Update the po files to cut down on dist time

02-05-08  JP Rosevear  <jpr@ximian.com>

	* Update the po files to cut down on dist time

svn path=/trunk/; revision=16721

39 files changed, 376347 insertions, 152937 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index e6cb32eb5a..12653c6e03 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-08  JP Rosevear  <jpr@ximian.com>
+
+	* Update the po files to cut down on dist time
+
 2002-05-06  Christopher James Lahey  <clahey@ximian.com>
 
 	* POTFILES.in: Replaced ldap-config.c with addressbook-config.c.
diff --git a/po/az.po b/po/az.po
index 90604f03e0..0dd93c4fd3 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: 2001-11-26 14:41+0100\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -31,21 +31,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "VCard fayllarını Evolution içinə gətirir."
 
 #: 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 "Fərqli Qeyd Et"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ad"
 
 #: 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 "ePoçt"
 
 #: 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:1731
 msgid "Primary"
 msgstr "İlk"
 
@@ -55,15 +56,16 @@ 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:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 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/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: 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
 msgid "Business"
 msgstr "Məslək"
 
@@ -73,12 +75,12 @@ msgid "Bus"
 msgstr "Məs"
 
 #: 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:1720
 msgid "Callback"
 msgstr "Geri axtarma"
 
 #: 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:1722
 msgid "Company"
 msgstr "Şirkət"
 
@@ -88,13 +90,14 @@ msgstr "Şir"
 
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: 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
 msgid "Home"
 msgstr "Ev"
 
 #: 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 "Quruluş"
 
@@ -103,18 +106,20 @@ msgid "Org"
 msgstr "Qur"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "Əl Telefonu"
 
 #: 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:1721
 msgid "Car"
 msgstr "Maşın"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: 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:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "İş Faksı"
 
@@ -123,13 +128,13 @@ msgid "Bus Fax"
 msgstr "İş Faksı"
 
 #: 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:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "2-ci İş"
 
@@ -138,69 +143,68 @@ msgid "Bus 2"
 msgstr "İş 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:1724
 msgid "Home 2"
 msgstr "2-ci Ev"
 
 #: 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:1726
+#: 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:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "Başqa"
 
 #: 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:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: 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: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:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "3.ncü ePoçt ünvanı"
 
 #: 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 Səhifəsi"
 
@@ -209,7 +213,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 "Bölmə"
 
@@ -218,7 +222,7 @@ msgid "Dep"
 msgstr "Böl"
 
 #: 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 "İdarə"
 
@@ -227,12 +231,12 @@ msgid "Off"
 msgstr "Qapalı"
 
 #: 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 "Başlıq"
 
 #: 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 "Məslək"
 
@@ -241,7 +245,7 @@ msgid "Prof"
 msgstr "Məs"
 
 #: 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 "İdarəci"
 
@@ -254,7 +258,7 @@ msgid "Ass"
 msgstr "Yar"
 
 #: 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 "Ləqəb"
 
@@ -263,12 +267,12 @@ msgid "Nick"
 msgstr "ULəqəb"
 
 #: 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 "Yoldaş"
 
 #: 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 "Qeyd"
 
@@ -281,7 +285,7 @@ msgid "CALUri"
 msgstr "TƏQUri"
 
 #: 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 "Sərbəst/məşğul URL"
 
@@ -310,302 +314,16 @@ msgstr "Kateqoriyalar"
 msgid "Family Name"
 msgstr "Soyad"
 
-#: 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 "Kart: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Ad: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Prefiks:\t"
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Verilən:\t"
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Əlavə: "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Ailə:\t"
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Suffiks:\t"
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Ad günü:  "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Ünvan:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"   Poçt Qutusu:\t"
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"   Əlavə:\t"
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"   Küçə:\t"
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"   Şəhər:\t"
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"   Rayon:\t"
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"   Poçt Kodu:\t"
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"   Ölkə:\t"
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Təslim Etiketi:  "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefonlar:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"ePoçt:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"ePoçt:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Göndərici:  "
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Zaman zolağı:  "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Coğrafi Yerləşmə:  "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Məslək:\t"
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Quruluş:\t"
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"   Ad:\t"
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"   Bölmə:\t"
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"   Bölmə2:\t"
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"   Bölmə3:\t"
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"   Bölmə4:\t"
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kateqoriyalar:\t"
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"İzahat:\t"
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3879
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Yeganə Kəlimə:\t"
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Ümumi Açar:\t"
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Çoxlu VCard"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "%s üçün VCard"
@@ -613,85 +331,89 @@ msgstr "%s üçün 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:1130
-#: 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:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Bonoboyu başlada bilmədim"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2215
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Axtarılır..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Yüklənir ..."
 
 #. 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 "Axtarış ifadəsində xəta."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:475
-msgid "Connecting to LDAP server..."
-msgstr "LDAP vericiyə bağlantı qurulur..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:485
-msgid "Unable to connect to LDAP server."
-msgstr "LDAP vericiyə bağlanma xətası."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:501
-msgid "Waiting for connection to LDAP server..."
-msgstr "LDAP vericiyə bağlantı qurulmağı gözlənilir..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:870
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "LDAP vericiyə kart əlavə edilir..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:971
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "LDAP vericidən kart çıxardılır..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP vericidəki kart təkmilləşdirilir..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2160
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Axtarış yenidəm başladılır."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "LDAP axtarış nəticələri alınır..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2165
-msgid "Restarting search."
-msgstr "Axtarış yenidəm başladılır."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Kart çıxartma xətası"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "URL `%s' alına bilmir"
+
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "ePoçt Ünvanı: "
 
-#: addressbook/conduit/address-conduit.c:294
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Ox yüklənə bilmədi\n"
 
-#: addressbook/conduit/address-conduit.c:307
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "eKitab yüklənmədi\n"
 
-#: addressbook/conduit/address-conduit.c:1089
-#: calendar/conduits/calendar/calendar-conduit.c:981
-#: calendar/conduits/todo/todo-conduit.c:694
+#: 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 xidməti başladıla bilmədi"
 
-#: addressbook/conduit/address-conduit.c:1090
-#: calendar/conduits/calendar/calendar-conduit.c:982
-#: calendar/conduits/todo/todo-conduit.c:695
+#: 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ı başlada bilmədim"
 
-#: 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 Ünvan əlavələri bloku oxuna bilmədi"
 
@@ -708,221 +430,109 @@ 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
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 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:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Əlaqələri idarə edici Evolution əlavəsi."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Nümunəvi ünvan dəftəri idarəsi emalatxanası"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Əlaqələr"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Əlaqələr məlumatını daxil edən qovluq."
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP Vericisi"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "Əlaqələr məlumatını daxil edən LDAP verici."
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Yeni Əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
-msgstr "Yeni Ə_laqə"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_Əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Yeni Əlaqə Siyahısı"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
-msgstr "Yeni Əlaqə _Siyahısı"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
-msgstr "Ünvan dəftərini düzəlt"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
-msgstr "Hesab Adı"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "Ünvan dəftəri əlavə et"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
-msgstr "Ünvan Dəftəri Qaynağı"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "Ətraflı"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
-msgstr "Əsas"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Əsas"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "De_lete"
-msgstr "Si_l"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "ePoçt Ünvanı: "
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-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"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "One"
-msgstr "Bir"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
-msgstr "Axtarış ə_sası:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search s_cope: "
-msgstr "Axtarışın əhatə _sahəsi:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Server Name"
-msgstr "Verici Adı"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid "Sub"
-msgstr "Baz."
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-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.  "
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "This information is not required for most ldap servers. "
-msgstr "Bu məlumat bir çox lap verici üçün lüzumsuzdur.  "
-
-#: 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 ""
-"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."
-
-#: 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 ""
-"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."
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-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."
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
-msgstr "Bu. ldap vericinizin istifadə etdiyi qapı nömrəsidir."
-
-#: 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 "Bu ad hesab adınızı müəyyəmləşdirər. Ancaq nümayiş məqsədi daşıyır."
-
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "_Account name:"
-msgstr "_Hesab adı:"
-
-#: 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 "_Əlavə Et"
-
-#: 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 "_Düzəlt"
-
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
-msgstr "Verici_m tanıtmaya ehtiyac hiss edər"
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
-msgstr "_Qapı:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
-msgstr "_Verici adı:"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Əlaqə Siyahısı"
 
-#: 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs-ni başlada bilmədim"
 
-#: addressbook/gui/component/addressbook-storage.c:167
-msgid "Other Contacts"
-msgstr "Digər Əlaqələr"
-
-#: addressbook/gui/component/addressbook.c:468
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Ünvan dəftərini aça bilmədim"
 
-#: 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"
@@ -931,7 +541,7 @@ msgstr ""
 "Bu ünvan dəftərini aça bilmirik. Ya səhv URL bildirdiniz,\n"
 "ya da LDAP verici işləmir."
 
-#: 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"
@@ -941,67 +551,62 @@ 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: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."
 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:623
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s üçün parol girin (istifadəçi %s)"
 
-#: addressbook/gui/component/addressbook.c:786
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Daxil edən hər hansı üzv"
-
-#: addressbook/gui/component/addressbook.c:787
-msgid "Name contains"
-msgstr "Daxil edən ad"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "sonlanır"
 
-#: addressbook/gui/component/addressbook.c:788
-msgid "Email contains"
-msgstr "Daxil edən ePoçt"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "2-ci ePoçt ünvanı"
 
-#: addressbook/gui/component/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kateqoriya"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:772
+#: 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
 msgid "Advanced..."
 msgstr "Ətraflı..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1031
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Hər Hansı Kateqoriya"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1083
 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:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1686
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 msgid "Primary Email"
 msgstr "İlk ePoçt ünvanı"
 
@@ -1047,6 +652,621 @@ 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
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "Ü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
+#, fuzzy
+msgid "Always"
+msgstr "Alarm"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Adsız"
+
+#: 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 "%s ilə bağlantı yenidən qurulur"
+
+#: 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 "Məlumat Yoxdur"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "Si_l"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Siyahı _adı:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "ePoçt Ünvanı: "
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+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"
+
+#: 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"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "A_xtar"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Ümumi"
+
+#: 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 "Quraşdırma"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+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
+#, fuzzy
+msgid "Never"
+msgstr "_hər"
+
+#: 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 "Bir"
+
+#: 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 "Axtarışın əhatə _sahəsi:"
+
+#. 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 "Axtarılır"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Hamısını Seç"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Silinən"
+
+#: 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 "Mənbə Məlumatı"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Vericiyə bağlantı qurulur..."
+
+#: 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 "Baz."
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Dəstəklənməyən sxem"
+
+#: 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 ""
+"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"
+"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 "_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
+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:139
+msgid "_Add"
+msgstr "_Əlavə Et"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Əlavə Et"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Gediş əlavə et"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Gediş əlavə et"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Alarm"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "Hamısını _Sil"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Ekran"
+
+#: 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:152 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 "_Düzəlt"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "Görüşü _düzəlt"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution Alarmı"
+
+#: 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 "_Seçənəklər"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Qapı:"
+
+#: 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 "Axtarış ə_sası:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Verici adı:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Xəbərdarlıq vaxtı ( dəqiqə )"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Hesab %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "əlaqə-siyahısı-editoru"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Kart yoxdur"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "%s ilə bağlantı yenidən qurulur"
+
+#: 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 "Ümumi"
+
+#: 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 "Axtarılır"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü."
@@ -1056,9 +1276,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü emalatxanası"
 
 #: 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: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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Sil"
 
@@ -1087,7 +1307,12 @@ msgstr "(%d göstərilmir)"
 msgid "Unnamed Contact"
 msgstr "Adsız Əlaqə"
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Daxil edən yollayıcılar"
+
+#: 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"
@@ -1102,7 +1327,7 @@ msgstr ""
 "Jon Trowbridge <trow@ximian.com> ünvanına ətraflı xəta raportu\n"
 "göndərəsiniz. Minnətdarıq."
 
-#: 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"
@@ -1114,88 +1339,107 @@ msgstr ""
 "Problemi həll etmək üçün Evolution proqramının\n"
 "yenidən başladılması lazım gələ bilər."
 
-#: 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 "Ünvan Dəftərindən Əlaqələri Seçin"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "Daxil edir:"
+msgid "Select Names"
+msgstr "Ad Seç"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Co_ntacts:"
-msgstr "_Əlaqələr:"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Əlaqəni Silimmi?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "F_ind"
-msgstr "A_xtar"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Əlaqələr"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "Ad Seç"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
-msgstr "Aşağıdakı kriteriyalara uyğun gələn əlaqələri göstər:"
+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 "_Daşı ..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kateqoriya:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Qovluq:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Message Recipients:"
-msgstr "_İsmarış Alıcısı:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "Anni_versary:"
-msgstr "_İl dönümü :"
+#, fuzzy
+msgid "A_ssistant's name:"
+msgstr "_Köməkçi adı :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "B_usiness"
-msgstr "_Məslək"
+#, fuzzy
+msgid "Add_ress..."
+msgstr "_Ünvan..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Business _Fax"
-msgstr "Məsləki _Faks"
+msgid "Anni_versary:"
+msgstr "_İl dönümü :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#, fuzzy
+msgid "Birthda_y:"
+msgstr "_Ad günü :"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#, fuzzy
+msgid "C_ontacts..."
+msgstr "_Əlaqələr ..."
+
+#: 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 "Nö_vlər..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr "Iş birliği"
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Əlaqə düzəldicisi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "D_epartment:"
+msgstr "_Bölmə :"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Ətraflı"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
 msgstr "Sə_rbəst/Məşğul URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "File A_s:"
 msgstr "Fərqli Fa_ylla:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "General"
-msgstr "Ümumi"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#, fuzzy
+msgid "Full _Name..."
+msgstr "_Tam Ad ..."
 
-#: 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"
@@ -1205,1126 +1449,1191 @@ msgstr ""
 "bildirirsə, bu məlumatın ünvanını\n"
 "buraya girin."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr "Yeni telefon növü"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "No_tes:"
 msgstr "_Qeydlər:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Organi_zation:"
 msgstr "_Orqanizasiya:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#, fuzzy
+msgid "P_rofession:"
+msgstr "_Məslək :"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Phone Types"
 msgstr "Telefon Növləri"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Wants to receive _HTML mail"
-msgstr "_HTML ePoçtlarını qəbul edir"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Address..."
-msgstr "_Ünvan..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Assistant's name:"
-msgstr "_Köməkçi adı :"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Birthday:"
-msgstr "_Ad günü :"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+msgid "S_pouse:"
+msgstr "_Yoldaş:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Business"
-msgstr "_Məslək"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#, fuzzy
+msgid "This is the _mailing address"
+msgstr "_Bu ePoçt ünvanıdır"
 
-#: 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 "_Əlaqələr ..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "Wants to receive _HTML mail"
+msgstr "_HTML ePoçtlarını qəbul edir"
 
-#: 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: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:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "_Sil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Department:"
-msgstr "_Bölmə :"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Full Name..."
-msgstr "_Tam Ad ..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Home"
-msgstr "_Ev"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Job title:"
 msgstr "Məslək _izahı:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager's Name:"
 msgstr "_İdarəcinin Adı :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Mobile"
-msgstr "_Cib"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
 msgstr "_Ləqəb :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
 msgstr "_İdarə :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Profession:"
-msgstr "_Məslək :"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Public Calendar URL:"
 msgstr "_Ümumi Təqvim URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Spouse:"
-msgstr "_Yoldaş:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr "_Bu ePoçt ünvanıdır"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "_Veb səhifəsi ünvanı:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Əlaqəni Silimmi?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:756
-msgid "Category editor not available."
-msgstr "Kateqoriya editoru mövcud deyildir."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:763
-msgid "This contact belongs to these categories:"
-msgstr "Bu üzv bu kateqoriyalara aitdir:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Sahənin pəncərəciyi tapıla bilmir: `%s'"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
-msgstr "Cəld Əlaqə Əlavəsi"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
-msgstr "Hamısını Düzəlt"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr "Tam Ad"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
-msgid "E-mail"
-msgstr "ePoçt"
-
-#. 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 "siyahı"
-
-#: 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 onsuz da mövcuddur.\n"
-"Üstünə yazmaq istəyirsiniz?"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Ünvan _2:"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
+msgstr "Birləşmiş Ştatlar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
 msgid "Afghanistan"
 msgstr "Əfqanıstan"
 
-#: 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 "Albaniya"
 
-#: 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 "Əlcəzair"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "American Samoa"
 msgstr "Amerikan Samoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Angola"
 msgstr "Anqola"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Anguilla"
 msgstr "Anquilla"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Antigua And Barbuda"
 msgstr "Antiq Və Barbuda"
 
-#: 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 "Argentina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Armenia"
 msgstr "Ermənistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Aruba"
 msgstr "Aruba"
 
-#: 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 "Avstraliya"
 
-#: 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 "Avstriya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Azerbaijan"
 msgstr "Azərbaycan"
 
-#: 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 "Bahama"
 
-#: 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 "Bahreyn"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Bangladesh"
 msgstr "Banqladeş"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Belarus"
 msgstr "Belarusiya"
 
-#: 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 "Belçika"
 
-#: 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 "Beliz"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: 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 "Boliviya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bosnia And Herzegowina"
 msgstr "Bosniya Və Herzegovina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Botswana"
 msgstr "Botsvana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bouvet Island"
 msgstr "Buvet Adası"
 
-#: 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 "Braziliya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "British Indian Ocean Territory"
 msgstr "Britaniya Hind Okeanı Sahəsi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:33
-msgid "British Virgin Islands"
-msgstr "Britaniya Virgin Adaları"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Brunei Darussalam"
 msgstr "Bruney Darüssəlim"
 
-#: 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 "Bolqariya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Cambodia"
 msgstr "Kambodiya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: 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 "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cape Verde"
 msgstr "Keyp Verde"
 
-#: 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 "Kayman Adaları"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Central African Republic"
 msgstr "Mərkəzi Afrika Respublikası"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Chad"
 msgstr "Çad"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-msgid "Check Address"
-msgstr "Ünvanı Yoxla"
-
-#: 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 "Çili"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "China"
 msgstr "Çin"
 
-#: 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 "Kristmas Adası"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokos Adası"
 
-#: 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 "Kolumbiya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Comoros"
 msgstr "Komor"
 
-#: 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 "Konqo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Cook Islands"
 msgstr "Kuku Adaları"
 
-#: 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 "Kosta Rika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cote d'Ivoire"
 msgstr "Kot Divuar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:56
-msgid "Countr_y:"
-msgstr "Öl_kə:"
-
-#: 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 "Xırvatıstan"
 
-#: 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 "Kuba"
 
-#: 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 "Kipr (Yunan və Türk) "
 
-#: 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 "Çex Respublikası"
 
-#: 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 "Danimarka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Djibouti"
 msgstr "Cibuti"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Dominica"
 msgstr "Dominik"
 
-#: 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 "Dominikan Respublikası"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "East Timor"
 msgstr "Şərqi Timor"
 
-#: 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 "Ekvador"
 
-#: 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 "Misir"
 
-#: 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 "Elsalvador"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Equatorial Guinea"
 msgstr "Ekvatorial Qvineya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Eritrea"
 msgstr "Eritre"
 
-#: 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 "Estoniya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Ethiopia"
 msgstr "Efiopiya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Falkland Islands"
 msgstr "Folkland Adaları"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Faroe Islands"
 msgstr "Faro Adaları"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Fiji"
 msgstr "Fici"
 
-#: 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 "Finlandiya"
 
-#: 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 "Fransa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "French Guiana"
 msgstr "Fransız Gvineyası"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "French Polynesia"
 msgstr "Fransız Poloneziyası"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Southern Territories"
 msgstr "Cənubi Fransız Sahələri"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Gabon"
 msgstr "Qabon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Gambia"
 msgstr "Qambiya"
 
-#: 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 "Gürcüstan"
 
-#: 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 "Almanya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Ghana"
 msgstr "Qana"
 
-#: 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 "Gibraltar"
 
-#: 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 "Yunanıstan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Greenland"
 msgstr "Qrinland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Grenada"
 msgstr "Qrenada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Guadeloupe"
 msgstr "Quadelup"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Guam"
 msgstr "Quam"
 
-#: 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 "Quatemala"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guinea"
 msgstr "Qvineya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guinea-bissau"
 msgstr "Qvineya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guyana"
 msgstr "Quyana"
 
-#: 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 "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 "Herd Və McDonald Adları"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Holy See"
 msgstr "Müqəddəs Dəniz"
 
-#: 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 "Honduras"
 
-#: 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 "Honq Konq"
 
-#: 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 "Macarıstan"
 
-#: 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 "İslandiya"
 
-#: 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 "Hindistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Indonesia"
 msgstr "İndoneziya"
 
-#: 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 "İrlandiya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Israel"
 msgstr "İsrail"
 
-#: 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 "İtaliya"
 
-#: 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 "Yamayka"
 
-#: 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 "Yaponiya"
 
-#: 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 "İordaniya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Kazakhstan"
 msgstr "Qazaxıstan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#, fuzzy
+msgid "Korea, Republic Of"
+msgstr "Koreya Respublikası"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Küveyt"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Kyrgyzstan"
 msgstr "Qırğızıstan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Latviya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: my-evolution/Locations.h:1198
 msgid "Lebanon"
 msgstr "Livan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
 msgid "Liberia"
 msgstr "Liberiya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Liechtenstein"
 msgstr "Lixtenşteyn"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: my-evolution/Locations.h:1234
 msgid "Lithuania"
 msgstr "Litvaniya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: my-evolution/Locations.h:1268
 msgid "Luxembourg"
 msgstr "Lüksemburq"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Macau"
 msgstr "Makau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Macedonia"
 msgstr "Makedoniya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Madagascar"
 msgstr "Madaqaskar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Malawi"
 msgstr "Malavi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Malaysia"
 msgstr "Malayziya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Maldives"
 msgstr "Maldiv"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Marshall Islands"
 msgstr "Marşal Adaları"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Martinique"
 msgstr "Martiniq"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Mauritania"
 msgstr "Mavritaniya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Mauritius"
 msgstr "Maurit"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mayotte"
 msgstr "Mayot"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1387
 msgid "Mexico"
 msgstr "Meksika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Micronesia"
 msgstr "Mikroneziya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+msgid "Moldova, Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Monaco"
 msgstr "Monako"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mongolia"
 msgstr "Monqolustan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: my-evolution/Locations.h:1470
 msgid "Morocco"
 msgstr "Mərakeş"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mozambique"
 msgstr "Mozambiq"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Namibia"
 msgstr "Namibiya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
 msgid "Netherlands"
 msgstr "Hollandiya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Netherlands Antilles"
 msgstr "Holland Antilləri"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "New Caledonia"
 msgstr "Yeni Kaledoniya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1560
 msgid "New Zealand"
 msgstr "Yeni Zellandiya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: my-evolution/Locations.h:1562
 msgid "Nicaragua"
 msgstr "Nikaraqua"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nigeria"
 msgstr "Nigeriya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niue"
 msgstr "Niu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: my-evolution/Locations.h:1574
 msgid "Norfolk Island"
 msgstr "Norfolk Adaları"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Northern Mariana Islands"
 msgstr "Şimali Marian Adaları"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
 msgid "Norway"
 msgstr "Norveç"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1632
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
 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 "Palau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Palestinian Territory"
 msgstr "Fələstin Bölgəsi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
 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 "Papua Yeni Qvineya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1688
 msgid "Paraguay"
 msgstr "Paraqvay"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr "Filippin"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Pitcairn"
 msgstr "Pitkairn"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
 msgid "Poland"
 msgstr "Polşa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
 msgid "Portugal"
 msgstr "Portuqaliya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1824
 msgid "Puerto Rico"
 msgstr "Porto Riko"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
 msgid "Qatar"
 msgstr "Katar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:173
-msgid "Republic Of Korea"
-msgstr "Koreya Respublikası"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:174
-msgid "Republic Of Moldova"
-msgstr "Moldova Respublikası"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Reunion"
 msgstr "Reyunion"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
 msgid "Romania"
 msgstr "Ruminıya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Russian Federation"
 msgstr "Rusiya Federasiyası"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Rwanda"
 msgstr "Rvanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Saint Kitts And Nevis"
 msgstr "Müqəddəs Kits Və Nevis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Saint Lucia"
 msgstr "Müqəddəs Lusiya"
 
-#: 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 "Müqəddəs Vinsent Və Grenadinlər"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome Və Prinsip"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: my-evolution/Locations.h:2035
 msgid "Saudi Arabia"
 msgstr "Səudiyyə Ərəbistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Senegal"
 msgstr "Seneqal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Seychelles"
 msgstr "Seyşel"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Sierra Leone"
 msgstr "Siera Lione"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2090
 msgid "Singapore"
 msgstr "Sinqapur"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: my-evolution/Locations.h:2103
 msgid "Slovakia"
 msgstr "Slovakiya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: my-evolution/Locations.h:2104
 msgid "Slovenia"
 msgstr "Sloveniya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Solomon Islands"
 msgstr "Solomon Adaları"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Somalia"
 msgstr "Somali"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2119
 msgid "South Africa"
 msgstr "Cənubi Afrika"
 
-#: 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 "Cənub Georgiya Və Cənub Sandviç Adaları"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
 msgid "Spain"
 msgstr "İspaniya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Sri Lanka"
 msgstr "Şri Lanka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "St. Helena"
 msgstr "Müqəddəs Helena"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "St. Pierre And Miquelon"
 msgstr "Müqəddəs Pyer Və Mikuelon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
 msgid "Suriname"
 msgstr "Surinam"
 
-#: 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 "Svalbard Və Xuan Mayen Adları"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Swaziland"
 msgstr "Svaziland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
 msgid "Sweden"
 msgstr "İsveç"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2183
 msgid "Switzerland"
 msgstr "İsveçrə"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
 msgid "Taiwan"
 msgstr "Tayvan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Tajikistan"
 msgstr "Tacikistan"
 
-#: 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 "Birləşmiş Tanzaniya Respublikası"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
 msgstr "Tayland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Togo"
 msgstr "Toqo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Tokelau"
 msgstr "Tokelo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Tonga"
 msgstr "Tonqa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Trinidad And Tobago"
 msgstr "Trinidad Və Tobaqo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tunisia"
 msgstr "Tunis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
 msgid "Turkey"
 msgstr "Türkiyə"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Turkmenistan"
 msgstr "Türkmənistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Turks And Caicos Islands"
 msgstr "Türk Və Kaykos Adaları"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:218
-msgid "U.S. Virgin Islands"
-msgstr "A.B.Ş. Virgin adları"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Uganda"
 msgstr "Uqanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
 msgid "Ukraine"
 msgstr "Ukrayna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "United Arab Emirates"
 msgstr "Birləşmiş Ərəb Əmirlikləri"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2342
 msgid "United Kingdom"
 msgstr "Birləşmiş Krallıq"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr "Birləşmiş Tanzaniya Respublikası"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-msgid "United States"
-msgstr "Birləşmiş Ştatlar"
-
-#: 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 "Birləşmiş Ştatlar yanı Kiçik Adalar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: my-evolution/Locations.h:2348
 msgid "Uruguay"
 msgstr "Uruqvay"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Uzbekistan"
 msgstr "Özbəkistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2380
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
 msgid "Viet Nam"
 msgstr "Vyetnam"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#, fuzzy
+msgid "Virgin Islands, British"
+msgstr "A.B.Ş. Virgin adları"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#, fuzzy
+msgid "Virgin Islands, U.S."
+msgstr "A.B.Ş. Virgin adları"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Wallis And Futuna Islands"
 msgstr "Vallis Və Futuna Adaları"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Western Sahara"
 msgstr "Qərbi Saxara"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
 msgid "Yemen"
 msgstr "Yəmən"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2524
 msgid "Yugoslavia"
 msgstr "Yuqoslaviya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Zambia"
 msgstr "Zambiya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Əlaqəni Silimmi?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+msgid "Category editor not available."
+msgstr "Kateqoriya editoru mövcud deyildir."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+msgid "This contact belongs to these categories:"
+msgstr "Bu üzv bu kateqoriyalara aitdir:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#, fuzzy
+msgid "Save Contact as VCard"
+msgstr "VCard olaraq qeyd et"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Sahənin pəncərəciyi tapıla bilmir: `%s'"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+msgid "Contact Quick-Add"
+msgstr "Cəld Əlaqə Əlavəsi"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+msgid "Edit Full"
+msgstr "Hamısını Düzəlt"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr "Tam Ad"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+msgid "E-mail"
+msgstr "ePoçt"
+
+#. 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 "siyahı"
+
+#: 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 onsuz da mövcuddur.\n"
+"Üstünə yazmaq istəyirsiniz?"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Ünvan _2:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "Ünvanı Yoxla"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "Öl_kə:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "_Ünvan :"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "_Şəhər:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Poçt Qutusu:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Vilayət"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "_ZIP Kodu:"
 
@@ -2406,7 +2715,9 @@ 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:"
+msgstr ""
+"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"
@@ -2422,10 +2733,15 @@ msgid "contact-list-editor"
 msgstr "əlaqə-siyahısı-editoru"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 msgid "Contact List Editor"
 msgstr "Əlaqə Siyahısı Editoru"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#, fuzzy
+msgid "Save List as VCard"
+msgstr "VCard olaraq qeyd et"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Yenə Də Əlavə Et"
@@ -2472,7 +2788,7 @@ msgstr ""
 "mövcuddur. Bunu yenə də əlavə etmək istəyirsiniz?."
 
 #: 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 "Ətraflı Axtarış"
 
@@ -2481,218 +2797,321 @@ msgstr "Ətraflı Axtarış"
 msgid "Search"
 msgstr "Axtar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d kart"
 
-#: 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 olaraq qeyd et"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Aç"
-
-#: 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 "Əlaqəni Çatdır"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-msgid "Send Message to Contact"
-msgstr "Əlaqəyə İsmarış Göndər"
-
-#: 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 "Çap Et"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr "Zərfi Çap Et"
-
-#: 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 "Sil"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: 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:33
-#: shell/evolution-shell-component.c:1007
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: shell/evolution-shell-component.c:1043
 msgid "Success"
 msgstr "Müvəffəqiyyət"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: 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:1894
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
+#: 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
 msgid "Unknown error"
 msgstr "Naməlum xəta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Nüsxə xətdən deyil"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "Qadağandır"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Kart tapıla bilmədi"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "Kard ID onsuz da mövcuddur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protokol dəstəklənmir"
 
-#: 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:607 camel/camel-service.c:643
+#: 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
 msgid "Cancelled"
 msgstr "Ləğv Edildi"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Başqa xəta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Siyahıya əlavə etmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Kart əlavə etmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Siyahı təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Siyahı çıxartma xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Kart çıxartma xətası"
 
-#. 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:204
+#, fuzzy
+msgid "Display Cards?"
+msgstr "Ekran"
 
-#. 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:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "Ekran"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Kart yoxdur"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Kart yoxdur"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Kart yoxdur"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Kart yoxdur"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Əlaqə əlavə etmək üçün buraya tıqlayın *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Əsas Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Köməkçi Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "İş Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Geri axtarma Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Şirkət Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "İş Ünvanı"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Ev Ünvanı"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Əl Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Maşın Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "2-ci İş Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "2-ci Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Digər Telefonlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "VCard olaraq qeyd et"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Yeni Əlaqə"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Yeni Əlaqə Siyahısı"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "Qovluğa _Get ..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_İdxal Et..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "Əlaqələri A_xtar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Ünvan Dəftəri Qaynağı..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Pilot Qurğuları..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Əlaqəni Çatdır"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Əlaqəyə İsmarış Göndər"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Zərfi Çap Et"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "Qovluğa _Köçürt..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "Qovluğa _Daşı ..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: 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
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Hazırkı Görünüş"
+
+#. 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:940
+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:945
+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."
@@ -2706,11 +3125,12 @@ msgstr "və bir başqa kart."
 msgid "Save in addressbook"
 msgstr "Ünvan dəftərinə qeyd et"
 
-#: 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 ""
@@ -2720,10 +3140,37 @@ msgstr ""
 "\n"
 "Buraya cüt-tıqlayaraq bir əlaqə üzvünü yarat."
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Bu görünüşdə göstəriləcək üzvlər yoxdur\n"
+"\n"
+"Buraya cüt-tıqlayaraq bir əlaqə üzvünü yarat."
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Kart Nümayişi "
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr "Zərfi çap et"
+
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr "Kartları çap et"
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+msgid "Print card"
+msgstr "Kartı çap et"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -2793,6 +3240,7 @@ msgid "Include:"
 msgstr "Daxil et :"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Mənzərə"
 
@@ -2817,10 +3265,12 @@ msgid "Options"
 msgstr "Seçənəklər"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "İstiqamət"
 
 #: addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "Səhifə"
 
@@ -2836,7 +3286,9 @@ msgstr "Kağız"
 msgid "Paper source:"
 msgstr "Kağız qaynağı :"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Portret"
 
@@ -2892,62 +3344,49 @@ msgstr "En :"
 msgid "_Font..."
 msgstr "_Yazı növü ..."
 
-#: addressbook/printing/e-contact-print.c:1111
-msgid "Print cards"
-msgstr "Kartları çap et"
-
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-msgid "Print card"
-msgstr "Kartı çap et"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr "Zərfi çap et"
-
-#: calendar/cal-util/cal-component.c:1202
+#: calendar/cal-util/cal-component.c:1207
 msgid "Untitled appointment"
 msgstr "Adsız görüş"
 
-#: 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:405 mail/message-list.c:642
+#: 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
 msgid "High"
 msgstr "Yüksək"
 
-#: 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:641
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
-#: 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:407 mail/message-list.c:640
+#: 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
 msgid "Low"
 msgstr "Alçaq"
 
 #. 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
 msgid "Undefined"
 msgstr "Təsvirsiz"
 
-#: calendar/conduits/calendar/calendar-conduit.c:937
-#: calendar/conduits/todo/todo-conduit.c:649
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Təqvim vericisi ilə bağlantı qurulurkən xəta oldu"
 
-#: calendar/conduits/calendar/calendar-conduit.c: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 Təqvim əlavələri bloku oxuna bilmədi"
 
-#: calendar/conduits/todo/todo-conduit.c:756
-#: calendar/conduits/todo/todo-conduit.c:759
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "_Üstünlük:"
+
+#: 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 Ediləcəklər əlavələri bloku oxuna bilmədi"
 
@@ -2960,41 +3399,55 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Təqvim göstərən Bonobo idarə nümunəsi."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Təqvim və Vəzifə Qurğuları"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Evolutionun Təqvim əlavəsi."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr "Evolutionun Vəzifə parçası emalatxanası."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 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:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "Nümunəvi Təqvim idarəsi emalaxanası"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 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:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 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
+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 "Alarm vermə xidməti"
@@ -3003,22 +3456,10 @@ 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
-msgid "Starting:"
-msgstr "Başlayır:"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-msgid "Ending:"
-msgstr "Sonlanır:"
-
 #: 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
-msgid "Evolution Alarm"
-msgstr "Evolution Alarmı"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3041,11 +3482,11 @@ msgstr "Xəbərdarlıq vaxtı ( dəqiqə )"
 msgid "_Edit appointment"
 msgstr "Görüşü _düzəlt"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:670
+#: calendar/gui/alarm-notify/alarm-queue.c:675
 msgid "No description available."
 msgstr "İzahat yoxdur."
 
-#: 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"
@@ -3057,11 +3498,17 @@ msgstr ""
 "üçün qurulubdur.  Evolution yerinə normal\n"
 "xatırlatma ekranı göstərəcəkdir."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:781
-#, c-format
+#: calendar/gui/alarm-notify/alarm-queue.c:753
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Xəbərdarlıq"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:758
+#, fuzzy, 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"
@@ -3074,7 +3521,12 @@ msgstr ""
 "\n"
 "Həqiqətən də bu proqramı icra etmək istəyirsiniz?"
 
-#: 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 "Mənə bir də soruşma."
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "GNOME başladıla bilmədi"
 
@@ -3086,52 +3538,67 @@ msgstr "Alarm vermə xidməti yaradıla bilmir"
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm vermə xidməti emalatxanası yaradıla bilmir"
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Daxil edən icmal"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Daxil edən izah"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Daxil edən şərh"
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr "Oxşar Olmayan"
+
+#: 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: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 %b %d"
 
-#: 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:805
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:800
+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:384
 msgid "Private"
 msgstr "Şəxsi"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Ümumi"
 
@@ -3152,32 +3619,27 @@ msgid "W"
 msgstr "Çərş."
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Boş"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 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:479 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Bitirmə Tarixi"
 
@@ -3193,12 +3655,13 @@ 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/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/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
+#: 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 "Yoxdur"
 
@@ -3210,23 +3673,15 @@ msgstr "Təkrarlayan"
 msgid "Assigned"
 msgstr "Vəzifələndirilmiş"
 
-#: 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:803
+#: 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
 msgid "Yes"
 msgstr "Bəli"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr "Xeyr"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1974 calendar/gui/e-day-view.c:1675
-#: calendar/gui/e-week-view.c:1182
-msgid "Searching"
-msgstr "Axtarılır"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Gündəlik Nümayiş"
@@ -3243,63 +3698,79 @@ msgstr "Həftəlik Nümayiş"
 msgid "Month View"
 msgstr "Aylıq Nümayiş"
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
-msgstr "Daxil edən icmal"
-
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
-msgstr "Daxil edən izah"
-
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "Daxil edən şərh"
-
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
-msgid "Unmatched"
-msgstr "Oxşar Olmayan"
-
-#: 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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Təqvim"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Görüş və hadisələri daxil edən qovluq"
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Vəzifə"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Ediləcəkləri daxil edən qovluq"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "Yeni bir iclas yarat"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "Xəbərlər Qurğuları"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "İclas"
+
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "Yeni Vəzifə"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "_Vəzifə"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Yeni İclas"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "Yeni _Görüş"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
-msgstr "Yeni bir vəzifə yarat"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Yeni İclas"
+
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "İclas"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "Yeni _Vəzifə"
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "Təqvimin göstərəcəyi URI"
 
+#: 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 "Səsli Alarm Seçənəkləri"
@@ -3345,8 +3816,9 @@ 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:"
@@ -3466,12 +3938,12 @@ msgstr "iclas qurtarandan %s %s sonra"
 msgid "%s at the end of the appointment"
 msgstr "iclas qurtarandan %s sonra"
 
-#: calendar/gui/dialogs/alarm-page.c:453
+#: calendar/gui/dialogs/alarm-page.c:452
 #, c-format
 msgid "%s at %s"
 msgstr "%s %s"
 
-#: calendar/gui/dialogs/alarm-page.c:459
+#: calendar/gui/dialogs/alarm-page.c:458
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "naməlum tətik növü üçün %s"
@@ -3492,7 +3964,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.c:737 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Mündəricat:"
 
@@ -3500,12 +3972,11 @@ msgstr "Mündəricat:"
 msgid "_Options..."
 msgstr "_Seçənəklər..."
 
-#. 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 "sonra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "əvvəl"
 
@@ -3522,7 +3993,7 @@ msgstr "görüşün sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "dəqiqə"
 
@@ -3563,170 +4034,170 @@ msgid "Color for tasks due today"
 msgstr "Bugünkü vəzifə rəngi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Əsas _xatırladıcılı yeni görüş yarat"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Gün"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Hə_ftənin ilk günü:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Cümə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Saat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Dəqiqə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Bazar ertəsi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Ge_cikmiş işlər:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Şənbə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-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"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 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:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "Ba_z"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Bazar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Bügunki və_zifələr:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "C_ax"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "Ça_x"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Bügunki və_zifələr:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "_Vəzifə Siyahısı"
 
-#: 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 "Cümə Axşamı"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Vaxt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Zaman _zolağı:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Vaxt dili_mləri:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Vaxt Şəkli:"
 
-#: 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 "Çərşənbə axşamı"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Çərşənbə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "İş  Həftəsi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 saat (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 saat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 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:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Ekran"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Cüm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Ümumi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "Qurtarmış vəzifələri bundan sonra _gizlə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "B_e"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Başqa"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Ge_cikmiş işlər:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_Şn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "_Vəzifə Siyahısı"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Vaxt dili_mləri:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Çər"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "iclas başlamadan əvvəl"
 
@@ -3744,7 +4215,8 @@ 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."
@@ -3762,8 +4234,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
@@ -3786,81 +4258,68 @@ 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
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Siz dəyişikliklər aparmadınız. editoru güncəlləşdirək?"
 
-#: 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 " buraya "
 
-#: 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 " (Qurtarılıb "
 
-#: 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 "Qurtarılıb "
 
-#: 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 " (Ait "
 
-#: 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 "Aidiyyət"
 
-#: calendar/gui/dialogs/comp-editor.c:303
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "Cism güncəllənə bilmədi!"
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "İclası düzəlt"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "İclas - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Vəzifə - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Jurnal üzvü - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1897
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "Faylının üsütünə yazım mı?"
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1904
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Eyni adlı bir fayl onsuz da vardır.\n"
-"Üstünə yazım mı?"
-
-#: 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 "Fərqli Qeyd Et ..."
+#: 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
+msgid "Save as..."
+msgstr "Fərqli qeyd et ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Hazırkı buraxılış öyrənilə bilmədi!"
 
@@ -3918,7 +4377,7 @@ msgstr "Nümayəndələşdir:"
 msgid "Enter Delegate"
 msgstr "Nümayəndəni Bildir"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "İclas"
 
@@ -3932,13 +4391,13 @@ msgstr "Təkrarlama"
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 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:365
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "İclas"
 
@@ -3971,30 +4430,42 @@ msgid "F_ree"
 msgstr "B_oş"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
+#, fuzzy
+msgid "L_ocation:"
+msgstr ""
+"\n"
+"Coğrafi Yerləşmə:  "
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Xü_susi"
 
-#: 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 "Üm_umi"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Vaxt Fərqli Göstər"
 
-#: 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ü_ndəricat:"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Əlaqələr ..."
+
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "_Sonlanma vaxtı:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "_Başlama vaxt:"
 
@@ -4045,7 +4516,6 @@ msgid "Member"
 msgstr "Üzv"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
@@ -4057,14 +4527,14 @@ 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:49
-#: mail/message-list.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
+#: mail/message-list.etspec.h:11
 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 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Növ"
@@ -4079,7 +4549,7 @@ 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:445
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "Başqalarını _Dəvət Et ..."
 
@@ -4087,27 +4557,98 @@ msgstr "Başqalarını _Dəvət Et ..."
 msgid "_Other Organizer"
 msgstr "_Başqa Təşkilatçı"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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.nci"
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "2-ci"
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "3.ncü"
+
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Bu görüşdə \"Evolution\"un düzəldə bilməyəcəyi hallar var."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "..da"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "siyahı"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "saniyə"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Başqa"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Şimal"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "siyahı"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Başqa faks"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "gün"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "...da (də)"
 
-#: 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 "hadisələr"
 
@@ -4171,17 +4712,27 @@ msgstr "həftə"
 msgid "year(s)"
 msgstr "il"
 
-#: 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 ""
+"İ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:60
-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?"
+#: 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?"
 
-#: calendar/gui/dialogs/send-comp.c:65
-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?"
+#: 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?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
@@ -4198,7 +4749,7 @@ msgid "Progress"
 msgstr "Gedişat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4210,15 +4761,19 @@ msgstr "_Üstünlük:"
 msgid "_Status:"
 msgstr "_Hal:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "Əsas"
+
 #: 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:324
 msgid "Assignment"
 msgstr "Vəzifələndirilmiş"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "İzah :"
 
@@ -4230,147 +4785,89 @@ msgstr "Başla_ma Tarixi:"
 msgid "_Due Date:"
 msgstr "_Bu tarixə qədər :"
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: 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:751 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:941 calendar/gui/e-day-view.c:3544
-#: calendar/gui/e-week-view.c:3422 mail/folder-browser.c:1447
-#: shell/e-shortcuts-view.c:384
+#: 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
 msgid "_Open"
 msgstr "_Aç"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:973
+#, 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-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 "_Çap Et ..."
+
+#: calendar/gui/e-calendar-table.c:978 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:947 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3433 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:979 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:949 calendar/gui/e-day-view.c:3530
-#: calendar/gui/e-day-view.c:3557 calendar/gui/e-week-view.c:3409
-#: calendar/gui/e-week-view.c:3435 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:980 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 "_Yapışdır"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Vəzifə Ver"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "v_Calendar şəklində çatdır"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "Qurtardı deyə _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:956
-msgid "_Delete this Task"
-msgstr "Bu Vəzifəni _Sil"
-
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "Vəzifələri Qurtardı deyə _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "Seçili Vəzifələri _Sil"
 
-#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7115
-#: calendar/gui/e-week-view.c:3918
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Cismlər güncəllənir"
 
-#: calendar/gui/e-calendar-table.c:1228
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Vəzifə əlavə etmək üçün tıqla"
 
-#. 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"
-
-#. 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/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Tarix öz şəklində verilməlidir: \n"
-"\n"
-"%s"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:723
-#: camel/camel-filter-driver.c:837
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Qurtar"
 
@@ -4401,8 +4898,7 @@ 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: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-shortcuts.c:1030
 msgid "Summary"
 msgstr "Mündəricat"
 
@@ -4414,6 +4910,29 @@ msgstr "Vəzifə nizamlanması"
 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 %m/%d/%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 %m/%d/%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 ""
+"Tarix öz şəklində verilməlidir: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -4421,376 +4940,175 @@ msgstr "%02i dəqiqə bölmələri"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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"
 
 #. 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"
 
 #. 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
 msgid "am"
 msgstr "am"
 
 #. 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
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "Yeni _Görüş"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Yeni Bütün Gün _Hadisəsi"
 
-#: 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:3553 calendar/gui/e-week-view.c:3440
+#, fuzzy
+msgid "New Meeting"
+msgstr "İclas"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Yeni Vəzifə"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Çap Et ..."
+
+#: 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 "_Bugünə Get"
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 msgid "_Go to Date..."
 msgstr "Tarixə _Get..."
 
-#: calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-msgid "_Delete this Appointment"
-msgstr "Bu İclası _Sil"
+#: 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 "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
+#, fuzzy
+msgid "_Configure..."
+msgstr "Quraşdırma"
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+msgid "_Configure Pilot..."
+msgstr "Quraşdırma"
 
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
+#: 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
+msgid "_Save As..."
+msgstr "Fərqli _Qeyd Et ..."
+
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "_Görüşləri Planlaşdır"
+
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "v_Calendar şəklində çatdır"
+
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "Bu Vaqeənin _Daşına Bilməsinə İmkan Ver"
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "Bu _Vaqeəni Sil"
 
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 msgid "Delete _All Occurrences"
 msgstr "_Bütün Vaqeələri Sil"
 
-#: calendar/gui/e-itip-control.c:524
-msgid "Meeting begins: <b>"
-msgstr "İclas başlayır: <b>"
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Task begins: <b>"
-msgstr "Vəzifə başlayır: <b>"
-
-#: calendar/gui/e-itip-control.c:534
-msgid "Free/Busy info begins: <b>"
-msgstr "Sərbəst/Məşğul infosu başlayır: <b>"
-
-#: calendar/gui/e-itip-control.c:538
-msgid "Begins: <b>"
-msgstr "Başlayır: <b>"
-
-#: calendar/gui/e-itip-control.c:550
-msgid "Meeting ends: <b>"
-msgstr "İclas sonlanır: <b>"
-
-#: calendar/gui/e-itip-control.c:553
-msgid "Free/Busy info ends: <b>"
-msgstr "Sərbəst/Məşğul infosu sonlanır: <b>"
-
-#: calendar/gui/e-itip-control.c:557
-msgid "Ends: <b>"
-msgstr "Sonlanır: <b>"
-
-#: calendar/gui/e-itip-control.c:571
-msgid "Task Completed: <b>"
-msgstr "Vəzifə Qurtardı: <b>"
-
-#: calendar/gui/e-itip-control.c:581
-msgid "Task Due: <b>"
-msgstr "Vəzifə Vaxtı: <b>"
-
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
-msgid "iCalendar Information"
-msgstr "iCalendar Məlumatı"
-
-#. Title
-#: calendar/gui/e-itip-control.c:633
-msgid "iCalendar Error"
-msgstr "iCalendar Xətası"
-
-#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
-msgid "An unknown person"
-msgstr "Naməlum şəxs"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
-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:737
-msgid "<i>None</i>"
-msgstr "<i>Heç biri</i>"
-
-#: 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
-msgid "Choose an action:"
-msgstr "Gediş seç:"
-
-#: calendar/gui/e-itip-control.c:779
-msgid "Update"
-msgstr "Güncəllə"
-
-#: 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
-msgid "OK"
-msgstr "Oldu"
-
-#: calendar/gui/e-itip-control.c:795
-msgid "Accept"
-msgstr "Qəbul Et"
-
-#: calendar/gui/e-itip-control.c:796
-msgid "Tentatively accept"
-msgstr "Girişimli qəbul et"
-
-#: calendar/gui/e-itip-control.c:797
-msgid "Decline"
-msgstr "Rədd Et"
-
-#: calendar/gui/e-itip-control.c:811
-msgid "Send Free/Busy Information"
-msgstr "Sərbəst/Məşğul Məlumatını Yolla"
-
-#: calendar/gui/e-itip-control.c:824
-msgid "Update respondent status"
-msgstr "Cavablayıcı vəziyyətini güncəllə"
-
-#: calendar/gui/e-itip-control.c:838
-msgid "Send Latest Information"
-msgstr "Ən Son Məlumatı Yolla"
-
-#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Ləğv Et"
-
-#: calendar/gui/e-itip-control.c:867
-#, 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:868
-msgid "Meeting Information"
-msgstr "Görüş Məlumatı"
-
-#: calendar/gui/e-itip-control.c:872
-#, 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:873
-msgid "Meeting Proposal"
-msgstr "Görüş Məqsədi"
-
-#: calendar/gui/e-itip-control.c:877
-#, 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:878
-msgid "Meeting Update"
-msgstr "Görüş Güncəllənməsi"
-
-#: calendar/gui/e-itip-control.c:882
-#, 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:883
-msgid "Meeting Update Request"
-msgstr "Görüş Güncəllənmə İstəyi"
-
-#: calendar/gui/e-itip-control.c:887
-#, 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:888
-msgid "Meeting Reply"
-msgstr "Görüş Cavabı"
-
-#: calendar/gui/e-itip-control.c:892
-#, 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:893
-msgid "Meeting Cancellation"
-msgstr "Görüş Ləğvi"
-
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
-#: calendar/gui/e-itip-control.c:982
-#, 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:898
-msgid "Bad Meeting Message"
-msgstr "Pis Görüş İsmarışı"
-
-#: calendar/gui/e-itip-control.c:917
-#, 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:918
-msgid "Task Information"
-msgstr "Vəzifə Məlumatı"
-
-#: calendar/gui/e-itip-control.c:922
-#, 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:923
-msgid "Task Proposal"
-msgstr "Vəzifə Təklifi"
-
-#: calendar/gui/e-itip-control.c:927
-#, 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:928
-msgid "Task Update"
-msgstr "Vəzifə Gencəllənməsi"
-
-#: calendar/gui/e-itip-control.c:932
-#, 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:933
-msgid "Task Update Request"
-msgstr "Vəzifə Güncəllənmə İstəyi"
-
-#: calendar/gui/e-itip-control.c:937
-#, 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:938
-msgid "Task Reply"
-msgstr "Vəzifə Cavabı"
-
-#: calendar/gui/e-itip-control.c:942
-#, 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:943
-msgid "Task Cancellation"
-msgstr "Vəzifə Ləğvi"
-
-#: calendar/gui/e-itip-control.c:948
-msgid "Bad Task Message"
-msgstr "Pis Vəzifə İsmarışı"
-
-#: calendar/gui/e-itip-control.c:967
-#, 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:968
-msgid "Free/Busy Information"
-msgstr "Sərbəst/Məşğul Məlumatı"
-
-#: calendar/gui/e-itip-control.c:972
-#, 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:973
-msgid "Free/Busy Request"
-msgstr "Sərbəst/Məşğul İstəyi"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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-itip-control.c:977
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, 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:978
-msgid "Free/Busy Reply"
-msgstr "Sərbəst/Məşğul Cavabı"
-
-#: calendar/gui/e-itip-control.c:983
-msgid "Bad Free/Busy Message"
-msgstr "Pis Sərbəst/Məşğul İsmarışı"
-
-#: calendar/gui/e-itip-control.c:1052
-msgid "The message does not appear to be properly formed"
-msgstr "Bu ismarış düzgün qurulmuşa oxşamır"
-
-#: calendar/gui/e-itip-control.c:1071
-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:1099 calendar/gui/e-itip-control.c:1105
-msgid "The attachment does not contain a valid calendar message"
-msgstr "İlişgidəki hökmlü təqvim ismarışı daxil etmir"
+msgid "Error executing %s."
+msgstr "%s icra xətası."
 
-#: calendar/gui/e-itip-control.c:1130
-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: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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1229
+#: 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:1231
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Gübcəlləmə Qurtardı\n"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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"
+
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 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:1284
-msgid "Attendee status ould not be updated!\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:1286
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "İştirakçı vəziyyəti güncəlləndi\n"
 
-#: calendar/gui/e-itip-control.c:1288
-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"
-
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Çıxartma Qurtardı"
 
-#: calendar/gui/e-itip-control.c:1348 calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Üzv göndərildi!\n"
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1566
-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"
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Qovluq Seçin"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Qovluq Seçin"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4829,211 +5147,213 @@ msgstr "bitiş tarixi"
 msgid "date-start"
 msgstr "başlama tarixi"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1535
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Lazımi İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "Ehtiyatdakı İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "Qeyri-İştirakçılar"
 
-#: 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:771
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Şəxsi"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Qrup"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Mənbə"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Otaq"
 
-#: 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:775
-#: calendar/gui/e-meeting-model.c:791
-#: 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 "Naməlum"
-
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "Stul"
 
-#: 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:788
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "Lazımi İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "Ehtiyatdakı İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Qeyri İştirakçılar"
 
-#: 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:816
+#: 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 "Hərəkət Lazımdır"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:817
+#: 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:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:818
+#: 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:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:819 calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Girişimli"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "Temsil Edildi"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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: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:2118 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"
 
 #. 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"
 
-#: calendar/gui/e-meeting-time-sel.c:428
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "İş Yerində Deyil"
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Məlumat Yoxdur"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Seçənəklər"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Sadəcə olaraq -İş Saatlarını Göstər"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "_Uzaqlaşdıraraq Göstər"
 
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "Sərbəst/Məşğulları _Təzələ"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Avtomarik Olaraq Seç"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "_Bütün Adamlar və Qaynaqlar"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "Bütün _adamlar və Bir Qaynaq"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "_Lazımi Adamlar"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "Lazımi Adamlar və _Bir Qaynaq"
 
-#: calendar/gui/e-meeting-time-sel.c:641
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "İclas başlama saatı :"
 
-#: calendar/gui/e-meeting-time-sel.c:660
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "İclas sonlanma saatı :"
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Vəzifələr %s vaxtl açılır"
 
-#: 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' dakı (dəki) vəzifələr yüklənə bilmədi"
 
-#: 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' i(ı) yükləməyə yarayan yol dəstəklənmir"
 
-#: calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Qurtarma Vaxtı"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Seçili üzv silinir"
+
+#: calendar/gui/e-tasks.c:659
+#, fuzzy
+msgid "Expunging"
+msgstr "Qovluq açılır"
+
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Yeni _Görüş..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "Bu İclası _Sil"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1865
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Təqvim %s vaxtı açılır"
@@ -5094,271 +5414,269 @@ msgstr "Oktyabr"
 msgid "September"
 msgstr "Sentyabr"
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:220
+#, fuzzy
+msgid "At least one attendee is necessary"
 msgstr "Ən az bir dinləyici vacibdir"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "Təşkilatçı bildirlməlidir."
 
-#: calendar/gui/itip-utils.c:570
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Siz hadisənin istirakçısı olmalısınız."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr "Komponent düzəltmə emalatxanası yaradıla bilmir"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr "1.nci"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr "2-ci"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr "3.ncü"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr "4.ncü"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr "5.nci"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr "6.ncı"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr "7.nci"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr "8.nci"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr "9.ncu"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr "10.ncu"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr "11.nci"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr "12-ci"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr "13.ncü"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr "14.ncü"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr "15.nci"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr "16.ncı"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr "17.nci"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr "18.nci"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr "19.ncu"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr "20.nci"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr "21.nci"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr "22-ci"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr "23.ncü"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr "24.ncü"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr "25.nci"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr "26.ncı"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr "27.nci"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr "28.nci"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr "29.ncu"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr "39.ncu"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr "31.nci"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr "Baz."
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "B.ei"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Ç.a"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Çə"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "C.a"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Cümə"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Şn"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Seçili gün ( %a %b %d %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 %b %d"
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr "%a %b %d"
 
-#: 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:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Seçili həftə ( %s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Seçili ay ( %b %Y )"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Seçili il ( %Y )"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Vəzifə"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Hal: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Üstünlük: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Qurtaran Nisbət: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Kateqoriyalar: %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "Əlaqələr:"
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Təqvimi çap et"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2358 my-evolution/e-summary.c:619
-#: 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Çap Etmə nümayişi"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Üzvü çap et"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Çap Qurğuları"
 
-#: 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 ""
+"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"
 msgstr "Göstəriləcək vəzifələr qovluğunun URIsi"
 
-#: calendar/gui/tasks-control-factory.c:75
-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."
+#: 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 ""
+"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
+msgid "Do not ask me again."
+msgstr "Mənə bir də soruşma."
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Kartları çap et"
 
 #: calendar/gui/tasks-migrate.c:105
 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ı."
+msgstr ""
+"\"Evolution\" təqvim qovluğunda olan vəzifələri yeni qovluqlara "
+"daşıdı."
 
 #: calendar/gui/tasks-migrate.c:108
 msgid ""
@@ -5367,10 +5685,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
@@ -5378,8 +5696,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
@@ -5387,96 +5705,137 @@ 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"
 msgstr "BBeÇaÇCaCŞ"
 
-#: calendar/pcs/query.c:234
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "VCard fayllarını Evolution içinə gətirən emalatxana."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "VCard fayllarını Evolution içinə gətirir."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "VCard fayllarını Evolution içinə gətirir."
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Təqvim İsmarışı"
+
+#: 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 məktub faylları tapdı.\n"
+"Onları proqramımıza idxal edək?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Təqvim"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "indiki-vaxt 0 arqument gözləyir"
 
-#: calendar/pcs/query.c:258
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "vaxt-düzəlt 1 arqument gözləyir"
 
-#: calendar/pcs/query.c:263
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "vaxt-düzəlt 1 qatar arqument gözləyir"
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "vaxt-düzəlt arqumenti 1  ISO 8601 tarix/vaxt qatarı olmalıdır"
 
-#: calendar/pcs/query.c:300
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "vaxt-gün-əlavə-et 2 arqument gözləyir"
 
-#: calendar/pcs/query.c:305
+#: 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:312
+#: 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:339
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "vaxt-gün-başlanğıcı 1 arqumentini gözləyir"
 
-#: calendar/pcs/query.c:344
+#: 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:371
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "vaxt-gün-sonu 1 arqumentini gözləyir"
 
-#: calendar/pcs/query.c:376
+#: 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:412
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype 0 arqument gözləyir"
 
-#: calendar/pcs/query.c:508
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? 2 arqument gözləyir"
 
-#: 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? time_t olan 1 arqument gözləyir"
 
-#: 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? time_t olan 2 arqument gözləyir"
 
-#: calendar/pcs/query.c:650
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? 2 arqument gözləyir"
 
-#: calendar/pcs/query.c:655
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? qatar olan arqument 1 gözləyir"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? qatar olan arqument 2 gözləyir"
 
-#: calendar/pcs/query.c:679
+#: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr "contains? \"hər hansı\", \"icmal\", \"izahat\" olan arqument 1 gözləyir"
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
+msgstr ""
+"contains? \"hər hansı\", \"icmal\", \"izahat\" olan arqument 1 gözləyir"
 
-#: calendar/pcs/query.c:721
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? ən az 1 arqument gözləyir"
 
-#: 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)"
@@ -5484,42 +5843,1669 @@ msgstr ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 
-#: calendar/pcs/query.c:821
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? 0 argument gözləyir"
 
-#: calendar/pcs/query.c:866
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? 1 arqument gözləyir"
 
-#: calendar/pcs/query.c:871
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? time_t olan arqumnet 1 gözləyir"
 
-#: calendar/pcs/query.c:1159
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Axtarış ifadəsi bulean qiymət qəbul etməz"
 
-#: camel/camel-cipher-context.c:171
+#.
+#. * 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 "Cibuti"
+
+#: 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 "Amerikan Samoa"
+
+#: calendar/zones.h:60
+#, fuzzy
+msgid "America/Anchorage"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:61
+#, fuzzy
+msgid "America/Anguilla"
+msgstr "Anquilla"
+
+#: calendar/zones.h:62
+#, fuzzy
+msgid "America/Antigua"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:63
+#, fuzzy
+msgid "America/Araguaina"
+msgstr "Nikaraqua"
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+#, fuzzy
+msgid "America/Asuncion"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:66
+#, fuzzy
+msgid "America/Barbados"
+msgstr "Barbados"
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: calendar/zones.h:68
+#, fuzzy
+msgid "America/Belize"
+msgstr "Beliz"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+#, fuzzy
+msgid "America/Bogota"
+msgstr "Amerikan Samoa"
+
+#: 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 "Amerikan Samoa"
+
+#: calendar/zones.h:76
+#, fuzzy
+msgid "America/Catamarca"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+#, fuzzy
+msgid "America/Cayman"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:79
+#, fuzzy
+msgid "America/Chicago"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+#, fuzzy
+msgid "America/Cordoba"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:82
+#, fuzzy
+msgid "America/Costa_Rica"
+msgstr "Kosta Rika"
+
+#: calendar/zones.h:83
+#, fuzzy
+msgid "America/Cuiaba"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:84
+#, fuzzy
+msgid "America/Curacao"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+#, fuzzy
+msgid "America/Dawson"
+msgstr "Amerikan Samoa"
+
+#: 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 "Dominik"
+
+#: calendar/zones.h:91
+#, fuzzy
+msgid "America/Edmonton"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+#, fuzzy
+msgid "America/El_Salvador"
+msgstr "Elsalvador"
+
+#: 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 "Amerikan Samoa"
+
+#: 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 "Amerikan Samoa"
+
+#: calendar/zones.h:100
+#, fuzzy
+msgid "America/Guadeloupe"
+msgstr "Quadelup"
+
+#: calendar/zones.h:101
+#, fuzzy
+msgid "America/Guatemala"
+msgstr "Quatemala"
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+#, fuzzy
+msgid "America/Guyana"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:104
+#, fuzzy
+msgid "America/Halifax"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:105
+#, fuzzy
+msgid "America/Havana"
+msgstr "Amerikan Samoa"
+
+#: 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 "Amerikan Samoa"
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+#, fuzzy
+msgid "America/Juneau"
+msgstr "Amerikan Samoa"
+
+#: 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 "Amerikan Samoa"
+
+#: calendar/zones.h:120
+#, fuzzy
+msgid "America/Lima"
+msgstr "Amerikan Samoa"
+
+#: 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 "Amerikan Samoa"
+
+#: calendar/zones.h:124
+#, fuzzy
+msgid "America/Managua"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:125
+#, fuzzy
+msgid "America/Manaus"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:126
+#, fuzzy
+msgid "America/Martinique"
+msgstr "Martiniq"
+
+#: calendar/zones.h:127
+#, fuzzy
+msgid "America/Mazatlan"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:128
+#, fuzzy
+msgid "America/Mendoza"
+msgstr "Amerikan Samoa"
+
+#: 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 "Amerikan Samoa"
+
+#: calendar/zones.h:136
+#, fuzzy
+msgid "America/Montserrat"
+msgstr "Montserrat"
+
+#: calendar/zones.h:137
+#, fuzzy
+msgid "America/Nassau"
+msgstr "Amerikan Samoa"
+
+#: 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 "Amerikan Samoa"
+
+#: calendar/zones.h:141
+#, fuzzy
+msgid "America/Noronha"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+#, fuzzy
+msgid "America/Panama"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+#, fuzzy
+msgid "America/Paramaribo"
+msgstr "Amerikan Samoa"
+
+#: 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 "Porto Riko"
+
+#: 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 "Amerikan Samoa"
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+#, fuzzy
+msgid "America/Rosario"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:157
+#, fuzzy
+msgid "America/Santiago"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:158
+#, fuzzy
+msgid "America/Santo_Domingo"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:159
+#, fuzzy
+msgid "America/Sao_Paulo"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+#, fuzzy
+msgid "America/Shiprock"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:162
+#, fuzzy
+msgid "America/St_Johns"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+#, fuzzy
+msgid "America/St_Lucia"
+msgstr "Amerikan Samoa"
+
+#: calendar/zones.h:165
+#, fuzzy
+msgid "America/St_Thomas"
+msgstr "Amerikan Samoa"
+
+#: 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 "Azərbaycan"
+
+#: calendar/zones.h:172
+#, fuzzy
+msgid "America/Tortola"
+msgstr "Amerikan Samoa"
+
+#: 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 "Amerikan Samoa"
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: calendar/zones.h:178
+#, fuzzy
+msgid "Antarctica/Casey"
+msgstr "Antarktika"
+
+#: calendar/zones.h:179
+#, fuzzy
+msgid "Antarctica/Davis"
+msgstr "Antarktika"
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: calendar/zones.h:181
+#, fuzzy
+msgid "Antarctica/Mawson"
+msgstr "Antarktika"
+
+#: calendar/zones.h:182
+#, fuzzy
+msgid "Antarctica/McMurdo"
+msgstr "Antarktika"
+
+#: calendar/zones.h:183
+#, fuzzy
+msgid "Antarctica/Palmer"
+msgstr "Antarktika"
+
+#: calendar/zones.h:184
+#, fuzzy
+msgid "Antarctica/South_Pole"
+msgstr "Antarktika"
+
+#: calendar/zones.h:185
+#, fuzzy
+msgid "Antarctica/Syowa"
+msgstr "Antarktika"
+
+#: calendar/zones.h:186
+#, fuzzy
+msgid "Antarctica/Vostok"
+msgstr "Antarktika"
+
+#: 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 "Bahreyn"
+
+#: 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 "Kolumbiya"
+
+#: 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 "Honq Konq"
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+#: calendar/zones.h:216
+#, fuzzy
+msgid "Asia/Istanbul"
+msgstr "Köməkçi"
+
+#: 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 "Küveyt"
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr ""
+
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Muscat"
+msgstr "Köməkçi"
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: calendar/zones.h:235
+#, fuzzy
+msgid "Asia/Omsk"
+msgstr "Vəzifə Ver"
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+#, fuzzy
+msgid "Asia/Qatar"
+msgstr "Katar"
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:247
+#, fuzzy
+msgid "Asia/Singapore"
+msgstr "Sinqapur"
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+#, fuzzy
+msgid "Atlantic/Bermuda"
+msgstr "Bermuda"
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+#, fuzzy
+msgid "Atlantic/Cape_Verde"
+msgstr "Keyp Verde"
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+#, fuzzy
+msgid "Australia/Adelaide"
+msgstr "Avstraliya"
+
+#: calendar/zones.h:274
+#, fuzzy
+msgid "Australia/Brisbane"
+msgstr "Avstraliya"
+
+#: calendar/zones.h:275
+#, fuzzy
+msgid "Australia/Broken_Hill"
+msgstr "Avstraliya"
+
+#: calendar/zones.h:276
+#, fuzzy
+msgid "Australia/Darwin"
+msgstr "Avstraliya"
+
+#: calendar/zones.h:277
+#, fuzzy
+msgid "Australia/Hobart"
+msgstr "Avstraliya"
+
+#: calendar/zones.h:278
+#, fuzzy
+msgid "Australia/Lindeman"
+msgstr "Avstraliya"
+
+#: calendar/zones.h:279
+#, fuzzy
+msgid "Australia/Lord_Howe"
+msgstr "Avstraliya"
+
+#: calendar/zones.h:280
+#, fuzzy
+msgid "Australia/Melbourne"
+msgstr "Avstraliya"
+
+#: calendar/zones.h:281
+#, fuzzy
+msgid "Australia/Perth"
+msgstr "Avstraliya"
+
+#: calendar/zones.h:282
+#, fuzzy
+msgid "Australia/Sydney"
+msgstr "Avstraliya"
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:284
+#, fuzzy
+msgid "Europe/Andorra"
+msgstr "Andorra"
+
+#: calendar/zones.h:285
+#, fuzzy
+msgid "Europe/Athens"
+msgstr "Seçənəklər"
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:296
+#, fuzzy
+msgid "Europe/Gibraltar"
+msgstr "Gibraltar"
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:304
+#, fuzzy
+msgid "Europe/Luxembourg"
+msgstr "Lüksemburq"
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr ""
+
+#: calendar/zones.h:308
+#, fuzzy
+msgid "Europe/Monaco"
+msgstr "Monako"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr ""
+
+#: calendar/zones.h:312
+#, fuzzy
+msgid "Europe/Paris"
+msgstr "Seçənəklər"
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:317
+#, fuzzy
+msgid "Europe/San_Marino"
+msgstr "San Marino"
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "Komor"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+#, fuzzy
+msgid "Indian/Mahe"
+msgstr "Hindistan"
+
+#: calendar/zones.h:341
+#, fuzzy
+msgid "Indian/Maldives"
+msgstr "Maldiv"
+
+#: calendar/zones.h:342
+#, fuzzy
+msgid "Indian/Mauritius"
+msgstr "Maurit"
+
+#: calendar/zones.h:343
+#, fuzzy
+msgid "Indian/Mayotte"
+msgstr "Mayot"
+
+#: calendar/zones.h:344
+#, fuzzy
+msgid "Indian/Reunion"
+msgstr "Reyunion"
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+#, fuzzy
+msgid "Pacific/Pitcairn"
+msgstr "Pitkairn"
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
+#: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
 msgstr "Bu şifrləmə ilə imza dəstəklənmir"
 
-#: camel/camel-cipher-context.c:211
+#: 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:251
+#: camel/camel-cipher-context.c:249
 msgid "Verifying is not supported by this cipher"
 msgstr "Bu qeydlərdə təsdiqləmə dəstəklənmir"
 
-#: camel/camel-cipher-context.c:294
+#: camel/camel-cipher-context.c:292
 msgid "Encryption is not supported by this cipher"
 msgstr "Bu qeydlərdə şifrləmə dəstəklənmir"
 
-#: camel/camel-cipher-context.c:336
+#: camel/camel-cipher-context.c:334
 msgid "Decryption is not supported by this cipher"
 msgstr "Bu qeydlərdə şifr açma dəstəklənmir"
 
+#: camel/camel-data-cache.c:169
+#, fuzzy
+msgid "Unable to create cache path"
+msgstr ""
+"Nəticə faylı yaradıla bilmir: %s\n"
+" %s"
+
+#: camel/camel-data-cache.c:441
+#, 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
 #, c-format
 msgid ""
@@ -5528,7 +7514,8 @@ 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
@@ -5540,7 +7527,8 @@ 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
 msgid "Resynchronizing with server"
@@ -5550,81 +7538,66 @@ msgstr "Verici ilə yenidən sinxronlaşdırılır"
 msgid "You must be working online to complete this operation"
 msgstr "Bui əməliyyatı bitirmək üçün xətdə olmalısınız"
 
-#: 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 "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, 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
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "İşə salıcı süzgəc xətası: %s: %s"
+
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Növbə faylını aça bilmədim"
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Növbə faylını işlədə bilmirəm"
 
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) İsmarışı alınır"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "İsmarış açıla bilmir"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Bacarılmayan İsmarış %d"
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d İsmarışın %d qədərə alınır"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d nin(nın) %d ismarışında iflas etdim"
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Alıcı süzgəc xətası: %s: %s"
-
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "İşə salıcı süzgəc xətası: %s: %s"
+#: camel/camel-filter-search.c:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "İsmarış kodu açıla bilmir."
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "İşə salıcı süzgəc axtarışı xətası: %s: %s"
 
-#: camel/camel-folder.c:471
-#, 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:1040
-#, 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:1080
-#, 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:1262
-msgid "Moving messages"
-msgstr "İsmarışlar daşınır"
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5633,7 +7606,7 @@ msgstr ""
 "Axtarış ifadəsi darana bilmir:%s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5642,18 +7615,33 @@ msgstr ""
 "İşə salıcı axtarış ifadəsi darama xətası:%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 "(hamısını yoxla) tək düzgün nəticə istəyir"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Naməlum başlıqda sorǧu aparılır: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Cismdə hökmsüz yazı, kəlimə xaric"
+#: camel/camel-folder.c:469
+#, 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
+#, 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
+#, 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
+msgid "Moving messages"
+msgstr "İsmarışlar daşınır"
 
 #: camel/camel-lock-client.c:111
 #, c-format
@@ -5684,17 +7672,21 @@ 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
@@ -5760,114 +7752,126 @@ 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"
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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"
+msgstr ""
+"İsmarış imzalana bilmir: GPG/PGP proqramına boru yaradıla bilmir. %s"
 
-#: camel/camel-pgp-context.c:755
+#: 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:953
+#: 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"
+msgstr ""
+"İsmarış təsdiqlənə bilmir: təsdiqlənmək üçün düz mətn yoxdur"
 
-#: camel/camel-pgp-context.c:959
+#: 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"
+msgstr ""
+"İsmarış təsdiqlənə bilmir: GPG/PGP proqramına boru yaradıla bilmir. "
+"%s"
 
-#: camel/camel-pgp-context.c:970
+#: camel/camel-pgp-context.c:1004
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "İsmarış təsdiqlənə bilmir: Müvəqqəti fayl yaradıla bilmir: %s"
+msgstr ""
+"İsmarış təsdiqlənə bilmir: Müvəqqəti fayl yaradıla bilmir: %s"
 
-#: camel/camel-pgp-context.c:1143
+#: 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:1153
+#: 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:1160
+#: camel/camel-pgp-context.c:1194
 #, c-format
 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"
+msgstr ""
+"İsmarış kriptlənə bilmir: GPG/PGP proqramına boru yaradıla bilmir. %s"
 
-#: camel/camel-pgp-context.c:1169
+#: 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:1337
+#: 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:1345
+#: 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:1352
+#: 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"
+msgstr ""
+"İsmarış dekript edilə bilmir: GPG/PGP proqramına boru yaradıla bilmir. "
+"%s"
 
-#: camel/camel-provider.c:130
+#: camel/camel-pgp-mime.c:354
+msgid "This is a digitally signed message part"
+msgstr ""
+
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s yüklənə bilmir: Modul yükləmə bu sistemdə dəstəklənmir."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s yüklənə bilmədi: %s"
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s yüklənə bilmir: Modulda başlatma kodu yoxdur."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s verici %s"
 
-#: camel/camel-remote-store.c:207
+#: 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:264
+#: 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:267
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(naməlum ev sahibi)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -5879,7 +7883,8 @@ 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."
@@ -5921,8 +7926,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"
@@ -5933,8 +7938,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"
@@ -5967,8 +7972,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
@@ -5980,25 +7985,40 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
+#, fuzzy
+msgid "Login"
 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."
 msgstr "Naməlum tanıtma vəziyyəti."
 
+#: 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 ""
+"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:301
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: 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"
 
@@ -6042,40 +8062,56 @@ msgstr "'%s' URLsi ev sahibinə ehtiyac hiss edir"
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLsi yola ehtiyac hiss edir"
 
-#: camel/camel-service.c:611
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "\"%s\" Həll edilir"
 
-#: camel/camel-service.c:638
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Ad axtarışında iflas etdim: %s"
 
-#: camel/camel-service.c:663
+#: camel/camel-service.c:673
 #, 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:665
+#: camel/camel-service.c:675
 #, 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
+#, fuzzy
+msgid "Resolving address"
+msgstr "\"%s\" Həll edilir"
+
+#: camel/camel-service.c:787
+#, 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
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Qovşaq Ad axtarışı iflas etdi: %s: naməlum səbəb"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 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: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' protokolu üçün xidmətçi yoxdur"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6121,15 +8157,15 @@ msgstr "İsmarış kodu açıla bilmir."
 msgid "Failed to verify certificates."
 msgstr "Vəsiqələr təsdiqlənə bilmir."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 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:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Qovluq yaradıla bilmir: Ambarda sənv əməliyyat aparılıb"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6138,8 +8174,7 @@ msgstr ""
 "Məruzəçi: %s\n"
 "Mövzu: %s"
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6154,24 +8189,40 @@ msgstr ""
 "\n"
 "Yenə də qəbul etmək istəyirsiniz?"
 
-#: camel/camel-tcp-stream-ssl.c:422
+#. 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
 #, 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"
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
 msgstr ""
-"ePoçt: %s\n"
-"Ümumə Ad: %s\n"
-"Quruluş Vahidi: %s\n"
-"Quruluş: %s\n"
-"Yer: %s\n"
-"Əyalət: %s\n"
-"Ölkə: %s"
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, fuzzy, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
+msgstr ""
+"%sdan(dən) xəsərli vəsizqə:\n"
+"\n"
+"%s\n"
+"\n"
+"Yenə də qəbul etmək istəyirsiniz?"
 
 #: camel/camel-url.c:288
 #, c-format
@@ -6183,27 +8234,27 @@ msgstr "URL `%s' alına bilmir"
 msgid "No such message %s in %s"
 msgstr "\"%s\"da(də) %s deye bir ismarış yoxdur"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Bele bir ismarış yoxdur: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Qovluq silinə bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Qovluq silinə bilmir: %s: Belə qovluq yoxdur"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Qovluq adı dəyişdirilə bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Qovluq adı dəyişdirilə bilmir: %s: Belə qovluq yoxdur"
@@ -6226,62 +8277,62 @@ msgstr "IMAP əmri iflas etdi: %s"
 msgid "Server response ended too soon."
 msgstr "Verci cavabı çox tez sonlandı."
 
-#: camel/providers/imap/camel-imap-command.c:608
+#: camel/providers/imap/camel-imap-command.c:610
 #, 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:644
+#: camel/providers/imap/camel-imap-command.c:646
 #, 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:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s qovluğunu yarada bilmədim: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, 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:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Dəyişdirilmiş ismarışda dəyişikliklər daranır"
 
-#: camel/providers/imap/camel-imap-folder.c:1566
-#: camel/providers/imap/camel-imap-folder.c:1978
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Bu ismarış hazırda mövcuddur"
 
-#: camel/providers/imap/camel-imap-folder.c:1717
-#: camel/providers/imap/camel-imap-folder.c:1798
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "Yeni ismarışların icmalı alınır"
 
-#: camel/providers/imap/camel-imap-folder.c:1723
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Yeni ismarışlar daranır"
 
-#: camel/providers/imap/camel-imap-folder.c:2015
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cavabında ismarış gövdəsi tapıla bilmədi"
 
-#: 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 "Ön yaddaş qovluğunu aça bilmədim: %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 "%s ismarışı ön yaddaşa alına bilmədi: %s"
@@ -6294,7 +8345,7 @@ msgstr "Yeni ePoçt üçün baxılır"
 msgid "Check for new messages in all folders"
 msgstr "Bütün qovluqlarda yeni ePoçt üçün bax"
 
-#: 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 "Qovluqlar"
 
@@ -6320,34 +8371,37 @@ 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: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."
+msgstr ""
+"Bu seçənəklə siz IMAP vericisinə düz mətn parol ilə bağlana "
+"biləcəksiniz."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, 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:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Parolu girmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6358,101 +8412,123 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "%s deyə bir qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 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:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "MH-şəklində məktub qovluqları"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 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:52
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Yerli göndərişlər"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:62
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Maildir-şəklində məktub qovluqları"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 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:80
+#: 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:81
+#: camel/providers/local/camel-local-provider.c:101
 msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "Yerli məktubları mbox tərzi məktub cərgələrində saxlaya bilmək üçün."
+msgstr ""
+"Yerli məktubları mbox tərzi məktub cərgələrində saxlaya bilmək "
+"üçün."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s kök saxlama dəqiq bir yol deyildir"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s kök saxlama düzgün bir qovluq deyildir."
 
-#: camel/providers/local/camel-local-store.c: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 "Qovluq alına bilmədi: %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 "Yerli saxlamaların gələnlər qutusu qovluğu yoxdur"
 
-#: 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 Yeli məktub faylı"
 
-#: 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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "%s faylı %s adi ilə yenidən adlandırıla bilmir: %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 "Qovluq yenidən adlandırıla bilmir: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "`%s' Qovluq mündəricat faylı silinə bilmir: %s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:389
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' Qovluq indeks faylı silinə bilmir: %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "İcmal qeyd edilə bilmir: %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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Xülasəyə ismarış əlavə edə bilmədim: naməlum səbəb"
 
@@ -6472,7 +8548,7 @@ msgstr "İsmarış məktub qovluğu fayllına əlavə edilə bilmir: %s: %s "
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6484,7 +8560,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "Belə bir ismarış yoxdur"
 
@@ -6493,7 +8569,7 @@ msgstr "Belə bir ismarış yoxdur"
 msgid "Invalid message contents"
 msgstr "Hökmsüz ismarış mövtəviyyatı"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -6503,14 +8579,14 @@ msgstr ""
 "`%s' qovluğu açıla bilmir: \n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "`%s' faylı yoxdur ."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -6520,41 +8596,64 @@ msgstr ""
 "`%s' qovluğu yaradıla bilmədi:\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' məktub qovluğu faylı deyildir."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' qovluğu silinə bilmir: %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "məktub qovluğu faylı deyildir"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "`%s' qovluğu darana bilmədi: %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 "Məktub cərgəsi qovluğu cığırı açıla bilmir: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Yeni ePoçt üçün baxılır"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "Qovluqlar saxlanılır"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Məktub qutusu açıla bilmir: %s: %s\n"
@@ -6571,9 +8670,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6583,16 +8682,16 @@ msgstr ""
 "   %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 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:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İSmarıc quruluşu bacarılmadı: Məktub qutusu yoxsa xəsərlidir?"
 
-#: camel/providers/local/camel-mbox-store.c:93
+#: camel/providers/local/camel-mbox-store.c:95
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6601,7 +8700,7 @@ msgstr ""
 "`%s' Faylı açıla bilmir:\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"
@@ -6610,14 +8709,14 @@ msgstr ""
 "`%s' faylı yaradıla bilmədi: \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' normal bir fayl deyildir ."
 
-#: 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"
@@ -6626,96 +8725,87 @@ msgstr ""
 "`%s' qovluğu silinə bilmir:\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 "`%s' qovluğu boş deyildir. Silinmədi."
 
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c: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 "Qovluqlar saxlanılır"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Qovluq açıla bilmir: %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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Qovluq yoxlana bilmir: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Faylı açıla bilmir: %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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, 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: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: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ə"
+msgstr ""
+"Toplama və qovluq bir birinə uyğun gəlmir, sinxronizasiyadan sonra da "
+"əlbətdə"
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "Qaynaq qovluğu bağlana bilmədi: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, 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:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Qovluq yenidən adlandırıla bilmir: %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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Naməlum xəta: %s"
@@ -6734,12 +8824,12 @@ msgstr "mh qovluğuna ismarış əlavə edilə bilmir: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' qovluq deyildir."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, 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:512
+#: 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"
@@ -6750,6 +8840,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Qovluq `%s/%s' faylı yoxdur."
@@ -6759,29 +8850,31 @@ msgstr "Qovluq `%s/%s' faylı yoxdur."
 msgid "Spool mail file %s"
 msgstr "%s hovuz məktub faylı"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Hovuz qovluqları yenidən adlandırıla bilməz"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Hovuz qovluqları silinə bilməz"
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6790,47 +8883,24 @@ 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:940
+#: 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/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "%s@%s üçün parolu lütfən girin"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Verici istifadəçi adını qəbul etmədi"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Vericiyə istifadəçi adı göndərilə bilmədi"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Verici istifadəçi adını/parolunu qəbul etmədi"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "%s ismarışı tapıla bilmədi"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Vericidən qrup adı öyrənilə bilmədi."
+#: camel/providers/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/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 üçün qrup siyahısı yüklənə bilmir: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "%s üçün qrup faylı qeyd edilə bilmir: %s"
+#: 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"
@@ -6839,149 +8909,172 @@ 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:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Xəbər vericisi üçün qovluq açıla bilmir: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s dan(dən) USENET Xəbərləri"
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 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-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 üçün .newsrc faylı açıla bilmir ya da yaradıla bilmir: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "%s deyə bir qovluq yoxdur"
+
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "Boru yaradıla bilmədi: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "IMAP əmri iflas etdi: %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 "Yeni ismarışlar daranır"
+
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "Naməlum xəta: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:566
+#, fuzzy
+msgid "Use cancel"
+msgstr "Ləğv Et"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "Əməliyyat ləğv edildi"
+
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "POP yığcamlaşdırılması alınır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "POP vericisindəki yeni ismarışlar yoxlana bilmir: %s"
+#: 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 "Əməliyyat ləğv edildi"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Qovluq açıla bilmir: ismarış siyahısı bütün deyil."
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Qovluq alına bilmədi: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Silinmiş ismarışlar açılır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "İsmarış alına bilmir: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "%s POP vericisindən ismarışlar alına bilmədi: %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 "%s uid'li ismarış yoxdur"
 
-#: 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 "%d POP ismarışı alınır"
 
-#: 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 ""
+"İSmarıc alına bilmir: %s\n"
+"   %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Naməlum yağmur"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "İsmarış saxlanması"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "İsmarışları Vericidə burax"
 
-#: 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 gün sonra sil"
 
-#: 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:84
 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 "Hər hansı POP vericisinə bağlanmaq və məktub endirmək üçün."
 
-#: 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 ""
-"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: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 ""
-"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-provider.c:91
-msgid "This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr "Bu seçənək POP verisici ilə Kerberos 4 istifadə edərək ünsiyyət quracaqdır."
-
-#: camel/providers/pop3/camel-pop3-store.c:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "KPOP vericisi ilə ünsüyyət qurula bilmir: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:214
-#, c-format
-msgid "Could not connect to server: %s"
-msgstr "Vericiyə bağlana bilmirəm: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, 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:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sLütfən %s@%s üçün POP3 parolunuzu girin"
-
-#: camel/providers/pop3/camel-pop3-store.c:378
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
+"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
+#, 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:381
-#: camel/providers/pop3/camel-pop3-store.c:418
-msgid "(Unknown)"
-msgstr "(Naməlum)"
+#: 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:408
+#: 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
+#, 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
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6989,7 +9082,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
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "IMAP əmri iflas etdi: %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "G/Ç xətası"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6998,18 +9111,13 @@ msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "Parol göndərmə xətası oldu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "`%s' deyə bir qovluq yoxdur."
 
-#: camel/providers/pop3/camel-pop3-store.c:566
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "POP vericisindən gözlənilməz cavab alındı: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7018,177 +9126,205 @@ 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
+msgid "Could not parse recipient list"
+msgstr "URL `%s' alına bilmir"
 
-#: 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ə 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:123
+#: camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Sendmail çəngəllənə bilmədi: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:149
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not send message: %s"
 msgstr "İsmarış göndərilə bilmədi: %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 %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:169
+#: camel/providers/sendmail/camel-sendmail-transport.c:185
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s işə salına bilmir: məktub göndərilə bilmədi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:174
+#: camel/providers/sendmail/camel-sendmail-transport.c:190
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail %d halı ilə bağlandı: məktub göndərilə bilmədi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr "İsmarışda 'Göndərən' ünvanı tapıla bilmədi"
-
-#: 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 "Sendmail proqramı ilə məktub göndərilməsi"
 
-#: 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"
 
 #: 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:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaksis xətası, əmr tanınmır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametr və ya arqumentlərdə sintaksis xətası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Əmr qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Əmr parametri qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Sistem vəziyyəti və ya kömək cavabı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Kömək İsmarışı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Xidmət hazırdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Xidmət nəqliyyat kanallarını bağlayır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Xidmət uyğun deyildir, nəqliyyat kanalları bağlanır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Sorğulanan məktub gedişi müvəffəqiyyətlidir, qurtardı"
 
-#: 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 "İstifadəçi yerli deyil; <çatdırma cığırı>na çatdırıram"
 
-#: 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 "Sorğulanan məktub gedişi alınmadı; məktub qutusu əl çatmazdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Sorğulanan gediş alınmadı; məktub qutusu əl çatmazdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Sorğulanan gediş ləğv edildi; xəta oldu"
 
-#: 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 "İ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:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Sorğulanan gediş alınmadı; uyğunsuz sistem daxılı"
 
-#: 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 "Sorğulanan məktub gediş ləğv edildi; daxıl dolmuşdur"
 
-#: 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 "Sorğulanan gediş alınmadı; məktub qutusu adı qəbul edilmədi"
 
-#: 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 "Məktub alımı başladı; <CRLF>.<CRLF> ilə sonlandırın"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Nəqliyyat bacarılmadı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Parol nəqli lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Tanıtma mexanizması çox zəifdir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Sorğulanan tanıtma mexanizması üçün kriptləmək lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Müvəqqəti tanıtma iflası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Tanıtma lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, 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:376
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "AUTH istək vaxt dolması. %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, 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"
 msgstr "%s SMTP vericisi %s tanıtma növünü dəstəkləmir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:415
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7199,128 +9335,135 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP vericisi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, 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:581
-msgid "Cannot send message: sender address not defined."
-msgstr "İsmarış göndrərilə bilmədi: göndərənin ünvanı bildirilməyib."
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:593 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "İsmarış göndərilir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+#, 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
 msgid "SMTP Greeting"
 msgstr "SMTP Qarşılaması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, 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:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "SMTP Tanıtma"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "SASL tanıtma cismi yaratma xətası."
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "AUTH istək bacarılmadı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 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:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:893
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1081
+#, 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:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "RCTP TO cavablama xətası: %s: məktub göndərilə bilmədi"
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA istək vaxt dolamsı. %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "DATA cavablama xətası: %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
+#, fuzzy
+msgid "DATA response error"
+msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1030
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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"
+msgstr ""
+"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:1067
-#, c-format
-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"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "QUİT cavablama xətası: %s: ağır deyil"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "RSET cavablama xətası: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -7347,19 +9490,19 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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 "yapışdırılmış fayl"
 
-#: 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 "Seçili üzvləri yapışdırılmış fayllar siyahısından sil"
 
-#: composer/e-msg-composer-attachment-bar.c:531
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "Yapışdırılmış fayl əlavə et ..."
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "İsmarışa bir fayl əlavə et"
 
@@ -7387,69 +9530,69 @@ msgid "MIME type:"
 msgstr "MIME növü:"
 
 #: 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 "İlişdirilmişin öz-özünə göstərilməyini tövsiyyə et"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Ünvan dəftəri üçün buraya tıqla"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Göndərən:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Cavab ver"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Mövzu :"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Gn:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "İsmarışın göndərildiği adamlar"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:397
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 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:228
+#: 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:700
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7458,46 +9601,34 @@ msgstr ""
 "%s faylı oxunurkən xəta oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:898
-msgid "Save as..."
-msgstr "Fərqli qeyd et ..."
-
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Xəbərdarlıq!"
 
-#: composer/e-msg-composer.c:911
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Fayl mövcuddur, üstünə yazaq?"
 
-#: composer/e-msg-composer.c:933
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fayl qeyd edərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:952
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fayl yüklərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1023
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Bu hesab üçün lahiyə cərgəsə açıla bilmədi.\n"
-"Əsas lahiyə cərgəsini işlətmək istəyirsiniz?"
-
-#: composer/e-msg-composer.c:1073
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fayla yetişilirkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1081
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Editordan ismarışlar alına bilmir"
 
-#: composer/e-msg-composer.c:1088
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7506,7 +9637,7 @@ msgstr ""
 "Faylda axtarış aparıla bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1095
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7515,7 +9646,7 @@ msgstr ""
 "Fayl parçalana bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1104
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7524,7 +9655,7 @@ msgstr ""
 "İsmarışın öz-özünə qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7532,7 +9663,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:1360
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7542,23 +9673,23 @@ msgstr ""
 "\n"
 "Dəyişiklikləri qeyd etmak istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1367
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Xəbərdarlıq: Düzəldilmiş İsmarış"
 
-#: composer/e-msg-composer.c:1390
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Faylı aç"
 
-#: composer/e-msg-composer.c:1539
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Faylı Daxil Et"
 
-#: composer/e-msg-composer.c:1922 composer/e-msg-composer.c:2375
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Bir ismarış yaz"
 
-#: composer/e-msg-composer.c:2392
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -7566,7 +9697,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:2415 composer/e-msg-composer.c:2470
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7574,26 +9705,28 @@ msgstr ""
 "Yazıçı pəncərəsi yaradıla bilmir:\n"
 "HTML editor parçası fəaliyyətə keçirilə bilmir."
 
-#: 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."
 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:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutionun ePoçt yazma parçasını başlada bilmədim ."
 
-#: 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:1
 msgid "The Evolution groupware suite"
 msgstr "Evolution qruplaşdırılmış proqram təminatı otağı"
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Ximian Evolution _FAQ"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "ünvan kartı"
@@ -7634,15 +9767,33 @@ 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
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Eyni adlı bir fayl onsuz da vardır.\n"
+"Üstünə yazım mı?"
+
 #. 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 "Bu parolu yadda saxla"
 
-#: 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 "Bu iclas boyunca bu parolu yadda saxla"
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "Kateqoriyalar"
+
 #. 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
@@ -7714,13 +9865,13 @@ 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"
 
 #. 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"
 
@@ -7761,11 +9912,7 @@ msgstr "saat"
 msgid "minute"
 msgstr "dəqiqə"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "saniyə"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "saniyə"
 
@@ -7840,7 +9987,7 @@ msgstr " əvvəl"
 msgid "ago"
 msgstr "əvvəl"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:930
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -7853,35 +10000,28 @@ msgid "Filter Rules"
 msgstr "Süzgəc Qaydaları"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "Onda"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Gediş əlavə et"
 
-#: 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."
 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:242 filter/vfolder-rule.c:364
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Qovluq Seçin"
 
-#: filter/filter-folder.c:267
-msgid "Enter folder URI"
-msgstr "Qovluq URIsini Bildirin"
-
-#: filter/filter-folder.c:314
-msgid "<click here to select a folder>"
-msgstr "<qovluq seçmək üçün buraya tıqlayın>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -7891,7 +10031,7 @@ msgstr ""
 "'%s' qaydalı ifadələrdə xəta oldu:\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Sınaq"
 
@@ -7899,39 +10039,40 @@ msgstr "Sınaq"
 msgid "You must name this filter."
 msgstr "Bu süzgəcə ad verməlisiniz."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Qayda adı :"
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Adsız"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Əgər"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "Gedişi işə sal"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "bütün kriteriyalar uyğun gəlirsə"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Kriteriya əlavə et"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "gələn"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "gedən"
 
@@ -7975,6 +10116,12 @@ msgstr "bütün yerli və fəal uzaq qovluqlarla"
 msgid "with all local folders"
 msgstr "bütün yerli qovluqlarla"
 
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Qaynağı Seç"
+
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Rəng Ver"
@@ -7987,6 +10134,11 @@ msgstr "Qaynağı Seç"
 msgid "Attachments"
 msgstr "Yapışdırılmış Fayllar"
 
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Beliz"
+
 #: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "daxil edir"
@@ -8040,144 +10192,154 @@ msgid "ends with"
 msgstr "sonlanır"
 
 #: filter/libfilter-i18n.h:21
+msgid "Execute Shell Command"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Mövcuddur"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "mövcuddur"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "İfadə"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Vacib"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "dir(dır)"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "sonra idi"
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "əvvəl idi"
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Bayraqlı"
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "böyükdür"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "azdır"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "deyil"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Bayraqlı"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "Məktublaşma qrupu"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "İsmarış Gövdəsi"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "İsmarış Başlığı"
 
-#: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr "İsmarış alındı"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message was sent"
-msgstr "İsmarış göndərildi"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Qovluğa Köçür"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "da(də) ya da sonra"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "da(də) ya da əvvəl"
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "Səs çal:"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Oxu"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Alıcılar"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "Regex Uyğunluqları"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "Cavab verilən"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1404
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Göndərən"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Hal Seç"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Böyüklük (kB)"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "oxşayır"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "Mənbə Hesabı"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Xas başlıq"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "başlayır"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "İşi Dayandır"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:908
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Mövzu"
 
-#: filter/libfilter-i18n.h:52
-msgid "was after"
-msgstr "sonra idi"
-
-#: filter/libfilter-i18n.h:53
-msgid "was before"
-msgstr "əvvəl idi"
-
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Qaydalar"
 
-#: filter/rule-editor.c:278
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Qayda Əlavə Et"
 
-#: filter/rule-editor.c:344
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Qaydanı Düzəlt"
 
@@ -8197,30 +10359,30 @@ msgstr "Mənbə olarq ən az bir qovluq bildirməlisiniz."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sizin köhnə Elm məktublarınızı idxal edir"
 
-#: 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 "Alınır..."
 
-#: 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 "Xahiş edirik gözləyin"
 
-#: 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 "%s %s olaraq idxal edilir"
 
-#: 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 "%s daranır"
 
-#: 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:101
 msgid "Mail"
 msgstr "Məktub"
 
@@ -8248,23 +10410,74 @@ msgstr ""
 "Evolution GnomeCard faylları tapdı.\n"
 "Onları Evolution içinə idxal edək?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Üstünlük: %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 köhnə Netscape verilənlərini idxal edir"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Zibil Qutusu"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "%s Yeli məktub faylı"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Qovluq daranır"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "İdxal başlanır"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Qurğular"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Süzgəcləri Düzəlt"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8289,44 +10502,94 @@ msgid "Pine"
 msgstr "Pine"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Evolutionun məktub yazıçısı emalatxanası."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Evolutionun Vəzifə parçası emalatxanası."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Evolutionun məktub yazıçısı emalatxanası."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Evolutionun məktub yazıçısı emalatxanası."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Məktub taşkilatcısı Evolution parçası."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolutionun ePoçt yazıçısı."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Evolutionun icracı mündəricat parçası."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Evolutionun məktub qovluğu nümayişcisi."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Evolutionun məktub qovluğu nümayişcisi emalatxanası."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Evolutionun məktub yazıçısı emalatxanası."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Məktub Mündəricatı parçası emalatxanası."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Təkrarlama _yoxudr"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Hesablar"
+
+#: 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 "Poçt quraşdırılma ara üzü"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Məktub daxil edən qovluq"
+#: 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:101
-msgid "Mail storage folder (internal)"
-msgstr "Məktub saxlama qovluğu (daxili)"
+msgid "Folder containing mail"
+msgstr "Məktub daxil edən qovluq"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -8336,230 +10599,255 @@ msgstr "Virtual Zibil"
 msgid "Virtual Trash folder"
 msgstr "Virtual Zibil Qovluğu"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Ambara bağlana bilmirəm: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Bu qovluq ismarış daxil edə bilməz."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Xüsusiyyətlər..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Qovluqların seçənəklərini dəyişdir"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 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:951
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr "Məktub nəql yolunu bildirməmisən"
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Yeni Məktub İsmarışı"
 
-#: mail/component-factory.c:951
-msgid "New _Mail Message"
-msgstr "Yeni _Məktub İsmarışı"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "_Məktub İsmarışı"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 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:990
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolutionun qovluq info parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Vericiyə bağlantı qurulur..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
 
-#: mail/folder-browser-ui.c:271
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"in Seçənəkləri"
 
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Seçənəklər"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d yeni"
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d gizli"
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d seçili"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d yollanmamış"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d yollanmış"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "cəmi %d"
 
-#: mail/folder-browser.c:1049
-msgid "Create vFolder from Search"
-msgstr "Axtarışdan vFolder yarat"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "İsmarışdan _Virtual Qovluq Yarat"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "_Mövzudakı vFolder"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "Gön_dərəndəki vFolder"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "_Alıcıdakı vFolder"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "Məktublaşma Q_rupundakı VFolder"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Mö_vzudakı Süzgəc"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Gön_dərəndəki  Süzgəc"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "_Alıcıdakı Süzgəc"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "_Məktublaşma Qrupundakı Süzgəc"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "Yeni İsmarış olaraq _Düzəlt ..."
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:104
-msgid "_Save As..."
-msgstr "Fərqli _Qeyd Et ..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Ver"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "_Qrupa Cavab Ver"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Ver"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Çatdır"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Bitirmə Tarixi"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Təmizlə"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Oxun_muş olaraq İşarələ"
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Ox_unmamış olaraq İşarələ"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "_Vacib olaraq İşarələ"
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "_Qeyri-Vacib olaraq İşarələ"
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Geri Gətir"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:106
-msgid "_Undelete"
-msgstr "_Geri Gətir"
+#: mail/folder-browser.c:1645
+msgid "Label"
+msgstr ""
 
-#: mail/folder-browser.c:1473
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Yollayanı Ünvan dəftərinə Əlavə Et"
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Süzgəclər Əlavə Et"
 
-#: mail/folder-browser.c:1478
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "İsmarışdan Qa_yda Yarat"
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
-msgstr "Məktublaşma Qrupundakı Süzgəc"
-
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Məktublaşma Qrupunda Süz (%s)"
 
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "(%s) Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Əsas"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Qovluq Məlumatı Alınır"
@@ -8574,33 +10862,27 @@ 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"
 msgstr "'Outlook Express 4' fayllarını Evolution içinə gətirir."
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Daxil edən vücud"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Hazırkı Saxlama Şəkli:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "İndekslənir:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Məktub Qutusu Şəkli"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Daxil edən vücud"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Yeni saxlama şəkli"
 
-#: 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"
@@ -8610,15 +10892,15 @@ msgstr ""
 " (disk sahəsi çatışmamazlığındakı kimi) avtomatik olaraq \n"
 "bərpası mümkün olmaya bilər. Bu xüsusiyyəti ehtiyatlı işlədin."
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "məktub qovluğu"
 
-#: 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"
 
@@ -8636,86 +10918,79 @@ msgstr "Evolution Xəbər Düzəldicisi"
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesab Düzəldicisi"
 
-#: mail/mail-account-gui.c:962
-msgid "Could not save signature file."
-msgstr "İmza faylı qeyd edilə bilmir."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Qovşaq:"
 
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "Imzanı qeyd et"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "İ_stifadəci Adı:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+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:1045
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"İmza dəyişdirilib, amma qeyd edilməyib.\n"
-"\n"
-"Dəyişikliklərinizin qeyd edilməyini istəyirsinizmi?"
 
-#: mail/mail-account-gui.c:1654
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr "Eyni adda və iki hesab yarada bilməzsiniz."
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (varsayılan) "
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Bağla"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Fəallaşdır"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 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:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Silmə"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Həqiqətən də hesabı silək?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-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:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Bağla"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:783 mail/mail-config.glade.h:42
-msgid "Mail Settings"
-msgstr "Məktub Qurğuları"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Fəallaşdır"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "%s a(ə) məktub göndər"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+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-autofilter.c:215
-#, c-format
-msgid "Subject is %s"
-msgstr "Mövzu %s dir(dır)"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Fəal"
 
-#: mail/mail-autofilter.c:231
-#, c-format
-msgid "Mail from %s"
-msgstr "Məktub %s dandır(dəndir)"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "_Hesab adı:"
 
-#: mail/mail-autofilter.c:287
-#, c-format
-msgid "%s mailing list"
-msgstr "%s məktublaşma qrupu"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Porto Riko"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Süzgəc Qaydası Əlavə Et"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8727,7 +11002,7 @@ msgstr ""
 "bunu quraşdırmalısınız.\n"
 "Bunu indi quraşdırmaq istəyirsiniz?"
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8735,7 +11010,7 @@ msgstr ""
 "ePoçt göndərməkdən əvvəl bir \n"
 "şəxs tanıtmalısan."
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8743,24 +11018,20 @@ msgstr ""
 "ePoçt göndərməkdən əvvəl bir ePoçt\n"
 "nəqliyyatını qurmalısan."
 
-#: mail/mail-callbacks.c:230
-msgid "You have not set a mail transport method"
-msgstr "Məktub nəql yolunu bildirməmisən"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:265
+#: mail/mail-callbacks.c:194
 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:280
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Yenə də yollayaq?"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8768,19 +11039,19 @@ msgstr ""
 "Bu ismarışın mövzusu yoxdur .\n"
 "Həqiqətən də göndərim?"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 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:370
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "İsmarış təkcə Bcc alıcıları daxil edir."
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8790,42 +11061,46 @@ msgstr ""
 "məlumatlndırmaq istəsin.\n"
 "Yenə də göndərək?"
 
-#: mail/mail-callbacks.c:469
-msgid "This message contains invalid recipients:"
-msgstr "İsmarış hökmsüz alıcılar daxil edir."
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 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:600
+#: mail/mail-callbacks.c:497
 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:838
+#: mail/mail-callbacks.c:623
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+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
 msgid "an unknown sender"
 msgstr "naməlum yollayan"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 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:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "İsmarış(ları) buraya daşı "
 
-#: mail/mail-callbacks.c:1283 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "İsmarış(ları) buraya köçürt"
 
-#: mail/mail-callbacks.c:1753
+#: mail/mail-callbacks.c:2091
 #, 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:1778
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8833,7 +11108,7 @@ msgstr ""
 "Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
 "ismarışları düzəldə bilərsiniz."
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8841,44 +11116,53 @@ msgstr ""
 "Sadəcə olaraq Göndərilən cərgəsinə qeyd edilən\n"
 "ismarışları yeniden gönderebilirsiniz."
 
-#: mail/mail-callbacks.c:1831
+#: mail/mail-callbacks.c:2169
 #, 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:1857
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Heç İsmarış Seçilmədi"
 
-#: mail/mail-callbacks.c:1951
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Faylının üsütünə yazım mı?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "İsmarışı Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "İsmarışları Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:2122 widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Xəbərdarlıq"
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Sonrakı oxunamış ismarışı göstər"
+
+#: mail/mail-callbacks.c:2373
+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:2129
+#: mail/mail-callbacks.c:2615
 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:2136
-msgid "Do not ask me again."
-msgstr "Mənə bir də soruşma."
-
-#: mail/mail-callbacks.c:2244
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8887,22 +11171,32 @@ msgstr ""
 "Süzgəc məlumatını yükləmə xətası:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2256
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Süzgəclər"
 
-#: mail/mail-callbacks.c:2319
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "%d İsmarışın %d qədərə alınır"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "İsmarışı Çap Et"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2863
+msgid "US-Letter"
+msgstr ""
+
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "İsmarıların çap edilməsi bacarılmadı"
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, 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?"
+msgstr ""
+"Bütün %d ismarışlarını başqa pəncərədə açmaq istəyirsiniz?"
 
 #: mail/mail-config-druid.c:146
 msgid ""
@@ -8910,9 +11204,10 @@ 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 ""
@@ -8920,8 +11215,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
@@ -8948,24 +11243,42 @@ 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:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesab Yardımçısı"
 
-#: mail/mail-config.c:326
-#, c-format
-msgid "Account %d"
-msgstr "Hesab %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "İşləyir"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Toqo"
+
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "sonra"
 
-#: mail/mail-config.c:1859
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -8976,87 +11289,159 @@ msgstr ""
 "%s\n"
 "Qısa yol yaradılmayacaqdır."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Gələnlər"
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Xidmət Yoxlanılır"
 
-#: mail/mail-config.c:2183 mail/mail-config.c:2187
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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
-msgid " _Check for supported types "
-msgstr " Dəstəklənən növləri _yoxla "
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " rəng"
+#, fuzzy
+msgid " Edit "
+msgstr "_Düzəlt"
 
 #: mail/mail-config.glade.h:3
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
+#, fuzzy
+msgid " New "
+msgstr "Yeni"
 
 #: mail/mail-config.glade.h:4
-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ə"
+msgid " _Check for supported types "
+msgstr " Dəstəklənən növləri _yoxla "
 
 #: mail/mail-config.glade.h:5
-msgid "Account"
-msgstr "Hesab"
+#, 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
+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
+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:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Hesab %d"
+
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Hesab Haqqında"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Hesab İdarəsi"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "Hesablar"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Əməliyyatı Ləğv Et"
 
-#: mail/mail-config.glade.h:9
-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ə"
+#: 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ə"
+
+#: 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"
+
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
 
-#: mail/mail-config.glade.h:10
-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"
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "İsmarışa bir fayl əlavə et"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Yapışdırılmış fayl"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Tanıtma"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "Yeni Məktubları _avtomatik yoxla"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Naməlum hərf dəstəsi: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_Qapat"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Yeni Məktubları Yoxla"
 
-#: mail/mail-config.glade.h:14
-msgid "Composer"
-msgstr "Yazıçı"
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Composing Messages"
+msgstr "Bir ismarış yaz"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Quraşdırma"
 
-#: mail/mail-config.glade.h:16
-msgid "Confirm when Expunging a folder"
-msgstr "Qovluq açılırkən Təsdiqlə"
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9072,229 +11457,372 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Qurtar\"a basın."
 
-#: mail/mail-config.glade.h:23
+#: 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:24
-msgid "Default Forward style is: "
-msgstr "Əsas Çatdırma tərzi:"
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Əsas"
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Əsas dil kodlaması:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Poçt Alınır"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digital ID-lər..."
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr "Ekran"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "İsmarış açıla bilmir"
 
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Qurtardı"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Lahiyələr"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "_Lahiyələr qovluğu:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "Fə_allaşdır"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Düzəlt..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
-msgstr "Fəal"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Şərq"
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Daxil edən ePoçt"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "ePoçt Ünvanı: "
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "Çıxışda zibil qutularını _boşalt"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "Gedişi işə sal"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "sonlanır"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Seçənəklər"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Çatdırılmış ismarış"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Digital ID Al..."
 
-#: mail/mail-config.glade.h:35
-msgid "HTML signature file:"
-msgstr "HTML imza faylı:"
+#: mail/mail-config.glade.h:58
+#, 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: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 "Kimlik"
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr "HTML məktubda"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Daxili"
 
-#: 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 "Qeyd Et və Qapat"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "_Rəsmləri Yüklə"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "ePoçt Quraşdırılması"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Məktub qutusu yeri"
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
-msgstr "Bunu ə_sas hesab olaraq göstər"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "İsmarış Başlığı"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_İsmarış Ekranı"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikroneziya"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP Vericisi:"
 
-#: mail/mail-config.glade.h:46
-msgid "News"
-msgstr "Xəbərlər"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "ePoçt Quraşdırılması"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "_Xəbərlər"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Arzuya Bağlı Məlumatlar"
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "_Orqanizasiya:"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "PGP _Açar ID:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Rəng al"
 
-#: 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 "Ə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:88
+#, 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"
 
-#: mail/mail-config.glade.h:56
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "_Boş mövzu qisimli məktub göndərdiyim vaxt bildir"
+#: mail/mail-config.glade.h:89
+#, 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 "Təkcə _Bcc alıcıları bildirlən ismarış yollamağa çalışdığımda bildir"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Seçili əlaqələri çap et"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail cərgəsi "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "İsmarış açıla bilmir"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Sitatlandırılmış"
 
-#: mail/mail-config.glade.h:60
+#: 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"
 
-#: 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 "Cavab ver"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "ePoçt Alınır"
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
-msgstr "E-poçt Alınır"
-
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Alma Seçənəkləri"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Bu parolu yadda saxla"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "İstənən Məlumatlar"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+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:67
-msgid "Security"
-msgstr "Təhlükəsizlik"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
-msgstr "Süzgəc Qeyd Faylını seç..."
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "PGP binarını seç"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "ePoçt Göndərilir"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Imza faylı : "
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
-msgstr "E-poçt Göndərilir"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "İmza xaricindəkiləri sil"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Göndərilənlər"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "ePoçt Göndərilir"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Göndərilən _ismarışlar qovluğu:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Göndərilən və Lahiyə İsmarışları"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Veri_ci tanıtmaya ehtiyac hiss edər"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Verici Quraşdırılması"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "Verici _Növü: "
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
-msgstr "Imza faylı : "
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Qısa Yollar"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Imzanı qeyd et"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Qaynaq"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Mənbə Məlumatı"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "Qaynaqlar"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "Tərz adı :"
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
-msgstr "Xüsusi Cərgələr"
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX poçt qutusu faylı"
 
-#: mail/mail-config.glade.h:86
-msgid "Use s_ecure connection (SSL)"
-msgstr "E_tibarlı bağlantı (SSL) işlət"
+#: mail/mail-config.glade.h:128
+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:87
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "_HTML Imza:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Dəyişən"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9304,126 +11832,218 @@ msgstr ""
 "\n"
 "Başlamaq üçün \"Sonrakı\" düyməsinə basın. "
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Şərq"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "_Həmişə netdə olmayan rəsmləri yüklə"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:141
 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:93
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "Kimlik Yo_xlama Növü: "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "Kimlik Yo_xlama Növü: "
+
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "Yeni Məktubları _avtomatik yoxla"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Vəsiqə ID:"
 
-#: mail/mail-config.glade.h:97
-msgid "_Drafts folder:"
-msgstr "_Lahiyələr qovluğu:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
-msgstr "_Poçt Ünvanı: "
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Qovluq açılırkən Təsdiqlə"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
-msgstr "Çıxışda zibil qutularını _boşalt"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Əsas"
 
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:151
+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
+#, fuzzy
+msgid "_Filename:"
+msgstr "Fayl adı:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Fərqli Çatdır"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "_Tam Ad:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:159
+#, 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:103
-msgid "_Highlight citations with"
-msgstr "Sitatları belə _Rəngləndir"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
-msgstr "_Qovşaq:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Dil"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 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:106
-msgid "_Log filter actions to:"
-msgstr "Süzgəc gedişlərini buraya _qeyd et:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Bunu ə_sas hesab olaraq göstər"
 
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "İsmarışları bundan sonra \"Oxundu\" olaraq _işarələ: "
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "Netdə olmayan rəsmləri he_ç bir vaxt yükləmə"
 
-#: mail/mail-config.glade.h:110
-msgid "_Organization:"
-msgstr "_Qutuluş:"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "_PGP binarı cığırı:"
 
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
-msgstr "_Cığır:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
-msgstr "Bu parolu _yadda saxla"
+#: mail/mail-config.glade.h:172
+#, 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"
 
-#: mail/mail-config.glade.h:114
-msgid "_Send mail in HTML format by default."
-msgstr "Əsas olaraq Məktubu HTML Şəklində _göndər"
+#: mail/mail-config.glade.h:173
+#, 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:115
-msgid "_Server Type: "
-msgstr "_Verici Növü: "
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Radio"
 
-#: mail/mail-config.glade.h:116
-msgid "_Signature file:"
-msgstr "_Imza faylı:"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "E-poçt Alınır"
 
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
-msgstr "İ_stifadəci Adı:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Hamısına cavab ver"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Təhlükəsizlik"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Təhlükəsizlik"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "E-poçt Göndərilir"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Vaxt Fərqli Göstər"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Dəyişən"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_hər"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " rəng"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "izah"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "xəbərlərpəncərəsi1"
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr "placeholder"
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr "saniyə."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "PGP imza məzmunu yaradıla bilmir."
@@ -9460,145 +12080,139 @@ msgstr "S/MIME zərf məzmunu yaradıla bilmir."
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME kod açma məzmunu yaradıla bilmir."
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Yapışdırılmış Faylı Qeyd Et"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Diskə Qeyd Et ..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "İçərisini Göstər"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "%s da(də) Aç ..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "İçərisini Göstər (%s ilə)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Gizlə"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Xarici Göstərici"
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "İsmarış içindəkilər yüklənir"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Körpünü Səyyahda Aç"
 
-#: mail/mail-display.c:1594
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Körpü Ünvanınə Köçür"
 
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Körpünü Fərqli qeyd et"
 
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Rəsmi Fərqli qeyd et..."
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s yapışdırılmış fayl"
 
-#: mail/mail-format.c:684
+#: mail/mail-format.c:647
 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:767
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarix"
 
-#: mail/mail-format.c:850
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Səhv Ünvan"
 
-#: mail/mail-format.c:890 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Göndərən"
 
-#: mail/mail-format.c:893
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Cavablama"
 
-#: mail/mail-format.c:897 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Gn:"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:905
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1817
-msgid "This message is digitally signed. Click the lock icon for more information."
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
 msgstr ""
-"Bu ismarış digital olaraq imzalanmışdır. Ətraflı məlumat üçün qıfıl "
-"timsalına tıqla."
-
-#: mail/mail-format.c:1840
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution bu tərz imzalı mətnləri başa düşmür."
-
-#: mail/mail-format.c:1848
-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:1856
-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."
+"\n"
+"Göndərici:  "
 
-#: mail/mail-format.c:2072
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP saytını göstərən ox (%s)"
 
-#: mail/mail-format.c:2086
+#: mail/mail-format.c:2120
 #, 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:2091
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerli faylyi göstərən ox (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Uzaq verilənlər (%s) nişanı"
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2162
 #, 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:2133
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Xəsərli xarici proqram parçası."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Qovluq yenidən qurulur"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9607,27 +12221,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:763
+#: mail/mail-local.c:762
 #, 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:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Qovluq meta verilənləri %s silinə bilmir: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" qovluğu \"%s\" şəklinə çevrilir"
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, 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:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9635,11 +12249,11 @@ msgstr ""
 "Bu qovluğu bir də aça bilməsən, onu əllə\n"
 "bərpa etməlisən."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 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:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "%s i(ı) Yenidən Quraşdır"
@@ -9666,117 +12280,112 @@ msgstr ""
 msgid "Working"
 msgstr "İşləyir"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Qovluq Süzülür"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Poçt Alınır"
 
-#: 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 "Axırı ki, ismarış müvəffəqiyyətlə yollandı."
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" Göndərilir"
 
-#: mail/mail-ops.c:677
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarış göndərilir"
 
-#: mail/mail-ops.c:696
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d ismarışda xəta"
 
-#: 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 "Qurtadı."
 
-#: mail/mail-ops.c:791
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "İsmarışlar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarışlar \"%s\"a(ə) daşınır"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İsmarışlar \"%s\"a(ə) köçürülür"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Daşınır"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Köçürdülür"
 
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" dakı qovluqlar daranır"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Zibil Qutusu"
-
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Çatdırılmış ismarış"
 
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "%s qaynağı açılır"
 
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s qovluğu çıxardılır"
 
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Qovluq yenilənir"
 
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Qovluq açılır"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarışı alınır"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d ismarış alınır"
 
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d ismarış qeyd edilir"
 
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9785,7 +12394,7 @@ msgstr ""
 "Nəticə faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9794,11 +12403,11 @@ msgstr ""
 "İsmarışların buraya qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Yapışdırılmış Fayl Qeyd Edilir"
 
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9807,22 +12416,27 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Data yazıla bilmədi: %s"
 
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ilə bağlantı kəsilir"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "A_xtar"
 
@@ -9862,64 +12476,88 @@ msgstr "Oxşayır:"
 msgid "Cancelling..."
 msgstr "Ləğv Edilir ..."
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Verici: %s, Növ: %s"
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Cığır: %s, Növ: %s"
 
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Növ: %s"
 
-#: mail/mail-send-recv.c:286
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Poçt Göndər və Al"
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Hamısını Ləğv Et"
 
-#: mail/mail-send-recv.c:348
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Güncəllənir ..."
 
-#: 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 "Gözləyir..."
 
-#: mail/mail-send-recv.c:533
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Ləğv Edildi."
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "İstifadəçi əməliyyatı ləğv etdi."
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s üçün Parol girin"
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 msgid "Enter Password"
 msgstr "Parol Girin"
 
-#: mail/mail-tools.c:255
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "İmza faylı qeyd edilə bilmir."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Imzanı qeyd et"
+
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"İmza dəyişdirilib, amma qeyd edilməyib.\n"
+"\n"
+"Dəyişikliklərinizin qeyd edilməyini istəyirsinizmi?"
+
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "Imza faylı : "
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Çatdırılmış ismarış - %s"
 
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Çatdırılmış ismarış"
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Çatdırılmış İsmarış"
 
@@ -9946,104 +12584,163 @@ msgstr ""
 "    '%s'\n"
 "Və güncəlləndilər."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "VFolderlər"
+#: mail/mail-vfolder.c:785
+#, fuzzy
+msgid "vFolders"
+msgstr "Qovluqlar"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:825
 msgid "Edit VFolder"
 msgstr "VFolder-i Düzəlt"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:841
 #, 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:894
+#: mail/mail-vfolder.c:895
 msgid "New VFolder"
 msgstr "Yeni VFolder"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Mövzusuz)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - İsmarış"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Görülməmiş"
 
-#: mail/message-list.c:631
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Görülmüş"
 
-#: mail/message-list.c:632
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Cavab cerilmiş"
 
-#: mail/message-list.c:633
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Çoxlu Görülməmiş İsmarış"
 
-#: mail/message-list.c:634
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Çoxlu İsmarış"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Ən Alçaq"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Alçalt"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Yüksək"
 
-#: mail/message-list.c:644
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Ən Yüksək"
 
-#: mail/message-list.c:894
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Sabah: %l:%M %p"
 
-#: mail/message-list.c:922
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:932
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2325
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "İsmarış siyahısı yaradılır"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "Aidiyyət"
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Hal"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Bayraqlı"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Alındı"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Böyüklük"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "Geri axtarma"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "İrəli get"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Mənbə Məlumatı"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Çatdır"
+
+#: 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 "Cavab ver"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Hamısına cavab ver"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Nümayiş"
+
+#: 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\""
@@ -10065,7 +12762,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" qovluğuna qeydiyyat silinir"
 
 #: 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 "Qovluq"
 
@@ -10110,85 +12807,10991 @@ msgid "_Unsubscribe"
 msgstr "Qeydiyyatdan _Çıx"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "İcracı mündəricat üçün Evolution parçası."
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "Evolution İcmalını daxil edən qovluqlar"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolutionun ePoçt yazıçısı."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Evolutionun Vəzifə parçası emalatxanası."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Məktub Mündəricatı parçası emalatxanası."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "İcmam Qurğuları"
+
+#: 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
+#, fuzzy
+msgid "Aarhus"
+msgstr "Alarm"
+
+#: my-evolution/Locations.h:2
+#, fuzzy
+msgid "Abakan"
+msgstr "Azərbaycan"
+
+#: my-evolution/Locations.h:3
+msgid "Abbotsford"
+msgstr ""
+
+#: my-evolution/Locations.h:4
+#, fuzzy
+msgid "Aberdeen"
+msgstr "Ziyarətçilər"
+
+#: my-evolution/Locations.h:5
+#, fuzzy
+msgid "Abha"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:6
+#, fuzzy
+msgid "Abilene"
+msgstr "Əl Telefonu"
+
+#: 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 "Nikaraqua"
+
+#: my-evolution/Locations.h:13
+msgid "Adak"
+msgstr ""
+
+#: my-evolution/Locations.h:14
+#, fuzzy
+msgid "Adana"
+msgstr "Albaniya"
+
+#: my-evolution/Locations.h:15
+msgid "Adana/Incirlik"
+msgstr ""
+
+#: my-evolution/Locations.h:16
+msgid "Adelaide"
+msgstr ""
+
+#: my-evolution/Locations.h:17
+#, fuzzy
+msgid "Aden"
+msgstr "İsveç"
+
+#: my-evolution/Locations.h:18
+#, fuzzy
+msgid "Adrar"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:19
+msgid "Aeroparque"
+msgstr ""
+
+#: my-evolution/Locations.h:20
+msgid "Aeropuerto del Norte"
+msgstr ""
+
+#: my-evolution/Locations.h:21
+#, fuzzy
+msgid "Afonsos"
+msgstr "Adsız"
+
+#: my-evolution/Locations.h:22
+#, fuzzy
+msgid "Africa"
+msgstr "Cənubi Afrika"
+
+#: my-evolution/Locations.h:23
+msgid "Afyon"
+msgstr ""
+
+#: my-evolution/Locations.h:24
+#, fuzzy
+msgid "Agen"
+msgstr "Argentina"
+
+#: my-evolution/Locations.h:25
+#, fuzzy
+msgid "Aguascaliantes"
+msgstr "Avstraliya"
+
+#: 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 "Albaniya"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:39
+#, fuzzy
+msgid "Alamosa"
+msgstr "Alarm"
+
+#: my-evolution/Locations.h:40
+#, fuzzy
+msgid "Alaska"
+msgstr "Alarm"
+
+#: my-evolution/Locations.h:41
+msgid "Al Baha"
+msgstr ""
+
+#: my-evolution/Locations.h:43
+#, fuzzy
+msgid "Albany"
+msgstr "Albaniya"
+
+#: my-evolution/Locations.h:44
+#, fuzzy
+msgid "Albenga"
+msgstr "Albaniya"
+
+#: my-evolution/Locations.h:45
+#, fuzzy
+msgid "Alberta"
+msgstr "Əlcəzair"
+
+#: my-evolution/Locations.h:46
+msgid "Alborg"
+msgstr ""
+
+#: my-evolution/Locations.h:47
+msgid "Albuquerque"
+msgstr ""
+
+#: my-evolution/Locations.h:48
+#, fuzzy
+msgid "Alderney"
+msgstr "Qovluq adı:"
+
+#: my-evolution/Locations.h:49
+msgid "Alesund"
+msgstr ""
+
+#: my-evolution/Locations.h:50
+#, fuzzy
+msgid "Alexandria"
+msgstr "Albaniya"
+
+#: 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 "Əlcəzair"
+
+#: my-evolution/Locations.h:56
+#, fuzzy
+msgid "Algona"
+msgstr "Anqola"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:62
+#, fuzzy
+msgid "Alliance"
+msgstr "Ətraflı"
+
+#: my-evolution/Locations.h:63
+#, fuzzy
+msgid "Alma"
+msgstr "Anqola"
+
+#: my-evolution/Locations.h:64
+#, fuzzy
+msgid "Almeria"
+msgstr "Əlcəzair"
+
+#: my-evolution/Locations.h:65
+#, fuzzy
+msgid "Alpena"
+msgstr "Albaniya"
+
+#: my-evolution/Locations.h:66
+msgid "Al Qaysumah"
+msgstr ""
+
+#: my-evolution/Locations.h:67
+#, fuzzy
+msgid "Alta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:68
+#, fuzzy
+msgid "Altamira"
+msgstr "Albaniya"
+
+#: my-evolution/Locations.h:69
+#, fuzzy
+msgid "Alton"
+msgstr "_Gedişlər"
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr ""
+
+#: my-evolution/Locations.h:71
+#, fuzzy
+msgid "Alturas"
+msgstr "Alarm"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:75
+#, fuzzy
+msgid "Amarillo"
+msgstr "ePoçt"
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr ""
+
+#: my-evolution/Locations.h:77
+#, fuzzy
+msgid "Ambler"
+msgstr "Üzv"
+
+#: my-evolution/Locations.h:78
+#, fuzzy
+msgid "Amelia"
+msgstr "Ermənistan"
+
+#: my-evolution/Locations.h:79
+#, fuzzy
+msgid "Amendola"
+msgstr "Anqola"
+
+#: my-evolution/Locations.h:80
+#, fuzzy
+msgid "Ames"
+msgstr "mil"
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr ""
+
+#: my-evolution/Locations.h:82
+#, fuzzy
+msgid "Amsterdam"
+msgstr "Avstriya"
+
+#: my-evolution/Locations.h:83
+#, fuzzy
+msgid "Anadyr"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:84
+msgid "Anaktuvuk"
+msgstr ""
+
+#: my-evolution/Locations.h:85
+#, fuzzy
+msgid "Anapa"
+msgstr "Yaponiya"
+
+#: my-evolution/Locations.h:86
+#, fuzzy
+msgid "Anchorage"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:87
+msgid "Anchorage - Elmendorf AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:88
+#, fuzzy
+msgid "Ancona"
+msgstr "Anqola"
+
+#: my-evolution/Locations.h:89
+msgid "Andahuayla"
+msgstr ""
+
+#: my-evolution/Locations.h:90
+#, fuzzy
+msgid "Anderson"
+msgstr "İldırımlı Fırtına"
+
+#: my-evolution/Locations.h:91
+#, fuzzy
+msgid "Andoya"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:92
+#, fuzzy
+msgid "Andravida"
+msgstr "Şəxsi"
+
+#: 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 "Albaniya"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:101
+#, fuzzy
+msgid "Anniston"
+msgstr "Əfqanıstan"
+
+#: my-evolution/Locations.h:102
+#, fuzzy
+msgid "Antalya"
+msgstr "İtaliya"
+
+#: my-evolution/Locations.h:103
+#, fuzzy
+msgid "Antartica"
+msgstr "Antarktika"
+
+#: my-evolution/Locations.h:104
+#, fuzzy
+msgid "Antigo"
+msgstr "Anqola"
+
+#: my-evolution/Locations.h:105
+#, fuzzy
+msgid "Antigua"
+msgstr "Anquilla"
+
+#: my-evolution/Locations.h:106
+#, fuzzy
+msgid "Antigua and Barbuda"
+msgstr "Antiq Və Barbuda"
+
+#: my-evolution/Locations.h:107
+#, fuzzy
+msgid "Antofagasta"
+msgstr "Əfqanıstan"
+
+#: 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 "placeholder"
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr ""
+
+#: my-evolution/Locations.h:112
+#, fuzzy
+msgid "Aquadilla"
+msgstr "Anquilla"
+
+#: my-evolution/Locations.h:113
+#, fuzzy
+msgid "Aracaju"
+msgstr "Makau"
+
+#: my-evolution/Locations.h:114
+#, fuzzy
+msgid "Arad"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:115
+#, fuzzy
+msgid "Arar"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:116
+#, fuzzy
+msgid "Araxos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:117
+#, fuzzy
+msgid "Arcata"
+msgstr "Antarktika"
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr ""
+
+#: my-evolution/Locations.h:119
+#, fuzzy
+msgid "Arequipa"
+msgstr "Ermənistan"
+
+#: my-evolution/Locations.h:121
+#, fuzzy
+msgid "Arica"
+msgstr "Əlcəzair"
+
+#: my-evolution/Locations.h:122
+#, fuzzy
+msgid "Arizona"
+msgstr "Argentina"
+
+#: my-evolution/Locations.h:123
+msgid "Arkansas"
+msgstr ""
+
+#: my-evolution/Locations.h:124
+msgid "Arkhangelsk"
+msgstr ""
+
+#: my-evolution/Locations.h:125
+#, fuzzy
+msgid "Arlington"
+msgstr "İstiqamət"
+
+#: my-evolution/Locations.h:126
+#, fuzzy
+msgid "Artigas"
+msgstr "Argentina"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:131
+#, fuzzy
+msgid "Ashfield"
+msgstr "Vəzifələndirilmiş"
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:133
+#, fuzzy
+msgid "Ashland"
+msgstr "Tayland"
+
+#: my-evolution/Locations.h:134
+#, fuzzy
+msgid "Asia"
+msgstr "Avstriya"
+
+#: my-evolution/Locations.h:135
+#, fuzzy
+msgid "Aspen"
+msgstr "Aç"
+
+#: my-evolution/Locations.h:136
+#, fuzzy
+msgid "Asswan"
+msgstr "Köməkçi"
+
+#: my-evolution/Locations.h:137
+#, fuzzy
+msgid "Astoria"
+msgstr "Avstriya"
+
+#: my-evolution/Locations.h:138
+#, fuzzy
+msgid "Astrakhan"
+msgstr "Avstraliya"
+
+#: my-evolution/Locations.h:139
+#, fuzzy
+msgid "Asturias"
+msgstr "Avstriya"
+
+#: my-evolution/Locations.h:140
+#, fuzzy
+msgid "Asuncion"
+msgstr "Reyunion"
+
+#: my-evolution/Locations.h:141
+#, fuzzy
+msgid "Athens"
+msgstr "Yapışdırılmış Fayllar"
+
+#: my-evolution/Locations.h:142
+#, fuzzy
+msgid "Athinai"
+msgstr "Çin"
+
+#: my-evolution/Locations.h:143
+#, fuzzy
+msgid "Atlanta"
+msgstr "Albaniya"
+
+#: my-evolution/Locations.h:144
+#, fuzzy
+msgid "Atlantic"
+msgstr "Avtomatik"
+
+#: 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 "İslandiya"
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:150
+#, fuzzy
+msgid "Augusta"
+msgstr "Avqust"
+
+#: my-evolution/Locations.h:151
+#, fuzzy
+msgid "Aurora"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:152
+#, fuzzy
+msgid "Austin"
+msgstr "Avstriya"
+
+#: my-evolution/Locations.h:153
+#, fuzzy
+msgid "Australasia"
+msgstr "Avstraliya"
+
+#: my-evolution/Locations.h:156
+msgid "Avalon"
+msgstr ""
+
+#: my-evolution/Locations.h:157
+msgid "Aviano"
+msgstr ""
+
+#: my-evolution/Locations.h:158
+msgid "Ayacucho"
+msgstr ""
+
+#: my-evolution/Locations.h:159
+#, fuzzy
+msgid "Bage"
+msgstr "Əsas"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:170
+#, fuzzy
+msgid "Ball Mountain"
+msgstr "Daxil edən ePoçt"
+
+#: my-evolution/Locations.h:171
+#, fuzzy
+msgid "Baltimore"
+msgstr "Baltik"
+
+#: my-evolution/Locations.h:172
+msgid "Baltimore-Glen Burnie"
+msgstr ""
+
+#: my-evolution/Locations.h:173
+#, fuzzy
+msgid "Banak"
+msgstr "Botsvana"
+
+#: my-evolution/Locations.h:174
+#, fuzzy
+msgid "Bandarabbass"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:175
+#, fuzzy
+msgid "Bangor"
+msgstr "əvvəl"
+
+#: my-evolution/Locations.h:176
+#, fuzzy
+msgid "Baracoa"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:177
+msgid "Barbers Point"
+msgstr ""
+
+#: my-evolution/Locations.h:178
+#, fuzzy
+msgid "Barcelona"
+msgstr "Makedoniya"
+
+#: my-evolution/Locations.h:179
+#, fuzzy
+msgid "Bardufoss"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:180
+msgid "Bar Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:181
+#, fuzzy
+msgid "Bari"
+msgstr "Bahreyn"
+
+#: my-evolution/Locations.h:182
+msgid "Bariloche"
+msgstr ""
+
+#: my-evolution/Locations.h:183
+#, fuzzy
+msgid "Barinas"
+msgstr "Bahreyn"
+
+#: my-evolution/Locations.h:184
+#, fuzzy
+msgid "Barking Sand"
+msgstr "Küləkli qum"
+
+#: my-evolution/Locations.h:185
+#, fuzzy
+msgid "Barksdale"
+msgstr "Əsas"
+
+#: my-evolution/Locations.h:186
+#, fuzzy
+msgid "Barnaul"
+msgstr "Braziliya"
+
+#: 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 "Faro Adaları"
+
+#: 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 "Əsas"
+
+#: my-evolution/Locations.h:194
+msgid "Batesville"
+msgstr ""
+
+#: my-evolution/Locations.h:195
+#, fuzzy
+msgid "Batman"
+msgstr "Butan"
+
+#: my-evolution/Locations.h:196
+msgid "Baton Rouge"
+msgstr ""
+
+#: my-evolution/Locations.h:197
+msgid "Battle Creek"
+msgstr ""
+
+#: my-evolution/Locations.h:198
+#, fuzzy
+msgid "Battle Mountain"
+msgstr "Daxil edən ad"
+
+#: my-evolution/Locations.h:199
+#, fuzzy
+msgid "Bauru"
+msgstr "Nauru"
+
+#: my-evolution/Locations.h:200
+#, fuzzy
+msgid "Bayamo"
+msgstr "Bahama"
+
+#: my-evolution/Locations.h:201
+msgid "Bayreuth"
+msgstr ""
+
+#: my-evolution/Locations.h:202
+#, fuzzy
+msgid "Beatrice"
+msgstr "Baltik"
+
+#: my-evolution/Locations.h:203
+msgid "Beaufort"
+msgstr ""
+
+#: my-evolution/Locations.h:204
+#, fuzzy
+msgid "Beaumont"
+msgstr "ay"
+
+#: 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 "Bahreyn"
+
+#: my-evolution/Locations.h:208
+#, fuzzy
+msgid "Beckley"
+msgstr "Beliz"
+
+#: my-evolution/Locations.h:209
+#, fuzzy
+msgid "Bedford"
+msgstr "əvvəl"
+
+#: my-evolution/Locations.h:210
+#, fuzzy
+msgid "Beijing"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:211
+#, fuzzy
+msgid "Beirut"
+msgstr "Belarusiya"
+
+#: my-evolution/Locations.h:212
+msgid "Beja"
+msgstr ""
+
+#: my-evolution/Locations.h:213
+#, fuzzy
+msgid "Belem"
+msgstr "Beliz"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:219
+#, fuzzy
+msgid "Belleville"
+msgstr "Beliz"
+
+#: my-evolution/Locations.h:220
+#, fuzzy
+msgid "Bellingham"
+msgstr "Küləkli dolu yağışı"
+
+#: my-evolution/Locations.h:221
+msgid "Belmar-Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:222
+#, fuzzy
+msgid "Belo Horizonte"
+msgstr "Beliz"
+
+#: 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 "Venezuela"
+
+#: my-evolution/Locations.h:226
+#, fuzzy
+msgid "Benina"
+msgstr "Benin"
+
+#: 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 "Yenilə"
+
+#: my-evolution/Locations.h:230
+msgid "Bergamo"
+msgstr ""
+
+#: my-evolution/Locations.h:231
+#, fuzzy
+msgid "Bergen"
+msgstr "Görülmüş"
+
+#: my-evolution/Locations.h:232
+msgid "Bergstrom AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:233
+msgid "Berlevag"
+msgstr ""
+
+#: my-evolution/Locations.h:234
+#, fuzzy
+msgid "Berlin"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:235
+msgid "Berlin-Tegel"
+msgstr ""
+
+#: my-evolution/Locations.h:236
+msgid "Berlin-Tempelhof"
+msgstr ""
+
+#: my-evolution/Locations.h:237
+#, fuzzy
+msgid "Bern"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:238
+#, fuzzy
+msgid "Bethel"
+msgstr "Hava"
+
+#: my-evolution/Locations.h:239
+msgid "Bethlehem Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:240
+#, fuzzy
+msgid "Bettles"
+msgstr "Beliz"
+
+#: my-evolution/Locations.h:241
+#, fuzzy
+msgid "Beverly"
+msgstr "_hər"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:245
+#, fuzzy
+msgid "Big Piney"
+msgstr "Pine"
+
+#: 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 "Məktublaşma qrupu"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:257
+#, fuzzy
+msgid "Blanding"
+msgstr "Kölgələmə"
+
+#: my-evolution/Locations.h:258
+#, fuzzy
+msgid "Block Island"
+msgstr "Kuku Adaları"
+
+#: my-evolution/Locations.h:259
+msgid "Bloemfontein J. B. M. Hertzog "
+msgstr ""
+
+#: my-evolution/Locations.h:260
+#, fuzzy
+msgid "Bloomington"
+msgstr "Küləkli qum"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:267
+#, fuzzy
+msgid "Bodo"
+msgstr "İçindəkilər"
+
+#: my-evolution/Locations.h:268
+msgid "Bogota/Eldorado"
+msgstr ""
+
+#: my-evolution/Locations.h:269
+#, fuzzy
+msgid "Boise"
+msgstr "Əsas"
+
+#: my-evolution/Locations.h:271
+msgid "Bologna"
+msgstr ""
+
+#: my-evolution/Locations.h:272
+#, fuzzy
+msgid "Bolzano"
+msgstr "Polşa"
+
+#: my-evolution/Locations.h:273
+msgid "Bombay/Santacruz"
+msgstr ""
+
+#: my-evolution/Locations.h:274
+#, fuzzy
+msgid "Boone"
+msgstr "Yoxdur"
+
+#: my-evolution/Locations.h:275
+msgid "Bordeaux"
+msgstr ""
+
+#: my-evolution/Locations.h:276
+#, fuzzy
+msgid "Borger"
+msgstr "həmişə"
+
+#: 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 "Bosniya Və Herzegovina"
+
+#: my-evolution/Locations.h:280
+#, fuzzy
+msgid "Boston"
+msgstr "Estoniya"
+
+#: my-evolution/Locations.h:281
+#, fuzzy
+msgid "Boulmer"
+msgstr "Qovluq"
+
+#: my-evolution/Locations.h:282
+#, fuzzy
+msgid "Bourges"
+msgstr "Qaynaqlar"
+
+#: my-evolution/Locations.h:283
+msgid "Bournemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:284
+#, fuzzy
+msgid "Bowling Green"
+msgstr "Küləkli qum"
+
+#: my-evolution/Locations.h:285
+#, fuzzy
+msgid "Bozeman"
+msgstr "Koreyaca"
+
+#: my-evolution/Locations.h:286
+#, fuzzy
+msgid "Bradford"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:287
+msgid "Bradshaw Field"
+msgstr ""
+
+#: my-evolution/Locations.h:288
+#, fuzzy
+msgid "Brainerd"
+msgstr "Bahreyn"
+
+#: my-evolution/Locations.h:289
+#, fuzzy
+msgid "Brasilia"
+msgstr "Braziliya"
+
+#: my-evolution/Locations.h:290
+msgid "Brasschaat"
+msgstr ""
+
+#: my-evolution/Locations.h:291
+#, fuzzy
+msgid "Bratislava"
+msgstr "Braziliya"
+
+#: my-evolution/Locations.h:292
+#, fuzzy
+msgid "Bratsk"
+msgstr "Lahiyələr"
+
+#: my-evolution/Locations.h:293
+msgid "Braunschweig"
+msgstr ""
+
+#: my-evolution/Locations.h:295
+#, fuzzy
+msgid "Bremen"
+msgstr "Yəmən"
+
+#: my-evolution/Locations.h:296
+msgid "Bremerton"
+msgstr ""
+
+#: my-evolution/Locations.h:297
+#, fuzzy
+msgid "Brest"
+msgstr "Sınaq"
+
+#: my-evolution/Locations.h:298
+msgid "Bridgeport"
+msgstr ""
+
+#: my-evolution/Locations.h:299
+#, fuzzy
+msgid "Brindisi"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:300
+msgid "Brisbane"
+msgstr ""
+
+#: my-evolution/Locations.h:301
+#, fuzzy
+msgid "Bristol"
+msgstr "Braziliya"
+
+#: 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 "Barbados"
+
+#: my-evolution/Locations.h:305
+#, fuzzy
+msgid "Broken Bow"
+msgstr "Parçalı buludlu"
+
+#: my-evolution/Locations.h:306
+msgid "Bronnoysund"
+msgstr ""
+
+#: my-evolution/Locations.h:307
+#, fuzzy
+msgid "Brookings"
+msgstr "İşləyir"
+
+#: my-evolution/Locations.h:308
+msgid "Brooksville"
+msgstr ""
+
+#: my-evolution/Locations.h:309
+#, fuzzy
+msgid "Broome"
+msgstr "Alt :"
+
+#: my-evolution/Locations.h:310
+msgid "Brownsville"
+msgstr ""
+
+#: my-evolution/Locations.h:311
+#, fuzzy
+msgid "Brunswick"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:312
+msgid "Brussels-National Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:313
+msgid "Bryansk"
+msgstr ""
+
+#: my-evolution/Locations.h:314
+#, fuzzy
+msgid "Bryce Canyon"
+msgstr "Şirkət"
+
+#: 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 "Butan"
+
+#: my-evolution/Locations.h:323
+#, fuzzy
+msgid "Burgas"
+msgstr "Məs"
+
+#: my-evolution/Locations.h:324
+#, fuzzy
+msgid "Burley"
+msgstr "Türkiyə"
+
+#: my-evolution/Locations.h:325
+msgid "Burlington"
+msgstr ""
+
+#: my-evolution/Locations.h:326
+#, fuzzy
+msgid "Burnet"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:327
+#, fuzzy
+msgid "Burns"
+msgstr "Məs"
+
+#: my-evolution/Locations.h:328
+#, fuzzy
+msgid "Bursa"
+msgstr "Məs"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:332
+#, fuzzy
+msgid "Cagliari"
+msgstr "Təqvim"
+
+#: my-evolution/Locations.h:333
+#, fuzzy
+msgid "Cairns"
+msgstr "Stul"
+
+#: my-evolution/Locations.h:334
+#, fuzzy
+msgid "Cairo"
+msgstr "Stul"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:338
+#, fuzzy
+msgid "Calgary"
+msgstr "Təqvim"
+
+#: my-evolution/Locations.h:339
+msgid "Cali/Alfonso Bonillaaragon"
+msgstr ""
+
+#: my-evolution/Locations.h:340
+#, fuzzy
+msgid "Caliente"
+msgstr "Təqvim"
+
+#: my-evolution/Locations.h:341
+#, fuzzy
+msgid "California"
+msgstr "Yeni Kaledoniya"
+
+#: my-evolution/Locations.h:342
+msgid "Calvi-Ste-Catherine"
+msgstr ""
+
+#: my-evolution/Locations.h:343
+#, fuzzy
+msgid "Camaguey"
+msgstr "Paraqvay"
+
+#: 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 "Kamerun"
+
+#: my-evolution/Locations.h:347
+#, fuzzy
+msgid "Camiri"
+msgstr "Stul"
+
+#: my-evolution/Locations.h:348
+#, fuzzy
+msgid "Campeche"
+msgstr "Qurtar"
+
+#: my-evolution/Locations.h:349
+#, fuzzy
+msgid "Campinas"
+msgstr "Kambodiya"
+
+#: my-evolution/Locations.h:350
+#, fuzzy
+msgid "Campo"
+msgstr "Şir"
+
+#: my-evolution/Locations.h:351
+#, fuzzy
+msgid "Campo Grande"
+msgstr "Keyp Verde"
+
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr ""
+
+#: my-evolution/Locations.h:353
+#, fuzzy
+msgid "Canaan"
+msgstr "Kanada"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:363
+#, fuzzy
+msgid "Cancun"
+msgstr "Ləğv Et"
+
+#: my-evolution/Locations.h:364
+msgid "Cannes-Mandelieu"
+msgstr ""
+
+#: my-evolution/Locations.h:365
+#, fuzzy
+msgid "Cantwell"
+msgstr "Ləğv Et"
+
+#: my-evolution/Locations.h:366
+#, fuzzy
+msgid "Cape Girardeau"
+msgstr "Keyp Verde"
+
+#: my-evolution/Locations.h:367
+#, fuzzy
+msgid "Cape Hatteras"
+msgstr "Keyp Verde"
+
+#: my-evolution/Locations.h:368
+#, fuzzy
+msgid "Cape Lisburne"
+msgstr "Kağız qaynağı :"
+
+#: my-evolution/Locations.h:369
+#, fuzzy
+msgid "Cape Newenham"
+msgstr "Keyp Verde"
+
+#: 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 "Keyp Verde"
+
+#: my-evolution/Locations.h:374
+msgid "Caracas La Carlota"
+msgstr ""
+
+#: my-evolution/Locations.h:375
+msgid "Caracas Maiquetia"
+msgstr ""
+
+#: my-evolution/Locations.h:376
+#, fuzzy
+msgid "Caravelas"
+msgstr "Vəzifəni Ləğv Et"
+
+#: my-evolution/Locations.h:377
+#, fuzzy
+msgid "Carbondale"
+msgstr "Kambodiya"
+
+#: my-evolution/Locations.h:378
+#, fuzzy
+msgid "Cardiff"
+msgstr "Kart Nümayişi "
+
+#: my-evolution/Locations.h:379
+#, fuzzy
+msgid "Caribou"
+msgstr "Maşın"
+
+#: my-evolution/Locations.h:380
+#, fuzzy
+msgid "Carlisle"
+msgstr "Dəyişən"
+
+#: my-evolution/Locations.h:381
+#, fuzzy
+msgid "Carlsbad"
+msgstr "Geri axtarma"
+
+#: my-evolution/Locations.h:382
+#, fuzzy
+msgid "Carroll"
+msgstr "Maşın"
+
+#: my-evolution/Locations.h:383
+msgid "Cartagena/Rafael Nunez"
+msgstr ""
+
+#: my-evolution/Locations.h:384
+msgid "Casa Granda"
+msgstr ""
+
+#: my-evolution/Locations.h:385
+#, fuzzy
+msgid "Cascade"
+msgstr "Mənzərə"
+
+#: my-evolution/Locations.h:386
+#, fuzzy
+msgid "Casper"
+msgstr "Kağız"
+
+#: my-evolution/Locations.h:387
+#, fuzzy
+msgid "Catacamas"
+msgstr "Bahama"
+
+#: my-evolution/Locations.h:388
+#, fuzzy
+msgid "Catania"
+msgstr "Xırvatıstan"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:393
+#, fuzzy
+msgid "Cedar City"
+msgstr "Təmizlə"
+
+#: 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 "Əlcəzair"
+
+#: my-evolution/Locations.h:397
+msgid "Chacarita"
+msgstr ""
+
+#: my-evolution/Locations.h:398
+#, fuzzy
+msgid "Chadron"
+msgstr "Çad"
+
+#: my-evolution/Locations.h:399
+#, fuzzy
+msgid "Challis"
+msgstr "Stul"
+
+#: my-evolution/Locations.h:400
+#, fuzzy
+msgid "Chamberlain"
+msgstr "Kamerun"
+
+#: my-evolution/Locations.h:401
+#, fuzzy
+msgid "Chambery"
+msgstr "Kamerun"
+
+#: my-evolution/Locations.h:402
+#, fuzzy
+msgid "Champaign"
+msgstr "Şirkət"
+
+#: my-evolution/Locations.h:403
+#, fuzzy
+msgid "Chandalar Lake"
+msgstr "Təqvim İsmarışı"
+
+#: my-evolution/Locations.h:404
+#, fuzzy
+msgid "Chandler"
+msgstr "Çad"
+
+#: my-evolution/Locations.h:405
+#, fuzzy
+msgid "Chania"
+msgstr "Çin"
+
+#: my-evolution/Locations.h:406
+#, fuzzy
+msgid "Chanute"
+msgstr "Ləğv Et"
+
+#: my-evolution/Locations.h:407
+#, fuzzy
+msgid "Chariton"
+msgstr "Kamerun"
+
+#: my-evolution/Locations.h:408
+msgid "Charleroi-Brussels South"
+msgstr ""
+
+#: my-evolution/Locations.h:409
+msgid "Charles City"
+msgstr ""
+
+#: my-evolution/Locations.h:410
+#, fuzzy
+msgid "Charleston"
+msgstr "İştirakçılar"
+
+#: my-evolution/Locations.h:411
+#, fuzzy
+msgid "Charlotte"
+msgstr "Mayot"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:416
+#, fuzzy
+msgid "Cheju"
+msgstr "Çili"
+
+#: 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 "Lüksemburq"
+
+#: my-evolution/Locations.h:420
+#, fuzzy
+msgid "Cherry Point"
+msgstr "Digər Telefonlar"
+
+#: 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 "Çin"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:431
+#, fuzzy
+msgid "Chiclayo"
+msgstr "Çili"
+
+#: my-evolution/Locations.h:432
+#, fuzzy
+msgid "Chico"
+msgstr "Çili"
+
+#: my-evolution/Locations.h:433
+msgid "Chicopee Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:434
+#, fuzzy
+msgid "Chievres"
+msgstr "Çincə"
+
+#: my-evolution/Locations.h:435
+#, fuzzy
+msgid "Chihhang"
+msgstr "Çin"
+
+#: my-evolution/Locations.h:436
+msgid "Chihuahua"
+msgstr ""
+
+#: my-evolution/Locations.h:437
+#, fuzzy
+msgid "Childress"
+msgstr "Çili"
+
+#: my-evolution/Locations.h:439
+#, fuzzy
+msgid "China Lake"
+msgstr "Çin"
+
+#: my-evolution/Locations.h:440
+#, fuzzy
+msgid "Chinandega"
+msgstr "Çin"
+
+#: my-evolution/Locations.h:441
+msgid "Chinmem/Shatou"
+msgstr ""
+
+#: my-evolution/Locations.h:442
+#, fuzzy
+msgid "Chino"
+msgstr "Çin"
+
+#: my-evolution/Locations.h:443
+msgid "Chippewa County"
+msgstr ""
+
+#: my-evolution/Locations.h:444
+#, fuzzy
+msgid "Chita"
+msgstr "Çin"
+
+#: 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 "Çin"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:462
+#, fuzzy
+msgid "Clarinda"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:463
+#, fuzzy
+msgid "Clarion"
+msgstr "Iş birliği"
+
+#: my-evolution/Locations.h:464
+msgid "Clarksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:465
+#, fuzzy
+msgid "Clayton"
+msgstr "Iş birliği"
+
+#: my-evolution/Locations.h:466
+msgid "Clayton Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:467
+msgid "Clermont-Ferrand"
+msgstr ""
+
+#: my-evolution/Locations.h:468
+#, fuzzy
+msgid "Cleveland"
+msgstr "Qrinland"
+
+#: 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 "Kolumbiya"
+
+#: 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 "Kuku Adaları"
+
+#: my-evolution/Locations.h:477
+#, fuzzy
+msgid "Cody"
+msgstr "İçindəkilər"
+
+#: my-evolution/Locations.h:478
+msgid "Coeur d'Alene"
+msgstr ""
+
+#: my-evolution/Locations.h:479
+#, fuzzy
+msgid "Cold Bay"
+msgstr "_Qovluq Çubuğu"
+
+#: my-evolution/Locations.h:480
+#, fuzzy
+msgid "Colima"
+msgstr "Kolumbiya"
+
+#: my-evolution/Locations.h:481
+#, fuzzy
+msgid "College Station"
+msgstr "Iş birliği"
+
+#: my-evolution/Locations.h:482
+msgid "Colmar-Meyenheim"
+msgstr ""
+
+#: my-evolution/Locations.h:484
+#, fuzzy
+msgid "Colonia"
+msgstr "Kolumbiya"
+
+#: my-evolution/Locations.h:485
+#, fuzzy
+msgid "Colorado"
+msgstr "Iş birliği"
+
+#: my-evolution/Locations.h:486
+msgid "Colorado Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:487
+#, fuzzy
+msgid "Columbia"
+msgstr "Kolumbiya"
+
+#: my-evolution/Locations.h:488
+msgid "Columbia-McEntire"
+msgstr ""
+
+#: my-evolution/Locations.h:489
+#, fuzzy
+msgid "Columbus"
+msgstr "Kolumbiya"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:494
+#, fuzzy
+msgid "Colville"
+msgstr "Çili"
+
+#: my-evolution/Locations.h:495
+msgid "Comodoro Rivadavia"
+msgstr ""
+
+#: my-evolution/Locations.h:496
+#, fuzzy
+msgid "Comox"
+msgstr "Şir"
+
+#: my-evolution/Locations.h:497
+msgid "Conceicao Do Araguaia"
+msgstr ""
+
+#: my-evolution/Locations.h:498
+#, fuzzy
+msgid "Concepcion"
+msgstr "Əməliyyatı Ləğv Et"
+
+#: my-evolution/Locations.h:499
+#, fuzzy
+msgid "Concord"
+msgstr "Konqo"
+
+#: my-evolution/Locations.h:500
+msgid "Concordia"
+msgstr ""
+
+#: my-evolution/Locations.h:501
+msgid "Connaught"
+msgstr ""
+
+#: my-evolution/Locations.h:502
+#, fuzzy
+msgid "Connecticut"
+msgstr "Əlaqələr"
+
+#: my-evolution/Locations.h:503
+#, fuzzy
+msgid "Conroe"
+msgstr "Konqo"
+
+#: my-evolution/Locations.h:504
+#, fuzzy
+msgid "Constantine"
+msgstr "Daxil edir:"
+
+#: my-evolution/Locations.h:505
+msgid "Copper Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:506
+#, fuzzy
+msgid "Cordoba"
+msgstr "Kolumbiya"
+
+#: my-evolution/Locations.h:507
+#, fuzzy
+msgid "Cordova"
+msgstr "İordaniya"
+
+#: my-evolution/Locations.h:508
+msgid "Cork"
+msgstr ""
+
+#: my-evolution/Locations.h:509
+#, fuzzy
+msgid "Coro"
+msgstr "Komor"
+
+#: my-evolution/Locations.h:510
+#, fuzzy
+msgid "Corona"
+msgstr "Komor"
+
+#: my-evolution/Locations.h:511
+msgid "Corpus Christi"
+msgstr ""
+
+#: my-evolution/Locations.h:512
+msgid "Corpus Christi NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:513
+#, fuzzy
+msgid "Corrientes"
+msgstr "hadisələr"
+
+#: my-evolution/Locations.h:514
+#, fuzzy
+msgid "Corsicana"
+msgstr "Kosta Rika"
+
+#: my-evolution/Locations.h:515
+#, fuzzy
+msgid "Cortez"
+msgstr "Qeyd"
+
+#: my-evolution/Locations.h:516
+#, fuzzy
+msgid "Corumba"
+msgstr "Kuba"
+
+#: my-evolution/Locations.h:518
+msgid "Cotulla"
+msgstr ""
+
+#: my-evolution/Locations.h:519
+msgid "Council Bluffs"
+msgstr ""
+
+#: my-evolution/Locations.h:520
+#, fuzzy
+msgid "Coventry"
+msgstr "Öl_kə:"
+
+#: my-evolution/Locations.h:521
+#, fuzzy
+msgid "Covington"
+msgstr "Konqo"
+
+#: my-evolution/Locations.h:522
+msgid "Cozumel"
+msgstr ""
+
+#: my-evolution/Locations.h:523
+#, fuzzy
+msgid "Craig"
+msgstr "Xırvatıstan"
+
+#: my-evolution/Locations.h:524
+#, fuzzy
+msgid "Cranfield"
+msgstr "Ləğv Edildi"
+
+#: my-evolution/Locations.h:525
+msgid "Crescent City"
+msgstr ""
+
+#: my-evolution/Locations.h:526
+#, fuzzy
+msgid "Creston"
+msgstr "Sual"
+
+#: my-evolution/Locations.h:527
+#, fuzzy
+msgid "Crestview"
+msgstr "Nümayiş"
+
+#: 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 "Kamerun"
+
+#: my-evolution/Locations.h:533
+#, fuzzy
+msgid "Cuba Awrs"
+msgstr "Kuba"
+
+#: my-evolution/Locations.h:534
+msgid "Cuernavaca"
+msgstr ""
+
+#: my-evolution/Locations.h:535
+#, fuzzy
+msgid "Cuiaba"
+msgstr "Kuba"
+
+#: my-evolution/Locations.h:536
+#, fuzzy
+msgid "Culdrose"
+msgstr "Qapat"
+
+#: my-evolution/Locations.h:537
+msgid "Culiacan"
+msgstr ""
+
+#: my-evolution/Locations.h:538
+#, fuzzy
+msgid "Cumana"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:539
+msgid "Cumberland"
+msgstr ""
+
+#: my-evolution/Locations.h:540
+#, fuzzy
+msgid "Curitiba"
+msgstr "Xırvatıstan"
+
+#: my-evolution/Locations.h:541
+msgid "Curitiba Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:542
+#, fuzzy
+msgid "Custer"
+msgstr "Kəs"
+
+#: my-evolution/Locations.h:543
+msgid "Cut Bank"
+msgstr ""
+
+#: my-evolution/Locations.h:544
+msgid "Cuzco"
+msgstr ""
+
+#: my-evolution/Locations.h:547
+#, fuzzy
+msgid "Dagali"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:548
+msgid "Daggett"
+msgstr ""
+
+#: my-evolution/Locations.h:549
+msgid "Dalhart"
+msgstr ""
+
+#: my-evolution/Locations.h:550
+#, fuzzy
+msgid "Dalian"
+msgstr "Tayvan"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:556
+#, fuzzy
+msgid "Danbury"
+msgstr "Yanvars"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:562
+#, fuzzy
+msgid "Dayton"
+msgstr "Gün"
+
+#: my-evolution/Locations.h:563
+msgid "Daytona Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:564
+msgid "Dayton-Fairborn"
+msgstr ""
+
+#: my-evolution/Locations.h:565
+#, fuzzy
+msgid "Dayton-South Airport"
+msgstr "İdxal etmə"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:571
+#, fuzzy
+msgid "Deelen"
+msgstr "Sil"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:576
+#, fuzzy
+msgid "Delta"
+msgstr "Sil"
+
+#: my-evolution/Locations.h:577
+#, fuzzy
+msgid "Deming"
+msgstr "İclas"
+
+#: my-evolution/Locations.h:578
+msgid "Den Helder/De Kooy"
+msgstr ""
+
+#: my-evolution/Locations.h:579
+#, fuzzy
+msgid "Denison"
+msgstr "Reyunion"
+
+#: my-evolution/Locations.h:581
+#, fuzzy
+msgid "Denton"
+msgstr "Livan"
+
+#: my-evolution/Locations.h:582
+#, fuzzy
+msgid "Denver"
+msgstr "Göndərən"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:587
+#, fuzzy
+msgid "Des Moines"
+msgstr "Zaman Dilimləri"
+
+#: my-evolution/Locations.h:588
+#, fuzzy
+msgid "Destin"
+msgstr "Sual"
+
+#: 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 "Bahreyn"
+
+#: my-evolution/Locations.h:596
+#, fuzzy
+msgid "Dickinson"
+msgstr "Ölçülər :"
+
+#: my-evolution/Locations.h:597
+#, fuzzy
+msgid "Dijon"
+msgstr "Qurtardı"
+
+#: my-evolution/Locations.h:598
+#, fuzzy
+msgid "Dillingham"
+msgstr "Sürüşgən dolu yağışı"
+
+#: my-evolution/Locations.h:599
+#, fuzzy
+msgid "Dillon"
+msgstr "Qurtardı"
+
+#: my-evolution/Locations.h:600
+#, fuzzy
+msgid "Dinard"
+msgstr "Kartı çap et"
+
+#: 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 "Rolu"
+
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "Qurtardı"
+
+#: my-evolution/Locations.h:610
+#, fuzzy
+msgid "Dongsha"
+msgstr "Tonqa"
+
+#: my-evolution/Locations.h:611
+msgid "Dongshi"
+msgstr ""
+
+#: my-evolution/Locations.h:612
+#, fuzzy
+msgid "Don Torcuato"
+msgstr "da(də) ya da sonra"
+
+#: my-evolution/Locations.h:613
+msgid "Dortmund-Wickede"
+msgstr ""
+
+#: my-evolution/Locations.h:614
+#, fuzzy
+msgid "Dothan"
+msgstr "Qurtardı"
+
+#: my-evolution/Locations.h:615
+msgid "Douglas"
+msgstr ""
+
+#: my-evolution/Locations.h:616
+#, fuzzy
+msgid "Dover"
+msgstr "həmişə"
+
+#: 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 "Kuba"
+
+#: my-evolution/Locations.h:620
+msgid "Dubbo"
+msgstr ""
+
+#: my-evolution/Locations.h:621
+#, fuzzy
+msgid "Dublin"
+msgstr "Ümumi"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:625
+#, fuzzy
+msgid "Dugway"
+msgstr "Gün"
+
+#: my-evolution/Locations.h:626
+#, fuzzy
+msgid "Duluth"
+msgstr "Əsas"
+
+#: my-evolution/Locations.h:627
+#, fuzzy
+msgid "Dundee"
+msgstr "Aidiyyət"
+
+#: my-evolution/Locations.h:628
+#, fuzzy
+msgid "Durango"
+msgstr "əvvəl"
+
+#: 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 "Toz fırtınası"
+
+#: my-evolution/Locations.h:633
+msgid "Dutch Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:634
+msgid "Dyersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:635
+#, fuzzy
+msgid "Eagle"
+msgstr "Fəallaşdır"
+
+#: 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 "Şərq - Cənubi Şərq"
+
+#: my-evolution/Locations.h:640
+msgid "Eau Claire"
+msgstr ""
+
+#: my-evolution/Locations.h:642
+#, fuzzy
+msgid "Edinburgh"
+msgstr "Sonlanır:"
+
+#: my-evolution/Locations.h:643
+#, fuzzy
+msgid "Edmonton"
+msgstr "ay"
+
+#: 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 "Tornado"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:661
+#, fuzzy
+msgid "Elkins"
+msgstr "siyahı"
+
+#: my-evolution/Locations.h:662
+msgid "Elko"
+msgstr ""
+
+#: my-evolution/Locations.h:663
+#, fuzzy
+msgid "Elmira"
+msgstr "Elm"
+
+#: my-evolution/Locations.h:664
+#, fuzzy
+msgid "El Monte"
+msgstr "Ay"
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr ""
+
+#: my-evolution/Locations.h:667
+#, fuzzy
+msgid "El Salvador Int."
+msgstr "Elsalvador"
+
+#: my-evolution/Locations.h:668
+msgid "Elsenborn"
+msgstr ""
+
+#: my-evolution/Locations.h:669
+#, fuzzy
+msgid "Ely"
+msgstr "Elm"
+
+#: my-evolution/Locations.h:670
+msgid "Emmonak"
+msgstr ""
+
+#: my-evolution/Locations.h:671
+#, fuzzy
+msgid "Emporia"
+msgstr "Vacib"
+
+#: my-evolution/Locations.h:672
+msgid "Enid"
+msgstr ""
+
+#: my-evolution/Locations.h:673
+#, fuzzy
+msgid "Enid/Woodring"
+msgstr "Sonlanır:"
+
+#: 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 "Eritre"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:685
+#, fuzzy
+msgid "Eugene"
+msgstr "İyun"
+
+#: my-evolution/Locations.h:686
+#, fuzzy
+msgid "Eureka"
+msgstr "Eritre"
+
+#: my-evolution/Locations.h:687
+msgid "Europe"
+msgstr ""
+
+#: my-evolution/Locations.h:688
+#, fuzzy
+msgid "Evanston"
+msgstr "Estoniya"
+
+#: my-evolution/Locations.h:689
+msgid "Evansville"
+msgstr ""
+
+#: my-evolution/Locations.h:690
+#, fuzzy
+msgid "Everett"
+msgstr "Hər"
+
+#: my-evolution/Locations.h:691
+msgid "Evergreen"
+msgstr ""
+
+#: my-evolution/Locations.h:692
+msgid "Evreux-Fauville"
+msgstr ""
+
+#: my-evolution/Locations.h:693
+#, fuzzy
+msgid "Exeter"
+msgstr "Hava"
+
+#: my-evolution/Locations.h:694
+msgid "Ezeiza"
+msgstr ""
+
+#: my-evolution/Locations.h:695
+#, fuzzy
+msgid "Fagernes"
+msgstr "Peycer"
+
+#: my-evolution/Locations.h:696
+msgid "Fairbanks"
+msgstr ""
+
+#: my-evolution/Locations.h:697
+msgid "Fairchild"
+msgstr ""
+
+#: my-evolution/Locations.h:698
+#, fuzzy
+msgid "Fairfield"
+msgstr "_Göndərən Girişi"
+
+#: my-evolution/Locations.h:699
+#, fuzzy
+msgid "Fairmont"
+msgstr "Yazı növləri"
+
+#: 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 "əvvəl"
+
+#: my-evolution/Locations.h:705
+#, fuzzy
+msgid "Farmingdale"
+msgstr "Dəyişən"
+
+#: my-evolution/Locations.h:706
+#, fuzzy
+msgid "Farmington"
+msgstr "Dondurucu tornado"
+
+#: my-evolution/Locations.h:707
+#, fuzzy
+msgid "Farmville"
+msgstr "Soyad"
+
+#: my-evolution/Locations.h:708
+#, fuzzy
+msgid "Faro"
+msgstr "Göndərən"
+
+#: my-evolution/Locations.h:709
+msgid "Fayetteville"
+msgstr ""
+
+#: my-evolution/Locations.h:710
+#, fuzzy
+msgid "Feng Nin"
+msgstr "Şaxtalı yağış"
+
+#: my-evolution/Locations.h:711
+msgid "Fergus Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:712
+msgid "Fernando De Noronha"
+msgstr ""
+
+#: my-evolution/Locations.h:713
+#, fuzzy
+msgid "Ferrara"
+msgstr "Fevral"
+
+#: my-evolution/Locations.h:714
+#, fuzzy
+msgid "Figari"
+msgstr "Nigeriya"
+
+#: my-evolution/Locations.h:715
+#, fuzzy
+msgid "Findlay"
+msgstr "Cümə"
+
+#: my-evolution/Locations.h:717
+#, fuzzy
+msgid "Firenze"
+msgstr "Boş"
+
+#: my-evolution/Locations.h:718
+msgid "Fitchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:719
+msgid "Flagstaff"
+msgstr ""
+
+#: my-evolution/Locations.h:720
+#, fuzzy
+msgid "Flint"
+msgstr "siyahı"
+
+#: my-evolution/Locations.h:721
+#, fuzzy
+msgid "Flippin"
+msgstr "Filippin"
+
+#: my-evolution/Locations.h:722
+#, fuzzy
+msgid "Florence"
+msgstr "Fransa"
+
+#: my-evolution/Locations.h:723
+#, fuzzy
+msgid "Florennes"
+msgstr "Boş"
+
+#: my-evolution/Locations.h:724
+#, fuzzy
+msgid "Flores"
+msgstr "Fərqli Qeyd Et"
+
+#: my-evolution/Locations.h:725
+msgid "Florianopolis"
+msgstr ""
+
+#: my-evolution/Locations.h:726
+#, fuzzy
+msgid "Florida"
+msgstr "Cümə"
+
+#: my-evolution/Locations.h:727
+#, fuzzy
+msgid "Floro"
+msgstr "Göndərən"
+
+#: my-evolution/Locations.h:728
+msgid "Fond Du Lac"
+msgstr ""
+
+#: my-evolution/Locations.h:729
+#, fuzzy
+msgid "Forde/Bringeland"
+msgstr "Finlandiya"
+
+#: my-evolution/Locations.h:730
+#, fuzzy
+msgid "Forli"
+msgstr "_Cüm"
+
+#: my-evolution/Locations.h:731
+#, fuzzy
+msgid "Formosa"
+msgstr "Şəkil"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:742
+#, fuzzy
+msgid "Fort Eustis"
+msgstr "Qısa Yollar"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:748
+#, fuzzy
+msgid "Fort Leonard"
+msgstr "Çatdır"
+
+#: my-evolution/Locations.h:749
+msgid "Fort Lewis"
+msgstr ""
+
+#: my-evolution/Locations.h:750
+msgid "Fort Madison"
+msgstr ""
+
+#: my-evolution/Locations.h:751
+#, fuzzy
+msgid "Fort Meade"
+msgstr "İsmarışı Çat_dır"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:757
+#, fuzzy
+msgid "Fort Smith"
+msgstr "Şəkil"
+
+#: my-evolution/Locations.h:758
+#, fuzzy
+msgid "Fort Stewart"
+msgstr "Başlamayıb"
+
+#: my-evolution/Locations.h:759
+msgid "Fort Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:760
+#, fuzzy
+msgid "Fort Wayne"
+msgstr "Fransa"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:769
+#, fuzzy
+msgid "Franklin"
+msgstr "_İşində Çatdır"
+
+#: my-evolution/Locations.h:770
+#, fuzzy
+msgid "Fredericton"
+msgstr "izah"
+
+#: my-evolution/Locations.h:771
+#, fuzzy
+msgid "Freeport"
+msgstr "Boş"
+
+#: my-evolution/Locations.h:772
+msgid "Frenchville"
+msgstr ""
+
+#: my-evolution/Locations.h:773
+#, fuzzy
+msgid "Fresno"
+msgstr "Şaxta"
+
+#: my-evolution/Locations.h:774
+msgid "Fresno-Chandler"
+msgstr ""
+
+#: my-evolution/Locations.h:775
+#, fuzzy
+msgid "Friday Harbor"
+msgstr "Cümə"
+
+#: my-evolution/Locations.h:776
+msgid "Friedrichshafen"
+msgstr ""
+
+#: my-evolution/Locations.h:777
+#, fuzzy
+msgid "Frigg"
+msgstr "_Cüm"
+
+#: my-evolution/Locations.h:778
+#, fuzzy
+msgid "Frontone"
+msgstr "Yazı növləri"
+
+#: my-evolution/Locations.h:779
+#, fuzzy
+msgid "Frosinone"
+msgstr "Məslək"
+
+#: my-evolution/Locations.h:780
+#, fuzzy
+msgid "Fryeburg"
+msgstr "Fevral"
+
+#: 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 "Makedoniya"
+
+#: my-evolution/Locations.h:789
+msgid "Gadsden"
+msgstr ""
+
+#: my-evolution/Locations.h:790
+#, fuzzy
+msgid "Gage"
+msgstr "Səhifə"
+
+#: my-evolution/Locations.h:791
+#, fuzzy
+msgid "Gainesville"
+msgstr "Ləğv Edildi"
+
+#: 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 "Qana"
+
+#: my-evolution/Locations.h:796
+msgid "Galesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:797
+#, fuzzy
+msgid "Gallup"
+msgstr "Quadelup"
+
+#: my-evolution/Locations.h:798
+msgid "Galveston"
+msgstr ""
+
+#: my-evolution/Locations.h:799
+#, fuzzy
+msgid "Gambell"
+msgstr "Qambiya"
+
+#: my-evolution/Locations.h:800
+#, fuzzy
+msgid "Gander"
+msgstr "Başlıq"
+
+#: my-evolution/Locations.h:801
+#, fuzzy
+msgid "Garden City"
+msgstr "Kimlik"
+
+#: my-evolution/Locations.h:802
+msgid "Gary"
+msgstr ""
+
+#: my-evolution/Locations.h:803
+#, fuzzy
+msgid "Gassim"
+msgstr "Quam"
+
+#: my-evolution/Locations.h:804
+#, fuzzy
+msgid "Gatineau"
+msgstr "Qvineya"
+
+#: my-evolution/Locations.h:805
+msgid "Gaziantep"
+msgstr ""
+
+#: my-evolution/Locations.h:806
+#, fuzzy
+msgid "Gdansk"
+msgstr "gün"
+
+#: my-evolution/Locations.h:807
+#, fuzzy
+msgid "Geneve"
+msgstr "Yunanıstan"
+
+#: my-evolution/Locations.h:808
+#, fuzzy
+msgid "Genova"
+msgstr "Ümumi"
+
+#: 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 "Qana"
+
+#: my-evolution/Locations.h:814
+msgid "Ghedi"
+msgstr ""
+
+#: my-evolution/Locations.h:816
+msgid "Gifu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:817
+#, fuzzy
+msgid "Gila Bend"
+msgstr "Finlandiya"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:821
+#, fuzzy
+msgid "Girona"
+msgstr "Qvineya"
+
+#: my-evolution/Locations.h:822
+#, fuzzy
+msgid "Gizan"
+msgstr "Qabon"
+
+#: my-evolution/Locations.h:823
+#, fuzzy
+msgid "Glasgow"
+msgstr "əvvəl"
+
+#: my-evolution/Locations.h:824
+#, fuzzy
+msgid "Glendive"
+msgstr "Maldiv"
+
+#: my-evolution/Locations.h:825
+msgid "Glens Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:826
+#, fuzzy
+msgid "Goiania"
+msgstr "Ruminıya"
+
+#: my-evolution/Locations.h:827
+msgid "Goldsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:828
+#, fuzzy
+msgid "Goodland"
+msgstr "Polşa"
+
+#: my-evolution/Locations.h:829
+#, fuzzy
+msgid "Goose Bay"
+msgstr "Günə Get"
+
+#: my-evolution/Locations.h:830
+msgid "Goteborg (Landvetter)"
+msgstr ""
+
+#: my-evolution/Locations.h:831
+msgid "Goteborg (Save)"
+msgstr ""
+
+#: my-evolution/Locations.h:832
+#, fuzzy
+msgid "Granada"
+msgstr "Qrenada"
+
+#: 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 "Folkland Adaları"
+
+#: 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 "San Marino"
+
+#: my-evolution/Locations.h:840
+msgid "Grand Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:841
+#, fuzzy
+msgid "Grandview"
+msgstr "Nümayiş"
+
+#: my-evolution/Locations.h:842
+#, fuzzy
+msgid "Grangeville"
+msgstr "Ləğv Edildi"
+
+#: my-evolution/Locations.h:843
+#, fuzzy
+msgid "Grants"
+msgstr "Lahiyələr"
+
+#: my-evolution/Locations.h:844
+#, fuzzy
+msgid "Graz"
+msgstr "Braziliya"
+
+#: my-evolution/Locations.h:845
+msgid "Great Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:847
+#, fuzzy
+msgid "Greeley"
+msgstr "Yunanıstan"
+
+#: my-evolution/Locations.h:848
+#, fuzzy
+msgid "Green Bay"
+msgstr "Qrinland"
+
+#: my-evolution/Locations.h:849
+msgid "Green River"
+msgstr ""
+
+#: my-evolution/Locations.h:850
+msgid "Greensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:851
+#, fuzzy
+msgid "Greenville"
+msgstr "Qrinland"
+
+#: my-evolution/Locations.h:852
+msgid "Greenville-Spartanburg"
+msgstr ""
+
+#: my-evolution/Locations.h:853
+#, fuzzy
+msgid "Greenwood"
+msgstr "Qrinland"
+
+#: my-evolution/Locations.h:854
+msgid "Grenoble-Saint-Geoirs"
+msgstr ""
+
+#: my-evolution/Locations.h:855
+msgid "Griffiss AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:856
+#, fuzzy
+msgid "Groningen"
+msgstr "Xəbərdarlıq"
+
+#: 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 "Quatemala"
+
+#: my-evolution/Locations.h:860
+#, fuzzy
+msgid "Guadalupe Pass"
+msgstr "Quadelup"
+
+#: my-evolution/Locations.h:861
+#, fuzzy
+msgid "Guanare"
+msgstr "Quyana"
+
+#: my-evolution/Locations.h:862
+msgid "Guangzhou"
+msgstr ""
+
+#: my-evolution/Locations.h:863
+#, fuzzy
+msgid "Guantanamo"
+msgstr "Quatemala"
+
+#: my-evolution/Locations.h:864
+#, fuzzy
+msgid "Guarany"
+msgstr "Almanya"
+
+#: my-evolution/Locations.h:865
+#, fuzzy
+msgid "Guaratingueta"
+msgstr "Qvineya"
+
+#: my-evolution/Locations.h:866
+msgid "Guarulhos"
+msgstr ""
+
+#: my-evolution/Locations.h:868
+msgid "Guayaquil/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:869
+#, fuzzy
+msgid "Guaymas"
+msgstr "Quam"
+
+#: my-evolution/Locations.h:870
+#, fuzzy
+msgid "Guernsey"
+msgstr "Almanya"
+
+#: my-evolution/Locations.h:871
+#, fuzzy
+msgid "Guidonia"
+msgstr "Qvineya"
+
+#: my-evolution/Locations.h:872
+msgid "Gulfport"
+msgstr ""
+
+#: my-evolution/Locations.h:873
+#, fuzzy
+msgid "Gulkana"
+msgstr "Quyana"
+
+#: my-evolution/Locations.h:874
+msgid "Gullfax C"
+msgstr ""
+
+#: my-evolution/Locations.h:875
+#, fuzzy
+msgid "Gunnison"
+msgstr "Reyunion"
+
+#: my-evolution/Locations.h:876
+msgid "Gunnison (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:877
+#, fuzzy
+msgid "Guriat"
+msgstr "Qvineya"
+
+#: my-evolution/Locations.h:878
+msgid "Gustavus"
+msgstr ""
+
+#: my-evolution/Locations.h:879
+#, fuzzy
+msgid "Guymon"
+msgstr "Quyana"
+
+#: my-evolution/Locations.h:880
+#, fuzzy
+msgid "Habana"
+msgstr "Albaniya"
+
+#: 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 ""
+
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+msgid "Hail"
+msgstr "Dolu"
+
+#: my-evolution/Locations.h:886
+msgid "Hailey-Sun Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:887
+#, fuzzy
+msgid "Haines"
+msgstr "Başlıqlar"
+
+#: 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 "Dolu fırtınası"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:902
+#, fuzzy
+msgid "Ha Noi"
+msgstr "Dolu"
+
+#: my-evolution/Locations.h:903
+msgid "Harbor Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:904
+#, fuzzy
+msgid "Harlingen"
+msgstr "Xəbərdarlıq"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:911
+#, fuzzy
+msgid "Hastings"
+msgstr "Başlıqlar"
+
+#: my-evolution/Locations.h:912
+msgid "Haugesund"
+msgstr ""
+
+#: my-evolution/Locations.h:913
+#, fuzzy
+msgid "Havre"
+msgstr "Yüngül pus"
+
+#: my-evolution/Locations.h:914
+#, fuzzy
+msgid "Hawaii"
+msgstr "Haiti"
+
+#: my-evolution/Locations.h:915
+msgid "Hawthorne"
+msgstr ""
+
+#: my-evolution/Locations.h:916
+#, fuzzy
+msgid "Hayden"
+msgstr "Başlıq"
+
+#: my-evolution/Locations.h:917
+msgid "Hayes River"
+msgstr ""
+
+#: my-evolution/Locations.h:918
+#, fuzzy
+msgid "Hays"
+msgstr "gün"
+
+#: 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 "Müqəddəs Helena"
+
+#: my-evolution/Locations.h:922
+msgid "Helsinki"
+msgstr ""
+
+#: my-evolution/Locations.h:923
+#, fuzzy
+msgid "Henderson"
+msgstr "Başlıq"
+
+#: 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 "Dolu fırtınası"
+
+#: my-evolution/Locations.h:930
+#, fuzzy
+msgid "Hilo"
+msgstr "Dolu"
+
+#: my-evolution/Locations.h:931
+msgid "Hinesville"
+msgstr ""
+
+#: my-evolution/Locations.h:932
+msgid "Hiroshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:933
+#, fuzzy
+msgid "Hobart"
+msgstr "Qovşaq"
+
+#: my-evolution/Locations.h:934
+#, fuzzy
+msgid "Hobbs"
+msgstr "Qovşaq"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:941
+#, fuzzy
+msgid "Holguin"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:942
+#, fuzzy
+msgid "Homer"
+msgstr "Ev"
+
+#: my-evolution/Locations.h:943
+#, fuzzy
+msgid "Homestead AFB"
+msgstr "Qurtarılıb "
+
+#: my-evolution/Locations.h:944
+#, fuzzy
+msgid "Hondo"
+msgstr "Tornado"
+
+#: 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 "gedən"
+
+#: my-evolution/Locations.h:954
+#, fuzzy
+msgid "Houma"
+msgstr "Ev"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:960
+#, fuzzy
+msgid "Howard AFB"
+msgstr "Fərqli Çatdır"
+
+#: my-evolution/Locations.h:961
+msgid "Hsinchu"
+msgstr ""
+
+#: my-evolution/Locations.h:962
+msgid "Huanuco"
+msgstr ""
+
+#: my-evolution/Locations.h:963
+msgid "Huehuetenango"
+msgstr ""
+
+#: my-evolution/Locations.h:964
+#, fuzzy
+msgid "Hulien"
+msgstr "Gizlə"
+
+#: my-evolution/Locations.h:965
+msgid "Humberside"
+msgstr ""
+
+#: my-evolution/Locations.h:967
+msgid "Huntington"
+msgstr ""
+
+#: my-evolution/Locations.h:968
+#, fuzzy
+msgid "Huntsville"
+msgstr "qədər"
+
+#: my-evolution/Locations.h:969
+msgid "Hurlburt"
+msgstr ""
+
+#: my-evolution/Locations.h:970
+#, fuzzy
+msgid "Huron"
+msgstr "Saat"
+
+#: 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 "Əsas"
+
+#: my-evolution/Locations.h:977
+#, fuzzy
+msgid "Ibiza"
+msgstr "Hindistan"
+
+#: my-evolution/Locations.h:979
+msgid "Ichikawa"
+msgstr ""
+
+#: my-evolution/Locations.h:980
+#, fuzzy
+msgid "Idaho"
+msgstr "Hindistan"
+
+#: 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 "İslandiya"
+
+#: my-evolution/Locations.h:985
+#, fuzzy
+msgid "Iliamna"
+msgstr "Daxili"
+
+#: my-evolution/Locations.h:986
+msgid "Illinois"
+msgstr ""
+
+#: my-evolution/Locations.h:987
+#, fuzzy
+msgid "Imperial"
+msgstr "Aprel"
+
+#: my-evolution/Locations.h:988
+msgid "Imperial (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:989
+msgid "Imperial Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:990
+#, fuzzy
+msgid "In Amenas"
+msgstr "Ermənistan"
+
+#: my-evolution/Locations.h:992
+#, fuzzy
+msgid "Indiana"
+msgstr "Hindistan"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:998
+#, fuzzy
+msgid "Inverness"
+msgstr "İşləyir"
+
+#: my-evolution/Locations.h:999
+msgid "Inyokern"
+msgstr ""
+
+#: my-evolution/Locations.h:1000
+#, fuzzy
+msgid "Iowa"
+msgstr "Norveç"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1005
+#, fuzzy
+msgid "Iraklion"
+msgstr "Məlumat"
+
+#: my-evolution/Locations.h:1006
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1008
+#, fuzzy
+msgid "Iron Mountain"
+msgstr "Daxil edən şərh"
+
+#: 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 "İtaliya"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1025
+#, fuzzy
+msgid "Izumo Airport"
+msgstr "Al"
+
+#: 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 "Yaponca"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1044
+#, fuzzy
+msgid "Jonkoping"
+msgstr "İşləyir"
+
+#: my-evolution/Locations.h:1045
+#, fuzzy
+msgid "Joplin"
+msgstr "Köçürdülür"
+
+#: 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 "Yaponiya"
+
+#: my-evolution/Locations.h:1050
+#, fuzzy
+msgid "Jujuy"
+msgstr "İyul"
+
+#: my-evolution/Locations.h:1051
+#, fuzzy
+msgid "Juliaca"
+msgstr "Ümumi"
+
+#: my-evolution/Locations.h:1052
+#, fuzzy
+msgid "Junction"
+msgstr "Reyunion"
+
+#: my-evolution/Locations.h:1053
+#, fuzzy
+msgid "Juneau"
+msgstr "İyun"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1059
+#, fuzzy
+msgid "Kalamata"
+msgstr "Malta"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1071
+#, fuzzy
+msgid "Karachi"
+msgstr "Mart"
+
+#: my-evolution/Locations.h:1072
+#, fuzzy
+msgid "Karup"
+msgstr "Nauru"
+
+#: 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 "Qazaxıstan"
+
+#: my-evolution/Locations.h:1080
+#, fuzzy
+msgid "Kearney"
+msgstr "Kenya"
+
+#: my-evolution/Locations.h:1081
+#, fuzzy
+msgid "Keene"
+msgstr "Görülmüş"
+
+#: 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 "Kenya"
+
+#: my-evolution/Locations.h:1085
+#, fuzzy
+msgid "Kenosha"
+msgstr "Kenya"
+
+#: my-evolution/Locations.h:1086
+#, fuzzy
+msgid "Kentucky"
+msgstr "Kenya"
+
+#: 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 "Almanya"
+
+#: my-evolution/Locations.h:1090
+msgid "Ketchikan"
+msgstr ""
+
+#: my-evolution/Locations.h:1091
+#, fuzzy
+msgid "Key West"
+msgstr "Qərb"
+
+#: 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 "Kuku Adaları"
+
+#: 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 "Kenya"
+
+#: my-evolution/Locations.h:1132
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1133
+#, fuzzy
+msgid "Korea, Republic of"
+msgstr "Çex Respublikası"
+
+#: 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 "Koreyaca"
+
+#: 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 "gələn"
+
+#: 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 "Makedoniya"
+
+#: my-evolution/Locations.h:1151
+msgid "La Coruna"
+msgstr ""
+
+#: my-evolution/Locations.h:1152
+#, fuzzy
+msgid "La Crosse"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1153
+msgid "La Esperanza"
+msgstr ""
+
+#: my-evolution/Locations.h:1154
+#, fuzzy
+msgid "Lafayette"
+msgstr "Mayot"
+
+#: my-evolution/Locations.h:1155
+msgid "La Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1156
+#, fuzzy
+msgid "Lahaina"
+msgstr "Bahreyn"
+
+#: my-evolution/Locations.h:1157
+#, fuzzy
+msgid "Lahore"
+msgstr "Daha _Enli"
+
+#: my-evolution/Locations.h:1158
+#, fuzzy
+msgid "Lajes"
+msgstr "Laos"
+
+#: 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 "İslandiya"
+
+#: my-evolution/Locations.h:1164
+msgid "Lake Tahoe"
+msgstr ""
+
+#: my-evolution/Locations.h:1165
+#, fuzzy
+msgid "Lakeview"
+msgstr "Nümayiş"
+
+#: my-evolution/Locations.h:1166
+#, fuzzy
+msgid "Lamar"
+msgstr "Myanmar"
+
+#: my-evolution/Locations.h:1167
+#, fuzzy
+msgid "La Mesa"
+msgstr "_Məktub İsmarışı"
+
+#: my-evolution/Locations.h:1168
+#, fuzzy
+msgid "Lamezia"
+msgstr "Qambiya"
+
+#: my-evolution/Locations.h:1169
+#, fuzzy
+msgid "Lamoni"
+msgstr "Livan"
+
+#: my-evolution/Locations.h:1170
+msgid "Lampedusa"
+msgstr ""
+
+#: my-evolution/Locations.h:1171
+#, fuzzy
+msgid "Lanai"
+msgstr "Dil"
+
+#: my-evolution/Locations.h:1172
+#, fuzzy
+msgid "Lancaster"
+msgstr "Mənzərə"
+
+#: my-evolution/Locations.h:1173
+#, fuzzy
+msgid "Lander"
+msgstr "Başlıq"
+
+#: my-evolution/Locations.h:1174
+#, fuzzy
+msgid "Langebaanweg"
+msgstr "Dil"
+
+#: my-evolution/Locations.h:1175
+msgid "Langley AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1176
+#, fuzzy
+msgid "Lannion"
+msgstr "Livan"
+
+#: my-evolution/Locations.h:1177
+#, fuzzy
+msgid "Lansing"
+msgstr "Xəbərdarlıq"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1182
+#, fuzzy
+msgid "Laredo"
+msgstr "Daha _Enli"
+
+#: my-evolution/Locations.h:1183
+#, fuzzy
+msgid "Larnaka"
+msgstr "Şri Lanka"
+
+#: my-evolution/Locations.h:1184
+#, fuzzy
+msgid "La Romana"
+msgstr "Ruminıya"
+
+#: 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 "Latviya"
+
+#: my-evolution/Locations.h:1189
+msgid "Latrobe"
+msgstr ""
+
+#: my-evolution/Locations.h:1191
+msgid "Laughlin"
+msgstr ""
+
+#: my-evolution/Locations.h:1192
+#, fuzzy
+msgid "Laurel"
+msgstr "Daha _Enli"
+
+#: my-evolution/Locations.h:1193
+#, fuzzy
+msgid "La Verne"
+msgstr "Keyp Verde"
+
+#: my-evolution/Locations.h:1194
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1195
+#, fuzzy
+msgid "Lawton"
+msgstr "Livan"
+
+#: my-evolution/Locations.h:1196
+msgid "Leadville"
+msgstr ""
+
+#: my-evolution/Locations.h:1197
+#, fuzzy
+msgid "Learmouth"
+msgstr "Lesoto"
+
+#: my-evolution/Locations.h:1199
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1201
+#, fuzzy
+msgid "Leesburg"
+msgstr "Lüksemburq"
+
+#: my-evolution/Locations.h:1202
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1205
+msgid "Leknes"
+msgstr ""
+
+#: my-evolution/Locations.h:1206
+#, fuzzy
+msgid "Le Mans"
+msgstr "İda"
+
+#: my-evolution/Locations.h:1207
+#, fuzzy
+msgid "Le Marine"
+msgstr "Martiniq"
+
+#: my-evolution/Locations.h:1208
+#, fuzzy
+msgid "Lemmon"
+msgstr "Livan"
+
+#: my-evolution/Locations.h:1209
+#, fuzzy
+msgid "Lemoore"
+msgstr "Sil"
+
+#: my-evolution/Locations.h:1210
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1212
+#, fuzzy
+msgid "Leuchars"
+msgstr "il"
+
+#: my-evolution/Locations.h:1213
+#, fuzzy
+msgid "Lewisburg"
+msgstr "Lüksemburq"
+
+#: my-evolution/Locations.h:1214
+#, fuzzy
+msgid "Lewiston"
+msgstr "Lesoto"
+
+#: my-evolution/Locations.h:1215
+#, fuzzy
+msgid "Lewistown"
+msgstr "Lesoto"
+
+#: my-evolution/Locations.h:1216
+#, fuzzy
+msgid "Lexington"
+msgstr "Livan"
+
+#: my-evolution/Locations.h:1217
+#, fuzzy
+msgid "Liberal"
+msgstr "Liberiya"
+
+#: my-evolution/Locations.h:1219
+#, fuzzy
+msgid "Libya"
+msgstr "Liberiya"
+
+#: my-evolution/Locations.h:1220
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1221
+msgid "Lidgerwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1222
+#, fuzzy
+msgid "Liege"
+msgstr "Niger"
+
+#: my-evolution/Locations.h:1223
+#, fuzzy
+msgid "Lihue"
+msgstr "Niu"
+
+#: my-evolution/Locations.h:1224
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1225
+msgid "Lima-Callao"
+msgstr ""
+
+#: my-evolution/Locations.h:1226
+#, fuzzy
+msgid "Limnos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1227
+#, fuzzy
+msgid "Limoges"
+msgstr "Ən Alçaq"
+
+#: my-evolution/Locations.h:1228
+#, fuzzy
+msgid "Limon"
+msgstr "ay"
+
+#: my-evolution/Locations.h:1229
+#, fuzzy
+msgid "Lincoln"
+msgstr "gələn"
+
+#: my-evolution/Locations.h:1230
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1231
+#, fuzzy
+msgid "Lisboa"
+msgstr "Liberiya"
+
+#: my-evolution/Locations.h:1232
+#, fuzzy
+msgid "Lista"
+msgstr "siyahı"
+
+#: my-evolution/Locations.h:1233
+#, fuzzy
+msgid "Litchfield"
+msgstr "Yüngül dolu yağışı"
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1240
+msgid "Ljubljana"
+msgstr ""
+
+#: my-evolution/Locations.h:1241
+#, fuzzy
+msgid "Logan"
+msgstr "NT Giriş"
+
+#: my-evolution/Locations.h:1242
+msgid "Lolland Falster"
+msgstr ""
+
+#: my-evolution/Locations.h:1243
+#, fuzzy
+msgid "Lompoc"
+msgstr "Şir"
+
+#: my-evolution/Locations.h:1244
+#, fuzzy
+msgid "London"
+msgstr "Livan"
+
+#: my-evolution/Locations.h:1245
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1249
+#, fuzzy
+msgid "Londrina"
+msgstr "Honduras"
+
+#: my-evolution/Locations.h:1250
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1253
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+#: my-evolution/Locations.h:1254
+#, fuzzy
+msgid "Los Alamos"
+msgstr "Alarm"
+
+#: my-evolution/Locations.h:1255
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1260
+#, fuzzy
+msgid "Lousiana"
+msgstr "Botsvana"
+
+#: my-evolution/Locations.h:1261
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1265
+#, fuzzy
+msgid "Lugano"
+msgstr "Livan"
+
+#: my-evolution/Locations.h:1266
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1267
+#, fuzzy
+msgid "Luton"
+msgstr "gedən"
+
+#: my-evolution/Locations.h:1269
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1270
+#, fuzzy
+msgid "Luxor"
+msgstr "Lüksemburq"
+
+#: my-evolution/Locations.h:1271
+#, fuzzy
+msgid "Lviv"
+msgstr "Latviya"
+
+#: my-evolution/Locations.h:1272
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1275
+msgid "Lyon-Satolas"
+msgstr ""
+
+#: my-evolution/Locations.h:1276
+#, fuzzy
+msgid "Maastricht"
+msgstr "Mart"
+
+#: my-evolution/Locations.h:1277
+#, fuzzy
+msgid "Macae"
+msgstr "Makau"
+
+#: my-evolution/Locations.h:1278
+#, fuzzy
+msgid "Macapa"
+msgstr "Makau"
+
+#: my-evolution/Locations.h:1279
+#, fuzzy
+msgid "Maceio"
+msgstr "Makedoniya"
+
+#: my-evolution/Locations.h:1280
+#, fuzzy
+msgid "Macon"
+msgstr "İda"
+
+#: my-evolution/Locations.h:1281
+#, fuzzy
+msgid "Madinah"
+msgstr "Makedoniya"
+
+#: my-evolution/Locations.h:1282
+#, fuzzy
+msgid "Madison"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1283
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1285
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+#: my-evolution/Locations.h:1286
+#, fuzzy
+msgid "Magadan"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:1287
+msgid "Magdalena"
+msgstr ""
+
+#: my-evolution/Locations.h:1288
+#, fuzzy
+msgid "Maine"
+msgstr "İda"
+
+#: my-evolution/Locations.h:1289
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1290
+msgid "Makkah"
+msgstr ""
+
+#: my-evolution/Locations.h:1291
+#, fuzzy
+msgid "Makung"
+msgstr "İda"
+
+#: my-evolution/Locations.h:1292
+#, fuzzy
+msgid "Malad City"
+msgstr "Malavi"
+
+#: my-evolution/Locations.h:1293
+#, fuzzy
+msgid "Malaga"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1294
+#, fuzzy
+msgid "Malatya"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1295
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1296
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1298
+msgid "Mammoth Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1299
+#, fuzzy
+msgid "Managua"
+msgstr "İdarəci"
+
+#: my-evolution/Locations.h:1300
+#, fuzzy
+msgid "Manassas"
+msgstr "Malayziya"
+
+#: my-evolution/Locations.h:1301
+#, fuzzy
+msgid "Manaus"
+msgstr "Makau"
+
+#: my-evolution/Locations.h:1302
+#, fuzzy
+msgid "Manchester"
+msgstr "Oxşayır:"
+
+#: my-evolution/Locations.h:1303
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+msgid "Manhattan"
+msgstr ""
+
+#: my-evolution/Locations.h:1305
+#, fuzzy
+msgid "Manisa"
+msgstr "İda"
+
+#: my-evolution/Locations.h:1306
+#, fuzzy
+msgid "Manistee"
+msgstr "Çən"
+
+#: my-evolution/Locations.h:1307
+#, fuzzy
+msgid "Manitoba"
+msgstr "Ana vasitə çubuğu"
+
+#: my-evolution/Locations.h:1308
+msgid "Manitowoc"
+msgstr ""
+
+#: my-evolution/Locations.h:1309
+#, fuzzy
+msgid "Mankato"
+msgstr "Monako"
+
+#: my-evolution/Locations.h:1310
+#, fuzzy
+msgid "Mansfield"
+msgstr "Məktub"
+
+#: my-evolution/Locations.h:1311
+#, fuzzy
+msgid "Manta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1312
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1313
+#, fuzzy
+msgid "Maraba"
+msgstr "Mavritaniya"
+
+#: my-evolution/Locations.h:1314
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1315
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1316
+#, fuzzy
+msgid "Marathon"
+msgstr "Mart"
+
+#: my-evolution/Locations.h:1317
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1318
+#, fuzzy
+msgid "Margarita"
+msgstr "Mavritaniya"
+
+#: my-evolution/Locations.h:1319
+#, fuzzy
+msgid "Marianna"
+msgstr "Mavritaniya"
+
+#: my-evolution/Locations.h:1320
+#, fuzzy
+msgid "Marib"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1321
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1322
+#, fuzzy
+msgid "Marietta"
+msgstr "Mavritaniya"
+
+#: my-evolution/Locations.h:1323
+msgid "Marino di Ravenna"
+msgstr ""
+
+#: my-evolution/Locations.h:1324
+#, fuzzy
+msgid "Marion"
+msgstr "Kənarlar"
+
+#: my-evolution/Locations.h:1325
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1326
+#, fuzzy
+msgid "Marquette"
+msgstr "Martiniq"
+
+#: my-evolution/Locations.h:1327
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+msgid "Marseilles"
+msgstr ""
+
+#: my-evolution/Locations.h:1329
+#, fuzzy
+msgid "Marshall"
+msgstr "Marşal Adaları"
+
+#: my-evolution/Locations.h:1330
+#, fuzzy
+msgid "Marshalltown"
+msgstr "Marşal Adaları"
+
+#: my-evolution/Locations.h:1331
+msgid "Marshfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1332
+#, fuzzy
+msgid "Marte"
+msgstr "Martiniq"
+
+#: my-evolution/Locations.h:1333
+#, fuzzy
+msgid "Marthas Vineyard"
+msgstr "Ox_unmamış olaraq İşarələ"
+
+#: my-evolution/Locations.h:1334
+#, fuzzy
+msgid "Martinsburg"
+msgstr "Martiniq"
+
+#: my-evolution/Locations.h:1335
+#, fuzzy
+msgid "Martinsville"
+msgstr "Martiniq"
+
+#: my-evolution/Locations.h:1336
+#, fuzzy
+msgid "Maryland"
+msgstr "İrlandiya"
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1339
+msgid "Mashhad"
+msgstr ""
+
+#: my-evolution/Locations.h:1340
+#, fuzzy
+msgid "Masirah"
+msgstr "Malayziya"
+
+#: my-evolution/Locations.h:1341
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1343
+#, fuzzy
+msgid "Massena"
+msgstr "Makedoniya"
+
+#: my-evolution/Locations.h:1344
+#, fuzzy
+msgid "Matamoros"
+msgstr "Komor"
+
+#: my-evolution/Locations.h:1345
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1347
+msgid "Matsuyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1348
+#, fuzzy
+msgid "Mattoon"
+msgstr "İda"
+
+#: my-evolution/Locations.h:1349
+#, fuzzy
+msgid "Mayaguez"
+msgstr "İdarəci"
+
+#: my-evolution/Locations.h:1350
+#, fuzzy
+msgid "Mayport"
+msgstr "Mayot"
+
+#: my-evolution/Locations.h:1351
+#, fuzzy
+msgid "Mazatlan"
+msgstr "Qazaxıstan"
+
+#: my-evolution/Locations.h:1352
+#, fuzzy
+msgid "Mazu"
+msgstr "Makau"
+
+#: my-evolution/Locations.h:1353
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1354
+msgid "McAllen"
+msgstr ""
+
+#: my-evolution/Locations.h:1355
+#, fuzzy
+msgid "McCall"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1356
+#, fuzzy
+msgid "McCarthy"
+msgstr "Mart"
+
+#: my-evolution/Locations.h:1357
+#, fuzzy
+msgid "McClellan"
+msgstr "İslandiya"
+
+#: my-evolution/Locations.h:1358
+#, fuzzy
+msgid "McComb"
+msgstr "Şir"
+
+#: my-evolution/Locations.h:1359
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1361
+msgid "Mc Gregor"
+msgstr ""
+
+#: my-evolution/Locations.h:1362
+#, fuzzy
+msgid "Meacham"
+msgstr "Makau"
+
+#: my-evolution/Locations.h:1363
+#, fuzzy
+msgid "Medford"
+msgstr "əvvəl"
+
+#: my-evolution/Locations.h:1364
+msgid "Medicine Lodge"
+msgstr ""
+
+#: my-evolution/Locations.h:1365
+#, fuzzy
+msgid "Mehamn"
+msgstr "İda"
+
+#: my-evolution/Locations.h:1366
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1367
+msgid "Melbourne"
+msgstr ""
+
+#: my-evolution/Locations.h:1368
+#, fuzzy
+msgid "Melfa"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1369
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1373
+#, fuzzy
+msgid "Mendoza"
+msgstr "Makedoniya"
+
+#: my-evolution/Locations.h:1374
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1377
+msgid "Merced"
+msgstr ""
+
+#: my-evolution/Locations.h:1378
+#, fuzzy
+msgid "Merida"
+msgstr "Cümə"
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1380
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1381
+#, fuzzy
+msgid "Merril Field"
+msgstr "_Göndərən Girişi"
+
+#: my-evolution/Locations.h:1382
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1386
+#, fuzzy
+msgid "Mexicali"
+msgstr "Meksika"
+
+#: my-evolution/Locations.h:1388
+#, fuzzy
+msgid "Miami"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1391
+msgid "Michigan"
+msgstr ""
+
+#: my-evolution/Locations.h:1392
+#, fuzzy
+msgid "Middle East"
+msgstr "_Orta ad:"
+
+#: my-evolution/Locations.h:1393
+#, fuzzy
+msgid "Middleton Island"
+msgstr "Solomon Adaları"
+
+#: my-evolution/Locations.h:1394
+#, fuzzy
+msgid "Middletown"
+msgstr "_Orta ad:"
+
+#: my-evolution/Locations.h:1395
+#, fuzzy
+msgid "Midland"
+msgstr "Finlandiya"
+
+#: my-evolution/Locations.h:1396
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1398
+msgid "Milano/Malpensa"
+msgstr ""
+
+#: my-evolution/Locations.h:1399
+#, fuzzy
+msgid "Miles City"
+msgstr "Fayl növü:"
+
+#: my-evolution/Locations.h:1400
+#, fuzzy
+msgid "Milford"
+msgstr "üçün"
+
+#: my-evolution/Locations.h:1401
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1402
+msgid "Millville"
+msgstr ""
+
+#: my-evolution/Locations.h:1403
+#, fuzzy
+msgid "Milton"
+msgstr "%s a(ə) məktub göndər"
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1407
+#, fuzzy
+msgid "Minatitlan"
+msgstr "Mavritaniya"
+
+#: my-evolution/Locations.h:1408
+#, fuzzy
+msgid "Minchumina"
+msgstr "gələn"
+
+#: my-evolution/Locations.h:1409
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1414
+#, fuzzy
+msgid "Minnesota"
+msgstr "Mikroneziya"
+
+#: my-evolution/Locations.h:1415
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1416
+#, fuzzy
+msgid "Minot"
+msgstr "deyil"
+
+#: my-evolution/Locations.h:1417
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1419
+msgid "Mississippi"
+msgstr ""
+
+#: my-evolution/Locations.h:1420
+#, fuzzy
+msgid "Missoula"
+msgstr "Miss"
+
+#: my-evolution/Locations.h:1421
+#, fuzzy
+msgid "Missouri"
+msgstr "Miss"
+
+#: my-evolution/Locations.h:1422
+#, fuzzy
+msgid "Mitchell"
+msgstr "Oxşayır:"
+
+#: my-evolution/Locations.h:1423
+#, fuzzy
+msgid "Mitilini"
+msgstr "Məktublaşma qrupu"
+
+#: my-evolution/Locations.h:1424
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1425
+msgid "Miyazaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1426
+#, fuzzy
+msgid "Moa"
+msgstr "B.ei"
+
+#: my-evolution/Locations.h:1427
+#, fuzzy
+msgid "Mobile Downtown"
+msgstr "Əl Telefonu"
+
+#: my-evolution/Locations.h:1428
+msgid "Mobile Regional Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1429
+#, fuzzy
+msgid "Mobridge"
+msgstr "Əl Telefonu"
+
+#: my-evolution/Locations.h:1430
+#, fuzzy
+msgid "Modesto"
+msgstr "Orta çən"
+
+#: my-evolution/Locations.h:1431
+msgid "Mo I Rana"
+msgstr ""
+
+#: my-evolution/Locations.h:1432
+#, fuzzy
+msgid "Mojave"
+msgstr "Daşı"
+
+#: my-evolution/Locations.h:1433
+#, fuzzy
+msgid "Molde"
+msgstr "Əl Telefonu"
+
+#: my-evolution/Locations.h:1434
+#, fuzzy
+msgid "Moldova"
+msgstr "Bazar ertəsi"
+
+#: my-evolution/Locations.h:1435
+msgid "Moline-Quad Cities"
+msgstr ""
+
+#: my-evolution/Locations.h:1436
+#, fuzzy
+msgid "Molokai"
+msgstr "Malavi"
+
+#: my-evolution/Locations.h:1437
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1438
+msgid "Monchengladbach"
+msgstr ""
+
+#: my-evolution/Locations.h:1439
+#, fuzzy
+msgid "Monclova"
+msgstr "Monako"
+
+#: my-evolution/Locations.h:1440
+#, fuzzy
+msgid "Moncton"
+msgstr "Monako"
+
+#: my-evolution/Locations.h:1441
+#, fuzzy
+msgid "Monida"
+msgstr "Bazar ertəsi"
+
+#: my-evolution/Locations.h:1442
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+#: my-evolution/Locations.h:1443
+#, fuzzy
+msgid "Monroe"
+msgstr "Monako"
+
+#: my-evolution/Locations.h:1444
+#, fuzzy
+msgid "Montague"
+msgstr "İdarəci"
+
+#: my-evolution/Locations.h:1445
+#, fuzzy
+msgid "Montana"
+msgstr "Botsvana"
+
+#: my-evolution/Locations.h:1446
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1448
+#, fuzzy
+msgid "Monte Bisbino"
+msgstr "Orta qar yadışı"
+
+#: my-evolution/Locations.h:1449
+msgid "Monte Calamita"
+msgstr ""
+
+#: my-evolution/Locations.h:1450
+#, fuzzy
+msgid "Monte Cimone"
+msgstr "Aylıq Nümayiş"
+
+#: my-evolution/Locations.h:1451
+#, fuzzy
+msgid "Montego Bay"
+msgstr "Monqolustan"
+
+#: my-evolution/Locations.h:1452
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1453
+#, fuzzy
+msgid "Monterey"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1454
+#, fuzzy
+msgid "Monterrey"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1458
+#, fuzzy
+msgid "Montgomery"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1459
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1460
+#, fuzzy
+msgid "Monticello"
+msgstr "Monako"
+
+#: my-evolution/Locations.h:1461
+#, fuzzy
+msgid "Montpelier"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1465
+#, fuzzy
+msgid "Montrose"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1466
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1467
+#, fuzzy
+msgid "Morelia"
+msgstr "Monqolustan"
+
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Morgantown"
+msgstr "Quruluş"
+
+#: my-evolution/Locations.h:1469
+#, fuzzy
+msgid "Moriarty"
+msgstr "İlk"
+
+#: my-evolution/Locations.h:1471
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1474
+msgid "Moses Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1475
+#, fuzzy
+msgid "Mosinee"
+msgstr "Əl Telefonu"
+
+#: my-evolution/Locations.h:1476
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain Home"
+msgstr ""
+
+#: my-evolution/Locations.h:1479
+#, fuzzy
+msgid "Mountain View"
+msgstr "Aylıq Nümayiş"
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1482
+#, fuzzy
+msgid "Mount Shasta"
+msgstr "Cənubi Şərq"
+
+#: my-evolution/Locations.h:1483
+#, fuzzy
+msgid "Mount Vernon"
+msgstr "Aylıq Nümayiş"
+
+#: my-evolution/Locations.h:1484
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1487
+msgid "Muir"
+msgstr ""
+
+#: my-evolution/Locations.h:1488
+#, fuzzy
+msgid "Mullan"
+msgstr "İda"
+
+#: my-evolution/Locations.h:1489
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1490
+msgid "Munchen"
+msgstr ""
+
+#: my-evolution/Locations.h:1491
+#, fuzzy
+msgid "Muncie"
+msgstr "İyun"
+
+#: my-evolution/Locations.h:1492
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1493
+#, fuzzy
+msgid "Murcia"
+msgstr "Mavritaniya"
+
+#: my-evolution/Locations.h:1494
+msgid "Murmansk"
+msgstr ""
+
+#: my-evolution/Locations.h:1495
+#, fuzzy
+msgid "Mus"
+msgstr "Məs"
+
+#: my-evolution/Locations.h:1496
+#, fuzzy
+msgid "Muscatine"
+msgstr "Martiniq"
+
+#: my-evolution/Locations.h:1497
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1498
+msgid "Muskegon"
+msgstr ""
+
+#: my-evolution/Locations.h:1499
+#, fuzzy
+msgid "Mykonos"
+msgstr "knots"
+
+#: my-evolution/Locations.h:1500
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1507
+#, fuzzy
+msgid "Najran"
+msgstr "Bahreyn"
+
+#: my-evolution/Locations.h:1508
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1509
+msgid "Nalchik"
+msgstr ""
+
+#: my-evolution/Locations.h:1510
+#, fuzzy
+msgid "Namsos"
+msgstr "Ad"
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1513
+msgid "Nankishirahama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1514
+#, fuzzy
+msgid "Nanning"
+msgstr "Xəbərdarlıq"
+
+#: my-evolution/Locations.h:1515
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1516
+msgid "Nantucket"
+msgstr ""
+
+#: my-evolution/Locations.h:1517
+#, fuzzy
+msgid "Napa"
+msgstr "Yaponiya"
+
+#: my-evolution/Locations.h:1518
+#, fuzzy
+msgid "Naples"
+msgstr "Ad"
+
+#: my-evolution/Locations.h:1519
+#, fuzzy
+msgid "Napoli"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1520
+#, fuzzy
+msgid "Narvik"
+msgstr "ULəqəb"
+
+#: my-evolution/Locations.h:1521
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1524
+msgid "Nassau"
+msgstr ""
+
+#: my-evolution/Locations.h:1525
+#, fuzzy
+msgid "Natal"
+msgstr "İtaliya"
+
+#: my-evolution/Locations.h:1526
+#, fuzzy
+msgid "Natchez"
+msgstr "Oxşayır:"
+
+#: my-evolution/Locations.h:1527
+msgid "Nawabshah"
+msgstr ""
+
+#: my-evolution/Locations.h:1528
+#, fuzzy
+msgid "Nebraska"
+msgstr "Yeni Vəzifə"
+
+#: my-evolution/Locations.h:1529
+msgid "Needles"
+msgstr ""
+
+#: my-evolution/Locations.h:1530
+#, fuzzy
+msgid "Nenana"
+msgstr "Qrenada"
+
+#: my-evolution/Locations.h:1532
+msgid "Neuquen"
+msgstr ""
+
+#: my-evolution/Locations.h:1533
+#, fuzzy
+msgid "Nevada"
+msgstr "Qrenada"
+
+#: my-evolution/Locations.h:1534
+#, fuzzy
+msgid "Newark"
+msgstr "Yeni Vəzifə"
+
+#: my-evolution/Locations.h:1535
+#, fuzzy
+msgid "New Bedford"
+msgstr "Yeni Bəsləmə"
+
+#: my-evolution/Locations.h:1536
+#, fuzzy
+msgid "New Bern"
+msgstr "Yeni Zellandiya"
+
+#: my-evolution/Locations.h:1537
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1539
+msgid "Newburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1540
+#, fuzzy
+msgid "Newcastle"
+msgstr "Xəbərlər"
+
+#: my-evolution/Locations.h:1541
+#, fuzzy
+msgid "New Delhi/Palam"
+msgstr "Yeni Zellandiya"
+
+#: my-evolution/Locations.h:1542
+#, fuzzy
+msgid "Newfoundland"
+msgstr "Yeni Zellandiya"
+
+#: my-evolution/Locations.h:1543
+msgid "New Hampshire"
+msgstr ""
+
+#: my-evolution/Locations.h:1544
+#, fuzzy
+msgid "New Haven"
+msgstr "Yeni Kaledoniya"
+
+#: my-evolution/Locations.h:1545
+#, fuzzy
+msgid "New Iberia"
+msgstr "Yeni Kaledoniya"
+
+#: my-evolution/Locations.h:1546
+#, fuzzy
+msgid "New Jersey"
+msgstr "Yeni İsmarış"
+
+#: my-evolution/Locations.h:1547
+#, fuzzy
+msgid "New Mexico"
+msgstr "Meksika"
+
+#: my-evolution/Locations.h:1548
+#, fuzzy
+msgid "New Orleans"
+msgstr "Hollandiya"
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1550
+msgid "New Orleans NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1551
+#, fuzzy
+msgid "Newport"
+msgstr "Şimal"
+
+#: my-evolution/Locations.h:1552
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1553
+msgid "New Port Richey"
+msgstr ""
+
+#: my-evolution/Locations.h:1554
+#, fuzzy
+msgid "New River"
+msgstr "Yeni VFolder"
+
+#: my-evolution/Locations.h:1555
+msgid "New Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1556
+#, fuzzy
+msgid "Newton"
+msgstr "Yeni"
+
+#: my-evolution/Locations.h:1557
+#, fuzzy
+msgid "New York"
+msgstr "Yeni VFolder"
+
+#: my-evolution/Locations.h:1558
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1559
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1561
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1564
+msgid "Niigata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1565
+#, fuzzy
+msgid "Nimes-Garons"
+msgstr "Ölçülər :"
+
+#: my-evolution/Locations.h:1566
+#, fuzzy
+msgid "Nipawin"
+msgstr "İspaniya"
+
+#: my-evolution/Locations.h:1567
+#, fuzzy
+msgid "Nis"
+msgstr "dir(dır)"
+
+#: my-evolution/Locations.h:1568
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1570
+msgid "N Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1571
+#, fuzzy
+msgid "Nogales"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:1572
+#, fuzzy
+msgid "Nome"
+msgstr "Ad"
+
+#: my-evolution/Locations.h:1573
+#, fuzzy
+msgid "Norfolk"
+msgstr "Norfolk Adaları"
+
+#: my-evolution/Locations.h:1575
+#, fuzzy
+msgid "Norfolk NAS"
+msgstr "Norfolk Adaları"
+
+#: my-evolution/Locations.h:1576
+#, fuzzy
+msgid "Norrkoping"
+msgstr "İşləyir"
+
+#: my-evolution/Locations.h:1577
+#, fuzzy
+msgid "North Adams"
+msgstr "Şimali Şərq"
+
+#: my-evolution/Locations.h:1578
+#, fuzzy
+msgid "North Bend"
+msgstr "Şimal"
+
+#: my-evolution/Locations.h:1579
+msgid "North Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:1580
+#, fuzzy
+msgid "North Conway"
+msgstr "Norveç"
+
+#: my-evolution/Locations.h:1581
+#, fuzzy
+msgid "North Dakota"
+msgstr "Şimali Şərq"
+
+#: my-evolution/Locations.h:1582
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1583
+msgid "North Kingstown"
+msgstr ""
+
+#: my-evolution/Locations.h:1584
+#, fuzzy
+msgid "North Platte"
+msgstr "Şimali Şərq"
+
+#: my-evolution/Locations.h:1585
+#, fuzzy
+msgid "Northway"
+msgstr "Norveç"
+
+#: my-evolution/Locations.h:1586
+#, fuzzy
+msgid "Northwest Territories"
+msgstr "Cənubi Fransız Sahələri"
+
+#: my-evolution/Locations.h:1588
+#, fuzzy
+msgid "Norwich"
+msgstr "Şimal"
+
+#: my-evolution/Locations.h:1589
+#, fuzzy
+msgid "Norwood"
+msgstr "Norveç"
+
+#: my-evolution/Locations.h:1590
+#, fuzzy
+msgid "Notodden"
+msgstr "Qeyd"
+
+#: my-evolution/Locations.h:1591
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1595
+msgid "Nueva Ocotepeque"
+msgstr ""
+
+#: my-evolution/Locations.h:1596
+#, fuzzy
+msgid "Nuevo Laredo"
+msgstr "Başlamayıb"
+
+#: my-evolution/Locations.h:1597
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+msgid "Oahu"
+msgstr ""
+
+#: my-evolution/Locations.h:1600
+msgid "Oak Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:1601
+#, fuzzy
+msgid "Oakland"
+msgstr "Tayland"
+
+#: my-evolution/Locations.h:1602
+#, fuzzy
+msgid "Oaxaca"
+msgstr "Yamayka"
+
+#: my-evolution/Locations.h:1603
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+msgid "Obihiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1605
+#, fuzzy
+msgid "Ocala"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1606
+#, fuzzy
+msgid "Oceanside"
+msgstr "İslandiya"
+
+#: my-evolution/Locations.h:1607
+#, fuzzy
+msgid "Odense"
+msgstr "Bir"
+
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1609
+#, fuzzy
+msgid "Oelwen"
+msgstr "Aç"
+
+#: my-evolution/Locations.h:1610
+#, fuzzy
+msgid "Ogden"
+msgstr "Aç"
+
+#: my-evolution/Locations.h:1611
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1613
+msgid "Ohio"
+msgstr ""
+
+#: my-evolution/Locations.h:1614
+#, fuzzy
+msgid "Ohrid"
+msgstr "Başqa"
+
+#: my-evolution/Locations.h:1615
+msgid "Oita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1616
+#, fuzzy
+msgid "Ojika Island"
+msgstr "Kuku Adaları"
+
+#: my-evolution/Locations.h:1617
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1624
+#, fuzzy
+msgid "Okushiri Island"
+msgstr "Britaniya Virgin Adaları"
+
+#: my-evolution/Locations.h:1625
+#, fuzzy
+msgid "Olathe"
+msgstr "Başqa"
+
+#: my-evolution/Locations.h:1626
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1627
+#, fuzzy
+msgid "Olbia"
+msgstr "Albaniya"
+
+#: my-evolution/Locations.h:1628
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1629
+#, fuzzy
+msgid "Omaha"
+msgstr "Oman"
+
+#: my-evolution/Locations.h:1630
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1631
+#, fuzzy
+msgid "Omak"
+msgstr "Oman"
+
+#: my-evolution/Locations.h:1633
+msgid "Ominato Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1634
+msgid "Omsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1635
+msgid "O'Neill"
+msgstr ""
+
+#: my-evolution/Locations.h:1636
+#, fuzzy
+msgid "Ontario"
+msgstr "İstiqamət"
+
+#: my-evolution/Locations.h:1637
+#, fuzzy
+msgid "Oostende"
+msgstr "Ziyarətçilər"
+
+#: my-evolution/Locations.h:1638
+#, fuzzy
+msgid "Oran"
+msgstr "Oman"
+
+#: my-evolution/Locations.h:1639
+msgid "Oran/Es Senia"
+msgstr ""
+
+#: my-evolution/Locations.h:1640
+#, fuzzy
+msgid "Orange"
+msgstr "Qur"
+
+#: my-evolution/Locations.h:1641
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1642
+msgid "Ord-Sharp"
+msgstr ""
+
+#: my-evolution/Locations.h:1643
+#, fuzzy
+msgid "Oregon"
+msgstr "Qur"
+
+#: my-evolution/Locations.h:1644
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1645
+#, fuzzy
+msgid "Orland"
+msgstr "İrlandiya"
+
+#: my-evolution/Locations.h:1646
+#, fuzzy
+msgid "Orlando"
+msgstr "İrlandiya"
+
+#: my-evolution/Locations.h:1647
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1648
+msgid "Orsta-Volda"
+msgstr ""
+
+#: my-evolution/Locations.h:1649
+#, fuzzy
+msgid "Oruro"
+msgstr "Xəta"
+
+#: my-evolution/Locations.h:1650
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1652
+#, fuzzy
+msgid "Oscoda"
+msgstr "saniyə"
+
+#: my-evolution/Locations.h:1653
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1657
+#, fuzzy
+msgid "Ostrava"
+msgstr "Avstraliya"
+
+#: my-evolution/Locations.h:1658
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1661
+#, fuzzy
+msgid "Owyhee"
+msgstr "həftə"
+
+#: my-evolution/Locations.h:1662
+#, fuzzy
+msgid "Oxford"
+msgstr "üçün"
+
+#: my-evolution/Locations.h:1663
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1670
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1671
+#, fuzzy
+msgid "Paganella"
+msgstr "Səhifə"
+
+#: my-evolution/Locations.h:1674
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1675
+#, fuzzy
+msgid "Palacios"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1676
+#, fuzzy
+msgid "Palermo"
+msgstr "Peycer"
+
+#: my-evolution/Locations.h:1677
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1678
+#, fuzzy
+msgid "Palmdale"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1679
+#, fuzzy
+msgid "Palmer"
+msgstr "Peycer"
+
+#: my-evolution/Locations.h:1680
+#, fuzzy
+msgid "Palm Springs"
+msgstr "Məktub Qurğuları"
+
+#: my-evolution/Locations.h:1681
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1682
+#, fuzzy
+msgid "Pamplona"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1684
+#, fuzzy
+msgid "Panama City"
+msgstr "Panama"
+
+#: my-evolution/Locations.h:1685
+#, fuzzy
+msgid "Pantelleria"
+msgstr "Ləğv Edildi"
+
+#: my-evolution/Locations.h:1686
+#, fuzzy
+msgid "Papa"
+msgstr "Yaponiya"
+
+#: my-evolution/Locations.h:1687
+#, fuzzy
+msgid "Paphos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1689
+#, fuzzy
+msgid "Paris"
+msgstr "İlk"
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1692
+#, fuzzy
+msgid "Paris/Orly"
+msgstr "Qismi çisələmə"
+
+#: my-evolution/Locations.h:1693
+msgid "Parkersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1694
+#, fuzzy
+msgid "Pasco"
+msgstr "Parol"
+
+#: my-evolution/Locations.h:1695
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1700
+msgid "Passo Rolle"
+msgstr ""
+
+#: my-evolution/Locations.h:1701
+#, fuzzy
+msgid "Patna"
+msgstr "Panama"
+
+#: my-evolution/Locations.h:1702
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1706
+#, fuzzy
+msgid "Paysandu"
+msgstr "Ağır qum"
+
+#: my-evolution/Locations.h:1707
+#, fuzzy
+msgid "Payson"
+msgstr "Səs çal:"
+
+#: my-evolution/Locations.h:1708
+#, fuzzy
+msgid "Pellston"
+msgstr "Sual"
+
+#: my-evolution/Locations.h:1709
+#, fuzzy
+msgid "Pelotas"
+msgstr "Yenilə"
+
+#: my-evolution/Locations.h:1710
+#, fuzzy
+msgid "Pendleton"
+msgstr "Seçki : "
+
+#: my-evolution/Locations.h:1711
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1716
+#, fuzzy
+msgid "Peoria"
+msgstr "Gürcüstan"
+
+#: my-evolution/Locations.h:1717
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1718
+msgid "Pereira/Matecana"
+msgstr ""
+
+#: my-evolution/Locations.h:1719
+#, fuzzy
+msgid "Perm"
+msgstr "İlk"
+
+#: my-evolution/Locations.h:1720
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1721
+msgid "Perry-Foley"
+msgstr ""
+
+#: my-evolution/Locations.h:1722
+#, fuzzy
+msgid "Perth"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1724
+#, fuzzy
+msgid "Perugia"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1725
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1730
+#, fuzzy
+msgid "Philip"
+msgstr "Filippin"
+
+#: my-evolution/Locations.h:1731
+#, fuzzy
+msgid "Philipsburg"
+msgstr "Filippin"
+
+#: my-evolution/Locations.h:1732
+#, fuzzy
+msgid "Phillips"
+msgstr "Filippin"
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1739
+msgid "Piedras Negras"
+msgstr ""
+
+#: my-evolution/Locations.h:1740
+#, fuzzy
+msgid "Pierre"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1741
+msgid "Pietersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1742
+#, fuzzy
+msgid "Pikeville"
+msgstr "Nümayiş"
+
+#: my-evolution/Locations.h:1743
+msgid "Pine Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+msgid "Pirassununga"
+msgstr ""
+
+#: my-evolution/Locations.h:1747
+#, fuzzy
+msgid "Pisa"
+msgstr "Pakistan"
+
+#: my-evolution/Locations.h:1748
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1753
+#, fuzzy
+msgid "Plymouth"
+msgstr "ay"
+
+#: my-evolution/Locations.h:1754
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+msgid "Pocos De Caldas"
+msgstr ""
+
+#: my-evolution/Locations.h:1756
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1757
+#, fuzzy
+msgid "Podgorica Titograd"
+msgstr "Qismi tornado"
+
+#: my-evolution/Locations.h:1758
+msgid "Pohang Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1759
+#, fuzzy
+msgid "Point Hope"
+msgstr "Zərfi Çap Et"
+
+#: my-evolution/Locations.h:1760
+#, fuzzy
+msgid "Point Lay"
+msgstr "İcmalı Çap Et"
+
+#: my-evolution/Locations.h:1761
+#, fuzzy
+msgid "Point Mugu"
+msgstr "İsmarışı Çap Et"
+
+#: my-evolution/Locations.h:1762
+msgid "Point Piedras Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1763
+#, fuzzy
+msgid "Poitiers"
+msgstr "Seçənəklər"
+
+#: my-evolution/Locations.h:1765
+msgid "Pompano Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1766
+#, fuzzy
+msgid "Ponca City"
+msgstr "Telefon Siyahısı"
+
+#: my-evolution/Locations.h:1767
+#, fuzzy
+msgid "Ponce"
+msgstr "Yoxdur"
+
+#: my-evolution/Locations.h:1768
+msgid "Ponta Pora"
+msgstr ""
+
+#: my-evolution/Locations.h:1769
+#, fuzzy
+msgid "Pontiac"
+msgstr "Əlaqələr"
+
+#: my-evolution/Locations.h:1770
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1771
+msgid "Poplar Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1772
+#, fuzzy
+msgid "Poprad"
+msgstr "Polşa"
+
+#: my-evolution/Locations.h:1773
+#, fuzzy
+msgid "Port Alexander"
+msgstr "Təqvimi çap et"
+
+#: my-evolution/Locations.h:1774
+msgid "Port Alsworth"
+msgstr ""
+
+#: my-evolution/Locations.h:1775
+#, fuzzy
+msgid "Port Angeles"
+msgstr "Zərfi Çap Et"
+
+#: my-evolution/Locations.h:1776
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1777
+msgid "Port Elizabeth"
+msgstr ""
+
+#: my-evolution/Locations.h:1778
+#, fuzzy
+msgid "Porterville"
+msgstr "Nümayiş"
+
+#: my-evolution/Locations.h:1779
+#, fuzzy
+msgid "Port Hardy"
+msgstr "Kartı çap et"
+
+#: my-evolution/Locations.h:1780
+#, fuzzy
+msgid "Port Hedland"
+msgstr "Polşa"
+
+#: my-evolution/Locations.h:1781
+msgid "Port Heiden"
+msgstr ""
+
+#: my-evolution/Locations.h:1782
+#, fuzzy
+msgid "Portland"
+msgstr "Polşa"
+
+#: my-evolution/Locations.h:1783
+#, fuzzy
+msgid "Porto"
+msgstr "_Qapı:"
+
+#: my-evolution/Locations.h:1784
+#, fuzzy
+msgid "Porto Alegre"
+msgstr "Gedişat"
+
+#: my-evolution/Locations.h:1785
+msgid "Porto Alegre Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:1786
+#, fuzzy
+msgid "Portoroz"
+msgstr "Portret"
+
+#: my-evolution/Locations.h:1787
+#, fuzzy
+msgid "Porto Santo"
+msgstr "Portret"
+
+#: my-evolution/Locations.h:1788
+msgid "Porto Velho"
+msgstr ""
+
+#: my-evolution/Locations.h:1789
+#, fuzzy
+msgid "Port Said"
+msgstr "Portret"
+
+#: my-evolution/Locations.h:1790
+msgid "Portsmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1792
+#, fuzzy
+msgid "Posadas"
+msgstr "Polşa"
+
+#: my-evolution/Locations.h:1793
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1796
+#, fuzzy
+msgid "Poza Rica"
+msgstr "Kosta Rika"
+
+#: my-evolution/Locations.h:1797
+#, fuzzy
+msgid "Poznan"
+msgstr "Polşa"
+
+#: my-evolution/Locations.h:1798
+#, fuzzy
+msgid "Praha"
+msgstr "Paraqvay"
+
+#: my-evolution/Locations.h:1799
+#, fuzzy
+msgid "Pratica di Mare"
+msgstr "Qismi çisələmə"
+
+#: my-evolution/Locations.h:1800
+msgid "Prescott"
+msgstr ""
+
+#: my-evolution/Locations.h:1801
+#, fuzzy
+msgid "Presidente Prudente"
+msgstr "Çap Etmə nümayişi"
+
+#: my-evolution/Locations.h:1802
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1804
+#, fuzzy
+msgid "Pretoria"
+msgstr "Gürcüstan"
+
+#: my-evolution/Locations.h:1805
+#, fuzzy
+msgid "Preveza"
+msgstr "Nümayiş"
+
+#: my-evolution/Locations.h:1806
+#, fuzzy
+msgid "Price-Carbon"
+msgstr "Pitkairn"
+
+#: my-evolution/Locations.h:1807
+#, fuzzy
+msgid "Pristina"
+msgstr "Ənənəvi"
+
+#: my-evolution/Locations.h:1808
+#, fuzzy
+msgid "Providence"
+msgstr "_Vilayət"
+
+#: my-evolution/Locations.h:1809
+#, fuzzy
+msgid "Provincetown"
+msgstr "Nümayiş"
+
+#: my-evolution/Locations.h:1810
+#, fuzzy
+msgid "Provo"
+msgstr "Məs"
+
+#: my-evolution/Locations.h:1811
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1812
+#, fuzzy
+msgid "Pucallpa"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1813
+msgid "Pudahuel"
+msgstr ""
+
+#: my-evolution/Locations.h:1814
+#, fuzzy
+msgid "Puebla"
+msgstr "Ümumi"
+
+#: my-evolution/Locations.h:1815
+#, fuzzy
+msgid "Pueblo"
+msgstr "Ümumi"
+
+#: my-evolution/Locations.h:1816
+#, fuzzy
+msgid "Puerto Barrios"
+msgstr "Porto Riko"
+
+#: my-evolution/Locations.h:1817
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1818
+#, fuzzy
+msgid "Puerto Escondido"
+msgstr "Porto Riko"
+
+#: my-evolution/Locations.h:1819
+#, fuzzy
+msgid "Puerto Lempira"
+msgstr "Porto Riko"
+
+#: my-evolution/Locations.h:1820
+#, fuzzy
+msgid "Puerto Limon"
+msgstr "Porto Riko"
+
+#: my-evolution/Locations.h:1821
+#, fuzzy
+msgid "Puerto Maldonado"
+msgstr "Qismi tornado"
+
+#: my-evolution/Locations.h:1822
+#, fuzzy
+msgid "Puerto Montt"
+msgstr "Porto Riko"
+
+#: my-evolution/Locations.h:1823
+#, fuzzy
+msgid "Puerto Plata"
+msgstr "Porto Riko"
+
+#: my-evolution/Locations.h:1825
+#, fuzzy
+msgid "Puerto Suarez"
+msgstr "İcmalı Çap Et"
+
+#: my-evolution/Locations.h:1826
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1827
+#, fuzzy
+msgid "Pula"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1828
+#, fuzzy
+msgid "Pullman"
+msgstr "Polşa"
+
+#: my-evolution/Locations.h:1829
+msgid "Punta Arenas"
+msgstr ""
+
+#: my-evolution/Locations.h:1830
+#, fuzzy
+msgid "Punta Cana"
+msgstr "Təqvimi çap et"
+
+#: my-evolution/Locations.h:1831
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1835
+msgid "Pyongyang"
+msgstr ""
+
+#: my-evolution/Locations.h:1837
+#, fuzzy
+msgid "Quantico"
+msgstr "Sual"
+
+#: my-evolution/Locations.h:1838
+#, fuzzy
+msgid "Quebec"
+msgstr "Mövzu"
+
+#: my-evolution/Locations.h:1839
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1842
+msgid "Quimper"
+msgstr ""
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/Locations.h:1843
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1850
+#, fuzzy
+msgid "Rapid City"
+msgstr "Cavab verilən"
+
+#: my-evolution/Locations.h:1851
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1852
+msgid "Ras Al Khaimah"
+msgstr ""
+
+#: my-evolution/Locations.h:1853
+#, fuzzy
+msgid "Rawlins"
+msgstr "Yağış "
+
+#: my-evolution/Locations.h:1854
+#, fuzzy
+msgid "Reading"
+msgstr "Başlıqlar"
+
+#: my-evolution/Locations.h:1855
+#, fuzzy
+msgid "Rebun Island"
+msgstr "Buvet Adası"
+
+#: my-evolution/Locations.h:1856
+#, fuzzy
+msgid "Recife"
+msgstr "Alındı"
+
+#: my-evolution/Locations.h:1857
+msgid "Red Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1858
+#, fuzzy
+msgid "Redding"
+msgstr "Başlıqlar"
+
+#: my-evolution/Locations.h:1859
+#, fuzzy
+msgid "Redig"
+msgstr "Oxu"
+
+#: my-evolution/Locations.h:1860
+#, fuzzy
+msgid "Redmond"
+msgstr "Xatırladıcı"
+
+#: my-evolution/Locations.h:1861
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1863
+msgid "Reggio Calabria"
+msgstr ""
+
+#: my-evolution/Locations.h:1864
+#, fuzzy
+msgid "Regina"
+msgstr "Bölgələr"
+
+#: my-evolution/Locations.h:1865
+msgid "Reims-Champagne"
+msgstr ""
+
+#: my-evolution/Locations.h:1866
+#, fuzzy
+msgid "Rennes"
+msgstr "Xatırladıcılar"
+
+#: my-evolution/Locations.h:1867
+#, fuzzy
+msgid "Reno"
+msgstr "Reyunion"
+
+#: my-evolution/Locations.h:1868
+#, fuzzy
+msgid "Renton"
+msgstr "Reyunion"
+
+#: my-evolution/Locations.h:1869
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1870
+#, fuzzy
+msgid "Reus"
+msgstr "Qaydalar"
+
+#: my-evolution/Locations.h:1871
+#, fuzzy
+msgid "Reyes"
+msgstr "il"
+
+#: my-evolution/Locations.h:1872
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1873
+#, fuzzy
+msgid "Reynosa"
+msgstr "Yenilə"
+
+#: my-evolution/Locations.h:1874
+#, fuzzy
+msgid "Rhinelander"
+msgstr "Finlandiya"
+
+#: my-evolution/Locations.h:1875
+#, fuzzy
+msgid "Rhode Island"
+msgstr "Buvet Adası"
+
+#: my-evolution/Locations.h:1876
+#, fuzzy
+msgid "Riberalta"
+msgstr "Gibraltar"
+
+#: my-evolution/Locations.h:1877
+msgid "Richmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1878
+#, fuzzy
+msgid "Rickenbacker"
+msgstr "Ləqəb"
+
+#: my-evolution/Locations.h:1879
+#, fuzzy
+msgid "Rieti"
+msgstr "Haiti"
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rifle"
+msgstr "Rolu"
+
+#: my-evolution/Locations.h:1881
+#, fuzzy
+msgid "Riga"
+msgstr "Sağ :"
+
+#: my-evolution/Locations.h:1882
+#, fuzzy
+msgid "Rijeka"
+msgstr "Oxu"
+
+#: my-evolution/Locations.h:1883
+#, fuzzy
+msgid "Rimini"
+msgstr "Ruminıya"
+
+#: my-evolution/Locations.h:1884
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1885
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1886
+msgid "Rio Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1887
+#, fuzzy
+msgid "Rioja"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1888
+#, fuzzy
+msgid "Rio / Jacarepagua"
+msgstr "Nikaraqua"
+
+#: my-evolution/Locations.h:1889
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+#, fuzzy
+msgid "Rishiri Island"
+msgstr "Britaniya Virgin Adaları"
+
+#: my-evolution/Locations.h:1891
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+#, fuzzy
+msgid "Rivera"
+msgstr "Liberiya"
+
+#: my-evolution/Locations.h:1893
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1894
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1895
+msgid "Riverton"
+msgstr ""
+
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "Pine"
+
+#: my-evolution/Locations.h:1897
+#, fuzzy
+msgid "Rivolto"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:1898
+#, fuzzy
+msgid "Riyadh"
+msgstr "Oxu"
+
+#: my-evolution/Locations.h:1899
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1900
+#, fuzzy
+msgid "Roatan"
+msgstr "Xırvatıstan"
+
+#: my-evolution/Locations.h:1901
+#, fuzzy
+msgid "Robore"
+msgstr "əvvəl"
+
+#: my-evolution/Locations.h:1902
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1903
+msgid "Rockford"
+msgstr ""
+
+#: my-evolution/Locations.h:1904
+#, fuzzy
+msgid "Rockland"
+msgstr "Polşa"
+
+#: my-evolution/Locations.h:1905
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1907
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1908
+#, fuzzy
+msgid "Rodos"
+msgstr "Otaq"
+
+#: my-evolution/Locations.h:1909
+#, fuzzy
+msgid "Rogers"
+msgstr "Qovluqlar"
+
+#: my-evolution/Locations.h:1910
+#, fuzzy
+msgid "Roma/Ciampino"
+msgstr "Ruminıya"
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1917
+msgid "Roosevelt"
+msgstr ""
+
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Roros"
+msgstr "Komor"
+
+#: my-evolution/Locations.h:1919
+msgid "Rorvik/Ryum"
+msgstr ""
+
+#: my-evolution/Locations.h:1920
+#, fuzzy
+msgid "Rosario"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1921
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1922
+#, fuzzy
+msgid "Roseglen"
+msgstr "Rolu"
+
+#: my-evolution/Locations.h:1923
+#, fuzzy
+msgid "Rost"
+msgstr "Qovşaq"
+
+#: my-evolution/Locations.h:1924
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1927
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1928
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1929
+#, fuzzy
+msgid "Rurrenabaque"
+msgstr "Təkrarlama"
+
+#: my-evolution/Locations.h:1930
+msgid "Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1931
+#, fuzzy
+msgid "Russia"
+msgstr "Avstriya"
+
+#: my-evolution/Locations.h:1932
+#, fuzzy
+msgid "Rutland"
+msgstr "Butan"
+
+#: my-evolution/Locations.h:1933
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1935
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1936
+msgid "Sabine Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:1937
+#, fuzzy
+msgid "Sacramento"
+msgstr "Bölmə"
+
+#: my-evolution/Locations.h:1938
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1939
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1940
+#, fuzzy
+msgid "Saginaw"
+msgstr "İspaniya"
+
+#: my-evolution/Locations.h:1941
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1944
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1945
+#, fuzzy
+msgid "Saint Mary's"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1946
+#, fuzzy
+msgid "Saint Mawgan"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1947
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1948
+#, fuzzy
+msgid "Saint Paul"
+msgstr "Müqəddəs Lusiya"
+
+#: my-evolution/Locations.h:1949
+#, fuzzy
+msgid "Saiq"
+msgstr "İspaniya"
+
+#: my-evolution/Locations.h:1950
+#, fuzzy
+msgid "Salalah"
+msgstr "Kir"
+
+#: my-evolution/Locations.h:1951
+#, fuzzy
+msgid "Salem"
+msgstr "Qeyd Et"
+
+#: my-evolution/Locations.h:1952
+#, fuzzy
+msgid "Salida"
+msgstr "Somali"
+
+#: my-evolution/Locations.h:1953
+msgid "Salida-Harriet"
+msgstr ""
+
+#: my-evolution/Locations.h:1954
+#, fuzzy
+msgid "Salina"
+msgstr "Somali"
+
+#: my-evolution/Locations.h:1955
+#, fuzzy
+msgid "Salinas"
+msgstr "Somali"
+
+#: my-evolution/Locations.h:1956
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1957
+#, fuzzy
+msgid "Salmon"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1958
+msgid "Salmon (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1959
+#, fuzzy
+msgid "Salta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1960
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1961
+msgid "Salt Lake City"
+msgstr ""
+
+#: my-evolution/Locations.h:1962
+#, fuzzy
+msgid "Salto"
+msgstr "_Şn"
+
+#: my-evolution/Locations.h:1963
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+#, fuzzy
+msgid "Salvador"
+msgstr "Elsalvador"
+
+#: my-evolution/Locations.h:1965
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1966
+#, fuzzy
+msgid "Samara"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1967
+#, fuzzy
+msgid "Samos"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1968
+#, fuzzy
+msgid "Samsun"
+msgstr "Ba_z"
+
+#: my-evolution/Locations.h:1969
+#, fuzzy
+msgid "Sana'A"
+msgstr "Qum"
+
+#: my-evolution/Locations.h:1970
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+#, fuzzy
+msgid "San Angelo"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1975
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1976
+#, fuzzy
+msgid "San Carlos"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1977
+#, fuzzy
+msgid "Sandane"
+msgstr "Qum"
+
+#: my-evolution/Locations.h:1978
+#, fuzzy
+msgid "Sandberg"
+msgstr "Göndərən"
+
+#: my-evolution/Locations.h:1979
+#, fuzzy
+msgid "Sanderson"
+msgstr "Göndərən"
+
+#: my-evolution/Locations.h:1980
+#, fuzzy
+msgid "San Diego"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1986
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1987
+#, fuzzy
+msgid "Sand Point"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1988
+msgid "San Fernando De Apure"
+msgstr ""
+
+#: my-evolution/Locations.h:1989
+#, fuzzy
+msgid "Sanford"
+msgstr "Qum"
+
+#: my-evolution/Locations.h:1990
+#, fuzzy
+msgid "San Francisco"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1991
+#, fuzzy
+msgid "Sangju"
+msgstr "Kölgələmə"
+
+#: my-evolution/Locations.h:1992
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1993
+#, fuzzy
+msgid "San Joaquin"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1994
+#, fuzzy
+msgid "San Jose"
+msgstr "Qeyd Et və Qapat"
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1997
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1998
+#, fuzzy
+msgid "San Juan"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1999
+msgid "Sankt-Peterburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2000
+#, fuzzy
+msgid "Sanliurfa"
+msgstr "Somali"
+
+#: my-evolution/Locations.h:2001
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2002
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2003
+#, fuzzy
+msgid "San Miguel"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2004
+#, fuzzy
+msgid "San Nicholas Island"
+msgstr "Norfolk Adaları"
+
+#: my-evolution/Locations.h:2005
+#, fuzzy
+msgid "San Salvador"
+msgstr "Elsalvador"
+
+#: my-evolution/Locations.h:2006
+#, fuzzy
+msgid "San Sebastian"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2007
+#, fuzzy
+msgid "Santa Ana"
+msgstr "Müqəddəs Lusiya"
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+#, fuzzy
+msgid "Santa Maria"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2012
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2013
+#, fuzzy
+msgid "Santa Monica"
+msgstr "Müqəddəs Lusiya"
+
+#: my-evolution/Locations.h:2014
+#, fuzzy
+msgid "Santander"
+msgstr "Göndərən"
+
+#: my-evolution/Locations.h:2015
+#, fuzzy
+msgid "Santarem"
+msgstr "Qum fırtınası"
+
+#: my-evolution/Locations.h:2016
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2017
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+#, fuzzy
+msgid "Santiago"
+msgstr "Müqəddəs Lusiya"
+
+#: my-evolution/Locations.h:2019
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2020
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2021
+#, fuzzy
+msgid "Santorini"
+msgstr "Qum fırtınası"
+
+#: my-evolution/Locations.h:2022
+#, fuzzy
+msgid "Santos"
+msgstr "Hal"
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+#, fuzzy
+msgid "Sao Luiz"
+msgstr "Müqəddəs Lusiya"
+
+#: my-evolution/Locations.h:2025
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2028
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+#, fuzzy
+msgid "Sarasota"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:2030
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+#, fuzzy
+msgid "Sarzana"
+msgstr "Şri Lanka"
+
+#: my-evolution/Locations.h:2032
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2033
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2038
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2039
+msgid "Sawyer AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2040
+#, fuzzy
+msgid "Sayun"
+msgstr "Ba_z"
+
+#: my-evolution/Locations.h:2041
+#, fuzzy
+msgid "Scatsta"
+msgstr "Hal"
+
+#: my-evolution/Locations.h:2042
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2045
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2046
+msgid "Scottsdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Scranton"
+msgstr "Quruluş"
+
+#: my-evolution/Locations.h:2048
+msgid "Seattle"
+msgstr ""
+
+#: my-evolution/Locations.h:2049
+#, fuzzy
+msgid "Seattle-Boeing"
+msgstr "Qurğular"
+
+#: my-evolution/Locations.h:2050
+#, fuzzy
+msgid "Sedalia"
+msgstr "Somali"
+
+#: my-evolution/Locations.h:2051
+#, fuzzy
+msgid "Seeb"
+msgstr "Görülmüş"
+
+#: my-evolution/Locations.h:2052
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+#, fuzzy
+msgid "Sendai Airport"
+msgstr "İdxal başlanır"
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2058
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2059
+msgid "Sevilla"
+msgstr ""
+
+#: my-evolution/Locations.h:2060
+#, fuzzy
+msgid "Seward"
+msgstr "Axtar"
+
+#: my-evolution/Locations.h:2061
+msgid "Sexton Summit"
+msgstr ""
+
+#: my-evolution/Locations.h:2062
+#, fuzzy
+msgid "Shanghai"
+msgstr "Kölgələmə"
+
+#: my-evolution/Locations.h:2063
+msgid "Shannon"
+msgstr ""
+
+#: my-evolution/Locations.h:2064
+#, fuzzy
+msgid "Sharjah"
+msgstr "Axtar"
+
+#: my-evolution/Locations.h:2065
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+#: my-evolution/Locations.h:2066
+#, fuzzy
+msgid "Sharurah"
+msgstr "Şənbə"
+
+#: my-evolution/Locations.h:2067
+#, fuzzy
+msgid "Shawbury"
+msgstr "Şənbə"
+
+#: my-evolution/Locations.h:2068
+#, fuzzy
+msgid "Shearwater"
+msgstr "Başlama Tarixi"
+
+#: my-evolution/Locations.h:2069
+msgid "Sheboygan"
+msgstr ""
+
+#: my-evolution/Locations.h:2070
+#, fuzzy
+msgid "Sheldon"
+msgstr "İsveç"
+
+#: my-evolution/Locations.h:2071
+msgid "Shelter Cove"
+msgstr ""
+
+#: my-evolution/Locations.h:2072
+#, fuzzy
+msgid "Shelton"
+msgstr "Seçki : "
+
+#: my-evolution/Locations.h:2073
+msgid "Shenandoah"
+msgstr ""
+
+#: my-evolution/Locations.h:2074
+#, fuzzy
+msgid "Sheridan"
+msgstr "Sudan"
+
+#: my-evolution/Locations.h:2075
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2076
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2077
+msgid "Shingle Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2078
+#, fuzzy
+msgid "Shiraz"
+msgstr "Böyüklük"
+
+#: my-evolution/Locations.h:2079
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2080
+msgid "Shizuhama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2081
+#, fuzzy
+msgid "Shoreham"
+msgstr "Xal"
+
+#: my-evolution/Locations.h:2082
+#, fuzzy
+msgid "Show Low"
+msgstr "Alçaq qar yağışı"
+
+#: my-evolution/Locations.h:2083
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2084
+msgid "Shreveport Regional"
+msgstr ""
+
+#: my-evolution/Locations.h:2085
+#, fuzzy
+msgid "Sidney"
+msgstr "Pine"
+
+#: my-evolution/Locations.h:2086
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2087
+msgid "Siloam Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2088
+#, fuzzy
+msgid "Silver City"
+msgstr "Təhlükəsizlik"
+
+#: my-evolution/Locations.h:2089
+#, fuzzy
+msgid "Sindal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2091
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2097
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2098
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+#: my-evolution/Locations.h:2099
+#, fuzzy
+msgid "Skive"
+msgstr "Böyüklük"
+
+#: my-evolution/Locations.h:2100
+#, fuzzy
+msgid "Skopje"
+msgstr "Dayan"
+
+#: my-evolution/Locations.h:2101
+#, fuzzy
+msgid "Skwentna"
+msgstr "Göndərilənlər"
+
+#: my-evolution/Locations.h:2102
+#, fuzzy
+msgid "Slana"
+msgstr "Albaniya"
+
+#: my-evolution/Locations.h:2105
+#, fuzzy
+msgid "Smithers"
+msgstr "dəqiqə"
+
+#: my-evolution/Locations.h:2106
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2107
+#, fuzzy
+msgid "Snowshoe Lake"
+msgstr "Qar yağışları"
+
+#: my-evolution/Locations.h:2108
+#, fuzzy
+msgid "Sochi"
+msgstr "Cənub"
+
+#: my-evolution/Locations.h:2109
+#, fuzzy
+msgid "Socorro"
+msgstr "Xal"
+
+#: my-evolution/Locations.h:2110
+#, fuzzy
+msgid "Socotra"
+msgstr "Xal"
+
+#: my-evolution/Locations.h:2111
+#, fuzzy
+msgid "Soda Springs"
+msgstr "Qar dənələri"
+
+#: my-evolution/Locations.h:2112
+#, fuzzy
+msgid "Sofia"
+msgstr "Somali"
+
+#: my-evolution/Locations.h:2113
+#, fuzzy
+msgid "Sogndal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2114
+#, fuzzy
+msgid "Soldotna"
+msgstr "Sloveniya"
+
+#: my-evolution/Locations.h:2115
+#, fuzzy
+msgid "Somerset"
+msgstr "Yağış"
+
+#: my-evolution/Locations.h:2116
+#, fuzzy
+msgid "Sonderborg"
+msgstr "Göndərən"
+
+#: my-evolution/Locations.h:2117
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2120
+#, fuzzy
+msgid "Southampton"
+msgstr "Cənubi Şərq"
+
+#: my-evolution/Locations.h:2121
+#, fuzzy
+msgid "South Bend"
+msgstr "Cənub"
+
+#: my-evolution/Locations.h:2122
+#, fuzzy
+msgid "South Carolina"
+msgstr "Cənubi Afrika"
+
+#: my-evolution/Locations.h:2123
+#, fuzzy
+msgid "South Dakota"
+msgstr "Cənubi Şərq"
+
+#: my-evolution/Locations.h:2124
+#, fuzzy
+msgid "Southend"
+msgstr "Cənub"
+
+#: my-evolution/Locations.h:2125
+#, fuzzy
+msgid "South Marsh Island"
+msgstr "Marşal Adaları"
+
+#: my-evolution/Locations.h:2126
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2128
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2129
+#, fuzzy
+msgid "Spencer"
+msgstr "Göndərən"
+
+#: my-evolution/Locations.h:2130
+msgid "Spickard"
+msgstr ""
+
+#: my-evolution/Locations.h:2131
+#, fuzzy
+msgid "Split"
+msgstr "siyahı"
+
+#: my-evolution/Locations.h:2132
+#, fuzzy
+msgid "Spokane"
+msgstr "İspaniya"
+
+#: my-evolution/Locations.h:2133
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2134
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "Springfield"
+msgstr "Bəsitləşdirilmiş"
+
+#: my-evolution/Locations.h:2136
+msgid "Stampede Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:2137
+#, fuzzy
+msgid "State College"
+msgstr "Bitirmə Tarixi:"
+
+#: my-evolution/Locations.h:2138
+#, fuzzy
+msgid "Stauning"
+msgstr "Başlayır:"
+
+#: my-evolution/Locations.h:2139
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2140
+msgid "Stavanger/Sola"
+msgstr ""
+
+#: my-evolution/Locations.h:2141
+#, fuzzy
+msgid "Staverton"
+msgstr "Başlayır:"
+
+#: my-evolution/Locations.h:2142
+#, fuzzy
+msgid "Stavropol"
+msgstr "Dayan"
+
+#: my-evolution/Locations.h:2143
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2144
+msgid "Steamboat Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2145
+#, fuzzy
+msgid "Stephenville"
+msgstr "Seyşel"
+
+#: my-evolution/Locations.h:2146
+#, fuzzy
+msgid "St. George"
+msgstr "Müqəddəs Helena"
+
+#: my-evolution/Locations.h:2147
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2148
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2149
+msgid "St Johnsbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2150
+#, fuzzy
+msgid "St Joseph"
+msgstr "Dayan"
+
+#: my-evolution/Locations.h:2151
+#, fuzzy
+msgid "St Louis"
+msgstr "Müqəddəs Lusiya"
+
+#: my-evolution/Locations.h:2152
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2157
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2158
+#, fuzzy
+msgid "Storm Lake"
+msgstr "Şri Lanka"
+
+#: my-evolution/Locations.h:2159
+#, fuzzy
+msgid "Stornoway"
+msgstr "Norveç"
+
+#: my-evolution/Locations.h:2160
+#, fuzzy
+msgid "St Paul"
+msgstr "Hal"
+
+#: my-evolution/Locations.h:2161
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2164
+msgid "Strevell"
+msgstr ""
+
+#: my-evolution/Locations.h:2165
+#, fuzzy
+msgid "St Simon's Island"
+msgstr "Solomon Adaları"
+
+#: my-evolution/Locations.h:2166
+msgid "Stumpy Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2167
+#, fuzzy
+msgid "Sturgeon Bay"
+msgstr "Şənbə"
+
+#: my-evolution/Locations.h:2168
+msgid "Stuttgart"
+msgstr ""
+
+#: my-evolution/Locations.h:2169
+#, fuzzy
+msgid "Sucre"
+msgstr "Xal"
+
+#: my-evolution/Locations.h:2170
+#, fuzzy
+msgid "Sumburgh"
+msgstr "Lüksemburq"
+
+#: my-evolution/Locations.h:2171
+#, fuzzy
+msgid "Sumter"
+msgstr "Mündəricat"
+
+#: my-evolution/Locations.h:2172
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2174
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2175
+msgid "Superior"
+msgstr ""
+
+#: my-evolution/Locations.h:2177
+#, fuzzy
+msgid "Sutton"
+msgstr "Ba_z"
+
+#: my-evolution/Locations.h:2178
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2179
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2188
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2189
+msgid "Szombathely"
+msgstr ""
+
+#: my-evolution/Locations.h:2190
+#, fuzzy
+msgid "Tabatinga"
+msgstr "Ənənəvi"
+
+#: my-evolution/Locations.h:2191
+msgid "Tabriz"
+msgstr ""
+
+#: my-evolution/Locations.h:2192
+#, fuzzy
+msgid "Tabuk"
+msgstr "Vəzifə"
+
+#: my-evolution/Locations.h:2193
+msgid "Tachikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+#, fuzzy
+msgid "Tacna"
+msgstr "Qana"
+
+#: my-evolution/Locations.h:2195
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2199
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+#, fuzzy
+msgid "Taejon"
+msgstr "Onda"
+
+#: my-evolution/Locations.h:2201
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2202
+msgid "Taichung"
+msgstr ""
+
+#: my-evolution/Locations.h:2203
+#, fuzzy
+msgid "Taif"
+msgstr "Tayvan"
+
+#: my-evolution/Locations.h:2204
+#, fuzzy
+msgid "Tainan"
+msgstr "Tayvan"
+
+#: my-evolution/Locations.h:2206
+#, fuzzy
+msgid "Taiyuan"
+msgstr "Tayvan"
+
+#: my-evolution/Locations.h:2207
+#, fuzzy
+msgid "Taiz"
+msgstr "Tayvan"
+
+#: my-evolution/Locations.h:2208
+#, fuzzy
+msgid "Tajima"
+msgstr "Tayvan"
+
+#: my-evolution/Locations.h:2209
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Talara"
+msgstr ""
+
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Talinn"
+msgstr "Tayvan"
+
+#: my-evolution/Locations.h:2212
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tallahassee"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2215
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2216
+#, fuzzy
+msgid "Tampa"
+msgstr "Yaponiya"
+
+#: my-evolution/Locations.h:2217
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2218
+#, fuzzy
+msgid "Tampere"
+msgstr "Kağız"
+
+#: my-evolution/Locations.h:2219
+msgid "Tampico"
+msgstr ""
+
+#: my-evolution/Locations.h:2220
+#, fuzzy
+msgid "Tanana"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:2221
+msgid "Tanegashima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2222
+#, fuzzy
+msgid "Taos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:2223
+#, fuzzy
+msgid "Taoyuan"
+msgstr "Tayvan"
+
+#: my-evolution/Locations.h:2224
+msgid "Tapachula"
+msgstr ""
+
+#: my-evolution/Locations.h:2225
+#, fuzzy
+msgid "Taranto"
+msgstr "Tayvan"
+
+#: my-evolution/Locations.h:2226
+#, fuzzy
+msgid "Tarbes"
+msgstr "Vəzifə"
+
+#: my-evolution/Locations.h:2227
+#, fuzzy
+msgid "Tarija"
+msgstr "Tayvan"
+
+#: my-evolution/Locations.h:2228
+msgid "Tarvisio"
+msgstr ""
+
+#: my-evolution/Locations.h:2229
+#, fuzzy
+msgid "Tatalina"
+msgstr "Ənənəvi"
+
+#: my-evolution/Locations.h:2230
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2235
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2236
+#, fuzzy
+msgid "Tela"
+msgstr "Tokelo"
+
+#: my-evolution/Locations.h:2237
+#, fuzzy
+msgid "Temple"
+msgstr "Teleks"
+
+#: my-evolution/Locations.h:2238
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2244
+msgid "Texarkana"
+msgstr ""
+
+#: my-evolution/Locations.h:2245
+#, fuzzy
+msgid "Texas"
+msgstr "Vəzifə"
+
+#: my-evolution/Locations.h:2246
+#, fuzzy
+msgid "The Dalles"
+msgstr "Seyşel"
+
+#: my-evolution/Locations.h:2247
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2248
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2249
+msgid "Thiruvananthapuram"
+msgstr ""
+
+#: my-evolution/Locations.h:2250
+#, fuzzy
+msgid "Thisted"
+msgstr "Başlıq"
+
+#: my-evolution/Locations.h:2251
+msgid "Thompson Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2252
+#, fuzzy
+msgid "Thumrait"
+msgstr "Cümə Axşamı"
+
+#: my-evolution/Locations.h:2253
+#, fuzzy
+msgid "Tianjin"
+msgstr "Tayvan"
+
+#: my-evolution/Locations.h:2254
+#, fuzzy
+msgid "Tijuana"
+msgstr "Litvaniya"
+
+#: my-evolution/Locations.h:2255
+msgid "Timisoara"
+msgstr ""
+
+#: my-evolution/Locations.h:2256
+msgid "Tin City"
+msgstr ""
+
+#: my-evolution/Locations.h:2257
+#, fuzzy
+msgid "Tirana"
+msgstr "Tayvan"
+
+#: my-evolution/Locations.h:2258
+#, fuzzy
+msgid "Tiree"
+msgstr "Boş"
+
+#: my-evolution/Locations.h:2259
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2260
+msgid "Tiruchchirapalli"
+msgstr ""
+
+#: my-evolution/Locations.h:2261
+#, fuzzy
+msgid "Titusville"
+msgstr "Başlıq"
+
+#: my-evolution/Locations.h:2262
+#, fuzzy
+msgid "Tivat"
+msgstr "Şəxsi"
+
+#: my-evolution/Locations.h:2263
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2267
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+#, fuzzy
+msgid "Tokunoshima Island"
+msgstr "Kristmas Adası"
+
+#: my-evolution/Locations.h:2269
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2271
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2272
+msgid "Tokyo New International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2273
+#, fuzzy
+msgid "Toledo"
+msgstr "Gizlə/Göstər"
+
+#: my-evolution/Locations.h:2274
+#, fuzzy
+msgid "Toluca"
+msgstr "Tokelo"
+
+#: my-evolution/Locations.h:2275
+#, fuzzy
+msgid "Tonopah"
+msgstr "Tonqa"
+
+#: my-evolution/Locations.h:2276
+#, fuzzy
+msgid "Topeka"
+msgstr "Tokelo"
+
+#: my-evolution/Locations.h:2277
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2279
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2280
+#, fuzzy
+msgid "Toronto"
+msgstr "Tornado"
+
+#: my-evolution/Locations.h:2281
+#, fuzzy
+msgid "Torp"
+msgstr "Üst :"
+
+#: my-evolution/Locations.h:2282
+#, fuzzy
+msgid "Torrance"
+msgstr "Fransa"
+
+#: my-evolution/Locations.h:2283
+#, fuzzy
+msgid "Torreon"
+msgstr "Koreyaca"
+
+#: my-evolution/Locations.h:2284
+#, fuzzy
+msgid "Tottori Airport"
+msgstr "İdxal başlanır"
+
+#: my-evolution/Locations.h:2285
+#, fuzzy
+msgid "Toulouse"
+msgstr "Qapat"
+
+#: my-evolution/Locations.h:2286
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2290
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2291
+#, fuzzy
+msgid "Trabzon"
+msgstr "Qabon"
+
+#: my-evolution/Locations.h:2292
+#, fuzzy
+msgid "Trapani"
+msgstr "Yaponiya"
+
+#: my-evolution/Locations.h:2293
+msgid "Traverse City"
+msgstr ""
+
+#: my-evolution/Locations.h:2294
+#, fuzzy
+msgid "Trelew"
+msgstr "Teleks"
+
+#: my-evolution/Locations.h:2295
+#, fuzzy
+msgid "Trenton"
+msgstr "İstiqamət"
+
+#: my-evolution/Locations.h:2296
+#, fuzzy
+msgid "Trevico"
+msgstr "Əvvəlki"
+
+#: my-evolution/Locations.h:2297
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2298
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2299
+#, fuzzy
+msgid "Trieste"
+msgstr "Sınaq"
+
+#: my-evolution/Locations.h:2300
+#, fuzzy
+msgid "Trinidad"
+msgstr "Tornado"
+
+#: my-evolution/Locations.h:2301
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2304
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2305
+msgid "Troyes/Barberey"
+msgstr ""
+
+#: my-evolution/Locations.h:2306
+#, fuzzy
+msgid "Truckee"
+msgstr "Türkiyə"
+
+#: my-evolution/Locations.h:2307
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2314
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2315
+msgid "Tulancingo"
+msgstr ""
+
+#: my-evolution/Locations.h:2316
+#, fuzzy
+msgid "Tulcea"
+msgstr "Çərşənbə axşamı"
+
+#: my-evolution/Locations.h:2317
+#, fuzzy
+msgid "Tulsa"
+msgstr "Tunis"
+
+#: my-evolution/Locations.h:2318
+#, fuzzy
+msgid "Tupelo"
+msgstr "Ça_x"
+
+#: my-evolution/Locations.h:2319
+#, fuzzy
+msgid "Turaif"
+msgstr "Türkçə"
+
+#: my-evolution/Locations.h:2320
+#, fuzzy
+msgid "Turin"
+msgstr "Türkçə"
+
+#: my-evolution/Locations.h:2322
+#, fuzzy
+msgid "Turku"
+msgstr "Türkiyə"
+
+#: my-evolution/Locations.h:2323
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2324
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+#: my-evolution/Locations.h:2325
+#, fuzzy
+msgid "Twenthe"
+msgstr "Girişimli"
+
+#: my-evolution/Locations.h:2326
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2327
+msgid "Twin Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2328
+#, fuzzy
+msgid "Tyler"
+msgstr "Növ"
+
+#: my-evolution/Locations.h:2329
+msgid "Tyndall AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2330
+#, fuzzy
+msgid "Tyumen"
+msgstr "Ça_x"
+
+#: my-evolution/Locations.h:2331
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2332
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2340
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2341
+#, fuzzy
+msgid "United Arab Emirates "
+msgstr "Birləşmiş Ərəb Əmirlikləri"
+
+#: my-evolution/Locations.h:2344
+#, fuzzy
+msgid "Unst"
+msgstr "Görülməmiş"
+
+#: my-evolution/Locations.h:2345
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2346
+#, fuzzy
+msgid "Uruapan"
+msgstr "Yaponiya"
+
+#: my-evolution/Locations.h:2347
+#, fuzzy
+msgid "Uruguaiana"
+msgstr "Uruqvay"
+
+#: my-evolution/Locations.h:2349
+msgid "Urumqi"
+msgstr ""
+
+#: my-evolution/Locations.h:2350
+#, fuzzy
+msgid "Utah"
+msgstr "."
+
+#: my-evolution/Locations.h:2351
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2353
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:2355
+#, fuzzy
+msgid "Vadso"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:2356
+#, fuzzy
+msgid "Vaerlose"
+msgstr "Dəyişən"
+
+#: my-evolution/Locations.h:2357
+#, fuzzy
+msgid "Vagar"
+msgstr "Peycer"
+
+#: my-evolution/Locations.h:2358
+msgid "Valdez 2"
+msgstr ""
+
+#: my-evolution/Locations.h:2359
+#, fuzzy
+msgid "Valdosta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:2360
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2361
+#, fuzzy
+msgid "Valencia"
+msgstr "Sloveniya"
+
+#: my-evolution/Locations.h:2362
+#, fuzzy
+msgid "Valentine"
+msgstr "İçərisini Göstər"
+
+#: my-evolution/Locations.h:2363
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2366
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2367
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2368
+#, fuzzy
+msgid "Van"
+msgstr "İda"
+
+#: my-evolution/Locations.h:2369
+msgid "Vancouver"
+msgstr ""
+
+#: my-evolution/Locations.h:2370
+#, fuzzy
+msgid "Vandel"
+msgstr "Ləğv Et"
+
+#: my-evolution/Locations.h:2371
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2373
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+#, fuzzy
+msgid "Varadero"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:2375
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2376
+#, fuzzy
+msgid "Varna"
+msgstr "Vanuatu"
+
+#: my-evolution/Locations.h:2377
+#, fuzzy
+msgid "Vasteras"
+msgstr "sonra"
+
+#: my-evolution/Locations.h:2378
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2379
+#, fuzzy
+msgid "Venezia"
+msgstr "Venezuela"
+
+#: my-evolution/Locations.h:2381
+#, fuzzy
+msgid "Venice"
+msgstr "Yunikod"
+
+#: my-evolution/Locations.h:2382
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2383
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2384
+#, fuzzy
+msgid "Vermont"
+msgstr "ay"
+
+#: my-evolution/Locations.h:2385
+#, fuzzy
+msgid "Vernal"
+msgstr "Ümumi"
+
+#: my-evolution/Locations.h:2386
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+#, fuzzy
+msgid "Vicenza"
+msgstr "Venezuela"
+
+#: my-evolution/Locations.h:2388
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2390
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2393
+msgid "Vigo"
+msgstr ""
+
+#: my-evolution/Locations.h:2394
+#, fuzzy
+msgid "Vilhena"
+msgstr "Fayl adı:"
+
+#: my-evolution/Locations.h:2395
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+msgid "Villahermosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2398
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2404
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+#, fuzzy
+msgid "Visalia"
+msgstr "Avstraliya"
+
+#: my-evolution/Locations.h:2406
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2410
+msgid "Vladivostok"
+msgstr ""
+
+#: my-evolution/Locations.h:2411
+#, fuzzy
+msgid "Vlieland"
+msgstr "Finlandiya"
+
+#: my-evolution/Locations.h:2412
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2413
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2414
+#, fuzzy
+msgid "Volkel"
+msgstr "Tokelo"
+
+#: my-evolution/Locations.h:2415
+#, fuzzy
+msgid "Volk Field"
+msgstr "_Göndərən Girişi"
+
+#: my-evolution/Locations.h:2416
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2417
+#, fuzzy
+msgid "Voslau"
+msgstr "Tokelo"
+
+#: my-evolution/Locations.h:2418
+#, fuzzy
+msgid "Waco"
+msgstr "Monako"
+
+#: my-evolution/Locations.h:2419
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2423
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2424
+#, fuzzy
+msgid "Wallops Island"
+msgstr "Folkland Adaları"
+
+#: my-evolution/Locations.h:2425
+msgid "Walnut Ridge"
+msgstr ""
+
+#: my-evolution/Locations.h:2426
+#, fuzzy
+msgid "Warner Robins"
+msgstr "Xəbərdarlıq"
+
+#: my-evolution/Locations.h:2427
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2429
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2430
+msgid "Washington/Dulles"
+msgstr ""
+
+#: my-evolution/Locations.h:2431
+#, fuzzy
+msgid "Waterbury"
+msgstr "Hava"
+
+#: my-evolution/Locations.h:2432
+#, fuzzy
+msgid "Waterloo"
+msgstr "Hava"
+
+#: my-evolution/Locations.h:2433
+#, fuzzy
+msgid "Watertown"
+msgstr "Hava"
+
+#: my-evolution/Locations.h:2434
+#, fuzzy
+msgid "Waterville"
+msgstr "Kateqoriyalar"
+
+#: my-evolution/Locations.h:2435
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+#, fuzzy
+msgid "Wausau"
+msgstr "Vanuatu"
+
+#: my-evolution/Locations.h:2437
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2438
+msgid "Waynesboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2439
+#, fuzzy
+msgid "Webster City"
+msgstr "Web Səhifəsi"
+
+#: my-evolution/Locations.h:2440
+#, fuzzy
+msgid "Wejh"
+msgstr "Çə"
+
+#: my-evolution/Locations.h:2441
+msgid "Wellington"
+msgstr ""
+
+#: my-evolution/Locations.h:2442
+#, fuzzy
+msgid "Wenatchee"
+msgstr "Hava"
+
+#: my-evolution/Locations.h:2443
+#, fuzzy
+msgid "Wendover"
+msgstr "Göndərən"
+
+#: my-evolution/Locations.h:2444
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2445
+#, fuzzy
+msgid "West Burke"
+msgstr "Qərbi Avropa"
+
+#: my-evolution/Locations.h:2446
+#, fuzzy
+msgid "Westerland"
+msgstr "Hollandiya"
+
+#: my-evolution/Locations.h:2447
+#, fuzzy
+msgid "Westfield"
+msgstr "Qərb"
+
+#: my-evolution/Locations.h:2448
+msgid "Westhampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2449
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2451
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2452
+msgid "West Yellowstone (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2453
+#, fuzzy
+msgid "Wheeling"
+msgstr "Vaxtlaşdırılır"
+
+#: my-evolution/Locations.h:2454
+#, fuzzy
+msgid "Whidbey Island"
+msgstr "Kristmas Adası"
+
+#: my-evolution/Locations.h:2455
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2461
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2462
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2463
+#, fuzzy
+msgid "Wick"
+msgstr "ULəqəb"
+
+#: my-evolution/Locations.h:2464
+#, fuzzy
+msgid "Wien"
+msgstr "Çə"
+
+#: my-evolution/Locations.h:2465
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2467
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2468
+msgid "Williamsport"
+msgstr ""
+
+#: my-evolution/Locations.h:2469
+#, fuzzy
+msgid "Williston"
+msgstr "siyahı"
+
+#: my-evolution/Locations.h:2470
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2472
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2473
+#, fuzzy
+msgid "Winchester"
+msgstr "Lixtenşteyn"
+
+#: my-evolution/Locations.h:2474
+#, fuzzy
+msgid "Windsor"
+msgstr "Qum fırtınası"
+
+#: my-evolution/Locations.h:2475
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2478
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+#, fuzzy
+msgid "Winslow"
+msgstr "indi"
+
+#: my-evolution/Locations.h:2480
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2481
+msgid "Winter Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:2482
+#, fuzzy
+msgid "Winter Park"
+msgstr "Parol Girin"
+
+#: my-evolution/Locations.h:2483
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+#, fuzzy
+msgid "Wisconsin"
+msgstr "Mikroneziya"
+
+#: my-evolution/Locations.h:2485
+msgid "Wisconsin Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:2486
+#, fuzzy
+msgid "Wise"
+msgstr "Çə"
+
+#: my-evolution/Locations.h:2487
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2488
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2489
+#, fuzzy
+msgid "Woong Cheon"
+msgstr "Honq Konq"
+
+#: my-evolution/Locations.h:2490
+#, fuzzy
+msgid "Wooster"
+msgstr "Axırıncı :"
+
+#: my-evolution/Locations.h:2491
+#, fuzzy
+msgid "Worcester"
+msgstr "həmişə"
+
+#: my-evolution/Locations.h:2492
+#, fuzzy
+msgid "Worland"
+msgstr "Polşa"
+
+#: my-evolution/Locations.h:2493
+#, fuzzy
+msgid "Worthington"
+msgstr "İşləyir"
+
+#: my-evolution/Locations.h:2494
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2495
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2496
+msgid "Wuchia Observatory"
+msgstr ""
+
+#: my-evolution/Locations.h:2497
+#, fuzzy
+msgid "Wyoming"
+msgstr "İşləyir"
+
+#: my-evolution/Locations.h:2498
+#, fuzzy
+msgid "Xiamen"
+msgstr "Ad"
+
+#: my-evolution/Locations.h:2499
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2505
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2506
+msgid "Yankton"
+msgstr ""
+
+#: my-evolution/Locations.h:2507
+#, fuzzy
+msgid "Yao Airport"
+msgstr "İdxal etmə"
+
+#: my-evolution/Locations.h:2508
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2510
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2511
+msgid "Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2513
+#, fuzzy
+msgid "Yenbo"
+msgstr "Yəmən"
+
+#: my-evolution/Locations.h:2514
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2522
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2528
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2529
+msgid "Zacatecas"
+msgstr ""
+
+#: my-evolution/Locations.h:2530
+#, fuzzy
+msgid "Zadar"
+msgstr "Təqvim"
+
+#: my-evolution/Locations.h:2531
+#, fuzzy
+msgid "Zagreb"
+msgstr "Səhifə"
+
+#: my-evolution/Locations.h:2532
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2533
+msgid "Zama Airfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2534
+#, fuzzy
+msgid "Zanesville"
+msgstr "Ləğv Edildi"
+
+#: my-evolution/Locations.h:2535
+#, fuzzy
+msgid "Zaragoza"
+msgstr "Paraqvay"
+
+#: my-evolution/Locations.h:2536
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2537
+msgid "Zuni Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:2538
+#, fuzzy
+msgid "Zurich"
+msgstr "Türkçə"
+
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "Evolution İcmalını daxil edən qovluqlar"
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Evolution İcmal qismi hazırlana bilmir."
-
-#: 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 "Görüşlər"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "Görüş yoxdur"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:400
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:379
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-calendar.c:420
+#, fuzzy
+msgid "No description"
+msgstr "izah"
+
+#: my-evolution/e-summary-mail.c:151
 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
+msgid "Local Folders"
+msgstr "Yerli Qovluqlar"
+
 #. 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:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Word of the Day"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Günün Sitatları"
 
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Xəbər əlavə et"
 
-#: my-evolution/e-summary-preferences.c:953
+#: my-evolution/e-summary-preferences.c:728
 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:957
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Ad :"
 
-#: my-evolution/e-summary-preferences.c:1503
-msgid "Summary Settings"
-msgstr "İcmam Qurğuları"
-
-#: 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
 msgid "Error downloading RDF"
 msgstr "RDF endirmə xətası"
 
-#: my-evolution/e-summary-rdf.c:528
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr "Yeni Bəsləmə"
 
-#: my-evolution/e-summary-tasks.c:248
+#: my-evolution/e-summary-shown.c:463
+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
+#, fuzzy
+msgid "<- Remove"
+msgstr " _Sil"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Yağış"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Vəzifə yoxdur"
 
-#: my-evolution/e-summary-tasks.c:287
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(İzahsız)"
 
@@ -10196,23 +23799,24 @@ msgstr "(İzahsız)"
 msgid "My Weather"
 msgstr "Mənim Hava Vəziyyətim"
 
-#: my-evolution/e-summary-weather.c:348
-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>"
+#: 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:501
 msgid "Weather"
 msgstr "Hava"
 
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr "Bölgələr"
-
 #: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:488
+#, fuzzy
+msgid "Please wait..."
+msgstr "Xahiş edirik gözləyin"
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "İcmalı Çap Et"
 
@@ -10220,42 +23824,10 @@ msgstr "İcmalı Çap Et"
 msgid "Printing of Summary failed"
 msgstr "İcmal Çapı bacarılmadı"
 
-#: my-evolution/main.c:66
+#: my-evolution/main.c:65
 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
-msgid "F"
-msgstr "F"
-
-#: my-evolution/metar.c:29
-msgid "C"
-msgstr "C"
-
-#: my-evolution/metar.c:33
-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
-msgid "miles"
-msgstr "mil"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilometr"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Təmizlə"
@@ -10654,11 +24226,6 @@ msgstr "Sürüşgən buz dənəcəkləri"
 msgid "Freezing ice pellets"
 msgstr "Şaxta və buz dənəcəkləri"
 
-#. HAIL
-#: my-evolution/metar.c:217
-msgid "Hail"
-msgstr "Dolu"
-
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "Çevrədə dolu yağışı var"
@@ -11404,150 +24971,123 @@ msgid "Drifting dust whirls"
 msgstr "Sürüşgən toz qasırğaları"
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr " _Sil"
-
-#: my-evolution/my-evolution.glade.h:2
 msgid "Add n_ews feed"
 msgstr "Xəbə_r əlavə et"
 
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "Büt_ün dayancaqlar:"
-
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "Bütün _qovluqlar:"
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "Bütün xə_bərlər:"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr "S_elsius"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 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:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr "Göstəriləcək ən ço_x miqdar:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr "Xəbərlər Qurğuları"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr "Bir a_y"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr "Bir hə_ftə"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr "Y_enilə vaxtı (saniyələrlə):"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr "Yeniləma vax_tı (saniyələrlə):"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 msgid "S_how full path for folders"
 msgstr "Qovluqların tam cığırını g_östər"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr "B_ütün vəzifələri göstər"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _today's tasks"
 msgstr "_Bugünku vəzifələri göstər"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr "İstiliklərini göstər:"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "Vəzifələr"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr "Hava qurğuları"
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "Qovluqları _göstər:"
-
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "Stasiyaları _göstər:"
-
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
-msgstr "Məlzəmələri _göstər:"
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr "_Fahrenayt"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr "_Beş gün"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr "_Məktub"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 msgid "_News Feeds"
 msgstr "_Xəbərlər"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr "_Bur Gün"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr "_Vaxtlaşdır"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr "_Hava"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Xüsusi Cərgələr"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution qabığı."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Təfsilatı Göstər"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Əməliyyatı Ləğv Et"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Gələnlər qutusu"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Gedənlər qutusu"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Yerli Qovluqlar"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution qurulması"
 
-#: 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"
@@ -11555,17 +25095,17 @@ msgstr ""
 "Evolutionun bu yeni qurulmasının şəxsi Evolution qovluğuna\n"
 "bə'zi əlavə fayllar köçürməlidir"
 
-#: shell/e-setup.c:129
+#: 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:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Fayllar düzgün güncəllənə bilmədi"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11576,7 +25116,7 @@ msgstr ""
 "\n"
 "Xəta : %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11585,7 +25125,33 @@ msgstr ""
 "`%s' işinə fayllar köçürülürkən xəta\n"
 "baş verdi."
 
-#: shell/e-setup.c:281
+#: shell/e-setup.c:282
+#, fuzzy, c-format
+msgid ""
+"Evolution could not create directory\n"
+"%s:\n"
+"%s"
+msgstr ""
+"%s qovluğunu yarada bilmədim:\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:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11596,7 +25162,7 @@ msgstr ""
 "\"Evolution\" istifadəçi fayllarınin qurulması\n"
 "üçün onu sil."
 
-#: shell/e-setup.c:295
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11610,7 +25176,7 @@ msgstr ""
 "bunlar silinməlidir.\n"
 "Bu qovluğu silmək istəyirsiniz?"
 
-#: shell/e-setup.c:320
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11621,49 +25187,53 @@ msgstr ""
 "\"Evolution\" qovluğunda yerləşmir. \"Evolution\" \n"
 "istifadəçi fayllarınin qurulması üçün onu sil."
 
-#: 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 "Təlif haqqı 1999, 2000, 2001 Helix Code, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Sizə gətirən"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Qovluq yoxlana bilmir: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Qovluaq adı dəyişdirilə bilmir:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Qovluq öz üstünə daşına bilməz."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Qovluq öz üstünə köçürülə bilməz."
 
-#: 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 "Qovluq içindəkilərdən birinə daçına bilməz."
 
-#: 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\" qovluğunun köçürələcəyi qovluğu bildir:"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Qovluğu köçürt"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Qovluğu daşı"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11672,18 +25242,18 @@ msgstr ""
 "Qovluq silinə bilmir:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\"-i Sil"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11692,22 +25262,22 @@ msgstr ""
 "Qovluaq adı dəyişdirilə bilmir:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "%s qovluğu adını buna dəyişdir:"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Qovluğun adını dəyişdir"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:148
+#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Bildirilən qovluq adı hökmlü deyildir: %s"
 
-#: 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"
@@ -11716,7 +25286,7 @@ msgstr ""
 "Bildirilən qovluq yaradıla bilmədi:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:267
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "\"Evolution\" - Yeni qovluq yarat"
 
@@ -11728,11 +25298,11 @@ msgstr ""
 "Bildirilən gediş üçün bu seçili qovluq növü \n"
 "hökmlü deyildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:359
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Yeni ..."
 
-#: 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 "( Adsız )"
 
@@ -11748,13 +25318,13 @@ 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:799
+#: 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 "Xahiş edirik, idxal edəcəyiniz məlumatı seçin:"
 
@@ -11780,16 +25350,22 @@ msgstr ""
 "%s Alınır\n"
 "%d üzvü alınır."
 
-#: shell/e-shell-importer.c:397
+#: shell/e-shell-importer.c:409
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' faylı yoxdur"
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: shell/e-shell-importer.c:420
 msgid "You may only import to local folders"
 msgstr "Təkcə yerli qovluqlara idxal edə bilərisiniz"
 
-#: shell/e-shell-importer.c:424
+#: shell/e-shell-importer.c:435
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11798,11 +25374,11 @@ msgstr ""
 "İş görəcək alıcı mövcud deyildir\n"
 "%s"
 
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:445
 msgid "Importing"
 msgstr "Alınır"
 
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:453
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11811,17 +25387,17 @@ msgstr ""
 "%s Alınır.\n"
 "%s Başladılır"
 
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:466
 #, c-format
 msgid "Error starting %s"
 msgstr "%s başladırkən xəta oldu"
 
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:485
 #, c-format
 msgid "Error loading %s"
 msgstr "%s yüklənərkən xəta oldu"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:502
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11830,31 +25406,31 @@ msgstr ""
 "%s Alınır\n"
 "Alınan üzv 1."
 
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:572
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:623
 msgid "Filename:"
 msgstr "Fayl adı:"
 
-#: shell/e-shell-importer.c:617
+#: shell/e-shell-importer.c:628
 msgid "Select a file"
 msgstr "Fayl seç"
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:638
 msgid "File type:"
 msgstr "Fayl növü:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:663
 msgid "Import data and settings from older programs"
 msgstr "Köhnə proqramlardakı verilən və qurğuları idxal et"
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:667
 msgid "Import a single file"
 msgstr "Tək fayl idxal et"
 
-#: 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
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11862,24 +25438,24 @@ msgstr ""
 "Xahiş edirik gözləyin...\n"
 "Mövcud qurğular axtarılır"
 
-#: 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
 msgid "Starting Intelligent Importers"
 msgstr "Ağıllı İdxalçılar Başladılır"
 
-#: 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
 #, c-format
 msgid "From %s:"
 msgstr "Göndərən %s:"
 
-#: shell/e-shell-importer.c:1014
+#: shell/e-shell-importer.c:1027
 msgid "Select folder"
 msgstr "Qovluq seçin"
 
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1028
 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:1127 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Al"
 
@@ -11900,6 +25476,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Yeni"
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr "Qovluq adı bildirilməyib."
@@ -11916,109 +25498,124 @@ 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:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH yolunda tapıla bilmədi."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "\"Bug-buddy\" işə salına bilmədi."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution Haqqında"
 
-#: shell/e-shell-view-menu.c:409
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Qovluğa get ..."
 
-#: shell/e-shell-view-menu.c:410
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Açmaq istədiyiniz qovluğu seçin"
 
-#: shell/e-shell-view-menu.c:530
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Yeni bir qısa yol yarat"
 
-#: shell/e-shell-view-menu.c:531
+#: shell/e-shell-view-menu.c:566
 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:562
-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."
-
-#: shell/e-shell-view-menu.c:570
-#, c-format
-msgid "Error executing %s."
-msgstr "%s icra xətası."
-
-#: shell/e-shell-view-menu.c:672
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "Xətdə _İşlə"
 
-#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Xətdən Qopuq _İşlə"
 
-#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Xətdən Qopuq İşlə"
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "( Heç bir qovluq göstərilmir )"
 
-#: shell/e-shell-view.c:1574
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1576
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(Heç Biri)"
 
-#: shell/e-shell-view.c:1623
-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."
+#: shell/e-shell-view.c:1867
+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."
 
-#: 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 xətdən çıxmaq gedişatındadır."
 
-#: shell/e-shell-view.c:1636
-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."
+#: shell/e-shell-view.c:1880
+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."
+
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Fəallaşdırma sistemi xətası:\n"
+"%s"
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerli qeydi quraşdıra bilmədim -- %s"
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, 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:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Oldu"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Hökmsüz arqumentlər"
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "OAF-a qeyd edə bilmirəm"
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Quraşdırma Databeyzi Tapılmadı"
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Ümumi xəta"
 
@@ -12135,76 +25732,71 @@ msgstr "_Sil"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu qısa yolu qısa yol çubuğundan sil"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Qısa yolları qeyd edərkən xəta oldu."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Qısa Yollar"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Qovluğu daşıya bilmirəm:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Gələnlər qutusu"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "( Adsızdır )"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Xəta yoxdur"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Eyni adlı bir qovluq onsuz da var"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Bildirilən qovluq növü hökmlü deyildir"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "G/Ç xətası"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Qovluğu yaratmaq üçün lazımi disk sahəsi yoxdur"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Qovluq boş deyil"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Bildirilən qovluq tapıla bilmədi"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funksiya yazılmamışdır"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Əməliyyat dəstəklənmir"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Bu qeydlərdə müəyyənləşdirilən növ dəstəklənmir"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "Bildirilən qovluq təkmilləşdirilə, silinə bilməz"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Altlarından birinə törəmə qovluq yarada bilmirəm"
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "Bu adda qovluq yarada bilmədim"
 
@@ -12214,106 +25806,114 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% qurtardı)"
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<qovluq seçmək üçün buraya tıqlayın>"
+
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Naməlum xəta."
+
+#: 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"
+"Komponent sistemi xətası:\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"
+"Fəallaşdırma sistemi xətası:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "CORBA xətası"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Kəsilmiş"
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Səhv qrqument"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Onsuz da yiyəsi var"
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Yiyəsi yoxdur"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Tapıla bilmədi"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Dəstəklənməyən növ"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Dəstəklənməyən sxem"
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Dəstəklənməyən gedişat"
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Daxili xəta"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Mövcuddur"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Hökmsüz URI"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Alt qovluqları var"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Heç yer qalmayıb"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Köhnə yiyəsi öldü"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Naməlum xəta."
-
-#: 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"
-"Komponent sistemi xətası:\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"
-"Fəallaşdırma sistemi xətası:\n"
-"%s"
+#: shell/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "Fayl növü:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -12321,7 +25921,8 @@ 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"
@@ -12386,7 +25987,9 @@ 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"
@@ -12439,291 +26042,271 @@ 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
+msgid "Evolution"
+msgstr "Evolution"
+
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution əndə çıxır..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution qabığına çata bilmədim."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution qabığını başlada bilmədim: %s"
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Açılış ekranını gösdərmə"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "İdxal başlanır"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Ağıllı İdxalçılar Başladılır"
+
+#: shell/main.c:320
 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:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parçalar sistemini başlada bilmədim."
 
+#: tools/evolution-addressbook-abuse.c:80
 #: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Əsas ünvan dəftəri yüklərkən xəta oldu."
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Yekun Faylı"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Giriş Faylı"
 
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr "Yekun Faylı"
+
 #: tools/evolution-addressbook-import.c:80
 msgid "No filename provided."
 msgstr "fayl adı bildirilməyib."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Köçürt"
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Seçili ismarışları başqa cərgəyə köçür"
 
-#: 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 "Seçiləni köçürt"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Qovluğa _Köçürt..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Yeni bir hesab yarat"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Yeni bir əlaqə siyahısı yarat"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "Kəs"
-
-#: 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 "Seçiləni kəs"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "Seçili əlaqəni sil"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Yeni Siyahı"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Seçili ismarışları başqa bir cərgəyə daşı"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Yapışdır"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Qovluğa _Daşı ..."
 
-#: 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 "Ara yaddaşı yapışdır"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Çap ediləcək əlaqəni nümayiş etdirər"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Seçili əlaqələri çap et"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Seçili əlaqələri VCard olaraq qeyd et."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Hamısını Seç"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Bütün əlaqələri seç"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "_İsmarışı Əlaqəyə Göndər..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Seçili ismarışı başqa əlaqələrə yolla."
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Əlaqəyə yeni bir ismarış göndər"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Seçili əlaqələri başqasına göndər."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Dayan"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Yükləməni Dayandır"
 
-#: 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 "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: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-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
 msgid "_Actions"
 msgstr "_Gedişlər"
 
-#: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr "_Ünvan Dəftəri Qaynağı..."
-
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr "_Əlaqə"
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "_Əlaqə Siyahısı"
 
-#: 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 "Əlaqənı _Çatdır..."
 
-#: 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 "_Çap Et ..."
-
 #: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "Qovluğa _Daşı ..."
+
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "VCard olaraq _Qeyd Et"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "Əlaqələri A_xtar"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "Hamısını Se_ç"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "TƏqvim qurğularını quraşdır"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "_İsmarışı Əlaqəyə Göndər..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Yeni Bütün Gün _Hadisəsi Yarat"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a New _Task"
-msgstr "Yeni _Vəzifə Yarat"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "_Yeni Görüş Yarat"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "Bütün gün üçün hadisə yarat"
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Gün"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Bu görüşü sil"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Get"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Dala get"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "İrəli get"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "_Tarixə Get"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Xüsusi bir tarixə get"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Bugünə get"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Ay"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Yeni İclas"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr "Yeni Vəzifə"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Çap ediləcək təqvimi nümayiş etdirər"
 
-#: 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 "Çap Etmə Nüma_yişi"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Bu təqvimi çap et"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Bu təqcimdə Sərbəst/Məşğul məlumatını dərc et"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Bir günü göstər"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Bir ayı göstər"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Bir həftəni göster"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "İş həftəsini göstər"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Həftə"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "_Görüş..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Təqvim Qurğuları..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "Sərbəst/Məşğul Məlumatını _Dərc Et"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "_Vəzifə..."
-
 #: 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
@@ -12753,18 +26336,18 @@ msgstr "Çap ediləcək üzvü nümayiş etdir"
 msgid "Print this item"
 msgstr "Bu üzvü çap et"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Çap Et ..."
-
-#: 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 "Qeyd Et"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Fərqli Qeyd Et ..."
+
 #: 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 "Qeyd Et və Qapat"
 
@@ -12780,8 +26363,8 @@ msgstr "Bu üzvü diskə qeyd et"
 #: 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:40
 msgid "_File"
 msgstr "_Fayl"
 
@@ -12790,19 +26373,24 @@ msgid "Print En_velope..."
 msgstr "_Zərfi Çap Et..."
 
 #: 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 "_Fərqli Qeyd Et ..."
 
 #: ui/evolution-contact-editor.xml.h:9
-msgid "Save the contactt and close the dialog box"
+#, fuzzy
+msgid "Save the contact and close the dialog box"
 msgstr "Əlaqəni qeyd et və dialoqu qapat"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "_İsmarışı Əlaqəyə Göndər..."
+
 #: 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 "_Qeyd Et ..."
 
@@ -12862,6 +26450,10 @@ 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"
@@ -12871,82 +26463,57 @@ msgid "Compose _New Message"
 msgstr "_Yeni İsmarış Yaz"
 
 #: ui/evolution-mail-global.xml.h:4
-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"
-
-#: ui/evolution-mail-global.xml.h:5
 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:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Virtual qovluq izahatları yaradın və ya təkmilləşdirin"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Zibil qutusunu _boşalt"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "_Parolları Unut"
 
-#: 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 "Yenidən xəbərdar edilmək üçün yadda saxlanan bütün parolları unut"
-
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Yeni İsmarış"
+msgstr ""
+"Yenidən xəbərdar edilmək üçün yadda saxlanan bütün parolları unut"
 
-#: 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əktub yazmaq üçün yazma pəncərəsini aç"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Bütün seçili ismarışları bütün qovluqlardan tamamilə sil"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "Al / Göndər"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Sorğulanmış məktubu göndər və yeni məktubları al"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "İsmarış nümayiş pəncərəsini göster"
 
-#: ui/evolution-mail-global.xml.h:16
+#: 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:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "Virtual Qovluq _Düzəldicisi..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Süzgəclər ..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "_Məktub İsmarışı"
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "_Məktub Qurğuları..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Nümayiş Paneli"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "_Göndər / Al"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "Qovluqlara Qe_ydiyyatdan Keç..."
 
@@ -12979,8 +26546,10 @@ msgid "Hide _Read Messages"
 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ə"
+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ə"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
@@ -13008,11 +26577,14 @@ 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ç"
+msgstr ""
+"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"
@@ -13038,11 +26610,11 @@ msgstr "Seçili ismarışları müvəqqəti gizlə"
 msgid "Threaded Message list"
 msgstr "İlgək_lənmiş İsmarışlar Siyahısı"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_Təmizlə"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Qovluq"
 
@@ -13059,211 +26631,229 @@ msgid "_Threaded Message List"
 msgstr "İlmək_lənmiş İsmarışlar Siyahısı"
 
 #: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Yollayanı Ünvan dəftərinə Əlavə Et"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Süzgəclər Əlavə Et"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Yollayanı Ünvan dəftərinə Əlavə Et"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Seçili ismarışlarlara süzmə qaydaları əlavə et"
 
-#: 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 "Seçili ismarış göndərən bütün alıcılara cavab yaz"
 
-#: 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 "Seçili ismarış göndərən məktublaşma qrupuna cavab yaz"
 
-#: 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 "Seçili ismarış göndərənə cavab yaz"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Seçili ismarışları başqa cərgəyə köçür"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "İsmarışdan _Virtual Qovluq Yarat"
 
-#: 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 "Bu yollayanların ismarışlarını süzmək üçün qayda yarat"
 
-#: 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 "Bu alıcıların ismarışlarını süzmək üçün qayda yarat"
 
-#: 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 "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:11
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Bu mövzulu ismarışları süzmək üçün qayda yarat"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Bu alıcılara virtual qovluq yarat"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Bu məktublaşma qrupuna virtual qovluq yarat"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Bu yollayana virtual qovluq yarat"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Bu mövzuya virtual qovluq yarat"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Mətn böyüklüyünü azalt"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Sonrakı vacib ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Sonrakı ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Sonrakı oxunamış ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Sonrakı oxunmamış ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Əvvəlki vacib ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Əvvəlki ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Əvvəlki oxunmamış ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Çatdır"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Məktublaşma Q_rupuna görə Süz..."
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Gö_ndərənə görə Süz..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Alı_cıya görə Süz..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Möv_zuya  görə Süz..."
 
-#: ui/evolution-mail-message.xml.h:29
-msgid "Force images in HTML mail to be loaded"
-msgstr "Məktubdakı HTML içindəki rəsmləri yüklənməyə məcbur et"
-
-#: ui/evolution-mail-message.xml.h:30
-msgid "Forward"
-msgstr "Çatdır"
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward As"
-msgstr "Fərqli Çatdır"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward _Attached"
-msgstr "_İlişdirərək Çatdır"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Inline"
-msgstr "_İşində Çatdır"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Seçili ismarışları silmə üçün işarələ"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Quoted"
-msgstr "_Sitatlayaraq Çatdır"
+msgid "Follow _Up..."
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr "Məktubdakı HTML içindəki rəsmləri yüklənməyə məcbur et"
+
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Seçili ismarışı yeni ismarış vücudunda çatdır"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Seçili ismarışı sitatını cavab olaraq çatdır"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Seçili ismarışı birinə çatdır"
 
-#: 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 "Seçili ismarışı birinə ilişdirərək çatdır"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Mətn böyüklüyün artıq"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "_Rəsmləri Yüklə"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "_Vacib olaraq İşarələ"
 
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Ox_unmamış olaraq İşarələ"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Qeyri-Va_cib olaraq İşarələ"
 
-#: 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 "İşarələ"
 
-#: 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 "Seçili ismarışları vacib olaraq işarələ"
 
-#: 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 "İsmarışı əvvəl oxunmamış olaraq İşarələ"
 
-#: 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 "Seçili ismarışları vacib olaraq işarələ"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Seçili ismarışları silmə üçün işarələ"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Daşı"
 
-#: 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 "Seçili ismarışları başqa bir cərgəyə daşı"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "İrəli"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "Sonrakı Vacib İsmarış"
-
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
-msgstr "Sonrakı İsmarış"
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "Sonrakı Vacib İsmarış"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Sonrakı İlmək"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Sonrakı Oxunmamış İsmarış"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -13279,159 +26869,188 @@ msgid "Original Si_ze"
 msgstr "Əsl Bö_yüklük"
 
 #: ui/evolution-mail-message.xml.h:61
-msgid "Preview the message to be printed"
-msgstr "Çap ediləcək ismarışı nümayiş etdir"
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Əvvəlki Oxunmamış İsmarış"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "Əvvəlki"
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Əvvəlki Vacib İsmarış"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "Əvvəlki Vacib İsmarış"
+msgid "Preview the message to be printed"
+msgstr "Çap ediləcək ismarışı nümayiş etdir"
 
 #: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "Əvvəlki İsmarış"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "Əvvəlki Oxunmamış İsmarış"
+msgid "Previous"
+msgstr "Əvvəlki"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "İsmarışı çap et"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "Cavab ver"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Re_direct"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "Hamısına cavab ver"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Seçili ismarışı birinə çatdır"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr "Mətni əsl böyüklüyünə sıfırla"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "İsmarışı A_xtar..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "Daha Ki_çik"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "İsmarışı mətn faylı olaraq göstər"
 
-#: 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 "Göstərilən ismarışın vücudunda mətn axtar"
 
-#: ui/evolution-mail-message.xml.h:78
+#: 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:79
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "Məktub _Mənbəyini Göstər"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "_Tam Başlıqları Göstər"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "İsmarışı normal tərzdə göstər"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "İsmarışı bütün başlıqlarla göstər"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "İsmarışın mənbəyini göstər"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "Mətn Bö_yüklüyü"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Seçili ismarışı silmə"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "Məktublaşma Q_rupundakı VFolder..."
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "Gön_dərəndəki VFolder..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "_Alıcıdakı VFolder..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "_Mövzudakı VFolder..."
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
-msgstr "Süzgəcləri Ə_lavə Et"
-
 #: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Attached"
+msgstr "Yapışdır"
+
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "Qovluğa _Köçürt"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "İsmarışdan Qayda _Yarat"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "İsmarışı Çat_dır"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Get"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "Daxili"
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "Daha _Enli"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "_İsmarış Ekranı"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "Qovluğa _Daşı"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Sonrakı İsmarış"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Normal Ekran"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "İsmarışı _Aç"
 
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Əvvəlki İsmarış"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Sitatlandırılmış"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_Vasitələr"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Geri Gətir"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 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: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:36
 msgid "_Close"
 msgstr "_Qapat"
 
 #: 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:56
 msgid "_View"
 msgstr "_Göstər"
 
@@ -13455,11 +27074,11 @@ msgstr "İsmarışı PGP ilə kodla"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Bu ismarışı S/MIME Vəsiqəniz ilə kriptləyin"
 
-#: 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 "For_mat"
 
-#: 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"
 
@@ -13475,6 +27094,10 @@ msgstr "Bir faylı mətn olaraq ismarışa əlavə et"
 msgid "Insert text file..."
 msgstr "_Mətn faylını daxil et ... "
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Aç"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Fayl aç"
@@ -13508,7 +27131,7 @@ msgid "Save in folder..."
 msgstr "_Qovluqda qeyd et ..."
 
 #: 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 "Hazırkı faylı qeyd et"
 
@@ -13533,6 +27156,7 @@ msgid "Send _later"
 msgstr "_Sonra göndər"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "ePoçtu HTML Şəklində göndər"
 
@@ -13601,7 +27225,7 @@ msgid "_From Field"
 msgstr "_Göndərən Girişi"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Daxil Et"
 
@@ -13613,11 +27237,7 @@ msgstr "_Aç ..."
 msgid "_Reply-To Field"
 msgstr "_Cavab_Verləcək Girişi"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Təhlükəsizlik"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Kömək"
 
@@ -13673,33 +27293,41 @@ msgstr "Son vəzifə bildilərini öyrən"
 msgid "Re_fresh Task"
 msgstr "Vəzifəni Ye_nilə"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Vəzifə nümayiş qurğularını sazla"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Seçili vəzifəni köçürt"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Seçili vəzifəni kəs"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "Seçili vəzifələri sil"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Seçili vəzifələri sil"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "Qurtardı deyə _İşarələ"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Vəzifəni ara yaddaşdan yapışdır"
 
-#: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings..."
-msgstr "Vəzifə Qurğuları..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Çap ediləcək əlaqəni nümayiş etdirər"
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
-msgstr "_Vəzifə"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "İsmarışı çap et"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -13766,113 +27394,118 @@ msgid "Open this folder in an other window"
 msgstr "Bu qovluğu yeni pəncərədə aç"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Al / Göndər"
+
+#: ui/evolution.xml.h:22
+#, 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
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution haqqında məlumat göstər"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Xəta Raportunu Göndər"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "_Xəta Raportunu Göndər"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug-buddy ilə bir xəta raportunu göndər"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Gizlə/Göstər"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Qovluqlar çubuğunun nümayiş etdiriləcəyi yeri bildir"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 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:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Oflayn işləmənin harda olacağını bildirər"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Seçili qovluğu göstər"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolution Haqqında..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Köçürt..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "_Qovluq Çubuğu"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "Qovluğa _Get ..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_İdxal Et..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Daşı ..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Yeni"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Yeni Qovluq"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_Pilot Qurğuları..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Adını Dəyişdir..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Göndər / Al"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Qısa Yol"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "_Qısa Yol Çubuğu"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "İcmal xüsusiyyətlərini dəyişdir"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "İcmalı çap et"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Yenilə"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Nümayişi yenilə"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "_İcmal Qurğuları..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Ünvan Kartları"
@@ -13886,18 +27519,27 @@ msgid "Phone List"
 msgstr "Telefon Siyahısı"
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "Qovluq Seçin"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Göndərən"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Vəziyyət"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Mövzu"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "İsmarışlar"
 
@@ -13905,6 +27547,12 @@ msgstr "İsmarışlar"
 msgid "With Category"
 msgstr "Kateqoriya ilə"
 
+#. Check for UTC.
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+msgid "UTC"
+msgstr ""
+
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "Select a Time Zone"
 msgstr "Vaxt Zolağı Seç"
@@ -13923,15 +27571,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:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "_Hazırkı Görünüş"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "_Hazırkı Görünüş"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "Görünüşləri Müəyyənləşdir"
 
@@ -13961,78 +27619,84 @@ 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:58
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "Baltik"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "Mərkəzi Avropa"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "Çincə"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr "Kirilcə"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "Yunanca"
 
-#: 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 "Yaponca"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Korean"
 msgstr "Koreyaca"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Türkçə"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Yunikod"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Qərbi Avropa"
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 msgid "Traditional"
 msgstr "Ənənəvi"
 
-#: 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 "Bəsitləşdirilmiş"
 
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:92
 msgid "Ukrainian"
 msgstr "Ukraynaca"
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "Yeni"
+#: widgets/misc/e-charset-picker.c:95
+#, fuzzy
+msgid "Visual"
+msgstr "Bağla"
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Naməlum hərf dəstəsi: %s"
 
-#: widgets/misc/e-charset-picker.c:201
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "İşlədiləcək hərf köməsini girin"
 
-#: widgets/misc/e-charset-picker.c:276
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Başqa..."
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Hərf Kodlaması"
 
@@ -14040,25 +27704,23 @@ msgstr "Hərf Kodlaması"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Axtarış Editoru"
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Axtarışı Qeyd Et"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Qeydedilmiş Axtarışlara Əlavə Et"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Təmizlə"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Axtarışı Qeyd Et"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Hamısını Göstər"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Qeydedilmiş Axtarışlara Əlavə Et"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -14081,11 +27743,21 @@ msgstr "İsmarış"
 msgid "Don't show this message again."
 msgstr "Bu ismarışı bir də göstərmə."
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "Ax_tar"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "İndi Axtar"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Təmizlə"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Təmizlə"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "İndi Axtar"
 
@@ -14111,3 +27783,918 @@ msgstr "init_corba(): GNOME başladıla bilmədi"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 
+#~ msgid "Card: "
+#~ msgstr "Kart: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Ad: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Prefiks:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Verilən:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Əlavə: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ailə:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Suffiks:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Ad günü:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Ünvan:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "   Poçt Qutusu:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "   Əlavə:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "   Küçə:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "   Şəhər:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "   Rayon:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "   Poçt Kodu:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "   Ölkə:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Təslim Etiketi:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefonlar:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefon:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "ePoçt:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "ePoçt:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Zaman zolağı:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "Məslək:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "Quruluş:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "   Ad:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "   Bölmə:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "   Bölmə2:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "   Bölmə3:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "   Bölmə4:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kateqoriyalar:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "İzahat:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Yeganə Kəlimə:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Ümumi Açar:\t"
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "LDAP vericiyə bağlantı qurulur..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "LDAP vericiyə bağlantı qurulmağı gözlənilir..."
+
+#~ msgid "New _Contact"
+#~ msgstr "Yeni Ə_laqə"
+
+#~ msgid "New Contact _List"
+#~ msgstr "Yeni Əlaqə _Siyahısı"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Ünvan dəftərini düzəlt"
+
+#~ msgid "Account Name"
+#~ msgstr "Hesab Adı"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Ünvan dəftəri əlavə et"
+
+#~ msgid "Server Name"
+#~ 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.  "
+
+#~ 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."
+#~ 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."
+
+#~ msgid ""
+#~ "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."
+
+#~ 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."
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Bu. ldap vericinizin istifadə etdiyi qapı nömrəsidir."
+
+#~ 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:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Aşağıdakı kriteriyalara uyğun gələn əlaqələri göstər:"
+
+#~ msgid "_Message Recipients:"
+#~ msgstr "_İsmarış Alıcısı:"
+
+#~ msgid "B_usiness"
+#~ msgstr "_Məslək"
+
+#~ msgid "Business _Fax"
+#~ msgstr "Məsləki _Faks"
+
+#~ msgid "_Business"
+#~ msgstr "_Məslək"
+
+#~ msgid "_Home"
+#~ msgstr "_Ev"
+
+#~ msgid "_Mobile"
+#~ msgstr "_Cib"
+
+#~ msgid "Republic Of Moldova"
+#~ msgstr "Moldova Respublikası"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Yeni bir iclas yarat"
+
+#~ msgid "Create a new task"
+#~ msgstr "Yeni bir vəzifə yarat"
+
+#~ msgid "New _Task"
+#~ msgstr "Yeni _Vəzifə"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Əsas _xatırladıcılı yeni görüş yarat"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "Hə_ftənin ilk günü:"
+
+#~ msgid "_Other"
+#~ msgstr "_Başqa"
+
+#~ 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%"
+
+#~ 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:"
+
+#~ msgid "Invalid type in body-contains, expecting string"
+#~ msgstr "Cismdə hökmsüz yazı, kəlimə xaric"
+
+#~ msgid ""
+#~ "EMail: %s\n"
+#~ "Common Name: %s\n"
+#~ "Organization Unit: %s\n"
+#~ "Organization: %s\n"
+#~ "Locality: %s\n"
+#~ "State: %s\n"
+#~ "Country: %s"
+#~ msgstr ""
+#~ "ePoçt: %s\n"
+#~ "Ümumə Ad: %s\n"
+#~ "Quruluş Vahidi: %s\n"
+#~ "Quruluş: %s\n"
+#~ "Yer: %s\n"
+#~ "Əyalət: %s\n"
+#~ "Ölkə: %s"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "%s@%s üçün parolu lütfən girin"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Verici istifadəçi adını qəbul etmədi"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Vericiyə istifadəçi adı göndərilə bilmədi"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Verici istifadəçi adını/parolunu qəbul etmədi"
+
+#~ msgid "Message %s not found."
+#~ msgstr "%s ismarışı tapıla bilmədi"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Vericidən qrup adı öyrənilə bilmədi."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "%s üçün qrup siyahısı yüklənə bilmir: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "%s üçün qrup faylı qeyd edilə bilmir: %s"
+
+#~ msgid "Could not open directory for news server: %s"
+#~ msgstr "Xəbər vericisi üçün qovluq açıla bilmir: %s"
+
+#~ msgid "Unable to open or create .newsrc file for %s: %s"
+#~ msgstr "%s üçün .newsrc faylı açıla bilmir ya da yaradıla bilmir: %s"
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "POP vericisindəki yeni ismarışlar yoxlana bilmir: %s"
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr "Qovluq açıla bilmir: ismarış siyahısı bütün deyil."
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "İsmarış alına bilmir: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ 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."
+#~ msgstr ""
+#~ "Bu seçənək POP verisici ilə Kerberos 4 istifadə edərək ünsiyyət "
+#~ "quracaqdır."
+
+#~ msgid "Could not authenticate to KPOP server: %s"
+#~ msgstr "KPOP vericisi ilə ünsüyyət qurula bilmir: %s"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Vericiyə bağlana bilmirəm: %s"
+
+#~ 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."
+
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "RCTP TO cavablama xətası: %s: məktub göndərilə bilmədi"
+
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "DATA cavablama xətası: %s: məktub göndərilə bilmədi"
+
+#~ 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"
+
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "QUİT cavablama xətası: %s: ağır deyil"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Qovluq URIsini Bildirin"
+
+#~ msgid "Message was received"
+#~ msgstr "İsmarış alındı"
+
+#~ msgid "Message was sent"
+#~ msgstr "İsmarış göndərildi"
+
+#~ msgid "on or before"
+#~ msgstr "da(də) ya da əvvəl"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Məktub saxlama qovluğu (daxili)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Ambara bağlana bilmirəm: %s"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "Yeni _Məktub İsmarışı"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Axtarışdan vFolder yarat"
+
+#~ 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ə"
+
+#~ msgid "Composer"
+#~ msgstr "Yazıçı"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Əsas Çatdırma tərzi:"
+
+#~ 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ç..."
+
+#~ msgid "_Email Address:"
+#~ msgstr "_Poçt Ünvanı: "
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "Süzgəc gedişlərini buraya _qeyd et:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Qutuluş:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "Bu parolu _yadda saxla"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Əsas olaraq Məktubu HTML Şəklində _göndər"
+
+#~ msgid "_Server Type: "
+#~ msgstr "_Verici Növü: "
+
+#~ msgid "_Signature file:"
+#~ msgstr "_Imza faylı:"
+
+#~ 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ı."
+
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ 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"
+
+#~ msgid "Al_l stations:"
+#~ msgstr "Büt_ün dayancaqlar:"
+
+#~ 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:"
+
+#~ msgid "_Display stations:"
+#~ msgstr "Stasiyaları _göstər:"
+
+#~ 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 )"
+
+#~ msgid "New List"
+#~ msgstr "Yeni Siyahı"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "TƏqvim qurğularını quraşdır"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Yeni Bütün Gün _Hadisəsi Yarat"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Yeni _Vəzifə Yarat"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "_Yeni Görüş Yarat"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Bütün gün üçün hadisə yarat"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Görüş..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Təqvim Qurğuları..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Vəzifə..."
+
+#~ 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"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_Məktub Qurğuları..."
+
+#~ msgid "Forward _Attached"
+#~ msgstr "_İlişdirərək Çatdır"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "_Sitatlayaraq Çatdır"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "Süzgəcləri Ə_lavə Et"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Vəzifə nümayiş qurğularını sazla"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Vəzifə Qurğuları..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "İcmal xüsusiyyətlərini dəyişdir"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "_İcmal Qurğuları..."
+
+#~ msgid "Show All"
+#~ msgstr "Hamısını Göstər"
+
+#~ msgid "Sear_ch"
+#~ msgstr "Ax_tar"
diff --git a/po/bg.po b/po/bg.po
index 3c1cae5879..a4e5daa740 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-04-30 17:53+0300\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -319,11 +319,11 @@ msgstr "�������"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "��������� VCards"
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard �� %s"
@@ -430,54 +430,68 @@ 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
+#, 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "��������� �� Evolution �� �������� �� ��������"
 
-#: 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 Minicard control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the configuration control for the Evolution Addressbook."
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#, fuzzy
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr "������� �� ����������� �� Evolution "
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: 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
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:72
 #: 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
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "��������"
 
@@ -516,10 +530,6 @@ msgstr "������ _��������"
 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 "�� ���� �� ������ ��������� �����"
@@ -595,15 +605,6 @@ msgstr "��� �� � ���������"
 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
@@ -652,12 +653,12 @@ msgstr "������� ���������"
 msgid "Enable Queries (Dangerous!)"
 msgstr "������� ��������� (������!)"
 
-#: addressbook/gui/component/ldap-config.c:188
+#: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "�� ����� �� �� ������ � LDAP �������."
 
-#: addressbook/gui/component/ldap-config.c:206
+#: addressbook/gui/component/addressbook-config.c:215
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -665,47 +666,53 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/ldap-config.c:226
+#: addressbook/gui/component/addressbook-config.c:235
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.c:632
+#: addressbook/gui/component/addressbook-config.c:641
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.c:1134
+#: addressbook/gui/component/addressbook-config.c:1143
 msgid "The server did not respond with a schema entry"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1163
 #, fuzzy
 msgid "Could not query for schema information"
 msgstr ""
 "������ ���������� ��� ���������:\n"
 "%s"
 
-#: addressbook/gui/component/ldap-config.c:1160
+#: addressbook/gui/component/addressbook-config.c:1169
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP ������� �� ������� %s ����������"
 
-#: addressbook/gui/component/ldap-config.c:1604
+#: 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
-msgid "&lt;&lt; Fewer Options"
-msgstr ""
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "�����"
 
 #: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
-msgid "&lt;- _Remove"
+msgid "<- _Remove"
 msgstr "�����"
 
 #: addressbook/gui/component/ldap-config.glade.h:4
@@ -754,8 +761,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "��������� �� ������"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:53
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always"
 msgstr "������"
@@ -848,8 +855,8 @@ msgstr "������������"
 msgid "Mappings"
 msgstr "������"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:55
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Never"
 msgstr "_�����"
@@ -1030,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 ""
 
@@ -1060,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 ""
@@ -1093,7 +1100,7 @@ msgid "Using email address"
 msgstr "���� � �����_��� �����"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:54 mail/mail-config.glade.h:137
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1101,13 +1108,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:139
 msgid "_Add"
 msgstr "���_���"
 
 #: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add -&gt;"
-msgstr ""
+#, fuzzy
+msgid "_Add ->"
+msgstr "�_�����"
 
 #: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
@@ -1147,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:153 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:152 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
@@ -1183,8 +1191,9 @@ msgid "_Log in method:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_More Options &gt;&gt;"
-msgstr ""
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_�����"
 
 #: addressbook/gui/component/ldap-config.glade.h:122
 #, fuzzy
@@ -1264,7 +1273,7 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "������� �� ��������� �� ����� � ��������� ����� �� ��������"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:957
+#: 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
 msgid "Remove"
@@ -1295,12 +1304,12 @@ msgstr "(%d �� �� ��������)"
 msgid "Unnamed Contact"
 msgstr "���������� �������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:580
+#: 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:696
+#: 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"
@@ -1316,7 +1325,7 @@ msgstr ""
 "���� ��������� ���� �� <trow@ximian.com> � �������� ����������\n"
 "���������� ��."
 
-#: addressbook/gui/component/select-names/e-select-names.c:704
+#: 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"
@@ -1324,7 +1333,7 @@ msgid ""
 "correct this problem."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:786
+#: addressbook/gui/component/select-names/e-select-names.c:806
 msgid "Select Contacts from Addressbook"
 msgstr "����� �� ������� �� ��������� �����"
 
@@ -1461,7 +1470,7 @@ msgstr "����� �� ��������� _HTML mail"
 #: 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:1634 mail/mail-config.glade.h:151
+#: 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
 msgid "_Delete"
@@ -2519,14 +2528,6 @@ 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 "��������� �� �������?"
 
@@ -2807,7 +2808,8 @@ 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 shell/e-shell.c:2141
+#: 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
 msgid "Unknown error"
 msgstr "���������� ������"
@@ -2835,10 +2837,9 @@ 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
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2276
-#: camel/camel-service.c:613 camel/camel-service.c:649
-#: camel/camel-service.c:717 camel/camel-service.c:756
+#: 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
 msgid "Cancelled"
 msgstr "����������"
 
@@ -2870,7 +2871,7 @@ msgstr "������ ��� ��������� �� ������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:97
 #: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1592
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "������ ��� ��������� �� �����"
 
@@ -2972,102 +2973,102 @@ msgstr "���� �������"
 msgid "Other Address"
 msgstr "���� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
-#: addressbook/gui/widgets/e-addressbook-view.c:845
-#: addressbook/gui/widgets/e-addressbook-view.c:1794
+#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:1824
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "������� ���� VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:832
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 #, fuzzy
 msgid "New Contact..."
 msgstr "��� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 #, fuzzy
 msgid "New Contact List..."
 msgstr "��� ������ � ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:836
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "����� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:837
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 #, fuzzy
 msgid "Import..."
 msgstr "�����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:839
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "���_�� �� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:840
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "�������� �� ������� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:842
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "��������� �� Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:846
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "�������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:847
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Send Message to Contact"
 msgstr "������� ����������� �� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:848
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: 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:850
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Print Envelope"
 msgstr "����� �� ����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "������� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #, fuzzy
 msgid "Move to folder..."
 msgstr "�������� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:901
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:902
 #: 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:860
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861 filter/libfilter-i18n.h:11
+#: 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
 #: 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:864
+#: addressbook/gui/widgets/e-addressbook-view.c:907
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3077,7 +3078,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:901
+#: addressbook/gui/widgets/e-addressbook-view.c:940
 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,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�"
 
@@ -3085,7 +3086,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:906
+#: addressbook/gui/widgets/e-addressbook-view.c:945
 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,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�"
 
@@ -3325,29 +3326,25 @@ msgstr "_�����..."
 msgid "Untitled appointment"
 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:416 mail/message-list.c:684
+#: 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
 msgid "High"
 msgstr "������"
 
-#: 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:417 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 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:418 mail/message-list.c:682
+#: 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
 msgid "Low"
 msgstr "�����"
 
 #. 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:419
 msgid "Undefined"
 msgstr "������������"
 
@@ -3437,22 +3434,10 @@ 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"
@@ -3491,7 +3476,7 @@ msgstr ""
 "�� ������� ����."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2606
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "��������"
@@ -3536,7 +3521,7 @@ msgstr "���������� �� ��������"
 msgid "Comment contains"
 msgstr "���������� �� ��������"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1118
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "����������"
 
@@ -3565,7 +3550,7 @@ msgstr "%d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1468
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3577,16 +3562,14 @@ msgstr ""
 "OAF"
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:395
 msgid "Private"
 msgstr "������"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:396
 msgid "Confidential"
 msgstr "��������������"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:394
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "��������"
 
@@ -3607,32 +3590,27 @@ msgid "W"
 msgstr "�"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:468
 msgid "Free"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:469
-#: calendar/gui/e-meeting-time-sel.c:435
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
 #: shell/evolution-shell-component.c:1065
 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:489 calendar/gui/print.c:2267
 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:490 calendar/gui/print.c:2270
 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-calendar-table.c:491 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2273
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "����������"
 
@@ -3648,11 +3626,10 @@ 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:1596
-#: mail/mail-account-gui.c:1211 mail/mail-account-gui.c:1212
-#: mail/mail-account-gui.c:1813 mail/mail-accounts.c:439
-#: mail/mail-accounts.c:448 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
+#: 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
 #: 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
@@ -3669,12 +3646,10 @@ 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/e-meeting-model.c:821
 msgid "Yes"
 msgstr "��"
 
 #: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
 msgid "No"
 msgstr "��"
 
@@ -3695,8 +3670,7 @@ msgid "Month View"
 msgstr "����� �� �����"
 
 #: 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
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "��������"
 
@@ -3704,12 +3678,11 @@ msgstr "��������"
 msgid "Folder containing appointments and events"
 msgstr "������� ������� ����� � �������"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/print.c:1754
-#: calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:72 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
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "������"
 
@@ -3959,7 +3932,7 @@ msgstr "���������"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "��������:"
 
@@ -3988,7 +3961,7 @@ msgstr "���� �� �����"
 msgid "hour(s)"
 msgstr "���(���)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:190
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr "�����(�/�)"
 
@@ -4155,7 +4128,7 @@ msgid "_Fri"
 msgstr "_���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_�������"
 
@@ -4255,23 +4228,23 @@ 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:2185
+#: 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:2189
+#: 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:2191
+#: 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:2196
+#: 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:2198
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
 msgid "Due "
 msgstr "������"
 
@@ -4303,8 +4276,8 @@ msgid "No summary"
 msgstr "���� ������"
 
 #: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3814
-#: calendar/gui/e-week-view.c:3709 composer/e-msg-composer.c:958
+#: 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
 msgid "Save as..."
 msgstr "������� ����..."
 
@@ -4366,7 +4339,7 @@ msgstr "�������� ��:"
 msgid "Enter Delegate"
 msgstr "�������� ��������"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2224
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "�����"
 
@@ -4433,7 +4406,7 @@ msgid "Pu_blic"
 msgstr "��������"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "������ ������� ����"
 
@@ -4478,55 +4451,49 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "���� ���"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "��������� ��"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "��������� ��"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 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:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "����"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:864
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 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:52
+#: 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"
 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
+#: 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
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "���"
@@ -4759,9 +4726,9 @@ msgstr "�������"
 msgid "Assignment"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:812
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "��������:"
 
@@ -4773,68 +4740,13 @@ msgstr "��_����� ����:"
 msgid "_Due Date:"
 msgstr "_������ ����"
 
-#: calendar/gui/e-calendar-table.c:438
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:439
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:440
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:441
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:442
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:443
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:444
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:445
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:446
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:447
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:448
-#, c-format
-msgid "100%"
-msgstr "100%"
-
 #: calendar/gui/e-calendar-table.c:751 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:1607
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
 #: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_������"
@@ -4896,13 +4808,12 @@ msgstr "���_����� ���� ������ ���� ���������"
 msgid "_Delete Selected Tasks"
 msgstr "_������� ��������� ������"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7412
-#: calendar/gui/e-week-view.c:4190
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "�������� ��������"
 
 #: calendar/gui/e-calendar-table.c:1342
-#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "�������� �� �� �������� ������"
 
@@ -4910,48 +4821,47 @@ msgstr "�������� �� �� �������� ������"
 msgid "Alarms"
 msgstr "������"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:946
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
 #: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "����������"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "���� �� �����������"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "����"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "������ ����"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "���������� �������"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "���������"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:771
-#: shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "������"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "��������� �� ������"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4986,7 +4896,7 @@ msgstr "%02i ������� ���������"
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1413
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1484
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4999,13 +4909,11 @@ 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"
 
@@ -5056,7 +4964,7 @@ msgid "_Configure Pilot..."
 msgstr "������������"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "������ ����..."
 
@@ -5082,105 +4990,20 @@ msgstr "������ ���� �_������"
 msgid "Delete _All Occurrences"
 msgstr "������ ������ _�������"
 
-#: calendar/gui/e-day-view.c:3966 calendar/gui/e-week-view.c:3837
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
 #: shell/e-shell-view-menu.c:609
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "����������� GNOME Pilot �������� �� � ���������� �� ���� �������"
 
-#: calendar/gui/e-day-view.c:3972 calendar/gui/e-week-view.c:3843
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
 #: shell/e-shell-view-menu.c:617
 #, c-format
 msgid "Error executing %s."
 msgstr "������ ��� ���������� �� %s"
 
-#: calendar/gui/e-itip-control.c:556
-msgid "Meeting begins: <b>"
-msgstr "������ �� �����: <b>"
-
-#: calendar/gui/e-itip-control.c:561
-msgid "Task begins: <b>"
-msgstr "������ �� ������: <b>"
-
-#: calendar/gui/e-itip-control.c:566
-msgid "Free/Busy info begins: <b>"
-msgstr "������ �� ���������� ��������/����: <b>"
-
-#: calendar/gui/e-itip-control.c:570
-msgid "Begins: <b>"
-msgstr "������: <b>"
-
-#: calendar/gui/e-itip-control.c:582
-msgid "Meeting ends: <b>"
-msgstr "���� �� �������:: <b>"
-
-#: calendar/gui/e-itip-control.c:585
-msgid "Free/Busy info ends: <b>"
-msgstr "���� �� ���������� ��������/����: <b>"
-
-#: calendar/gui/e-itip-control.c:589
-msgid "Ends: <b>"
-msgstr "����: <b>"
-
-#: calendar/gui/e-itip-control.c:603
-msgid "Task Completed: <b>"
-msgstr "�������� ����������: <b>"
-
-#: calendar/gui/e-itip-control.c:613
-msgid "Task Due: <b>"
-msgstr "���������� ������: <b>"
-
-#: calendar/gui/e-itip-control.c:650 calendar/gui/e-itip-control.c:699
-msgid "iCalendar Information"
-msgstr "i���������� ����������"
-
-#. Title
-#: calendar/gui/e-itip-control.c:665
-msgid "iCalendar Error"
-msgstr "i�������� ������"
-
-#: calendar/gui/e-itip-control.c:730 calendar/gui/e-itip-control.c:746
-msgid "An unknown person"
-msgstr "���������� �������"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:753
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> ����, ����������� �������� ���������� � ������ �������� �������� �� "
-"������� ����."
-
-#: calendar/gui/e-itip-control.c:769
-msgid "<i>None</i>"
-msgstr "<i>���</i>"
-
-#: calendar/gui/e-itip-control.c:781
-#, fuzzy
-msgid "Status:"
-msgstr "_������:"
-
-#: calendar/gui/e-itip-control.c:786 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
-msgid "Accepted"
-msgstr "�����"
-
-#: calendar/gui/e-itip-control.c:790 calendar/gui/itip-utils.c:326
-#, fuzzy
-msgid "Tentatively Accepted"
-msgstr "�������� ������"
-
-#: calendar/gui/e-itip-control.c:794 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
-msgid "Declined"
-msgstr "�������"
-
-#: calendar/gui/e-itip-control.c:798 calendar/gui/e-itip-control.c:997
-#: calendar/gui/e-itip-control.c:1068 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: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
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
@@ -5188,261 +5011,56 @@ msgstr "�������"
 msgid "Unknown"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:844 calendar/gui/e-itip-control.c:860
-#: calendar/gui/e-itip-control.c:876 calendar/gui/e-itip-control.c:889
-#: calendar/gui/e-itip-control.c:902 calendar/gui/e-itip-control.c:915
-msgid "Choose an action:"
-msgstr "������ ��������:"
-
-#: calendar/gui/e-itip-control.c:845
-msgid "Update"
-msgstr "��������"
-
-#: calendar/gui/e-itip-control.c:846 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:917
-#: shell/e-shell.c:2131 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:861
-msgid "Accept"
-msgstr "������"
-
-#: calendar/gui/e-itip-control.c:862
-msgid "Tentatively accept"
-msgstr "�������� ������"
-
-#: calendar/gui/e-itip-control.c:863
-msgid "Decline"
-msgstr "������"
-
-#: calendar/gui/e-itip-control.c:877
-msgid "Send Free/Busy Information"
-msgstr "������� ���������� ��������/����"
-
-#: calendar/gui/e-itip-control.c:890
-msgid "Update respondent status"
-msgstr "�������� ������� �� ������������"
-
-#: calendar/gui/e-itip-control.c:903
-msgid "Send Latest Information"
-msgstr "������� ���������� ����������"
-
-#: calendar/gui/e-itip-control.c:916 calendar/gui/itip-utils.c:343
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "���������"
-
-#: calendar/gui/e-itip-control.c:964
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> ��������� ���������� �� �����."
-
-#: calendar/gui/e-itip-control.c:965
-msgid "Meeting Information"
-msgstr "���������� �� �����"
-
-#: calendar/gui/e-itip-control.c:969
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> ������� ������ ���������� �� �������."
-
-#: calendar/gui/e-itip-control.c:970
-msgid "Meeting Proposal"
-msgstr "����������� �� �������:"
-
-#: calendar/gui/e-itip-control.c:974
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "<b>%s</b> ����� �� ���� ������� �� �������������� �����."
-
-#: calendar/gui/e-itip-control.c:975
-msgid "Meeting Update"
-msgstr "���������� �� �������:"
-
-#: calendar/gui/e-itip-control.c:979
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> ����� �� ������ ���������� ���������� �� �������.."
-
-#: calendar/gui/e-itip-control.c:980
-msgid "Meeting Update Request"
-msgstr "������ �� ���������� �� �������:"
-
-#: calendar/gui/e-itip-control.c:1003
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> �������� �� ��������� �� �������."
-
-#: calendar/gui/e-itip-control.c:1004
-msgid "Meeting Reply"
-msgstr "������� �� �����"
-
-#: calendar/gui/e-itip-control.c:1008
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> �������� �������."
-
-#: calendar/gui/e-itip-control.c:1009
-msgid "Meeting Cancellation"
-msgstr "���������� �� �������"
-
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1119
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> ������� ������������ ���������."
-
-#: calendar/gui/e-itip-control.c:1014
-msgid "Bad Meeting Message"
-msgstr "���� ��������� �� �����"
-
-#: calendar/gui/e-itip-control.c:1034
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> ��������� ���������� �� ��������."
-
-#: calendar/gui/e-itip-control.c:1035
-msgid "Task Information"
-msgstr "���������� �� ������"
-
-#: calendar/gui/e-itip-control.c:1039
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> ������� ������ ������� � ������.."
-
-#: calendar/gui/e-itip-control.c:1040
-msgid "Task Proposal"
-msgstr "����������� �� ������"
-
-#: calendar/gui/e-itip-control.c:1044
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b>%s</b> ����� �� ���� ������� ��� ������������ ������.."
-
-#: calendar/gui/e-itip-control.c:1045
-msgid "Task Update"
-msgstr "���������� �� ������"
-
-#: calendar/gui/e-itip-control.c:1049
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> ����� �� ������ ���������� ���������� �� ������.."
-
-#: calendar/gui/e-itip-control.c:1050
-msgid "Task Update Request"
-msgstr "������ �� ���������� �� ������"
-
-#: calendar/gui/e-itip-control.c:1074
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> �������� �� ��������� � ������."
-
-#: calendar/gui/e-itip-control.c:1075
-msgid "Task Reply"
-msgstr "������� �� ������"
-
-#: calendar/gui/e-itip-control.c:1079
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> �������� ������."
-
-#: calendar/gui/e-itip-control.c:1080
-msgid "Task Cancellation"
-msgstr "���������� �� ������"
-
-#: calendar/gui/e-itip-control.c:1085
-msgid "Bad Task Message"
-msgstr "���� ��������� �� ������"
-
-#: calendar/gui/e-itip-control.c:1104
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> ��������� ���������� ��������/����."
-
-#: calendar/gui/e-itip-control.c:1105
-msgid "Free/Busy Information"
-msgstr "���������� ��������/����"
-
-#: calendar/gui/e-itip-control.c:1109
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> ������� �� ��� ���������� �� ��������/����."
-
-#: calendar/gui/e-itip-control.c:1110
-msgid "Free/Busy Request"
-msgstr "������ ��������/����"
-
-#: calendar/gui/e-itip-control.c:1114
-#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> �������� �� �������� ��������/����."
-
-#: calendar/gui/e-itip-control.c:1115
-msgid "Free/Busy Reply"
-msgstr "������� ��������/����"
-
-#: calendar/gui/e-itip-control.c:1120
-msgid "Bad Free/Busy Message"
-msgstr "���� ��������/���� ���������"
-
-#: calendar/gui/e-itip-control.c:1193
-msgid "The message does not appear to be properly formed"
-msgstr "������� �������� �� � ������������� ���������."
-
-#: calendar/gui/e-itip-control.c:1212
-msgid "The message contains only unsupported requests."
-msgstr "����������� ������� ���� ����������� ������."
-
-#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1246
-msgid "The attachment does not contain a valid calendar message"
-msgstr "����������� �� ������� ������� �������� ���������."
-
-#: calendar/gui/e-itip-control.c:1271
-msgid "The attachment has no viewable calendar items"
-msgstr "����������� ���� ������ ������ �� ��������"
-
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1564
 msgid "Calendar file could not be updated!\n"
 msgstr "������������ ���� �� ���� �� ���� �������!\n"
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "������������ ����������\n"
 
-#: calendar/gui/e-itip-control.c:1446
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1613
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1638
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1474
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1476
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1504
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "������������� ����������"
 
-#: calendar/gui/e-itip-control.c:1534 calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "������ ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1536 calendar/gui/e-itip-control.c:1588
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "������ �� ���� �� ���� ��������!\n"
 
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "������ �����"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "������ �����"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -5497,57 +5115,58 @@ 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:533
 msgid "Individual"
 msgstr "������������"
 
 #: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
 msgid "Group"
 msgstr "�����"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
 msgid "Resource"
 msgstr "������"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
 msgid "Room"
 msgstr "���������"
 
 #: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
 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:535
 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
 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
 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: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"
+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-time-sel.c:434
 msgid "Tentative"
 msgstr "������"
 
 #: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:838
 msgid "Delegated"
 msgstr "���������"
 
@@ -5652,7 +5271,17 @@ msgstr "�� ���� �� ������ ������ � `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "������ ������ �� ��������� �� `%s' �� �� �������"
 
-#: calendar/gui/e-tasks.c:654
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "���� �� �����������"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "������ ��������� ������"
+
+#: calendar/gui/e-tasks.c:659
 #, fuzzy
 msgid "Expunging"
 msgstr "��������� �� �����"
@@ -5665,17 +5294,17 @@ msgstr "���� _�����..."
 msgid "_Delete this Appointment"
 msgstr "_������ ���� �����"
 
-#: calendar/gui/gnome-cal.c:1537
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/gnome-cal.c:1548
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "������ ������ �� �������� �� `%s' �� �� �������"
 
-#: calendar/gui/gnome-cal.c:1917
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "������ �������� � %s"
@@ -5744,40 +5373,6 @@ msgstr "��������� � ���� ���� ��������."
 msgid "An organizer must be set."
 msgstr "������ �� ���� ������� �����������."
 
-#: calendar/gui/itip-utils.c:295
-msgid "Event information"
-msgstr "���������� �� �������"
-
-#: calendar/gui/itip-utils.c:297
-msgid "Task information"
-msgstr "���������� �� ������"
-
-#: calendar/gui/itip-utils.c:299
-msgid "Journal information"
-msgstr "���������� �� �������"
-
-#: calendar/gui/itip-utils.c:301
-msgid "Free/Busy information"
-msgstr "���������� ��������/����"
-
-#: calendar/gui/itip-utils.c:303
-msgid "Calendar information"
-msgstr "���������� ����������"
-
-#: calendar/gui/itip-utils.c:339
-#, fuzzy
-msgid "Updated"
-msgstr "��������"
-
-#: calendar/gui/itip-utils.c:347
-#, fuzzy
-msgid "Refresh"
-msgstr "�������� ������"
-
-#: calendar/gui/itip-utils.c:351
-msgid "Counter-proposal"
-msgstr ""
-
 #: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "��� ������ �� ��� ������� �� ���������."
@@ -5939,87 +5534,54 @@ msgid "Sa"
 msgstr "��"
 
 #. Day
-#: calendar/gui/print.c:1840
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "������ ��� (%a %b %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 %b %d"
 
-#: 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 %b %d %Y"
 
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "������� ������� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1885
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "������ ����� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "������� ������ (%Y)"
 
-#: calendar/gui/print.c:2226
-msgid "Task"
-msgstr "������"
-
-#: calendar/gui/print.c:2283
-#, c-format
-msgid "Status: %s"
-msgstr "������: %s"
-
-#: calendar/gui/print.c:2301
-#, c-format
-msgid "Priority: %s"
-msgstr "���������: %s"
-
-#: calendar/gui/print.c:2315
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "���������� � ��������: %i"
-
-#: calendar/gui/print.c:2327
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2341
-#, c-format
-msgid "Categories: %s"
-msgstr "���������: %s"
-
-#: calendar/gui/print.c:2352
-msgid "Contacts: "
-msgstr "��������:"
-
-#: calendar/gui/print.c:2407
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "��������� ��������"
 
-#: calendar/gui/print.c:2498 calendar/gui/print.c:2590
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2892
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
 #: 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:2527
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "����� �� �����"
 
-#: calendar/gui/print.c:2608
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "������� ���������..."
 
@@ -6047,8 +5609,8 @@ msgstr ""
 "\n"
 "������������ �� �� ������ �����������?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2379
-#: mail/mail-callbacks.c:2620
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "�� �������� ���� ��������� ������."
 
@@ -6112,11 +5674,6 @@ 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"
@@ -6136,107 +5693,107 @@ msgstr ""
 msgid "Gnome Calendar"
 msgstr "��������"
 
-#: calendar/pcs/query.c:247
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now ������ 0 ���������"
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time ������ 1 ��������"
 
-#: calendar/pcs/query.c:276
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time ������ �������� 1 �� ���� ���"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day ������ 2 ���������"
 
-#: calendar/pcs/query.c:318
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:325
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:352
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin ������ 1 ��������"
 
-#: calendar/pcs/query.c:357
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:384
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:389
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:425
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:521
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:526
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:533
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:668
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:675
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:692
+#: 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:734
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:746
+#: 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 ""
 
-#: calendar/pcs/query.c:834
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:879
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:884
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1161
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -7835,7 +7392,6 @@ msgid "Unable to process spool folder"
 msgstr "�� ���� �� �������� spool �����"
 
 #: camel/camel-filter-driver.c:911
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "���������� �� ��������� ����� %d (%d%%)"
 
@@ -7899,22 +7455,22 @@ msgstr "(���������� �� �����) ������� �������� ����� �������"
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "����������� ��������: �������� �� ��������� �� %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "����������� ��������: ������� �� �����: �� %s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "����������� ��������: ������� �� uids: �� %s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "�������� ���������"
 
@@ -8025,77 +7581,77 @@ msgstr "���� �������� ������ %s ����� �� %s"
 msgid "Please enter your %s passphrase"
 msgstr "���� �������� ������ ����� %s"
 
-#: camel/camel-pgp-context.c:622
+#: camel/camel-pgp-context.c:621
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "�� ���� �� ������� ���� ���������: ���� ��������� ����� �� ������"
 
-#: camel/camel-pgp-context.c:629 camel/camel-pgp-context.c:803
+#: 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:635 camel/camel-pgp-context.c:809
+#: 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"
+"�� ���� �� ������� ���� ���������: �� ���� �� ������ ��������� ����� �� "
+"GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:796
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:988
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "�� ���� �� ������� ���� ���������: ���� ��������� ����� �� ��������"
 
-#: camel/camel-pgp-context.c:994
+#: 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"
+"�� ���� �� ������� ���� ���������: �� ���� �� ������ ��������� ����� �� "
+"GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1005
+#: 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:1178
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "�� ���� �� ��������� ���� ���������: ���� ����� ����� �� ����������"
 
-#: camel/camel-pgp-context.c:1188
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr "�� ���� �� ��������� ���� ���������: ���� ������"
 
-#: camel/camel-pgp-context.c:1195
+#: 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:1204
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "�� ���� �� ��������� ���� ���������: ���� ������� ���������"
 
-#: camel/camel-pgp-context.c:1373
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 "�� ���� �� ����������� ���� ���������: ���� �������� ����� �� ������������"
 
-#: camel/camel-pgp-context.c:1381
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr "�� ���� �� ����������� ���� ���������: ���� ������"
 
-#: camel/camel-pgp-context.c:1388
+#: 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:332
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr ""
 
@@ -8138,14 +7694,14 @@ msgstr "�� ���� �� �� ������ ���  %s (���� %d): %s"
 msgid "(unknown host)"
 msgstr "(���������� ����)"
 
-#: camel/camel-remote-store.c:348 camel/camel-remote-store.c:410
-#: camel/camel-remote-store.c:471
+#: 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:474
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -8286,7 +7842,7 @@ 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:86
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "������"
 
@@ -8335,32 +7891,32 @@ msgstr "URL '%s' �� ������ �� ��������� ���"
 msgid "Resolving: %s"
 msgstr "����������: %s"
 
-#: camel/camel-service.c:644 camel/camel-service.c:751
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "������� ��� ������� ����� %s"
 
-#: camel/camel-service.c:669
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "��������� �� ���� ��������: %s: ����� �� � �������"
 
-#: camel/camel-service.c:671
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "��������� �� ���� ��������: %s: ���������� �������"
 
-#: camel/camel-service.c:721
+#: camel/camel-service.c:725
 #, fuzzy
 msgid "Resolving address"
 msgstr "����������: %s"
 
-#: camel/camel-service.c:779
+#: camel/camel-service.c:787
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "��������� �� ���� ��������: %s: ����� �� � �������"
 
-#: camel/camel-service.c:782
+#: camel/camel-service.c:790
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "��������� �� ���� ��������: %s: ���������� �������"
@@ -8504,22 +8060,22 @@ msgstr "���� ������ ���������: %s � %s"
 msgid "No such message: %s"
 msgstr "���� ������ ���������: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "�� ���� �� ������ ����� %s: ������ ��������"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "�� ���� �� ������ ����� %s: ���� ������ �����"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "�� ���� �� ����������� ������� %s ������ ��������"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "�� ���� �� ����������� ������� %s ���� ������ �����"
@@ -8571,21 +8127,21 @@ msgstr "������� � ���� ��������� � ������������ �� �������."
 msgid "Scanning for changed messages"
 msgstr "�������� �� ��������� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1640
-#: camel/providers/imap/camel-imap-folder.c:2116
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "����������� �� � �������"
 
-#: camel/providers/imap/camel-imap-folder.c:1795
-#: camel/providers/imap/camel-imap-folder.c:1869
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "�������� �������� ���������� �� ���� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1801
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "�������� �� ���� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:2153
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "�� ���� �� ������ ������ �� ����������� � FETCH ��������."
 
@@ -9277,7 +8833,7 @@ msgstr "������ ������ �� �������"
 msgid "Delete after %s day(s)"
 msgstr "������� ���� %s ���"
 
-#: 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:84
 msgid "POP"
 msgstr "POP"
 
@@ -9354,7 +8910,8 @@ msgstr "������/������� ������"
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s ���� �������� POP3 ������ �� %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:503
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -9363,13 +8920,13 @@ msgstr ""
 "�� ���� �� �� ������ � POP ������.\n"
 "������ ��������� ������ %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:593
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "���� ������ ����� `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9424,7 +8981,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "��������� �� ���� ���� ���������� sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9598,7 +9155,7 @@ msgstr "SMTP ���� ���� %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "�� ���� �� ������� ���������: ��������� ����� �� ���������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "��������� �� �����������"
 
@@ -9947,12 +9504,6 @@ msgid ""
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3466
-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"
@@ -10156,7 +9707,7 @@ msgstr "���"
 msgid "minute"
 msgstr "������"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:192
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "�������"
 
@@ -10255,7 +9806,7 @@ msgstr ""
 "����, ������� �� � ������� ������� ����� �� ������."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1636 mail/mail-account-gui.c:1650
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "������ �����"
 
@@ -10268,7 +9819,7 @@ msgstr ""
 "������ � ��������� ����� '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:45
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "����"
 
@@ -10448,7 +9999,7 @@ msgid "Follow Up"
 msgstr ""
 
 #: filter/libfilter-i18n.h:26 mail/mail-config.c:74
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "�����"
 
@@ -10687,9 +10238,7 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution ��������� ������ ����� ���� �� Netscape"
 
-#. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1104
-#: shell/e-local-storage.c:178
+#: importers/netscape-importer.c:1865
 msgid "Trash"
 msgstr "�����"
 
@@ -10796,12 +10345,12 @@ msgstr ""
 msgid "Font Preferences"
 msgstr "_���� ����������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:69
+#: 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:71
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
 msgid "Mail Preferences"
 msgstr ""
 
@@ -10950,148 +10499,144 @@ msgstr "%d ����"
 msgid "Create _Virtual Folder From Search..."
 msgstr "������� ��������� _����� �� ���������"
 
-#: mail/folder-browser.c:1580
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "VFolder ����� _����"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "_v����� �� ��������"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "v_����� �� ����������"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "������ ����� _Mailing List"
 
-#: mail/folder-browser.c:1587
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "������ ����� �_���"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "������ ����� ��_������"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "������ ����� ��_��������"
 
-#: mail/folder-browser.c:1590 mail/folder-browser.c:1922
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "������ ����� Mailing _List"
 
-#: mail/folder-browser.c:1608 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "���������� ���� ���� ���������..."
 
-#: mail/folder-browser.c:1610
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "�����"
 
-#: mail/folder-browser.c:1614 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "�������� �� ��������"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "�������� �� �������"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "�������� �� ������"
 
-#: mail/folder-browser.c:1617
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "��������"
 
-#: mail/folder-browser.c:1621
+#: mail/folder-browser.c:1622
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1623
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "����������"
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1624
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "�������"
 
 #. separator here?
-#: mail/folder-browser.c:1627 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "��������: ���������"
 
-#: mail/folder-browser.c:1628
+#: mail/folder-browser.c:1629
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "��������: �����������"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "������� ���� �_����"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1631
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "�������� ���� ��_�����"
 
-#: mail/folder-browser.c:1635
+#: mail/folder-browser.c:1636
 #, fuzzy
 msgid "U_ndelete"
 msgstr "���������� �������"
 
-#: mail/folder-browser.c:1639
+#: mail/folder-browser.c:1640
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "�������� � �����..."
 
-#: mail/folder-browser.c:1640 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "������� � �����..."
 
-#: mail/folder-browser.c:1644
+#: mail/folder-browser.c:1645
 #, fuzzy
 msgid "Label"
 msgstr "������"
 
-#: mail/folder-browser.c:1648
+#: mail/folder-browser.c:1649
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "������ �������� � ��������� �����"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1653
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "������� ������"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1657
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "������ ������� �� �����������"
 
-#: mail/folder-browser.c:1923
+#: mail/folder-browser.c:1936
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "������ �� �������� ������"
 
-#: mail/folder-browser.c:1925
+#: mail/folder-browser.c:1938
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "������ �� �������� ������ (%s)"
 
-#: mail/folder-browser.c:1926
+#: mail/folder-browser.c:1939
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "������ �� �������� ������ (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "�� ������������"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "��������� ���������� �� �����"
@@ -11163,33 +10708,33 @@ msgstr "Evolution - �������� �� ������"
 msgid "Evolution Account Editor"
 msgstr "�������� �� ������� � Evolution"
 
-#: mail/mail-account-gui.c:737 mail/mail-config.glade.h:162
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
 msgid "_Host:"
 msgstr "_����:"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:132
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
 #, fuzzy
 msgid "User_name:"
 msgstr "_������������ ���:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
 msgid "_Path:"
 msgstr "_���:"
 
-#: mail/mail-account-gui.c:1215 mail/mail-account-gui.c:1216
-#: mail/mail-account-gui.c:1457 mail/mail-account-gui.c:1462
-#: mail/mail-config.glade.h:95
+#: 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:1285 mail/mail-account-gui.c:1300
+#: 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:1988
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr "��� �� ���� �� ����� ��� ��������� � ���� ���."
 
@@ -11231,26 +10776,6 @@ msgstr "������������� ���:"
 msgid "Protocol"
 msgstr "������ ����"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Mail �� %s"
-
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "������ � %s"
-
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Mail �� %s"
-
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "%s �������� ������"
-
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "������ ������� �� ������"
@@ -11395,18 +10920,18 @@ msgstr "������� ����������� ����..."
 msgid "Save Messages As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:2364
+#: mail/mail-callbacks.c:2366
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "������� ���������� ����������� ���������"
 
-#: mail/mail-callbacks.c:2371
+#: mail/mail-callbacks.c:2373
 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:2613
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11419,7 +10944,7 @@ msgstr ""
 "\n"
 "������������ �� �� ������ �����������?"
 
-#: mail/mail-callbacks.c:2726
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11428,28 +10953,28 @@ msgstr ""
 "������ ��� ��������� ������������ �� �������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2738
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "������"
 
-#: mail/mail-callbacks.c:2781
+#: mail/mail-callbacks.c:2783
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "���������� �� ��������� ����� %d �� %d"
 
-#: mail/mail-callbacks.c:2834
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "��������� �����������"
 
-#: mail/mail-callbacks.c:2861
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-�����"
 
-#: mail/mail-callbacks.c:2899
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "������������� ���������"
 
-#: mail/mail-callbacks.c:3085 mail/mail-callbacks.c:3125
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11512,34 +11037,29 @@ msgid "Evolution Account Assistant"
 msgstr "�������� �� Evolution �� �������"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:138
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Work"
 msgstr "����"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:87
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Personal"
 msgstr "������"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:128
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "To Do"
 msgstr "����"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:67
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "����"
 
-#: mail/mail-config.c:634
-#, c-format
-msgid "Account %d"
-msgstr "������ %d"
-
 #: mail/mail-config.c:2458
 #, c-format
 msgid ""
@@ -11551,14 +11071,6 @@ msgstr ""
 "%s\n"
 "���� �� ���� ���������� ���������."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2469
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Inbox"
-
 #: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "��������� ����������"
@@ -11609,110 +11121,106 @@ msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "_������ �� ������������ ��� ��������� �� ���������� ����"
 
 #: mail/mail-config.glade.h:8
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr ""
-
-#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Editor"
 msgstr "������ %d"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Account ����������"
 
-#: mail/mail-config.glade.h:11 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "�������� �� ������"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Advanced Options"
 msgstr "�������� ����������"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Afrikaans"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_������ �� ������������ ��� ��������� �� ���������� ����"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Alerts"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "������ _�������� ����������� ���� ��� ���������� �� ���� ������"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Arabic"
 msgstr "������"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "�������� ���� ��� �����������"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "�������������"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_����������� �������� �� ��� email"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "���������� ������ �������: %s"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "C_olors"
 msgstr "_�������"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "�������� �� ��� email"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "������ ���������"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "������������"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11728,371 +11236,371 @@ msgstr ""
 "\n"
 "�������� �� \"�������\" �� �� �������� �����������."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 #, fuzzy
 msgid "Dari"
 msgstr "����"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "�� ������������"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "��� �����"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "������������ �� ������ �������:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "���������� �� ������"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "������ IDs..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "�� ���� �� ������ ���������"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "����� _������"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "���_�����"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable advanced options"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "������� �� ��. ���� �������"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "����� �� ��. ����"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_�������� ������� ��� ��������"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Execute Command..."
 msgstr "��������� ��������"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "�������� �"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Font Properties"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "���������� ���������"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "�������� ������ ID..."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_����������� �������� �"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Hulu"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 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:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "������� � �������"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "������� _��������"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Mail ������������"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "�������������� �� ���������� �����"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Composer"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Display"
 msgstr "��������� �� _���������"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Microsoft"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP ������:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Mail ������������"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "News Servers"
 msgstr "������"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:80
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "���������� ����������"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "��������_���:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _���� ID:"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "���� ������ �� ������� ���� ���� � ���������� � ������ _Bcc"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "PGP"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "��������� ��������� ����������"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "�������� ���������� Qmail"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "�� ���� �� ������ ���������"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:95
 msgid "Randomized"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "������� ���� �����_�"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "�������-��:"
 
-#: mail/mail-config.glade.h:99 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:100
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "����� �� ����������"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Remember this _password"
 msgstr "������� ���� ������"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "�������� ����������"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "S_ecurity"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:104
 msgid "Same as text"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "������� MIME"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Select PGP program"
 msgstr "������ PGP ��������"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Select a signature file"
 msgstr "���� � ������:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Select a signature script"
 msgstr "������� ������ ���������"
 
-#: mail/mail-config.glade.h:114 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "��������� �� Email"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "������ _����� ��� ���������:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "������� � ������� ���������"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "�������� ������� ���_�������"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "������ ������������"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "��� �_�����:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Signature"
 msgstr "������� ���������"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "�������� �� ����������"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "��� �� ����:"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:125
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "���������� Unix mbox"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:128
 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:131
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "Use _HTML for this signature"
 msgstr "_HTML ���������:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:132
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12102,212 +11610,212 @@ msgstr ""
 "\n"
 "�������� �� \"�������\" �� �� ���������."
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "XEmacs"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "_������ ������� �� ������� �������� �� �������"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr "�_����� �������� ���������� ��������� ������ �������� ���� ������"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "��� �� ����������_���:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "��� �� ����������_���:"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "_����������� �������� �� ��� email"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_������������ ID:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:147
 msgid "_Color for misspelled words: "
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "������������� ��� ����������� �� �����"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "�� ������������"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Enable spell checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Filename:"
 msgstr "��� �� ����:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Forward style:"
 msgstr "�������� ����"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Full name:"
 msgstr "_����� ���:"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "� HTML ����"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_HTML Signature:"
 msgstr "_HTML ���������:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Identity"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Language:"
 msgstr "����"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr "_������� �������� ��� ��������� � � ��������� �����"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "����� ���� ��� ����������� �� ������"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "������_�� ����������� ���� \"���������\" ����:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_���:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_������ �� ������� �������� �� �������"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "_PGP ��� �� ��������:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "���� ��� ��������� �� HTML ��������� �� �������� ����� �� � �����"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "���� ��_� ��������� �� ���� ��� ����"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Random"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "���������� �� ������"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Reply style:"
 msgstr "�������� �� ������"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:177
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Script:"
 msgstr "_���������"
 
-#: mail/mail-config.glade.h:180 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_���������"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "��������� �� Email"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_Show animated images"
 msgstr "������ ������� ����"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "_Signatures"
 msgstr "_���� � ������:"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:183
 #, fuzzy
 msgid "_Text Signature:"
 msgstr "_HTML ���������:"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "������� ���������� ������ (_SSL)"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_�����"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 #, fuzzy
 msgid "color"
 msgstr " ����"
 
-#: mail/mail-config.glade.h:189
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "�������� �� ������ 1"
 
@@ -12386,10 +11894,6 @@ msgstr "������ Viewer"
 msgid "Loading message content"
 msgstr "�������� ������������� �� �����������"
 
-#: mail/mail-display.c:1553
-msgid "<b>Overdue:</b>&nbsp;"
-msgstr ""
-
 #: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "_������ �������� � �������"
@@ -12450,30 +11954,6 @@ msgstr ""
 "\n"
 "�������� ��������: "
 
-#: mail/mail-format.c:1707
-#, fuzzy
-msgid "View messages..."
-msgstr "������� ����������� ����..."
-
-#: mail/mail-format.c:1813
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-"���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
-"������ ����������."
-
-#: mail/mail-format.c:1836
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution �� ���������� ���� ��� ��������� ���������."
-
-#: mail/mail-format.c:1844
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1852
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
 #: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
@@ -12573,112 +12053,112 @@ msgstr ""
 msgid "Working"
 msgstr "������"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "������ ����� �����"
 
-#: mail/mail-ops.c:259
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "���������� �� ������"
 
-#: 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 "�����, ����������� ���� ��������� �������."
 
-#: mail/mail-ops.c:600
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "��������� �� \"%s\""
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "��������� �� ��������� %d �� %d"
 
-#: mail/mail-ops.c:739
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "������ �� ��������� %d �� %d"
 
-#: mail/mail-ops.c:741 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "����������."
 
-#: mail/mail-ops.c:834
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "������� ����������� � �����"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "�������� �������� � %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "�������� �� ����������� � %s"
 
-#: mail/mail-ops.c:941
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "�����������"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "��������"
 
-#: mail/mail-ops.c:1054
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "��������� �� ����� � \"%s\""
 
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "���������� ���������"
 
-#: mail/mail-ops.c:1280
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "�������� �� ����� %s"
 
-#: mail/mail-ops.c:1352
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "������ ��������� %s"
 
-#: mail/mail-ops.c:1421
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "�������� ����� %s"
 
-#: mail/mail-ops.c:1515
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "��������� �� ����� %s"
 
-#: mail/mail-ops.c:1566
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "���������� �� �����"
 
-#: mail/mail-ops.c:1602
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "��������� �� �����"
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "��������� ��������� %s"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "��������� %d ���������"
 
-#: mail/mail-ops.c:1804
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "����������� �� %d ���������"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12687,7 +12167,7 @@ msgstr ""
 "�� ���� �� ������ ������� ����: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12696,11 +12176,11 @@ msgstr ""
 "������ ��� ��������� �� ��������� �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "�������� ���������"
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12709,22 +12189,22 @@ msgstr ""
 "�� ���� �� ������ ������� ����: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�� ���� �� ������ �������: %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "���������� �� %s"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "������ ������ � %s"
 
-#: mail/mail-ops.c:2234
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
@@ -12873,12 +12353,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. Make this static, saves having to recompute it each time
-#: mail/mail-vfolder.c:728 my-evolution/e-summary-mail.c:254
-#: my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "VFolders"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "v�����"
@@ -22956,8 +22430,13 @@ msgstr "���� ��������"
 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 shell/e-local-storage.c:1021
+#: my-evolution/e-summary-mail.c:761
 msgid "Local Folders"
 msgstr "������� �����"
 
@@ -23060,38 +22539,6 @@ msgstr "�������� ���������� �� ��������"
 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 "���� ����"
@@ -24347,23 +23794,6 @@ msgstr "������� �������"
 msgid "Cancel Operation"
 msgstr "�������� ����������"
 
-#: shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "�������"
-
-#: shell/e-local-storage.c:174 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Inbox"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Outbox"
-
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "�������"
-
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "���������� �� Evolution"
@@ -24863,12 +24293,12 @@ msgstr ""
 "�������� �� ���������� �� ��������� �:\n"
 "%s"
 
-#: shell/e-shell.c:762
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�� ���� �� ������� ��������� ��������� -- %s"
 
-#: shell/e-shell.c:1830
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24880,19 +24310,23 @@ msgstr ""
 "�������������\n"
 "�� �� �������� ������ �� ������� ������."
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "������ ���������"
 
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "�� ���� �� ����������� � OAF"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "����������������� ���� ����� �� � ��������"
 
-#: shell/e-shell.c:2139 shell/e-storage.c:487
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "�������� ������"
 
@@ -25017,6 +24451,10 @@ msgstr "������ ��� ��������� �� ���������."
 msgid "Shortcuts"
 msgstr "���������"
 
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Inbox"
+
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -25080,7 +24518,6 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ����������)"
 
@@ -25185,7 +24622,7 @@ msgstr "���� �����"
 msgid "Old owner has died"
 msgstr "������� ���������� � �����"
 
-#: shell/evolution-test-component.c:45
+#: shell/evolution-test-component.c:47
 #, fuzzy
 msgid "Test type"
 msgstr "��� �� ����:"
@@ -25723,6 +25160,10 @@ 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 "�������� �������� �������� ��������"
@@ -26972,21 +26413,16 @@ msgstr "�������� �� �������"
 msgid "Save Search"
 msgstr "������ �������"
 
-#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:97
 #, fuzzy
 msgid "_Save Search..."
 msgstr "������ �������"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "������ � ���������� ��������"
 
-#: widgets/misc/e-filter-bar.h:93
-#, fuzzy
-msgid "_Advanced Search..."
-msgstr "������������ �������"
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "����������"
@@ -27048,6 +26484,376 @@ 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 ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "������� �� ���, �� ������\n"
+#~ "�� �������� ���� �������?"
+
+#~ msgid "Starting:"
+#~ msgstr "���������:"
+
+#~ msgid "Ending:"
+#~ msgstr "���������:"
+
+#~ msgid "Evolution Alarm"
+#~ msgstr "������ �� Evolution."
+
+#~ 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 "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 "i���������� ����������"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "i�������� ������"
+
+#~ 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>"
+
+#, fuzzy
+#~ msgid "Status:"
+#~ 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 "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 "����������� �� ������� ������� �������� ���������."
+
+#~ 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 "���������� ����������"
+
+#, fuzzy
+#~ msgid "Updated"
+#~ msgstr "��������"
+
+#, fuzzy
+#~ msgid "Refresh"
+#~ msgstr "�������� ������"
+
+#~ msgid "Task"
+#~ msgstr "������"
+
+#~ msgid "Status: %s"
+#~ msgstr "������: %s"
+
+#~ msgid "Priority: %s"
+#~ msgstr "���������: %s"
+
+#~ msgid "Percent Complete: %i"
+#~ msgstr "���������� � ��������: %i"
+
+#~ msgid "URL: %s"
+#~ msgstr "URL: %s"
+
+#~ msgid "Categories: %s"
+#~ msgstr "���������: %s"
+
+#~ msgid "Contacts: "
+#~ msgstr "��������:"
+
+#, fuzzy
+#~ msgid "Reminder!!"
+#~ msgstr "�������"
+
+#~ msgid "Default"
+#~ msgstr "�� ������������"
+
+#~ msgid "Mail to %s"
+#~ msgstr "Mail �� %s"
+
+#~ msgid "Subject is %s"
+#~ msgstr "������ � %s"
+
+#~ msgid "Mail from %s"
+#~ msgstr "Mail �� %s"
+
+#~ msgid "%s mailing list"
+#~ msgstr "%s �������� ������"
+
+#~ msgid "Account %d"
+#~ msgstr "������ %d"
+
+#~ 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 "������������ �������"
+
 #~ msgid "Card: "
 #~ msgstr "�����:"
 
@@ -27312,17 +27118,15 @@ 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"
 #~ "�������� �� � �������������� �� �� ������ ����������."
@@ -27456,8 +27260,7 @@ 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"
diff --git a/po/ca.po b/po/ca.po
index 8723685f74..790b32814a 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: 2001-11-14 19:26-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -33,23 +33,24 @@ msgid "Imports VCard files into Evolution."
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:849
+#: addressbook/gui/widgets/e-addressbook-view.c:335
 #, fuzzy
 msgid "File As"
 msgstr "Arxiva com:"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nom"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/gui/widgets/e-addressbook-view.c:337
 #, fuzzy
 msgid "Email"
 msgstr "Adre�a electr�nica 2"
 
 #: 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:1731
 msgid "Primary"
 msgstr "Primari"
 
@@ -60,15 +61,16 @@ 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:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: 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
 msgid "Business"
 msgstr "Feina"
 
@@ -79,12 +81,12 @@ msgid "Bus"
 msgstr "Ocupat"
 
 #: 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:1720
 msgid "Callback"
 msgstr "Crida de retorn"
 
 #: 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:1722
 msgid "Company"
 msgstr "Empresa"
 
@@ -95,13 +97,14 @@ msgstr "Copia"
 
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: 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
 msgid "Home"
 msgstr "Particular"
 
 #: 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 "Organitzaci�"
 
@@ -110,18 +113,20 @@ msgid "Org"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "M�bil"
 
 #: 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:1721
 msgid "Car"
 msgstr "Cotxe"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: 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:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax de la feina"
 
@@ -131,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:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "Feina 2"
 
@@ -147,70 +152,69 @@ msgid "Bus 2"
 msgstr "Ocupat"
 
 #: 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:1724
 msgid "Home 2"
 msgstr "Particular 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:1726
+#: 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:1656
-#: addressbook/gui/contact-editor/e-contact-editor.c:1714
-#: mail/mail-config.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "Altres"
 
 #: 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:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "T�lex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:359
 #, fuzzy
 msgid "TTY"
 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:1687
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Adre�a electr�nica 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 ""
 
@@ -219,7 +223,7 @@ msgid "Url"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:364
 #, fuzzy
 msgid "Department"
 msgstr "_Departament:"
@@ -229,7 +233,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:365
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina"
@@ -240,13 +244,13 @@ msgid "Off"
 msgstr "_Oficina"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:366
 #, fuzzy
 msgid "Title"
 msgstr "_T�tol:"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:367
 #, fuzzy
 msgid "Profession"
 msgstr "_Professi�:"
@@ -256,7 +260,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:368
 #, fuzzy
 msgid "Manager"
 msgstr "Busca"
@@ -271,7 +275,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:370
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenom:"
@@ -282,13 +286,13 @@ msgid "Nick"
 msgstr "_Sobrenom:"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:371
 #, fuzzy
 msgid "Spouse"
 msgstr "_C�njuge:"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:372
 #, fuzzy
 msgid "Note"
 msgstr "Cap"
@@ -303,7 +307,7 @@ msgid "CALUri"
 msgstr ""
 
 #: 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 ""
 
@@ -336,248 +340,17 @@ msgstr "categories"
 msgid "Family Name"
 msgstr "Nom complet:"
 
-#: addressbook/backend/ebook/e-card-simple.c:788
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
-#: addressbook/backend/ebook/e-card.c:3712
-#, fuzzy
-msgid "Card: "
-msgstr "Cotxe"
-
-#: addressbook/backend/ebook/e-card.c:3714
-#, fuzzy
-msgid ""
-"\n"
-"Name: "
-msgstr "Nom:"
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3719
-#, fuzzy
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr "_Sufix:"
-
-#: addressbook/backend/ebook/e-card.c:3733
-#, fuzzy
-msgid ""
-"\n"
-"Birth Date: "
-msgstr "Data d'ini_ci:"
-
-#: addressbook/backend/ebook/e-card.c:3744
-#, fuzzy
-msgid ""
-"\n"
-"Address:"
-msgstr "_Adre�a:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3752
-#, fuzzy
-msgid ""
-"\n"
-"  Country:     "
-msgstr "Pa�_s:"
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3804
-#, fuzzy
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr "Adre�a electr�nica 2"
-
-#: addressbook/backend/ebook/e-card.c:3807
-#, fuzzy
-msgid ""
-"\n"
-"E-mail:"
-msgstr "Adre�a electr�nica 2"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3844
-#, fuzzy
-msgid ""
-"\n"
-"Business Role: "
-msgstr "Feina 2"
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3857
-#, fuzzy
-msgid ""
-"\n"
-"  Name:  "
-msgstr "Nom:"
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3865
-#, fuzzy
-msgid ""
-"\n"
-"Categories: "
-msgstr "categories"
-
-#: addressbook/backend/ebook/e-card.c:3866
-#, fuzzy
-msgid ""
-"\n"
-"Comment: "
-msgstr "Comentaris sobre l'element:"
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3879
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3882
-#, fuzzy
-msgid ""
-"\n"
-"Public Key: "
-msgstr "P�blic"
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "Mou el missatge"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
@@ -585,98 +358,98 @@ msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%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: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:1130
-#: 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:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2215
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 #, fuzzy
 msgid "Searching..."
 msgstr "Cerca"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 #, fuzzy
 msgid "Loading..."
 msgstr "_Par�metres"
 
 #. 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 ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:475
-#, fuzzy
-msgid "Connecting to LDAP server..."
-msgstr "Connexi� de prova a \"%s\""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:485
-#, fuzzy
-msgid "Unable to connect to LDAP server."
-msgstr ""
-"No es pot autenticar davant del servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/backend/pas/pas-backend-ldap.c:501
-#, fuzzy
-msgid "Waiting for connection to LDAP server..."
-msgstr "Connexi� de prova a \"%s\""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:870
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:971
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2160
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2165
-msgid "Restarting search."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Error en llegir el fitxer de correu: %s"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
 msgstr ""
+"No s'ha pogut obrir el fitxer `%s':\n"
+"%s"
 
-#: addressbook/conduit/address-conduit.c:294
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "Adre�a electr�nica:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:307
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1089
-#: calendar/conduits/calendar/calendar-conduit.c:981
-#: calendar/conduits/todo/todo-conduit.c:694
+#: 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 "No s'ha pogut iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:1090
-#: calendar/conduits/calendar/calendar-conduit.c:982
-#: calendar/conduits/todo/todo-conduit.c:695
+#: 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 "No s'ha pogut iniciar el wombat"
 
-#: 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 "No s'ha pogut llegir el bloc d'aplicaci� d'adre�a del Pilot"
 
@@ -694,384 +467,871 @@ 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
+#, 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#, fuzzy
+msgid "Directory Servers"
+msgstr "N_ou servidor de directori"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 #, 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:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 #, 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:13
 #, 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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#, 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
 #, fuzzy
 msgid "Factory for the sample Addressbook control"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 #, fuzzy
 msgid "Contacts"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 #, fuzzy
 msgid "Folder containing contact information"
 msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "New Contact"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:526
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "New _Contact"
-msgstr "Visualitza tots els contactes"
+msgid "_Contact"
+msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "New Contact List"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
-msgid "New Contact _List"
-msgstr "Visualitza tots els contactes"
+msgid "Contact _List"
+msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-config.c:186
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
 #, fuzzy
-msgid "Edit Addressbook"
-msgstr "Desa a la llibreta d'adreces"
+msgid "Could not initialize gnome-vfs"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr "No es pot obrir la llibreta d'adreces"
+
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: 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"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
+#, 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
 #, fuzzy
-msgid "Account Name"
-msgstr "cont�"
+msgid "Name begins with"
+msgstr "acaba amb"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
+#: addressbook/gui/component/addressbook.c:770
 #, fuzzy
-msgid "Add Addressbook"
+msgid "Email is"
+msgstr "Adre�a electr�nica 2"
+
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Category is"
+msgstr "categories"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: 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
+#, fuzzy
+msgid "Advanced..."
+msgstr "Afegeix..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+#, fuzzy
+msgid "Any Category"
+msgstr "categories"
+
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
+msgstr "L'URI que mostrar� el navegador de carpetes"
+
+#: 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
+msgid "Primary Email"
+msgstr "Adre�a electr�nica principal"
+
+#: addressbook/gui/component/e-address-popup.c:587
+#, fuzzy
+msgid "Select an Action"
+msgstr "Fitxer de signatura:"
+
+#: addressbook/gui/component/e-address-popup.c:593
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crea un nou contacte"
+
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:891
+#, fuzzy
+msgid "Querying Addressbook..."
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Contacte _nou"
+
+#: addressbook/gui/component/e-address-popup.c:1046
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Adre�a electr�nica:"
+
+#: addressbook/gui/component/e-address-widget.c:364
+#, fuzzy
+msgid "Disable Queries"
+msgstr "Categories disponibles:"
+
+#: addressbook/gui/component/e-address-widget.c:364
+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 "
+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
+msgid "1:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+msgid "380"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Addressbook Sources"
 msgstr "Afegeix una font"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
 #, fuzzy
-msgid "Advanced"
-msgstr "Afegeix..."
+msgid "Always"
+msgstr "Alarmes"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
-msgid "Base"
-msgstr "Enganxa"
+msgid "Connecting"
+msgstr "S'est� recollint el correu des de %s"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
-msgid "Basic"
-msgstr "Enganxa"
+msgid "DN Customization"
+msgstr "Cerca personalitzada"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "De_lete"
 msgstr "Suprimeix"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Nom d'usuari:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Email Address:"
 msgstr "Adre�a electr�nica:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "Cerca"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "General"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+#, fuzzy
+msgid "LDAP Attribute"
+msgstr "Autenticaci�:"
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Configuraci� del correu"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Marges"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "Cada"
+
+#: 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 "_Objecte"
+
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: 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 "Valors predeterminats"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Valors predeterminats"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
-msgid "Search _base:"
+msgid "S_earch scope: "
 msgstr "Cerca"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#. 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 "Search s_cope: "
+msgid "Searching"
 msgstr "Cerca"
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
-msgid "Server Name"
-msgstr "Servidor:"
+msgid "Select"
+msgstr "Selecciona'ls _tots"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Suprimeix"
+
+#: 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/addressbook-config.glade.h:15
+#: 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 "Cap informaci�"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Connexi� de prova a \"%s\""
+
+#: 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 "Fes un so en visualitzar les alarmes"
+
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Sub"
 msgstr "Dg"
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "The information below is required in order to add an addressbook.  "
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Seleccioneu una carpeta"
+
+#: 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:17
-msgid "This information is not required for most ldap servers. "
+#: 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/addressbook-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:90
 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 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/addressbook-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"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/addressbook-config.glade.h:20
-msgid "This is the name of the server where your addressbook is located."
+#: 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/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
+#: addressbook/gui/component/ldap-config.glade.h:96
+msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"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:23
+#: addressbook/gui/component/ldap-config.glade.h:101
+msgid "Using distinguished name (DN)"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:102
 #, fuzzy
-msgid "_Account name:"
-msgstr "cont�"
+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
+msgid "Whenever Possible"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: 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:90 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:139
 msgid "_Add"
 msgstr "_Afegeix"
 
-#: 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 "_Edita"
-
-#: addressbook/gui/component/addressbook-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
-msgid "_My server requires authentication"
-msgstr ""
-"No es pot connectar al servidor POP.\n"
-"No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
+msgid "_Add ->"
+msgstr "Afegeix >>"
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
-msgid "_Port:"
-msgstr "Prioritat:"
+msgid "_Add Mapping"
+msgstr "Afegeix una acci�"
 
-#: addressbook/gui/component/addressbook-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Server name:"
-msgstr "Servidor:"
+msgid "_Add to DN"
+msgstr "Afegeix una acci�"
 
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+msgid "_Always"
+msgstr "Alarmes"
 
-#: addressbook/gui/component/addressbook-storage.c:167
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
-msgid "Other Contacts"
-msgstr "Contacte _nou"
+msgid "_Delete Mapping"
+msgstr "_Suprimeix"
 
-#: addressbook/gui/component/addressbook.c:468
-msgid "Unable to open addressbook"
-msgstr "No es pot obrir la llibreta d'adreces"
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Visualitzaci�"
 
-#: addressbook/gui/component/addressbook.c:477
-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"
+#: addressbook/gui/component/ldap-config.glade.h:111
+msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:482
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:490
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:623
-#, 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/ldap-config.glade.h:114 filter/filter.glade.h:9
+#: mail/mail-config.glade.h:152 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 "_Edita"
 
-#: addressbook/gui/component/addressbook.c:786
-#: calendar/gui/cal-search-bar.c:55
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
-msgid "Any field contains"
-msgstr "El cos cont�"
+msgid "_Edit Mapping"
+msgstr "Edita una cita"
 
-#: addressbook/gui/component/addressbook.c:787
+#: addressbook/gui/component/ldap-config.glade.h:116
 #, fuzzy
-msgid "Name contains"
-msgstr "cont�"
+msgid "_Evolution attribute:"
+msgstr "Evolution"
 
-#: addressbook/gui/component/addressbook.c:788
-#, fuzzy
-msgid "Email contains"
-msgstr "cont�"
+#: 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/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/ldap-config.glade.h:121
 #, fuzzy
-msgid "Category is"
-msgstr "categories"
+msgid "_More Options >>"
+msgstr "_Opcions"
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/ldap-config.glade.h:122
 #, fuzzy
-msgid "Advanced..."
-msgstr "Afegeix..."
+msgid "_Port number:"
+msgstr "N�mero de port:"
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1031
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/ldap-config.glade.h:123
 #, fuzzy
-msgid "Any Category"
-msgstr "categories"
+msgid "_Restore Defaults"
+msgstr "Valors predeterminats"
 
-#: addressbook/gui/component/addressbook.c:1071
-msgid "The URI that the Folder Browser will display"
-msgstr "L'URI que mostrar� el navegador de carpetes"
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "Cerca"
 
-#.
-#. * 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
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
-msgid "(none)"
-msgstr "(Sense nom)"
+msgid "_Server name:"
+msgstr "Servidor:"
 
-#: 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:1686
-msgid "Primary Email"
-msgstr "Adre�a electr�nica principal"
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Durada de l'snooze (minuts)"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
-msgid "Select an Action"
-msgstr "Fitxer de signatura:"
+msgid "account-druid"
+msgstr "cont�"
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, fuzzy, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Crea un nou contacte"
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "Contacta l'editor"
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "No iniciat"
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
-msgid "Querying Addressbook..."
-msgstr "Desa a la llibreta d'adreces"
+msgid "connecting-tab"
+msgstr "S'est� recollint el correu des de %s"
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-#, fuzzy
-msgid "Add to Contacts"
-msgstr "Contacte _nou"
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
-msgid "Merge E-Mail Address"
-msgstr "Adre�a electr�nica:"
+msgid "general-tab"
+msgstr "General"
 
-#: addressbook/gui/component/e-address-widget.c:364
-#, fuzzy
-msgid "Disable Queries"
-msgstr "Categories disponibles:"
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
+#: 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 "Cerca"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 #, fuzzy
 msgid "Evolution's addressbook name selection interface."
@@ -1082,9 +1342,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: 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: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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Elimina"
 
@@ -1118,7 +1378,12 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Cerca un contacte"
+
+#: 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"
@@ -1128,7 +1393,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"
@@ -1136,1311 +1401,1377 @@ 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:1
-#, fuzzy
-msgid "C_ontaining:"
-msgstr "cont�"
+msgid "Select Names"
+msgstr "Seleccioneu els noms"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
-msgid "Co_ntacts:"
-msgstr "_Contactes..."
+msgid "Selected Contacts:"
+msgstr "Voleu suprimir el contacte?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "F_ind"
-msgstr "Cerca"
+msgid "Show Contacts"
+msgstr "_Contactes..."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "Seleccioneu els noms"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
+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 "_Category:"
-msgstr "categories"
+msgid "_Browse..."
+msgstr "Mou"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
-msgid "_Folder:"
-msgstr "_Carpeta"
+msgid "_Category:"
+msgstr "categories"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:8
 #, fuzzy
-msgid "_Message Recipients:"
-msgstr "Destinataris del missatge"
+msgid "_Folder:"
+msgstr "_Carpeta"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "Anni_versary:"
-msgstr "Ani_versari:"
+#, fuzzy
+msgid "A_ssistant's name:"
+msgstr "_Nom de l'assistent:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "B_usiness"
-msgstr "F_eina"
+#, fuzzy
+msgid "Add_ress..."
+msgstr "_Adre�a..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Business _Fax"
-msgstr "Fax de la feina"
+msgid "Anni_versary:"
+msgstr "Ani_versari:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#, fuzzy
+msgid "Birthda_y:"
+msgstr "_Data de naixement:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "C_ontacts..."
+msgstr "C_ontactes..."
+
+#: 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 "Ca_tegories..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Contacta l'editor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "D_epartment:"
+msgstr "_Departament:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Detalls"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "File A_s:"
 msgstr "Arxiva com:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "General"
-msgstr "General"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#, fuzzy
+msgid "Full _Name..."
+msgstr "Nom _complet..."
 
-#: 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"
 "of that information here."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr "Nou tipus de tel�fon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "No_tes:"
 msgstr "No_tes:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "Organitzaci�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#, fuzzy
+msgid "P_rofession:"
+msgstr "_Professi�:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Phone Types"
 msgstr "Tipus de tel�fon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Wants to receive _HTML mail"
-msgstr "Vol rebre correu _HTML"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Address..."
-msgstr "_Adre�a..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Assistant's name:"
-msgstr "_Nom de l'assistent:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Birthday:"
-msgstr "_Data de naixement:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+msgid "S_pouse:"
+msgstr "_C�njuge:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Business"
-msgstr "_Feina"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#, fuzzy
+msgid "This is the _mailing address"
+msgstr "_Aquesta �s l'adre�a de correu"
 
-#: 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 "_Contactes..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "Wants to receive _HTML mail"
+msgstr "Vol rebre correu _HTML"
 
-#: 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: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:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Department:"
-msgstr "_Departament:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Full Name..."
-msgstr "Nom _complet..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Home"
-msgstr "_Particular"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Job title:"
 msgstr "_C�rrec:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager's Name:"
 msgstr "_Nom del gestor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Mobile"
-msgstr "_M�bil"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
 msgstr "_Sobrenom:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
 msgstr "_Oficina"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Profession:"
-msgstr "_Professi�:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "_Public Calendar URL:"
 msgstr "Agenda"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Spouse:"
-msgstr "_C�njuge:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr "_Aquesta �s l'adre�a de correu"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Web page address:"
 msgstr "Adre�a de p�gina web:"
 
-#: 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:756
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
 #, fuzzy
-msgid "Category editor not available."
-msgstr "No hi ha cap resum disponible."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:763
-#, 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:1662
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
-#, fuzzy, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "No s'ha pogut suprimir la carpeta `%s': %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
-#, fuzzy
-msgid "Edit Full"
-msgstr "Filtres d'edici�"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#, fuzzy
-msgid "Full Name"
-msgstr "Nom complet:"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
-#, fuzzy
-msgid "E-mail"
-msgstr "Adre�a electr�nica 2"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
-#, fuzzy
-msgid "list"
-msgstr "�s"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adre�a _2:"
+msgid "United States"
+msgstr "Mou el missatge"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
 #, fuzzy
 msgid "Afghanistan"
 msgstr "Assistent"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 #, fuzzy
 msgid "Antarctica"
 msgstr "Tria autom�tica"
 
-#: 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
 #, fuzzy
 msgid "Argentina"
 msgstr "Orientaci�"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: my-evolution/Locations.h:155
 #, fuzzy
 msgid "Austria"
 msgstr "agost"
 
-#: 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
 #, fuzzy
 msgid "Belarus"
 msgstr "anys"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:23
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: my-evolution/Locations.h:218
 #, fuzzy
 msgid "Belize"
 msgstr "Mida"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #, fuzzy
 msgid "Benin"
 msgstr "S'est� enviant \"%s\""
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: my-evolution/Locations.h:294
 #, fuzzy
 msgid "Brazil"
 msgstr "_Correu"
 
-#: 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/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 "Canad�"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:44
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #, fuzzy
 msgid "Chad"
 msgstr "Cotxe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-msgid "Check Address"
-msgstr "Comprova l'adre�a"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: my-evolution/Locations.h:438
 #, fuzzy
 msgid "Chile"
 msgstr "_Fitxer"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 #, fuzzy
 msgid "China"
 msgstr "Cotxe"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 #, fuzzy
 msgid "Comoros"
 msgstr "Colors"
 
-#: 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
 #, fuzzy
 msgid "Congo"
 msgstr "S'est� copiant"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:56
-msgid "Countr_y:"
-msgstr "Pa�_s:"
-
-#: 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/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 "Finl�ndia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: my-evolution/Locations.h:766
 #, fuzzy
 msgid "France"
 msgstr "Cancel�lat"
 
-#: 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
 #, fuzzy
 msgid "Germany"
 msgstr "maig"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: my-evolution/Locations.h:846
 #, fuzzy
 msgid "Greece"
 msgstr "setmana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #, fuzzy
 msgid "Greenland"
 msgstr "Finl�ndia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #, fuzzy
 msgid "Grenada"
 msgstr "Canad�"
 
-#: 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
 #, fuzzy
 msgid "Guam"
 msgstr "am"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:93
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #, fuzzy
 msgid "Guinea"
 msgstr "General"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: my-evolution/Locations.h:888
 #, fuzzy
 msgid "Haiti"
 msgstr "_Correu"
 
-#: 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
 #, fuzzy
 msgid "Honduras"
 msgstr "Hores"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: my-evolution/Locations.h:966
 #, fuzzy
 msgid "Hungary"
 msgstr "Diumenge"
 
-#: 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
 #, fuzzy
 msgid "Italy"
 msgstr "avui"
 
-#: 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
+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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #, fuzzy
 msgid "Laos"
 msgstr "Baixa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: my-evolution/Locations.h:1190
 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:1198
 msgid "Lebanon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 #, fuzzy
 msgid "Lesotho"
 msgstr "Baixa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Liberia"
 msgstr "abril"
 
-#: 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:1234
 #, fuzzy
 msgid "Lithuania"
 msgstr "vuit�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: my-evolution/Locations.h:1268
 msgid "Luxembourg"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #, fuzzy
 msgid "Macau"
 msgstr "mar�"
 
-#: 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
 #, fuzzy
 msgid "Malawi"
 msgstr "_Correu"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #, fuzzy
 msgid "Mali"
 msgstr "_Correu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
 #, fuzzy
 msgid "Malta"
 msgstr "_Correu"
 
-#: 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
 #, fuzzy
 msgid "Martinique"
 msgstr "Minut"
 
-#: 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
 #, fuzzy
 msgid "Mauritius"
 msgstr "Marges"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 #, fuzzy
 msgid "Mayotte"
 msgstr "Dilluns"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1387
 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
+msgid "Moldova, Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 #, fuzzy
 msgid "Monaco"
 msgstr "Dilluns"
 
-#: 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:1470
 msgid "Morocco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 #, fuzzy
 msgid "Mozambique"
 msgstr "M�bil"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #, fuzzy
 msgid "Myanmar"
 msgstr "Busca"
 
-#: 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
 #, fuzzy
 msgid "Nepal"
 msgstr "Recupera el correu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
 #, fuzzy
 msgid "Netherlands"
 msgstr "Selecciona'ls _tots"
 
-#: 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
 #, fuzzy
 msgid "New Caledonia"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1560
 #, fuzzy
 msgid "New Zealand"
 msgstr "Recupera el correu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: my-evolution/Locations.h:1562
 msgid "Nicaragua"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #, fuzzy
 msgid "Niger"
 msgstr "Alta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #, fuzzy
 msgid "Nigeria"
 msgstr "abril"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 #, fuzzy
 msgid "Niue"
 msgstr "Minut"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: my-evolution/Locations.h:1574
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norway"
 msgstr "Ara"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1632
 msgid "Oman"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
 #, fuzzy
 msgid "Pakistan"
 msgstr "Enganxa"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama"
 msgstr "Canad�"
 
-#: 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:1688
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Peru"
 msgstr "Paper"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr ""
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
 #, fuzzy
 msgid "Poland"
 msgstr "Finl�ndia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Portugal"
 msgstr "Vertical"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1824
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Qatar"
 msgstr "despr�s de"
 
-#: 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
 #, fuzzy
 msgid "Reunion"
 msgstr "Seccions:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
 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/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #, fuzzy
 msgid "Rwanda"
 msgstr "Canad�"
 
-#: 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
 #, fuzzy
 msgid "Samoa"
 msgstr "Puntuaci�"
 
-#: 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:2035
 msgid "Saudi Arabia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 #, fuzzy
 msgid "Senegal"
 msgstr "General"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #, fuzzy
 msgid "Seychelles"
 msgstr "Seleccioneu una carpeta"
 
-#: 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:2090
 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:2103
 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:2104
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #, fuzzy
 msgid "Somalia"
 msgstr "Normal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2119
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spain"
 msgstr "_Envia"
 
-#: 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
 #, fuzzy
 msgid "Sudan"
 msgstr "dg."
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
 #, fuzzy
 msgid "Suriname"
 msgstr "_Sobrenom:"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #, fuzzy
 msgid "Swaziland"
 msgstr "Finl�ndia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
 #, fuzzy
 msgid "Sweden"
 msgstr "Vist"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2183
 msgid "Switzerland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Taiwan"
 msgstr "R�dio"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #, fuzzy
 msgid "Tajikistan"
 msgstr "Tasques"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+msgid "Tanzania, United Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 #, fuzzy
 msgid "Thailand"
 msgstr "Finl�ndia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 #, fuzzy
 msgid "Togo"
 msgstr "Per a"
 
-#: 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
 #, fuzzy
 msgid "Tonga"
 msgstr "Avui"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
 #, fuzzy
 msgid "Turkey"
 msgstr "dm."
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 #, fuzzy
 msgid "Turkmenistan"
 msgstr "Tasca"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 #, fuzzy
 msgid "Uganda"
 msgstr "Canad�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
 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:2342
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-#, fuzzy
-msgid "United States"
-msgstr "Mou el missatge"
-
-#: 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:2348
 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:2380
 msgid "Venezuela"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Viet Nam"
 msgstr "Seleccioneu els noms"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+msgid "Virgin Islands, British"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
 #, fuzzy
 msgid "Yemen"
 msgstr "Vist"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2524
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Voleu suprimir el contacte?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#, fuzzy
+msgid "Category editor not available."
+msgstr "No hi ha cap resum disponible."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#, 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
+#, fuzzy
+msgid "Save Contact as VCard"
+msgstr "Desa com a VCard"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "No s'ha pogut suprimir la carpeta `%s': %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
+#, fuzzy
+msgid "Edit Full"
+msgstr "Filtres d'edici�"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+#, fuzzy
+msgid "Full Name"
+msgstr "Nom complet:"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#, fuzzy
+msgid "E-mail"
+msgstr "Adre�a electr�nica 2"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "�s"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Adre�a _2:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "Comprova l'adre�a"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "Pa�_s:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "_Adre�a:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "_Poblaci�:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Apartat de correus:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Comarca:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "_Codi postal:"
 
@@ -2544,11 +2875,16 @@ msgid "contact-list-editor"
 msgstr "Contacta l'editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Contacta l'editor"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#, fuzzy
+msgid "Save List as VCard"
+msgstr "Desa com a VCard"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
@@ -2595,7 +2931,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:231
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Afegeix..."
@@ -2605,249 +2941,351 @@ msgstr "Afegeix..."
 msgid "Search"
 msgstr "Cerca"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 #, fuzzy
 msgid "No cards"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 #, fuzzy
 msgid "1 card"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr " segons"
 
-#: 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 "Desa com a VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: ui/evolution-message-composer.xml.h:13
+#: addressbook/gui/widgets/e-addressbook-model.c:370
 #, fuzzy
-msgid "Open"
-msgstr "_Obre"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:734
-#: ui/evolution-addressbook.xml.h:10
-#, fuzzy
-msgid "Forward Contact"
-msgstr "Reenvia"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-#, fuzzy
-msgid "Send Message to Contact"
-msgstr "FIXME: Nou _missatge per contactar"
-
-#: 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 "Imprimeix"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-#, fuzzy
-msgid "Print Envelope"
-msgstr "Imprimeix el missatge..."
-
-#: 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 "Suprimeix"
+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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: 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:33
-#: shell/evolution-shell-component.c:1007
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: shell/evolution-shell-component.c:1043
 #, fuzzy
 msgid "Success"
 msgstr "Fonts"
 
-#: 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: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
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #, fuzzy
 msgid "Repository offline"
 msgstr "S'est� movent"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "Perm�s denegat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 #, fuzzy
 msgid "Card not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
 msgid "Protocol not supported"
 msgstr "Operaci� no suportada"
 
-#: 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:607 camel/camel-service.c:643
+#: 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
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancel�lat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 #, fuzzy
 msgid "Other error"
 msgstr "Error d'E/S"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 #, fuzzy
 msgid "Error adding list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 #, fuzzy
 msgid "Error adding card"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #, fuzzy
 msgid "Error modifying list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 #, fuzzy
 msgid "Error removing list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #, fuzzy
 msgid "Error removing card"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#. 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 ""
+#: addressbook/gui/widgets/e-addressbook-util.c:204
+#, fuzzy
+msgid "Display Cards?"
+msgstr "_Visualitzaci�"
 
-#. 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"
+#: addressbook/gui/widgets/e-addressbook-util.c:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "_Visualitzaci�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "No iniciat"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "No iniciat"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "No iniciat"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "No iniciat"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "<feu clic aqu� per seleccionar una data>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Primari"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 #, fuzzy
 msgid "Business Phone"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Crida de retorn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 #, fuzzy
 msgid "Company Phone"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 #, fuzzy
 msgid "Home Phone"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 #, fuzzy
 msgid "Business Address"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 #, fuzzy
 msgid "Home Address"
 msgstr "Comprova l'adre�a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "M�bil"
 
-#: 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:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 #, fuzzy
 msgid "Other Phone"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 #, fuzzy
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Desa com a VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Visualitza tots els contactes"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Visualitza tots els contactes"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_V�s a la carpeta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "S'est� movent"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Cerca contactes"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Afegeix una font"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Par�metres"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Reenvia"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#, fuzzy
+msgid "Send Message to Contact"
+msgstr "FIXME: Nou _missatge per contactar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+#, fuzzy
+msgid "Print Envelope"
+msgstr "Imprimeix el missatge..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "Copia a la carpeta"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "Mou a la carpeta"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: 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
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "l'hora actual"
+
+#. 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:940
+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 ""
+
+#. 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
+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 ""
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -2861,11 +3299,12 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: 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 ""
@@ -2875,11 +3314,41 @@ msgstr ""
 "\n"
 "Feu doble clic aqu� per crear un nou contacte."
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"No hi ha elements per mostrar en aquesta vista\n"
+"\n"
+"Feu doble clic aqu� per crear un nou contacte."
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #, fuzzy
 msgid "Card View"
 msgstr "Cotxe"
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+#, fuzzy
+msgid "Print envelope"
+msgstr "Imprimeix el missatge..."
+
+#: addressbook/printing/e-contact-print.c:1115
+#, fuzzy
+msgid "Print cards"
+msgstr "Imprimeix l'agenda"
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+#, fuzzy
+msgid "Print card"
+msgstr "Imprimeix l'agenda"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -2950,6 +3419,7 @@ msgid "Include:"
 msgstr "Inclou:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Horitzontal"
 
@@ -2974,10 +3444,12 @@ msgid "Options"
 msgstr "Opcions"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Orientaci�"
 
 #: addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "P�gina"
 
@@ -2993,7 +3465,9 @@ msgstr "Paper"
 msgid "Paper source:"
 msgstr "Font del paper:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Vertical"
 
@@ -3050,66 +3524,50 @@ msgstr "Amplada:"
 msgid "_Font..."
 msgstr "Lletra..."
 
-#: addressbook/printing/e-contact-print.c:1111
-#, fuzzy
-msgid "Print cards"
-msgstr "Imprimeix l'agenda"
-
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-#, fuzzy
-msgid "Print card"
-msgstr "Imprimeix l'agenda"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-#, fuzzy
-msgid "Print envelope"
-msgstr "Imprimeix el missatge..."
-
-#: calendar/cal-util/cal-component.c:1202
+#: calendar/cal-util/cal-component.c:1207
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "Edita una cita"
 
-#: 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:405 mail/message-list.c:651
+#: 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
 msgid "High"
 msgstr "Alta"
 
-#: 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:650
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
-#: 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:407 mail/message-list.c:649
+#: 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
 msgid "Low"
 msgstr "Baixa"
 
 #. 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
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:937
-#: calendar/conduits/todo/todo-conduit.c:649
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: 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 "No s'ha pogut llegir el bloc d'aplicaci� d'agenda del Pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:756
-#: calendar/conduits/todo/todo-conduit.c:759
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "_Prioritat:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaci� de coses per fer del Pilot"
 
@@ -3123,49 +3581,63 @@ msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #, fuzzy
+msgid "Calendar and Tasks"
+msgstr "_Par�metres"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Calendar."
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, 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:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, 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:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, 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:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 #, 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:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 #, 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
+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 ""
@@ -3174,26 +3646,11 @@ 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 "Encap�alaments:"
-
 #: 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"
@@ -3219,12 +3676,12 @@ msgstr "Durada de l'snooze (minuts)"
 msgid "_Edit appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:670
+#: calendar/gui/alarm-notify/alarm-queue.c:675
 #, fuzzy
 msgid "No description available."
 msgstr "No hi ha cap resum disponible."
 
-#: 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"
@@ -3232,18 +3689,30 @@ 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:2608
+#: widgets/misc/e-messagebox.c:159
+#, fuzzy
+msgid "Warning"
+msgstr "S'est� movent"
+
+#: 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 "Envia aquest missatge"
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
@@ -3258,26 +3727,45 @@ msgstr "No s'ha pogut crear el directori temporal: %s"
 msgid "Could not create the alarm notify service factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/cal-search-bar.c:50
+#, fuzzy
+msgid "Summary contains"
+msgstr "cont�"
+
+#: calendar/gui/cal-search-bar.c:51
+#, fuzzy
+msgid "Description contains"
+msgstr "Descripci�:"
+
+#: calendar/gui/cal-search-bar.c:52
+#, fuzzy
+msgid "Comment contains"
+msgstr "cont�"
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:405
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A, %d de %B de %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: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/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
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: 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
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %d de %B de %Y"
@@ -3285,27 +3773,25 @@ msgstr "%A, %d de %B de %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:805
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "P�blic"
 
@@ -3326,33 +3812,28 @@ msgid "W"
 msgstr "O"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "setmana"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 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:479 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 #, fuzzy
 msgid "Completed"
 msgstr "% comp_let:"
@@ -3369,12 +3850,13 @@ 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/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/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
+#: 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 "Cap"
 
@@ -3388,25 +3870,16 @@ msgstr "Recurr�ncia"
 msgid "Assigned"
 msgstr "Assigna una puntuaci�"
 
-#: 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:803
+#: 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
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 #, fuzzy
 msgid "No"
 msgstr "Ara"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1974 calendar/gui/e-day-view.c:1675
-#: calendar/gui/e-week-view.c:1182
-#, fuzzy
-msgid "Searching"
-msgstr "Cerca"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 #, fuzzy
 msgid "Day View"
@@ -3427,70 +3900,83 @@ msgstr "Setmana"
 msgid "Month View"
 msgstr "Mes"
 
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Summary contains"
-msgstr "cont�"
-
-#: calendar/gui/cal-search-bar.c:57
-#, fuzzy
-msgid "Description contains"
-msgstr "Descripci�:"
-
-#: calendar/gui/cal-search-bar.c:58
-#, fuzzy
-msgid "Comment contains"
-msgstr "cont�"
-
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
-msgid "Unmatched"
-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
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Tasques"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "Filtre sobre la llista de correu"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "Crea una nova cita"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "Cancel�lat"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
+#: calendar/gui/component-factory.c:695
 #, fuzzy
-msgid "New _Appointment"
-msgstr "Nova cita..."
+msgid "_Meeting"
+msgstr "Cancel�lat"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
+#: calendar/gui/component-factory.c:699
 #, fuzzy
-msgid "Create a new task"
-msgstr "Crea un nou contacte"
+msgid "New task"
+msgstr "Tasca"
 
-#: calendar/gui/component-factory.c:649
+#: calendar/gui/component-factory.c:699
 #, fuzzy
-msgid "New _Task"
+msgid "_Task"
 msgstr "Tasca"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Nova cita..."
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Nova cita..."
+
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Nova cita..."
+
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "Cites:"
+
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr ""
+"No s'ha pogut obrir la carpeta `%s':\n"
+"%s"
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrar� l'agenda"
 
+#: calendar/gui/control-factory.c:174
+msgid "The type of view to show"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-options.c:359
 #, fuzzy
 msgid "Audio Alarm Options"
@@ -3672,12 +4158,12 @@ msgstr "Crea una nova cita"
 msgid "%s at the end of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/dialogs/alarm-page.c:453
+#: calendar/gui/dialogs/alarm-page.c:452
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%2$s%1$s"
 
-#: calendar/gui/dialogs/alarm-page.c:459
+#: calendar/gui/dialogs/alarm-page.c:458
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3700,7 +4186,7 @@ msgstr "Recordatoris"
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "Resum:"
 
@@ -3709,12 +4195,11 @@ msgstr "Resum:"
 msgid "_Options..."
 msgstr "_Opcions"
 
-#. 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 "despr�s de"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "abans de"
 
@@ -3733,7 +4218,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:120
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 #, fuzzy
 msgid "minute(s)"
 msgstr "minuts"
@@ -3778,196 +4263,186 @@ msgid "Color for tasks due today"
 msgstr "Element per fer que ven� avui:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
-msgid "Create new appointments with a default _reminder"
-msgstr "Crea una nova cita"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Dies"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#, fuzzy
-msgid "First day of wee_k:"
-msgstr "primer dia de la setmana:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Divendres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Hores"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Dilluns"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#, fuzzy
-msgid "O_verdue tasks:"
-msgstr "Elements ven�uts"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, 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:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #, fuzzy
 msgid "Show week _numbers in date navigator"
 msgstr "Mostra els n�meros de les setmanes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #, fuzzy
 msgid "Su_n"
 msgstr "dg."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Elemts que vencen avui"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_hu"
 msgstr "dj."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "T_ue"
 msgstr "dm."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
-msgid "Tas_ks due today:"
-msgstr "Elemts que vencen avui"
+msgid "Task List"
+msgstr "Tasques"
 
-#: 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 "Dijous"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Temps"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #, fuzzy
 msgid "Time _zone:"
 msgstr "Divisions de temps:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
-msgid "Time di_visions:"
-msgstr "Divisions de temps:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Format de l'hora:"
 
-#: 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 "Dimarts"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Work Week"
 msgstr "Setmana de treball"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #, fuzzy
 msgid "_12 hour (AM/PM)"
 msgstr "12 hores (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #, fuzzy
 msgid "_24 hour"
 msgstr "24 hores"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #, fuzzy
 msgid "_Compress weekends in month view"
 msgstr "Comprimeix els caps de setmana"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 #, fuzzy
 msgid "_Display"
 msgstr "_Visualitzaci�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "_End of day:"
 msgstr "Final del dia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
 msgid "_Fri"
 msgstr "dv."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_General"
 msgstr "General"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "Suprimeix el missatge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Mon"
 msgstr "dl."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #, fuzzy
-msgid "_Other"
-msgstr "Altres"
+msgid "_Overdue tasks:"
+msgstr "Elements ven�uts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Sat"
 msgstr "ds."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "_Task List"
-msgstr "Tasques"
+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:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Divisions de temps:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Wed"
 msgstr "dc."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "before the start of the appointment"
 msgstr "Crea una nova cita"
@@ -4041,78 +4516,64 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: 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:2212
 #, fuzzy
 msgid " (Completed "
 msgstr "% comp_let:"
 
-#: 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
 #, fuzzy
 msgid "Completed "
 msgstr "% comp_let:"
 
-#: 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:2221
 #, fuzzy
 msgid "Due "
 msgstr "Data de venciment"
 
-#: calendar/gui/dialogs/comp-editor.c:303
+#: calendar/gui/dialogs/comp-editor.c:322
 #, fuzzy
 msgid "Could not update object!"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Sense resum"
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1897
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "Voleu sobreescriure el fitxer?"
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1904
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ja existeix una fitxer amb aquest nom.\n"
-"El voleu sobreescriure?"
-
-#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-#, fuzzy
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4194,7 +4655,7 @@ msgstr "Suprimeix"
 msgid "Enter Delegate"
 msgstr "Suprimeix"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 #, fuzzy
 msgid "Appointment"
 msgstr "Cites:"
@@ -4209,14 +4670,14 @@ msgstr "Recurr�ncia"
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 #, 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:365
+#: calendar/gui/dialogs/event-editor.c:368
 #, fuzzy
 msgid "Meeting"
 msgstr "Cancel�lat"
@@ -4254,32 +4715,42 @@ msgid "F_ree"
 msgstr "setmana"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
+#, fuzzy
+msgid "L_ocation:"
+msgstr "_Accions"
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: 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 "P�_blic"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 #, fuzzy
 msgid "Show Time As"
 msgstr "Mostra"
 
-#: 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 "Resu_m:"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Contactes..."
+
+#: calendar/gui/dialogs/event-page.glade.h:14
 #, fuzzy
 msgid "_End time:"
 msgstr "Hora de _finalitzaci�:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
@@ -4309,62 +4780,55 @@ msgstr "Tots els assistents"
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
 #, fuzzy
-msgid "Click here to add an attendee"
-msgstr "<feu clic aqu� per seleccionar una data>"
+msgid "Common Name"
+msgstr "Completat"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
 #, fuzzy
-msgid "Common Name"
-msgstr "Completat"
+msgid "Delegated From"
+msgstr "Suprimeix"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
-msgid "Delegated From"
+msgid "Delegated To"
 msgstr "Suprimeix"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
 #, fuzzy
-msgid "Delegated To"
-msgstr "Suprimeix"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-#, fuzzy
 msgid "Language"
 msgstr "Busca"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 #, fuzzy
 msgid "Member"
 msgstr "desembre"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:798
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 #, fuzzy
 msgid "Role"
 msgstr "M�bil"
 
-#: 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/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
 #, fuzzy
 msgid "Status"
 msgstr "_Estat:"
 
-#: 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 #, fuzzy
 msgid "Type"
@@ -4382,7 +4846,7 @@ msgid "_Change Organizer"
 msgstr "Organitzaci�:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:445
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "_Invita a altres..."
 
@@ -4391,29 +4855,98 @@ msgstr "_Invita a altres..."
 msgid "_Other Organizer"
 msgstr "Organitzaci�:"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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
+#, fuzzy
+msgid "th"
+msgstr "4"
+
+#: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "el"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+msgid "first"
+msgstr "primer"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "segon"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+msgid "third"
+msgstr "tercer"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "quart"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "�s"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Un altre fax"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dia"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-#, fuzzy
-msgid "th"
-msgstr "4"
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 #, fuzzy
 msgid "occurrences"
 msgstr "aparicions"
@@ -4484,16 +5017,20 @@ msgstr "setmana(es)"
 msgid "year(s)"
 msgstr "any(s)"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:56
+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
+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?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
@@ -4512,7 +5049,7 @@ msgid "Progress"
 msgstr "En proc�s"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
@@ -4525,16 +5062,21 @@ msgstr "_Prioritat:"
 msgid "_Status:"
 msgstr "_Estat:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+#, 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:322
+#: calendar/gui/dialogs/task-editor.c:324
 #, fuzzy
 msgid "Assignment"
 msgstr "Assigna una puntuaci�"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Descripci�:"
 
@@ -4547,208 +5089,170 @@ msgstr "Data d'ini_ci:"
 msgid "_Due Date:"
 msgstr "_Data de venciment:"
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "100%"
-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:751 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:941 calendar/gui/e-day-view.c:3544
-#: calendar/gui/e-week-view.c:3422 mail/folder-browser.c:1447
-#: shell/e-shortcuts-view.c:384
+#: 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
 #, fuzzy
 msgid "_Open"
 msgstr "_Obre"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:973
+#, 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-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
+#, fuzzy
+msgid "_Print..."
+msgstr "Imprimeix..."
+
+#: calendar/gui/e-calendar-table.c:978 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:947 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3433 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:979 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
 #, fuzzy
 msgid "_Copy"
 msgstr "Copia"
 
-#: calendar/gui/e-calendar-table.c:949 calendar/gui/e-day-view.c:3530
-#: calendar/gui/e-day-view.c:3557 calendar/gui/e-week-view.c:3409
-#: calendar/gui/e-week-view.c:3435 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:980 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
 #, fuzzy
 msgid "_Paste"
 msgstr "Enganxa"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:984
 #, fuzzy
-msgid "_Mark as Complete"
-msgstr "Marca com a completa"
+msgid "_Assign Task"
+msgstr "_Tasca (FIXME)"
 
-#: calendar/gui/e-calendar-table.c:956
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
-msgid "_Delete this Task"
-msgstr "Suprimeix la tasca"
+msgid "_Forward as iCalendar"
+msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-calendar-table.c:959
+#: calendar/gui/e-calendar-table.c:986
 #, fuzzy
-msgid "_Mark Tasks as Complete"
+msgid "_Mark as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
+msgstr "Marca com a completa"
+
+#: calendar/gui/e-calendar-table.c:992
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7115
-#: calendar/gui/e-week-view.c:3918
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
-#. 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 ""
-"La data s'ha d'introduir amb el format: \n"
-"\n"
-"%s"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 #, fuzzy
 msgid "Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Completion Date"
 msgstr "Completat"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Data de venciment"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "End Date"
 msgstr "Hora de _finalitzaci�:"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioritat"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 #, fuzzy
 msgid "Summary"
 msgstr "R_esum"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, fuzzy
 msgid "Task sort"
 msgstr "Tasques"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 #, fuzzy
 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 ""
+"La data s'ha d'introduir amb el format: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -4756,414 +5260,186 @@ msgstr "%02i divisions de minut"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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 de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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"
 
 #. 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
 msgid "am"
 msgstr "am"
 
 #. 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
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
-#, fuzzy
-msgid "New All Day _Event"
-msgstr "Esdeveniment per a _tot el dia"
-
-#: calendar/gui/e-day-view.c:3535 calendar/gui/e-week-view.c:3414
-#: ui/evolution-calendar.xml.h:17
-#, fuzzy
-msgid "Go to _Today"
-msgstr "V�s a avui"
-
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
-#, fuzzy
-msgid "_Go to Date..."
-msgstr "V�s a una data"
-
-#: calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
+#: calendar/gui/e-day-view.c:3549
 #, fuzzy
-msgid "_Delete this Appointment"
-msgstr "Suprimeix aquesta cita"
-
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
-#, fuzzy
-msgid "Make this Occurrence _Movable"
-msgstr "Fes aquesta cita movible"
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
-#, fuzzy
-msgid "Delete this _Occurrence"
-msgstr "Suprimeix-ne aquesta aparici�"
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
-#, fuzzy
-msgid "Delete _All Occurrences"
-msgstr "Suprimeix-ne totes les aparicions"
-
-#: calendar/gui/e-itip-control.c:524
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Task begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:534
-#, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "Cap informaci�"
-
-#: calendar/gui/e-itip-control.c:538
-msgid "Begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:550
-#, fuzzy
-msgid "Meeting ends: <b>"
-msgstr "Hora de _finalitzaci� de la reuni�:"
-
-#: calendar/gui/e-itip-control.c:553
-#, fuzzy
-msgid "Free/Busy info ends: <b>"
-msgstr "Cap informaci�"
-
-#: calendar/gui/e-itip-control.c:557
-msgid "Ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:571
-#, fuzzy
-msgid "Task Completed: <b>"
-msgstr "% comp_let:"
-
-#: calendar/gui/e-itip-control.c:581
-msgid "Task Due: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
-#, fuzzy
-msgid "iCalendar Information"
-msgstr "Cap informaci�"
-
-#. Title
-#: calendar/gui/e-itip-control.c:633
-#, fuzzy
-msgid "iCalendar Error"
-msgstr "Agenda"
-
-#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
-#, fuzzy
-msgid "An unknown person"
-msgstr "Error desconegut"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:737
-msgid "<i>None</i>"
-msgstr ""
-
-#: 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
-#, fuzzy
-msgid "Choose an action:"
-msgstr "Fitxer de signatura:"
-
-#: calendar/gui/e-itip-control.c:779
-#, fuzzy
-msgid "Update"
-msgstr "ha estat despr�s de"
-
-#: 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
-msgid "OK"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:795
-#, fuzzy
-msgid "Accept"
-msgstr "set"
-
-#: calendar/gui/e-itip-control.c:796
-#, fuzzy
-msgid "Tentatively accept"
-msgstr "Tentatiu"
-
-#: calendar/gui/e-itip-control.c:797
-#, fuzzy
-msgid "Decline"
-msgstr "Suprimeix"
-
-#: calendar/gui/e-itip-control.c:811
-#, fuzzy
-msgid "Send Free/Busy Information"
-msgstr "Cap informaci�"
-
-#: calendar/gui/e-itip-control.c:824
-msgid "Update respondent status"
-msgstr ""
+msgid "New _Appointment"
+msgstr "Nova cita..."
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 #, fuzzy
-msgid "Send Latest Information"
-msgstr "Cap informaci�"
+msgid "New All Day _Event"
+msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 #, fuzzy
-msgid "Cancel"
+msgid "New Meeting"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:867
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
 #, fuzzy
-msgid "Meeting Information"
-msgstr "Cap informaci�"
+msgid "New Task"
+msgstr "Tasca"
 
-#: calendar/gui/e-itip-control.c:872
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr ""
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Imprimeix..."
 
-#: calendar/gui/e-itip-control.c:873
+#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: ui/evolution-calendar.xml.h:10
 #, fuzzy
-msgid "Meeting Proposal"
-msgstr "Cancel�lat"
-
-#: calendar/gui/e-itip-control.c:877
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
+msgid "Go to _Today"
+msgstr "V�s a avui"
 
-#: calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 #, fuzzy
-msgid "Meeting Update"
-msgstr "Hora de _finalitzaci� de la reuni�:"
-
-#: calendar/gui/e-itip-control.c:882
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr ""
+msgid "_Go to Date..."
+msgstr "V�s a una data"
 
-#: calendar/gui/e-itip-control.c:883
+#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: ui/evolution-calendar.xml.h:31
 #, fuzzy
-msgid "Meeting Update Request"
-msgstr "FIXME: Pe_tici� de cita"
-
-#: calendar/gui/e-itip-control.c:887
-#, fuzzy, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "_Aquesta �s l'adre�a de correu"
+msgid "_Publish Free/Busy Information"
+msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:888
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
 #, fuzzy
-msgid "Meeting Reply"
-msgstr "Cancel�lat"
-
-#: calendar/gui/e-itip-control.c:892
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
+msgid "_Configure..."
+msgstr "Mou a la carpeta"
 
-#: calendar/gui/e-itip-control.c:893
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
 #, fuzzy
-msgid "Meeting Cancellation"
-msgstr "Fitxer de signatura:"
-
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
-#: calendar/gui/e-itip-control.c:982
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
+msgid "_Configure Pilot..."
+msgstr "Mou a la carpeta"
 
-#: calendar/gui/e-itip-control.c:898
+#: 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
 #, fuzzy
-msgid "Bad Meeting Message"
-msgstr "_Edita el missatge"
-
-#: calendar/gui/e-itip-control.c:917
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr ""
+msgid "_Save As..."
+msgstr "Anomena i desa..."
 
-#: calendar/gui/e-itip-control.c:918
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 #, fuzzy
-msgid "Task Information"
-msgstr "Cap informaci�"
-
-#: calendar/gui/e-itip-control.c:922
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr ""
+msgid "_Schedule Meeting..."
+msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 #, fuzzy
-msgid "Task Proposal"
-msgstr "TaskPad"
-
-#: calendar/gui/e-itip-control.c:927
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr ""
+msgid "_Forward as iCalendar..."
+msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 #, fuzzy
-msgid "Task Update"
-msgstr "ha estat despr�s de"
-
-#: calendar/gui/e-itip-control.c:932
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr ""
+msgid "Make this Occurrence _Movable"
+msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-itip-control.c:933
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 #, fuzzy
-msgid "Task Update Request"
-msgstr "FIXME: _Petici� de tasca"
-
-#: calendar/gui/e-itip-control.c:937
-#, fuzzy, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "_Aquesta �s l'adre�a de correu"
+msgid "Delete this _Occurrence"
+msgstr "Suprimeix-ne aquesta aparici�"
 
-#: calendar/gui/e-itip-control.c:938
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 #, fuzzy
-msgid "Task Reply"
-msgstr "Respon"
+msgid "Delete _All Occurrences"
+msgstr "Suprimeix-ne totes les aparicions"
 
-#: calendar/gui/e-itip-control.c:942
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:943
-#, fuzzy
-msgid "Task Cancellation"
-msgstr "Cancel�lat"
-
-#: calendar/gui/e-itip-control.c:948
-#, fuzzy
-msgid "Bad Task Message"
-msgstr "Agenda"
-
-#: calendar/gui/e-itip-control.c:967
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, fuzzy, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "Cap informaci�"
-
-#: calendar/gui/e-itip-control.c:968
-#, fuzzy
-msgid "Free/Busy Information"
-msgstr "Cap informaci�"
-
-#: calendar/gui/e-itip-control.c:972
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:973
-msgid "Free/Busy Request"
-msgstr ""
+msgid "Error executing %s."
+msgstr "Error en desar el fitxer: %s"
 
-#: calendar/gui/e-itip-control.c:977
-#, 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: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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:978
-msgid "Free/Busy Reply"
+#: calendar/gui/e-itip-control.c:1564
+msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:1566
 #, fuzzy
-msgid "Bad Free/Busy Message"
-msgstr "Imprimeix el missatge"
-
-#: calendar/gui/e-itip-control.c:1052
-msgid "The message does not appear to be properly formed"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1071
-msgid "The message contains only unsupported requests."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
-msgid "The attachment does not contain a valid calendar message"
-msgstr ""
+msgid "Update complete\n"
+msgstr "Data completa:"
 
-#: calendar/gui/e-itip-control.c:1130
-msgid "The attachment has no viewable calendar items"
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1231
-#, fuzzy
-msgid "Update complete\n"
-msgstr "Data completa:"
-
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1284
-msgid "Attendee status ould not be updated!\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1638
+#, fuzzy
+msgid "Attendee status could not be updated!\n"
+msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1640
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1288
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:1348 calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data d'enviament"
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Seleccioneu una carpeta"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Seleccioneu una carpeta"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
@@ -5208,226 +5484,229 @@ msgstr ""
 msgid "date-start"
 msgstr "Inici del dia:"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1535
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 #, fuzzy
 msgid "Required Participants"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Persones _requerides"
 
-#: 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:771
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 #, fuzzy
 msgid "Group"
 msgstr "Grup %i"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 #, fuzzy
 msgid "Resource"
 msgstr "Font"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr ""
 
-#: 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:775
-#: calendar/gui/e-meeting-model.c:791
-#: 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 "Desconegut"
-
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 #, fuzzy
 msgid "Chair"
 msgstr "Cotxe"
 
-#: 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:788
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 #, fuzzy
 msgid "Required Participant"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr ""
 
-#: 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:816
+#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 #, fuzzy
 msgid "Needs Action"
 msgstr "Elimina una acci�"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:817
+#: 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:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:818
+#: 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:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:819 calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 #, fuzzy
 msgid "Delegated"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 #, fuzzy
 msgid "In Process"
 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: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:2088
 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: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:2118 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
-#: 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 "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:428
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Opcions"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Mostra _nom�s les hores de treball"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "Mostra-ho reduint el zoom"
 
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "_Actualitza lliure/ocupat"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "Tria autom�tica"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "_Totes les persones i recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "Totes les persones i un recurs"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "Persones requerides i _un recurs"
 
-#: calendar/gui/e-meeting-time-sel.c:641
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "Hora d'_inici de la reuni�:"
 
-#: calendar/gui/e-meeting-time-sel.c:660
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: calendar/gui/e-tasks.c:355
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No s'ha pogut carregar l'agenda en `%s'"
 
-#: calendar/gui/e-tasks.c:367
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 
-#: calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Completat"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Suprimeix un contacte"
+
+#: calendar/gui/e-tasks.c:659
+#, fuzzy
+msgid "Expunging"
+msgstr "_Esborra"
+
+#: calendar/gui/e-week-view.c:3438
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "Suprimeix aquesta cita"
+
+#: calendar/gui/gnome-cal.c:1538
 #, 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:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1865
+#: calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Obre l'agenda"
@@ -5502,275 +5781,261 @@ msgstr "octubre"
 msgid "September"
 msgstr "setembre"
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:220
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:570
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: 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 "Dg"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Dl"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Dm"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Dc"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Dj"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Dv"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Ds"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Avui (%a, %d de %b de %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 de %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 de %b de %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Aquesta setmana (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Aquest mes (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Enguany (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Tasca"
-
-#: calendar/gui/print.c:2262
-#, fuzzy, c-format
-msgid "Status: %s"
-msgstr "_Estat:"
-
-#: calendar/gui/print.c:2280
-#, fuzzy, c-format
-msgid "Priority: %s"
-msgstr "_Prioritat:"
-
-#: calendar/gui/print.c:2294
-#, fuzzy, c-format
-msgid "Percent Complete: %i"
-msgstr "Marca la tasca com a completa"
-
-#: calendar/gui/print.c:2306
-#, fuzzy, c-format
-msgid "URL: %s"
-msgstr "URL:"
-
-#: calendar/gui/print.c:2320
-#, fuzzy, c-format
-msgid "Categories: %s"
-msgstr "categories"
-
-#: calendar/gui/print.c:2331
-#, fuzzy
-msgid "Contacts: "
-msgstr "_Contactes..."
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2358 my-evolution/e-summary.c:619
-#: 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Previsualitzaci� d'impressi�"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 #, fuzzy
 msgid "Print Item"
 msgstr "Imprimeix aquest element"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 #, fuzzy
 msgid "Print Setup"
 msgstr "Configuraci� de la p�gina:"
 
-#: 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 ""
+
+#: calendar/gui/tasks-control.c:147
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrar� l'agenda"
 
-#: calendar/gui/tasks-control-factory.c:75
+#: calendar/gui/tasks-control.c:456
 msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
+"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 ""
 
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Envia aquest missatge"
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Imprimeix l'agenda"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5804,135 +6069,1716 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DDDDDDD"
 
-#: calendar/pcs/query.c:234
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+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:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Agenda"
+
+#: calendar/importers/icalendar-importer.c:663
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "_Obre una agenda"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:258
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:263
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:300
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:305
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:339
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:344
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:371
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:376
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:412
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:508
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:513
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:650
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:655
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:679
+#: 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:721
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: 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)"
 msgstr ""
 
-#: calendar/pcs/query.c:821
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:866
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:871
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1159
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
-#: camel/camel-cipher-context.c:171
+#.
+#. * 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
+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
+msgid "America/Adak"
+msgstr ""
+
+#: calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr ""
+
+#: calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr ""
+
+#: calendar/zones.h:62
+msgid "America/Antigua"
+msgstr ""
+
+#: calendar/zones.h:63
+msgid "America/Araguaina"
+msgstr ""
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr ""
+
+#: calendar/zones.h:66
+msgid "America/Barbados"
+msgstr ""
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: calendar/zones.h:68
+#, fuzzy
+msgid "America/Belize"
+msgstr "Mida"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+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
+msgid "America/Caracas"
+msgstr ""
+
+#: calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr ""
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+msgid "America/Cayman"
+msgstr ""
+
+#: calendar/zones.h:79
+msgid "America/Chicago"
+msgstr ""
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr ""
+
+#: calendar/zones.h:82
+msgid "America/Costa_Rica"
+msgstr ""
+
+#: calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr ""
+
+#: calendar/zones.h:84
+msgid "America/Curacao"
+msgstr ""
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+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
+msgid "America/Dominica"
+msgstr ""
+
+#: calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr ""
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+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
+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 "Canad�"
+
+#: calendar/zones.h:100
+msgid "America/Guadeloupe"
+msgstr ""
+
+#: calendar/zones.h:101
+msgid "America/Guatemala"
+msgstr ""
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+msgid "America/Guyana"
+msgstr ""
+
+#: calendar/zones.h:104
+msgid "America/Halifax"
+msgstr ""
+
+#: calendar/zones.h:105
+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
+msgid "America/Jamaica"
+msgstr ""
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+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
+msgid "America/La_Paz"
+msgstr ""
+
+#: calendar/zones.h:120
+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
+msgid "America/Maceio"
+msgstr ""
+
+#: calendar/zones.h:124
+msgid "America/Managua"
+msgstr ""
+
+#: calendar/zones.h:125
+msgid "America/Manaus"
+msgstr ""
+
+#: calendar/zones.h:126
+#, fuzzy
+msgid "America/Martinique"
+msgstr "Minut"
+
+#: calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr ""
+
+#: calendar/zones.h:128
+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
+msgid "America/Montreal"
+msgstr ""
+
+#: calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr ""
+
+#: calendar/zones.h:137
+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
+msgid "America/Nome"
+msgstr ""
+
+#: calendar/zones.h:141
+msgid "America/Noronha"
+msgstr ""
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+#, fuzzy
+msgid "America/Panama"
+msgstr "Canad�"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+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
+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
+msgid "America/Regina"
+msgstr ""
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+msgid "America/Rosario"
+msgstr ""
+
+#: calendar/zones.h:157
+msgid "America/Santiago"
+msgstr ""
+
+#: calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr ""
+
+#: calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr ""
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr ""
+
+#: calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr ""
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr ""
+
+#: calendar/zones.h:165
+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
+msgid "America/Tijuana"
+msgstr ""
+
+#: calendar/zones.h:172
+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
+msgid "America/Yakutat"
+msgstr ""
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: calendar/zones.h:178
+#, fuzzy
+msgid "Antarctica/Casey"
+msgstr "Tria autom�tica"
+
+#: calendar/zones.h:179
+#, fuzzy
+msgid "Antarctica/Davis"
+msgstr "Tria autom�tica"
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: calendar/zones.h:181
+#, fuzzy
+msgid "Antarctica/Mawson"
+msgstr "Tria autom�tica"
+
+#: calendar/zones.h:182
+#, fuzzy
+msgid "Antarctica/McMurdo"
+msgstr "Tria autom�tica"
+
+#: calendar/zones.h:183
+#, fuzzy
+msgid "Antarctica/Palmer"
+msgstr "Tria autom�tica"
+
+#: calendar/zones.h:184
+#, fuzzy
+msgid "Antarctica/South_Pole"
+msgstr "Tria autom�tica"
+
+#: calendar/zones.h:185
+#, fuzzy
+msgid "Antarctica/Syowa"
+msgstr "Tria autom�tica"
+
+#: calendar/zones.h:186
+#, fuzzy
+msgid "Antarctica/Vostok"
+msgstr "Tria autom�tica"
+
+#: 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
+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
+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
+msgid "Asia/Hong_Kong"
+msgstr ""
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+#: calendar/zones.h:216
+#, fuzzy
+msgid "Asia/Istanbul"
+msgstr "Assistent"
+
+#: 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
+msgid "Asia/Kuwait"
+msgstr ""
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr ""
+
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Muscat"
+msgstr "Assistent"
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: calendar/zones.h:235
+#, fuzzy
+msgid "Asia/Omsk"
+msgstr "_Tasca (FIXME)"
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+#, fuzzy
+msgid "Asia/Qatar"
+msgstr "despr�s de"
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:247
+msgid "Asia/Singapore"
+msgstr ""
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+msgid "Atlantic/Bermuda"
+msgstr ""
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+msgid "Atlantic/Cape_Verde"
+msgstr ""
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+msgid "Australia/Adelaide"
+msgstr ""
+
+#: calendar/zones.h:274
+msgid "Australia/Brisbane"
+msgstr ""
+
+#: calendar/zones.h:275
+msgid "Australia/Broken_Hill"
+msgstr ""
+
+#: calendar/zones.h:276
+#, fuzzy
+msgid "Australia/Darwin"
+msgstr "agost"
+
+#: calendar/zones.h:277
+#, fuzzy
+msgid "Australia/Hobart"
+msgstr "agost"
+
+#: calendar/zones.h:278
+msgid "Australia/Lindeman"
+msgstr ""
+
+#: calendar/zones.h:279
+msgid "Australia/Lord_Howe"
+msgstr ""
+
+#: calendar/zones.h:280
+msgid "Australia/Melbourne"
+msgstr ""
+
+#: calendar/zones.h:281
+#, fuzzy
+msgid "Australia/Perth"
+msgstr "agost"
+
+#: calendar/zones.h:282
+#, fuzzy
+msgid "Australia/Sydney"
+msgstr "agost"
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:284
+msgid "Europe/Andorra"
+msgstr ""
+
+#: calendar/zones.h:285
+#, fuzzy
+msgid "Europe/Athens"
+msgstr "Propietats..."
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:296
+msgid "Europe/Gibraltar"
+msgstr ""
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:304
+msgid "Europe/Luxembourg"
+msgstr ""
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr ""
+
+#: calendar/zones.h:308
+#, fuzzy
+msgid "Europe/Monaco"
+msgstr "Dilluns"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr ""
+
+#: calendar/zones.h:312
+#, fuzzy
+msgid "Europe/Paris"
+msgstr "Propietats..."
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:317
+msgid "Europe/San_Marino"
+msgstr ""
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "Colors"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+msgid "Indian/Mahe"
+msgstr ""
+
+#: calendar/zones.h:341
+msgid "Indian/Maldives"
+msgstr ""
+
+#: calendar/zones.h:342
+#, fuzzy
+msgid "Indian/Mauritius"
+msgstr "Marges"
+
+#: calendar/zones.h:343
+#, fuzzy
+msgid "Indian/Mayotte"
+msgstr "Dilluns"
+
+#: calendar/zones.h:344
+#, fuzzy
+msgid "Indian/Reunion"
+msgstr "Seccions:"
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
+#: camel/camel-cipher-context.c:169
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:211
+#: 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:251
+#: camel/camel-cipher-context.c:249
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:294
+#: camel/camel-cipher-context.c:292
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:336
+#: camel/camel-cipher-context.c:334
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
+#: camel/camel-data-cache.c:169
+#, fuzzy
+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
+#, 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
 #, c-format
 msgid ""
@@ -5957,91 +7803,72 @@ msgstr ""
 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:710 camel/camel-filter-driver.c:719
 #, fuzzy
 msgid "Syncing folders"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, 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
+#, fuzzy, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Error en desar el fitxer: %s"
+
+#: camel/camel-filter-driver.c:887
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 #, 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:688
-#, fuzzy, c-format
+#: camel/camel-filter-driver.c:911
+#, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 #, fuzzy
 msgid "Cannot open message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 #, fuzzy
 msgid "Syncing folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:921
-#, fuzzy, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Error en desar el fitxer: %s"
-
-#: camel/camel-filter-driver.c:927
-#, fuzzy, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Error en desar el fitxer: %s"
+#: camel/camel-filter-search.c:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1040
-#, 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:1080
-#, 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:1262
-#, fuzzy
-msgid "Moving messages"
-msgstr "C�pia de missatges"
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -6050,7 +7877,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -6059,19 +7886,39 @@ msgstr ""
 "Error en preparar-se per a %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 ""
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
+#: camel/camel-folder.c:1038
+#, 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
+#, 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
+#, fuzzy
+msgid "Moving messages"
+msgstr "C�pia de missatges"
+
 #: camel/camel-lock-client.c:111
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -6102,8 +7949,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
@@ -6179,120 +8026,125 @@ msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
 msgid "Please enter your %s passphrase"
 msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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:755
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:953
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:959
+#: 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:970
+#: 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:1143
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1153
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1160
+#: 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:1169
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1352
+#: 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-provider.c:130
+#: camel/camel-pgp-mime.c:354
+msgid "This is a digitally signed message part"
+msgstr ""
+
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "No s'ha pogut carregar %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 ""
 "No s'ha pogut carregar %s: el m�dul no cont� cap codi d'inicialitzaci�."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "Servidor %s %s"
 
-#: camel/camel-remote-store.c:207
+#: 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:264
+#: 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:267
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(ordinador central desconegut)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/camel-remote-store.c:484
+#: 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"
@@ -6348,8 +8200,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"
@@ -6398,8 +8250,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
@@ -6409,14 +8261,15 @@ msgid ""
 msgstr "No s'ha pogut crear el conducte: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
-msgstr ""
+#, fuzzy
+msgid "Login"
+msgstr "Agrupament"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 #, fuzzy
@@ -6430,9 +8283,22 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Autenticaci�:"
 
+#: 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 ""
+"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:301
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: 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"
 
@@ -6477,26 +8343,39 @@ msgstr "L'URL '%s' necessita un component d'ordinador central"
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de cam�"
 
-#: camel/camel-service.c:611
+#: camel/camel-service.c:617
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "S'est� comprovant \"%s\""
 
-#: camel/camel-service.c:638
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:663
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:665
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "S'est� comprovant \"%s\""
+
+#: camel/camel-service.c:787
+msgid "Host lookup failed: host not found"
+msgstr ""
+
+#: camel/camel-service.c:790
+msgid "Host lookup failed: unknown reason"
+msgstr ""
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Prove�dor de correu de la carpeta virtual"
@@ -6505,12 +8384,12 @@ msgstr "Prove�dor de correu de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per llegir correu com a consulta d'un altre joc de carpetes"
 
-#: 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 "No hi ha cap prove�dor disponible per al protocol `%s'"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6557,25 +8436,24 @@ msgstr "Missatge de _correu (FIXME)"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
 msgstr "Assumpte"
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:428
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6585,16 +8463,34 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: 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:491
 #, 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"
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
 msgstr ""
 
 #: camel/camel-url.c:288
@@ -6609,27 +8505,27 @@ msgstr ""
 msgid "No such message %s in %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No es pot bifurcar %s: %s"
@@ -6641,82 +8537,82 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: camel/providers/imap/camel-imap-command.c:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 #, 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:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, 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:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, 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:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, 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:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, 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:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "S'estan desant els canvis al missatge..."
 
-#: camel/providers/imap/camel-imap-folder.c:1566
-#: camel/providers/imap/camel-imap-folder.c:1978
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 #, 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:1717
-#: camel/providers/imap/camel-imap-folder.c:1798
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1723
+#: camel/providers/imap/camel-imap-folder.c:1799
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "C�pia de missatges"
 
-#: camel/providers/imap/camel-imap-folder.c:2015
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, fuzzy, c-format
 msgid "Could not open cache directory: %s"
 msgstr "No s'ha pogut crear el directori %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: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 "Missatge de _correu (FIXME)"
@@ -6731,7 +8627,7 @@ msgstr "Comprova si hi ha nou correu"
 msgid "Check for new messages in all folders"
 msgstr "Comprova si hi ha nou correu"
 
-#: 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 "Carpetes"
 
@@ -6768,30 +8664,30 @@ msgstr ""
 "Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya de "
 "text net."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autenticaci�:"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6802,109 +8698,128 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "Directoris de correu en format MH d'UNIX"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 #, 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:52
+#: camel/providers/local/camel-local-provider.c:64
 #, fuzzy
 msgid "Local delivery"
 msgstr "Carpetes virtuals"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 #, 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:62
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "Directoris de correu en format MH d'UNIX"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 #, 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:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, 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
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "`%s' no �s un fitxer habitual."
 
-#: camel/providers/local/camel-local-store.c: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
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No es pot bifurcar %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 ""
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %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:863
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:374
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:389
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, 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:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -6925,7 +8840,7 @@ msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6937,7 +8852,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 #, fuzzy
 msgid "No such message"
 msgstr "L'ordinador central %s no existeix."
@@ -6947,7 +8862,7 @@ msgstr "L'ordinador central %s no existeix."
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -6957,14 +8872,14 @@ msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -6974,44 +8889,68 @@ msgstr ""
 "No s'ha pogut crear la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:131
+#: camel/providers/local/camel-maildir-store.c:132
 #, fuzzy, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' no �s un directori."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 #, fuzzy
 msgid "not a maildir directory"
 msgstr "Directori de correu local %s"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 "No s'ha pogut crear la carpeta `%s':\n"
 "%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
 #, fuzzy, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Comprova si hi ha nou correu"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+#, fuzzy
+msgid "Storing folder"
+msgstr "S'est� sincronitzant \"%s\""
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
@@ -7029,9 +8968,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -7041,16 +8980,16 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: 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"
@@ -7059,7 +8998,7 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%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"
@@ -7068,14 +9007,14 @@ msgstr ""
 "No s'ha pogut crear el fitxer `%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' no �s un fitxer habitual."
 
-#: 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"
@@ -7084,102 +9023,90 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%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 "La carpeta `%s' no �s buida. No s'ha suprimit."
 
-#. 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 "S'est� sincronitzant \"%s\""
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, 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:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "No es pot bifurcar %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, 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:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, 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: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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "No s'ha pogut tancar la carpeta font %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, 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:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, 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:873
-#: camel/providers/local/camel-spool-summary.c:544
-#: camel/providers/local/camel-spool-summary.c:1110
+#: camel/providers/local/camel-mbox-summary.c:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
@@ -7199,12 +9126,12 @@ msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' no �s un directori."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, 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:512
+#: camel/providers/local/camel-spool-folder.c:515
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
@@ -7215,6 +9142,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' no �s un fitxer habitual."
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
@@ -7224,78 +9152,57 @@ msgstr "La carpeta `%s' no existeix."
 msgid "Spool mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 #, fuzzy
 msgid "Spool folders cannot be renamed"
 msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 #, fuzzy
 msgid "Spool folders cannot be deleted"
 msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: 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/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "El servidor ha rebutjat el nom d'usuari"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "El servidor ha rebutjat el nom d'usuari/la contrasenya"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "No s'ha trobat el missatge %s."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "No s'ha pogut aconseguir la llista de grups del servidor"
+#: 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/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 "No es pot carregar el fitxer de llista de grups per a %s: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
+#: 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"
@@ -7305,17 +9212,12 @@ 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:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "No s'ha pogut obrir el directori per al servidor de not�cies: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "Not�cies d'USENET mitjan�ant %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -7323,76 +9225,117 @@ msgstr ""
 "Aquesta opci� us autentica al servidor NNTP mitjan�ant una contrasenya en "
 "text net"
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:495
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "No es pot obrir o crear el fitxer .newsrc per a %s: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "La carpeta `%s' no existeix."
+
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "No s'ha pogut crear el conducte: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "L'ordre IMAP ha fallat: %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 "C�pia de missatges"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "Error desconegut: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:566
 #, fuzzy
-msgid "Retrieving POP summary"
-msgstr "S'estan recuperant els missatges : %s"
+msgid "Use cancel"
+msgstr "Cancel�lat"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, fuzzy, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "No s'ha pogut connectar al servidor POP en %s."
+msgid "Operation failed: %s"
+msgstr "Obre l'agenda"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
+#: camel/providers/pop3/camel-pop3-folder.c:272
+#, fuzzy
+msgid "Retrieving POP summary"
+msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: 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 "Expunging deleted messages"
-msgstr "Imprimeix el missatge seleccionat"
+msgid "User cancelled"
+msgstr "Obre l'agenda"
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, fuzzy, c-format
-msgid "Could not fetch message: %s"
-msgstr "No s'ha pogut enviar el missatge: %s"
+msgid "Cannot get POP summary: %s"
+msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
+#: camel/providers/pop3/camel-pop3-folder.c:325
+#, fuzzy
+msgid "Expunging deleted messages"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: 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 "No hi ha cap missatge amb l'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
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: 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 ""
+"No es pot recuperar el missatge: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Error desconegut"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 #, fuzzy
 msgid "Message storage"
 msgstr "Cos del missatge"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 #, fuzzy
 msgid "Leave messages on server"
 msgstr "No suprimeixis els missatges del servidor"
 
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:43
 #, fuzzy, c-format
 msgid "Delete after %s day(s)"
 msgstr "Suprimeix la tasca"
 
-#: 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:84
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52
+#: camel/providers/pop3/camel-pop3-provider.c:54
 #, fuzzy
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
-#: 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."
@@ -7400,7 +9343,7 @@ msgstr ""
 "Aquesta opci� us connectar� al sevidor POP mitjan�ant una contrasenya en "
 "text net. �s l'�nica suportada per molts servidors POP."
 
-#: camel/providers/pop3/camel-pop3-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 "
@@ -7410,48 +9353,32 @@ 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-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per autenticar-"
-"vos-hi."
-
-#: camel/providers/pop3/camel-pop3-store.c:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "No se us ha pogut autenticar al servidor KPOP: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
 #, fuzzy, c-format
-msgid "Could not connect to server: %s"
-msgstr "No s'ha pogut connectar al servidor POP en %s."
-
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, 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:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sSi us plau, introdu�u la contrasenya POP3 per a %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:378
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
+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:381
-#: camel/providers/pop3/camel-pop3-store.c:418
-msgid "(Unknown)"
-msgstr "(Desconegut)"
+#: 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
+#, 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:408
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -7459,7 +9386,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
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "L'ordre IMAP ha fallat: %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "Error d'E/S"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7468,18 +9415,13 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar la contrasenya: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/pop3/camel-pop3-store.c:566
-#, fuzzy, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "Resposta inesperada del servidor IMAP: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7491,51 +9433,53 @@ msgstr ""
 "Per lliurar correu transferint-lo al programa \"sendmail\" en el sistema "
 "local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr ""
+"No s'ha pogut obrir el fitxer `%s':\n"
+"%s"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
 
-#: 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 "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
 
-#: 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 "No s'ha pogut enviar el missatge: %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 "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
 
-#: 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 "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: 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 "El sendmail ha acabat amb l'estat %d: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-#, fuzzy
-msgid "Could not find 'From' address in message"
-msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c: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 "Lliurament de correu mitjan�ant el programa 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 ""
 
@@ -7546,132 +9490,154 @@ msgstr ""
 "Per al lliurament de correu mitjan�ant la connexi� a un concentrador de "
 "correu utilitzant SMTP."
 
-#: 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:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: 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:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 #, fuzzy
 msgid "Help message"
 msgstr "Mou el missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 #, fuzzy
 msgid "Service ready"
 msgstr "Amaga"
 
-#: 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:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: 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: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: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:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: 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: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: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: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: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:205
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: 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:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "No s'ha indicat cap contrasenya."
 
-#: 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:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 #, fuzzy
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:222
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:224
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:376
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+msgid "server does not appear to support SSL"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, 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
+#, fuzzy
+msgid "STARTTLS response error"
+msgstr "Error desconegut: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:458
 #, fuzzy, c-format
 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:415
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7682,133 +9648,137 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, 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:581
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 #, fuzzy
 msgid "Sending message"
 msgstr "Envia aquest missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+#, 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
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, 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:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 #, 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:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:893
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1081
+#, fuzzy
+msgid "MAIL FROM response error"
+msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:937
-#, fuzzy, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
+#: camel/providers/smtp/camel-smtp-transport.c:1121
+#, c-format
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, fuzzy, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
+#. 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
+#, fuzzy
+msgid "DATA response error"
+msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1030
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, fuzzy, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "Error desconegut: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -7835,19 +9805,19 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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 "adjunci�"
 
-#: 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 "Elimina els elements seleccionats de la llista d'adjuncions"
 
-#: composer/e-msg-composer-attachment-bar.c:531
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "Afegeix una adjunci�..."
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
@@ -7875,25 +9845,25 @@ msgid "MIME type:"
 msgstr "Tipus de 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:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Respon"
@@ -7901,31 +9871,31 @@ msgstr "Respon"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Introdu�u els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:397
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7933,12 +9903,12 @@ msgstr ""
 "introdu�u les adreces que rebran una c�pia del missatge sense apar�ixer a la "
 "llista de destinataris del missatge."
 
-#: composer/e-msg-composer-select-file.c:228
+#: composer/e-msg-composer-select-file.c:267
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:718
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7947,73 +9917,63 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:894
-msgid "Save as..."
-msgstr "Anomena i desa..."
-
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:967
 #, fuzzy
 msgid "Warning!"
 msgstr "S'est� movent"
 
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1019
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1077
+#: composer/e-msg-composer.c:1051
 #, 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:1084
+#: composer/e-msg-composer.c:1058
 #, 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:1091
+#: composer/e-msg-composer.c:1065
 #, 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:1100
+#: composer/e-msg-composer.c:1074
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1202
+#: composer/e-msg-composer.c:1176
 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:1356
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -8023,57 +9983,58 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:1363
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Reenvia el missatge"
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:1535
+#: composer/e-msg-composer.c:1513
 #, fuzzy
 msgid "Insert File"
 msgstr "FIXME: Insereix el fitxer..."
 
-#: composer/e-msg-composer.c:1910 composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:2368
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2391 composer/e-msg-composer.c:2446
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 #, 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/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."
 msgstr ""
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: 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:1
 #, fuzzy
 msgid "The Evolution groupware suite"
 msgstr "Barra de _dreceres de l'Evolution"
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Evolution"
+
 #: data/evolution.keys.in.h:1
 #, fuzzy
 msgid "address card"
@@ -8119,15 +10080,33 @@ 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
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Ja existeix una fitxer amb aquest nom.\n"
+"El voleu sobreescriure?"
+
 #. Remember the password?
-#: e-util/e-passwords.c:347 mail/mail-session.c:267
+#: 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:268
+#: 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 ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "categories"
+
 #. 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
@@ -8211,13 +10190,13 @@ msgstr "%H:%M:%S%n"
 #. 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"
 
 #. 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"
 
@@ -8259,11 +10238,7 @@ msgstr "hora"
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "segon"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "segons"
 
@@ -8340,7 +10315,7 @@ msgstr "fa"
 msgid "ago"
 msgstr "fa"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
@@ -8354,33 +10329,25 @@ msgid "Filter Rules"
 msgstr "Regles del filtre"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "Aleshores"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Afegeix una acci�"
 
-#: 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."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:364
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: filter/filter-folder.c:267
-msgid "Enter folder URI"
-msgstr "Introdu�u l'URI de la carpeta"
-
-#: filter/filter-folder.c:314
-msgid "<click here to select a folder>"
-msgstr "<feu clic aqu� per seleccionar una carpeta>"
-
 #: filter/filter-input.c:198
 #, fuzzy, c-format
 msgid ""
@@ -8390,7 +10357,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Comprova"
 
@@ -8398,42 +10365,43 @@ msgstr "Comprova"
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Nom de la regla: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Sense t�tol"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "Executa les accions"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "si es compleixen tots els criteris"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "si es compleix qualsevol criteri"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Afegeix un criteri"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 #, fuzzy
 msgid "incoming"
 msgstr ""
 "Entrant\n"
 "Sortint\n"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 #, fuzzy
 msgid "outgoing"
 msgstr "Agrupament"
@@ -8484,6 +10452,12 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Crea una carpeta nova"
 
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Assigna una puntuaci�"
+
 #: filter/libfilter-i18n.h:3
 #, fuzzy
 msgid "Assign Color"
@@ -8498,6 +10472,11 @@ msgstr "Assigna una puntuaci�"
 msgid "Attachments"
 msgstr "adjunci�"
 
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Mida"
+
 #: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "cont�"
@@ -8555,153 +10534,162 @@ msgid "ends with"
 msgstr "acaba amb"
 
 #: filter/libfilter-i18n.h:21
+msgid "Execute Shell Command"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
 #, fuzzy
 msgid "Exist"
 msgstr "S_urt"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "existeix"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expressi�"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "�s"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "ha estat despr�s de"
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "ha estat abans de"
+
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "�s m�s gran que"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "�s m�s petit que"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "no �s"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "no �s"
+
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "Mailing list"
 msgstr "Llista de correu %s"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Message Header"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr "S'ha rebut el missatge"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message was sent"
-msgstr "S'ha enviat el missatge"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "el o despr�s del"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "el o abans del"
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "Final del dia:"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Read"
 msgstr "R�dio"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "Replied to"
 msgstr "Respon a tots"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Puntuaci�"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1404
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Remitent"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 #, fuzzy
 msgid "Set Status"
 msgstr "Estat de la connexi�"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Mida"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 #, fuzzy
 msgid "Source Account"
 msgstr "cont�"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Especifiqueu la cap�alera"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "comen�a per"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Assumpte"
 
-#: filter/libfilter-i18n.h:52
-msgid "was after"
-msgstr "ha estat despr�s de"
-
-#: filter/libfilter-i18n.h:53
-msgid "was before"
-msgstr "ha estat abans de"
-
 #: filter/rule-editor.c:179
 #, fuzzy
 msgid "Rules"
 msgstr "M�bil"
 
-#: filter/rule-editor.c:278
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Afegeix una regla"
 
-#: filter/rule-editor.c:344
+#: filter/rule-editor.c:361
 #, fuzzy
 msgid "Edit Rule"
 msgstr "Filtres d'edici�"
@@ -8724,32 +10712,32 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "Importing..."
 msgstr "S'est� movent"
 
-#: 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
 #, fuzzy
 msgid "Please wait"
 msgstr "acaba amb"
 
-#: 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
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr "S'est� movent"
 
-#: 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
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "S'est� examinant %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:101
 #, fuzzy
 msgid "Mail"
 msgstr "_Correu"
@@ -8775,26 +10763,78 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "_Prioritat:"
+
+#: 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 ""
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+#, fuzzy
+msgid "Trash"
+msgstr "Tasca"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Fitxer de correu local %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 #, fuzzy
 msgid "Starting import"
 msgstr "Data d'_inici:"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 #, fuzzy
 msgid "Settings"
 msgstr "_Par�metres"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Filtres d'edici�"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8816,56 +10856,108 @@ msgid "Pine"
 msgstr "Imprimeix"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Prefer�ncies de l'agenda"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 #, fuzzy
 msgid "Evolution mail composer."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 #, fuzzy
 msgid "Evolution mail executive summary component."
 msgstr ""
 "No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 #, fuzzy
 msgid "Evolution mail folder display component."
 msgstr ""
 "No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 #, fuzzy
 msgid "Evolution mail folder factory component."
 msgstr ""
 "No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the Evolution composer."
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the Mail Summary component."
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Prefer�ncies"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "cont�"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Prefer�ncies"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 #, fuzzy
 msgid "Mail configuration interface"
 msgstr "Configuraci� del correu"
 
-#: mail/component-factory.c:100
+#: 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:101
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr ""
-
 #: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
@@ -8876,258 +10968,273 @@ msgstr "Carpetes virtuals"
 msgid "Virtual Trash folder"
 msgstr "Carpetes virtuals"
 
-#: mail/component-factory.c:129
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "No s'ha pogut connectar al servidor POP en %s."
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 #, fuzzy
 msgid "Properties..."
 msgstr "Propietats..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Propietats de la llista de coses per fer"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:925
+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
 #, fuzzy
 msgid "New Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 #, fuzzy
-msgid "New _Mail Message"
+msgid "_Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 #, 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:990
+#: mail/component-factory.c:1009
 #, 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:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Connexi� de prova a \"%s\""
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: mail/folder-browser-ui.c:271
+#: mail/folder-browser-ui.c:342
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propietats..."
 
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:344
 #, fuzzy
 msgid "Properties"
 msgstr "Propietats..."
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Suprimeix"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " segons"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr " segons"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1049
+#: mail/folder-browser.c:1088
 #, fuzzy
-msgid "Create vFolder from Search"
+msgid "Create _Virtual Folder From Search..."
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "VFolder sobre el remite_nt"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "VFolder sobre els destinata_ris"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "_Anomena i desa..."
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:104
-#, fuzzy
-msgid "_Save As..."
-msgstr "Anomena i desa..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "% comp_let:"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Agenda"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1629
 #, fuzzy
-msgid "Mark as U_nread"
+msgid "Mark as _Unread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1462
+#: mail/folder-browser.c:1631
 #, fuzzy
-msgid "Mark as Unim_portant"
+msgid "_Mark as Unimportant"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1466
+#: mail/folder-browser.c:1636
 #, fuzzy
-msgid "_Move to Folder..."
-msgstr "_Mou a la carpeta"
+msgid "U_ndelete"
+msgstr "_Suprimeix"
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
+msgstr "Mou a la carpeta"
+
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta"
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1645
 #, fuzzy
-msgid "_Undelete"
-msgstr "_Suprimeix"
+msgid "Label"
+msgstr "etiqueta9"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1649
 #, fuzzy
-msgid "Add Sender to Address Book"
+msgid "Add Sender to Address_book"
 msgstr "Desa a la llibreta d'adreces"
 
-#: mail/folder-browser.c:1476
+#: mail/folder-browser.c:1653
 #, fuzzy
-msgid "Apply Filters"
+msgid "Appl_y Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:1478
+#: mail/folder-browser.c:1657
 #, fuzzy
-msgid "Create Ru_le From Message"
+msgid "Crea_te Rule From Message"
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
-msgstr "Filtre sobre la llista de correu"
-
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1936
 #, fuzzy
-msgid "VFolder on Mailing List"
+msgid "VFolder on M_ailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.c:1632
+#: mail/folder-browser.c:1939
 #, fuzzy, c-format
-msgid "VFolder on Mailing List (%s)"
+msgid "VFolder on M_ailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.h:26
-#, fuzzy
-msgid "Default"
-msgstr "Valors predeterminats"
-
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -9152,46 +11259,36 @@ msgstr ""
 
 #: mail/local-config.glade.h:1
 #, fuzzy
-msgid "Body contents"
-msgstr "El cos cont�"
-
-#: mail/local-config.glade.h:2
-#, fuzzy
 msgid "Current store format:"
 msgstr "No s'ha pogut iniciar el wombat"
 
-#: mail/local-config.glade.h:3
-#, fuzzy
-msgid "Indexing:"
-msgstr "_�ndex"
-
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:2
 #, fuzzy
-msgid "Mailbox Format"
-msgstr "Format"
+msgid "Index body contents"
+msgstr "El cos cont�"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 #, fuzzy
 msgid "New store format:"
 msgstr "Tipus de font de not�cies:"
 
-#: 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"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 #, fuzzy
 msgid "maildir"
 msgstr "Adre�a electr�nica 2"
 
-#: 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:9
 #, fuzzy
 msgid "mh"
 msgstr "h"
@@ -9212,101 +11309,89 @@ msgstr "Conducte de les coses per fer de l'Evolution"
 msgid "Evolution Account Editor"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-account-gui.c:962
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
 #, fuzzy
-msgid "Could not save signature file."
-msgstr ""
-"No s'ha pogut obrir el fitxer de signatura %s:\n"
-"%s"
+msgid "_Host:"
+msgstr "Hores"
 
-#: mail/mail-account-gui.c:1039
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
 #, fuzzy
-msgid "Save signature"
-msgstr "Fitxer de signatura:"
+msgid "User_name:"
+msgstr "Nom d'usuari:"
 
-#: mail/mail-account-gui.c:1045
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
 #, fuzzy
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Aquest missatge no s'ha enviat.\n"
-"\n"
-"Voleu desar-ne els canvis?"
-
-#: mail/mail-account-gui.c:1654
-msgid "You may not create two accounts with the same name."
-msgstr ""
+msgid "_Path:"
+msgstr "Cam�:"
 
-#: mail/mail-accounts.c:149
+#: 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 " (default)"
-msgstr "Valors predeterminats"
+msgid "Random"
+msgstr "R�dio"
 
-#: mail/mail-accounts.c:194
-#, fuzzy
-msgid "Disable"
-msgstr "Inhabilitat"
+#: 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-accounts.c:196
-msgid "Enable"
+#: mail/mail-account-gui.c:1985
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:216
 #, fuzzy
 msgid "Don't delete"
 msgstr "Suprimeix"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#, fuzzy
+msgid "Disable"
+msgstr "Inhabilitat"
+
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:783 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
 #, fuzzy
-msgid "Mail Settings"
-msgstr "_Par�metres"
-
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Correu per a %s"
-
-#: mail/mail-autofilter.c:215
-#, fuzzy, c-format
-msgid "Subject is %s"
-msgstr "Assumpte"
+msgid "Enabled"
+msgstr "Inhabilitat"
 
-#: mail/mail-autofilter.c:231
-#, c-format
-msgid "Mail from %s"
-msgstr "Correu de %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "cont�"
 
-#: mail/mail-autofilter.c:287
-#, c-format
-msgid "%s mailing list"
-msgstr "Llista de correu %s"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+msgid "Protocol"
+msgstr ""
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -9318,7 +11403,7 @@ msgstr ""
 "rebre o redactar correu.\n"
 "El voleu configurar ara?"
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -9326,7 +11411,7 @@ msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -9334,23 +11419,19 @@ msgstr ""
 "Cal que configureu un transport de correu\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:230
-msgid "You have not set a mail transport method"
-msgstr "No heu definit cap m�tode de transport de correu"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:265
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:280
+#: mail/mail-callbacks.c:209
 #, fuzzy
 msgid "Send anyway?"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -9358,64 +11439,66 @@ msgstr ""
 "Aquest missatge no t� cap assumpte.\n"
 "Voleu que l'envi� igualment?"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 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:299
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 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:469
-msgid "This message contains invalid recipients:"
-msgstr ""
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 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:600
+#: mail/mail-callbacks.c:497
 #, 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:838
+#: mail/mail-callbacks.c:623
+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
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Error desconegut"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:1283 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:1753
+#: mail/mail-callbacks.c:2091
 #, 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:1778
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -9423,7 +11506,7 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:2155
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -9432,34 +11515,44 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:1831
+#: mail/mail-callbacks.c:2169
 #, 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:1857
+#: mail/mail-callbacks.c:2195
 #, fuzzy
 msgid "No Message Selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/mail-callbacks.c:1951
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Voleu sobreescriure el fitxer?"
+
+#: mail/mail-callbacks.c:2294
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2296
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:2122 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2366
 #, fuzzy
-msgid "Warning"
-msgstr "S'est� movent"
+msgid "Go to next folder with unread messages?"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: mail/mail-callbacks.c:2129
+#: mail/mail-callbacks.c:2373
+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
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -9467,12 +11560,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2136
-#, fuzzy
-msgid "Do not ask me again."
-msgstr "Envia aquest missatge"
-
-#: mail/mail-callbacks.c:2244
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -9481,20 +11569,29 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2256
+#: mail/mail-callbacks.c:2740
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtres de correu ..."
 
-#: mail/mail-callbacks.c:2319
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "S'est� escrivint el missatge %d de %d"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2863
+msgid "US-Letter"
+msgstr ""
+
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -9538,17 +11635,35 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-config.c:326
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "cont�"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "S'est� movent"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Per a"
+
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "despr�s de"
 
-#: mail/mail-config.c:1859
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -9556,100 +11671,159 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, c-format
-msgid "%s: Inbox"
-msgstr ""
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2183 mail/mail-config.c:2187
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 #, 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:2
+#: mail/mail-config.glade.h:5
 #, fuzzy
-msgid " color"
-msgstr "Colors"
+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:3
+#: mail/mail-config.glade.h:6
 #, 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:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:8
 #, fuzzy
-msgid "Account"
+msgid "Account Editor"
 msgstr "cont�"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Accounts"
-msgstr "cont�"
+msgid "Advanced Options"
+msgstr "Cancel�lat"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: 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:10
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Adjunta un fitxer al missatge"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "adjunci�"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Authentication"
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "Comprova si hi ha nou correu"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Error desconegut: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "Tanca"
+
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:29
 #, fuzzy
-msgid "Composer"
-msgstr "Redacta"
+msgid "Composing Messages"
+msgstr "Redacta un missatge"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:16
-#, fuzzy
-msgid "Confirm when Expunging a folder"
-msgstr "S'est� esborrant \"%s\""
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -9662,411 +11836,605 @@ msgstr ""
 "Ja teniu enllestida la configuraci� del correu.\n"
 "Feu clic a \"Finalitza\" per desar els nous par�metres"
 
-#: mail/mail-config.glade.h:23
+#: 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:24
-msgid "Default Forward style is: "
-msgstr ""
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Sendmail"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid "Display"
-msgstr "_Visualitzaci�"
+msgid "Do not quote original message"
+msgstr "No es pot recuperar el missatge: %s"
 
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Done"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
+#: mail/mail-config.glade.h:46
 #, fuzzy
-msgid "Drafts"
-msgstr "Data de venciment"
+msgid "Drafts _folder:"
+msgstr "Creaci� d'una nova carpeta"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "E_nable"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Edita..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:49
 #, fuzzy
-msgid "Enabled"
-msgstr "Inhabilitat"
+msgid "Emacs"
+msgstr "�ltim"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "cont�"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "Adre�a electr�nica:"
+
+#: mail/mail-config.glade.h:52
+msgid "Empty _trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "Executa les accions"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "acaba amb"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Propietats de l'adjunci�"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Missatge reenviat - %s"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "HTML signature file:"
-msgstr "Fitxer de signatura:"
+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:36
+#: mail/mail-config.glade.h:60
 #, fuzzy
 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 "Identitat"
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Inline"
 msgstr "Visualitza en l�nia"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Desa i tanca"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Missatge reenviat - %s"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Format"
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
-msgstr ""
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Cos del missatge"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "Esborra la visualitzaci� del missatge"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "�s"
+
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:77
 #, fuzzy
-msgid "News"
-msgstr "Nou"
+msgid "New Mail Notification"
+msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Edita el servidor de not�cies"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Optional Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organitzaci�:"
+
+#: mail/mail-config.glade.h:83
+msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Agafa un color"
 
-#: mail/mail-config.glade.h:54
-msgid "Pretty Good Privacy"
-msgstr ""
-
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:88
 #, fuzzy
-msgid "Prompt when sending HTML messages to contacts that don't want them"
+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:56
-#, fuzzy
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "S'est� afegint un missatge sense cap assumpte"
+#: mail/mail-config.glade.h:89
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:90
 #, fuzzy
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "S'est� afegint un missatge sense cap assumpte"
+msgid "Printed Fonts"
+msgstr "Imprimeix els contactes"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Adre�a electr�nica 2"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "No es pot recuperar el missatge: %s"
+
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quoted"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Desa com a VCard"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 #, fuzzy
-msgid "Receiving Email"
-msgstr "Sendmail"
+msgid "Re_ply-To:"
+msgstr "Respon"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 #, fuzzy
-msgid "Receiving Mail"
+msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:99
 #, fuzzy
-msgid "Receiving Options"
+msgid "Receiving _Options"
 msgstr "Data de recepci�"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Desa com a VCard"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Required Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:103
+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"
+msgid "Secure MIME (S/MIME)"
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:67
-msgid "Security"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-#, fuzzy
-msgid "Select Filter Log file..."
-msgstr "Fitxer de signatura:"
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110
 #, fuzzy
-msgid "Sending Email"
-msgstr "Sendmail"
+msgid "Select PGP program"
+msgstr "Seleccioneu els noms"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:111
 #, fuzzy
-msgid "Sending Mail"
-msgstr "Sendmail"
+msgid "Select a signature file"
+msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
+#: mail/mail-config.glade.h:112
 #, fuzzy
-msgid "Sent"
-msgstr "Vist"
+msgid "Select a signature script"
+msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#, fuzzy
+msgid "Sending Email"
+msgstr "Sendmail"
+
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Agenda"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Mostra la barra de _dreceres"
+
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Font"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "Source Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "Fonts"
-
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:124
 #, fuzzy
-msgid "Special Folders"
-msgstr "Carpetes virtuals"
+msgid "Specify _filename:"
+msgstr "Nom de l'estil:"
+
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
-msgid "Use s_ecure connection (SSL)"
+#: mail/mail-config.glade.h:128
+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:87
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Inhabilitat"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "�ltim"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "Autenticaci�:"
+
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
 #, fuzzy
-msgid "_Drafts folder:"
-msgstr "Creaci� d'una nova carpeta"
+msgid "_Confirm when expunging a folder"
+msgstr "S'est� esborrant \"%s\""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:149
 #, fuzzy
-msgid "_Email Address:"
-msgstr "Adre�a electr�nica:"
+msgid "_Defaults"
+msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
+#: mail/mail-config.glade.h:151
+msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:153
+msgid "_Enable spell checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:154
+#, fuzzy
+msgid "_Filename:"
+msgstr "Nom del fitxer:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
 #, fuzzy
-msgid "_Full Name:"
+msgid "_Forward style:"
+msgstr "Reenvia"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "Nom complet:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:159
+#, 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:103
+#: mail/mail-config.glade.h:162
 #, fuzzy
-msgid "_Highlight citations with"
-msgstr "Ressalta els elemts que vencen avui"
+msgid "_Identity"
+msgstr "Identitat"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:163
 #, fuzzy
-msgid "_Host:"
-msgstr "Hores"
+msgid "_Language:"
+msgstr "Busca"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
+#: mail/mail-config.glade.h:165
+msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:166
 #, fuzzy
-msgid "_Mark messages as Read after"
+msgid "_Mark messages as read after"
 msgstr "Marca el missatge com a vist [ms]: "
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Name:"
 msgstr "Nom:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:169
+msgid "_PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:172
 #, fuzzy
-msgid "_Organization:"
-msgstr "Organitzaci�:"
+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:111
-msgid "_PGP binary path:"
+#: mail/mail-config.glade.h:173
+#, 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"
+msgstr "Sendmail"
+
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Respon a tots"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:178
 #, fuzzy
-msgid "_Path:"
-msgstr "Cam�:"
+msgid "_Script:"
+msgstr "Descripci�:"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:180
 #, fuzzy
-msgid "_Remember this password"
-msgstr "Desa com a VCard"
+msgid "_Sending Mail"
+msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:181
 #, fuzzy
-msgid "_Send mail in HTML format by default."
-msgstr "Envia els missatges en format HTML"
+msgid "_Show animated images"
+msgstr "Mostra"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:182
 #, fuzzy
-msgid "_Server Type: "
-msgstr "Servidor:"
+msgid "_Signatures"
+msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Signature file:"
+msgid "_Text Signature:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:184
+msgid "_Use secure connection (SSL):"
+msgstr ""
+
+#: mail/mail-config.glade.h:185
 #, fuzzy
-msgid "_Username:"
-msgstr "Nom d'usuari:"
+msgid "_Variable-width:"
+msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "_every"
 msgstr "Cada"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr "Colors"
+
+#: mail/mail-config.glade.h:188
 #, fuzzy
 msgid "description"
 msgstr "Descripci�:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 #, fuzzy
 msgid "newswindow1"
 msgstr "finestra1"
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr ""
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr "segons."
-
 #: mail/mail-crypto.c:59
 #, fuzzy
 msgid "Could not create a PGP signature context."
@@ -10112,158 +12480,150 @@ msgstr "No s'ha pogut crear el quadre de di�leg."
 msgid "Could not create a S/MIME decode context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Desa al disc..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Visualitza en l�nia"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualitza en l�nia (mitjan�ant %s)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Amaga"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Visualitzador extern"
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1265
 #, fuzzy
 msgid "Loading message content"
 msgstr "S'estan reenviant els missatges \"%s\""
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1832
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Obre'l en una nova finestra"
 
-#: mail/mail-display.c:1594
+#: mail/mail-display.c:1833
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Contacte (FIXME)"
 
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1835
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Tasca (FIXME)"
 
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1837
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunci�"
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 #, 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:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Date"
 msgstr "Data de venciment"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adre�a electr�nica:"
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 #, fuzzy
 msgid "Reply-To"
 msgstr "Respon"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Per a"
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1813
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-
-#: mail/mail-format.c:1836
+#: mail/mail-format.c:915
 #, fuzzy
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: mail/mail-format.c:1844
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1852
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
+msgid "Mailer"
+msgstr "_Correu"
 
-#: mail/mail-format.c:2068
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2087
+#: mail/mail-format.c:2125
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2154
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2129
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -10272,29 +12632,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:763
+#: mail/mail-local.c:762
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, 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:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'est� convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -10302,11 +12662,11 @@ msgstr ""
 "Si ja no podeu obrir aquesta b�stia de correu\n"
 "potser us caldr� reparar-la manualment."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "_Configura la carpeta"
@@ -10334,166 +12694,165 @@ msgstr ""
 msgid "Working"
 msgstr "S'est� movent"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Fi_ltre sobre el remitent"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Sendmail"
 
-#: 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:557
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'est� enviant \"%s\""
 
-#: mail/mail-ops.c:677
+#: mail/mail-ops.c:723
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: mail/mail-ops.c:696
+#: mail/mail-ops.c:742
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "S'est� marcant el missatge %d de %d"
 
-#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 #, fuzzy
 msgid "Complete."
 msgstr "% comp_let:"
 
-#: mail/mail-ops.c:791
+#: mail/mail-ops.c:837
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "S'est� movent"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "S'est� copiant"
 
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
-#, fuzzy
-msgid "Trash"
-msgstr "Tasca"
-
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1240
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1283
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1355
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1424
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1518
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1569
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1605
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'est� esborrant \"%s\""
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1654
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1721
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1807
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1919
 #, 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:1901
+#: mail/mail-ops.c:1947
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:2021
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2037
 #, 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:2022
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2137
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2138
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Search"
 msgstr "Cerca"
@@ -10542,72 +12901,100 @@ msgstr "Cam�:"
 msgid "Cancelling..."
 msgstr "Cancel�lat"
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:246
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor:"
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tipus:"
 
-#: mail/mail-send-recv.c:286
+#: mail/mail-send-recv.c:287
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:289
 #, fuzzy
 msgid "Cancel All"
 msgstr "Cancel�lat"
 
-#: mail/mail-send-recv.c:348
+#: mail/mail-send-recv.c:349
 #, fuzzy
 msgid "Updating..."
 msgstr "_Par�metres"
 
-#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
+#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
 #, fuzzy
 msgid "Waiting..."
 msgstr "_Par�metres"
 
-#: mail/mail-send-recv.c:533
+#: mail/mail-send-recv.c:534
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancel�lat"
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 #, fuzzy
 msgid "User canceled operation."
 msgstr "Consulta cancel�lada per l'usuari."
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 #, fuzzy
 msgid "Enter Password"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: mail/mail-tools.c:255
+#: mail/mail-signature-editor.c:79
+#, 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
+#, fuzzy
+msgid "Save signature"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-signature-editor.c:178
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Aquest missatge no s'ha enviat.\n"
+"\n"
+"Voleu desar-ne els canvis?"
+
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:261
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:399
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Reenvia el missatge"
@@ -10631,117 +13018,177 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "VFolders"
+#: mail/mail-vfolder.c:785
+#, fuzzy
+msgid "vFolders"
+msgstr "Carpetes"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:825
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Edita les VFolders"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:841
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:895
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 #, fuzzy
 msgid "(No subject)"
 msgstr "Re: (sense assumpte)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "_Missatge"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:675
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:676
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Mou el missatge"
 
-#: mail/message-list.c:647
+#: mail/message-list.c:680
 #, fuzzy
 msgid "Lowest"
 msgstr "Baixa"
 
-#: mail/message-list.c:648
+#: mail/message-list.c:681
 #, fuzzy
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:685
 #, fuzzy
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:686
 #, fuzzy
 msgid "Highest"
 msgstr "Alta"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:998
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:931
+#: mail/message-list.c:1019
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:1029
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2396
 #, fuzzy
 msgid "Generating message list"
 msgstr "C�pia de missatges"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "Data de venciment"
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "_Estat:"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr ""
 
-#: 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 "Received"
 msgstr "Data de recepci�"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Mida"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "Crida de retorn"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "V�s endavant en el temps"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Cap informaci�"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Reenvia"
+
+#: 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 "Respon"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Respon a tots"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Previsualitzaci�:"
+
+#: mail/message-tag-followup.c:315
+#, fuzzy
+msgid "Flag to Follow Up"
+msgstr "FIXME: _Assenyala per al seguiment..."
+
 #: mail/subscribe-dialog.c:219
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -10763,7 +13210,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%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
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetes"
@@ -10818,97 +13265,10831 @@ msgstr "Cancel�la la subscripci�"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 #, fuzzy
-msgid "Evolution component for the executive summary."
+msgid "Configuration control for the Evolution Summary."
 msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
+"Utilitat de configuraci� per al conducte de les coses per fer de "
+"l'Evolution.\n"
 
-#: my-evolution/component-factory.c:44
-msgid "Folder containing the Evolution Summary"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Prefer�ncies"
+
+#: 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/component-factory.c:153
+#: my-evolution/Locations.h:1
 #, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+msgid "Aarhus"
+msgstr "Alarmes"
+
+#: my-evolution/Locations.h:2
+msgid "Abakan"
+msgstr ""
+
+#: my-evolution/Locations.h:3
+msgid "Abbotsford"
+msgstr ""
+
+#: my-evolution/Locations.h:4
+#, fuzzy
+msgid "Aberdeen"
+msgstr "Tots els assistents"
+
+#: my-evolution/Locations.h:5
+msgid "Abha"
+msgstr ""
+
+#: my-evolution/Locations.h:6
+#, fuzzy
+msgid "Abilene"
+msgstr "M�bil"
+
+#: 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
+msgid "Acarigua"
+msgstr ""
+
+#: my-evolution/Locations.h:13
+msgid "Adak"
+msgstr ""
+
+#: my-evolution/Locations.h:14
+#, fuzzy
+msgid "Adana"
+msgstr "Afegeix..."
+
+#: my-evolution/Locations.h:15
+msgid "Adana/Incirlik"
+msgstr ""
+
+#: my-evolution/Locations.h:16
+msgid "Adelaide"
+msgstr ""
+
+#: my-evolution/Locations.h:17
+#, fuzzy
+msgid "Aden"
+msgstr "Vist"
+
+#: my-evolution/Locations.h:18
+msgid "Adrar"
+msgstr ""
+
+#: my-evolution/Locations.h:19
+#, fuzzy
+msgid "Aeroparque"
+msgstr "Opac"
+
+#: my-evolution/Locations.h:20
+msgid "Aeropuerto del Norte"
+msgstr ""
+
+#: my-evolution/Locations.h:21
+msgid "Afonsos"
+msgstr ""
+
+#: my-evolution/Locations.h:22
+#, fuzzy
+msgid "Africa"
+msgstr "divendres"
+
+#: my-evolution/Locations.h:23
+msgid "Afyon"
+msgstr ""
+
+#: my-evolution/Locations.h:24
+#, fuzzy
+msgid "Agen"
+msgstr "Orientaci�"
+
+#: my-evolution/Locations.h:25
+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
+#, fuzzy
+msgid "Air Force"
+msgstr "Edita la font"
+
+#: 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 "Canad�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:39
+#, fuzzy
+msgid "Alamosa"
+msgstr "Alarmes"
+
+#: my-evolution/Locations.h:40
+#, fuzzy
+msgid "Alaska"
+msgstr "Alarmes"
+
+#: my-evolution/Locations.h:41
+msgid "Al Baha"
+msgstr ""
+
+#: my-evolution/Locations.h:43
+msgid "Albany"
+msgstr ""
+
+#: my-evolution/Locations.h:44
+msgid "Albenga"
+msgstr ""
+
+#: my-evolution/Locations.h:45
+msgid "Alberta"
+msgstr ""
+
+#: my-evolution/Locations.h:46
+msgid "Alborg"
+msgstr ""
+
+#: my-evolution/Locations.h:47
+msgid "Albuquerque"
+msgstr ""
+
+#: my-evolution/Locations.h:48
+#, fuzzy
+msgid "Alderney"
+msgstr "Nom del fitxer:"
+
+#: my-evolution/Locations.h:49
+#, fuzzy
+msgid "Alesund"
+msgstr "segon"
+
+#: my-evolution/Locations.h:50
+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 "Alta"
+
+#: my-evolution/Locations.h:56
+msgid "Algona"
+msgstr ""
+
+#: my-evolution/Locations.h:57
+#, fuzzy
+msgid "Alicante"
+msgstr "Activa"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:62
+#, fuzzy
+msgid "Alliance"
+msgstr "Afegeix..."
+
+#: my-evolution/Locations.h:63
+#, fuzzy
+msgid "Alma"
+msgstr "Alarmes"
+
+#: my-evolution/Locations.h:64
+#, fuzzy
+msgid "Almeria"
+msgstr "abril"
+
+#: my-evolution/Locations.h:65
+#, fuzzy
+msgid "Alpena"
+msgstr "_Obre"
+
+#: my-evolution/Locations.h:66
+msgid "Al Qaysumah"
+msgstr ""
+
+#: my-evolution/Locations.h:67
+#, fuzzy
+msgid "Alta"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:68
+msgid "Altamira"
+msgstr ""
+
+#: my-evolution/Locations.h:69
+#, fuzzy
+msgid "Alton"
+msgstr "_Accions"
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr ""
+
+#: my-evolution/Locations.h:71
+#, fuzzy
+msgid "Alturas"
+msgstr "dj."
+
+#: my-evolution/Locations.h:72
+#, fuzzy
+msgid "Altus"
+msgstr "dm."
+
+#: my-evolution/Locations.h:73
+msgid "Amami Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:74
+msgid "Amapala"
+msgstr ""
+
+#: my-evolution/Locations.h:75
+#, fuzzy
+msgid "Amarillo"
+msgstr "Adre�a electr�nica 2"
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr ""
+
+#: my-evolution/Locations.h:77
+#, fuzzy
+msgid "Ambler"
+msgstr "desembre"
+
+#: my-evolution/Locations.h:78
+#, fuzzy
+msgid "Amelia"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:79
+msgid "Amendola"
+msgstr ""
+
+#: my-evolution/Locations.h:80
+#, fuzzy
+msgid "Ames"
+msgstr "_Filtres de correu ..."
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr ""
+
+#: my-evolution/Locations.h:82
+#, fuzzy
+msgid "Amsterdam"
+msgstr "ahir"
+
+#: my-evolution/Locations.h:83
+msgid "Anadyr"
+msgstr ""
+
+#: my-evolution/Locations.h:84
+msgid "Anaktuvuk"
+msgstr ""
+
+#: my-evolution/Locations.h:85
+msgid "Anapa"
+msgstr ""
+
+#: my-evolution/Locations.h:86
+msgid "Anchorage"
+msgstr ""
+
+#: my-evolution/Locations.h:87
+msgid "Anchorage - Elmendorf AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:88
+#, fuzzy
+msgid "Ancona"
+msgstr "cont�"
+
+#: my-evolution/Locations.h:89
+msgid "Andahuayla"
+msgstr ""
+
+#: my-evolution/Locations.h:90
+msgid "Anderson"
+msgstr ""
+
+#: my-evolution/Locations.h:91
+#, fuzzy
+msgid "Andoya"
+msgstr "_Envia"
+
+#: my-evolution/Locations.h:92
+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
+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 ""
+
+#: my-evolution/Locations.h:101
+#, fuzzy
+msgid "Anniston"
+msgstr "Assistent"
+
+#: my-evolution/Locations.h:102
+#, fuzzy
+msgid "Antalya"
+msgstr "avui"
+
+#: my-evolution/Locations.h:103
+#, fuzzy
+msgid "Antartica"
+msgstr "Tria autom�tica"
+
+#: my-evolution/Locations.h:104
+#, fuzzy
+msgid "Antigo"
+msgstr "_Accions"
+
+#: my-evolution/Locations.h:105
+#, fuzzy
+msgid "Antigua"
+msgstr "Orientaci�"
+
+#: my-evolution/Locations.h:106
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: my-evolution/Locations.h:107
+#, fuzzy
+msgid "Antofagasta"
+msgstr "Assistent"
+
+#: my-evolution/Locations.h:108
+msgid "Antwerpen/Deurne"
+msgstr ""
+
+#: my-evolution/Locations.h:109
+msgid "Aomori Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:110
+msgid "Apalachicola"
+msgstr ""
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr ""
+
+#: my-evolution/Locations.h:112
+msgid "Aquadilla"
+msgstr ""
+
+#: my-evolution/Locations.h:113
+#, fuzzy
+msgid "Aracaju"
+msgstr "mar�"
+
+#: my-evolution/Locations.h:114
+msgid "Arad"
+msgstr ""
+
+#: my-evolution/Locations.h:115
+#, fuzzy
+msgid "Arar"
+msgstr "Alarmes"
+
+#: my-evolution/Locations.h:116
+#, fuzzy
+msgid "Araxos"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:117
+#, fuzzy
+msgid "Arcata"
+msgstr "Tria autom�tica"
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr ""
+
+#: my-evolution/Locations.h:119
+msgid "Arequipa"
+msgstr ""
+
+#: my-evolution/Locations.h:121
+#, fuzzy
+msgid "Arica"
+msgstr "Tria autom�tica"
+
+#: my-evolution/Locations.h:122
+#, fuzzy
+msgid "Arizona"
+msgstr "Orientaci�"
+
+#: my-evolution/Locations.h:123
+msgid "Arkansas"
+msgstr ""
+
+#: my-evolution/Locations.h:124
+msgid "Arkhangelsk"
+msgstr ""
+
+#: my-evolution/Locations.h:125
+#, fuzzy
+msgid "Arlington"
+msgstr "Orientaci�"
+
+#: my-evolution/Locations.h:126
+#, fuzzy
+msgid "Artigas"
+msgstr "Orientaci�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:131
+#, fuzzy
+msgid "Ashfield"
+msgstr "Assigna una puntuaci�"
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:133
+#, fuzzy
+msgid "Ashland"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:134
+#, fuzzy
+msgid "Asia"
+msgstr "agost"
+
+#: my-evolution/Locations.h:135
+#, fuzzy
+msgid "Aspen"
+msgstr "_Obre"
+
+#: my-evolution/Locations.h:136
+#, fuzzy
+msgid "Asswan"
+msgstr "Assistent"
+
+#: my-evolution/Locations.h:137
+#, fuzzy
+msgid "Astoria"
+msgstr "agost"
+
+#: my-evolution/Locations.h:138
+#, fuzzy
+msgid "Astrakhan"
+msgstr "agost"
+
+#: my-evolution/Locations.h:139
+#, fuzzy
+msgid "Asturias"
+msgstr "agost"
+
+#: my-evolution/Locations.h:140
+#, fuzzy
+msgid "Asuncion"
+msgstr "Seccions:"
+
+#: my-evolution/Locations.h:141
+#, fuzzy
+msgid "Athens"
+msgstr "adjunci�"
+
+#: my-evolution/Locations.h:142
+#, fuzzy
+msgid "Athinai"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:143
+#, fuzzy
+msgid "Atlanta"
+msgstr "Assistent"
+
+#: my-evolution/Locations.h:144
+#, fuzzy
+msgid "Atlantic"
+msgstr "Tria autom�tica"
+
+#: 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
+msgid "Auckland"
+msgstr ""
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:150
+#, fuzzy
+msgid "Augusta"
+msgstr "agost"
+
+#: my-evolution/Locations.h:151
+#, fuzzy
+msgid "Aurora"
+msgstr "agost"
+
+#: my-evolution/Locations.h:152
+#, fuzzy
+msgid "Austin"
+msgstr "agost"
+
+#: my-evolution/Locations.h:153
+#, fuzzy
+msgid "Australasia"
+msgstr "agost"
+
+#: my-evolution/Locations.h:156
+msgid "Avalon"
+msgstr ""
+
+#: my-evolution/Locations.h:157
+msgid "Aviano"
+msgstr ""
+
+#: my-evolution/Locations.h:158
+msgid "Ayacucho"
+msgstr ""
+
+#: my-evolution/Locations.h:159
+#, fuzzy
+msgid "Bage"
+msgstr "Enganxa"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:170
+#, fuzzy
+msgid "Ball Mountain"
+msgstr "cont�"
+
+#: my-evolution/Locations.h:171
+msgid "Baltimore"
+msgstr ""
+
+#: my-evolution/Locations.h:172
+msgid "Baltimore-Glen Burnie"
+msgstr ""
+
+#: my-evolution/Locations.h:173
+msgid "Banak"
+msgstr ""
+
+#: my-evolution/Locations.h:174
+msgid "Bandarabbass"
+msgstr ""
+
+#: my-evolution/Locations.h:175
+#, fuzzy
+msgid "Bangor"
+msgstr "fa"
+
+#: my-evolution/Locations.h:176
+msgid "Baracoa"
+msgstr ""
+
+#: my-evolution/Locations.h:177
+msgid "Barbers Point"
+msgstr ""
+
+#: my-evolution/Locations.h:178
+msgid "Barcelona"
+msgstr ""
+
+#: my-evolution/Locations.h:179
+#, fuzzy
+msgid "Bardufoss"
+msgstr "anys"
+
+#: my-evolution/Locations.h:180
+msgid "Bar Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:181
+#, fuzzy
+msgid "Bari"
+msgstr "Enganxa"
+
+#: my-evolution/Locations.h:182
+msgid "Bariloche"
+msgstr ""
+
+#: my-evolution/Locations.h:183
+#, fuzzy
+msgid "Barinas"
+msgstr "Marges"
+
+#: my-evolution/Locations.h:184
+msgid "Barking Sand"
+msgstr ""
+
+#: my-evolution/Locations.h:185
+#, fuzzy
+msgid "Barksdale"
+msgstr "Enganxa"
+
+#: my-evolution/Locations.h:186
+#, fuzzy
+msgid "Barnaul"
+msgstr "_Correu"
+
+#: 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
+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 "Enganxa"
+
+#: my-evolution/Locations.h:194
+msgid "Batesville"
+msgstr ""
+
+#: my-evolution/Locations.h:195
+msgid "Batman"
+msgstr ""
+
+#: my-evolution/Locations.h:196
+msgid "Baton Rouge"
+msgstr ""
+
+#: my-evolution/Locations.h:197
+msgid "Battle Creek"
+msgstr ""
+
+#: my-evolution/Locations.h:198
+#, fuzzy
+msgid "Battle Mountain"
+msgstr "cont�"
+
+#: my-evolution/Locations.h:199
+#, fuzzy
+msgid "Bauru"
+msgstr "anys"
+
+#: my-evolution/Locations.h:200
+msgid "Bayamo"
+msgstr ""
+
+#: my-evolution/Locations.h:201
+msgid "Bayreuth"
+msgstr ""
+
+#: my-evolution/Locations.h:202
+#, fuzzy
+msgid "Beatrice"
+msgstr "Enganxa"
+
+#: my-evolution/Locations.h:203
+msgid "Beaufort"
+msgstr ""
+
+#: my-evolution/Locations.h:204
+#, fuzzy
+msgid "Beaumont"
+msgstr "mes"
+
+#: 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 "Cerca"
+
+#: my-evolution/Locations.h:208
+#, fuzzy
+msgid "Beckley"
+msgstr "Mida"
+
+#: my-evolution/Locations.h:209
+#, fuzzy
+msgid "Bedford"
+msgstr "abans de"
+
+#: my-evolution/Locations.h:210
+#, fuzzy
+msgid "Beijing"
+msgstr "S'est� enviant \"%s\""
+
+#: my-evolution/Locations.h:211
+#, fuzzy
+msgid "Beirut"
+msgstr "anys"
+
+#: my-evolution/Locations.h:212
+msgid "Beja"
+msgstr ""
+
+#: my-evolution/Locations.h:213
+#, fuzzy
+msgid "Belem"
+msgstr "Mida"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:219
+#, fuzzy
+msgid "Belleville"
+msgstr "Mida"
+
+#: my-evolution/Locations.h:220
+msgid "Bellingham"
+msgstr ""
+
+#: my-evolution/Locations.h:221
+msgid "Belmar-Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:222
+#, fuzzy
+msgid "Belo Horizonte"
+msgstr "Mida"
+
+#: my-evolution/Locations.h:223
+msgid "Belo Horizonte Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:224
+msgid "Bemidji"
+msgstr ""
+
+#: my-evolution/Locations.h:225
+msgid "Benbecula"
+msgstr ""
+
+#: my-evolution/Locations.h:226
+#, fuzzy
+msgid "Benina"
+msgstr "S'est� enviant \"%s\""
+
+#: 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 "R�dio"
+
+#: my-evolution/Locations.h:230
+msgid "Bergamo"
+msgstr ""
+
+#: my-evolution/Locations.h:231
+#, fuzzy
+msgid "Bergen"
+msgstr "Vist"
+
+#: my-evolution/Locations.h:232
+msgid "Bergstrom AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:233
+msgid "Berlevag"
+msgstr ""
+
+#: my-evolution/Locations.h:234
+#, fuzzy
+msgid "Berlin"
+msgstr "S'est� enviant \"%s\""
+
+#: my-evolution/Locations.h:235
+msgid "Berlin-Tegel"
+msgstr ""
+
+#: my-evolution/Locations.h:236
+msgid "Berlin-Tempelhof"
+msgstr ""
+
+#: my-evolution/Locations.h:237
+#, fuzzy
+msgid "Bern"
+msgstr "S'est� enviant \"%s\""
+
+#: my-evolution/Locations.h:238
+#, fuzzy
+msgid "Bethel"
+msgstr "Altres"
+
+#: my-evolution/Locations.h:239
+msgid "Bethlehem Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:240
+#, fuzzy
+msgid "Bettles"
+msgstr "Mida"
+
+#: my-evolution/Locations.h:241
+#, fuzzy
+msgid "Beverly"
+msgstr "Cada"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:245
+#, fuzzy
+msgid "Big Piney"
+msgstr "Imprimeix"
+
+#: 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 "Llista de correu %s"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:257
+#, fuzzy
+msgid "Blanding"
+msgstr "Ombrejat"
+
+#: my-evolution/Locations.h:258
+msgid "Block Island"
+msgstr ""
+
+#: my-evolution/Locations.h:259
+msgid "Bloemfontein J. B. M. Hertzog "
+msgstr ""
+
+#: my-evolution/Locations.h:260
+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
+#, fuzzy
+msgid "Bluefields"
+msgstr "Camps disponibles"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:267
+#, fuzzy
+msgid "Bodo"
+msgstr "Cos"
+
+#: my-evolution/Locations.h:268
+msgid "Bogota/Eldorado"
+msgstr ""
+
+#: my-evolution/Locations.h:269
+#, fuzzy
+msgid "Boise"
+msgstr "Enganxa"
+
+#: my-evolution/Locations.h:271
+msgid "Bologna"
+msgstr ""
+
+#: my-evolution/Locations.h:272
+#, fuzzy
+msgid "Bolzano"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:273
+msgid "Bombay/Santacruz"
+msgstr ""
+
+#: my-evolution/Locations.h:274
+#, fuzzy
+msgid "Boone"
+msgstr "Cap"
+
+#: my-evolution/Locations.h:275
+msgid "Bordeaux"
+msgstr ""
+
+#: my-evolution/Locations.h:276
+#, fuzzy
+msgid "Borger"
+msgstr "per sempre"
+
+#: my-evolution/Locations.h:277
+msgid "Bornholm"
+msgstr ""
+
+#: my-evolution/Locations.h:278
+msgid "Boscombe Down"
+msgstr ""
+
+#: my-evolution/Locations.h:279
+msgid "Bosnia-Herzegovina"
+msgstr ""
+
+#: my-evolution/Locations.h:280
+#, fuzzy
+msgid "Boston"
+msgstr "Inferior:"
+
+#: my-evolution/Locations.h:281
+#, fuzzy
+msgid "Boulmer"
+msgstr "Carpetes"
+
+#: my-evolution/Locations.h:282
+#, fuzzy
+msgid "Bourges"
+msgstr "Fonts"
+
+#: my-evolution/Locations.h:283
+msgid "Bournemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:284
+msgid "Bowling Green"
+msgstr ""
+
+#: my-evolution/Locations.h:285
+msgid "Bozeman"
+msgstr ""
+
+#: my-evolution/Locations.h:286
+msgid "Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:287
+msgid "Bradshaw Field"
+msgstr ""
+
+#: my-evolution/Locations.h:288
+msgid "Brainerd"
+msgstr ""
+
+#: my-evolution/Locations.h:289
+#, fuzzy
+msgid "Brasilia"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:290
+msgid "Brasschaat"
+msgstr ""
+
+#: my-evolution/Locations.h:291
+#, fuzzy
+msgid "Bratislava"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:292
+#, fuzzy
+msgid "Bratsk"
+msgstr "Data de venciment"
+
+#: my-evolution/Locations.h:293
+msgid "Braunschweig"
+msgstr ""
+
+#: my-evolution/Locations.h:295
+#, fuzzy
+msgid "Bremen"
+msgstr "Vist"
+
+#: my-evolution/Locations.h:296
+msgid "Bremerton"
+msgstr ""
+
+#: my-evolution/Locations.h:297
+#, fuzzy
+msgid "Brest"
+msgstr "Comprova"
+
+#: my-evolution/Locations.h:298
+msgid "Bridgeport"
+msgstr ""
+
+#: my-evolution/Locations.h:299
+msgid "Brindisi"
+msgstr ""
+
+#: my-evolution/Locations.h:300
+msgid "Brisbane"
+msgstr ""
+
+#: my-evolution/Locations.h:301
+#, fuzzy
+msgid "Bristol"
+msgstr "_Correu"
+
+#: 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 "Ocupat"
+
+#: my-evolution/Locations.h:305
+msgid "Broken Bow"
+msgstr ""
+
+#: my-evolution/Locations.h:306
+msgid "Bronnoysund"
+msgstr ""
+
+#: my-evolution/Locations.h:307
+#, fuzzy
+msgid "Brookings"
+msgstr "S'est� movent"
+
+#: my-evolution/Locations.h:308
+msgid "Brooksville"
+msgstr ""
+
+#: my-evolution/Locations.h:309
+#, fuzzy
+msgid "Broome"
+msgstr "Inferior:"
+
+#: my-evolution/Locations.h:310
+msgid "Brownsville"
+msgstr ""
+
+#: my-evolution/Locations.h:311
+msgid "Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:312
+msgid "Brussels-National Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:313
+msgid "Bryansk"
+msgstr ""
+
+#: my-evolution/Locations.h:314
+#, fuzzy
+msgid "Bryce Canyon"
+msgstr "Empresa"
+
+#: 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
+msgid "Burbank"
+msgstr ""
+
+#: my-evolution/Locations.h:323
+#, fuzzy
+msgid "Burgas"
+msgstr "Ocupat"
+
+#: my-evolution/Locations.h:324
+#, fuzzy
+msgid "Burley"
+msgstr "dm."
+
+#: my-evolution/Locations.h:325
+msgid "Burlington"
+msgstr ""
+
+#: my-evolution/Locations.h:326
+#, fuzzy
+msgid "Burnet"
+msgstr "juny"
+
+#: my-evolution/Locations.h:327
+#, fuzzy
+msgid "Burns"
+msgstr "Ocupat"
+
+#: my-evolution/Locations.h:328
+#, fuzzy
+msgid "Bursa"
+msgstr "Ocupat"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:332
+#, fuzzy
+msgid "Cagliari"
+msgstr "Agenda"
+
+#: my-evolution/Locations.h:333
+#, fuzzy
+msgid "Cairns"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:334
+#, fuzzy
+msgid "Cairo"
+msgstr "Cotxe"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:338
+#, fuzzy
+msgid "Calgary"
+msgstr "Agenda"
+
+#: my-evolution/Locations.h:339
+msgid "Cali/Alfonso Bonillaaragon"
+msgstr ""
+
+#: my-evolution/Locations.h:340
+#, fuzzy
+msgid "Caliente"
+msgstr "Agenda"
+
+#: my-evolution/Locations.h:341
+#, fuzzy
+msgid "California"
+msgstr "Visualitza tots els contactes"
+
+#: my-evolution/Locations.h:342
+msgid "Calvi-Ste-Catherine"
+msgstr ""
+
+#: my-evolution/Locations.h:343
+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 "Cotxe"
+
+#: my-evolution/Locations.h:347
+#, fuzzy
+msgid "Camiri"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:348
+#, fuzzy
+msgid "Campeche"
+msgstr "% comp_let:"
+
+#: my-evolution/Locations.h:349
+#, fuzzy
+msgid "Campinas"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:350
+#, fuzzy
+msgid "Campo"
+msgstr "Copia"
+
+#: my-evolution/Locations.h:351
+msgid "Campo Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr ""
+
+#: my-evolution/Locations.h:353
+#, fuzzy
+msgid "Canaan"
+msgstr "Canad�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:363
+#, fuzzy
+msgid "Cancun"
+msgstr "Cancel�lat"
+
+#: my-evolution/Locations.h:364
+msgid "Cannes-Mandelieu"
+msgstr ""
+
+#: my-evolution/Locations.h:365
+#, fuzzy
+msgid "Cantwell"
+msgstr "Cancel�lat"
+
+#: my-evolution/Locations.h:366
+msgid "Cape Girardeau"
+msgstr ""
+
+#: my-evolution/Locations.h:367
+msgid "Cape Hatteras"
+msgstr ""
+
+#: my-evolution/Locations.h:368
+#, fuzzy
+msgid "Cape Lisburne"
+msgstr "Font del paper:"
+
+#: my-evolution/Locations.h:369
+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
+msgid "Capo Mele"
+msgstr ""
+
+#: my-evolution/Locations.h:374
+msgid "Caracas La Carlota"
+msgstr ""
+
+#: my-evolution/Locations.h:375
+msgid "Caracas Maiquetia"
+msgstr ""
+
+#: my-evolution/Locations.h:376
+#, fuzzy
+msgid "Caravelas"
+msgstr "Tasca"
+
+#: my-evolution/Locations.h:377
+#, fuzzy
+msgid "Carbondale"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:378
+#, fuzzy
+msgid "Cardiff"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:379
+#, fuzzy
+msgid "Caribou"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:380
+#, fuzzy
+msgid "Carlisle"
+msgstr "Inhabilitat"
+
+#: my-evolution/Locations.h:381
+#, fuzzy
+msgid "Carlsbad"
+msgstr "Crida de retorn"
+
+#: my-evolution/Locations.h:382
+#, fuzzy
+msgid "Carroll"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:383
+msgid "Cartagena/Rafael Nunez"
+msgstr ""
+
+#: my-evolution/Locations.h:384
+msgid "Casa Granda"
+msgstr ""
+
+#: my-evolution/Locations.h:385
+#, fuzzy
+msgid "Cascade"
+msgstr "Horitzontal"
+
+#: my-evolution/Locations.h:386
+#, fuzzy
+msgid "Casper"
+msgstr "Paper"
+
+#: my-evolution/Locations.h:387
+msgid "Catacamas"
+msgstr ""
+
+#: my-evolution/Locations.h:388
+#, fuzzy
+msgid "Catania"
+msgstr "vuit�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:393
+#, fuzzy
+msgid "Cedar City"
+msgstr "Agenda"
+
+#: 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 "abril"
+
+#: my-evolution/Locations.h:397
+msgid "Chacarita"
+msgstr ""
+
+#: my-evolution/Locations.h:398
+#, fuzzy
+msgid "Chadron"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:399
+#, fuzzy
+msgid "Challis"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:400
+msgid "Chamberlain"
+msgstr ""
+
+#: my-evolution/Locations.h:401
+#, fuzzy
+msgid "Chambery"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:402
+#, fuzzy
+msgid "Champaign"
+msgstr "Empresa"
+
+#: my-evolution/Locations.h:403
+#, fuzzy
+msgid "Chandalar Lake"
+msgstr "Agenda"
+
+#: my-evolution/Locations.h:404
+#, fuzzy
+msgid "Chandler"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:405
+#, fuzzy
+msgid "Chania"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:406
+#, fuzzy
+msgid "Chanute"
+msgstr "Cancel�lat"
+
+#: my-evolution/Locations.h:407
+#, fuzzy
+msgid "Chariton"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:408
+msgid "Charleroi-Brussels South"
+msgstr ""
+
+#: my-evolution/Locations.h:409
+msgid "Charles City"
+msgstr ""
+
+#: my-evolution/Locations.h:410
+msgid "Charleston"
+msgstr ""
+
+#: my-evolution/Locations.h:411
+#, fuzzy
+msgid "Charlotte"
+msgstr "Dilluns"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:416
+#, fuzzy
+msgid "Cheju"
+msgstr "_Fitxer"
+
+#: 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 "hora"
+
+#: my-evolution/Locations.h:420
+#, fuzzy
+msgid "Cherry Point"
+msgstr "Contacte _nou"
+
+#: 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 "Cotxe"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:431
+#, fuzzy
+msgid "Chiclayo"
+msgstr "_Fitxer"
+
+#: my-evolution/Locations.h:432
+#, fuzzy
+msgid "Chico"
+msgstr "_Fitxer"
+
+#: my-evolution/Locations.h:433
+msgid "Chicopee Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:434
+#, fuzzy
+msgid "Chievres"
+msgstr "_Fitxer"
+
+#: my-evolution/Locations.h:435
+#, fuzzy
+msgid "Chihhang"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:436
+msgid "Chihuahua"
+msgstr ""
+
+#: my-evolution/Locations.h:437
+#, fuzzy
+msgid "Childress"
+msgstr "_Fitxer"
+
+#: my-evolution/Locations.h:439
+#, fuzzy
+msgid "China Lake"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:440
+#, fuzzy
+msgid "Chinandega"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:441
+msgid "Chinmem/Shatou"
+msgstr ""
+
+#: my-evolution/Locations.h:442
+#, fuzzy
+msgid "Chino"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:443
+msgid "Chippewa County"
+msgstr ""
+
+#: my-evolution/Locations.h:444
+#, fuzzy
+msgid "Chita"
+msgstr "Cotxe"
+
+#: 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 "Cotxe"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:462
+#, fuzzy
+msgid "Clarinda"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:463
+#, fuzzy
+msgid "Clarion"
+msgstr "Agenda"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:468
+#, fuzzy
+msgid "Cleveland"
+msgstr "Finl�ndia"
+
+#: 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
+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
+msgid "Cocos Island"
+msgstr ""
+
+#: my-evolution/Locations.h:477
+#, fuzzy
+msgid "Cody"
+msgstr "Cos"
+
+#: my-evolution/Locations.h:478
+msgid "Coeur d'Alene"
+msgstr ""
+
+#: my-evolution/Locations.h:479
+#, fuzzy
+msgid "Cold Bay"
+msgstr "_Carpeta"
+
+#: my-evolution/Locations.h:480
+#, fuzzy
+msgid "Colima"
+msgstr "Empresa"
+
+#: my-evolution/Locations.h:481
+#, fuzzy
+msgid "College Station"
+msgstr "Tots els assistents"
+
+#: my-evolution/Locations.h:482
+msgid "Colmar-Meyenheim"
+msgstr ""
+
+#: my-evolution/Locations.h:484
+#, fuzzy
+msgid "Colonia"
+msgstr "Visualitza tots els contactes"
+
+#: my-evolution/Locations.h:485
+#, fuzzy
+msgid "Colorado"
+msgstr "Colors"
+
+#: my-evolution/Locations.h:486
+msgid "Colorado Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:487
+msgid "Columbia"
+msgstr ""
+
+#: my-evolution/Locations.h:488
+msgid "Columbia-McEntire"
+msgstr ""
+
+#: my-evolution/Locations.h:489
+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 ""
+
+#: my-evolution/Locations.h:494
+#, fuzzy
+msgid "Colville"
+msgstr "_Fitxer"
+
+#: my-evolution/Locations.h:495
+msgid "Comodoro Rivadavia"
+msgstr ""
+
+#: my-evolution/Locations.h:496
+#, fuzzy
+msgid "Comox"
+msgstr "Copia"
+
+#: my-evolution/Locations.h:497
+msgid "Conceicao Do Araguaia"
+msgstr ""
+
+#: my-evolution/Locations.h:498
+#, fuzzy
+msgid "Concepcion"
+msgstr "Cancel�lat"
+
+#: my-evolution/Locations.h:499
+#, fuzzy
+msgid "Concord"
+msgstr "S'est� copiant"
+
+#: my-evolution/Locations.h:500
+msgid "Concordia"
+msgstr ""
+
+#: my-evolution/Locations.h:501
+msgid "Connaught"
+msgstr ""
+
+#: my-evolution/Locations.h:502
+#, fuzzy
+msgid "Connecticut"
+msgstr "_Contactes..."
+
+#: my-evolution/Locations.h:503
+#, fuzzy
+msgid "Conroe"
+msgstr "S'est� copiant"
+
+#: my-evolution/Locations.h:504
+#, fuzzy
+msgid "Constantine"
+msgstr "cont�"
+
+#: my-evolution/Locations.h:505
+msgid "Copper Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:506
+msgid "Cordoba"
+msgstr ""
+
+#: my-evolution/Locations.h:507
+msgid "Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:508
+msgid "Cork"
+msgstr ""
+
+#: my-evolution/Locations.h:509
+#, fuzzy
+msgid "Coro"
+msgstr "Colors"
+
+#: my-evolution/Locations.h:510
+#, fuzzy
+msgid "Corona"
+msgstr "Colors"
+
+#: my-evolution/Locations.h:511
+msgid "Corpus Christi"
+msgstr ""
+
+#: my-evolution/Locations.h:512
+msgid "Corpus Christi NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:513
+#, fuzzy
+msgid "Corrientes"
+msgstr "aparicions"
+
+#: my-evolution/Locations.h:514
+msgid "Corsicana"
+msgstr ""
+
+#: my-evolution/Locations.h:515
+#, fuzzy
+msgid "Cortez"
+msgstr "Cap"
+
+#: my-evolution/Locations.h:516
+#, fuzzy
+msgid "Corumba"
+msgstr "Format"
+
+#: my-evolution/Locations.h:518
+msgid "Cotulla"
+msgstr ""
+
+#: my-evolution/Locations.h:519
+msgid "Council Bluffs"
+msgstr ""
+
+#: my-evolution/Locations.h:520
+#, fuzzy
+msgid "Coventry"
+msgstr "Pa�_s:"
+
+#: my-evolution/Locations.h:521
+#, fuzzy
+msgid "Covington"
+msgstr "S'est� copiant"
+
+#: my-evolution/Locations.h:522
+msgid "Cozumel"
+msgstr ""
+
+#: my-evolution/Locations.h:523
+#, fuzzy
+msgid "Craig"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:524
+#, fuzzy
+msgid "Cranfield"
+msgstr "Cancel�lat"
+
+#: my-evolution/Locations.h:525
+msgid "Crescent City"
+msgstr ""
+
+#: my-evolution/Locations.h:526
+#, fuzzy
+msgid "Creston"
+msgstr "Descripci�:"
+
+#: my-evolution/Locations.h:527
+#, fuzzy
+msgid "Crestview"
+msgstr "Previsualitzaci�:"
+
+#: my-evolution/Locations.h:529
+msgid "Cross City"
+msgstr ""
+
+#: my-evolution/Locations.h:530
+msgid "Crossville"
+msgstr ""
+
+#: my-evolution/Locations.h:531
+msgid "Crotone"
+msgstr ""
+
+#: my-evolution/Locations.h:533
+msgid "Cuba Awrs"
+msgstr ""
+
+#: my-evolution/Locations.h:534
+msgid "Cuernavaca"
+msgstr ""
+
+#: my-evolution/Locations.h:535
+msgid "Cuiaba"
+msgstr ""
+
+#: my-evolution/Locations.h:536
+#, fuzzy
+msgid "Culdrose"
+msgstr "Tanca"
+
+#: my-evolution/Locations.h:537
+msgid "Culiacan"
+msgstr ""
+
+#: my-evolution/Locations.h:538
+#, fuzzy
+msgid "Cumana"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:539
+msgid "Cumberland"
+msgstr ""
+
+#: my-evolution/Locations.h:540
+msgid "Curitiba"
+msgstr ""
+
+#: my-evolution/Locations.h:541
+msgid "Curitiba Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:542
+#, fuzzy
+msgid "Custer"
+msgstr "Personalitzat"
+
+#: my-evolution/Locations.h:543
+msgid "Cut Bank"
+msgstr ""
+
+#: my-evolution/Locations.h:544
+msgid "Cuzco"
+msgstr ""
+
+#: my-evolution/Locations.h:547
+#, fuzzy
+msgid "Dagali"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:548
+msgid "Daggett"
+msgstr ""
+
+#: my-evolution/Locations.h:549
+msgid "Dalhart"
+msgstr ""
+
+#: my-evolution/Locations.h:550
+#, fuzzy
+msgid "Dalian"
+msgstr "R�dio"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:556
+#, fuzzy
+msgid "Danbury"
+msgstr "gener"
+
+#: my-evolution/Locations.h:557
+msgid "Danville"
+msgstr ""
+
+#: my-evolution/Locations.h:558
+msgid "Dar-El-Beida"
+msgstr ""
+
+#: my-evolution/Locations.h:559
+#, fuzzy
+msgid "Davenport"
+msgstr "Transparent"
+
+#: my-evolution/Locations.h:560
+msgid "David"
+msgstr ""
+
+#: my-evolution/Locations.h:561
+msgid "Dawadmi"
+msgstr ""
+
+#: my-evolution/Locations.h:562
+#, fuzzy
+msgid "Dayton"
+msgstr "Dia"
+
+#: my-evolution/Locations.h:563
+msgid "Daytona Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:564
+msgid "Dayton-Fairborn"
+msgstr ""
+
+#: my-evolution/Locations.h:565
+#, fuzzy
+msgid "Dayton-South Airport"
+msgstr "No l'eliminis"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:571
+#, fuzzy
+msgid "Deelen"
+msgstr "Suprimeix"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:576
+#, fuzzy
+msgid "Delta"
+msgstr "Suprimeix"
+
+#: my-evolution/Locations.h:577
+#, fuzzy
+msgid "Deming"
+msgstr "min."
+
+#: my-evolution/Locations.h:578
+msgid "Den Helder/De Kooy"
+msgstr ""
+
+#: my-evolution/Locations.h:579
+#, fuzzy
+msgid "Denison"
+msgstr "Seccions:"
+
+#: my-evolution/Locations.h:581
+#, fuzzy
+msgid "Denton"
+msgstr "Seccions:"
+
+#: my-evolution/Locations.h:582
+#, fuzzy
+msgid "Denver"
+msgstr "Remitent"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:587
+#, fuzzy
+msgid "Des Moines"
+msgstr "Divisions de temps:"
+
+#: my-evolution/Locations.h:588
+#, fuzzy
+msgid "Destin"
+msgstr "Descripci�:"
+
+#: 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
+msgid "Dhahran"
+msgstr ""
+
+#: my-evolution/Locations.h:596
+#, fuzzy
+msgid "Dickinson"
+msgstr "Dimensions:"
+
+#: my-evolution/Locations.h:597
+#, fuzzy
+msgid "Dijon"
+msgstr "Cap"
+
+#: my-evolution/Locations.h:598
+msgid "Dillingham"
+msgstr ""
+
+#: my-evolution/Locations.h:599
+#, fuzzy
+msgid "Dillon"
+msgstr "Cap"
+
+#: my-evolution/Locations.h:600
+#, fuzzy
+msgid "Dinard"
+msgstr "Imprimeix l'agenda"
+
+#: 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 "M�bil"
+
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "Cap"
+
+#: my-evolution/Locations.h:610
+#, fuzzy
+msgid "Dongsha"
+msgstr "Avui"
+
+#: my-evolution/Locations.h:611
+msgid "Dongshi"
+msgstr ""
+
+#: my-evolution/Locations.h:612
+#, fuzzy
+msgid "Don Torcuato"
+msgstr "el o despr�s del"
+
+#: my-evolution/Locations.h:613
+msgid "Dortmund-Wickede"
+msgstr ""
+
+#: my-evolution/Locations.h:614
+#, fuzzy
+msgid "Dothan"
+msgstr "Cap"
+
+#: my-evolution/Locations.h:615
+msgid "Douglas"
+msgstr ""
+
+#: my-evolution/Locations.h:616
+#, fuzzy
+msgid "Dover"
+msgstr "per sempre"
+
+#: my-evolution/Locations.h:617
+msgid "Dresden-Klotzsche"
+msgstr ""
+
+#: my-evolution/Locations.h:618
+msgid "Drummond"
+msgstr ""
+
+#: my-evolution/Locations.h:619
+msgid "Dubai"
+msgstr ""
+
+#: my-evolution/Locations.h:620
+msgid "Dubbo"
+msgstr ""
+
+#: my-evolution/Locations.h:621
+#, fuzzy
+msgid "Dublin"
+msgstr "P�blic"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:625
+#, fuzzy
+msgid "Dugway"
+msgstr "Dia"
+
+#: my-evolution/Locations.h:626
+#, fuzzy
+msgid "Duluth"
+msgstr "Valors predeterminats"
+
+#: my-evolution/Locations.h:627
+#, fuzzy
+msgid "Dundee"
+msgstr "Data de venciment"
+
+#: my-evolution/Locations.h:628
+#, fuzzy
+msgid "Durango"
+msgstr "fa"
+
+#: 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
+msgid "Dusseldorf"
+msgstr ""
+
+#: my-evolution/Locations.h:633
+msgid "Dutch Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:634
+msgid "Dyersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:635
+#, fuzzy
+msgid "Eagle"
+msgstr "P�gina"
+
+#: 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
+msgid "East St Louis"
+msgstr ""
+
+#: my-evolution/Locations.h:640
+msgid "Eau Claire"
+msgstr ""
+
+#: my-evolution/Locations.h:642
+#, fuzzy
+msgid "Edinburgh"
+msgstr "Encap�alaments:"
+
+#: my-evolution/Locations.h:643
+#, fuzzy
+msgid "Edmonton"
+msgstr "mes"
+
+#: 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
+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 ""
+
+#: my-evolution/Locations.h:661
+#, fuzzy
+msgid "Elkins"
+msgstr "�s"
+
+#: my-evolution/Locations.h:662
+msgid "Elko"
+msgstr ""
+
+#: my-evolution/Locations.h:663
+msgid "Elmira"
+msgstr ""
+
+#: my-evolution/Locations.h:664
+#, fuzzy
+msgid "El Monte"
+msgstr "Mes"
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr ""
+
+#: my-evolution/Locations.h:667
+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
+#, fuzzy
+msgid "Emmonak"
+msgstr "dilluns"
+
+#: my-evolution/Locations.h:671
+#, fuzzy
+msgid "Emporia"
+msgstr "S'est� movent"
+
+#: my-evolution/Locations.h:672
+msgid "Enid"
+msgstr ""
+
+#: my-evolution/Locations.h:673
+#, fuzzy
+msgid "Enid/Woodring"
+msgstr "Encap�alaments:"
+
+#: 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
+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 ""
+
+#: my-evolution/Locations.h:685
+#, fuzzy
+msgid "Eugene"
+msgstr "_Esborra"
+
+#: my-evolution/Locations.h:686
+msgid "Eureka"
+msgstr ""
+
+#: my-evolution/Locations.h:687
+msgid "Europe"
+msgstr ""
+
+#: my-evolution/Locations.h:688
+#, fuzzy
+msgid "Evanston"
+msgstr "�ltim"
+
+#: my-evolution/Locations.h:689
+msgid "Evansville"
+msgstr ""
+
+#: my-evolution/Locations.h:690
+#, fuzzy
+msgid "Everett"
+msgstr "Cada"
+
+#: my-evolution/Locations.h:691
+msgid "Evergreen"
+msgstr ""
+
+#: my-evolution/Locations.h:692
+msgid "Evreux-Fauville"
+msgstr ""
+
+#: my-evolution/Locations.h:693
+#, fuzzy
+msgid "Exeter"
+msgstr "Altres"
+
+#: my-evolution/Locations.h:694
+msgid "Ezeiza"
+msgstr ""
+
+#: my-evolution/Locations.h:695
+#, fuzzy
+msgid "Fagernes"
+msgstr "Busca"
+
+#: my-evolution/Locations.h:696
+msgid "Fairbanks"
+msgstr ""
+
+#: my-evolution/Locations.h:697
+msgid "Fairchild"
+msgstr ""
+
+#: my-evolution/Locations.h:698
+msgid "Fairfield"
+msgstr ""
+
+#: my-evolution/Locations.h:699
+#, fuzzy
+msgid "Fairmont"
+msgstr "Lletres"
+
+#: 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 "fa"
+
+#: my-evolution/Locations.h:705
+#, fuzzy
+msgid "Farmingdale"
+msgstr "Inhabilitat"
+
+#: my-evolution/Locations.h:706
+msgid "Farmington"
+msgstr ""
+
+#: my-evolution/Locations.h:707
+#, fuzzy
+msgid "Farmville"
+msgstr "Nom complet:"
+
+#: my-evolution/Locations.h:708
+#, fuzzy
+msgid "Faro"
+msgstr "De:"
+
+#: my-evolution/Locations.h:709
+msgid "Fayetteville"
+msgstr ""
+
+#: my-evolution/Locations.h:710
+#, fuzzy
+msgid "Feng Nin"
+msgstr "S'est� enviant \"%s\""
+
+#: my-evolution/Locations.h:711
+msgid "Fergus Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:712
+msgid "Fernando De Noronha"
+msgstr ""
+
+#: my-evolution/Locations.h:713
+#, fuzzy
+msgid "Ferrara"
+msgstr "febrer"
+
+#: my-evolution/Locations.h:714
+#, fuzzy
+msgid "Figari"
+msgstr "abril"
+
+#: my-evolution/Locations.h:715
+#, fuzzy
+msgid "Findlay"
+msgstr "Divendres"
+
+#: my-evolution/Locations.h:717
+#, fuzzy
+msgid "Firenze"
+msgstr "setmana"
+
+#: my-evolution/Locations.h:718
+#, fuzzy
+msgid "Fitchburg"
+msgstr "dj."
+
+#: my-evolution/Locations.h:719
+msgid "Flagstaff"
+msgstr ""
+
+#: my-evolution/Locations.h:720
+#, fuzzy
+msgid "Flint"
+msgstr "�s"
+
+#: my-evolution/Locations.h:721
+msgid "Flippin"
+msgstr ""
+
+#: my-evolution/Locations.h:722
+#, fuzzy
+msgid "Florence"
+msgstr "Cancel�lat"
 
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/Locations.h:723
+#, fuzzy
+msgid "Florennes"
+msgstr "setmana"
+
+#: my-evolution/Locations.h:724
+#, fuzzy
+msgid "Flores"
+msgstr "_Formularis"
+
+#: my-evolution/Locations.h:725
+msgid "Florianopolis"
+msgstr ""
+
+#: my-evolution/Locations.h:726
+#, fuzzy
+msgid "Florida"
+msgstr "Divendres"
+
+#: my-evolution/Locations.h:727
+#, fuzzy
+msgid "Floro"
+msgstr "De:"
+
+#: my-evolution/Locations.h:728
+msgid "Fond Du Lac"
+msgstr ""
+
+#: my-evolution/Locations.h:729
+#, fuzzy
+msgid "Forde/Bringeland"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:730
+#, fuzzy
+msgid "Forli"
+msgstr "dv."
+
+#: my-evolution/Locations.h:731
+#, fuzzy
+msgid "Formosa"
+msgstr "Format"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:742
+#, fuzzy
+msgid "Fort Eustis"
+msgstr "Mostra la barra de _dreceres"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:748
+#, fuzzy
+msgid "Fort Leonard"
+msgstr "Reenvia"
+
+#: my-evolution/Locations.h:749
+msgid "Fort Lewis"
+msgstr ""
+
+#: my-evolution/Locations.h:750
+msgid "Fort Madison"
+msgstr ""
+
+#: my-evolution/Locations.h:751
+#, fuzzy
+msgid "Fort Meade"
+msgstr "Reenvia el missatge"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:757
+#, fuzzy
+msgid "Fort Smith"
+msgstr "Format"
+
+#: my-evolution/Locations.h:758
+#, fuzzy
+msgid "Fort Stewart"
+msgstr "No iniciat"
+
+#: my-evolution/Locations.h:759
+msgid "Fort Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:760
+#, fuzzy
+msgid "Fort Wayne"
+msgstr "Cancel�lat"
+
+#: 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
+#, fuzzy
+msgid "Frankfort"
+msgstr "Transparent"
+
+#: my-evolution/Locations.h:768
+msgid "Frankfurt/Main"
+msgstr ""
+
+#: my-evolution/Locations.h:769
+#, fuzzy
+msgid "Franklin"
+msgstr "V�s endavant en el temps"
+
+#: my-evolution/Locations.h:770
+#, fuzzy
+msgid "Fredericton"
+msgstr "Descripci�:"
+
+#: my-evolution/Locations.h:771
+#, fuzzy
+msgid "Freeport"
+msgstr "setmana"
+
+#: my-evolution/Locations.h:772
+msgid "Frenchville"
+msgstr ""
+
+#: my-evolution/Locations.h:773
+#, fuzzy
+msgid "Fresno"
+msgstr "setmana"
+
+#: my-evolution/Locations.h:774
+msgid "Fresno-Chandler"
+msgstr ""
+
+#: my-evolution/Locations.h:775
+#, fuzzy
+msgid "Friday Harbor"
+msgstr "Divendres"
+
+#: my-evolution/Locations.h:776
+msgid "Friedrichshafen"
+msgstr ""
+
+#: my-evolution/Locations.h:777
+#, fuzzy
+msgid "Frigg"
+msgstr "dv."
+
+#: my-evolution/Locations.h:778
+#, fuzzy
+msgid "Frontone"
+msgstr "Lletres"
+
+#: my-evolution/Locations.h:779
+#, fuzzy
+msgid "Frosinone"
+msgstr "_Professi�:"
+
+#: my-evolution/Locations.h:780
+#, fuzzy
+msgid "Fryeburg"
+msgstr "febrer"
+
+#: 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 "Visualitza tots els contactes"
+
+#: my-evolution/Locations.h:789
+msgid "Gadsden"
+msgstr ""
+
+#: my-evolution/Locations.h:790
+#, fuzzy
+msgid "Gage"
+msgstr "P�gina"
+
+#: my-evolution/Locations.h:791
+#, fuzzy
+msgid "Gainesville"
+msgstr "Cancel�lat"
+
+#: 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 "Agenda"
+
+#: my-evolution/Locations.h:796
+msgid "Galesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:797
+msgid "Gallup"
+msgstr ""
+
+#: my-evolution/Locations.h:798
+msgid "Galveston"
+msgstr ""
+
+#: my-evolution/Locations.h:799
+#, fuzzy
+msgid "Gambell"
+msgstr "etiqueta9"
+
+#: my-evolution/Locations.h:800
+#, fuzzy
+msgid "Gander"
+msgstr "Cap�alera"
+
+#: my-evolution/Locations.h:801
+#, fuzzy
+msgid "Garden City"
+msgstr "Identitat"
+
+#: my-evolution/Locations.h:802
+msgid "Gary"
+msgstr ""
+
+#: my-evolution/Locations.h:803
+#, fuzzy
+msgid "Gassim"
+msgstr "am"
+
+#: my-evolution/Locations.h:804
+#, fuzzy
+msgid "Gatineau"
+msgstr "General"
+
+#: my-evolution/Locations.h:805
+msgid "Gaziantep"
+msgstr ""
+
+#: my-evolution/Locations.h:806
+#, fuzzy
+msgid "Gdansk"
+msgstr "dies"
+
+#: my-evolution/Locations.h:807
+#, fuzzy
+msgid "Geneve"
+msgstr "setmana"
+
+#: my-evolution/Locations.h:808
+#, fuzzy
+msgid "Genova"
+msgstr "General"
+
+#: my-evolution/Locations.h:809
+msgid "George Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:810
+msgid "Georgetown"
+msgstr ""
+
+#: my-evolution/Locations.h:813
+msgid "Ghardaia"
+msgstr ""
+
+#: my-evolution/Locations.h:814
+msgid "Ghedi"
+msgstr ""
+
+#: my-evolution/Locations.h:816
+msgid "Gifu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:817
+#, fuzzy
+msgid "Gila Bend"
+msgstr "Finl�ndia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:821
+#, fuzzy
+msgid "Girona"
+msgstr "General"
+
+#: my-evolution/Locations.h:822
+msgid "Gizan"
+msgstr ""
+
+#: my-evolution/Locations.h:823
+#, fuzzy
+msgid "Glasgow"
+msgstr "fa"
+
+#: my-evolution/Locations.h:824
+msgid "Glendive"
+msgstr ""
+
+#: my-evolution/Locations.h:825
+msgid "Glens Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:826
+#, fuzzy
+msgid "Goiania"
+msgstr "vuit�"
+
+#: my-evolution/Locations.h:827
+msgid "Goldsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:828
+#, fuzzy
+msgid "Goodland"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:829
+#, fuzzy
+msgid "Goose Bay"
+msgstr "V�s a avui"
+
+#: my-evolution/Locations.h:830
+msgid "Goteborg (Landvetter)"
+msgstr ""
+
+#: my-evolution/Locations.h:831
+msgid "Goteborg (Save)"
+msgstr ""
+
+#: my-evolution/Locations.h:832
+#, fuzzy
+msgid "Granada"
+msgstr "Canad�"
+
+#: 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 "Finl�ndia"
+
+#: my-evolution/Locations.h:837
+msgid "Grand Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:838
+msgid "Grand Junction"
+msgstr ""
+
+#: my-evolution/Locations.h:839
+msgid "Grand Marais"
+msgstr ""
+
+#: my-evolution/Locations.h:840
+msgid "Grand Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:841
+#, fuzzy
+msgid "Grandview"
+msgstr "Previsualitzaci�:"
+
+#: my-evolution/Locations.h:842
+#, fuzzy
+msgid "Grangeville"
+msgstr "Cancel�lat"
+
+#: my-evolution/Locations.h:843
+#, fuzzy
+msgid "Grants"
+msgstr "Data de venciment"
+
+#: my-evolution/Locations.h:844
+#, fuzzy
+msgid "Graz"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:845
+msgid "Great Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:847
+#, fuzzy
+msgid "Greeley"
+msgstr "setmana"
+
+#: my-evolution/Locations.h:848
+#, fuzzy
+msgid "Green Bay"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:849
+msgid "Green River"
+msgstr ""
+
+#: my-evolution/Locations.h:850
+msgid "Greensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:851
+#, fuzzy
+msgid "Greenville"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:852
+msgid "Greenville-Spartanburg"
+msgstr ""
+
+#: my-evolution/Locations.h:853
+#, fuzzy
+msgid "Greenwood"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:854
+msgid "Grenoble-Saint-Geoirs"
+msgstr ""
+
+#: my-evolution/Locations.h:855
+msgid "Griffiss AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:856
+#, fuzzy
+msgid "Groningen"
+msgstr "S'est� movent"
+
+#: my-evolution/Locations.h:857
+msgid "Grosseto"
+msgstr ""
+
+#: my-evolution/Locations.h:858
+msgid "Groton"
+msgstr ""
+
+#: my-evolution/Locations.h:859
+msgid "Guadalajara"
+msgstr ""
+
+#: my-evolution/Locations.h:860
+msgid "Guadalupe Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:861
+#, fuzzy
+msgid "Guanare"
+msgstr "General"
+
+#: my-evolution/Locations.h:862
+msgid "Guangzhou"
+msgstr ""
+
+#: my-evolution/Locations.h:863
+msgid "Guantanamo"
+msgstr ""
+
+#: my-evolution/Locations.h:864
+#, fuzzy
+msgid "Guarany"
+msgstr "maig"
+
+#: my-evolution/Locations.h:865
+#, fuzzy
+msgid "Guaratingueta"
+msgstr "General"
+
+#: my-evolution/Locations.h:866
+msgid "Guarulhos"
+msgstr ""
+
+#: my-evolution/Locations.h:868
+msgid "Guayaquil/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:869
+#, fuzzy
+msgid "Guaymas"
+msgstr "am"
+
+#: my-evolution/Locations.h:870
+#, fuzzy
+msgid "Guernsey"
+msgstr "maig"
+
+#: my-evolution/Locations.h:871
+#, fuzzy
+msgid "Guidonia"
+msgstr "General"
+
+#: my-evolution/Locations.h:872
+msgid "Gulfport"
+msgstr ""
+
+#: my-evolution/Locations.h:873
+#, fuzzy
+msgid "Gulkana"
+msgstr "General"
+
+#: my-evolution/Locations.h:874
+msgid "Gullfax C"
+msgstr ""
+
+#: my-evolution/Locations.h:875
+#, fuzzy
+msgid "Gunnison"
+msgstr "Seccions:"
+
+#: my-evolution/Locations.h:876
+msgid "Gunnison (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:877
+#, fuzzy
+msgid "Guriat"
+msgstr "General"
+
+#: my-evolution/Locations.h:878
+msgid "Gustavus"
+msgstr ""
+
+#: my-evolution/Locations.h:879
+#, fuzzy
+msgid "Guymon"
+msgstr "am"
+
+#: my-evolution/Locations.h:880
+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 ""
+
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#, fuzzy
+msgid "Hail"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:886
+msgid "Hailey-Sun Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:887
+#, fuzzy
+msgid "Haines"
+msgstr "Encap�alaments"
+
+#: 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 "_Correu"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:902
+#, fuzzy
+msgid "Ha Noi"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:903
+msgid "Harbor Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:904
+#, fuzzy
+msgid "Harlingen"
+msgstr "S'est� movent"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:911
+#, fuzzy
+msgid "Hastings"
+msgstr "Encap�alaments"
+
+#: my-evolution/Locations.h:912
+msgid "Haugesund"
+msgstr ""
+
+#: my-evolution/Locations.h:913
+#, fuzzy
+msgid "Havre"
+msgstr "Cap�alera"
+
+#: my-evolution/Locations.h:914
+#, fuzzy
+msgid "Hawaii"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:915
+msgid "Hawthorne"
+msgstr ""
+
+#: my-evolution/Locations.h:916
+#, fuzzy
+msgid "Hayden"
+msgstr "Cap�alera"
+
+#: my-evolution/Locations.h:917
+msgid "Hayes River"
+msgstr ""
+
+#: my-evolution/Locations.h:918
+#, fuzzy
+msgid "Hays"
+msgstr "dies"
+
+#: 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 "Vist"
+
+#: my-evolution/Locations.h:922
+msgid "Helsinki"
+msgstr ""
+
+#: my-evolution/Locations.h:923
+#, fuzzy
+msgid "Henderson"
+msgstr "Cap�alera"
+
+#: 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
+msgid "Hillsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:930
+#, fuzzy
+msgid "Hilo"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:931
+msgid "Hinesville"
+msgstr ""
+
+#: my-evolution/Locations.h:932
+msgid "Hiroshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:933
+#, fuzzy
+msgid "Hobart"
+msgstr "Hores"
+
+#: my-evolution/Locations.h:934
+#, fuzzy
+msgid "Hobbs"
+msgstr "Hores"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:941
+#, fuzzy
+msgid "Holguin"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:942
+#, fuzzy
+msgid "Homer"
+msgstr "Particular"
+
+#: my-evolution/Locations.h:943
+#, fuzzy
+msgid "Homestead AFB"
+msgstr "% comp_let:"
+
+#: my-evolution/Locations.h:944
+#, fuzzy
+msgid "Hondo"
+msgstr "_Envia"
+
+#: 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 "Agrupament"
+
+#: my-evolution/Locations.h:954
+#, fuzzy
+msgid "Houma"
+msgstr "Particular"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:960
+#, fuzzy
+msgid "Howard AFB"
+msgstr "Reenvia"
+
+#: my-evolution/Locations.h:961
+msgid "Hsinchu"
+msgstr ""
+
+#: my-evolution/Locations.h:962
+msgid "Huanuco"
+msgstr ""
+
+#: my-evolution/Locations.h:963
+msgid "Huehuetenango"
+msgstr ""
+
+#: my-evolution/Locations.h:964
+#, fuzzy
+msgid "Hulien"
+msgstr "Amaga"
+
+#: my-evolution/Locations.h:965
+msgid "Humberside"
+msgstr ""
+
+#: my-evolution/Locations.h:967
+msgid "Huntington"
+msgstr ""
+
+#: my-evolution/Locations.h:968
+#, fuzzy
+msgid "Huntsville"
+msgstr "fins a"
+
+#: my-evolution/Locations.h:969
+msgid "Hurlburt"
+msgstr ""
+
+#: my-evolution/Locations.h:970
+#, fuzzy
+msgid "Huron"
+msgstr "Hora"
+
+#: 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 "Enganxa"
+
+#: my-evolution/Locations.h:977
+msgid "Ibiza"
+msgstr ""
+
+#: my-evolution/Locations.h:979
+msgid "Ichikawa"
+msgstr ""
+
+#: my-evolution/Locations.h:980
+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 "Finl�ndia"
+
+#: my-evolution/Locations.h:985
+#, fuzzy
+msgid "Iliamna"
+msgstr "Visualitza en l�nia"
+
+#: my-evolution/Locations.h:986
+msgid "Illinois"
+msgstr ""
+
+#: my-evolution/Locations.h:987
+#, fuzzy
+msgid "Imperial"
+msgstr "abril"
+
+#: my-evolution/Locations.h:988
+#, fuzzy
+msgid "Imperial (2)"
+msgstr "abril"
+
+#: my-evolution/Locations.h:989
+#, fuzzy
+msgid "Imperial Beach"
+msgstr "abril"
+
+#: my-evolution/Locations.h:990
+msgid "In Amenas"
+msgstr ""
+
+#: my-evolution/Locations.h:992
+#, fuzzy
+msgid "Indiana"
+msgstr "_�ndex"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:998
+#, fuzzy
+msgid "Inverness"
+msgstr "En proc�s"
+
+#: my-evolution/Locations.h:999
+msgid "Inyokern"
+msgstr ""
+
+#: my-evolution/Locations.h:1000
+#, fuzzy
+msgid "Iowa"
+msgstr "Ara"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1005
+#, fuzzy
+msgid "Iraklion"
+msgstr "Cap informaci�"
+
+#: my-evolution/Locations.h:1006
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1008
+#, fuzzy
+msgid "Iron Mountain"
+msgstr "cont�"
+
+#: 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 "avui"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1025
+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 "Cancel�lat"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1044
+#, fuzzy
+msgid "Jonkoping"
+msgstr "S'est� movent"
+
+#: my-evolution/Locations.h:1045
+#, fuzzy
+msgid "Joplin"
+msgstr "S'est� copiant"
+
+#: my-evolution/Locations.h:1047
+msgid "Juanjui"
+msgstr ""
+
+#: my-evolution/Locations.h:1048
+msgid "Juan Santamaria"
+msgstr ""
+
+#: my-evolution/Locations.h:1049
+msgid "Juigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:1050
+#, fuzzy
+msgid "Jujuy"
+msgstr "juliol"
+
+#: my-evolution/Locations.h:1051
+#, fuzzy
+msgid "Juliaca"
+msgstr "P�blic"
+
+#: my-evolution/Locations.h:1052
+#, fuzzy
+msgid "Junction"
+msgstr "Seccions:"
+
+#: my-evolution/Locations.h:1053
+#, fuzzy
+msgid "Juneau"
+msgstr "juny"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1059
+#, fuzzy
+msgid "Kalamata"
+msgstr "_Correu"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1071
+#, fuzzy
+msgid "Karachi"
+msgstr "mar�"
+
+#: my-evolution/Locations.h:1072
+#, fuzzy
+msgid "Karup"
+msgstr "Grup %i"
+
+#: 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
+msgid "Kazan"
+msgstr ""
+
+#: my-evolution/Locations.h:1080
+msgid "Kearney"
+msgstr ""
+
+#: my-evolution/Locations.h:1081
+#, fuzzy
+msgid "Keene"
+msgstr "Vist"
+
+#: 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 "Sendmail"
+
+#: my-evolution/Locations.h:1085
+msgid "Kenosha"
+msgstr ""
+
+#: my-evolution/Locations.h:1086
+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 "maig"
+
+#: my-evolution/Locations.h:1090
+msgid "Ketchikan"
+msgstr ""
+
+#: my-evolution/Locations.h:1091
+#, fuzzy
+msgid "Key West"
+msgstr "Comprova"
+
+#: 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 "Finl�ndia"
+
+#: 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 "Avui"
+
+#: my-evolution/Locations.h:1132
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1133
+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
+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 ""
+"Entrant\n"
+"Sortint\n"
+
+#: 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 "vuit�"
+
+#: my-evolution/Locations.h:1151
+msgid "La Coruna"
+msgstr ""
+
+#: my-evolution/Locations.h:1152
+#, fuzzy
+msgid "La Crosse"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:1153
+msgid "La Esperanza"
+msgstr ""
+
+#: my-evolution/Locations.h:1154
+#, fuzzy
+msgid "Lafayette"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1155
+msgid "La Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1156
+#, fuzzy
+msgid "Lahaina"
+msgstr "Cotxe"
+
+#: my-evolution/Locations.h:1157
+#, fuzzy
+msgid "Lahore"
+msgstr "Busca"
+
+#: my-evolution/Locations.h:1158
+#, fuzzy
+msgid "Lajes"
+msgstr "Baixa"
+
+#: 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 "Finl�ndia"
+
+#: my-evolution/Locations.h:1164
+msgid "Lake Tahoe"
+msgstr ""
+
+#: my-evolution/Locations.h:1165
+#, fuzzy
+msgid "Lakeview"
+msgstr "Previsualitzaci�:"
+
+#: my-evolution/Locations.h:1166
+#, fuzzy
+msgid "Lamar"
+msgstr "Busca"
+
+#: my-evolution/Locations.h:1167
+#, fuzzy
+msgid "La Mesa"
+msgstr "FIXME: Missatge de _correu"
+
+#: my-evolution/Locations.h:1168
+msgid "Lamezia"
+msgstr ""
+
+#: my-evolution/Locations.h:1169
+#, fuzzy
+msgid "Lamoni"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:1170
+msgid "Lampedusa"
+msgstr ""
+
+#: my-evolution/Locations.h:1171
+#, fuzzy
+msgid "Lanai"
+msgstr "Busca"
+
+#: my-evolution/Locations.h:1172
+#, fuzzy
+msgid "Lancaster"
+msgstr "Horitzontal"
+
+#: my-evolution/Locations.h:1173
+#, fuzzy
+msgid "Lander"
+msgstr "Cap�alera"
+
+#: my-evolution/Locations.h:1174
+#, fuzzy
+msgid "Langebaanweg"
+msgstr "Busca"
+
+#: my-evolution/Locations.h:1175
+msgid "Langley AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1176
+msgid "Lannion"
+msgstr ""
+
+#: my-evolution/Locations.h:1177
+#, fuzzy
+msgid "Lansing"
+msgstr "S'est� movent"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1182
+#, fuzzy
+msgid "Laredo"
+msgstr "Busca"
+
+#: my-evolution/Locations.h:1183
+#, fuzzy
+msgid "Larnaka"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:1184
+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 "R�dio"
+
+#: my-evolution/Locations.h:1189
+msgid "Latrobe"
+msgstr ""
+
+#: my-evolution/Locations.h:1191
+msgid "Laughlin"
+msgstr ""
+
+#: my-evolution/Locations.h:1192
+#, fuzzy
+msgid "Laurel"
+msgstr "Busca"
+
+#: my-evolution/Locations.h:1193
+msgid "La Verne"
+msgstr ""
+
+#: my-evolution/Locations.h:1194
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1195
+#, fuzzy
+msgid "Lawton"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:1196
+msgid "Leadville"
+msgstr ""
+
+#: my-evolution/Locations.h:1197
+#, fuzzy
+msgid "Learmouth"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:1199
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1201
+msgid "Leesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1202
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1205
+#, fuzzy
+msgid "Leknes"
+msgstr "dc."
+
+#: my-evolution/Locations.h:1206
+#, fuzzy
+msgid "Le Mans"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1207
+#, fuzzy
+msgid "Le Marine"
+msgstr "Minut"
+
+#: my-evolution/Locations.h:1208
+msgid "Lemmon"
+msgstr ""
+
+#: my-evolution/Locations.h:1209
+#, fuzzy
+msgid "Lemoore"
+msgstr "Elimina"
+
+#: my-evolution/Locations.h:1210
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1212
+#, fuzzy
+msgid "Leuchars"
+msgstr "anys"
+
+#: my-evolution/Locations.h:1213
+msgid "Lewisburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1214
+#, fuzzy
+msgid "Lewiston"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:1215
+#, fuzzy
+msgid "Lewistown"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:1216
+msgid "Lexington"
+msgstr ""
+
+#: my-evolution/Locations.h:1217
+#, fuzzy
+msgid "Liberal"
+msgstr "abril"
+
+#: my-evolution/Locations.h:1219
+#, fuzzy
+msgid "Libya"
+msgstr "abril"
+
+#: my-evolution/Locations.h:1220
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1221
+msgid "Lidgerwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1222
+#, fuzzy
+msgid "Liege"
+msgstr "Alta"
+
+#: my-evolution/Locations.h:1223
+#, fuzzy
+msgid "Lihue"
+msgstr "Minut"
+
+#: my-evolution/Locations.h:1224
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1225
+msgid "Lima-Callao"
+msgstr ""
+
+#: my-evolution/Locations.h:1226
+#, fuzzy
+msgid "Limnos"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:1227
+#, fuzzy
+msgid "Limoges"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:1228
+#, fuzzy
+msgid "Limon"
+msgstr "mes"
+
+#: my-evolution/Locations.h:1229
+#, fuzzy
+msgid "Lincoln"
+msgstr ""
+"Entrant\n"
+"Sortint\n"
+
+#: my-evolution/Locations.h:1230
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1231
+#, fuzzy
+msgid "Lisboa"
+msgstr "abril"
+
+#: my-evolution/Locations.h:1232
+#, fuzzy
+msgid "Lista"
+msgstr "�s"
+
+#: my-evolution/Locations.h:1233
+#, fuzzy
+msgid "Litchfield"
+msgstr "vuit�"
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1240
+msgid "Ljubljana"
+msgstr ""
+
+#: my-evolution/Locations.h:1241
+#, fuzzy
+msgid "Logan"
+msgstr "Avui"
+
+#: my-evolution/Locations.h:1242
+msgid "Lolland Falster"
+msgstr ""
+
+#: my-evolution/Locations.h:1243
+#, fuzzy
+msgid "Lompoc"
+msgstr "Redacta"
+
+#: my-evolution/Locations.h:1244
+#, fuzzy
+msgid "London"
+msgstr "_Envia"
+
+#: my-evolution/Locations.h:1245
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1249
+#, fuzzy
+msgid "Londrina"
+msgstr "Hores"
+
+#: my-evolution/Locations.h:1250
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1253
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+#: my-evolution/Locations.h:1254
+#, fuzzy
+msgid "Los Alamos"
+msgstr "Alarmes"
+
+#: my-evolution/Locations.h:1255
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1260
+msgid "Lousiana"
+msgstr ""
+
+#: my-evolution/Locations.h:1261
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1265
+#, fuzzy
+msgid "Lugano"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:1266
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1267
+#, fuzzy
+msgid "Luton"
+msgstr "Agrupament"
+
+#: my-evolution/Locations.h:1269
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1270
+#, fuzzy
+msgid "Luxor"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:1271
+msgid "Lviv"
+msgstr ""
+
+#: my-evolution/Locations.h:1272
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1275
+msgid "Lyon-Satolas"
+msgstr ""
+
+#: my-evolution/Locations.h:1276
+#, fuzzy
+msgid "Maastricht"
+msgstr "mar�"
+
+#: my-evolution/Locations.h:1277
+#, fuzzy
+msgid "Macae"
+msgstr "mar�"
+
+#: my-evolution/Locations.h:1278
+#, fuzzy
+msgid "Macapa"
+msgstr "mar�"
+
+#: my-evolution/Locations.h:1279
+#, fuzzy
+msgid "Maceio"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1280
+#, fuzzy
+msgid "Macon"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1281
+#, fuzzy
+msgid "Madinah"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1282
+#, fuzzy
+msgid "Madison"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:1283
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1285
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+#: my-evolution/Locations.h:1286
+#, fuzzy
+msgid "Magadan"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:1287
+msgid "Magdalena"
+msgstr ""
+
+#: my-evolution/Locations.h:1288
+#, fuzzy
+msgid "Maine"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1289
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1290
+msgid "Makkah"
+msgstr ""
+
+#: my-evolution/Locations.h:1291
+#, fuzzy
+msgid "Makung"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1292
+#, fuzzy
+msgid "Malad City"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1293
+#, fuzzy
+msgid "Malaga"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1294
+#, fuzzy
+msgid "Malatya"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1295
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1296
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1298
+msgid "Mammoth Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1299
+#, fuzzy
+msgid "Managua"
+msgstr "Busca"
+
+#: my-evolution/Locations.h:1300
+#, fuzzy
+msgid "Manassas"
+msgstr "_Missatge"
+
+#: my-evolution/Locations.h:1301
+#, fuzzy
+msgid "Manaus"
+msgstr "mar�"
+
+#: my-evolution/Locations.h:1302
+#, fuzzy
+msgid "Manchester"
+msgstr "Cam�:"
+
+#: my-evolution/Locations.h:1303
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+msgid "Manhattan"
+msgstr ""
+
+#: my-evolution/Locations.h:1305
+#, fuzzy
+msgid "Manisa"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1306
+#, fuzzy
+msgid "Manistee"
+msgstr "�s"
+
+#: my-evolution/Locations.h:1307
+#, fuzzy
+msgid "Manitoba"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1308
+msgid "Manitowoc"
+msgstr ""
+
+#: my-evolution/Locations.h:1309
+#, fuzzy
+msgid "Mankato"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1310
+#, fuzzy
+msgid "Mansfield"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1311
+#, fuzzy
+msgid "Manta"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1312
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1313
+msgid "Maraba"
+msgstr ""
+
+#: my-evolution/Locations.h:1314
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1315
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1316
+#, fuzzy
+msgid "Marathon"
+msgstr "mar�"
+
+#: my-evolution/Locations.h:1317
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1318
+#, fuzzy
+msgid "Margarita"
+msgstr "Marges"
+
+#: my-evolution/Locations.h:1319
+#, fuzzy
+msgid "Marianna"
+msgstr "Marges"
+
+#: my-evolution/Locations.h:1320
+#, fuzzy
+msgid "Marib"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1321
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1322
+#, fuzzy
+msgid "Marietta"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1323
+msgid "Marino di Ravenna"
+msgstr ""
+
+#: my-evolution/Locations.h:1324
+#, fuzzy
+msgid "Marion"
+msgstr "Marges"
+
+#: my-evolution/Locations.h:1325
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1326
+#, fuzzy
+msgid "Marquette"
+msgstr "Minut"
+
+#: my-evolution/Locations.h:1327
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+msgid "Marseilles"
+msgstr ""
+
+#: my-evolution/Locations.h:1329
+#, fuzzy
+msgid "Marshall"
+msgstr "mar�"
+
+#: my-evolution/Locations.h:1330
+msgid "Marshalltown"
+msgstr ""
+
+#: my-evolution/Locations.h:1331
+msgid "Marshfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1332
+#, fuzzy
+msgid "Marte"
+msgstr "Minut"
+
+#: my-evolution/Locations.h:1333
+#, fuzzy
+msgid "Marthas Vineyard"
+msgstr "Marca'l com a per _llegir"
+
+#: my-evolution/Locations.h:1334
+#, fuzzy
+msgid "Martinsburg"
+msgstr "Minut"
+
+#: my-evolution/Locations.h:1335
+#, fuzzy
+msgid "Martinsville"
+msgstr "Minut"
+
+#: my-evolution/Locations.h:1336
+#, fuzzy
+msgid "Maryland"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1339
+msgid "Mashhad"
+msgstr ""
+
+#: my-evolution/Locations.h:1340
+#, fuzzy
+msgid "Masirah"
+msgstr "mar�"
+
+#: my-evolution/Locations.h:1341
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1343
+#, fuzzy
+msgid "Massena"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1344
+#, fuzzy
+msgid "Matamoros"
+msgstr "Colors"
+
+#: my-evolution/Locations.h:1345
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1347
+msgid "Matsuyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1348
+#, fuzzy
+msgid "Mattoon"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1349
+#, fuzzy
+msgid "Mayaguez"
+msgstr "Busca"
+
+#: my-evolution/Locations.h:1350
+#, fuzzy
+msgid "Mayport"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1351
+#, fuzzy
+msgid "Mazatlan"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1352
+#, fuzzy
+msgid "Mazu"
+msgstr "mar�"
+
+#: my-evolution/Locations.h:1353
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1354
+msgid "McAllen"
+msgstr ""
+
+#: my-evolution/Locations.h:1355
+#, fuzzy
+msgid "McCall"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1356
+#, fuzzy
+msgid "McCarthy"
+msgstr "mar�"
+
+#: my-evolution/Locations.h:1357
+msgid "McClellan"
+msgstr ""
+
+#: my-evolution/Locations.h:1358
+#, fuzzy
+msgid "McComb"
+msgstr "Copia"
+
+#: my-evolution/Locations.h:1359
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1361
+msgid "Mc Gregor"
+msgstr ""
+
+#: my-evolution/Locations.h:1362
+#, fuzzy
+msgid "Meacham"
+msgstr "mar�"
+
+#: my-evolution/Locations.h:1363
+#, fuzzy
+msgid "Medford"
+msgstr "abans de"
+
+#: my-evolution/Locations.h:1364
+msgid "Medicine Lodge"
+msgstr ""
+
+#: my-evolution/Locations.h:1365
+#, fuzzy
+msgid "Mehamn"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1366
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1367
+msgid "Melbourne"
+msgstr ""
+
+#: my-evolution/Locations.h:1368
+#, fuzzy
+msgid "Melfa"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1369
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1373
+#, fuzzy
+msgid "Mendoza"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1374
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1377
+msgid "Merced"
+msgstr ""
+
+#: my-evolution/Locations.h:1378
+#, fuzzy
+msgid "Merida"
+msgstr "Divendres"
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1380
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1381
+msgid "Merril Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1382
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1386
+#, fuzzy
+msgid "Mexicali"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1388
+#, fuzzy
+msgid "Miami"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1391
+msgid "Michigan"
+msgstr ""
+
+#: my-evolution/Locations.h:1392
+#, fuzzy
+msgid "Middle East"
+msgstr "_Mig:"
+
+#: my-evolution/Locations.h:1393
+msgid "Middleton Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1394
+#, fuzzy
+msgid "Middletown"
+msgstr "_Mig:"
+
+#: my-evolution/Locations.h:1395
+#, fuzzy
+msgid "Midland"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1396
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1398
+msgid "Milano/Malpensa"
+msgstr ""
+
+#: my-evolution/Locations.h:1399
+#, fuzzy
+msgid "Miles City"
+msgstr "Nom del fitxer:"
+
+#: my-evolution/Locations.h:1400
+#, fuzzy
+msgid "Milford"
+msgstr "per a"
+
+#: my-evolution/Locations.h:1401
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1402
+msgid "Millville"
+msgstr ""
+
+#: my-evolution/Locations.h:1403
+#, fuzzy
+msgid "Milton"
+msgstr "Envia per correu _a:"
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1407
+msgid "Minatitlan"
+msgstr ""
+
+#: my-evolution/Locations.h:1408
+#, fuzzy
+msgid "Minchumina"
+msgstr ""
+"Entrant\n"
+"Sortint\n"
+
+#: my-evolution/Locations.h:1409
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1414
+#, fuzzy
+msgid "Minnesota"
+msgstr "Minuts"
+
+#: my-evolution/Locations.h:1415
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1416
+#, fuzzy
+msgid "Minot"
+msgstr "no �s"
+
+#: my-evolution/Locations.h:1417
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1419
+msgid "Mississippi"
+msgstr ""
+
+#: my-evolution/Locations.h:1420
+#, fuzzy
+msgid "Missoula"
+msgstr "�s"
+
+#: my-evolution/Locations.h:1421
+#, fuzzy
+msgid "Missouri"
+msgstr "�s"
+
+#: my-evolution/Locations.h:1422
+#, fuzzy
+msgid "Mitchell"
+msgstr "Cam�:"
+
+#: my-evolution/Locations.h:1423
+#, fuzzy
+msgid "Mitilini"
+msgstr "Llista de correu %s"
+
+#: my-evolution/Locations.h:1424
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1425
+#, fuzzy
+msgid "Miyazaki Airport"
+msgstr "Transport de correu"
+
+#: my-evolution/Locations.h:1426
+#, fuzzy
+msgid "Moa"
+msgstr "Dl"
+
+#: my-evolution/Locations.h:1427
+#, fuzzy
+msgid "Mobile Downtown"
+msgstr "M�bil"
+
+#: my-evolution/Locations.h:1428
+msgid "Mobile Regional Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1429
+#, fuzzy
+msgid "Mobridge"
+msgstr "M�bil"
+
+#: my-evolution/Locations.h:1430
+#, fuzzy
+msgid "Modesto"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:1431
+msgid "Mo I Rana"
+msgstr ""
+
+#: my-evolution/Locations.h:1432
+#, fuzzy
+msgid "Mojave"
+msgstr "Mou"
+
+#: my-evolution/Locations.h:1433
+#, fuzzy
+msgid "Molde"
+msgstr "M�bil"
+
+#: my-evolution/Locations.h:1434
+#, fuzzy
+msgid "Moldova"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1435
+msgid "Moline-Quad Cities"
+msgstr ""
+
+#: my-evolution/Locations.h:1436
+#, fuzzy
+msgid "Molokai"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1437
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1438
+msgid "Monchengladbach"
+msgstr ""
+
+#: my-evolution/Locations.h:1439
+#, fuzzy
+msgid "Monclova"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1440
+#, fuzzy
+msgid "Moncton"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1441
+#, fuzzy
+msgid "Monida"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1442
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+#: my-evolution/Locations.h:1443
+#, fuzzy
+msgid "Monroe"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1444
+#, fuzzy
+msgid "Montague"
+msgstr "Busca"
+
+#: my-evolution/Locations.h:1445
+#, fuzzy
+msgid "Montana"
+msgstr "cont�"
+
+#: my-evolution/Locations.h:1446
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1448
+msgid "Monte Bisbino"
+msgstr ""
+
+#: my-evolution/Locations.h:1449
+msgid "Monte Calamita"
+msgstr ""
+
+#: my-evolution/Locations.h:1450
+#, fuzzy
+msgid "Monte Cimone"
+msgstr "Mes"
+
+#: my-evolution/Locations.h:1451
+msgid "Montego Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:1452
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1453
+#, fuzzy
+msgid "Monterey"
+msgstr "Mes"
+
+#: my-evolution/Locations.h:1454
+msgid "Monterrey"
+msgstr ""
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1458
+msgid "Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1459
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1460
+#, fuzzy
+msgid "Monticello"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1461
+#, fuzzy
+msgid "Montpelier"
+msgstr "Mes"
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1465
+#, fuzzy
+msgid "Montrose"
+msgstr "Lletres"
+
+#: my-evolution/Locations.h:1466
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1467
+msgid "Morelia"
+msgstr ""
+
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Morgantown"
+msgstr "Organitzaci�"
+
+#: my-evolution/Locations.h:1469
+#, fuzzy
+msgid "Moriarty"
+msgstr "Primari"
+
+#: my-evolution/Locations.h:1471
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1474
+msgid "Moses Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1475
+#, fuzzy
+msgid "Mosinee"
+msgstr "M�bil"
+
+#: my-evolution/Locations.h:1476
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain Home"
+msgstr ""
+
+#: my-evolution/Locations.h:1479
+#, fuzzy
+msgid "Mountain View"
+msgstr "Mes"
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1482
+#, fuzzy
+msgid "Mount Shasta"
+msgstr "Fonts"
+
+#: my-evolution/Locations.h:1483
+#, fuzzy
+msgid "Mount Vernon"
+msgstr "Mes"
+
+#: my-evolution/Locations.h:1484
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1487
+msgid "Muir"
+msgstr ""
+
+#: my-evolution/Locations.h:1488
+#, fuzzy
+msgid "Mullan"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:1489
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1490
+msgid "Munchen"
+msgstr ""
+
+#: my-evolution/Locations.h:1491
+#, fuzzy
+msgid "Muncie"
+msgstr "juny"
+
+#: my-evolution/Locations.h:1492
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1493
+#, fuzzy
+msgid "Murcia"
+msgstr "agost"
+
+#: my-evolution/Locations.h:1494
+msgid "Murmansk"
+msgstr ""
+
+#: my-evolution/Locations.h:1495
+#, fuzzy
+msgid "Mus"
+msgstr "Ocupat"
+
+#: my-evolution/Locations.h:1496
+#, fuzzy
+msgid "Muscatine"
+msgstr "Minut"
+
+#: my-evolution/Locations.h:1497
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1498
+msgid "Muskegon"
+msgstr ""
+
+#: my-evolution/Locations.h:1499
+#, fuzzy
+msgid "Mykonos"
+msgstr "Lletres"
+
+#: my-evolution/Locations.h:1500
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1507
+msgid "Najran"
+msgstr ""
+
+#: my-evolution/Locations.h:1508
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1509
+msgid "Nalchik"
+msgstr ""
+
+#: my-evolution/Locations.h:1510
+#, fuzzy
+msgid "Namsos"
+msgstr "Nom"
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1513
+msgid "Nankishirahama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1514
+#, fuzzy
+msgid "Nanning"
+msgstr "S'est� movent"
+
+#: my-evolution/Locations.h:1515
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1516
+msgid "Nantucket"
+msgstr ""
+
+#: my-evolution/Locations.h:1517
+#, fuzzy
+msgid "Napa"
+msgstr "Recupera el correu"
+
+#: my-evolution/Locations.h:1518
+#, fuzzy
+msgid "Naples"
+msgstr "Nom"
+
+#: my-evolution/Locations.h:1519
+#, fuzzy
+msgid "Napoli"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1520
+#, fuzzy
+msgid "Narvik"
+msgstr "_Sobrenom:"
+
+#: my-evolution/Locations.h:1521
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1524
+msgid "Nassau"
+msgstr ""
+
+#: my-evolution/Locations.h:1525
+#, fuzzy
+msgid "Natal"
+msgstr "avui"
+
+#: my-evolution/Locations.h:1526
+#, fuzzy
+msgid "Natchez"
+msgstr "Cam�:"
+
+#: my-evolution/Locations.h:1527
+msgid "Nawabshah"
+msgstr ""
+
+#: my-evolution/Locations.h:1528
+#, fuzzy
+msgid "Nebraska"
+msgstr "Tasca"
+
+#: my-evolution/Locations.h:1529
+#, fuzzy
+msgid "Needles"
+msgstr "dc."
+
+#: my-evolution/Locations.h:1530
+#, fuzzy
+msgid "Nenana"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:1532
+msgid "Neuquen"
+msgstr ""
+
+#: my-evolution/Locations.h:1533
+#, fuzzy
+msgid "Nevada"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:1534
+#, fuzzy
+msgid "Newark"
+msgstr "Tasca"
+
+#: my-evolution/Locations.h:1535
+#, fuzzy
+msgid "New Bedford"
+msgstr "Servidors de not�cies"
+
+#: my-evolution/Locations.h:1536
+#, fuzzy
+msgid "New Bern"
+msgstr "Nova a_genda"
+
+#: my-evolution/Locations.h:1537
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1539
+msgid "Newburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1540
+#, fuzzy
+msgid "Newcastle"
+msgstr "Nou"
+
+#: my-evolution/Locations.h:1541
+#, fuzzy
+msgid "New Delhi/Palam"
+msgstr "Recupera el correu"
+
+#: my-evolution/Locations.h:1542
+#, fuzzy
+msgid "Newfoundland"
+msgstr "Recupera el correu"
+
+#: my-evolution/Locations.h:1543
+msgid "New Hampshire"
+msgstr ""
+
+#: my-evolution/Locations.h:1544
+#, fuzzy
+msgid "New Haven"
+msgstr "Nova a_genda"
+
+#: my-evolution/Locations.h:1545
+#, fuzzy
+msgid "New Iberia"
+msgstr "Visualitza tots els contactes"
+
+#: my-evolution/Locations.h:1546
+#, fuzzy
+msgid "New Jersey"
+msgstr "_Missatge"
+
+#: my-evolution/Locations.h:1547
+msgid "New Mexico"
+msgstr ""
+
+#: my-evolution/Locations.h:1548
+#, fuzzy
+msgid "New Orleans"
+msgstr "Selecciona'ls _tots"
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1550
+msgid "New Orleans NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1551
+#, fuzzy
+msgid "Newport"
+msgstr "quart"
+
+#: my-evolution/Locations.h:1552
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1553
+msgid "New Port Richey"
+msgstr ""
+
+#: my-evolution/Locations.h:1554
+#, fuzzy
+msgid "New River"
+msgstr "Nova a_genda"
+
+#: my-evolution/Locations.h:1555
+msgid "New Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1556
+#, fuzzy
+msgid "Newton"
+msgstr "Nou"
+
+#: my-evolution/Locations.h:1557
+#, fuzzy
+msgid "New York"
+msgstr "Nova VFolder"
+
+#: my-evolution/Locations.h:1558
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1559
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1561
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1564
+msgid "Niigata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1565
+#, fuzzy
+msgid "Nimes-Garons"
+msgstr "Dimensions:"
+
+#: my-evolution/Locations.h:1566
+#, fuzzy
+msgid "Nipawin"
+msgstr "_Envia"
+
+#: my-evolution/Locations.h:1567
+#, fuzzy
+msgid "Nis"
+msgstr "�s"
+
+#: my-evolution/Locations.h:1568
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1570
+msgid "N Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1571
+#, fuzzy
+msgid "Nogales"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:1572
+#, fuzzy
+msgid "Nome"
+msgstr "Nom"
+
+#: my-evolution/Locations.h:1573
+#, fuzzy
+msgid "Norfolk"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:1575
+msgid "Norfolk NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1576
+#, fuzzy
+msgid "Norrkoping"
+msgstr "S'est� movent"
+
+#: my-evolution/Locations.h:1577
+#, fuzzy
+msgid "North Adams"
+msgstr "No_tes:"
+
+#: my-evolution/Locations.h:1578
+#, fuzzy
+msgid "North Bend"
+msgstr "quart"
+
+#: my-evolution/Locations.h:1579
+msgid "North Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:1580
+#, fuzzy
+msgid "North Conway"
+msgstr "Ara"
+
+#: my-evolution/Locations.h:1581
+#, fuzzy
+msgid "North Dakota"
+msgstr "No_tes:"
+
+#: my-evolution/Locations.h:1582
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1583
+msgid "North Kingstown"
+msgstr ""
+
+#: my-evolution/Locations.h:1584
+#, fuzzy
+msgid "North Platte"
+msgstr "No_tes:"
+
+#: my-evolution/Locations.h:1585
+#, fuzzy
+msgid "Northway"
+msgstr "Ara"
+
+#: my-evolution/Locations.h:1586
+#, fuzzy
+msgid "Northwest Territories"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:1588
+#, fuzzy
+msgid "Norwich"
+msgstr "quart"
+
+#: my-evolution/Locations.h:1589
+#, fuzzy
+msgid "Norwood"
+msgstr "Ara"
+
+#: my-evolution/Locations.h:1590
+#, fuzzy
+msgid "Notodden"
+msgstr "Cap"
+
+#: my-evolution/Locations.h:1591
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1595
+msgid "Nueva Ocotepeque"
+msgstr ""
+
+#: my-evolution/Locations.h:1596
+#, fuzzy
+msgid "Nuevo Laredo"
+msgstr "No iniciat"
+
+#: my-evolution/Locations.h:1597
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+#, fuzzy
+msgid "Oahu"
+msgstr "Opac"
+
+#: my-evolution/Locations.h:1600
+msgid "Oak Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:1601
+#, fuzzy
+msgid "Oakland"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1602
+msgid "Oaxaca"
+msgstr ""
+
+#: my-evolution/Locations.h:1603
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+msgid "Obihiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1605
+#, fuzzy
+msgid "Ocala"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1606
+msgid "Oceanside"
+msgstr ""
+
+#: my-evolution/Locations.h:1607
+#, fuzzy
+msgid "Odense"
+msgstr "_Obre"
+
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1609
+#, fuzzy
+msgid "Oelwen"
+msgstr "_Obre"
+
+#: my-evolution/Locations.h:1610
+#, fuzzy
+msgid "Ogden"
+msgstr "_Obre"
+
+#: my-evolution/Locations.h:1611
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1613
+msgid "Ohio"
+msgstr ""
+
+#: my-evolution/Locations.h:1614
+#, fuzzy
+msgid "Ohrid"
+msgstr "Altres"
+
+#: my-evolution/Locations.h:1615
+msgid "Oita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1616
+msgid "Ojika Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1617
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1624
+msgid "Okushiri Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1625
+#, fuzzy
+msgid "Olathe"
+msgstr "Altres"
+
+#: my-evolution/Locations.h:1626
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1627
+msgid "Olbia"
+msgstr ""
+
+#: my-evolution/Locations.h:1628
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1629
+msgid "Omaha"
+msgstr ""
+
+#: my-evolution/Locations.h:1630
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1631
+#, fuzzy
+msgid "Omak"
+msgstr "D'acord"
+
+#: my-evolution/Locations.h:1633
+msgid "Ominato Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1634
+#, fuzzy
+msgid "Omsk"
+msgstr "D'acord"
+
+#: my-evolution/Locations.h:1635
+msgid "O'Neill"
+msgstr ""
+
+#: my-evolution/Locations.h:1636
+#, fuzzy
+msgid "Ontario"
+msgstr "Orientaci�"
+
+#: my-evolution/Locations.h:1637
+#, fuzzy
+msgid "Oostende"
+msgstr "Tots els assistents"
+
+#: my-evolution/Locations.h:1638
+#, fuzzy
+msgid "Oran"
+msgstr "Cancel�lat"
+
+#: my-evolution/Locations.h:1639
+msgid "Oran/Es Senia"
+msgstr ""
+
+#: my-evolution/Locations.h:1640
+#, fuzzy
+msgid "Orange"
+msgstr "Cancel�lat"
+
+#: my-evolution/Locations.h:1641
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1642
+msgid "Ord-Sharp"
+msgstr ""
+
+#: my-evolution/Locations.h:1643
+#, fuzzy
+msgid "Oregon"
+msgstr "Seccions:"
+
+#: my-evolution/Locations.h:1644
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1645
+#, fuzzy
+msgid "Orland"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1646
+#, fuzzy
+msgid "Orlando"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1647
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1648
+msgid "Orsta-Volda"
+msgstr ""
+
+#: my-evolution/Locations.h:1649
+#, fuzzy
+msgid "Oruro"
+msgstr "Cap error"
+
+#: my-evolution/Locations.h:1650
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1652
+#, fuzzy
+msgid "Oscoda"
+msgstr "segon"
+
+#: my-evolution/Locations.h:1653
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1657
+msgid "Ostrava"
+msgstr ""
+
+#: my-evolution/Locations.h:1658
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1661
+#, fuzzy
+msgid "Owyhee"
+msgstr "setmana"
+
+#: my-evolution/Locations.h:1662
+#, fuzzy
+msgid "Oxford"
+msgstr "per a"
+
+#: my-evolution/Locations.h:1663
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1670
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1671
+#, fuzzy
+msgid "Paganella"
+msgstr "P�gina"
+
+#: my-evolution/Locations.h:1674
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1675
+msgid "Palacios"
+msgstr ""
+
+#: my-evolution/Locations.h:1676
+#, fuzzy
+msgid "Palermo"
+msgstr "Busca"
+
+#: my-evolution/Locations.h:1677
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1678
+msgid "Palmdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1679
+#, fuzzy
+msgid "Palmer"
+msgstr "Busca"
+
+#: my-evolution/Locations.h:1680
+#, fuzzy
+msgid "Palm Springs"
+msgstr "_Par�metres"
+
+#: my-evolution/Locations.h:1681
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1682
+#, fuzzy
+msgid "Pamplona"
+msgstr "Puntuaci�"
+
+#: my-evolution/Locations.h:1684
+#, fuzzy
+msgid "Panama City"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:1685
+#, fuzzy
+msgid "Pantelleria"
+msgstr "Cancel�lat"
+
+#: my-evolution/Locations.h:1686
+#, fuzzy
+msgid "Papa"
+msgstr "Paper"
+
+#: my-evolution/Locations.h:1687
+#, fuzzy
+msgid "Paphos"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:1689
+#, fuzzy
+msgid "Paris"
+msgstr "Primari"
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1692
+#, fuzzy
+msgid "Paris/Orly"
+msgstr "Vertical"
+
+#: my-evolution/Locations.h:1693
+msgid "Parkersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1694
+#, fuzzy
+msgid "Pasco"
+msgstr "Contrasenya"
+
+#: my-evolution/Locations.h:1695
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1700
+msgid "Passo Rolle"
+msgstr ""
+
+#: my-evolution/Locations.h:1701
+#, fuzzy
+msgid "Patna"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:1702
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1706
+#, fuzzy
+msgid "Paysandu"
+msgstr "Final del dia:"
+
+#: my-evolution/Locations.h:1707
+#, fuzzy
+msgid "Payson"
+msgstr "Final del dia:"
+
+#: my-evolution/Locations.h:1708
+#, fuzzy
+msgid "Pellston"
+msgstr "Descripci�:"
+
+#: my-evolution/Locations.h:1709
+#, fuzzy
+msgid "Pelotas"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:1710
+#, fuzzy
+msgid "Pendleton"
+msgstr "Seccions:"
+
+#: my-evolution/Locations.h:1711
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1716
+#, fuzzy
+msgid "Peoria"
+msgstr "Primari"
+
+#: my-evolution/Locations.h:1717
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1718
+msgid "Pereira/Matecana"
+msgstr ""
+
+#: my-evolution/Locations.h:1719
+#, fuzzy
+msgid "Perm"
+msgstr "Primari"
+
+#: my-evolution/Locations.h:1720
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1721
+msgid "Perry-Foley"
+msgstr ""
+
+#: my-evolution/Locations.h:1722
+#, fuzzy
+msgid "Perth"
+msgstr "Paper"
+
+#: my-evolution/Locations.h:1724
+#, fuzzy
+msgid "Perugia"
+msgstr "Paper"
+
+#: my-evolution/Locations.h:1725
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1730
+msgid "Philip"
+msgstr ""
+
+#: my-evolution/Locations.h:1731
+msgid "Philipsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1732
+msgid "Phillips"
+msgstr ""
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1739
+msgid "Piedras Negras"
+msgstr ""
+
+#: my-evolution/Locations.h:1740
+#, fuzzy
+msgid "Pierre"
+msgstr "Paper"
+
+#: my-evolution/Locations.h:1741
+msgid "Pietersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1742
+#, fuzzy
+msgid "Pikeville"
+msgstr "Previsualitzaci�:"
+
+#: my-evolution/Locations.h:1743
+#, fuzzy
+msgid "Pine Bluff"
+msgstr "Adre�a electr�nica principal"
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+msgid "Pirassununga"
+msgstr ""
+
+#: my-evolution/Locations.h:1747
+#, fuzzy
+msgid "Pisa"
+msgstr "Enganxa"
+
+#: my-evolution/Locations.h:1748
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1753
+#, fuzzy
+msgid "Plymouth"
+msgstr "mes"
+
+#: my-evolution/Locations.h:1754
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+msgid "Pocos De Caldas"
+msgstr ""
+
+#: my-evolution/Locations.h:1756
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1757
+msgid "Podgorica Titograd"
+msgstr ""
+
+#: my-evolution/Locations.h:1758
+msgid "Pohang Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1759
+#, fuzzy
+msgid "Point Hope"
+msgstr "Imprimeix el missatge..."
+
+#: my-evolution/Locations.h:1760
+#, fuzzy
+msgid "Point Lay"
+msgstr "R_esum"
+
+#: my-evolution/Locations.h:1761
+#, fuzzy
+msgid "Point Mugu"
+msgstr "Imprimeix el missatge"
+
+#: my-evolution/Locations.h:1762
+msgid "Point Piedras Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1763
+#, fuzzy
+msgid "Poitiers"
+msgstr "Propietats..."
+
+#: my-evolution/Locations.h:1765
+msgid "Pompano Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1766
+#, fuzzy
+msgid "Ponca City"
+msgstr "Tipus de tel�fon"
+
+#: my-evolution/Locations.h:1767
+#, fuzzy
+msgid "Ponce"
+msgstr "Cap"
+
+#: my-evolution/Locations.h:1768
+msgid "Ponta Pora"
+msgstr ""
+
+#: my-evolution/Locations.h:1769
+#, fuzzy
+msgid "Pontiac"
+msgstr "_Contactes..."
+
+#: my-evolution/Locations.h:1770
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1771
+msgid "Poplar Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1772
+#, fuzzy
+msgid "Poprad"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1773
+#, fuzzy
+msgid "Port Alexander"
+msgstr "Imprimeix l'agenda"
+
+#: my-evolution/Locations.h:1774
+msgid "Port Alsworth"
+msgstr ""
+
+#: my-evolution/Locations.h:1775
+#, fuzzy
+msgid "Port Angeles"
+msgstr "Imprimeix el missatge..."
+
+#: my-evolution/Locations.h:1776
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1777
+msgid "Port Elizabeth"
+msgstr ""
+
+#: my-evolution/Locations.h:1778
+#, fuzzy
+msgid "Porterville"
+msgstr "Previsualitzaci�:"
+
+#: my-evolution/Locations.h:1779
+#, fuzzy
+msgid "Port Hardy"
+msgstr "Imprimeix l'agenda"
+
+#: my-evolution/Locations.h:1780
+#, fuzzy
+msgid "Port Hedland"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1781
+msgid "Port Heiden"
+msgstr ""
+
+#: my-evolution/Locations.h:1782
+#, fuzzy
+msgid "Portland"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1783
+#, fuzzy
+msgid "Porto"
+msgstr "Prioritat:"
+
+#: my-evolution/Locations.h:1784
+#, fuzzy
+msgid "Porto Alegre"
+msgstr "En proc�s"
+
+#: my-evolution/Locations.h:1785
+msgid "Porto Alegre Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:1786
+#, fuzzy
+msgid "Portoroz"
+msgstr "Vertical"
+
+#: my-evolution/Locations.h:1787
+#, fuzzy
+msgid "Porto Santo"
+msgstr "Vertical"
+
+#: my-evolution/Locations.h:1788
+msgid "Porto Velho"
+msgstr ""
+
+#: my-evolution/Locations.h:1789
+#, fuzzy
+msgid "Port Said"
+msgstr "Vertical"
+
+#: my-evolution/Locations.h:1790
+msgid "Portsmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1792
+#, fuzzy
+msgid "Posadas"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1793
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1796
+msgid "Poza Rica"
+msgstr ""
+
+#: my-evolution/Locations.h:1797
+#, fuzzy
+msgid "Poznan"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1798
+#, fuzzy
+msgid "Praha"
+msgstr "Tasca"
+
+#: my-evolution/Locations.h:1799
+msgid "Pratica di Mare"
+msgstr ""
+
+#: my-evolution/Locations.h:1800
+msgid "Prescott"
+msgstr ""
+
+#: my-evolution/Locations.h:1801
+#, fuzzy
+msgid "Presidente Prudente"
+msgstr "Previsualitzaci� d'impressi�"
+
+#: my-evolution/Locations.h:1802
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1804
+#, fuzzy
+msgid "Pretoria"
+msgstr "Vertical"
+
+#: my-evolution/Locations.h:1805
+#, fuzzy
+msgid "Preveza"
+msgstr "Anterior"
+
+#: my-evolution/Locations.h:1806
+msgid "Price-Carbon"
+msgstr ""
+
+#: my-evolution/Locations.h:1807
+#, fuzzy
+msgid "Pristina"
+msgstr "Opcions"
+
+#: my-evolution/Locations.h:1808
+#, fuzzy
+msgid "Providence"
+msgstr "_Comarca:"
+
+#: my-evolution/Locations.h:1809
+#, fuzzy
+msgid "Provincetown"
+msgstr "Previsualitzaci�:"
+
+#: my-evolution/Locations.h:1810
+#, fuzzy
+msgid "Provo"
+msgstr "Anterior"
+
+#: my-evolution/Locations.h:1811
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1812
+msgid "Pucallpa"
+msgstr ""
+
+#: my-evolution/Locations.h:1813
+msgid "Pudahuel"
+msgstr ""
+
+#: my-evolution/Locations.h:1814
+#, fuzzy
+msgid "Puebla"
+msgstr "P�blic"
+
+#: my-evolution/Locations.h:1815
+#, fuzzy
+msgid "Pueblo"
+msgstr "P�blic"
+
+#: my-evolution/Locations.h:1816
+msgid "Puerto Barrios"
+msgstr ""
+
+#: my-evolution/Locations.h:1817
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1818
+msgid "Puerto Escondido"
+msgstr ""
+
+#: my-evolution/Locations.h:1819
+msgid "Puerto Lempira"
+msgstr ""
+
+#: my-evolution/Locations.h:1820
+#, fuzzy
+msgid "Puerto Limon"
+msgstr "Descripci�:"
+
+#: my-evolution/Locations.h:1821
+msgid "Puerto Maldonado"
+msgstr ""
+
+#: my-evolution/Locations.h:1822
+msgid "Puerto Montt"
+msgstr ""
+
+#: my-evolution/Locations.h:1823
+msgid "Puerto Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1825
+#, fuzzy
+msgid "Puerto Suarez"
+msgstr "R_esum"
+
+#: my-evolution/Locations.h:1826
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1827
+#, fuzzy
+msgid "Pula"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1828
+#, fuzzy
+msgid "Pullman"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1829
+msgid "Punta Arenas"
+msgstr ""
+
+#: my-evolution/Locations.h:1830
+#, fuzzy
+msgid "Punta Cana"
+msgstr "Imprimeix l'agenda"
+
+#: my-evolution/Locations.h:1831
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1835
+msgid "Pyongyang"
+msgstr ""
+
+#: my-evolution/Locations.h:1837
+#, fuzzy
+msgid "Quantico"
+msgstr "Descripci�:"
+
+#: my-evolution/Locations.h:1838
+#, fuzzy
+msgid "Quebec"
+msgstr "Assumpte"
+
+#: my-evolution/Locations.h:1839
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1842
+msgid "Quimper"
+msgstr ""
+
+#: my-evolution/Locations.h:1843
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1850
+#, fuzzy
+msgid "Rapid City"
+msgstr "Respon a tots"
+
+#: my-evolution/Locations.h:1851
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1852
+msgid "Ras Al Khaimah"
+msgstr ""
+
+#: my-evolution/Locations.h:1853
+#, fuzzy
+msgid "Rawlins"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:1854
+#, fuzzy
+msgid "Reading"
+msgstr "Encap�alaments"
+
+#: my-evolution/Locations.h:1855
+msgid "Rebun Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1856
+#, fuzzy
+msgid "Recife"
+msgstr "Data de recepci�"
+
+#: my-evolution/Locations.h:1857
+msgid "Red Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1858
+#, fuzzy
+msgid "Redding"
+msgstr "Encap�alaments"
+
+#: my-evolution/Locations.h:1859
+#, fuzzy
+msgid "Redig"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:1860
+#, fuzzy
+msgid "Redmond"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:1861
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1863
+msgid "Reggio Calabria"
+msgstr ""
+
+#: my-evolution/Locations.h:1864
+#, fuzzy
+msgid "Regina"
+msgstr "Seccions:"
+
+#: my-evolution/Locations.h:1865
+msgid "Reims-Champagne"
+msgstr ""
+
+#: my-evolution/Locations.h:1866
+#, fuzzy
+msgid "Rennes"
+msgstr "Recordatoris"
+
+#: my-evolution/Locations.h:1867
+#, fuzzy
+msgid "Reno"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:1868
+#, fuzzy
+msgid "Renton"
+msgstr "Seccions:"
+
+#: my-evolution/Locations.h:1869
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1870
+#, fuzzy
+msgid "Reus"
+msgstr "M�bil"
+
+#: my-evolution/Locations.h:1871
+#, fuzzy
+msgid "Reyes"
+msgstr "anys"
+
+#: my-evolution/Locations.h:1872
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1873
+#, fuzzy
+msgid "Reynosa"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:1874
+#, fuzzy
+msgid "Rhinelander"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1875
+msgid "Rhode Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1876
+#, fuzzy
+msgid "Riberalta"
+msgstr "abril"
+
+#: my-evolution/Locations.h:1877
+msgid "Richmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1878
+#, fuzzy
+msgid "Rickenbacker"
+msgstr "_Sobrenom:"
+
+#: my-evolution/Locations.h:1879
+#, fuzzy
+msgid "Rieti"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rifle"
+msgstr "M�bil"
+
+#: my-evolution/Locations.h:1881
+#, fuzzy
+msgid "Riga"
+msgstr "Dreta:"
+
+#: my-evolution/Locations.h:1882
+#, fuzzy
+msgid "Rijeka"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:1883
+#, fuzzy
+msgid "Rimini"
+msgstr "min."
+
+#: my-evolution/Locations.h:1884
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1885
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1886
+msgid "Rio Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1887
+#, fuzzy
+msgid "Rioja"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:1888
+msgid "Rio / Jacarepagua"
+msgstr ""
+
+#: my-evolution/Locations.h:1889
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+msgid "Rishiri Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1891
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+#, fuzzy
+msgid "Rivera"
+msgstr "abril"
+
+#: my-evolution/Locations.h:1893
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1894
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1895
+msgid "Riverton"
+msgstr ""
+
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "Imprimeix"
+
+#: my-evolution/Locations.h:1897
+#, fuzzy
+msgid "Rivolto"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:1898
+#, fuzzy
+msgid "Riyadh"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:1899
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1900
+#, fuzzy
+msgid "Roatan"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:1901
+#, fuzzy
+msgid "Robore"
+msgstr "abans de"
+
+#: my-evolution/Locations.h:1902
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1903
+msgid "Rockford"
+msgstr ""
+
+#: my-evolution/Locations.h:1904
+#, fuzzy
+msgid "Rockland"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1905
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1907
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1908
+#, fuzzy
+msgid "Rodos"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:1909
+#, fuzzy
+msgid "Rogers"
+msgstr "Carpetes"
+
+#: my-evolution/Locations.h:1910
+msgid "Roma/Ciampino"
+msgstr ""
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1917
+#, fuzzy
+msgid "Roosevelt"
+msgstr "set�"
+
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Roros"
+msgstr "Colors"
+
+#: my-evolution/Locations.h:1919
+msgid "Rorvik/Ryum"
+msgstr ""
+
+#: my-evolution/Locations.h:1920
+#, fuzzy
+msgid "Rosario"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:1921
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1922
+#, fuzzy
+msgid "Roseglen"
+msgstr "M�bil"
+
+#: my-evolution/Locations.h:1923
+#, fuzzy
+msgid "Rost"
+msgstr "Hores"
+
+#: my-evolution/Locations.h:1924
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1927
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1928
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1929
+#, fuzzy
+msgid "Rurrenabaque"
+msgstr "Recurr�ncia"
+
+#: my-evolution/Locations.h:1930
+msgid "Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1931
+#, fuzzy
+msgid "Russia"
+msgstr "agost"
+
+#: my-evolution/Locations.h:1932
+#, fuzzy
+msgid "Rutland"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:1933
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1935
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1936
+msgid "Sabine Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:1937
+#, fuzzy
+msgid "Sacramento"
+msgstr "_Departament:"
+
+#: my-evolution/Locations.h:1938
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1939
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1940
+#, fuzzy
+msgid "Saginaw"
+msgstr "_Envia"
+
+#: my-evolution/Locations.h:1941
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1944
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1945
+#, fuzzy
+msgid "Saint Mary's"
+msgstr "Imprimeix l'agenda"
+
+#: my-evolution/Locations.h:1946
+msgid "Saint Mawgan"
+msgstr ""
+
+#: my-evolution/Locations.h:1947
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1948
+msgid "Saint Paul"
+msgstr ""
+
+#: my-evolution/Locations.h:1949
+#, fuzzy
+msgid "Saiq"
+msgstr "_Envia"
+
+#: my-evolution/Locations.h:1950
+msgid "Salalah"
+msgstr ""
+
+#: my-evolution/Locations.h:1951
+#, fuzzy
+msgid "Salem"
+msgstr "Desa"
+
+#: my-evolution/Locations.h:1952
+#, fuzzy
+msgid "Salida"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:1953
+msgid "Salida-Harriet"
+msgstr ""
+
+#: my-evolution/Locations.h:1954
+#, fuzzy
+msgid "Salina"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:1955
+#, fuzzy
+msgid "Salinas"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:1956
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1957
+#, fuzzy
+msgid "Salmon"
+msgstr "Puntuaci�"
+
+#: my-evolution/Locations.h:1958
+msgid "Salmon (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1959
+#, fuzzy
+msgid "Salta"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:1960
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1961
+msgid "Salt Lake City"
+msgstr ""
+
+#: my-evolution/Locations.h:1962
+#, fuzzy
+msgid "Salto"
+msgstr "ds."
+
+#: my-evolution/Locations.h:1963
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+msgid "Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:1965
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1966
+#, fuzzy
+msgid "Samara"
+msgstr "Puntuaci�"
+
+#: my-evolution/Locations.h:1967
+#, fuzzy
+msgid "Samos"
+msgstr "Puntuaci�"
+
+#: my-evolution/Locations.h:1968
+#, fuzzy
+msgid "Samsun"
+msgstr "dg."
+
+#: my-evolution/Locations.h:1969
+#, fuzzy
+msgid "Sana'A"
+msgstr "_Envia"
+
+#: my-evolution/Locations.h:1970
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+msgid "San Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1975
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1976
+#, fuzzy
+msgid "San Carlos"
+msgstr "Desa i tanca"
+
+#: my-evolution/Locations.h:1977
+#, fuzzy
+msgid "Sandane"
+msgstr "_Envia"
+
+#: my-evolution/Locations.h:1978
+#, fuzzy
+msgid "Sandberg"
+msgstr "Remitent"
+
+#: my-evolution/Locations.h:1979
+#, fuzzy
+msgid "Sanderson"
+msgstr "Remitent"
+
+#: my-evolution/Locations.h:1980
+msgid "San Diego"
+msgstr ""
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1986
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1987
+msgid "Sand Point"
+msgstr ""
+
+#: my-evolution/Locations.h:1988
+msgid "San Fernando De Apure"
+msgstr ""
+
+#: my-evolution/Locations.h:1989
+#, fuzzy
+msgid "Sanford"
+msgstr "_Envia"
+
+#: my-evolution/Locations.h:1990
+msgid "San Francisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1991
+#, fuzzy
+msgid "Sangju"
+msgstr "Ombrejat"
+
+#: my-evolution/Locations.h:1992
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1993
+msgid "San Joaquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1994
+#, fuzzy
+msgid "San Jose"
+msgstr "Desa i tanca"
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1997
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1998
+#, fuzzy
+msgid "San Juan"
+msgstr "dg."
+
+#: my-evolution/Locations.h:1999
+msgid "Sankt-Peterburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2000
+#, fuzzy
+msgid "Sanliurfa"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:2001
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2002
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2003
+msgid "San Miguel"
+msgstr ""
+
+#: my-evolution/Locations.h:2004
+msgid "San Nicholas Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2005
+msgid "San Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:2006
+msgid "San Sebastian"
+msgstr ""
+
+#: my-evolution/Locations.h:2007
+msgid "Santa Ana"
+msgstr ""
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+msgid "Santa Maria"
+msgstr ""
+
+#: my-evolution/Locations.h:2012
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2013
+msgid "Santa Monica"
+msgstr ""
+
+#: my-evolution/Locations.h:2014
+#, fuzzy
+msgid "Santander"
+msgstr "Remitent"
+
+#: my-evolution/Locations.h:2015
+#, fuzzy
+msgid "Santarem"
+msgstr "despr�s de"
+
+#: my-evolution/Locations.h:2016
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2017
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+msgid "Santiago"
+msgstr ""
+
+#: my-evolution/Locations.h:2019
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2020
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2021
+msgid "Santorini"
+msgstr ""
+
+#: my-evolution/Locations.h:2022
+#, fuzzy
+msgid "Santos"
+msgstr "_Estat:"
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+msgid "Sao Luiz"
+msgstr ""
+
+#: my-evolution/Locations.h:2025
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2028
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+#, fuzzy
+msgid "Sarasota"
+msgstr "Puntuaci�"
+
+#: my-evolution/Locations.h:2030
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+#, fuzzy
+msgid "Sarzana"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:2032
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2033
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2038
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2039
+msgid "Sawyer AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2040
+#, fuzzy
+msgid "Sayun"
+msgstr "dg."
+
+#: my-evolution/Locations.h:2041
+#, fuzzy
+msgid "Scatsta"
+msgstr "_Estat:"
+
+#: my-evolution/Locations.h:2042
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2045
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2046
+msgid "Scottsdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Scranton"
+msgstr "Organitzaci�"
+
+#: my-evolution/Locations.h:2048
+msgid "Seattle"
+msgstr ""
+
+#: my-evolution/Locations.h:2049
+#, fuzzy
+msgid "Seattle-Boeing"
+msgstr "_Par�metres"
+
+#: my-evolution/Locations.h:2050
+#, fuzzy
+msgid "Sedalia"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:2051
+#, fuzzy
+msgid "Seeb"
+msgstr "Vist"
+
+#: my-evolution/Locations.h:2052
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+#, fuzzy
+msgid "Sendai Airport"
+msgstr "Data d'_inici:"
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2058
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2059
+msgid "Sevilla"
+msgstr ""
+
+#: my-evolution/Locations.h:2060
+#, fuzzy
+msgid "Seward"
+msgstr "Cerca"
+
+#: my-evolution/Locations.h:2061
+msgid "Sexton Summit"
+msgstr ""
+
+#: my-evolution/Locations.h:2062
+#, fuzzy
+msgid "Shanghai"
+msgstr "Ombrejat"
+
+#: my-evolution/Locations.h:2063
+msgid "Shannon"
+msgstr ""
+
+#: my-evolution/Locations.h:2064
+#, fuzzy
+msgid "Sharjah"
+msgstr "Cerca"
+
+#: my-evolution/Locations.h:2065
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+#: my-evolution/Locations.h:2066
+#, fuzzy
+msgid "Sharurah"
+msgstr "Dissabte"
+
+#: my-evolution/Locations.h:2067
+#, fuzzy
+msgid "Shawbury"
+msgstr "Dissabte"
+
+#: my-evolution/Locations.h:2068
+#, fuzzy
+msgid "Shearwater"
+msgstr "Data d'ini_ci:"
+
+#: my-evolution/Locations.h:2069
+msgid "Sheboygan"
+msgstr ""
+
+#: my-evolution/Locations.h:2070
+#, fuzzy
+msgid "Sheldon"
+msgstr "Vist"
+
+#: my-evolution/Locations.h:2071
+msgid "Shelter Cove"
+msgstr ""
+
+#: my-evolution/Locations.h:2072
+#, fuzzy
+msgid "Shelton"
+msgstr "Seccions:"
+
+#: my-evolution/Locations.h:2073
+msgid "Shenandoah"
+msgstr ""
+
+#: my-evolution/Locations.h:2074
+#, fuzzy
+msgid "Sheridan"
+msgstr "dg."
+
+#: my-evolution/Locations.h:2075
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2076
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2077
+msgid "Shingle Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2078
+#, fuzzy
+msgid "Shiraz"
+msgstr "Mida"
+
+#: my-evolution/Locations.h:2079
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2080
+msgid "Shizuhama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2081
+#, fuzzy
+msgid "Shoreham"
+msgstr "Puntuaci�"
+
+#: my-evolution/Locations.h:2082
+#, fuzzy
+msgid "Show Low"
+msgstr "Mostra 1 setmana"
+
+#: my-evolution/Locations.h:2083
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2084
+msgid "Shreveport Regional"
+msgstr ""
+
+#: my-evolution/Locations.h:2085
+#, fuzzy
+msgid "Sidney"
+msgstr "Imprimeix"
+
+#: my-evolution/Locations.h:2086
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2087
+msgid "Siloam Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2088
+msgid "Silver City"
+msgstr ""
+
+#: my-evolution/Locations.h:2089
+#, fuzzy
+msgid "Sindal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2091
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2097
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2098
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+#: my-evolution/Locations.h:2099
+#, fuzzy
+msgid "Skive"
+msgstr "Mida"
+
+#: my-evolution/Locations.h:2100
+#, fuzzy
+msgid "Skopje"
+msgstr "Atura"
+
+#: my-evolution/Locations.h:2101
+#, fuzzy
+msgid "Skwentna"
+msgstr "Vist"
+
+#: my-evolution/Locations.h:2102
+#, fuzzy
+msgid "Slana"
+msgstr "_Envia"
+
+#: my-evolution/Locations.h:2105
+#, fuzzy
+msgid "Smithers"
+msgstr "minuts"
+
+#: my-evolution/Locations.h:2106
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2107
+msgid "Snowshoe Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2108
+#, fuzzy
+msgid "Sochi"
+msgstr "quart"
+
+#: my-evolution/Locations.h:2109
+#, fuzzy
+msgid "Socorro"
+msgstr "Puntuaci�"
+
+#: my-evolution/Locations.h:2110
+#, fuzzy
+msgid "Socotra"
+msgstr "Puntuaci�"
+
+#: my-evolution/Locations.h:2111
+msgid "Soda Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2112
+#, fuzzy
+msgid "Sofia"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:2113
+#, fuzzy
+msgid "Sogndal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2114
+msgid "Soldotna"
+msgstr ""
+
+#: my-evolution/Locations.h:2115
+#, fuzzy
+msgid "Somerset"
+msgstr "Mostra"
+
+#: my-evolution/Locations.h:2116
+#, fuzzy
+msgid "Sonderborg"
+msgstr "Remitent"
+
+#: my-evolution/Locations.h:2117
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2120
+#, fuzzy
+msgid "Southampton"
+msgstr "Fonts"
+
+#: my-evolution/Locations.h:2121
+#, fuzzy
+msgid "South Bend"
+msgstr "quart"
+
+#: my-evolution/Locations.h:2122
+msgid "South Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:2123
+#, fuzzy
+msgid "South Dakota"
+msgstr "Fonts"
+
+#: my-evolution/Locations.h:2124
+#, fuzzy
+msgid "Southend"
+msgstr "quart"
+
+#: my-evolution/Locations.h:2125
+msgid "South Marsh Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2126
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2128
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2129
+#, fuzzy
+msgid "Spencer"
+msgstr "Remitent"
+
+#: my-evolution/Locations.h:2130
+msgid "Spickard"
+msgstr ""
+
+#: my-evolution/Locations.h:2131
+#, fuzzy
+msgid "Split"
+msgstr "�s"
+
+#: my-evolution/Locations.h:2132
+#, fuzzy
+msgid "Spokane"
+msgstr "_Envia"
+
+#: my-evolution/Locations.h:2133
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2134
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "Springfield"
+msgstr "S'est� sincronitzant \"%s\""
+
+#: my-evolution/Locations.h:2136
+msgid "Stampede Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:2137
+#, fuzzy
+msgid "State College"
+msgstr "Data completa:"
+
+#: my-evolution/Locations.h:2138
+#, fuzzy
+msgid "Stauning"
+msgstr "_Par�metres"
+
+#: my-evolution/Locations.h:2139
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2140
+msgid "Stavanger/Sola"
+msgstr ""
+
+#: my-evolution/Locations.h:2141
+#, fuzzy
+msgid "Staverton"
+msgstr "_Par�metres"
+
+#: my-evolution/Locations.h:2142
+#, fuzzy
+msgid "Stavropol"
+msgstr "Atura"
+
+#: my-evolution/Locations.h:2143
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2144
+msgid "Steamboat Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2145
+#, fuzzy
+msgid "Stephenville"
+msgstr "Seleccioneu una carpeta"
+
+#: my-evolution/Locations.h:2146
+#, fuzzy
+msgid "St. George"
+msgstr "Puntuaci�"
+
+#: my-evolution/Locations.h:2147
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2148
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2149
+msgid "St Johnsbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2150
+#, fuzzy
+msgid "St Joseph"
+msgstr "Atura"
+
+#: my-evolution/Locations.h:2151
+#, fuzzy
+msgid "St Louis"
+msgstr "Atura la c�rrega"
+
+#: my-evolution/Locations.h:2152
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2157
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2158
+#, fuzzy
+msgid "Storm Lake"
+msgstr "Puntuaci�"
+
+#: my-evolution/Locations.h:2159
+#, fuzzy
+msgid "Stornoway"
+msgstr "Ara"
+
+#: my-evolution/Locations.h:2160
+#, fuzzy
+msgid "St Paul"
+msgstr "_Estat:"
+
+#: my-evolution/Locations.h:2161
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2164
+#, fuzzy
+msgid "Strevell"
+msgstr "Subscriu-me"
+
+#: my-evolution/Locations.h:2165
+msgid "St Simon's Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2166
+msgid "Stumpy Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2167
+#, fuzzy
+msgid "Sturgeon Bay"
+msgstr "Dissabte"
+
+#: my-evolution/Locations.h:2168
+msgid "Stuttgart"
+msgstr ""
+
+#: my-evolution/Locations.h:2169
+#, fuzzy
+msgid "Sucre"
+msgstr "Puntuaci�"
+
+#: my-evolution/Locations.h:2170
+msgid "Sumburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:2171
+#, fuzzy
+msgid "Sumter"
+msgstr "R_esum"
+
+#: my-evolution/Locations.h:2172
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2174
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2175
+msgid "Superior"
+msgstr ""
+
+#: my-evolution/Locations.h:2177
+#, fuzzy
+msgid "Sutton"
+msgstr "dg."
+
+#: my-evolution/Locations.h:2178
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2179
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2188
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2189
+msgid "Szombathely"
+msgstr ""
+
+#: my-evolution/Locations.h:2190
+#, fuzzy
+msgid "Tabatinga"
+msgstr "Opcions"
+
+#: my-evolution/Locations.h:2191
+msgid "Tabriz"
+msgstr ""
+
+#: my-evolution/Locations.h:2192
+#, fuzzy
+msgid "Tabuk"
+msgstr "Tasca"
+
+#: my-evolution/Locations.h:2193
+msgid "Tachikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+#, fuzzy
+msgid "Tacna"
+msgstr "mar�"
+
+#: my-evolution/Locations.h:2195
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2199
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+#, fuzzy
+msgid "Taejon"
+msgstr "Aleshores"
+
+#: my-evolution/Locations.h:2201
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2202
+msgid "Taichung"
+msgstr ""
+
+#: my-evolution/Locations.h:2203
+#, fuzzy
+msgid "Taif"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:2204
+#, fuzzy
+msgid "Tainan"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:2206
+#, fuzzy
+msgid "Taiyuan"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:2207
+#, fuzzy
+msgid "Taiz"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:2208
+#, fuzzy
+msgid "Tajima"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:2209
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Talara"
+msgstr ""
+
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Talinn"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:2212
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tallahassee"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2215
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2216
+#, fuzzy
+msgid "Tampa"
+msgstr "Puntuaci�"
+
+#: my-evolution/Locations.h:2217
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2218
+#, fuzzy
+msgid "Tampere"
+msgstr "Paper"
+
+#: my-evolution/Locations.h:2219
+msgid "Tampico"
+msgstr ""
+
+#: my-evolution/Locations.h:2220
+#, fuzzy
+msgid "Tanana"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:2221
+msgid "Tanegashima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2222
+#, fuzzy
+msgid "Taos"
+msgstr "Baixa"
+
+#: my-evolution/Locations.h:2223
+#, fuzzy
+msgid "Taoyuan"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:2224
+msgid "Tapachula"
+msgstr ""
+
+#: my-evolution/Locations.h:2225
+#, fuzzy
+msgid "Taranto"
+msgstr "Transparent"
+
+#: my-evolution/Locations.h:2226
+#, fuzzy
+msgid "Tarbes"
+msgstr "Tasca"
+
+#: my-evolution/Locations.h:2227
+#, fuzzy
+msgid "Tarija"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:2228
+msgid "Tarvisio"
+msgstr ""
+
+#: my-evolution/Locations.h:2229
+#, fuzzy
+msgid "Tatalina"
+msgstr "Opcions"
+
+#: my-evolution/Locations.h:2230
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2235
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2236
+#, fuzzy
+msgid "Tela"
+msgstr "T�lex"
+
+#: my-evolution/Locations.h:2237
+#, fuzzy
+msgid "Temple"
+msgstr "T�lex"
+
+#: my-evolution/Locations.h:2238
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2244
+msgid "Texarkana"
+msgstr ""
+
+#: my-evolution/Locations.h:2245
+#, fuzzy
+msgid "Texas"
+msgstr "Tasca"
+
+#: my-evolution/Locations.h:2246
+#, fuzzy
+msgid "The Dalles"
+msgstr "Seleccioneu una carpeta"
+
+#: my-evolution/Locations.h:2247
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2248
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2249
+msgid "Thiruvananthapuram"
+msgstr ""
+
+#: my-evolution/Locations.h:2250
+#, fuzzy
+msgid "Thisted"
+msgstr "_T�tol:"
+
+#: my-evolution/Locations.h:2251
+msgid "Thompson Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2252
+#, fuzzy
+msgid "Thumrait"
+msgstr "Dijous"
+
+#: my-evolution/Locations.h:2253
+#, fuzzy
+msgid "Tianjin"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:2254
+#, fuzzy
+msgid "Tijuana"
+msgstr "vuit�"
+
+#: my-evolution/Locations.h:2255
+#, fuzzy
+msgid "Timisoara"
+msgstr "Format de l'hora"
+
+#: my-evolution/Locations.h:2256
+msgid "Tin City"
+msgstr ""
+
+#: my-evolution/Locations.h:2257
+#, fuzzy
+msgid "Tirana"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:2258
+#, fuzzy
+msgid "Tiree"
+msgstr "setmana"
+
+#: my-evolution/Locations.h:2259
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2260
+msgid "Tiruchchirapalli"
+msgstr ""
+
+#: my-evolution/Locations.h:2261
+#, fuzzy
+msgid "Titusville"
+msgstr "_T�tol:"
+
+#: my-evolution/Locations.h:2262
+#, fuzzy
+msgid "Tivat"
+msgstr "Privat"
+
+#: my-evolution/Locations.h:2263
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2267
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+msgid "Tokunoshima Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2269
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2271
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2272
+msgid "Tokyo New International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2273
+#, fuzzy
+msgid "Toledo"
+msgstr "M�bil"
+
+#: my-evolution/Locations.h:2274
+msgid "Toluca"
+msgstr ""
+
+#: my-evolution/Locations.h:2275
+#, fuzzy
+msgid "Tonopah"
+msgstr "Avui"
+
+#: my-evolution/Locations.h:2276
+#, fuzzy
+msgid "Topeka"
+msgstr "Superior:"
+
+#: my-evolution/Locations.h:2277
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2279
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2280
+msgid "Toronto"
+msgstr ""
+
+#: my-evolution/Locations.h:2281
+#, fuzzy
+msgid "Torp"
+msgstr "Superior:"
+
+#: my-evolution/Locations.h:2282
+#, fuzzy
+msgid "Torrance"
+msgstr "Cancel�lat"
+
+#: my-evolution/Locations.h:2283
+msgid "Torreon"
+msgstr ""
+
+#: my-evolution/Locations.h:2284
+#, fuzzy
+msgid "Tottori Airport"
+msgstr "Data d'_inici:"
+
+#: my-evolution/Locations.h:2285
+#, fuzzy
+msgid "Toulouse"
+msgstr "Tanca"
+
+#: my-evolution/Locations.h:2286
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2290
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2291
+msgid "Trabzon"
+msgstr ""
+
+#: my-evolution/Locations.h:2292
+#, fuzzy
+msgid "Trapani"
+msgstr "Transparent"
+
+#: my-evolution/Locations.h:2293
+msgid "Traverse City"
+msgstr ""
+
+#: my-evolution/Locations.h:2294
+#, fuzzy
+msgid "Trelew"
+msgstr "T�lex"
+
+#: my-evolution/Locations.h:2295
+#, fuzzy
+msgid "Trenton"
+msgstr "Orientaci�"
+
+#: my-evolution/Locations.h:2296
+#, fuzzy
+msgid "Trevico"
+msgstr "Ant_erior"
+
+#: my-evolution/Locations.h:2297
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2298
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2299
+#, fuzzy
+msgid "Trieste"
+msgstr "Comprova"
+
+#: my-evolution/Locations.h:2300
+msgid "Trinidad"
+msgstr ""
+
+#: my-evolution/Locations.h:2301
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2304
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2305
+msgid "Troyes/Barberey"
+msgstr ""
+
+#: my-evolution/Locations.h:2306
+#, fuzzy
+msgid "Truckee"
+msgstr "dm."
+
+#: my-evolution/Locations.h:2307
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2314
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2315
+msgid "Tulancingo"
+msgstr ""
+
+#: my-evolution/Locations.h:2316
+#, fuzzy
+msgid "Tulcea"
+msgstr "Dimarts"
+
+#: my-evolution/Locations.h:2317
+#, fuzzy
+msgid "Tulsa"
+msgstr "Dimarts"
+
+#: my-evolution/Locations.h:2318
+#, fuzzy
+msgid "Tupelo"
+msgstr "dm."
+
+#: my-evolution/Locations.h:2319
+#, fuzzy
+msgid "Turaif"
+msgstr "Tasca"
+
+#: my-evolution/Locations.h:2320
+#, fuzzy
+msgid "Turin"
+msgstr "Tasca"
+
+#: my-evolution/Locations.h:2322
+#, fuzzy
+msgid "Turku"
+msgstr "dm."
+
+#: my-evolution/Locations.h:2323
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2324
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+#: my-evolution/Locations.h:2325
+#, fuzzy
+msgid "Twenthe"
+msgstr "des�"
+
+#: my-evolution/Locations.h:2326
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2327
+msgid "Twin Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2328
+#, fuzzy
+msgid "Tyler"
+msgstr "Tipus:"
+
+#: my-evolution/Locations.h:2329
+msgid "Tyndall AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2330
+#, fuzzy
+msgid "Tyumen"
+msgstr "dm."
+
+#: my-evolution/Locations.h:2331
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2332
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2340
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2341
+#, fuzzy
+msgid "United Arab Emirates "
+msgstr "Mou el missatge"
+
+#: my-evolution/Locations.h:2344
+#, fuzzy
+msgid "Unst"
+msgstr "No vist"
+
+#: my-evolution/Locations.h:2345
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2346
+msgid "Uruapan"
+msgstr ""
+
+#: my-evolution/Locations.h:2347
+#, fuzzy
+msgid "Uruguaiana"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:2349
+msgid "Urumqi"
+msgstr ""
+
+#: my-evolution/Locations.h:2350
+#, fuzzy
+msgid "Utah"
+msgstr "4"
+
+#: my-evolution/Locations.h:2351
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2353
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:2355
+#, fuzzy
+msgid "Vadso"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:2356
+#, fuzzy
+msgid "Vaerlose"
+msgstr "Inhabilitat"
+
+#: my-evolution/Locations.h:2357
+#, fuzzy
+msgid "Vagar"
+msgstr "Busca"
+
+#: my-evolution/Locations.h:2358
+msgid "Valdez 2"
+msgstr ""
+
+#: my-evolution/Locations.h:2359
+#, fuzzy
+msgid "Valdosta"
+msgstr "_Correu"
+
+#: my-evolution/Locations.h:2360
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2361
+#, fuzzy
+msgid "Valencia"
+msgstr "Agenda"
+
+#: my-evolution/Locations.h:2362
+#, fuzzy
+msgid "Valentine"
+msgstr "Visualitza en l�nia"
+
+#: my-evolution/Locations.h:2363
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2366
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2367
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2368
+#, fuzzy
+msgid "Van"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:2369
+msgid "Vancouver"
+msgstr ""
+
+#: my-evolution/Locations.h:2370
+#, fuzzy
+msgid "Vandel"
+msgstr "Cancel�lat"
+
+#: my-evolution/Locations.h:2371
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2373
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+#, fuzzy
+msgid "Varadero"
+msgstr "Inhabilitat"
+
+#: my-evolution/Locations.h:2375
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2376
+#, fuzzy
+msgid "Varna"
+msgstr "Inhabilitat"
+
+#: my-evolution/Locations.h:2377
+#, fuzzy
+msgid "Vasteras"
+msgstr "despr�s de"
+
+#: my-evolution/Locations.h:2378
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2379
+msgid "Venezia"
+msgstr ""
+
+#: my-evolution/Locations.h:2381
+msgid "Venice"
+msgstr ""
+
+#: my-evolution/Locations.h:2382
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2383
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2384
+#, fuzzy
+msgid "Vermont"
+msgstr "mes"
+
+#: my-evolution/Locations.h:2385
+#, fuzzy
+msgid "Vernal"
+msgstr "General"
+
+#: my-evolution/Locations.h:2386
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+msgid "Vicenza"
+msgstr ""
+
+#: my-evolution/Locations.h:2388
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2390
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2393
+msgid "Vigo"
+msgstr ""
+
+#: my-evolution/Locations.h:2394
+#, fuzzy
+msgid "Vilhena"
+msgstr "Nom del fitxer:"
+
+#: my-evolution/Locations.h:2395
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+#, fuzzy
+msgid "Villahermosa"
+msgstr "Alarmes visuals"
+
+#: my-evolution/Locations.h:2398
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2404
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+#, fuzzy
+msgid "Visalia"
+msgstr "Alarmes visuals"
+
+#: my-evolution/Locations.h:2406
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2410
+msgid "Vladivostok"
+msgstr ""
+
+#: my-evolution/Locations.h:2411
+#, fuzzy
+msgid "Vlieland"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:2412
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2413
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2414
+#, fuzzy
+msgid "Volkel"
+msgstr "M�bil"
+
+#: my-evolution/Locations.h:2415
+#, fuzzy
+msgid "Volk Field"
+msgstr "Camps"
+
+#: my-evolution/Locations.h:2416
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2417
+msgid "Voslau"
+msgstr ""
+
+#: my-evolution/Locations.h:2418
+#, fuzzy
+msgid "Waco"
+msgstr "Dilluns"
+
+#: my-evolution/Locations.h:2419
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2423
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2424
+msgid "Wallops Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2425
+msgid "Walnut Ridge"
+msgstr ""
+
+#: my-evolution/Locations.h:2426
+#, fuzzy
+msgid "Warner Robins"
+msgstr "S'est� movent"
+
+#: my-evolution/Locations.h:2427
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2429
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2430
+msgid "Washington/Dulles"
+msgstr ""
+
+#: my-evolution/Locations.h:2431
+#, fuzzy
+msgid "Waterbury"
+msgstr "Altres"
+
+#: my-evolution/Locations.h:2432
+#, fuzzy
+msgid "Waterloo"
+msgstr "Altres"
+
+#: my-evolution/Locations.h:2433
+#, fuzzy
+msgid "Watertown"
+msgstr "Altres"
+
+#: my-evolution/Locations.h:2434
+#, fuzzy
+msgid "Waterville"
+msgstr "categories"
+
+#: my-evolution/Locations.h:2435
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+msgid "Wausau"
+msgstr ""
+
+#: my-evolution/Locations.h:2437
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2438
+msgid "Waynesboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2439
+msgid "Webster City"
+msgstr ""
+
+#: my-evolution/Locations.h:2440
+#, fuzzy
+msgid "Wejh"
+msgstr "Dc"
+
+#: my-evolution/Locations.h:2441
+msgid "Wellington"
+msgstr ""
+
+#: my-evolution/Locations.h:2442
+#, fuzzy
+msgid "Wenatchee"
+msgstr "Altres"
+
+#: my-evolution/Locations.h:2443
+#, fuzzy
+msgid "Wendover"
+msgstr "Remitent"
+
+#: my-evolution/Locations.h:2444
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2445
+msgid "West Burke"
+msgstr ""
+
+#: my-evolution/Locations.h:2446
+#, fuzzy
+msgid "Westerland"
+msgstr "Selecciona'ls _tots"
+
+#: my-evolution/Locations.h:2447
+#, fuzzy
+msgid "Westfield"
+msgstr "Comprova"
+
+#: my-evolution/Locations.h:2448
+#, fuzzy
+msgid "Westhampton"
+msgstr "La setmana comen�a el"
+
+#: my-evolution/Locations.h:2449
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2451
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2452
+msgid "West Yellowstone (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2453
+#, fuzzy
+msgid "Wheeling"
+msgstr "Seleccioneu una carpeta"
+
+#: my-evolution/Locations.h:2454
+msgid "Whidbey Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2455
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2461
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2462
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2463
+#, fuzzy
+msgid "Wick"
+msgstr "_Sobrenom:"
+
+#: my-evolution/Locations.h:2464
+#, fuzzy
+msgid "Wien"
+msgstr "Dc"
+
+#: my-evolution/Locations.h:2465
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2467
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2468
+#, fuzzy
+msgid "Williamsport"
+msgstr "Transport de correu"
+
+#: my-evolution/Locations.h:2469
+#, fuzzy
+msgid "Williston"
+msgstr "�s"
+
+#: my-evolution/Locations.h:2470
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2472
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2473
+msgid "Winchester"
+msgstr ""
+
+#: my-evolution/Locations.h:2474
+msgid "Windsor"
+msgstr ""
+
+#: my-evolution/Locations.h:2475
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2478
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+#, fuzzy
+msgid "Winslow"
+msgstr "ara"
+
+#: my-evolution/Locations.h:2480
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2481
+msgid "Winter Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:2482
+#, fuzzy
+msgid "Winter Park"
+msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
+
+#: my-evolution/Locations.h:2483
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+#, fuzzy
+msgid "Wisconsin"
+msgstr "segons"
+
+#: my-evolution/Locations.h:2485
+msgid "Wisconsin Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:2486
+#, fuzzy
+msgid "Wise"
+msgstr "Dc"
+
+#: my-evolution/Locations.h:2487
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2488
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2489
+msgid "Woong Cheon"
+msgstr ""
+
+#: my-evolution/Locations.h:2490
+#, fuzzy
+msgid "Wooster"
+msgstr "Peu de p�gina:"
+
+#: my-evolution/Locations.h:2491
+#, fuzzy
+msgid "Worcester"
+msgstr "per sempre"
+
+#: my-evolution/Locations.h:2492
+#, fuzzy
+msgid "Worland"
+msgstr "Finl�ndia"
+
+#: my-evolution/Locations.h:2493
+#, fuzzy
+msgid "Worthington"
+msgstr "S'est� movent"
+
+#: my-evolution/Locations.h:2494
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2495
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2496
+msgid "Wuchia Observatory"
+msgstr ""
+
+#: my-evolution/Locations.h:2497
+#, fuzzy
+msgid "Wyoming"
+msgstr "S'est� movent"
+
+#: my-evolution/Locations.h:2498
+#, fuzzy
+msgid "Xiamen"
+msgstr "Nom"
+
+#: my-evolution/Locations.h:2499
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2505
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2506
+msgid "Yankton"
+msgstr ""
+
+#: my-evolution/Locations.h:2507
+#, fuzzy
+msgid "Yao Airport"
+msgstr "No l'eliminis"
+
+#: my-evolution/Locations.h:2508
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2510
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2511
+msgid "Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2513
+#, fuzzy
+msgid "Yenbo"
+msgstr "Vist"
+
+#: my-evolution/Locations.h:2514
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2522
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2528
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2529
+msgid "Zacatecas"
+msgstr ""
+
+#: my-evolution/Locations.h:2530
+#, fuzzy
+msgid "Zadar"
+msgstr "Agenda"
+
+#: my-evolution/Locations.h:2531
+#, fuzzy
+msgid "Zagreb"
+msgstr "P�gina"
+
+#: my-evolution/Locations.h:2532
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2533
+msgid "Zama Airfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2534
+#, fuzzy
+msgid "Zanesville"
+msgstr "Cancel�lat"
+
+#: my-evolution/Locations.h:2535
+msgid "Zaragoza"
+msgstr ""
+
+#: my-evolution/Locations.h:2536
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2537
+msgid "Zuni Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:2538
+#, fuzzy
+msgid "Zurich"
+msgstr "Tasca"
+
+#: 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
 #, fuzzy
 msgid "Appointments"
 msgstr "Cites:"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 #, fuzzy
 msgid "No appointments"
 msgstr "Mostra les hores d'acabament de les cites"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:400
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-calendar.c:379
+#: my-evolution/e-summary-calendar.c:402
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-calendar.c:420
+#, fuzzy
+msgid "No description"
+msgstr "Descripci�:"
+
+#: my-evolution/e-summary-mail.c:151
 #, 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
+#, fuzzy
+msgid "Local Folders"
+msgstr "Carpetes virtuals"
+
 #. 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:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:720
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Afegeix un servidor de not�cies"
 
-#: my-evolution/e-summary-preferences.c:953
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:957
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Nom:"
 
-#: my-evolution/e-summary-preferences.c:1503
-#, fuzzy
-msgid "Summary Settings"
-msgstr "_Par�metres"
-
-#: 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
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "Error en carregar el fitxer: %s"
 
-#: my-evolution/e-summary-rdf.c:528
+#: my-evolution/e-summary-rdf.c:444
 #, fuzzy
 msgid "News Feed"
 msgstr "Servidors de not�cies"
 
-#: my-evolution/e-summary-tasks.c:248
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
+msgstr ""
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "Afegeix >>"
+
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr "<< Elimina"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Mostra"
+
+#: my-evolution/e-summary-tasks.c:251
 #, fuzzy
 msgid "No tasks"
 msgstr "Mostra les _adjuncions"
 
-#: my-evolution/e-summary-tasks.c:287
+#: my-evolution/e-summary-tasks.c:291
 #, fuzzy
 msgid "(No Description)"
 msgstr "(Sense descripci�)"
@@ -10917,26 +24098,26 @@ msgstr "(Sense descripci�)"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#: 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:501
 #, fuzzy
 msgid "Weather"
 msgstr "Altres"
 
-#: my-evolution/e-summary-weather.c:722
-#, fuzzy
-msgid "Regions"
-msgstr "Seccions:"
-
 #: my-evolution/e-summary.c:193
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:488
+#, fuzzy
+msgid "Please wait..."
+msgstr "acaba amb"
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
 msgstr "R_esum"
@@ -10946,47 +24127,11 @@ msgstr "R_esum"
 msgid "Printing of Summary failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: my-evolution/main.c:66
+#: my-evolution/main.c:65
 #, 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"
@@ -11400,12 +24545,6 @@ msgstr ""
 msgid "Freezing ice pellets"
 msgstr ""
 
-#. HAIL
-#: my-evolution/metar.c:217
-#, fuzzy
-msgid "Hail"
-msgstr "_Correu"
-
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
@@ -12180,173 +25319,141 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid " _Remove"
-msgstr "Elimina"
-
-#: my-evolution/my-evolution.glade.h:2
-#, fuzzy
 msgid "Add n_ews feed"
 msgstr "Afegeix un servidor de not�cies"
 
-#: my-evolution/my-evolution.glade.h:3
-#, fuzzy
-msgid "Al_l stations:"
-msgstr "Tots els assistents"
-
-#: my-evolution/my-evolution.glade.h:4
-#, fuzzy
-msgid "All _folders:"
-msgstr "Carpetes"
-
-#: my-evolution/my-evolution.glade.h:5
-#, fuzzy
-msgid "All news _feeds:"
-msgstr "Afegeix un servidor de not�cies"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 #, fuzzy
 msgid "One mont_h"
 msgstr "mes"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "One w_eek"
 msgstr "Mostra 1 setmana"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "Mostra en aquest ordre"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "Show _all tasks"
 msgstr "Mostra les _adjuncions"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "Mostra les _adjuncions"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 #, fuzzy
 msgid "Tasks "
 msgstr "Tasques"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 #, fuzzy
 msgid "Weather settings"
 msgstr "Par�metres de prova"
 
-#: my-evolution/my-evolution.glade.h:22
-#, fuzzy
-msgid "_Display folders:"
-msgstr "Visualitza les carpetes que continguin:"
-
-#: my-evolution/my-evolution.glade.h:23
-#, fuzzy
-msgid "_Display stations:"
-msgstr "Opcions de visualitzaci�"
-
-#: my-evolution/my-evolution.glade.h:24
-#, fuzzy
-msgid "_Displayed feeds:"
-msgstr "_Visualitzaci�"
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 #, fuzzy
 msgid "_Five days"
 msgstr "Divendres"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr "_Correu"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "_News Feeds"
 msgstr "Servidors de not�cies"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "_One day"
 msgstr "Dimecres"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 #, fuzzy
 msgid "_Schedule"
 msgstr "Seleccioneu una carpeta"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 #, fuzzy
 msgid "_Weather"
 msgstr "Altres"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 #, fuzzy
+msgid "Configuration control for Evolution default folders."
+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"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#, fuzzy
 msgid "The Evolution shell."
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 #, fuzzy
 msgid "Show Details"
 msgstr "Detalls"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 #, fuzzy
 msgid "Cancel Operation"
 msgstr "Cancel�lat"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr ""
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr ""
-
-#: shell/e-local-storage.c:636
-#, fuzzy
-msgid "Local Folders"
-msgstr "Carpetes virtuals"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instal�laci� de l'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"
@@ -12354,17 +25461,17 @@ msgstr ""
 "Aquesta nova versi� de l'Evolution necessita instal�lar fitxers addicionals\n"
 "al directori personal on teniu l'Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Si us plau, feu clic a \"D'acord\" per instal�lar els fitxers, o a "
 "\"Cancel�la\" per sortir."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -12375,14 +25482,40 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "S'ha produ�t un error en llegir el fitxer."
 
-#: shell/e-setup.c:281
+#: shell/e-setup.c:282
+#, fuzzy, c-format
+msgid ""
+"Evolution could not create directory\n"
+"%s:\n"
+"%s"
+msgstr ""
+"No s'ha pogut crear el directori %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:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -12393,7 +25526,7 @@ msgstr ""
 "Si us plau, moveu-lo per permetre la instal�laci�\n"
 "dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-setup.c:295
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -12402,7 +25535,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:320
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -12413,57 +25546,59 @@ msgstr ""
 "de l'Evolution. Si us plau, moveu-lo per permetre\n"
 "la instal�laci� dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-shell-about-box.c:40
-#, fuzzy
-msgid "Evolution "
-msgstr "Evolution"
-
-#: shell/e-shell-about-box.c:41
-#, fuzzy
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "No es pot bifurcar %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"No s'ha pogut suprimir la carpeta `%s':\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "No es pot bifurcar %s: %s"
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "No es poden copiar els fitxers a\n"
 "`%s'."
 
-#: 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 ""
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 #, fuzzy
 msgid "Copy folder"
 msgstr "Copia a la carpeta"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 #, fuzzy
 msgid "Move folder"
 msgstr "Mou a la carpeta"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -12472,20 +25607,20 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Crea \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: shell/e-shell-folder-commands.c:425
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:502
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -12494,23 +25629,23 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:549
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:556
 #, fuzzy
 msgid "Rename folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:148
+#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-creation-dialog.c:168
 #, fuzzy, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "El nom de carpeta indicat no �s v�lid."
 
-#: 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"
@@ -12519,7 +25654,7 @@ msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:267
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea una nova carpeta"
 
@@ -12531,11 +25666,11 @@ 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:359
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nou..."
 
-#: 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 "(Sense t�tol)"
 
@@ -12552,7 +25687,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
+#: 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 ""
 
@@ -12573,105 +25708,111 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:397
+#: shell/e-shell-importer.c:409
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: shell/e-shell-importer.c:420
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:424
+#: shell/e-shell-importer.c:435
 #, 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:434
+#: shell/e-shell-importer.c:445
 #, fuzzy
 msgid "Importing"
 msgstr "S'est� movent"
 
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:453
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:466
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:485
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:502
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:572
 #, fuzzy
 msgid "Automatic"
 msgstr "Tria autom�tica"
 
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:617
+#: shell/e-shell-importer.c:628
 #, fuzzy
 msgid "Select a file"
 msgstr "Fitxer de signatura:"
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:638
 #, fuzzy
 msgid "File type:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:663
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:667
 #, fuzzy
 msgid "Import a single file"
 msgstr "S'est� movent"
 
-#: 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
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: 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
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: 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
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1014
+#: shell/e-shell-importer.c:1027
 #, fuzzy
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1028
 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:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
@@ -12693,6 +25834,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Nou"
+
 #: shell/e-shell-utils.c:114
 #, fuzzy
 msgid "No folder name specified."
@@ -12711,94 +25858,93 @@ msgstr "No s'ha pogut crear el directori %s: %s"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 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:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "_Quant a l'Evolution..."
 
-#: shell/e-shell-view-menu.c:409
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "V�s a la carpeta..."
 
-#: shell/e-shell-view-menu.c:410
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:530
+#: shell/e-shell-view-menu.c:565
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shell-view-menu.c:531
+#: shell/e-shell-view-menu.c:566
 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 ""
-
-#: shell/e-shell-view-menu.c:570
-#, fuzzy, c-format
-msgid "Error executing %s."
-msgstr "Error en desar el fitxer: %s"
-
-#: shell/e-shell-view-menu.c:672
+#: shell/e-shell-view-menu.c:732
 #, fuzzy
 msgid "_Work Online"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Work Offline"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 #, fuzzy
 msgid "Work Offline"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-view.c:1574
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1576
+#: shell/e-shell-view.c:1820
 #, fuzzy
 msgid "(None)"
 msgstr "(Sense nom)"
 
-#: 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 ""
 
-#: shell/e-shell-view.c:1630
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: 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 ""
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12806,21 +25952,25 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr ""
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configuraci� del correu"
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Error gen�ric"
 
@@ -12951,78 +26101,73 @@ msgstr "Elimina"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Error en desar les dreceres."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-storage-set-view.c:658
-#, fuzzy, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
 msgstr ""
-"No s'ha pogut suprimir la carpeta `%s':\n"
-"%s"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Sense nom)"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Cap error"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Ja existeix una carpeta amb el mateix nom"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "El tipus de carpeta especificat no �s v�lid"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "Error d'E/S"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: 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:499
 msgid "The specified folder was not found"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funci� no implementada en aquest emmagatzemament"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Operaci� no suportada"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: 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:513
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "No es pot bifurcar %s: %s"
@@ -13033,106 +26178,115 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:196
-#, fuzzy, c-format
+#, fuzzy
 msgid "%s (%d%% complete)"
 msgstr "% comp_let:"
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<feu clic aqu� per seleccionar una carpeta>"
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "Error desconegut"
+
+#: 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/evolution-shell-component.c:1045
 #, fuzzy
 msgid "CORBA error"
 msgstr "Error d'E/S"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 #, fuzzy
 msgid "Invalid argument"
 msgstr "adjunci�"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 #, fuzzy
 msgid "No owner"
 msgstr "Cap"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 #, fuzzy
 msgid "Not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Detecta els tipus suportats..."
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Consulta cancel�lada per l'usuari."
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 #, fuzzy
 msgid "Internal error"
 msgstr "Error d'E/S"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 #, fuzzy
 msgid "Exists"
 msgstr "S_urt"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Agenda"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 #, fuzzy
 msgid "Has subfolders"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 #, fuzzy
 msgid "No space left"
 msgstr "S'ha rebut el missatge"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:124
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr "Error desconegut"
-
-#: 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/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "Nom del fitxer:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
@@ -13263,346 +26417,311 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #: shell/main.c:89
+msgid "Evolution"
+msgstr "Evolution"
+
+#: shell/main.c:95
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "_Par�metres"
 
-#: shell/main.c:210
+#: shell/main.c:227
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, 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:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Data d'_inici:"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Data d'_inici:"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No es pot inicialitzar el sistema de components del Bonobo."
 
+#: 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 "Error en carregar el fitxer: %s"
 
-#: tools/evolution-addressbook-export.c:46
-#, fuzzy
-msgid "Output File"
-msgstr "Obre un fitxer"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "FIXME: Insereix el fitxer..."
 
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Obre un fitxer"
+
 #: tools/evolution-addressbook-import.c:80
 #, fuzzy
 msgid "No filename provided."
 msgstr "(Cap carpeta mostrada)"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Copia"
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Copia a la carpeta"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 #, fuzzy
 msgid "Copy the selection"
 msgstr "_Inverteix la selecci�"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Copia a la carpeta"
+
+#: ui/evolution-addressbook.xml.h:6
 #, fuzzy
 msgid "Create new contact"
 msgstr "Crea un nou contacte"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 #, fuzzy
 msgid "Create new contact list"
 msgstr "Crea un nou contacte"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-#, fuzzy
-msgid "Cut"
-msgstr "Personalitzat"
-
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
 #, fuzzy
 msgid "Cut the selection"
 msgstr "_Inverteix la selecci�"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Delete selected contacts"
 msgstr "Suprimeix un contacte"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:13
 #, fuzzy
-msgid "New List"
-msgstr "Nou"
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Mou a la carpeta"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Enganxa"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Mou a la carpeta"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "Imprimeix els contactes"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "Suprimeix un contacte"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "Select All"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Suprimeix un contacte"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#, fuzzy
-msgid "Send _Message to Contact..."
-msgstr "FIXME: Nou _missatge per contactar"
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "Suprimeix un contacte"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 #, fuzzy
 msgid "Send message to contact"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Atura"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Atura la c�rrega"
 
-#: 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 "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: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-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
 msgid "_Actions"
 msgstr "_Accions"
 
-#: ui/evolution-addressbook.xml.h:30
-#, fuzzy
-msgid "_Addressbook Sources..."
-msgstr "Afegeix una font"
-
-#: ui/evolution-addressbook.xml.h:31
-#, fuzzy
-msgid "_Contact"
-msgstr "_Contactes..."
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 #, fuzzy
 msgid "_Contact List"
 msgstr "_Contactes..."
 
-#: 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
 #, fuzzy
 msgid "_Forward Contact..."
 msgstr "_Contactes..."
 
-#: 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
+#: ui/evolution-addressbook.xml.h:38
 #, fuzzy
-msgid "_Print..."
-msgstr "Imprimeix..."
+msgid "_Move to Folder..."
+msgstr "_Mou a la carpeta"
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Save as VCard"
 msgstr "Desa com a VCard"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "_Cerca contactes"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 #, fuzzy
 msgid "_Select All"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:4
-#, fuzzy
-msgid "Create a New All Day _Event"
-msgstr "Crea una nova agenda"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
-msgid "Create a New _Task"
-msgstr "Crea un nou contacte"
-
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:45
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "Crea una nova cita"
-
-#: ui/evolution-calendar.xml.h:9
-#, fuzzy
-msgid "Create an event for the whole day"
-msgstr "Crea una nova cita per a avui"
+msgid "_Send Message to Contact..."
+msgstr "FIXME: Nou _missatge per contactar"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "Dia"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
 msgid "Delete the appointment"
 msgstr "Suprimeix aquesta cita"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Go To"
 msgstr "V�s a"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Go back"
 msgstr "V�s enrera en el temps"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Go forward"
 msgstr "V�s endavant en el temps"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Go to _Date"
 msgstr "V�s a una data"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "V�s a una data concreta"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to today"
 msgstr "V�s a avui"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:21
-#, fuzzy
-msgid "New Appointment"
-msgstr "Nova cita..."
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-#, fuzzy
-msgid "New Task"
-msgstr "Tasca"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: 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
 #, fuzzy
 msgid "Print Pre_view"
 msgstr "Previsualitzaci� d'impressi�"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Print this calendar"
 msgstr "_Imprimeix aquest agenda"
 
-#: 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
 #, fuzzy
 msgid "Show one day"
 msgstr "Mostra 1 dia"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Show one month"
 msgstr "Mostra 1 mes"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Show one week"
 msgstr "Mostra 1 setmana"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Mostra la setmana de treball"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 #, fuzzy
 msgid "Week"
 msgstr "Setmanes"
 
-#: ui/evolution-calendar.xml.h:35
-#, fuzzy
-msgid "_Appointment..."
-msgstr "Cites:"
-
-#: ui/evolution-calendar.xml.h:36
-#, fuzzy
-msgid "_Calendar Settings..."
-msgstr "_Par�metres"
-
-#: ui/evolution-calendar.xml.h:42
-#, fuzzy
-msgid "_Publish Free/Busy Information"
-msgstr "Cap informaci�"
-
-#: ui/evolution-calendar.xml.h:43
-#, fuzzy
-msgid "_Task..."
-msgstr "Tasca"
-
 #: 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
@@ -13635,18 +26754,19 @@ msgstr "Previsualitza el missatge que s'ha d'imprimir"
 msgid "Print this item"
 msgstr "Imprimeix aquest element"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Imprimeix..."
-
-#: 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 "Desa"
 
+#: ui/evolution-comp-editor.xml.h:13
+#, fuzzy
+msgid "Save As..."
+msgstr "Anomena i desa..."
+
 #: 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 "Desa i tanca"
 
@@ -13663,8 +26783,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:40
 msgid "_File"
 msgstr "_Fitxer"
 
@@ -13674,7 +26794,7 @@ msgid "Print En_velope..."
 msgstr "Imprimeix el missatge..."
 
 #: 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
 #, fuzzy
 msgid "Save _As..."
@@ -13684,10 +26804,15 @@ msgstr "Anomena i desa..."
 msgid "Save the contact and close the dialog box"
 msgstr "Desa el contacte i tanca el quadre de di�leg"
 
+#: ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "FIXME: Nou _missatge per contactar"
+
 #: 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 "_Desa"
 
@@ -13759,6 +26884,11 @@ 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"
@@ -13770,92 +26900,59 @@ msgid "Compose _New Message"
 msgstr "Redacta un nou missatge"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: 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:6
 #, fuzzy
 msgid "Empty _Trash"
 msgstr "Dies buits:"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Oblida les _contrasenyes"
 
-#: 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
-#, fuzzy
-msgid "New Message"
-msgstr "_Missatge"
-
-#: 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:10
 #, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-global.xml.h:13
-#, fuzzy
-msgid "Send / Receive"
-msgstr "Sendmail"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Envia el correu de la cua i recupera'n el nou"
-
-#: 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:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Editor de carpetes _virtuals..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "_Filters..."
 msgstr "_Filtres de correu ..."
 
-#: ui/evolution-mail-global.xml.h:20
-#, fuzzy
-msgid "_Mail Message"
-msgstr "FIXME: Missatge de _correu"
-
-#: ui/evolution-mail-global.xml.h:21
-#, fuzzy
-msgid "_Mail Settings..."
-msgstr "_Par�metres"
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "Previsualitzaci�:"
 
-#: ui/evolution-mail-global.xml.h:23
-#, fuzzy
-msgid "_Send / Receive"
-msgstr "Sendmail"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "S'estan escanejant les carpetes de \"%s\""
@@ -13964,11 +27061,11 @@ msgstr "Imprimeix el missatge seleccionat"
 msgid "Threaded Message list"
 msgstr "Llista de missatges en cadena"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_Esborra"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Carpeta"
 
@@ -13988,251 +27085,257 @@ msgstr "Llista de missatges en cadena"
 
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Desa a la llibreta d'adreces"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "_Aplica els filtres"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Desa a la llibreta d'adreces"
+
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
 msgid "Apply filter rules to the selected messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
 #, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Respon a tots els destinataris d'aquest missatge"
 
-#: 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-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:7
 #, fuzzy
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:9
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "Copia el missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:10
 #, fuzzy
 msgid "Create _Virtual Folder From Message"
 msgstr "Carpetes virtuals"
 
-#: 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-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-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-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:14
 #, fuzzy
 msgid "Create a rule to filter messages with this subject"
 msgstr "Envia un missatge sense assumpte"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create a virtual folder for these recipients"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:16
 #, fuzzy
 msgid "Create a virtual folder for this mailing list"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:17
 #, fuzzy
 msgid "Create a virtual folder for this sender"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Create a virtual folder for this subject"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
 #, fuzzy
 msgid "Display the next important message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Display the next message"
 msgstr "l'hora actual"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
 msgid "Display the previous important message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Voleu descartar aquest missatge?"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Display the previous unread message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Reenvia"
+
+#: ui/evolution-mail-message.xml.h:29
 #, fuzzy
 msgid "Filter on Mailing _List..."
 msgstr "Filtre sobre la llista de correu"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "Filtre sobre el remitent"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "Filtre sobre els destinataris"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "Filtre sobre l'assumpte"
 
-#: ui/evolution-mail-message.xml.h:29
-msgid "Force images in HTML mail to be loaded"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:30
-msgid "Forward"
-msgstr "Reenvia"
-
-#: ui/evolution-mail-message.xml.h:31
-#, fuzzy
-msgid "Forward As"
-msgstr "Reenvia"
-
-#: ui/evolution-mail-message.xml.h:32
-#, fuzzy
-msgid "Forward _Attached"
-msgstr "Reenvia"
-
 #: ui/evolution-mail-message.xml.h:33
 #, fuzzy
-msgid "Forward _Inline"
-msgstr "V�s endavant en el temps"
+msgid "Flag selected message(s) for follow-up"
+msgstr "Imprimeix el missatge seleccionat"
 
 #: ui/evolution-mail-message.xml.h:34
-#, fuzzy
-msgid "Forward _Quoted"
-msgstr "Reenvia"
+msgid "Follow _Up..."
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message in the body of a new message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Increase the text size"
 msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Load _Images"
 msgstr "Missatge reenviat - %s"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark as I_mportant"
 msgstr "Marca'l com a per _llegir"
 
 #: ui/evolution-mail-message.xml.h:45
 #, fuzzy
-msgid "Mark as Unimp_ortant"
+msgid "Mark as U_nread"
 msgstr "Marca'l com a per _llegir"
 
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
-msgid "Mark the selected messages as having been read"
-msgstr "Imprimeix el missatge seleccionat"
+msgid "Mark as Unimp_ortant"
+msgstr "Marca'l com a per _llegir"
 
 #: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-msgid "Mark the selected messages as important"
+msgid "Mark the selected message(s) as having been read"
 msgstr "Imprimeix el missatge seleccionat"
 
 #: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as not having been read"
-msgstr ""
+#, fuzzy
+msgid "Mark the selected message(s) as important"
+msgstr "Imprimeix el missatge seleccionat"
 
 #: ui/evolution-mail-message.xml.h:49
 #, fuzzy
-msgid "Mark the selected messages as unimportant"
+msgid "Mark the selected message(s) as not having been read"
 msgstr "Imprimeix el missatge seleccionat"
 
 #: ui/evolution-mail-message.xml.h:50
 #, fuzzy
-msgid "Mark the selected messages for deletion"
+msgid "Mark the selected message(s) as unimportant"
 msgstr "Imprimeix el missatge seleccionat"
 
 #: ui/evolution-mail-message.xml.h:51
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Imprimeix el missatge seleccionat"
+
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Mou"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
-msgid "Move selected messages to another folder"
+msgid "Move selected message(s) to another folder"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Seg�ent"
 
-#: ui/evolution-mail-message.xml.h:54
-#, fuzzy
-msgid "Next Important Message"
-msgstr "Respon al remitent d'aquest missatge"
-
 #: ui/evolution-mail-message.xml.h:55
 #, fuzzy
-msgid "Next Message"
-msgstr "_Missatge"
+msgid "Next _Important Message"
+msgstr "Respon al remitent d'aquest missatge"
 
 #: ui/evolution-mail-message.xml.h:56
 #, fuzzy
-msgid "Next Thread"
+msgid "Next _Thread"
 msgstr "Selecciona'ls _tots"
 
 #: ui/evolution-mail-message.xml.h:57
 #, fuzzy
-msgid "Next Unread Message"
+msgid "Next _Unread Message"
 msgstr "Mou el missatge"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -14251,170 +27354,196 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-msgid "Preview the message to be printed"
-msgstr "Previsualitza el missatge que s'ha d'imprimir"
+msgid "P_revious Unread Message"
+msgstr "Carrega un missatge desat anteriorment"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Previous"
-msgstr "Ant_erior"
+msgid "Pr_evious Important Message"
+msgstr "Carrega un missatge desat anteriorment"
 
 #: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Previous Important Message"
-msgstr "Carrega un missatge desat anteriorment"
+msgid "Preview the message to be printed"
+msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
 #: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-msgid "Previous Message"
-msgstr "Imprimeix el missatge"
-
-#: ui/evolution-mail-message.xml.h:65
-#, fuzzy
-msgid "Previous Unread Message"
-msgstr "Carrega un missatge desat anteriorment"
+msgid "Previous"
+msgstr "Ant_erior"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 #, fuzzy
 msgid "Print this message"
 msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "Respon"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Re_direct"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "Respon a tots"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Mou un missatge a una nova carpeta"
 
-#: 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-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "Anomena i desa..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Desa el missatge a una carpeta determinada"
 
-#: 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-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
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "Font del correu"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Cerca completa"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Envia els missatges en format HTML"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Comprova si hi ha nou correu"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Filtre sobre la llista de correu"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "VFolder sobre el remite_nt"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "VFolder sobre els destinata_ris"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "VFolder sobre l'assumpte"
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
-msgstr "_Aplica els filtres"
-
 #: ui/evolution-mail-message.xml.h:92
 #, fuzzy
+msgid "_Attached"
+msgstr "Adjunta"
+
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
 msgid "_Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Reenvia el missatge"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "V�s a"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "Visualitza en l�nia"
+
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Larger"
 msgstr "Busca"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Message Display"
 msgstr "Esborra la visualitzaci� del missatge"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "_Missatge"
+
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Normal Display"
 msgstr "_Visualitzaci�"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:105
 #, fuzzy
 msgid "_Open Message"
 msgstr "_Edita el missatge"
 
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Imprimeix el missatge"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Cap"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_Eines"
 
+#: ui/evolution-mail-message.xml.h:112
+#, fuzzy
+msgid "_Undelete"
+msgstr "_Suprimeix"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
 msgid "Close this window"
@@ -14422,14 +27551,14 @@ msgstr "Suprimeix aquesta cita"
 
 #: 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:36
 #, fuzzy
 msgid "_Close"
 msgstr "Tanca"
 
 #: 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:56
 msgid "_View"
 msgstr "_Visualitza"
 
@@ -14456,12 +27585,12 @@ msgstr "Edita el missatge"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
-#: 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 "Format"
 
-#: 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"
@@ -14480,6 +27609,11 @@ msgstr "Insereix un fitxer com a text dins del missatge"
 msgid "Insert text file..."
 msgstr "_Insereix el fitxer de text... (FIXME)"
 
+#: ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "_Obre"
+
 #: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "Open a file"
@@ -14516,7 +27650,7 @@ msgid "Save in folder..."
 msgstr "Desa a la _carpeta..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:7
 #, fuzzy
 msgid "Save the current file"
 msgstr "l'hora actual"
@@ -14546,6 +27680,7 @@ msgid "Send _later"
 msgstr "Remitent"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Envia els missatges en format HTML"
@@ -14628,7 +27763,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 #, fuzzy
 msgid "_Insert"
 msgstr "_�ndex"
@@ -14643,11 +27778,7 @@ msgstr "_Obre..."
 msgid "_Reply-To Field"
 msgstr "Respon"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr ""
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Ajuda"
 
@@ -14707,39 +27838,45 @@ msgstr ""
 msgid "Re_fresh Task"
 msgstr "Refresca la llista"
 
-#: 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:3
 #, fuzzy
 msgid "Copy selected task"
 msgstr "Obre la tasca"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Suprimeix la tasca"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "Suprimeix la tasca"
+
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Delete selected tasks"
 msgstr "Suprimeix la tasca"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "Marca com a completa"
+
+#: ui/evolution-tasks.xml.h:10
 #, fuzzy
 msgid "Paste task from the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:11
 #, fuzzy
-msgid "Tasks Settings..."
-msgstr "_Par�metres"
+msgid "Previews the list of tasks to be printed"
+msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
-msgid "_Task"
-msgstr "Tasca"
+msgid "Print the list of tasks"
+msgstr "Imprimeix el missatge"
 
 #: ui/evolution.xml.h:1
 #, fuzzy
@@ -14817,133 +27954,139 @@ msgstr "Envia aquest missatge"
 
 #: ui/evolution.xml.h:21
 #, fuzzy
+msgid "Send / Receive"
+msgstr "Sendmail"
+
+#: ui/evolution.xml.h:22
+#, 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
+#, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Mostra informaci� referent a l'Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Submit Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Envia un informe d'error mitjan�ant el Bug Buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "Toggle"
 msgstr "M�bil"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commuta la visualitzaci� o no de la barra de dreceres"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Toggle whether we are working offline."
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Visualitza la carpeta seleccionada"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Copy..."
 msgstr "Copia"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_V�s a la carpeta..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Import..."
 msgstr "S'est� movent"
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Move..."
 msgstr "Mou"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nova VFolder"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "_Par�metres"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Tanca..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+#, fuzzy
+msgid "_Send / Receive"
+msgstr "Sendmail"
+
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Shortcut"
 msgstr "Mostra la barra de _dreceres"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: 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:3
 #, fuzzy
 msgid "Print summary"
 msgstr "Sense resum"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 #, fuzzy
 msgid "Reload"
 msgstr "R�dio"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 #, fuzzy
 msgid "Reload the view"
 msgstr "Reconstrueix la visualitzaci� del missatge"
 
-#: ui/my-evolution.xml.h:8
-#, fuzzy
-msgid "_Summary Settings..."
-msgstr "_Par�metres"
-
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "Address Cards"
@@ -14961,20 +28104,29 @@ msgstr "Tipus de tel�fon"
 
 #: views/mail/galview.xml.h:1
 #, fuzzy
+msgid "As Sent Folder"
+msgstr "Seleccioneu una carpeta"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
 msgid "By Sender"
 msgstr "Remitent"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 #, fuzzy
 msgid "By Status"
 msgstr "_Estat:"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 #, fuzzy
 msgid "By Subject"
 msgstr "Assumpte"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 #, fuzzy
 msgid "Messages"
 msgstr "_Missatge"
@@ -14984,6 +28136,12 @@ msgstr "_Missatge"
 msgid "With Category"
 msgstr "categories"
 
+#. Check for UTC.
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+msgid "UTC"
+msgstr ""
+
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 #, fuzzy
 msgid "Select a Time Zone"
@@ -15006,12 +28164,23 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 #, fuzzy
 msgid "_Current View"
 msgstr "l'hora actual"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "Cerca personalitzada"
+
+#: widgets/menus/gal-view-menus.c:333
+#, fuzzy
+msgid "Save Custom View"
+msgstr "Cerca personalitzada"
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr ""
 
@@ -15046,80 +28215,85 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor de percentatge ha d'estar entre 0 i 100, ambd�s inclosos"
 
-#: 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 ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 #, fuzzy
 msgid "Greek"
 msgstr "setmana"
 
-#: 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 ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 #, fuzzy
 msgid "Turkish"
 msgstr "Tasca"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 #, fuzzy
 msgid "Traditional"
 msgstr "Opcions"
 
-#: 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 ""
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "Nou"
+#: widgets/misc/e-charset-picker.c:95
+#, fuzzy
+msgid "Visual"
+msgstr "Alarmes visuals"
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, fuzzy, c-format
 msgid "Unknown character set: %s"
 msgstr "Error desconegut: %s"
 
-#: widgets/misc/e-charset-picker.c:201
+#: 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:281
 #, fuzzy
 msgid "Other..."
 msgstr "Altres"
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr ""
 
@@ -15127,30 +28301,25 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:146
 #, fuzzy
 msgid "Search Editor"
 msgstr "Contacta l'editor"
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:162
 #, fuzzy
 msgid "Save Search"
 msgstr "Cerca"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:97
 #, fuzzy
-msgid "Add to Saved Searches"
+msgid "_Save Search..."
 msgstr "Cerca"
 
-#: widgets/misc/e-filter-bar.h:95
-#, fuzzy
-msgid "Clear"
-msgstr "Agenda"
-
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:98
 #, fuzzy
-msgid "Show All"
-msgstr "Mostra"
+msgid "_Edit Saved Searches..."
+msgstr "Cerca"
 
 #: widgets/misc/e-messagebox.c:152
 #, fuzzy
@@ -15178,12 +28347,22 @@ msgstr "_Missatge"
 msgid "Don't show this message again."
 msgstr "Envia aquest missatge"
 
-#: widgets/misc/e-search-bar.c:334
+#: widgets/misc/e-search-bar.c:477
 #, fuzzy
-msgid "Sear_ch"
-msgstr "Cerca"
+msgid "_Find Now"
+msgstr "finestra2"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Agenda"
+
+#: widgets/misc/e-search-bar.c:835
+#, fuzzy
+msgid "Clear"
+msgstr "Agenda"
+
+#: widgets/misc/e-search-bar.c:837
 #, fuzzy
 msgid "Find Now"
 msgstr "finestra2"
@@ -15215,6 +28394,642 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
+#~ msgid "Card: "
+#~ msgstr "Cotxe"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr "Nom:"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr "_Sufix:"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr "Data d'ini_ci:"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr "_Adre�a:"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr "Pa�_s:"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr "Adre�a electr�nica 2"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr "Adre�a electr�nica 2"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr "Feina 2"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr "Nom:"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr "categories"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr "Comentaris sobre l'element:"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr "P�blic"
+
+#, fuzzy
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Connexi� de prova a \"%s\""
+
+#, fuzzy
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Connexi� de prova a \"%s\""
+
+#, fuzzy
+#~ msgid "New _Contact"
+#~ msgstr "Visualitza tots els contactes"
+
+#, fuzzy
+#~ msgid "New Contact _List"
+#~ msgstr "Visualitza tots els contactes"
+
+#, fuzzy
+#~ msgid "Edit Addressbook"
+#~ msgstr "Desa a la llibreta d'adreces"
+
+#, fuzzy
+#~ msgid "Account Name"
+#~ msgstr "cont�"
+
+#, fuzzy
+#~ msgid "Add Addressbook"
+#~ msgstr "Desa a la llibreta d'adreces"
+
+#, fuzzy
+#~ msgid "Server Name"
+#~ msgstr "Servidor:"
+
+#, fuzzy
+#~ msgid "_My server requires authentication"
+#~ msgstr ""
+#~ "No es pot connectar al servidor POP.\n"
+#~ "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..."
+
+#, fuzzy
+#~ msgid "_Message Recipients:"
+#~ msgstr "Destinataris del missatge"
+
+#~ msgid "B_usiness"
+#~ msgstr "F_eina"
+
+#~ msgid "Business _Fax"
+#~ msgstr "Fax de la feina"
+
+#~ msgid "_Business"
+#~ msgstr "_Feina"
+
+#~ msgid "_Home"
+#~ msgstr "_Particular"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Create a new task"
+#~ msgstr "Crea un nou contacte"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Tasca"
+
+#, fuzzy
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Crea una nova cita"
+
+#, fuzzy
+#~ msgid "First day of wee_k:"
+#~ msgstr "primer dia de la setmana:"
+
+#, fuzzy
+#~ msgid "_Other"
+#~ 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"
+
+#~ msgid "Server rejected username"
+#~ msgstr "El servidor ha rebutjat el nom d'usuari"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "El servidor ha rebutjat el nom d'usuari/la contrasenya"
+
+#~ msgid "Message %s not found."
+#~ msgstr "No s'ha trobat el missatge %s."
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "No s'ha pogut aconseguir la llista de grups del servidor"
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "No es pot carregar el fitxer de llista de grups per a %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
+
+#~ msgid "Could not open directory for news server: %s"
+#~ msgstr "No s'ha pogut obrir el directori per al servidor de not�cies: %s"
+
+#~ msgid "Unable to open or create .newsrc file for %s: %s"
+#~ msgstr "No es pot obrir o crear el fitxer .newsrc per a %s: %s"
+
+#, fuzzy
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "No s'ha pogut connectar al servidor POP en %s."
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr ""
+#~ "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
+
+#, fuzzy
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "No s'ha pogut enviar el missatge: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ 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."
+#~ msgstr ""
+#~ "Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per "
+#~ "autenticar-vos-hi."
+
+#~ msgid "Could not authenticate to KPOP server: %s"
+#~ msgstr "No se us ha pogut autenticar al servidor KPOP: %s"
+
+#, fuzzy
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "No s'ha pogut connectar al servidor POP en %s."
+
+#~ msgid "(Unknown)"
+#~ 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."
+
+#, fuzzy
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
+
+#, fuzzy
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Introdu�u l'URI de la carpeta"
+
+#~ msgid "Message was received"
+#~ msgstr "S'ha rebut el missatge"
+
+#~ msgid "Message was sent"
+#~ msgstr "S'ha enviat el missatge"
+
+#~ msgid "on or before"
+#~ msgstr "el o abans del"
+
+#, fuzzy
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "No s'ha pogut connectar al servidor POP en %s."
+
+#, fuzzy
+#~ msgid "New _Mail Message"
+#~ msgstr "FIXME: Missatge de _correu"
+
+#, fuzzy
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Carpetes virtuals"
+
+#~ msgid "Filter on Mailing List"
+#~ msgstr "Filtre sobre la llista de correu"
+
+#, fuzzy
+#~ msgid "Mailbox Format"
+#~ 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"
+
+#~ msgid "Edit..."
+#~ msgstr "Edita..."
+
+#, fuzzy
+#~ msgid "HTML signature file:"
+#~ msgstr "Fitxer de signatura:"
+
+#, fuzzy
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Fitxer de signatura:"
+
+#, fuzzy
+#~ msgid "_Email Address:"
+#~ msgstr "Adre�a electr�nica:"
+
+#, fuzzy
+#~ msgid "_Full Name:"
+#~ msgstr "Nom complet:"
+
+#, fuzzy
+#~ msgid "_Organization:"
+#~ msgstr "Organitzaci�:"
+
+#, fuzzy
+#~ msgid "_Remember this password"
+#~ msgstr "Desa com a VCard"
+
+#, fuzzy
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Envia els missatges en format HTML"
+
+#, fuzzy
+#~ msgid "_Server Type: "
+#~ msgstr "Servidor:"
+
+#, fuzzy
+#~ msgid "_Signature file:"
+#~ msgstr "Fitxer de signatura:"
+
+#~ msgid "seconds."
+#~ msgstr "segons."
+
+#, fuzzy
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr ""
+#~ "No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#, fuzzy
+#~ msgid "Summary Settings"
+#~ 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:"
+
+#, fuzzy
+#~ msgid "_Display stations:"
+#~ msgstr "Opcions de visualitzaci�"
+
+#, fuzzy
+#~ msgid "_Displayed feeds:"
+#~ msgstr "_Visualitzaci�"
+
+#, fuzzy
+#~ 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)"
+
+#, fuzzy
+#~ msgid "New List"
+#~ msgstr "Nou"
+
+#, fuzzy
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Crea una nova agenda"
+
+#, fuzzy
+#~ msgid "Create a New _Task"
+#~ msgstr "Crea un nou contacte"
+
+#, fuzzy
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Crea una nova cita"
+
+#, fuzzy
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Crea una nova cita per a avui"
+
+#, fuzzy
+#~ msgid "_Appointment..."
+#~ msgstr "Cites:"
+
+#, fuzzy
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Par�metres"
+
+#, fuzzy
+#~ msgid "_Task..."
+#~ msgstr "Tasca"
+
+#, fuzzy
+#~ msgid "_Mail Settings..."
+#~ msgstr "_Par�metres"
+
+#, fuzzy
+#~ msgid "Forward _Attached"
+#~ msgstr "Reenvia"
+
+#, fuzzy
+#~ msgid "Forward _Quoted"
+#~ msgstr "Reenvia"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Aplica els filtres"
+
+#, fuzzy
+#~ msgid "Tasks Settings..."
+#~ msgstr "_Par�metres"
+
+#, fuzzy
+#~ msgid "_Summary Settings..."
+#~ msgstr "_Par�metres"
+
+#, fuzzy
+#~ msgid "Show All"
+#~ msgstr "Mostra"
+
+#, fuzzy
+#~ msgid "Sear_ch"
+#~ msgstr "Cerca"
+
+#, fuzzy
 #~ msgid "I couldn't remove the item from your calendar file!\n"
 #~ msgstr "No s'ha pogut crear una agenda a `%s'"
 
@@ -15320,14 +29135,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
 #, fuzzy
-#~ msgid "_Imperial"
-#~ msgstr "abril"
-
-#, fuzzy
-#~ msgid "Ximian Evolution"
-#~ msgstr "Evolution"
-
-#, fuzzy
 #~ msgid ""
 #~ "Ximian Evolution is a suite of groupware applications\n"
 #~ "for mail, calendaring, and contact management\n"
@@ -15364,20 +29171,17 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "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"
+#~ "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"
+#~ "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"
+#~ "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"
@@ -15401,10 +29205,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
 
 #, fuzzy
-#~ msgid "LDAP Authentication"
-#~ msgstr "Autenticaci�:"
-
-#, fuzzy
 #~ msgid "Password:"
 #~ msgstr "Contrasenya"
 
@@ -15412,9 +29212,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Sent By:"
 #~ msgstr "Vist"
 
-#~ msgid "Couldn't create temporary mbox `%s': %s"
-#~ msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
-
 #, fuzzy
 #~ msgid ""
 #~ "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -15455,14 +29252,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "_Import File..."
 #~ msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#, fuzzy
-#~ msgid "Factory for the Evolution addressbook component."
-#~ msgstr ""
-#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#~ msgid "123"
-#~ msgstr "123"
-
 #~ msgid "a"
 #~ msgstr "a"
 
@@ -15556,9 +29345,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Snooze"
 #~ msgstr "'Snooze'"
 
-#~ msgid "Ok"
-#~ msgstr "D'acord"
-
 #, fuzzy
 #~ msgid "%d"
 #~ msgstr "d"
@@ -15598,13 +29384,12 @@ 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"
@@ -15619,10 +29404,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Adre�a electr�nica 2"
 
 #, fuzzy
-#~ msgid "Pine mail"
-#~ msgstr "Adre�a electr�nica principal"
-
-#, fuzzy
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Missatge reenviat - %s"
 
@@ -15639,11 +29420,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Sincronitza \"%s\""
 
 #, fuzzy
-#~ msgid "Factory for the Evolution executive summary component."
-#~ msgstr ""
-#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#, fuzzy
 #~ msgid "%l:%M%p"
 #~ msgstr "%I:%M %p"
 
@@ -15675,10 +29451,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Unknown auth type"
 #~ msgstr "Error desconegut"
 
-#, fuzzy
-#~ msgid "Subtree"
-#~ msgstr "Subscriu-me"
-
 #~ msgid "Root DN:"
 #~ msgstr "DN arrel:"
 
@@ -15704,25 +29476,12 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "USA"
 #~ msgstr "EUA"
 
-#, fuzzy
-#~ msgid "Canceled"
-#~ msgstr "Cancel�lat"
-
-#~ msgid "Transparent"
-#~ msgstr "Transparent"
-
-#~ msgid "Opaque"
-#~ msgstr "Opac"
-
 #~ msgid "12 hour (am/pm)"
 #~ msgstr "12 hores (am/pm)"
 
 #~ msgid "Beep when alarm windows appear."
 #~ msgstr "Fes un so quan aparegui una finestra d'alarma."
 
-#~ msgid "Calendar Preferences"
-#~ msgstr "Prefer�ncies de l'agenda"
-
 #, fuzzy
 #~ msgid "Colors for Tasks"
 #~ msgstr "Colors per a la visualitzaci�"
@@ -15731,9 +29490,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Date Navigator"
 #~ msgstr "Opcions del navegador de dates"
 
-#~ msgid "Defaults"
-#~ msgstr "Valors predeterminats"
-
 #~ msgid "Remind me of all appointments"
 #~ msgstr "Recorda'm totes les cites"
 
@@ -15757,26 +29513,11 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "Aquest missatge no t� cap assumpte.\n"
 #~ "Voleu que l'envi� igualment?"
 
-#~ msgid "Edit"
-#~ msgstr "Edita"
-
-#, fuzzy
-#~ msgid "Store search as vFolder"
-#~ msgstr "Seleccioneu una carpeta"
-
-#, fuzzy
-#~ msgid "Resend"
-#~ msgstr "segon"
-
 #, fuzzy
 #~ msgid "Receiving"
 #~ msgstr "Data de recepci�"
 
 #, fuzzy
-#~ msgid "Store"
-#~ msgstr "Puntuaci�"
-
-#, fuzzy
 #~ msgid "Display folders starting with:"
 #~ msgstr "Visualitza les carpetes que continguin:"
 
@@ -15840,19 +29581,12 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Desa el contacte i tanca el quadre de di�leg"
 
 #, fuzzy
-#~ msgid "_Action"
-#~ msgstr "_Accions"
-
-#, fuzzy
 #~ msgid "Help"
 #~ msgstr "_Ajuda"
 
 #~ msgid "See online help"
 #~ msgstr "Consulta l'ajuda en l�nia"
 
-#~ msgid "Compose"
-#~ msgstr "Redacta"
-
 #, fuzzy
 #~ msgid "Manage _Subscriptions..."
 #~ msgstr "Gestiona les subscripcions..."
@@ -15874,10 +29608,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "_Edita el missatge"
 
 #, fuzzy
-#~ msgid "Customize"
-#~ msgstr "Cerca personalitzada"
-
-#, fuzzy
 #~ msgid "Delegate Task"
 #~ msgstr "Suprimeix la tasca"
 
@@ -15918,9 +29648,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "TasksPreferences"
 #~ msgstr "Prefer�ncies de l'agenda..."
 
-#~ msgid "C_ontacts..."
-#~ msgstr "C_ontactes..."
-
 #~ msgid "_Company:"
 #~ msgstr "_Empresa:"
 
@@ -15980,9 +29707,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Time Until Due"
 #~ msgstr "Temps fins al venciment"
 
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarmes visuals"
-
 #~ msgid "Work week"
 #~ msgstr "Setmana de treball"
 
@@ -16139,14 +29863,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Mark as Read"
 #~ msgstr "Mar_ca'l com a llegit"
 
-#, fuzzy
-#~ msgid "Move to Folder..."
-#~ msgstr "Mou a la carpeta"
-
-#, fuzzy
-#~ msgid "Copy to Folder..."
-#~ msgstr "Copia a la carpeta"
-
 #~ msgid "Change folder \"%s\" to \"%s\" format"
 #~ msgstr "Canvia la carpeta \"%s\" al format \"%s\""
 
@@ -16185,15 +29901,9 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Evolution files successfully installed."
 #~ msgstr "Els fitxers de l'Evolution s'han instal�lat amb �xit."
 
-#~ msgid "Activate"
-#~ msgstr "Activa"
-
 #~ msgid "Activate this shortcut"
 #~ msgstr "Activa aquesta drecera"
 
-#~ msgid "Find a contact"
-#~ msgstr "Cerca un contacte"
-
 #~ msgid "View All"
 #~ msgstr "Visualitza'ls tots"
 
@@ -16207,17 +29917,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Crea una nova agenda"
 
 #, fuzzy
-#~ msgid "New _Event"
-#~ msgstr "Nova a_genda"
-
-#, fuzzy
-#~ msgid "Open Calendar"
-#~ msgstr "_Obre una agenda"
-
-#~ msgid "Prev"
-#~ msgstr "Anterior"
-
-#, fuzzy
 #~ msgid "Save calendar as something else"
 #~ msgstr "Deixa l'agenda com a alguna altra cosa"
 
@@ -16329,18 +30028,10 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Create a new email"
 #~ msgstr "Crea un nou contacte"
 
-#, fuzzy
-#~ msgid "Configure Folder..."
-#~ msgstr "Mou a la carpeta"
-
 #~ msgid "Copy message to a new folder"
 #~ msgstr "Copia el missatge a una nova carpeta"
 
 #, fuzzy
-#~ msgid "Expunge"
-#~ msgstr "_Esborra"
-
-#, fuzzy
 #~ msgid "Forward this message in-line with your mail, so you can edit it"
 #~ msgstr "Reenvia un missatge sense cap assumpte"
 
@@ -16401,10 +30092,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "_Insereix el fitxer de text... (FIXME)"
 
 #, fuzzy
-#~ msgid "Redo"
-#~ msgstr "R�dio"
-
-#, fuzzy
 #~ msgid "Redo the undone action"
 #~ msgstr "Elimina una acci�"
 
@@ -16433,10 +30120,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "_Cerca contactes"
 
 #, fuzzy
-#~ msgid "Undo"
-#~ msgstr "_Envia"
-
-#, fuzzy
 #~ msgid "Undo the last action"
 #~ msgstr "Elimina una acci�"
 
@@ -16454,11 +30137,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."
@@ -16481,18 +30164,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."
@@ -16516,9 +30199,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Unspecified"
 #~ msgstr "Especifiqueu la cap�alera"
 
-#~ msgid "Email address:"
-#~ msgstr "Adre�a electr�nica:"
-
 #, fuzzy
 #~ msgid "Evolution Mail Configuration"
 #~ msgstr "Configuraci� del correu"
@@ -16528,10 +30208,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "No suprimeixis els missatges del servidor"
 
 #, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "cont�"
-
-#, fuzzy
 #~ msgid "Reply address:"
 #~ msgstr "Adre�a electr�nica:"
 
@@ -16544,10 +30220,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Desa com a VCard"
 
 #, fuzzy
-#~ msgid "Transport"
-#~ msgstr "Transparent"
-
-#, fuzzy
 #~ msgid "Transport Authentication"
 #~ msgstr "Autenticaci�:"
 
@@ -16578,8 +30250,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"
@@ -16669,18 +30341,9 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Evolution Calendar Conduit"
 #~ msgstr "Conducte de l'agenda de l'Evolution"
 
-#~ msgid "Configuration utility for the evolution calendar conduit.\n"
-#~ msgstr ""
-#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
 #~ msgid "Evolution ToDo Conduit"
 #~ msgstr "Conducte de les coses per fer de l'Evolution"
 
-#~ msgid "Configuration utility for the evolution todo conduit.\n"
-#~ msgstr ""
-#~ "Utilitat de configuraci� per al conducte de les coses per fer de "
-#~ "l'Evolution.\n"
-
 #~ msgid "The priority must be between 1 and 9, inclusive"
 #~ msgstr "La prioritat ha d'estar entre 1 i 9, ambd�s inclosos"
 
@@ -16768,8 +30431,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"
@@ -16842,9 +30505,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "FIXME: Mark as U_nread"
 #~ msgstr "Marca'l com a per _llegir"
 
-#~ msgid "_Object"
-#~ msgstr "_Objecte"
-
 #~ msgid "FIXME: _Item"
 #~ msgstr "FIXME: _Element"
 
@@ -16900,9 +30560,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "FIXME: _Spelling..."
 #~ msgstr "FIXME: _Ortografia..."
 
-#~ msgid "_Forms"
-#~ msgstr "_Formularis"
-
 #~ msgid "FIXME: _New Contact"
 #~ msgstr "FIXME: Contacte _nou"
 
@@ -16928,9 +30585,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "FIXME: New _Journal Entry for Contact"
 #~ msgstr "FIXME: Nova entrada al _diari per contactar"
 
-#~ msgid "FIXME: _Flag for Follow Up..."
-#~ msgstr "FIXME: _Assenyala per al seguiment..."
-
 #~ msgid "FIXME: _Display Map of Address"
 #~ msgstr "FIXME: _Mostra el mapa de l'adre�a"
 
@@ -16958,9 +30612,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "task-editor-dialog"
 #~ msgstr "task-editor-dialog"
 
-#~ msgid "Mail _to:"
-#~ msgstr "Envia per correu _a:"
-
 #~ msgid "_Audio"
 #~ msgstr "_�udio"
 
@@ -16985,24 +30636,17 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "No teniu configurada cap font de correu"
 
 #, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Propietats de l'adjunci�"
-
-#, fuzzy
 #~ msgid "Reply-to:"
 #~ 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 "Full name:"
-#~ msgstr "Nom complet:"
+#~ "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"
@@ -17011,11 +30655,11 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ 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"
@@ -17027,11 +30671,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"
@@ -17043,10 +30687,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"
@@ -17060,12 +30704,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Edit Identity"
 #~ msgstr "Edita la identitat"
 
-#~ msgid "Edit Source"
-#~ msgstr "Edita la font"
-
-#~ msgid "Edit News Server"
-#~ msgstr "Edita el servidor de not�cies"
-
 #~ msgid "The connection was successful!"
 #~ msgstr "La connexi� ha tingut �xit!"
 
@@ -17081,9 +30719,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Mail Sources"
 #~ msgstr "Fonts del correu"
 
-#~ msgid "Mail Transport"
-#~ msgstr "Transport de correu"
-
 #~ msgid "News Sources"
 #~ msgstr "Fonts de not�cies"
 
@@ -17156,9 +30791,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "External Directories"
 #~ msgstr "Directoris externs"
 
-#~ msgid "Port Number:"
-#~ msgstr "N�mero de port:"
-
 #~ msgid "Outline:"
 #~ msgstr "Contorn:"
 
@@ -17180,78 +30812,42 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "sunday"
 #~ msgstr "diumenge"
 
-#~ msgid "monday"
-#~ msgstr "dilluns"
-
 #~ msgid "tuesday"
 #~ msgstr "dimarts"
 
-#~ msgid "tues"
-#~ msgstr "dm."
-
 #~ msgid "wednesday"
 #~ msgstr "dimecres"
 
-#~ msgid "wednes"
-#~ msgstr "dc."
-
 #~ msgid "thursday"
 #~ msgstr "dijous"
 
-#~ msgid "thur"
-#~ msgstr "dj."
-
-#~ msgid "thurs"
-#~ msgstr "dj."
-
-#~ msgid "friday"
-#~ msgstr "divendres"
-
 #~ msgid "saturday"
 #~ msgstr "dissabte"
 
 #~ msgid "fortnight"
 #~ msgstr "quinzena"
 
-#~ msgid "min"
-#~ msgstr "min."
-
 #~ msgid "sec"
 #~ msgstr "s"
 
 #~ msgid "tomorrow"
 #~ msgstr "dem�"
 
-#~ msgid "yesterday"
-#~ msgstr "ahir"
-
 #~ msgid "this"
 #~ msgstr "aquest"
 
 #~ msgid "next"
 #~ msgstr "seg�ent"
 
-#~ msgid "first"
-#~ msgstr "primer"
-
-#~ msgid "third"
-#~ msgstr "tercer"
-
 #~ msgid "fifth"
 #~ msgstr "cinqu�"
 
 #~ msgid "sixth"
 #~ msgstr "sis�"
 
-#~ msgid "seventh"
-#~ msgstr "set�"
-
 #~ msgid "ninth"
 #~ msgstr "nov�"
 
-#~ msgid "tenth"
-#~ msgstr "des�"
-
 #~ msgid "eleventh"
 #~ msgstr "onz�"
 
@@ -17295,8 +30891,7 @@ 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."
@@ -17343,9 +30938,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Rebuilding message view"
 #~ msgstr "S'est� reconstruint la visualitzaci� del missatge"
 
-#~ msgid "N_ew Directory Server"
-#~ msgstr "N_ou servidor de directori"
-
 #~ msgid "_Save Calendar As"
 #~ msgstr "_Anomena i desa l'agenda"
 
@@ -17369,8 +30961,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."
@@ -17387,15 +30979,9 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Time display"
 #~ msgstr "Visualitzaci� de l'hora"
 
-#~ msgid "Time format"
-#~ msgstr "Format de l'hora"
-
 #~ msgid "24-hour"
 #~ msgstr "24 hores"
 
-#~ msgid "Weeks start on"
-#~ msgstr "La setmana comen�a el"
-
 #~ msgid ""
 #~ "Please select the start and end hours you want\n"
 #~ "to be displayed in the day view and week view.\n"
@@ -17422,12 +31008,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "To Do List"
 #~ msgstr "Llista de coses per fer"
 
-#~ msgid "Preferences"
-#~ msgstr "Prefer�ncies"
-
-#~ msgid "Beep on display alarms"
-#~ msgstr "Fes un so en visualitzar les alarmes"
-
 #~ msgid "Audio alarms timeout after"
 #~ msgstr "Les alarmes ac�stiques s'apaguen despr�s de"
 
@@ -17546,9 +31126,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "To-do list"
 #~ msgstr "Llista de coses per fer"
 
-#~ msgid "Hour"
-#~ msgstr "Hora"
-
 #~ msgid "Second"
 #~ msgstr "Segon"
 
@@ -17585,9 +31162,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Bcc: >>"
 #~ msgstr "Bcc: >>"
 
-#~ msgid "label9"
-#~ msgstr "etiqueta9"
-
 #~ msgid "label7"
 #~ msgstr "etiqueta7"
 
@@ -17616,14 +31190,5 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "Per afegir una columna a la vostra taula, arrosegue-la\n"
 #~ "a la ubicaci� on voleu que aparegui."
 
-#~ msgid "Available fields"
-#~ msgstr "Camps disponibles"
-
 #~ msgid "label2"
 #~ msgstr "etiqueta2"
-
-#~ msgid "Add >>"
-#~ msgstr "Afegeix >>"
-
-#~ msgid "<< Remove"
-#~ msgstr "<< Elimina"
diff --git a/po/cs.po b/po/cs.po
index bce248c1e4..7ea752de8a 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-04-18 17:11-0400\n"
+"POT-Creation-Date: 2002-05-07 15:46-0400\n"
 "PO-Revision-Date: 2002-04-18 13:21-0400\n"
 "Last-Translator: Radka Doul�kov� <doulikova@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -30,7 +30,7 @@ msgid "Imports VCard files into Evolution."
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:333
+#: addressbook/gui/widgets/e-addressbook-view.c:335
 msgid "File As"
 msgstr "Ulo� jako"
 
@@ -40,7 +40,7 @@ msgid "Name"
 msgstr "Jm�no"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:337
 msgid "Email"
 msgstr "E-mail"
 
@@ -56,7 +56,7 @@ msgstr "Hl."
 #: 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:367
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asistent"
 
@@ -96,7 +96,7 @@ msgid "Home"
 msgstr "Dom�"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:344
 msgid "Organization"
 msgstr "Organizace"
 
@@ -118,7 +118,7 @@ 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/widgets/e-addressbook-view.c:347
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax - pr�ce"
 
@@ -128,7 +128,7 @@ msgstr "Fax - pr."
 
 #: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1725
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax - domov"
 
@@ -148,7 +148,7 @@ msgstr "Domov 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:351
+#: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -161,49 +161,49 @@ msgstr "Dal��"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1729
-#: addressbook/gui/widgets/e-addressbook-view.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Dal�� fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1730
-#: addressbook/gui/widgets/e-addressbook-view.c:354
+#: 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/widgets/e-addressbook-view.c:355
+#: 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/widgets/e-addressbook-view.c:356
+#: 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:357
+#: 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:359
+#: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "2. e-mail"
 
 #: 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:360
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "3. e-mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:361
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Web Site"
 msgstr "Webov� str�nka"
 
@@ -212,7 +212,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:364
 msgid "Department"
 msgstr "Odd�len�"
 
@@ -221,7 +221,7 @@ msgid "Dep"
 msgstr "Odd."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:365
 msgid "Office"
 msgstr "Kancel��"
 
@@ -230,12 +230,12 @@ msgid "Off"
 msgstr "Kanc."
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:364
+#: addressbook/gui/widgets/e-addressbook-view.c:366
 msgid "Title"
 msgstr "Titul"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.c:367
 msgid "Profession"
 msgstr "Povol�n�"
 
@@ -244,7 +244,7 @@ msgid "Prof"
 msgstr "Pov."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:368
 msgid "Manager"
 msgstr "Vedouc�"
 
@@ -257,7 +257,7 @@ msgid "Ass"
 msgstr "Asist."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:368
+#: addressbook/gui/widgets/e-addressbook-view.c:370
 msgid "Nickname"
 msgstr "P�ezd�vka"
 
@@ -266,12 +266,12 @@ msgid "Nick"
 msgstr "P�ezd."
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:369
+#: 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:370
+#: addressbook/gui/widgets/e-addressbook-view.c:372
 msgid "Note"
 msgstr "Pozn�mka"
 
@@ -284,7 +284,7 @@ msgid "CALUri"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:371
+#: addressbook/gui/widgets/e-addressbook-view.c:373
 msgid "Free-busy URL"
 msgstr ""
 
@@ -318,11 +318,11 @@ msgstr "P��jmen�"
 msgid "%x"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard pro %s"
@@ -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:2738
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 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:1129
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "P�id�v�m kartu do serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1232
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Odstra�uji kartu ze serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1468
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Upravuji kartu ze serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2592
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
 msgid "Restarting search."
 msgstr "Znovu spou�t�m vyhled�v�n�."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2684
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "P�ij�m�m v�sledky hled�n� LDAP"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2765
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
 msgid "Error performing search"
 msgstr "Chyba p�i prov�d�n� hled�n�"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2789
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
 msgid "Could not parse query string"
 msgstr ""
 
@@ -426,55 +426,66 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
+#, fuzzy
+msgid "Addressbook Settings"
+msgstr "Zdroje adres��e"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-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:6
-msgid "Directory Servers"
+msgid "Configuration control for the Evolution Addressbook."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Evolution Addressbook minicard viewer"
+msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution component for handling contacts."
+msgid "Directory Servers"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook Minicard control"
+msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook's address displayer"
+msgid "Evolution component for handling contacts."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-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:12
-msgid "Factory for the configuration control for the Evolution Addressbook."
+msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
-msgid "Factory for the sample Addressbook control"
+msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid ""
-"This page can be used to configure access to directory servers using the "
-"LDAP protocol"
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+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
+msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:72
 #: 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:1042
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakty"
 
@@ -507,203 +518,11 @@ msgstr "Nov� seznam kontakt�"
 msgid "Contact _List"
 msgstr "_Seznam kontakt�"
 
-#: addressbook/gui/component/addressbook-config.c:238
-msgid "Edit Addressbook"
-msgstr "Uprav adres��"
-
-#: 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 "_Ov��it s pou��v�n�m serveru"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Jm�no ��tu"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "P�idej adres��"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Addressbook Sources"
-msgstr "Zdroje adres��e"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Pokro�il�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Z�klad"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Z�kladn�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr "Zkontrolovat toto, pokud server po�aduje va�e ov��en�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "De_lete"
-msgstr "_Smazat"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr "Rozli�ovac� jm�no (RN)"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "E-mailov� adresa"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
-msgstr ""
-"Evolution bude pou��vat toto rozli�ovac� jm�no (RN) k va�emu ov��en� na "
-"serveru"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolution bude pou��vat tuto e-mailovou adresu k va�emu ov��en� na serveru"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr "Jeden"
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "_Z�klad vyhled�v�n�:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
-msgstr "_Rozsah vyhled�v�n�:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Jm�no serveru"
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
-msgstr ""
-"N��e uveden� informace je po�adov�na k tomu, aby mohl b�t p�id�n adres��"
-
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "Tato informace nen� po�adov�na pro v�t�inu server� 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."
-msgstr ""
-"Tuto informaci pou��v� v� server ldap pro up�esn�n� toho, kter� uzly jsou "
-"pou��v�ny p�i vyhled�v�n�. Pro v�ce informac� kontaktujte sv�ho "
-"administr�tora."
-
-#: 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 ""
-"Toto je z�kladn� uzel pro v�echna va�e vyhled�v�n� na serveru ldap. Pro v�ce "
-"informac� kontaktujte sv�ho administr�tora"
-
-#: 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 ""
-"Toto je maxim�ln� po�et karet, kter� mohou b�t sta�eny. Pokud nastav�te toto "
-"��slo p��li� vysok�, zpomal� se tento adres��."
-
-#: 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."
-msgstr ""
-
-#: 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:28
-msgid "This is the port that your ldap server uses."
-msgstr ""
-
-#: 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:30
-msgid "_Account name:"
-msgstr "_N�zev ��tu:"
-
-#: 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:147
-msgid "_Add"
-msgstr "_P�idat"
-
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr "_Rozli�ovac� jm�no:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr "_Omezen� stahov�n�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:157
-#: 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 "_Upravit"
-
-#: addressbook/gui/component/addressbook-config.glade.h:35
-msgid "_Email address:"
-msgstr "_E-mailov� adresa:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "Port"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "N�zev _serveru:"
-
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "Nen� mo�n� spustit gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:168
-msgid "Other Contacts"
-msgstr "Dal�� kontakty"
-
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Nen� mo�n� otev��t adres��"
@@ -731,54 +550,45 @@ msgid ""
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
-#: addressbook/gui/component/addressbook.c:647
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Napi�te heslo pro  %s (u�ivatel %s)"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:769
 msgid "Name begins with"
 msgstr "Jm�no za��n� na"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:770
 msgid "Email is"
 msgstr "E-mail je"
 
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:771
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorie je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:773
+#: addressbook/gui/component/addressbook.c:772
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Jak�koliv pol��ko obsahuje"
 
-#: addressbook/gui/component/addressbook.c:774 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
 msgid "Advanced..."
 msgstr "Pokro�il�..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1002
+#: addressbook/gui/component/addressbook.c:1001
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Jak�koliv kategorie"
 
-#: addressbook/gui/component/addressbook.c:1084
+#: addressbook/gui/component/addressbook.c:1083
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, kterou prohl��e� slo�ek zobraz�"
 
-#.
-#. * 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 "(��dn�)"
-
 #: 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
@@ -827,6 +637,599 @@ 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:215
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr "_Ov��it s pou��v�n�m serveru"
+
+#: 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
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Volby"
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "<- _Remove"
+msgstr "_Odstranit"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "1234"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "Zdroje adres��e"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+msgid "Always"
+msgstr "V�dy"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Connecting"
+msgstr "_Obsahuje"
+
+#: 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 "(Nen� informace)"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "_Smazat"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "_Rozli�ovac� jm�no:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Email Address:"
+msgstr "_E-mailov� adresa:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+msgid "Evolution Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr ""
+"Evolution bude pou��vat tuto e-mailovou adresu k va�emu ov��en� na serveru"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolution bude pou��vat tuto e-mailovou adresu k va�emu ov��en� na serveru"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "_Naj�t"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Obecn�"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "LDAP Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+msgid "LDAP Configuration Assistant"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+msgid "Mappings"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+msgid "Never"
+msgstr "Nikdy"
+
+#: 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 "Jeden"
+
+#: 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 "Implicitn� hodnoty"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Implicitn� hodnoty"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "_Rozsah vyhled�v�n�:"
+
+#. 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Vybrat v�e"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "V�b�r:"
+
+#: 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 "Soubory konfigurace"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+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/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
+#, 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 ""
+"Toto je maxim�ln� po�et karet, kter� mohou b�t sta�eny. Pokud nastav�te toto "
+"��slo p��li� vysok�, zpomal� se tento adres��."
+
+#: 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
+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
+#, fuzzy
+msgid "Using distinguished name (DN)"
+msgstr "Rozli�ovac� jm�no (RN)"
+
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+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
+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:139
+msgid "_Add"
+msgstr "_P�idat"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_P�idat"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+msgid "_Add Mapping"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+msgid "_Add to DN"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "V�dy"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "Smazat"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "Jm�no _asistenta/-ky:"
+
+#: addressbook/gui/component/ldap-config.glade.h:111
+#, fuzzy
+msgid "_Distinguished Name (DN):"
+msgstr "Rozli�ovac� jm�no (RN)"
+
+#: 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 "_Omezen� stahov�n�"
+
+#: 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
+#: 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 "_Upravit"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+msgid "_Edit Mapping"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+msgid "_Evolution attribute:"
+msgstr ""
+
+#: 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 "Volby"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "Port"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Implicitn� hodnoty"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "_Z�klad vyhled�v�n�:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "N�zev _serveru:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+msgid "_Timeout (minutes):"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+msgid "account-druid"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+msgid "account-editor"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Barbados"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+msgid "connecting-tab"
+msgstr ""
+
+#: 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 "Obecn�"
+
+#: 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 "Vyhled�v�m..."
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr ""
@@ -836,7 +1239,7 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:852
+#: 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
 msgid "Remove"
@@ -867,7 +1270,12 @@ msgstr "<(%d nezobrazeno)"
 msgid "Unnamed Contact"
 msgstr "Nepojmenovan� kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:603
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Nepojmenovan� seznam kontakt�"
+
+#: 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"
@@ -877,7 +1285,7 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:611
+#: 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"
@@ -885,31 +1293,39 @@ msgid ""
 "correct this problem."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:693
+#: addressbook/gui/component/select-names/e-select-names.c:806
 msgid "Select Contacts from Addressbook"
 msgstr "Vyberte kontakty z adres��e"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "_Obsahuje"
+msgid "Select Names"
+msgstr "Vybrat jm�na"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "_Naj�t"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Smazat kontakt?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Vybrat jm�na"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Kontakty"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Uk�zat kontakty vyhovuj�c� n�seduj�c�m kriteri�m"
+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
+msgid "_Browse..."
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategorie:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Slo�ka:"
 
@@ -970,11 +1386,6 @@ msgstr "Ulo�it _jako:"
 msgid "Full _Name..."
 msgstr "Cel� _jm�no..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: mail/mail-config.glade.h:57
-msgid "General"
-msgstr "Obecn�"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1016,12 +1427,11 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:707
-#: calendar/gui/e-calendar-table.c:1001 calendar/gui/e-day-view.c:3609
-#: filter/filter.glade.h:8 mail/folder-browser.c:1629
-#: mail/mail-config.glade.h:155 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: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
 msgid "_Delete"
 msgstr "Smazat"
 
@@ -2072,14 +2482,6 @@ 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 ""
-"Opravdu chcete\n"
-"smazat tento kontakt?"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Smazat kontakt?"
 
@@ -2113,7 +2515,7 @@ msgid "Edit Full"
 msgstr "Cel� upravit"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:334
+#: addressbook/gui/widgets/e-addressbook-view.c:336
 msgid "Full Name"
 msgstr "Cel� jm�no"
 
@@ -2342,94 +2744,6 @@ msgstr ""
 msgid "Error getting book view"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:149
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:912
-#: addressbook/gui/widgets/e-addressbook-view.c:1022
-#: addressbook/gui/widgets/e-addressbook-view.c:1705
-#: ui/evolution-addressbook.xml.h:21
-msgid "Save as VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Otev�en�"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1023
-#: ui/evolution-addressbook.xml.h:12
-msgid "Forward Contact"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:317
-#: addressbook/gui/widgets/e-addressbook-view.c:1024
-msgid "Send Message to Contact"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:318
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-#: 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 "Tisknout"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:320
-#: addressbook/gui/widgets/e-addressbook-view.c:1027
-msgid "Print Envelope"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:324
-#: addressbook/gui/widgets/e-addressbook-view.c:1031
-msgid "Copy to folder..."
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:325
-#: addressbook/gui/widgets/e-addressbook-view.c:1032
-msgid "Move to folder..."
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: addressbook/gui/widgets/e-addressbook-view.c:1035
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Vy��znout"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1036
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kop�rovat"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:330
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:381
-#: addressbook/gui/widgets/e-addressbook-view.c:1037
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
-msgid "Paste"
-msgstr "Vlo�it"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:331
-#: addressbook/gui/widgets/e-addressbook-view.c:1038
-#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:214
-#: 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 "Smazat"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
-msgid "New Contact..."
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
-#: addressbook/gui/widgets/e-addressbook-view.c:1089
-msgid "New Contact List..."
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
 #: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
@@ -2443,7 +2757,8 @@ 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 shell/e-shell.c:2096
+#: 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
 msgid "Unknown error"
 msgstr ""
@@ -2471,10 +2786,9 @@ 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
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2276
-#: camel/camel-service.c:613 camel/camel-service.c:649
-#: camel/camel-service.c:717 camel/camel-service.c:756
+#: 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
 msgid "Cancelled"
 msgstr ""
 
@@ -2506,7 +2820,7 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:97
 #: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr ""
 
@@ -2526,86 +2840,182 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:343
+#: addressbook/gui/widgets/e-addressbook-util.c:344
 msgid "Move card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:345
+#: addressbook/gui/widgets/e-addressbook-util.c:346
 msgid "Copy card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Move cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:351
 msgid "Copy cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:332
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:341
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:350
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:352
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+msgid "New Contact..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+msgid "New Contact List..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+msgid "Go to Folder..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "Importovat"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "K_ontakty..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Zdroje adres��e"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Nastaven�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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 "Tisknout"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:893
+msgid "Print Envelope"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Copy to folder..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Move to folder..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Vy��znout"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kop�rovat"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+msgid "Paste"
+msgstr "Vlo�it"
+
+#: 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
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+msgid "Delete"
+msgstr "Smazat"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+msgid "Current View"
+msgstr ""
+
+#. 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:581
+#: addressbook/gui/widgets/e-addressbook-view.c:940
 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 ""
 
@@ -2613,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:586
+#: addressbook/gui/widgets/e-addressbook-view.c:945
 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 ""
 
@@ -2630,7 +3040,7 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
@@ -2639,7 +3049,7 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
+#: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
 "\n"
 "\n"
@@ -2841,29 +3251,25 @@ msgstr ""
 msgid "Untitled appointment"
 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:416 mail/message-list.c:684
+#: 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
 msgid "High"
 msgstr "Vysok�"
 
-#: 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:417 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Norm�ln�"
 
-#: 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:418 mail/message-list.c:682
+#: 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
 msgid "Low"
 msgstr "N�zk�"
 
 #. 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:419
 msgid "Undefined"
 msgstr "Nedefinov�no"
 
@@ -2950,22 +3356,10 @@ 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 ""
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3001,7 +3395,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2598
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varov�n�"
@@ -3045,7 +3439,7 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1118
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr ""
 
@@ -3056,7 +3450,7 @@ msgstr ""
 #. 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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1421 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
@@ -3074,26 +3468,24 @@ msgstr ""
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1468
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:775
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:395
 msgid "Private"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:396
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:394
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr ""
 
@@ -3114,32 +3506,27 @@ msgid "W"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:468
 msgid "Free"
 msgstr "Voln�"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:469
-#: calendar/gui/e-meeting-time-sel.c:435
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
 #: shell/evolution-shell-component.c:1065
 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:489 calendar/gui/print.c:2267
 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:490 calendar/gui/print.c:2270
 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-calendar-table.c:491 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2273
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr ""
 
@@ -3152,11 +3539,10 @@ 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:1591
-#: mail/mail-account-gui.c:1059 mail/mail-account-gui.c:1060
-#: mail/mail-account-gui.c:1661 mail/mail-accounts.c:427
-#: mail/mail-accounts.c:436 mail/mail-accounts.c:486
-#: mail/mail-config.glade.h:87 mail/message-tag-followup.c:64
+#: 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
 #: 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
@@ -3173,21 +3559,13 @@ 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/e-meeting-model.c:821
 msgid "Yes"
 msgstr "Ano"
 
 #: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
 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:1695
-#: calendar/gui/e-week-view.c:1206
-msgid "Searching"
-msgstr ""
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr ""
@@ -3204,8 +3582,8 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/component-factory.c:67 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalend��"
 
@@ -3213,11 +3591,10 @@ msgstr "Kalend��"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:72 calendar/gui/print.c:1754
-#: calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
-#: my-evolution/e-summary-tasks.c:250 my-evolution/e-summary-tasks.c:267
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1039
+#: 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
 msgid "Tasks"
 msgstr ""
@@ -3461,7 +3838,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -3490,7 +3867,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:181
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr ""
 
@@ -3531,170 +3908,164 @@ msgid "Color for tasks due today"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
+msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Days"
+#: calendar/gui/dialogs/recurrence-page.c:1125
+msgid "Friday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr ""
+msgid "Hours"
+msgstr "Hodiny"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
-msgid "Friday"
-msgstr ""
+msgid "Minutes"
+msgstr "Minuty"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Hours"
-msgstr "Hodiny"
+#: calendar/gui/dialogs/recurrence-page.c:1121
+msgid "Monday"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Minutes"
-msgstr "Minuty"
+#: calendar/gui/dialogs/recurrence-page.c:1126
+msgid "Saturday"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
-msgid "Monday"
+msgid "Sh_ow a default reminder"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
+msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
-msgid "Saturday"
+msgid "Sta_rt of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
+msgid "Su_n"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Show week _numbers in date navigator"
+#: calendar/gui/dialogs/recurrence-page.c:1127
+msgid "Sunday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Sta_rt of day:"
+msgid "T_asks due today:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Su_n"
+msgid "T_hu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Sunday"
+msgid "T_ue"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "T_hu"
-msgstr ""
+#, fuzzy
+msgid "Task List"
+msgstr "T�d�ikist�n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "T_ue"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: 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: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 ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr ""
-
-#: 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: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:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "24 hodinov�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_End of day:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "O_becn�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "_Overdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "_Show appointment end times in week and month views"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+msgid "_Time divisions:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr ""
 
@@ -3758,23 +4129,23 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -3806,8 +4177,8 @@ msgid "No summary"
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3801
-#: calendar/gui/e-week-view.c:3707 composer/e-msg-composer.c:958
+#: 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
 msgid "Save as..."
 msgstr "Ulo�it jako..."
 
@@ -3869,7 +4240,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2224
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr ""
 
@@ -3936,7 +4307,7 @@ msgid "Pu_blic"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr ""
 
@@ -3981,55 +4352,49 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
+msgid "Common Name"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
+msgid "Delegated From"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
+msgid "Delegated To"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr ""
+msgid "Language"
+msgstr "Jazyk"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Jazyk"
+msgid "Member"
+msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
+msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:864
 #: 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:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:52
+#: 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"
 msgstr "Stav"
 
-#: 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
+#: 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
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -4052,27 +4417,96 @@ msgstr ""
 msgid "_Other Organizer"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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 "seznam"
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "Poslat"
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+msgid "rd"
+msgstr ""
+
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
-msgid "day"
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "seznam"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
-msgid "on the"
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Dal��"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+msgid "fourth"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "seznam"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Dal�� fax"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+msgid "day"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1260
+msgid "on the"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr ""
 
@@ -4167,7 +4601,7 @@ msgid "Progress"
 msgstr "Pr�b�h"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:730
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4179,15 +4613,19 @@ msgstr ""
 msgid "_Status:"
 msgstr ""
 
+#: calendar/gui/dialogs/task-editor.c:178
+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
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:812
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Popis:"
 
@@ -4199,132 +4637,76 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:438
-#, c-format
-msgid "0%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:439
-#, c-format
-msgid "10%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:440
-#, c-format
-msgid "20%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:441
-#, c-format
-msgid "30%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:442
-#, c-format
-msgid "40%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:443
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:444
-#, c-format
-msgid "60%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:445
-#, c-format
-msgid "70%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:446
-#, c-format
-msgid "80%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:447
-#, c-format
-msgid "90%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:448
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2744
-#: calendar/gui/e-week-view.c:1846
+#: calendar/gui/e-calendar-table.c:751 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:3583
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1602
+#: 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
 msgid "_Open"
 msgstr "_Otev��t"
 
-#: calendar/gui/e-calendar-table.c:974
+#: calendar/gui/e-calendar-table.c:973
 msgid "_Save as..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:976 calendar/gui/e-day-view.c:3587
-#: calendar/gui/e-week-view.c:3442 calendar/gui/e-week-view.c:3475
+#: calendar/gui/e-calendar-table.c:974 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 "_Tisknout..."
 
-#: calendar/gui/e-calendar-table.c:981 calendar/gui/e-day-view.c:3593
-#: calendar/gui/e-week-view.c:3481 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:978 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 "_Vyjmout"
 
-#: calendar/gui/e-calendar-table.c:983 calendar/gui/e-day-view.c:3595
-#: calendar/gui/e-week-view.c:3483 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:979 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�rovat"
 
-#: calendar/gui/e-calendar-table.c:985 calendar/gui/e-day-view.c:3559
-#: calendar/gui/e-day-view.c:3597 calendar/gui/e-week-view.c:3447
-#: calendar/gui/e-week-view.c:3485 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:980 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 "V_lo�it"
 
-#: calendar/gui/e-calendar-table.c:990
+#: calendar/gui/e-calendar-table.c:984
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:985
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:994
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:987
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7366
-#: calendar/gui/e-week-view.c:4155
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr ""
 
@@ -4332,48 +4714,47 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:946
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
 #: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Priorita"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:767
-#: shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4404,440 +4785,165 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1407
-#: 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 ""
 
 #. 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:1434
+#: 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 ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:632 calendar/gui/e-week-view.c:368
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:371
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3543
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3545 calendar/gui/e-week-view.c:3433
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3547 calendar/gui/e-week-view.c:3435
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3549 calendar/gui/e-week-view.c:3437
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3554 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tisk..."
 
-#: calendar/gui/e-day-view.c:3564 calendar/gui/e-week-view.c:3452
+#: 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 ""
 
-#: calendar/gui/e-day-view.c:3566 calendar/gui/e-week-view.c:3454
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
+#: 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:3576 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
 msgid "_Configure..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3585 calendar/gui/e-week-view.c:3473
-#: mail/folder-browser.c:1604 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+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
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3602 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3604 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3499
+#: 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:3613 calendar/gui/e-week-view.c:3501
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3503
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:556
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:561
-msgid "Task begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:566
-msgid "Free/Busy info begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:570
-msgid "Begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:582
-msgid "Meeting ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:585
-msgid "Free/Busy info ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:589
-msgid "Ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:603
-msgid "Task Completed: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:613
-msgid "Task Due: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:650 calendar/gui/e-itip-control.c:699
-msgid "iCalendar Information"
-msgstr ""
-
-#. Title
-#: calendar/gui/e-itip-control.c:665
-msgid "iCalendar Error"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:730 calendar/gui/e-itip-control.c:746
-msgid "An unknown person"
-msgstr ""
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:753
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:769
-msgid "<i>None</i>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:781
-msgid "Status:"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:786 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
-msgid "Accepted"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:790 calendar/gui/itip-utils.c:326
-msgid "Tentatively Accepted"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:794 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
-msgid "Declined"
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
+#, c-format
+msgid "Error executing %s."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:798 calendar/gui/e-itip-control.c:997
-#: calendar/gui/e-itip-control.c:1068 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: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
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:318
-#: mail/mail-display.c:846 widgets/misc/e-charset-picker.c:58
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Nezn�m�"
 
-#: calendar/gui/e-itip-control.c:844 calendar/gui/e-itip-control.c:860
-#: calendar/gui/e-itip-control.c:876 calendar/gui/e-itip-control.c:889
-#: calendar/gui/e-itip-control.c:902 calendar/gui/e-itip-control.c:915
-msgid "Choose an action:"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:845
-msgid "Update"
-msgstr "Zaktualizovat"
-
-#: calendar/gui/e-itip-control.c:846 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:917
-#: shell/e-shell.c:2086 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:861
-msgid "Accept"
-msgstr "Akceptovat"
-
-#: calendar/gui/e-itip-control.c:862
-msgid "Tentatively accept"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:863
-msgid "Decline"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:877
-msgid "Send Free/Busy Information"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:890
-msgid "Update respondent status"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:903
-msgid "Send Latest Information"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:916 calendar/gui/itip-utils.c:343
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Zru�it"
-
-#: calendar/gui/e-itip-control.c:964
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:965
-msgid "Meeting Information"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:969
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:970
-msgid "Meeting Proposal"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:974
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:975
-msgid "Meeting Update"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:979
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:980
-msgid "Meeting Update Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1003
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1004
-msgid "Meeting Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1008
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1009
-msgid "Meeting Cancellation"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1119
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1014
-msgid "Bad Meeting Message"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1034
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1035
-msgid "Task Information"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1039
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1040
-msgid "Task Proposal"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1044
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1045
-msgid "Task Update"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1049
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1050
-msgid "Task Update Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1074
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1075
-msgid "Task Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1079
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1080
-msgid "Task Cancellation"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1085
-msgid "Bad Task Message"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1104
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1105
-msgid "Free/Busy Information"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1109
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1110
-msgid "Free/Busy Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1114
-#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1115
-msgid "Free/Busy Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1120
-msgid "Bad Free/Busy Message"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1193
-msgid "The message does not appear to be properly formed"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1212
-msgid "The message contains only unsupported requests."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1246
-msgid "The attachment does not contain a valid calendar message"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1271
-msgid "The attachment has no viewable calendar items"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1564
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1446
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1613
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1638
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1474
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1476
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1504
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1534 calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1536 calendar/gui/e-itip-control.c:1588
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:1861
+msgid "Select Calendar Folder"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1868
+msgid "Select Tasks Folder"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4892,57 +4998,58 @@ 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:533
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
 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
 msgid "Resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
 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:535
 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
 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
 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: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"
+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-time-sel.c:434
 msgid "Tentative"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:838
 msgid "Delegated"
 msgstr ""
 
@@ -5047,29 +5154,37 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:654
+#: calendar/gui/e-tasks.c:543
+msgid "Completing tasks..."
+msgstr ""
+
+#: calendar/gui/e-tasks.c:566
+msgid "Deleting selected objects..."
+msgstr ""
+
+#: calendar/gui/e-tasks.c:659
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3431
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3497
+#: calendar/gui/e-week-view.c:3489
 msgid "_Delete this Appointment"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1879
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
@@ -5138,38 +5253,6 @@ msgstr ""
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:295
-msgid "Event information"
-msgstr ""
-
-#: calendar/gui/itip-utils.c:297
-msgid "Task information"
-msgstr ""
-
-#: calendar/gui/itip-utils.c:299
-msgid "Journal information"
-msgstr ""
-
-#: calendar/gui/itip-utils.c:301
-msgid "Free/Busy information"
-msgstr ""
-
-#: calendar/gui/itip-utils.c:303
-msgid "Calendar information"
-msgstr ""
-
-#: calendar/gui/itip-utils.c:339
-msgid "Updated"
-msgstr ""
-
-#: calendar/gui/itip-utils.c:347
-msgid "Refresh"
-msgstr "Zaktualizovat"
-
-#: calendar/gui/itip-utils.c:351
-msgid "Counter-proposal"
-msgstr ""
-
 #: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr ""
@@ -5331,87 +5414,54 @@ msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1840
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: 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, %e. %b"
 
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1885
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2226
-msgid "Task"
-msgstr ""
-
-#: calendar/gui/print.c:2283
-#, c-format
-msgid "Status: %s"
-msgstr ""
-
-#: calendar/gui/print.c:2301
-#, c-format
-msgid "Priority: %s"
-msgstr ""
-
-#: calendar/gui/print.c:2315
-#, c-format
-msgid "Percent Complete: %i"
-msgstr ""
-
-#: calendar/gui/print.c:2327
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2341
-#, c-format
-msgid "Categories: %s"
-msgstr ""
-
-#: calendar/gui/print.c:2352
-msgid "Contacts: "
-msgstr ""
-
-#: calendar/gui/print.c:2407
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:2498 calendar/gui/print.c:2590
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2884
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
 #: 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:2527
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2608
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr ""
 
@@ -5432,8 +5482,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2373
-#: mail/mail-callbacks.c:2612
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr ""
 
@@ -5485,10 +5535,6 @@ 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 ""
@@ -5503,107 +5549,107 @@ msgstr ""
 msgid "Gnome Calendar"
 msgstr ""
 
-#: calendar/pcs/query.c:247
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:276
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:318
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:325
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:352
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:357
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:384
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:389
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:425
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:521
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:526
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:533
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:668
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:675
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:692
+#: 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:734
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:746
+#: 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 ""
 
-#: calendar/pcs/query.c:834
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:879
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:884
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1161
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -7140,11 +7186,11 @@ msgstr ""
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-data-cache.c:167
+#: camel/camel-data-cache.c:169
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:439
+#: camel/camel-data-cache.c:441
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
@@ -7196,7 +7242,6 @@ msgid "Unable to process spool folder"
 msgstr ""
 
 #: camel/camel-filter-driver.c:911
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
@@ -7250,27 +7295,27 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:649
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr ""
 
@@ -7379,68 +7424,68 @@ msgstr ""
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:622
+#: camel/camel-pgp-context.c:621
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:629 camel/camel-pgp-context.c:803
+#: 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:635 camel/camel-pgp-context.c:809
+#: 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:796
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:988
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:994
+#: 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:1005
+#: 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:1178
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1188
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1195
+#: 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:1204
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1373
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1381
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1388
+#: 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:332
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr ""
 
@@ -7483,14 +7528,14 @@ msgstr ""
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:348 camel/camel-remote-store.c:410
-#: camel/camel-remote-store.c:471
+#: 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:474
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7589,7 +7634,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -7617,7 +7662,7 @@ 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:91
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Heslo"
 
@@ -7666,30 +7711,30 @@ msgstr ""
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:644 camel/camel-service.c:751
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:669
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:671
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:721
+#: camel/camel-service.c:725
 msgid "Resolving address"
 msgstr ""
 
-#: camel/camel-service.c:779
+#: camel/camel-service.c:787
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:782
+#: camel/camel-service.c:790
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -7815,27 +7860,27 @@ msgstr ""
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr ""
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -7887,21 +7932,21 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1640
-#: camel/providers/imap/camel-imap-folder.c:2116
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1795
-#: camel/providers/imap/camel-imap-folder.c:1869
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1801
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2153
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -7926,7 +7971,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"
 
@@ -7958,28 +8003,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:528
+#: camel/providers/imap/camel-imap-store.c:529
 #: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap/camel-imap-store.c:568
 #: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -7987,56 +8032,57 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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:91
+#: camel/providers/local/camel-local-provider.c:116
 msgid "Directory tree of mbox files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8078,12 +8124,17 @@ msgstr ""
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:375
+#: camel/providers/local/camel-local-store.c:358
+#, c-format
+msgid "Could not rename '%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-local-store.c:389
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -8398,12 +8449,12 @@ msgstr ""
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
 #: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
 #: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr ""
@@ -8507,9 +8558,9 @@ msgid "Retrieving POP summary"
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:444
-#: camel/providers/pop3/camel-pop3-folder.c:503
-#: camel/providers/pop3/camel-pop3-folder.c:520
+#: 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 ""
 
@@ -8518,31 +8569,31 @@ msgstr ""
 msgid "Cannot get POP summary: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:323
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:418
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. 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:425
+#: camel/providers/pop3/camel-pop3-folder.c:427
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: 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 ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:512
+#: camel/providers/pop3/camel-pop3-folder.c:514
 msgid "Unknown reason"
 msgstr ""
 
@@ -8559,7 +8610,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:90
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr ""
 
@@ -8626,20 +8677,21 @@ msgstr ""
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:503
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:593
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr ""
 
@@ -8691,7 +8743,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:110
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr ""
 
@@ -8855,7 +8907,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr ""
 
@@ -8903,26 +8955,26 @@ msgstr ""
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1082
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1107
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1159
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -8930,35 +8982,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:1171
 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:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1243
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1268
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1282
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1305
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1317
 msgid "QUIT response error"
 msgstr ""
 
@@ -8987,7 +9039,7 @@ msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:150
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
 msgid "attachment"
 msgstr ""
 
@@ -9183,12 +9235,6 @@ msgid ""
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3466
-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"
@@ -9247,19 +9293,19 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2241
-#: mail/mail-display.c:120
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
 #. 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 "Zapamatujte si toto heslo"
 
-#: 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 ""
 
@@ -9389,11 +9435,7 @@ msgstr ""
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr ""
-
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:183
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "V�b�r ikony..."
 
@@ -9488,7 +9530,7 @@ msgid ""
 msgstr ""
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1484 mail/mail-account-gui.c:1498
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr ""
 
@@ -9499,7 +9541,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:45
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test1"
 
@@ -9677,7 +9719,7 @@ msgid "Follow Up"
 msgstr ""
 
 #: filter/libfilter-i18n.h:26 mail/mail-config.c:74
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "D�le�it�"
 
@@ -9733,7 +9775,7 @@ msgstr ""
 msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "��st"
 
@@ -9754,7 +9796,7 @@ msgstr ""
 msgid "Score"
 msgstr "Sk�re"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1546
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr ""
 
@@ -9819,29 +9861,29 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: 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 ""
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:687
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:780
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:956
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
 #: importers/pine-importer.c:637 mail/component-factory.c:101
 msgid "Mail"
 msgstr "Po�ta"
@@ -9866,23 +9908,73 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, c-format
+msgid "Priority Filter \"%s\""
+msgstr ""
+
+#: 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 ""
 
-#: importers/netscape-importer.c:886 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Ko�"
+
+#: importers/netscape-importer.c:2021
+msgid "Scanning mail filters"
+msgstr ""
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:895
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:961
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Nastaven�"
 
-#: importers/netscape-importer.c:982
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Program elektronick� po�ty"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -9907,66 +9999,78 @@ msgid "Composer Preferences"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Configuration control for the Evolution Mail Accounts."
+msgid "Configuration control for the Evolution Display Fonts."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Configuration control for the Evolution Mailer."
+msgid "Configuration control for the Evolution Mail Accounts."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Configuration control for the Evolution Message Composer."
+msgid "Configuration control for the Evolution Mailer."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution component for handling mail."
+msgid "Configuration control for the Evolution Message Composer."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Evolution mail composer."
+msgid "Evolution component for handling mail."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Evolution mail executive summary component."
+msgid "Evolution mail composer."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Evolution mail folder display component."
+msgid "Evolution mail executive summary component."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Evolution mail folder factory component."
+msgid "Evolution mail folder display component."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory for the Evolution composer."
+msgid "Evolution mail folder factory component."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:11
+msgid "Factory for the Evolution composer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12 mail/mail-config.glade.h:71
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+msgid "Font Preferences"
+msgstr ""
+
+#: 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:13 mail/mail-config.glade.h:73
+#: 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:14
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
+#: 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:16
+#: 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:17
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
@@ -10041,186 +10145,182 @@ msgstr ""
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: mail/folder-browser.c:300 mail/mail-display.c:332 mail/mail-display.c:838
+#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:755
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:758 mail/folder-browser.c:766
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:762
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1083
+#: mail/folder-browser.c:1088
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1575
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1576
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1577
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1578
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1585 mail/folder-browser.c:1917
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1603 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1605
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Tisk"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1611 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1612
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Dop�edu"
 
-#: mail/folder-browser.c:1616
+#: mail/folder-browser.c:1622
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1617
+#: mail/folder-browser.c:1623
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1624
 msgid "Cl_ear Flag"
 msgstr ""
 
 #. separator here?
-#: mail/folder-browser.c:1622 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1629
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1631
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1636
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1634
+#: mail/folder-browser.c:1640
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1635 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1639
+#: mail/folder-browser.c:1645
 msgid "Label"
 msgstr "N�pis"
 
-#: mail/folder-browser.c:1643
+#: mail/folder-browser.c:1649
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/folder-browser.c:1647
+#: mail/folder-browser.c:1653
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1657
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1918
+#: mail/folder-browser.c:1936
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1920
+#: mail/folder-browser.c:1938
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1921
+#: mail/folder-browser.c:1939
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Implicitn�"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr ""
@@ -10286,90 +10386,71 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:53 mail/mail-config.glade.h:10
-msgid "Always"
-msgstr "V�dy"
-
-#: mail/mail-account-gui.c:54 mail/mail-config.glade.h:144
-msgid "Whenever Possible"
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:84
-msgid "Never"
-msgstr "Nikdy"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "U�ivatel:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr ""
 
-#: mail/mail-account-gui.c:1063 mail/mail-account-gui.c:1064
-#: mail/mail-account-gui.c:1305 mail/mail-account-gui.c:1310
-#: mail/mail-config.glade.h:102
+#: 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 "N�hodn�"
 
-#: mail/mail-account-gui.c:1133 mail/mail-account-gui.c:1148
+#: 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:1836
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:211
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:218
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:341 mail/mail-accounts.c:375
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:343 mail/mail-accounts.c:377
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
 msgid "Enable"
 msgstr "Povolit"
 
-#: mail/mail-accounts.c:615 mail/mail-accounts.c:619
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
-#: mail/mail-accounts.c:714 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:715 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr ""
 
-#: mail/mail-accounts.c:716 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr ""
-
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr ""
@@ -10450,63 +10531,63 @@ msgstr ""
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1427 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1429 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2085
+#: mail/mail-callbacks.c:2091
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2110
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2149
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2163
+#: mail/mail-callbacks.c:2169
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2189
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2234 mail/mail-display.c:116
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2288
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2290
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2358
+#: mail/mail-callbacks.c:2366
 msgid "Go to next folder with unread messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2373
 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:2605
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10514,35 +10595,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2718
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2730
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2773
+#: mail/mail-callbacks.c:2783
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/mail-callbacks.c:2826
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:2853
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "A4"
 
-#: mail/mail-callbacks.c:2891
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3077 mail/mail-callbacks.c:3117
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -10584,36 +10665,31 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr ""
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:145
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
 msgid "Work"
 msgstr ""
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:92
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr "Osobn�"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:136
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:69
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr ""
 
-#: mail/mail-config.c:632
-#, c-format
-msgid "Account %d"
-msgstr ""
-
-#: mail/mail-config.c:2456
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -10621,139 +10697,145 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2467
-#, c-format
-msgid "%s: Inbox"
-msgstr ""
-
-#: mail/mail-config.c:2717
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2795 mail/mail-config.c:2799
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.c:2997
+#: mail/mail-config.c:2999
 msgid "Unnamed"
 msgstr "Beze jm�na"
 
-#: mail/mail-config.c:3175
+#: mail/mail-config.c:3177
 msgid "Cannot execute signature script"
 msgstr ""
 
 #: mail/mail-config.glade.h:1
-msgid " _Check for supported types "
+msgid " "
 msgstr ""
 
 #: mail/mail-config.glade.h:2
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr ""
+#, fuzzy
+msgid " Edit "
+msgstr "_Upravit"
 
 #: mail/mail-config.glade.h:3
-msgid "(SSL is not supported in this build of evolution)"
-msgstr ""
+#, fuzzy
+msgid " New "
+msgstr "Nov�"
 
 #: mail/mail-config.glade.h:4
-msgid "A_lways encrypt to myself when sending encrypted mail"
+msgid " _Check for supported types "
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "Account Editor"
+msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
-msgid "Account Information"
+msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
+#: mail/mail-config.glade.h:7
+msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-msgid "Advanced Options"
+msgid "Account Editor"
 msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Afrikaans"
+msgid "Account Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Account Management"
 msgstr ""
 
 #: mail/mail-config.glade.h:11
-msgid "Always _blind carbon-copy (Bcc) to:"
+msgid "Advanced Options"
 msgstr ""
 
 #: mail/mail-config.glade.h:12
-msgid "Always _carbon-copy (Cc) to:"
+msgid "Afrikaans"
 msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Always _encrypt to myself when sending encrypted mail"
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Always _sign outgoing messages when using this account"
-msgstr ""
+#, fuzzy
+msgid "Alerts"
+msgstr "Al��rsko"
 
 #: mail/mail-config.glade.h:15
+msgid "Alwa_ys sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
 msgid "Arabic"
 msgstr "Arab�tina"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:17 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Automatically detect links"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
 msgstr "Automaticky vytv��et odkazy"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltsk� (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltsk� (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:22
-msgid "Beep when new mail arrives"
-msgstr ""
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Nezn�m� znakov� sada: %s"
 
-#: mail/mail-config.glade.h:23
-msgid "Character Set:"
-msgstr ""
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "Barvy"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
-msgid "Colors"
-msgstr "Barvy"
-
-#: mail/mail-config.glade.h:26
-msgid "Command"
-msgstr "P��kaz"
-
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10763,504 +10845,531 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
-msgid "Dari"
-msgstr ""
-
-#: mail/mail-config.glade.h:36
-msgid "De_fault"
-msgstr ""
-
 #: mail/mail-config.glade.h:37
-msgid "Default Behavior"
+msgid "Dari"
 msgstr ""
 
 #: mail/mail-config.glade.h:38
-msgid "Default Forward style:"
+msgid "De_fault"
 msgstr ""
 
 #: mail/mail-config.glade.h:39
-msgid "Default Reply style:"
+msgid "Default Behavior"
 msgstr ""
 
 #: mail/mail-config.glade.h:40
-msgid "Default character encoding:"
+msgid "Default character _encoding:"
 msgstr ""
 
 #: mail/mail-config.glade.h:41
-msgid "Defaults"
-msgstr "Implicitn� hodnoty"
-
-#: mail/mail-config.glade.h:42
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:45
-msgid "Do not notify me when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:44
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Hotovo"
 
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "_Slo�ka:"
+
+#: mail/mail-config.glade.h:47
+msgid "E_nable"
+msgstr ""
+
 #: mail/mail-config.glade.h:48
-msgid "E_mail address:"
+msgid "E_nable advanced options"
 msgstr ""
 
 #: mail/mail-config.glade.h:49
-msgid "E_nable"
+msgid "Emacs"
 msgstr ""
 
 #: mail/mail-config.glade.h:50
-msgid "Ed_it..."
+msgid "Email Accounts"
 msgstr ""
 
 #: mail/mail-config.glade.h:51
-msgid "Edi_t..."
-msgstr ""
+#, fuzzy
+msgid "Email _address:"
+msgstr "_E-mailov� adresa:"
 
 #: mail/mail-config.glade.h:52
-msgid "Emacs"
+msgid "Empty _trash folders on exit"
 msgstr ""
 
 #: mail/mail-config.glade.h:53
-msgid "Email Accounts"
+msgid "Execute Command..."
 msgstr ""
 
 #: mail/mail-config.glade.h:54
-msgid "Enable advanced options"
-msgstr ""
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "kon��"
 
 #: mail/mail-config.glade.h:55
-msgid "Execute Command..."
-msgstr ""
+#, fuzzy
+msgid "Font Properties"
+msgstr "Vlastnosti"
 
 #: mail/mail-config.glade.h:56
-msgid "Forwards and Replies"
+msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:59
-msgid "HTML Mail"
+#: mail/mail-config.glade.h:58
+msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Hulu"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:62 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:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:66
-msgid "Keyboard Shortcuts"
-msgstr "Kl�vesov� zkratky"
-
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Language:"
-msgstr "Jazyk:"
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
-msgid "Make this my _default account"
+#: mail/mail-config.glade.h:72
+msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
-msgid "Mark messages as read after"
+#: mail/mail-config.glade.h:73
+msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
-msgid "Message Composer"
+#: mail/mail-config.glade.h:74
+msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
-msgid "Message Display"
+#: mail/mail-config.glade.h:75
+msgid "NNTP Server:"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Microsoft"
+#: mail/mail-config.glade.h:77
+msgid "New Mail Notification"
+msgstr ""
+
+#: mail/mail-config.glade.h:78
+msgid "News Servers"
 msgstr ""
 
 #: mail/mail-config.glade.h:80
-msgid "Misspelled color: "
+msgid "On Screen fonts"
 msgstr ""
 
 #: mail/mail-config.glade.h:81
-msgid "NNTP Server:"
+msgid "Optional Information"
 msgstr ""
 
 #: mail/mail-config.glade.h:82
-msgid "N_ew..."
-msgstr ""
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Or_ganizace:"
 
 #: mail/mail-config.glade.h:83
-msgid "Ne_w..."
+msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
-msgid "New Mail Notification"
+#: mail/mail-config.glade.h:87
+msgid "Pick a color"
+msgstr "Vyber barvu"
+
+#: mail/mail-config.glade.h:88
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
-msgid "News Servers"
+#: mail/mail-config.glade.h:89
+msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
-msgid "Optional Information"
+#: mail/mail-config.glade.h:90
+msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
-msgid "PGP/GPG _Key ID:"
+#: mail/mail-config.glade.h:91
+msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:93
-msgid "Pick a color"
-msgstr "Vyber barvu"
+#: mail/mail-config.glade.h:92
+msgid "Quote original message"
+msgstr ""
 
-#: mail/mail-config.glade.h:94
-msgid "Play sound file when new mail arrives"
+#: mail/mail-config.glade.h:93
+msgid "Quoted"
 msgstr ""
 
 #: mail/mail-config.glade.h:95
-msgid "Pretty Good Privacy (PGP/GPG)"
+msgid "Randomized"
 msgstr ""
 
 #: mail/mail-config.glade.h:96
-msgid "Prompt when sending HTML messages to contacts that don't want them"
+msgid "Re_member this password"
 msgstr ""
 
 #: mail/mail-config.glade.h:97
-msgid "Prompt when sending messages with an empty subject line"
+msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
-msgid "Prompt when sending messages with only _Bcc recipients defined"
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+msgid "Receiving Email"
 msgstr ""
 
 #: mail/mail-config.glade.h:99
-msgid "Qmail maildir "
+msgid "Receiving _Options"
 msgstr ""
 
 #: mail/mail-config.glade.h:100
-msgid "Quote original message"
-msgstr ""
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Zapamatujte si toto heslo"
 
 #: mail/mail-config.glade.h:101
-msgid "Quoted"
+msgid "Required Information"
 msgstr ""
 
 #: mail/mail-config.glade.h:103
-msgid "Randomized"
-msgstr ""
+#, fuzzy
+msgid "S_ecurity"
+msgstr "Bezpe�nost"
 
 #: mail/mail-config.glade.h:104
-msgid "Re_member this password"
+msgid "Same as text"
 msgstr ""
 
-#: mail/mail-config.glade.h:105 shell/glade/evolution-startup-wizard.glade.h:6
-msgid "Receiving Email"
+#: mail/mail-config.glade.h:105
+msgid "Secure MIME (S/MIME)"
 msgstr ""
 
 #: mail/mail-config.glade.h:106
-msgid "Receiving Mail"
+msgid "Select HTML fixed width font"
 msgstr ""
 
 #: mail/mail-config.glade.h:107
-msgid "Receiving Options"
+msgid "Select HTML fixed width font for printing"
 msgstr ""
 
 #: mail/mail-config.glade.h:108
-msgid "Required Information"
+msgid "Select HTML variable width font"
 msgstr ""
 
 #: mail/mail-config.glade.h:109
-msgid "Restore defaults"
+msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:112
-msgid "Secure MIME (S/MIME)"
-msgstr ""
-
-#: mail/mail-config.glade.h:113
-msgid "Security"
-msgstr "Bezpe�nost"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:110
 msgid "Select PGP program"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:111
 msgid "Select a signature file"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:112
 msgid "Select a signature script"
 msgstr ""
 
-#: mail/mail-config.glade.h:117 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
-msgid "Sending Mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Soubory konfigurace"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:125
-msgid "Shortcut"
-msgstr "Kl�vesov� zkratky"
-
-#: mail/mail-config.glade.h:126
-msgid "Shortcuts type:"
-msgstr ""
-
-#: mail/mail-config.glade.h:127
-msgid "Show animated images"
-msgstr "Animovan� obr�zky"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Zkratky"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:121
 msgid "Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:129
-msgid "Signatures"
-msgstr ""
-
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Zdroj"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
-msgid "Specify filename:"
+#: mail/mail-config.glade.h:124
+msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:125
 msgid "Spell Checking"
 msgstr "Kontrola pravopisu"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:135
-msgid "Text _Signature:"
-msgstr ""
-
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:128
 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:139
+#: mail/mail-config.glade.h:130
 msgid "Use _HTML for this signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
-msgid "Use s_ecure connection (SSL):"
+#: mail/mail-config.glade.h:132
+msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:138
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:143
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
-msgid "_Confirm when expunging a folder"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
 msgstr ""
 
-#: mail/mail-config.glade.h:156
-msgid "_Drafts folder:"
+#: mail/mail-config.glade.h:148
+msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
-msgid "_Empty trash folders on exit"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Implicitn� hodnoty"
+
+#: mail/mail-config.glade.h:151
+msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:153
 msgid "_Enable spell checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:154
 msgid "_Filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "_Dop�edu"
+
+#: mail/mail-config.glade.h:157
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "Poslat HTML dopis?"
+
+#: mail/mail-config.glade.h:160
 msgid "_HTML Signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
-msgid "_Highlight quotations with"
+#: mail/mail-config.glade.h:162
+msgid "_Identity"
 msgstr ""
 
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Jazyk:"
+
 #: mail/mail-config.glade.h:164
-msgid "_Host:"
+msgid "_Load images if sender is in addressbook"
 msgstr ""
 
 #: mail/mail-config.glade.h:165
-msgid "_Load images if sender is in addressbook"
+msgid "_Make this my default account"
 msgstr ""
 
 #: mail/mail-config.glade.h:166
-msgid "_Name:"
-msgstr "_Jm�no:"
+msgid "_Mark messages as read after"
+msgstr ""
 
 #: mail/mail-config.glade.h:167
-msgid "_Never load images off the net"
-msgstr ""
+msgid "_Name:"
+msgstr "_Jm�no:"
 
 #: mail/mail-config.glade.h:168
-msgid "_Organization:"
+msgid "_Never load images off the net"
 msgstr ""
 
 #: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
-msgid "_Path:"
-msgstr ""
-
 #: mail/mail-config.glade.h:171
-msgid "_Random"
+msgid "_Play sound file when new mail arrives"
 msgstr ""
 
 #: mail/mail-config.glade.h:172
-msgid "_Remember this password"
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
 #: mail/mail-config.glade.h:173
-msgid "_Reply-To:"
+msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
 #: mail/mail-config.glade.h:174
-msgid "_Script:"
+msgid "_Random"
 msgstr ""
 
 #: mail/mail-config.glade.h:175
-msgid "_Send messages in HTML format by default"
+msgid "_Receiving Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:176
-msgid "_Server type: "
+msgid "_Reply style:"
 msgstr ""
 
 #: mail/mail-config.glade.h:177
-msgid "_Username:"
-msgstr "U�ivatel:"
+msgid "_Restore defaults"
+msgstr ""
 
 #: mail/mail-config.glade.h:178
+msgid "_Script:"
+msgstr ""
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Poslat HTML dopis?"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Animovan� obr�zky"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+msgstr "Singapur"
+
+#: 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
+msgid "_Variable-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:187
 msgid "color"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr ""
 
@@ -11300,58 +11409,58 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:277
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:344
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr ""
 
-#: mail/mail-display.c:388
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:389
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:390
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:450
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:454
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:475
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1263
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1813
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1814
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1816
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1818
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr ""
 
@@ -11396,27 +11505,6 @@ msgstr ""
 msgid "Mailer"
 msgstr "Program elektronick� po�ty"
 
-#: mail/mail-format.c:1707
-msgid "View messages..."
-msgstr ""
-
-#: mail/mail-format.c:1813
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-
-#: mail/mail-format.c:1836
-msgid "Evolution does not recognize this type of signed message."
-msgstr ""
-
-#: mail/mail-format.c:1844
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1852
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
 #: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
@@ -11510,162 +11598,157 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:259
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr ""
 
-#: 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 ""
 
-#: mail/mail-ops.c:600
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:739
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:741 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:834
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:941
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "P�esouv�m"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kop�ruji"
 
-#: mail/mail-ops.c:1054
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1104 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Ko�"
-
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1280
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1352
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1421
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1515
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1566
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1602
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1804
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-ops.c:2234
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:53
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr ""
 
@@ -11782,7 +11865,7 @@ msgstr ""
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:395
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr ""
 
@@ -11805,10 +11888,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr ""
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr ""
@@ -11919,43 +11998,43 @@ msgstr "P�ijato"
 msgid "Size"
 msgstr "Velikost"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:57
 msgid "Call"
 msgstr ""
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:58
 msgid "Do Not Forward"
 msgstr ""
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:59
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:60
 msgid "For Your Information"
 msgstr ""
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Vp�ed"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:62
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
 msgid "Reply"
 msgstr ""
 
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
 msgid "Reply to All"
 msgstr ""
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:66
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:312
+#: mail/message-tag-followup.c:315
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -21865,11 +21944,17 @@ msgstr ""
 msgid "No description"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:151
 msgid "Mail summary"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:398 shell/e-local-storage.c:1021
+#. 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
 msgid "Local Folders"
 msgstr ""
 
@@ -21891,15 +21976,15 @@ msgstr ""
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:710
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:718
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:722
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Jm�no:"
 
@@ -21911,15 +21996,23 @@ msgstr ""
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:467
-msgid "Add->"
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:473
-msgid "<-Remove"
-msgstr ""
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "_P�idat"
 
-#: my-evolution/e-summary-table.c:58
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr "Odstranit"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr ""
 
@@ -21963,38 +22056,6 @@ msgstr ""
 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
-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 ""
@@ -23249,23 +23310,6 @@ msgstr ""
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr ""
-
-#: shell/e-local-storage.c:174 shell/e-shell-view.c:389
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr ""
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr ""
-
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr ""
-
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr ""
@@ -23628,83 +23672,74 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:170
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:220
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:465
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:466
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:586
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:587
+#: shell/e-shell-view-menu.c:566
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:638
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:646
-#, c-format
-msgid "Error executing %s."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:59
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 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:1808
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1810
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "Nic"
 
-#: shell/e-shell-view.c:1857
+#: 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:1864
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1870
+#: shell/e-shell-view.c:1880
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:165
+#: shell/e-shell.c:169
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -23712,12 +23747,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:758
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1825
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23725,19 +23760,23 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2088
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2090
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2092
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2094 shell/e-storage.c:487
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr ""
 
@@ -23828,7 +23867,7 @@ msgstr ""
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:20
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr ""
 
@@ -23860,11 +23899,8 @@ msgstr ""
 msgid "Shortcuts"
 msgstr "Zkratky"
 
-#: shell/e-storage-set-view.c:650
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
 msgstr ""
 
 #: shell/e-storage-set-view.etspec.h:1
@@ -23929,7 +23965,6 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
@@ -24023,7 +24058,7 @@ msgstr ""
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:45
+#: shell/evolution-test-component.c:47
 msgid "Test type"
 msgstr ""
 
@@ -24292,7 +24327,7 @@ msgstr ""
 #: 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.xml.h:35
 msgid "_Actions"
 msgstr ""
 
@@ -24414,7 +24449,7 @@ msgid "Delete this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr ""
 
@@ -24454,7 +24489,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:42
+#: ui/evolution.xml.h:40
 msgid "_File"
 msgstr "_Soubor"
 
@@ -24539,6 +24574,10 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr ""
 
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Zru�it"
+
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr ""
@@ -24692,7 +24731,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Slo�ka"
 
@@ -25084,7 +25123,7 @@ msgstr ""
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:57
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr ""
 
@@ -25099,12 +25138,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:38
+#: ui/evolution.xml.h:36
 msgid "_Close"
 msgstr "U_zav��t"
 
 #: 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:56
 msgid "_View"
 msgstr "_Zobrazen�"
 
@@ -25148,6 +25187,10 @@ msgstr ""
 msgid "Insert text file..."
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Otev�en�"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Otev��t soubor"
@@ -25287,11 +25330,7 @@ msgstr "_Otev��t..."
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr ""
-
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "N�_pov�da"
 
@@ -25428,126 +25467,118 @@ 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 ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 msgid "Open in New Window"
 msgstr "Otev��t v nov�m oknu"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:29
-msgid "Toggle fullscreen mode"
-msgstr "P�epnout celoobrazovkov� re�im"
-
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Kop�rovat..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr ""
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Nov�"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Nov� adres��"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr ""
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:52
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "Kl�vesov� zkratky"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr ""
 
@@ -25762,18 +25793,14 @@ msgstr ""
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:97
 msgid "_Save Search..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:98
 msgid "_Edit Saved Searches..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:93
-msgid "_Advanced Search..."
-msgstr ""
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "P�edform�tovan�"
@@ -25832,3 +25859,105 @@ msgstr ""
 #: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Uprav adres��"
+
+#~ msgid "Account Name"
+#~ msgstr "Jm�no ��tu"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "P�idej adres��"
+
+#~ msgid "Advanced"
+#~ msgstr "Pokro�il�"
+
+#~ msgid "Base"
+#~ msgstr "Z�klad"
+
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Zkontrolovat toto, pokud server po�aduje va�e ov��en�"
+
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
+#~ "server"
+#~ msgstr ""
+#~ "Evolution bude pou��vat toto rozli�ovac� jm�no (RN) k va�emu ov��en� na "
+#~ "serveru"
+
+#~ msgid "Server Name"
+#~ msgstr "Jm�no serveru"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr ""
+#~ "N��e uveden� informace je po�adov�na k tomu, aby mohl b�t p�id�n adres��"
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "Tato informace nen� po�adov�na pro v�t�inu server� 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 ""
+#~ "Tuto informaci pou��v� v� server ldap pro up�esn�n� toho, kter� uzly jsou "
+#~ "pou��v�ny p�i vyhled�v�n�. Pro v�ce informac� kontaktujte sv�ho "
+#~ "administr�tora."
+
+#~ 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� uzel pro v�echna va�e vyhled�v�n� na serveru ldap. Pro v�ce "
+#~ "informac� kontaktujte sv�ho administr�tora"
+
+#~ msgid "_Account name:"
+#~ msgstr "_N�zev ��tu:"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Dal�� kontakty"
+
+#~ msgid "(none)"
+#~ msgstr "(��dn�)"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Uk�zat kontakty vyhovuj�c� n�seduj�c�m kriteri�m"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Opravdu chcete\n"
+#~ "smazat tento kontakt?"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "Update"
+#~ msgstr "Zaktualizovat"
+
+#~ msgid "Accept"
+#~ msgstr "Akceptovat"
+
+#~ msgid "Refresh"
+#~ msgstr "Zaktualizovat"
+
+#~ msgid "URL: %s"
+#~ msgstr "URL: %s"
+
+#~ msgid "Default"
+#~ msgstr "Implicitn�"
+
+#~ msgid "Command"
+#~ msgstr "P��kaz"
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Kl�vesov� zkratky"
+
+#~ msgid "Shortcut"
+#~ msgstr "Kl�vesov� zkratky"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "P�epnout celoobrazovkov� re�im"
diff --git a/po/da.po b/po/da.po
index 5d5c909716..62453a1a1a 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-02-07 11:27-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -32,21 +32,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importerer VCard-filer i 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 "Gem som"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Navn"
 
 #: 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 "E-post"
 
 #: 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:1731
 msgid "Primary"
 msgstr "Prim�r"
 
@@ -56,16 +57,16 @@ 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:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 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:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
 msgid "Business"
 msgstr "Arbejde"
 
@@ -75,12 +76,12 @@ msgid "Bus"
 msgstr "Arb"
 
 #: 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:1720
 msgid "Callback"
 msgstr "Ring tilbage"
 
 #: 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:1722
 msgid "Company"
 msgstr "Firma"
 
@@ -91,13 +92,13 @@ 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:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
 msgid "Home"
 msgstr "Hjemme"
 
 #: 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 "Organisation"
 
@@ -107,19 +108,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:1727
 msgid "Mobile"
 msgstr "Mobil"
 
 #: 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:1721
 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:1647
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax p� arbejde"
 
@@ -128,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:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "Arbejde 2"
 
@@ -143,69 +144,68 @@ msgid "Bus 2"
 msgstr "Arb 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:1724
 msgid "Home 2"
 msgstr "Hjemme 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:1726
+#: 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:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "Andre"
 
 #: 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:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: 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:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-post 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 "Netside"
 
@@ -214,7 +214,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 "Afdeling"
 
@@ -223,7 +223,7 @@ msgid "Dep"
 msgstr "Afd"
 
 #: 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 "Kontor"
 
@@ -232,12 +232,12 @@ msgid "Off"
 msgstr "Ktr"
 
 #: 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 "Titel"
 
 #: 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 "Profession"
 
@@ -246,7 +246,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: 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 "Leder"
 
@@ -259,7 +259,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: 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 "Kaldenavn"
 
@@ -268,12 +268,12 @@ msgid "Nick"
 msgstr "Kaldt"
 
 #: 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 "�gtef�lle"
 
 #: 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 "Kommentar"
 
@@ -286,7 +286,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 "Fri-ledig URL"
 
@@ -315,302 +315,16 @@ msgstr "Kategorier"
 msgid "Family Name"
 msgstr "Efternavn"
 
-#: 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 "Kort: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Navn:"
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"Pr�fiks:    "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"Opgivet:     "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-" Yderligere: "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-" Familie:    "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-" Suffiks:    "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"F�dselsdato:"
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adresse:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Postboks:    "
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"Linje:         "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Vej:        "
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  By:          "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Region:      "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Postnummer:  "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Land:        "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Leveringsetiket"
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefoner:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-post:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-post:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"E-postprogram: "
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Tidszone: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geografisk lokation: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Stilling: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"Navn:  "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"Enhed:  "
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"Enhed2: "
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"Enhed3: "
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"Enhed4: "
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategorier: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Kommentar: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3879
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Unik streng: "
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Offentlig n�gle: "
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -618,85 +332,89 @@ msgstr "VCard for %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:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere 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:2732
 msgid "Searching..."
 msgstr "S�ger..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Indl�ser..."
 
 #. 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 "Fejl i s�geudtryk."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:483
-msgid "Connecting to LDAP server..."
-msgstr "Kobler til LDAP-server..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:493
-msgid "Unable to connect to LDAP server."
-msgstr "Kunne ikke koble til IMAP-server."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:509
-msgid "Waiting for connection to LDAP server..."
-msgstr "Venter p� tilkobling til LDAP-server..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:912
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Tilf�jer kort p� LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1013
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Fjerner kort fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "�ndrer kort fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2214
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Starter s�gning igen."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Modtager s�geresultater fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2219
-msgid "Restarting search."
-msgstr "Starter s�gning igen."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Fejl ved fjernelse af kort"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Kunne ikke tolke URL `%s'"
+
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "E-post-adresse:"
 
-#: addressbook/conduit/address-conduit.c:296
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Mark�ren kunne ikke lokaliseres\n"
 
-#: addressbook/conduit/address-conduit.c:309
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "EBook ikke indl�st\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 "Kunne ikke starte 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 "Kunne ikke starte 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 "Kunne ikke l�se pilotens adresseapplikationsblok"
 
@@ -713,223 +431,109 @@ 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
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Minikort visning i Evolution adressebog"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Evolution komponent til h�ndtering af kontakter."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fabrik til styring af minikort for adressebogen"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Fabrik til adressebogens adressevisning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the Addressbook's address popup"
 msgstr "Fabrik for adressebogens adresse-pop-op"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik til styring af eksempel-adressebogen"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Mappe som indeholder kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "LDAP-server som indeholder kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
-msgstr "Ny _kontakt"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
-msgstr "Ny kontakt_liste"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
-msgstr "Redig�r adressebog"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
-msgstr "Kontonavn"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "Tilf�j adressebog"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
-msgstr "Adressebog-kilder"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "Avanceret"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
-msgstr "Basis"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Grundl�ggende"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "De_lete"
-msgstr "S_let"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "E-post-adresse:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution vil bruge denne adresse godkende dig p� serveren"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "One"
-msgstr "�n"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
-msgstr "S�ge_basis:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search s_cope: "
-msgstr "S�_geomr�de:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Server Name"
-msgstr "Servernavn:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid "Sub"
-msgstr "Under"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Informationen nedenfor kr�ves for at tilf�je en adressebog."
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "This information is not required for most ldap servers. "
-msgstr "Denne information kr�ves ikke for de fleste LDAP-servere."
-
-#: 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 ""
-"Denne information bruges af din LDAP-server til at specificere hvilke noder "
-"bruges i en s�gning. Kontakt din administrator for mere information."
-
-#: 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 ""
-"Dette er basisnoden for alle dine s�gninger p� LDAP-serveren. Kontakt din "
-"administrator for mere information."
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Dette er navnet p� serveren, hvor din adressebog ligger."
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
-msgstr "Dette er porten, som din LDAP-server bruger."
-
-#: 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 ""
-"Dette navn vil bruges til at identificere din konto. Det bruges kun for "
-"visning p� sk�rmen."
-
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "_Account name:"
-msgstr "Konton_avn:"
-
-#: 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 "_Tilf�j"
-
-#: 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 "R_edig�r"
-
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
-msgstr "_Min server kr�ver autenticering"
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
-msgstr "_Port:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
-msgstr "_Servernavn:"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Kontaktliste"
 
-#: 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunne ikke initiere gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:167
-msgid "Other Contacts"
-msgstr "Andre kontakter"
-
-#: addressbook/gui/component/addressbook.c:485
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke �bne adressebogen"
 
-#: 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"
@@ -939,7 +543,7 @@ msgstr ""
 "at du har indtastet en ugyldig URI, eller at LDAP-serveren\n"
 "er nede"
 
-#: 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"
@@ -951,7 +555,7 @@ msgstr ""
 "m� du overs�tte programmet fra kildekoden i CVS efter at\n"
 "have hentet OpenLDAP fra henvisningen nedenfor.\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."
@@ -959,57 +563,50 @@ 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:640
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Indtast adgangskode for %s (bruger %s)"
 
-#: addressbook/gui/component/addressbook.c:808
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Et felt indeholder"
-
-#: addressbook/gui/component/addressbook.c:809
-msgid "Name contains"
-msgstr "Navn indeholder"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "slutter med"
 
-#: addressbook/gui/component/addressbook.c:810
-msgid "Email contains"
-msgstr "E-post indeholder"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "E-post 2"
 
-#: addressbook/gui/component/addressbook.c:811
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. 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:772
+#: 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
 msgid "Advanced..."
 msgstr "Avanceret..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1030
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/component/addressbook.c:1112
+#: addressbook/gui/component/addressbook.c:1083
 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:1686
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 msgid "Primary Email"
 msgstr "Prim�r e-post"
 
@@ -1055,6 +652,617 @@ 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
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "Adressebog-kilder"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Alarmer"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonym"
+
+#: 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 "Ingen information"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "S_let"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Listenavn:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "E-post-adresse:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+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 vil bruge denne adresse godkende dig p� serveren"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr "Evolution vil bruge denne adresse godkende dig p� serveren"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "F_ind"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Generelt"
+
+#: 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 "Konfiguration"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Margener"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_hver"
+
+#: 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 "�n"
+
+#: 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 "S�_geomr�de:"
+
+#. 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 "S�ger..."
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "V�lg alt"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Slettet"
+
+#: 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 "Kildeinformation"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Kobler til 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 "Under"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Et ikke underst�ttet skema"
+
+#: 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 ""
+"Dette navn vil bruges til at identificere din konto. Det bruges kun for "
+"visning p� sk�rmen."
+
+#: 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 "De_tte er postadressen"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+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:139
+msgid "_Add"
+msgstr "_Tilf�j"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Tilf�j"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Tilf�j handling"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Tilf�j handling"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Alarmer"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Slet alle"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Vis"
+
+#: 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:152 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 "R_edig�r"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "R_edig�r aftale"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution Alarm"
+
+#: 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 "_Tilvalg"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Port:"
+
+#: 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 "S�ge_basis:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Servernavn:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Uds�t-tid (minutter)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Konto %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "kontakt-liste-redigering"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Ingen kort"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Kobler til %s igen"
+
+#: 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 "Generelt"
+
+#: 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 "S�ger..."
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolution adressebog-komponent"
@@ -1064,9 +1272,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fabrik til adressebogens gr�nseflade for navnevalg"
 
 #: 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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1095,7 +1303,12 @@ msgstr "(%d ikke vist)"
 msgid "Unnamed Contact"
 msgstr "Kontakt uden navn:"
 
-#: 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 "Afsender indeholder"
+
+#: 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"
@@ -1111,7 +1324,7 @@ msgstr ""
 "m� du gerne sende en besked til Jon Trowbridge <trow@ximian.com> med en \n"
 "detaljeret beskrivelse af omst�ndighederne omkring fejlen. Tak."
 
-#: 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"
@@ -1123,42 +1336,43 @@ msgstr ""
 "Du beh�ver m�ske at forlade og genstarter Evolution for at \n"
 "l�se dette problem."
 
-#: 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 "V�lg kontakter fra adressebogen"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "Indeh_older:"
+msgid "Select Names"
+msgstr "V�lg navn"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Co_ntacts:"
-msgstr "Ko_ntakter:"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Slet kontakt?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "F_ind"
-msgstr "F_ind"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Kontakter"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "V�lg navn"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
-msgstr "Vis kontakter som m�der f�lgende kriterier:"
+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 "_Flyt..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Mappe:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Message Recipients:"
-msgstr "_Beskedsmodtagere:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "A_ssistant's name:"
 msgstr "_Assistentens navn:"
@@ -1191,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:1293
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -1216,10 +1430,6 @@ msgstr "Gem _som:"
 msgid "Full _Name..."
 msgstr "_Fulde navn..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Generelt"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1264,10 +1474,11 @@ 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: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: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
 msgid "_Delete"
 msgstr "_Slet"
 
@@ -1295,1123 +1506,1122 @@ msgstr "URL for _Offentlig kalender:"
 msgid "_Web page address:"
 msgstr "_Hjemmeside-adresse:"
 
-#: 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:757
-msgid "Category editor not available."
-msgstr "Kategori-redigering ikke tilg�ngelig."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:764
-msgid "This contact belongs to these categories:"
-msgstr "Denne kontakt h�rer til disse kategorier:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:978
-msgid "Save Contact as VCard"
-msgstr "Gem kontakt som VCard"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
-msgid "TTY/TDD"
-msgstr "TTY/TTD"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2287
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Kunne ikke finde widget for felt: `%s'"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
-msgstr "Hurtig kontakt-tilf�jelse"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
-msgstr "Redig�r alt"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr "Fulde navn"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
-msgid "E-mail"
-msgstr "E-post"
-
-#. 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 "liste"
-
-#: 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 eksisterer allerede\n"
-"Vil du overskrive den?"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresse _2:"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
+msgstr "U.S.A."
 
-#: 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 "Albanien"
 
-#: 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 "Algeriet"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "American Samoa"
 msgstr "Amerikansk Samoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Antarctica"
 msgstr "Antarktis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Antigua And Barbuda"
 msgstr "Antigua og Barbuda"
 
-#: 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 "Argentina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Armenia"
 msgstr "Armenien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Aruba"
 msgstr "Aruba"
 
-#: 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 "Australien"
 
-#: 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 "�strig"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Azerbaijan"
 msgstr "Aserbajdsjan"
 
-#: 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 "Bahamas"
 
-#: 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 "Bahrain"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Belarus"
 msgstr "Hviderusland"
 
-#: 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 "Belgien"
 
-#: 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 "Belize"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: 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 "Bosnien og Herzegovina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bouvet Island"
 msgstr "Bouvet�en"
 
-#: 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 "Brasilien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "British Indian Ocean Territory"
 msgstr "Britisk-Indisk havomr�de"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:33
-msgid "British Virgin Islands"
-msgstr "Jomfru�erne (britisk)"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Brunei Darussalam"
 msgstr "Brunei Dar-es-salam"
 
-#: 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 "Bulgarien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Cambodia"
 msgstr "Cambodja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: 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 "Kap Verde"
 
-#: 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 "Cayman-�erne"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Central African Republic"
 msgstr "Centralafrikanske republik"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Chad"
 msgstr "Tchad"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-msgid "Check Address"
-msgstr "Kontroll�r adresse"
-
-#: 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 "Chile"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "China"
 msgstr "Kina"
 
-#: 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 "Jule�en"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cocos (Keeling) Islands"
 msgstr "Cocos (Keeling)-�erne"
 
-#: 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 "Columbia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Comoros"
 msgstr "Komorene"
 
-#: 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 "Congo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Cook Islands"
 msgstr "Cook-�erne"
 
-#: 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 "Costa Rica"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cote d'Ivoire"
 msgstr "Elfenbenskysten"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:56
-msgid "Countr_y:"
-msgstr "Lan_d:"
-
-#: 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 "Kroatien"
 
-#: 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 "Cypern"
 
-#: 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 "Tjekkiske republik"
 
-#: 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 "Danmark"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Dominica"
 msgstr "Dominika"
 
-#: 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 "Dominikanske republik"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "East Timor"
 msgstr "�st-Timor"
 
-#: 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 "�kvador"
 
-#: 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 "Egypten"
 
-#: 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 "El Salvador"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Equatorial Guinea"
 msgstr "�kvatorial Guinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: 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 "Estland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Ethiopia"
 msgstr "Etiopien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Falkland Islands"
 msgstr "Falklands�erne"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Faroe Islands"
 msgstr "F�r�erne"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Fiji"
 msgstr "Fiji"
 
-#: 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 "Finland"
 
-#: 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 "Frankrig"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "French Guiana"
 msgstr "Fransk Guinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "French Polynesia"
 msgstr "Fransk polynesien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Southern Territories"
 msgstr "Sydlige Franske territorier"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Gambia"
 msgstr "Gambia"
 
-#: 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 "Georgia"
 
-#: 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 "Tyskland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Ghana"
 msgstr "Ghana"
 
-#: 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 "Gibraltar"
 
-#: 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 "Gr�kenland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Greenland"
 msgstr "Gr�nland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: 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 "Guatemala"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guinea-bissau"
 msgstr "Guinea-bissau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guyana"
 msgstr "Guyana"
 
-#: 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 "Heard og McDonald-�erne"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Holy See"
 msgstr "D�dehavet"
 
-#: 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 "Hong Kong"
 
-#: 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 "Ungarn"
 
-#: 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 "Island"
 
-#: 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 "Indien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Indonesia"
 msgstr "Indonesien"
 
-#: 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 "Irland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Israel"
 msgstr "Israel"
 
-#: 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 "Italien"
 
-#: 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 "Jamaica"
 
-#: 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 "Japan"
 
-#: 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 "Jordan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Kazakhstan"
 msgstr "Kasakhstan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: 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 "Den koreanske republik"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Kyrgyzstan"
 msgstr "Kurgistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:117
-#: my-evolution/Locations.h:1183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Letland"
 
-#: 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:1198
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: 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:1218
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: 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:1234
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: 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:1268
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Macau"
 msgstr "Macau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Macedonia"
 msgstr "Makedonien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Malawi"
 msgstr "Malawi"
 
-#: 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 "Maldiverne"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Mali"
 msgstr "Mali"
 
-#: 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:1297
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Marshall Islands"
 msgstr "Marshall�erne"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Mauritania"
 msgstr "Mauretanien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: 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:1387
 msgid "Mexico"
 msgstr "Mexico"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Micronesia"
 msgstr "Mikronesien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#, fuzzy
+msgid "Moldova, Republic Of"
+msgstr "Den koreanske republik"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mongolia"
 msgstr "Mongoliet"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: 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:1470
 msgid "Morocco"
 msgstr "Marokko"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Namibia"
 msgstr "Namibien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Nepal"
 msgstr "Nepal"
 
-#: 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:1531
 msgid "Netherlands"
 msgstr "Holland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Netherlands Antilles"
 msgstr "Hollandske Antiller"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "New Caledonia"
 msgstr "Ny-kaledonia"
 
-#: 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:1560
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: 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:1562
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niue"
 msgstr "Niue"
 
-#: 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:1574
 msgid "Norfolk Island"
 msgstr "Norfolk-�en"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Northern Mariana Islands"
 msgstr "Nordre Mariana-�erne"
 
-#: 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:1587
 msgid "Norway"
 msgstr "Norge"
 
-#: 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:1632
 msgid "Oman"
 msgstr "Oman"
 
-#: 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:1673
 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 "Palau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Palestinian Territory"
 msgstr "Palestinensisk omr�de"
 
-#: 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:1683
 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 "Papua Ny Guinea"
 
-#: 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:1688
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: 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:1723
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr "Filippinerne"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: 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:1764
 msgid "Poland"
 msgstr "Polen"
 
-#: 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:1791
 msgid "Portugal"
 msgstr "Portugal"
 
-#: 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:1824
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: 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:1836
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:173
-msgid "Republic Of Korea"
-msgstr "Den Koreanske republik"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:174
-msgid "Republic Of Moldova"
-msgstr "Republikken Moldova"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Reunion"
 msgstr "R�union"
 
-#: 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:1912
 msgid "Romania"
 msgstr "Rum�nien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Russian Federation"
 msgstr "Rusland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts og Nevis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: 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 "Saint Vincent og grenadinerne"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome og Principe"
 
-#: 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:2035
 msgid "Saudi Arabia"
 msgstr "Saudi Arabien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Seychelles"
 msgstr "Seyschellene"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: 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:2090
 msgid "Singapore"
 msgstr "Singapore"
 
-#: 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:2103
 msgid "Slovakia"
 msgstr "Slovakiet"
 
-#: 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:2104
 msgid "Slovenia"
 msgstr "Slovenien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Solomon Islands"
 msgstr "Solomon�erne"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Somalia"
 msgstr "Somalia"
 
-#: 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:2119
 msgid "South Africa"
 msgstr "Sydafrika"
 
-#: 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 "Syd Georgia og de sydlige sandwich-�erne"
 
-#: 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:2127
 msgid "Spain"
 msgstr "Spanien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre og Miquelon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Sudan"
 msgstr "Sudan"
 
-#: 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:2176
 msgid "Suriname"
 msgstr "Surinam"
 
-#: 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 "Svalbard og Jan Mayen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: 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:2181
 msgid "Sweden"
 msgstr "Sverige"
 
-#: 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:2183
 msgid "Switzerland"
 msgstr "Svejts"
 
-#: 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:2205
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: 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 "Republikken Tanzania"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
 msgstr "Thailand"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Trinidad And Tobago"
 msgstr "Trinidad og Tobago"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tunisia"
 msgstr "Tunesien"
 
-#: 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:2321
 msgid "Turkey"
 msgstr "Tyrkiet"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Turks And Caicos Islands"
 msgstr "Turks og Caicos-�erne"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:218
-msgid "U.S. Virgin Islands"
-msgstr "U.S. Jomfru�erne"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "United Arab Emirates"
 msgstr "De forenede arabiske emirater"
 
-#: 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:2342
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr "Republikken Tanzania"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-#: my-evolution/Locations.h:2331
-msgid "United States"
-msgstr "U.S.A."
-
-#: 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 "USA, mindre omliggende �er"
 
-#: 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:2348
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: 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:2380
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: 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:2392
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#, fuzzy
+msgid "Virgin Islands, British"
+msgstr "U.S. Jomfru�erne"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#, fuzzy
+msgid "Virgin Islands, U.S."
+msgstr "U.S. Jomfru�erne"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis- og Futuna-�erne"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Western Sahara"
 msgstr "Vestlige Sahara"
 
-#: 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:2512
 msgid "Yemen"
 msgstr "Yemen"
 
-#: 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:2524
 msgid "Yugoslavia"
 msgstr "Jugoslavien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Slet kontakt?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+msgid "Category editor not available."
+msgstr "Kategori-redigering ikke tilg�ngelig."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+msgid "This contact belongs to these categories:"
+msgstr "Denne kontakt h�rer til disse kategorier:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+msgid "Save Contact as VCard"
+msgstr "Gem kontakt som VCard"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr "TTY/TTD"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Kunne ikke finde widget for felt: `%s'"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+msgid "Contact Quick-Add"
+msgstr "Hurtig kontakt-tilf�jelse"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+msgid "Edit Full"
+msgstr "Redig�r alt"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr "Fulde navn"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+msgid "E-mail"
+msgstr "E-post"
+
+#. 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 "liste"
+
+#: 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 eksisterer allerede\n"
+"Vil du overskrive den?"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Adresse _2:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "Kontroll�r adresse"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "Lan_d:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "_By:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Stat/Provins:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "_ZIP/Postnummer:"
 
@@ -2563,7 +2773,7 @@ msgstr ""
 "eksisterer allerede i denne mappe. Vil du tilf�je den alligevel?"
 
 #: 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 "Avanceret s�gning"
 
@@ -2572,217 +2782,319 @@ msgstr "Avanceret s�gning"
 msgid "Search"
 msgstr "S�gning"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d kort"
 
-#: 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 "Gem som VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "�bn"
-
-#: 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 "Videresend kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-msgid "Send Message to Contact"
-msgstr "Send besked til kontakt"
-
-#: 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 "Udskriv"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr "Udskriv konvolut"
-
-#: 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 "Slet"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Fejl ved �ndring af kort"
 
-#: 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:1043
 msgid "Success"
 msgstr "Succes"
 
-#: 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: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
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "\"Offline\" lager"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "Tilgang n�gtet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Kort ikke fundet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "Kort-ID eksisterer allerede"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke underst�ttet"
 
-#: 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/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
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Anden fejl"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Fejl ved tilf�jelse af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Fejl ved tilf�jelse af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Fejl ved �ndring af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Fejl ved fjernelse af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Fejl ved fjernelse af kort"
 
-#. 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:204
+#, fuzzy
+msgid "Display Cards?"
+msgstr "Vis"
 
-#. 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:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "Vis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Monte Sucro"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Ingen kort"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Ingen kort"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Ingen kort"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Klik her for at tilf�je en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Prim�r telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Assistents telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Arbejdstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Telefon for tilbageringing"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Hjemmetelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Arbejdsadresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Hjemmeadresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Arbejdstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Hjemmetelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Anden telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Gem som VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Ny kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_G� til mappe..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Import�r..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_S�g efter kontakter"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Adressebogs-kilder..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Indstillinger for _h�hdholdt..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Videresend kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Send besked til kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Udskriv konvolut"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "K_opi�r til mappe..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "Fl_yt til mappe..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: 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
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Aktiv visning"
+
+#. 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:940
+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:945
+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."
@@ -2796,11 +3108,12 @@ msgstr "og eet andet kort."
 msgid "Save in addressbook"
 msgstr "Gem i adressebog"
 
-#: 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 ""
@@ -2810,10 +3123,37 @@ msgstr ""
 "\n"
 "Dobbeltklik her for at oprette en ny kontakt."
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Ingen opf�ringer i denne visning\n"
+"\n"
+"Dobbeltklik her for at oprette en ny kontakt."
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Kortvisning"
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr "Udskriv konvolut"
+
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr "Udskriv kort"
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+msgid "Print card"
+msgstr "Udskriv kort"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -2883,6 +3223,7 @@ msgid "Include:"
 msgstr "Inklud�r:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Landskab"
 
@@ -2907,11 +3248,12 @@ msgid "Options"
 msgstr "Alternativer"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Orientering"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "Side"
 
@@ -2927,7 +3269,9 @@ msgstr "Papir"
 msgid "Paper source:"
 msgstr "Papirkilde:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Portr�t"
 
@@ -2983,1575 +3327,49 @@ msgstr "Bredde:"
 msgid "_Font..."
 msgstr "Skri_fttype..."
 
-#: addressbook/printing/e-contact-print.c:1115
-msgid "Print cards"
-msgstr "Udskriv kort"
-
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
-msgid "Print card"
-msgstr "Udskriv kort"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr "Udskriv konvolut"
-
-#.
-#. * 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 "Afrika/Abidjan"
-
-#: calendar/zones.h:8
-msgid "Africa/Accra"
-msgstr "Afrika/Akkra"
-
-#: calendar/zones.h:9
-msgid "Africa/Addis_Ababa"
-msgstr "Afrika/Addis_Abeba"
-
-#: calendar/zones.h:10
-msgid "Africa/Algiers"
-msgstr "Afrika/Algier"
-
-#: calendar/zones.h:11
-msgid "Africa/Asmera"
-msgstr "Afrika/Asmera"
-
-#: calendar/zones.h:12
-msgid "Africa/Bamako"
-msgstr "Afrika/Bamako"
-
-#: calendar/zones.h:13
-msgid "Africa/Bangui"
-msgstr "Afrika/Bangui"
-
-#: calendar/zones.h:14
-msgid "Africa/Banjul"
-msgstr "Afrika/Banjul"
-
-#: calendar/zones.h:15
-msgid "Africa/Bissau"
-msgstr "Afrika/Bissau"
-
-#: calendar/zones.h:16
-msgid "Africa/Blantyre"
-msgstr "Afrika/Blantyre"
-
-#: calendar/zones.h:17
-msgid "Africa/Brazzaville"
-msgstr "Afrika/Brazzaville"
-
-#: calendar/zones.h:18
-msgid "Africa/Bujumbura"
-msgstr "Afrika/Bujumbura"
-
-#: calendar/zones.h:19
-msgid "Africa/Cairo"
-msgstr "Afrika/Kairo"
-
-#: calendar/zones.h:20
-msgid "Africa/Casablanca"
-msgstr "Afrika/Casablanca"
-
-#: calendar/zones.h:21
-msgid "Africa/Ceuta"
-msgstr "Afrika/Ceuta"
-
-#: calendar/zones.h:22
-msgid "Africa/Conakry"
-msgstr "Afrika/Conakry"
-
-#: calendar/zones.h:23
-msgid "Africa/Dakar"
-msgstr "Afrika/Dakar"
-
-#: calendar/zones.h:24
-msgid "Africa/Dar_es_Salaam"
-msgstr "Afrika/Dar_es_salaam"
-
-#: calendar/zones.h:25
-msgid "Africa/Djibouti"
-msgstr "Afrika/Djibouti"
-
-#: calendar/zones.h:26
-msgid "Africa/Douala"
-msgstr "Afrika/Douala"
-
-#: calendar/zones.h:27
-msgid "Africa/El_Aaiun"
-msgstr "Afrika/El_Aaiun"
-
-#: calendar/zones.h:28
-msgid "Africa/Freetown"
-msgstr "Afrika/Freetown"
-
-#: calendar/zones.h:29
-msgid "Africa/Gaborone"
-msgstr "Afrika/Gaborone"
-
-#: calendar/zones.h:30
-msgid "Africa/Harare"
-msgstr "Afrika/Harare"
-
-#: calendar/zones.h:31
-msgid "Africa/Johannesburg"
-msgstr "Afrika/Johannesburg"
-
-#: calendar/zones.h:32
-msgid "Africa/Kampala"
-msgstr "Afrika/Kampala"
-
-#: calendar/zones.h:33
-msgid "Africa/Khartoum"
-msgstr "Afrika/Khartoum"
-
-#: calendar/zones.h:34
-msgid "Africa/Kigali"
-msgstr "Afrika/Kigali"
-
-#: calendar/zones.h:35
-msgid "Africa/Kinshasa"
-msgstr "Afrika/Kinshasa"
-
-#: calendar/zones.h:36
-msgid "Africa/Lagos"
-msgstr "Afrika/Lagos"
-
-#: calendar/zones.h:37
-msgid "Africa/Libreville"
-msgstr "Afrika/Libreville"
-
-#: calendar/zones.h:38
-msgid "Africa/Lome"
-msgstr "Afrika/Lome"
-
-#: calendar/zones.h:39
-msgid "Africa/Luanda"
-msgstr "Afrika/Luanda"
-
-#: calendar/zones.h:40
-msgid "Africa/Lubumbashi"
-msgstr "Afrika/Lubumbashi"
-
-#: calendar/zones.h:41
-msgid "Africa/Lusaka"
-msgstr "Afrika/Lusaka"
-
-#: calendar/zones.h:42
-msgid "Africa/Malabo"
-msgstr "Afrika/Malabo"
-
-#: calendar/zones.h:43
-msgid "Africa/Maputo"
-msgstr "Afrika/Maputo"
-
-#: calendar/zones.h:44
-msgid "Africa/Maseru"
-msgstr "Afrika/Maseru"
-
-#: calendar/zones.h:45
-msgid "Africa/Mbabane"
-msgstr "Afrika/Mbabane"
-
-#: calendar/zones.h:46
-msgid "Africa/Mogadishu"
-msgstr "Afrika/Mogadishu"
-
-#: calendar/zones.h:47
-msgid "Africa/Monrovia"
-msgstr "Afrika/Monrovia"
-
-#: calendar/zones.h:48
-msgid "Africa/Nairobi"
-msgstr "Afrika/Nairobi"
-
-#: calendar/zones.h:49
-msgid "Africa/Ndjamena"
-msgstr "Afrika/Ndjamena"
-
-#: calendar/zones.h:50
-msgid "Africa/Niamey"
-msgstr "Afrika/Niamey"
-
-#: calendar/zones.h:51
-msgid "Africa/Nouakchott"
-msgstr "Afrika/Nouakchott"
-
-#: calendar/zones.h:52
-msgid "Africa/Ouagadougou"
-msgstr "Afrika/Ouagadougou"
-
-#: calendar/zones.h:53
-msgid "Africa/Porto-Novo"
-msgstr "Afrika/Porto-Novo"
-
-#: calendar/zones.h:54
-msgid "Africa/Sao_Tome"
-msgstr "Afrika/Sao_Tome"
-
-#: calendar/zones.h:55
-msgid "Africa/Timbuktu"
-msgstr "Afrika/Timbuktu"
-
-#: calendar/zones.h:56
-msgid "Africa/Tripoli"
-msgstr "Afrika/Tripoli"
-
-#: calendar/zones.h:57
-msgid "Africa/Tunis"
-msgstr "Afrika/Tunis"
-
-#: calendar/zones.h:58
-msgid "Africa/Windhoek"
-msgstr "Afrika/Windhoek"
-
-#: calendar/zones.h:59
-msgid "America/Adak"
-msgstr "Amerika/Adak"
-
-#: calendar/zones.h:60
-msgid "America/Anchorage"
-msgstr "Amerika/Anchorage"
-
-#: calendar/zones.h:61
-msgid "America/Anguilla"
-msgstr "Amerika/Anguilla"
-
-#: calendar/zones.h:62
-msgid "America/Antigua"
-msgstr "Amerika/Antigua"
-
-#: calendar/zones.h:63
-msgid "America/Araguaina"
-msgstr "Amerika/Araguaina"
-
-#: calendar/zones.h:64
-msgid "America/Aruba"
-msgstr "Amerika/Aruba"
-
-#: calendar/zones.h:65
-msgid "America/Asuncion"
-msgstr "Amerika/Asuncion"
-
-#: calendar/zones.h:66
-msgid "America/Barbados"
-msgstr "Amerika/Barbados"
-
-#: calendar/zones.h:67
-msgid "America/Belem"
-msgstr "Amerika/Belem"
-
-#: calendar/zones.h:68
-msgid "America/Belize"
-msgstr "Amerika/Belize"
-
-#: calendar/zones.h:69
-msgid "America/Boa_Vista"
-msgstr "Amerika/Boa_Vista"
-
-#: calendar/zones.h:70
-msgid "America/Bogota"
-msgstr "Amerika/Bogota"
-
-#: calendar/zones.h:71
-msgid "America/Boise"
-msgstr "Amerika/Boise"
-
-#: calendar/zones.h:72
-msgid "America/Buenos_Aires"
-msgstr "Amerika/Buenos_Aires"
-
-#: calendar/zones.h:73
-msgid "America/Cambridge_Bay"
-msgstr "Amerika/Cambridge_Bay"
-
-#: calendar/zones.h:74
-msgid "America/Cancun"
-msgstr "Amerika/Cancun"
-
-#: calendar/zones.h:75
-msgid "America/Caracas"
-msgstr "Amerika/Caracas"
-
-#: calendar/zones.h:76
-msgid "America/Catamarca"
-msgstr "Amerika/Catamarca"
-
-#: calendar/zones.h:77
-msgid "America/Cayenne"
-msgstr "Amerika/Cayenne"
-
-#: calendar/zones.h:78
-msgid "America/Cayman"
-msgstr "Amerika/Cayman"
-
-#: calendar/zones.h:79
-msgid "America/Chicago"
-msgstr "Amerika/Chicago"
-
-#: calendar/zones.h:80
-msgid "America/Chihuahua"
-msgstr "Amerika/Chihuahua"
-
-#: calendar/zones.h:81
-msgid "America/Cordoba"
-msgstr "Amerika/Cordoba"
-
-#: calendar/zones.h:82
-msgid "America/Costa_Rica"
-msgstr "Amerika/Costa_Rica"
-
-#: calendar/zones.h:83
-msgid "America/Cuiaba"
-msgstr "Amerika/Cuiaba"
-
-#: calendar/zones.h:84
-msgid "America/Curacao"
-msgstr "Amerika/Curacao"
-
-#: calendar/zones.h:85
-msgid "America/Danmarkshavn"
-msgstr "Amerika/Danmarkshavn"
-
-#: calendar/zones.h:86
-msgid "America/Dawson"
-msgstr "Amerika/Dawson"
-
-#: calendar/zones.h:87
-msgid "America/Dawson_Creek"
-msgstr "Amerika/Dawson_Creek"
-
-#: calendar/zones.h:88
-msgid "America/Denver"
-msgstr "Amerika/Denver"
-
-#: calendar/zones.h:89
-msgid "America/Detroit"
-msgstr "Amerika/Detroit"
-
-#: calendar/zones.h:90
-msgid "America/Dominica"
-msgstr "Amerika/Dominika"
-
-#: calendar/zones.h:91
-msgid "America/Edmonton"
-msgstr "Amerika/Edmonton"
-
-#: calendar/zones.h:92
-msgid "America/Eirunepe"
-msgstr "Amerika/Eirunepe"
-
-#: calendar/zones.h:93
-msgid "America/El_Salvador"
-msgstr "Amerika/El_Salvador"
-
-#: calendar/zones.h:94
-msgid "America/Fortaleza"
-msgstr "Amerika/Fortaleza"
-
-#: calendar/zones.h:95
-msgid "America/Glace_Bay"
-msgstr "Amerika/Glace_Bay"
-
-#: calendar/zones.h:96
-msgid "America/Godthab"
-msgstr "America/Godth�b"
-
-#: calendar/zones.h:97
-msgid "America/Goose_Bay"
-msgstr "Amerika/Goose_Bay"
-
-#: calendar/zones.h:98
-msgid "America/Grand_Turk"
-msgstr "Amerika/Grand_Turk"
-
-#: calendar/zones.h:99
-msgid "America/Grenada"
-msgstr "Amerika/Grenada"
-
-#: calendar/zones.h:100
-msgid "America/Guadeloupe"
-msgstr "Amerika/Guadeloupe"
-
-#: calendar/zones.h:101
-msgid "America/Guatemala"
-msgstr "Amerika/Guatemala"
-
-#: calendar/zones.h:102
-msgid "America/Guayaquil"
-msgstr "Amerika/Guayaquil"
-
-#: calendar/zones.h:103
-msgid "America/Guyana"
-msgstr "Amerika/Guyana"
-
-#: calendar/zones.h:104
-msgid "America/Halifax"
-msgstr "Amerika/Halifax"
-
-#: calendar/zones.h:105
-msgid "America/Havana"
-msgstr "Amerika/Havana"
-
-#: calendar/zones.h:106
-msgid "America/Hermosillo"
-msgstr "Amerika/Hermosillo"
-
-#: calendar/zones.h:107
-msgid "America/Indiana/Indianapolis"
-msgstr "Amerika/Indiana/Indianapolis"
-
-#: calendar/zones.h:108
-msgid "America/Indiana/Knox"
-msgstr "Amerika/Indiana/Knox"
-
-#: calendar/zones.h:109
-msgid "America/Indiana/Marengo"
-msgstr "Amerika/Indiana/Marengo"
-
-#: calendar/zones.h:110
-msgid "America/Indiana/Vevay"
-msgstr "Amerika/Indiana/Vevay"
-
-#: calendar/zones.h:111
-msgid "America/Indianapolis"
-msgstr "Amerika/Indianapolis"
-
-#: calendar/zones.h:112
-msgid "America/Inuvik"
-msgstr "Amerika/Inuvik"
-
-#: calendar/zones.h:113
-msgid "America/Iqaluit"
-msgstr "Amerika/Iqaluit"
-
-#: calendar/zones.h:114
-msgid "America/Jamaica"
-msgstr "Amerika/Jamaica"
-
-#: calendar/zones.h:115
-msgid "America/Jujuy"
-msgstr "Amerika/Jujuy"
-
-#: calendar/zones.h:116
-msgid "America/Juneau"
-msgstr "Amerika/Juneau"
-
-#: calendar/zones.h:117
-msgid "America/Kentucky/Louisville"
-msgstr "Amerika/Kentucky/Louisville"
-
-#: calendar/zones.h:118
-msgid "America/Kentucky/Monticello"
-msgstr "Amerika/Kentucky/Monticello"
-
-#: calendar/zones.h:119
-msgid "America/La_Paz"
-msgstr "Amerika/La_Paz"
-
-#: calendar/zones.h:120
-msgid "America/Lima"
-msgstr "Amerika/Lima"
-
-#: calendar/zones.h:121
-msgid "America/Los_Angeles"
-msgstr "Amerika/Los_Angeles"
-
-#: calendar/zones.h:122
-msgid "America/Louisville"
-msgstr "Amerika/Louisville"
-
-#: calendar/zones.h:123
-msgid "America/Maceio"
-msgstr "Amerika/Maceio"
-
-#: calendar/zones.h:124
-msgid "America/Managua"
-msgstr "Amerika/Managua"
-
-#: calendar/zones.h:125
-msgid "America/Manaus"
-msgstr "Amerika/Manaus"
-
-#: calendar/zones.h:126
-msgid "America/Martinique"
-msgstr "Amerika/Martinique"
-
-#: calendar/zones.h:127
-msgid "America/Mazatlan"
-msgstr "Amerika/Mazatlan"
-
-#: calendar/zones.h:128
-msgid "America/Mendoza"
-msgstr "Amerika/Mendoza"
-
-#: calendar/zones.h:129
-msgid "America/Menominee"
-msgstr "Amerika/Menominee"
-
-#: calendar/zones.h:130
-msgid "America/Merida"
-msgstr "Amerika/Merida"
-
-#: calendar/zones.h:131
-msgid "America/Mexico_City"
-msgstr "Amerika/Mexico_City"
-
-#: calendar/zones.h:132
-msgid "America/Miquelon"
-msgstr "America/Miquelon"
-
-#: calendar/zones.h:133
-msgid "America/Monterrey"
-msgstr "Amerika/Monterrey"
-
-#: calendar/zones.h:134
-msgid "America/Montevideo"
-msgstr "Amerika/Montevideo"
-
-#: calendar/zones.h:135
-msgid "America/Montreal"
-msgstr "Amerika/Montr�al"
-
-#: calendar/zones.h:136
-msgid "America/Montserrat"
-msgstr "Amerika/Montserrat"
-
-#: calendar/zones.h:137
-msgid "America/Nassau"
-msgstr "Amerika/Nassau"
-
-#: calendar/zones.h:138
-msgid "America/New_York"
-msgstr "Amerika/New_York"
-
-#: calendar/zones.h:139
-msgid "America/Nipigon"
-msgstr "Amerika/Nipigon"
-
-#: calendar/zones.h:140
-msgid "America/Nome"
-msgstr "Amerika/Nome"
-
-#: calendar/zones.h:141
-msgid "America/Noronha"
-msgstr "Amerika/Noronha"
-
-#: calendar/zones.h:142
-msgid "America/North_Dakota/Center"
-msgstr "Amerika/North_Dakota/Center"
-
-#: calendar/zones.h:143
-msgid "America/Panama"
-msgstr "Amerika/Panama"
-
-#: calendar/zones.h:144
-msgid "America/Pangnirtung"
-msgstr "Amerika/Pangnirtung"
-
-#: calendar/zones.h:145
-msgid "America/Paramaribo"
-msgstr "Amerika/Paramaribo"
-
-#: calendar/zones.h:146
-msgid "America/Phoenix"
-msgstr "Amerika/Phoenix"
-
-#: calendar/zones.h:147
-msgid "America/Port-au-Prince"
-msgstr "Amerika/Port-au-Prince"
-
-#: calendar/zones.h:148
-msgid "America/Port_of_Spain"
-msgstr "Amerika/Port_of_Spain"
-
-#: calendar/zones.h:149
-msgid "America/Porto_Velho"
-msgstr "Amerika/Porto_Velho"
-
-#: calendar/zones.h:150
-msgid "America/Puerto_Rico"
-msgstr "Amerika/Puerto_Rico"
-
-#: calendar/zones.h:151
-msgid "America/Rainy_River"
-msgstr "Amerika/Rainy_River"
-
-#: calendar/zones.h:152
-msgid "America/Rankin_Inlet"
-msgstr "Amerika/Rankin_Inlet"
-
-#: calendar/zones.h:153
-msgid "America/Recife"
-msgstr "Amerika/Recife"
-
-#: calendar/zones.h:154
-msgid "America/Regina"
-msgstr "Amerika/Regina"
-
-#: calendar/zones.h:155
-msgid "America/Rio_Branco"
-msgstr "Amerika/Rio_Branco"
-
-#: calendar/zones.h:156
-msgid "America/Rosario"
-msgstr "Amerika/Rosario"
-
-#: calendar/zones.h:157
-msgid "America/Santiago"
-msgstr "Amerika/Santiago"
-
-#: calendar/zones.h:158
-msgid "America/Santo_Domingo"
-msgstr "Amerika/Santo_Domingo"
-
-#: calendar/zones.h:159
-msgid "America/Sao_Paulo"
-msgstr "Amerika/Sao_Paulo"
-
-#: calendar/zones.h:160
-msgid "America/Scoresbysund"
-msgstr "Amerika/Scoresbysund"
-
-#: calendar/zones.h:161
-msgid "America/Shiprock"
-msgstr "Amerika/Shiprock"
-
-#: calendar/zones.h:162
-msgid "America/St_Johns"
-msgstr "Amerika/St_Johns"
-
-#: calendar/zones.h:163
-msgid "America/St_Kitts"
-msgstr "Amerika/St_Kitts"
-
-#: calendar/zones.h:164
-msgid "America/St_Lucia"
-msgstr "Amerika/St_Lucia"
-
-#: calendar/zones.h:165
-msgid "America/St_Thomas"
-msgstr "Amerika/St_Thomas"
-
-#: calendar/zones.h:166
-msgid "America/St_Vincent"
-msgstr "Amerika/St_Vincent"
-
-#: calendar/zones.h:167
-msgid "America/Swift_Current"
-msgstr "Amerika/Swift_Current"
-
-#: calendar/zones.h:168
-msgid "America/Tegucigalpa"
-msgstr "Amerika/Tegucigalpa"
-
-#: calendar/zones.h:169
-msgid "America/Thule"
-msgstr "Amerika/Thule"
-
-#: calendar/zones.h:170
-msgid "America/Thunder_Bay"
-msgstr "Amerika/Thunder_Bay"
-
-#: calendar/zones.h:171
-msgid "America/Tijuana"
-msgstr "Amerika/Tijuana"
-
-#: calendar/zones.h:172
-msgid "America/Tortola"
-msgstr "Amerika/Tortola"
-
-#: calendar/zones.h:173
-msgid "America/Vancouver"
-msgstr "Amerika/Vancouver"
-
-#: calendar/zones.h:174
-msgid "America/Whitehorse"
-msgstr "Amerika/Whitehorse"
-
-#: calendar/zones.h:175
-msgid "America/Winnipeg"
-msgstr "Amerika/Winnipeg"
-
-#: calendar/zones.h:176
-msgid "America/Yakutat"
-msgstr "Amerika/Yakutat"
-
-#: calendar/zones.h:177
-msgid "America/Yellowknife"
-msgstr "Amerika/Yellowknife"
-
-#: calendar/zones.h:178
-msgid "Antarctica/Casey"
-msgstr "Antarktis/Casey"
-
-#: calendar/zones.h:179
-msgid "Antarctica/Davis"
-msgstr "Antarktis/Davis"
-
-#: calendar/zones.h:180
-msgid "Antarctica/DumontDUrville"
-msgstr "Antarktis/DumontDUrville"
-
-#: calendar/zones.h:181
-msgid "Antarctica/Mawson"
-msgstr "Antarktis/Mawson"
-
-#: calendar/zones.h:182
-msgid "Antarctica/McMurdo"
-msgstr "Antarktis/McMurdo"
-
-#: calendar/zones.h:183
-msgid "Antarctica/Palmer"
-msgstr "Antarktis/Palmer"
-
-#: calendar/zones.h:184
-msgid "Antarctica/South_Pole"
-msgstr "Antarktis/Sydpolen"
-
-#: calendar/zones.h:185
-msgid "Antarctica/Syowa"
-msgstr "Antarktis/Syowa"
-
-#: calendar/zones.h:186
-msgid "Antarctica/Vostok"
-msgstr "Antarktis/Vostok"
-
-#: calendar/zones.h:187
-msgid "Arctic/Longyearbyen"
-msgstr "Arktis/Longyearbyen"
-
-#: calendar/zones.h:188
-msgid "Asia/Aden"
-msgstr "Asien/Aden"
-
-#: calendar/zones.h:189
-msgid "Asia/Almaty"
-msgstr "Asien/Almaty"
-
-#: calendar/zones.h:190
-msgid "Asia/Amman"
-msgstr "Asien/Amman"
-
-#: calendar/zones.h:191
-msgid "Asia/Anadyr"
-msgstr "Asien/Anadyr"
-
-#: calendar/zones.h:192
-msgid "Asia/Aqtau"
-msgstr "Asien/Aqtau"
-
-#: calendar/zones.h:193
-msgid "Asia/Aqtobe"
-msgstr "Asien/Aqtobe"
-
-#: calendar/zones.h:194
-msgid "Asia/Ashgabat"
-msgstr "Asien/Ashgabat"
-
-#: calendar/zones.h:195
-msgid "Asia/Baghdad"
-msgstr "Asien/Bagdad"
-
-#: calendar/zones.h:196
-msgid "Asia/Bahrain"
-msgstr "Asien/Bahrain"
-
-#: calendar/zones.h:197
-msgid "Asia/Baku"
-msgstr "Asien/Bakuc"
-
-#: calendar/zones.h:198
-msgid "Asia/Bangkok"
-msgstr "Asien/Bangkok"
-
-#: calendar/zones.h:199
-msgid "Asia/Beirut"
-msgstr "Asien/Beirut"
-
-#: calendar/zones.h:200
-msgid "Asia/Bishkek"
-msgstr "Asien/Bishkek"
-
-#: calendar/zones.h:201
-msgid "Asia/Brunei"
-msgstr "Asien/Brunei"
-
-#: calendar/zones.h:202
-msgid "Asia/Calcutta"
-msgstr "Asien/Calcutta"
-
-#: calendar/zones.h:203
-msgid "Asia/Choibalsan"
-msgstr "Asien/Choibalsan"
-
-#: calendar/zones.h:204
-msgid "Asia/Chongqing"
-msgstr "Asien Chongqing"
-
-#: calendar/zones.h:205
-msgid "Asia/Colombo"
-msgstr "Asien/Colombo"
-
-#: calendar/zones.h:206
-msgid "Asia/Damascus"
-msgstr "Asien/Damaskus"
-
-#: calendar/zones.h:207
-msgid "Asia/Dhaka"
-msgstr "Asien/Dhaka"
-
-#: calendar/zones.h:208
-msgid "Asia/Dili"
-msgstr "Asien/Dili"
-
-#: calendar/zones.h:209
-msgid "Asia/Dubai"
-msgstr "Asien/Dubai"
-
-#: calendar/zones.h:210
-msgid "Asia/Dushanbe"
-msgstr "Asien/Dushanbe"
-
-#: calendar/zones.h:211
-msgid "Asia/Gaza"
-msgstr "Asien/Gaza"
-
-#: calendar/zones.h:212
-msgid "Asia/Harbin"
-msgstr "Asien/Harbin"
-
-#: calendar/zones.h:213
-msgid "Asia/Hong_Kong"
-msgstr "Asien/Hong_Kong"
-
-#: calendar/zones.h:214
-msgid "Asia/Hovd"
-msgstr "Asien/Hovd"
-
-#: calendar/zones.h:215
-msgid "Asia/Irkutsk"
-msgstr "Asien/Irkutsk"
-
-#: calendar/zones.h:216
-msgid "Asia/Istanbul"
-msgstr "Asien/Istanbul"
-
-#: calendar/zones.h:217
-msgid "Asia/Jakarta"
-msgstr "Asien/Jakarta"
-
-#: calendar/zones.h:218
-msgid "Asia/Jayapura"
-msgstr "Asien/Jayapura"
-
-#: calendar/zones.h:219
-msgid "Asia/Jerusalem"
-msgstr "Asien/Jerusalem"
-
-#: calendar/zones.h:220
-msgid "Asia/Kabul"
-msgstr "Asien/Kabul"
-
-#: calendar/zones.h:221
-msgid "Asia/Kamchatka"
-msgstr "Asien/Kamchatka"
-
-#: calendar/zones.h:222
-msgid "Asia/Karachi"
-msgstr "Asien/Karachi"
-
-#: calendar/zones.h:223
-msgid "Asia/Kashgar"
-msgstr "Asien/Kashgar"
-
-#: calendar/zones.h:224
-msgid "Asia/Katmandu"
-msgstr "Asien/Katmandu"
-
-#: calendar/zones.h:225
-msgid "Asia/Krasnoyarsk"
-msgstr "Asien/Krasnoyarsk"
-
-#: calendar/zones.h:226
-msgid "Asia/Kuala_Lumpur"
-msgstr "Asien/Kuala_Lumpur"
-
-#: calendar/zones.h:227
-msgid "Asia/Kuching"
-msgstr "Asien/Kuching"
-
-#: calendar/zones.h:228
-msgid "Asia/Kuwait"
-msgstr "Asien/Kuwait"
-
-#: calendar/zones.h:229
-msgid "Asia/Macao"
-msgstr "Asien/Macao"
-
-#: calendar/zones.h:230
-msgid "Asia/Magadan"
-msgstr "Asien/Magadan"
-
-#: calendar/zones.h:231
-msgid "Asia/Manila"
-msgstr "Asien/Manila"
-
-#: calendar/zones.h:232
-msgid "Asia/Muscat"
-msgstr "Asien/Muscat"
-
-#: calendar/zones.h:233
-msgid "Asia/Nicosia"
-msgstr "Asien/Nicosia"
-
-#: calendar/zones.h:234
-msgid "Asia/Novosibirsk"
-msgstr "Asien/Novosibirsk"
-
-#: calendar/zones.h:235
-msgid "Asia/Omsk"
-msgstr "Asien/Omsk"
-
-#: calendar/zones.h:236
-msgid "Asia/Phnom_Penh"
-msgstr "Asien/Phnom_Penh"
-
-#: calendar/zones.h:237
-msgid "Asia/Pontianak"
-msgstr "Asien/Pontianak"
-
-#: calendar/zones.h:238
-msgid "Asia/Pyongyang"
-msgstr "Asien/Pyongyang"
-
-#: calendar/zones.h:239
-msgid "Asia/Qatar"
-msgstr "Asien/Qatar"
-
-#: calendar/zones.h:240
-msgid "Asia/Rangoon"
-msgstr "Asien/Rangoon"
-
-#: calendar/zones.h:241
-msgid "Asia/Riyadh"
-msgstr "Asien/Riyadh"
-
-#: calendar/zones.h:242
-msgid "Asia/Saigon"
-msgstr "Asien/Saigon"
-
-#: calendar/zones.h:243
-msgid "Asia/Sakhalin"
-msgstr "Asien/Sakhalin"
-
-#: calendar/zones.h:244
-msgid "Asia/Samarkand"
-msgstr "Asien/Samarkand"
-
-#: calendar/zones.h:245
-msgid "Asia/Seoul"
-msgstr "Asien/Seoul"
-
-#: calendar/zones.h:246
-msgid "Asia/Shanghai"
-msgstr "Asien/Shanghai"
-
-#: calendar/zones.h:247
-msgid "Asia/Singapore"
-msgstr "Asien/Singapore"
-
-#: calendar/zones.h:248
-msgid "Asia/Taipei"
-msgstr "Asien/Taipei"
-
-#: calendar/zones.h:249
-msgid "Asia/Tashkent"
-msgstr "Asien/Tashkent"
-
-#: calendar/zones.h:250
-msgid "Asia/Tbilisi"
-msgstr "Asien/Tbilisi"
-
-#: calendar/zones.h:251
-msgid "Asia/Tehran"
-msgstr "Asien/Teheran"
-
-#: calendar/zones.h:252
-msgid "Asia/Thimphu"
-msgstr "Asien/Thimphu"
-
-#: calendar/zones.h:253
-msgid "Asia/Tokyo"
-msgstr "Asien/Tokyo"
-
-#: calendar/zones.h:254
-msgid "Asia/Ujung_Pandang"
-msgstr "Asien/Ujung_Pandang"
-
-#: calendar/zones.h:255
-msgid "Asia/Ulaanbaatar"
-msgstr "Asien/Ulaanbaatar"
-
-#: calendar/zones.h:256
-msgid "Asia/Urumqi"
-msgstr "Asien/Urumqi"
-
-#: calendar/zones.h:257
-msgid "Asia/Vientiane"
-msgstr "Asien/Vientiane"
-
-#: calendar/zones.h:258
-msgid "Asia/Vladivostok"
-msgstr "Asien/Vladivostok"
-
-#: calendar/zones.h:259
-msgid "Asia/Yakutsk"
-msgstr "Asien/Jakutsk"
-
-#: calendar/zones.h:260
-msgid "Asia/Yekaterinburg"
-msgstr "Asien/Jekaterinburg"
-
-#: calendar/zones.h:261
-msgid "Asia/Yerevan"
-msgstr "Asien/Jerevan"
-
-#: calendar/zones.h:262
-msgid "Atlantic/Azores"
-msgstr "Atlanten/Azorene"
-
-#: calendar/zones.h:263
-msgid "Atlantic/Bermuda"
-msgstr "Atlanten/Bermuda"
-
-#: calendar/zones.h:264
-msgid "Atlantic/Canary"
-msgstr "Atlanteren/De canariske �er"
-
-#: calendar/zones.h:265
-msgid "Atlantic/Cape_Verde"
-msgstr "Atlanten/Kap_Verde"
-
-#: calendar/zones.h:266
-msgid "Atlantic/Faeroe"
-msgstr "Atlanten/F�r�erne"
-
-#: calendar/zones.h:267
-msgid "Atlantic/Jan_Mayen"
-msgstr "Atlanten/Jan_Mayen"
-
-#: calendar/zones.h:268
-msgid "Atlantic/Madeira"
-msgstr "Atlanten/Madeira"
-
-#: calendar/zones.h:269
-msgid "Atlantic/Reykjavik"
-msgstr "Atlanten/Reykjav�k"
-
-#: calendar/zones.h:270
-msgid "Atlantic/South_Georgia"
-msgstr "Atlanten/Syd-Georgia"
-
-#: calendar/zones.h:271
-msgid "Atlantic/St_Helena"
-msgstr "Atlanten/St_Helena"
-
-#: calendar/zones.h:272
-msgid "Atlantic/Stanley"
-msgstr "Atlanten/Stanley"
-
-#: calendar/zones.h:273
-msgid "Australia/Adelaide"
-msgstr "Australien/Adelaide"
-
-#: calendar/zones.h:274
-msgid "Australia/Brisbane"
-msgstr "Australien/Brisbane"
-
-#: calendar/zones.h:275
-msgid "Australia/Broken_Hill"
-msgstr "Australien/Broken_Hill"
-
-#: calendar/zones.h:276
-msgid "Australia/Darwin"
-msgstr "Australien/Darwin"
-
-#: calendar/zones.h:277
-msgid "Australia/Hobart"
-msgstr "Australien/Hobart"
-
-#: calendar/zones.h:278
-msgid "Australia/Lindeman"
-msgstr "Australien/Lindeman"
-
-#: calendar/zones.h:279
-msgid "Australia/Lord_Howe"
-msgstr "Australien/Lord_Howe"
-
-#: calendar/zones.h:280
-msgid "Australia/Melbourne"
-msgstr "Australien/Melbourne"
-
-#: calendar/zones.h:281
-msgid "Australia/Perth"
-msgstr "Australien/Perth"
-
-#: calendar/zones.h:282
-msgid "Australia/Sydney"
-msgstr "Australien/Sydney"
-
-#: calendar/zones.h:283
-msgid "Europe/Amsterdam"
-msgstr "Europa/Amsterdam"
-
-#: calendar/zones.h:284
-msgid "Europe/Andorra"
-msgstr "Europa/Andorra"
-
-#: calendar/zones.h:285
-msgid "Europe/Athens"
-msgstr "Europa/Athen"
-
-#: calendar/zones.h:286
-msgid "Europe/Belfast"
-msgstr "Europa/Belfast"
-
-#: calendar/zones.h:287
-msgid "Europe/Belgrade"
-msgstr "Europa/Beograd"
-
-#: calendar/zones.h:288
-msgid "Europe/Berlin"
-msgstr "Europa/Berlin"
-
-#: calendar/zones.h:289
-msgid "Europe/Bratislava"
-msgstr "Europa/Bratislava"
-
-#: calendar/zones.h:290
-msgid "Europe/Brussels"
-msgstr "Europa/Bryssel"
-
-#: calendar/zones.h:291
-msgid "Europe/Bucharest"
-msgstr "Europa/Bukarest"
-
-#: calendar/zones.h:292
-msgid "Europe/Budapest"
-msgstr "Europa/Budapest"
-
-#: calendar/zones.h:293
-msgid "Europe/Chisinau"
-msgstr "Europa/Chisinau"
-
-#: calendar/zones.h:294
-msgid "Europe/Copenhagen"
-msgstr "Europa/K�benhavn"
-
-#: calendar/zones.h:295
-msgid "Europe/Dublin"
-msgstr "Europa/Dublin"
-
-#: calendar/zones.h:296
-msgid "Europe/Gibraltar"
-msgstr "Europa/Gibraltar"
-
-#: calendar/zones.h:297
-msgid "Europe/Helsinki"
-msgstr "Europa/Helsinki"
-
-#: calendar/zones.h:298
-msgid "Europe/Istanbul"
-msgstr "Europa/Istanbul"
-
-#: calendar/zones.h:299
-msgid "Europe/Kaliningrad"
-msgstr "Europa/Kaliningrad"
-
-#: calendar/zones.h:300
-msgid "Europe/Kiev"
-msgstr "Europa/Kiev"
-
-#: calendar/zones.h:301
-msgid "Europe/Lisbon"
-msgstr "Europa/Lisboa"
-
-#: calendar/zones.h:302
-msgid "Europe/Ljubljana"
-msgstr "Europa/Ljubljana"
-
-#: calendar/zones.h:303
-msgid "Europe/London"
-msgstr "Europa/London"
-
-#: calendar/zones.h:304
-msgid "Europe/Luxembourg"
-msgstr "Europa/Luxembourg"
-
-#: calendar/zones.h:305
-msgid "Europe/Madrid"
-msgstr "Europa/Madrid"
-
-#: calendar/zones.h:306
-msgid "Europe/Malta"
-msgstr "Europa/Malta"
-
-#: calendar/zones.h:307
-msgid "Europe/Minsk"
-msgstr "Europa/Minsk"
-
-#: calendar/zones.h:308
-msgid "Europe/Monaco"
-msgstr "Europa/Monaco"
-
-#: calendar/zones.h:309
-msgid "Europe/Moscow"
-msgstr "Europa/Moskva"
-
-#: calendar/zones.h:310
-msgid "Europe/Nicosia"
-msgstr "Europa/Nicosia"
-
-#: calendar/zones.h:311
-msgid "Europe/Oslo"
-msgstr "Europa/Oslo"
-
-#: calendar/zones.h:312
-msgid "Europe/Paris"
-msgstr "Europa/Paris"
-
-#: calendar/zones.h:313
-msgid "Europe/Prague"
-msgstr "Europa/Prag"
-
-#: calendar/zones.h:314
-msgid "Europe/Riga"
-msgstr "Europa/Riga"
-
-#: calendar/zones.h:315
-msgid "Europe/Rome"
-msgstr "Europa/Rom"
-
-#: calendar/zones.h:316
-msgid "Europe/Samara"
-msgstr "Europa/Samara"
-
-#: calendar/zones.h:317
-msgid "Europe/San_Marino"
-msgstr "Europa/San_Marino"
-
-#: calendar/zones.h:318
-msgid "Europe/Sarajevo"
-msgstr "Europa/Sarajevo"
-
-#: calendar/zones.h:319
-msgid "Europe/Simferopol"
-msgstr "Europa/Simferopol"
-
-#: calendar/zones.h:320
-msgid "Europe/Skopje"
-msgstr "Europa/Skopje"
-
-#: calendar/zones.h:321
-msgid "Europe/Sofia"
-msgstr "Europa/Sofia"
-
-#: calendar/zones.h:322
-msgid "Europe/Stockholm"
-msgstr "Europa/Stockholm"
-
-#: calendar/zones.h:323
-msgid "Europe/Tallinn"
-msgstr "Europa/Tallinn"
-
-#: calendar/zones.h:324
-msgid "Europe/Tirane"
-msgstr "Europa/Tirane"
-
-#: calendar/zones.h:325
-msgid "Europe/Uzhgorod"
-msgstr "Europa/Uzhgorod"
-
-#: calendar/zones.h:326
-msgid "Europe/Vaduz"
-msgstr "Europa/Vaduz"
-
-#: calendar/zones.h:327
-msgid "Europe/Vatican"
-msgstr "Europa/Vatikanet"
-
-#: calendar/zones.h:328
-msgid "Europe/Vienna"
-msgstr "Europa/Wien"
-
-#: calendar/zones.h:329
-msgid "Europe/Vilnius"
-msgstr "Europa/Vilnius"
-
-#: calendar/zones.h:330
-msgid "Europe/Warsaw"
-msgstr "Europa/Warszawa"
-
-#: calendar/zones.h:331
-msgid "Europe/Zagreb"
-msgstr "Europa/Zagreb"
-
-#: calendar/zones.h:332
-msgid "Europe/Zaporozhye"
-msgstr "Europa/Zaporozhye"
-
-#: calendar/zones.h:333
-msgid "Europe/Zurich"
-msgstr "Europa/Z�rich"
-
-#: calendar/zones.h:334
-msgid "Indian/Antananarivo"
-msgstr "Indiske hav/Antananarivo"
-
-#: calendar/zones.h:335
-msgid "Indian/Chagos"
-msgstr "Indiske hav/Chagos"
-
-#: calendar/zones.h:336
-msgid "Indian/Christmas"
-msgstr "Indiske hav/Jule�en"
-
-#: calendar/zones.h:337
-msgid "Indian/Cocos"
-msgstr "Indiske hav/Cocos"
-
-#: calendar/zones.h:338
-msgid "Indian/Comoro"
-msgstr "Indiske hav/Comorerne"
-
-#: calendar/zones.h:339
-msgid "Indian/Kerguelen"
-msgstr "Indiske hav/Kerguelen"
-
-#: calendar/zones.h:340
-msgid "Indian/Mahe"
-msgstr "Indiske hav/Mahe"
-
-#: calendar/zones.h:341
-msgid "Indian/Maldives"
-msgstr "Indiske hav/Maldiverne"
-
-#: calendar/zones.h:342
-msgid "Indian/Mauritius"
-msgstr "Indiske hav/Mauritius"
-
-#: calendar/zones.h:343
-msgid "Indian/Mayotte"
-msgstr "Indiske hav/Mayotte"
-
-#: calendar/zones.h:344
-msgid "Indian/Reunion"
-msgstr "Indiske hav/Reunion"
-
-#: calendar/zones.h:345
-msgid "Pacific/Apia"
-msgstr "Stillehavet/Apia"
-
-#: calendar/zones.h:346
-msgid "Pacific/Auckland"
-msgstr "Stillehavet/Auckland"
-
-#: calendar/zones.h:347
-msgid "Pacific/Chatham"
-msgstr "Stillehavet/Chatham"
-
-#: calendar/zones.h:348
-msgid "Pacific/Easter"
-msgstr "Stillehavet/P�ske�en"
-
-#: calendar/zones.h:349
-msgid "Pacific/Efate"
-msgstr "Stillehavet/Efate"
-
-#: calendar/zones.h:350
-msgid "Pacific/Enderbury"
-msgstr "Stillehavet/Enderbury"
-
-#: calendar/zones.h:351
-msgid "Pacific/Fakaofo"
-msgstr "Stillehavet/Fakaofo"
-
-#: calendar/zones.h:352
-msgid "Pacific/Fiji"
-msgstr "Stillehavet/Fiji�erne"
-
-#: calendar/zones.h:353
-msgid "Pacific/Funafuti"
-msgstr "Stillehavet/Funafuti"
-
-#: calendar/zones.h:354
-msgid "Pacific/Galapagos"
-msgstr "Stillehavet/Galapagos"
-
-#: calendar/zones.h:355
-msgid "Pacific/Gambier"
-msgstr "Stillehavet/Gambier"
-
-#: calendar/zones.h:356
-msgid "Pacific/Guadalcanal"
-msgstr "Stillehavet/Guadalcanal"
-
-#: calendar/zones.h:357
-msgid "Pacific/Guam"
-msgstr "Stillehavet/Guam"
-
-#: calendar/zones.h:358
-msgid "Pacific/Honolulu"
-msgstr "Stillehavet/Honolulu"
-
-#: calendar/zones.h:359
-msgid "Pacific/Johnston"
-msgstr "Stillehavet/Johnston"
-
-#: calendar/zones.h:360
-msgid "Pacific/Kiritimati"
-msgstr "Stillehavet/Kiritimati"
-
-#: calendar/zones.h:361
-msgid "Pacific/Kosrae"
-msgstr "Stillehavet/Kosrae"
-
-#: calendar/zones.h:362
-msgid "Pacific/Kwajalein"
-msgstr "Stillehavet/Kwajalein"
-
-#: calendar/zones.h:363
-msgid "Pacific/Majuro"
-msgstr "Stillehavet/Majuro"
-
-#: calendar/zones.h:364
-msgid "Pacific/Marquesas"
-msgstr "Stillehavet/Marquesas"
-
-#: calendar/zones.h:365
-msgid "Pacific/Midway"
-msgstr "Stillehavet/Midway"
-
-#: calendar/zones.h:366
-msgid "Pacific/Nauru"
-msgstr "Stillehavet/Nauru"
-
-#: calendar/zones.h:367
-msgid "Pacific/Niue"
-msgstr "Stillehavet/Niue"
-
-#: calendar/zones.h:368
-msgid "Pacific/Norfolk"
-msgstr "Stillehavet/Norfolk"
-
-#: calendar/zones.h:369
-msgid "Pacific/Noumea"
-msgstr "Stillehavet/Noumea"
-
-#: calendar/zones.h:370
-msgid "Pacific/Pago_Pago"
-msgstr "Stillehavet/Pago_Pago"
-
-#: calendar/zones.h:371
-msgid "Pacific/Palau"
-msgstr "Stillehavet/Palau"
-
-#: calendar/zones.h:372
-msgid "Pacific/Pitcairn"
-msgstr "Stillehavet/Pitcairn"
-
-#: calendar/zones.h:373
-msgid "Pacific/Ponape"
-msgstr "Stillehavet/Ponape"
-
-#: calendar/zones.h:374
-msgid "Pacific/Port_Moresby"
-msgstr "Stillehavet/Port_Moresby"
-
-#: calendar/zones.h:375
-msgid "Pacific/Rarotonga"
-msgstr "Stillehavet/Rarotonga"
-
-#: calendar/zones.h:376
-msgid "Pacific/Saipan"
-msgstr "Stillehavet/Saipan"
-
-#: calendar/zones.h:377
-msgid "Pacific/Tahiti"
-msgstr "Stillehavet/Tahiti"
-
-#: calendar/zones.h:378
-msgid "Pacific/Tarawa"
-msgstr "Stillehavet/Tarawa"
-
-#: calendar/zones.h:379
-msgid "Pacific/Tongatapu"
-msgstr "Stillehavet/Tongatapu"
-
-#: calendar/zones.h:380
-msgid "Pacific/Truk"
-msgstr "Stillehavet/Truk"
-
-#: calendar/zones.h:381
-msgid "Pacific/Wake"
-msgstr "Stillehavet/Wake"
-
-#: calendar/zones.h:382
-msgid "Pacific/Wallis"
-msgstr "Stillehavet/Wallis"
-
-#: calendar/zones.h:383
-msgid "Pacific/Yap"
-msgstr "Stillehavet/Yap"
-
 #: calendar/cal-util/cal-component.c:1207
 msgid "Untitled appointment"
 msgstr "Unavngivet aftale"
 
-#: 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:405 mail/message-list.c:668
+#: 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
 msgid "High"
 msgstr "H�j"
 
-#: 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/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
-#: 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:407 mail/message-list.c:666
+#: 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
 msgid "Low"
 msgstr "Lav"
 
 #. 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
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: 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 "Fejl under kommunikation med kalenderserveren"
 
-#: 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 "Kunne ikke l�se pilotens kalender-applikationsblok"
 
-#: 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 "_Prioritet:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke l�se pilotens applikationsblok for opgaveliste"
 
@@ -4564,42 +3382,56 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Eksempel p� Bonobo-kontrol som viser en kalender."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Indstillinger for kalender og opgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution komponent for h�ndtering af kalenderen."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr "Fabrik til Evolution-opgavekontrol."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "Fabrik for kalenderens iTip visningskontrol"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "Fabrik til styring af eksempel-kaldender"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 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:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 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
+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 "Alarm-tjeneste"
@@ -4608,23 +3440,10 @@ 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
-msgid "Evolution Alarm"
-msgstr "Evolution Alarm"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -4647,11 +3466,11 @@ msgstr "Uds�t-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_edig�r aftale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:670
+#: calendar/gui/alarm-notify/alarm-queue.c:675
 msgid "No description available."
 msgstr "Ingen beskrivelse tilg�ngelig."
 
-#: 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"
@@ -4663,11 +3482,17 @@ msgstr ""
 "at sende e-post. Evolution vil vise en normal dialog\n"
 "for p�mindelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:781
-#, c-format
+#: calendar/gui/alarm-notify/alarm-queue.c:753
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Advarsel"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:758
+#, fuzzy, 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"
@@ -4680,7 +3505,12 @@ msgstr ""
 "\n"
 "Er du sikker p�, at du �nsker at k�re dette program?"
 
-#: 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 "Sp�rg mig ikke igen."
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere Gnome"
 
@@ -4692,36 +3522,52 @@ msgstr "Kunne ikke oprette fabrik for alarm-tjenesten"
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke oprette fabrik for alarm-tjenesten"
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Sammendrag indeholder"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Beskrivelse indeholder"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentar indeholder"
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr "Ingen tr�ffere"
+
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%A den %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 ""
@@ -4729,16 +3575,14 @@ msgstr ""
 "ORBit og OAF."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Fortroligt"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Offentlig"
 
@@ -4759,32 +3603,27 @@ msgid "W"
 msgstr "V"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Ledig"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 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:479 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Fuldf�rt"
 
@@ -4800,9 +3639,10 @@ 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/mail-account-gui.c:1485
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
-#: mail/mail-config.glade.h:47
+#: 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
 #: 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
@@ -4817,23 +3657,15 @@ msgstr "Genindtr�ffer"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: 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:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
 msgid "Yes"
 msgstr "Ja"
 
-#: 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:310
 msgid "No"
 msgstr "Nej"
 
-#. 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 "S�ger..."
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Dagvisning"
@@ -4850,63 +3682,79 @@ msgstr "Ugevisning"
 msgid "Month View"
 msgstr "M�nedsvisning"
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
-msgstr "Sammendrag indeholder"
-
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
-msgstr "Beskrivelse indeholder"
-
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "Kommentar indeholder"
-
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1072
-msgid "Unmatched"
-msgstr "Ingen tr�ffere"
-
-#: 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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Mappe som indeholder aftaler og h�ndelser"
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Opgaver"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Mappe som indeholder opgaver"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "Opret en ny aftale"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "Indstillinger for nyhedstjeneste"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "M�de"
+
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "Ny opgave"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "_Opgave"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Ny aftale"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "Ny _aftale"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
-msgstr "Opret en ny opgave"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Ny aftale"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "Ny _opgave"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "Aftale"
+
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Kunne ikke �bne mappen i `%s'"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
+#: 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 "Alternativer for lyd-alarmer"
@@ -5099,7 +3947,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.c:749 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -5107,11 +3955,11 @@ msgstr "Sammendrag:"
 msgid "_Options..."
 msgstr "_Alternativer..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "after"
 msgstr "efter"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "f�r"
 
@@ -5128,7 +3976,7 @@ msgstr "slutning p� aftale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -5169,170 +4017,168 @@ 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
-msgid "Create new appointments with a default _reminder"
-msgstr "Op_ret en ny aftale med standard-p�mindelse"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Dage"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "F�rste dag i u_gen:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Timer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Mandag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Overskredne opga_ver:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "L�rdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-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:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "Vis uge_nummer i datonavigation"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "S�_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:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "S�ndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Op_gaver som skal afsluttes i dag:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "T_or"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "T_ir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Op_gaver som skal afsluttes i dag:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "O_pgaveliste"
 
-#: 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 "Torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Tid"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Tids_zone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Opdeling a_f tid:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: 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 "Tirsdag"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Arbejdsuge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 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:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "_Komprim�r weekender i m�nedsvisning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Vis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Generelt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul udf�rte opgaver efter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Man"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Andre"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Overskredne opga_ver:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "L_�r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "O_pgaveliste"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Opdeling a_f tid:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "f�r aftalen starter"
 
@@ -5400,73 +4246,60 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort �ndringer. Opdater redigering?"
 
-#: 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 " til "
 
-#: 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 " (Fuldf�rt "
 
-#: 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 "Fuldf�rt "
 
-#: 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 " (F�rdig "
 
-#: 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 "F�rdig "
 
-#: calendar/gui/dialogs/comp-editor.c:303
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "Kunne ikke opdatere objektet."
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Redig�r aftale"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalopf�ring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "Overskriv fil?"
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1915
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"En fil med samme navn eksisterer allerede.\n"
-"Overskriv den?"
-
-#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "Gem som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versionsdata!"
 
@@ -5524,7 +4357,7 @@ msgstr "Deleg�r til:"
 msgid "Enter Delegate"
 msgstr "Indtast delegat"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Aftale"
 
@@ -5538,13 +4371,13 @@ msgstr "Genindtr�ffelse"
 
 #: 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:365
 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:366
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "M�de"
 
@@ -5591,7 +4424,7 @@ msgid "Pu_blic"
 msgstr "Of_fentlig"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Vis tid som"
 
@@ -5636,55 +4469,49 @@ msgstr "Deltager"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "Normalt navn"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegeret fra"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegeret til"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Sprog"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Medlem"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:810
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "SU"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Rolle"
 
-#: 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: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"
 msgstr "Status"
 
-#: 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
@@ -5699,7 +4526,7 @@ msgid "_Change Organizer"
 msgstr "�n_dr organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "_Invit�r andre..."
 
@@ -5707,27 +4534,98 @@ msgstr "_Invit�r andre..."
 msgid "_Other Organizer"
 msgstr "Anden _organisator"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Denne aftale har genindtr�ffelser som ikke kan redigeres af Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "p�"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "liste"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "sekund"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Andre"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Nord"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "liste"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Anden fax"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "den"
 
-#: 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 "gentagelser"
 
@@ -5791,17 +4689,23 @@ msgstr "uge(r)"
 msgid "year(s)"
 msgstr "�r"
 
-#: 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 "M�deinformationen er �ndret. Send en opdateret version?"
+
+#: calendar/gui/dialogs/send-comp.c:59
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "M�deinformationen er �ndret. Send en opdateret version?"
 
-#: 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 "Opgaveinformationen er �ndret. Send en opdateret version?"
 
-#: calendar/gui/dialogs/send-comp.c:65
-msgid "The journal entry has changed. Send an updated version?"
-msgstr "Journalopf�ringen er �ndret. Send en opdateret version?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
+msgstr "Opgaveinformationen er �ndret. Send en opdateret version?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
@@ -5818,7 +4722,7 @@ msgid "Progress"
 msgstr "Fremgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:966
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -5830,15 +4734,19 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+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:322
+#: calendar/gui/dialogs/task-editor.c:324
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -5850,180 +4758,154 @@ msgstr "Sta_rt dato:"
 msgid "_Due Date:"
 msgstr "F�r_dig-dato:"
 
-#: calendar/gui/e-calendar-table.c:427
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:428
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:429
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:430
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:431
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:432
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:433
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:434
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:435
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:436
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:437
-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:751 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: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: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
 msgid "_Open"
 msgstr "_�bn"
 
-#: 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:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Gem som..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "S_kriv ud..."
+
+#: calendar/gui/e-calendar-table.c:978 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: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:979 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: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:980 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 "_Inds�t"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Tildel opgave"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Videresend som i_Calendar"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Mark�r som fuldf�rt"
 
-#: calendar/gui/e-calendar-table.c:956
-msgid "_Delete this Task"
-msgstr "Sle_t denne opgave"
-
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_Mark�r opgaver som fuldf�rte"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "Sle_t valgte opgaver"
 
-#: 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:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Klik for at tilf�je en opgave"
 
-#. 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 %Y-%m-%d %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 %H:%M:%S"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Datoen skal skrives ind p� formatet: \n"
-"\n"
-"%s"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Fuldf�rt"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Fuldf�rt dato"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "F�rdig-dato"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Slutdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Geografisk placering"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Opgavesortering"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 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 %Y-%m-%d %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 %H:%M:%S"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Datoen skal skrives ind p� formatet: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -6031,386 +4913,173 @@ msgstr "%02i minutters opdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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
 msgid "am"
 msgstr " "
 
 #. 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
 msgid "pm"
 msgstr " "
 
-#: 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 "Ny _aftale"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Ny aftale som varer h_ele dagen"
 
-#: 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 "M�de"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Ny opgave"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Udskriv..."
+
+#: 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 "G� _til i dag"
 
-#: 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 "_G� til dato..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3430
-msgid "_Delete this Appointment"
-msgstr "Sle_t denne aftale"
+#: 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 "_Udgiv ledig/optaget-information"
+
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
+#, fuzzy
+msgid "_Configure..."
+msgstr "Konfiguration"
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
+msgid "_Save As..."
+msgstr "Gem _som..."
+
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Ops�t _m�de"
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Videresend som i_Calendar"
+
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "G�r denne h�ndelse _flytbar"
 
-#: 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 "Slet denne _h�ndelse"
 
-#: 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 "Slet _alle h�ndelser"
 
-#: calendar/gui/e-itip-control.c:536
-msgid "Meeting begins: <b>"
-msgstr "M�de starter: <b>"
-
-#: calendar/gui/e-itip-control.c:541
-msgid "Task begins: <b>"
-msgstr "Opgave starter: <b>"
-
-#: calendar/gui/e-itip-control.c:546
-msgid "Free/Busy info begins: <b>"
-msgstr "Ledig/optaget-information starter: <b>"
-
-#: calendar/gui/e-itip-control.c:550
-msgid "Begins: <b>"
-msgstr "Starter: <b>"
-
-#: calendar/gui/e-itip-control.c:562
-msgid "Meeting ends: <b>"
-msgstr "M�de slutter: <b>"
-
-#: calendar/gui/e-itip-control.c:565
-msgid "Free/Busy info ends: <b>"
-msgstr "Ledig/optaget-information starter: <b>"
-
-#: calendar/gui/e-itip-control.c:569
-msgid "Ends: <b>"
-msgstr "Slutter: <b>"
-
-#: calendar/gui/e-itip-control.c:583
-msgid "Task Completed: <b>"
-msgstr "Opgave fuldf�rt <b>"
-
-#: calendar/gui/e-itip-control.c:593
-msgid "Task Due: <b>"
-msgstr "Opgave p�begyndes: <b>"
-
-#: calendar/gui/e-itip-control.c:630 calendar/gui/e-itip-control.c:679
-msgid "iCalendar Information"
-msgstr "iCalendar-information"
-
-#. Title
-#: calendar/gui/e-itip-control.c:645
-msgid "iCalendar Error"
-msgstr "iCalendar-fejl"
-
-#: calendar/gui/e-itip-control.c:710 calendar/gui/e-itip-control.c:726
-msgid "An unknown person"
-msgstr "en ukendt afsender"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:733
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
-"<br>Kontroll�r venligst f�lgende information og v�lg s� en handling fra "
-"menuen nedenfor."
-
-#: calendar/gui/e-itip-control.c:749
-msgid "<i>None</i>"
-msgstr "<i>Ingen</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
-msgid "Choose an action:"
-msgstr "V�lg en handling"
-
-#: calendar/gui/e-itip-control.c:791
-msgid "Update"
-msgstr "Opgaveopdatering"
-
-#: 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
-msgid "OK"
-msgstr "O.k."
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Accept"
-msgstr "Godtaget"
-
-#: calendar/gui/e-itip-control.c:808
-msgid "Tentatively accept"
-msgstr "Foresl�et"
-
-#: calendar/gui/e-itip-control.c:809
-msgid "Decline"
-msgstr "Afsl�et"
-
-#: calendar/gui/e-itip-control.c:823
-msgid "Send Free/Busy Information"
-msgstr "Send oplysning om ledig/optaget"
-
-#: calendar/gui/e-itip-control.c:836
-msgid "Update respondent status"
-msgstr "Opdaterer modpartens status"
-
-#: calendar/gui/e-itip-control.c:849
-msgid "Send Latest Information"
-msgstr "Send nyeste oplysninger"
-
-#: calendar/gui/e-itip-control.c:862 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Afbryd"
-
-#: calendar/gui/e-itip-control.c:910
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> har offentliggjort m�deoplysning."
-
-#: calendar/gui/e-itip-control.c:911
-msgid "Meeting Information"
-msgstr "M�deinformation"
-
-#: calendar/gui/e-itip-control.c:915
-#, 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:916
-msgid "Meeting Proposal"
-msgstr "M�deforslag"
-
-#: calendar/gui/e-itip-control.c:920
-#, 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:921
-msgid "Meeting Update"
-msgstr "M�deopdatering"
+"GNOME pilotv�rkt�jerne ser ikke ud til at v�re installeret p� dette system."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, 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:926
-msgid "Meeting Update Request"
-msgstr "Anmodning om m�deopdatering"
+msgid "Error executing %s."
+msgstr "Fejl under k�rsel af %s."
 
-#: 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
+#: 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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:949
-#, 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:950
-msgid "Meeting Reply"
-msgstr "M�desvar"
-
-#: calendar/gui/e-itip-control.c:954
-#, 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:955
-msgid "Meeting Cancellation"
-msgstr "M�deaflysing"
-
-#: calendar/gui/e-itip-control.c:959 calendar/gui/e-itip-control.c:1030
-#: calendar/gui/e-itip-control.c:1065
-#, 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:960
-msgid "Bad Meeting Message"
-msgstr "Ugyldig m�debesked"
-
-#: calendar/gui/e-itip-control.c:980
-#, 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:981
-msgid "Task Information"
-msgstr "Opgaveinformation"
-
-#: calendar/gui/e-itip-control.c:985
-#, 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:986
-msgid "Task Proposal"
-msgstr "Forslag om opgave"
-
-#: calendar/gui/e-itip-control.c:990
-#, 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:991
-msgid "Task Update"
-msgstr "Opgaveopdatering"
-
-#: calendar/gui/e-itip-control.c:995
-#, 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:996
-msgid "Task Update Request"
-msgstr "Anmodning om opgaveopdatering"
-
-#: calendar/gui/e-itip-control.c:1020
-#, 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:1021
-msgid "Task Reply"
-msgstr "Svar p� opgave"
-
-#: calendar/gui/e-itip-control.c:1025
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> har aflyst en opgave."
-
-#: calendar/gui/e-itip-control.c:1026
-msgid "Task Cancellation"
-msgstr "Aflysing af opgave"
-
-#: calendar/gui/e-itip-control.c:1031
-msgid "Bad Task Message"
-msgstr "Ugyldig opgavebesked"
-
-#: calendar/gui/e-itip-control.c:1050
-#, 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:1051
-msgid "Free/Busy Information"
-msgstr "Ugyldig besked om ledig/optaget"
-
-#: calendar/gui/e-itip-control.c:1055
-#, 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:1056
-msgid "Free/Busy Request"
-msgstr "Foresp�rgsel om ledig/optaget"
-
-#: calendar/gui/e-itip-control.c:1060
-#, 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:1061
-msgid "Free/Busy Reply"
-msgstr "Svar p� ledig/optaget"
-
-#: calendar/gui/e-itip-control.c:1066
-msgid "Bad Free/Busy Message"
-msgstr "Ugyldig besked om ledig/optaget"
-
-#: calendar/gui/e-itip-control.c:1139
-msgid "The message does not appear to be properly formed"
-msgstr "Beskeden ser ikke ud til at v�re rigtig udformet"
-
-#: calendar/gui/e-itip-control.c:1158
-msgid "The message contains only unsupported requests."
-msgstr "Denne besked indeholder foresp�rgsler, som ikke er underst�ttet."
-
-#: calendar/gui/e-itip-control.c:1186 calendar/gui/e-itip-control.c:1192
-msgid "The attachment does not contain a valid calendar message"
-msgstr "Bilaget indeholder ikke en gyldig kalender-besked"
-
-#: calendar/gui/e-itip-control.c:1217
-msgid "The attachment has no viewable calendar items"
-msgstr "Bilaget har ingen synlige kalender-elementer"
-
-#: calendar/gui/e-itip-control.c:1316
+#: 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:1318
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Opdatering fuldf�rt\n"
 
-#: calendar/gui/e-itip-control.c:1363
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 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:1371
+#: 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:1373
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Deltagerstatus opdateret\n"
 
-#: calendar/gui/e-itip-control.c:1375
-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:1403
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Fjernelse fuldf�rt"
 
-#: calendar/gui/e-itip-control.c:1422 calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Elementet sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1424 calendar/gui/e-itip-control.c:1476
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:1649
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr "Kunne ikke finde nogen af dine identiteter i deltagerlisten!\n"
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "V�lg mappe"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "V�lg mappe"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -6449,203 +5118,213 @@ msgstr "slut-dato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Form�nd"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1570
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Obligatoriske deltagere"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "Valgfrie deltagere"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "Ikke-deltagere"
 
-#: 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:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Individuel"
 
-#: 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:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Gruppe"
 
-#: 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:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Ressourse"
 
-#: 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:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Rum"
 
-#: 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:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "Formand"
 
-#: 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:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "Obligatorisk deltager"
 
-#: 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:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "Valgfri deltager"
 
-#: 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:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Ikke-deltager"
 
-#: 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:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 msgid "Needs Action"
 msgstr "Beh�ver handling"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:824
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr "Godtaget"
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:825
+#: 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: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:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Foresl�et"
 
-#: 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:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "Delegeret"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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: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:2118 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:436
 msgid "Out of Office"
 msgstr "Ude"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Ingen information"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Tilvalg"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Vis k_un arbejdstid"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "Vis _zoomet ud"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "_Opdat�r ledig/optaget"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Autov�lg"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr "_>>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "_Alle mennesker og ressourser"
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "Alle _mennesker og en ressourse"
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "_Obligatoriske deltagere"
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "Obligatoriske deltagere _og en ressourse"
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "Tid for m�dets _start:"
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Tid for m�dets slutning:"
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�bner lager %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 "Kunne ikke indl�se opgaverne i `%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 "Den n�dvendige metode til indl�sning af `%s' er ikke underst�ttet"
 
-#: calendar/gui/e-week-view.c:3408 calendar/gui/e-week-view.c:3446
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Fuldf�rt dato"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Sletter de valgte objekter"
+
+#: calendar/gui/e-tasks.c:659
+#, fuzzy
+msgid "Expunging"
+msgstr "Fjerner slettede beskeder fra mappe"
+
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Ny _aftale..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "Sle_t denne aftale"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke �bne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1865
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�bner kalender ved %s"
@@ -6706,291 +5385,226 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr "Mindst en deltager er n�dvendig"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "En organisator skal angives."
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-msgid "Event information"
-msgstr "Kalenderinformation"
-
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-msgid "Task information"
-msgstr "Opgaveinformation"
-
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-msgid "Journal information"
-msgstr "Journalinformation"
-
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-msgid "Free/Busy information"
-msgstr "Ledig/optaget-information"
-
-#: calendar/gui/itip-utils.c:321
-msgid "Calendar information"
-msgstr "Kalenderinformation"
-
-#: calendar/gui/itip-utils.c:370
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Ledig/optaget-information (%s til %s)"
-
-#: calendar/gui/itip-utils.c:382
-msgid "iCalendar information"
-msgstr "iCalendar-information"
-
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Du m� v�re en deltager i arrangementet"
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr "Kunne ikke oprette fabrik for komponentredigering"
 
-#: 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 "S�n"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Man"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Tir"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "L�r"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valgt dag (%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 "Valgt uge (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Valgt m�ned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Valgt �r (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Opgave"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Prioritet: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "F�rdige procenter: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Kategorier: %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "Kontakter: "
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Udskriv kalender"
 
-#: 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Forh�ndsvisning af udskrift"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Udskriv element"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Printerops�tning"
 
-#: calendar/gui/tasks-control.c:126
-msgid "The URI of the tasks folder to display"
-msgstr "URIen til opgavemappen, der skal vises"
-
 #: calendar/gui/tasks-control-factory.c:75
 msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
@@ -6998,6 +5612,33 @@ msgstr ""
 "Kunne ikke oprette visningen. Unders�g venligst din konfiguration af ORBit "
 "og OAF."
 
+#: calendar/gui/tasks-control.c:147
+msgid "The URI of the tasks folder to display"
+msgstr "URIen til opgavemappen, der skal vises"
+
+#: 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 ""
+"Denne operation vil fjerne alle beskeder m�rket som slettet permanent. Hvis "
+"du forts�tter vil du ikke kunne genoprette disse beskeder. \n"
+"\n"
+"Vil du virkelig slette disse beskeder?"
+
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+msgid "Do not ask me again."
+msgstr "Sp�rg mig ikke igen."
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Udskriv kort"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -7040,80 +5681,114 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
-#: 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 "Fabrik til import af VCard-filer i Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "Importerer VCard-filer i Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "Importerer VCard-filer i Evolution."
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Kalenderbesked"
+
+#: 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 har fundet Pine e-post filer.\n"
+"Vil du importere dem til Evolution?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Kalender"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "tid-nu forventer 0 argumenter"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time forventer 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 forventer at argument 1 er en streng"
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "argument 1 til make-time skal v�re en dato/tid streng p� ISO 8601 format"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day forventer 2 argumenter"
 
-#: 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 forventer at argument 1 er en 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 forventer at argument 2 er et heltal"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin forventer 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 forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end forventer 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 forventer at argument 1 er af type time_t"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype forventer 0 argumenter"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? forventer 2 argumenter"
 
-#: 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? forventer at argument 1 er af type 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 forventer at argument 2 er af type time_t"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? forventer 2 argumenter"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? forventer at argument 1 er en streng"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? forventer at argument 2 er en streng"
 
-#: calendar/pcs/query.c:691
+#: calendar/pcs/query.c:693
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", "
 "\"description\""
@@ -7121,11 +5796,11 @@ msgstr ""
 "contains? forventer at argument 1 er en af \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? forventer mindst 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)"
@@ -7133,15 +5808,15 @@ msgstr ""
 "has-categories? forventer at alle argumenter er strenger eller �t, og kun "
 "�t, argument er den boolske v�rdi falsk (#f)"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? forventer 0 argumenter"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? forventer 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? forventer at argument 1 er en time_t"
 
@@ -7149,6 +5824,1519 @@ msgstr "completed-before? forventer at argument 1 er en time_t"
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Evaluering af s�geudtrykket gav ikke en boolsk v�rdi"
 
+#.
+#. * 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 "Afrika/Abidjan"
+
+#: calendar/zones.h:8
+msgid "Africa/Accra"
+msgstr "Afrika/Akkra"
+
+#: calendar/zones.h:9
+msgid "Africa/Addis_Ababa"
+msgstr "Afrika/Addis_Abeba"
+
+#: calendar/zones.h:10
+msgid "Africa/Algiers"
+msgstr "Afrika/Algier"
+
+#: calendar/zones.h:11
+msgid "Africa/Asmera"
+msgstr "Afrika/Asmera"
+
+#: calendar/zones.h:12
+msgid "Africa/Bamako"
+msgstr "Afrika/Bamako"
+
+#: calendar/zones.h:13
+msgid "Africa/Bangui"
+msgstr "Afrika/Bangui"
+
+#: calendar/zones.h:14
+msgid "Africa/Banjul"
+msgstr "Afrika/Banjul"
+
+#: calendar/zones.h:15
+msgid "Africa/Bissau"
+msgstr "Afrika/Bissau"
+
+#: calendar/zones.h:16
+msgid "Africa/Blantyre"
+msgstr "Afrika/Blantyre"
+
+#: calendar/zones.h:17
+msgid "Africa/Brazzaville"
+msgstr "Afrika/Brazzaville"
+
+#: calendar/zones.h:18
+msgid "Africa/Bujumbura"
+msgstr "Afrika/Bujumbura"
+
+#: calendar/zones.h:19
+msgid "Africa/Cairo"
+msgstr "Afrika/Kairo"
+
+#: calendar/zones.h:20
+msgid "Africa/Casablanca"
+msgstr "Afrika/Casablanca"
+
+#: calendar/zones.h:21
+msgid "Africa/Ceuta"
+msgstr "Afrika/Ceuta"
+
+#: calendar/zones.h:22
+msgid "Africa/Conakry"
+msgstr "Afrika/Conakry"
+
+#: calendar/zones.h:23
+msgid "Africa/Dakar"
+msgstr "Afrika/Dakar"
+
+#: calendar/zones.h:24
+msgid "Africa/Dar_es_Salaam"
+msgstr "Afrika/Dar_es_salaam"
+
+#: calendar/zones.h:25
+msgid "Africa/Djibouti"
+msgstr "Afrika/Djibouti"
+
+#: calendar/zones.h:26
+msgid "Africa/Douala"
+msgstr "Afrika/Douala"
+
+#: calendar/zones.h:27
+msgid "Africa/El_Aaiun"
+msgstr "Afrika/El_Aaiun"
+
+#: calendar/zones.h:28
+msgid "Africa/Freetown"
+msgstr "Afrika/Freetown"
+
+#: calendar/zones.h:29
+msgid "Africa/Gaborone"
+msgstr "Afrika/Gaborone"
+
+#: calendar/zones.h:30
+msgid "Africa/Harare"
+msgstr "Afrika/Harare"
+
+#: calendar/zones.h:31
+msgid "Africa/Johannesburg"
+msgstr "Afrika/Johannesburg"
+
+#: calendar/zones.h:32
+msgid "Africa/Kampala"
+msgstr "Afrika/Kampala"
+
+#: calendar/zones.h:33
+msgid "Africa/Khartoum"
+msgstr "Afrika/Khartoum"
+
+#: calendar/zones.h:34
+msgid "Africa/Kigali"
+msgstr "Afrika/Kigali"
+
+#: calendar/zones.h:35
+msgid "Africa/Kinshasa"
+msgstr "Afrika/Kinshasa"
+
+#: calendar/zones.h:36
+msgid "Africa/Lagos"
+msgstr "Afrika/Lagos"
+
+#: calendar/zones.h:37
+msgid "Africa/Libreville"
+msgstr "Afrika/Libreville"
+
+#: calendar/zones.h:38
+msgid "Africa/Lome"
+msgstr "Afrika/Lome"
+
+#: calendar/zones.h:39
+msgid "Africa/Luanda"
+msgstr "Afrika/Luanda"
+
+#: calendar/zones.h:40
+msgid "Africa/Lubumbashi"
+msgstr "Afrika/Lubumbashi"
+
+#: calendar/zones.h:41
+msgid "Africa/Lusaka"
+msgstr "Afrika/Lusaka"
+
+#: calendar/zones.h:42
+msgid "Africa/Malabo"
+msgstr "Afrika/Malabo"
+
+#: calendar/zones.h:43
+msgid "Africa/Maputo"
+msgstr "Afrika/Maputo"
+
+#: calendar/zones.h:44
+msgid "Africa/Maseru"
+msgstr "Afrika/Maseru"
+
+#: calendar/zones.h:45
+msgid "Africa/Mbabane"
+msgstr "Afrika/Mbabane"
+
+#: calendar/zones.h:46
+msgid "Africa/Mogadishu"
+msgstr "Afrika/Mogadishu"
+
+#: calendar/zones.h:47
+msgid "Africa/Monrovia"
+msgstr "Afrika/Monrovia"
+
+#: calendar/zones.h:48
+msgid "Africa/Nairobi"
+msgstr "Afrika/Nairobi"
+
+#: calendar/zones.h:49
+msgid "Africa/Ndjamena"
+msgstr "Afrika/Ndjamena"
+
+#: calendar/zones.h:50
+msgid "Africa/Niamey"
+msgstr "Afrika/Niamey"
+
+#: calendar/zones.h:51
+msgid "Africa/Nouakchott"
+msgstr "Afrika/Nouakchott"
+
+#: calendar/zones.h:52
+msgid "Africa/Ouagadougou"
+msgstr "Afrika/Ouagadougou"
+
+#: calendar/zones.h:53
+msgid "Africa/Porto-Novo"
+msgstr "Afrika/Porto-Novo"
+
+#: calendar/zones.h:54
+msgid "Africa/Sao_Tome"
+msgstr "Afrika/Sao_Tome"
+
+#: calendar/zones.h:55
+msgid "Africa/Timbuktu"
+msgstr "Afrika/Timbuktu"
+
+#: calendar/zones.h:56
+msgid "Africa/Tripoli"
+msgstr "Afrika/Tripoli"
+
+#: calendar/zones.h:57
+msgid "Africa/Tunis"
+msgstr "Afrika/Tunis"
+
+#: calendar/zones.h:58
+msgid "Africa/Windhoek"
+msgstr "Afrika/Windhoek"
+
+#: calendar/zones.h:59
+msgid "America/Adak"
+msgstr "Amerika/Adak"
+
+#: calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr "Amerika/Anchorage"
+
+#: calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr "Amerika/Anguilla"
+
+#: calendar/zones.h:62
+msgid "America/Antigua"
+msgstr "Amerika/Antigua"
+
+#: calendar/zones.h:63
+msgid "America/Araguaina"
+msgstr "Amerika/Araguaina"
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr "Amerika/Aruba"
+
+#: calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr "Amerika/Asuncion"
+
+#: calendar/zones.h:66
+msgid "America/Barbados"
+msgstr "Amerika/Barbados"
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr "Amerika/Belem"
+
+#: calendar/zones.h:68
+msgid "America/Belize"
+msgstr "Amerika/Belize"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr "Amerika/Boa_Vista"
+
+#: calendar/zones.h:70
+msgid "America/Bogota"
+msgstr "Amerika/Bogota"
+
+#: calendar/zones.h:71
+msgid "America/Boise"
+msgstr "Amerika/Boise"
+
+#: calendar/zones.h:72
+msgid "America/Buenos_Aires"
+msgstr "Amerika/Buenos_Aires"
+
+#: calendar/zones.h:73
+msgid "America/Cambridge_Bay"
+msgstr "Amerika/Cambridge_Bay"
+
+#: calendar/zones.h:74
+msgid "America/Cancun"
+msgstr "Amerika/Cancun"
+
+#: calendar/zones.h:75
+msgid "America/Caracas"
+msgstr "Amerika/Caracas"
+
+#: calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr "Amerika/Catamarca"
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr "Amerika/Cayenne"
+
+#: calendar/zones.h:78
+msgid "America/Cayman"
+msgstr "Amerika/Cayman"
+
+#: calendar/zones.h:79
+msgid "America/Chicago"
+msgstr "Amerika/Chicago"
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr "Amerika/Chihuahua"
+
+#: calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr "Amerika/Cordoba"
+
+#: calendar/zones.h:82
+msgid "America/Costa_Rica"
+msgstr "Amerika/Costa_Rica"
+
+#: calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr "Amerika/Cuiaba"
+
+#: calendar/zones.h:84
+msgid "America/Curacao"
+msgstr "Amerika/Curacao"
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr "Amerika/Danmarkshavn"
+
+#: calendar/zones.h:86
+msgid "America/Dawson"
+msgstr "Amerika/Dawson"
+
+#: calendar/zones.h:87
+msgid "America/Dawson_Creek"
+msgstr "Amerika/Dawson_Creek"
+
+#: calendar/zones.h:88
+msgid "America/Denver"
+msgstr "Amerika/Denver"
+
+#: calendar/zones.h:89
+msgid "America/Detroit"
+msgstr "Amerika/Detroit"
+
+#: calendar/zones.h:90
+msgid "America/Dominica"
+msgstr "Amerika/Dominika"
+
+#: calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr "Amerika/Edmonton"
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr "Amerika/Eirunepe"
+
+#: calendar/zones.h:93
+msgid "America/El_Salvador"
+msgstr "Amerika/El_Salvador"
+
+#: calendar/zones.h:94
+msgid "America/Fortaleza"
+msgstr "Amerika/Fortaleza"
+
+#: calendar/zones.h:95
+msgid "America/Glace_Bay"
+msgstr "Amerika/Glace_Bay"
+
+#: calendar/zones.h:96
+msgid "America/Godthab"
+msgstr "America/Godth�b"
+
+#: calendar/zones.h:97
+msgid "America/Goose_Bay"
+msgstr "Amerika/Goose_Bay"
+
+#: calendar/zones.h:98
+msgid "America/Grand_Turk"
+msgstr "Amerika/Grand_Turk"
+
+#: calendar/zones.h:99
+msgid "America/Grenada"
+msgstr "Amerika/Grenada"
+
+#: calendar/zones.h:100
+msgid "America/Guadeloupe"
+msgstr "Amerika/Guadeloupe"
+
+#: calendar/zones.h:101
+msgid "America/Guatemala"
+msgstr "Amerika/Guatemala"
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr "Amerika/Guayaquil"
+
+#: calendar/zones.h:103
+msgid "America/Guyana"
+msgstr "Amerika/Guyana"
+
+#: calendar/zones.h:104
+msgid "America/Halifax"
+msgstr "Amerika/Halifax"
+
+#: calendar/zones.h:105
+msgid "America/Havana"
+msgstr "Amerika/Havana"
+
+#: calendar/zones.h:106
+msgid "America/Hermosillo"
+msgstr "Amerika/Hermosillo"
+
+#: calendar/zones.h:107
+msgid "America/Indiana/Indianapolis"
+msgstr "Amerika/Indiana/Indianapolis"
+
+#: calendar/zones.h:108
+msgid "America/Indiana/Knox"
+msgstr "Amerika/Indiana/Knox"
+
+#: calendar/zones.h:109
+msgid "America/Indiana/Marengo"
+msgstr "Amerika/Indiana/Marengo"
+
+#: calendar/zones.h:110
+msgid "America/Indiana/Vevay"
+msgstr "Amerika/Indiana/Vevay"
+
+#: calendar/zones.h:111
+msgid "America/Indianapolis"
+msgstr "Amerika/Indianapolis"
+
+#: calendar/zones.h:112
+msgid "America/Inuvik"
+msgstr "Amerika/Inuvik"
+
+#: calendar/zones.h:113
+msgid "America/Iqaluit"
+msgstr "Amerika/Iqaluit"
+
+#: calendar/zones.h:114
+msgid "America/Jamaica"
+msgstr "Amerika/Jamaica"
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr "Amerika/Jujuy"
+
+#: calendar/zones.h:116
+msgid "America/Juneau"
+msgstr "Amerika/Juneau"
+
+#: calendar/zones.h:117
+msgid "America/Kentucky/Louisville"
+msgstr "Amerika/Kentucky/Louisville"
+
+#: calendar/zones.h:118
+msgid "America/Kentucky/Monticello"
+msgstr "Amerika/Kentucky/Monticello"
+
+#: calendar/zones.h:119
+msgid "America/La_Paz"
+msgstr "Amerika/La_Paz"
+
+#: calendar/zones.h:120
+msgid "America/Lima"
+msgstr "Amerika/Lima"
+
+#: calendar/zones.h:121
+msgid "America/Los_Angeles"
+msgstr "Amerika/Los_Angeles"
+
+#: calendar/zones.h:122
+msgid "America/Louisville"
+msgstr "Amerika/Louisville"
+
+#: calendar/zones.h:123
+msgid "America/Maceio"
+msgstr "Amerika/Maceio"
+
+#: calendar/zones.h:124
+msgid "America/Managua"
+msgstr "Amerika/Managua"
+
+#: calendar/zones.h:125
+msgid "America/Manaus"
+msgstr "Amerika/Manaus"
+
+#: calendar/zones.h:126
+msgid "America/Martinique"
+msgstr "Amerika/Martinique"
+
+#: calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr "Amerika/Mazatlan"
+
+#: calendar/zones.h:128
+msgid "America/Mendoza"
+msgstr "Amerika/Mendoza"
+
+#: calendar/zones.h:129
+msgid "America/Menominee"
+msgstr "Amerika/Menominee"
+
+#: calendar/zones.h:130
+msgid "America/Merida"
+msgstr "Amerika/Merida"
+
+#: calendar/zones.h:131
+msgid "America/Mexico_City"
+msgstr "Amerika/Mexico_City"
+
+#: calendar/zones.h:132
+msgid "America/Miquelon"
+msgstr "America/Miquelon"
+
+#: calendar/zones.h:133
+msgid "America/Monterrey"
+msgstr "Amerika/Monterrey"
+
+#: calendar/zones.h:134
+msgid "America/Montevideo"
+msgstr "Amerika/Montevideo"
+
+#: calendar/zones.h:135
+msgid "America/Montreal"
+msgstr "Amerika/Montr�al"
+
+#: calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr "Amerika/Montserrat"
+
+#: calendar/zones.h:137
+msgid "America/Nassau"
+msgstr "Amerika/Nassau"
+
+#: calendar/zones.h:138
+msgid "America/New_York"
+msgstr "Amerika/New_York"
+
+#: calendar/zones.h:139
+msgid "America/Nipigon"
+msgstr "Amerika/Nipigon"
+
+#: calendar/zones.h:140
+msgid "America/Nome"
+msgstr "Amerika/Nome"
+
+#: calendar/zones.h:141
+msgid "America/Noronha"
+msgstr "Amerika/Noronha"
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr "Amerika/North_Dakota/Center"
+
+#: calendar/zones.h:143
+msgid "America/Panama"
+msgstr "Amerika/Panama"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr "Amerika/Pangnirtung"
+
+#: calendar/zones.h:145
+msgid "America/Paramaribo"
+msgstr "Amerika/Paramaribo"
+
+#: calendar/zones.h:146
+msgid "America/Phoenix"
+msgstr "Amerika/Phoenix"
+
+#: calendar/zones.h:147
+msgid "America/Port-au-Prince"
+msgstr "Amerika/Port-au-Prince"
+
+#: calendar/zones.h:148
+msgid "America/Port_of_Spain"
+msgstr "Amerika/Port_of_Spain"
+
+#: calendar/zones.h:149
+msgid "America/Porto_Velho"
+msgstr "Amerika/Porto_Velho"
+
+#: calendar/zones.h:150
+msgid "America/Puerto_Rico"
+msgstr "Amerika/Puerto_Rico"
+
+#: calendar/zones.h:151
+msgid "America/Rainy_River"
+msgstr "Amerika/Rainy_River"
+
+#: calendar/zones.h:152
+msgid "America/Rankin_Inlet"
+msgstr "Amerika/Rankin_Inlet"
+
+#: calendar/zones.h:153
+msgid "America/Recife"
+msgstr "Amerika/Recife"
+
+#: calendar/zones.h:154
+msgid "America/Regina"
+msgstr "Amerika/Regina"
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr "Amerika/Rio_Branco"
+
+#: calendar/zones.h:156
+msgid "America/Rosario"
+msgstr "Amerika/Rosario"
+
+#: calendar/zones.h:157
+msgid "America/Santiago"
+msgstr "Amerika/Santiago"
+
+#: calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr "Amerika/Santo_Domingo"
+
+#: calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr "Amerika/Sao_Paulo"
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr "Amerika/Scoresbysund"
+
+#: calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr "Amerika/Shiprock"
+
+#: calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr "Amerika/St_Johns"
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr "Amerika/St_Kitts"
+
+#: calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr "Amerika/St_Lucia"
+
+#: calendar/zones.h:165
+msgid "America/St_Thomas"
+msgstr "Amerika/St_Thomas"
+
+#: calendar/zones.h:166
+msgid "America/St_Vincent"
+msgstr "Amerika/St_Vincent"
+
+#: calendar/zones.h:167
+msgid "America/Swift_Current"
+msgstr "Amerika/Swift_Current"
+
+#: calendar/zones.h:168
+msgid "America/Tegucigalpa"
+msgstr "Amerika/Tegucigalpa"
+
+#: calendar/zones.h:169
+msgid "America/Thule"
+msgstr "Amerika/Thule"
+
+#: calendar/zones.h:170
+msgid "America/Thunder_Bay"
+msgstr "Amerika/Thunder_Bay"
+
+#: calendar/zones.h:171
+msgid "America/Tijuana"
+msgstr "Amerika/Tijuana"
+
+#: calendar/zones.h:172
+msgid "America/Tortola"
+msgstr "Amerika/Tortola"
+
+#: calendar/zones.h:173
+msgid "America/Vancouver"
+msgstr "Amerika/Vancouver"
+
+#: calendar/zones.h:174
+msgid "America/Whitehorse"
+msgstr "Amerika/Whitehorse"
+
+#: calendar/zones.h:175
+msgid "America/Winnipeg"
+msgstr "Amerika/Winnipeg"
+
+#: calendar/zones.h:176
+msgid "America/Yakutat"
+msgstr "Amerika/Yakutat"
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr "Amerika/Yellowknife"
+
+#: calendar/zones.h:178
+msgid "Antarctica/Casey"
+msgstr "Antarktis/Casey"
+
+#: calendar/zones.h:179
+msgid "Antarctica/Davis"
+msgstr "Antarktis/Davis"
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr "Antarktis/DumontDUrville"
+
+#: calendar/zones.h:181
+msgid "Antarctica/Mawson"
+msgstr "Antarktis/Mawson"
+
+#: calendar/zones.h:182
+msgid "Antarctica/McMurdo"
+msgstr "Antarktis/McMurdo"
+
+#: calendar/zones.h:183
+msgid "Antarctica/Palmer"
+msgstr "Antarktis/Palmer"
+
+#: calendar/zones.h:184
+msgid "Antarctica/South_Pole"
+msgstr "Antarktis/Sydpolen"
+
+#: calendar/zones.h:185
+msgid "Antarctica/Syowa"
+msgstr "Antarktis/Syowa"
+
+#: calendar/zones.h:186
+msgid "Antarctica/Vostok"
+msgstr "Antarktis/Vostok"
+
+#: calendar/zones.h:187
+msgid "Arctic/Longyearbyen"
+msgstr "Arktis/Longyearbyen"
+
+#: calendar/zones.h:188
+msgid "Asia/Aden"
+msgstr "Asien/Aden"
+
+#: calendar/zones.h:189
+msgid "Asia/Almaty"
+msgstr "Asien/Almaty"
+
+#: calendar/zones.h:190
+msgid "Asia/Amman"
+msgstr "Asien/Amman"
+
+#: calendar/zones.h:191
+msgid "Asia/Anadyr"
+msgstr "Asien/Anadyr"
+
+#: calendar/zones.h:192
+msgid "Asia/Aqtau"
+msgstr "Asien/Aqtau"
+
+#: calendar/zones.h:193
+msgid "Asia/Aqtobe"
+msgstr "Asien/Aqtobe"
+
+#: calendar/zones.h:194
+msgid "Asia/Ashgabat"
+msgstr "Asien/Ashgabat"
+
+#: calendar/zones.h:195
+msgid "Asia/Baghdad"
+msgstr "Asien/Bagdad"
+
+#: calendar/zones.h:196
+msgid "Asia/Bahrain"
+msgstr "Asien/Bahrain"
+
+#: calendar/zones.h:197
+msgid "Asia/Baku"
+msgstr "Asien/Bakuc"
+
+#: calendar/zones.h:198
+msgid "Asia/Bangkok"
+msgstr "Asien/Bangkok"
+
+#: calendar/zones.h:199
+msgid "Asia/Beirut"
+msgstr "Asien/Beirut"
+
+#: calendar/zones.h:200
+msgid "Asia/Bishkek"
+msgstr "Asien/Bishkek"
+
+#: calendar/zones.h:201
+msgid "Asia/Brunei"
+msgstr "Asien/Brunei"
+
+#: calendar/zones.h:202
+msgid "Asia/Calcutta"
+msgstr "Asien/Calcutta"
+
+#: calendar/zones.h:203
+msgid "Asia/Choibalsan"
+msgstr "Asien/Choibalsan"
+
+#: calendar/zones.h:204
+msgid "Asia/Chongqing"
+msgstr "Asien Chongqing"
+
+#: calendar/zones.h:205
+msgid "Asia/Colombo"
+msgstr "Asien/Colombo"
+
+#: calendar/zones.h:206
+msgid "Asia/Damascus"
+msgstr "Asien/Damaskus"
+
+#: calendar/zones.h:207
+msgid "Asia/Dhaka"
+msgstr "Asien/Dhaka"
+
+#: calendar/zones.h:208
+msgid "Asia/Dili"
+msgstr "Asien/Dili"
+
+#: calendar/zones.h:209
+msgid "Asia/Dubai"
+msgstr "Asien/Dubai"
+
+#: calendar/zones.h:210
+msgid "Asia/Dushanbe"
+msgstr "Asien/Dushanbe"
+
+#: calendar/zones.h:211
+msgid "Asia/Gaza"
+msgstr "Asien/Gaza"
+
+#: calendar/zones.h:212
+msgid "Asia/Harbin"
+msgstr "Asien/Harbin"
+
+#: calendar/zones.h:213
+msgid "Asia/Hong_Kong"
+msgstr "Asien/Hong_Kong"
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr "Asien/Hovd"
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr "Asien/Irkutsk"
+
+#: calendar/zones.h:216
+msgid "Asia/Istanbul"
+msgstr "Asien/Istanbul"
+
+#: calendar/zones.h:217
+msgid "Asia/Jakarta"
+msgstr "Asien/Jakarta"
+
+#: calendar/zones.h:218
+msgid "Asia/Jayapura"
+msgstr "Asien/Jayapura"
+
+#: calendar/zones.h:219
+msgid "Asia/Jerusalem"
+msgstr "Asien/Jerusalem"
+
+#: calendar/zones.h:220
+msgid "Asia/Kabul"
+msgstr "Asien/Kabul"
+
+#: calendar/zones.h:221
+msgid "Asia/Kamchatka"
+msgstr "Asien/Kamchatka"
+
+#: calendar/zones.h:222
+msgid "Asia/Karachi"
+msgstr "Asien/Karachi"
+
+#: calendar/zones.h:223
+msgid "Asia/Kashgar"
+msgstr "Asien/Kashgar"
+
+#: calendar/zones.h:224
+msgid "Asia/Katmandu"
+msgstr "Asien/Katmandu"
+
+#: calendar/zones.h:225
+msgid "Asia/Krasnoyarsk"
+msgstr "Asien/Krasnoyarsk"
+
+#: calendar/zones.h:226
+msgid "Asia/Kuala_Lumpur"
+msgstr "Asien/Kuala_Lumpur"
+
+#: calendar/zones.h:227
+msgid "Asia/Kuching"
+msgstr "Asien/Kuching"
+
+#: calendar/zones.h:228
+msgid "Asia/Kuwait"
+msgstr "Asien/Kuwait"
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr "Asien/Macao"
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr "Asien/Magadan"
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr "Asien/Manila"
+
+#: calendar/zones.h:232
+msgid "Asia/Muscat"
+msgstr "Asien/Muscat"
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr "Asien/Nicosia"
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr "Asien/Novosibirsk"
+
+#: calendar/zones.h:235
+msgid "Asia/Omsk"
+msgstr "Asien/Omsk"
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr "Asien/Phnom_Penh"
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr "Asien/Pontianak"
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr "Asien/Pyongyang"
+
+#: calendar/zones.h:239
+msgid "Asia/Qatar"
+msgstr "Asien/Qatar"
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr "Asien/Rangoon"
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr "Asien/Riyadh"
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr "Asien/Saigon"
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr "Asien/Sakhalin"
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr "Asien/Samarkand"
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr "Asien/Seoul"
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr "Asien/Shanghai"
+
+#: calendar/zones.h:247
+msgid "Asia/Singapore"
+msgstr "Asien/Singapore"
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr "Asien/Taipei"
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr "Asien/Tashkent"
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr "Asien/Tbilisi"
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr "Asien/Teheran"
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr "Asien/Thimphu"
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr "Asien/Tokyo"
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr "Asien/Ujung_Pandang"
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr "Asien/Ulaanbaatar"
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr "Asien/Urumqi"
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr "Asien/Vientiane"
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr "Asien/Vladivostok"
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr "Asien/Jakutsk"
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr "Asien/Jekaterinburg"
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr "Asien/Jerevan"
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr "Atlanten/Azorene"
+
+#: calendar/zones.h:263
+msgid "Atlantic/Bermuda"
+msgstr "Atlanten/Bermuda"
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr "Atlanteren/De canariske �er"
+
+#: calendar/zones.h:265
+msgid "Atlantic/Cape_Verde"
+msgstr "Atlanten/Kap_Verde"
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr "Atlanten/F�r�erne"
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr "Atlanten/Jan_Mayen"
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr "Atlanten/Madeira"
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr "Atlanten/Reykjav�k"
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr "Atlanten/Syd-Georgia"
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr "Atlanten/St_Helena"
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr "Atlanten/Stanley"
+
+#: calendar/zones.h:273
+msgid "Australia/Adelaide"
+msgstr "Australien/Adelaide"
+
+#: calendar/zones.h:274
+msgid "Australia/Brisbane"
+msgstr "Australien/Brisbane"
+
+#: calendar/zones.h:275
+msgid "Australia/Broken_Hill"
+msgstr "Australien/Broken_Hill"
+
+#: calendar/zones.h:276
+msgid "Australia/Darwin"
+msgstr "Australien/Darwin"
+
+#: calendar/zones.h:277
+msgid "Australia/Hobart"
+msgstr "Australien/Hobart"
+
+#: calendar/zones.h:278
+msgid "Australia/Lindeman"
+msgstr "Australien/Lindeman"
+
+#: calendar/zones.h:279
+msgid "Australia/Lord_Howe"
+msgstr "Australien/Lord_Howe"
+
+#: calendar/zones.h:280
+msgid "Australia/Melbourne"
+msgstr "Australien/Melbourne"
+
+#: calendar/zones.h:281
+msgid "Australia/Perth"
+msgstr "Australien/Perth"
+
+#: calendar/zones.h:282
+msgid "Australia/Sydney"
+msgstr "Australien/Sydney"
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr "Europa/Amsterdam"
+
+#: calendar/zones.h:284
+msgid "Europe/Andorra"
+msgstr "Europa/Andorra"
+
+#: calendar/zones.h:285
+msgid "Europe/Athens"
+msgstr "Europa/Athen"
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr "Europa/Belfast"
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr "Europa/Beograd"
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr "Europa/Berlin"
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr "Europa/Bratislava"
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr "Europa/Bryssel"
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr "Europa/Bukarest"
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr "Europa/Budapest"
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr "Europa/Chisinau"
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr "Europa/K�benhavn"
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr "Europa/Dublin"
+
+#: calendar/zones.h:296
+msgid "Europe/Gibraltar"
+msgstr "Europa/Gibraltar"
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr "Europa/Helsinki"
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr "Europa/Istanbul"
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr "Europa/Kaliningrad"
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr "Europa/Kiev"
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr "Europa/Lisboa"
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr "Europa/Ljubljana"
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr "Europa/London"
+
+#: calendar/zones.h:304
+msgid "Europe/Luxembourg"
+msgstr "Europa/Luxembourg"
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr "Europa/Madrid"
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr "Europa/Malta"
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr "Europa/Minsk"
+
+#: calendar/zones.h:308
+msgid "Europe/Monaco"
+msgstr "Europa/Monaco"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr "Europa/Moskva"
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr "Europa/Nicosia"
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr "Europa/Oslo"
+
+#: calendar/zones.h:312
+msgid "Europe/Paris"
+msgstr "Europa/Paris"
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr "Europa/Prag"
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr "Europa/Riga"
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr "Europa/Rom"
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr "Europa/Samara"
+
+#: calendar/zones.h:317
+msgid "Europe/San_Marino"
+msgstr "Europa/San_Marino"
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr "Europa/Sarajevo"
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr "Europa/Simferopol"
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr "Europa/Skopje"
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr "Europa/Sofia"
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr "Europa/Stockholm"
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr "Europa/Tallinn"
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr "Europa/Tirane"
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr "Europa/Uzhgorod"
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr "Europa/Vaduz"
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr "Europa/Vatikanet"
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr "Europa/Wien"
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr "Europa/Vilnius"
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr "Europa/Warszawa"
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr "Europa/Zagreb"
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr "Europa/Zaporozhye"
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr "Europa/Z�rich"
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr "Indiske hav/Antananarivo"
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr "Indiske hav/Chagos"
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr "Indiske hav/Jule�en"
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr "Indiske hav/Cocos"
+
+#: calendar/zones.h:338
+msgid "Indian/Comoro"
+msgstr "Indiske hav/Comorerne"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr "Indiske hav/Kerguelen"
+
+#: calendar/zones.h:340
+msgid "Indian/Mahe"
+msgstr "Indiske hav/Mahe"
+
+#: calendar/zones.h:341
+msgid "Indian/Maldives"
+msgstr "Indiske hav/Maldiverne"
+
+#: calendar/zones.h:342
+msgid "Indian/Mauritius"
+msgstr "Indiske hav/Mauritius"
+
+#: calendar/zones.h:343
+msgid "Indian/Mayotte"
+msgstr "Indiske hav/Mayotte"
+
+#: calendar/zones.h:344
+msgid "Indian/Reunion"
+msgstr "Indiske hav/Reunion"
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr "Stillehavet/Apia"
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr "Stillehavet/Auckland"
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr "Stillehavet/Chatham"
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr "Stillehavet/P�ske�en"
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr "Stillehavet/Efate"
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr "Stillehavet/Enderbury"
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr "Stillehavet/Fakaofo"
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr "Stillehavet/Fiji�erne"
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr "Stillehavet/Funafuti"
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr "Stillehavet/Galapagos"
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr "Stillehavet/Gambier"
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr "Stillehavet/Guadalcanal"
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr "Stillehavet/Guam"
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr "Stillehavet/Honolulu"
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr "Stillehavet/Johnston"
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr "Stillehavet/Kiritimati"
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr "Stillehavet/Kosrae"
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr "Stillehavet/Kwajalein"
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr "Stillehavet/Majuro"
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr "Stillehavet/Marquesas"
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr "Stillehavet/Midway"
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr "Stillehavet/Nauru"
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr "Stillehavet/Niue"
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr "Stillehavet/Norfolk"
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr "Stillehavet/Noumea"
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr "Stillehavet/Pago_Pago"
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr "Stillehavet/Palau"
+
+#: calendar/zones.h:372
+msgid "Pacific/Pitcairn"
+msgstr "Stillehavet/Pitcairn"
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr "Stillehavet/Ponape"
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr "Stillehavet/Port_Moresby"
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr "Stillehavet/Rarotonga"
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr "Stillehavet/Saipan"
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr "Stillehavet/Tahiti"
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr "Stillehavet/Tarawa"
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr "Stillehavet/Tongatapu"
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr "Stillehavet/Truk"
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr "Stillehavet/Wake"
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr "Stillehavet/Wallis"
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr "Stillehavet/Yap"
+
 #: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
 msgstr "Signering er ikke underst�ttet af dette cipher"
@@ -7169,6 +7357,18 @@ msgstr "Kryptering er ikke underst�ttet af dette cipher"
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke underst�ttet af dette cipher"
 
+#: camel/camel-data-cache.c:169
+#, fuzzy
+msgid "Unable to create cache path"
+msgstr ""
+"Kunne ikke oprette uddatafil: %s\n"
+" %s"
+
+#: camel/camel-data-cache.c:441
+#, fuzzy, c-format
+msgid "Could not remove cache entry: %s: %s"
+msgstr "Kan ikke �bne cache-katalog: %s"
+
 #: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
@@ -7199,81 +7399,66 @@ msgstr "Resynkroniserer med server"
 msgid "You must be working online to complete this operation"
 msgstr "Du skal arbejde opkoblet for at fuldf�re denne operation"
 
-#: 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 "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, 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
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Fejl under k�rsel af filter: %s: %s"
+
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke �bne spool-mappen"
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Kan ikke behandle spool-mappen"
 
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Henter besked %d (%d%%)"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Kan ikke �bne besked"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Mislykkedes p� besked %d"
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mislykkedes p� besked %d af %d"
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Fejl under l�sning af filter: %s: %s"
-
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Fejl under k�rsel af filter: %s: %s"
+#: camel/camel-filter-search.c:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "Kunne ikke afkode besked."
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fejl under udf�relse af filters�gning: %s: %s"
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Uunderst�ttet operation: till�g besked: for %s"
-
-#: camel/camel-folder.c:1040
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Uunderst�ttet operation: s�g efter udtryk: efter %s"
-
-#: camel/camel-folder.c:1080
-#, 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:1262
-msgid "Moving messages"
-msgstr "Flytter beskeder"
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -7282,7 +7467,7 @@ msgstr ""
 "Kan ikke tolke s�geudtrykket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -7291,18 +7476,33 @@ msgstr ""
 "Fejl under k�rsel af s�geudtrykket %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) kr�ver et enkelt boolsk resultat"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Udf�rer foresp�rgsel p� ukendt header: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Ugyldig type i krop-indeholder, forventer streng"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Uunderst�ttet operation: till�g besked: for %s"
+
+#: camel/camel-folder.c:1038
+#, 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
+#, 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
+msgid "Moving messages"
+msgstr "Flytter beskeder"
 
 #: camel/camel-lock-client.c:111
 #, c-format
@@ -7409,128 +7609,125 @@ msgstr "Indtast venligst din %s adgangsfrase for %s"
 msgid "Please enter your %s passphrase"
 msgstr "Indtast venligst din %s adgangsfrase"
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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 ikke signere denne besked: kunne ikke oprette kanal til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:755
+#: 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:953
+#: 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:959
+#: camel/camel-pgp-context.c:993
 #, c-format
 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"
 
-#: camel/camel-pgp-context.c:970
+#: 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:1143
+#: 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:1153
+#: 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:1160
+#: 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:1169
+#: 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:1337
+#: 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:1345
+#: 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:1352
+#: 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:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt underskrevet brevdel"
 
-#: camel/camel-pgp-mime.c:485
-msgid "This is an encrypted message part"
-msgstr "Dette er en krypteret brevdel"
-
-#: 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 ""
 "Kunne ikke indl�se %s: Modulindl�sning er ikke underst�ttet p� dette system."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikke indl�se %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 "Kunne ikke indl�se %s: Ingen initieringskode i modulet."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s-server %s"
 
-#: camel/camel-remote-store.c:207
+#: 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:264
+#: 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:267
-#: camel/providers/smtp/camel-smtp-transport.c:273
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(ukendt v�rt)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "Operation afbrudt"
 
-#: camel/camel-remote-store.c:484
+#: 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"
@@ -7643,13 +7840,14 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Ugyldigt svar p� autenticering fra server."
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
-msgstr "NT-indlogning"
+#, 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."
@@ -7659,9 +7857,21 @@ msgstr "Dette valg vil koble til serveren ved brug af en simpel adgangskode."
 msgid "Unknown authentication state."
 msgstr "Ukendt godkendelsestilstand."
 
+#: 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 ""
+"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:301
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: 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"
 
@@ -7705,26 +7915,41 @@ msgstr "URL '%s' skal indeholde et v�rtsnavn"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' skal indeholde en sti"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Finder: \"%s\""
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fejl i navneopslag: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "V�rtsopslag mislykkedes: %s: v�rt ikke fundet"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "V�rtsopslag mislykkedes: %s: ukendt �rsag"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Finder: \"%s\""
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "V�rtsopslag mislykkedes: %s: v�rt ikke fundet"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "V�rtsopslag mislykkedes: %s: ukendt �rsag"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "E-post-udbyder for virtuelle mapper"
@@ -7733,12 +7958,12 @@ msgstr "E-post-udbyder for virtuelle mapper"
 msgid "For reading mail as a query of another set of folders"
 msgstr "For l�sning af e-post som en foresp�rgsel p� et andet s�t mapper"
 
-#: 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 "Ingen udbyder tilg�ngelig for protokol `%s'"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7784,35 +8009,22 @@ msgstr "Kunne ikke afkode besked."
 msgid "Failed to verify certificates."
 msgstr "Fejl under verificering af certifikater."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finde mappe: Ugyldig operation p� dette lager"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke oprette mappe: Ugyldig operation p� dette lager"
 
-#: 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 ""
-"E-post: %s\n"
-"Adresseringsnavn: %s\n"
-"Organisationsenhed: %s\n"
-"Organisation: %s\n"
-"Lokalitet: %s\n"
-"Stat: %s\n"
-"Land: %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"
@@ -7827,6 +8039,41 @@ msgstr ""
 "\n"
 "Vil du acceptere alligevel?"
 
+#. 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
+#, c-format
+msgid ""
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, fuzzy, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
+msgstr ""
+"Ugyldig certifikat fra %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Vil du acceptere alligevel?"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -7837,27 +8084,27 @@ msgstr "Kunne ikke tolke URL `%s'"
 msgid "No such message %s in %s"
 msgstr "Ingen s�dan besked %s i %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Ingen s�dan besked: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen s�dan mappe"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke �ndre navn p� mappe: %s: Ugyldig operation"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke �ndre navn p� mappe: %s: Ingen s�dan mappe"
@@ -7866,76 +8113,76 @@ msgstr "Kan ikke �ndre navn p� mappe: %s: Ingen s�dan mappe"
 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:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr "Svar fra server blev afsluttet for tidligt."
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, 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:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, 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:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke indl�se sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "S�ger efter �ndrede beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1585
-#: camel/providers/imap/camel-imap-folder.c:2028
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Denne besked er ikke tilg�ngelig"
 
-#: camel/providers/imap/camel-imap-folder.c:1740
-#: camel/providers/imap/camel-imap-folder.c:1821
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformation for nye beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1746
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "S�ger efter nye beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:2065
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedens indhold i FETCH-svar."
 
-#: 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 "Kan ikke �bne cache-katalog: %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 "Fejl under mellemlagring af besked %s: %s"
@@ -7948,7 +8195,7 @@ msgstr "Ser efter nye beskeder"
 msgid "Check for new messages in all folders"
 msgstr "Se efter nye beskeder i alle mapper"
 
-#: 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 "Mapper"
 
@@ -7982,28 +8229,28 @@ msgstr ""
 "Dette valg vil lade dig koble til en IMAP-server ved at bruge en "
 "klartekst-adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:389
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen underst�tte for autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8014,102 +8261,121 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ophavsmappen tillades ikke at have undermapper"
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "E-postkataloger i MH-format"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 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:52
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Lokale levering"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:62
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "E-postmapper i \"Maildir\" format"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 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:80
+#: 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:81
+#: camel/providers/local/camel-local-provider.c:101
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 "For l�sning og lagring af lokal e-post i standard mbox \"spool\"-filer."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrod %s er ikke en absolut sti"
 
-#: 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 "Lagerrod %s er ikke et normalt katalog"
 
-#: 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 "Finder ikke mappe: %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 "Lokalt lager har ikke en indbakke"
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke �ndre navn p� mappe %s til %s: %s"
 
-#: camel/providers/local/camel-local-store.c:374
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Kunne ikke �ndre navn p� mappe: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kunne ikke slette sammendragsfil for mappe `%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 "Kunne ikke slette indeksfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Kunne ikke gemme sammendrag: %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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke tilf�je besked i sammendraget: ukendt grund"
 
@@ -8129,7 +8395,7 @@ msgstr "Kan ikke tilf�je besked i maildir mappe: %s: %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8141,7 +8407,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "Ingen s�dan besked"
 
@@ -8150,7 +8416,7 @@ msgstr "Ingen s�dan besked"
 msgid "Invalid message contents"
 msgstr "Ugyldig beskedsindhold"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8160,14 +8426,14 @@ msgstr ""
 "Kan ikke �bne mappe `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8177,41 +8443,64 @@ msgstr ""
 "Kunne ikke oprette mappe `%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' er ikke en maildir katalog."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "ikke et maildir katalog"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikke s�ge i mappe `%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 "Kan ikke �bne maildir katalogsti: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Ser efter nye beskeder"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "Gemmer mappe"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke �bne postboks: %s: %s\n"
@@ -8228,9 +8517,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8240,16 +8529,16 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 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:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbygning af besked mislykkedes: Beskadiget postboks?"
 
-#: 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"
@@ -8258,7 +8547,7 @@ msgstr ""
 "Kunne ikke �bne fil `%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"
@@ -8267,14 +8556,14 @@ msgstr ""
 "Kunne ikke oprette fil '%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' er ikke en normal fil."
 
-#: 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"
@@ -8283,96 +8572,85 @@ msgstr ""
 "Kunne ikke slette mappen `%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 "Mappen `%s' er ikke tom. Ikke slettet."
 
-#. 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 "Gemmer mappe"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunne ikke �bne mappe %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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikke tjekke mappe: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunne ikke �bne fil %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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke �bne midlertidig postboks: %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
+#: 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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke �ndre navn p� mappe: %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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukendt fejl: %s"
@@ -8391,12 +8669,12 @@ msgstr "Kan ikke tilf�je besked i mh-mappe: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' er ikke et katalog."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, 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:512
+#: 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"
@@ -8407,6 +8685,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen `%s/%s' eksisterer ikke."
@@ -8416,29 +8695,31 @@ msgstr "Mappen `%s/%s' eksisterer ikke."
 msgid "Spool mail file %s"
 msgstr "Spool e-post-fil %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mapper kan ikke omd�bes"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmapper kan ikke blive slettet"
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8447,47 +8728,24 @@ 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:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "Kunne ikke gemme: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Indtast venligst NNTP-adgangskode for %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Serveren godtog ikke brugernavn"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Fejl under sending af brugernavn til server"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Serveren godtog ikke brugernavn/adgangskode"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Besked %s ikke fundet."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Kunne ikke hente gruppeliste fra serveren."
+#: 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/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 "Kunne ikke indl�se gruppelistefil for %s: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Kunne ikke gemme gruppelistefil for %s: %s"
+#: 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"
@@ -8499,17 +8757,12 @@ msgstr ""
 "Dette er en udbyder for l�sning af og postning af indl�g til USENET "
 "nyhedsgrupper."
 
-#: camel/providers/nntp/camel-nntp-store.c:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Kunne ikke �bne katalog for nyheds-server: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET Nyheder via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8517,71 +8770,112 @@ msgstr ""
 "Dette alternativ vil autenticere mod NNTP-serveren ved brug af klartekst "
 "adgangskode."
 
-#: 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 "Kunne ikke �bne eller oprette .newsrc-fil for %s: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Mappen %s eksisterer ikke"
+
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "Kunne ikke oprette kanal: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "IMAP-kommando mislykkedes: %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 "S�ger efter nye beskeder"
+
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "Ukendt fejl: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:566
+#, fuzzy
+msgid "Use cancel"
+msgstr "Afbryd"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "Operation afbrudt"
+
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Henter POP-sammendrag"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "Kunne ikke tjekke POP-server efter nye beskeder: %s"
+#: 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 "Operation afbrudt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Kunne ikke �bne mappe: beskedslisten var ikke komplet."
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Fjerner slettede beskeder"
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "Kunne ikke hente besked: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Kunne ikke hente besked fra 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 "Ingen besked med 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 "Henter POP-besked %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 ""
+"Kan ikke hente besked: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Ukendt nedb�r"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "Beskedslager"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Behold beskeder p� serveren"
 
-#: 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 "Slet efter %s dage"
 
-#: 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:84
 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 "For tilkobling til og nedhenting af e-post p� POP-servere."
 
-#: 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."
@@ -8590,7 +8884,7 @@ msgstr ""
 "klartekst. Dette er det eneste alternativ som er underst�ttet af mange "
 "POP-servere."
 
-#: 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 "
@@ -8600,48 +8894,32 @@ 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-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
-"Dette lader dig koble til POP-serveren ved at bruge Kerberos 4 som "
-"autenticering."
+"Kunne ikke koble til POP-server.\n"
+"Fejl under oversending af brugernavn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Kunne ikke autenticere mod KPOP-server: %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:214
-#, c-format
-msgid "Could not connect to server: %s"
-msgstr "Kunne ikke koble til server: %s"
+#: camel/providers/pop3/camel-pop3-store.c:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Godkendelse mislykkedes."
 
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, 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:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sIndtast venligst POP3-adgangskode for %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:377
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Kunne ikke koble til POP-server.\n"
-"Fejl under oversending af brugernavn: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
-msgid "(Unknown)"
-msgstr "(Ukendt)"
-
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8649,7 +8927,27 @@ msgstr ""
 "Kunne ikke koble til POP-serveren.\n"
 "Ingen underst�ttelse for forespurgt autenticeringsmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "IMAP-kommando mislykkedes: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "I/U-fejl"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8658,18 +8956,13 @@ msgstr ""
 "Kunne ikke koble til POP-server.\n"
 "Fejl ved oversending af adgangskode: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen s�dan mappe `%s'."
 
-#: camel/providers/pop3/camel-pop3-store.c:563
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "Uventet svar fra POP-server: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8681,49 +8974,50 @@ msgstr ""
 "For levering af e-post ved at videresende den til \"sendmail\"-programmet p� "
 "det lokale system."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "Kunne ikke tolke URL `%s'"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kunne ikke oprette kanal til sendmail: %s: besked ikke sendt"
 
-#: 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 "Kunne ikke k�re fork p� sendmail: %s: besked ikke sendt"
 
-#: 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 "Kunne ikke sende beskeden: %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 afsluttet med signal %s: besked ikke sendt."
 
-#: 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 "Kunne ikke k�re %s: besked ikke sendt."
 
-#: 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 afsluttet med status %d: besked ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr "Kunne ikke finde 'Fra'-adresse i besked"
-
-#: 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 "Levering af e-post via sendmail programmet"
 
-#: 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"
 
@@ -8731,122 +9025,145 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "For levering af e-post via en ekstern e-postserver med SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfejl, kommando ikke genkendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfejl i parametre eller argumenter"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Kommando ikke implementeret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementeret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar p� systemhj�lp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Hj�lpebesked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Tjeneste klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Tjenesten lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Tjenesten er ikke tilg�ngelig, lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Forespurgt e-post handling er ok, fuldf�rt"
 
-#: 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 "Ikke lokal bruger; videresender til <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 "Forespurgt e-post-handling er ikke udf�rt: postboks ikke tilg�ngelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurgt handling ikke udf�rt: postboks ikke tilg�ngelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurgt handling afbrudt: fejl i processering"
 
-#: 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 "Ikke lokal bruger; venligst pr�v <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 "Forespurgt handling ikke udf�rt: utilstr�kkelig lagringsplads"
 
-#: 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 "Forespurgt e-post handling afbrudt: lagringsallokering overskredet"
 
-#: 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 "Forespurgt handling ikke udf�rt: postboksnavn ikke tilladt"
 
-#: 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 "Start e-post input; slut med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Transaktionen mislykkedes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Adgangskodeoverf�ring kr�ves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Autenticeringsmekanismen er for svag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kr�ves for forespurgt autenticeringsmekanisme."
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autenticeringsfejl"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Autenticering kr�ves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:317
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, 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:379
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "Tidsafbrud for AUTH-foresp�rgsel: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, 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"
 msgstr "SMTP-server %s underst�tter ikke efterspurgt autenticeringstype %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8857,128 +9174,132 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, 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:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr "Kan ikke sende besked: afsenderadresse ikke defineret."
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Sender besked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende besked: ingen modtagere definerte."
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+#, 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
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Fejl ved HELO-svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "SMTP-autenticering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Fejl under opretelse af SASL-autenticeringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsafbrud for AUTH-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "AUTH-foresp�rgsel mislykkedes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar p� autenticering fra server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:893
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1081
+#, fuzzy
+msgid "MAIL FROM response error"
 msgstr "Fejl ved \"MAIL FROM\"-foresp�rgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Fejl ved \"RCPT TO\"-svar: %s: besked ikke sendt."
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-foresp�rgsel: %s: besked ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "Fejl ved DATA-svar: %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
+#, fuzzy
+msgid "DATA response error"
+msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1030
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "Fejl ved DATA-svar: beskedsterminering: %s: besked ikke sendt"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "Ugyldigt svar p� autenticering fra server."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsafbrud for RSET-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "Fejl ved QUIT-svar: %s: ikke-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "Fejl ved RSET-svar: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -9005,19 +9326,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 "bilag"
 
-#: 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 "Fjern valgte opf�ringer fra bilagslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:533
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "Tilf�j bilag..."
 
-#: composer/e-msg-composer-attachment-bar.c:534
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "Vedl�g en fil til beskeden"
 
@@ -9045,56 +9366,56 @@ msgid "MIME type:"
 msgstr "MIME-type:"
 
 #: 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 "Foresl� automatisk visning af bilag"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Klik her for at f� adressebogen op"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Indtast modtagerene for beskeden"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:397
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9102,12 +9423,12 @@ msgstr ""
 "Indtast adresserne som skal modtage en kopi af beskeden uden at komme til "
 "syne i modtagerlisten for beskeden."
 
-#: 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 "Vedl�g en fil"
 
-#: composer/e-msg-composer.c:698
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9116,46 +9437,34 @@ msgstr ""
 "Fejl under l�sning af fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:896
-msgid "Save as..."
-msgstr "Gem som..."
-
-#: composer/e-msg-composer.c:905
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:931
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fejl under gemning af fil: %s"
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl under indl�sning af fil: %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 ""
-"Kunne ikke �bne skitse-mappen for denne konto.\n"
-"Vil du bruge standard skitse-mappe?"
-
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fejl ved adgang til fil: %s"
 
-#: composer/e-msg-composer.c:1079
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente besked fra redigering"
 
-#: composer/e-msg-composer.c:1086
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9164,7 +9473,7 @@ msgstr ""
 "Kunne ikke s�ge i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1093
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9173,7 +9482,7 @@ msgstr ""
 "Kunne ikke afkorte fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9182,7 +9491,7 @@ msgstr ""
 "Fejl under autogemning af besked: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9190,7 +9499,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:1358
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9200,23 +9509,23 @@ msgstr ""
 "\n"
 "Vil du gemme �ndringene?"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Advarsel: �ndret besked"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "�bn fil"
 
-#: composer/e-msg-composer.c:1537
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Inds�t fil"
 
-#: composer/e-msg-composer.c:1923 composer/e-msg-composer.c:2366
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Skriv en besked"
 
-#: composer/e-msg-composer.c:2383
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9224,7 +9533,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "adressse-udv�lgelses-kontrol kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:2406 composer/e-msg-composer.c:2461
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9232,7 +9541,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "En komponent i HTML tekstbehandler kunne ikke aktiveres."
 
-#: 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."
@@ -9240,7 +9549,7 @@ msgstr ""
 "Kunne ikke oprette skrivevindue fordi du ikke har sat\n"
 "en identitet op i e-post-komponenten."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikke initiere Evolutions composer."
 
@@ -9292,15 +9601,33 @@ msgstr "Emne indeholder"
 msgid "Subject does not contain"
 msgstr "Emne indeholder ikke"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"En fil med samme navn eksisterer allerede.\n"
+"Overskriv den?"
+
 #. 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 "Husk denne adgangskode"
 
-#: 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 "Husk denne adgangskode for resten af denne session"
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "Kategorier"
+
 #. 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
@@ -9419,11 +9746,7 @@ msgstr "time"
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "sekund"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr " sekunder"
 
@@ -9498,7 +9821,7 @@ msgstr " siden"
 msgid "ago"
 msgstr "siden"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:956
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
@@ -9511,15 +9834,15 @@ msgid "Filter Rules"
 msgstr "Filterregler"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "S�"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Tilf�j handling"
 
-#: 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."
@@ -9527,19 +9850,11 @@ msgstr ""
 "Du glemte at v�lge en mappe.\n"
 "Venligst g� tilbage og specificer en gyldig mappe for levering af e-post."
 
-#: 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:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "V�lg mappe"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Indtast URI for mappen"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<klik her for at v�lge en mappe>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9549,7 +9864,7 @@ msgstr ""
 "Fejl i regul�rt udtryk '%s':\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test"
 
@@ -9557,39 +9872,40 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "Du skal give navn til dette filter."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Regelnavn: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Uden navn"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "Udf�r handlinger"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er m�dt"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "hvis et kriterie er m�dt"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Tilf�j kriterie"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "indkommende"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "udg�ende"
 
@@ -9635,208 +9951,228 @@ msgstr "med alle lokale mapper"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Giv point"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Tilknyt farve"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Giv point"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Bilag"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belem"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "indeholder"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dato modtaget"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Slettet"
 
-#: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr "Eksisterer ikke"
-
-#: filter/libfilter-i18n.h:11
-msgid "Draft"
-msgstr "Skitse"
-
-#: filter/libfilter-i18n.h:12
-msgid "Exist"
-msgstr "Eksisterer"
-
 #: filter/libfilter-i18n.h:13
-msgid "Expression"
-msgstr "Udtryk"
+msgid "does not contain"
+msgstr "indeholder ikke"
 
 #: filter/libfilter-i18n.h:14
-msgid "Important"
-msgstr "Vigtig"
+msgid "does not end with"
+msgstr "slutter ikke med"
 
 #: filter/libfilter-i18n.h:15
-msgid "Mailing list"
-msgstr "E-postliste"
+msgid "does not exist"
+msgstr "eksisterer ikke"
 
 #: filter/libfilter-i18n.h:16
-msgid "Message Body"
-msgstr "Beskedskrop"
+msgid "does not sound like"
+msgstr "ligner ikke"
 
 #: filter/libfilter-i18n.h:17
-msgid "Message Header"
-msgstr "Beskedshoved"
+msgid "does not start with"
+msgstr "starter ikke med"
 
 #: filter/libfilter-i18n.h:18
-msgid "Message was received"
-msgstr "Beskeden blev modtaget"
+msgid "Do Not Exist"
+msgstr "Eksisterer ikke"
 
 #: filter/libfilter-i18n.h:19
-msgid "Message was sent"
-msgstr "Beskeden blev sendt"
+msgid "Draft"
+msgstr "Skitse"
 
 #: filter/libfilter-i18n.h:20
-msgid "Move to Folder"
-msgstr "Flyt til mappe"
+msgid "ends with"
+msgstr "slutter med"
 
 #: filter/libfilter-i18n.h:21
-msgid "Read"
-msgstr "L�s"
+msgid "Execute Shell Command"
+msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Recipients"
-msgstr "Modtagere"
+msgid "Exist"
+msgstr "Eksisterer"
 
 #: filter/libfilter-i18n.h:23
-msgid "Regex Match"
-msgstr "Tr�ffer p� regul�rt udtryk"
+msgid "exists"
+msgstr "eksisterer"
 
 #: filter/libfilter-i18n.h:24
-msgid "Replied to"
-msgstr "Svaret til"
+msgid "Expression"
+msgstr "Udtryk"
 
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
-msgid "Score"
-msgstr "Point"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1404
-msgid "Sender"
-msgstr "Afsender"
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Vigtig"
 
 #: filter/libfilter-i18n.h:27
-msgid "Set Status"
-msgstr "S�t status"
+msgid "is"
+msgstr "er"
 
 #: filter/libfilter-i18n.h:28
-msgid "Size (kB)"
-msgstr "St�rrelse (kB)"
+#, fuzzy
+msgid "is after"
+msgstr "var efter"
 
 #: filter/libfilter-i18n.h:29
-msgid "Source Account"
-msgstr "Kildekonto"
+#, fuzzy
+msgid "is before"
+msgstr "var f�r"
 
 #: filter/libfilter-i18n.h:30
-msgid "Specific header"
-msgstr "Specifik header"
+#, fuzzy
+msgid "is Flagged"
+msgstr "M�rket"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "er st�rre end"
 
 #: filter/libfilter-i18n.h:32
-msgid "Stop Processing"
-msgstr "Stop behandling"
+msgid "is less than"
+msgstr "er mindre end"
 
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
-msgid "Subject"
-msgstr "Emne"
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "er ikke"
+
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "M�rket"
+
+#: filter/libfilter-i18n.h:35
+msgid "Mailing list"
+msgstr "E-postliste"
 
 #: filter/libfilter-i18n.h:36
-msgid "contains"
-msgstr "indeholder"
+msgid "Message Body"
+msgstr "Beskedskrop"
 
 #: filter/libfilter-i18n.h:37
-msgid "does not contain"
-msgstr "indeholder ikke"
+msgid "Message Header"
+msgstr "Beskedshoved"
 
 #: filter/libfilter-i18n.h:38
-msgid "does not end with"
-msgstr "slutter ikke med"
+msgid "Move to Folder"
+msgstr "Flyt til mappe"
 
 #: filter/libfilter-i18n.h:39
-msgid "does not exist"
-msgstr "eksisterer ikke"
+#, fuzzy
+msgid "Play Sound"
+msgstr "Afspil lyd:"
 
-#: filter/libfilter-i18n.h:40
-msgid "does not sound like"
-msgstr "ligner ikke"
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+msgid "Read"
+msgstr "L�s"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not start with"
-msgstr "starter ikke med"
+msgid "Recipients"
+msgstr "Modtagere"
 
 #: filter/libfilter-i18n.h:42
-msgid "ends with"
-msgstr "slutter med"
+msgid "Regex Match"
+msgstr "Tr�ffer p� regul�rt udtryk"
 
 #: filter/libfilter-i18n.h:43
-msgid "exists"
-msgstr "eksisterer"
+msgid "Replied to"
+msgstr "Svaret til"
 
-#: filter/libfilter-i18n.h:44
-msgid "is greater than"
-msgstr "er st�rre end"
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
+msgid "Score"
+msgstr "Point"
 
-#: filter/libfilter-i18n.h:45
-msgid "is less than"
-msgstr "er mindre end"
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+msgid "Sender"
+msgstr "Afsender"
 
 #: filter/libfilter-i18n.h:46
-msgid "is not"
-msgstr "er ikke"
+msgid "Set Status"
+msgstr "S�t status"
 
 #: filter/libfilter-i18n.h:47
-msgid "is"
-msgstr "er"
+msgid "Size (kB)"
+msgstr "St�rrelse (kB)"
 
 #: filter/libfilter-i18n.h:48
-msgid "on or after"
-msgstr "p� eller efter"
+msgid "sounds like"
+msgstr "lyder som"
 
 #: filter/libfilter-i18n.h:49
-msgid "on or before"
-msgstr "p� eller f�r"
+msgid "Source Account"
+msgstr "Kildekonto"
 
 #: filter/libfilter-i18n.h:50
-msgid "sounds like"
-msgstr "lyder som"
+msgid "Specific header"
+msgstr "Specifik header"
 
 #: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "starter med"
 
-#: filter/libfilter-i18n.h:52
-msgid "was after"
-msgstr "var efter"
-
 #: filter/libfilter-i18n.h:53
-msgid "was before"
-msgstr "var f�r"
+msgid "Stop Processing"
+msgstr "Stop behandling"
+
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
+msgid "Subject"
+msgstr "Emne"
 
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Regler"
 
-#: filter/rule-editor.c:284
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Tilf�j regel"
 
-#: filter/rule-editor.c:357
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
@@ -9856,30 +10192,30 @@ msgstr "Du skal specificere mindst en mappe som kilde."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gammel e-post fra 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 "Importerer..."
 
-#: 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 "Venligst vent"
 
-#: 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 "Importerer %s som %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 "S�ger i %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:101
 msgid "Mail"
 msgstr "Post"
 
@@ -9907,23 +10243,74 @@ msgstr ""
 "Evolution har fundet GnomeCard filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Prioritet: %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 importerer dine gamle data fra Netscape"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Affald"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Lokal e-post-fil %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "S�ger i katalog"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Starter import"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Rediger filtre"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -9948,44 +10335,94 @@ msgid "Pine"
 msgstr "Pine"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Fabrik for Evolution beskedsredigering."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Fabrik til Evolution-opgavekontrol."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Fabrik for Evolution beskedsredigering."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Fabrik for Evolution beskedsredigering."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Evolution komponent for h�ndtering af e-post."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolutions e-postredigering."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Evolution e-post komponent for sammendrag."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Evolution komponent for e-post mappevisning."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Evolution komponent for e-postmappe fabrik."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Fabrik for Evolution beskedsredigering."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Fabrik for e-post sammendrag komponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "I_ngen genindtr�ffelse"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Kontoer"
+
+#: 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 "Gr�nseflade for e-post-konfiguration"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Mappe som indeholder e-post"
+#: 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:101
-msgid "Mail storage folder (internal)"
-msgstr "Mappe for beskedslager (intern)"
+msgid "Folder containing mail"
+msgstr "Mappe som indeholder e-post"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -9995,24 +10432,19 @@ msgstr "Virtuelt affald"
 msgid "Virtual Trash folder"
 msgstr "Virtuel affaldsmappe"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Kunne ikke koble til lager: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Denne mappe kan ikke indeholde beskeder."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Egenskaber ..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "�ndr denne mappes egenskaber"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10020,205 +10452,236 @@ 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:951
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr "Du har ikke sat en transportmetode for e-post"
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Ny e-post besked"
 
-#: mail/component-factory.c:951
-msgid "New _Mail Message"
-msgstr "Ny e-post _besked"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "Send _besked"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikke initiere Evolutions konfigurationskomponent for e-post."
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Kobler til server..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring med skallen"
 
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaber for \"%s\""
 
-#: mail/folder-browser-ui.c:274
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d nye"
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d skjulte"
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d valgte"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendte"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d sendte"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1049
-msgid "Create vFolder from Search"
-msgstr "Lav vFolder fra s�gning"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Opret _virtuel mappe fra besked"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "Virtuel mappe for e_mnet"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "Virtuel mappe for afse_nder"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "Virtuel mappe for modtage_re"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "Virtuel mappe p� e-post_liste"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtr�r p� em_ne"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtr�r p� afsen_der"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filtr�r p� modta_gere"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filtr�r p� e-_postliste"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "R_edig�r som ny besked..."
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
-msgid "_Save As..."
-msgstr "Gem _som..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "S_kriv ud"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Fuldf�rt"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "T�m"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_k�r som l�st"
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Mark�r som _ul�st"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Mark�r som v_igtig"
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Mark�r som uv_igtig"
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "Fortryd sletning"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "K_opi�r til mappe..."
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
-msgid "_Undelete"
-msgstr "Fortryd sletning"
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
 
-#: mail/folder-browser.c:1473 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Tilf�j sender i adressebog"
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "P�f�r filtre"
 
-#: mail/folder-browser.c:1478
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "Opret rege_l fra besked"
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
-msgstr "Filtr�r efter e-postliste"
-
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "Virtuel mappe p� e-postliste"
 
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr�r efter e-postliste (%s)"
 
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "Virtuel mappe p� e-postliste (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Forvalgt"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Henter mappeinformation"
@@ -10240,26 +10703,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importerer Outlook Express 4-filer til Evolution"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Krop indeholder"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Aktivt lagringsformat:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Indekserer:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Format for postboks"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Krop indeholder"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nyt lagringsformat:"
 
-#: 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"
@@ -10269,15 +10725,15 @@ msgstr ""
 "(s� som mangel p� diskplads) ikke n�dvendigvis rettes op\n"
 "igen. Venligst brug denne funktion med forsigtighed."
 
-#: 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"
 
@@ -10295,86 +10751,79 @@ msgstr "Evolution nyhedsredigerer"
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:962
-msgid "Could not save signature file."
-msgstr "Kunne ikke gemme signaturfil."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_V�rt:"
 
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "Gem signatur"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "Br_ugernavn:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+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:1045
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Denne signatur er �ndret, men har ikke blevet gemt..\n"
-"\n"
-"Vil du gemme �ndringene?"
 
-#: mail/mail-account-gui.c:1654
+#: mail/mail-account-gui.c:1985
 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:149
-msgid " (default)"
-msgstr " (forvalgt)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Deaktiver"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Aktiver"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 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:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Slet ikke"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Vil du virkelig slette kontoen?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-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:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Deaktiver"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:798 mail/mail-config.glade.h:42
-msgid "Mail Settings"
-msgstr "Indstillinger for e-post"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Aktiver"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Send til %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "Er du sikker p� at du vil slette denne nyhedsgruppekonto?"
 
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Emne er %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Aktiveret"
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "E-post fra %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Konton_avn:"
 
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "%s e-postliste"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Puerto Rico"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Tilf�j filterregel"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10386,7 +10835,7 @@ msgstr ""
 "modtage eller skrive beskeder.\n"
 "Vil du konfigurere den nu?"
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10394,7 +10843,7 @@ msgstr ""
 "Du skal konfigurere en identitet\n"
 "f�r du kan skrive e-post."
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10402,12 +10851,8 @@ msgstr ""
 "Du skal konfigurere en e-post-transport\n"
 "f�r du kan skrive e-post."
 
-#: mail/mail-callbacks.c:230
-msgid "You have not set a mail transport method"
-msgstr "Du har ikke sat en transportmetode for e-post"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:265
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10415,11 +10860,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:280
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Send alligevel?"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10427,7 +10872,7 @@ msgstr ""
 "Denne besked har ikke et emne.\n"
 "Send alligevel?"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10435,11 +10880,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:370
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "Denne besked indeholder kun Bcc-modtagere."
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10449,40 +10894,44 @@ msgstr ""
 "\"Apparently-To\" header.\n"
 "Send alligevel?"
 
-#: mail/mail-callbacks.c:469
-msgid "This message contains invalid recipients:"
-msgstr "Denne besked indeholder ugyldige modtagere:"
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 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:600
+#: mail/mail-callbacks.c:497
 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:838
+#: mail/mail-callbacks.c:623
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Kunne ikke �bne skitse-mappen for denne konto.\n"
+"Vil du bruge standard skitse-mappe?"
+
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "en ukendt afsender"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 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:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Flyt beskeder til"
 
-#: mail/mail-callbacks.c:1283 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopi�r beskeder til"
 
-#: mail/mail-callbacks.c:1759
+#: mail/mail-callbacks.c:2091
 #, 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:1784
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10490,7 +10939,7 @@ msgstr ""
 "Du kan kun redigere beskeder gemt\n"
 "i Skitser-kataloget."
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10498,28 +10947,39 @@ msgstr ""
 "Du kan kun sende beskeder igen\n"
 "som er gemt i sendt-kataloget."
 
-#: mail/mail-callbacks.c:1837
+#: mail/mail-callbacks.c:2169
 #, 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:1863
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Ingen besked valgt"
 
-#: mail/mail-callbacks.c:1962
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Overskriv fil?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Gem besked som..."
 
-#: mail/mail-callbacks.c:1964
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Advarsel"
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Vis n�ste ul�ste besked"
 
-#: mail/mail-callbacks.c:2135
+#: mail/mail-callbacks.c:2373
+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
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10531,11 +10991,7 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse beskeder?"
 
-#: mail/mail-callbacks.c:2142
-msgid "Do not ask me again."
-msgstr "Sp�rg mig ikke igen."
-
-#: mail/mail-callbacks.c:2250
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10544,23 +11000,28 @@ msgstr ""
 "Fejl under indl�sning af filter-information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2262
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2325
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Henter besked %d af %d"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:2352
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-letter"
 
-#: mail/mail-callbacks.c:2371
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Fejl under udskrift af besked"
 
-#: mail/mail-callbacks.c:2473
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, 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?"
@@ -10618,16 +11079,35 @@ msgstr ""
 "nedenunder. Dette navn bliver kun brugt for visning p� sk�rmen."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: mail/mail-config.c:326
-#, c-format
-msgid "Account %d"
-msgstr "Konto %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "efter"
 
-#: mail/mail-config.c:1859
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -10638,87 +11118,156 @@ msgstr ""
 "%s\n"
 "Ingen genvej vil blive oprettet."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Indbakke"
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Tjekker tjeneste"
 
-#: mail/mail-config.c:2190 mail/mail-config.c:2194
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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
-msgid " _Check for supported types "
-msgstr "_S�g efter underst�ttede typer"
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " farve"
+#, 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
+#, 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
 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:4
+#: mail/mail-config.glade.h:7
 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:5
-msgid "Account"
-msgstr "Konto"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "H�ndtering af konti"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "Kontoer"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Aflys operation"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "Krypt�r altid til mig s_elv ved sending af krypteret e-post."
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Arkansas"
+
+#: mail/mail-config.glade.h:13
+#, 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:10
-msgid "Always _sign outgoing messages when using this account"
+#: 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:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "Arica"
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Vedl�g en fil til beskeden"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilag"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autenticering"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "Hent beskeder _automatisk hver(t)"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Ukendt tegns�t: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_Luk"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Ser efter nye beskeder"
 
-#: mail/mail-config.glade.h:14
-msgid "Composer"
-msgstr "Skriv"
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Composing Messages"
+msgstr "Skriv en besked"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:16
-msgid "Confirm when Expunging a folder"
-msgstr "Bekr�ft n�r slettede beskeder skal fjernes"
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10734,229 +11283,372 @@ msgstr ""
 "\n"
 "Klik p� \"Fuldf�r\" for at gemme dine indstillinger"
 
-#: mail/mail-config.glade.h:23
+#: 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:24
-msgid "Default Forward style is: "
-msgstr "Standard videresendingsstil er: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Standard tegnkoding: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Henter e-post"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitale IDer..."
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr "Vis"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Kan ikke �bne besked"
 
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "F�rdig"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Skitser"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "_Skitsemappe:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "A_ktiv�r"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Redig�r..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
-msgstr "Aktiveret"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "�st"
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "E-post indeholder"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "E-post-adresse:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "T�m affalds_kurven ved afslutning"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "Udf�r handlinger"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "slutter med"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Egenskaber"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Videresendte beskeder"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Hent digital ID..."
 
-#: mail/mail-config.glade.h:35
-msgid "HTML signature file:"
-msgstr "HTML-signaturfil:"
+#: mail/mail-config.glade.h:58
+#, 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: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 "Identitet"
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr "I HTML e-post"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Indlejret"
 
-#: 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 "Gem og luk"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Indl�s b_illeder"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "E-post-konfiguration"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Placering af postboks"
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
-msgstr "Brug denne som stan_dard konto"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Beskedshoved"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_Beskedsvisning"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikronesien"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP-server:"
 
-#: mail/mail-config.glade.h:46
-msgid "News"
-msgstr "News"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "E-post-konfiguration"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "_Nyhedstjenester"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Yderligere information"
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organisat_ion:"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "PGP-n�gle _ID:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "V�lg en farve"
 
-#: 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 "Sp�rg ved sending af HTML-beskeder til kontakter som ikke �nsker dem"
+#: mail/mail-config.glade.h:88
+#, 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:56
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Sp�rg ved sending af beskeder uden _emne"
+#: mail/mail-config.glade.h:89
+#, 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 "Sp�rg ved sending af beskeder med kun _Bcc-modtagere defineret"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Udskriv valgte kontakter"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Kan ikke �bne besked"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citeret"
 
-#: mail/mail-config.glade.h:60
+#: 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"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
-msgid "Receiving Email"
-msgstr "Indkommende e-post"
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Svar-til:"
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+msgid "Receiving Email"
 msgstr "Indkommende e-post"
 
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Alternativer indkommende"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Husk denne adgangskode"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "N�dvendig information"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+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:67
-msgid "Security"
-msgstr "Sikkerhed"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
-msgstr "V�lg en logfil for filter..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "V�lg PGP-bin�rfil"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Udg�ende e-post"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
-msgstr "Udg�ende e-post"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Slet alt undtaget signatur"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Sendt"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "Udg�ende e-post"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _beskeder:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Sendte beskeder og skisser"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Server kr�ver _autenticering"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "Server_type: "
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
-msgstr "Signaturfil:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Genveje"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Gem signatur"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Kilde"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Kildeinformation"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "Kilder"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "Stilnavn:"
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
-msgstr "Specielle mapper"
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:86
-msgid "Use s_ecure connection (SSL)"
-msgstr "Brug sikker forbindelse (_SSL)"
+#: mail/mail-config.glade.h:128
+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:87
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "_HTML-signatur:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Variabel"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10966,126 +11658,215 @@ msgstr ""
 "\n"
 "Klik \"N�ste\" for at begynde. "
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "�st"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "_Altid indl�s billeder fra nettet"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:141
 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:93
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Autenticeringstype: "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "_Autenticeringstype: "
+
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "Hent beskeder _automatisk hver(t)"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:97
-msgid "_Drafts folder:"
-msgstr "_Skitsemappe:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
-msgstr "_E-post adresse:"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Bekr�ft n�r slettede beskeder skal fjernes"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
-msgstr "T�m affalds_kurven ved afslutning"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Forvalgt"
 
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:151
+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
+#, fuzzy
+msgid "_Filename:"
+msgstr "Filnavn:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Videresend som"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "_Fulde navn:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:159
+#, 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:103
-msgid "_Highlight citations with"
-msgstr "M_ark�r citering med"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Identitet"
 
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
-msgstr "_V�rt:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Sprog"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr "_Indl�s billeder hvis afsender er i adressebogen"
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
-msgstr "_Log filterhandlinger til:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Brug denne som stan_dard konto"
 
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_Mark�r beskeder som l�st efter"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "Indl�s aldrig billeder fra _nettet"
 
-#: mail/mail-config.glade.h:110
-msgid "_Organization:"
-msgstr "_Organisation:"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "Sti til _PGP-bin�rfil:"
 
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
-msgstr "S_ti:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
-msgstr "Husk denne adgangs_kode"
+#: mail/mail-config.glade.h:172
+#, 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:114
-msgid "_Send mail in HTML format by default."
-msgstr "_Send beskeder i HTML-format som standard."
+#: mail/mail-config.glade.h:173
+#, 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:115
-msgid "_Server Type: "
-msgstr "_Servertype: "
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Radio"
 
-#: mail/mail-config.glade.h:116
-msgid "_Signature file:"
-msgstr "_Signaturfil:"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Indkommende e-post"
 
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
-msgstr "Br_ugernavn:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Svar til alle"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Sikkerhed"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Sikkerhed"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Udg�ende e-post"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Vis tid som"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Variabel"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_hver"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " farve"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "nyhedsvindue1"
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr "pladsholder"
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr "sekunder"
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Kunne ikke oprette PGP signaturkontekst."
@@ -11122,146 +11903,139 @@ msgstr "Kunne ikke oprette S/MIME \"envelope\" kontekst."
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikke oprette S/MIME afkodningskontekst."
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Gem bilag"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Kunne ikke oprette midlertidigt katalog: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Gem til disk..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Vis indlejret"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "�bn i %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis indlejret (via %s)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:1136
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Indl�ser beskedsindhold"
 
-#: mail/mail-display.c:1605
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "�bn henvisning i netl�ser"
 
-#: mail/mail-display.c:1607
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Kopi�r henvisning"
 
-#: mail/mail-display.c:1610
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Gem henvisning som"
 
-#: mail/mail-display.c:1613
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Gem billede som..."
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilag"
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke l�se MIME-besked. Viser ren beskedstekst."
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Ugyldig e-post-adresse:"
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Fra"
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1814
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
 msgstr ""
-"Denne besked er digitalt signeret. For flere informationer, klik p� "
-"l�sikonen."
-
-#: mail/mail-format.c:1837
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution kan ikke genkende denne form for signeret besked."
-
-#: mail/mail-format.c:1845
-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:1853
-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."
+"\n"
+"E-postprogram: "
 
-#: mail/mail-format.c:2069
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-server (%s)"
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2120
 #, 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:2088
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/mail-format.c:2117
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peger til eksterne data (%s)"
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:2130
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11270,27 +12044,27 @@ msgstr ""
 "Kan ikke gemme metainformation for mappe; du vil sandsynligvis\n"
 "ikke kunne �bne denne mappe igen: %s: %s"
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan ikke gemme metainformation om mappe p�: %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan ikke slette metainformation for mappe %s: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�ndrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, 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:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11298,11 +12072,11 @@ msgstr ""
 "Hvis du ikke kan �bne denne postboks igen m�\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 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:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigur�r /%s igen"
@@ -11329,117 +12103,112 @@ msgstr ""
 msgid "Working"
 msgstr "Arbejder"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: 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 "Fuldf�rte alligevel sending af beskeden."
 
-#: mail/mail-ops.c:554
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:674
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender besked %d af %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fejlet p� besked %d af %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 "Fuldf�rt."
 
-#: mail/mail-ops.c:788
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Gemmer besked til mappe"
 
-#: mail/mail-ops.c:868
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter beskeder til %s"
 
-#: mail/mail-ops.c:868
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:895
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1058 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Affald"
-
-#: mail/mail-ops.c:1191
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Videresendte beskeder"
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "�bner mappe %s"
 
-#: mail/mail-ops.c:1306
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "�bner lager %s"
 
-#: mail/mail-ops.c:1375
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1520
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Opfrisker mappe"
 
-#: mail/mail-ops.c:1556
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Fjerner slettede beskeder fra mappe"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter besked %s"
 
-#: mail/mail-ops.c:1672
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d beskeder"
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gemmer %d beskeder"
 
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11448,7 +12217,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11457,11 +12226,11 @@ msgstr ""
 "Fejl under gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11470,22 +12239,27 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2088
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2089
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_S�g"
 
@@ -11521,68 +12295,92 @@ msgstr "Find:"
 msgid "Matches:"
 msgstr "Tr�ffere:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Afbryder..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Type: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sti: %s, Type: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Send & modtag e-post"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Afbryd alle"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Opdaterer..."
 
-#: 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 "Venter..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Afbrudt."
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Operation afbrudt af bruger."
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: mail/mail-tools.c:256
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Kunne ikke gemme signaturfil."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Gem signatur"
+
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Denne signatur er �ndret, men har ikke blevet gemt..\n"
+"\n"
+"Vil du gemme �ndringene?"
+
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "Signaturfil:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt besked - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Videresendt besked"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Videresendt besked"
 
@@ -11609,10 +12407,6 @@ msgstr ""
 "    '%s'\n"
 "Og er blevet opdateret."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "Virtuelle mapper "
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "vMapper"
@@ -11630,87 +12424,145 @@ msgstr "Pr�ver at redigere en vfolder '%s' som ikke eksisterer."
 msgid "New VFolder"
 msgstr "Ny Virtuel mappe"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Uden emne)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Besked"
 
-#: mail/message-list.c:656
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Ul�st"
 
-#: mail/message-list.c:657
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "L�st"
 
-#: mail/message-list.c:658
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:659
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Flere ul�ste beskeder"
 
-#: mail/message-list.c:660
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:665
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:669
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "H�jere"
 
-#: mail/message-list.c:670
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "H�jest"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "I dag %H:%M"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "I g�r %H:%M"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:958
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2358
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Genererer beskedsliste"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "F�rdig "
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Status"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "M�rket"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Modtaget"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "St�rrelse"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "McAll"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "G� fremad"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Kildeinformation"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Videresend"
+
+#: 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 "Svar"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Svar til alle"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Forh�ndsvis"
+
+#: 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\""
@@ -11732,7 +12584,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement p� mappe \"%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 "Mappe"
 
@@ -11777,1423 +12629,33 @@ msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolution-komponent for sammendrag."
-
-#: my-evolution/component-factory.c:44
-msgid "Folder containing the Evolution Summary"
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
 msgstr "Mappe som indeholder Evolution sammendrag"
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Kan ikke initiere Evolutions sammendragskomponent."
-
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
-msgid "Appointments"
-msgstr "Aftaler"
-
-#: my-evolution/e-summary-calendar.c:341
-msgid "No appointments"
-msgstr "Ingen aftaler"
-
-#: 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 "Inegn beskrivelse"
-
-#: my-evolution/e-summary-mail.c:129
-msgid "Mail summary"
-msgstr "E-post sammendrag"
-
-#. 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 "Dictionary.com Ord for dagen"
-
-#: my-evolution/e-summary-preferences.c:466
-msgid "Quotes of the Day"
-msgstr "Dagens citater"
-
-#: my-evolution/e-summary-preferences.c:946
-msgid "Add a news feed"
-msgstr "Tilf�j nyheds-server"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolutions e-postredigering."
 
-#: my-evolution/e-summary-preferences.c:954
-msgid "Enter the URL of the news feed you wish to add"
-msgstr "Indtast URL for nyhedsstedet du vil tilf�je"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Fabrik til Evolution-opgavekontrol."
 
-#: my-evolution/e-summary-preferences.c:958
-msgid "Name:"
-msgstr "Navn:"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Fabrik for e-post sammendrag komponent."
 
-#: my-evolution/e-summary-preferences.c:1504
-msgid "Summary Settings"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
 msgstr "Indstillinger for sammendrag"
 
-#: 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 "Fejl under nedhentning af RDF"
-
-#: my-evolution/e-summary-rdf.c:528
-msgid "News Feed"
-msgstr "Nyhedstjenester"
-
-#: my-evolution/e-summary-tasks.c:248
-msgid "No tasks"
-msgstr "Ingen opgaver"
-
-#: my-evolution/e-summary-tasks.c:287
-msgid "(No Description)"
-msgstr "(Ingen beskrivelse)"
-
-#: my-evolution/e-summary-weather.c:71
-msgid "My Weather"
-msgstr "Min vejrbesked"
-
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr "<dd><b>Vejr-serveren kunne ikke kontaktes</b></dd>"
-
-#: my-evolution/e-summary-weather.c:559
-msgid "Weather"
-msgstr "Vejr"
-
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr "Regioner"
-
-#: my-evolution/e-summary.c:193
-msgid "%A, %B %e %Y"
-msgstr "%A %e. %B %Y"
-
-#: my-evolution/e-summary.c:493
-msgid "Please wait..."
-msgstr "Venligst vent..."
-
-#: my-evolution/e-summary.c:584 ui/my-evolution.xml.h:3
-msgid "Print Summary"
-msgstr "Udskriv sammendrag"
-
-#: my-evolution/e-summary.c:630
-msgid "Printing of Summary failed"
-msgstr "Fejl under udskrift af sammendrag"
-
-#: my-evolution/main.c:66
-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"
-
-#: my-evolution/metar.c:45
-msgid "Broken clouds"
-msgstr "Brudte skyer"
-
-#: my-evolution/metar.c:46
-msgid "Scattered clouds"
-msgstr "Spredte skyer"
-
-#: my-evolution/metar.c:47
-msgid "Few clouds"
-msgstr "F� skyer"
-
-#: my-evolution/metar.c:48
-msgid "Overcast"
-msgstr "Overskyet"
-
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
-msgid "Invalid"
-msgstr "Ugyldig"
-
-#: my-evolution/metar.c:63
-msgid "Variable"
-msgstr "Variabel"
-
-#: my-evolution/metar.c:64
-msgid "North"
-msgstr "Nord"
-
-#: my-evolution/metar.c:64
-msgid "North - NorthEast"
-msgstr "Nord - nord�st"
-
-#: my-evolution/metar.c:64
-msgid "Northeast"
-msgstr "Nord�st"
-
-#: my-evolution/metar.c:64
-msgid "East - NorthEast"
-msgstr "�st - nord�st"
-
-#: my-evolution/metar.c:65
-msgid "East"
-msgstr "�st"
-
-#: my-evolution/metar.c:65
-msgid "East - Southeast"
-msgstr "�st - syd�st"
-
-#: my-evolution/metar.c:65
-msgid "Southeast"
-msgstr "Syd�st"
-
-#: my-evolution/metar.c:65
-msgid "South - Southeast"
-msgstr "Syd - syd�st"
-
-#: my-evolution/metar.c:66
-msgid "South"
-msgstr "Syd"
-
-#: my-evolution/metar.c:66
-msgid "South - Southwest"
-msgstr "Syd - sydvest"
-
-#: my-evolution/metar.c:66
-msgid "Southwest"
-msgstr "Sydvest"
-
-#: my-evolution/metar.c:66
-msgid "West - Southwest"
-msgstr "Vest - sydvest"
-
-#: my-evolution/metar.c:67
-msgid "West"
-msgstr "Vest"
-
-#: my-evolution/metar.c:67
-msgid "West - Northwest"
-msgstr "Vest - nordvest"
-
-#: my-evolution/metar.c:67
-msgid "Northwest"
-msgstr "Nordvest"
-
-#: my-evolution/metar.c:67
-msgid "North - Northwest"
-msgstr "Nord - nordvest"
-
-#. DRIZZLE
-#: my-evolution/metar.c:127
-msgid "Drizzle"
-msgstr "Sm�regn"
-
-#: my-evolution/metar.c:128
-msgid "Drizzle in the vicinity"
-msgstr "Sm�regn i omegnen"
-
-#: my-evolution/metar.c:129
-msgid "Light drizzle"
-msgstr "Let sm�regn"
-
-#: my-evolution/metar.c:130
-msgid "Moderate drizzle"
-msgstr "Moderat sm�regn"
-
-#: my-evolution/metar.c:131
-msgid "Heavy drizzle"
-msgstr "Tung sm�regn"
-
-#: my-evolution/metar.c:132
-msgid "Shallow drizzle"
-msgstr "Tyndt sm�regn"
-
-#: my-evolution/metar.c:133
-msgid "Patches of drizzle"
-msgstr "Regnbyger"
-
-#: my-evolution/metar.c:134
-msgid "Partial drizzle"
-msgstr "Delvis sm�regn"
-
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
-msgid "Thunderstorm"
-msgstr "Tordenstorm"
-
-#: my-evolution/metar.c:136
-msgid "Windy drizzle"
-msgstr "Sm�regn med vind"
-
-#: my-evolution/metar.c:137
-msgid "Showers"
-msgstr "Regnbyger"
-
-#: my-evolution/metar.c:138
-msgid "Drifting drizzle"
-msgstr "Drivende sm�regn"
-
-#: my-evolution/metar.c:139
-msgid "Freezing drizzle"
-msgstr "Frysende sm�regn"
-
-#. RAIN
-#: my-evolution/metar.c:142
-msgid "Rain"
-msgstr "Regn"
-
-#: my-evolution/metar.c:143
-msgid "Rain in the vicinity"
-msgstr "Regn i omegnen"
-
-#: my-evolution/metar.c:144
-msgid "Light rain"
-msgstr "Let regn"
-
-#: my-evolution/metar.c:145
-msgid "Moderate rain"
-msgstr "Moderat regn"
-
-#: my-evolution/metar.c:146
-msgid "Heavy rain"
-msgstr "Tungt regn"
-
-#: my-evolution/metar.c:147
-msgid "Shallow rain"
-msgstr "Tyndt regn"
-
-#: my-evolution/metar.c:148
-msgid "Patches of rain"
-msgstr "Regnbyger"
-
-#: my-evolution/metar.c:149
-msgid "Partial rainfall"
-msgstr "Delvis regn"
-
-#: my-evolution/metar.c:151
-msgid "Blowing rainfall"
-msgstr "Regn med vind"
-
-#: my-evolution/metar.c:152
-msgid "Rain showers"
-msgstr "Regnbyger"
-
-#: my-evolution/metar.c:153
-msgid "Drifting rain"
-msgstr "Drivende regn"
-
-#: my-evolution/metar.c:154
-msgid "Freezing rain"
-msgstr "Frysende regn"
-
-#. SNOW
-#: my-evolution/metar.c:157
-msgid "Snow"
-msgstr "Sne"
-
-#: my-evolution/metar.c:158
-msgid "Snow in the vicinity"
-msgstr "Sne i omegnen"
-
-#: my-evolution/metar.c:159
-msgid "Light snow"
-msgstr "Let sne"
-
-#: my-evolution/metar.c:160
-msgid "Moderate snow"
-msgstr "Moderat sne"
-
-#: my-evolution/metar.c:161
-msgid "Heavy snow"
-msgstr "Tung sne"
-
-#: my-evolution/metar.c:162
-msgid "Shallow snow"
-msgstr "Grund sne"
-
-#: my-evolution/metar.c:163
-msgid "Patches of snow"
-msgstr "Snebyger"
-
-#: my-evolution/metar.c:164
-msgid "Partial snowfall"
-msgstr "Delvis snefald"
-
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
-msgid "Snowstorm"
-msgstr "Snestorm"
-
-#: my-evolution/metar.c:166
-msgid "Blowing snowfall"
-msgstr "Sne og vind"
-
-#: my-evolution/metar.c:167
-msgid "Snow showers"
-msgstr "Snebyger"
-
-#: my-evolution/metar.c:168
-msgid "Drifting snow"
-msgstr "Drivende sne"
-
-#: my-evolution/metar.c:169
-msgid "Freezing snow"
-msgstr "Frysende sne"
-
-#. SNOW_GRAINS
-#: my-evolution/metar.c:172
-msgid "Snow grains"
-msgstr "Snekorn"
-
-#: my-evolution/metar.c:173
-msgid "Snow grains in the vicinity"
-msgstr "Snekorn i omegnen"
-
-#: my-evolution/metar.c:174
-msgid "Light snow grains"
-msgstr "Lette snekorn"
-
-#: my-evolution/metar.c:175
-msgid "Moderate snow grains"
-msgstr "Moderate snekorn"
-
-#: my-evolution/metar.c:176
-msgid "Heavy snow grains"
-msgstr "Tunge snekorn"
-
-#: my-evolution/metar.c:177
-msgid "Shallow snow grains"
-msgstr "Tynde snekorn"
-
-#: my-evolution/metar.c:178
-msgid "Patches of snow grains"
-msgstr "Omr�der med snekorn"
-
-#: my-evolution/metar.c:179
-msgid "Partial snow grains"
-msgstr "Delvise snekorn"
-
-#: my-evolution/metar.c:181
-msgid "Blowing snow grains"
-msgstr "Bl�sende snekorn"
-
-#: my-evolution/metar.c:182
-msgid "Snow grain showers"
-msgstr "Byger med snekorn"
-
-#: my-evolution/metar.c:183
-msgid "Drifting snow grains"
-msgstr "Drivende snekorn"
-
-#: my-evolution/metar.c:184
-msgid "Freezing snow grains"
-msgstr "Frysende snekorn"
-
-#. ICE_CRYSTALS
-#: my-evolution/metar.c:187
-msgid "Ice crystals"
-msgstr "Iskrystaller"
-
-#: my-evolution/metar.c:188
-msgid "Ice crystals in the vicinity"
-msgstr "Iskrystaller i omegnen"
-
-#: my-evolution/metar.c:189
-msgid "Few ice crystals"
-msgstr "Nogen iskrystaller"
-
-#: my-evolution/metar.c:190
-msgid "Moderate ice crystals"
-msgstr "Moderat med iskrystaller"
-
-#: my-evolution/metar.c:191
-msgid "Heavy ice crystals"
-msgstr "Tungt med iskrystaller"
-
-#: my-evolution/metar.c:193
-msgid "Patches of ice crystals"
-msgstr "Omr�der med iskrystaller"
-
-#: my-evolution/metar.c:194
-msgid "Partial ice crystals"
-msgstr "Delvise iskrystaller"
-
-#: my-evolution/metar.c:195
-msgid "Ice crystal storm"
-msgstr "Storm med iskrystaller"
-
-#: my-evolution/metar.c:196
-msgid "Blowing ice crystals"
-msgstr "Bl�sende iskrystaller"
-
-#: my-evolution/metar.c:197
-msgid "Showers of ice crystals"
-msgstr "Byger med iskrystaller"
-
-#: my-evolution/metar.c:198
-msgid "Drifting ice crystals"
-msgstr "Drivende iskrystaller"
-
-#: my-evolution/metar.c:199
-msgid "Freezing ice crystals"
-msgstr "Frysende iskrystaller"
-
-#. ICE_PELLETS
-#: my-evolution/metar.c:202
-msgid "Ice pellets"
-msgstr "Is-pellets"
-
-#: my-evolution/metar.c:203
-msgid "Ice pellets in the vicinity"
-msgstr "Is-pellets i omr�det"
-
-#: my-evolution/metar.c:204
-msgid "Few ice pellets"
-msgstr "F� is-pellets"
-
-#: my-evolution/metar.c:205
-msgid "Moderate ice pellets"
-msgstr "Moderate is-pellets"
-
-#: my-evolution/metar.c:206
-msgid "Heavy ice pellets"
-msgstr "Kraftige is-pellets"
-
-#: my-evolution/metar.c:207
-msgid "Shallow ice pellets"
-msgstr "Tynde is-pellets"
-
-#: my-evolution/metar.c:208
-msgid "Patches of ice pellets"
-msgstr "Omr�der med is-pellets"
-
-#: my-evolution/metar.c:209
-msgid "Partial ice pellets"
-msgstr "Delvis is-pellets"
-
-#: my-evolution/metar.c:210
-msgid "Ice pellet storm"
-msgstr "Is-pellets storm"
-
-#: my-evolution/metar.c:211
-msgid "Blowing ice pellets"
-msgstr "Bl�sende is-pellets"
-
-#: my-evolution/metar.c:212
-msgid "Showers of ice pellets"
-msgstr "Byger med is-pellets"
-
-#: my-evolution/metar.c:213
-msgid "Drifting ice pellets"
-msgstr "Drivende is-pellets"
-
-#: my-evolution/metar.c:214
-msgid "Freezing ice pellets"
-msgstr "Frysende is-pellets"
-
-#. HAIL
-#: my-evolution/Locations.h:883 my-evolution/metar.c:217
-msgid "Hail"
-msgstr "Hagl"
-
-#: my-evolution/metar.c:218
-msgid "Hail in the vicinity"
-msgstr "Hagl i omegnen"
-
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
-msgid "Light hail"
-msgstr "Let hagl"
-
-#: my-evolution/metar.c:220
-msgid "Moderate hail"
-msgstr "Moderat hagl"
-
-#: my-evolution/metar.c:221
-msgid "Heavy hail"
-msgstr "Tungt hagl"
-
-#: my-evolution/metar.c:222
-msgid "Shallow hail"
-msgstr "Let hagl"
-
-#: my-evolution/metar.c:223
-msgid "Patches of hail"
-msgstr "Omr�der med hagl"
-
-#: my-evolution/metar.c:224
-msgid "Partial hail"
-msgstr "Delvis hagl"
-
-#: my-evolution/metar.c:225
-msgid "Hailstorm"
-msgstr "Haglstorm"
-
-#: my-evolution/metar.c:226
-msgid "Blowing hail"
-msgstr "Hagl med vind"
-
-#: my-evolution/metar.c:227
-msgid "Hail showers"
-msgstr "Haglbyger"
-
-#: my-evolution/metar.c:228
-msgid "Drifting hail"
-msgstr "Drivende hagl"
-
-#: my-evolution/metar.c:229
-msgid "Freezing hail"
-msgstr "Frysende hagl"
-
-#. SMALL_HAIL
-#: my-evolution/metar.c:232
-msgid "Small hail"
-msgstr "Sm�hagl"
-
-#: my-evolution/metar.c:233
-msgid "Small hail in the vicinity"
-msgstr "Sm�hagl i omegnen"
-
-#: my-evolution/metar.c:235
-msgid "Moderate small hail"
-msgstr "Moderat sm�hagl"
-
-#: my-evolution/metar.c:236
-msgid "Heavy small hail"
-msgstr "Tungt sm�hagl"
-
-#: my-evolution/metar.c:237
-msgid "Shallow small hail"
-msgstr "Let sm�hagl"
-
-#: my-evolution/metar.c:238
-msgid "Patches of small hail"
-msgstr "Omr�der med sm�hagl"
-
-#: my-evolution/metar.c:239
-msgid "Partial small hail"
-msgstr "Delvis sm�hagl"
-
-#: my-evolution/metar.c:240
-msgid "Small hailstorm"
-msgstr "Lille haglstorm"
-
-#: my-evolution/metar.c:241
-msgid "Blowing small hail"
-msgstr "Sm�hagl med vind"
-
-#: my-evolution/metar.c:242
-msgid "Showers of small hail"
-msgstr "Byger med sm�hagl"
-
-#: my-evolution/metar.c:243
-msgid "Drifting small hail"
-msgstr "Drivende sm�hagl"
-
-#: my-evolution/metar.c:244
-msgid "Freezing small hail"
-msgstr "Frysende sm�hagl"
-
-#. PRECIPITATION
-#: my-evolution/metar.c:247
-msgid "Unknown precipitation"
-msgstr "Ukendt nedb�r"
-
-#: my-evolution/metar.c:248
-msgid "Precipitation in the vicinity"
-msgstr "Nedb�r i omr�det"
-
-#: my-evolution/metar.c:249
-msgid "Light precipitation"
-msgstr "Let nedb�r"
-
-#: my-evolution/metar.c:250
-msgid "Moderate precipitation"
-msgstr "Moderat nedb�r"
-
-#: my-evolution/metar.c:251
-msgid "Heavy precipitation"
-msgstr "Kraftig nedb�r"
-
-#: my-evolution/metar.c:252
-msgid "Shallow precipitation"
-msgstr "Tynd nedb�r"
-
-#: my-evolution/metar.c:253
-msgid "Patches of precipitation"
-msgstr "Omr�der med nedb�r"
-
-#: my-evolution/metar.c:254
-msgid "Partial precipitation"
-msgstr "Delvis nedb�r"
-
-#: my-evolution/metar.c:255
-msgid "Unknown thunderstorm"
-msgstr "Ukendt tordenstorm"
-
-#: my-evolution/metar.c:256
-msgid "Blowing precipitation"
-msgstr "Bl�sende nedb�r"
-
-#: my-evolution/metar.c:257
-msgid "Showers, type unknown"
-msgstr "Byger, type ukendt"
-
-#: my-evolution/metar.c:258
-msgid "Drifting precipitation"
-msgstr "Drivende nedb�r"
-
-#: my-evolution/metar.c:259
-msgid "Freezing precipitation"
-msgstr "Frysende nedb�r"
-
-#. MIST
-#: my-evolution/metar.c:262
-msgid "Mist"
-msgstr "T�ge"
-
-#: my-evolution/metar.c:263
-msgid "Mist in the vicinity"
-msgstr "T�ge i omegnen"
-
-#: my-evolution/metar.c:264
-msgid "Light mist"
-msgstr "Let t�ge"
-
-#: my-evolution/metar.c:265
-msgid "Moderate mist"
-msgstr "Moderat t�ge"
-
-#: my-evolution/metar.c:266
-msgid "Thick mist"
-msgstr "Tyk t�ge"
-
-#: my-evolution/metar.c:267
-msgid "Shallow mist"
-msgstr "Tynd t�ge"
-
-#: my-evolution/metar.c:268
-msgid "Patches of mist"
-msgstr "Omr�der med t�ge"
-
-#: my-evolution/metar.c:269
-msgid "Partial mist"
-msgstr "Delvis t�ge"
-
-#: my-evolution/metar.c:271
-msgid "Mist with wind"
-msgstr "T�ge med vind"
-
-#: my-evolution/metar.c:273
-msgid "Drifting mist"
-msgstr "Drivende t�ge"
-
-#: my-evolution/metar.c:274
-msgid "Freezing mist"
-msgstr "T�ge og frost"
-
-#. FOG
-#: my-evolution/metar.c:277
-msgid "Fog"
-msgstr "Dis"
-
-#: my-evolution/metar.c:278
-msgid "Fog in the vicinity"
-msgstr "Dis i omr�det"
-
-#: my-evolution/metar.c:279
-msgid "Light fog"
-msgstr "Let dis"
-
-#: my-evolution/metar.c:280
-msgid "Moderate fog"
-msgstr "Moderat dis"
-
-#: my-evolution/metar.c:281
-msgid "Thick fog"
-msgstr "Tyk dis"
-
-#: my-evolution/metar.c:282
-msgid "Shallow fog"
-msgstr "Tynd dis"
-
-#: my-evolution/metar.c:283
-msgid "Patches of fog"
-msgstr "Omr�der med dis"
-
-#: my-evolution/metar.c:284
-msgid "Partial fog"
-msgstr "Delvis dis"
-
-#: my-evolution/metar.c:286
-msgid "Fog with wind"
-msgstr "Dis med vind"
-
-#: my-evolution/metar.c:288
-msgid "Drifting fog"
-msgstr "Drivende dis"
-
-#: my-evolution/metar.c:289
-msgid "Freezing fog"
-msgstr "Frysende dis"
-
-#. SMOKE
-#: my-evolution/metar.c:292
-msgid "Smoke"
-msgstr "R�g"
-
-#: my-evolution/metar.c:293
-msgid "Smoke in the vicinity"
-msgstr "R�g i omegnen"
-
-#: my-evolution/metar.c:294
-msgid "Thin smoke"
-msgstr "Tynd r�g"
-
-#: my-evolution/metar.c:295
-msgid "Moderate smoke"
-msgstr "Moderat r�g"
-
-#: my-evolution/metar.c:296
-msgid "Thick smoke"
-msgstr "Tyk r�g"
-
-#: my-evolution/metar.c:297
-msgid "Shallow smoke"
-msgstr "Let r�g"
-
-#: my-evolution/metar.c:298
-msgid "Patches of smoke"
-msgstr "Omr�der med r�g"
-
-#: my-evolution/metar.c:299
-msgid "Partial smoke"
-msgstr "Delvis r�g"
-
-#: my-evolution/metar.c:300
-msgid "Thunderous smoke"
-msgstr "Tordnende bygekast"
-
-#: my-evolution/metar.c:301
-msgid "Smoke with wind"
-msgstr "R�g med vind"
-
-#: my-evolution/metar.c:303
-msgid "Drifting smoke"
-msgstr "Drivende r�g"
-
-#. VOLCANIC_ASH
-#: my-evolution/metar.c:307
-msgid "Volcanic ash"
-msgstr "Vulkansk aske"
-
-#: my-evolution/metar.c:308
-msgid "Volcanic ash in the vicinity"
-msgstr "Vulkansk aske i omegnen"
-
-#: my-evolution/metar.c:310
-msgid "Moderate volcanic ash"
-msgstr "Moderat vulkansk aske"
-
-#: my-evolution/metar.c:311
-msgid "Thick volcanic ash"
-msgstr "Tyk vulkansk aske"
-
-#: my-evolution/metar.c:312
-msgid "Shallow volcanic ash"
-msgstr "Let vulkansk aske"
-
-#: my-evolution/metar.c:313
-msgid "Patches of volcanic ash"
-msgstr "Omr�der med vulkansk aske"
-
-#: my-evolution/metar.c:314
-msgid "Partial volcanic ash"
-msgstr "Delvis vulkansk aske"
-
-#: my-evolution/metar.c:315
-msgid "Thunderous volcanic ash"
-msgstr "Tordnende Vulkansk aske"
-
-#: my-evolution/metar.c:316
-msgid "Blowing volcanic ash"
-msgstr "Bl�sende vulkansk aske"
-
-#: my-evolution/metar.c:317
-msgid "Showers of volcanic ash"
-msgstr "Byger med vulkansk aske"
-
-#: my-evolution/metar.c:318
-msgid "Drifting volcanic ash"
-msgstr "Drivende vulkansk aske"
-
-#: my-evolution/metar.c:319
-msgid "Freezing volcanic ash"
-msgstr "Frysende vulkansk aske"
-
-#. SAND
-#: my-evolution/metar.c:322
-msgid "Sand"
-msgstr "Sand"
-
-#: my-evolution/metar.c:323
-msgid "Sand in the vicinity"
-msgstr "Sand i omegnen"
-
-#: my-evolution/metar.c:324
-msgid "Light sand"
-msgstr "Let sand"
-
-#: my-evolution/metar.c:325
-msgid "Moderate sand"
-msgstr "Moderat sand"
-
-#: my-evolution/metar.c:326
-msgid "Heavy sand"
-msgstr "Tungt sand"
-
-#: my-evolution/metar.c:328
-msgid "Patches of sand"
-msgstr "Omr�der med sand"
-
-#: my-evolution/metar.c:329
-msgid "Partial sand"
-msgstr "Delvis sand"
-
-#: my-evolution/metar.c:331
-msgid "Blowing sand"
-msgstr "Bl�sende sand"
-
-#: my-evolution/metar.c:333
-msgid "Drifting sand"
-msgstr "Drivende sand"
-
-#. HAZE
-#: my-evolution/metar.c:337
-msgid "Haze"
-msgstr "Dis"
-
-#: my-evolution/metar.c:338
-msgid "Haze in the vicinity"
-msgstr "Dis i omr�det"
-
-#: my-evolution/metar.c:339
-msgid "Light haze"
-msgstr "Let dis"
-
-#: my-evolution/metar.c:340
-msgid "Moderate haze"
-msgstr "Moderat dis"
-
-#: my-evolution/metar.c:341
-msgid "Thick haze"
-msgstr "Tyk dis"
-
-#: my-evolution/metar.c:342
-msgid "Shallow haze"
-msgstr "Tynd dis"
-
-#: my-evolution/metar.c:343
-msgid "Patches of haze"
-msgstr "Omr�der med dis"
-
-#: my-evolution/metar.c:344
-msgid "Partial haze"
-msgstr "Delvis dis"
-
-#: my-evolution/metar.c:346
-msgid "Haze with wind"
-msgstr "Dis med vind"
-
-#: my-evolution/metar.c:348
-msgid "Drifting haze"
-msgstr "Drivende dis"
-
-#: my-evolution/metar.c:349
-msgid "Freezing haze"
-msgstr "Frysende dis"
-
-# Spray betyder st�vregn men her bruges det om regn
-#. SPRAY
-#: my-evolution/metar.c:352
-msgid "Spray"
-msgstr "St�vregn"
-
-#: my-evolution/metar.c:353
-msgid "Spray in the vicinity"
-msgstr "St�vregn i omr�det"
-
-#: my-evolution/metar.c:354
-msgid "Light spray"
-msgstr "Let st�vregn"
-
-#: my-evolution/metar.c:355
-msgid "Moderate spray"
-msgstr "Moderat regn"
-
-#: my-evolution/metar.c:356
-msgid "Heavy spray"
-msgstr "Kraftige byger"
-
-#: my-evolution/metar.c:357
-msgid "Shallow spray"
-msgstr "Tynde byger"
-
-#: my-evolution/metar.c:358
-msgid "Patches of spray"
-msgstr "Spredte byger"
-
-#: my-evolution/metar.c:359
-msgid "Partial spray"
-msgstr "Spredte byger"
-
-#: my-evolution/metar.c:361
-msgid "Blowing spray"
-msgstr "Bl�sende byger"
-
-#: my-evolution/metar.c:363
-msgid "Drifting spray"
-msgstr "Drivende byger"
-
-#: my-evolution/metar.c:364
-msgid "Freezing spray"
-msgstr "Frysende byger"
-
-#. DUST
-#: my-evolution/metar.c:367
-msgid "Dust"
-msgstr "St�v"
-
-#: my-evolution/metar.c:368
-msgid "Dust in the vicinity"
-msgstr "St�v i omegnen"
-
-#: my-evolution/metar.c:369
-msgid "Light dust"
-msgstr "Let st�v"
-
-#: my-evolution/metar.c:370
-msgid "Moderate dust"
-msgstr "Moderat st�v"
-
-#: my-evolution/metar.c:371
-msgid "Heavy dust"
-msgstr "Tungt st�v"
-
-#: my-evolution/metar.c:373
-msgid "Patches of dust"
-msgstr "Omr�der med st�v"
-
-#: my-evolution/metar.c:374
-msgid "Partial dust"
-msgstr "Delvis st�v"
-
-#: my-evolution/metar.c:376
-msgid "Blowing dust"
-msgstr "Bl�sende st�v"
-
-#: my-evolution/metar.c:378
-msgid "Drifting dust"
-msgstr "Drivende st�v"
-
-#. SQUALL
-#: my-evolution/metar.c:382
-msgid "Squall"
-msgstr "Bygekast"
-
-#: my-evolution/metar.c:383
-msgid "Squall in the vicinity"
-msgstr "Bygekast i omr�det"
-
-#: my-evolution/metar.c:384
-msgid "Light squall"
-msgstr "Lette bygekast"
-
-#: my-evolution/metar.c:385
-msgid "Moderate squall"
-msgstr "Moderate bygekast"
-
-#: my-evolution/metar.c:386
-msgid "Heavy squall"
-msgstr "Kraftige bygekast"
-
-#: my-evolution/metar.c:389
-msgid "Partial squall"
-msgstr "Delvise bygekast"
-
-#: my-evolution/metar.c:390
-msgid "Thunderous squall"
-msgstr "Tordnende bygekast"
-
-#: my-evolution/metar.c:391
-msgid "Blowing squall"
-msgstr "Bl�sende bygekast"
-
-#: my-evolution/metar.c:393
-msgid "Drifting squall"
-msgstr "Drivende bygekast"
-
-#: my-evolution/metar.c:394
-msgid "Freezing squall"
-msgstr "Frysende bygekast"
-
-#. SANDSTORM
-#: my-evolution/metar.c:397
-msgid "Sandstorm"
-msgstr "Sandstorm"
-
-#: my-evolution/metar.c:398
-msgid "Sandstorm in the vicinity"
-msgstr "Sandstorm i omegnen"
-
-#: my-evolution/metar.c:399
-msgid "Light standstorm"
-msgstr "Let sandstorm"
-
-#: my-evolution/metar.c:400
-msgid "Moderate sandstorm"
-msgstr "Moderat sandstorm"
-
-#: my-evolution/metar.c:401
-msgid "Heavy sandstorm"
-msgstr "Tung sandstorm"
-
-#: my-evolution/metar.c:402
-msgid "Shallow sandstorm"
-msgstr "Tynd sandstorm"
-
-#: my-evolution/metar.c:404
-msgid "Partial sandstorm"
-msgstr "Delvis sandstorm"
-
-#: my-evolution/metar.c:405
-msgid "Thunderous sandstorm"
-msgstr "Sandstorm med torden"
-
-#: my-evolution/metar.c:406
-msgid "Blowing sandstorm"
-msgstr "Bl�sende sandstorm"
-
-#: my-evolution/metar.c:408
-msgid "Drifting sandstorm"
-msgstr "Drivende sandstorm"
-
-#: my-evolution/metar.c:409
-msgid "Freezing sandstorm"
-msgstr "Sandstorm med frost"
-
-#. DUSTSTORM
-#: my-evolution/metar.c:412
-msgid "Duststorm"
-msgstr "St�vstorm"
-
-#: my-evolution/metar.c:413
-msgid "Duststorm in the vicinity"
-msgstr "St�vstorm i omegnen"
-
-#: my-evolution/metar.c:414
-msgid "Light duststorm"
-msgstr "Let st�vstorm"
-
-#: my-evolution/metar.c:415
-msgid "Moderate duststorm"
-msgstr "Moderat st�vstorm"
-
-#: my-evolution/metar.c:416
-msgid "Heavy duststorm"
-msgstr "Tung st�vstorm"
-
-#: my-evolution/metar.c:417
-msgid "Shallow duststorm"
-msgstr "Tynd st�vstorm"
-
-#: my-evolution/metar.c:419
-msgid "Partial duststorm"
-msgstr "Delvis st�vstorm"
-
-#: my-evolution/metar.c:420
-msgid "Thunderous duststorm"
-msgstr "St�vstorm med torden"
-
-#: my-evolution/metar.c:421
-msgid "Blowing duststorm"
-msgstr "Bl�sende st�vstorm"
-
-#: my-evolution/metar.c:423
-msgid "Drifting duststorm"
-msgstr "Drivende st�vstorm"
-
-#: my-evolution/metar.c:424
-msgid "Freezing duststorm"
-msgstr "St�vstorm med frost"
-
-#. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
-msgid "Funnel cloud"
-msgstr "R�gsky"
-
-#: my-evolution/metar.c:428
-msgid "Funnel cloud in the vicinity"
-msgstr "R�gsky i omr�det"
-
-#: my-evolution/metar.c:429
-msgid "Light funnel cloud"
-msgstr "Let r�gsky"
-
-#: my-evolution/metar.c:430
-msgid "Moderate funnel cloud"
-msgstr "Moderat r�gsky"
-
-#: my-evolution/metar.c:431
-msgid "Thick funnel cloud"
-msgstr "Tyk r�gsky"
-
-#: my-evolution/metar.c:432
-msgid "Shallow funnel cloud"
-msgstr "Tynd r�gsky"
-
-#: my-evolution/metar.c:433
-msgid "Patches of funnel clouds"
-msgstr "Omr�der med r�gskyer"
-
-#: my-evolution/metar.c:434
-msgid "Partial funnel clouds"
-msgstr "Delvise r�gskyer"
-
-#: my-evolution/metar.c:436
-msgid "Funnel cloud w/ wind"
-msgstr "R�gsky med vind"
-
-#: my-evolution/metar.c:438
-msgid "Drifting funnel cloud"
-msgstr "Drivende r�gsky"
-
-#. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
-msgid "Tornado"
-msgstr "Tornado"
-
-#: my-evolution/metar.c:443
-msgid "Tornado in the vicinity"
-msgstr "Tornado i omegnen"
-
-#: my-evolution/metar.c:445
-msgid "Moderate tornado"
-msgstr "Moderat tornado"
-
-#: my-evolution/metar.c:446
-msgid "Raging tornado"
-msgstr "Rasende tornado"
-
-#: my-evolution/metar.c:449
-msgid "Partial tornado"
-msgstr "Delvis tornado"
-
-#: my-evolution/metar.c:450
-msgid "Thunderous tornado"
-msgstr "Tornado med torden"
-
-#: my-evolution/metar.c:453
-msgid "Drifting tornado"
-msgstr "Drivende tornado"
-
-#: my-evolution/metar.c:454
-msgid "Freezing tornado"
-msgstr "Tornado med frost"
-
-#. DUST_WHIRLS
-#: my-evolution/metar.c:457
-msgid "Dust whirls"
-msgstr "St�vhvirvler"
-
-#: my-evolution/metar.c:458
-msgid "Dust whirls in the vicinity"
-msgstr "St�vhvirvler i omegnen"
-
-#: my-evolution/metar.c:459
-msgid "Light dust whirls"
-msgstr "Lette st�vhvirvler"
-
-#: my-evolution/metar.c:460
-msgid "Moderate dust whirls"
-msgstr "Moderate st�vhvirvler"
-
-#: my-evolution/metar.c:461
-msgid "Heavy dust whirls"
-msgstr "Tunge st�vhvirvler"
-
-#: my-evolution/metar.c:462
-msgid "Shallow dust whirls"
-msgstr "Tynde st�vhvirvler"
-
-#: my-evolution/metar.c:463
-msgid "Patches of dust whirls"
-msgstr "Omr�der med st�vhvirvler"
-
-#: my-evolution/metar.c:464
-msgid "Partial dust whirls"
-msgstr "Delvise st�vhvirvler"
-
-#: my-evolution/metar.c:466
-msgid "Blowing dust whirls"
-msgstr "Bl�sende st�vhvirvler"
-
-#: my-evolution/metar.c:468
-msgid "Drifting dust whirls"
-msgstr "Drivende st�vhvirvler"
-
-#: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr " Fje_rn"
-
-#: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ews feed"
-msgstr "Til_f�j nyhedstjeneste"
-
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "Al_le stationer:"
-
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "Alle _mapper:"
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "Alle _nyhedstjenester"
-
-#: my-evolution/my-evolution.glade.h:6
-msgid "C_elsius"
-msgstr "C_elsius"
-
-#: my-evolution/my-evolution.glade.h:8
-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:9
-msgid "Ma_x number of items shown:"
-msgstr "Ma_ksimalt antal opf�ringer som vises:"
-
-#: my-evolution/my-evolution.glade.h:10
-msgid "News Feed Settings"
-msgstr "Indstillinger for nyhedstjeneste"
-
-#: my-evolution/my-evolution.glade.h:11
-msgid "One mont_h"
-msgstr "E_n m�ned"
-
-#: my-evolution/my-evolution.glade.h:12
-msgid "One w_eek"
-msgstr "_En uge"
-
-#: my-evolution/my-evolution.glade.h:13
-msgid "R_efresh time (seconds):"
-msgstr "Opdat_eringstid (sekunder):"
-
-#: my-evolution/my-evolution.glade.h:14
-msgid "Refresh _time (seconds):"
-msgstr "Opda_teringstid (sekunder):"
-
-#: my-evolution/my-evolution.glade.h:15
-msgid "S_how full path for folders"
-msgstr "V_is fuld sti for mapper"
-
-#: my-evolution/my-evolution.glade.h:16
-msgid "Show _all tasks"
-msgstr "Vis _alle opgaver"
-
-#: my-evolution/my-evolution.glade.h:17
-msgid "Show _today's tasks"
-msgstr "Vis _opgaver for i dag"
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Show temperatures in:"
-msgstr "Vis temperatur i:"
-
-#: my-evolution/my-evolution.glade.h:19
-msgid "Tasks "
-msgstr "Opgaver "
-
-#: my-evolution/my-evolution.glade.h:20
-msgid "Weather settings"
-msgstr "Indstillinger for vejr"
-
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "_Vis mapper:"
-
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "_Vis stationer:"
-
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
-msgstr "_Viste tjenester:"
-
-#: my-evolution/my-evolution.glade.h:25
-msgid "_Fahrenheit"
-msgstr "_Fahrenheit"
-
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Five days"
-msgstr "_Fem dage"
-
-#: my-evolution/my-evolution.glade.h:27
-msgid "_Mail"
-msgstr "_E-post"
-
-#: my-evolution/my-evolution.glade.h:28
-msgid "_News Feeds"
-msgstr "_Nyhedstjenester"
-
-#: my-evolution/my-evolution.glade.h:29
-msgid "_One day"
-msgstr "_En dag"
-
-#: my-evolution/my-evolution.glade.h:30
-msgid "_Schedule"
-msgstr "_Afs�t tid"
-
-#: my-evolution/my-evolution.glade.h:31
-msgid "_Weather"
-msgstr "_Vejr"
+#: 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"
@@ -14796,7 +14258,8 @@ msgid "Chattanooga"
 msgstr "Chattanooga"
 
 #: my-evolution/Locations.h:415
-msgid "Chebogsary"
+#, fuzzy
+msgid "Cheboksary"
 msgstr "Chebogsary"
 
 #: my-evolution/Locations.h:416
@@ -15512,7458 +14975,8888 @@ 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 "Dodge City"
 
-#: 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 "F�rdig"
+
+#: 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 "D�sseldorf"
 
-#: 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 "�st-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 "�st 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 internationale lufthavn"
 
-#: 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 "Elizabeth City"
 
-#: my-evolution/Locations.h:657
+#: my-evolution/Locations.h:659
 msgid "Elk City"
 msgstr "Elk City"
 
-#: 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 internationale lufthavn"
 
-#: 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 "Europa"
 
-#: 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 "Falls City"
 
-#: 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 "F�rde/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 "Frankfurt"
 
-#: 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 "Fukue lufthavn"
 
-#: my-evolution/Locations.h:782
+#: my-evolution/Locations.h:784
 msgid "Fukui Airport"
 msgstr "Fukui lufthavn"
 
-#: my-evolution/Locations.h:783
+#: my-evolution/Locations.h:785
 msgid "Fukuoka Airport"
 msgstr "Fukuoka lufthavn"
 
-#: 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 Makedonia"
 
-#: 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 "Garden City"
 
-#: 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 "Gen�ve"
 
-#: 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 "George lufthavn"
 
-#: 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 "Goose Bay"
 
-#: my-evolution/Locations.h:828
+#: my-evolution/Locations.h:830
 msgid "Goteborg (Landvetter)"
 msgstr "G�teborg (Landvetter)"
 
-#: my-evolution/Locations.h:829
+#: my-evolution/Locations.h:831
 msgid "Goteborg (Save)"
 msgstr "G�teborg (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 "Grand Island"
 
-#: 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 "Green Bay"
 
-#: 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 "Guadelupe 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 "Gullfaks 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 "Havana"
 
-#: my-evolution/Locations.h:879
+#: my-evolution/Locations.h:881
 msgid "Hachijojima Airport"
 msgstr "Hachijojima lufthavn"
 
-#: 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 "Hagl"
+
+#: 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 "Hakodate lufthavn"
 
-#: 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 "Hanamaki lufthavn"
 
-#: 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 "Ha Noi"
 
-#: 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 "Hill City"
 
-#: 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 "Hiroshima lufthavn"
 
-#: 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 "Ho Chi 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 "Honningsv�g"
 
-#: 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 "Iki lufthavn"
 
-#: 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 "Innsbr�ck"
 
-#: 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 "Iowa City"
 
-#: 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 "Den islamske republik Iran"
 
-#: 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 "Izumo lufthavn"
 
-#: 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 "Jacksonville-Craig lufthavn"
 
-#: 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 "Jeddah kong Abdul Aziz internationale lufthavn"
 
-#: my-evolution/Locations.h:1034
+#: my-evolution/Locations.h:1037
 msgid "Jefferson City"
 msgstr "Jefferson City"
 
-#: 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 "J�nk�ping"
 
-#: 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 "Kagoshima lufthavn"
 
-#: 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 "Kansai internationale lufthavn"
 
-#: 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 "Kansas City"
 
-#: my-evolution/Locations.h:1066
+#: my-evolution/Locations.h:1069
 msgid "Kansas City-Gladstone"
 msgstr "Kansas City-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 "Kasuminime 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 "Kikai Island"
 
-#: 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 "Kong Khaled internationale lufthavn"
 
-#: 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 "Kitakyushu lufthavn"
 
-#: 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 "K�benhavn/Kastrup"
 
-#: my-evolution/Locations.h:1117
+#: my-evolution/Locations.h:1121
 msgid "Kobenhavn/Roskilde"
 msgstr "K�benhavn/Roskilde"
 
-#: my-evolution/Locations.h:1118
+#: my-evolution/Locations.h:1122
 msgid "Kochi Airport"
 msgstr "Kochi lufthavn"
 
-#: 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 "K�ln/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 "Den demokratiske folkerepublik Korea"
 
-#: my-evolution/Locations.h:1129
+#: my-evolution/Locations.h:1133
 msgid "Korea, Republic of"
 msgstr "Den koreanske republik"
 
-#: 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 "Kumanoto lufthavn"
 
-#: 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 "Kushiro lufthavn"
 
-#: 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:1191
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1185
+#: my-evolution/Locations.h:1192
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1186
+#: my-evolution/Locations.h:1193
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1187
+#: my-evolution/Locations.h:1194
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1188
+#: my-evolution/Locations.h:1195
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1189
+#: my-evolution/Locations.h:1196
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1190
+#: my-evolution/Locations.h:1197
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1199
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1200
 msgid "Leeds and Bradford"
 msgstr "Leeds og Bradford"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1201
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1202
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1203
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1204
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1205
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1206
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1207
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1208
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1209
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1210
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1211
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1212
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1213
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1214
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1215
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1216
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1217
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1219
 msgid "Libya"
 msgstr "Libya"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1220
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1221
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1222
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1223
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1224
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1225
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1226
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1227
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1228
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1229
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1230
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1231
 msgid "Lisboa"
 msgstr "Lissabon"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1232
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1233
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1235
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1236
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1237
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1238
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1239
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1240
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1241
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1242
 msgid "Lolland Falster"
 msgstr "Lolland-Falster"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1243
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1244
 msgid "London"
 msgstr "London"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1245
 msgid "London/City"
 msgstr "London/City"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1246
 msgid "London/Gatwick"
 msgstr "London/Gatwick"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1247
 msgid "London/Heathrow"
 msgstr "London/Heathrow"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1248
 msgid "London/Stansted"
 msgstr "London/Stansted"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1249
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1250
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1251
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1252
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1253
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1254
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1255
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1256
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1257
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1258
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1259
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1260
 msgid "Lousiana"
 msgstr "Louisiana"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1261
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1262
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1263
 msgid "Lubeck-Blankensee"
 msgstr "L�beck-Blankensee"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1264
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1265
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1266
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1267
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1269
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1270
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1271
+#, fuzzy
+msgid "Lviv"
+msgstr "Letland"
+
+#: my-evolution/Locations.h:1272
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1273
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1275
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1276
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1277
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1278
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1279
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1280
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1281
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1282
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1283
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1285
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1286
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1287
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1288
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1289
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1290
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1291
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1292
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1293
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1294
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1295
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1296
 msgid "Malmo/Sturup"
 msgstr "Malm�/Sturup"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1298
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1299
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1300
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1301
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1302
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1303
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1304
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1305
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1306
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1307
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1308
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1309
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1310
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1311
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1312
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1313
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1314
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1315
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1316
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1317
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1318
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1319
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1320
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1321
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1322
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1323
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1324
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1325
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1326
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1327
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1328
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1329
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1330
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1331
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1332
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1333
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1334
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1335
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1336
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1337
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1338
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1339
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1340
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1341
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1342
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1343
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1344
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1345
 msgid "Matsumoto Airport"
 msgstr "Matsumoto lufthavn"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1346
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1347
 msgid "Matsuyama Airport"
 msgstr "Matsuyama lufthavn"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1348
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1349
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1350
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1351
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1352
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1353
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1354
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1355
 msgid "McCall"
 msgstr "McAll"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1356
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1357
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1358
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1359
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1360
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1361
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1362
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1363
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1364
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1365
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1366
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1367
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1368
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1369
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1370
 msgid "Memambetsu Airport"
 msgstr "Memambetsu lufthavn"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1371
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1372
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1373
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1374
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1375
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1376
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1377
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1378
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1379
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1380
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1381
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1382
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1383
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1384
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1385
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1386
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1388
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1389
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1390
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1391
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1392
 msgid "Middle East"
 msgstr "Mellem�sten"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1393
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1394
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1395
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1396
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1397
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1398
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1399
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1400
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1401
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1402
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1403
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1405
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1406
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1407
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1408
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1409
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1410
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1413
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1414
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1415
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1416
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1417
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1418
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1419
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1420
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1421
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1422
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1423
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1424
 msgid "Miyakejima Airport"
 msgstr "Miyakejima lufthavn"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1425
 msgid "Miyazaki Airport"
 msgstr "Miyazaki lufthavn"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1426
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1427
 msgid "Mobile Downtown"
 msgstr "Mobile centrum"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1428
 msgid "Mobile Regional Airport"
 msgstr "Mobile regionale lufthavn"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1429
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1430
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1431
 msgid "Mo I Rana"
 msgstr "Mo i rana"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1432
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1433
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1434
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1435
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1436
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1437
 msgid "Mombetsu Airport"
 msgstr "Mombetsu lufthavn"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1438
 msgid "Monchengladbach"
 msgstr "M�nchengladbach"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1439
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1440
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1441
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1442
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1443
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1444
 msgid "Montague"
 msgstr "Montaque"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1445
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1446
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1447
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1448
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1449
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1450
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1451
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1452
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1453
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1454
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1455
 msgid "Monte Scuro"
 msgstr "Monte Sucro"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1456
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1457
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1458
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1459
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1460
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1461
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1462
 msgid "Montreal Dorval"
 msgstr "Montr�al Dorval"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1463
 msgid "Montreal Mirabel"
 msgstr "Montr�al Mirabel"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1464
 msgid "Montreal Saint-Hubert"
 msgstr "Montr�al Saint-Hubert"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1465
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1466
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1467
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1468
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1469
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1471
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1472
 msgid "Moscow Domodedovo"
 msgstr "Moskva Domodedovo"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1473
 msgid "Moscow Sheremetyevo"
 msgstr "Moskva Sheremetyevo"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1474
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1475
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1476
 msgid "Mosjoen"
 msgstr "Mosj�en"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1477
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1478
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1479
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1480
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1481
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1482
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1483
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1484
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1485
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1486
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1487
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1488
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1489
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1490
 msgid "Munchen"
 msgstr "M�nchen"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1491
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1492
 msgid "Munster/Osnabruck"
 msgstr "M�nster/Osnabr�ck"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1493
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1494
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1495
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1496
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1497
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1498
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1499
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1500
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1501
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1502
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1503
 msgid "Nagasaki Airport"
 msgstr "Nagasaki lufthavn"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1504
 msgid "Nagoya Airport"
 msgstr "Nagoya lufthavn"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1505
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1506
 msgid "Naha Airport"
 msgstr "Naha lufthavn"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1507
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1508
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu lufthavn"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1509
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1510
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1512
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1513
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama lufthavn"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1514
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1515
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1516
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1517
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1518
 msgid "Naples"
 msgstr "Naples"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1519
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1520
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1521
 msgid "Nasa Shuttle"
 msgstr "Nasas rumf�rge"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1522
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1523
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1524
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1525
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1526
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1527
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1528
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1529
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1530
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1532
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1533
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1534
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1535
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1536
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1537
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1538
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1539
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1540
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1541
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1542
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1543
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1544
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1545
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1546
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1547
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1548
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1549
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1550
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1551
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1552
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1553
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1554
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1555
 msgid "New Tokyo International Airport"
 msgstr "Nye Tokyo internationale lufthavn"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1556
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1557
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1558
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK lufthavn"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1559
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1561
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1563
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-C�te d'Azur"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1564
 msgid "Niigata Airport"
 msgstr "Niigata lufthavn"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1565
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1566
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1567
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1568
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1569
 msgid "N Las Vegas"
 msgstr "Las Vegas N"
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1570
 msgid "N Myrtle Beach"
 msgstr "Myrtle Beach N"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1571
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1572
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1573
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1575
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1576
 msgid "Norrkoping"
 msgstr "Norrk�ping"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1577
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1578
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1579
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1580
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1581
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1582
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1583
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1584
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1585
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1586
 msgid "Northwest Territories"
 msgstr "Nordvest-territoriet"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1588
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1589
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1590
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1591
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1592
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1593
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1594
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1595
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1596
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1597
 msgid "Nurnberg"
 msgstr "N�rnberg"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1598
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1599
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1600
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1601
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1602
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1603
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1604
 msgid "Obihiro Airport"
 msgstr "Obihiro lufthavn"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1605
 msgid "Ocala"
 msgstr "Ocalu"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1606
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1607
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1608
+#, fuzzy
+msgid "Odesa"
+msgstr "Odense"
+
+#: my-evolution/Locations.h:1609
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1610
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1611
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1612
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1613
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1614
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1615
 msgid "Oita Airport"
 msgstr "Oita lufthavn"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1616
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1617
 msgid "Okayama Airport"
 msgstr "Okayama lufthavn"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1618
 msgid "Oki Airport"
 msgstr "Oki lufthavn"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1619
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1623
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1624
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1625
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1626
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1627
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1628
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1629
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1630
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1631
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1633
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1634
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1635
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1636
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1637
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1638
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1639
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1640
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1641
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1642
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1643
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1644
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1645
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1646
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1647
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando internationale)"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1648
 msgid "Orsta-Volda"
 msgstr "�rsta-Volda"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1649
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1650
 msgid "Osaka International Airport"
 msgstr "Osaka internationale lufthavn"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1651
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1652
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1653
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1654
 msgid "Oshima Airport"
 msgstr "Oshima lufthavn"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1655
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1656
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardemoen"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1657
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1658
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1659
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1660
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1661
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1662
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1663
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1664
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1665
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1666
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1667
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1668
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1669
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1670
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1671
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1674
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1675
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1676
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1677
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1678
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1679
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1680
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1681
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1682
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1684
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1685
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1686
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1687
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1689
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1690
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1691
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1692
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1693
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1694
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1695
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1696
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1697
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1698
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1699
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1700
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1701
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1702
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1703
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1704
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyreneene"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1705
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1706
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1707
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1708
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1709
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1710
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1711
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1712
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1713
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1714
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1715
 msgid "People's Republic of China"
 msgstr "Folkerepublikken Kina"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1716
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1717
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1718
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1719
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1720
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpugnan-Rivesaltes"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1721
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1722
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1724
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1725
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1726
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1727
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1728
 msgid "Petrozavodsk"
 msgstr "Petrozadovsk"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1729
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1730
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1731
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1732
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1733
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1736
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1737
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1738
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1739
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1740
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1741
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1742
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1743
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1744
 msgid "Pingtung North"
 msgstr "Pingtung nord"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1745
 msgid "Pingtung South"
 msgstr "Pingtung syd"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1746
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1747
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1748
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1750
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1751
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1752
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1753
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1754
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1755
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1756
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1757
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1758
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1759
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1760
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1761
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1762
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1763
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1765
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1766
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1767
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1768
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1769
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1770
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1771
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1772
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1773
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1774
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1775
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1776
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1777
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1778
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1779
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1780
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1781
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1782
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1783
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1785
 msgid "Porto Alegre Apt"
 msgstr "Porte Alegre Apt"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1786
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1787
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1788
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1789
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1790
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1792
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1793
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1794
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1795
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1796
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1797
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1798
 msgid "Praha"
 msgstr "Prag"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1799
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1800
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1801
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1802
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1803
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1804
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1805
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1806
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1807
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1808
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1809
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1810
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1811
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1812
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1813
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1814
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1815
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1816
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1817
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1818
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1819
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1820
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1821
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1822
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1823
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1825
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1826
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1827
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1828
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1829
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1830
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1831
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1832
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1833
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1834
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1835
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1837
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1838
 msgid "Quebec"
 msgstr "Qu�bec"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1839
 msgid "Quebec City"
 msgstr "Qu�bec City"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1840
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1841
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1842
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1843
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1844
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1845
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1846
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1847
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1848
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1849
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1850
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1851
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1852
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1853
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1854
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1855
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1856
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1857
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1858
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1859
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1860
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1861
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1862
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1863
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1864
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1865
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1866
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1867
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1868
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1869
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1870
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1871
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1872
 msgid "Reykjavik"
 msgstr "Reykjav�k"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1873
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1874
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1875
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1876
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1877
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1878
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1879
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1880
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1881
 msgid "Riga"
 msgstr "Riga"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1882
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1883
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1884
 msgid "Rio De Janeiro"
 msgstr "Rio de Janeiro"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1885
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1886
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1887
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1888
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1889
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1890
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1891
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1892
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1893
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1894
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1895
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "Rivera"
+
+#: my-evolution/Locations.h:1897
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1898
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1899
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1900
 msgid "Roatan"
 msgstr "Rostan"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1901
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1902
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1903
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1904
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1905
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1906
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1907
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1908
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1909
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1910
 msgid "Roma/Ciampino"
 msgstr "Rom/Ciampino"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1911
 msgid "Roma/Fiumicino"
 msgstr "Rom/Fiumicino"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1913
 msgid "Roma/Urbe"
 msgstr "Rom/Urbe"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1914
 msgid "Rome-Russell"
 msgstr "Rome-Russel"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1915
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1916
 msgid "Ronneby"
 msgstr "R�nneby"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1917
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1918
 msgid "Roros"
 msgstr "R�ros"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1919
 msgid "Rorvik/Ryum"
 msgstr "R�rvik/Ryum"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1920
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1921
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1922
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1923
 msgid "Rost"
 msgstr "R�st"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1924
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1925
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1926
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1927
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1928
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1929
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1930
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1931
 msgid "Russia"
 msgstr "Rusland"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1932
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1933
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1934
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1935
 msgid "Saarbrucken"
 msgstr "Saarbr�cken"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1936
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1937
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1938
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1939
 msgid "Safford-Municipal Airport"
 msgstr "Safford kommunale lufthavn"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1940
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1941
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1942
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1943
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1944
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1945
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1946
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1947
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1948
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1949
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1950
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1951
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1952
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1953
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1954
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1955
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1956
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1957
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1958
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1959
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1960
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1961
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1962
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1963
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1964
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1965
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1966
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1967
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1968
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1969
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1970
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1971
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1972
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1973
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1974
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1975
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1976
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1977
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1978
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1979
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1980
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1984
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1985
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1986
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessj�en/Stokka"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1987
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1988
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1989
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1990
 msgid "San Francisco"
 msgstr "San Fransisco"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1991
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1992
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1993
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1994
 msgid "San Jose"
 msgstr "San Jos�"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1995
 msgid "San Jose De Chiquitos"
 msgstr "San Jos� De Chiquitos"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1996
 msgid "San Jose del Cabo"
 msgstr "San Jos� del Cabo"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1997
 msgid "San Jose-Santa Clara"
 msgstr "San Jos�-Santa Clara"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1998
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1999
 msgid "Sankt-Peterburg"
 msgstr "St. Petersburg"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:2000
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:2001
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:2002
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:2003
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:2004
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:2005
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:2006
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:2007
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:2008
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:2009
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:2010
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2011
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2012
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2013
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2014
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2015
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2016
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2017
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2018
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2019
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2020
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2021
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2022
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2023
 msgid "Sao Jose Dos Campo"
 msgstr "San Jos� Dos Campo"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2024
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2025
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2026
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2027
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2028
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2029
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2030
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2031
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2032
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2033
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2034
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2036
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2037
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2038
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2039
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2040
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2041
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2042
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2043
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2044
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2045
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2046
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2047
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2048
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2049
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2050
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2051
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2052
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2053
 msgid "Sendai Airport"
 msgstr "Sendai lufthavn"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2054
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2055
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O internationale lufthavn"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2056
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2057
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2058
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2059
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2060
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2061
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2062
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2063
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2064
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2065
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheik internationale"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2066
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2067
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2068
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2069
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2070
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2071
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2072
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2073
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2074
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2075
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2076
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2077
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2078
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2079
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2080
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2081
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2082
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2083
 msgid "Shreveport Downtown"
 msgstr "Shreveport centrum"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2084
 msgid "Shreveport Regional"
 msgstr "Shreveport regionale"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2085
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2086
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2087
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2088
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2089
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2091
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2092
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2093
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2094
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2095
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2096
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2097
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2098
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2099
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2100
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2101
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2102
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2105
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2106
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2107
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2108
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2109
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2110
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2111
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2112
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2113
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2114
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2115
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2116
 msgid "Sonderborg"
 msgstr "S�nderborg"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2117
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2118
 msgid "Sorkjosen"
 msgstr "S�rkjosen"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2120
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2121
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2122
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2123
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2124
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2125
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2126
 msgid "South Timbalier"
 msgstr "Timbalier syd"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2128
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2129
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2130
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2131
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2132
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2133
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2124
-msgid "Springbog"
+#: my-evolution/Locations.h:2134
+#, fuzzy
+msgid "Springbok"
 msgstr "Springbog"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2135
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2136
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2137
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2138
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2139
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2140
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2141
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2142
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2143
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2144
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2145
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2146
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2147
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2148
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2149
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2150
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2151
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2152
 msgid "St Louis-Spirit"
 msgstr "St. Louis-Spirit"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2153
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2154
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2155
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2156
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2157
 msgid "Stord/Sorstokken"
 msgstr "Stord/S�rstokken"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2158
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2159
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2160
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2161
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2162
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2163
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2164
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2165
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2166
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2167
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2168
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2169
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2170
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2171
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2172
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2173
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2174
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2175
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2177
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2178
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2179
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2180
 msgid "Svolvaer/Helle"
 msgstr "Svolv�r/Helle"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2182
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2184
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2185
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2186
+#, fuzzy
+msgid "Sympheropol"
+msgstr "Stavropol"
+
+#: my-evolution/Locations.h:2187
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2188
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2189
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2190
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2191
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2192
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2193
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2194
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2195
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2196
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2197
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2198
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2199
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2200
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2201
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2202
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2203
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2204
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2206
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2207
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2208
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2209
 msgid "Takamatsu Airport"
 msgstr "Takamatsu lufthavn"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2210
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2211
 msgid "Talinn"
 msgstr "Talinn"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2212
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2213
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2214
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2215
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2216
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2217
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2218
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2219
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2220
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2221
 msgid "Tanegashima Airport"
 msgstr "Tanegashima lufthavn"
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2222
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2223
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2224
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2225
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2226
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2227
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2228
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2229
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2230
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2231
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2232
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2233
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2234
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2235
 msgid "Tehran-Mehrabad"
 msgstr "Teheran-Mehrabad"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2236
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2237
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2238
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2239
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2240
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2241
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2242
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2243
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2244
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2245
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2246
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2247
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2248
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2249
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2250
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2251
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2252
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2253
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2254
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2255
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2256
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2257
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2258
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2259
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2260
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2261
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2262
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2263
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2264
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2265
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2266
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2267
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2268
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2269
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2270
 msgid "Tokyo Heliport"
 msgstr "Tokyo heliport"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2271
 msgid "Tokyo International Airport"
 msgstr "Tokyi internationale lufthavn"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2272
 msgid "Tokyo New International Airport"
 msgstr "Tokyo nye internationale lufthavn"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2273
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2274
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2275
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2276
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2277
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2278
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2279
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2280
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2281
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2282
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2283
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2284
 msgid "Tottori Airport"
 msgstr "Tottori lufthavn"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2285
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2286
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2287
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2288
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2289
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2290
 msgid "Toyama Airport"
 msgstr "Toyama lufthavn"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2291
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2292
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2293
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2294
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2295
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2296
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2297
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2298
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2299
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2300
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2301
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2302
 msgid "Tromso/Langnes"
 msgstr "Troms�/Langnes"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2303
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/V�rnes"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2304
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2305
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2306
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2307
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2308
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2309
 msgid "Tsushima Airport"
 msgstr "Tsushima lufthavn"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2310
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2311
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2312
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2313
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2314
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2315
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2316
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2317
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2318
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2319
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2320
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2322
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2323
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2324
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2325
 msgid "Twenthe"
 msgstr "Twente"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2326
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2327
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2328
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2329
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2330
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2331
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2332
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2333
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2335
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2336
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2337
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2338
 msgid "Umea"
 msgstr "Ume�"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2339
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2340
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2341
 msgid "United Arab Emirates "
 msgstr "De forenede arabiske emirater"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2344
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2345
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2346
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2347
 msgid "Uruguaiana"
 msgstr "Uruguay"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2349
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2350
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2351
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2352
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/S�sterberg"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2353
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2354
+#, fuzzy
+msgid "Uzhgorod"
+msgstr "Europa/Uzhgorod"
+
+#: my-evolution/Locations.h:2355
 msgid "Vadso"
 msgstr "Vads�"
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2356
 msgid "Vaerlose"
 msgstr "V�rl�se"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2357
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2358
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2359
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2360
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2361
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2362
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2363
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2364
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2365
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2366
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2367
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2368
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2369
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2370
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2371
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2372
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2373
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2374
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2375
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2376
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2377
 msgid "Vasteras"
 msgstr "V�ster�s"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2378
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2379
 msgid "Venezia"
 msgstr "Venedig"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2381
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2382
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2383
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2384
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2385
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2386
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2387
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2388
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2389
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2390
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2391
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2393
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2394
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2395
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2396
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2397
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2398
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2399
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2400
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2401
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2402
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2403
 msgid "Virginia Tech Airport"
 msgstr "Virginia tekniske lufthavn"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2404
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2405
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2406
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2407
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2408
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2409
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2410
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2411
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2412
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2413
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2414
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2415
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2416
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2417
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2418
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2419
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser lufthavn"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2420
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2421
 msgid "Wakefield"
 msgstr "Wakesfield"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2422
 msgid "Wakkanai Airport"
 msgstr "Wakkanai lufthavn"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2423
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2424
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2425
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2426
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2427
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2428
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2429
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2430
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2431
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2432
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2433
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2434
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2435
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2436
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2437
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2438
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2439
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2440
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2441
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2442
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2443
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2444
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2445
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2446
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2447
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2448
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2449
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2450
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2451
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2452
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2453
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2454
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2455
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2456
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2457
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2458
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2459
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2460
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2461
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2462
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2463
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2464
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2465
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2466
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2467
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2468
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2469
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2470
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2471
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2472
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2473
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2474
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2475
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2476
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2477
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2478
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2479
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2480
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2481
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2482
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2483
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2484
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2485
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2486
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2487
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2488
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2489
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2490
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2491
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2492
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2493
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2494
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2495
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2496
 msgid "Wuchia Observatory"
 msgstr "Wuchia obervatorie"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2497
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2498
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2499
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2500
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2501
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2502
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2503
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2504
 msgid "Yamagata Airport"
 msgstr "Yamagata lufthavn"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2505
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube lufthavn"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2506
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2507
 msgid "Yao Airport"
 msgstr "Yao lufthavn"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2508
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2509
 msgid "Yekaterinburg"
 msgstr "Jekaterinburg"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2510
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2511
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2513
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2514
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2515
 msgid "Yeonpyeungdo"
 msgstr "Yeinpyeungdo"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2516
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2517
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2518
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2519
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2520
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2521
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2522
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2523
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2525
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2526
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2527
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2528
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2529
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2530
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2531
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2532
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2533
 msgid "Zama Airfield"
 msgstr "Zama lufthavn"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2534
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2535
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2536
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2537
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2538
 msgid "Zurich"
 msgstr "Z�rich"
 
+#: my-evolution/component-factory.c:51
+msgid "Folder containing the Evolution Summary"
+msgstr "Mappe som indeholder Evolution sammendrag"
+
+#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
+msgid "Appointments"
+msgstr "Aftaler"
+
+#: my-evolution/e-summary-calendar.c:366
+msgid "No appointments"
+msgstr "Ingen aftaler"
+
+#: 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 "Inegn beskrivelse"
+
+#: my-evolution/e-summary-mail.c:151
+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
+msgid "Local Folders"
+msgstr "Lokale mapper"
+
+#. 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:92
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary-preferences.c:471
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Ord for dagen"
+
+#: my-evolution/e-summary-preferences.c:492
+msgid "Quotes of the Day"
+msgstr "Dagens citater"
+
+#: my-evolution/e-summary-preferences.c:720
+msgid "Add a news feed"
+msgstr "Tilf�j nyheds-server"
+
+#: my-evolution/e-summary-preferences.c:728
+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
+msgid "Error downloading RDF"
+msgstr "Fejl under nedhentning af RDF"
+
+#: my-evolution/e-summary-rdf.c:444
+msgid "News Feed"
+msgstr "Nyhedstjenester"
+
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+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
+#, fuzzy
+msgid "Shown"
+msgstr "Regnbyger"
+
+#: my-evolution/e-summary-tasks.c:251
+msgid "No tasks"
+msgstr "Ingen opgaver"
+
+#: my-evolution/e-summary-tasks.c:291
+msgid "(No Description)"
+msgstr "(Ingen beskrivelse)"
+
+#: my-evolution/e-summary-weather.c:71
+msgid "My Weather"
+msgstr "Min vejrbesked"
+
+#: 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 "Vejr"
+
+#: my-evolution/e-summary.c:193
+msgid "%A, %B %e %Y"
+msgstr "%A %e. %B %Y"
+
+#: my-evolution/e-summary.c:488
+msgid "Please wait..."
+msgstr "Venligst vent..."
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Udskriv sammendrag"
+
+#: my-evolution/e-summary.c:626
+msgid "Printing of Summary failed"
+msgstr "Fejl under udskrift af sammendrag"
+
+#: my-evolution/main.c:65
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "Executive summary komponent kunne ikke initialisere Bonobo.\n"
+
+#: my-evolution/metar.c:44
+msgid "Clear sky"
+msgstr "Klar himmel"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr "Brudte skyer"
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr "Spredte skyer"
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr "F� skyer"
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr "Overskyet"
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+msgid "Invalid"
+msgstr "Ugyldig"
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr "Variabel"
+
+#: my-evolution/metar.c:64
+msgid "North"
+msgstr "Nord"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr "Nord - nord�st"
+
+#: my-evolution/metar.c:64
+msgid "Northeast"
+msgstr "Nord�st"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr "�st - nord�st"
+
+#: my-evolution/metar.c:65
+msgid "East"
+msgstr "�st"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr "�st - syd�st"
+
+#: my-evolution/metar.c:65
+msgid "Southeast"
+msgstr "Syd�st"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr "Syd - syd�st"
+
+#: my-evolution/metar.c:66
+msgid "South"
+msgstr "Syd"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr "Syd - sydvest"
+
+#: my-evolution/metar.c:66
+msgid "Southwest"
+msgstr "Sydvest"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr "Vest - sydvest"
+
+#: my-evolution/metar.c:67
+msgid "West"
+msgstr "Vest"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr "Vest - nordvest"
+
+#: my-evolution/metar.c:67
+msgid "Northwest"
+msgstr "Nordvest"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr "Nord - nordvest"
+
+#. DRIZZLE
+#: my-evolution/metar.c:127
+msgid "Drizzle"
+msgstr "Sm�regn"
+
+#: my-evolution/metar.c:128
+msgid "Drizzle in the vicinity"
+msgstr "Sm�regn i omegnen"
+
+#: my-evolution/metar.c:129
+msgid "Light drizzle"
+msgstr "Let sm�regn"
+
+#: my-evolution/metar.c:130
+msgid "Moderate drizzle"
+msgstr "Moderat sm�regn"
+
+#: my-evolution/metar.c:131
+msgid "Heavy drizzle"
+msgstr "Tung sm�regn"
+
+#: my-evolution/metar.c:132
+msgid "Shallow drizzle"
+msgstr "Tyndt sm�regn"
+
+#: my-evolution/metar.c:133
+msgid "Patches of drizzle"
+msgstr "Regnbyger"
+
+#: my-evolution/metar.c:134
+msgid "Partial drizzle"
+msgstr "Delvis sm�regn"
+
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
+msgid "Thunderstorm"
+msgstr "Tordenstorm"
+
+#: my-evolution/metar.c:136
+msgid "Windy drizzle"
+msgstr "Sm�regn med vind"
+
+#: my-evolution/metar.c:137
+msgid "Showers"
+msgstr "Regnbyger"
+
+#: my-evolution/metar.c:138
+msgid "Drifting drizzle"
+msgstr "Drivende sm�regn"
+
+#: my-evolution/metar.c:139
+msgid "Freezing drizzle"
+msgstr "Frysende sm�regn"
+
+#. RAIN
+#: my-evolution/metar.c:142
+msgid "Rain"
+msgstr "Regn"
+
+#: my-evolution/metar.c:143
+msgid "Rain in the vicinity"
+msgstr "Regn i omegnen"
+
+#: my-evolution/metar.c:144
+msgid "Light rain"
+msgstr "Let regn"
+
+#: my-evolution/metar.c:145
+msgid "Moderate rain"
+msgstr "Moderat regn"
+
+#: my-evolution/metar.c:146
+msgid "Heavy rain"
+msgstr "Tungt regn"
+
+#: my-evolution/metar.c:147
+msgid "Shallow rain"
+msgstr "Tyndt regn"
+
+#: my-evolution/metar.c:148
+msgid "Patches of rain"
+msgstr "Regnbyger"
+
+#: my-evolution/metar.c:149
+msgid "Partial rainfall"
+msgstr "Delvis regn"
+
+#: my-evolution/metar.c:151
+msgid "Blowing rainfall"
+msgstr "Regn med vind"
+
+#: my-evolution/metar.c:152
+msgid "Rain showers"
+msgstr "Regnbyger"
+
+#: my-evolution/metar.c:153
+msgid "Drifting rain"
+msgstr "Drivende regn"
+
+#: my-evolution/metar.c:154
+msgid "Freezing rain"
+msgstr "Frysende regn"
+
+#. SNOW
+#: my-evolution/metar.c:157
+msgid "Snow"
+msgstr "Sne"
+
+#: my-evolution/metar.c:158
+msgid "Snow in the vicinity"
+msgstr "Sne i omegnen"
+
+#: my-evolution/metar.c:159
+msgid "Light snow"
+msgstr "Let sne"
+
+#: my-evolution/metar.c:160
+msgid "Moderate snow"
+msgstr "Moderat sne"
+
+#: my-evolution/metar.c:161
+msgid "Heavy snow"
+msgstr "Tung sne"
+
+#: my-evolution/metar.c:162
+msgid "Shallow snow"
+msgstr "Grund sne"
+
+#: my-evolution/metar.c:163
+msgid "Patches of snow"
+msgstr "Snebyger"
+
+#: my-evolution/metar.c:164
+msgid "Partial snowfall"
+msgstr "Delvis snefald"
+
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
+msgid "Snowstorm"
+msgstr "Snestorm"
+
+#: my-evolution/metar.c:166
+msgid "Blowing snowfall"
+msgstr "Sne og vind"
+
+#: my-evolution/metar.c:167
+msgid "Snow showers"
+msgstr "Snebyger"
+
+#: my-evolution/metar.c:168
+msgid "Drifting snow"
+msgstr "Drivende sne"
+
+#: my-evolution/metar.c:169
+msgid "Freezing snow"
+msgstr "Frysende sne"
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:172
+msgid "Snow grains"
+msgstr "Snekorn"
+
+#: my-evolution/metar.c:173
+msgid "Snow grains in the vicinity"
+msgstr "Snekorn i omegnen"
+
+#: my-evolution/metar.c:174
+msgid "Light snow grains"
+msgstr "Lette snekorn"
+
+#: my-evolution/metar.c:175
+msgid "Moderate snow grains"
+msgstr "Moderate snekorn"
+
+#: my-evolution/metar.c:176
+msgid "Heavy snow grains"
+msgstr "Tunge snekorn"
+
+#: my-evolution/metar.c:177
+msgid "Shallow snow grains"
+msgstr "Tynde snekorn"
+
+#: my-evolution/metar.c:178
+msgid "Patches of snow grains"
+msgstr "Omr�der med snekorn"
+
+#: my-evolution/metar.c:179
+msgid "Partial snow grains"
+msgstr "Delvise snekorn"
+
+#: my-evolution/metar.c:181
+msgid "Blowing snow grains"
+msgstr "Bl�sende snekorn"
+
+#: my-evolution/metar.c:182
+msgid "Snow grain showers"
+msgstr "Byger med snekorn"
+
+#: my-evolution/metar.c:183
+msgid "Drifting snow grains"
+msgstr "Drivende snekorn"
+
+#: my-evolution/metar.c:184
+msgid "Freezing snow grains"
+msgstr "Frysende snekorn"
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:187
+msgid "Ice crystals"
+msgstr "Iskrystaller"
+
+#: my-evolution/metar.c:188
+msgid "Ice crystals in the vicinity"
+msgstr "Iskrystaller i omegnen"
+
+#: my-evolution/metar.c:189
+msgid "Few ice crystals"
+msgstr "Nogen iskrystaller"
+
+#: my-evolution/metar.c:190
+msgid "Moderate ice crystals"
+msgstr "Moderat med iskrystaller"
+
+#: my-evolution/metar.c:191
+msgid "Heavy ice crystals"
+msgstr "Tungt med iskrystaller"
+
+#: my-evolution/metar.c:193
+msgid "Patches of ice crystals"
+msgstr "Omr�der med iskrystaller"
+
+#: my-evolution/metar.c:194
+msgid "Partial ice crystals"
+msgstr "Delvise iskrystaller"
+
+#: my-evolution/metar.c:195
+msgid "Ice crystal storm"
+msgstr "Storm med iskrystaller"
+
+#: my-evolution/metar.c:196
+msgid "Blowing ice crystals"
+msgstr "Bl�sende iskrystaller"
+
+#: my-evolution/metar.c:197
+msgid "Showers of ice crystals"
+msgstr "Byger med iskrystaller"
+
+#: my-evolution/metar.c:198
+msgid "Drifting ice crystals"
+msgstr "Drivende iskrystaller"
+
+#: my-evolution/metar.c:199
+msgid "Freezing ice crystals"
+msgstr "Frysende iskrystaller"
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:202
+msgid "Ice pellets"
+msgstr "Is-pellets"
+
+#: my-evolution/metar.c:203
+msgid "Ice pellets in the vicinity"
+msgstr "Is-pellets i omr�det"
+
+#: my-evolution/metar.c:204
+msgid "Few ice pellets"
+msgstr "F� is-pellets"
+
+#: my-evolution/metar.c:205
+msgid "Moderate ice pellets"
+msgstr "Moderate is-pellets"
+
+#: my-evolution/metar.c:206
+msgid "Heavy ice pellets"
+msgstr "Kraftige is-pellets"
+
+#: my-evolution/metar.c:207
+msgid "Shallow ice pellets"
+msgstr "Tynde is-pellets"
+
+#: my-evolution/metar.c:208
+msgid "Patches of ice pellets"
+msgstr "Omr�der med is-pellets"
+
+#: my-evolution/metar.c:209
+msgid "Partial ice pellets"
+msgstr "Delvis is-pellets"
+
+#: my-evolution/metar.c:210
+msgid "Ice pellet storm"
+msgstr "Is-pellets storm"
+
+#: my-evolution/metar.c:211
+msgid "Blowing ice pellets"
+msgstr "Bl�sende is-pellets"
+
+#: my-evolution/metar.c:212
+msgid "Showers of ice pellets"
+msgstr "Byger med is-pellets"
+
+#: my-evolution/metar.c:213
+msgid "Drifting ice pellets"
+msgstr "Drivende is-pellets"
+
+#: my-evolution/metar.c:214
+msgid "Freezing ice pellets"
+msgstr "Frysende is-pellets"
+
+#: my-evolution/metar.c:218
+msgid "Hail in the vicinity"
+msgstr "Hagl i omegnen"
+
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
+msgid "Light hail"
+msgstr "Let hagl"
+
+#: my-evolution/metar.c:220
+msgid "Moderate hail"
+msgstr "Moderat hagl"
+
+#: my-evolution/metar.c:221
+msgid "Heavy hail"
+msgstr "Tungt hagl"
+
+#: my-evolution/metar.c:222
+msgid "Shallow hail"
+msgstr "Let hagl"
+
+#: my-evolution/metar.c:223
+msgid "Patches of hail"
+msgstr "Omr�der med hagl"
+
+#: my-evolution/metar.c:224
+msgid "Partial hail"
+msgstr "Delvis hagl"
+
+#: my-evolution/metar.c:225
+msgid "Hailstorm"
+msgstr "Haglstorm"
+
+#: my-evolution/metar.c:226
+msgid "Blowing hail"
+msgstr "Hagl med vind"
+
+#: my-evolution/metar.c:227
+msgid "Hail showers"
+msgstr "Haglbyger"
+
+#: my-evolution/metar.c:228
+msgid "Drifting hail"
+msgstr "Drivende hagl"
+
+#: my-evolution/metar.c:229
+msgid "Freezing hail"
+msgstr "Frysende hagl"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:232
+msgid "Small hail"
+msgstr "Sm�hagl"
+
+#: my-evolution/metar.c:233
+msgid "Small hail in the vicinity"
+msgstr "Sm�hagl i omegnen"
+
+#: my-evolution/metar.c:235
+msgid "Moderate small hail"
+msgstr "Moderat sm�hagl"
+
+#: my-evolution/metar.c:236
+msgid "Heavy small hail"
+msgstr "Tungt sm�hagl"
+
+#: my-evolution/metar.c:237
+msgid "Shallow small hail"
+msgstr "Let sm�hagl"
+
+#: my-evolution/metar.c:238
+msgid "Patches of small hail"
+msgstr "Omr�der med sm�hagl"
+
+#: my-evolution/metar.c:239
+msgid "Partial small hail"
+msgstr "Delvis sm�hagl"
+
+#: my-evolution/metar.c:240
+msgid "Small hailstorm"
+msgstr "Lille haglstorm"
+
+#: my-evolution/metar.c:241
+msgid "Blowing small hail"
+msgstr "Sm�hagl med vind"
+
+#: my-evolution/metar.c:242
+msgid "Showers of small hail"
+msgstr "Byger med sm�hagl"
+
+#: my-evolution/metar.c:243
+msgid "Drifting small hail"
+msgstr "Drivende sm�hagl"
+
+#: my-evolution/metar.c:244
+msgid "Freezing small hail"
+msgstr "Frysende sm�hagl"
+
+#. PRECIPITATION
+#: my-evolution/metar.c:247
+msgid "Unknown precipitation"
+msgstr "Ukendt nedb�r"
+
+#: my-evolution/metar.c:248
+msgid "Precipitation in the vicinity"
+msgstr "Nedb�r i omr�det"
+
+#: my-evolution/metar.c:249
+msgid "Light precipitation"
+msgstr "Let nedb�r"
+
+#: my-evolution/metar.c:250
+msgid "Moderate precipitation"
+msgstr "Moderat nedb�r"
+
+#: my-evolution/metar.c:251
+msgid "Heavy precipitation"
+msgstr "Kraftig nedb�r"
+
+#: my-evolution/metar.c:252
+msgid "Shallow precipitation"
+msgstr "Tynd nedb�r"
+
+#: my-evolution/metar.c:253
+msgid "Patches of precipitation"
+msgstr "Omr�der med nedb�r"
+
+#: my-evolution/metar.c:254
+msgid "Partial precipitation"
+msgstr "Delvis nedb�r"
+
+#: my-evolution/metar.c:255
+msgid "Unknown thunderstorm"
+msgstr "Ukendt tordenstorm"
+
+#: my-evolution/metar.c:256
+msgid "Blowing precipitation"
+msgstr "Bl�sende nedb�r"
+
+#: my-evolution/metar.c:257
+msgid "Showers, type unknown"
+msgstr "Byger, type ukendt"
+
+#: my-evolution/metar.c:258
+msgid "Drifting precipitation"
+msgstr "Drivende nedb�r"
+
+#: my-evolution/metar.c:259
+msgid "Freezing precipitation"
+msgstr "Frysende nedb�r"
+
+#. MIST
+#: my-evolution/metar.c:262
+msgid "Mist"
+msgstr "T�ge"
+
+#: my-evolution/metar.c:263
+msgid "Mist in the vicinity"
+msgstr "T�ge i omegnen"
+
+#: my-evolution/metar.c:264
+msgid "Light mist"
+msgstr "Let t�ge"
+
+#: my-evolution/metar.c:265
+msgid "Moderate mist"
+msgstr "Moderat t�ge"
+
+#: my-evolution/metar.c:266
+msgid "Thick mist"
+msgstr "Tyk t�ge"
+
+#: my-evolution/metar.c:267
+msgid "Shallow mist"
+msgstr "Tynd t�ge"
+
+#: my-evolution/metar.c:268
+msgid "Patches of mist"
+msgstr "Omr�der med t�ge"
+
+#: my-evolution/metar.c:269
+msgid "Partial mist"
+msgstr "Delvis t�ge"
+
+#: my-evolution/metar.c:271
+msgid "Mist with wind"
+msgstr "T�ge med vind"
+
+#: my-evolution/metar.c:273
+msgid "Drifting mist"
+msgstr "Drivende t�ge"
+
+#: my-evolution/metar.c:274
+msgid "Freezing mist"
+msgstr "T�ge og frost"
+
+#. FOG
+#: my-evolution/metar.c:277
+msgid "Fog"
+msgstr "Dis"
+
+#: my-evolution/metar.c:278
+msgid "Fog in the vicinity"
+msgstr "Dis i omr�det"
+
+#: my-evolution/metar.c:279
+msgid "Light fog"
+msgstr "Let dis"
+
+#: my-evolution/metar.c:280
+msgid "Moderate fog"
+msgstr "Moderat dis"
+
+#: my-evolution/metar.c:281
+msgid "Thick fog"
+msgstr "Tyk dis"
+
+#: my-evolution/metar.c:282
+msgid "Shallow fog"
+msgstr "Tynd dis"
+
+#: my-evolution/metar.c:283
+msgid "Patches of fog"
+msgstr "Omr�der med dis"
+
+#: my-evolution/metar.c:284
+msgid "Partial fog"
+msgstr "Delvis dis"
+
+#: my-evolution/metar.c:286
+msgid "Fog with wind"
+msgstr "Dis med vind"
+
+#: my-evolution/metar.c:288
+msgid "Drifting fog"
+msgstr "Drivende dis"
+
+#: my-evolution/metar.c:289
+msgid "Freezing fog"
+msgstr "Frysende dis"
+
+#. SMOKE
+#: my-evolution/metar.c:292
+msgid "Smoke"
+msgstr "R�g"
+
+#: my-evolution/metar.c:293
+msgid "Smoke in the vicinity"
+msgstr "R�g i omegnen"
+
+#: my-evolution/metar.c:294
+msgid "Thin smoke"
+msgstr "Tynd r�g"
+
+#: my-evolution/metar.c:295
+msgid "Moderate smoke"
+msgstr "Moderat r�g"
+
+#: my-evolution/metar.c:296
+msgid "Thick smoke"
+msgstr "Tyk r�g"
+
+#: my-evolution/metar.c:297
+msgid "Shallow smoke"
+msgstr "Let r�g"
+
+#: my-evolution/metar.c:298
+msgid "Patches of smoke"
+msgstr "Omr�der med r�g"
+
+#: my-evolution/metar.c:299
+msgid "Partial smoke"
+msgstr "Delvis r�g"
+
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
+msgstr "Tordnende bygekast"
+
+#: my-evolution/metar.c:301
+msgid "Smoke with wind"
+msgstr "R�g med vind"
+
+#: my-evolution/metar.c:303
+msgid "Drifting smoke"
+msgstr "Drivende r�g"
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:307
+msgid "Volcanic ash"
+msgstr "Vulkansk aske"
+
+#: my-evolution/metar.c:308
+msgid "Volcanic ash in the vicinity"
+msgstr "Vulkansk aske i omegnen"
+
+#: my-evolution/metar.c:310
+msgid "Moderate volcanic ash"
+msgstr "Moderat vulkansk aske"
+
+#: my-evolution/metar.c:311
+msgid "Thick volcanic ash"
+msgstr "Tyk vulkansk aske"
+
+#: my-evolution/metar.c:312
+msgid "Shallow volcanic ash"
+msgstr "Let vulkansk aske"
+
+#: my-evolution/metar.c:313
+msgid "Patches of volcanic ash"
+msgstr "Omr�der med vulkansk aske"
+
+#: my-evolution/metar.c:314
+msgid "Partial volcanic ash"
+msgstr "Delvis vulkansk aske"
+
+#: my-evolution/metar.c:315
+msgid "Thunderous volcanic ash"
+msgstr "Tordnende Vulkansk aske"
+
+#: my-evolution/metar.c:316
+msgid "Blowing volcanic ash"
+msgstr "Bl�sende vulkansk aske"
+
+#: my-evolution/metar.c:317
+msgid "Showers of volcanic ash"
+msgstr "Byger med vulkansk aske"
+
+#: my-evolution/metar.c:318
+msgid "Drifting volcanic ash"
+msgstr "Drivende vulkansk aske"
+
+#: my-evolution/metar.c:319
+msgid "Freezing volcanic ash"
+msgstr "Frysende vulkansk aske"
+
+#. SAND
+#: my-evolution/metar.c:322
+msgid "Sand"
+msgstr "Sand"
+
+#: my-evolution/metar.c:323
+msgid "Sand in the vicinity"
+msgstr "Sand i omegnen"
+
+#: my-evolution/metar.c:324
+msgid "Light sand"
+msgstr "Let sand"
+
+#: my-evolution/metar.c:325
+msgid "Moderate sand"
+msgstr "Moderat sand"
+
+#: my-evolution/metar.c:326
+msgid "Heavy sand"
+msgstr "Tungt sand"
+
+#: my-evolution/metar.c:328
+msgid "Patches of sand"
+msgstr "Omr�der med sand"
+
+#: my-evolution/metar.c:329
+msgid "Partial sand"
+msgstr "Delvis sand"
+
+#: my-evolution/metar.c:331
+msgid "Blowing sand"
+msgstr "Bl�sende sand"
+
+#: my-evolution/metar.c:333
+msgid "Drifting sand"
+msgstr "Drivende sand"
+
+#. HAZE
+#: my-evolution/metar.c:337
+msgid "Haze"
+msgstr "Dis"
+
+#: my-evolution/metar.c:338
+msgid "Haze in the vicinity"
+msgstr "Dis i omr�det"
+
+#: my-evolution/metar.c:339
+msgid "Light haze"
+msgstr "Let dis"
+
+#: my-evolution/metar.c:340
+msgid "Moderate haze"
+msgstr "Moderat dis"
+
+#: my-evolution/metar.c:341
+msgid "Thick haze"
+msgstr "Tyk dis"
+
+#: my-evolution/metar.c:342
+msgid "Shallow haze"
+msgstr "Tynd dis"
+
+#: my-evolution/metar.c:343
+msgid "Patches of haze"
+msgstr "Omr�der med dis"
+
+#: my-evolution/metar.c:344
+msgid "Partial haze"
+msgstr "Delvis dis"
+
+#: my-evolution/metar.c:346
+msgid "Haze with wind"
+msgstr "Dis med vind"
+
+#: my-evolution/metar.c:348
+msgid "Drifting haze"
+msgstr "Drivende dis"
+
+#: my-evolution/metar.c:349
+msgid "Freezing haze"
+msgstr "Frysende dis"
+
+# Spray betyder st�vregn men her bruges det om regn
+#. SPRAY
+#: my-evolution/metar.c:352
+msgid "Spray"
+msgstr "St�vregn"
+
+#: my-evolution/metar.c:353
+msgid "Spray in the vicinity"
+msgstr "St�vregn i omr�det"
+
+#: my-evolution/metar.c:354
+msgid "Light spray"
+msgstr "Let st�vregn"
+
+#: my-evolution/metar.c:355
+msgid "Moderate spray"
+msgstr "Moderat regn"
+
+#: my-evolution/metar.c:356
+msgid "Heavy spray"
+msgstr "Kraftige byger"
+
+#: my-evolution/metar.c:357
+msgid "Shallow spray"
+msgstr "Tynde byger"
+
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
+msgstr "Spredte byger"
+
+#: my-evolution/metar.c:359
+msgid "Partial spray"
+msgstr "Spredte byger"
+
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
+msgstr "Bl�sende byger"
+
+#: my-evolution/metar.c:363
+msgid "Drifting spray"
+msgstr "Drivende byger"
+
+#: my-evolution/metar.c:364
+msgid "Freezing spray"
+msgstr "Frysende byger"
+
+#. DUST
+#: my-evolution/metar.c:367
+msgid "Dust"
+msgstr "St�v"
+
+#: my-evolution/metar.c:368
+msgid "Dust in the vicinity"
+msgstr "St�v i omegnen"
+
+#: my-evolution/metar.c:369
+msgid "Light dust"
+msgstr "Let st�v"
+
+#: my-evolution/metar.c:370
+msgid "Moderate dust"
+msgstr "Moderat st�v"
+
+#: my-evolution/metar.c:371
+msgid "Heavy dust"
+msgstr "Tungt st�v"
+
+#: my-evolution/metar.c:373
+msgid "Patches of dust"
+msgstr "Omr�der med st�v"
+
+#: my-evolution/metar.c:374
+msgid "Partial dust"
+msgstr "Delvis st�v"
+
+#: my-evolution/metar.c:376
+msgid "Blowing dust"
+msgstr "Bl�sende st�v"
+
+#: my-evolution/metar.c:378
+msgid "Drifting dust"
+msgstr "Drivende st�v"
+
+#. SQUALL
+#: my-evolution/metar.c:382
+msgid "Squall"
+msgstr "Bygekast"
+
+#: my-evolution/metar.c:383
+msgid "Squall in the vicinity"
+msgstr "Bygekast i omr�det"
+
+#: my-evolution/metar.c:384
+msgid "Light squall"
+msgstr "Lette bygekast"
+
+#: my-evolution/metar.c:385
+msgid "Moderate squall"
+msgstr "Moderate bygekast"
+
+#: my-evolution/metar.c:386
+msgid "Heavy squall"
+msgstr "Kraftige bygekast"
+
+#: my-evolution/metar.c:389
+msgid "Partial squall"
+msgstr "Delvise bygekast"
+
+#: my-evolution/metar.c:390
+msgid "Thunderous squall"
+msgstr "Tordnende bygekast"
+
+#: my-evolution/metar.c:391
+msgid "Blowing squall"
+msgstr "Bl�sende bygekast"
+
+#: my-evolution/metar.c:393
+msgid "Drifting squall"
+msgstr "Drivende bygekast"
+
+#: my-evolution/metar.c:394
+msgid "Freezing squall"
+msgstr "Frysende bygekast"
+
+#. SANDSTORM
+#: my-evolution/metar.c:397
+msgid "Sandstorm"
+msgstr "Sandstorm"
+
+#: my-evolution/metar.c:398
+msgid "Sandstorm in the vicinity"
+msgstr "Sandstorm i omegnen"
+
+#: my-evolution/metar.c:399
+msgid "Light standstorm"
+msgstr "Let sandstorm"
+
+#: my-evolution/metar.c:400
+msgid "Moderate sandstorm"
+msgstr "Moderat sandstorm"
+
+#: my-evolution/metar.c:401
+msgid "Heavy sandstorm"
+msgstr "Tung sandstorm"
+
+#: my-evolution/metar.c:402
+msgid "Shallow sandstorm"
+msgstr "Tynd sandstorm"
+
+#: my-evolution/metar.c:404
+msgid "Partial sandstorm"
+msgstr "Delvis sandstorm"
+
+#: my-evolution/metar.c:405
+msgid "Thunderous sandstorm"
+msgstr "Sandstorm med torden"
+
+#: my-evolution/metar.c:406
+msgid "Blowing sandstorm"
+msgstr "Bl�sende sandstorm"
+
+#: my-evolution/metar.c:408
+msgid "Drifting sandstorm"
+msgstr "Drivende sandstorm"
+
+#: my-evolution/metar.c:409
+msgid "Freezing sandstorm"
+msgstr "Sandstorm med frost"
+
+#. DUSTSTORM
+#: my-evolution/metar.c:412
+msgid "Duststorm"
+msgstr "St�vstorm"
+
+#: my-evolution/metar.c:413
+msgid "Duststorm in the vicinity"
+msgstr "St�vstorm i omegnen"
+
+#: my-evolution/metar.c:414
+msgid "Light duststorm"
+msgstr "Let st�vstorm"
+
+#: my-evolution/metar.c:415
+msgid "Moderate duststorm"
+msgstr "Moderat st�vstorm"
+
+#: my-evolution/metar.c:416
+msgid "Heavy duststorm"
+msgstr "Tung st�vstorm"
+
+#: my-evolution/metar.c:417
+msgid "Shallow duststorm"
+msgstr "Tynd st�vstorm"
+
+#: my-evolution/metar.c:419
+msgid "Partial duststorm"
+msgstr "Delvis st�vstorm"
+
+#: my-evolution/metar.c:420
+msgid "Thunderous duststorm"
+msgstr "St�vstorm med torden"
+
+#: my-evolution/metar.c:421
+msgid "Blowing duststorm"
+msgstr "Bl�sende st�vstorm"
+
+#: my-evolution/metar.c:423
+msgid "Drifting duststorm"
+msgstr "Drivende st�vstorm"
+
+#: my-evolution/metar.c:424
+msgid "Freezing duststorm"
+msgstr "St�vstorm med frost"
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:427
+msgid "Funnel cloud"
+msgstr "R�gsky"
+
+#: my-evolution/metar.c:428
+msgid "Funnel cloud in the vicinity"
+msgstr "R�gsky i omr�det"
+
+#: my-evolution/metar.c:429
+msgid "Light funnel cloud"
+msgstr "Let r�gsky"
+
+#: my-evolution/metar.c:430
+msgid "Moderate funnel cloud"
+msgstr "Moderat r�gsky"
+
+#: my-evolution/metar.c:431
+msgid "Thick funnel cloud"
+msgstr "Tyk r�gsky"
+
+#: my-evolution/metar.c:432
+msgid "Shallow funnel cloud"
+msgstr "Tynd r�gsky"
+
+#: my-evolution/metar.c:433
+msgid "Patches of funnel clouds"
+msgstr "Omr�der med r�gskyer"
+
+#: my-evolution/metar.c:434
+msgid "Partial funnel clouds"
+msgstr "Delvise r�gskyer"
+
+#: my-evolution/metar.c:436
+msgid "Funnel cloud w/ wind"
+msgstr "R�gsky med vind"
+
+#: my-evolution/metar.c:438
+msgid "Drifting funnel cloud"
+msgstr "Drivende r�gsky"
+
+#. TORNADO
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
+msgid "Tornado"
+msgstr "Tornado"
+
+#: my-evolution/metar.c:443
+msgid "Tornado in the vicinity"
+msgstr "Tornado i omegnen"
+
+#: my-evolution/metar.c:445
+msgid "Moderate tornado"
+msgstr "Moderat tornado"
+
+#: my-evolution/metar.c:446
+msgid "Raging tornado"
+msgstr "Rasende tornado"
+
+#: my-evolution/metar.c:449
+msgid "Partial tornado"
+msgstr "Delvis tornado"
+
+#: my-evolution/metar.c:450
+msgid "Thunderous tornado"
+msgstr "Tornado med torden"
+
+#: my-evolution/metar.c:453
+msgid "Drifting tornado"
+msgstr "Drivende tornado"
+
+#: my-evolution/metar.c:454
+msgid "Freezing tornado"
+msgstr "Tornado med frost"
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:457
+msgid "Dust whirls"
+msgstr "St�vhvirvler"
+
+#: my-evolution/metar.c:458
+msgid "Dust whirls in the vicinity"
+msgstr "St�vhvirvler i omegnen"
+
+#: my-evolution/metar.c:459
+msgid "Light dust whirls"
+msgstr "Lette st�vhvirvler"
+
+#: my-evolution/metar.c:460
+msgid "Moderate dust whirls"
+msgstr "Moderate st�vhvirvler"
+
+#: my-evolution/metar.c:461
+msgid "Heavy dust whirls"
+msgstr "Tunge st�vhvirvler"
+
+#: my-evolution/metar.c:462
+msgid "Shallow dust whirls"
+msgstr "Tynde st�vhvirvler"
+
+#: my-evolution/metar.c:463
+msgid "Patches of dust whirls"
+msgstr "Omr�der med st�vhvirvler"
+
+#: my-evolution/metar.c:464
+msgid "Partial dust whirls"
+msgstr "Delvise st�vhvirvler"
+
+#: my-evolution/metar.c:466
+msgid "Blowing dust whirls"
+msgstr "Bl�sende st�vhvirvler"
+
+#: my-evolution/metar.c:468
+msgid "Drifting dust whirls"
+msgstr "Drivende st�vhvirvler"
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add n_ews feed"
+msgstr "Til_f�j nyhedstjeneste"
+
+#: my-evolution/my-evolution.glade.h:2
+msgid "C_elsius"
+msgstr "C_elsius"
+
+#: my-evolution/my-evolution.glade.h:4
+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
+msgid "Ma_x number of items shown:"
+msgstr "Ma_ksimalt antal opf�ringer som vises:"
+
+#: my-evolution/my-evolution.glade.h:6
+msgid "News Feed Settings"
+msgstr "Indstillinger for nyhedstjeneste"
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "One mont_h"
+msgstr "E_n m�ned"
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "One w_eek"
+msgstr "_En uge"
+
+#: my-evolution/my-evolution.glade.h:9
+msgid "R_efresh time (seconds):"
+msgstr "Opdat_eringstid (sekunder):"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "Refresh _time (seconds):"
+msgstr "Opda_teringstid (sekunder):"
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "S_how full path for folders"
+msgstr "V_is fuld sti for mapper"
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Show _all tasks"
+msgstr "Vis _alle opgaver"
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "Show _today's tasks"
+msgstr "Vis _opgaver for i dag"
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "Show temperatures in:"
+msgstr "Vis temperatur i:"
+
+#: my-evolution/my-evolution.glade.h:15
+msgid "Tasks "
+msgstr "Opgaver "
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "Weather settings"
+msgstr "Indstillinger for vejr"
+
+#: my-evolution/my-evolution.glade.h:17
+msgid "_Fahrenheit"
+msgstr "_Fahrenheit"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "_Five days"
+msgstr "_Fem dage"
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "_Mail"
+msgstr "_E-post"
+
+#: my-evolution/my-evolution.glade.h:20
+msgid "_News Feeds"
+msgstr "_Nyhedstjenester"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "_One day"
+msgstr "_En dag"
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "_Schedule"
+msgstr "_Afs�t tid"
+
+#: my-evolution/my-evolution.glade.h:23
+msgid "_Weather"
+msgstr "_Vejr"
+
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Specielle mapper"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution skallen."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Vis detaljer"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Aflys operation"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Indbakke"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Udboks"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Lokale mapper"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution installation"
 
-#: 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"
@@ -22971,17 +23864,17 @@ msgstr ""
 "Denne nye version af Evolution skal installere  yderligere filer i\n"
 "dit personlige Evolution-katalog"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Venligst klik \"OK\" for at installere filerne, eller \"Afbryd\" for at "
 "afslutte."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Kunne ikke opdatere filerne."
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -22992,7 +23885,7 @@ msgstr ""
 "%s\n"
 "Fejl: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -23001,7 +23894,7 @@ msgstr ""
 "En fejl opstod under kopiering af filer til\n"
 "`%s'."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -23012,7 +23905,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -23023,7 +23916,7 @@ msgstr ""
 "har ikke korrekte rettigheder. Venligst g�r den\n"
 "l�sbar og k�rbar og start Evolution igen."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -23034,7 +23927,7 @@ msgstr ""
 "b�r fjernes for at Evolution skal fungere rigtigt.\n"
 "Venligst fjern denne fil og start Evolution igen."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -23045,7 +23938,7 @@ msgstr ""
 "Venligst flyt dette for at tillade installation\n"
 "af Evolution's brugerfiler."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -23059,7 +23952,7 @@ msgstr ""
 "kan k�re.\n"
 "Vil du fjerne dette katalog?"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -23070,49 +23963,53 @@ msgstr ""
 "Evolution-kataloget. Venligst flyt det for at \n"
 "tillade installation af Evolution's brugerfiler."
 
-#: 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."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Bragt til dig af"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Kan ikke tjekke mappe: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Kunne ikke �ndre navn p� mappe:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Kan ikke flytte en mappe over i sig selv."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Kan ikke kopiere en mappe over i sig selv."
 
-#: 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 "Kan ikke flytte en mappe til en af dens egne undermapper."
 
-#: 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 "Specific�r en mappe som mappen \"%s\" skal kopieres til:"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Kopi�r mappe"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Flyt mappe"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23121,18 +24018,18 @@ msgstr ""
 "Kunne ikke slette mappe:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Slet \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23141,16 +24038,16 @@ msgstr ""
 "Kunne ikke �ndre navn p� mappe:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "�ndr navn p� mappe \"%s\" til:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "�ndr navn p� mappe"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23165,7 +24062,7 @@ msgstr ""
 "Kan ikke oprette specificeret katalog:\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 - Opret ny mappe"
 
@@ -23181,7 +24078,7 @@ msgstr ""
 msgid "New..."
 msgstr "Ny..."
 
-#: 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 "(Uden navn)"
 
@@ -23354,6 +24251,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Ny"
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr "Intet mappenavn angivet."
@@ -23370,91 +24273,93 @@ 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:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy blev ikke fundet i din $PATH."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke k�res."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Om Ximian Evolution..."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "G� til mappe..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "V�lg mappen du �nsker at �bne"
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Opret en ny genvej"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:566
 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:577
-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."
-
-#: shell/e-shell-view-menu.c:585
-#, c-format
-msgid "Error executing %s."
-msgstr "Fejl under k�rsel af %s."
-
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "_Arbejd tilkoblet"
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ar_bejd frakoblet"
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Arbejd frakoblet"
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: 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 "(Ingen)"
 
-#: 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 er koblet til. Klik p� denne knap for at arbejde frakoblet."
 
-#: shell/e-shell-view.c:1641
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution er i f�rd med at koble fra."
 
-#: 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 er frakoblet. Klik p� denne knap for at arbejde tilkoblet."
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Fejlen fra aktiveringssystemet er:\n"
+"%s"
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke ops�tte lokal lagring -- %s"
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23465,19 +24370,23 @@ msgstr ""
 "er afsluttet uventet. Du m� afslutte Evolution og genstarte\n"
 "for at f� adgang til disse data igen."
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "O.k."
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabase ikke fundet"
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Generisk fejl"
 
@@ -23594,76 +24503,72 @@ msgstr "_Fjern"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne genvej fra genvejslinjen"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Fejl ved gemning af genveje."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Genveje"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Kan ikke overf�re mappe:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Indbakke"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Uden navn)"
+#: 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 "Ingen fejl"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Specificeret mappetype er ikke gyldig"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "I/U-fejl"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plads til at oprette mappen"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Mappen er ikke tom"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Specificeret mappe blev ikke fundet"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funktionen er ikke implementeret i dette lager"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Operationen er ikke underst�ttet"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Specificeret type er ikke underst�ttet for dette lager"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "Specificeret mappe kan ikke �ndres eller fjernes"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan ikke g�re en mappe til barn af en af sine efterkommere"
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "Kan ikke oprette en mappe med det navn"
 
@@ -23673,106 +24578,114 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fuldf�rt)"
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<klik her for at v�lge en mappe>"
+
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Ukendt fejl."
+
+#: 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"
+"Fejlen fra komponentsystemet er:\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"
+"Fejlen fra aktiveringssystemet er:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "CORBA-fejl"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Afbrudt"
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Ugyldige argumenter"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Har en ejer allerede"
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Ingen ejer"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Ikke fundet"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "En ikke-underst�ttet type"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Et ikke underst�ttet skema"
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "En ikke-underst�ttet handling"
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Intern fejl"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Eksisterer"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Har undermapper"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Ingen plads tilbage"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Tidligere ejer er d�d FIXME"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Ukendt fejl."
-
-#: 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"
-"Fejlen fra komponentsystemet er:\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"
-"Fejlen fra aktiveringssystemet er:\n"
-"%s"
+#: shell/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "Filtype:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -23898,296 +24811,272 @@ 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:83
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:89
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution afslutter nu..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikke tilg� Ximian Evolution-skallen."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikke initiere Ximian Evolution-skallen: %s"
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Deaktiv�r splash"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Starter import"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Starter intelligent importering"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr "Send fejls�gingsudskrift for alle komponenterne til en fil."
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
+#: tools/evolution-addressbook-abuse.c:80
 #: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Fejl ved indl�sning af adressebog."
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Uddata fil"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Inddata fil"
 
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr "Uddata fil"
+
 #: tools/evolution-addressbook-import.c:80
 msgid "No filename provided."
 msgstr "Intet filnavn specificeret."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Kopier"
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Kopi�r valgte beskeder til en anden mappe"
 
-#: 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 "Kopier udvalget"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "K_opi�r til mappe..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Opret en ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Opret en ny kontaktliste"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "Klip ud"
-
-#: 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 "Klip udvalget ud"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "Slet valgte kontakter"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Ny liste"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Flyt valgte beskeder til en anden mappe"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Inds�t"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Fl_yt til mappe..."
 
-#: 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 "Inds�t fra klippebordet"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Forh�ndsviser kontakterne som skal skrives ud"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Udskriv valgte kontakter"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Gem valgte kontakter som et VCard."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "V�lg alt"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "V�lg alle kontakter"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "Send _besked til kontakt..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Send en besked til valgte kontakter."
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Send besked til kontakt"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Send valgte kontakter til en anden person."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Stop indl�sning"
 
-#: 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 "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:18 ui/evolution-mail-list.xml.h:23
+#: 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-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
+#: ui/evolution.xml.h:35
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr "_Adressebogs-kilder..."
-
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "_Kontaktliste"
 
-#: 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 "_Videresend kontakt..."
 
-#: 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 "S_kriv ud..."
-
 #: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "Fl_yt til mappe..."
+
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "Gem _som VCard"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_S�g efter kontakter"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_V�lg alt"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Konfigur�r indstillinger for kalender"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "Send _besked til kontakt..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Opret en ny h�ndelse for h_ele dagen"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a New _Task"
-msgstr "Opre_t en ny opgave"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Opret en _ny aftale"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "Opret en h�ndelse for hele dagen"
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Slet aftalen"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "G� til"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "G� tilbage"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "G� fremad"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "G� til _dato"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "G� til en specifik dato"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "G� til i dag"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "M�ned"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Ny aftale"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr "Ny opgave"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Forh�ndsviser kalenderen som skal skrives ud"
 
-#: 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 "Forh�ndsvisning af udskrift"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Udskriv denne kalender"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Udgiv ledig/optaget information for denne kalender"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Vis en m�ned"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Vis en uge"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Vis arbejdsugen"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Uge"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "_Aftale..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "Indstillinger for _kalender..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "_Udgiv ledig/optaget-information"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "_Opgave..."
-
 #: 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
@@ -24217,18 +25106,18 @@ msgstr "Forh�ndsvisning af opf�ring som skal skrives ud"
 msgid "Print this item"
 msgstr "Udskriv denne opf�ring"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Udskriv..."
-
 #: 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 "Gem"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Gem som..."
+
 #: 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 "Gem og luk"
 
@@ -24244,8 +25133,8 @@ msgstr "Gem denne opf�ring p� disk"
 #: 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:40
 msgid "_File"
 msgstr "_Fil"
 
@@ -24263,10 +25152,14 @@ msgstr "Gem _som..."
 msgid "Save the contact and close the dialog box"
 msgstr "Gem kontakten og luk dialogboksen"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "Send _besked til kontakt..."
+
 #: 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 "_Gem"
 
@@ -24326,6 +25219,10 @@ 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"
@@ -24335,82 +25232,54 @@ msgid "Compose _New Message"
 msgstr "Skriv _ny besked"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Opret eller redig�r e-post konti og andre brugervalg"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Opret eller redig�r regler for filtrering af ny e-post"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Opret eller redig�r definitioner af virtuelle mapper"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "_T�m affaldskurven"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Glem _adgangskode"
 
-#: 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 "Glem alle adgangskoder s� du vil blive spurgt om at opgive dem igen"
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Ny besked"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "�bn et vindue for at skrive en e-post besked"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Fjern alle slettede beskeder fra alle mapper permanent"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "Send / modtag"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Send k�lagt e-post og hent ny e-post"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Vis vindue for forh�ndsvisning af besked"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonn�r eller fjern abonnement p� mapper p� eksterne servere"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigering af virtuelle mapper..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "Send _besked"
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "Indstillinger for e-post..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Forh�ndsvisningsvindue"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "_Send / modtag"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "_Abonn�r p� mapper..."
 
@@ -24503,11 +25372,11 @@ msgstr "Skjul valgte beskeder midlertidigt"
 msgid "Threaded Message list"
 msgstr "Beskedsliste med tr�de"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_Fjern slettede beskeder"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "M_appe"
 
@@ -24523,147 +25392,157 @@ msgstr "Egenska_ber..."
 msgid "_Threaded Message List"
 msgstr "Beskedsliste med _tr�de"
 
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Tilf�j sender i adressebog"
+
 #: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "P�f�r filtre"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Tilf�j sender i adressebog"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiv�r filterregler p� de valgte beskeder"
 
-#: 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 "Skriv et svar til alle modtagere af den valgte besked"
 
-#: 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 "Skriv et svar til e-postlisten for den valgte besked"
 
-#: 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 "Skriv et svar til afsender af den valgte besked"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopi�r valgte beskeder til en anden mappe"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Opret _virtuel mappe fra besked"
 
-#: 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 "Lav en regel for at filtrere beskeder fra denne afsender"
 
-#: 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 "Lav en regel for at filtrere beskeder til disse modtagere"
 
-#: 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 "Lav en regel for at filtrere beskeder til denne beskedsliste"
 
-#: 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 "Lav en regel for filtrering af beskeder med dette emne"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Lav en virtuel mappe for disse modtagere"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Lav en virtuel mappe for denne e-postliste"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Lav en virtuel mappe for denne afsender"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Lav en virtuel mappe for dette emne"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Formindsk tekstens st�rrelse"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Vis n�ste vigtige besked"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Vis n�ste besked"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Vis n�ste ul�ste besked"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Vis n�ste ul�ste tr�d"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Vis forrige vigtige besked"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Vis forrige besked"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Vis forrige ul�ste besked"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Videresend"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filtr�r p� e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filtr�r p� se_nder..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filtr�r p� modtage_re..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filtr�r p� e_mne..."
 
-#: ui/evolution-mail-message.xml.h:30
-msgid "Force images in HTML mail to be loaded"
-msgstr "Tvungen indl�sning af billeder i HTML e-post"
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward"
-msgstr "Videresend"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward As"
-msgstr "Videresend som"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Attached"
-msgstr "Videresend vedl_agt"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Mark�r valgte beskeder for sletning"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Inline"
-msgstr "Videresend _indlejret"
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "_Fulde navn..."
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Forward _Quoted"
-msgstr "Videresend ci_teret"
+msgid "Force images in HTML mail to be loaded"
+msgstr "Tvungen indl�sning af billeder i HTML e-post"
 
-#: 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 "Videresend den valgte besked i kroppen af en ny besked"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte besked citeret som et svar"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte besked til nogen"
 
-#: 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 "Videresend den valgte besked til nogen som et bilag"
 
@@ -24679,24 +25558,32 @@ msgstr "Indl�s b_illeder"
 msgid "Mark as I_mportant"
 msgstr "Bem�rk som _vigtig"
 
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Mark�r som _ul�st"
+
 #: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Bem�rk som uv_igtig"
 
 #: 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 "Mark�r valgte beskeder som l�st"
 
 #: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as important"
+#, fuzzy
+msgid "Mark the selected message(s) as important"
 msgstr "Mark�r valgte beskeder som vigtige"
 
 #: 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 "Mark�r valgte beskeder som ikke l�st"
 
 #: ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as unimportant"
+#, fuzzy
+msgid "Mark the selected message(s) as unimportant"
 msgstr "Mark�r valgte beskeder som uvigtige"
 
 #: ui/evolution-mail-message.xml.h:51
@@ -24708,7 +25595,8 @@ msgid "Move"
 msgstr "Flyt"
 
 #: ui/evolution-mail-message.xml.h:53
-msgid "Move selected messages to another folder"
+#, fuzzy
+msgid "Move selected message(s) to another folder"
 msgstr "Flyt valgte beskeder til en anden mappe"
 
 #: ui/evolution-mail-message.xml.h:54
@@ -24716,64 +25604,63 @@ msgid "Next"
 msgstr "N�ste"
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Important Message"
+#, fuzzy
+msgid "Next _Important Message"
 msgstr "N�ste vigtige besked"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Message"
-msgstr "N�ste besked"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "V�lg tr�d"
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Next Unread Message"
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "N�ste ul�ste besked"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "�bn valgt besked i et nyt vindue"
 
-#: 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 "�bn valgt besked i redigeringsvinduet for at sende den igen"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Oprindelig _st�rrelse"
 
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Forrige ul�ste besked"
+
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Forrige vigtige besked"
+
+#: ui/evolution-mail-message.xml.h:63
 msgid "Preview the message to be printed"
 msgstr "Forh�ndsvis beskeden som skal skrives ud"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Important Message"
-msgstr "Forrige vigtige besked"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Message"
-msgstr "Forrige besked"
-
-#: ui/evolution-mail-message.xml.h:66
-msgid "Previous Unread Message"
-msgstr "Forrige ul�ste besked"
-
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Udskriv denne besked"
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply"
-msgstr "Svar"
+#: 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 "Svar til alle"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Videresend den valgte besked til nogen"
 
 #: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
@@ -24844,8 +25731,9 @@ msgid "VFolder on _Subject..."
 msgstr "Virtuel mappe for e_mne..."
 
 #: ui/evolution-mail-message.xml.h:92
-msgid "_Apply Filters"
-msgstr "_P�f�r filtre"
+#, fuzzy
+msgid "_Attached"
+msgstr "Vedl�g"
 
 #: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
@@ -24860,43 +25748,71 @@ msgid "_Forward Message"
 msgstr "_Videresend besked"
 
 #: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "G� til"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "Indlejret"
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_St�rre"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "_Beskedsvisning"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Flyt til mappe"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "N�ste besked"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_�bn besked"
 
-#: 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 "Forrige besked"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Citeret"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_V�rkt�jer"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "Fortryd sletning"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Luk dette vindue"
 
 #: 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:36
 msgid "_Close"
 msgstr "L_uk"
 
 #: 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:56
 msgid "_View"
 msgstr "_Vis"
 
@@ -24920,11 +25836,11 @@ msgstr "Krypt�r denne besked med PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Krypt�r denne besked med dit S/MIME krypteringscertifikat"
 
-#: 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 "For_mat�r"
 
-#: 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"
 
@@ -24940,6 +25856,10 @@ msgstr "Inds�t en tekstfil i beskeden"
 msgid "Insert text file..."
 msgstr "Inds�t tekstfil..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "�bn"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "�bn en fil"
@@ -24973,7 +25893,7 @@ msgid "Save in folder..."
 msgstr "Gem i mappe..."
 
 #: 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 "Gem aktiv fil"
 
@@ -24998,6 +25918,7 @@ msgid "Send _later"
 msgstr "Send se_nere"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Send beskeden i HTML-format"
 
@@ -25066,7 +25987,7 @@ msgid "_From Field"
 msgstr "_Fra-felt"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Inds�t"
 
@@ -25078,11 +25999,7 @@ msgstr "_�bn..."
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Sikkerhed"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Hj�lp"
 
@@ -25138,33 +26055,41 @@ msgstr "Hent seneste information om opgaven"
 msgid "Re_fresh Task"
 msgstr "O_pdat�r opgave"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Konfigur�r indstillinger for opgavevisning"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopi�r valgt opgave"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Klip valgt opgave ud"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "Slet valgte opgaver"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Slet valgte opgaver"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "_Mark�r som fuldf�rt"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Inds�t opgave fra klippeborder"
 
-#: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings..."
-msgstr "Indstillinger for opgaver..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Forh�ndsviser kontakterne som skal skrives ud"
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
-msgstr "_Opgave"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Udskriv denne besked"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25231,113 +26156,118 @@ msgid "Open this folder in an other window"
 msgstr "�bn denne mappe i et andet vindue"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Send / modtag"
+
+#: ui/evolution.xml.h:22
+#, 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
 msgid "Show information about Ximian Evolution"
 msgstr "Vis information om Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Indsend fejlrapport"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Indsen_d fejlrapport"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Indsend en fejlrapport med Bug Buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Skift"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Sl� visning af mappelinjen fra/til"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Sl� visning af genvejslinjen fra/til"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Skift til frakoblet arbejdsmodus."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Vis den valgte mappe"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _OSS"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Kopi�r..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "_Mappelinje"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_G� til mappe..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Import�r..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Flyt..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "Indstillinger for _h�hdholdt..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Omd�b..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Send / modtag"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Genvej"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "_Genvejslinje"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "�ndr indstilingerne for sammendrag"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Udskriv sammendrag"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Genindl�s"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Genindl�s visningen"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "Indstillinger for _sammendrag..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Adressekort"
@@ -25351,18 +26281,27 @@ msgid "Phone List"
 msgstr "Telefonliste"
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "V�lg mappe"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Efter afsender"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Efter status"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Efter emne"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Beskeder"
 
@@ -25398,11 +26337,21 @@ msgstr ""
 "tidszone.\n"
 "Brug h�jre museknap til at zoome ud."
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "_Aktiv visning"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "Defin�r visninger"
 
@@ -25434,76 +26383,81 @@ msgstr "Datoen skal skrives ind p� formatet: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentv�rdien skal v�re mellem 0 og 100, inklusive"
 
-#: widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "Central-europ�isk"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "Gr�sk"
 
-#: 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 "Japansk"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Korean"
 msgstr "Koreansk"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "UCS"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Vest-europ�isk"
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 msgid "Traditional"
 msgstr "Traditionel"
 
-#: 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 "Forenklet"
 
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:92
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "Ny"
+#: 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 "Ukendt tegns�t: %s"
 
-#: widgets/misc/e-charset-picker.c:201
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Indtast tegns�t som skal bruges"
 
-#: widgets/misc/e-charset-picker.c:276
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Andre..."
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Tegnkodning"
 
@@ -25511,25 +26465,23 @@ msgstr "Tegnkodning"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Redigering af s�gning"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Gem s�gning"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Tilf�j i gemte s�gninger"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "T�m"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Gem s�gning"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Vis alle"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Tilf�j i gemte s�gninger"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -25552,11 +26504,21 @@ msgstr "Besked"
 msgid "Don't show this message again."
 msgstr "Vis ikke denne besked igen."
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "S�_g"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Find nu "
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "T�m"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "T�m"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Find nu "
 
@@ -25581,3 +26543,997 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 #: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
+
+#~ msgid "Card: "
+#~ msgstr "Kort: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Navn:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "Pr�fiks:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "Opgivet:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ " Yderligere: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ " Familie:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ " Suffiks:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "F�dselsdato:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Adresse:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postboks:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "Linje:         "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Vej:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  By:          "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Region:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postnummer:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Land:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Leveringsetiket"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefoner:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefon:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "E-post:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "E-post:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Tidszone: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Geo Location: "
+#~ msgstr ""
+#~ "\n"
+#~ "Geografisk lokation: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "Stilling: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "Org: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "Navn:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "Enhed:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "Enhed2: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "Enhed3: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "Enhed4: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kategorier: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kommentar: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Unik streng: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Offentlig n�gle: "
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Kobler til LDAP-server..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Venter p� tilkobling til LDAP-server..."
+
+#~ msgid "New _Contact"
+#~ msgstr "Ny _kontakt"
+
+#~ msgid "New Contact _List"
+#~ msgstr "Ny kontakt_liste"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Redig�r adressebog"
+
+#~ msgid "Account Name"
+#~ msgstr "Kontonavn"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Tilf�j adressebog"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanceret"
+
+#~ msgid "Base"
+#~ msgstr "Basis"
+
+#~ msgid "Server Name"
+#~ msgstr "Servernavn:"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "Informationen nedenfor kr�ves for at tilf�je en adressebog."
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ 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."
+#~ msgstr ""
+#~ "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."
+#~ msgstr ""
+#~ "Dette er basisnoden for alle dine s�gninger p� LDAP-serveren. Kontakt din "
+#~ "administrator for mere information."
+
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Dette er navnet p� serveren, hvor din adressebog ligger."
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Dette er porten, som din LDAP-server bruger."
+
+#~ 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:"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "Ko_ntakter:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Vis kontakter som m�der f�lgende kriterier:"
+
+#~ 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)"
+
+#~ msgid "Republic Of Korea"
+#~ msgstr "Den Koreanske republik"
+
+#~ 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"
+
+#~ msgid "Create a new task"
+#~ msgstr "Opret en ny opgave"
+
+#~ msgid "New _Task"
+#~ msgstr "Ny _opgave"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Op_ret en ny aftale med standard-p�mindelse"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "F�rste dag i u_gen:"
+
+#~ 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"
+
+#~ msgid "This is an encrypted message part"
+#~ msgstr "Dette er en krypteret brevdel"
+
+#~ msgid "NT Login"
+#~ msgstr "NT-indlogning"
+
+#~ msgid ""
+#~ "EMail: %s\n"
+#~ "Common Name: %s\n"
+#~ "Organization Unit: %s\n"
+#~ "Organization: %s\n"
+#~ "Locality: %s\n"
+#~ "State: %s\n"
+#~ "Country: %s"
+#~ msgstr ""
+#~ "E-post: %s\n"
+#~ "Adresseringsnavn: %s\n"
+#~ "Organisationsenhed: %s\n"
+#~ "Organisation: %s\n"
+#~ "Lokalitet: %s\n"
+#~ "Stat: %s\n"
+#~ "Land: %s"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Indtast venligst NNTP-adgangskode for %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Serveren godtog ikke brugernavn"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Fejl under sending af brugernavn til server"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Serveren godtog ikke brugernavn/adgangskode"
+
+#~ msgid "Message %s not found."
+#~ msgstr "Besked %s ikke fundet."
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Kunne ikke hente gruppeliste fra serveren."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Kunne ikke indl�se gruppelistefil for %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Kunne ikke gemme gruppelistefil for %s: %s"
+
+#~ msgid "Could not open directory for news server: %s"
+#~ msgstr "Kunne ikke �bne katalog for nyheds-server: %s"
+
+#~ msgid "Unable to open or create .newsrc file for %s: %s"
+#~ msgstr "Kunne ikke �bne eller oprette .newsrc-fil for %s: %s"
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Kunne ikke tjekke POP-server efter nye beskeder: %s"
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr "Kunne ikke �bne mappe: beskedslisten var ikke komplet."
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Kunne ikke hente besked: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ 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."
+#~ msgstr ""
+#~ "Dette lader dig koble til POP-serveren ved at bruge Kerberos 4 som "
+#~ "autenticering."
+
+#~ msgid "Could not authenticate to KPOP server: %s"
+#~ msgstr "Kunne ikke autenticere mod KPOP-server: %s"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Kunne ikke koble til server: %s"
+
+#~ 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"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "Kan ikke sende besked: afsenderadresse ikke defineret."
+
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "Fejl ved \"RCPT TO\"-svar: %s: besked ikke sendt."
+
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "Fejl ved DATA-svar: %s: besked ikke sendt"
+
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr "Fejl ved DATA-svar: beskedsterminering: %s: besked ikke sendt"
+
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "Fejl ved QUIT-svar: %s: ikke-fatal"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Indtast URI for mappen"
+
+#~ msgid "Message was received"
+#~ msgstr "Beskeden blev modtaget"
+
+#~ msgid "Message was sent"
+#~ msgstr "Beskeden blev sendt"
+
+#~ msgid "on or after"
+#~ msgstr "p� eller efter"
+
+#~ msgid "on or before"
+#~ msgstr "p� eller f�r"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Mappe for beskedslager (intern)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Kunne ikke koble til lager: %s"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "Ny e-post _besked"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Lav vFolder fra s�gning"
+
+#~ msgid "Filter on Mailing List"
+#~ msgstr "Filtr�r efter e-postliste"
+
+#~ msgid "Indexing:"
+#~ msgstr "Indekserer:"
+
+#~ 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."
+
+#~ msgid "Composer"
+#~ msgstr "Skriv"
+
+#~ 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"
+
+#~ msgid "_Email Address:"
+#~ msgstr "_E-post adresse:"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "_Log filterhandlinger til:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organisation:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "Husk denne adgangs_kode"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "_Send beskeder i HTML-format som standard."
+
+#~ msgid "_Server Type: "
+#~ msgstr "_Servertype: "
+
+#~ msgid "_Signature file:"
+#~ msgstr "_Signaturfil:"
+
+#~ msgid "placeholder"
+#~ msgstr "pladsholder"
+
+#~ 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."
+
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Kan ikke initiere Evolutions sammendragskomponent."
+
+#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#~ msgstr "<dd><b>Vejr-serveren kunne ikke kontaktes</b></dd>"
+
+#~ 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:"
+
+#~ msgid "_Display stations:"
+#~ msgstr "_Vis stationer:"
+
+#~ 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)"
+
+#~ msgid "New List"
+#~ msgstr "Ny liste"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Konfigur�r indstillinger for kalender"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Opret en ny h�ndelse for h_ele dagen"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Opre_t en ny opgave"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Opret en _ny aftale"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Opret en h�ndelse for hele dagen"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Aftale..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "Indstillinger for _kalender..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Opgave..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Opret eller redig�r e-post konti og andre brugervalg"
+
+#~ msgid "New Message"
+#~ msgstr "Ny besked"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "Indstillinger for e-post..."
+
+#~ msgid "Forward _Attached"
+#~ msgstr "Videresend vedl_agt"
+
+#~ msgid "Forward _Inline"
+#~ msgstr "Videresend _indlejret"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "Videresend ci_teret"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_P�f�r filtre"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Konfigur�r indstillinger for opgavevisning"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Indstillinger for opgaver..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "�ndr indstilingerne for sammendrag"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "Indstillinger for _sammendrag..."
+
+#~ msgid "Show All"
+#~ msgstr "Vis alle"
+
+#~ msgid "Sear_ch"
+#~ msgstr "S�_g"
diff --git a/po/de.po b/po/de.po
index d6acbde1db..b2e4a94d8e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2001-11-20 10:09+0100\n"
+"POT-Creation-Date: 2002-05-07 15:46-0400\n"
 "PO-Revision-Date: 2001-11-18 20:43+0100\n"
 "Last-Translator: Manuel Borchers <webmaster@matronix.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -35,21 +35,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importiert VCard-Dateien in 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 "Einsortieren unter"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Name"
 
 #: 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 "E-Mail"
 
 #: 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:1731
 msgid "Primary"
 msgstr "Prim�r"
 
@@ -59,15 +60,16 @@ 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:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: 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
 msgid "Business"
 msgstr "Gesch�ftlich"
 
@@ -77,12 +79,12 @@ msgid "Bus"
 msgstr "Gesch�ft"
 
 #: 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:1720
 msgid "Callback"
 msgstr "R�ckruf"
 
 #: 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:1722
 msgid "Company"
 msgstr "Firma"
 
@@ -92,13 +94,14 @@ msgstr "Fa."
 
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: 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
 msgid "Home"
 msgstr "Zu Hause"
 
 #: 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 "Organisation"
 
@@ -107,18 +110,20 @@ msgid "Org"
 msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "Mobil"
 
 #: 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:1721
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: 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:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Gesch�ftliches Fax"
 
@@ -127,13 +132,13 @@ msgid "Bus Fax"
 msgstr "Gesch. Fax"
 
 #: 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:1725
+#: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
 #: 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:1718
 msgid "Business 2"
 msgstr "Gesch�ftlich 2"
 
@@ -142,69 +147,68 @@ msgid "Bus 2"
 msgstr "Gesch�ft 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:1724
 msgid "Home 2"
 msgstr "Zu Hause 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:1726
+#: 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:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "Andere"
 
 #: 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:1729
+#: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
 #: 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:1730
+#: 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:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Funk"
 
 #: 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:1733
+#: 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 "Telex"
 
 #: 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:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-Mail 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 "Website"
 
@@ -213,7 +217,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 "Abteilung"
 
@@ -222,7 +226,7 @@ msgid "Dep"
 msgstr "Abt"
 
 #: 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 "B�ro"
 
@@ -231,12 +235,12 @@ msgid "Off"
 msgstr "B�ro"
 
 #: 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 "Titel"
 
 #: 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 "Beruf"
 
@@ -245,7 +249,7 @@ msgid "Prof"
 msgstr "Beruf"
 
 #: 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 "Vorgesetzter"
 
@@ -258,7 +262,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: 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 "Spitzname"
 
@@ -267,12 +271,12 @@ msgid "Nick"
 msgstr "Spitzn."
 
 #: 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 "Lebenspartner"
 
 #: 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 "Notiz"
 
@@ -285,7 +289,7 @@ msgid "CALUri"
 msgstr "KalURI"
 
 #: 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 "Verf�gbarkeits-Adresse"
 
@@ -314,302 +318,16 @@ msgstr "Kategorien"
 msgid "Family Name"
 msgstr "Familienname"
 
-#: 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 "Karte: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Name: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Pr�fix:     "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Vorname:     "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Zus�tzlich: "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Familienname:     "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Suffix:     "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Geburtsdatum: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adresse:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Postfach:  "
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Suffix:        "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Stra�e:     "
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Ort:     "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Region:     "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Postleitzahl: "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Land:     "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Postvermerk: "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefone:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-Mail:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-Mail:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Mailer: "
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Zeitzone: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geographischer Ort: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Berufsbezeichnung: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Firma: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Name:  "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Einheit:  "
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Einheit2: "
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Einheit3: "
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Einheit4: "
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategorien: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Kommentar: "
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3879
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Eindeutige Zeichenkette: "
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"�ffentlicher Schl�ssel: "
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Mehrere VCards"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard f�r %s"
@@ -617,85 +335,89 @@ msgstr "VCard f�r %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: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:1130
-#: 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:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2215
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Suchen..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Laden..."
 
 #. 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 "Fehler im Suchausdruck."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:475
-msgid "Connecting to LDAP server..."
-msgstr "Verbindung zu LDAP-Server..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:485
-msgid "Unable to connect to LDAP server."
-msgstr "Verbindung IMAP-Server konnte nicht aufgebaut werden."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:501
-msgid "Waiting for connection to LDAP server..."
-msgstr "Warten auf Verbindung zum LDAP-Server..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:870
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Karte zu LDAP-Server hinzuf�gen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:971
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Karte von LDAP-Server entfernen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Karte auf LDAP-Server �ndern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2160
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Suche wird neu gestartet."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Empfangen von LDAP-Suchergebnissen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2165
-msgid "Restarting search."
-msgstr "Suche wird neu gestartet."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Fehler beim Entfernen einer Karte"
 
-#: addressbook/conduit/address-conduit.c:294
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "URL `%s' konnte nicht geparst werden"
+
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "E-Mail-Adresse:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor konnte nicht geladen werden\n"
 
-#: addressbook/conduit/address-conduit.c:307
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
-#: addressbook/conduit/address-conduit.c:1089
-#: calendar/conduits/calendar/calendar-conduit.c:981
-#: calendar/conduits/todo/todo-conduit.c:694
+#: 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 "Der Wombat-Server konnte nicht gestartet werden"
 
-#: addressbook/conduit/address-conduit.c:1090
-#: calendar/conduits/calendar/calendar-conduit.c:982
-#: calendar/conduits/todo/todo-conduit.c:695
+#: 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 konnte nicht gestartet werden"
 
-#: 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 "Adress-Anwendungsblock des konnte Pilot nicht gelesen werden"
 
@@ -712,226 +434,109 @@ 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
+#, fuzzy
+msgid "Addressbook Settings"
+msgstr "Adressbuch-Quellen"
+
+#: 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
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Evolution-Komponente f�r Kontaktverwaltung."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fabrik f�r die Adressbuch-Minikarten-Control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik f�r die beispielhafte Adressbuch-Kontrolle"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Ordner mit Kontaktinformationen"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP-Server:"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "LDAP-Server mit Kontaktinformationen"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
-msgstr "Neuer _Kontakt"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Neu Kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
-msgstr "Neue Kontakt_liste"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
-msgstr "Adressbuch bearbeiten"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
-msgstr "Accountname"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "Adressbuch hinzuf�gen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
-msgstr "Adressbuch-Quellen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "Komplex"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Grundlegend"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "De_lete"
-msgstr "_L�schen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "E-Mail-Adresse:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolution wird diese E-Mail-Adresse benutzen, um Sie beim Server zu "
-"legitimieren"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "One"
-msgstr "One"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
-msgstr "Such_basis:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search s_cope: "
-msgstr "Suchebe_reich:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Server Name"
-msgstr "Servername"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Die Information unten wird ben�tigt, um ein Adressbuch hinzuzuf�gen."
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "This information is not required for most ldap servers. "
-msgstr "Diese Informationen werden f�r die meisten LDAP-Server nicht ben�tigt."
-
-#: 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 ""
-"Diese Informationen werden von Ihrem LDAP-Server benutzt, um anzugeben, "
-"welche Knoten bei einer Suche verwendet werden. Nehmen Sie f�r weitere "
-"Informationen Kontakt zu Ihrem Serveradministrator auf."
-
-#: 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 ""
-"Dies ist der Basisknoten f�r alle Ihre Suchen auf dem LDAP-Server. Nehmen "
-"Sie f�r weitere Informationen Kontakt zu Ihrem Serveradministrator auf."
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Dies ist der Name des Servers, auf dem das Adressbuch liegt."
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
-msgstr "Dies ist der Port, den Ihr LDAP-Server verwendet."
-
-#: 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 ""
-"Dieser Name wird verwendet, um Ihren Zugang zu identifizieren. Er erscheint "
-"nur zu Anzeigezwecken."
-
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "_Account name:"
-msgstr "_Accountname:"
-
-#: 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 "Hinzuf�gen"
-
-#: 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 "_Bearbeiten"
-
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
-msgstr "_Mein Server ben�tigt Legitimation"
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
-msgstr "_Port:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
-msgstr "_Servername:"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Kontaktliste"
 
-#: 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs konnte nicht initialisiert werden"
 
-#: addressbook/gui/component/addressbook-storage.c:167
-msgid "Other Contacts"
-msgstr "Andere Kontakte"
-
-#: addressbook/gui/component/addressbook.c:468
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Das Adressbuch kann nicht ge�ffnet werden"
 
-#: 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"
@@ -941,7 +546,7 @@ msgstr ""
 "bedeutet entweder, dass Sie einen ung�ltigen URI eingegeben\n"
 "haben oder dass der LDAP-Server unerreichbar ist."
 
-#: 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"
@@ -954,7 +559,7 @@ msgstr ""
 "nachdem Sie sich von der Adresse unten OpenLDAP besorgt\n"
 "haben.\n"
 
-#: 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."
@@ -962,57 +567,50 @@ 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:623
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Passwort f�r %s (Benutzer %s) eingeben"
 
-#: addressbook/gui/component/addressbook.c:786
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Irgend ein Feld enth�lt"
-
-#: addressbook/gui/component/addressbook.c:787
-msgid "Name contains"
-msgstr "Name enth�lt"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "endet mit"
 
-#: addressbook/gui/component/addressbook.c:788
-msgid "Email contains"
-msgstr "E-Mail enth�lt"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "E-Mail 2"
 
-#: addressbook/gui/component/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorie ist"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:772
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Irgend ein Feld enth�lt"
+
+#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
 msgid "Advanced..."
 msgstr "Komplex..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1031
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1083
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
-#.
-#. * 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 "(keine)"
-
 #: 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:1686
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 msgid "Primary Email"
 msgstr "Prim�re E-Mail"
 
@@ -1058,6 +656,621 @@ msgstr "Abfragen deaktivieren"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Abfragen aktivieren (gef�hrlich!)"
 
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Verbindung IMAP-Server konnte nicht aufgebaut werden."
+
+#: addressbook/gui/component/addressbook-config.c:215
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Legitimation beim IMAP-Server konnte nicht erreicht werden.\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 ""
+"Ung�ltige opake Verfolgungsinformation:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1169
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "Antwort des IMAP-Servers enthielt keine %s-Information"
+
+#: addressbook/gui/component/addressbook-config.c:1613
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL wird von dieser Bin�rversion von Evolution nicht unterst�tzt)"
+
+#: addressbook/gui/component/addressbook-config.c:1689
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Abschlussdatum"
+
+#: addressbook/gui/component/ldap-config.glade.h:1
+#, fuzzy
+msgid "  S_how Supported Bases "
+msgstr "_Pr�fen, welche Typen unterst�tzt werden "
+
+#: addressbook/gui/component/ldap-config.glade.h:2
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Optionen"
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "<- _Remove"
+msgstr " _Entfernen"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "1234"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "Adressbuch-Quellen"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Alarme"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonym"
+
+#: 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 "Verbindung mit %s wird neu aufgebaut"
+
+#: 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 "Keine Information"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "_L�schen"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Listen_name:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "E-Mail-Adresse:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+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 wird diese E-Mail-Adresse benutzen, um Sie beim Server zu "
+"legitimieren"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolution wird diese E-Mail-Adresse benutzen, um Sie beim Server zu "
+"legitimieren"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "_Suchen:"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Allgemein"
+
+#: 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 "Konfiguration"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "R�nder"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_alle"
+
+#: 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 "One"
+
+#: 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 "Suchebe_reich:"
+
+#. 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 "Suchen"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Alle ausw�hlen"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Gel�scht"
+
+#: 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 "Quellinformation"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Verbindung zu 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 "Sub"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Nicht unterst�tztes Schema"
+
+#: 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 ""
+"Dieser Name wird verwendet, um Ihren Zugang zu identifizieren. Er erscheint "
+"nur zu Anzeigezwecken."
+
+#: 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 "Dies ist die Postadresse"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+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:139
+msgid "_Add"
+msgstr "Hinzuf�gen"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "Hinzuf�gen"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Aktion hinzuf�gen"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Aktion hinzuf�gen"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Alarme"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "Alle _l�schen"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Anzeige"
+
+#: 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:152 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 "_Bearbeiten"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "Termin _bearbeiten"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution-Alarm"
+
+#: 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 "Optionen"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Port:"
+
+#: 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 "Such_basis:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Servername:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Weiterschlaf-Zeit (Minuten)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Zugang %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 "Keine Karten"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Verbindung mit %s wird neu aufgebaut"
+
+#: 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 "Allgemein"
+
+#: 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 "Suchen"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolution Namenauswahlschnittstelle f�r das Adressbuch."
@@ -1067,9 +1280,9 @@ msgid "Factory for the Addressbook's name selection interface"
 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:777
-#: composer/e-msg-composer-attachment-bar.c:499 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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1098,7 +1311,12 @@ msgstr "(%d nicht gezeigt)"
 msgid "Unnamed Contact"
 msgstr "Namenloser Kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Absender enth�lt"
+
+#: 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"
@@ -1115,7 +1333,7 @@ msgstr ""
 "Beschreibung der Umst�nde, unter denen dieser Fehler auftrat,\n"
 "an Jon Trowbridge <trow@ximian.com>. Danke."
 
-#: 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"
@@ -1127,88 +1345,107 @@ msgstr ""
 "passieren. Sie werden Evolution beenden und neustarten\n"
 "m�ssen, um das Problem zu beheben."
 
-#: 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 "Kontakte aus Adressbuch w�hlen"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "Ent_haltend:"
+msgid "Select Names"
+msgstr "Namen w�hlen"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Co_ntacts:"
-msgstr "_Kontakte:"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Kontakt l�schen?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "F_ind"
-msgstr "_Suchen:"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Kontakte"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "Namen w�hlen"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
-msgstr "Kontakte zeigen, die auf folgende Kriterien passen:"
+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 "_Verschieben..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategorie:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Ordner:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Message Recipients:"
-msgstr "_Nachrichtenempf�nger:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "Anni_versary:"
-msgstr "Jahrestag:"
+#, fuzzy
+msgid "A_ssistant's name:"
+msgstr "Name des Assistenten:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "B_usiness"
-msgstr "Gesch�ftlich"
+#, fuzzy
+msgid "Add_ress..."
+msgstr "Adresse..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Business _Fax"
-msgstr "Gesch�ftliches Fax"
+msgid "Anni_versary:"
+msgstr "Jahrestag:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#, fuzzy
+msgid "Birthda_y:"
+msgstr "Geburtstag:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#, fuzzy
+msgid "C_ontacts..."
+msgstr "Kontakte..."
+
+#: 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 "Kategorien..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr "Zusammenarbeit"
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "D_epartment:"
+msgstr "Abteilung:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Details"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
 msgstr "_Verf�gbarkeits-Adresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "File A_s:"
 msgstr "Einsortieren _unter:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "General"
-msgstr "Allgemein"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#, fuzzy
+msgid "Full _Name..."
+msgstr "Voller Name..."
 
-#: 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"
@@ -1217,1134 +1454,1191 @@ msgstr ""
 "Falls diese Person Verf�gbarkeits- oder andere Kalenderinformationen im "
 "Internet ver�ffentlicht, geben Sie die Adresse dieser Informationen hier ein."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr "Neuer Telefon-Typ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "No_tes:"
 msgstr "Notizen:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Organi_zation:"
 msgstr "_Organisation:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#, fuzzy
+msgid "P_rofession:"
+msgstr "Beruf:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Phone Types"
 msgstr "Telefon-Typen"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Wants to receive _HTML mail"
-msgstr "Will HTML-Mail erhalten"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Address..."
-msgstr "Adresse..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Assistant's name:"
-msgstr "Name des Assistenten:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Birthday:"
-msgstr "Geburtstag:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+msgid "S_pouse:"
+msgstr "Partner:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Business"
-msgstr "Gesch�ftlich"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#, fuzzy
+msgid "This is the _mailing address"
+msgstr "Dies ist die Postadresse"
 
-#: 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 "Kontakte..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "Wants to receive _HTML mail"
+msgstr "Will HTML-Mail erhalten"
 
-#: 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: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:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "L�schen"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Department:"
-msgstr "Abteilung:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Full Name..."
-msgstr "Voller Name..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Home"
-msgstr "Zu Hause"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Job title:"
 msgstr "Stellenbezeichnung:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager's Name:"
 msgstr "Name des Vorgesetzten:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Mobile"
-msgstr "Mobil"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
 msgstr "Spitzname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
 msgstr "B�ro:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Profession:"
-msgstr "Beruf:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Public Calendar URL:"
 msgstr "_�ffentlicher Kalender-URI:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Spouse:"
-msgstr "Partner:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr "Dies ist die Postadresse"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "Adresse der _Webseite:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Sind Sie sicher, dass Sie diesen\n"
-"Kontakt l�schen wollen?"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "Kontakt l�schen?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:756
-msgid "Category editor not available."
-msgstr "Der Kategorie-Editor ist nicht verf�gbar."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:763
-msgid "This contact belongs to these categories:"
-msgstr "Dieser Kontakt geh�rt in folgende Kategorien:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
-msgid "TTY/TDD"
-msgstr "TTY/TTD"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Widget f�r ein Feld konnte nicht gefunden werden: '%s'"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
-msgstr "Kontakt schnell hinzuf�gen"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
-msgstr "Voll bearbeiten"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr "Voller Name"
-
-#: 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 "list"
-
-#: 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 gibt es bereits\n"
-"M�chten Sie sie �berschreiben?"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresse _2"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
+msgstr "Vereinigte Staaten"
 
-#: 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 "Albanien"
 
-#: 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 "Algerien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "American Samoa"
 msgstr "Amerikanisch-Samoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Antigua And Barbuda"
 msgstr "Antigua und Barbuda"
 
-#: 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 "Argentinien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Armenia"
 msgstr "Armenien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Aruba"
 msgstr "Aruba"
 
-#: 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 "Australien"
 
-#: 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 "�sterreich"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Azerbaijan"
 msgstr "Aserbaidschan"
 
-#: 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 "Bahamas"
 
-#: 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 "Bahrein"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Bangladesh"
 msgstr "Bangladesch"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Belarus"
 msgstr "Wei�russland"
 
-#: 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 "Belgien"
 
-#: 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 "Belize"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bermuda"
 msgstr "Bermudas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: 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 "Bolivien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnien und Herzegowina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bouvet Island"
 msgstr "Bouvet-Insel"
 
-#: 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 "Brasilien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "British Indian Ocean Territory"
 msgstr "British Indian Ocean Territory"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:33
-msgid "British Virgin Islands"
-msgstr "Britische Jungferninseln"
-
-#: 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 "Bulgarien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Cambodia"
 msgstr "Kambodscha"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: 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 "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cape Verde"
 msgstr "Kap Verde"
 
-#: 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 "Cayman-Inseln"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Central African Republic"
 msgstr "Zentralafrikanische Republic"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Chad"
 msgstr "Tschad"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-msgid "Check Address"
-msgstr "Adresse pr�fen"
-
-#: 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 "Chile"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "China"
 msgstr "China"
 
-#: 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 "Weihnachtsinsel"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokos-(Keeling-)Inseln"
 
-#: 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 "Kolumbien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Comoros"
 msgstr "Komoren"
 
-#: 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 "Kongo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Cook Islands"
 msgstr "Cook-Inseln"
 
-#: 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 "Costa Rica"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cote d'Ivoire"
 msgstr "Elfenbeink�ste"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:56
-msgid "Countr_y:"
-msgstr "Land:"
-
-#: 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 "Kroatien"
 
-#: 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 "Kuba"
 
-#: 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 "Zypern"
 
-#: 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 "Tschechische Republik"
 
-#: 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 "D�nemark"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Djibouti"
 msgstr "Dschibuti"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Dominica"
 msgstr "Dominica"
 
-#: 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 "Dominikanische Republik"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "East Timor"
 msgstr "Osttimor"
 
-#: 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 "Ecuador"
 
-#: 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 "�gypten"
 
-#: 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 "El Salvador"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Equatorial Guinea"
 msgstr "�quatorial-Guinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: 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 "Estland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Ethiopia"
 msgstr "�thiopien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Falkland Islands"
 msgstr "Falklandinseln"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Faroe Islands"
 msgstr "Far�er"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Fiji"
 msgstr "Fidschi"
 
-#: 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 "Finnland"
 
-#: 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 "Frankreich"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "French Guiana"
 msgstr "Franz�sisch-Guyana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "French Polynesia"
 msgstr "Franz�sisch-Polynesian"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Southern Territories"
 msgstr "Franz�sische S�dgebiete"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Gabon"
 msgstr "Gabun"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Gambia"
 msgstr "Gambia"
 
-#: 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 "Georgien"
 
-#: 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 "Deutschland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Ghana"
 msgstr "Ghana"
 
-#: 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 "Gibraltar"
 
-#: 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 "Griechenland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Greenland"
 msgstr "Gr�nland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guinea-bissau"
 msgstr "Guinea-Bissau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guyana"
 msgstr "Guyana"
 
-#: 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 "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 "Heard- und McDonald-Inseln"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Holy See"
 msgstr "Heiliger Stuhl"
 
-#: 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 "Honduras"
 
-#: 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 "Hongkong"
 
-#: 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 "Ungarn"
 
-#: 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 "Island"
 
-#: 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 "Indien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Indonesia"
 msgstr "Indonesien"
 
-#: 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 "Irland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Israel"
 msgstr "Israel"
 
-#: 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 "Italien"
 
-#: 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 "Jamaika"
 
-#: 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 "Japan"
 
-#: 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 "Jordan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Kazakhstan"
 msgstr "Kasachstan"
 
-#: 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 "Kiribati"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#, fuzzy
+msgid "Korea, Republic Of"
+msgstr "Republik Korea"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Lettland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: my-evolution/Locations.h:1198
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: my-evolution/Locations.h:1234
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: my-evolution/Locations.h:1268
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Macau"
 msgstr "Macao"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Macedonia"
 msgstr "Mazedonien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Malawi"
 msgstr "Malawi"
 
-#: 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 "Malediven"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Marshall Islands"
 msgstr "Marshall-Inseln"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Mauritania"
 msgstr "Mauretanien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1387
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Micronesia"
 msgstr "Mikronesien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+msgid "Moldova, Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mongolia"
 msgstr "Mongolei"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: my-evolution/Locations.h:1470
 msgid "Morocco"
 msgstr "Marokko"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
 msgid "Netherlands"
 msgstr "Niederlande"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Netherlands Antilles"
 msgstr "Niederl�ndische Antillen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "New Caledonia"
 msgstr "Neukaledonien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1560
 msgid "New Zealand"
 msgstr "Neuseeland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: my-evolution/Locations.h:1562
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: my-evolution/Locations.h:1574
 msgid "Norfolk Island"
 msgstr "Norfolkinsel"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Northern Mariana Islands"
 msgstr "N�rdliche Marianen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
 msgid "Norway"
 msgstr "Norwegen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1632
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
 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 "Palau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Palestinian Territory"
 msgstr "Pal�stinensisches Autonomiegebiet"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
 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 "Papua-Neuguinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1688
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr "Philippinen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
 msgid "Poland"
 msgstr "Polen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1824
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
 msgid "Qatar"
 msgstr "Katar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:173
-msgid "Republic Of Korea"
-msgstr "Republik Korea"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:174
-msgid "Republic Of Moldova"
-msgstr "Republik Moldawien"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Reunion"
 msgstr "Reunion"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
 msgid "Romania"
 msgstr "Rum�nien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Russian Federation"
 msgstr "Russische F�deration"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts und Nevis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: 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 "Saint Vincent und die Grenadinen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome und Principe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: my-evolution/Locations.h:2035
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Seychelles"
 msgstr "Seychellen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2090
 msgid "Singapore"
 msgstr "Singapur"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: my-evolution/Locations.h:2103
 msgid "Slovakia"
 msgstr "Slowakei"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: my-evolution/Locations.h:2104
 msgid "Slovenia"
 msgstr "Slowenien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Solomon Islands"
 msgstr "Salomonen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2119
 msgid "South Africa"
 msgstr "S�dafrika"
 
-#: 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 "S�dgeorgien und die S�dlichen Sandwichinseln"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
 msgid "Spain"
 msgstr "Spanien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "St. Helena"
 msgstr "Sankt Helena"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre und Miquelon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
 msgid "Suriname"
 msgstr "Surinam"
 
-#: 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 "Svalbard- und Jan-Mayen-Inseln"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Swaziland"
 msgstr "Swasiland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
 msgid "Sweden"
 msgstr "Schweden"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2183
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Tajikistan"
 msgstr "Tadschikistan"
 
-#: 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 "Vereinigte Republik Tansania"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
 msgstr "Thailand"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Trinidad And Tobago"
 msgstr "Trinidad und Tobago"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tunisia"
 msgstr "Tunesien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
 msgid "Turkey"
 msgstr "T�rkei"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Turks And Caicos Islands"
 msgstr "Turks und Caicos-Inseln"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tuvalu"
 msgstr "Tuval"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:218
-msgid "U.S. Virgin Islands"
-msgstr "U.S.-Jungferninseln"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "United Arab Emirates"
 msgstr "Vereinigte Arabische Emirate"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2342
 msgid "United Kingdom"
 msgstr "Vereinigtes K�nigreich"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr "Vereinigte Republik Tansania"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-msgid "United States"
-msgstr "Vereinigte Staaten"
-
-#: 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 "Kleinere abseitsliegende Inseln der Vereinigten Staaten"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: my-evolution/Locations.h:2348
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2380
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#, fuzzy
+msgid "Virgin Islands, British"
+msgstr "U.S.-Jungferninseln"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#, fuzzy
+msgid "Virgin Islands, U.S."
+msgstr "U.S.-Jungferninseln"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis und Futuna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Western Sahara"
 msgstr "Westsahara"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
 msgid "Yemen"
 msgstr "Jemen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2524
 msgid "Yugoslavia"
 msgstr "Jugoslawien"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Zambia"
 msgstr "Sambia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Zimbabwe"
 msgstr "Simbabwe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Kontakt l�schen?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+msgid "Category editor not available."
+msgstr "Der Kategorie-Editor ist nicht verf�gbar."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+msgid "This contact belongs to these categories:"
+msgstr "Dieser Kontakt geh�rt in folgende Kategorien:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#, fuzzy
+msgid "Save Contact as VCard"
+msgstr "Als VCard speichern"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr "TTY/TTD"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Widget f�r ein Feld konnte nicht gefunden werden: '%s'"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+msgid "Contact Quick-Add"
+msgstr "Kontakt schnell hinzuf�gen"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+msgid "Edit Full"
+msgstr "Voll bearbeiten"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr "Voller Name"
+
+#: 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 "list"
+
+#: 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 gibt es bereits\n"
+"M�chten Sie sie �berschreiben?"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Adresse _2"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "Adresse pr�fen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "Land:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "Ort:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Postfach:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Staat/Bundesland:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "Postleitzahl/_ZIP:"
 
@@ -2444,10 +2738,15 @@ msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 msgid "Contact List Editor"
 msgstr "Kontaktlisten-Editor"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#, fuzzy
+msgid "Save List as VCard"
+msgstr "Als VCard speichern"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Trotzdem hinzuf�gen"
@@ -2495,7 +2794,7 @@ msgstr ""
 "trotzdem hinzuf�gen?"
 
 #: 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 "Komplexe Suche"
 
@@ -2504,217 +2803,319 @@ msgstr "Komplexe Suche"
 msgid "Search"
 msgstr "Suchen"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Keine Karten"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 Karte"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d Karten"
 
-#: 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 "Als VCard speichern"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "�ffnen"
-
-#: 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 "Kontakt weiterleiten"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-msgid "Send Message to Contact"
-msgstr "Nachricht an Kontakt schicken"
-
-#: 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 "Drucken"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr "Umschlag drucken"
-
-#: 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 "L�schen"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+msgid "Error getting book view"
+msgstr "Fehler beim Starten von %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:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Fehler beim �ndern einer Karte"
 
-#: 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:1043
 msgid "Success"
 msgstr "Erfolg"
 
-#: 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: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
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Karte nicht gefunden"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "Kartenkennung existiert bereits"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protokoll nicht unterst�tzt"
 
-#: 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:607 camel/camel-service.c:643
+#: 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
 msgid "Cancelled"
 msgstr "Storniert"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Anderer Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Wollen Sie die �nderungen speichern?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Fehler beim Hinzuf�gen der Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Fehler beim Hinzuf�gen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Fehler beim �ndern einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Fehler beim Entfernen einer Karte"
 
-#. 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:204
+#, fuzzy
+msgid "Display Cards?"
+msgstr "Anzeige"
 
-#. 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:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "Anzeige"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Keine Karten"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Keine Karten"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Keine Karten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Keine Karten"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Hier klicken, um einen Kontakt hinzuzuf�gen *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Prim�res Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Telefon des Assistenten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Gesch�ftliches Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "R�ckruf-Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Firmentelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Telefon zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Gesch�ftliche Adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Adresse zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Autotelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Gesch�ftliches Telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Telefon zu Hause 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Anderes Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Als VCard speichern"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Neuer Kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Neu Kontaktliste"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Gehe zu Ordner..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Importieren..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "Nach Kontakten _suchen"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Adressbuch-Quellen..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Pilot-Einstellungen..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Kontakt weiterleiten"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Nachricht an Kontakt schicken"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Umschlag drucken"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "In Ordner kopieren..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "In Ordner verschieben..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Ausschneiden"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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: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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "Aktuelle Ansicht"
+
+#. 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:940
+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:945
+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."
@@ -2728,11 +3129,12 @@ msgstr "und eine andere Karte."
 msgid "Save in addressbook"
 msgstr "In Adressbuch speichern"
 
-#: 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 ""
@@ -2742,10 +3144,37 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"In dieser Ansicht gibt es keine Eintr�ge zum Anzeigen.\n"
+"\n"
+"Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Kartenansicht"
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr "Umschlag drucken"
+
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr "Karten drucken"
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+msgid "Print card"
+msgstr "Karte drucken"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 Punkt Tahoma"
@@ -2815,6 +3244,7 @@ msgid "Include:"
 msgstr "Dazunehmen:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Querformat"
 
@@ -2839,10 +3269,12 @@ msgid "Options"
 msgstr "Optionen"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Ausrichtung"
 
 #: addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "Seite"
 
@@ -2858,7 +3290,9 @@ msgstr "Papier"
 msgid "Paper source:"
 msgstr "Papierquelle:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Hochformat"
 
@@ -2914,62 +3348,49 @@ msgstr "Breite:"
 msgid "_Font..."
 msgstr "_Schrift..."
 
-#: addressbook/printing/e-contact-print.c:1111
-msgid "Print cards"
-msgstr "Karten drucken"
-
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-msgid "Print card"
-msgstr "Karte drucken"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr "Umschlag drucken"
-
-#: calendar/cal-util/cal-component.c:1202
+#: calendar/cal-util/cal-component.c:1207
 msgid "Untitled appointment"
 msgstr "Unbenannter Termin"
 
-#: 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:405 mail/message-list.c:651
+#: 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
 msgid "High"
 msgstr "Hoch"
 
-#: 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:650
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
-#: 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:407 mail/message-list.c:649
+#: 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
 msgid "Low"
 msgstr "Niedrig"
 
 #. 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
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: calendar/conduits/calendar/calendar-conduit.c:937
-#: calendar/conduits/todo/todo-conduit.c:649
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: 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 "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/conduits/todo/todo-conduit.c:756
-#: calendar/conduits/todo/todo-conduit.c:759
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "_Priorit�t:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
@@ -2982,41 +3403,55 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Eine beispielhafte Bonobo-Komponente, die einen Kalender anzeigt."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Kalender- und Aufgaben-Einstellungen"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Calendar."
+msgstr "Fabrik f�r den Evolution-Maileditor."
+
+#: 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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution-Komponente f�r die Verwaltung des Kalenders."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr "Fabrik f�r den Evolution-Aufgabeneditor."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 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:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "Fabrik f�r die beispielhafte Kalender-Control"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Fabrik, die Kalender-Komponenteneditor-Dialoge zentralisiert"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 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
+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 "Alarm-Benachrichtigungsdienst"
@@ -3025,22 +3460,10 @@ msgstr "Alarm-Benachrichtigungsdienst"
 msgid "Factory for the alarm notification service"
 msgstr "Fabrik f�r den Alarm-Benachrichtigungsdienst."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-msgid "Starting:"
-msgstr "Beginnt:"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-msgid "Ending:"
-msgstr "Endent:"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "ung�ltige Zeit"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-msgid "Evolution Alarm"
-msgstr "Evolution-Alarm"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3063,11 +3486,11 @@ msgstr "Weiterschlaf-Zeit (Minuten)"
 msgid "_Edit appointment"
 msgstr "Termin _bearbeiten"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:670
+#: calendar/gui/alarm-notify/alarm-queue.c:675
 msgid "No description available."
 msgstr "Keine Beschreibung verf�gbar."
 
-#: 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"
@@ -3080,11 +3503,17 @@ msgstr ""
 "wird statt dessen eine normales Erinnerungsdialogfenster\n"
 "anzeigen."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:781
-#, c-format
+#: calendar/gui/alarm-notify/alarm-queue.c:753
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Warnung"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:758
+#, fuzzy, 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"
@@ -3097,7 +3526,12 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausf�hren wollen?"
 
-#: 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 "Mich nicht mehr fragen."
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "GNOME konnte nicht initialisiert werden"
 
@@ -3109,36 +3543,52 @@ msgstr "Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 msgid "Could not create the alarm notify service factory"
 msgstr "Fabrik f�r Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Zusammenfassung enth�lt"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Beschreibung enth�lt"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentar enth�lt"
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr "Nicht passend"
+
+#: 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: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/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. %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:805
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3146,16 +3596,14 @@ msgstr ""
 "ORBit und OAF Einstellungen. "
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "�ffentlich"
 
@@ -3176,32 +3624,27 @@ msgid "W"
 msgstr "W"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Frei"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 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:479 calendar/gui/print.c:2249
 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:480 calendar/gui/e-meeting-model.c:329
-#: calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Abgeschlossen"
 
@@ -3217,12 +3660,13 @@ 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/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/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
+#: 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 "Keine"
 
@@ -3234,23 +3678,15 @@ msgstr "Wiederkehrend"
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: 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:803
+#: 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
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr "Nein"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1974 calendar/gui/e-day-view.c:1675
-#: calendar/gui/e-week-view.c:1182
-msgid "Searching"
-msgstr "Suchen"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Tagesansicht"
@@ -3267,63 +3703,79 @@ msgstr "Wochenansicht"
 msgid "Month View"
 msgstr "Monatsansicht"
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
-msgstr "Zusammenfassung enth�lt"
-
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
-msgstr "Beschreibung enth�lt"
-
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "Kommentar enth�lt"
-
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
-msgid "Unmatched"
-msgstr "Nicht passend"
-
-#: 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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Ordner mit Terminen und Ereignissen"
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Ordner mit To-Do-Eintr�gen"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "Einen neuen Termin anlegen"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "Schleigzeilen-Einstellungen"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "Besprechung"
+
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "Neue Aufgabe"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "Aufgabe"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Neuer Termin"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "Neuer _Termin"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
-msgstr "Eine neue Aufgabe anlegen"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Neuer Termin"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "Neue _Aufgabe"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "Termin"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Der Ordner in `%s' konnte nicht ge�ffnet werden"
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
 
+#: 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 "Audio-Alarmoptionen"
@@ -3491,12 +3943,12 @@ msgstr "%s %s nach Terminende"
 msgid "%s at the end of the appointment"
 msgstr "%s zum Terminende"
 
-#: calendar/gui/dialogs/alarm-page.c:453
+#: calendar/gui/dialogs/alarm-page.c:452
 #, c-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
-#: calendar/gui/dialogs/alarm-page.c:459
+#: calendar/gui/dialogs/alarm-page.c:458
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s f�r einen unbekannten Ausl�sertyp."
@@ -3517,7 +3969,7 @@ msgstr "Erinnerungen"
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
@@ -3525,12 +3977,11 @@ msgstr "Zusammenfassung:"
 msgid "_Options..."
 msgstr "_Optionen..."
 
-#. 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 "nach"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "vor"
 
@@ -3547,7 +3998,7 @@ msgstr "Ende des Termins"
 msgid "hour(s)"
 msgstr "Stunde(n)"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -3588,170 +4039,168 @@ msgid "Color for tasks due today"
 msgstr "Farbe f�r heute f�llige Aufgaben"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Neue Termine mit einer voreingestellten _Erinnerung erzeugen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Tage"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Erster Tag der _Woche:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Freitag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Stunden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Montag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "_�berf�llige Aufgaben:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Samstag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
-msgstr "_Endzeiten von Terminen in Wochen- und Monatsansichten zeigen"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "_Wochennummern in Datumsnavigator zeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "S_o"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Heute f�llige _Aufgaben:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "_Do"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "D_i"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Heute f�llige _Aufgaben:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "_Aufgabenliste"
 
-#: 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 "Donnerstag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Zeit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Zeit_zone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Zeit-_Unterteilungen:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Zeitformat:"
 
-#: 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 "Dienstag"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Werkwoche"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 Stunden (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 Stunden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 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:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "Wochenenden in Monatsansicht _komprimieren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Anzeige"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Fr"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Allgemein"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "Erledigte Aufgaben _verbergen nach"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Mo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Andere"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "_�berf�llige Aufgaben:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "S_a"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "_Aufgabenliste"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "_Endzeiten von Terminen in Wochen- und Monatsansichten zeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Zeit-_Unterteilungen:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Mi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "vor Terminbeginn"
 
@@ -3824,73 +4273,60 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine �nderungen gemacht, den Editor aktualisieren?"
 
-#: 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 " an "
 
-#: 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 " (Abgeschlossen "
 
-#: 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 "Abgeschlossen "
 
-#: 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 " (F�llig am "
 
-#: 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 "F�llig am "
 
-#: calendar/gui/dialogs/comp-editor.c:303
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "Objekt konnte nicht aktualisiert werden!"
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaleintrag - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1897
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "Datei �berschreiben?"
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1904
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Eine Datei mit diesem Namen existiert bereits.\n"
-"�berschreiben?"
-
-#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Aktuelle Version kann nicht erhalten werden!"
 
@@ -3949,7 +4385,7 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Termin"
 
@@ -3963,13 +4399,13 @@ msgstr "Wiederholung"
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 msgid "Scheduling"
 msgstr "Planung"
 
 #: calendar/gui/dialogs/event-editor.c:207
 #: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "Besprechung"
 
@@ -4002,30 +4438,42 @@ msgid "F_ree"
 msgstr "_Frei"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
+#, fuzzy
+msgid "L_ocation:"
+msgstr ""
+"\n"
+"Geographischer Ort: "
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Privat"
 
-#: 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 "�ffentlich"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Zeit zeigen als"
 
-#: 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 "Zusammenfassung:"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "Kontakte..."
+
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "_Endzeit:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "Anfangszeit:"
 
@@ -4052,55 +4500,49 @@ msgstr "Anwesender"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Hier klicken, um einen Teilnehmer hinzuzuf�gen"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Gemeinsamer Name"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegiert durch"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegiert an"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Sprache"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Mitglied"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:798
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "UAwg"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 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:49
-#: mail/message-list.etspec.h:8
+#: 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"
 msgstr "Status"
 
-#: 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -4115,7 +4557,7 @@ msgid "_Change Organizer"
 msgstr "Organisator _�ndern"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:445
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "Andere einladen..."
 
@@ -4123,29 +4565,100 @@ msgstr "Andere einladen..."
 msgid "_Other Organizer"
 msgstr "_Anderer Organisator"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Dieser Termin enth�lt Wiederholungsregeln, die Evolution nicht bearbeiten "
 "kann."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "bei"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "list"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "Sekunde"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Andere"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Nord"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "list"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Anderes Fax"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "Tag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "am"
 
-#: 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 "Auftreten"
 
@@ -4209,22 +4722,31 @@ msgstr "Woche(n)"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: 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 ""
+"Die Besprechungsinformationen haben sich ge�ndert. Eine aktualisierte "
+"Version verschicken?"
+
+#: calendar/gui/dialogs/send-comp.c:59
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Die Besprechungsinformationen haben sich ge�ndert. Eine aktualisierte "
 "Version verschicken?"
 
-#: 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 ""
 "Die Aufgabeninformationen haben sich ge�ndert. Eine aktualisierte Version "
 "verschicken?"
 
-#: calendar/gui/dialogs/send-comp.c:65
-msgid "The journal entry has changed. Send an updated version?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
-"Der Journaleintrag hat sich ge�ndert. Eine aktualisierte Version schicken?"
+"Die Aufgabeninformationen haben sich ge�ndert. Eine aktualisierte Version "
+"verschicken?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
@@ -4241,7 +4763,7 @@ msgid "Progress"
 msgstr "Fortschritt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4253,15 +4775,19 @@ msgstr "_Priorit�t:"
 msgid "_Status:"
 msgstr "Status:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "Grundlegend"
+
 #: 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:324
 msgid "Assignment"
 msgstr "Arbeitsauftrag"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Beschreibung:"
 
@@ -4273,191 +4799,154 @@ msgstr "Anfangsdatum:"
 msgid "_Due Date:"
 msgstr "F�llig am:"
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: 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:751 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:941 calendar/gui/e-day-view.c:3544
-#: calendar/gui/e-week-view.c:3422 mail/folder-browser.c:1447
-#: shell/e-shortcuts-view.c:384
+#: 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
 msgid "_Open"
 msgstr "�_ffnen"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Speichern unter..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "_Drucken..."
+
+#: calendar/gui/e-calendar-table.c:978 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:947 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3433 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:979 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:949 calendar/gui/e-day-view.c:3530
-#: calendar/gui/e-day-view.c:3557 calendar/gui/e-week-view.c:3409
-#: calendar/gui/e-week-view.c:3435 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:980 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 "Einf�gen"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Aufgabe zuweisen"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Als i_Calendar weiterleiten"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:956
-msgid "_Delete this Task"
-msgstr "Diese Aufgabe _l�schen"
-
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "Aufgaen als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "Ausgew�hlte Aufgaben _l�schen"
 
-#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7115
-#: calendar/gui/e-week-view.c:3918
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Klicken, um eine Aufgabe hinzuzuf�gen"
 
-#. 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 ""
-"Das Datum muss in diesem Format eingegeben werden: \n"
-"\n"
-"%s"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarme"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Abgeschlossen"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Abschlussdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "F�llig am"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Enddatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Geographische Lage"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Priorit�t"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
 #. 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
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Aufgabensorte"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 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 ""
+"Das Datum muss in diesem Format eingegeben werden: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -4465,379 +4954,178 @@ msgstr "%02i Minuten-Unterteilungen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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"
 
 #. 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"
 
 #. 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
 msgid "am"
 msgstr "AM"
 
 #. 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
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "Neuer _Termin"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Neues ganzt�giges _Ereignis"
 
-#: 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:3553 calendar/gui/e-week-view.c:3440
+#, fuzzy
+msgid "New Meeting"
+msgstr "Besprechung"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Neue Aufgabe"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Drucken..."
+
+#: 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 "Zum _heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-msgid "_Delete this Appointment"
-msgstr "Diesen Termin _l�schen"
+#: 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 "Verf�gbarkeitsinformationen _ver�ffentlichen"
+
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
+#, fuzzy
+msgid "_Configure..."
+msgstr "Konfiguration"
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
+msgid "_Save As..."
+msgstr "Speichern _unter..."
+
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Besprechung ansetzen"
+
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Als i_Calendar weiterleiten"
 
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten _beweglich machen"
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "Dieses _Auftreten l�schen"
 
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 msgid "Delete _All Occurrences"
 msgstr "Jedes _Auftreten l�schen"
 
-#: calendar/gui/e-itip-control.c:524
-msgid "Meeting begins: <b>"
-msgstr "Besprechung beginnt: <b>"
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Task begins: <b>"
-msgstr "Aufgabe beginnt: <b>"
-
-#: calendar/gui/e-itip-control.c:534
-msgid "Free/Busy info begins: <b>"
-msgstr "Verf�gbarkeitsinformation beginnt: <b>"
-
-#: calendar/gui/e-itip-control.c:538
-msgid "Begins: <b>"
-msgstr "Beginnt: <b>"
-
-#: calendar/gui/e-itip-control.c:550
-msgid "Meeting ends: <b>"
-msgstr "Besprechung endet: <b>"
-
-#: calendar/gui/e-itip-control.c:553
-msgid "Free/Busy info ends: <b>"
-msgstr "Verf�gbarkeitsinformation endet: <b>"
-
-#: calendar/gui/e-itip-control.c:557
-msgid "Ends: <b>"
-msgstr "Endet: <b>"
-
-#: calendar/gui/e-itip-control.c:571
-msgid "Task Completed: <b>"
-msgstr "Aufgabe vollst�ndig zu: <b>"
-
-#: calendar/gui/e-itip-control.c:581
-msgid "Task Due: <b>"
-msgstr "Aufgabe f�llig am: <b>"
-
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
-msgid "iCalendar Information"
-msgstr "iKalender-Information"
-
-#. Title
-#: calendar/gui/e-itip-control.c:633
-msgid "iCalendar Error"
-msgstr "iKalender-Fehler"
-
-#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
-msgid "An unknown person"
-msgstr "Eine unbekannte Person"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
-"<br> Bitte sehen Sie sich die folgenden Informationen noch einmal an und "
-"w�hlen Sie dann eine Aktion aus dem Men� unten aus."
-
-#: calendar/gui/e-itip-control.c:737
-msgid "<i>None</i>"
-msgstr "<i>Keine</i>"
-
-#: 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
-msgid "Choose an action:"
-msgstr "Eine Aktion w�hlen:"
-
-#: calendar/gui/e-itip-control.c:779
-msgid "Update"
-msgstr "Aktualisieren"
-
-#: 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
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:795
-msgid "Accept"
-msgstr "Annehmen"
-
-#: calendar/gui/e-itip-control.c:796
-msgid "Tentatively accept"
-msgstr "Vorl�ufig annehmen"
-
-#: calendar/gui/e-itip-control.c:797
-msgid "Decline"
-msgstr "Ablehnen"
-
-#: calendar/gui/e-itip-control.c:811
-msgid "Send Free/Busy Information"
-msgstr "Verf�gbarkeitsinformationen senden"
-
-#: calendar/gui/e-itip-control.c:824
-msgid "Update respondent status"
-msgstr "Status des Antwortenden aktualisieren"
-
-#: calendar/gui/e-itip-control.c:838
-msgid "Send Latest Information"
-msgstr "Neueste Informationen senden"
-
-#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: calendar/gui/e-itip-control.c:867
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> hat Besprechungsinformationen ver�ffentlicht."
-
-#: calendar/gui/e-itip-control.c:868
-msgid "Meeting Information"
-msgstr "Besprechungsinformationen"
-
-#: calendar/gui/e-itip-control.c:872
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> w�nscht Ihre Anwesenheit bei einer Besprechung"
-
-#: calendar/gui/e-itip-control.c:873
-msgid "Meeting Proposal"
-msgstr "Besprechungsvorschlag"
-
-#: calendar/gui/e-itip-control.c:877
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "<b>%s</b> w�nscht zu einer vorhandenen Besprechung hinzuzuf�gen"
-
-#: calendar/gui/e-itip-control.c:878
-msgid "Meeting Update"
-msgstr "Besprechungsaktualisierung"
-
-#: calendar/gui/e-itip-control.c:882
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> w�nscht aktuelle Besprechungsinformationen zu erhalten."
-
-#: calendar/gui/e-itip-control.c:883
-msgid "Meeting Update Request"
-msgstr "Besprechungs-Aktualisierungsanfrage"
-
-#: calendar/gui/e-itip-control.c:887
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> hat auf eine Besprechungsanfrage geantwortet."
-
-#: calendar/gui/e-itip-control.c:888
-msgid "Meeting Reply"
-msgstr "Besprechungsantwort"
-
-#: calendar/gui/e-itip-control.c:892
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> hat eine Besprechung widerrufen."
-
-#: calendar/gui/e-itip-control.c:893
-msgid "Meeting Cancellation"
-msgstr "Besprechungswiderruf"
-
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
-#: calendar/gui/e-itip-control.c:982
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> hat eine unverst�ndliche Nachricht gesendet."
-
-#: calendar/gui/e-itip-control.c:898
-msgid "Bad Meeting Message"
-msgstr "Fehlerhafte Besprechungsmitteilung"
-
-#: calendar/gui/e-itip-control.c:917
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> hat Aufgabeninformationen ver�ffentlicht."
-
-#: calendar/gui/e-itip-control.c:918
-msgid "Task Information"
-msgstr "Aufgabeninformationen"
-
-#: calendar/gui/e-itip-control.c:922
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> fordert Sie auf eine Aufgabe auszuf�hren."
-
-#: calendar/gui/e-itip-control.c:923
-msgid "Task Proposal"
-msgstr "Aufgabenvorschlag"
-
-#: calendar/gui/e-itip-control.c:927
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b>%s</b> w�nscht zu einer bestehenden Aufgabe hinzuzuf�gen."
-
-#: calendar/gui/e-itip-control.c:928
-msgid "Task Update"
-msgstr "Aufgabenaktualisierung"
-
-#: calendar/gui/e-itip-control.c:932
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> w�nscht letzte Aufgabeninformationen zu erhalten."
-
-#: calendar/gui/e-itip-control.c:933
-msgid "Task Update Request"
-msgstr "Aufgaben-Aktualisierungsanfrage"
-
-#: calendar/gui/e-itip-control.c:937
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> hat auf eine Aufgabenzuweisung geantwortet."
-
-#: calendar/gui/e-itip-control.c:938
-msgid "Task Reply"
-msgstr "Aufgaben-Antwort"
-
-#: calendar/gui/e-itip-control.c:942
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> hat eine Aufgabe widerrufen."
-
-#: calendar/gui/e-itip-control.c:943
-msgid "Task Cancellation"
-msgstr "Aufgabenwiderruf"
-
-#: calendar/gui/e-itip-control.c:948
-msgid "Bad Task Message"
-msgstr "Fehlerhafte Aufgabenmitteilung"
-
-#: calendar/gui/e-itip-control.c:967
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> hat Verf�gbarkeitsinformationen ver�ffentlicht."
-
-#: calendar/gui/e-itip-control.c:968
-msgid "Free/Busy Information"
-msgstr "Verf�gbarkeitsinformationen"
-
-#: calendar/gui/e-itip-control.c:972
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> fordert Ihre Verf�gbarkeitsinformationen an."
-
-#: calendar/gui/e-itip-control.c:973
-msgid "Free/Busy Request"
-msgstr "Verf�gbarkeits-Anfrage"
+"Die GNOME-Pilot-Werkzeuge scheinen auf diesem System nicht installiert zu "
+"sein."
 
-#: calendar/gui/e-itip-control.c:977
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> hat auf eine Verfugbarkeits-Anfrage geantwortet."
-
-#: calendar/gui/e-itip-control.c:978
-msgid "Free/Busy Reply"
-msgstr "Verf�gbarkeits-Antwort"
-
-#: calendar/gui/e-itip-control.c:983
-msgid "Bad Free/Busy Message"
-msgstr "Fehlerhafte Verf�gbarkeitsmitteilung"
-
-#: calendar/gui/e-itip-control.c:1052
-msgid "The message does not appear to be properly formed"
-msgstr "Diese Nachricht scheint falsch formatiert zu sein"
-
-#: calendar/gui/e-itip-control.c:1071
-msgid "The message contains only unsupported requests."
-msgstr "Diese Nachricht enth�lt ausschlie�lich nicht unterst�tzte Anfragen."
-
-#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
-msgid "The attachment does not contain a valid calendar message"
-msgstr "Die Anlage enth�lt keine g�ltige Kalendernachricht"
+msgid "Error executing %s."
+msgstr "Fehler beim Ausf�hren von %s."
 
-#: calendar/gui/e-itip-control.c:1130
-msgid "The attachment has no viewable calendar items"
-msgstr "Die Anlage hat keine anzeigbaren Kalenderinformationen"
+#: 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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1564
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"Anwesenheitsstatus kann nicht aktualisiert werden, da der Eintrag nicht mehr "
+"existiert"
+
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Anwesenheitsstatus konnte auf Grund eines ung�ltigen Status nicht "
 "aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1284
-msgid "Attendee status ould not be updated!\n"
+#: calendar/gui/e-itip-control.c:1638
+#, fuzzy
+msgid "Attendee status could not be updated!\n"
 msgstr "Anwesenheitsstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Anwesenheitsstatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:1288
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Anwesenheitsstatus kann nicht aktualisiert werden, da der Eintrag nicht mehr "
-"existiert"
-
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:1348 calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: calendar/gui/e-itip-control.c:1566
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
-"Keine Ihrer Identit�ten kann in der Anwesenheitsliste gefunden werden!\n"
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Ordner w�hlen"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Ordner w�hlen"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4876,213 +5164,215 @@ msgstr "datum-ende"
 msgid "date-start"
 msgstr "datum-anfang"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Vorsitzende"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1535
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Ben�tigte Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "Optionale Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "Nicht-Teilnehmer"
 
-#: 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:771
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Ressource"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Raum"
 
-#: 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:775
-#: calendar/gui/e-meeting-model.c:791
-#: 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 "Unbekannt"
-
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "Vorsitzender"
 
-#: 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:788
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "Ben�tigter Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
-#: 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:816
+#: 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 "Erfordert Ma�nahme"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:819 calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Vorl�ufig"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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:2113 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel-item.c:479
+#: calendar/gui/e-meeting-time-sel.c:2118 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
-#: 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 "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:428
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "Au�er Haus"
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Keine Information"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "Optionen"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Nur Arbeitszeit anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "Weggezoomt anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "Verf�gbarkeit _aktualisieren"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "<<"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "AutoWahl"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">>"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "Alle Leute und Ressourcen"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "Alle Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "Ben�tigte Leute"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "Ben�tigte Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:641
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "Anfang der Besprechung:"
 
-#: calendar/gui/e-meeting-time-sel.c:660
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Ende der Besprechung:"
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben bei %s werden ge�ffnet"
 
-#: 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 "Die Aufgaben in `%s' konnten nicht geladen werden"
 
-#: 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 ""
 "Die Methode, die zum Laden von `%s' ben�tigt wird, ist nicht unterst�tzt"
 
-#: calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Abschlussdatum"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Ausgew�hlte Objekte werden gel�scht"
+
+#: calendar/gui/e-tasks.c:659
+#, fuzzy
+msgid "Expunging"
+msgstr "Ordner wird ges�ubert"
+
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Neuer _Termin..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "Diesen Termin _l�schen"
+
+#: calendar/gui/gnome-cal.c:1538
 #, 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:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1865
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender bei %s wird ge�ffnet"
@@ -5143,262 +5433,227 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:220
+#, fuzzy
+msgid "At least one attendee is necessary"
 msgstr "Mindestens ein Teilnehmer wird ben�tigt."
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "Ein Organisator muss feststehen."
 
-#: calendar/gui/itip-utils.c:570
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Sie m�ssen ein Teilnehmer des Ereignisses sein."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr "Komponenteneditor-Fabrik konnte nicht angelegt werden"
 
-#: 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 "So"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Mo"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Di"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Do"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Angew�hlter Tag (%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 "Angew�hlte Woche (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Angew�hlter Monat (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Angew�hltes Jahr (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Aufgabe"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Priorit�t: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Prozent abgeschlossen: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Kategorien: %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "Kontakte: "
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Kalender drucken"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2358 my-evolution/e-summary.c:619
-#: 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Eintrag drucken"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
-#: calendar/gui/tasks-control.c:126
-msgid "The URI of the tasks folder to display"
-msgstr "Der URI, den der Aufgabenordner anzeigen wird"
-
 #: calendar/gui/tasks-control-factory.c:75
 msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
@@ -5406,6 +5661,34 @@ msgstr ""
 "Die Aufgaben-Ansicht konnte nicht erstellt werden. Bitte �berpr�fen Sie Ihre "
 "ORBit und OAF Einstellungen."
 
+#: calendar/gui/tasks-control.c:147
+msgid "The URI of the tasks folder to display"
+msgstr "Der URI, den der Aufgabenordner anzeigen wird"
+
+#: 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 ""
+"Dieser Vorgang wird alle als gel�scht markierten Nachrichten auf Dauer "
+"entfernen. Falls Sie fortfahren, werden Sie diese Nachrichten nie "
+"wiederherstellen k�nnen.\n"
+"\n"
+"Nachrichten wirklich entfernen?"
+
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+msgid "Do not ask me again."
+msgstr "Mich nicht mehr fragen."
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Karten drucken"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5448,93 +5731,127 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMDMDFS"
 
-#: calendar/pcs/query.c:234
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "Fabrik, um VCard-Dateien in Evolution zu importieren."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "Importiert VCard-Dateien in Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "Importiert VCard-Dateien in Evolution."
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Kalendermitteilung"
+
+#: 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 hat Pine-Maildateien gefunden.\n"
+"M�chten Sie sie in Evolution importieren?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Kalender"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:258
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time erwartet 1 Argument"
 
-#: calendar/pcs/query.c:263
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time erwartet eine Zeichenkette als 1. Argument"
 
-#: 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 erwartet eine Datum-/Zeit-Zeichenkette nach ISO 8601 als 1. "
 "Argument"
 
-#: calendar/pcs/query.c:300
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day erwartet zwei Argumente"
 
-#: 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 erwartet einen time_t-Wert als 1. Argument"
 
-#: 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 erwartet eine Ganzzahl als 2. Argument"
 
-#: calendar/pcs/query.c:339
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin erwartet 1 Argument"
 
-#: 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 erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:371
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end erwartet 1 Argument"
 
-#: 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 erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:412
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:508
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? erwartet 2 Argumente"
 
-#: 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? erwartet einen time_t-Wert als 1. Argument"
 
-#: 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? erwartet einen time_t-Wert als 2. Argument"
 
-#: calendar/pcs/query.c:650
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? erwartet 2 Argumente"
 
-#: calendar/pcs/query.c:655
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? erwartet eine Zeichenkette als 1. Argument"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? erwartet eine Zeichenkette als 2. Argument"
 
-#: calendar/pcs/query.c:679
+#: 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? erwartet als 1. Argument entweder \"any\", \"summary\" oder "
 "\"description\""
 
-#: calendar/pcs/query.c:721
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? erwartet mindestens 1 Argument"
 
-#: 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)"
@@ -5542,42 +5859,1669 @@ msgstr ""
 "has-categories? erwartet Zeichenketten als Argumente oder aber ein einziges "
 "Argument, das dem Wahrheitswert 'falsch' (#f) entspricht"
 
-#: calendar/pcs/query.c:821
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:866
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? erwartet 1 Argument"
 
-#: calendar/pcs/query.c:871
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:1159
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Auswertung des Suchausdrucks ergab keinen Wahrheitswert"
 
-#: camel/camel-cipher-context.c:171
+#.
+#. * 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 "Dschibuti"
+
+#: 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 "Amerikanisch-Samoa"
+
+#: calendar/zones.h:60
+#, fuzzy
+msgid "America/Anchorage"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:61
+#, fuzzy
+msgid "America/Anguilla"
+msgstr "Anguilla"
+
+#: calendar/zones.h:62
+#, fuzzy
+msgid "America/Antigua"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:63
+#, fuzzy
+msgid "America/Araguaina"
+msgstr "Nicaragua"
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+#, fuzzy
+msgid "America/Asuncion"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:66
+#, fuzzy
+msgid "America/Barbados"
+msgstr "Barbados"
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: calendar/zones.h:68
+#, fuzzy
+msgid "America/Belize"
+msgstr "Belize"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+#, fuzzy
+msgid "America/Bogota"
+msgstr "Amerikanisch-Samoa"
+
+#: 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 "Amerikanisch-Samoa"
+
+#: calendar/zones.h:76
+#, fuzzy
+msgid "America/Catamarca"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+#, fuzzy
+msgid "America/Cayman"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:79
+#, fuzzy
+msgid "America/Chicago"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+#, fuzzy
+msgid "America/Cordoba"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:82
+#, fuzzy
+msgid "America/Costa_Rica"
+msgstr "Costa Rica"
+
+#: calendar/zones.h:83
+#, fuzzy
+msgid "America/Cuiaba"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:84
+#, fuzzy
+msgid "America/Curacao"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+#, fuzzy
+msgid "America/Dawson"
+msgstr "Amerikanisch-Samoa"
+
+#: 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 "Dominica"
+
+#: calendar/zones.h:91
+#, fuzzy
+msgid "America/Edmonton"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+#, fuzzy
+msgid "America/El_Salvador"
+msgstr "El Salvador"
+
+#: 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 "Amerikanisch-Samoa"
+
+#: 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 "Amerikanisch-Samoa"
+
+#: calendar/zones.h:100
+#, fuzzy
+msgid "America/Guadeloupe"
+msgstr "Guadeloupe"
+
+#: calendar/zones.h:101
+#, fuzzy
+msgid "America/Guatemala"
+msgstr "Guatemala"
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+#, fuzzy
+msgid "America/Guyana"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:104
+#, fuzzy
+msgid "America/Halifax"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:105
+#, fuzzy
+msgid "America/Havana"
+msgstr "Amerikanisch-Samoa"
+
+#: 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 "Amerikanisch-Samoa"
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+#, fuzzy
+msgid "America/Juneau"
+msgstr "Amerikanisch-Samoa"
+
+#: 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 "Amerikanisch-Samoa"
+
+#: calendar/zones.h:120
+#, fuzzy
+msgid "America/Lima"
+msgstr "Amerikanisch-Samoa"
+
+#: 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 "Amerikanisch-Samoa"
+
+#: calendar/zones.h:124
+#, fuzzy
+msgid "America/Managua"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:125
+#, fuzzy
+msgid "America/Manaus"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:126
+#, fuzzy
+msgid "America/Martinique"
+msgstr "Martinique"
+
+#: calendar/zones.h:127
+#, fuzzy
+msgid "America/Mazatlan"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:128
+#, fuzzy
+msgid "America/Mendoza"
+msgstr "Amerikanisch-Samoa"
+
+#: 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 "Amerikanisch-Samoa"
+
+#: calendar/zones.h:136
+#, fuzzy
+msgid "America/Montserrat"
+msgstr "Montserrat"
+
+#: calendar/zones.h:137
+#, fuzzy
+msgid "America/Nassau"
+msgstr "Amerikanisch-Samoa"
+
+#: 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 "Amerikanisch-Samoa"
+
+#: calendar/zones.h:141
+#, fuzzy
+msgid "America/Noronha"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+#, fuzzy
+msgid "America/Panama"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+#, fuzzy
+msgid "America/Paramaribo"
+msgstr "Amerikanisch-Samoa"
+
+#: 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 "Puerto Rico"
+
+#: 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 "Amerikanisch-Samoa"
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+#, fuzzy
+msgid "America/Rosario"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:157
+#, fuzzy
+msgid "America/Santiago"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:158
+#, fuzzy
+msgid "America/Santo_Domingo"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:159
+#, fuzzy
+msgid "America/Sao_Paulo"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+#, fuzzy
+msgid "America/Shiprock"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:162
+#, fuzzy
+msgid "America/St_Johns"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+#, fuzzy
+msgid "America/St_Lucia"
+msgstr "Amerikanisch-Samoa"
+
+#: calendar/zones.h:165
+#, fuzzy
+msgid "America/St_Thomas"
+msgstr "Amerikanisch-Samoa"
+
+#: 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 "Aserbaidschan"
+
+#: calendar/zones.h:172
+#, fuzzy
+msgid "America/Tortola"
+msgstr "Amerikanisch-Samoa"
+
+#: 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 "Amerikanisch-Samoa"
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: calendar/zones.h:178
+#, fuzzy
+msgid "Antarctica/Casey"
+msgstr "Antarktika"
+
+#: calendar/zones.h:179
+#, fuzzy
+msgid "Antarctica/Davis"
+msgstr "Antarktika"
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: calendar/zones.h:181
+#, fuzzy
+msgid "Antarctica/Mawson"
+msgstr "Antarktika"
+
+#: calendar/zones.h:182
+#, fuzzy
+msgid "Antarctica/McMurdo"
+msgstr "Antarktika"
+
+#: calendar/zones.h:183
+#, fuzzy
+msgid "Antarctica/Palmer"
+msgstr "Antarktika"
+
+#: calendar/zones.h:184
+#, fuzzy
+msgid "Antarctica/South_Pole"
+msgstr "Antarktika"
+
+#: calendar/zones.h:185
+#, fuzzy
+msgid "Antarctica/Syowa"
+msgstr "Antarktika"
+
+#: calendar/zones.h:186
+#, fuzzy
+msgid "Antarctica/Vostok"
+msgstr "Antarktika"
+
+#: 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 "Bahrein"
+
+#: 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 "Kolumbien"
+
+#: 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 "Hongkong"
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+#: calendar/zones.h:216
+#, fuzzy
+msgid "Asia/Istanbul"
+msgstr "Assistent"
+
+#: 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 "Kuwait"
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr ""
+
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Muscat"
+msgstr "Assistent"
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: calendar/zones.h:235
+#, fuzzy
+msgid "Asia/Omsk"
+msgstr "Aufgabe zuweisen"
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+#, fuzzy
+msgid "Asia/Qatar"
+msgstr "Katar"
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:247
+#, fuzzy
+msgid "Asia/Singapore"
+msgstr "Singapur"
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+#, fuzzy
+msgid "Atlantic/Bermuda"
+msgstr "Bermudas"
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+#, fuzzy
+msgid "Atlantic/Cape_Verde"
+msgstr "Kap Verde"
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+#, fuzzy
+msgid "Australia/Adelaide"
+msgstr "Australien"
+
+#: calendar/zones.h:274
+#, fuzzy
+msgid "Australia/Brisbane"
+msgstr "Australien"
+
+#: calendar/zones.h:275
+#, fuzzy
+msgid "Australia/Broken_Hill"
+msgstr "Australien"
+
+#: calendar/zones.h:276
+#, fuzzy
+msgid "Australia/Darwin"
+msgstr "Australien"
+
+#: calendar/zones.h:277
+#, fuzzy
+msgid "Australia/Hobart"
+msgstr "Australien"
+
+#: calendar/zones.h:278
+#, fuzzy
+msgid "Australia/Lindeman"
+msgstr "Australien"
+
+#: calendar/zones.h:279
+#, fuzzy
+msgid "Australia/Lord_Howe"
+msgstr "Australien"
+
+#: calendar/zones.h:280
+#, fuzzy
+msgid "Australia/Melbourne"
+msgstr "Australien"
+
+#: calendar/zones.h:281
+#, fuzzy
+msgid "Australia/Perth"
+msgstr "Australien"
+
+#: calendar/zones.h:282
+#, fuzzy
+msgid "Australia/Sydney"
+msgstr "Australien"
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:284
+#, fuzzy
+msgid "Europe/Andorra"
+msgstr "Andorra"
+
+#: calendar/zones.h:285
+#, fuzzy
+msgid "Europe/Athens"
+msgstr "Eigenschaften"
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:296
+#, fuzzy
+msgid "Europe/Gibraltar"
+msgstr "Gibraltar"
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:304
+#, fuzzy
+msgid "Europe/Luxembourg"
+msgstr "Luxemburg"
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr ""
+
+#: calendar/zones.h:308
+#, fuzzy
+msgid "Europe/Monaco"
+msgstr "Monaco"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr ""
+
+#: calendar/zones.h:312
+#, fuzzy
+msgid "Europe/Paris"
+msgstr "Eigenschaften"
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:317
+#, fuzzy
+msgid "Europe/San_Marino"
+msgstr "San Marino"
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "Komoren"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+#, fuzzy
+msgid "Indian/Mahe"
+msgstr "Indien"
+
+#: calendar/zones.h:341
+#, fuzzy
+msgid "Indian/Maldives"
+msgstr "Malediven"
+
+#: calendar/zones.h:342
+#, fuzzy
+msgid "Indian/Mauritius"
+msgstr "Mauritius"
+
+#: calendar/zones.h:343
+#, fuzzy
+msgid "Indian/Mayotte"
+msgstr "Mayotte"
+
+#: calendar/zones.h:344
+#, fuzzy
+msgid "Indian/Reunion"
+msgstr "Reunion"
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+#, fuzzy
+msgid "Pacific/Pitcairn"
+msgstr "Pitcairn"
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
+#: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
 msgstr "Signieren wird von dieser Verschl�sselung  nicht unterst�tzt"
 
-#: camel/camel-cipher-context.c:211
+#: 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:251
+#: camel/camel-cipher-context.c:249
 msgid "Verifying is not supported by this cipher"
 msgstr "Pr�fen wird von dieser Verschl�sselung nicht unterst�tzt"
 
-#: camel/camel-cipher-context.c:294
+#: camel/camel-cipher-context.c:292
 msgid "Encryption is not supported by this cipher"
 msgstr "Verschl�sseln wird von dieser Verschl�sselung nicht unterst�tzt"
 
-#: camel/camel-cipher-context.c:336
+#: camel/camel-cipher-context.c:334
 msgid "Decryption is not supported by this cipher"
 msgstr "Entziffern wird von dieser Verschl�sselung nicht unterst�tzt"
 
+#: camel/camel-data-cache.c:169
+#, fuzzy
+msgid "Unable to create cache path"
+msgstr ""
+"Ausgabedatei konnte nicht erstellt werden: %s\n"
+" %s"
+
+#: camel/camel-data-cache.c:441
+#, fuzzy, c-format
+msgid "Could not remove cache entry: %s: %s"
+msgstr "Cache-Verzeichnis konnte nicht ge�ffnet werden: %s"
+
 #: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
@@ -5608,81 +7552,66 @@ msgstr "Resynchronisieren mit dem Server"
 msgid "You must be working online to complete this operation"
 msgstr "Sie m�ssen online arbeiten, um diesen Vorgang zu Ende zu bringen"
 
-#: 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 "Ordner werden synchronisiert"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, 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
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Fehler beim Ausf�hren des Filters: %s: %s"
+
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Der Spool-Ordner kann nicht ge�ffnet werden"
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner kann nicht verarbeitet werden"
 
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Nachricht kann nicht ge�ffnet werden"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
-
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Fehler beim Ausf�hren des Filters: %s: %s"
+#: camel/camel-filter-search.c:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "Nachricht konnte nicht dekodiert werden."
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausf�hren einer Filtersuche: %s: %s"
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nicht unterst�tzte Operation: Nachricht anh�ngen: f�r %s"
-
-#: camel/camel-folder.c:1040
-#, 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:1080
-#, 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:1262
-msgid "Moving messages"
-msgstr "Machrichten werden verschoben"
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5691,7 +7620,7 @@ msgstr ""
 "Suchausdruck kann nicht verarbeitet werden: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5700,18 +7629,33 @@ msgstr ""
 "Fehler beim Ausf�hren eines Suchausdrucks: %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) verlangt einen einzelnen Wahrheitswert als Ergebnis"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Abfrage wird auf unbekannte Kopfzeile ausgef�hrt: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Ung�ltiger Typ in body-contains, Zeichenkette wurde erwartet"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nicht unterst�tzte Operation: Nachricht anh�ngen: f�r %s"
+
+#: camel/camel-folder.c:1038
+#, 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:1078
+#, 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:1260
+msgid "Moving messages"
+msgstr "Machrichten werden verschoben"
 
 #: camel/camel-lock-client.c:111
 #, c-format
@@ -5820,128 +7764,133 @@ 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."
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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:755
+#: 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:953
+#: 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:959
+#: camel/camel-pgp-context.c:993
 #, c-format
 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"
 
-#: camel/camel-pgp-context.c:970
+#: 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:1143
+#: 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:1153
+#: 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:1160
+#: 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:1169
+#: 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:1337
+#: 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:1345
+#: 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:1352
+#: camel/camel-pgp-context.c:1387
 #, c-format
 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"
 
-#: camel/camel-provider.c:130
+#: camel/camel-pgp-mime.c:354
+msgid "This is a digitally signed message part"
+msgstr ""
+
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "%s konnte nicht geladen werden: Laden von Modulen wird von diesem System "
 "nicht unterst�tzt."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s konnte nicht geladen werden: %s"
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s konnte nicht geladen werden: Kein Initialisationscode im Modul."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s-Server %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-Dienst f�r %s auf %s"
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
-#: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: 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 "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 
-#: camel/camel-remote-store.c:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(unbekannter Rechner)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
+#: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verbindung zum Server unerwartet getrennt: %s"
@@ -6054,12 +8003,13 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Ung�ltige Legitimationsantwort vom Server."
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
+#, fuzzy
+msgid "Login"
 msgstr "NT-Login"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
@@ -6070,9 +8020,22 @@ msgstr "Diese Option verbindet zum Server mit einem einfachen Passwort."
 msgid "Unknown authentication state."
 msgstr "Unbekannter Legitimationszustand."
 
+#: 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 ""
+"Dies verbindet mit dem Server und benutzt Kerberos 4, um sich zu "
+"legitimieren."
+
 #: 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
+#: 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 "Passwort"
 
@@ -6116,26 +8079,41 @@ msgstr "URL '%s' braucht einen Rechnernamen-Teil"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%ss' braucht einen Pfad-Teil"
 
-#: camel/camel-service.c:611
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "%s wird aufgel�st"
 
-#: camel/camel-service.c:638
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fehler beim Aufl�sen eines Namens: %s"
 
-#: camel/camel-service.c:663
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: Rechner nicht gefunden"
 
-#: camel/camel-service.c:665
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: unbekannter Grund"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "%s wird aufgel�st"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Finden eines Rechners fehlgeschlagen: %s: Rechner nicht gefunden"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Finden eines Rechners fehlgeschlagen: %s: unbekannter Grund"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "E-Mail-Quelle: Virtueller Ordner"
@@ -6144,12 +8122,12 @@ msgstr "E-Mail-Quelle: Virtueller Ordner"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Zum Lesen von Mail in Form einer Abfrage �ber andere Ordner"
 
-#: 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 "Keine Quelle f�r Protokoll `%s' verf�gbar"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6195,18 +8173,18 @@ msgstr "Nachricht konnte nicht dekodiert werden."
 msgid "Failed to verify certificates."
 msgstr "Zertifikate konnten nicht verifiziert werden."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Auf Ordner kann nicht zugegriffen werden: Ung�ltige Aktion auf diesem "
 "Speicher"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Ordner kann nicht angelegt werden: Ung�ltige Aktion auf diesem Speicher"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6215,8 +8193,7 @@ msgstr ""
 "Ausgabestelle: %s\n"
 "Betreff: %s"
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:428
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6231,24 +8208,40 @@ msgstr ""
 "\n"
 "M�chten Sie trotzdem akzeptieren?"
 
-#: 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:491
 #, 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"
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, fuzzy, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
 msgstr ""
-"E-Mail: %s\n"
-"�blicher Name: %s\n"
-"Organisationseinheit: %s\n"
-"Organisation: %s\n"
-"�rtlichkeit: %s\n"
-"Bundesland/-staat: %s\n"
-"Land: %s"
+"Ung�ltiges Zertifikat von %s:\n"
+"\n"
+"%s\n"
+"\n"
+"M�chten Sie trotzdem akzeptieren?"
 
 #: camel/camel-url.c:288
 #, c-format
@@ -6260,27 +8253,27 @@ msgstr "URL `%s' konnte nicht geparst werden"
 msgid "No such message %s in %s"
 msgstr "Nachricht %s gibt es in %s nicht"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Nachricht gibt es nicht: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ordner kann nicht gel�scht werden: %s: Ung�ltige Aktion"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ordner kann nicht gel�scht werden: %s: Ordner gibt es nicht"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht umbenannt werden: %s: Ung�ltige Aktion"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
@@ -6289,76 +8282,76 @@ msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Sie k�nnen keine Nachrichten aus diesem M�llordner kopieren."
 
-#: camel/providers/imap/camel-imap-command.c:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Unerwartete Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-Befehl fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr "Antwort des Servers endete zu fr�h."
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, 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:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, 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:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, 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:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Suchen nach ge�nderten Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1566
-#: camel/providers/imap/camel-imap-folder.c:1978
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzei nicht verf�gbar"
 
-#: camel/providers/imap/camel-imap-folder.c:1717
-#: camel/providers/imap/camel-imap-folder.c:1798
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "�berblickinformation f�r neue Nachrichten wird abgerufen"
 
-#: camel/providers/imap/camel-imap-folder.c:1723
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Suchen nach neuen Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:2015
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
-#: 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 "Cache-Verzeichnis konnte nicht ge�ffnet werden: %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 "Nachricht %s konnte nicht gecacht werden: %s"
@@ -6371,7 +8364,7 @@ msgstr "Nach neuer Mail sehen"
 msgid "Check for new messages in all folders"
 msgstr "In allen Ordnern nach neuer Mail sehen"
 
-#: 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 "Ordner"
 
@@ -6405,29 +8398,29 @@ msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschl�sselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterst�tzung f�r Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6438,101 +8431,120 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "Mailverzeichnisse im MH-Format"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 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:52
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Lokale Auslieferung"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:62
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Mailverzeichnisse im Maildir-Format"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr "Zum Speichern lokaler Mail in Maildir-Verzeichnissen."
 
-#: camel/providers/local/camel-local-provider.c:80
+#: 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:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Speicherungswurzel %s ist kein absoluter Pfad"
 
-#: 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 "Speicherwurzel `%s' ist kein regul�res Verzeichnis."
 
-#: 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 "Ordner kann nicht abgerufen werden: %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 "Lokale Speicher haben keinen Posteingangsordner"
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokale Maildatei %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ordner %s konnte nicht in %s umbenannt werden: %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 "Ordner konnte nicht umbenannt werden: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Ordner-Zusammenfassungsdatei `%s' konnte nicht gel�scht werden: %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 "Ordner-Indexdatei `%s' konnte nicht gel�scht werden: %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Zusammenfassung konnte nicht gespeichert werden: %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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 "Nachricht kann nicht zur Zusammenfassung hinzugef�gt werden: Grund unbekannt"
@@ -6553,7 +8565,7 @@ msgstr "Nachricht kann nicht an maildir-Ordner angeh�ngt werden: %s: %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6565,7 +8577,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "Keine solche Nachricht"
 
@@ -6574,7 +8586,7 @@ msgstr "Keine solche Nachricht"
 msgid "Invalid message contents"
 msgstr "Ung�ltiger Inhalt der Nachricht"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -6584,14 +8596,14 @@ msgstr ""
 "Ordner `%s' konnte nicht ge�ffnet werden:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Ordner `%s' existiert nicht."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -6601,41 +8613,64 @@ msgstr ""
 "Ordner `%s' konnte nicht angelegt werden:\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' ist kein maildir-Verzeichnis."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ordner `%s' konnte nicht gel�scht werden: %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "kein maildir-Verzeichnis"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ordner `%s' konnte nicht abgetastet werden: %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 "Maildir-Verzeichnispfad kann nicht ge�ffnet werden: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Nach neuer Mail sehen"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "Ordner wird gespeichert"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Postfach kann nicht ge�ffnet werden: %s: %s\n"
@@ -6652,9 +8687,9 @@ msgstr "Nachricht kann nicht an mbox-Datei angeh�ngt werden: %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-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6664,16 +8699,16 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
 
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nachrichtenerstellung fehlgeschlagen: Defektes Postfach?"
 
-#: 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"
@@ -6682,7 +8717,7 @@ msgstr ""
 "Datei `%s' konnte nicht ge�ffnet werden:\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"
@@ -6691,14 +8726,14 @@ msgstr ""
 "Datei `%s' konnte nicht angelegt werden:\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' ist keine regul�re Datei."
 
-#: 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"
@@ -6707,97 +8742,86 @@ msgstr ""
 "Ordner `%s' konnte nicht gel�scht werden:\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 "Ordner `%s' ist nicht leer. Nicht gel�scht."
 
-#. 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 "Ordner wird gespeichert"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, 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:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ordner kann nicht gepr�ft werden: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, 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:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Tempor�res Postfach konnte nicht angelegt werden: %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
+#: 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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "Quellordner %s konnte nicht geschlossen werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, 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:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unbekannter Fehler: %s"
@@ -6816,12 +8840,12 @@ msgstr "Nachricht kann nicht an mh-Ordner angeh�ngt werden: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' ist kein Verzeichnis."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, 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:512
+#: camel/providers/local/camel-spool-folder.c:515
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Nachricht kann nicht an Spool-Datei angeh�ngt werden: %s: %s"
@@ -6832,6 +8856,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Ordner `%s/%s' existiert nicht."
@@ -6841,29 +8866,31 @@ msgstr "Ordner `%s/%s' existiert nicht."
 msgid "Spool mail file %s"
 msgstr "Spool-Maildatei %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-Ordner k�nnen nicht umbenannt werden"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-Ordner k�nnen nicht gel�scht werden"
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6872,47 +8899,24 @@ 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:940
+#: 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/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Bitte geben Sie das NNTP-Passwort f�r %s@%s ein"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Server lehnte Benutzername ab"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Benutzername konnte nicht an Server gesendet werden"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Server lehnte Benutzername/Passwort ab"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Nachricht %s nicht gefunden."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Gruppenliste konnte nicht vom Server abgerufen werden."
+#: 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' existiert nicht oder ist keine regul�re Datei"
 
-#: 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 "grouplist-Datei f�r %s konnte nicht geladen werden: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "grouplist-Datei f�r %s konnte nicht gespeichert werden: %s"
+#: camel/providers/local/camel-spoold-store.c:173
+#, fuzzy, c-format
+msgid "Mail tree %s"
+msgstr "Mail an %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
@@ -6923,17 +8927,12 @@ 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:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Verzeichnis f�r Newsserver konnte nicht ge�ffnet werden: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-News �ber %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6941,72 +8940,112 @@ msgstr ""
 "Diese Option f�hrt die Legitimation am NNTP-Server mit einem "
 "unverschl�sselten Passwort durch."
 
-#: 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 ".newsrc-Datei f�r %s konnte nicht ge�ffnet oder erstellt werden: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Ordner %s gibt es nicht"
+
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "Pipe konnte nicht angelegt werden: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "IMAP-Befehl fehlgeschlagen: %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 "Suchen nach neuen Nachrichten"
+
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "Unbekannter Fehler: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:566
+#, fuzzy
+msgid "Use cancel"
+msgstr "Abbrechen"
+
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "Vorgang abgebrochen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Abrufen der POP-Zusammenfassung"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "POP-Server konnte nicht auf neue Nachrichten �berpr�ft werden: %s"
+#: 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 "Vorgang abgebrochen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-"Ordner konnte nicht ge�ffnet werden: Nachrichtenliste war unvollst�ndig."
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Ordner kann nicht abgerufen werden: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Gel�schte Nachrichten werden ausger�umt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "Nachricht konnte nicht abgeholt werden: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Nachricht konnte nicht vom POP-Server %s abgerufen werden: %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 "Keine Nachricht mit 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 "Abrufen der POP-Nachricht %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 ""
+"Nachricht kann nicht erhalten werden: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Unbekannte Niederschl�ge"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "Nachrichtenspeicherung"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Mail auf Server belassen"
 
-#: 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 "Nach %s Tag(en) l�schen"
 
-#: 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:84
 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 "Zum Verbinden mit und Herunterladen von Mail von POP-Servern."
 
-#: 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."
@@ -7014,7 +9053,7 @@ msgstr ""
 "Diese Option wird mit dem POP-Server unter einem unverschl�sselten Passwort "
 "verbinden. Viele POP-Server unterst�tzen nur dies."
 
-#: camel/providers/pop3/camel-pop3-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 "
@@ -7024,48 +9063,32 @@ 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-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
-"Dies verbindet mit dem POP-Server und benutzt Kerberos 4, um sich zu "
-"legitimieren."
+"Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
+"Fehler beim Senden des Benutzernamens: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Legitimation beim KPOP-Server konnte nicht erfolgen: %s"
+#: camel/providers/pop3/camel-pop3-store.c:210
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operation nicht unterst�tzt"
 
-#: camel/providers/pop3/camel-pop3-store.c:214
-#, c-format
-msgid "Could not connect to server: %s"
-msgstr "Verbindung zu Server konnte nicht hergestellt werden: %s"
+#: camel/providers/pop3/camel-pop3-store.c:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Legitimation fehlgeschlagen."
 
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, fuzzy, 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:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sBitte geben Sie das POP3-Passwort f�r %s@%s ein"
-
-#: camel/providers/pop3/camel-pop3-store.c:378
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
-"Fehler beim Senden des Benutzernamens: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:381
-#: camel/providers/pop3/camel-pop3-store.c:418
-msgid "(Unknown)"
-msgstr "(Unbekannt)"
-
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -7073,7 +9096,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
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "IMAP-Befehl fehlgeschlagen: %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "E-/A-Fehler"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, fuzzy, 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
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7082,18 +9125,13 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Passworts: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
 
-#: camel/providers/pop3/camel-pop3-store.c:566
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "Unerwartete Antwort von POP-Server: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7105,50 +9143,51 @@ msgstr ""
 "Zum Ausliefern von Mail durch �bergabe an das Programm \"sendmail\" auf dem "
 "lokalen System."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "URL `%s' konnte nicht geparst werden"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Pipe zu sendmail konnte nicht angelegt werden: %s: Mail nicht verschickt"
 
-#: 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 konnte nicht geforkt werden: %s: Mail nicht verschickt"
 
-#: 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 "Nachricht konnte nicht verschickt werden: %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 brach mit Signal %s ab: Mail nicht verschickt."
 
-#: 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 konnte nicht ausgef�hrt werden: Mail nicht verschickt."
 
-#: 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 gab Status %d zur�ck: Mail nicht verschickt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr "'Von'-Adresse konnte nicht in Nachricht gefunden werden"
-
-#: 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 "Mailauslieferung �ber das Programm 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"
 
@@ -7156,124 +9195,147 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Zum Ausliefern von Mail �ber einen Mailknotenpunkt im Netz per SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfehler, Befehl nicht erkannt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfehler in Parametern oder Argumenten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Befehl nicht implementiert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Befehlsparameter nicht implementiert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Systemstatus- oder Systemhilfe-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Hilfemeldung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Dienst ist bereit"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Dienst schlie�t �bertragungskanal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst nicht verf�gbar, �bertragungskanal wird geschlossen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Angeforderte Mailaktion in Ordnung, abgeschlossen"
 
-#: 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 "Benutzer nicht lokal; Weiterleitung erfolgt zu <weiterleitungspfad>"
 
-#: 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 "Angeforderte Mailaktion nicht ausgef�hrt: Postfach nicht verf�gbar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Angeforderte Aktion nicht ausgef�hrt: Postfach nicht verf�gbar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Angeforderte Aktion abgebrochen: Fehler bei Verarbeitung"
 
-#: 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 "Benutzer nicht lokal; probieren Sie es mit <weiterleitungspfad>"
 
-#: 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 "Angeforderte Aktion nicht ausgef�hrt: unzureichender Systemspeicher"
 
-#: 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 "Angeforderte Aktion nicht ausgef�hrt: Speicherzuteilung �berschritten"
 
-#: 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 "Angeforderte Aktion nicht ausgef�hrt: Postfachname nicht erlaubt"
 
-#: 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 "Maileingabe beginnen; Ende mit <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Transaktion fehlgeschlagen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Ein Password�bergang ist notwendig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Legitimationsmechanismus ist zu schwach"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "F�r den verlangten Legitimationsmechanismus ist Verschl�sselung erforderlich."
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Zeitweiliger Legitimationsfehlschlag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Legitimation ben�tigt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Willkommen-Antwortfehler: %s: vielleicht nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:376
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, fuzzy, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr ""
+"Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
+"Fehler beim Senden des Benutzernamens: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:336
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "Diese Nachricht scheint falsch formatiert zu sein"
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "Zeit�berschreitung bei AUTH-Anfrage: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, fuzzy
+msgid "STARTTLS response error"
+msgstr "RSET-Antwort-Fehler: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:458
 #, 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:415
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7284,132 +9346,135 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, 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:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-Mailauslieferung �ber %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-"Nachricht konnte nicht verschickt werden: Absenderadresse nicht angegeben."
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:593 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Nachricht verschicken"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empf�nger angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+#, fuzzy
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "Nachricht konnte nicht verschickt werden: Keine Empf�nger angegeben."
+
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "SMTP-Begr��ung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO-Antwortfehler: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "SMTP-Legitimation"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zeit�berschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "AUTH-Anfrage fehlgeschlagen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Ung�ltige Legitimationsantwort vom Server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:893
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1081
+#, fuzzy
+msgid "MAIL FROM response error"
 msgstr "MAIL-FROM-Antwortfehler: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "RCPT-TO-Antwortfehler: %s: Mail nicht verschickt."
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Zeit�berschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "DATA-Antwortfehler: %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
+#, fuzzy
+msgid "DATA response error"
+msgstr "RSET-Antwort-Fehler: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1030
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "DATA-Antwortfehler: Nachrichtenabschluss: %s: Mail nicht verschickt"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "Ung�ltige Legitimationsantwort vom Server."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zeit�berschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "RSET-Antwort-Fehler: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "QUIT-Antwortfehler: %s: nicht fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "RSET-Antwort-Fehler: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -7436,19 +9501,19 @@ msgid "%.1fG"
 msgstr "%.1f GB"
 
 #. 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 "anlage"
 
-#: 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 "Das gew�hlte Element aus der Anlagenliste entfernen"
 
-#: composer/e-msg-composer-attachment-bar.c:531
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "Anlage hinzuf�gen..."
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "Der Nachricht eine Datei beilegen"
 
@@ -7476,56 +9541,56 @@ msgid "MIME type:"
 msgstr "MIME-Typ:"
 
 #: 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 "Automatische Anzeige der Anlage vorschlagen"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "F�r das Adressbuch hier klicken"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Von:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "An:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Gebe die Empf�nger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:397
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7533,12 +9598,12 @@ msgstr ""
 "Gebe die Adressen ein, die eine Kopie erhalten, dienicht in der "
 "Empf�ngerliste auftaucht."
 
-#: 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 "Eine Datei beilegen"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7547,46 +9612,34 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:898
-msgid "Save as..."
-msgstr "Speichern unter..."
-
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Warnung!"
 
-#: composer/e-msg-composer.c:911
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, �berschreiben?"
 
-#: composer/e-msg-composer.c:933
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:952
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:1023
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Der Entw�rfe-Ordner f�r diesen Zugang konnte nicht ge�ffnet werden.\n"
-"M�chten Sie den vorgegebenen Entw�rfe-Ordner verwenden?"
-
-#: composer/e-msg-composer.c:1073
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1081
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
 
-#: composer/e-msg-composer.c:1088
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7595,7 +9648,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1095
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7604,7 +9657,7 @@ msgstr ""
 "Datei konnte nicht verk�rzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1104
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7613,7 +9666,7 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7622,7 +9675,7 @@ msgstr ""
 "entdeckt.\n"
 "M�chten Sie eine Wiederherstellung versuchen?"
 
-#: composer/e-msg-composer.c:1360
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7632,23 +9685,23 @@ msgstr ""
 "\n"
 "Wollen Sie Ihre �nderungen speichern?"
 
-#: composer/e-msg-composer.c:1367
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Warnung: Ge�nderte Nachricht"
 
-#: composer/e-msg-composer.c:1390
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Datei �ffnen"
 
-#: composer/e-msg-composer.c:1539
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Datei einf�gen"
 
-#: composer/e-msg-composer.c:1914 composer/e-msg-composer.c:2367
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:2384
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -7656,7 +9709,7 @@ msgstr ""
 "Erstellungsfenster konnte nicht angelegt werden:\n"
 "Adressw�hler-Control konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:2407 composer/e-msg-composer.c:2462
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7664,7 +9717,7 @@ msgstr ""
 "Es konnte kein Erstellungsfenster angelegt werden:\n"
 "HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: 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."
@@ -7673,18 +9726,19 @@ msgstr ""
 "in der Mailkomponente noch keine Identit�t konfiguriert\n"
 "haben."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutions Maileditor kann nicht initialisiert werden."
 
-#: 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:1
 msgid "The Evolution groupware suite"
 msgstr "Die Groupware-Suite Evolution"
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Ximian-Evolution-_FAQ"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "Adresskarte"
@@ -7725,15 +9779,33 @@ 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:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Eine Datei mit diesem Namen existiert bereits.\n"
+"�berschreiben?"
+
 #. Remember the password?
-#: e-util/e-passwords.c:347 mail/mail-session.c:267
+#: e-util/e-passwords.c:363 mail/mail-session.c:269
 msgid "Remember this password"
 msgstr "Dieses Passwort speichern"
 
-#: e-util/e-passwords.c:349 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 "F�r den Rest dieser Sitzung an dieses Passwort erinnern"
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "Kategorien"
+
 #. 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
@@ -7805,13 +9877,13 @@ 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"
 
 #. 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"
 
@@ -7852,11 +9924,7 @@ msgstr "Stunde"
 msgid "minute"
 msgstr "Minute"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "Sekunde"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -7931,7 +9999,7 @@ msgstr " in der Vergangenheit"
 msgid "ago"
 msgstr "in der Vergangenheit"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %H.%M"
 
@@ -7944,15 +10012,15 @@ msgid "Filter Rules"
 msgstr "Filterregeln"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "Dann"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Aktion hinzuf�gen"
 
-#: 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."
@@ -7961,19 +10029,11 @@ msgstr ""
 "Bitte gehen Sie zur�ck und w�hlen Sie einen g�ltigen Ordner zum Ausliefern "
 "der Mail."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:364
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Ordner w�hlen"
 
-#: filter/filter-folder.c:267
-msgid "Enter folder URI"
-msgstr "Ordner-URI eingeben"
-
-#: filter/filter-folder.c:314
-msgid "<click here to select a folder>"
-msgstr "<hier klicken, um einen Ordner zu w�hlen>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -7983,7 +10043,7 @@ msgstr ""
 "Fehler im regul�ren Ausdruck '%s':\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test"
 
@@ -7991,39 +10051,40 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "Der Filter muss benannt werden."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Regelname: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Wenn"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "Aktionen ausf�hren"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "wenn alle Kriterien zutreffen"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "wenn irgendwelche Kriterien zutreffen"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Kriterium hinzuf�gen"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "Eingang"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "Ausgang"
 
@@ -8067,6 +10128,12 @@ msgstr "mit allen lokalen Ordnern und aktiven Ordnern aus dem Netz"
 msgid "with all local folders"
 msgstr "mit allen lokalen Ordnern"
 
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Bewertung zuweisen"
+
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Farbe zuweisen"
@@ -8079,6 +10146,11 @@ msgstr "Bewertung zuweisen"
 msgid "Attachments"
 msgstr "Anlagen"
 
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belize"
+
 #: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "enth�lt"
@@ -8132,144 +10204,154 @@ msgid "ends with"
 msgstr "endet mit"
 
 #: filter/libfilter-i18n.h:21
+msgid "Execute Shell Command"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Existiert"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "existiert"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Wichtig"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "ist"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "war nach"
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "war vor"
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Markiert"
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "ist gr��er als"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "ist kleiner als"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "ist nicht"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Markiert"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "Mailingliste"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "Nachrichtenkopf"
 
-#: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr "Nachricht wurde empfangen"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message was sent"
-msgstr "Nachricht wurde verschickt"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "am oder nach"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "am oder vor"
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "Klang abspielen:"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Gelesen"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Empf�nger"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "Regex-Treffer"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "Beantwortet an"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1404
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Absender"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Status setzen:"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Gr��e (kB)"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "klingt wie"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "Herkunfts-Account"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "beginnt mit"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Betreff"
 
-#: filter/libfilter-i18n.h:52
-msgid "was after"
-msgstr "war nach"
-
-#: filter/libfilter-i18n.h:53
-msgid "was before"
-msgstr "war vor"
-
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Regeln"
 
-#: filter/rule-editor.c:278
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Regel hinzuf�gen"
 
-#: filter/rule-editor.c:344
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Regel bearbeiten"
 
@@ -8289,30 +10371,30 @@ msgstr "Sie m�ssen mindestens einen Ordner als Quelle angeben."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importiert Ihre alte Elm-Mail."
 
-#: 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 "Importieren..."
 
-#: 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 "Bitte warten"
 
-#: 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 "Importieren von %s als %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 "%s wird abgetastet"
 
-#: 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:101
 msgid "Mail"
 msgstr "Mail"
 
@@ -8340,23 +10422,74 @@ msgstr ""
 "Evolution hat GnomeCard-Dateien gefunden.\n"
 "M�chten Sie sie in Evolution importieren?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Priorit�t: %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 importiert Ihre alten Netscape-Daten"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "M�ll"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Lokale Maildatei %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Verzeichnis wird abgetastet"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Import beginnt"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Filter bearbeiten"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8381,44 +10514,94 @@ msgid "Pine"
 msgstr "Pine"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Fabrik f�r den Evolution-Maileditor."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Fabrik f�r den Evolution-Aufgabeneditor."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Fabrik f�r den Evolution-Maileditor."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Fabrik f�r den Evolution-Maileditor."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Evolution-Komponente f�r den Umgang mit Mail."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolution-Mailersteller."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Evolutions Mail-Chefsesselansicht-Komponente."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Evolution-Komponente zur Mailordneranzeige."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Evolution-Mailordner-Fabrik-Komponente."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Fabrik f�r den Evolution-Maileditor."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Fabrik f�r die Mailzusammenfassungs-Komponente."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "_Keine Wiederholung"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Zug�nge"
+
+#: 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 "Mailkonfigurations-Oberfl�che"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Mail enthaltender Ordner"
+#: 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:101
-msgid "Mail storage folder (internal)"
-msgstr "Mailspeicher-Ordner (intern)"
+msgid "Folder containing mail"
+msgstr "Mail enthaltender Ordner"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -8428,24 +10611,19 @@ msgstr "Virtueller M�ll"
 msgid "Virtual Trash folder"
 msgstr "Virtueller M�llordner"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Verbindung zum Speicher konnte nicht hergestellt werden: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Eigenschaften..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Die Eigenschaften dieses Ordners �ndern"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -8453,207 +10631,237 @@ msgstr ""
 "Einige Ihrer Mail-Einstellungen scheinen ung�ltig, bitte stellen Sie sicher, "
 "dass alles in Ordnung ist."
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr "Sie haben keine Mailtransport-Methode eingestellt"
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Neue Mail-Nachricht"
 
-#: mail/component-factory.c:951
-msgid "New _Mail Message"
-msgstr "Neue _Mail-Nachricht"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "Nachricht _verschicken"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "Evolutions Mail-Konfigurations-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Evolutions Ordnerinformations-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Verbindung zu Server..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
-#: mail/folder-browser-ui.c:271
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenschaften von \"%s\""
 
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Tempor�res Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/folder-browser.c:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d neu"
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d verborgen"
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d ausgew�hlt"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d nicht verschickt"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d verschickt"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d insgesamt"
 
-#: mail/folder-browser.c:1049
-msgid "Create vFolder from Search"
-msgstr "vOrdner aus Suche erzeugen"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "_Virtuellen Ordner aus Nachricht erzeugen"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "VOrdner �ber _Betreff"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "VOrdner �ber Absender"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "VOrdner �ber Empf�nger"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner �ber Mailing_liste"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filter �ber _Betreff"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filter �ber _Absender"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filter �ber _Empf�nger"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filter �ber _Mailingliste"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten..."
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:104
-msgid "_Save As..."
-msgstr "Speichern _unter..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "Drucken"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "_Liste antworten"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Abgeschlossen"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "L�schen"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Als gelesen markieren"
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Als ungelesen markieren"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Als _unwichtig markieren"
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "L�schen r�ckg�ngig"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:106
-msgid "_Undelete"
-msgstr "L�schen r�ckg�ngig"
+#: mail/folder-browser.c:1645
+msgid "Label"
+msgstr ""
 
-#: mail/folder-browser.c:1473
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Absender zu Adressbuch hinzuf�gen"
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Filter anwenden"
 
-#: mail/folder-browser.c:1478
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "_Regel aus Nachricht erzeugen"
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
-msgstr "Filter �ber Mailingliste"
-
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "VOrdner �ber Mailingliste"
 
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filter �ber Mailingliste (%s)"
 
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "VOrdner �ber Mailingliste (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Vorgabe"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Ordner-Informationen werden entnommen"
@@ -8675,26 +10883,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importiert Outlook-Express-4-Dateien in Evolution."
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Rumpfinhalt"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Aktuelles Speicherformat:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Indizieren:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Postfach-Format"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Rumpfinhalt"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Neues Speicherformat:"
 
-#: 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"
@@ -8705,15 +10906,15 @@ msgstr ""
 "eventuell nicht automatisch behoben werden. Bitte\n"
 "verwenden Sie diese Funktion mit Vorsicht."
 
-#: 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"
 
@@ -8731,86 +10932,79 @@ msgstr "Evolution-News-Editor"
 msgid "Evolution Account Editor"
 msgstr "Evolution-Accounteditor"
 
-#: mail/mail-account-gui.c:962
-msgid "Could not save signature file."
-msgstr "Signaturdatei konnte nicht gespeichert werden."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Rechner:"
 
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "Signatur speichern"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "_Benutzername:"
 
-#: mail/mail-account-gui.c:1045
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "_Pfad:"
+
+#: 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 "Funk"
+
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Diese Signatur wurde ge�ndert, aber nicht gespeichert.\n"
-"\n"
-"M�chten Sie Ihre �nderungen speichern?"
 
-#: mail/mail-account-gui.c:1654
+#: mail/mail-account-gui.c:1985
 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:149
-msgid " (default)"
-msgstr " (voreingestellt)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Deaktivieren"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Aktivieren"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 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:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Nicht l�schen"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Account wirklich l�schen?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-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:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Deaktivieren"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:783 mail/mail-config.glade.h:42
-msgid "Mail Settings"
-msgstr "Mail-Einstellungen"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Aktivieren"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Mail an %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+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-autofilter.c:215
-#, c-format
-msgid "Subject is %s"
-msgstr "Betreff ist %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Aktiv"
 
-#: mail/mail-autofilter.c:231
-#, c-format
-msgid "Mail from %s"
-msgstr "E-Mail von %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "_Accountname:"
 
-#: mail/mail-autofilter.c:287
-#, c-format
-msgid "%s mailing list"
-msgstr "Mailingliste %s"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Puerto Rico"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzuf�gen"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8822,7 +11016,7 @@ msgstr ""
 "empfangen oder erstellen k�nnen.\n"
 "M�chten Sie ihn jetzt konfigurieren?"
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8830,7 +11024,7 @@ msgstr ""
 "Sie m�ssen eine Identit�t einrichten,\n"
 "bevor Sie Mail erstellen k�nnen."
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8838,12 +11032,8 @@ msgstr ""
 "Sie m�ssen einen Mailtransport einrichten,\n"
 "bevor Sie Mail erstellen k�nnen."
 
-#: mail/mail-callbacks.c:230
-msgid "You have not set a mail transport method"
-msgstr "Sie haben keine Mailtransport-Methode eingestellt"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:265
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -8851,11 +11041,11 @@ msgstr ""
 "Sie verschicken eine HTML-formatierte Nachricht, aber die folgenden "
 "Empf�nger wollen keine HTML-formatierte Mail:\n"
 
-#: mail/mail-callbacks.c:280
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Trotzdem verschicken?"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8863,7 +11053,7 @@ msgstr ""
 "Diese Nachricht hat keinen Betreff.\n"
 "Wirklich verschicken?"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8872,11 +11062,11 @@ msgstr ""
 "der Liste zu verbergen, wird die Nachricht nur BCC-Empf�ngeradressen "
 "enthalten."
 
-#: mail/mail-callbacks.c:370
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "Diese Nachricht enth�lt ausschlie�lich BCC-Empf�nger."
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8886,41 +11076,45 @@ msgstr ""
 "eine Apparently-To-Kopfzeile hinzuf�gt.\n"
 "Trotzdem verschicken?"
 
-#: mail/mail-callbacks.c:469
-msgid "This message contains invalid recipients:"
-msgstr "Diese Nachricht enth�lt ung�ltige Empf�nger:"
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 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:600
+#: mail/mail-callbacks.c:497
 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:838
+#: mail/mail-callbacks.c:623
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+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:977
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 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:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:1283 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:1753
+#: mail/mail-callbacks.c:2091
 #, 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:1778
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8928,7 +11122,7 @@ msgstr ""
 "Sie k�nnen nur im Entw�rfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8936,29 +11130,40 @@ msgstr ""
 "Sie k�nnen nur Nachrichten im\n"
 "Verschickt-Ordner neu verschicken."
 
-#: mail/mail-callbacks.c:1831
+#: mail/mail-callbacks.c:2169
 #, 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:1857
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Keine Nachricht ausgew�hlt"
 
-#: mail/mail-callbacks.c:1951
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Datei �berschreiben?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:2122 widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Warnung"
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Die n�chste ungelesene Nachricht anzeigen"
 
-#: mail/mail-callbacks.c:2129
+#: mail/mail-callbacks.c:2373
+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
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8971,11 +11176,7 @@ msgstr ""
 "\n"
 "Nachrichten wirklich entfernen?"
 
-#: mail/mail-callbacks.c:2136
-msgid "Do not ask me again."
-msgstr "Mich nicht mehr fragen."
-
-#: mail/mail-callbacks.c:2244
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8984,19 +11185,28 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2256
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2319
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Nachricht %d von %d wird abgerufen"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2863
+msgid "US-Letter"
+msgstr ""
+
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -9058,16 +11268,34 @@ msgstr ""
 "Dieser Name wird nur f�r die Bildschirmanzeige verwendet."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Zugangsdruide"
 
-#: mail/mail-config.c:326
-#, c-format
-msgid "Account %d"
-msgstr "Zugang %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "In Arbeit"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
 
-#: mail/mail-config.c:1859
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "nach"
+
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -9078,89 +11306,156 @@ msgstr ""
 "%s\n"
 "Es wird keine Verkn�pfung angelegt."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Eingang"
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Dienst wird �berpr�ft"
 
-#: mail/mail-config.c:2183 mail/mail-config.c:2187
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 msgstr "Verbindung zu Server..."
 
+#: mail/mail-config.c:2999
+#, fuzzy
+msgid "Unnamed"
+msgstr "Namenloser Kontakt"
+
+#: mail/mail-config.c:3177
+msgid "Cannot execute signature script"
+msgstr ""
+
 #: mail/mail-config.glade.h:1
-msgid " _Check for supported types "
-msgstr "_Pr�fen, welche Typen unterst�tzt werden "
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " Farbe"
+#, fuzzy
+msgid " Edit "
+msgstr "_Bearbeiten"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid " New "
+msgstr "Neu"
+
+#: mail/mail-config.glade.h:4
+msgid " _Check for supported types "
+msgstr "_Pr�fen, welche Typen unterst�tzt werden "
+
+#: mail/mail-config.glade.h:5
+#, fuzzy
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr "(SSL wird von dieser Bin�rversion von Evolution nicht unterst�tzt)"
+
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL wird von dieser Bin�rversion von Evolution nicht unterst�tzt)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Beim Verschicken verschl�sselter Mail _immer vor mir selber verschl�sseln"
 
-#: mail/mail-config.glade.h:5
-msgid "Account"
-msgstr "Zugang"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Zugang %d"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Zugangsinformation"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Zugangsverwaltung"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "Zug�nge"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Aktion abbrechen"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: 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 ""
-"Beim Verschicken verschl�sselter Mail immer vor mir selber _verschl�sseln"
+"Beim Verschicken verschl�sselter Mail _immer vor mir selber verschl�sseln"
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Alerts"
+msgstr "Alarme"
+
+#: mail/mail-config.glade.h:15
+#, fuzzy
+msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Bei Verwendung dieses Zugangs ausgehende Nachrichten immer _signieren"
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Der Nachricht eine Datei beilegen"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anlage"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "_Automatisch nach neuer Mail sehen"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Unbekannter Zeichensatz: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_Schlie�en"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Nach neuer Mail sehen"
 
-#: mail/mail-config.glade.h:14
-msgid "Composer"
-msgstr "Maileditor"
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Composing Messages"
+msgstr "Eine Nachricht erstellen"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:16
-msgid "Confirm when Expunging a folder"
-msgstr "S�ubern eines Ordners best�tigen"
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9178,232 +11473,371 @@ msgstr ""
 "Klicken Sie auf \"Beenden\", um Ihre Einstellungen zu\n"
 "speichern."
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:37
+msgid "Dari"
+msgstr ""
+
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: mail/mail-config.glade.h:24
-msgid "Default Forward style is: "
-msgstr "Vorgegebener Weiterleitungsstil ist: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Vorgabe"
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Vorgegebene Zeichenkodierung: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Abrufen von Mail"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitale Kennungen..."
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr "Anzeige"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Nachricht kann nicht ge�ffnet werden"
 
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Fertig"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Entw�rfe"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "_Entw�rfe-Ordner:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "_Aktivieren"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Bearbeiten..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
-msgstr "Aktiv"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Ost"
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "E-Mail enth�lt"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "E-Mail-Adresse:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "M�llordner beim Beenden _leeren"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "Aktionen ausf�hren"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "endet mit"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Eigenschaften"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Weitergeleitete Nachrichten"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Digitale Kennung erhalten..."
 
-#: mail/mail-config.glade.h:35
-msgid "HTML signature file:"
-msgstr "HTML-Signaturdatei:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "Zitate _hervorheben mit"
+
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Tuval"
 
-#: 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 "Identit�t"
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr "In HTML-Mail"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "An Ort und Stelle"
 
-#: 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 "Speichern und schlie�en"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "_Bilder laden"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Mailkonfiguration"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
-msgstr "Dies zu meinem _Vorgabezugang machen"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Nachrichtenkopf"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_Nachrichtenanzeige"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikronesien"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP-Server:"
 
-#: mail/mail-config.glade.h:46
-msgid "News"
-msgstr "Nachrichten"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "Mailkonfiguration"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "_Schlagzeilen"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Optionale Information"
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "_Organisation:"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "PGP-_Schl�sselkennung:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Eine Farbe ausw�hlen"
 
-#: 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"
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
-"Beim Abschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
-"nachfragen"
+"Beim Abschicken von Nachrichten mit ausschlie�lich _BCC-Empf�ngern nachfragen"
 
-#: mail/mail-config.glade.h:56
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Beim Abschicken von Nachrichten mit _leerem Betreff nachfragen"
+#: mail/mail-config.glade.h:89
+#, 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 ""
-"Beim Abschicken von Nachrichten mit ausschlie�lich _BCC-Empf�ngern nachfragen"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Ausgew�hlte Kontakte drucken"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail-maildir "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Nachricht kann nicht ge�ffnet werden"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Umschrieben"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "An dieses Passwort _erinnern"
 
-#: 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 "Antwort an:"
+
+#: 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:62
-msgid "Receiving Mail"
-msgstr "ERhalten von Mail"
-
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Empfangs-Optionen"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Dieses Passwort speichern"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Ben�tigte Information"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+msgstr "Sicherheit"
+
+#: mail/mail-config.glade.h:104
+msgid "Same as text"
+msgstr ""
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "Secure MIME (S/MIME)"
 msgstr "Sichere MIME"
 
-#: mail/mail-config.glade.h:67
-msgid "Security"
-msgstr "Sicherheit"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
-msgstr "Eine Filterprotokoll-Datei w�hlen..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "PGP-Bin�rdatei w�hlen"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Verschicken von E-Mail"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Signaturdatei:"
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
-msgstr "Verschicken von Mail"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Alles au�er Signatur l�schen"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Verschickt"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "Verschicken von E-Mail"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Ordner f�r verschickte _Nachrichten:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Nachrichten in \"Verschickt\" und \"Entw�rfe\""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Server ben�tigt _Legitimation"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Server-Konfiguration"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
-msgstr "Signaturdatei:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Verkn�pfungen"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Signatur speichern"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Quelle"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Quellinformation"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "Quellen"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "Stilname:"
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
-msgstr "Besondere Ordner"
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix-mbox"
 
-#: mail/mail-config.glade.h:86
-msgid "Use s_ecure connection (SSL)"
-msgstr "_Sichere Verbindung (_SSL) verwenden"
+#: mail/mail-config.glade.h:128
+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:87
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "_HTML-Signatur:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Unbest�ndig"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9413,126 +11847,217 @@ msgstr ""
 "\n"
 "Klicken Sie \"Weiter\" zum Beginnen."
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Ost"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "Bilder _immer aus dem Netz laden"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Bei Verwendung dieses Zugangs ausgehende Nachrichten _immer signieren"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "_Legitimations-Typ: "
+
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "_Automatisch nach neuer Mail sehen"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "Kennung des _Zertifikats:"
 
-#: mail/mail-config.glade.h:97
-msgid "_Drafts folder:"
-msgstr "_Entw�rfe-Ordner:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
-msgstr "_E-Mail-Adresse:"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "S�ubern eines Ordners best�tigen"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
-msgstr "M�llordner beim Beenden _leeren"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Vorgabe"
 
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:151
+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
+#, fuzzy
+msgid "_Filename:"
+msgstr "Dateiname:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Weiterleiten als"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "_Voller Name:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "In HTML-Mail"
+
+#: mail/mail-config.glade.h:160
 msgid "_HTML Signature:"
 msgstr "_HTML-Signatur:"
 
-#: mail/mail-config.glade.h:103
-msgid "_Highlight citations with"
-msgstr "Zitate _hervorheben mit"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Identit�t"
 
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
-msgstr "_Rechner:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Sprache"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr "Bilder _laden, falls Absender im Adressbuch ist"
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
-msgstr "Filteraktionen mit_protokollieren in:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Dies zu meinem _Vorgabezugang machen"
 
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Name:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "Bilder _nie aus dem Netz laden"
 
-#: mail/mail-config.glade.h:110
-msgid "_Organization:"
-msgstr "_Organisation:"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "Pfad zur _PGP-Bin�rdatei:"
 
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
-msgstr "_Pfad:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
-msgstr "Dieses Passwort _behalten"
+#: mail/mail-config.glade.h:172
+#, fuzzy
+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:114
-msgid "_Send mail in HTML format by default."
-msgstr "Mail normalerweise im HTML-Format ver_schicken."
+#: mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "Beim Abschicken von Nachrichten mit _leerem Betreff nachfragen"
 
-#: mail/mail-config.glade.h:115
-msgid "_Server Type: "
-msgstr "_Servertyp: "
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Funk"
 
-#: mail/mail-config.glade.h:116
-msgid "_Signature file:"
-msgstr "_Signaturdatei:"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "ERhalten von Mail"
 
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
-msgstr "_Benutzername:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Allen antworten"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Sicherheit"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Sicherheit"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Verschicken von Mail"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Zeit zeigen als"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+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 "_Sichere Verbindung (_SSL) verwenden"
+
+#: mail/mail-config.glade.h:185
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Unbest�ndig"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_alle"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " Farbe"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "Beschreibung"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newsfenster1"
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr "Platzhalter"
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr "Sekunden."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "PGP-Signaturkontext konnte nicht angelegt werden."
@@ -9569,151 +12094,140 @@ msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME-Entschl�sselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Anlage speichern"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Tempor�res Verzeichnis konnte nicht angelegt werden: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Auf Platte speichern..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "An Ort und Stelle betrachten"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "�ffnen in %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "An Ort und Stelle betrachten (�ber %s)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Externer Betrachter"
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Laden des Nachrichteninhalts"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Link in Browser �ffnen"
 
-#: mail/mail-display.c:1594
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Linkziel kopieren"
 
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Link speichern unter (FIXME)"
 
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Bild speichern unter..."
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "MIME-Nachricht konnte nicht geparst werden. Wird als Quellcode angezeigt."
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Ung�ltige Adresse"
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Von"
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "An"
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1813
-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:1844
-msgid "This message is digitally signed and has been found to be authentic."
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
 msgstr ""
-"Diese Nachricht ist digital unterzeichnet und wurde als authentisch "
-"nachgewiesen."
-
-#: mail/mail-format.c:1852
-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."
+"\n"
+"Mailer: "
 
-#: mail/mail-format.c:2068
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2120
 #, 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:2087
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf Daten im Netz (%s)"
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:2129
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Ung�ltiger external-body-Teil."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Ordner wird umkonfiguriert"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9722,37 +12236,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:763
+#: mail/mail-local.c:762
 #, 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:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ordner-Metadaten %s k�nnen nicht gel�scht werden: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, 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:1318
+#: mail/mail-local.c:1316
 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:1407
+#: mail/mail-local.c:1405
 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:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s neu konfigurieren"
@@ -9779,117 +12293,112 @@ msgstr ""
 msgid "Working"
 msgstr "In Arbeit"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Ordner wird gefiltert"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Abrufen von Mail"
 
-#: 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 "Trotzdem wurde die Nachricht erfolgreich verschickt."
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sende \"%s\""
 
-#: mail/mail-ops.c:677
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:696
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: 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 "Abgeschlossen."
 
-#: mail/mail-ops.c:791
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Machrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Verschiebe"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopiere"
 
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Taste Ordner in \"%s\" ab"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "M�ll"
-
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s �ffnen"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Speichers %s wird ge�ffnet"
 
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner '%s' wird gespeichert"
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Ordner wird aktualisiert"
 
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Ordner wird ges�ubert"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s abrufen"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d Nachricht(en) werden/wird abgerufen"
 
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d Nachricht(en) werden/wird gespeichert"
 
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9898,7 +12407,7 @@ msgstr ""
 "Ausgabedatei konnte nicht erstellt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9907,11 +12416,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Speichern der Anlage"
 
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9920,22 +12429,27 @@ msgstr ""
 "Ausgabedatei kann nicht erstellt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird neu aufgebaut"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Suchen"
 
@@ -9975,64 +12489,88 @@ msgstr "Passt auf:"
 msgid "Cancelling..."
 msgstr "Stornieren..."
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pfad: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:286
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Mail erhalten und verschicken"
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Alles abbrechen"
 
-#: mail/mail-send-recv.c:348
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Aktualisieren..."
 
-#: 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 "Warten..."
 
-#: mail/mail-send-recv.c:533
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Storniert"
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort f�r %s eingeben"
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: mail/mail-tools.c:255
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Signaturdatei konnte nicht gespeichert werden."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Signatur speichern"
+
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Diese Signatur wurde ge�ndert, aber nicht gespeichert.\n"
+"\n"
+"M�chten Sie Ihre �nderungen speichern?"
+
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "Signaturdatei:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Weitergeleitete Nachricht"
 
@@ -10059,105 +12597,164 @@ msgstr ""
 "   '%s'\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "VOrdner"
+#: mail/mail-vfolder.c:785
+#, fuzzy
+msgid "vFolders"
+msgstr "Ordner"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:825
 msgid "Edit VFolder"
 msgstr "VOrdner bearbeiten"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:841
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 "Es wurde versucht, einen vOrdner '%s' zu editieren, der nicht existiert."
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:895
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Kein Betreff)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Nachricht"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Gelesen"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:647
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: mail/message-list.c:648
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Niedriger"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "H�her"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Am h�chsten"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Erzeugen der Nachrichtenliste"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "F�llig am "
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Status"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Markiert"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Erhalten"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Gr��e"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "R�ckruf"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Vorangehen"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Quellinformation"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Weiterleiten"
+
+#: 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 "Antworten"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Allen antworten"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Vorschau"
+
+#: 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\""
@@ -10179,7 +12776,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Abonnement auf Ordner \"%s\" wird abbestellt"
 
 #: 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 "Ordner"
 
@@ -10224,86 +12821,10991 @@ msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolution-Komponente f�r die Chefsesselansicht"
-
-#: my-evolution/component-factory.c:44
-msgid "Folder containing the Evolution Summary"
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
 msgstr "Ordner mit der Evolution-�bersicht"
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolution-Mailersteller."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Fabrik f�r den Evolution-Aufgabeneditor."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Fabrik f�r die Mailzusammenfassungs-Komponente."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Einstellungen der Zusammenfassung"
+
+#: 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
+#, fuzzy
+msgid "Aarhus"
+msgstr "Alarme"
+
+#: my-evolution/Locations.h:2
+#, fuzzy
+msgid "Abakan"
+msgstr "Aserbaidschan"
+
+#: my-evolution/Locations.h:3
+msgid "Abbotsford"
+msgstr ""
+
+#: my-evolution/Locations.h:4
+#, fuzzy
+msgid "Aberdeen"
+msgstr "Anwesender"
+
+#: my-evolution/Locations.h:5
+#, fuzzy
+msgid "Abha"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:6
+#, fuzzy
+msgid "Abilene"
+msgstr "Mobiltelefon"
+
+#: 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 "Nicaragua"
+
+#: my-evolution/Locations.h:13
+msgid "Adak"
+msgstr ""
+
+#: my-evolution/Locations.h:14
+#, fuzzy
+msgid "Adana"
+msgstr "Albanien"
+
+#: my-evolution/Locations.h:15
+msgid "Adana/Incirlik"
+msgstr ""
+
+#: my-evolution/Locations.h:16
+msgid "Adelaide"
+msgstr ""
+
+#: my-evolution/Locations.h:17
+#, fuzzy
+msgid "Aden"
+msgstr "Schweden"
+
+#: my-evolution/Locations.h:18
+#, fuzzy
+msgid "Adrar"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:19
+msgid "Aeroparque"
+msgstr ""
+
+#: my-evolution/Locations.h:20
+msgid "Aeropuerto del Norte"
+msgstr ""
+
+#: my-evolution/Locations.h:21
+#, fuzzy
+msgid "Afonsos"
+msgstr "Anonym"
+
+#: my-evolution/Locations.h:22
+#, fuzzy
+msgid "Africa"
+msgstr "S�dafrika"
+
+#: my-evolution/Locations.h:23
+msgid "Afyon"
+msgstr ""
+
+#: my-evolution/Locations.h:24
+#, fuzzy
+msgid "Agen"
+msgstr "Argentinien"
+
+#: my-evolution/Locations.h:25
+#, fuzzy
+msgid "Aguascaliantes"
+msgstr "Australien"
+
+#: 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 "Albanien"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:39
+#, fuzzy
+msgid "Alamosa"
+msgstr "Alarme"
+
+#: my-evolution/Locations.h:40
+#, fuzzy
+msgid "Alaska"
+msgstr "Alarme"
+
+#: my-evolution/Locations.h:41
+msgid "Al Baha"
+msgstr ""
+
+#: my-evolution/Locations.h:43
+#, fuzzy
+msgid "Albany"
+msgstr "Albanien"
+
+#: my-evolution/Locations.h:44
+#, fuzzy
+msgid "Albenga"
+msgstr "Albanien"
+
+#: my-evolution/Locations.h:45
+#, fuzzy
+msgid "Alberta"
+msgstr "Algerien"
+
+#: my-evolution/Locations.h:46
+msgid "Alborg"
+msgstr ""
+
+#: my-evolution/Locations.h:47
+msgid "Albuquerque"
+msgstr ""
+
+#: my-evolution/Locations.h:48
+#, fuzzy
+msgid "Alderney"
+msgstr "Ordnername:"
+
+#: my-evolution/Locations.h:49
+msgid "Alesund"
+msgstr ""
+
+#: my-evolution/Locations.h:50
+#, fuzzy
+msgid "Alexandria"
+msgstr "Albanien"
+
+#: 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 "Algerien"
+
+#: my-evolution/Locations.h:56
+#, fuzzy
+msgid "Algona"
+msgstr "Angola"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:62
+#, fuzzy
+msgid "Alliance"
+msgstr "Komplex"
+
+#: my-evolution/Locations.h:63
+#, fuzzy
+msgid "Alma"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:64
+#, fuzzy
+msgid "Almeria"
+msgstr "Algerien"
+
+#: my-evolution/Locations.h:65
+#, fuzzy
+msgid "Alpena"
+msgstr "Albanien"
+
+#: my-evolution/Locations.h:66
+msgid "Al Qaysumah"
+msgstr ""
+
+#: my-evolution/Locations.h:67
+#, fuzzy
+msgid "Alta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:68
+#, fuzzy
+msgid "Altamira"
+msgstr "Albanien"
+
+#: my-evolution/Locations.h:69
+#, fuzzy
+msgid "Alton"
+msgstr "Aktio_nen"
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr ""
+
+#: my-evolution/Locations.h:71
+#, fuzzy
+msgid "Alturas"
+msgstr "Alarme"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:75
+#, fuzzy
+msgid "Amarillo"
+msgstr "E-Mail"
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr ""
+
+#: my-evolution/Locations.h:77
+#, fuzzy
+msgid "Ambler"
+msgstr "Mitglied"
+
+#: my-evolution/Locations.h:78
+#, fuzzy
+msgid "Amelia"
+msgstr "Armenien"
+
+#: my-evolution/Locations.h:79
+#, fuzzy
+msgid "Amendola"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:80
+#, fuzzy
+msgid "Ames"
+msgstr "Meilen"
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr ""
+
+#: my-evolution/Locations.h:82
+#, fuzzy
+msgid "Amsterdam"
+msgstr "�sterreich"
+
+#: my-evolution/Locations.h:83
+#, fuzzy
+msgid "Anadyr"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:84
+msgid "Anaktuvuk"
+msgstr ""
+
+#: my-evolution/Locations.h:85
+#, fuzzy
+msgid "Anapa"
+msgstr "Japan"
+
+#: my-evolution/Locations.h:86
+#, fuzzy
+msgid "Anchorage"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:87
+msgid "Anchorage - Elmendorf AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:88
+#, fuzzy
+msgid "Ancona"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:89
+msgid "Andahuayla"
+msgstr ""
+
+#: my-evolution/Locations.h:90
+#, fuzzy
+msgid "Anderson"
+msgstr "Gewitter"
+
+#: my-evolution/Locations.h:91
+#, fuzzy
+msgid "Andoya"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:92
+#, fuzzy
+msgid "Andravida"
+msgstr "Individuell"
+
+#: 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 "Albanien"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:101
+#, fuzzy
+msgid "Anniston"
+msgstr "Afghanistan"
+
+#: my-evolution/Locations.h:102
+#, fuzzy
+msgid "Antalya"
+msgstr "Italien"
+
+#: my-evolution/Locations.h:103
+#, fuzzy
+msgid "Antartica"
+msgstr "Antarktika"
+
+#: my-evolution/Locations.h:104
+#, fuzzy
+msgid "Antigo"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:105
+#, fuzzy
+msgid "Antigua"
+msgstr "Anguilla"
+
+#: my-evolution/Locations.h:106
+#, fuzzy
+msgid "Antigua and Barbuda"
+msgstr "Antigua und Barbuda"
+
+#: my-evolution/Locations.h:107
+#, fuzzy
+msgid "Antofagasta"
+msgstr "Afghanistan"
+
+#: 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 "Platzhalter"
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr ""
+
+#: my-evolution/Locations.h:112
+#, fuzzy
+msgid "Aquadilla"
+msgstr "Anguilla"
+
+#: my-evolution/Locations.h:113
+#, fuzzy
+msgid "Aracaju"
+msgstr "Macao"
+
+#: my-evolution/Locations.h:114
+#, fuzzy
+msgid "Arad"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:115
+#, fuzzy
+msgid "Arar"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:116
+#, fuzzy
+msgid "Araxos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:117
+#, fuzzy
+msgid "Arcata"
+msgstr "Antarktika"
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr ""
+
+#: my-evolution/Locations.h:119
+#, fuzzy
+msgid "Arequipa"
+msgstr "Armenien"
+
+#: my-evolution/Locations.h:121
+#, fuzzy
+msgid "Arica"
+msgstr "Algerien"
+
+#: my-evolution/Locations.h:122
+#, fuzzy
+msgid "Arizona"
+msgstr "Argentinien"
+
+#: my-evolution/Locations.h:123
+msgid "Arkansas"
+msgstr ""
+
+#: my-evolution/Locations.h:124
+msgid "Arkhangelsk"
+msgstr ""
+
+#: my-evolution/Locations.h:125
+#, fuzzy
+msgid "Arlington"
+msgstr "Ausrichtung"
+
+#: my-evolution/Locations.h:126
+#, fuzzy
+msgid "Artigas"
+msgstr "Argentinien"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:131
+#, fuzzy
+msgid "Ashfield"
+msgstr "Zugewiesen"
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:133
+#, fuzzy
+msgid "Ashland"
+msgstr "Thailand"
+
+#: my-evolution/Locations.h:134
+#, fuzzy
+msgid "Asia"
+msgstr "�sterreich"
+
+#: my-evolution/Locations.h:135
+#, fuzzy
+msgid "Aspen"
+msgstr "�ffnen"
+
+#: my-evolution/Locations.h:136
+#, fuzzy
+msgid "Asswan"
+msgstr "Assistent"
+
+#: my-evolution/Locations.h:137
+#, fuzzy
+msgid "Astoria"
+msgstr "�sterreich"
+
+#: my-evolution/Locations.h:138
+#, fuzzy
+msgid "Astrakhan"
+msgstr "Australien"
+
+#: my-evolution/Locations.h:139
+#, fuzzy
+msgid "Asturias"
+msgstr "�sterreich"
+
+#: my-evolution/Locations.h:140
+#, fuzzy
+msgid "Asuncion"
+msgstr "Reunion"
+
+#: my-evolution/Locations.h:141
+#, fuzzy
+msgid "Athens"
+msgstr "Anlagen"
+
+#: my-evolution/Locations.h:142
+#, fuzzy
+msgid "Athinai"
+msgstr "China"
+
+#: my-evolution/Locations.h:143
+#, fuzzy
+msgid "Atlanta"
+msgstr "Albanien"
+
+#: my-evolution/Locations.h:144
+#, fuzzy
+msgid "Atlantic"
+msgstr "Automatisch"
+
+#: 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 "Island"
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:150
+#, fuzzy
+msgid "Augusta"
+msgstr "August"
+
+#: my-evolution/Locations.h:151
+#, fuzzy
+msgid "Aurora"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:152
+#, fuzzy
+msgid "Austin"
+msgstr "�sterreich"
+
+#: my-evolution/Locations.h:153
+#, fuzzy
+msgid "Australasia"
+msgstr "Australien"
+
+#: my-evolution/Locations.h:156
+msgid "Avalon"
+msgstr ""
+
+#: my-evolution/Locations.h:157
+msgid "Aviano"
+msgstr ""
+
+#: my-evolution/Locations.h:158
+msgid "Ayacucho"
+msgstr ""
+
+#: my-evolution/Locations.h:159
+#, fuzzy
+msgid "Bage"
+msgstr "Base"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:170
+#, fuzzy
+msgid "Ball Mountain"
+msgstr "E-Mail enth�lt"
+
+#: my-evolution/Locations.h:171
+#, fuzzy
+msgid "Baltimore"
+msgstr "Baltisch"
+
+#: my-evolution/Locations.h:172
+msgid "Baltimore-Glen Burnie"
+msgstr ""
+
+#: my-evolution/Locations.h:173
+#, fuzzy
+msgid "Banak"
+msgstr "Botswana"
+
+#: my-evolution/Locations.h:174
+#, fuzzy
+msgid "Bandarabbass"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:175
+#, fuzzy
+msgid "Bangor"
+msgstr "in der Vergangenheit"
+
+#: my-evolution/Locations.h:176
+#, fuzzy
+msgid "Baracoa"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:177
+msgid "Barbers Point"
+msgstr ""
+
+#: my-evolution/Locations.h:178
+#, fuzzy
+msgid "Barcelona"
+msgstr "Mazedonien"
+
+#: my-evolution/Locations.h:179
+#, fuzzy
+msgid "Bardufoss"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:180
+msgid "Bar Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:181
+#, fuzzy
+msgid "Bari"
+msgstr "Bahrein"
+
+#: my-evolution/Locations.h:182
+msgid "Bariloche"
+msgstr ""
+
+#: my-evolution/Locations.h:183
+#, fuzzy
+msgid "Barinas"
+msgstr "Bahrein"
+
+#: my-evolution/Locations.h:184
+#, fuzzy
+msgid "Barking Sand"
+msgstr "St�rmischer Sand"
+
+#: my-evolution/Locations.h:185
+#, fuzzy
+msgid "Barksdale"
+msgstr "Base"
+
+#: my-evolution/Locations.h:186
+#, fuzzy
+msgid "Barnaul"
+msgstr "Brasilien"
+
+#: 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 "Far�er"
+
+#: 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 "Grundlegend"
+
+#: my-evolution/Locations.h:194
+msgid "Batesville"
+msgstr ""
+
+#: my-evolution/Locations.h:195
+#, fuzzy
+msgid "Batman"
+msgstr "Bhutan"
+
+#: my-evolution/Locations.h:196
+msgid "Baton Rouge"
+msgstr ""
+
+#: my-evolution/Locations.h:197
+msgid "Battle Creek"
+msgstr ""
+
+#: my-evolution/Locations.h:198
+#, fuzzy
+msgid "Battle Mountain"
+msgstr "Name enth�lt"
+
+#: my-evolution/Locations.h:199
+#, fuzzy
+msgid "Bauru"
+msgstr "Nauru"
+
+#: my-evolution/Locations.h:200
+#, fuzzy
+msgid "Bayamo"
+msgstr "Bahamas"
+
+#: my-evolution/Locations.h:201
+msgid "Bayreuth"
+msgstr ""
+
+#: my-evolution/Locations.h:202
+#, fuzzy
+msgid "Beatrice"
+msgstr "Baltisch"
+
+#: my-evolution/Locations.h:203
+msgid "Beaufort"
+msgstr ""
+
+#: my-evolution/Locations.h:204
+#, fuzzy
+msgid "Beaumont"
+msgstr "Monat"
+
+#: 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 "Bahrein"
+
+#: my-evolution/Locations.h:208
+#, fuzzy
+msgid "Beckley"
+msgstr "Belize"
+
+#: my-evolution/Locations.h:209
+#, fuzzy
+msgid "Bedford"
+msgstr "vor"
+
+#: my-evolution/Locations.h:210
+#, fuzzy
+msgid "Beijing"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:211
+#, fuzzy
+msgid "Beirut"
+msgstr "Wei�russland"
+
+#: my-evolution/Locations.h:212
+msgid "Beja"
+msgstr ""
+
+#: my-evolution/Locations.h:213
+#, fuzzy
+msgid "Belem"
+msgstr "Belize"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:219
+#, fuzzy
+msgid "Belleville"
+msgstr "Belize"
+
+#: my-evolution/Locations.h:220
+#, fuzzy
+msgid "Bellingham"
+msgstr "Wind und Hagel"
+
+#: my-evolution/Locations.h:221
+msgid "Belmar-Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:222
+#, fuzzy
+msgid "Belo Horizonte"
+msgstr "Belize"
+
+#: 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 "Venezuela"
+
+#: my-evolution/Locations.h:226
+#, fuzzy
+msgid "Benina"
+msgstr "Benin"
+
+#: 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 "Neu laden"
+
+#: my-evolution/Locations.h:230
+msgid "Bergamo"
+msgstr ""
+
+#: my-evolution/Locations.h:231
+#, fuzzy
+msgid "Bergen"
+msgstr "Gelesen"
+
+#: my-evolution/Locations.h:232
+msgid "Bergstrom AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:233
+msgid "Berlevag"
+msgstr ""
+
+#: my-evolution/Locations.h:234
+#, fuzzy
+msgid "Berlin"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:235
+msgid "Berlin-Tegel"
+msgstr ""
+
+#: my-evolution/Locations.h:236
+msgid "Berlin-Tempelhof"
+msgstr ""
+
+#: my-evolution/Locations.h:237
+#, fuzzy
+msgid "Bern"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:238
+#, fuzzy
+msgid "Bethel"
+msgstr "Wetter"
+
+#: my-evolution/Locations.h:239
+msgid "Bethlehem Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:240
+#, fuzzy
+msgid "Bettles"
+msgstr "Belize"
+
+#: my-evolution/Locations.h:241
+#, fuzzy
+msgid "Beverly"
+msgstr "_alle"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:245
+#, fuzzy
+msgid "Big Piney"
+msgstr "Pine"
+
+#: 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 "Mailingliste"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:257
+#, fuzzy
+msgid "Blanding"
+msgstr "Schattierung"
+
+#: my-evolution/Locations.h:258
+#, fuzzy
+msgid "Block Island"
+msgstr "Cook-Inseln"
+
+#: my-evolution/Locations.h:259
+msgid "Bloemfontein J. B. M. Hertzog "
+msgstr ""
+
+#: my-evolution/Locations.h:260
+#, fuzzy
+msgid "Bloomington"
+msgstr "St�rmischer Sand"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:267
+#, fuzzy
+msgid "Bodo"
+msgstr "Textk�rper"
+
+#: my-evolution/Locations.h:268
+msgid "Bogota/Eldorado"
+msgstr ""
+
+#: my-evolution/Locations.h:269
+#, fuzzy
+msgid "Boise"
+msgstr "Base"
+
+#: my-evolution/Locations.h:271
+msgid "Bologna"
+msgstr ""
+
+#: my-evolution/Locations.h:272
+#, fuzzy
+msgid "Bolzano"
+msgstr "Polen"
+
+#: my-evolution/Locations.h:273
+msgid "Bombay/Santacruz"
+msgstr ""
+
+#: my-evolution/Locations.h:274
+#, fuzzy
+msgid "Boone"
+msgstr "Keine"
+
+#: my-evolution/Locations.h:275
+msgid "Bordeaux"
+msgstr ""
+
+#: my-evolution/Locations.h:276
+#, fuzzy
+msgid "Borger"
+msgstr "f�r immer"
+
+#: 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 "Bosnien und Herzegowina"
+
+#: my-evolution/Locations.h:280
+#, fuzzy
+msgid "Boston"
+msgstr "Estland"
+
+#: my-evolution/Locations.h:281
+#, fuzzy
+msgid "Boulmer"
+msgstr "Ordner"
+
+#: my-evolution/Locations.h:282
+#, fuzzy
+msgid "Bourges"
+msgstr "Quellen"
+
+#: my-evolution/Locations.h:283
+msgid "Bournemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:284
+#, fuzzy
+msgid "Bowling Green"
+msgstr "St�rmischer Sand"
+
+#: my-evolution/Locations.h:285
+#, fuzzy
+msgid "Bozeman"
+msgstr "Koreanisch"
+
+#: my-evolution/Locations.h:286
+#, fuzzy
+msgid "Bradford"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:287
+msgid "Bradshaw Field"
+msgstr ""
+
+#: my-evolution/Locations.h:288
+#, fuzzy
+msgid "Brainerd"
+msgstr "Bahrein"
+
+#: my-evolution/Locations.h:289
+#, fuzzy
+msgid "Brasilia"
+msgstr "Brasilien"
+
+#: my-evolution/Locations.h:290
+msgid "Brasschaat"
+msgstr ""
+
+#: my-evolution/Locations.h:291
+#, fuzzy
+msgid "Bratislava"
+msgstr "Brasilien"
+
+#: my-evolution/Locations.h:292
+#, fuzzy
+msgid "Bratsk"
+msgstr "Entw�rfe"
+
+#: my-evolution/Locations.h:293
+msgid "Braunschweig"
+msgstr ""
+
+#: my-evolution/Locations.h:295
+#, fuzzy
+msgid "Bremen"
+msgstr "Jemen"
+
+#: my-evolution/Locations.h:296
+msgid "Bremerton"
+msgstr ""
+
+#: my-evolution/Locations.h:297
+#, fuzzy
+msgid "Brest"
+msgstr "Test"
+
+#: my-evolution/Locations.h:298
+msgid "Bridgeport"
+msgstr ""
+
+#: my-evolution/Locations.h:299
+#, fuzzy
+msgid "Brindisi"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:300
+msgid "Brisbane"
+msgstr ""
+
+#: my-evolution/Locations.h:301
+#, fuzzy
+msgid "Bristol"
+msgstr "Brasilien"
+
+#: 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 "Barbados"
+
+#: my-evolution/Locations.h:305
+#, fuzzy
+msgid "Broken Bow"
+msgstr "Zerfetzte Wolken"
+
+#: my-evolution/Locations.h:306
+msgid "Bronnoysund"
+msgstr ""
+
+#: my-evolution/Locations.h:307
+#, fuzzy
+msgid "Brookings"
+msgstr "In Arbeit"
+
+#: my-evolution/Locations.h:308
+msgid "Brooksville"
+msgstr ""
+
+#: my-evolution/Locations.h:309
+#, fuzzy
+msgid "Broome"
+msgstr "Unten:"
+
+#: my-evolution/Locations.h:310
+msgid "Brownsville"
+msgstr ""
+
+#: my-evolution/Locations.h:311
+#, fuzzy
+msgid "Brunswick"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:312
+msgid "Brussels-National Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:313
+msgid "Bryansk"
+msgstr ""
+
+#: my-evolution/Locations.h:314
+#, fuzzy
+msgid "Bryce Canyon"
+msgstr "Nach Firma"
+
+#: 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 "Bhutan"
+
+#: my-evolution/Locations.h:323
+#, fuzzy
+msgid "Burgas"
+msgstr "Gesch�ft"
+
+#: my-evolution/Locations.h:324
+#, fuzzy
+msgid "Burley"
+msgstr "T�rkei"
+
+#: my-evolution/Locations.h:325
+msgid "Burlington"
+msgstr ""
+
+#: my-evolution/Locations.h:326
+#, fuzzy
+msgid "Burnet"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:327
+#, fuzzy
+msgid "Burns"
+msgstr "Gesch�ft"
+
+#: my-evolution/Locations.h:328
+#, fuzzy
+msgid "Bursa"
+msgstr "Gesch�ft"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:332
+#, fuzzy
+msgid "Cagliari"
+msgstr "Kalender"
+
+#: my-evolution/Locations.h:333
+#, fuzzy
+msgid "Cairns"
+msgstr "Vorsitzender"
+
+#: my-evolution/Locations.h:334
+#, fuzzy
+msgid "Cairo"
+msgstr "Vorsitzender"
+
+#: 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 ""
-"Evolutions Mail-Zusammenfassungskomponente kann nicht initialisiert werden"
 
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/Locations.h:338
+#, fuzzy
+msgid "Calgary"
+msgstr "Kalender"
+
+#: my-evolution/Locations.h:339
+msgid "Cali/Alfonso Bonillaaragon"
+msgstr ""
+
+#: my-evolution/Locations.h:340
+#, fuzzy
+msgid "Caliente"
+msgstr "Kalender"
+
+#: my-evolution/Locations.h:341
+#, fuzzy
+msgid "California"
+msgstr "Neukaledonien"
+
+#: my-evolution/Locations.h:342
+msgid "Calvi-Ste-Catherine"
+msgstr ""
+
+#: my-evolution/Locations.h:343
+#, fuzzy
+msgid "Camaguey"
+msgstr "Paraguay"
+
+#: 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 "Kamerun"
+
+#: my-evolution/Locations.h:347
+#, fuzzy
+msgid "Camiri"
+msgstr "Vorsitzender"
+
+#: my-evolution/Locations.h:348
+#, fuzzy
+msgid "Campeche"
+msgstr "Abgeschlossen"
+
+#: my-evolution/Locations.h:349
+#, fuzzy
+msgid "Campinas"
+msgstr "Kambodscha"
+
+#: my-evolution/Locations.h:350
+#, fuzzy
+msgid "Campo"
+msgstr "Fa."
+
+#: my-evolution/Locations.h:351
+#, fuzzy
+msgid "Campo Grande"
+msgstr "Kap Verde"
+
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr ""
+
+#: my-evolution/Locations.h:353
+#, fuzzy
+msgid "Canaan"
+msgstr "Kanada"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:363
+#, fuzzy
+msgid "Cancun"
+msgstr "Abbrechen"
+
+#: my-evolution/Locations.h:364
+msgid "Cannes-Mandelieu"
+msgstr ""
+
+#: my-evolution/Locations.h:365
+#, fuzzy
+msgid "Cantwell"
+msgstr "Abbrechen"
+
+#: my-evolution/Locations.h:366
+#, fuzzy
+msgid "Cape Girardeau"
+msgstr "Kap Verde"
+
+#: my-evolution/Locations.h:367
+#, fuzzy
+msgid "Cape Hatteras"
+msgstr "Kap Verde"
+
+#: my-evolution/Locations.h:368
+#, fuzzy
+msgid "Cape Lisburne"
+msgstr "Papierquelle:"
+
+#: my-evolution/Locations.h:369
+#, fuzzy
+msgid "Cape Newenham"
+msgstr "Kap Verde"
+
+#: 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 "Kap Verde"
+
+#: my-evolution/Locations.h:374
+msgid "Caracas La Carlota"
+msgstr ""
+
+#: my-evolution/Locations.h:375
+msgid "Caracas Maiquetia"
+msgstr ""
+
+#: my-evolution/Locations.h:376
+#, fuzzy
+msgid "Caravelas"
+msgstr "Aufgabe stornieren"
+
+#: my-evolution/Locations.h:377
+#, fuzzy
+msgid "Carbondale"
+msgstr "Kambodscha"
+
+#: my-evolution/Locations.h:378
+#, fuzzy
+msgid "Cardiff"
+msgstr "Kartenansicht"
+
+#: my-evolution/Locations.h:379
+#, fuzzy
+msgid "Caribou"
+msgstr "Auto"
+
+#: my-evolution/Locations.h:380
+#, fuzzy
+msgid "Carlisle"
+msgstr "Unbest�ndig"
+
+#: my-evolution/Locations.h:381
+#, fuzzy
+msgid "Carlsbad"
+msgstr "R�ckruf"
+
+#: my-evolution/Locations.h:382
+#, fuzzy
+msgid "Carroll"
+msgstr "Auto"
+
+#: my-evolution/Locations.h:383
+msgid "Cartagena/Rafael Nunez"
+msgstr ""
+
+#: my-evolution/Locations.h:384
+msgid "Casa Granda"
+msgstr ""
+
+#: my-evolution/Locations.h:385
+#, fuzzy
+msgid "Cascade"
+msgstr "Querformat"
+
+#: my-evolution/Locations.h:386
+#, fuzzy
+msgid "Casper"
+msgstr "Papier"
+
+#: my-evolution/Locations.h:387
+#, fuzzy
+msgid "Catacamas"
+msgstr "Bahamas"
+
+#: my-evolution/Locations.h:388
+#, fuzzy
+msgid "Catania"
+msgstr "Kroatien"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:393
+#, fuzzy
+msgid "Cedar City"
+msgstr "Wolkenloser Himmel"
+
+#: 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 "Algerien"
+
+#: my-evolution/Locations.h:397
+msgid "Chacarita"
+msgstr ""
+
+#: my-evolution/Locations.h:398
+#, fuzzy
+msgid "Chadron"
+msgstr "Tschad"
+
+#: my-evolution/Locations.h:399
+#, fuzzy
+msgid "Challis"
+msgstr "Vorsitzender"
+
+#: my-evolution/Locations.h:400
+#, fuzzy
+msgid "Chamberlain"
+msgstr "Kamerun"
+
+#: my-evolution/Locations.h:401
+#, fuzzy
+msgid "Chambery"
+msgstr "Kamerun"
+
+#: my-evolution/Locations.h:402
+#, fuzzy
+msgid "Champaign"
+msgstr "Firma"
+
+#: my-evolution/Locations.h:403
+#, fuzzy
+msgid "Chandalar Lake"
+msgstr "Kalendermitteilung"
+
+#: my-evolution/Locations.h:404
+#, fuzzy
+msgid "Chandler"
+msgstr "Tschad"
+
+#: my-evolution/Locations.h:405
+#, fuzzy
+msgid "Chania"
+msgstr "China"
+
+#: my-evolution/Locations.h:406
+#, fuzzy
+msgid "Chanute"
+msgstr "Abbrechen"
+
+#: my-evolution/Locations.h:407
+#, fuzzy
+msgid "Chariton"
+msgstr "Kamerun"
+
+#: my-evolution/Locations.h:408
+msgid "Charleroi-Brussels South"
+msgstr ""
+
+#: my-evolution/Locations.h:409
+msgid "Charles City"
+msgstr ""
+
+#: my-evolution/Locations.h:410
+#, fuzzy
+msgid "Charleston"
+msgstr "Vorsitzende"
+
+#: my-evolution/Locations.h:411
+#, fuzzy
+msgid "Charlotte"
+msgstr "Mayotte"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:416
+#, fuzzy
+msgid "Cheju"
+msgstr "Chile"
+
+#: 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 "Luxemburg"
+
+#: my-evolution/Locations.h:420
+#, fuzzy
+msgid "Cherry Point"
+msgstr "Anderes Telefon"
+
+#: 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 "China"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:431
+#, fuzzy
+msgid "Chiclayo"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:432
+#, fuzzy
+msgid "Chico"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:433
+msgid "Chicopee Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:434
+#, fuzzy
+msgid "Chievres"
+msgstr "Chinesisch"
+
+#: my-evolution/Locations.h:435
+#, fuzzy
+msgid "Chihhang"
+msgstr "China"
+
+#: my-evolution/Locations.h:436
+msgid "Chihuahua"
+msgstr ""
+
+#: my-evolution/Locations.h:437
+#, fuzzy
+msgid "Childress"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:439
+#, fuzzy
+msgid "China Lake"
+msgstr "China"
+
+#: my-evolution/Locations.h:440
+#, fuzzy
+msgid "Chinandega"
+msgstr "China"
+
+#: my-evolution/Locations.h:441
+msgid "Chinmem/Shatou"
+msgstr ""
+
+#: my-evolution/Locations.h:442
+#, fuzzy
+msgid "Chino"
+msgstr "China"
+
+#: my-evolution/Locations.h:443
+msgid "Chippewa County"
+msgstr ""
+
+#: my-evolution/Locations.h:444
+#, fuzzy
+msgid "Chita"
+msgstr "China"
+
+#: 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 "China"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:462
+#, fuzzy
+msgid "Clarinda"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:463
+#, fuzzy
+msgid "Clarion"
+msgstr "Zusammenarbeit"
+
+#: my-evolution/Locations.h:464
+msgid "Clarksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:465
+#, fuzzy
+msgid "Clayton"
+msgstr "Zusammenarbeit"
+
+#: my-evolution/Locations.h:466
+msgid "Clayton Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:467
+msgid "Clermont-Ferrand"
+msgstr ""
+
+#: my-evolution/Locations.h:468
+#, fuzzy
+msgid "Cleveland"
+msgstr "Gr�nland"
+
+#: 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 "Kolumbien"
+
+#: 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 "Cook-Inseln"
+
+#: my-evolution/Locations.h:477
+#, fuzzy
+msgid "Cody"
+msgstr "Textk�rper"
+
+#: my-evolution/Locations.h:478
+msgid "Coeur d'Alene"
+msgstr ""
+
+#: my-evolution/Locations.h:479
+#, fuzzy
+msgid "Cold Bay"
+msgstr "Ordnerleiste"
+
+#: my-evolution/Locations.h:480
+#, fuzzy
+msgid "Colima"
+msgstr "Kolumbien"
+
+#: my-evolution/Locations.h:481
+#, fuzzy
+msgid "College Station"
+msgstr "Zusammenarbeit"
+
+#: my-evolution/Locations.h:482
+msgid "Colmar-Meyenheim"
+msgstr ""
+
+#: my-evolution/Locations.h:484
+#, fuzzy
+msgid "Colonia"
+msgstr "Kolumbien"
+
+#: my-evolution/Locations.h:485
+#, fuzzy
+msgid "Colorado"
+msgstr "Zusammenarbeit"
+
+#: my-evolution/Locations.h:486
+msgid "Colorado Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:487
+#, fuzzy
+msgid "Columbia"
+msgstr "Kolumbien"
+
+#: my-evolution/Locations.h:488
+msgid "Columbia-McEntire"
+msgstr ""
+
+#: my-evolution/Locations.h:489
+#, fuzzy
+msgid "Columbus"
+msgstr "Kolumbien"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:494
+#, fuzzy
+msgid "Colville"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:495
+msgid "Comodoro Rivadavia"
+msgstr ""
+
+#: my-evolution/Locations.h:496
+#, fuzzy
+msgid "Comox"
+msgstr "Fa."
+
+#: my-evolution/Locations.h:497
+msgid "Conceicao Do Araguaia"
+msgstr ""
+
+#: my-evolution/Locations.h:498
+#, fuzzy
+msgid "Concepcion"
+msgstr "Aktion abbrechen"
+
+#: my-evolution/Locations.h:499
+#, fuzzy
+msgid "Concord"
+msgstr "Kongo"
+
+#: my-evolution/Locations.h:500
+msgid "Concordia"
+msgstr ""
+
+#: my-evolution/Locations.h:501
+msgid "Connaught"
+msgstr ""
+
+#: my-evolution/Locations.h:502
+#, fuzzy
+msgid "Connecticut"
+msgstr "Kontakte"
+
+#: my-evolution/Locations.h:503
+#, fuzzy
+msgid "Conroe"
+msgstr "Kongo"
+
+#: my-evolution/Locations.h:504
+#, fuzzy
+msgid "Constantine"
+msgstr "Ent_haltend:"
+
+#: my-evolution/Locations.h:505
+msgid "Copper Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:506
+#, fuzzy
+msgid "Cordoba"
+msgstr "Kolumbien"
+
+#: my-evolution/Locations.h:507
+#, fuzzy
+msgid "Cordova"
+msgstr "Jordan"
+
+#: my-evolution/Locations.h:508
+msgid "Cork"
+msgstr ""
+
+#: my-evolution/Locations.h:509
+#, fuzzy
+msgid "Coro"
+msgstr "Komoren"
+
+#: my-evolution/Locations.h:510
+#, fuzzy
+msgid "Corona"
+msgstr "Komoren"
+
+#: my-evolution/Locations.h:511
+msgid "Corpus Christi"
+msgstr ""
+
+#: my-evolution/Locations.h:512
+msgid "Corpus Christi NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:513
+#, fuzzy
+msgid "Corrientes"
+msgstr "Auftreten"
+
+#: my-evolution/Locations.h:514
+#, fuzzy
+msgid "Corsicana"
+msgstr "Costa Rica"
+
+#: my-evolution/Locations.h:515
+#, fuzzy
+msgid "Cortez"
+msgstr "Notiz"
+
+#: my-evolution/Locations.h:516
+#, fuzzy
+msgid "Corumba"
+msgstr "Kuba"
+
+#: my-evolution/Locations.h:518
+msgid "Cotulla"
+msgstr ""
+
+#: my-evolution/Locations.h:519
+msgid "Council Bluffs"
+msgstr ""
+
+#: my-evolution/Locations.h:520
+#, fuzzy
+msgid "Coventry"
+msgstr "Land:"
+
+#: my-evolution/Locations.h:521
+#, fuzzy
+msgid "Covington"
+msgstr "Kongo"
+
+#: my-evolution/Locations.h:522
+msgid "Cozumel"
+msgstr ""
+
+#: my-evolution/Locations.h:523
+#, fuzzy
+msgid "Craig"
+msgstr "Kroatien"
+
+#: my-evolution/Locations.h:524
+#, fuzzy
+msgid "Cranfield"
+msgstr "Storniert"
+
+#: my-evolution/Locations.h:525
+msgid "Crescent City"
+msgstr ""
+
+#: my-evolution/Locations.h:526
+#, fuzzy
+msgid "Creston"
+msgstr "Frage"
+
+#: my-evolution/Locations.h:527
+#, fuzzy
+msgid "Crestview"
+msgstr "Vorschau"
+
+#: 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 "Kamerun"
+
+#: my-evolution/Locations.h:533
+#, fuzzy
+msgid "Cuba Awrs"
+msgstr "Kuba"
+
+#: my-evolution/Locations.h:534
+msgid "Cuernavaca"
+msgstr ""
+
+#: my-evolution/Locations.h:535
+#, fuzzy
+msgid "Cuiaba"
+msgstr "Kuba"
+
+#: my-evolution/Locations.h:536
+#, fuzzy
+msgid "Culdrose"
+msgstr "Schlie�en"
+
+#: my-evolution/Locations.h:537
+msgid "Culiacan"
+msgstr ""
+
+#: my-evolution/Locations.h:538
+#, fuzzy
+msgid "Cumana"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:539
+msgid "Cumberland"
+msgstr ""
+
+#: my-evolution/Locations.h:540
+#, fuzzy
+msgid "Curitiba"
+msgstr "Kroatien"
+
+#: my-evolution/Locations.h:541
+msgid "Curitiba Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:542
+#, fuzzy
+msgid "Custer"
+msgstr "Ausschneiden"
+
+#: my-evolution/Locations.h:543
+msgid "Cut Bank"
+msgstr ""
+
+#: my-evolution/Locations.h:544
+msgid "Cuzco"
+msgstr ""
+
+#: my-evolution/Locations.h:547
+#, fuzzy
+msgid "Dagali"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:548
+msgid "Daggett"
+msgstr ""
+
+#: my-evolution/Locations.h:549
+msgid "Dalhart"
+msgstr ""
+
+#: my-evolution/Locations.h:550
+#, fuzzy
+msgid "Dalian"
+msgstr "Taiwan"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:556
+#, fuzzy
+msgid "Danbury"
+msgstr "Januar"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:562
+#, fuzzy
+msgid "Dayton"
+msgstr "Tag"
+
+#: my-evolution/Locations.h:563
+msgid "Daytona Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:564
+msgid "Dayton-Fairborn"
+msgstr ""
+
+#: my-evolution/Locations.h:565
+#, fuzzy
+msgid "Dayton-South Airport"
+msgstr "Nicht importieren"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:571
+#, fuzzy
+msgid "Deelen"
+msgstr "L�schen"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:576
+#, fuzzy
+msgid "Delta"
+msgstr "L�schen"
+
+#: my-evolution/Locations.h:577
+#, fuzzy
+msgid "Deming"
+msgstr "Besprechung"
+
+#: my-evolution/Locations.h:578
+msgid "Den Helder/De Kooy"
+msgstr ""
+
+#: my-evolution/Locations.h:579
+#, fuzzy
+msgid "Denison"
+msgstr "Reunion"
+
+#: my-evolution/Locations.h:581
+#, fuzzy
+msgid "Denton"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:582
+#, fuzzy
+msgid "Denver"
+msgstr "Absender"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:587
+#, fuzzy
+msgid "Des Moines"
+msgstr "Zeitzonen"
+
+#: my-evolution/Locations.h:588
+#, fuzzy
+msgid "Destin"
+msgstr "Frage"
+
+#: 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 "Bahrein"
+
+#: my-evolution/Locations.h:596
+#, fuzzy
+msgid "Dickinson"
+msgstr "Ausma�e:"
+
+#: my-evolution/Locations.h:597
+#, fuzzy
+msgid "Dijon"
+msgstr "Fertig"
+
+#: my-evolution/Locations.h:598
+#, fuzzy
+msgid "Dillingham"
+msgstr "Abtreibender Hagel"
+
+#: my-evolution/Locations.h:599
+#, fuzzy
+msgid "Dillon"
+msgstr "Fertig"
+
+#: my-evolution/Locations.h:600
+#, fuzzy
+msgid "Dinard"
+msgstr "Karte drucken"
+
+#: 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 "Position"
+
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "Fertig"
+
+#: my-evolution/Locations.h:610
+#, fuzzy
+msgid "Dongsha"
+msgstr "Tonga"
+
+#: my-evolution/Locations.h:611
+msgid "Dongshi"
+msgstr ""
+
+#: my-evolution/Locations.h:612
+#, fuzzy
+msgid "Don Torcuato"
+msgstr "am oder nach"
+
+#: my-evolution/Locations.h:613
+msgid "Dortmund-Wickede"
+msgstr ""
+
+#: my-evolution/Locations.h:614
+#, fuzzy
+msgid "Dothan"
+msgstr "Fertig"
+
+#: my-evolution/Locations.h:615
+msgid "Douglas"
+msgstr ""
+
+#: my-evolution/Locations.h:616
+#, fuzzy
+msgid "Dover"
+msgstr "f�r immer"
+
+#: 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 "Kuba"
+
+#: my-evolution/Locations.h:620
+msgid "Dubbo"
+msgstr ""
+
+#: my-evolution/Locations.h:621
+#, fuzzy
+msgid "Dublin"
+msgstr "�ffentlich"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:625
+#, fuzzy
+msgid "Dugway"
+msgstr "Tag"
+
+#: my-evolution/Locations.h:626
+#, fuzzy
+msgid "Duluth"
+msgstr "Vorgabe"
+
+#: my-evolution/Locations.h:627
+#, fuzzy
+msgid "Dundee"
+msgstr "F�llig am "
+
+#: my-evolution/Locations.h:628
+#, fuzzy
+msgid "Durango"
+msgstr "in der Vergangenheit"
+
+#: 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 "Staubsturm"
+
+#: my-evolution/Locations.h:633
+msgid "Dutch Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:634
+msgid "Dyersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:635
+#, fuzzy
+msgid "Eagle"
+msgstr "Aktivieren"
+
+#: 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 "Ost - S�dost"
+
+#: my-evolution/Locations.h:640
+msgid "Eau Claire"
+msgstr ""
+
+#: my-evolution/Locations.h:642
+#, fuzzy
+msgid "Edinburgh"
+msgstr "Endent:"
+
+#: my-evolution/Locations.h:643
+#, fuzzy
+msgid "Edmonton"
+msgstr "Monat"
+
+#: 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 "Tornado"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:661
+#, fuzzy
+msgid "Elkins"
+msgstr "list"
+
+#: my-evolution/Locations.h:662
+msgid "Elko"
+msgstr ""
+
+#: my-evolution/Locations.h:663
+#, fuzzy
+msgid "Elmira"
+msgstr "Elm"
+
+#: my-evolution/Locations.h:664
+#, fuzzy
+msgid "El Monte"
+msgstr "Monat"
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr ""
+
+#: my-evolution/Locations.h:667
+#, fuzzy
+msgid "El Salvador Int."
+msgstr "El Salvador"
+
+#: my-evolution/Locations.h:668
+msgid "Elsenborn"
+msgstr ""
+
+#: my-evolution/Locations.h:669
+#, fuzzy
+msgid "Ely"
+msgstr "Elm"
+
+#: my-evolution/Locations.h:670
+msgid "Emmonak"
+msgstr ""
+
+#: my-evolution/Locations.h:671
+#, fuzzy
+msgid "Emporia"
+msgstr "Wichtig"
+
+#: my-evolution/Locations.h:672
+msgid "Enid"
+msgstr ""
+
+#: my-evolution/Locations.h:673
+#, fuzzy
+msgid "Enid/Woodring"
+msgstr "Endent:"
+
+#: 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 "Eritrea"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:685
+#, fuzzy
+msgid "Eugene"
+msgstr "Juni"
+
+#: my-evolution/Locations.h:686
+#, fuzzy
+msgid "Eureka"
+msgstr "Eritrea"
+
+#: my-evolution/Locations.h:687
+msgid "Europe"
+msgstr ""
+
+#: my-evolution/Locations.h:688
+#, fuzzy
+msgid "Evanston"
+msgstr "Estland"
+
+#: my-evolution/Locations.h:689
+msgid "Evansville"
+msgstr ""
+
+#: my-evolution/Locations.h:690
+#, fuzzy
+msgid "Everett"
+msgstr "Alle"
+
+#: my-evolution/Locations.h:691
+msgid "Evergreen"
+msgstr ""
+
+#: my-evolution/Locations.h:692
+msgid "Evreux-Fauville"
+msgstr ""
+
+#: my-evolution/Locations.h:693
+#, fuzzy
+msgid "Exeter"
+msgstr "Wetter"
+
+#: my-evolution/Locations.h:694
+msgid "Ezeiza"
+msgstr ""
+
+#: my-evolution/Locations.h:695
+#, fuzzy
+msgid "Fagernes"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:696
+msgid "Fairbanks"
+msgstr ""
+
+#: my-evolution/Locations.h:697
+msgid "Fairchild"
+msgstr ""
+
+#: my-evolution/Locations.h:698
+#, fuzzy
+msgid "Fairfield"
+msgstr "_Von-Feld"
+
+#: my-evolution/Locations.h:699
+#, fuzzy
+msgid "Fairmont"
+msgstr "Schriften"
+
+#: 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 "in der Vergangenheit"
+
+#: my-evolution/Locations.h:705
+#, fuzzy
+msgid "Farmingdale"
+msgstr "Unbest�ndig"
+
+#: my-evolution/Locations.h:706
+#, fuzzy
+msgid "Farmington"
+msgstr "Eisiger Tornado"
+
+#: my-evolution/Locations.h:707
+#, fuzzy
+msgid "Farmville"
+msgstr "Familienname"
+
+#: my-evolution/Locations.h:708
+#, fuzzy
+msgid "Faro"
+msgstr "Von"
+
+#: my-evolution/Locations.h:709
+msgid "Fayetteville"
+msgstr ""
+
+#: my-evolution/Locations.h:710
+#, fuzzy
+msgid "Feng Nin"
+msgstr "Eisregen"
+
+#: my-evolution/Locations.h:711
+msgid "Fergus Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:712
+msgid "Fernando De Noronha"
+msgstr ""
+
+#: my-evolution/Locations.h:713
+#, fuzzy
+msgid "Ferrara"
+msgstr "Februar"
+
+#: my-evolution/Locations.h:714
+#, fuzzy
+msgid "Figari"
+msgstr "Nigeria"
+
+#: my-evolution/Locations.h:715
+#, fuzzy
+msgid "Findlay"
+msgstr "Freitag"
+
+#: my-evolution/Locations.h:717
+#, fuzzy
+msgid "Firenze"
+msgstr "Frei"
+
+#: my-evolution/Locations.h:718
+msgid "Fitchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:719
+msgid "Flagstaff"
+msgstr ""
+
+#: my-evolution/Locations.h:720
+#, fuzzy
+msgid "Flint"
+msgstr "list"
+
+#: my-evolution/Locations.h:721
+#, fuzzy
+msgid "Flippin"
+msgstr "Philippinen"
+
+#: my-evolution/Locations.h:722
+#, fuzzy
+msgid "Florence"
+msgstr "Frankreich"
+
+#: my-evolution/Locations.h:723
+#, fuzzy
+msgid "Florennes"
+msgstr "Frei"
+
+#: my-evolution/Locations.h:724
+#, fuzzy
+msgid "Flores"
+msgstr "Einsortieren unter"
+
+#: my-evolution/Locations.h:725
+msgid "Florianopolis"
+msgstr ""
+
+#: my-evolution/Locations.h:726
+#, fuzzy
+msgid "Florida"
+msgstr "Freitag"
+
+#: my-evolution/Locations.h:727
+#, fuzzy
+msgid "Floro"
+msgstr "Von"
+
+#: my-evolution/Locations.h:728
+msgid "Fond Du Lac"
+msgstr ""
+
+#: my-evolution/Locations.h:729
+#, fuzzy
+msgid "Forde/Bringeland"
+msgstr "Finnland"
+
+#: my-evolution/Locations.h:730
+#, fuzzy
+msgid "Forli"
+msgstr "_Fr"
+
+#: my-evolution/Locations.h:731
+#, fuzzy
+msgid "Formosa"
+msgstr "Format"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:742
+#, fuzzy
+msgid "Fort Eustis"
+msgstr "Verkn�pfungen"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:748
+#, fuzzy
+msgid "Fort Leonard"
+msgstr "Weiterleiten"
+
+#: my-evolution/Locations.h:749
+msgid "Fort Lewis"
+msgstr ""
+
+#: my-evolution/Locations.h:750
+msgid "Fort Madison"
+msgstr ""
+
+#: my-evolution/Locations.h:751
+#, fuzzy
+msgid "Fort Meade"
+msgstr "Nachricht _weiterleiten"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:757
+#, fuzzy
+msgid "Fort Smith"
+msgstr "Format"
+
+#: my-evolution/Locations.h:758
+#, fuzzy
+msgid "Fort Stewart"
+msgstr "Nicht gestartet"
+
+#: my-evolution/Locations.h:759
+msgid "Fort Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:760
+#, fuzzy
+msgid "Fort Wayne"
+msgstr "Frankreich"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:769
+#, fuzzy
+msgid "Franklin"
+msgstr "An _Ort und Stelle weiterleiten"
+
+#: my-evolution/Locations.h:770
+#, fuzzy
+msgid "Fredericton"
+msgstr "Beschreibung"
+
+#: my-evolution/Locations.h:771
+#, fuzzy
+msgid "Freeport"
+msgstr "Frei"
+
+#: my-evolution/Locations.h:772
+msgid "Frenchville"
+msgstr ""
+
+#: my-evolution/Locations.h:773
+#, fuzzy
+msgid "Fresno"
+msgstr "Gefrierender Schneefall"
+
+#: my-evolution/Locations.h:774
+msgid "Fresno-Chandler"
+msgstr ""
+
+#: my-evolution/Locations.h:775
+#, fuzzy
+msgid "Friday Harbor"
+msgstr "Freitag"
+
+#: my-evolution/Locations.h:776
+msgid "Friedrichshafen"
+msgstr ""
+
+#: my-evolution/Locations.h:777
+#, fuzzy
+msgid "Frigg"
+msgstr "_Fr"
+
+#: my-evolution/Locations.h:778
+#, fuzzy
+msgid "Frontone"
+msgstr "Schriften"
+
+#: my-evolution/Locations.h:779
+#, fuzzy
+msgid "Frosinone"
+msgstr "Beruf"
+
+#: my-evolution/Locations.h:780
+#, fuzzy
+msgid "Fryeburg"
+msgstr "Februar"
+
+#: 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 "Mazedonien"
+
+#: my-evolution/Locations.h:789
+msgid "Gadsden"
+msgstr ""
+
+#: my-evolution/Locations.h:790
+#, fuzzy
+msgid "Gage"
+msgstr "Seite"
+
+#: my-evolution/Locations.h:791
+#, fuzzy
+msgid "Gainesville"
+msgstr "Storniert"
+
+#: 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 "Ghana"
+
+#: my-evolution/Locations.h:796
+msgid "Galesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:797
+#, fuzzy
+msgid "Gallup"
+msgstr "Guadeloupe"
+
+#: my-evolution/Locations.h:798
+msgid "Galveston"
+msgstr ""
+
+#: my-evolution/Locations.h:799
+#, fuzzy
+msgid "Gambell"
+msgstr "Gambia"
+
+#: my-evolution/Locations.h:800
+#, fuzzy
+msgid "Gander"
+msgstr "Kopfzeile"
+
+#: my-evolution/Locations.h:801
+#, fuzzy
+msgid "Garden City"
+msgstr "Identit�t"
+
+#: my-evolution/Locations.h:802
+msgid "Gary"
+msgstr ""
+
+#: my-evolution/Locations.h:803
+#, fuzzy
+msgid "Gassim"
+msgstr "Guam"
+
+#: my-evolution/Locations.h:804
+#, fuzzy
+msgid "Gatineau"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:805
+msgid "Gaziantep"
+msgstr ""
+
+#: my-evolution/Locations.h:806
+#, fuzzy
+msgid "Gdansk"
+msgstr "Tage"
+
+#: my-evolution/Locations.h:807
+#, fuzzy
+msgid "Geneve"
+msgstr "Griechenland"
+
+#: my-evolution/Locations.h:808
+#, fuzzy
+msgid "Genova"
+msgstr "Allgemein"
+
+#: 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 "Ghana"
+
+#: my-evolution/Locations.h:814
+msgid "Ghedi"
+msgstr ""
+
+#: my-evolution/Locations.h:816
+msgid "Gifu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:817
+#, fuzzy
+msgid "Gila Bend"
+msgstr "Finnland"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:821
+#, fuzzy
+msgid "Girona"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:822
+#, fuzzy
+msgid "Gizan"
+msgstr "Gabun"
+
+#: my-evolution/Locations.h:823
+#, fuzzy
+msgid "Glasgow"
+msgstr "in der Vergangenheit"
+
+#: my-evolution/Locations.h:824
+#, fuzzy
+msgid "Glendive"
+msgstr "Malediven"
+
+#: my-evolution/Locations.h:825
+msgid "Glens Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:826
+#, fuzzy
+msgid "Goiania"
+msgstr "Rum�nien"
+
+#: my-evolution/Locations.h:827
+msgid "Goldsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:828
+#, fuzzy
+msgid "Goodland"
+msgstr "Polen"
+
+#: my-evolution/Locations.h:829
+#, fuzzy
+msgid "Goose Bay"
+msgstr "Zum heutigen Tag"
+
+#: my-evolution/Locations.h:830
+msgid "Goteborg (Landvetter)"
+msgstr ""
+
+#: my-evolution/Locations.h:831
+msgid "Goteborg (Save)"
+msgstr ""
+
+#: my-evolution/Locations.h:832
+#, fuzzy
+msgid "Granada"
+msgstr "Grenada"
+
+#: 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 "Falklandinseln"
+
+#: 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 "San Marino"
+
+#: my-evolution/Locations.h:840
+msgid "Grand Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:841
+#, fuzzy
+msgid "Grandview"
+msgstr "Vorschau"
+
+#: my-evolution/Locations.h:842
+#, fuzzy
+msgid "Grangeville"
+msgstr "Storniert"
+
+#: my-evolution/Locations.h:843
+#, fuzzy
+msgid "Grants"
+msgstr "Entw�rfe"
+
+#: my-evolution/Locations.h:844
+#, fuzzy
+msgid "Graz"
+msgstr "Brasilien"
+
+#: my-evolution/Locations.h:845
+msgid "Great Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:847
+#, fuzzy
+msgid "Greeley"
+msgstr "Griechenland"
+
+#: my-evolution/Locations.h:848
+#, fuzzy
+msgid "Green Bay"
+msgstr "Gr�nland"
+
+#: my-evolution/Locations.h:849
+msgid "Green River"
+msgstr ""
+
+#: my-evolution/Locations.h:850
+msgid "Greensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:851
+#, fuzzy
+msgid "Greenville"
+msgstr "Gr�nland"
+
+#: my-evolution/Locations.h:852
+msgid "Greenville-Spartanburg"
+msgstr ""
+
+#: my-evolution/Locations.h:853
+#, fuzzy
+msgid "Greenwood"
+msgstr "Gr�nland"
+
+#: my-evolution/Locations.h:854
+msgid "Grenoble-Saint-Geoirs"
+msgstr ""
+
+#: my-evolution/Locations.h:855
+msgid "Griffiss AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:856
+#, fuzzy
+msgid "Groningen"
+msgstr "Warnung"
+
+#: 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 "Guatemala"
+
+#: my-evolution/Locations.h:860
+#, fuzzy
+msgid "Guadalupe Pass"
+msgstr "Guadeloupe"
+
+#: my-evolution/Locations.h:861
+#, fuzzy
+msgid "Guanare"
+msgstr "Guyana"
+
+#: my-evolution/Locations.h:862
+msgid "Guangzhou"
+msgstr ""
+
+#: my-evolution/Locations.h:863
+#, fuzzy
+msgid "Guantanamo"
+msgstr "Guatemala"
+
+#: my-evolution/Locations.h:864
+#, fuzzy
+msgid "Guarany"
+msgstr "Deutschland"
+
+#: my-evolution/Locations.h:865
+#, fuzzy
+msgid "Guaratingueta"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:866
+msgid "Guarulhos"
+msgstr ""
+
+#: my-evolution/Locations.h:868
+msgid "Guayaquil/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:869
+#, fuzzy
+msgid "Guaymas"
+msgstr "Guam"
+
+#: my-evolution/Locations.h:870
+#, fuzzy
+msgid "Guernsey"
+msgstr "Deutschland"
+
+#: my-evolution/Locations.h:871
+#, fuzzy
+msgid "Guidonia"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:872
+msgid "Gulfport"
+msgstr ""
+
+#: my-evolution/Locations.h:873
+#, fuzzy
+msgid "Gulkana"
+msgstr "Guyana"
+
+#: my-evolution/Locations.h:874
+msgid "Gullfax C"
+msgstr ""
+
+#: my-evolution/Locations.h:875
+#, fuzzy
+msgid "Gunnison"
+msgstr "Reunion"
+
+#: my-evolution/Locations.h:876
+msgid "Gunnison (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:877
+#, fuzzy
+msgid "Guriat"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:878
+msgid "Gustavus"
+msgstr ""
+
+#: my-evolution/Locations.h:879
+#, fuzzy
+msgid "Guymon"
+msgstr "Guyana"
+
+#: my-evolution/Locations.h:880
+#, fuzzy
+msgid "Habana"
+msgstr "Albanien"
+
+#: 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 ""
+
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+msgid "Hail"
+msgstr "Hagel"
+
+#: my-evolution/Locations.h:886
+msgid "Hailey-Sun Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:887
+#, fuzzy
+msgid "Haines"
+msgstr "�berschriften"
+
+#: 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 "Hagelsturm"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:902
+#, fuzzy
+msgid "Ha Noi"
+msgstr "Hagel"
+
+#: my-evolution/Locations.h:903
+msgid "Harbor Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:904
+#, fuzzy
+msgid "Harlingen"
+msgstr "Warnung"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:911
+#, fuzzy
+msgid "Hastings"
+msgstr "�berschriften"
+
+#: my-evolution/Locations.h:912
+msgid "Haugesund"
+msgstr ""
+
+#: my-evolution/Locations.h:913
+#, fuzzy
+msgid "Havre"
+msgstr "Dunst"
+
+#: my-evolution/Locations.h:914
+#, fuzzy
+msgid "Hawaii"
+msgstr "Haiti"
+
+#: my-evolution/Locations.h:915
+msgid "Hawthorne"
+msgstr ""
+
+#: my-evolution/Locations.h:916
+#, fuzzy
+msgid "Hayden"
+msgstr "Kopfzeile"
+
+#: my-evolution/Locations.h:917
+msgid "Hayes River"
+msgstr ""
+
+#: my-evolution/Locations.h:918
+#, fuzzy
+msgid "Hays"
+msgstr "Tage"
+
+#: 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 "Sankt Helena"
+
+#: my-evolution/Locations.h:922
+msgid "Helsinki"
+msgstr ""
+
+#: my-evolution/Locations.h:923
+#, fuzzy
+msgid "Henderson"
+msgstr "Kopfzeile"
+
+#: 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 "Hagelsturm"
+
+#: my-evolution/Locations.h:930
+#, fuzzy
+msgid "Hilo"
+msgstr "Hagel"
+
+#: my-evolution/Locations.h:931
+msgid "Hinesville"
+msgstr ""
+
+#: my-evolution/Locations.h:932
+msgid "Hiroshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:933
+#, fuzzy
+msgid "Hobart"
+msgstr "Rechner"
+
+#: my-evolution/Locations.h:934
+#, fuzzy
+msgid "Hobbs"
+msgstr "Rechner"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:941
+#, fuzzy
+msgid "Holguin"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:942
+#, fuzzy
+msgid "Homer"
+msgstr "Zu Hause"
+
+#: my-evolution/Locations.h:943
+#, fuzzy
+msgid "Homestead AFB"
+msgstr "Abgeschlossen "
+
+#: my-evolution/Locations.h:944
+#, fuzzy
+msgid "Hondo"
+msgstr "Tornado"
+
+#: 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 "Ausgang"
+
+#: my-evolution/Locations.h:954
+#, fuzzy
+msgid "Houma"
+msgstr "Zu Hause"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:960
+#, fuzzy
+msgid "Howard AFB"
+msgstr "Weiterleiten als"
+
+#: my-evolution/Locations.h:961
+msgid "Hsinchu"
+msgstr ""
+
+#: my-evolution/Locations.h:962
+msgid "Huanuco"
+msgstr ""
+
+#: my-evolution/Locations.h:963
+msgid "Huehuetenango"
+msgstr ""
+
+#: my-evolution/Locations.h:964
+#, fuzzy
+msgid "Hulien"
+msgstr "Verbergen"
+
+#: my-evolution/Locations.h:965
+msgid "Humberside"
+msgstr ""
+
+#: my-evolution/Locations.h:967
+msgid "Huntington"
+msgstr ""
+
+#: my-evolution/Locations.h:968
+#, fuzzy
+msgid "Huntsville"
+msgstr "bis"
+
+#: my-evolution/Locations.h:969
+msgid "Hurlburt"
+msgstr ""
+
+#: my-evolution/Locations.h:970
+#, fuzzy
+msgid "Huron"
+msgstr "Stunden"
+
+#: 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 "Grundlegend"
+
+#: my-evolution/Locations.h:977
+#, fuzzy
+msgid "Ibiza"
+msgstr "Indien"
+
+#: my-evolution/Locations.h:979
+msgid "Ichikawa"
+msgstr ""
+
+#: my-evolution/Locations.h:980
+#, fuzzy
+msgid "Idaho"
+msgstr "Indien"
+
+#: 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 "Island"
+
+#: my-evolution/Locations.h:985
+#, fuzzy
+msgid "Iliamna"
+msgstr "An Ort und Stelle"
+
+#: my-evolution/Locations.h:986
+msgid "Illinois"
+msgstr ""
+
+#: my-evolution/Locations.h:987
+#, fuzzy
+msgid "Imperial"
+msgstr "April"
+
+#: my-evolution/Locations.h:988
+msgid "Imperial (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:989
+msgid "Imperial Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:990
+#, fuzzy
+msgid "In Amenas"
+msgstr "Armenien"
+
+#: my-evolution/Locations.h:992
+#, fuzzy
+msgid "Indiana"
+msgstr "Indien"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:998
+#, fuzzy
+msgid "Inverness"
+msgstr "In Bearbeitung"
+
+#: my-evolution/Locations.h:999
+msgid "Inyokern"
+msgstr ""
+
+#: my-evolution/Locations.h:1000
+#, fuzzy
+msgid "Iowa"
+msgstr "Norwegen"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1005
+#, fuzzy
+msgid "Iraklion"
+msgstr "Information"
+
+#: my-evolution/Locations.h:1006
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1008
+#, fuzzy
+msgid "Iron Mountain"
+msgstr "Kommentar enth�lt"
+
+#: 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 "Italien"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1025
+#, fuzzy
+msgid "Izumo Airport"
+msgstr "Importieren"
+
+#: 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 "Japanisch"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1044
+#, fuzzy
+msgid "Jonkoping"
+msgstr "In Arbeit"
+
+#: my-evolution/Locations.h:1045
+#, fuzzy
+msgid "Joplin"
+msgstr "Kopiere"
+
+#: 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 "Japan"
+
+#: my-evolution/Locations.h:1050
+#, fuzzy
+msgid "Jujuy"
+msgstr "Juli"
+
+#: my-evolution/Locations.h:1051
+#, fuzzy
+msgid "Juliaca"
+msgstr "�ffentlich"
+
+#: my-evolution/Locations.h:1052
+#, fuzzy
+msgid "Junction"
+msgstr "Reunion"
+
+#: my-evolution/Locations.h:1053
+#, fuzzy
+msgid "Juneau"
+msgstr "Juni"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1059
+#, fuzzy
+msgid "Kalamata"
+msgstr "Malta"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1071
+#, fuzzy
+msgid "Karachi"
+msgstr "M�rz"
+
+#: my-evolution/Locations.h:1072
+#, fuzzy
+msgid "Karup"
+msgstr "Nauru"
+
+#: 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 "Kasachstan"
+
+#: my-evolution/Locations.h:1080
+#, fuzzy
+msgid "Kearney"
+msgstr "Kenia"
+
+#: my-evolution/Locations.h:1081
+#, fuzzy
+msgid "Keene"
+msgstr "Gelesen"
+
+#: 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 "Kenia"
+
+#: my-evolution/Locations.h:1085
+#, fuzzy
+msgid "Kenosha"
+msgstr "Kenia"
+
+#: my-evolution/Locations.h:1086
+#, fuzzy
+msgid "Kentucky"
+msgstr "Kenia"
+
+#: 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 "Deutschland"
+
+#: my-evolution/Locations.h:1090
+msgid "Ketchikan"
+msgstr ""
+
+#: my-evolution/Locations.h:1091
+#, fuzzy
+msgid "Key West"
+msgstr "West"
+
+#: 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 "Cook-Inseln"
+
+#: 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 "Kenia"
+
+#: my-evolution/Locations.h:1132
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1133
+#, fuzzy
+msgid "Korea, Republic of"
+msgstr "Tschechische Republik"
+
+#: 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 "Koreanisch"
+
+#: 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 "Eingang"
+
+#: 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 "Mazedonien"
+
+#: my-evolution/Locations.h:1151
+msgid "La Coruna"
+msgstr ""
+
+#: my-evolution/Locations.h:1152
+#, fuzzy
+msgid "La Crosse"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1153
+msgid "La Esperanza"
+msgstr ""
+
+#: my-evolution/Locations.h:1154
+#, fuzzy
+msgid "Lafayette"
+msgstr "Mayotte"
+
+#: my-evolution/Locations.h:1155
+msgid "La Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1156
+#, fuzzy
+msgid "Lahaina"
+msgstr "Bahrein"
+
+#: my-evolution/Locations.h:1157
+#, fuzzy
+msgid "Lahore"
+msgstr "_Gr��er"
+
+#: my-evolution/Locations.h:1158
+#, fuzzy
+msgid "Lajes"
+msgstr "Laos"
+
+#: 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 "Island"
+
+#: my-evolution/Locations.h:1164
+msgid "Lake Tahoe"
+msgstr ""
+
+#: my-evolution/Locations.h:1165
+#, fuzzy
+msgid "Lakeview"
+msgstr "Vorschau"
+
+#: my-evolution/Locations.h:1166
+#, fuzzy
+msgid "Lamar"
+msgstr "Myanmar"
+
+#: my-evolution/Locations.h:1167
+#, fuzzy
+msgid "La Mesa"
+msgstr "Nachricht _verschicken"
+
+#: my-evolution/Locations.h:1168
+#, fuzzy
+msgid "Lamezia"
+msgstr "Gambia"
+
+#: my-evolution/Locations.h:1169
+#, fuzzy
+msgid "Lamoni"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1170
+msgid "Lampedusa"
+msgstr ""
+
+#: my-evolution/Locations.h:1171
+#, fuzzy
+msgid "Lanai"
+msgstr "Sprache"
+
+#: my-evolution/Locations.h:1172
+#, fuzzy
+msgid "Lancaster"
+msgstr "Querformat"
+
+#: my-evolution/Locations.h:1173
+#, fuzzy
+msgid "Lander"
+msgstr "Kopfzeile"
+
+#: my-evolution/Locations.h:1174
+#, fuzzy
+msgid "Langebaanweg"
+msgstr "Sprache"
+
+#: my-evolution/Locations.h:1175
+msgid "Langley AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1176
+#, fuzzy
+msgid "Lannion"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1177
+#, fuzzy
+msgid "Lansing"
+msgstr "Warnung"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1182
+#, fuzzy
+msgid "Laredo"
+msgstr "_Gr��er"
+
+#: my-evolution/Locations.h:1183
+#, fuzzy
+msgid "Larnaka"
+msgstr "Sri Lanka"
+
+#: my-evolution/Locations.h:1184
+#, fuzzy
+msgid "La Romana"
+msgstr "Rum�nien"
+
+#: 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 "Lettland"
+
+#: my-evolution/Locations.h:1189
+msgid "Latrobe"
+msgstr ""
+
+#: my-evolution/Locations.h:1191
+msgid "Laughlin"
+msgstr ""
+
+#: my-evolution/Locations.h:1192
+#, fuzzy
+msgid "Laurel"
+msgstr "_Gr��er"
+
+#: my-evolution/Locations.h:1193
+#, fuzzy
+msgid "La Verne"
+msgstr "Kap Verde"
+
+#: my-evolution/Locations.h:1194
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1195
+#, fuzzy
+msgid "Lawton"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1196
+msgid "Leadville"
+msgstr ""
+
+#: my-evolution/Locations.h:1197
+#, fuzzy
+msgid "Learmouth"
+msgstr "Lesotho"
+
+#: my-evolution/Locations.h:1199
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1201
+#, fuzzy
+msgid "Leesburg"
+msgstr "Luxemburg"
+
+#: my-evolution/Locations.h:1202
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1205
+msgid "Leknes"
+msgstr ""
+
+#: my-evolution/Locations.h:1206
+#, fuzzy
+msgid "Le Mans"
+msgstr "Chef"
+
+#: my-evolution/Locations.h:1207
+#, fuzzy
+msgid "Le Marine"
+msgstr "Martinique"
+
+#: my-evolution/Locations.h:1208
+#, fuzzy
+msgid "Lemmon"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1209
+#, fuzzy
+msgid "Lemoore"
+msgstr "Entfernen"
+
+#: my-evolution/Locations.h:1210
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1212
+#, fuzzy
+msgid "Leuchars"
+msgstr "Jahre"
+
+#: my-evolution/Locations.h:1213
+#, fuzzy
+msgid "Lewisburg"
+msgstr "Luxemburg"
+
+#: my-evolution/Locations.h:1214
+#, fuzzy
+msgid "Lewiston"
+msgstr "Lesotho"
+
+#: my-evolution/Locations.h:1215
+#, fuzzy
+msgid "Lewistown"
+msgstr "Lesotho"
+
+#: my-evolution/Locations.h:1216
+#, fuzzy
+msgid "Lexington"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1217
+#, fuzzy
+msgid "Liberal"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1219
+#, fuzzy
+msgid "Libya"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1220
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1221
+msgid "Lidgerwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1222
+#, fuzzy
+msgid "Liege"
+msgstr "Niger"
+
+#: my-evolution/Locations.h:1223
+#, fuzzy
+msgid "Lihue"
+msgstr "Niue"
+
+#: my-evolution/Locations.h:1224
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1225
+msgid "Lima-Callao"
+msgstr ""
+
+#: my-evolution/Locations.h:1226
+#, fuzzy
+msgid "Limnos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1227
+#, fuzzy
+msgid "Limoges"
+msgstr "Am niedrigsten"
+
+#: my-evolution/Locations.h:1228
+#, fuzzy
+msgid "Limon"
+msgstr "Monat"
+
+#: my-evolution/Locations.h:1229
+#, fuzzy
+msgid "Lincoln"
+msgstr "Eingang"
+
+#: my-evolution/Locations.h:1230
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1231
+#, fuzzy
+msgid "Lisboa"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1232
+#, fuzzy
+msgid "Lista"
+msgstr "list"
+
+#: my-evolution/Locations.h:1233
+#, fuzzy
+msgid "Litchfield"
+msgstr "Leichter Hagel"
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1240
+msgid "Ljubljana"
+msgstr ""
+
+#: my-evolution/Locations.h:1241
+#, fuzzy
+msgid "Logan"
+msgstr "NT-Login"
+
+#: my-evolution/Locations.h:1242
+msgid "Lolland Falster"
+msgstr ""
+
+#: my-evolution/Locations.h:1243
+#, fuzzy
+msgid "Lompoc"
+msgstr "Fa."
+
+#: my-evolution/Locations.h:1244
+#, fuzzy
+msgid "London"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1245
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1249
+#, fuzzy
+msgid "Londrina"
+msgstr "Honduras"
+
+#: my-evolution/Locations.h:1250
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1253
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+#: my-evolution/Locations.h:1254
+#, fuzzy
+msgid "Los Alamos"
+msgstr "Alarme"
+
+#: my-evolution/Locations.h:1255
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1260
+#, fuzzy
+msgid "Lousiana"
+msgstr "Botswana"
+
+#: my-evolution/Locations.h:1261
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1265
+#, fuzzy
+msgid "Lugano"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1266
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1267
+#, fuzzy
+msgid "Luton"
+msgstr "Ausgang"
+
+#: my-evolution/Locations.h:1269
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1270
+#, fuzzy
+msgid "Luxor"
+msgstr "Luxemburg"
+
+#: my-evolution/Locations.h:1271
+#, fuzzy
+msgid "Lviv"
+msgstr "Lettland"
+
+#: my-evolution/Locations.h:1272
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1275
+msgid "Lyon-Satolas"
+msgstr ""
+
+#: my-evolution/Locations.h:1276
+#, fuzzy
+msgid "Maastricht"
+msgstr "M�rz"
+
+#: my-evolution/Locations.h:1277
+#, fuzzy
+msgid "Macae"
+msgstr "Macao"
+
+#: my-evolution/Locations.h:1278
+#, fuzzy
+msgid "Macapa"
+msgstr "Macao"
+
+#: my-evolution/Locations.h:1279
+#, fuzzy
+msgid "Maceio"
+msgstr "Mazedonien"
+
+#: my-evolution/Locations.h:1280
+#, fuzzy
+msgid "Macon"
+msgstr "Chef"
+
+#: my-evolution/Locations.h:1281
+#, fuzzy
+msgid "Madinah"
+msgstr "Mazedonien"
+
+#: my-evolution/Locations.h:1282
+#, fuzzy
+msgid "Madison"
+msgstr "Funk"
+
+#: my-evolution/Locations.h:1283
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1285
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+#: my-evolution/Locations.h:1286
+#, fuzzy
+msgid "Magadan"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:1287
+msgid "Magdalena"
+msgstr ""
+
+#: my-evolution/Locations.h:1288
+#, fuzzy
+msgid "Maine"
+msgstr "Chef"
+
+#: my-evolution/Locations.h:1289
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1290
+msgid "Makkah"
+msgstr ""
+
+#: my-evolution/Locations.h:1291
+#, fuzzy
+msgid "Makung"
+msgstr "Chef"
+
+#: my-evolution/Locations.h:1292
+#, fuzzy
+msgid "Malad City"
+msgstr "Malawi"
+
+#: my-evolution/Locations.h:1293
+#, fuzzy
+msgid "Malaga"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1294
+#, fuzzy
+msgid "Malatya"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1295
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1296
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1298
+msgid "Mammoth Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1299
+#, fuzzy
+msgid "Managua"
+msgstr "Vorgesetzter"
+
+#: my-evolution/Locations.h:1300
+#, fuzzy
+msgid "Manassas"
+msgstr "Malaysia"
+
+#: my-evolution/Locations.h:1301
+#, fuzzy
+msgid "Manaus"
+msgstr "Macao"
+
+#: my-evolution/Locations.h:1302
+#, fuzzy
+msgid "Manchester"
+msgstr "Passt auf:"
+
+#: my-evolution/Locations.h:1303
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+msgid "Manhattan"
+msgstr ""
+
+#: my-evolution/Locations.h:1305
+#, fuzzy
+msgid "Manisa"
+msgstr "Chef"
+
+#: my-evolution/Locations.h:1306
+#, fuzzy
+msgid "Manistee"
+msgstr "Nebel"
+
+#: my-evolution/Locations.h:1307
+#, fuzzy
+msgid "Manitoba"
+msgstr "Hauptwerkzeugleiste"
+
+#: my-evolution/Locations.h:1308
+msgid "Manitowoc"
+msgstr ""
+
+#: my-evolution/Locations.h:1309
+#, fuzzy
+msgid "Mankato"
+msgstr "Monaco"
+
+#: my-evolution/Locations.h:1310
+#, fuzzy
+msgid "Mansfield"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1311
+#, fuzzy
+msgid "Manta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1312
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1313
+#, fuzzy
+msgid "Maraba"
+msgstr "Mauretanien"
+
+#: my-evolution/Locations.h:1314
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1315
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1316
+#, fuzzy
+msgid "Marathon"
+msgstr "M�rz"
+
+#: my-evolution/Locations.h:1317
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1318
+#, fuzzy
+msgid "Margarita"
+msgstr "Mauretanien"
+
+#: my-evolution/Locations.h:1319
+#, fuzzy
+msgid "Marianna"
+msgstr "Mauretanien"
+
+#: my-evolution/Locations.h:1320
+#, fuzzy
+msgid "Marib"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1321
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1322
+#, fuzzy
+msgid "Marietta"
+msgstr "Mauretanien"
+
+#: my-evolution/Locations.h:1323
+msgid "Marino di Ravenna"
+msgstr ""
+
+#: my-evolution/Locations.h:1324
+#, fuzzy
+msgid "Marion"
+msgstr "R�nder"
+
+#: my-evolution/Locations.h:1325
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1326
+#, fuzzy
+msgid "Marquette"
+msgstr "Martinique"
+
+#: my-evolution/Locations.h:1327
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+msgid "Marseilles"
+msgstr ""
+
+#: my-evolution/Locations.h:1329
+#, fuzzy
+msgid "Marshall"
+msgstr "Marshall-Inseln"
+
+#: my-evolution/Locations.h:1330
+#, fuzzy
+msgid "Marshalltown"
+msgstr "Marshall-Inseln"
+
+#: my-evolution/Locations.h:1331
+msgid "Marshfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1332
+#, fuzzy
+msgid "Marte"
+msgstr "Martinique"
+
+#: my-evolution/Locations.h:1333
+#, fuzzy
+msgid "Marthas Vineyard"
+msgstr "Als ungelesen markieren"
+
+#: my-evolution/Locations.h:1334
+#, fuzzy
+msgid "Martinsburg"
+msgstr "Martinique"
+
+#: my-evolution/Locations.h:1335
+#, fuzzy
+msgid "Martinsville"
+msgstr "Martinique"
+
+#: my-evolution/Locations.h:1336
+#, fuzzy
+msgid "Maryland"
+msgstr "Irland"
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1339
+msgid "Mashhad"
+msgstr ""
+
+#: my-evolution/Locations.h:1340
+#, fuzzy
+msgid "Masirah"
+msgstr "Malaysia"
+
+#: my-evolution/Locations.h:1341
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1343
+#, fuzzy
+msgid "Massena"
+msgstr "Mazedonien"
+
+#: my-evolution/Locations.h:1344
+#, fuzzy
+msgid "Matamoros"
+msgstr "Komoren"
+
+#: my-evolution/Locations.h:1345
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1347
+msgid "Matsuyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1348
+#, fuzzy
+msgid "Mattoon"
+msgstr "Chef"
+
+#: my-evolution/Locations.h:1349
+#, fuzzy
+msgid "Mayaguez"
+msgstr "Vorgesetzter"
+
+#: my-evolution/Locations.h:1350
+#, fuzzy
+msgid "Mayport"
+msgstr "Mayotte"
+
+#: my-evolution/Locations.h:1351
+#, fuzzy
+msgid "Mazatlan"
+msgstr "Kasachstan"
+
+#: my-evolution/Locations.h:1352
+#, fuzzy
+msgid "Mazu"
+msgstr "Macao"
+
+#: my-evolution/Locations.h:1353
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1354
+msgid "McAllen"
+msgstr ""
+
+#: my-evolution/Locations.h:1355
+#, fuzzy
+msgid "McCall"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1356
+#, fuzzy
+msgid "McCarthy"
+msgstr "M�rz"
+
+#: my-evolution/Locations.h:1357
+#, fuzzy
+msgid "McClellan"
+msgstr "Island"
+
+#: my-evolution/Locations.h:1358
+#, fuzzy
+msgid "McComb"
+msgstr "Fa."
+
+#: my-evolution/Locations.h:1359
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1361
+msgid "Mc Gregor"
+msgstr ""
+
+#: my-evolution/Locations.h:1362
+#, fuzzy
+msgid "Meacham"
+msgstr "Macao"
+
+#: my-evolution/Locations.h:1363
+#, fuzzy
+msgid "Medford"
+msgstr "vor"
+
+#: my-evolution/Locations.h:1364
+msgid "Medicine Lodge"
+msgstr ""
+
+#: my-evolution/Locations.h:1365
+#, fuzzy
+msgid "Mehamn"
+msgstr "Chef"
+
+#: my-evolution/Locations.h:1366
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1367
+msgid "Melbourne"
+msgstr ""
+
+#: my-evolution/Locations.h:1368
+#, fuzzy
+msgid "Melfa"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1369
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1373
+#, fuzzy
+msgid "Mendoza"
+msgstr "Mazedonien"
+
+#: my-evolution/Locations.h:1374
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1377
+msgid "Merced"
+msgstr ""
+
+#: my-evolution/Locations.h:1378
+#, fuzzy
+msgid "Merida"
+msgstr "Freitag"
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1380
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1381
+#, fuzzy
+msgid "Merril Field"
+msgstr "_Von-Feld"
+
+#: my-evolution/Locations.h:1382
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1386
+#, fuzzy
+msgid "Mexicali"
+msgstr "Mexiko"
+
+#: my-evolution/Locations.h:1388
+#, fuzzy
+msgid "Miami"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1391
+msgid "Michigan"
+msgstr ""
+
+#: my-evolution/Locations.h:1392
+#, fuzzy
+msgid "Middle East"
+msgstr "Mittelname:"
+
+#: my-evolution/Locations.h:1393
+#, fuzzy
+msgid "Middleton Island"
+msgstr "Salomonen"
+
+#: my-evolution/Locations.h:1394
+#, fuzzy
+msgid "Middletown"
+msgstr "Mittelname:"
+
+#: my-evolution/Locations.h:1395
+#, fuzzy
+msgid "Midland"
+msgstr "Finnland"
+
+#: my-evolution/Locations.h:1396
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1398
+msgid "Milano/Malpensa"
+msgstr ""
+
+#: my-evolution/Locations.h:1399
+#, fuzzy
+msgid "Miles City"
+msgstr "Dateityp:"
+
+#: my-evolution/Locations.h:1400
+#, fuzzy
+msgid "Milford"
+msgstr "f�r"
+
+#: my-evolution/Locations.h:1401
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1402
+msgid "Millville"
+msgstr ""
+
+#: my-evolution/Locations.h:1403
+#, fuzzy
+msgid "Milton"
+msgstr "Mail an %s"
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1407
+#, fuzzy
+msgid "Minatitlan"
+msgstr "Mauretanien"
+
+#: my-evolution/Locations.h:1408
+#, fuzzy
+msgid "Minchumina"
+msgstr "Eingang"
+
+#: my-evolution/Locations.h:1409
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1414
+#, fuzzy
+msgid "Minnesota"
+msgstr "Mikronesien"
+
+#: my-evolution/Locations.h:1415
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1416
+#, fuzzy
+msgid "Minot"
+msgstr "ist nicht"
+
+#: my-evolution/Locations.h:1417
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1419
+msgid "Mississippi"
+msgstr ""
+
+#: my-evolution/Locations.h:1420
+#, fuzzy
+msgid "Missoula"
+msgstr "Fr�ulein"
+
+#: my-evolution/Locations.h:1421
+#, fuzzy
+msgid "Missouri"
+msgstr "Fr�ulein"
+
+#: my-evolution/Locations.h:1422
+#, fuzzy
+msgid "Mitchell"
+msgstr "Passt auf:"
+
+#: my-evolution/Locations.h:1423
+#, fuzzy
+msgid "Mitilini"
+msgstr "Mailingliste"
+
+#: my-evolution/Locations.h:1424
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1425
+msgid "Miyazaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1426
+#, fuzzy
+msgid "Moa"
+msgstr "Mo"
+
+#: my-evolution/Locations.h:1427
+#, fuzzy
+msgid "Mobile Downtown"
+msgstr "Mobiltelefon"
+
+#: my-evolution/Locations.h:1428
+msgid "Mobile Regional Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1429
+#, fuzzy
+msgid "Mobridge"
+msgstr "Mobil"
+
+#: my-evolution/Locations.h:1430
+#, fuzzy
+msgid "Modesto"
+msgstr "M��iger dichter Nebel"
+
+#: my-evolution/Locations.h:1431
+msgid "Mo I Rana"
+msgstr ""
+
+#: my-evolution/Locations.h:1432
+#, fuzzy
+msgid "Mojave"
+msgstr "Verschieben"
+
+#: my-evolution/Locations.h:1433
+#, fuzzy
+msgid "Molde"
+msgstr "Mobil"
+
+#: my-evolution/Locations.h:1434
+#, fuzzy
+msgid "Moldova"
+msgstr "Montag"
+
+#: my-evolution/Locations.h:1435
+msgid "Moline-Quad Cities"
+msgstr ""
+
+#: my-evolution/Locations.h:1436
+#, fuzzy
+msgid "Molokai"
+msgstr "Malawi"
+
+#: my-evolution/Locations.h:1437
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1438
+msgid "Monchengladbach"
+msgstr ""
+
+#: my-evolution/Locations.h:1439
+#, fuzzy
+msgid "Monclova"
+msgstr "Monaco"
+
+#: my-evolution/Locations.h:1440
+#, fuzzy
+msgid "Moncton"
+msgstr "Monaco"
+
+#: my-evolution/Locations.h:1441
+#, fuzzy
+msgid "Monida"
+msgstr "Montag"
+
+#: my-evolution/Locations.h:1442
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+#: my-evolution/Locations.h:1443
+#, fuzzy
+msgid "Monroe"
+msgstr "Monaco"
+
+#: my-evolution/Locations.h:1444
+#, fuzzy
+msgid "Montague"
+msgstr "Vorgesetzter"
+
+#: my-evolution/Locations.h:1445
+#, fuzzy
+msgid "Montana"
+msgstr "Botswana"
+
+#: my-evolution/Locations.h:1446
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1448
+#, fuzzy
+msgid "Monte Bisbino"
+msgstr "M��iger Schneefall"
+
+#: my-evolution/Locations.h:1449
+msgid "Monte Calamita"
+msgstr ""
+
+#: my-evolution/Locations.h:1450
+#, fuzzy
+msgid "Monte Cimone"
+msgstr "Monatsansicht"
+
+#: my-evolution/Locations.h:1451
+#, fuzzy
+msgid "Montego Bay"
+msgstr "Mongolei"
+
+#: my-evolution/Locations.h:1452
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1453
+#, fuzzy
+msgid "Monterey"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1454
+#, fuzzy
+msgid "Monterrey"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1458
+#, fuzzy
+msgid "Montgomery"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1459
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1460
+#, fuzzy
+msgid "Monticello"
+msgstr "Monaco"
+
+#: my-evolution/Locations.h:1461
+#, fuzzy
+msgid "Montpelier"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1465
+#, fuzzy
+msgid "Montrose"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1466
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1467
+#, fuzzy
+msgid "Morelia"
+msgstr "Mongolei"
+
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Morgantown"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:1469
+#, fuzzy
+msgid "Moriarty"
+msgstr "Prim�r"
+
+#: my-evolution/Locations.h:1471
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1474
+msgid "Moses Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1475
+#, fuzzy
+msgid "Mosinee"
+msgstr "Mobil"
+
+#: my-evolution/Locations.h:1476
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain Home"
+msgstr ""
+
+#: my-evolution/Locations.h:1479
+#, fuzzy
+msgid "Mountain View"
+msgstr "Monatsansicht"
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1482
+#, fuzzy
+msgid "Mount Shasta"
+msgstr "S�dost"
+
+#: my-evolution/Locations.h:1483
+#, fuzzy
+msgid "Mount Vernon"
+msgstr "Monatsansicht"
+
+#: my-evolution/Locations.h:1484
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1487
+msgid "Muir"
+msgstr ""
+
+#: my-evolution/Locations.h:1488
+#, fuzzy
+msgid "Mullan"
+msgstr "Chef"
+
+#: my-evolution/Locations.h:1489
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1490
+msgid "Munchen"
+msgstr ""
+
+#: my-evolution/Locations.h:1491
+#, fuzzy
+msgid "Muncie"
+msgstr "Juni"
+
+#: my-evolution/Locations.h:1492
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1493
+#, fuzzy
+msgid "Murcia"
+msgstr "Mauretanien"
+
+#: my-evolution/Locations.h:1494
+msgid "Murmansk"
+msgstr ""
+
+#: my-evolution/Locations.h:1495
+#, fuzzy
+msgid "Mus"
+msgstr "Gesch�ft"
+
+#: my-evolution/Locations.h:1496
+#, fuzzy
+msgid "Muscatine"
+msgstr "Martinique"
+
+#: my-evolution/Locations.h:1497
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1498
+msgid "Muskegon"
+msgstr ""
+
+#: my-evolution/Locations.h:1499
+#, fuzzy
+msgid "Mykonos"
+msgstr "Knoten"
+
+#: my-evolution/Locations.h:1500
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1507
+#, fuzzy
+msgid "Najran"
+msgstr "Bahrein"
+
+#: my-evolution/Locations.h:1508
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1509
+msgid "Nalchik"
+msgstr ""
+
+#: my-evolution/Locations.h:1510
+#, fuzzy
+msgid "Namsos"
+msgstr "Name"
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1513
+msgid "Nankishirahama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1514
+#, fuzzy
+msgid "Nanning"
+msgstr "Warnung"
+
+#: my-evolution/Locations.h:1515
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1516
+msgid "Nantucket"
+msgstr ""
+
+#: my-evolution/Locations.h:1517
+#, fuzzy
+msgid "Napa"
+msgstr "Japan"
+
+#: my-evolution/Locations.h:1518
+#, fuzzy
+msgid "Naples"
+msgstr "Name"
+
+#: my-evolution/Locations.h:1519
+#, fuzzy
+msgid "Napoli"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1520
+#, fuzzy
+msgid "Narvik"
+msgstr "Spitzn."
+
+#: my-evolution/Locations.h:1521
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1524
+msgid "Nassau"
+msgstr ""
+
+#: my-evolution/Locations.h:1525
+#, fuzzy
+msgid "Natal"
+msgstr "Italien"
+
+#: my-evolution/Locations.h:1526
+#, fuzzy
+msgid "Natchez"
+msgstr "Passt auf:"
+
+#: my-evolution/Locations.h:1527
+msgid "Nawabshah"
+msgstr ""
+
+#: my-evolution/Locations.h:1528
+#, fuzzy
+msgid "Nebraska"
+msgstr "Neue Aufgabe"
+
+#: my-evolution/Locations.h:1529
+msgid "Needles"
+msgstr ""
+
+#: my-evolution/Locations.h:1530
+#, fuzzy
+msgid "Nenana"
+msgstr "Grenada"
+
+#: my-evolution/Locations.h:1532
+msgid "Neuquen"
+msgstr ""
+
+#: my-evolution/Locations.h:1533
+#, fuzzy
+msgid "Nevada"
+msgstr "Grenada"
+
+#: my-evolution/Locations.h:1534
+#, fuzzy
+msgid "Newark"
+msgstr "Neue Aufgabe"
+
+#: my-evolution/Locations.h:1535
+#, fuzzy
+msgid "New Bedford"
+msgstr "Nachrichtenkanal"
+
+#: my-evolution/Locations.h:1536
+#, fuzzy
+msgid "New Bern"
+msgstr "Neuseeland"
+
+#: my-evolution/Locations.h:1537
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1539
+msgid "Newburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1540
+#, fuzzy
+msgid "Newcastle"
+msgstr "Nachrichten"
+
+#: my-evolution/Locations.h:1541
+#, fuzzy
+msgid "New Delhi/Palam"
+msgstr "Neuseeland"
+
+#: my-evolution/Locations.h:1542
+#, fuzzy
+msgid "Newfoundland"
+msgstr "Neuseeland"
+
+#: my-evolution/Locations.h:1543
+msgid "New Hampshire"
+msgstr ""
+
+#: my-evolution/Locations.h:1544
+#, fuzzy
+msgid "New Haven"
+msgstr "Neukaledonien"
+
+#: my-evolution/Locations.h:1545
+#, fuzzy
+msgid "New Iberia"
+msgstr "Neukaledonien"
+
+#: my-evolution/Locations.h:1546
+#, fuzzy
+msgid "New Jersey"
+msgstr "Neue Nachricht"
+
+#: my-evolution/Locations.h:1547
+#, fuzzy
+msgid "New Mexico"
+msgstr "Mexiko"
+
+#: my-evolution/Locations.h:1548
+#, fuzzy
+msgid "New Orleans"
+msgstr "Niederlande"
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1550
+msgid "New Orleans NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1551
+#, fuzzy
+msgid "Newport"
+msgstr "Nord"
+
+#: my-evolution/Locations.h:1552
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1553
+msgid "New Port Richey"
+msgstr ""
+
+#: my-evolution/Locations.h:1554
+#, fuzzy
+msgid "New River"
+msgstr "Neuer VOrdner"
+
+#: my-evolution/Locations.h:1555
+msgid "New Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1556
+#, fuzzy
+msgid "Newton"
+msgstr "Neu"
+
+#: my-evolution/Locations.h:1557
+#, fuzzy
+msgid "New York"
+msgstr "Neuer VOrdner"
+
+#: my-evolution/Locations.h:1558
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1559
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1561
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1564
+msgid "Niigata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1565
+#, fuzzy
+msgid "Nimes-Garons"
+msgstr "Ausma�e:"
+
+#: my-evolution/Locations.h:1566
+#, fuzzy
+msgid "Nipawin"
+msgstr "Spanien"
+
+#: my-evolution/Locations.h:1567
+#, fuzzy
+msgid "Nis"
+msgstr "ist"
+
+#: my-evolution/Locations.h:1568
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1570
+msgid "N Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1571
+#, fuzzy
+msgid "Nogales"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:1572
+#, fuzzy
+msgid "Nome"
+msgstr "Name"
+
+#: my-evolution/Locations.h:1573
+#, fuzzy
+msgid "Norfolk"
+msgstr "Norfolkinsel"
+
+#: my-evolution/Locations.h:1575
+#, fuzzy
+msgid "Norfolk NAS"
+msgstr "Norfolkinsel"
+
+#: my-evolution/Locations.h:1576
+#, fuzzy
+msgid "Norrkoping"
+msgstr "In Arbeit"
+
+#: my-evolution/Locations.h:1577
+#, fuzzy
+msgid "North Adams"
+msgstr "Nordost"
+
+#: my-evolution/Locations.h:1578
+#, fuzzy
+msgid "North Bend"
+msgstr "Nord"
+
+#: my-evolution/Locations.h:1579
+msgid "North Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:1580
+#, fuzzy
+msgid "North Conway"
+msgstr "Norwegen"
+
+#: my-evolution/Locations.h:1581
+#, fuzzy
+msgid "North Dakota"
+msgstr "Nordost"
+
+#: my-evolution/Locations.h:1582
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1583
+msgid "North Kingstown"
+msgstr ""
+
+#: my-evolution/Locations.h:1584
+#, fuzzy
+msgid "North Platte"
+msgstr "Nordost"
+
+#: my-evolution/Locations.h:1585
+#, fuzzy
+msgid "Northway"
+msgstr "Norwegen"
+
+#: my-evolution/Locations.h:1586
+#, fuzzy
+msgid "Northwest Territories"
+msgstr "Franz�sische S�dgebiete"
+
+#: my-evolution/Locations.h:1588
+#, fuzzy
+msgid "Norwich"
+msgstr "Nord"
+
+#: my-evolution/Locations.h:1589
+#, fuzzy
+msgid "Norwood"
+msgstr "Norwegen"
+
+#: my-evolution/Locations.h:1590
+#, fuzzy
+msgid "Notodden"
+msgstr "Notiz"
+
+#: my-evolution/Locations.h:1591
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1595
+msgid "Nueva Ocotepeque"
+msgstr ""
+
+#: my-evolution/Locations.h:1596
+#, fuzzy
+msgid "Nuevo Laredo"
+msgstr "Nicht gestartet"
+
+#: my-evolution/Locations.h:1597
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+msgid "Oahu"
+msgstr ""
+
+#: my-evolution/Locations.h:1600
+msgid "Oak Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:1601
+#, fuzzy
+msgid "Oakland"
+msgstr "Thailand"
+
+#: my-evolution/Locations.h:1602
+#, fuzzy
+msgid "Oaxaca"
+msgstr "Jamaika"
+
+#: my-evolution/Locations.h:1603
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+msgid "Obihiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1605
+#, fuzzy
+msgid "Ocala"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1606
+#, fuzzy
+msgid "Oceanside"
+msgstr "Island"
+
+#: my-evolution/Locations.h:1607
+#, fuzzy
+msgid "Odense"
+msgstr "One"
+
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1609
+#, fuzzy
+msgid "Oelwen"
+msgstr "�ffnen"
+
+#: my-evolution/Locations.h:1610
+#, fuzzy
+msgid "Ogden"
+msgstr "�ffnen"
+
+#: my-evolution/Locations.h:1611
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1613
+msgid "Ohio"
+msgstr ""
+
+#: my-evolution/Locations.h:1614
+#, fuzzy
+msgid "Ohrid"
+msgstr "Andere"
+
+#: my-evolution/Locations.h:1615
+msgid "Oita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1616
+#, fuzzy
+msgid "Ojika Island"
+msgstr "Cook-Inseln"
+
+#: my-evolution/Locations.h:1617
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1624
+#, fuzzy
+msgid "Okushiri Island"
+msgstr "Britische Jungferninseln"
+
+#: my-evolution/Locations.h:1625
+#, fuzzy
+msgid "Olathe"
+msgstr "Andere"
+
+#: my-evolution/Locations.h:1626
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1627
+#, fuzzy
+msgid "Olbia"
+msgstr "Albanien"
+
+#: my-evolution/Locations.h:1628
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1629
+#, fuzzy
+msgid "Omaha"
+msgstr "Oman"
+
+#: my-evolution/Locations.h:1630
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1631
+#, fuzzy
+msgid "Omak"
+msgstr "Oman"
+
+#: my-evolution/Locations.h:1633
+msgid "Ominato Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1634
+msgid "Omsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1635
+msgid "O'Neill"
+msgstr ""
+
+#: my-evolution/Locations.h:1636
+#, fuzzy
+msgid "Ontario"
+msgstr "Ausrichtung"
+
+#: my-evolution/Locations.h:1637
+#, fuzzy
+msgid "Oostende"
+msgstr "Anwesender"
+
+#: my-evolution/Locations.h:1638
+#, fuzzy
+msgid "Oran"
+msgstr "Oman"
+
+#: my-evolution/Locations.h:1639
+msgid "Oran/Es Senia"
+msgstr ""
+
+#: my-evolution/Locations.h:1640
+#, fuzzy
+msgid "Orange"
+msgstr "Org"
+
+#: my-evolution/Locations.h:1641
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1642
+msgid "Ord-Sharp"
+msgstr ""
+
+#: my-evolution/Locations.h:1643
+#, fuzzy
+msgid "Oregon"
+msgstr "Org"
+
+#: my-evolution/Locations.h:1644
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1645
+#, fuzzy
+msgid "Orland"
+msgstr "Irland"
+
+#: my-evolution/Locations.h:1646
+#, fuzzy
+msgid "Orlando"
+msgstr "Irland"
+
+#: my-evolution/Locations.h:1647
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1648
+msgid "Orsta-Volda"
+msgstr ""
+
+#: my-evolution/Locations.h:1649
+#, fuzzy
+msgid "Oruro"
+msgstr "Fehler"
+
+#: my-evolution/Locations.h:1650
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1652
+#, fuzzy
+msgid "Oscoda"
+msgstr "Sekunde"
+
+#: my-evolution/Locations.h:1653
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1657
+#, fuzzy
+msgid "Ostrava"
+msgstr "Australien"
+
+#: my-evolution/Locations.h:1658
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1661
+#, fuzzy
+msgid "Owyhee"
+msgstr "Woche"
+
+#: my-evolution/Locations.h:1662
+#, fuzzy
+msgid "Oxford"
+msgstr "f�r"
+
+#: my-evolution/Locations.h:1663
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1670
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1671
+#, fuzzy
+msgid "Paganella"
+msgstr "Seite"
+
+#: my-evolution/Locations.h:1674
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1675
+#, fuzzy
+msgid "Palacios"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1676
+#, fuzzy
+msgid "Palermo"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:1677
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1678
+#, fuzzy
+msgid "Palmdale"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1679
+#, fuzzy
+msgid "Palmer"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:1680
+#, fuzzy
+msgid "Palm Springs"
+msgstr "Mail-Einstellungen"
+
+#: my-evolution/Locations.h:1681
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1682
+#, fuzzy
+msgid "Pamplona"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1684
+#, fuzzy
+msgid "Panama City"
+msgstr "Panama"
+
+#: my-evolution/Locations.h:1685
+#, fuzzy
+msgid "Pantelleria"
+msgstr "Storniert"
+
+#: my-evolution/Locations.h:1686
+#, fuzzy
+msgid "Papa"
+msgstr "Japan"
+
+#: my-evolution/Locations.h:1687
+#, fuzzy
+msgid "Paphos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1689
+#, fuzzy
+msgid "Paris"
+msgstr "Prim"
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1692
+#, fuzzy
+msgid "Paris/Orly"
+msgstr "Teils Spr�hregen"
+
+#: my-evolution/Locations.h:1693
+msgid "Parkersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1694
+#, fuzzy
+msgid "Pasco"
+msgstr "Passwort"
+
+#: my-evolution/Locations.h:1695
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1700
+msgid "Passo Rolle"
+msgstr ""
+
+#: my-evolution/Locations.h:1701
+#, fuzzy
+msgid "Patna"
+msgstr "Panama"
+
+#: my-evolution/Locations.h:1702
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1706
+#, fuzzy
+msgid "Paysandu"
+msgstr "Starker Sand"
+
+#: my-evolution/Locations.h:1707
+#, fuzzy
+msgid "Payson"
+msgstr "Klang abspielen:"
+
+#: my-evolution/Locations.h:1708
+#, fuzzy
+msgid "Pellston"
+msgstr "Frage"
+
+#: my-evolution/Locations.h:1709
+#, fuzzy
+msgid "Pelotas"
+msgstr "Neu laden"
+
+#: my-evolution/Locations.h:1710
+#, fuzzy
+msgid "Pendleton"
+msgstr "Auswahl:"
+
+#: my-evolution/Locations.h:1711
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1716
+#, fuzzy
+msgid "Peoria"
+msgstr "Georgien"
+
+#: my-evolution/Locations.h:1717
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1718
+msgid "Pereira/Matecana"
+msgstr ""
+
+#: my-evolution/Locations.h:1719
+#, fuzzy
+msgid "Perm"
+msgstr "Prim"
+
+#: my-evolution/Locations.h:1720
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1721
+msgid "Perry-Foley"
+msgstr ""
+
+#: my-evolution/Locations.h:1722
+#, fuzzy
+msgid "Perth"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1724
+#, fuzzy
+msgid "Perugia"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1725
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1730
+#, fuzzy
+msgid "Philip"
+msgstr "Philippinen"
+
+#: my-evolution/Locations.h:1731
+#, fuzzy
+msgid "Philipsburg"
+msgstr "Philippinen"
+
+#: my-evolution/Locations.h:1732
+#, fuzzy
+msgid "Phillips"
+msgstr "Philippinen"
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1739
+msgid "Piedras Negras"
+msgstr ""
+
+#: my-evolution/Locations.h:1740
+#, fuzzy
+msgid "Pierre"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1741
+msgid "Pietersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1742
+#, fuzzy
+msgid "Pikeville"
+msgstr "Vorschau"
+
+#: my-evolution/Locations.h:1743
+msgid "Pine Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+msgid "Pirassununga"
+msgstr ""
+
+#: my-evolution/Locations.h:1747
+#, fuzzy
+msgid "Pisa"
+msgstr "Pakistan"
+
+#: my-evolution/Locations.h:1748
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1753
+#, fuzzy
+msgid "Plymouth"
+msgstr "Monat"
+
+#: my-evolution/Locations.h:1754
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+msgid "Pocos De Caldas"
+msgstr ""
+
+#: my-evolution/Locations.h:1756
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1757
+#, fuzzy
+msgid "Podgorica Titograd"
+msgstr "Teils Tornado"
+
+#: my-evolution/Locations.h:1758
+msgid "Pohang Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1759
+#, fuzzy
+msgid "Point Hope"
+msgstr "Umschlag drucken"
+
+#: my-evolution/Locations.h:1760
+#, fuzzy
+msgid "Point Lay"
+msgstr "Zusammenfassung drucken"
+
+#: my-evolution/Locations.h:1761
+#, fuzzy
+msgid "Point Mugu"
+msgstr "Nachricht drucken"
+
+#: my-evolution/Locations.h:1762
+msgid "Point Piedras Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1763
+#, fuzzy
+msgid "Poitiers"
+msgstr "Eigenschaften"
+
+#: my-evolution/Locations.h:1765
+msgid "Pompano Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1766
+#, fuzzy
+msgid "Ponca City"
+msgstr "Telefonliste"
+
+#: my-evolution/Locations.h:1767
+#, fuzzy
+msgid "Ponce"
+msgstr "Keine"
+
+#: my-evolution/Locations.h:1768
+msgid "Ponta Pora"
+msgstr ""
+
+#: my-evolution/Locations.h:1769
+#, fuzzy
+msgid "Pontiac"
+msgstr "Kontakte"
+
+#: my-evolution/Locations.h:1770
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1771
+msgid "Poplar Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1772
+#, fuzzy
+msgid "Poprad"
+msgstr "Polen"
+
+#: my-evolution/Locations.h:1773
+#, fuzzy
+msgid "Port Alexander"
+msgstr "Kalender drucken"
+
+#: my-evolution/Locations.h:1774
+msgid "Port Alsworth"
+msgstr ""
+
+#: my-evolution/Locations.h:1775
+#, fuzzy
+msgid "Port Angeles"
+msgstr "Umschlag drucken"
+
+#: my-evolution/Locations.h:1776
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1777
+msgid "Port Elizabeth"
+msgstr ""
+
+#: my-evolution/Locations.h:1778
+#, fuzzy
+msgid "Porterville"
+msgstr "Vorschau"
+
+#: my-evolution/Locations.h:1779
+#, fuzzy
+msgid "Port Hardy"
+msgstr "Karte drucken"
+
+#: my-evolution/Locations.h:1780
+#, fuzzy
+msgid "Port Hedland"
+msgstr "Polen"
+
+#: my-evolution/Locations.h:1781
+msgid "Port Heiden"
+msgstr ""
+
+#: my-evolution/Locations.h:1782
+#, fuzzy
+msgid "Portland"
+msgstr "Polen"
+
+#: my-evolution/Locations.h:1783
+#, fuzzy
+msgid "Porto"
+msgstr "_Port:"
+
+#: my-evolution/Locations.h:1784
+#, fuzzy
+msgid "Porto Alegre"
+msgstr "Fortschritt"
+
+#: my-evolution/Locations.h:1785
+msgid "Porto Alegre Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:1786
+#, fuzzy
+msgid "Portoroz"
+msgstr "Hochformat"
+
+#: my-evolution/Locations.h:1787
+#, fuzzy
+msgid "Porto Santo"
+msgstr "Hochformat"
+
+#: my-evolution/Locations.h:1788
+msgid "Porto Velho"
+msgstr ""
+
+#: my-evolution/Locations.h:1789
+#, fuzzy
+msgid "Port Said"
+msgstr "Hochformat"
+
+#: my-evolution/Locations.h:1790
+msgid "Portsmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1792
+#, fuzzy
+msgid "Posadas"
+msgstr "Polen"
+
+#: my-evolution/Locations.h:1793
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1796
+#, fuzzy
+msgid "Poza Rica"
+msgstr "Costa Rica"
+
+#: my-evolution/Locations.h:1797
+#, fuzzy
+msgid "Poznan"
+msgstr "Polen"
+
+#: my-evolution/Locations.h:1798
+#, fuzzy
+msgid "Praha"
+msgstr "Paraguay"
+
+#: my-evolution/Locations.h:1799
+#, fuzzy
+msgid "Pratica di Mare"
+msgstr "Teils Nieselregen"
+
+#: my-evolution/Locations.h:1800
+msgid "Prescott"
+msgstr ""
+
+#: my-evolution/Locations.h:1801
+#, fuzzy
+msgid "Presidente Prudente"
+msgstr "Druckvorschau"
+
+#: my-evolution/Locations.h:1802
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1804
+#, fuzzy
+msgid "Pretoria"
+msgstr "Georgien"
+
+#: my-evolution/Locations.h:1805
+#, fuzzy
+msgid "Preveza"
+msgstr "Vorschau"
+
+#: my-evolution/Locations.h:1806
+#, fuzzy
+msgid "Price-Carbon"
+msgstr "Pitcairn"
+
+#: my-evolution/Locations.h:1807
+#, fuzzy
+msgid "Pristina"
+msgstr "Traditionell"
+
+#: my-evolution/Locations.h:1808
+#, fuzzy
+msgid "Providence"
+msgstr "_Staat/Bundesland:"
+
+#: my-evolution/Locations.h:1809
+#, fuzzy
+msgid "Provincetown"
+msgstr "Vorschau"
+
+#: my-evolution/Locations.h:1810
+#, fuzzy
+msgid "Provo"
+msgstr "Beruf"
+
+#: my-evolution/Locations.h:1811
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1812
+#, fuzzy
+msgid "Pucallpa"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1813
+msgid "Pudahuel"
+msgstr ""
+
+#: my-evolution/Locations.h:1814
+#, fuzzy
+msgid "Puebla"
+msgstr "�ffentlich"
+
+#: my-evolution/Locations.h:1815
+#, fuzzy
+msgid "Pueblo"
+msgstr "�ffentlich"
+
+#: my-evolution/Locations.h:1816
+#, fuzzy
+msgid "Puerto Barrios"
+msgstr "Puerto Rico"
+
+#: my-evolution/Locations.h:1817
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1818
+#, fuzzy
+msgid "Puerto Escondido"
+msgstr "Puerto Rico"
+
+#: my-evolution/Locations.h:1819
+#, fuzzy
+msgid "Puerto Lempira"
+msgstr "Puerto Rico"
+
+#: my-evolution/Locations.h:1820
+#, fuzzy
+msgid "Puerto Limon"
+msgstr "Puerto Rico"
+
+#: my-evolution/Locations.h:1821
+#, fuzzy
+msgid "Puerto Maldonado"
+msgstr "Teils Tornado"
+
+#: my-evolution/Locations.h:1822
+#, fuzzy
+msgid "Puerto Montt"
+msgstr "Puerto Rico"
+
+#: my-evolution/Locations.h:1823
+#, fuzzy
+msgid "Puerto Plata"
+msgstr "Puerto Rico"
+
+#: my-evolution/Locations.h:1825
+#, fuzzy
+msgid "Puerto Suarez"
+msgstr "Zusammenfassung drucken"
+
+#: my-evolution/Locations.h:1826
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1827
+#, fuzzy
+msgid "Pula"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1828
+#, fuzzy
+msgid "Pullman"
+msgstr "Polen"
+
+#: my-evolution/Locations.h:1829
+msgid "Punta Arenas"
+msgstr ""
+
+#: my-evolution/Locations.h:1830
+#, fuzzy
+msgid "Punta Cana"
+msgstr "Kalender drucken"
+
+#: my-evolution/Locations.h:1831
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1835
+msgid "Pyongyang"
+msgstr ""
+
+#: my-evolution/Locations.h:1837
+#, fuzzy
+msgid "Quantico"
+msgstr "Frage"
+
+#: my-evolution/Locations.h:1838
+#, fuzzy
+msgid "Quebec"
+msgstr "Betreff"
+
+#: my-evolution/Locations.h:1839
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1842
+msgid "Quimper"
+msgstr ""
+
+#: my-evolution/Locations.h:1843
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1850
+#, fuzzy
+msgid "Rapid City"
+msgstr "Beantwortet an"
+
+#: my-evolution/Locations.h:1851
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1852
+msgid "Ras Al Khaimah"
+msgstr ""
+
+#: my-evolution/Locations.h:1853
+#, fuzzy
+msgid "Rawlins"
+msgstr "Regen"
+
+#: my-evolution/Locations.h:1854
+#, fuzzy
+msgid "Reading"
+msgstr "�berschriften"
+
+#: my-evolution/Locations.h:1855
+#, fuzzy
+msgid "Rebun Island"
+msgstr "Bouvet-Insel"
+
+#: my-evolution/Locations.h:1856
+#, fuzzy
+msgid "Recife"
+msgstr "Erhalten"
+
+#: my-evolution/Locations.h:1857
+msgid "Red Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1858
+#, fuzzy
+msgid "Redding"
+msgstr "�berschriften"
+
+#: my-evolution/Locations.h:1859
+#, fuzzy
+msgid "Redig"
+msgstr "Gelesen"
+
+#: my-evolution/Locations.h:1860
+#, fuzzy
+msgid "Redmond"
+msgstr "Erinnerung"
+
+#: my-evolution/Locations.h:1861
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1863
+msgid "Reggio Calabria"
+msgstr ""
+
+#: my-evolution/Locations.h:1864
+#, fuzzy
+msgid "Regina"
+msgstr "Regionen"
+
+#: my-evolution/Locations.h:1865
+msgid "Reims-Champagne"
+msgstr ""
+
+#: my-evolution/Locations.h:1866
+#, fuzzy
+msgid "Rennes"
+msgstr "Erinnerungen"
+
+#: my-evolution/Locations.h:1867
+#, fuzzy
+msgid "Reno"
+msgstr "Reunion"
+
+#: my-evolution/Locations.h:1868
+#, fuzzy
+msgid "Renton"
+msgstr "Reunion"
+
+#: my-evolution/Locations.h:1869
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1870
+#, fuzzy
+msgid "Reus"
+msgstr "Regeln"
+
+#: my-evolution/Locations.h:1871
+#, fuzzy
+msgid "Reyes"
+msgstr "Jahre"
+
+#: my-evolution/Locations.h:1872
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1873
+#, fuzzy
+msgid "Reynosa"
+msgstr "Neu laden"
+
+#: my-evolution/Locations.h:1874
+#, fuzzy
+msgid "Rhinelander"
+msgstr "Finnland"
+
+#: my-evolution/Locations.h:1875
+#, fuzzy
+msgid "Rhode Island"
+msgstr "Bouvet-Insel"
+
+#: my-evolution/Locations.h:1876
+#, fuzzy
+msgid "Riberalta"
+msgstr "Gibraltar"
+
+#: my-evolution/Locations.h:1877
+msgid "Richmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1878
+#, fuzzy
+msgid "Rickenbacker"
+msgstr "Spitzname"
+
+#: my-evolution/Locations.h:1879
+#, fuzzy
+msgid "Rieti"
+msgstr "Haiti"
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rifle"
+msgstr "Position"
+
+#: my-evolution/Locations.h:1881
+#, fuzzy
+msgid "Riga"
+msgstr "Rechts:"
+
+#: my-evolution/Locations.h:1882
+#, fuzzy
+msgid "Rijeka"
+msgstr "Gelesen"
+
+#: my-evolution/Locations.h:1883
+#, fuzzy
+msgid "Rimini"
+msgstr "Rum�nien"
+
+#: my-evolution/Locations.h:1884
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1885
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1886
+msgid "Rio Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1887
+#, fuzzy
+msgid "Rioja"
+msgstr "Funk"
+
+#: my-evolution/Locations.h:1888
+#, fuzzy
+msgid "Rio / Jacarepagua"
+msgstr "Nicaragua"
+
+#: my-evolution/Locations.h:1889
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+#, fuzzy
+msgid "Rishiri Island"
+msgstr "Britische Jungferninseln"
+
+#: my-evolution/Locations.h:1891
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+#, fuzzy
+msgid "Rivera"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1893
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1894
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1895
+msgid "Riverton"
+msgstr ""
+
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "Pine"
+
+#: my-evolution/Locations.h:1897
+#, fuzzy
+msgid "Rivolto"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:1898
+#, fuzzy
+msgid "Riyadh"
+msgstr "Gelesen"
+
+#: my-evolution/Locations.h:1899
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1900
+#, fuzzy
+msgid "Roatan"
+msgstr "Kroatien"
+
+#: my-evolution/Locations.h:1901
+#, fuzzy
+msgid "Robore"
+msgstr "vor"
+
+#: my-evolution/Locations.h:1902
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1903
+msgid "Rockford"
+msgstr ""
+
+#: my-evolution/Locations.h:1904
+#, fuzzy
+msgid "Rockland"
+msgstr "Polen"
+
+#: my-evolution/Locations.h:1905
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1907
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1908
+#, fuzzy
+msgid "Rodos"
+msgstr "Raum"
+
+#: my-evolution/Locations.h:1909
+#, fuzzy
+msgid "Rogers"
+msgstr "Ordner"
+
+#: my-evolution/Locations.h:1910
+#, fuzzy
+msgid "Roma/Ciampino"
+msgstr "Rum�nien"
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1917
+msgid "Roosevelt"
+msgstr ""
+
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Roros"
+msgstr "Komoren"
+
+#: my-evolution/Locations.h:1919
+msgid "Rorvik/Ryum"
+msgstr ""
+
+#: my-evolution/Locations.h:1920
+#, fuzzy
+msgid "Rosario"
+msgstr "Funk"
+
+#: my-evolution/Locations.h:1921
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1922
+#, fuzzy
+msgid "Roseglen"
+msgstr "Position"
+
+#: my-evolution/Locations.h:1923
+#, fuzzy
+msgid "Rost"
+msgstr "Rechner"
+
+#: my-evolution/Locations.h:1924
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1927
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1928
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1929
+#, fuzzy
+msgid "Rurrenabaque"
+msgstr "Wiederholung"
+
+#: my-evolution/Locations.h:1930
+msgid "Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1931
+#, fuzzy
+msgid "Russia"
+msgstr "�sterreich"
+
+#: my-evolution/Locations.h:1932
+#, fuzzy
+msgid "Rutland"
+msgstr "Bhutan"
+
+#: my-evolution/Locations.h:1933
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1935
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1936
+msgid "Sabine Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:1937
+#, fuzzy
+msgid "Sacramento"
+msgstr "Abteilung"
+
+#: my-evolution/Locations.h:1938
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1939
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1940
+#, fuzzy
+msgid "Saginaw"
+msgstr "Spanien"
+
+#: my-evolution/Locations.h:1941
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1944
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1945
+#, fuzzy
+msgid "Saint Mary's"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1946
+#, fuzzy
+msgid "Saint Mawgan"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1947
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1948
+#, fuzzy
+msgid "Saint Paul"
+msgstr "Saint Lucia"
+
+#: my-evolution/Locations.h:1949
+#, fuzzy
+msgid "Saiq"
+msgstr "Spanien"
+
+#: my-evolution/Locations.h:1950
+#, fuzzy
+msgid "Salalah"
+msgstr "Windb�en"
+
+#: my-evolution/Locations.h:1951
+#, fuzzy
+msgid "Salem"
+msgstr "Speichern"
+
+#: my-evolution/Locations.h:1952
+#, fuzzy
+msgid "Salida"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:1953
+msgid "Salida-Harriet"
+msgstr ""
+
+#: my-evolution/Locations.h:1954
+#, fuzzy
+msgid "Salina"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:1955
+#, fuzzy
+msgid "Salinas"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:1956
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1957
+#, fuzzy
+msgid "Salmon"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1958
+msgid "Salmon (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1959
+#, fuzzy
+msgid "Salta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1960
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1961
+msgid "Salt Lake City"
+msgstr ""
+
+#: my-evolution/Locations.h:1962
+#, fuzzy
+msgid "Salto"
+msgstr "S_a"
+
+#: my-evolution/Locations.h:1963
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+#, fuzzy
+msgid "Salvador"
+msgstr "El Salvador"
+
+#: my-evolution/Locations.h:1965
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1966
+#, fuzzy
+msgid "Samara"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1967
+#, fuzzy
+msgid "Samos"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1968
+#, fuzzy
+msgid "Samsun"
+msgstr "S_o"
+
+#: my-evolution/Locations.h:1969
+#, fuzzy
+msgid "Sana'A"
+msgstr "Sand"
+
+#: my-evolution/Locations.h:1970
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+#, fuzzy
+msgid "San Angelo"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1975
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1976
+#, fuzzy
+msgid "San Carlos"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1977
+#, fuzzy
+msgid "Sandane"
+msgstr "Sand"
+
+#: my-evolution/Locations.h:1978
+#, fuzzy
+msgid "Sandberg"
+msgstr "Absender"
+
+#: my-evolution/Locations.h:1979
+#, fuzzy
+msgid "Sanderson"
+msgstr "Absender"
+
+#: my-evolution/Locations.h:1980
+#, fuzzy
+msgid "San Diego"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1986
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1987
+#, fuzzy
+msgid "Sand Point"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1988
+msgid "San Fernando De Apure"
+msgstr ""
+
+#: my-evolution/Locations.h:1989
+#, fuzzy
+msgid "Sanford"
+msgstr "Sand"
+
+#: my-evolution/Locations.h:1990
+#, fuzzy
+msgid "San Francisco"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1991
+#, fuzzy
+msgid "Sangju"
+msgstr "Schattierung"
+
+#: my-evolution/Locations.h:1992
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1993
+#, fuzzy
+msgid "San Joaquin"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1994
+#, fuzzy
+msgid "San Jose"
+msgstr "Speichern und schlie�en"
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1997
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1998
+#, fuzzy
+msgid "San Juan"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1999
+msgid "Sankt-Peterburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2000
+#, fuzzy
+msgid "Sanliurfa"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:2001
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2002
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2003
+#, fuzzy
+msgid "San Miguel"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2004
+#, fuzzy
+msgid "San Nicholas Island"
+msgstr "Norfolkinsel"
+
+#: my-evolution/Locations.h:2005
+#, fuzzy
+msgid "San Salvador"
+msgstr "El Salvador"
+
+#: my-evolution/Locations.h:2006
+#, fuzzy
+msgid "San Sebastian"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2007
+#, fuzzy
+msgid "Santa Ana"
+msgstr "Saint Lucia"
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+#, fuzzy
+msgid "Santa Maria"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2012
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2013
+#, fuzzy
+msgid "Santa Monica"
+msgstr "Saint Lucia"
+
+#: my-evolution/Locations.h:2014
+#, fuzzy
+msgid "Santander"
+msgstr "Absender"
+
+#: my-evolution/Locations.h:2015
+#, fuzzy
+msgid "Santarem"
+msgstr "Sandsturm"
+
+#: my-evolution/Locations.h:2016
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2017
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+#, fuzzy
+msgid "Santiago"
+msgstr "Saint Lucia"
+
+#: my-evolution/Locations.h:2019
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2020
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2021
+#, fuzzy
+msgid "Santorini"
+msgstr "Sandsturm"
+
+#: my-evolution/Locations.h:2022
+#, fuzzy
+msgid "Santos"
+msgstr "Status"
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+#, fuzzy
+msgid "Sao Luiz"
+msgstr "Saint Lucia"
+
+#: my-evolution/Locations.h:2025
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2028
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+#, fuzzy
+msgid "Sarasota"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:2030
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+#, fuzzy
+msgid "Sarzana"
+msgstr "Sri Lanka"
+
+#: my-evolution/Locations.h:2032
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2033
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2038
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2039
+msgid "Sawyer AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2040
+#, fuzzy
+msgid "Sayun"
+msgstr "S_o"
+
+#: my-evolution/Locations.h:2041
+#, fuzzy
+msgid "Scatsta"
+msgstr "Status"
+
+#: my-evolution/Locations.h:2042
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2045
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2046
+msgid "Scottsdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Scranton"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:2048
+msgid "Seattle"
+msgstr ""
+
+#: my-evolution/Locations.h:2049
+#, fuzzy
+msgid "Seattle-Boeing"
+msgstr "Einstellungen"
+
+#: my-evolution/Locations.h:2050
+#, fuzzy
+msgid "Sedalia"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:2051
+#, fuzzy
+msgid "Seeb"
+msgstr "Gelesen"
+
+#: my-evolution/Locations.h:2052
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+#, fuzzy
+msgid "Sendai Airport"
+msgstr "Import beginnt"
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2058
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2059
+msgid "Sevilla"
+msgstr ""
+
+#: my-evolution/Locations.h:2060
+#, fuzzy
+msgid "Seward"
+msgstr "Suchen"
+
+#: my-evolution/Locations.h:2061
+msgid "Sexton Summit"
+msgstr ""
+
+#: my-evolution/Locations.h:2062
+#, fuzzy
+msgid "Shanghai"
+msgstr "Schattierung"
+
+#: my-evolution/Locations.h:2063
+msgid "Shannon"
+msgstr ""
+
+#: my-evolution/Locations.h:2064
+#, fuzzy
+msgid "Sharjah"
+msgstr "Suchen"
+
+#: my-evolution/Locations.h:2065
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+#: my-evolution/Locations.h:2066
+#, fuzzy
+msgid "Sharurah"
+msgstr "Samstag"
+
+#: my-evolution/Locations.h:2067
+#, fuzzy
+msgid "Shawbury"
+msgstr "Samstag"
+
+#: my-evolution/Locations.h:2068
+#, fuzzy
+msgid "Shearwater"
+msgstr "Anfangsdatum"
+
+#: my-evolution/Locations.h:2069
+msgid "Sheboygan"
+msgstr ""
+
+#: my-evolution/Locations.h:2070
+#, fuzzy
+msgid "Sheldon"
+msgstr "Schweden"
+
+#: my-evolution/Locations.h:2071
+msgid "Shelter Cove"
+msgstr ""
+
+#: my-evolution/Locations.h:2072
+#, fuzzy
+msgid "Shelton"
+msgstr "Auswahl:"
+
+#: my-evolution/Locations.h:2073
+msgid "Shenandoah"
+msgstr ""
+
+#: my-evolution/Locations.h:2074
+#, fuzzy
+msgid "Sheridan"
+msgstr "Sudan"
+
+#: my-evolution/Locations.h:2075
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2076
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2077
+msgid "Shingle Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2078
+#, fuzzy
+msgid "Shiraz"
+msgstr "Gr��e"
+
+#: my-evolution/Locations.h:2079
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2080
+msgid "Shizuhama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2081
+#, fuzzy
+msgid "Shoreham"
+msgstr "Bewertung"
+
+#: my-evolution/Locations.h:2082
+#, fuzzy
+msgid "Show Low"
+msgstr "Geringf�giger Schneefall"
+
+#: my-evolution/Locations.h:2083
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2084
+msgid "Shreveport Regional"
+msgstr ""
+
+#: my-evolution/Locations.h:2085
+#, fuzzy
+msgid "Sidney"
+msgstr "Pine"
+
+#: my-evolution/Locations.h:2086
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2087
+msgid "Siloam Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2088
+#, fuzzy
+msgid "Silver City"
+msgstr "Sicherheit"
+
+#: my-evolution/Locations.h:2089
+#, fuzzy
+msgid "Sindal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2091
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2097
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2098
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+#: my-evolution/Locations.h:2099
+#, fuzzy
+msgid "Skive"
+msgstr "Gr��e"
+
+#: my-evolution/Locations.h:2100
+#, fuzzy
+msgid "Skopje"
+msgstr "Stopp"
+
+#: my-evolution/Locations.h:2101
+#, fuzzy
+msgid "Skwentna"
+msgstr "Verschickt"
+
+#: my-evolution/Locations.h:2102
+#, fuzzy
+msgid "Slana"
+msgstr "Albanien"
+
+#: my-evolution/Locations.h:2105
+#, fuzzy
+msgid "Smithers"
+msgstr "Minuten"
+
+#: my-evolution/Locations.h:2106
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2107
+#, fuzzy
+msgid "Snowshoe Lake"
+msgstr "Schneeschauer"
+
+#: my-evolution/Locations.h:2108
+#, fuzzy
+msgid "Sochi"
+msgstr "S�d"
+
+#: my-evolution/Locations.h:2109
+#, fuzzy
+msgid "Socorro"
+msgstr "Bewertung"
+
+#: my-evolution/Locations.h:2110
+#, fuzzy
+msgid "Socotra"
+msgstr "Bewertung"
+
+#: my-evolution/Locations.h:2111
+#, fuzzy
+msgid "Soda Springs"
+msgstr "Kornschnee"
+
+#: my-evolution/Locations.h:2112
+#, fuzzy
+msgid "Sofia"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:2113
+#, fuzzy
+msgid "Sogndal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2114
+#, fuzzy
+msgid "Soldotna"
+msgstr "Slowenien"
+
+#: my-evolution/Locations.h:2115
+#, fuzzy
+msgid "Somerset"
+msgstr "Schauer"
+
+#: my-evolution/Locations.h:2116
+#, fuzzy
+msgid "Sonderborg"
+msgstr "Absender"
+
+#: my-evolution/Locations.h:2117
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2120
+#, fuzzy
+msgid "Southampton"
+msgstr "S�dost"
+
+#: my-evolution/Locations.h:2121
+#, fuzzy
+msgid "South Bend"
+msgstr "S�d"
+
+#: my-evolution/Locations.h:2122
+#, fuzzy
+msgid "South Carolina"
+msgstr "S�dafrika"
+
+#: my-evolution/Locations.h:2123
+#, fuzzy
+msgid "South Dakota"
+msgstr "S�dost"
+
+#: my-evolution/Locations.h:2124
+#, fuzzy
+msgid "Southend"
+msgstr "S�d"
+
+#: my-evolution/Locations.h:2125
+#, fuzzy
+msgid "South Marsh Island"
+msgstr "Marshall-Inseln"
+
+#: my-evolution/Locations.h:2126
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2128
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2129
+#, fuzzy
+msgid "Spencer"
+msgstr "Absender"
+
+#: my-evolution/Locations.h:2130
+msgid "Spickard"
+msgstr ""
+
+#: my-evolution/Locations.h:2131
+#, fuzzy
+msgid "Split"
+msgstr "list"
+
+#: my-evolution/Locations.h:2132
+#, fuzzy
+msgid "Spokane"
+msgstr "Spanien"
+
+#: my-evolution/Locations.h:2133
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2134
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "Springfield"
+msgstr "Vereinfach"
+
+#: my-evolution/Locations.h:2136
+msgid "Stampede Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:2137
+#, fuzzy
+msgid "State College"
+msgstr "Abgeschlossen am:"
+
+#: my-evolution/Locations.h:2138
+#, fuzzy
+msgid "Stauning"
+msgstr "Beginnt:"
+
+#: my-evolution/Locations.h:2139
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2140
+msgid "Stavanger/Sola"
+msgstr ""
+
+#: my-evolution/Locations.h:2141
+#, fuzzy
+msgid "Staverton"
+msgstr "Beginnt:"
+
+#: my-evolution/Locations.h:2142
+#, fuzzy
+msgid "Stavropol"
+msgstr "Stopp"
+
+#: my-evolution/Locations.h:2143
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2144
+msgid "Steamboat Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2145
+#, fuzzy
+msgid "Stephenville"
+msgstr "Seychellen"
+
+#: my-evolution/Locations.h:2146
+#, fuzzy
+msgid "St. George"
+msgstr "Sankt Helena"
+
+#: my-evolution/Locations.h:2147
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2148
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2149
+msgid "St Johnsbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2150
+#, fuzzy
+msgid "St Joseph"
+msgstr "Stopp"
+
+#: my-evolution/Locations.h:2151
+#, fuzzy
+msgid "St Louis"
+msgstr "Saint Lucia"
+
+#: my-evolution/Locations.h:2152
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2157
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2158
+#, fuzzy
+msgid "Storm Lake"
+msgstr "Sri Lanka"
+
+#: my-evolution/Locations.h:2159
+#, fuzzy
+msgid "Stornoway"
+msgstr "Norwegen"
+
+#: my-evolution/Locations.h:2160
+#, fuzzy
+msgid "St Paul"
+msgstr "Status"
+
+#: my-evolution/Locations.h:2161
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2164
+msgid "Strevell"
+msgstr ""
+
+#: my-evolution/Locations.h:2165
+#, fuzzy
+msgid "St Simon's Island"
+msgstr "Salomonen"
+
+#: my-evolution/Locations.h:2166
+msgid "Stumpy Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2167
+#, fuzzy
+msgid "Sturgeon Bay"
+msgstr "Samstag"
+
+#: my-evolution/Locations.h:2168
+msgid "Stuttgart"
+msgstr ""
+
+#: my-evolution/Locations.h:2169
+#, fuzzy
+msgid "Sucre"
+msgstr "Bewertung"
+
+#: my-evolution/Locations.h:2170
+#, fuzzy
+msgid "Sumburgh"
+msgstr "Luxemburg"
+
+#: my-evolution/Locations.h:2171
+#, fuzzy
+msgid "Sumter"
+msgstr "Zusammenfassung"
+
+#: my-evolution/Locations.h:2172
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2174
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2175
+msgid "Superior"
+msgstr ""
+
+#: my-evolution/Locations.h:2177
+#, fuzzy
+msgid "Sutton"
+msgstr "S_o"
+
+#: my-evolution/Locations.h:2178
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2179
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2188
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2189
+msgid "Szombathely"
+msgstr ""
+
+#: my-evolution/Locations.h:2190
+#, fuzzy
+msgid "Tabatinga"
+msgstr "Traditionell"
+
+#: my-evolution/Locations.h:2191
+msgid "Tabriz"
+msgstr ""
+
+#: my-evolution/Locations.h:2192
+#, fuzzy
+msgid "Tabuk"
+msgstr "Aufgabe"
+
+#: my-evolution/Locations.h:2193
+msgid "Tachikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+#, fuzzy
+msgid "Tacna"
+msgstr "Ghana"
+
+#: my-evolution/Locations.h:2195
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2199
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+#, fuzzy
+msgid "Taejon"
+msgstr "Dann"
+
+#: my-evolution/Locations.h:2201
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2202
+msgid "Taichung"
+msgstr ""
+
+#: my-evolution/Locations.h:2203
+#, fuzzy
+msgid "Taif"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2204
+#, fuzzy
+msgid "Tainan"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2206
+#, fuzzy
+msgid "Taiyuan"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2207
+#, fuzzy
+msgid "Taiz"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2208
+#, fuzzy
+msgid "Tajima"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2209
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Talara"
+msgstr ""
+
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Talinn"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2212
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tallahassee"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2215
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2216
+#, fuzzy
+msgid "Tampa"
+msgstr "Japan"
+
+#: my-evolution/Locations.h:2217
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2218
+#, fuzzy
+msgid "Tampere"
+msgstr "Papier"
+
+#: my-evolution/Locations.h:2219
+msgid "Tampico"
+msgstr ""
+
+#: my-evolution/Locations.h:2220
+#, fuzzy
+msgid "Tanana"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:2221
+msgid "Tanegashima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2222
+#, fuzzy
+msgid "Taos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:2223
+#, fuzzy
+msgid "Taoyuan"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2224
+msgid "Tapachula"
+msgstr ""
+
+#: my-evolution/Locations.h:2225
+#, fuzzy
+msgid "Taranto"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2226
+#, fuzzy
+msgid "Tarbes"
+msgstr "Aufgabe"
+
+#: my-evolution/Locations.h:2227
+#, fuzzy
+msgid "Tarija"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2228
+msgid "Tarvisio"
+msgstr ""
+
+#: my-evolution/Locations.h:2229
+#, fuzzy
+msgid "Tatalina"
+msgstr "Traditionell"
+
+#: my-evolution/Locations.h:2230
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2235
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2236
+#, fuzzy
+msgid "Tela"
+msgstr "Tokelau"
+
+#: my-evolution/Locations.h:2237
+#, fuzzy
+msgid "Temple"
+msgstr "Telex"
+
+#: my-evolution/Locations.h:2238
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2244
+msgid "Texarkana"
+msgstr ""
+
+#: my-evolution/Locations.h:2245
+#, fuzzy
+msgid "Texas"
+msgstr "Aufgabe"
+
+#: my-evolution/Locations.h:2246
+#, fuzzy
+msgid "The Dalles"
+msgstr "Seychellen"
+
+#: my-evolution/Locations.h:2247
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2248
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2249
+msgid "Thiruvananthapuram"
+msgstr ""
+
+#: my-evolution/Locations.h:2250
+#, fuzzy
+msgid "Thisted"
+msgstr "Titel"
+
+#: my-evolution/Locations.h:2251
+msgid "Thompson Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2252
+#, fuzzy
+msgid "Thumrait"
+msgstr "Donnerstag"
+
+#: my-evolution/Locations.h:2253
+#, fuzzy
+msgid "Tianjin"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2254
+#, fuzzy
+msgid "Tijuana"
+msgstr "Litauen"
+
+#: my-evolution/Locations.h:2255
+msgid "Timisoara"
+msgstr ""
+
+#: my-evolution/Locations.h:2256
+msgid "Tin City"
+msgstr ""
+
+#: my-evolution/Locations.h:2257
+#, fuzzy
+msgid "Tirana"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2258
+#, fuzzy
+msgid "Tiree"
+msgstr "Frei"
+
+#: my-evolution/Locations.h:2259
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2260
+msgid "Tiruchchirapalli"
+msgstr ""
+
+#: my-evolution/Locations.h:2261
+#, fuzzy
+msgid "Titusville"
+msgstr "Titel"
+
+#: my-evolution/Locations.h:2262
+#, fuzzy
+msgid "Tivat"
+msgstr "Privat"
+
+#: my-evolution/Locations.h:2263
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2267
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+#, fuzzy
+msgid "Tokunoshima Island"
+msgstr "Weihnachtsinsel"
+
+#: my-evolution/Locations.h:2269
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2271
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2272
+msgid "Tokyo New International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2273
+#, fuzzy
+msgid "Toledo"
+msgstr "Ein/Aus"
+
+#: my-evolution/Locations.h:2274
+#, fuzzy
+msgid "Toluca"
+msgstr "Tokelau"
+
+#: my-evolution/Locations.h:2275
+#, fuzzy
+msgid "Tonopah"
+msgstr "Tonga"
+
+#: my-evolution/Locations.h:2276
+#, fuzzy
+msgid "Topeka"
+msgstr "Tokelau"
+
+#: my-evolution/Locations.h:2277
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2279
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2280
+#, fuzzy
+msgid "Toronto"
+msgstr "Tornado"
+
+#: my-evolution/Locations.h:2281
+#, fuzzy
+msgid "Torp"
+msgstr "Oben:"
+
+#: my-evolution/Locations.h:2282
+#, fuzzy
+msgid "Torrance"
+msgstr "Frankreich"
+
+#: my-evolution/Locations.h:2283
+#, fuzzy
+msgid "Torreon"
+msgstr "Koreanisch"
+
+#: my-evolution/Locations.h:2284
+#, fuzzy
+msgid "Tottori Airport"
+msgstr "Import beginnt"
+
+#: my-evolution/Locations.h:2285
+#, fuzzy
+msgid "Toulouse"
+msgstr "Schlie�en"
+
+#: my-evolution/Locations.h:2286
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2290
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2291
+#, fuzzy
+msgid "Trabzon"
+msgstr "Gabun"
+
+#: my-evolution/Locations.h:2292
+#, fuzzy
+msgid "Trapani"
+msgstr "Japan"
+
+#: my-evolution/Locations.h:2293
+msgid "Traverse City"
+msgstr ""
+
+#: my-evolution/Locations.h:2294
+#, fuzzy
+msgid "Trelew"
+msgstr "Telex"
+
+#: my-evolution/Locations.h:2295
+#, fuzzy
+msgid "Trenton"
+msgstr "Ausrichtung"
+
+#: my-evolution/Locations.h:2296
+#, fuzzy
+msgid "Trevico"
+msgstr "Zur�ck"
+
+#: my-evolution/Locations.h:2297
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2298
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2299
+#, fuzzy
+msgid "Trieste"
+msgstr "Test"
+
+#: my-evolution/Locations.h:2300
+#, fuzzy
+msgid "Trinidad"
+msgstr "Tornado"
+
+#: my-evolution/Locations.h:2301
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2304
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2305
+msgid "Troyes/Barberey"
+msgstr ""
+
+#: my-evolution/Locations.h:2306
+#, fuzzy
+msgid "Truckee"
+msgstr "T�rkei"
+
+#: my-evolution/Locations.h:2307
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2314
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2315
+msgid "Tulancingo"
+msgstr ""
+
+#: my-evolution/Locations.h:2316
+#, fuzzy
+msgid "Tulcea"
+msgstr "Dienstag"
+
+#: my-evolution/Locations.h:2317
+#, fuzzy
+msgid "Tulsa"
+msgstr "Tunesien"
+
+#: my-evolution/Locations.h:2318
+#, fuzzy
+msgid "Tupelo"
+msgstr "D_i"
+
+#: my-evolution/Locations.h:2319
+#, fuzzy
+msgid "Turaif"
+msgstr "T�rkisch"
+
+#: my-evolution/Locations.h:2320
+#, fuzzy
+msgid "Turin"
+msgstr "T�rkisch"
+
+#: my-evolution/Locations.h:2322
+#, fuzzy
+msgid "Turku"
+msgstr "T�rkei"
+
+#: my-evolution/Locations.h:2323
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2324
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+#: my-evolution/Locations.h:2325
+#, fuzzy
+msgid "Twenthe"
+msgstr "Vorl�ufig"
+
+#: my-evolution/Locations.h:2326
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2327
+msgid "Twin Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2328
+#, fuzzy
+msgid "Tyler"
+msgstr "Typ"
+
+#: my-evolution/Locations.h:2329
+msgid "Tyndall AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2330
+#, fuzzy
+msgid "Tyumen"
+msgstr "D_i"
+
+#: my-evolution/Locations.h:2331
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2332
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2340
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2341
+#, fuzzy
+msgid "United Arab Emirates "
+msgstr "Vereinigte Arabische Emirate"
+
+#: my-evolution/Locations.h:2344
+#, fuzzy
+msgid "Unst"
+msgstr "Ungelesen"
+
+#: my-evolution/Locations.h:2345
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2346
+#, fuzzy
+msgid "Uruapan"
+msgstr "Japan"
+
+#: my-evolution/Locations.h:2347
+#, fuzzy
+msgid "Uruguaiana"
+msgstr "Uruguay"
+
+#: my-evolution/Locations.h:2349
+msgid "Urumqi"
+msgstr ""
+
+#: my-evolution/Locations.h:2350
+#, fuzzy
+msgid "Utah"
+msgstr "."
+
+#: my-evolution/Locations.h:2351
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2353
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:2355
+#, fuzzy
+msgid "Vadso"
+msgstr "Funk"
+
+#: my-evolution/Locations.h:2356
+#, fuzzy
+msgid "Vaerlose"
+msgstr "Unbest�ndig"
+
+#: my-evolution/Locations.h:2357
+#, fuzzy
+msgid "Vagar"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:2358
+msgid "Valdez 2"
+msgstr ""
+
+#: my-evolution/Locations.h:2359
+#, fuzzy
+msgid "Valdosta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:2360
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2361
+#, fuzzy
+msgid "Valencia"
+msgstr "Slowenien"
+
+#: my-evolution/Locations.h:2362
+#, fuzzy
+msgid "Valentine"
+msgstr "An Ort und Stelle betrachten"
+
+#: my-evolution/Locations.h:2363
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2366
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2367
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2368
+#, fuzzy
+msgid "Van"
+msgstr "Chef"
+
+#: my-evolution/Locations.h:2369
+msgid "Vancouver"
+msgstr ""
+
+#: my-evolution/Locations.h:2370
+#, fuzzy
+msgid "Vandel"
+msgstr "Abbrechen"
+
+#: my-evolution/Locations.h:2371
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2373
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+#, fuzzy
+msgid "Varadero"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:2375
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2376
+#, fuzzy
+msgid "Varna"
+msgstr "Vanuatu"
+
+#: my-evolution/Locations.h:2377
+#, fuzzy
+msgid "Vasteras"
+msgstr "nach"
+
+#: my-evolution/Locations.h:2378
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2379
+#, fuzzy
+msgid "Venezia"
+msgstr "Venezuela"
+
+#: my-evolution/Locations.h:2381
+#, fuzzy
+msgid "Venice"
+msgstr "Unicode"
+
+#: my-evolution/Locations.h:2382
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2383
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2384
+#, fuzzy
+msgid "Vermont"
+msgstr "Monat"
+
+#: my-evolution/Locations.h:2385
+#, fuzzy
+msgid "Vernal"
+msgstr "Allgemein"
+
+#: my-evolution/Locations.h:2386
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+#, fuzzy
+msgid "Vicenza"
+msgstr "Venezuela"
+
+#: my-evolution/Locations.h:2388
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2390
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2393
+msgid "Vigo"
+msgstr ""
+
+#: my-evolution/Locations.h:2394
+#, fuzzy
+msgid "Vilhena"
+msgstr "Dateiname:"
+
+#: my-evolution/Locations.h:2395
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+msgid "Villahermosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2398
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2404
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+#, fuzzy
+msgid "Visalia"
+msgstr "Australien"
+
+#: my-evolution/Locations.h:2406
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2410
+msgid "Vladivostok"
+msgstr ""
+
+#: my-evolution/Locations.h:2411
+#, fuzzy
+msgid "Vlieland"
+msgstr "Finnland"
+
+#: my-evolution/Locations.h:2412
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2413
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2414
+#, fuzzy
+msgid "Volkel"
+msgstr "Tokelau"
+
+#: my-evolution/Locations.h:2415
+#, fuzzy
+msgid "Volk Field"
+msgstr "_Von-Feld"
+
+#: my-evolution/Locations.h:2416
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2417
+#, fuzzy
+msgid "Voslau"
+msgstr "Tokelau"
+
+#: my-evolution/Locations.h:2418
+#, fuzzy
+msgid "Waco"
+msgstr "Monaco"
+
+#: my-evolution/Locations.h:2419
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2423
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2424
+#, fuzzy
+msgid "Wallops Island"
+msgstr "Falklandinseln"
+
+#: my-evolution/Locations.h:2425
+msgid "Walnut Ridge"
+msgstr ""
+
+#: my-evolution/Locations.h:2426
+#, fuzzy
+msgid "Warner Robins"
+msgstr "Warnung"
+
+#: my-evolution/Locations.h:2427
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2429
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2430
+msgid "Washington/Dulles"
+msgstr ""
+
+#: my-evolution/Locations.h:2431
+#, fuzzy
+msgid "Waterbury"
+msgstr "Wetter"
+
+#: my-evolution/Locations.h:2432
+#, fuzzy
+msgid "Waterloo"
+msgstr "Wetter"
+
+#: my-evolution/Locations.h:2433
+#, fuzzy
+msgid "Watertown"
+msgstr "Wetter"
+
+#: my-evolution/Locations.h:2434
+#, fuzzy
+msgid "Waterville"
+msgstr "Kategorien"
+
+#: my-evolution/Locations.h:2435
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+#, fuzzy
+msgid "Wausau"
+msgstr "Vanuatu"
+
+#: my-evolution/Locations.h:2437
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2438
+msgid "Waynesboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2439
+#, fuzzy
+msgid "Webster City"
+msgstr "Website"
+
+#: my-evolution/Locations.h:2440
+#, fuzzy
+msgid "Wejh"
+msgstr "Mi"
+
+#: my-evolution/Locations.h:2441
+msgid "Wellington"
+msgstr ""
+
+#: my-evolution/Locations.h:2442
+#, fuzzy
+msgid "Wenatchee"
+msgstr "Wetter"
+
+#: my-evolution/Locations.h:2443
+#, fuzzy
+msgid "Wendover"
+msgstr "Absender"
+
+#: my-evolution/Locations.h:2444
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2445
+#, fuzzy
+msgid "West Burke"
+msgstr "Westeurop�isch"
+
+#: my-evolution/Locations.h:2446
+#, fuzzy
+msgid "Westerland"
+msgstr "Niederlande"
+
+#: my-evolution/Locations.h:2447
+#, fuzzy
+msgid "Westfield"
+msgstr "West"
+
+#: my-evolution/Locations.h:2448
+msgid "Westhampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2449
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2451
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2452
+msgid "West Yellowstone (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2453
+#, fuzzy
+msgid "Wheeling"
+msgstr "Planung"
+
+#: my-evolution/Locations.h:2454
+#, fuzzy
+msgid "Whidbey Island"
+msgstr "Weihnachtsinsel"
+
+#: my-evolution/Locations.h:2455
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2461
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2462
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2463
+#, fuzzy
+msgid "Wick"
+msgstr "Spitzn."
+
+#: my-evolution/Locations.h:2464
+#, fuzzy
+msgid "Wien"
+msgstr "Mi"
+
+#: my-evolution/Locations.h:2465
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2467
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2468
+msgid "Williamsport"
+msgstr ""
+
+#: my-evolution/Locations.h:2469
+#, fuzzy
+msgid "Williston"
+msgstr "list"
+
+#: my-evolution/Locations.h:2470
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2472
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2473
+#, fuzzy
+msgid "Winchester"
+msgstr "Liechtenstein"
+
+#: my-evolution/Locations.h:2474
+#, fuzzy
+msgid "Windsor"
+msgstr "Sandsturm"
+
+#: my-evolution/Locations.h:2475
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2478
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+#, fuzzy
+msgid "Winslow"
+msgstr "jetzt"
+
+#: my-evolution/Locations.h:2480
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2481
+msgid "Winter Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:2482
+#, fuzzy
+msgid "Winter Park"
+msgstr "Passwort eingeben"
+
+#: my-evolution/Locations.h:2483
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+#, fuzzy
+msgid "Wisconsin"
+msgstr "Mikronesien"
+
+#: my-evolution/Locations.h:2485
+msgid "Wisconsin Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:2486
+#, fuzzy
+msgid "Wise"
+msgstr "Mi"
+
+#: my-evolution/Locations.h:2487
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2488
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2489
+#, fuzzy
+msgid "Woong Cheon"
+msgstr "Hongkong"
+
+#: my-evolution/Locations.h:2490
+#, fuzzy
+msgid "Wooster"
+msgstr "Fu�zeile:"
+
+#: my-evolution/Locations.h:2491
+#, fuzzy
+msgid "Worcester"
+msgstr "f�r immer"
+
+#: my-evolution/Locations.h:2492
+#, fuzzy
+msgid "Worland"
+msgstr "Polen"
+
+#: my-evolution/Locations.h:2493
+#, fuzzy
+msgid "Worthington"
+msgstr "In Arbeit"
+
+#: my-evolution/Locations.h:2494
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2495
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2496
+msgid "Wuchia Observatory"
+msgstr ""
+
+#: my-evolution/Locations.h:2497
+#, fuzzy
+msgid "Wyoming"
+msgstr "In Arbeit"
+
+#: my-evolution/Locations.h:2498
+#, fuzzy
+msgid "Xiamen"
+msgstr "Name"
+
+#: my-evolution/Locations.h:2499
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2505
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2506
+msgid "Yankton"
+msgstr ""
+
+#: my-evolution/Locations.h:2507
+#, fuzzy
+msgid "Yao Airport"
+msgstr "Nicht importieren"
+
+#: my-evolution/Locations.h:2508
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2510
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2511
+msgid "Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2513
+#, fuzzy
+msgid "Yenbo"
+msgstr "Jemen"
+
+#: my-evolution/Locations.h:2514
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2522
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2528
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2529
+msgid "Zacatecas"
+msgstr ""
+
+#: my-evolution/Locations.h:2530
+#, fuzzy
+msgid "Zadar"
+msgstr "Kalender"
+
+#: my-evolution/Locations.h:2531
+#, fuzzy
+msgid "Zagreb"
+msgstr "Seite"
+
+#: my-evolution/Locations.h:2532
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2533
+msgid "Zama Airfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2534
+#, fuzzy
+msgid "Zanesville"
+msgstr "Storniert"
+
+#: my-evolution/Locations.h:2535
+#, fuzzy
+msgid "Zaragoza"
+msgstr "Paraguay"
+
+#: my-evolution/Locations.h:2536
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2537
+msgid "Zuni Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:2538
+#, fuzzy
+msgid "Zurich"
+msgstr "T�rkisch"
+
+#: my-evolution/component-factory.c:51
+msgid "Folder containing the Evolution Summary"
+msgstr "Ordner mit der Evolution-�bersicht"
+
+#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "Termine"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "Keine Termine"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:400
 msgid "%k:%M %d %B"
 msgstr "%k.%M %d. %B"
 
-#: my-evolution/e-summary-calendar.c:379
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr "%l.%M %d. %B"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-calendar.c:420
+#, fuzzy
+msgid "No description"
+msgstr "Beschreibung"
+
+#: my-evolution/e-summary-mail.c:151
 msgid "Mail summary"
 msgstr "Mail-Zusammenfassung"
 
+#. 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 "VOrdner"
+
+#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
+#: my-evolution/e-summary-mail.c:761
+msgid "Local Folders"
+msgstr "Lokale Ordner"
+
 #. 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:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com: Wort des Tages"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Zitate des Tages"
 
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Einen Kanal hinzuf�gen"
 
-#: my-evolution/e-summary-preferences.c:953
+#: my-evolution/e-summary-preferences.c:728
 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:957
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Name:"
 
-#: my-evolution/e-summary-preferences.c:1503
-msgid "Summary Settings"
-msgstr "Einstellungen der Zusammenfassung"
-
-#: 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
 msgid "Error downloading RDF"
 msgstr "Fehler beim Herunterladen des RDF"
 
-#: my-evolution/e-summary-rdf.c:528
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr "Nachrichtenkanal"
 
-#: my-evolution/e-summary-tasks.c:248
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
+msgstr ""
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "Hinzuf�gen"
+
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr " _Entfernen"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Schauer"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Keine Aufgaben"
 
-#: my-evolution/e-summary-tasks.c:287
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(keine Beschreibung)"
 
@@ -10311,25 +23813,24 @@ msgstr "(keine Beschreibung)"
 msgid "My Weather"
 msgstr "Mein Wetter"
 
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#: my-evolution/e-summary-weather.c:279
+msgid "There was an error downloading data for"
 msgstr ""
-"<dd><b>Es konnte keine Verbindung mit dem Wetterserver aufgenommen werden</"
-"b></dd>"
 
-#: my-evolution/e-summary-weather.c:559
+#: my-evolution/e-summary-weather.c:501
 msgid "Weather"
 msgstr "Wetter"
 
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr "Regionen"
-
 #: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e. %B %Y"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:488
+#, fuzzy
+msgid "Please wait..."
+msgstr "Bitte warten"
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Zusammenfassung drucken"
 
@@ -10337,42 +23838,10 @@ msgstr "Zusammenfassung drucken"
 msgid "Printing of Summary failed"
 msgstr "Drucken der �bersicht fehlgeschlagen"
 
-#: my-evolution/main.c:66
+#: my-evolution/main.c:65
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Chefsesselansichts-Komponente konnte Bonobo nicht initialisieren.\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 "Knoten"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "km/h"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "Zoll Hg"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "Torr"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "Meilen"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "Kilometer"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Wolkenloser Himmel"
@@ -10771,11 +24240,6 @@ msgstr "Abtreibende Eisk�rner"
 msgid "Freezing ice pellets"
 msgstr "Eisige Eisk�rner"
 
-#. HAIL
-#: my-evolution/metar.c:217
-msgid "Hail"
-msgstr "Hagel"
-
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "Hagel in der Umgebung"
@@ -11521,150 +24985,123 @@ msgid "Drifting dust whirls"
 msgstr "Abtreibende Staubteufel"
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr " _Entfernen"
-
-#: my-evolution/my-evolution.glade.h:2
 msgid "Add n_ews feed"
 msgstr "_Kanal hinzuf�gen"
 
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "Alle _Sender:"
-
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "Alle _Ordner:"
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "_Alle Schlagzeilen:"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr "C_elsius"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 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:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr "Ma_ximale Anzahl angezeigter Eintr�ge:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr "Schleigzeilen-Einstellungen"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr "Ein _Monat"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr "Eine _Woche"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr "Aktualisierungs_zeit (Sekunden):"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr "Aktualisierungs_zeit (Sekunden):"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 msgid "S_how full path for folders"
 msgstr "_Vollen Pfad f�r Ordner anzeigen"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr "_Alle Aufgaben anzeigen"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _today's tasks"
 msgstr "_Heutige Aufgaben anzeigen"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr "Temperaturen anzeigen in:"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "Aufgaben "
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr "Wetter-Einstellungen"
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "_Ordner anzeigen:"
-
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "_Sender anzeigen:"
-
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
-msgstr "_Angezeigte Schlagzeilen:"
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr "_F�nf Tage"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr "_Mail"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 msgid "_News Feeds"
 msgstr "_Schlagzeilen"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr "_Ein Tag"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr "_Planung"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr "_Wetter"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Besondere Ordner"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Die Evolution-Shell."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Details anzeigen"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Aktion abbrechen"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Eingang"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Ausgang"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Lokale Ordner"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Installation von 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"
@@ -11672,17 +25109,17 @@ msgstr ""
 "Diese neue Version von Evolution muss zus�tzliche Dateien in Ihr\n"
 "pers�nliches Evolution-Verzeichnis installieren"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Bitte klicken Sie \"OK\", um die Dateien zu installieren, oder \"Abbrechen\" "
 "zum Beenden."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Dateien konnte nicht korrekt aktualisiert werden"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11694,7 +25131,7 @@ msgstr ""
 "kann nicht angelegt werden.\n"
 "Fehler: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11703,7 +25140,33 @@ msgstr ""
 "Ein Fehler trat auf beim Kopieren von Dateien nach\n"
 "'%s'."
 
-#: shell/e-setup.c:281
+#: shell/e-setup.c:282
+#, fuzzy, c-format
+msgid ""
+"Evolution could not create directory\n"
+"%s:\n"
+"%s"
+msgstr ""
+"Verzeichnis %s konnte nicht angelegt werden:\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:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11714,7 +25177,7 @@ msgstr ""
 "Bitte verschieben Sie es, damit Evolution seine\n"
 "Benutzerdateien installieren kann."
 
-#: shell/e-setup.c:295
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11729,7 +25192,7 @@ msgstr ""
 "M�chten Sie, dass dieses Verzeichnis\n"
 "entfernt wird?"
 
-#: shell/e-setup.c:320
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11741,50 +25204,54 @@ msgstr ""
 "es, damit Evolution seine Benutzerdateien\n"
 "installieren kann."
 
-#: 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."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Das Team:"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Ordner kann nicht gepr�ft werden: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Ordner kann nicht umbenannt werden:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Ordner kann nicht in sich selbst verschoben werden."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Ordner kann nicht in sich selbst kopiert werden."
 
-#: 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 "Ein Ordner kann nicht in eines seiner Kinder verschoben werden."
 
-#: 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 "Geben Sie einen Ordner an, in den Ordner \"%s\" kopiert werden soll:"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Ordner kopieren"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 "Geben Sie einen Ordner an, in den Ordner \"%s\" verschoben werden soll:"
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Ordner verschieben"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11793,18 +25260,18 @@ msgstr ""
 "Ordner kann nicht gel�scht werden:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" l�schen"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: shell/e-shell-folder-commands.c:425
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Sind Sie sicher, dass Sie den Ordner '%s' entfernen wollen?"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11813,22 +25280,22 @@ msgstr ""
 "Ordner kann nicht umbenannt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Den Ordner \"%s\" umbenennen in:"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Ordner umbenennen"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:148
+#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Der angegebene Ordnername ist nicht g�ltig: %s"
 
-#: 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"
@@ -11837,7 +25304,7 @@ msgstr ""
 "Der angegebene Ordner kann nicht erstellt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:267
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Neuen Ordner anlegen"
 
@@ -11849,11 +25316,11 @@ msgstr ""
 "Der Typ des ausgew�hlten Ordners ist f�r die \n"
 "gew�hlte Operation nicht g�ltig."
 
-#: shell/e-shell-folder-selection-dialog.c:359
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Neu..."
 
-#: 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 "(Namenlos)"
 
@@ -11875,7 +25342,7 @@ msgstr ""
 "Sie k�nnen \"Automatisch\" w�hlen, wenn Sie ihn nicht wissen, und Evolution "
 "wird versuchen, ihn selber zu bestimmen."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
+#: 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 "Bitte w�hlen Sie die Informationen, die Sie importieren wollen:"
 
@@ -11901,16 +25368,22 @@ msgstr ""
 "Importieren von %s\n"
 "Importiert wird Objekt %d."
 
-#: shell/e-shell-importer.c:397
+#: shell/e-shell-importer.c:409
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datei %s existiert nicht"
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution "
+
+#: shell/e-shell-importer.c:420
 msgid "You may only import to local folders"
 msgstr "Sie k�nnen nur in lokale Ordner importieren"
 
-#: shell/e-shell-importer.c:424
+#: shell/e-shell-importer.c:435
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11920,11 +25393,11 @@ msgstr ""
 "%s\n"
 "umgehen kann"
 
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:445
 msgid "Importing"
 msgstr "Importieren"
 
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:453
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11933,17 +25406,17 @@ msgstr ""
 "Importieren von %s.\n"
 "Starten von %s"
 
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:466
 #, c-format
 msgid "Error starting %s"
 msgstr "Fehler beim Starten von %s"
 
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:485
 #, c-format
 msgid "Error loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:502
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11952,31 +25425,31 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:572
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:623
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: shell/e-shell-importer.c:617
+#: shell/e-shell-importer.c:628
 msgid "Select a file"
 msgstr "Eine Datei w�hlen"
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:638
 msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:663
 msgid "Import data and settings from older programs"
 msgstr "Daten und Einstellungen aus �lteren Programmen importieren"
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:667
 msgid "Import a single file"
 msgstr "Eine einzelne Datei importieren"
 
-#: 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
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11984,24 +25457,24 @@ msgstr ""
 "Bitte warten...\n"
 "Suche nach existierenden Einstellungen"
 
-#: 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
 msgid "Starting Intelligent Importers"
 msgstr "Intelligente Importeure werden gestartet"
 
-#: 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
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
-#: shell/e-shell-importer.c:1014
+#: shell/e-shell-importer.c:1027
 msgid "Select folder"
 msgstr "Ordner w�hlen"
 
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1028
 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:1127 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importieren"
 
@@ -12022,6 +25495,12 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Das Evolution-Mailerdruiden-Interface konnte nicht gestartet werden\n"
 
+#: shell/e-shell-user-creatable-items-handler.c:506
+#: shell/e-shell-user-creatable-items-handler.c:551
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Neu"
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr "Kein Ordnername angegeben."
@@ -12038,94 +25517,95 @@ msgstr "Ordnername kann keine Slashes enthalten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' und '..' sind reservierte Ordnernamen."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Der Fehlermelder kann nicht gefunden werden"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Der Fehlermelder kann nicht starten"
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "�ber Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:409
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Gehe zu Ordner..."
 
-#: shell/e-shell-view-menu.c:410
+#: shell/e-shell-view-menu.c:445
 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:530
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Eine neue Verkn�pfung anlegen"
 
-#: shell/e-shell-view-menu.c:531
+#: shell/e-shell-view-menu.c:566
 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:562
-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."
-
-#: shell/e-shell-view-menu.c:570
-#, c-format
-msgid "Error executing %s."
-msgstr "Fehler beim Ausf�hren von %s."
-
-#: shell/e-shell-view-menu.c:672
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Offline _arbeiten"
 
-#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:1574
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1576
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(keine)"
 
-#: 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 ist zur Zeit online. Klicken Sie diesen Knopf, um offline "
 "zu arbeiten."
 
-#: 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 geht gerade offline."
 
-#: 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 ist gerade offline. Klicken Sie auf diesen Knopf, um online "
 "zu arbeiten."
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Der Fehler vom Aktivierungssystem ist:\n"
+"%s"
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Lokaler Speicher kann nicht eingestellt werden -- %s"
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12136,19 +25616,23 @@ msgstr ""
 "unerwartet ab. Sie m�ssen Evolution beenden und neu starten, um\n"
 "wieder auf diese Daten zugreifen zu k�nnen."
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Ung�ltige Argumente"
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF kann nicht stattfinden"
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
@@ -12266,76 +25750,71 @@ msgstr "_Entfernen"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese Verkn�pfung aus der Verkn�pfungsleiste entfernen"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Fehler beim Speichern von Verkn�pfungen."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Verkn�pfungen"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Ordner kann nicht �bertragen werden:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Eingang"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Kein Name)"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Der angegebene Ordnertyp ist ung�ltig"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "E-/A-Fehler"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Nicht gen�gend Platz, um den Ordner zu erstellen"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Der Ordner ist nicht leer"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Der angegebene Ordner wurde nicht gefunden"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funktion f�r diese Speicherweise nicht implementiert"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Operation nicht unterst�tzt"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Der angegebene Typ wird f�r diese Speicherweise nicht unterst�tzt"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "Der angegebene Ordner kann nicht ge�ndert oder entfernt werden"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Ein Ordner kann nicht das Kinder eines seiner Nachkommen werden"
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "Ein Ordnersperre mit diesem Namen kann nicht erzeugt werden"
 
@@ -12345,106 +25824,114 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<hier klicken, um einen Ordner zu w�hlen>"
+
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Unbekannter Fehler."
+
+#: 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"
+"Der Fehler im Komponentensystem ist:\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"
+"Der Fehler vom Aktivierungssystem ist:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "CORBA-Fehler"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Unterbrochen"
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Ung�ltiges Argument"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Hat bereits einen Besitzer"
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Kein Besitzer"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Nicht unterst�tzter Typ"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Nicht unterst�tztes Schema"
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Nicht unterst�tzte Aktion"
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Existiert"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Ung�ltiger URI"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Hat Unterordner"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Keine Platz mehr frei"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Alter Besitzer ist gestorben"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Unbekannter Fehler."
-
-#: 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"
-"Der Fehler im Komponentensystem ist:\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"
-"Der Fehler vom Aktivierungssystem ist:\n"
-"%s"
+#: shell/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "Dateityp:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -12574,291 +26061,271 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution kann Daten aus den folgenden Dateien importieren:"
 
 #: shell/main.c:89
+msgid "Evolution"
+msgstr "Evolution"
+
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution wird beendet..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Auf die Ximian-Evolution-Shell kann nicht zugegriffen werden."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Die Ximian-Evolution-Shell kann nicht initialisiert werden: %s"
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Splashscreen deaktivieren"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Import beginnt"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Intelligente Importeure werden gestartet"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Das Bonobo-Komponentensystem kann nicht initialisiert werden."
 
+#: tools/evolution-addressbook-abuse.c:80
 #: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Fehler beim Laden des Standard-Adressbuchs."
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Ausgabedatei"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Eingabedatei"
 
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr "Ausgabedatei"
+
 #: tools/evolution-addressbook-import.c:80
 msgid "No filename provided."
 msgstr "Kein Dateiname angegeben."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Kopieren"
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Ausgew�hlte Nachrichten in einen anderen Ordner kopieren"
 
-#: 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 "Die Auswahl kopieren"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "In Ordner kopieren..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Neuen Kontaktliste anlegen"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "Ausschneiden"
-
-#: 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 "Die Auswahl ausschneiden"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "Ausgew�hlte Kontakte l�schen"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Neue Liste"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Ausgew�hlte Nachrichten in einen anderen Ordner kopieren"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Einf�gen"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "In Ordner verschieben..."
 
-#: 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 "Inhalt der Zwischenablage einf�gen"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Zeigt eine Vorschau der zu druckenden Kontakte"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Ausgew�hlte Kontakte drucken"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Ausgew�hlte Kontakte als VCard speichern"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Alle ausw�hlen"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Alle Kontakte ausw�hlen"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "_Nachricht an Kontakt schicken..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Eine Nachricht an die ausgew�hlten Kontakte schicken."
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Nachricht an Kontakt schicken"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Ausgew�hlte Kontakte an jemand anderen schicken."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Laden abbrechen"
 
-#: 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 "der aktuellen Zeit"
+
+#: 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-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
 msgid "_Actions"
 msgstr "Aktio_nen"
 
-#: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr "_Adressbuch-Quellen..."
-
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "_Kontaktliste"
 
-#: 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 "_Kontakt weiterleiten..."
 
-#: 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 "_Drucken..."
-
 #: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "In Ordner verschieben..."
+
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "Als VCard _speichern"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "Nach Kontakten _suchen"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "Alle ausw�hlen"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Einstellungen des Kalenders konfigurieren"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "_Nachricht an Kontakt schicken..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Ein neues ganzt�giges _Ereignis anlegen"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a New _Task"
-msgstr "Eine neue _Aufgabe anlegen"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Einen _neuen Termin anlegen"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "Ein ganzt�giges Ereignis anlegen"
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Tag"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Diesen Termin l�schen"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Gehe zu"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Zur�ckgehen"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Vorangehen"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Gehe zu _Datum"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Zu bestimmtem Datum gehen"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Zum heutigen Tag"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Monat"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Neuer Termin"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr "Neue Aufgabe"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Zeigt eine Vorschau des zu druckenden Kalenders"
 
-#: 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 "Druckvorschau"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Verf�gbarkeitsinformationen f�r diesen Kalender ver�ffentlichen"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Einen Tag zeigen"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Einen Monat zeigen"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Eine Woche zeigen"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Die Werkwoche zeigen"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Woche"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "_Termin..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Kalender-Einstellungen..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "Verf�gbarkeitsinformationen _ver�ffentlichen"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "_Aufgabe..."
-
 #: 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
@@ -12888,18 +26355,18 @@ msgstr "Eine Vorschau des zu druckenden Objektes zeigen"
 msgid "Print this item"
 msgstr "Diesen Eintrag drucken"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Drucken..."
-
-#: 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 "Speichern"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Speichern unter..."
+
 #: 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 "Speichern und schlie�en"
 
@@ -12915,8 +26382,8 @@ msgstr "Diesen Eintrag auf Platte speichern"
 #: 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:40
 msgid "_File"
 msgstr "_Datei"
 
@@ -12925,7 +26392,7 @@ msgid "Print En_velope..."
 msgstr "Umschlag drucken..."
 
 #: 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 "Speichern _unter..."
@@ -12934,10 +26401,14 @@ msgstr "Speichern _unter..."
 msgid "Save the contact and close the dialog box"
 msgstr "Den Kontakt speichern und das Dialogfenster schlie�en"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "_Nachricht an Kontakt schicken..."
+
 #: 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 "_Speichern"
 
@@ -12997,6 +26468,10 @@ msgstr "Eine Besprechung f�r diesen Eintrag ansetzen"
 msgid "Customise My Evolution"
 msgstr "My Evolution anpassen"
 
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Abbrechen"
+
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Den aktuellen Mailvorgang abbrechen"
@@ -13006,83 +26481,55 @@ msgid "Compose _New Message"
 msgstr "_Neue Nachricht erstellen"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Mailzug�nge anlegen und bearbeiten sowie andere Vorlieben"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Regeln zum Filtern neuer Mail anlegen oder bearbeiten"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Definitionen virtueller Ordner anlegen oder bearbeiten"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "_M�ll leeren"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Passw�rter vergessen"
 
-#: 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 ""
 "Erinnerte Passw�rter vergessen, so dass Sie wieder nach ihnen gefragt werden"
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Neue Nachricht"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Ein Fenster zum Erstellen einer Mailnachricht �ffnen"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Alle gel�schten Nachrichten auf Dauer aus allen Ordnern entfernen"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "Verschicken / Empfangen"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Mail in der Warteschlange verschicken und neue Mail abholen"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Nachrichten-Vorschaufenster zeigen"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Ordner auf entfernten Servern abonnieren oder abbestellen"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor f�r virtuelle Ordner..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filter..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "Nachricht _verschicken"
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "_Mail-Einstellungen..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Vorschaufl�che"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "_Verschicken / Empfangen"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "Ordner _abonnieren..."
 
@@ -13178,11 +26625,11 @@ msgstr "Die gew�hlten Nachrichten zeitweilig verbergen"
 msgid "Threaded Message list"
 msgstr "Nachrichtenliste in Threads geordnet"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_S�ubern"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Ordner"
 
@@ -13199,211 +26646,228 @@ msgid "_Threaded Message List"
 msgstr "Nachrichtenliste in _Thread-Ordnung"
 
 #: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Absender zu Adressbuch hinzuf�gen"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Filter anwenden"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Absender zu Adressbuch hinzuf�gen"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Filterregeln auf die gew�hlten Nachrichten anwenden"
 
-#: 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 "Eine Antwort an alle Empf�ngern der gew�hlten Nachricht erstellen"
 
-#: 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 "Eine Antwort an die Mailingliste der gew�hlten Nachricht erstellen"
 
-#: 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 "Eine Antwort an den Absender der gew�hlten Nachricht erstellen"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Ausgew�hlte Nachrichten in einen anderen Ordner kopieren"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "_Virtuellen Ordner aus Nachricht erzeugen"
 
-#: 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 "Eine Regel erstellen, um Nachrichten von diesem Absender zu filtern"
 
-#: 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 "Eine Regel erstellen, um Nachrichten an diese Empf�nger zu filtern"
 
-#: 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 "Eine Regel erstellen, um Nachrichten an diese Mailingliste zu filtern"
 
-#: 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 "Eine Regel erstellen, um Nachrichten mit diesem Betreff zu filtern"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Einen virtuellen Ordner f�r diese Empf�nger anlegen"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Einen virtuellen Ordner f�r diese Mailingliste anlegen"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Einen virtuellen Ordner f�r diesen Absender anlegen"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Einen virtuellen Ordner f�r diesen Betreff anlegen"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Die Textgr��e heruntersetzen"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Die n�chste wichtige Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Die n�chste Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Die n�chste ungelesene Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Den n�chsten ungelesenen Thread anzeigen"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Die letzte wichtige Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Die vorherige Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Die letzte ungelesene Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Weiterleiten"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filter �ber Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filter �ber _Absender..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filter �ber _Empf�nger..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filter �ber _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:29
-msgid "Force images in HTML mail to be loaded"
-msgstr "Laden von Bildern in HTML-Mail erzwingen"
-
-#: ui/evolution-mail-message.xml.h:30
-msgid "Forward"
-msgstr "Weiterleiten"
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward As"
-msgstr "Weiterleiten als"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward _Attached"
-msgstr "Als _Anlage weiterleiten"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Inline"
-msgstr "An _Ort und Stelle weiterleiten"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Alle sichtbaren Nachrichten zum L�schen vorsehen"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Quoted"
-msgstr "Als _Zitat weiterleiten"
+msgid "Follow _Up..."
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr "Laden von Bildern in HTML-Mail erzwingen"
+
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Die ausgew�hlte Nachricht im Rumpf einer neuen Nachricht weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Die ausgew�hlte Nachricht als Zitat wie in einer Antwort weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Die ausgew�hlte Nachricht an jemanden weiterleiten"
 
-#: 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 "Die ausgew�hlte Nachricht an jemanden als Anlage weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Textgr��e heraufsetzen"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "_Bilder laden"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Als _wichtig markieren"
 
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Als ungelesen markieren"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Als _unwichtig markieren"
 
-#: 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 "Die gew�hlten Nachrichten als gelesen markieren"
 
-#: 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 "Die ausgew�hlten Nachrichten als wichtig markieren"
 
-#: 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 "Die ausgew�hlten Nachrichten als ungelesen markieren"
 
-#: 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 "Die ausgew�hlten Nachrichten als unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Alle sichtbaren Nachrichten zum L�schen vorsehen"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Verschieben"
 
-#: 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 "Ausgew�hlte Nachrichten in einen anderen Ordner kopieren"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Weiter"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "N�chste wichtige Nachricht"
-
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
-msgstr "N�chste Nachricht"
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "N�chste wichtige Nachricht"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "N�chster Thread"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "N�chste ungelesene Nachricht"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -13420,159 +26884,187 @@ msgid "Original Si_ze"
 msgstr "Original_gr��e"
 
 #: ui/evolution-mail-message.xml.h:61
-msgid "Preview the message to be printed"
-msgstr "Eine Vorschau der zu druckenden Nachricht zeigen"
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Letzte ungelesene Nachricht"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "Zur�ck"
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Letzte wichtige Nachricht"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "Letzte wichtige Nachricht"
+msgid "Preview the message to be printed"
+msgstr "Eine Vorschau der zu druckenden Nachricht zeigen"
 
 #: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "Vorherige Nachricht"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "Letzte ungelesene Nachricht"
+msgid "Previous"
+msgstr "Zur�ck"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "Antworten"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Re_direct"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "Allen antworten"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Die ausgew�hlte Nachricht an jemanden weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine Originalgr��e zur�cksetzen"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "Nachricht durch_suchen..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "_Kleiner"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "Die Nachricht als Textdatei speichern"
 
-#: 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 "Im Rumpf der angezeigten Nachricht nach einem Text suchen"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "Die Seiteneinstellungen f�r Ihren aktuellen Drucker einrichten"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "E-Mail-_Quellcode zeigen"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "Nachricht im normalen Stil zeigen"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "Nachricht mit allen E-Mail-Kopfzeilen zeigen"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "Den rohen E-Mail-Quellcode dieser Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "Text_gr��e"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "L�schen f�r ausgew�hlte Nachrichten r�ckg�ngig machen"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "VOrdner �ber Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "VOrdner �ber _Absender..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "VOrdner �ber _Empf�nger..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "VOrdner �ber _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
-msgstr "Filter _anwenden"
-
 #: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Attached"
+msgstr "Beilegen"
+
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "Filter aus Nachricht _erzeugen"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "Nachricht _weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Gehe zu"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "An Ort und Stelle"
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Gr��er"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "_Nachrichtenanzeige"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "N�chste Nachricht"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Normale Anzeige"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "Nachricht _�ffnen"
 
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Vorherige Nachricht"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Umschrieben"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "Werkzeuge"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "L�schen r�ckg�ngig"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Dieses Fenster schlie�en"
 
 #: 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:36
 msgid "_Close"
 msgstr "Schlie�en"
 
 #: 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:56
 msgid "_View"
 msgstr "_Ansicht"
 
@@ -13597,11 +27089,11 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 "Diese Nachricht mit Ihrem S/MIME-Verschl�sselungszertifikat verschl�sseln"
 
-#: 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 "For_mat"
 
-#: 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"
 
@@ -13617,6 +27109,10 @@ msgstr "Eine Datei als Text in die Nachricht einf�gen"
 msgid "Insert text file..."
 msgstr "Textdatei einf�gen..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "�ffnen"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Eine Datei �ffnen"
@@ -13650,7 +27146,7 @@ msgid "Save in folder..."
 msgstr "In Ordner speichern..."
 
 #: 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 "Die aktuelle Datei speichern"
 
@@ -13675,6 +27171,7 @@ msgid "Send _later"
 msgstr "_Sp�ter verschicken"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Die Mail im HTML-Format verschicken"
 
@@ -13743,7 +27240,7 @@ msgid "_From Field"
 msgstr "_Von-Feld"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "Einf�gen"
 
@@ -13755,11 +27252,7 @@ msgstr "_�ffnen..."
 msgid "_Reply-To Field"
 msgstr "Antwort-an-Feld"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Sicherheit"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Hilfe"
 
@@ -13815,33 +27308,41 @@ msgstr "Die letzten Aufgabeninformationen erhalten"
 msgid "Re_fresh Task"
 msgstr "Aufgabe _aktualisieren"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Einstellungen der Aufgabenansicht konfigurieren"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Ausgew�hlte Aufgabe kopieren"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Ausgew�hlte Aufgabe ausschneiden"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "Ausgew�hlte Aufgaben l�schen"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Ausgew�hlte Aufgaben l�schen"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "Als abgeschlossen _markieren"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Aufgabe aus der Zwischenablage einf�gen"
 
-#: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings..."
-msgstr "Aufgaben-Einstellungen..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Zeigt eine Vorschau der zu druckenden Kontakte"
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
-msgstr "Aufgabe"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Diese Nachricht drucken"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -13908,113 +27409,118 @@ msgid "Open this folder in an other window"
 msgstr "Diesen Ordner in einem anderen Fenster �ffnen"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Verschicken / Empfangen"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Mail in der Warteschlange verschicken und neue Mail abholen"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "Informationen �ber Ximian Evolution anzeigen"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Ein/Aus"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Anzeige der Ordnerleiste an/aus"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Anzeige der Verkn�pfungsleiste an/aus"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Offline-Arbeitsmodus an/aus."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Den gew�hlten Ordner betrachten"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian-Evolution-_FAQ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "�ber Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Kopieren..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "Ordnerleiste"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_Gehe zu Ordner..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Importieren..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Verschieben..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Neu"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "Neuer Ordner"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_Pilot-Einstellungen..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Umbenennen..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Verschicken / Empfangen"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Verkn�pfung"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "Verkn�pfungsleiste"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Die Eigenschaften f�r die �bersicht �ndern"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "�bersicht drucken"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Neu laden"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Die Ansicht neu laden"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "Einstellungen der _Zusammenfassung..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Adresskarten"
@@ -14028,18 +27534,27 @@ msgid "Phone List"
 msgstr "Telefonliste"
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "Ordner w�hlen"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Nach Absender"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Nach Status"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Nach Betreff"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Nachrichten"
 
@@ -14047,6 +27562,12 @@ msgstr "Nachrichten"
 msgid "With Category"
 msgstr "Mit Kategorie"
 
+#. Check for UTC.
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+msgid "UTC"
+msgstr ""
+
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "Select a Time Zone"
 msgstr "Eine Zeitzone w�hlen"
@@ -14069,11 +27590,21 @@ msgstr ""
 "heranzuzoomen, und w�hlen Sie eine Zeitzone.\n"
 " Mit der rechten Maustaste k�nnen Sie wegzoomen."
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "Aktuelle Ansicht"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "Aktuelle Ansicht"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "Ansichten definieren"
 
@@ -14105,76 +27636,81 @@ msgstr "Die Zeit muss folgendes Format haben: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschlie�lich) sein"
 
-#: widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "Mitteleurop�isch"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "Griechisch"
 
-#: 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 "Japanisch"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "T�rkisch"
 
-#: 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 "Westeurop�isch"
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 msgid "Traditional"
 msgstr "Traditionell"
 
-#: 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 "Vereinfach"
 
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:92
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "Neu"
+#: widgets/misc/e-charset-picker.c:95
+#, fuzzy
+msgid "Visual"
+msgstr "Deaktivieren"
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Unbekannter Zeichensatz: %s"
 
-#: widgets/misc/e-charset-picker.c:201
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Geben Sie den zu verwendenden Zeichensatz an"
 
-#: widgets/misc/e-charset-picker.c:276
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Anderer..."
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Zeichenkodierung"
 
@@ -14182,25 +27718,23 @@ msgstr "Zeichenkodierung"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Editor f�r Suchen"
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Suche speichren"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Zu gespeicherten Suchen hinzuf�gen"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "L�schen"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Suche speichren"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Alle zeigen"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Zu gespeicherten Suchen hinzuf�gen"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -14223,11 +27757,21 @@ msgstr "Meldung"
 msgid "Don't show this message again."
 msgstr "Diese Meldung nicht mehr anzeigen."
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "Su_chen"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Jetzt suchen"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "L�schen"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "L�schen"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Jetzt suchen"
 
@@ -14252,3 +27796,925 @@ msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 #: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
+
+#~ msgid "Card: "
+#~ msgstr "Karte: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Name: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Pr�fix:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Vorname:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Zus�tzlich: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Familienname:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Suffix:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Geburtsdatum: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Adresse:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postfach:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  Suffix:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Stra�e:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ort:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Region:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postleitzahl: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Land:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Postvermerk: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefone:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefon:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "E-Mail:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "E-Mail:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Zeitzone: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "Berufsbezeichnung: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "Firma: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Name:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Einheit:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Einheit2: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Einheit3: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Einheit4: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kategorien: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kommentar: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Eindeutige Zeichenkette: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "�ffentlicher Schl�ssel: "
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Verbindung zu LDAP-Server..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Warten auf Verbindung zum LDAP-Server..."
+
+#~ msgid "New _Contact"
+#~ msgstr "Neuer _Kontakt"
+
+#~ msgid "New Contact _List"
+#~ msgstr "Neue Kontakt_liste"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Adressbuch bearbeiten"
+
+#~ msgid "Account Name"
+#~ msgstr "Accountname"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Adressbuch hinzuf�gen"
+
+#~ msgid "Server Name"
+#~ msgstr "Servername"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr ""
+#~ "Die Information unten wird ben�tigt, um ein Adressbuch hinzuzuf�gen."
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr ""
+#~ "Diese Informationen werden f�r die meisten LDAP-Server nicht ben�tigt."
+
+#~ 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 ""
+#~ "Diese Informationen werden von Ihrem LDAP-Server benutzt, um anzugeben, "
+#~ "welche Knoten bei einer Suche verwendet werden. Nehmen Sie f�r weitere "
+#~ "Informationen Kontakt zu Ihrem Serveradministrator auf."
+
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact your "
+#~ "server administrator for more information."
+#~ msgstr ""
+#~ "Dies ist der Basisknoten f�r alle Ihre Suchen auf dem LDAP-Server. Nehmen "
+#~ "Sie f�r weitere Informationen Kontakt zu Ihrem Serveradministrator auf."
+
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Dies ist der Name des Servers, auf dem das Adressbuch liegt."
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Dies ist der Port, den Ihr LDAP-Server verwendet."
+
+#~ msgid "_My server requires authentication"
+#~ msgstr "_Mein Server ben�tigt Legitimation"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Andere Kontakte"
+
+#~ msgid "(none)"
+#~ msgstr "(keine)"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "_Kontakte:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Kontakte zeigen, die auf folgende Kriterien passen:"
+
+#~ msgid "_Message Recipients:"
+#~ msgstr "_Nachrichtenempf�nger:"
+
+#~ msgid "B_usiness"
+#~ msgstr "Gesch�ftlich"
+
+#~ msgid "Business _Fax"
+#~ msgstr "Gesch�ftliches Fax"
+
+#~ msgid "_Business"
+#~ msgstr "Gesch�ftlich"
+
+#~ msgid "_Home"
+#~ msgstr "Zu Hause"
+
+#~ msgid "_Mobile"
+#~ msgstr "Mobil"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Sind Sie sicher, dass Sie diesen\n"
+#~ "Kontakt l�schen wollen?"
+
+#~ msgid "Republic Of Moldova"
+#~ msgstr "Republik Moldawien"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Einen neuen Termin anlegen"
+
+#~ msgid "Create a new task"
+#~ msgstr "Eine neue Aufgabe anlegen"
+
+#~ msgid "New _Task"
+#~ msgstr "Neue _Aufgabe"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Neue Termine mit einer voreingestellten _Erinnerung erzeugen"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "Erster Tag der _Woche:"
+
+#~ msgid "_Other"
+#~ msgstr "_Andere"
+
+#~ msgid "Click here to add an attendee"
+#~ msgstr "Hier klicken, um einen Teilnehmer hinzuzuf�gen"
+
+#~ msgid "The journal entry has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Der Journaleintrag hat sich ge�ndert. Eine aktualisierte Version schicken?"
+
+#~ 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 "Diese Aufgabe _l�schen"
+
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "Besprechung beginnt: <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "Aufgabe beginnt: <b>"
+
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Verf�gbarkeitsinformation beginnt: <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Beginnt: <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Besprechung endet: <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Verf�gbarkeitsinformation endet: <b>"
+
+#~ msgid "Ends: <b>"
+#~ msgstr "Endet: <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Aufgabe vollst�ndig zu: <b>"
+
+#~ msgid "Task Due: <b>"
+#~ msgstr "Aufgabe f�llig am: <b>"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "iKalender-Information"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "iKalender-Fehler"
+
+#~ msgid "An unknown person"
+#~ msgstr "Eine unbekannte Person"
+
+#~ msgid ""
+#~ "<br> Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr ""
+#~ "<br> Bitte sehen Sie sich die folgenden Informationen noch einmal an und "
+#~ "w�hlen Sie dann eine Aktion aus dem Men� unten aus."
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Keine</i>"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Eine Aktion w�hlen:"
+
+#~ msgid "Update"
+#~ msgstr "Aktualisieren"
+
+#~ msgid "Accept"
+#~ msgstr "Annehmen"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Vorl�ufig annehmen"
+
+#~ msgid "Decline"
+#~ msgstr "Ablehnen"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Verf�gbarkeitsinformationen senden"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Status des Antwortenden aktualisieren"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Neueste Informationen senden"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> hat Besprechungsinformationen ver�ffentlicht."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Besprechungsinformationen"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> w�nscht Ihre Anwesenheit bei einer Besprechung"
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Besprechungsvorschlag"
+
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ msgstr "<b>%s</b> w�nscht zu einer vorhandenen Besprechung hinzuzuf�gen"
+
+#~ msgid "Meeting Update"
+#~ msgstr "Besprechungsaktualisierung"
+
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ msgstr "<b>%s</b> w�nscht aktuelle Besprechungsinformationen zu erhalten."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Besprechungs-Aktualisierungsanfrage"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b> hat auf eine Besprechungsanfrage geantwortet."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Besprechungsantwort"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> hat eine Besprechung widerrufen."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Besprechungswiderruf"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> hat eine unverst�ndliche Nachricht gesendet."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Fehlerhafte Besprechungsmitteilung"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> hat Aufgabeninformationen ver�ffentlicht."
+
+#~ msgid "Task Information"
+#~ msgstr "Aufgabeninformationen"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> fordert Sie auf eine Aufgabe auszuf�hren."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Aufgabenvorschlag"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> w�nscht zu einer bestehenden Aufgabe hinzuzuf�gen."
+
+#~ msgid "Task Update"
+#~ msgstr "Aufgabenaktualisierung"
+
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "<b>%s</b> w�nscht letzte Aufgabeninformationen zu erhalten."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Aufgaben-Aktualisierungsanfrage"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b> hat auf eine Aufgabenzuweisung geantwortet."
+
+#~ msgid "Task Reply"
+#~ msgstr "Aufgaben-Antwort"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> hat eine Aufgabe widerrufen."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Aufgabenwiderruf"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Fehlerhafte Aufgabenmitteilung"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> hat Verf�gbarkeitsinformationen ver�ffentlicht."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Verf�gbarkeitsinformationen"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> fordert Ihre Verf�gbarkeitsinformationen an."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Verf�gbarkeits-Anfrage"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "<b>%s</b> hat auf eine Verfugbarkeits-Anfrage geantwortet."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Verf�gbarkeits-Antwort"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Fehlerhafte Verf�gbarkeitsmitteilung"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Diese Nachricht enth�lt ausschlie�lich nicht unterst�tzte Anfragen."
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "Die Anlage enth�lt keine g�ltige Kalendernachricht"
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "Die Anlage hat keine anzeigbaren Kalenderinformationen"
+
+#~ msgid "Unable to find any of your identities in the attendees list!\n"
+#~ msgstr ""
+#~ "Keine Ihrer Identit�ten kann in der Anwesenheitsliste gefunden werden!\n"
+
+#~ msgid "Status: %s"
+#~ msgstr "Status: %s"
+
+#~ msgid "Percent Complete: %i"
+#~ msgstr "Prozent abgeschlossen: %i"
+
+#~ msgid "URL: %s"
+#~ msgstr "URL: %s"
+
+#~ msgid "Categories: %s"
+#~ msgstr "Kategorien: %s"
+
+#~ msgid "Contacts: "
+#~ msgstr "Kontakte: "
+
+#~ msgid "Invalid type in body-contains, expecting string"
+#~ msgstr "Ung�ltiger Typ in body-contains, Zeichenkette wurde erwartet"
+
+#~ msgid ""
+#~ "EMail: %s\n"
+#~ "Common Name: %s\n"
+#~ "Organization Unit: %s\n"
+#~ "Organization: %s\n"
+#~ "Locality: %s\n"
+#~ "State: %s\n"
+#~ "Country: %s"
+#~ msgstr ""
+#~ "E-Mail: %s\n"
+#~ "�blicher Name: %s\n"
+#~ "Organisationseinheit: %s\n"
+#~ "Organisation: %s\n"
+#~ "�rtlichkeit: %s\n"
+#~ "Bundesland/-staat: %s\n"
+#~ "Land: %s"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Bitte geben Sie das NNTP-Passwort f�r %s@%s ein"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Server lehnte Benutzername ab"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Benutzername konnte nicht an Server gesendet werden"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Server lehnte Benutzername/Passwort ab"
+
+#~ msgid "Message %s not found."
+#~ msgstr "Nachricht %s nicht gefunden."
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Gruppenliste konnte nicht vom Server abgerufen werden."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "grouplist-Datei f�r %s konnte nicht geladen werden: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "grouplist-Datei f�r %s konnte nicht gespeichert werden: %s"
+
+#~ msgid "Could not open directory for news server: %s"
+#~ msgstr "Verzeichnis f�r Newsserver konnte nicht ge�ffnet werden: %s"
+
+#~ msgid "Unable to open or create .newsrc file for %s: %s"
+#~ msgstr ".newsrc-Datei f�r %s konnte nicht ge�ffnet oder erstellt werden: %s"
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "POP-Server konnte nicht auf neue Nachrichten �berpr�ft werden: %s"
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr ""
+#~ "Ordner konnte nicht ge�ffnet werden: Nachrichtenliste war unvollst�ndig."
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Nachricht konnte nicht abgeholt werden: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ msgstr "Nachricht konnte nicht vom POP-Server %s abgerufen werden: %s"
+
+#~ msgid ""
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ msgstr ""
+#~ "Dies verbindet mit dem POP-Server und benutzt Kerberos 4, um sich zu "
+#~ "legitimieren."
+
+#~ msgid "Could not authenticate to KPOP server: %s"
+#~ msgstr "Legitimation beim KPOP-Server konnte nicht erfolgen: %s"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Verbindung zu Server konnte nicht hergestellt werden: %s"
+
+#~ msgid "(Unknown)"
+#~ msgstr "(Unbekannt)"
+
+#~ msgid "Unexpected response from POP server: %s"
+#~ msgstr "Unerwartete Antwort von POP-Server: %s"
+
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "'Von'-Adresse konnte nicht in Nachricht gefunden werden"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr ""
+#~ "Nachricht konnte nicht verschickt werden: Absenderadresse nicht angegeben."
+
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "RCPT-TO-Antwortfehler: %s: Mail nicht verschickt."
+
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "DATA-Antwortfehler: %s: Mail nicht verschickt"
+
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr "DATA-Antwortfehler: Nachrichtenabschluss: %s: Mail nicht verschickt"
+
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "QUIT-Antwortfehler: %s: nicht fatal"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Ordner-URI eingeben"
+
+#~ msgid "Message was received"
+#~ msgstr "Nachricht wurde empfangen"
+
+#~ msgid "Message was sent"
+#~ msgstr "Nachricht wurde verschickt"
+
+#~ msgid "on or before"
+#~ msgstr "am oder vor"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Mailspeicher-Ordner (intern)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Verbindung zum Speicher konnte nicht hergestellt werden: %s"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "Neue _Mail-Nachricht"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "vOrdner aus Suche erzeugen"
+
+#~ msgid "Filter on Mailing List"
+#~ msgstr "Filter �ber Mailingliste"
+
+#~ msgid "Indexing:"
+#~ msgstr "Indizieren:"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "Postfach-Format"
+
+#~ msgid " (default)"
+#~ msgstr " (voreingestellt)"
+
+#~ msgid "Subject is %s"
+#~ msgstr "Betreff ist %s"
+
+#~ msgid "Mail from %s"
+#~ msgstr "E-Mail von %s"
+
+#~ msgid "%s mailing list"
+#~ msgstr "Mailingliste %s"
+
+#~ msgid "This message contains invalid recipients:"
+#~ msgstr "Diese Nachricht enth�lt ung�ltige Empf�nger:"
+
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: Eingang"
+
+#~ msgid "Account"
+#~ msgstr "Zugang"
+
+#~ msgid "Always _encrypt to myself when sending encrypted mail"
+#~ msgstr ""
+#~ "Beim Verschicken verschl�sselter Mail immer vor mir selber _verschl�sseln"
+
+#~ msgid "Composer"
+#~ msgstr "Maileditor"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Vorgegebener Weiterleitungsstil ist: "
+
+#~ msgid "Edit..."
+#~ msgstr "Bearbeiten..."
+
+#~ msgid "HTML signature file:"
+#~ msgstr "HTML-Signaturdatei:"
+
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Eine Filterprotokoll-Datei w�hlen..."
+
+#~ msgid "_Email Address:"
+#~ msgstr "_E-Mail-Adresse:"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "Filteraktionen mit_protokollieren in:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organisation:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "Dieses Passwort _behalten"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Mail normalerweise im HTML-Format ver_schicken."
+
+#~ msgid "_Server Type: "
+#~ msgstr "_Servertyp: "
+
+#~ msgid "_Signature file:"
+#~ msgstr "_Signaturdatei:"
+
+#~ msgid "seconds."
+#~ msgstr "Sekunden."
+
+#~ 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."
+
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "Evolution versteht diesen unterzeichneten Nachrichtentyp nicht."
+
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr ""
+#~ "Diese Nachricht ist digital unterzeichnet und wurde als authentisch "
+#~ "nachgewiesen."
+
+#~ 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."
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "Evolution-Komponente f�r die Chefsesselansicht"
+
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr ""
+#~ "Evolutions Mail-Zusammenfassungskomponente kann nicht initialisiert werden"
+
+#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#~ msgstr ""
+#~ "<dd><b>Es konnte keine Verbindung mit dem Wetterserver aufgenommen "
+#~ "werden</b></dd>"
+
+#~ msgid "�F"
+#~ msgstr "�F"
+
+#~ msgid "�C"
+#~ msgstr "�C"
+
+#~ msgid "kph"
+#~ msgstr "km/h"
+
+#~ msgid "inHg"
+#~ msgstr "Zoll Hg"
+
+#~ msgid "mmHg"
+#~ msgstr "Torr"
+
+#~ msgid "kilometers"
+#~ msgstr "Kilometer"
+
+#~ msgid "Al_l stations:"
+#~ msgstr "Alle _Sender:"
+
+#~ msgid "All _folders:"
+#~ msgstr "Alle _Ordner:"
+
+#~ msgid "All news _feeds:"
+#~ msgstr "_Alle Schlagzeilen:"
+
+#~ msgid "_Display folders:"
+#~ msgstr "_Ordner anzeigen:"
+
+#~ msgid "_Display stations:"
+#~ msgstr "_Sender anzeigen:"
+
+#~ msgid "_Displayed feeds:"
+#~ msgstr "_Angezeigte Schlagzeilen:"
+
+#~ msgid "Outbox"
+#~ msgstr "Ausgang"
+
+#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+#~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ordner kann nicht �bertragen werden:\n"
+#~ "%s"
+
+#~ msgid "(No name)"
+#~ msgstr "(Kein Name)"
+
+#~ msgid "New List"
+#~ msgstr "Neue Liste"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Einstellungen des Kalenders konfigurieren"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Ein neues ganzt�giges _Ereignis anlegen"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Eine neue _Aufgabe anlegen"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Einen _neuen Termin anlegen"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Ein ganzt�giges Ereignis anlegen"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Termin..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Kalender-Einstellungen..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Aufgabe..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Mailzug�nge anlegen und bearbeiten sowie andere Vorlieben"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_Mail-Einstellungen..."
+
+#~ msgid "Forward _Attached"
+#~ msgstr "Als _Anlage weiterleiten"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "Als _Zitat weiterleiten"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "Filter _anwenden"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Einstellungen der Aufgabenansicht konfigurieren"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Aufgaben-Einstellungen..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Die Eigenschaften f�r die �bersicht �ndern"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "Einstellungen der _Zusammenfassung..."
+
+#~ msgid "Show All"
+#~ msgstr "Alle zeigen"
+
+#~ msgid "Sear_ch"
+#~ msgstr "Su_chen"
diff --git a/po/el.po b/po/el.po
index f837d01e95..7b269bbb30 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-01-18 16:03+0000\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -43,21 +43,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "�������� ������� VCard ��� Evolution."
 
 #: 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
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "�����"
 
 #: 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 "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:1731
 msgid "Primary"
 msgstr "��������"
 
@@ -67,16 +68,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:994
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 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:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
 msgid "Business"
 msgstr "�������"
 
@@ -86,12 +87,12 @@ msgid "Bus"
 msgstr "���."
 
 #: 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:1720
 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:1722
 msgid "Company"
 msgstr "��������"
 
@@ -102,13 +103,13 @@ 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:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
 msgid "Home"
 msgstr "�����"
 
 #: 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 "����������"
 
@@ -118,19 +119,19 @@ 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:1655
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "������"
 
 #: 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:1721
 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:1647
-#: addressbook/gui/widgets/e-addressbook-view.c:974
+#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "��� ��������"
 
@@ -139,13 +140,13 @@ msgid "Bus Fax"
 msgstr "��� ���."
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:975
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "������� 2"
 
@@ -154,69 +155,68 @@ msgid "Bus 2"
 msgstr "���. 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:1724
 msgid "Home 2"
 msgstr "����� 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:978
+#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: 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:57
+#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 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:980
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:981
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:982
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:983
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "��������"
 
 #: 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"
 
 #: 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/contact-editor/e-contact-editor.c:1759
+#: 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:987
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: 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:988
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Web Site"
 msgstr "����������"
 
@@ -225,7 +225,7 @@ msgid "Url"
 msgstr "����������� ���������"
 
 #: 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 "�����"
 
@@ -234,7 +234,7 @@ msgid "Dep"
 msgstr "����."
 
 #: 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 "�������"
 
@@ -243,12 +243,12 @@ msgid "Off"
 msgstr "����."
 
 #: 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 "������"
 
 #: 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 "���������"
 
@@ -257,7 +257,7 @@ msgid "Prof"
 msgstr "�����."
 
 #: 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 "����������"
 
@@ -270,7 +270,7 @@ msgid "Ass"
 msgstr "����."
 
 #: 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 "���������"
 
@@ -279,12 +279,12 @@ msgid "Nick"
 msgstr "����."
 
 #: 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 "�������"
 
 #: 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 "��������"
 
@@ -297,7 +297,7 @@ msgid "CALUri"
 msgstr "URI ����."
 
 #: 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 "��������� ������������ ��������������"
 
@@ -326,302 +326,16 @@ msgstr "����������"
 msgid "Family Name"
 msgstr "������������ �����"
 
-#: 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 "�����:"
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"�����: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-" �������:     "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  �������:      "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  ��������: "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  ����������:     "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  ��������:     "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"���������� ��������: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"���������:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  ���.������:  "
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  ����.:         "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  ����:      "
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  ����:       "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  �������:      "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-" ���.�������: "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-" ����:     "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"������� ���������: "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"��������:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"��������:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-mail:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-mail:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"������������ ������������: "
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"���� ����: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"���������� ����: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"������������� ��������: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"���.: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  �����:  "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  ������:  "
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  ������2: "
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  ������3: "
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  ������4: "
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"����������: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"������: "
-
-#. 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:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"������� ������: "
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "��������� VCards"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard ��� %s"
@@ -629,86 +343,89 @@ msgstr "VCard ��� %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:1721
+#: 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:1726
-#: calendar/conduits/todo/todo-conduit.c:1307
-#: 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:171 calendar/gui/main.c:63
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "��� ���� ������ � ������������ ��� 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:2732
 msgid "Searching..."
 msgstr "������� ���������..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "������� �������..."
 
 #. 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 "������ ���� ������� ����������."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:483
-msgid "Connecting to LDAP server..."
-msgstr "������� �� ��� ���������� LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:493
-msgid "Unable to connect to LDAP server."
-msgstr "��� ����� ������ � ������� �� ��� ���������� LDAP."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:509
-msgid "Waiting for connection to LDAP server..."
-msgstr "������� �������� �� ��� ���������� LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:912
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "�������� ������ ���� ���������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1013
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "�������� ������ ��� ��� ���������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "����������� ������ ���� ���������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2214
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "������������ ����������."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "���� ������������� ���������� ��� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2219
-msgid "Restarting search."
-msgstr "������������ ����������."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "������ ��������� ������"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "��� ���� ������ � ��������� ���������: %s"
+
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "��������� Email:"
 
-#: 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:439
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "To ����k ��� ���������\n"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: calendar/conduits/calendar/calendar-conduit.c:1202
-#: calendar/conduits/todo/todo-conduit.c:815
+#: 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:1221
-#: calendar/conduits/calendar/calendar-conduit.c:1203
-#: calendar/conduits/todo/todo-conduit.c:816
+#: 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: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 ""
 "��� ���� ������ � �������� ��� �������� ���������� ��� ���������� �������"
@@ -722,234 +439,116 @@ msgid "A Bonobo control for displaying an address."
 msgstr "�������� ������� ��� Bonobo ��� ��� ������� ���� ����������."
 
 #: 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
+#, 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
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 "�������� ������� ��� ��� ������� ����-������ ��� ������� ����������� ��� "
 "Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 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:10
 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:11
 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:12
 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:13
 msgid "Factory for the Addressbook's address popup"
 msgstr "���������� ��� ��� ���������� ��������� ��� �� ������ �����������"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "���������� ��� �� ������ ��������� ������� ��� ������� �����������"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-shortcuts.c:1061
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "������"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "������� ��� �������� ����������� ������"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "����������� LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "����������� LDAP ��� �������� ����������� ������"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "��� �����"
 
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
-msgstr "��� _�����"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_�����"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "��� ����� ������"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
-msgstr "��� _����� ������"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
-msgstr "����������� ������� �����������"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
-msgstr "����� �����������"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "�������� ������� �����������"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
-msgstr "����� ������� �����������"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "��� �������������"
-
-#: 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-config.glade.h:8
-msgid "De_lete"
-msgstr "���_�����"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "��������� Email:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"�� Evolution �� ������������� ����� �� ��������� ��� ��� ����������� ��� "
-"���� ����������"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "One"
-msgstr "���"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
-msgstr "���� _����������:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search s_cope: "
-msgstr "��������� �� _�����:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Server Name"
-msgstr "����� ����������"
-
-#: 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."
-msgstr ""
-"� ����������� ldap ������������ ����� ��� ���������� ��� �� ������ ����� "
-"������ ���������������� �� ��� ���������. ������������� �� ��� ����������� "
-"������� ��� ������������ �����������."
-
-#: 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 ""
-"����� ����� � ������� ������ ��� ���� ��� ����������� ��� ���� ���������� "
-"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 ""
-"���� �� ����� �� �������������� ��� ��� ���������� ��� �����������. ����� "
-"���� ��� ��� ������� ��� �����������."
-
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "_Account name:"
-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:99 my-evolution/my-evolution.glade.h:21
-msgid "_Add"
-msgstr "_��������"
-
-#: addressbook/gui/component/addressbook-config.glade.h:25
-#: 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
-msgid "_Edit"
-msgstr "_�����������"
-
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
-msgstr "_� ����������� ��� ������� �����������"
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
-msgstr "_����:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
-msgstr "����� _����������:"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "_����� ������"
 
-#: 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "��� ���� ������ � ������������ ��� gnome-vfs"
 
-#: addressbook/gui/component/addressbook.c:499
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "��� ���� ������ �� ������� ��� ������� �����������"
 
-#: 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"
@@ -959,7 +558,7 @@ msgstr ""
 "�������� ��� ����� ��������� ����� URI, � ��� � ������������ LDAP �����\n"
 "����� �����������"
 
-#: 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"
@@ -971,7 +570,7 @@ msgstr ""
 "��������� �� ��������� ��� ��� ����� CVS ���� ������\n"
 "���� ��� OpenLDAP ��� ��� �������� ��������.\n"
 
-#: 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."
@@ -979,47 +578,50 @@ msgstr ""
 "��� ���� ������ �� ������� ��� ������� �����������.  �������� ������� ��\n"
 "� �������� ������� ��� ��� ����� �� �������� ��������� �� ����."
 
-#: addressbook/gui/component/addressbook.c:654
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "���������� ������ ��������� ��� %s (������� %s)"
 
-#: addressbook/gui/component/addressbook.c:822
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "���� ����� ��������"
-
-#: addressbook/gui/component/addressbook.c:823
-msgid "Name contains"
-msgstr "�� ����� ��������"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "�������� ��"
 
-#: addressbook/gui/component/addressbook.c:824
-msgid "Email contains"
-msgstr "�� Email ��������"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "Email 2"
 
-#: addressbook/gui/component/addressbook.c:825
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "� ��������� �����"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:826 widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:772
+#: 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
 msgid "Advanced..."
 msgstr "��� �������������..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1053
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "���� ���������"
 
-#: addressbook/gui/component/addressbook.c:1136
+#: addressbook/gui/component/addressbook.c:1083
 msgid "The URI that the Folder Browser will display"
 msgstr "�� URI ��� �� ��������� � ��������� �������"
 
 #: 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:1758
 msgid "Primary Email"
 msgstr "�������� Email"
 
@@ -1065,6 +667,621 @@ 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
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "����� ������� �����������"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "������������"
+
+#: 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 ""
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "DN Customization"
+msgstr "����� �����������"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "���_�����"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "����� _��������:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "��������� Email:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "����������� Evolution"
+
+#: 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/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"�� Evolution �� ������������� ����� �� ��������� ��� ��� ����������� ��� "
+"���� ����������"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "��_����"
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "���������"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "���������"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, 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/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
+#, fuzzy
+msgid "R_estore Defaults"
+msgstr "��' �������"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "��' �������"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "��������� �� _�����:"
+
+#. 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 "������� ���������"
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:65
+#, fuzzy
+msgid "Step 1: Server Information"
+msgstr "����������� �����"
+
+#: 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/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/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:55 mail/mail-config.glade.h:136
+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:139
+msgid "_Add"
+msgstr "_��������"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_��������"
+
+#: 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 "�������� ���������"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "������������"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_�������� ����"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_��������"
+
+#: 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:152 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 "_�����������"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "����������� _��������"
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_��������"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_����:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "��' �������"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "���� _����������:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "����� _����������:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "������ ��� ������� ��������� (�����)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "����������� %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "������������-������-������"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "����� �����"
+
+#: 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/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/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "������� ���������"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "���������� �������� �������� ��� ������� ����������� ��� Evolution."
@@ -1074,9 +1291,9 @@ msgid "Factory for the Addressbook's name selection interface"
 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
+#: 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
 msgid "Remove"
 msgstr "��������"
 
@@ -1105,7 +1322,12 @@ msgstr "(%d ��� �����������)"
 msgid "Unnamed Contact"
 msgstr "����� ����� �����"
 
-#: addressbook/gui/component/select-names/e-select-names.c:581
+#: 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"
@@ -1122,7 +1344,7 @@ msgstr ""
 "�������� ������� ��� ������ ���� Jon Trowbridge <trow@ximian.com> �� ���\n"
 "��������� ������� ���� ��� ��� �������� ������ ���� �� ������.  ������������."
 
-#: 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"
@@ -1135,31 +1357,40 @@ msgstr ""
 "���� �� ������ �� �������������� �� Evolution �����������\n"
 "�� ����� �� ��������."
 
-#: 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
-msgid "C_ontaining:"
-msgstr "_��������:"
+msgid "Select Names"
+msgstr "������� ��������"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "��_����"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "�������� ������;"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "������� ��������"
+#, 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 ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "_Browse..."
+msgstr "_����������..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_���������:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_�������:"
 
@@ -1199,7 +1430,7 @@ msgstr "����������"
 
 #. 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:1365
 msgid "Contact Editor"
 msgstr "������������ ������"
 
@@ -1226,10 +1457,6 @@ msgstr "������������ _��:"
 msgid "Full _Name..."
 msgstr "_������ �����..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "������"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1277,10 +1504,11 @@ 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:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1477 mail/mail-config.glade.h:105
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "��_������"
 
@@ -1308,27 +1536,1135 @@ msgstr "URL _�������� �����������:"
 msgid "_Web page address:"
 msgstr "_��������� �����������:"
 
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
+msgstr "�������� ���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#, fuzzy
+msgid "Afghanistan"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: my-evolution/Locations.h:42
+msgid "Albania"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: my-evolution/Locations.h:54
+msgid "Algeria"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+msgid "American Samoa"
+msgstr "����������� �����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#, fuzzy
+msgid "Andorra"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#, fuzzy
+msgid "Angola"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#, fuzzy
+msgid "Anguilla"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#, fuzzy
+msgid "Antarctica"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#, fuzzy
+msgid "Antigua And Barbuda"
+msgstr "��������� ��� �����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: my-evolution/Locations.h:120
+msgid "Argentina"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#, fuzzy
+msgid "Armenia"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#, fuzzy
+msgid "Aruba"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: my-evolution/Locations.h:154
+msgid "Australia"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: my-evolution/Locations.h:155
+msgid "Austria"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#, fuzzy
+msgid "Azerbaijan"
+msgstr "�������/��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: my-evolution/Locations.h:161
+msgid "Bahamas"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: my-evolution/Locations.h:164
+msgid "Bahrain"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+msgid "Bangladesh"
+msgstr "������������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#, fuzzy
+msgid "Barbados"
+msgstr "�����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+msgid "Belarus"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: my-evolution/Locations.h:216
+msgid "Belgium"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: my-evolution/Locations.h:218
+msgid "Belize"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#, fuzzy
+msgid "Benin"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+msgid "Bermuda"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#, fuzzy
+msgid "Bhutan"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: my-evolution/Locations.h:270
+msgid "Bolivia"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#, fuzzy
+msgid "Bosnia And Herzegowina"
+msgstr "������-����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#, fuzzy
+msgid "Botswana"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#, fuzzy
+msgid "Bouvet Island"
+msgstr "����� ����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: my-evolution/Locations.h:294
+msgid "Brazil"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+msgid "British Indian Ocean Territory"
+msgstr "��������� ����� ������� �������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+msgid "Brunei Darussalam"
+msgstr "�������� �����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: my-evolution/Locations.h:320
+msgid "Bulgaria"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+msgid "Burkina Faso"
+msgstr "��������� ����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#, fuzzy
+msgid "Burundi"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#, fuzzy
+msgid "Cambodia"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#, fuzzy
+msgid "Cameroon"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: my-evolution/Locations.h:354
+msgid "Canada"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#, fuzzy
+msgid "Cape Verde"
+msgstr "������� ���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: my-evolution/Locations.h:389
+msgid "Cayman Islands"
+msgstr "����� ������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+msgid "Central African Republic"
+msgstr "���������� ��������� �������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#, fuzzy
+msgid "Chad"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: my-evolution/Locations.h:438
+msgid "Chile"
+msgstr "����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#, fuzzy
+msgid "China"
+msgstr "����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: my-evolution/Locations.h:451
+msgid "Christmas Island"
+msgstr "����� �������������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+msgid "Cocos (Keeling) Islands"
+msgstr "����� ����� (�������)"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: my-evolution/Locations.h:483
+msgid "Colombia"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#, fuzzy
+msgid "Comoros"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#, fuzzy
+msgid "Congo"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#, fuzzy
+msgid "Cook Islands"
+msgstr "����� ����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: my-evolution/Locations.h:517
+msgid "Costa Rica"
+msgstr "����� ����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+msgid "Cote d'Ivoire"
+msgstr "���� ������������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: my-evolution/Locations.h:528
+msgid "Croatia"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: my-evolution/Locations.h:532
+msgid "Cuba"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: my-evolution/Locations.h:545
+msgid "Cyprus"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: my-evolution/Locations.h:546
+msgid "Czech Republic"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: my-evolution/Locations.h:580
+msgid "Denmark"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+msgid "Djibouti"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+msgid "Dominica"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: my-evolution/Locations.h:608
+msgid "Dominican Republic"
+msgstr "���������� ����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+msgid "East Timor"
+msgstr "��������� �����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: my-evolution/Locations.h:641
+msgid "Ecuador"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: my-evolution/Locations.h:650
+msgid "Egypt"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: my-evolution/Locations.h:666
+msgid "El Salvador"
+msgstr "�� ��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+msgid "Equatorial Guinea"
+msgstr "��������� �������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#, fuzzy
+msgid "Eritrea"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: my-evolution/Locations.h:684
+msgid "Estonia"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+msgid "Ethiopia"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#, fuzzy
+msgid "Falkland Islands"
+msgstr "����� ������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#, fuzzy
+msgid "Faroe Islands"
+msgstr "����� ������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+msgid "Fiji"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: my-evolution/Locations.h:716
+msgid "Finland"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: my-evolution/Locations.h:766
+msgid "France"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+msgid "French Guiana"
+msgstr "������� �������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+msgid "French Polynesia"
+msgstr "������� ���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#, fuzzy
+msgid "French Southern Territories"
+msgstr "�������� ������ ��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#, fuzzy
+msgid "Gabon"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#, fuzzy
+msgid "Gambia"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: my-evolution/Locations.h:811
+msgid "Georgia"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: my-evolution/Locations.h:812
+msgid "Germany"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#, fuzzy
+msgid "Ghana"
+msgstr "����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: my-evolution/Locations.h:815
+msgid "Gibraltar"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: my-evolution/Locations.h:846
+msgid "Greece"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#, fuzzy
+msgid "Greenland"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#, fuzzy
+msgid "Grenada"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#, fuzzy
+msgid "Guadeloupe"
+msgstr "�������/�����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#, fuzzy
+msgid "Guam"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: my-evolution/Locations.h:867
+msgid "Guatemala"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#, fuzzy
+msgid "Guinea"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+msgid "Guinea-bissau"
+msgstr "�������-�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#, fuzzy
+msgid "Guyana"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: my-evolution/Locations.h:888
+msgid "Haiti"
+msgstr "����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+msgid "Heard And McDonald Islands"
+msgstr "���� ����� ��� ����� ����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Holy See"
+msgstr "���� ����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: my-evolution/Locations.h:945
+msgid "Honduras"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: my-evolution/Locations.h:946
+msgid "Hong Kong"
+msgstr "����� �����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: my-evolution/Locations.h:966
+msgid "Hungary"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: my-evolution/Locations.h:978
+msgid "Iceland"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: my-evolution/Locations.h:991
+msgid "India"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+msgid "Indonesia"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: my-evolution/Locations.h:1007
+msgid "Ireland"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+msgid "Israel"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: my-evolution/Locations.h:1016
+msgid "Italy"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: my-evolution/Locations.h:1031
+msgid "Jamaica"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: my-evolution/Locations.h:1035
+msgid "Japan"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: my-evolution/Locations.h:1046
+msgid "Jordan"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#, fuzzy
+msgid "Kazakhstan"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#, fuzzy
+msgid "Kenya"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+msgid "Kiribati"
+msgstr "���������"
+
+#: 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/e-contact-editor-address.c:241
+msgid "Kyrgyzstan"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#, fuzzy
+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
+msgid "Lebanon"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#, fuzzy
+msgid "Lesotho"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
+msgid "Liberia"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#, fuzzy
+msgid "Liechtenstein"
+msgstr "�����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: my-evolution/Locations.h:1234
+msgid "Lithuania"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: my-evolution/Locations.h:1268
+msgid "Luxembourg"
+msgstr "������������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#, fuzzy
+msgid "Macau"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#, fuzzy
+msgid "Macedonia"
+msgstr "����� �������������� ���������� ��� ���������� (����)"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+msgid "Madagascar"
+msgstr "�����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#, fuzzy
+msgid "Malawi"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#, fuzzy
+msgid "Malaysia"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#, fuzzy
+msgid "Maldives"
+msgstr "�������/��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#, fuzzy
+msgid "Mali"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
+msgid "Malta"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#, fuzzy
+msgid "Marshall Islands"
+msgstr "����� ������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#, fuzzy
+msgid "Martinique"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#, fuzzy
+msgid "Mauritania"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+msgid "Mauritius"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#, fuzzy
+msgid "Mayotte"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1387
+msgid "Mexico"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#, fuzzy
+msgid "Micronesia"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#, fuzzy
+msgid "Moldova, Republic Of"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#, fuzzy
+msgid "Monaco"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#, fuzzy
+msgid "Mongolia"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#, fuzzy
+msgid "Montserrat"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: my-evolution/Locations.h:1470
+msgid "Morocco"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+msgid "Mozambique"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#, fuzzy
+msgid "Myanmar"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+msgid "Namibia"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#, fuzzy
+msgid "Nauru"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+msgid "Nepal"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
+msgid "Netherlands"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+msgid "Netherlands Antilles"
+msgstr "���������� ��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#, fuzzy
+msgid "New Caledonia"
+msgstr "��� �����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1560
+msgid "New Zealand"
+msgstr "��� ��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: my-evolution/Locations.h:1562
+msgid "Nicaragua"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#, fuzzy
+msgid "Niger"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#, fuzzy
+msgid "Nigeria"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#, fuzzy
+msgid "Niue"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: my-evolution/Locations.h:1574
+msgid "Norfolk Island"
+msgstr "����� �������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+msgid "Northern Mariana Islands"
+msgstr "����� ������� ���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
+msgid "Norway"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1632
+msgid "Oman"
+msgstr "����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
+msgid "Pakistan"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#, fuzzy
+msgid "Palau"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+msgid "Palestinian Territory"
+msgstr "������������ �����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
+msgid "Panama"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+msgid "Papua New Guinea"
+msgstr "������-��� �������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1688
+msgid "Paraguay"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
+msgid "Peru"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#, fuzzy
+msgid "Philippines"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#, fuzzy
+msgid "Pitcairn"
+msgstr "�������� ������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
+msgid "Poland"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
+msgid "Portugal"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1824
+msgid "Puerto Rico"
+msgstr "������� ����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
+msgid "Qatar"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#, fuzzy
+msgid "Reunion"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
+msgid "Romania"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+msgid "Russian Federation"
+msgstr "������ ����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+msgid "Rwanda"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+msgid "Saint Kitts And Nevis"
+msgstr "����� ���� ��� �����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#, fuzzy
+msgid "Saint Lucia"
+msgstr "����� ������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+msgid "Saint Vincent And The Grena-dines"
+msgstr "����� ��������� ��� �����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#, fuzzy
+msgid "Samoa"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#, fuzzy
+msgid "San Marino"
+msgstr "����� �������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+msgid "Sao Tome And Principe"
+msgstr "��� ���� ��� ���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: my-evolution/Locations.h:2035
+msgid "Saudi Arabia"
+msgstr "�������� ������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+msgid "Senegal"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#, fuzzy
+msgid "Seychelles"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+msgid "Sierra Leone"
+msgstr "������ �����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2090
+msgid "Singapore"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: my-evolution/Locations.h:2103
+msgid "Slovakia"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: my-evolution/Locations.h:2104
+msgid "Slovenia"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#, fuzzy
+msgid "Solomon Islands"
+msgstr "����� ������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#, fuzzy
+msgid "Somalia"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2119
+msgid "South Africa"
+msgstr "����� ������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+msgid "South Georgia And The South Sandwich Islands"
+msgstr "����� ������� ��� ����� ���� ���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
+msgid "Spain"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#, fuzzy
+msgid "Sri Lanka"
+msgstr "��� �����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#, fuzzy
+msgid "St. Helena"
+msgstr "���� �����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+msgid "St. Pierre And Miquelon"
+msgstr "����� ���� ��� �������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#, fuzzy
+msgid "Sudan"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
+msgid "Suriname"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+msgid "Svalbard And Jan Mayen Islands"
+msgstr "����� ���������� ��� ���� ������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+msgid "Swaziland"
+msgstr "�����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
+msgid "Sweden"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2183
+msgid "Switzerland"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
+msgid "Taiwan"
+msgstr "������"
+
+#: 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/gui/contact-editor/e-contact-editor-address.c:334
+#, fuzzy
+msgid "Thailand"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+msgid "Togo"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#, fuzzy
+msgid "Tokelau"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#, fuzzy
+msgid "Tonga"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+msgid "Trinidad And Tobago"
+msgstr "���������� ��� ��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#, fuzzy
+msgid "Tunisia"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
+msgid "Turkey"
+msgstr "�������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+msgid "Turkmenistan"
+msgstr "�������������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+msgid "Turks And Caicos Islands"
+msgstr "����� ������ ��� ������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+msgid "Tuvalu"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+msgid "Uganda"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
+msgid "Ukraine"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#, fuzzy
+msgid "United Arab Emirates"
+msgstr "������� ������� �������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2342
+msgid "United Kingdom"
+msgstr "������� ��������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+msgid "United States Minor Outlying Islands"
+msgstr "����� ����������� ����� �������� ���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: my-evolution/Locations.h:2348
+msgid "Uruguay"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+msgid "Uzbekistan"
+msgstr "������������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#, fuzzy
+msgid "Vanuatu"
+msgstr "���������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2380
+msgid "Venezuela"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
+msgid "Viet Nam"
+msgstr "�������"
+
+#: 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/e-contact-editor-address.c:357
+msgid "Western Sahara"
+msgstr "������ ������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
+msgid "Yemen"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2524
+msgid "Yugoslavia"
+msgstr "�������������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+msgid "Zambia"
+msgstr "������"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+msgid "Zimbabwe"
+msgstr "����������"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "�������� ������;"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:757
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
 msgid "Category editor not available."
 msgstr "� ������������ ���������� ��� ����� ����������."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:764
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
 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:1044
 msgid "Save Contact as VCard"
 msgstr "���������� ������ �� VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2309
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�� ������� ��������� ��� �� �����: `%s'"
@@ -1342,7 +2678,7 @@ msgid "Edit Full"
 msgstr "������ �����������"
 
 #: 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 "������ �����"
 
@@ -1549,7 +2885,7 @@ msgstr ""
 "��� �� ����� ��� ������.  ������ ���������� �� ���������;"
 
 #: 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 "����������� ���������"
 
@@ -1558,171 +2894,115 @@ msgstr "����������� ���������"
 msgid "Search"
 msgstr "���������"
 
-#: 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:140
 msgid "1 card"
 msgstr "1 �����"
 
-#: 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: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:277
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "�������"
-
-#: 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:280
-#: addressbook/gui/widgets/e-addressbook-view.c:836
-msgid "Send Message to Contact"
-msgstr "�������� ��������� ��� �����"
-
-#: 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:283
-#: addressbook/gui/widgets/e-addressbook-view.c:839
-msgid "Print Envelope"
-msgstr "�������� �������"
-
-#: 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 "�������"
-
-#: 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 "���������"
-
-#: 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: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
-msgid "Delete"
-msgstr "��������"
+#: 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
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: 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:1043
 msgid "Success"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: 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:1894
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
+#: 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
 msgid "Unknown error"
 msgstr "������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "������ ������� ����� �������"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "��� ����������� � ��������"
 
-#: 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 "�� ������������� ������ ������� ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "��� ������������� �� ����������"
 
-#: 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 camel/camel-service.c:610
-#: camel/camel-service.c:646
+#: 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
 msgid "Cancelled"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "���� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "������ �� ������������ ��� �������;"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "������ ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "������ ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "������ ������������ ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "������ ���������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1389
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "������ ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:202
+#: addressbook/gui/widgets/e-addressbook-util.c:204
 #, fuzzy
 msgid "Display Cards?"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:203
+#: addressbook/gui/widgets/e-addressbook-util.c:205
 #, fuzzy
 msgid "Display Cards"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -1730,81 +3010,203 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 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: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"
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+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: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"
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "����� �����"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "����� �����"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "����� �����"
 
-#: 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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "�������� ��������"
 
-#: 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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "�������� ��������"
 
-#: 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:967
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "�������� ���������"
 
-#: 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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "��������� ��������"
 
-#: 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:972
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "������ ��������"
 
-#: 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:976
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "�������� �������� 2"
 
-#: 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:979
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "���� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:985
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "���������� �� (VCard)"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "��� �����"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "��� ����� ������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_�������� ���� ������..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_��������..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_��������� ������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_����� ������� �����������..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "��������� ���������� _�������..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "�������� ������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "�������� ��������� ��� �����"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "�������� �������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "��������� ��� ������..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "_���������� ��� ������..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "�������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_�������� �������"
+
+#. 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:940
+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:945
+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."
@@ -1818,11 +3220,12 @@ msgstr "��� ���� ��� �����."
 msgid "Save in addressbook"
 msgstr "���������� ��� ������ �����������"
 
-#: 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 ""
@@ -1832,6 +3235,19 @@ msgstr ""
 "\n"
 "����� ���� ��� ��� �� ���������� ��� ��� �����"
 
+#: 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
 msgid "Card View"
 msgstr "������� ������"
@@ -1919,6 +3335,7 @@ msgid "Include:"
 msgstr "���� ��:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "���������"
 
@@ -1943,11 +3360,12 @@ msgid "Options"
 msgstr "��������"
 
 #: 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
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "������"
 
@@ -1963,7 +3381,9 @@ msgstr "�����"
 msgid "Paper source:"
 msgstr "���� �������:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "����������"
 
@@ -2023,41 +3443,46 @@ msgstr "_�������������..."
 msgid "Untitled appointment"
 msgstr "�������� ����� �����"
 
-#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:679
+#: 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
 msgid "High"
 msgstr "�����"
 
-#: 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 mail/message-list.c:678
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "��������"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:677
+#: 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
 msgid "Low"
 msgstr "������"
 
 #. 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
 msgid "Undefined"
 msgstr "�������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1149
-#: calendar/conduits/todo/todo-conduit.c:761
+#: 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:1296
-#: calendar/conduits/calendar/calendar-conduit.c:1299
+#: 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:877
-#: calendar/conduits/todo/todo-conduit.c:880
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "_�������������"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "��� ���� ������ � �������� ��� �������� ������������ ��� ���������� �������"
@@ -2071,41 +3496,55 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "��� ���������� ���������� ������� ��� ��� �������� �����������."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "��������� ����������� ��� ��������"
+
+#: 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:5
 msgid "Evolution calendar executive summary component."
 msgstr "��������� ������������ ��������� ����������� Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 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:8
 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:9
 msgid "Factory for the Evolution Tasks control"
 msgstr "���������� ��� �� ��������� �������� Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "��������� ��� �� ��������� �������� iTip �����������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "���������� ��� �� ��������� ��������� �����������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "���������� ��� ��� ����������� ��� ���������� �������� ��� �����������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr "���������� ��� ��� ���������� ���������� ����������� �����������"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 "�������� ����������� �����������"
@@ -2157,7 +3596,7 @@ msgstr ""
 "�������� �� ��� �������� ����������."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2231
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�������������"
@@ -2184,7 +3623,7 @@ msgstr ""
 msgid "Do not ask me about this program again."
 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:58
 msgid "Could not initialize GNOME"
 msgstr "��� ���� ������ ������������ ��� GNOME"
 
@@ -2196,52 +3635,52 @@ msgstr "��� ���� ������ � ���������� ��� ��������� �����������"
 msgid "Could not create the alarm notify service factory"
 msgstr "��� ���� ������ � ���������� ��� ����������� ��� ��������� �����������"
 
-#: 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:51
 msgid "Description contains"
 msgstr "� ��������� ��������"
 
-#: 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
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "����������"
 
-#: calendar/gui/calendar-commands.c:446
+#: 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 "%d %a %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 ""
@@ -2280,8 +3719,8 @@ msgstr "�"
 msgid "Free"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:432
-#: shell/evolution-shell-component.c:1029
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 msgid "Busy"
 msgstr "������������"
 
@@ -2297,7 +3736,7 @@ 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:329 calendar/gui/e-meeting-model.c:352
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "������������"
 
@@ -2313,9 +3752,10 @@ 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/mail-account-gui.c:1497
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
-#: mail/mail-config.glade.h:55
+#: 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
 #: 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
@@ -2330,21 +3770,15 @@ msgstr "���������"
 msgid "Assigned"
 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/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
 msgid "Yes"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr "���"
 
-#. 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
 msgid "Day View"
 msgstr "������� ������"
@@ -2361,46 +3795,80 @@ msgstr "������� ���������"
 msgid "Month View"
 msgstr "������� ����"
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-#: shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "����������"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "������� ��� �������� �������� ��� ��������"
 
-#: calendar/gui/component-factory.c:68 my-evolution/e-summary-tasks.c:240
-#: my-evolution/e-summary-tasks.c:257 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "��������"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "������� ��� �������� �������� ����-���������"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "���������� ���� ��������"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "��������� ����������� ��������"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "���������"
+
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "��� �������"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "_�������"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "��� ��������"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "��� �_��������"
 
-#: 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:707
+#, fuzzy
+msgid "New appointment"
+msgstr "��� ��������"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "��� �������"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "��������"
+
+#: 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:167
 msgid "The URI that the calendar will display"
 msgstr "�� URI ��� �� ��������� �� ����������"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "������ ��� �������� ����� ��� �������"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "�������� �������� �����������"
@@ -2466,9 +3934,7 @@ msgstr "�������� ����� ����"
 msgid "hours"
 msgstr "����"
 
-#: 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 "�����"
 
@@ -2625,7 +4091,7 @@ msgstr "����� ��� ��������"
 msgid "hour(s)"
 msgstr "���(��)"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "�����(�)"
 
@@ -2666,170 +4132,168 @@ msgid "Color for tasks due today"
 msgstr "����� ��� ��� �������� ��� ������ ������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "���������� ���� �������� �� ��' ������� _����������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "����� ����� ��� _���������:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "���������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 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:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "�������� ��� ����� ����:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
-msgstr "�������� ������ ������ �������� ���� �������� ��������� ��� ����"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "�������� ������� ��������� ���� ��������� �����������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Sta_rt of day:"
 msgstr "��_�� ������:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "������������ ��� ������ ������:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "_����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "�_����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "������������ ��� ������ ������:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "_����� ��������"
 
-#: 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:25
 msgid "Time"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "_���� ������� ����:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "_���������� ����:"
-
-#: 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: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:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "�������� ��������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "12 ���� (��/��)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "_������� ����������� ��� �� �������� ��� ������������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "�������� ��������������� ���� ������� �������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_��������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_End of day:"
 msgstr "_����� ������:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "_�������� ������������� �������� ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_�����"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "�������� ��� ����� ����:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "_����� ��������"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "�������� ������ ������ �������� ���� �������� ��������� ��� ����"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "_���������� ����:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "���� ��� ��� ���� ��� ��������"
 
@@ -2900,73 +4364,60 @@ msgstr ""
 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 " �� "
 
-#: 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: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/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:321
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "��� ���� ������ � ��������� ��� ������������!"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "����������� ��������"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "�������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "������������ ���������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "����� ��������"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2011
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "��������� �������;"
-
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2018
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"�������  ��� ������ �� ���� �� �����\n"
-"�� ����� ���������;"
-
-#: 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: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
+msgid "Save as..."
+msgstr "���������� ��..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "��� ���� ������ �� ��������� � �������� ������!"
 
@@ -3039,13 +4490,13 @@ 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:365
 msgid "Scheduling"
 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:368
 msgid "Meeting"
 msgstr "���������"
 
@@ -3175,14 +4626,14 @@ 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:47
-#: mail/message-list.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
+#: mail/message-list.etspec.h:11
 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 mail/mail-config.glade.h:94
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "�����"
@@ -3197,7 +4648,7 @@ msgid "_Change Organizer"
 msgstr "������� ����������"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "_��������� �����..."
 
@@ -3205,29 +4656,100 @@ msgstr "_��������� �����..."
 msgid "_Other Organizer"
 msgstr "����� �����������"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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: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:997
 msgid "on"
 msgstr "���"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: 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 "������������"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "����"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "�������"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "�����"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "���� ���"
+
+#: 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:1260
 msgid "on the"
 msgstr "���"
 
-#: 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 "����������"
 
@@ -3328,7 +4850,7 @@ msgid "Progress"
 msgstr "�������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -3340,15 +4862,19 @@ msgstr "_�������������"
 msgid "_Status:"
 msgstr "_���������:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "������"
+
 #: 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:324
 msgid "Assignment"
 msgstr "�������"
 
 #: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "���������:"
 
@@ -3360,60 +4886,80 @@ msgstr "���������� �_������:"
 msgid "_Due Date:"
 msgstr "���������� _�����:"
 
-#: 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:751 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:960 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1454
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_�������"
 
-#: 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:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "���������� ��..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "_��������..."
+
+#: calendar/gui/e-calendar-table.c:978 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: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:979 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: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:980 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 "����������"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "������� ��������"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "�������� �� i_Calendar"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_�������� �� ������������"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "_�������� ����� ��� ��������"
-
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_�������� �������� �� �������������"
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_�������� ����������� ��������"
 
-#: 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:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "���������� ������������"
 
-#: calendar/gui/e-calendar-table.c:1247
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "���� ��� ��� �������� ��������"
 
@@ -3421,8 +4967,8 @@ msgstr "���� ��� ��� �������� ��������"
 msgid "Alarms"
 msgstr "������������"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:885
-#: camel/camel-filter-driver.c:987
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "������������"
 
@@ -3453,8 +4999,7 @@ 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:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1483
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "��������"
 
@@ -3496,110 +5041,177 @@ msgstr "%02i ������� ������"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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/e-day-view.c:638 calendar/gui/e-week-view.c:375
 msgid "am"
 msgstr "��"
 
 #. 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
 msgid "pm"
 msgstr "��"
 
-#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "��� �_��������"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "��� _������� ��������� ��� ������"
 
-#: 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:3553 calendar/gui/e-week-view.c:3440
+#, fuzzy
+msgid "New Meeting"
+msgstr "���������"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "��� �������"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "��������..."
+
+#: 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 "������� ��� _������"
 
-#: 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 "_������� ���� ����������..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-msgid "_Delete this Appointment"
-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 "����_������ ����������� ��������������"
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
+#, fuzzy
+msgid "_Configure..."
+msgstr "���������� ���� � /%s"
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
+msgid "_Save As..."
+msgstr "�_��������� ��..."
+
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "��������������� _����������"
+
+#: 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: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:3461
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "�������� ����� ��� _���������"
 
-#: 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 "�������� �_��� ��� ����������"
 
-#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:1013
-#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:292
-#: calendar/gui/e-meeting-model.c:357
-#: 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-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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
+#, 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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1315
+#: calendar/gui/e-itip-control.c:1564
 msgid "Calendar file could not be updated!\n"
 msgstr "��� ���� ������ �� ���������\n"
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "� �������� ������������\n"
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"��� ���� ������ � �������� ��� ���������� ��������������� ������ �� �������� "
+"��� ������� �����"
+
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "��� ���� ������ � ��������� ��� ���������� ��������������� ���� ���� �� "
 "������� ����������\n"
 
-#: calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1638
 msgid "Attendee status could not be updated!\n"
 msgstr "��� ���� ������ � �������� ��� ���������� ���������������\n"
 
-#: calendar/gui/e-itip-control.c:1372
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "� ��������� ��������������� ����������\n"
 
-#: calendar/gui/e-itip-control.c:1374
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"��� ���� ������ � �������� ��� ���������� ��������������� ������ �� �������� "
-"��� ������� �����"
-
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "� �������� ������������"
 
-#: calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "�� �������� ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "��� ���� ������ � �������� ��� ���������!\n"
 
-#: calendar/gui/e-itip-control.c:1648
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
-"��� ���� ������ � ������ ��� ���������� ��� ���� ����� ���������������!\n"
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "������� �������"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "������� �������"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -3638,199 +5250,213 @@ msgstr "���������� ������"
 msgid "date-start"
 msgstr "���������� �������"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "����� ����������"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "����������� �������������"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "������������ �������������"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "��-�������������"
 
-#: 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:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "�����"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "�����"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "�����"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "�������"
 
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "���������"
 
-#: 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:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "����������� ����������"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "������������ ����������"
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "��-����������"
 
-#: 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: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:321 calendar/gui/e-meeting-model.c:344
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr "�������"
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 msgid "Declined"
 msgstr "������ ���������"
 
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "�����������"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "���������������"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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:2118 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:436
 msgid "Out of Office"
 msgstr "����� ��������"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "����� �����������"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_��������"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "�������� _���� ��� ���� ��������"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "�������� ����������"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "���_����� ��������������"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_�������� �������"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "��� _�� ����� ��� �� �����"
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "��� �� ����� ��� ���� _�����"
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "����������� �����"
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "����������� ����� ��� ���� �����"
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "������ �_������ ����������:"
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "������ _��������� ����������:"
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "������� ��������� ��� %s"
 
-#: 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'"
 
-#: 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/e-tasks.c:629
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "���������� �����������"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "�������� ����������� ������������"
+
+#: calendar/gui/e-tasks.c:659
 #, fuzzy
 msgid "Expunging"
 msgstr "����������� � �������"
 
-#: 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 "��� �_�������..."
 
-#: calendar/gui/gnome-cal.c:1493
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "_�������� ����� ��� ��������"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "������� �� ������� ������� ��� `%s'"
 
-#: calendar/gui/gnome-cal.c:1504
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "� ������� ��� ���������� ��� ��� ������� ��� '%s' ��� �������������"
 
-#: calendar/gui/gnome-cal.c:1859
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "������� ����������� ��� %s"
@@ -3891,227 +5517,223 @@ msgstr "���������"
 msgid "September"
 msgstr "�����������"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr "���������� ����������� ���� ���������������"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "������ �� ������� ���� ����������."
 
-#: calendar/gui/itip-utils.c:370
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "���������� �������������� (%s ��� %s)"
-
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "������ �� ����� ��������������� ��� ���� �� �������."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 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 "��"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "��"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "��"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "��"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "���������� ����� (%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 "���������� �������� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "����������� ����� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "����������� ������ (%Y)"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "�������� �����������"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2508 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:2894
+#: 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:2550
 msgid "Print Item"
 msgstr "�������� ���������"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "��������� ���������"
 
@@ -4122,11 +5744,11 @@ msgstr ""
 " ��� ���� ������ �� ������������ � ������� ��� ��������. �������� ������� "
 "��� ����������� ORBit ��� OAF"
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "�� URI ��� ������� ��������� ���� ��������"
 
-#: calendar/gui/tasks-control.c:434
+#: calendar/gui/tasks-control.c:456
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -4139,10 +5761,16 @@ msgstr ""
 "\n"
 "����� ������� ��� ��� �������� ��� ���������;"
 
-#: calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2245
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "�� ��� ��������� � �������."
 
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "�������� ������"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -4195,106 +5823,130 @@ msgstr "���������� ��� ��� �������� ������� VCard ��� Evolution"
 msgid "Imports iCalendar files into Evolution"
 msgstr "�������� ������� VCard ��� Evolution."
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "�������� ������� VCard ��� Evolution."
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "������ �����������"
+
+#: 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/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "����������"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "� ������ ��������� ���� 0 �����������"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "����������� ������� ��� ������ ��� ��� ���������"
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "����������� ������� ��� ������ �� ����� � ���������� 1 ��������"
 
-#: 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 �� ����� �������� ����������/������ ISO "
 "8601"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "� �������� ������ ������ ���������� �� ���� 2 �����������"
 
-#: calendar/pcs/query.c:317
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:324
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 "� �������� ������ ������ ���������� �� ���� �� ��������� 2 ���� �������"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "� ���� ������ ������ ���������� �� ���� 1 ���������"
 
-#: calendar/pcs/query.c:356
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "�� ������ ������ ������ ���������� �� ���� 1 ���������"
 
-#: calendar/pcs/query.c:388
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: 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:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:691
+#: calendar/pcs/query.c:693
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", "
 "\"description\""
 msgstr ""
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
@@ -5835,14 +7487,14 @@ msgstr "� ������������� ��� ������������� ��� ���� �� cipher"
 msgid "Decryption is not supported by this cipher"
 msgstr "� ���������������� ��� ������������� ��� ���� �� cipher"
 
-#: camel/camel-data-cache.c:159
+#: camel/camel-data-cache.c:169
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr ""
 "��� ����� ������ � ���������� ��� ������� ������: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:426
+#: camel/camel-data-cache.c:441
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "��� ���� ������ � ���������� ��� ��������� %s: %s"
@@ -5878,51 +7530,51 @@ msgid "You must be working online to complete this operation"
 msgstr ""
 "������ �� ����� ���������� ��� ������ ��� �� ����������� ���� � ����������"
 
-#: camel/camel-filter-driver.c:649 camel/camel-filter-driver.c:658
+#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
 msgid "Syncing folders"
 msgstr "������������ �������"
 
-#: camel/camel-filter-driver.c:750 camel/camel-filter-driver.c:1130
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "������ ���� ������� �������: %s: %s"
 
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ���� �������� �������: %s: %s"
 
-#: camel/camel-filter-driver.c:826
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:835
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:850
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "���� ��������� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:854
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "��� ���� ������ �� ������� ��� ���������"
 
-#: camel/camel-filter-driver.c:855 camel/camel-filter-driver.c:867
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "�������� ��� ������ %d"
 
-#: camel/camel-filter-driver.c:881 camel/camel-filter-driver.c:982
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "������������ �������"
 
-#: camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "���� ��������� %d ��� %d"
 
-#: camel/camel-filter-driver.c:964
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "�������� ��� ������ %d ��� %d"
@@ -5937,14 +7589,14 @@ msgstr "�������� ���� ��� ��������������� ��� ���������."
 msgid "Error executing filter search: %s: %s"
 msgstr "������ ���� �������� ���������� �������: %s: %s"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5953,36 +7605,32 @@ msgstr ""
 "������ ���� �������� �������� ����������: %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 ""
 
-#: 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
-msgid "Invalid type in body-contains, expecting string"
-msgstr ""
-
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "�� �������������� ���������� : ������� ���������: ���  %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "�� �������������� ����������: ��������� ����� ��������: ��� %s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "�� �������������� ����������: ��������� ����� ���������� ������: ��� %s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "���������� ���������"
 
@@ -6093,190 +7741,142 @@ msgstr ""
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
 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:628 camel/camel-pgp-context.c:802
 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: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:755
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:953
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 "��� ���� ������ � ���������� ��� ���������: ��� ������� ���� ������� ��� "
 "����������"
 
-#: camel/camel-pgp-context.c:959
+#: 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:970
+#: 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:1143
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 "��� ���� ������ � ������������� ��� ���������: ��� ������� ���� ������� ��� "
 "�������������"
 
-#: camel/camel-pgp-context.c:1153
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr "��� ���� ������ � ������������� ��� ���������: ��� ������ �������"
 
-#: camel/camel-pgp-context.c:1160
+#: 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:1169
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 "��� ���� ������ � ������������� ��� ���������: ��� ����� ������� ����������"
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 "��� ���� ������ � ���������������� ��� ���������:  ��� ������� ciphertext "
 "��� ����������������"
 
-#: camel/camel-pgp-context.c:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr "��� ���� ������ � ���������������� ��� ���������: ��� ������ �������"
 
-#: camel/camel-pgp-context.c:1352
+#: 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:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "���� �� ������ ��� ��������� ����� ������� �������������"
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "�������� �������� ������ ��������� ��� %s"
-
-#: camel/camel-pkcs7-context.c:213
-#, fuzzy
-msgid "Error hashing password."
-msgstr "������ ��������� ������"
-
-#: camel/camel-pkcs7-context.c:222
-#, fuzzy
-msgid "Invalid password."
-msgstr "�� ������ ����������"
-
-#: camel/camel-pkcs7-context.c:329
-#, fuzzy, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "�������� ���� ��� ��������� ��� �������������� \"%s\"."
-
-#: camel/camel-pkcs7-context.c:378
-#, fuzzy, c-format
-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 ""
-
-#: camel/camel-pkcs7-context.c:590
-#, fuzzy
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "��� ���� ������ � ���������� ������������ ������������� PGP."
-
-#: camel/camel-pkcs7-context.c:620
-#, fuzzy, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "��� ���� ������ � ������� �� ��� ���������� :%s"
-
-#: camel/camel-pkcs7-context.c:626
-#, fuzzy
-msgid "Could not encrypt: encoding failed."
-msgstr "��� ���� ������ � ���������� ��� ������� ���������"
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr ""
-
-#: 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:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "��� ���� ������ �� �������� �� %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 ""
 "��� ���� ������ �� �������� �� %s: ��� ������� ������� ������������� ��� "
 "�������."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s ����������� %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s �������� ��� %s ��� %s"
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 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:274
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -6384,12 +7984,13 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "��������� �������� ������������ ��� ��� ����������"
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
+#, fuzzy
+msgid "Login"
 msgstr "���������� ��"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
@@ -6401,9 +8002,22 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "������� ��������� ������������."
 
+#: 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 ""
+"�� ��� ������� ���� �� �������� ���� ���������� �� ��� ����������� Kerberos "
+"4."
+
 #: 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/nntp/camel-nntp-store.c:153
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "������� ���������"
 
@@ -6449,26 +8063,41 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr "� ����������� ��������� '%s' ���������� ��� ��������� �����"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "�������� ���������� �����������: %s: ������������ ��� �������"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "�������� ���������� �����������: %s: �������� �����"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "���������� � ������� %s"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "�������� ���������� �����������: %s: ������������ ��� �������"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "�������� ���������� �����������: %s: �������� �����"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "�������� ������������ ��� ��� �������� ������"
@@ -6477,12 +8106,12 @@ msgstr "�������� ������������ ��� ��� �������� ������"
 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 "��� ������� ���������� �������� ��� �� ���������� `%s'"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6491,6 +8120,11 @@ msgstr ""
 "��� ���� ������ � ���������� ��� ��������� %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "�������� �������� ������ ��������� ��� %s"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "�������� ������� ��������� ���� �������������� ��� �� ����� ��������."
@@ -6523,24 +8157,24 @@ msgstr "�������� ���� ��� ��������������� ��� ���������."
 msgid "Failed to verify certificates."
 msgstr "�������� ���� ��� ���������� ��� ��������������."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "��� ����� ������ �� ����� � ���� ��� �������: �� ������ �� ���� ��� �������"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "��� ����� ������ �� ������������ � �������: �� ������ �� ���� ��� �������"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6557,7 +8191,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:438
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -6566,16 +8200,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:500
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -6600,27 +8234,27 @@ msgstr ""
 msgid "No such message %s in %s"
 msgstr "������ ������ ������ %s ��� %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "������ ������ ������ %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "��� ���� ������ � �������� ��� ������� %s: ����� ����������"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "��� ���� ������ � �������� ��� ������� %s: ��� ������� � �������"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "��� ���� ������ � ����������� ��� ������� %s: ����� ����������"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -6644,62 +8278,62 @@ msgstr "� ������ IMAP �������: %s"
 msgid "Server response ended too soon."
 msgstr "� ����������� ��� ��� ���������� ������������ ��� �����."
 
-#: camel/providers/imap/camel-imap-command.c:608
+#: camel/providers/imap/camel-imap-command.c:610
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "� �������� ��� ���������� ���� ��� �������� ��� ���������� %s"
 
-#: camel/providers/imap/camel-imap-command.c:644
+#: camel/providers/imap/camel-imap-command.c:646
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "����������� �������� �� ��� ��� ���������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "��� ���� ������ � ���������� ��� ��������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "��� ���� ������ � ������� ��� ��������� ���  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "������� ������ ��� ��������� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2104
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "�� ������ ��� ����� ��������� ���� ��� ������"
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "���� ����������� ��������� ��� ��� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "������� ������ ��� ��� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:2141
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
@@ -6712,7 +8346,7 @@ msgstr "������� ��� ��� ��������"
 msgid "Check for new messages in all folders"
 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:1031
 msgid "Folders"
 msgstr "�������"
 
@@ -6747,29 +8381,29 @@ msgstr ""
 "�� ��� ������� ���� �� ����� ������� ���� ���������� IMAP �� ����� ������� "
 "����� ��������."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "� ����������� IMAP %s ��� ����������� ��� ��������� ���� ������������ %s"
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:390
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "�� ��������������� ����� ������������ %s"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s�������� �������� ��� ������ IMAP ��� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "��� ����� ������� ������ ���������."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6780,102 +8414,121 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "��� ������� ������� ������� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "��������� �� ����� ��"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr "��� ��� ���������� ��������� �� ���������� ��������� ��� ��."
 
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "������ ��������"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:76
+#: 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:82
 msgid "Maildir-format mail directories"
 msgstr "��������� ��������� �� ����� Maildir"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr "��� ��� ���������� ������� ��������� �� ���������� maildir"
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "� ������� ��� root %s ��� ����� ������� ����"
 
-#: 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 "� ������� ��� root %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: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: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:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "������ ������ ��������� %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "��� ���� ������ � ����������� ��� ������� %s ��� %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 "��� ���� ������ � ����������� ��� ������� : %s"
+
+#: 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: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/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "��� ���� ������ � ���������� ��� ���������:%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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "��� ���� ������ � �������� ��� ��������� ���� �������� : ������� �����"
 
@@ -6895,7 +8548,7 @@ msgstr "��� ����� ������ � �������� ��������� ���� ������ maildir: %s: %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6907,7 +8560,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "��� ������� ������ ������"
 
@@ -6916,7 +8569,7 @@ msgstr "��� ������� ������ ������"
 msgid "Invalid message contents"
 msgstr "�� ������ ����������� ��� ������"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -6926,14 +8579,14 @@ msgstr ""
 "��� ���� ������ �� ������� ��� �������`%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "� ������� `%s' ��� �������."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -6943,41 +8596,64 @@ msgstr ""
 "��� ���� ������ �� ������������ � �������`%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' ��� ����� ��������� maildir."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "��� ���� ������ � �������� ��� ������� `%s': %s"
 
-#: 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:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, 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: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/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "������� ��� ��� ��������"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "������� �����������"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "��� ����� ������ �� ������� ��� mailbox: %s: %s\n"
@@ -6994,9 +8670,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -7006,16 +8682,16 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "� ������� �������� �� ���� ������������ �����."
 
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "�������� ����������� ���������: �������������  mailbox;"
 
-#: 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"
@@ -7024,7 +8700,7 @@ msgstr ""
 "��� ���� ������ �� ������� ��� �������`%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"
@@ -7033,14 +8709,14 @@ msgstr ""
 "��� ���� ������ � ���������� ��� �������`%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' ��� ����� �������� ������."
 
-#: 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"
@@ -7049,96 +8725,85 @@ msgstr ""
 "��� ���� ������ � �������� ��� ������� `%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 "� ������� `%s' ��� ����� ������. ��� ����� � ��������."
 
-#. 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:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "��� ���� ������ �� ������� ��� �������: %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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "��� ����� ������ �� ������� ��� �������: %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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "��� ����� ������ �� ������� ��� ���������� mailbox: %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
+#: 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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "��� ���� ������ �� �������� ��� ������� ����� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, 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:652
 #, 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "������� ������: %s"
@@ -7157,12 +8822,12 @@ msgstr "��� ����� ������ � �������� ��������� ���� mh ������: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' ��� ����� ���������"
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "��� ����� ������ �� ������ � ���� ��������� ��� ��: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:512
+#: camel/providers/local/camel-spool-folder.c:515
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr ""
@@ -7173,6 +8838,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "� �������`%s/%s' ��� �������."
@@ -7182,89 +8848,55 @@ msgstr "� �������`%s/%s' ��� �������."
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "��� ���� ������ �� ������������ � ���������� ������� %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: 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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "��� ���� ������ � ������������: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "�������� �������� ��� ������ ��������� NNTP ��� %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "� ����������� �������� �� ����� ������"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "�������� ���� ��� �������� ��� �������� ������ ���� ����������"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "� ����������� �������� �� ����� ������/������ ���������"
+#: 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/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:153
-#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/local/camel-spoold-store.c:173
 #, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr ""
-"��� ������ �� ����� � ���� ��� ���������: %s\n"
-"  %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#, fuzzy
-msgid "User cancelled"
-msgstr "� ���������� ���������"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "��� ���� ������ � ���� ��� ������ ������ ��� ��� ����������."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c: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
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "��� ����� ������ ���������� ��� ������ ������ ��� %s: %s"
+msgid "Mail tree %s"
+msgstr "������ ��� ���/��� %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
@@ -7276,12 +8908,12 @@ msgstr ""
 "����� ����� ���� �������� ��� ��� �������� ��� ���������� ��������� �� "
 "������ �������� USENET"
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "�������� USENET ���� %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -7325,67 +8957,76 @@ msgstr "�����"
 msgid "Operation failed: %s"
 msgstr "� ���������� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "�������� ��������� ���"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "��� ����� ������ �� ����� ������� ���� ���������� ��� ��� ��������: %s"
+#: 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:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-"��� ���� ������ �� �������� � �������: � ���������� ��� ��������� ����� "
-"��������."
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "��� ����� ������ � ���� ��� �������: %s: %s"
 
-#: 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:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "��� ����� ������ � ���� ��� ���������: %s"
-
-#: 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: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: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 "�������� ��������� ��� %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid "Message storage"
+#: 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/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "������� ������������ ������������"
 
 #: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr ""
+
+#: 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:43
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "�������� ���� ��� %s �����(��)"
 
-#: 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:84
 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 "��� ��� ������� ��� ���� ��������� ��� ����������� POP."
 
-#: 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."
@@ -7394,7 +9035,7 @@ msgstr ""
 "������� ��������� �� ����� ����� ��������. ����� � ������� ��� ������������ "
 "�� ��� ������ ����������� POP."
 
-#: 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 "
@@ -7404,56 +9045,60 @@ msgstr ""
 "���������������� ������� ���������. ���� ������ �� ��� ���������� ��� ����� "
 "��� �������, ����� ��� �� �� ����������� ������������ �� ��������."
 
-#: camel/providers/pop3/camel-pop3-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
-"�� ������� ���� �� ����� ������� ���� ���������� ��� �� ��� ����� "
-"������������ Kerberos 4."
+"��� ���� ������ � ������� �� ��� ���������� POP.\n"
+"������ ���� ��� �������� ��� �������� ������: %s"
 
-#: 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:210
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "� ���������� ��� �������������"
 
-#: 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:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "� ����������� �������."
 
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
 msgstr "��� ���� ������ � ������� �� ��� ���������� POP ��� :%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%s�������� �������� ��� ������ ��������� POP3 ��� %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:377
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
-"Error sending username: %s"
+"No support for requested authentication mechanism."
 msgstr ""
 "��� ���� ������ � ������� �� ��� ���������� POP.\n"
-"������ ���� ��� �������� ��� �������� ������: %s"
+"��� ������������� � ���������� ������������."
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
-msgid "(Unknown)"
-msgstr "(�������)"
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "� ������ IMAP �������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+#: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
 msgstr ""
-"��� ���� ������ � ������� �� ��� ���������� POP.\n"
-"��� ������������� � ���������� ������������."
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "������ �/�"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7462,18 +9107,13 @@ msgstr ""
 "��� ���� ������ � ������� �� ��� ���������� POP.\n"
 "������ ���� ��� �������� ������� ��������� %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "��� ������� � ������� `%s'."
 
-#: camel/providers/pop3/camel-pop3-store.c:563
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "���������� �������� ��� ��� ���������� ���: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7485,57 +9125,53 @@ msgstr ""
 "��� ��� �������� ��������� �� ��� �������� ��� ��������� \"sendmail\" ��� "
 "������ �������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "��� ���� ������ � ��������� ���������: %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: �� ������ ��� "
 "��������"
 
-#: 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: �� ������ ��� ��������"
 
-#: 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"
 
-#: 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: �� ������ ��� ��������."
 
-#: 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: �� ������ ��� ��������."
 
-#: 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:194
-msgid "Could not find 'From' address in message"
-msgstr "��� ���� ������ � ������ ��� ������ '���' ���� ���������"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-#, fuzzy
-msgid "Could not parse recipient list"
-msgstr "��� ���� ������ � ��������� ���������: %s"
-
-#: 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: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:74
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -7545,128 +9181,151 @@ msgstr ""
 "��� �� �������� ��������� �� ��� ������� �� ������������� mailhub �� ����� "
 "SMTP.\n"
 
-#: 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: 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:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "� ���������� ��� ������� ��� ���� �����������"
 
-#: 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:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "������ ��������"
 
-#: 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "� �������� ������� �� ������ ���������"
 
-#: 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:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "������� � ��������� �������� ������������, ������������"
 
-#: 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 "��� ������� ������� , �� ����� �������� ��� <forward-path>"
 
-#: 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 ""
 "� ��������� �������� ������������ ��� �����������: �� mailbox ��� ����� "
 "���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "� ��������� �������� ��� �����������: �� mailbox ��� ����� ���������"
 
-#: 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:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "��� ������� �������, �������� ��������� <forward-path>"
 
-#: 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: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:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "� ��������� �������� ��� �����������: �� ����� ��� mailbox ��� �����������"
 
-#: 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:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "� ��������� �������"
 
-#: 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:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "� ���������� ������������ ����� ��������"
 
-#: 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:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "��������� �������� ������������"
 
-#: 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:318
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "������ ��������� �����������:%s: ������� ��-�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "�� ������ ������� �� ��� ���� ���������� �����"
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "������ ������������ ����� ������: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, 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"
 msgstr ""
 "� ����������� SMTP %s ��� ����������� ��� ���� ������������ %s ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s�������� �������� ��� ������ ��������� SMTP ��� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7677,142 +9336,138 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "����������� SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "�������� ��������� ���� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-"��� ����� ������ � �������� ��� ���������: ��� ����������� � ��������� "
-"���������."
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "��� ����� ������ � �������� ��� ���������: � ��������� ��������� ��� ����� "
 "������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "������� �������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 "��� ����� ������ � �������� ��� ���������: ��� ������������ ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:615
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "��� ����� ������ � �������� ��� ���������: ��� ������������ ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:674
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "����������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "������ HELO ����� ������:%s: ��-�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:716
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "������ ���� �������� HELO:%s: ��-�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "����������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:754
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "������ ���� ��� ���������� ��� ������������ ������������ SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:769
-#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "������ ������������ ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:790
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "� ������ ������������ �������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "��������� �������� ������������ ��� ��� �����������.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:864
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "������ MAIL FROM ����� ������: %s: �� ������ ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:883
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1081
+#, fuzzy
+msgid "MAIL FROM response error"
 msgstr "������ ��������� MAIL FROM: %s:�� ������ ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:908
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "������ RCPT TO ����� ������: %s:�� ������ ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, 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:961
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "������ DATA ����� ������: %s:�� ������ ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:980
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-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
+#, fuzzy
+msgid "DATA response error"
+msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1020
-#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "����� ������ � �������� DATA: ����������� ���������:  %s: �� ������ ��� "
 "��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1057
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-"������ ��������� DATA: ����������� ���������: %s: �� ������ ��� ��������"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "��������� �������� ������������ ��� ��� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "������ RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1100
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1123
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "������ QUIT ����� ������:%s: ��-�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1142
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "����� ��������� QUIT:%s: ��-�������"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "������ ��������� RSET: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -7839,7 +9494,7 @@ 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 "���������"
 
@@ -7879,56 +9534,56 @@ msgid "MIME type:"
 msgstr "����� 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 "������� ��� �������� ������� ��� ����������"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "���� ��� ��� �� ������� �����������"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "���:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "�������� ��:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "�������� ���� ���������� ��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "���������:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�������� ��� ����������� ���� �� ������ ��������� ��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "��������� �����������:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7936,12 +9591,12 @@ msgstr ""
 "�������� ��� ����������� ���� �� ������ ��������� ��� ��������� ����� ����� "
 "�� ����������� ���� �������� ���������� ��� ���������."
 
-#: 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 "��������� �������"
 
-#: composer/e-msg-composer.c:688
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7950,38 +9605,34 @@ msgstr ""
 "������ ���� ��� �������� ��� ������� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:905
-msgid "Save as..."
-msgstr "���������� ��..."
-
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "�������������!"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "�� ������ �������, �� ����� ���������;"
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "������ ���� ��� ���������� ��� �������: %s"
 
-#: composer/e-msg-composer.c:959
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ ���� �� ������� ��� �������: %s"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "������ ���� ��� ���������� ��� �������: %s"
 
-#: composer/e-msg-composer.c:998
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "������� � �������� ��� ��������� ��� ��� �����������"
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7990,14 +9641,14 @@ msgstr ""
 "������� � ��������� ��� ������: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -8006,7 +9657,7 @@ msgstr ""
 "������ ���� ��� �������� ���������� ��� ���������: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1123
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -8015,7 +9666,7 @@ msgstr ""
 "����������� ��������.\n"
 "������ �� ����� ���������� �������� ����;"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -8025,23 +9676,23 @@ msgstr ""
 "\n"
 "������ �� ������������ ��� �������;"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "�������������: ������������� ������"
 
-#: composer/e-msg-composer.c:1311
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "������� �������"
 
-#: composer/e-msg-composer.c:1460
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "�������� �������"
 
-#: composer/e-msg-composer.c:1846 composer/e-msg-composer.c:2322
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "�������� ���� ���������"
 
-#: composer/e-msg-composer.c:2339
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -8049,7 +9700,7 @@ msgstr ""
 "��� ���� ������ � ���������� ��� ��������� ��� �����������:\n"
 "������� � ������������ ��� ���������� ������� ��� �������� �����������."
 
-#: composer/e-msg-composer.c:2362 composer/e-msg-composer.c:2417
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -8057,7 +9708,7 @@ msgstr ""
 "��� ���� ������ � ���������� ��� ��������� ��� �����������:\n"
 "������� � ������������ ��� ���������� ��� ����������� HTML."
 
-#: 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."
@@ -8065,7 +9716,7 @@ msgstr ""
 "��� ���� ������ � ������������ ��� ��������� ��� ����������� ������\n"
 "��� ����� �������� ����� ��������� ��� ��������� ������������."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "��� ����� ������ � ������������ ��� ����������� ��� Evolution"
 
@@ -8117,16 +9768,34 @@ msgstr "���� ��������"
 msgid "Subject does not contain"
 msgstr "���� ��� ��������"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"�������  ��� ������ �� ���� �� �����\n"
+"�� ����� ���������;"
+
 #. 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:270
+#: 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 ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "����������"
+
 #. 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
@@ -8213,174 +9882,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 "�������� ��� Evolution ��� ��� ����������� ������."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "�������� ������������ ������� ���������."
-
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-"��� ���� ������ � ������������ ��� ���������� ������� ��������� ��� "
-"Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-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 ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "�������� e-mail"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "������ ��� �������� ����� ��� �������"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL: %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "��������"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "���������� ����� ��� ������� �� ���� ����"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "���������� ���� � /%s"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "������"
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"��� ���� ������ � �������� ��� �������:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "������ ���� �� ������� ��� %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: 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 ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the RDF summary."
-msgstr "��������� ��� �� ���������� ��������� ���������."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "��������"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "���������� ��� ��� ����������� ��� Evolution."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "��������� ��� �� ���������� ��������� ���������."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c: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
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "��������"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "���_����� ��������������"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "������"
@@ -8413,11 +9914,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:191
 msgid "seconds"
 msgstr "������������"
 
@@ -8492,7 +9989,7 @@ msgstr " ����"
 msgid "ago"
 msgstr "����"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:973
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -8505,15 +10002,15 @@ msgid "Filter Rules"
 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
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -8521,19 +10018,11 @@ msgstr ""
 "�������� �� ������� ���� ������.\n"
 "��������� ���� ��� ������ ���� ������ ������ ��� ��� �������� ��� ���������."
 
-#: 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:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "������� �������"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "�������� �� URI �������"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<����� ���� ��� ��� �� ��������� ������>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -8541,7 +10030,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:488 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "������"
 
@@ -8549,39 +10038,40 @@ msgstr "������"
 msgid "You must name this filter."
 msgstr "������ �� ������ ����� �' ���� �� ������."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "'����� ������: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "����� �����"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "��"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "�������� ���������"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "�� ������������� ��� �� ��������"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "�� ������������� ������ ��� �� ��������"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "�������� ���������"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "�����������"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "����������"
 
@@ -8627,192 +10117,215 @@ msgstr "�� ����� ���� �������� ��������"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "������� ��������"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "������"
+
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "��������� �� ������"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "��� ��������"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "��� ��������� ��"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "��� �������"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "��� �������� �� �����"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "��� ������ ��"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "��� �������"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "�������� ��"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "�����"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "���� ����"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "���� ����"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "����������"
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "����� ���������� ���"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "����� ��������� ���"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "��� �����"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "����������"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "����� ������������"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "���� ���������"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "����������� ���������"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "���������� �� ������"
 
-#: filter/libfilter-i18n.h:34 mail/message-list.c:671
-#: mail/message-list.etspec.h:4
+#: filter/libfilter-i18n.h:39
 #, fuzzy
-msgid "Needs Reply"
-msgstr "�������� ��������������"
+msgid "Play Sound"
+msgstr "�������� ����:"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "���������� �����"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1486
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "������� ����������"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "������� (kB)"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "�������� �� �����"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "������� �����������"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "������� �����������"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "������ ��"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "����������� ������������"
 
-#: filter/libfilter-i18n.h:49 mail/mail-format.c:932
-#: mail/message-list.etspec.h:10
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "����"
 
@@ -8820,11 +10333,11 @@ msgstr "����"
 msgid "Rules"
 msgstr "�������"
 
-#: filter/rule-editor.c:284
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "�������� ������"
 
-#: filter/rule-editor.c:357
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "����������� ������"
 
@@ -8844,30 +10357,30 @@ msgstr "������ �� �������� ����������� ���� ������ ��� ����."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution ������� �� ������ ��� 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 "������� ��������..."
 
-#: 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 "�������� ����������"
 
-#: 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 "��������� %s �� %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 "������� ������ ��� %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:101
 msgid "Mail"
 msgstr "��������"
 
@@ -8895,23 +10408,74 @@ msgstr ""
 "�� Evolution ����� �������� Elm\n"
 "������ �� ��������� ��� Evolution;"
 
-#: importers/netscape-importer.c:106
+#: 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:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "�� Evolution ������� �� ������ ��� �������� Netscape"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "�����������"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "������ ������ ��������� %s"
+
+#: 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:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "���������"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "����������� �������"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8935,45 +10499,95 @@ msgstr ""
 msgid "Pine"
 msgstr "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
+msgid "Composer Preferences"
+msgstr ""
+
+#: 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:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "���������� ��� �� ��������� �������� Evolution"
+
+#: 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:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "���������� ��� ��� ����������� ��� Evolution."
+
+#: 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:7
 msgid "Evolution mail composer."
 msgstr "������������ ��������� ��� Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "�������� ������������ ������� ���������."
 
-#: 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:10
 msgid "Evolution mail folder factory component."
 msgstr "��������� ��� Evolution ��� �� ���������� ������� ���������."
 
-#: 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: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 "_����� ������������"
+
+#: 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:16
 msgid "Mail configuration interface"
 msgstr "������� ��������� ���������"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-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:101
-msgid "Mail storage folder (internal)"
-msgstr "������� ����������� ������������ (����������)"
+msgid "Folder containing mail"
+msgstr "������� ��� �������� ��������"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -8983,24 +10597,19 @@ msgstr "�������� �����������"
 msgid "Virtual Trash folder"
 msgstr "��������� ������� ������������"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "��� ����� ������ � ������� �� ��� �������: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "����� � ������� ��� ������ �� �������� ��������."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "���������..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "������ ��� ��������� ��� �������"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -9008,219 +10617,239 @@ msgstr ""
 "������� ��� ��� ��������� ��� ������������ ��� �������� �� ����� "
 "��������������, �������� ������� ��� ��� ����� �����."
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr "��� ����� ������ ����� �������� ��� ���������"
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "��� ������ ������������"
 
-#: mail/component-factory.c:951
-msgid "New _Mail Message"
-msgstr "_��� ������ ������������"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "_�������� ���������"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 "��� ����� ������ � ������������ ��� ���������� ��������� ��� Evolution."
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "��� ����� ������ � ������������ ��� ���������� �������� ��������� ��� "
 "Evolution."
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "��� ����� ������ � ������������ ��� ���������� ����������� ������� ��� "
 "Evolution."
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "������� ���� ����������..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "��� ����� ������ �� ����� ���������� ����������� �� �������"
 
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "��������� ��� \"%s\""
 
-#: mail/folder-browser-ui.c:274
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "���������"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:307
+#: mail/folder-browser.c:305 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:751
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d ���"
 
-#: mail/folder-browser.c:754 mail/folder-browser.c:762
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:756
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d ��������"
 
-#: mail/folder-browser.c:758
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d ����������"
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d �� �����������"
 
-#: mail/folder-browser.c:770
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d �����������"
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d ��������"
 
-#: mail/folder-browser.c:1054
-msgid "Create vFolder from Search"
-msgstr "���������� �������� ��� ��� ���������"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "���������� ��������� ������� ��� �� ������"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "�������� ��� _����"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "�������� ���� _���������"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "�������� ����� ����������"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "�������� ���� ����� _������������"
 
-#: mail/folder-browser.c:1444
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "������ ��� ����"
 
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "������ ���� ���������"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "������ ����� ����������"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "������ ���� ����� ������������"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_����������� �� ��� ������..."
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:105
-msgid "_Save As..."
-msgstr "�_��������� ��..."
-
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_��������"
 
-#: mail/folder-browser.c:1461 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_�������� ���� ���������"
 
-#: mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "�������� ��� _�����"
 
-#: mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "�������� �� _�����"
 
-#: mail/folder-browser.c:1464
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_��������"
 
-#: mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "������������"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "����������"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "������� _�� �����������"
 
-#: mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "������� _�� �� �����������"
 
-#: mail/folder-browser.c:1468
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "������� _�� ���������"
 
-#: mail/folder-browser.c:1469
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "������� _�� �� ���������"
 
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1636
 #, fuzzy
-msgid "Mark as Needing Reply"
-msgstr "�������� ����������"
+msgid "U_ndelete"
+msgstr "�_������ ���������"
 
-#: mail/folder-browser.c:1471
+#: mail/folder-browser.c:1640
 #, fuzzy
-msgid "Mark as Not Needing Reply"
-msgstr "�������� ����������"
-
-#: mail/folder-browser.c:1475
-msgid "_Move to Folder..."
+msgid "Mo_ve to Folder..."
 msgstr "_���������� ��� ������..."
 
-#: mail/folder-browser.c:1476
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "��������� ��� ������..."
 
-#: mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
-msgid "_Undelete"
-msgstr "�_������ ���������"
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "_����������"
 
-#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "�������� ��������� ��� ������ �����������"
 
-#: mail/folder-browser.c:1485
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "�������� �������"
 
-#: mail/folder-browser.c:1487
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "���������� ������ ��� �� ������"
 
-#: mail/folder-browser.c:1656
-msgid "Filter on Mailing List"
-msgstr "������ ���� ����� ������������"
-
-#: mail/folder-browser.c:1657
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "�������� ���� ����� ������������"
 
-#: mail/folder-browser.c:1659
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "������ ���� ����� ������������ (%s)"
 
-#: mail/folder-browser.c:1660
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "�������� ���� ����� ������������ (%s)"
 
 #: mail/folder-info.c:64
@@ -9244,26 +10873,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "������� ������ Outlook Express 4 ��� Evolution"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "����������� �������"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "������ ����� �����������:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "����������:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "����� Mailbox"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "����������� �������"
 
-#: 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:4
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -9273,15 +10895,15 @@ msgstr ""
 "(���� � ������� ����� ���� �����) ������ �� ��� ��������� ��������.\n"
 "�������� ����� ����� ����� ��� ����������� �� ������ �������."
 
-#: 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"
 
@@ -9299,66 +10921,79 @@ msgstr "������������ �������� Evolution"
 msgid "Evolution Account Editor"
 msgstr "������������ ����������� Evolution"
 
-#: mail/mail-account-gui.c:962
-msgid "Could not save signature file."
-msgstr "��� ���� ������ � ���������� ��� ������� ���������"
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr ""
 
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "���������� ���������"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "_����� ������:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+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:1045
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"� �������� ���� ������� ���� ��� ���� �����������.\n"
-"\n"
-"������ �� ������������ ��� ������� ����;"
 
-#: mail/mail-account-gui.c:1666
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr "��� ����������� �� ������������� ��� ������������ �� �� ���� �����."
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (��' �������)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "��������������"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "������������"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "����� ������� ��� ��� �������� ����� ��� �����������;"
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "�� ��� ���������"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "�� ��������� � �����������;"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "��������������"
+
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "������������"
+
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
 msgid "Are you sure you want to delete this news account?"
 msgstr "����� ������� ��� ��� �������� ��� ����������� ��������;"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:49
-msgid "Mail Settings"
-msgstr "��������� ���������"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "������������"
+
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "����� _�����������:"
+
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "������� ����"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "�������� ������ �������"
 
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -9370,7 +11005,7 @@ msgstr ""
 "� �������� ���������\n"
 "������ �� ������ ��� ������� ����;"
 
-#: mail/mail-callbacks.c:143
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -9378,7 +11013,7 @@ msgstr ""
 "������ �� ��������� ��� ���������\n"
 "���� ��� ��� �������� ���������"
 
-#: mail/mail-callbacks.c:157
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -9386,12 +11021,8 @@ msgstr ""
 "������ �� ��������� ��� �������� ������������\n"
 "���� ��� ��� �������� ���������"
 
-#: mail/mail-callbacks.c:187
-msgid "You have not set a mail transport method"
-msgstr "��� ����� ������ ����� �������� ��� ���������"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -9399,11 +11030,11 @@ msgstr ""
 "�� �������� ������ �� ����� HTML, ���� � �������� ���������� ��� ��������� "
 "�������� �� ����� HTML:\n"
 
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "�� ������ ����� � �����;"
 
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -9411,7 +11042,7 @@ msgstr ""
 "���� �� ������ ��� ���� ����.\n"
 "�� ������;"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -9420,12 +11051,12 @@ msgstr ""
 "�����������, ���� �� ������ �� �������� ���� ���������� ���� ��������� "
 "�����������(Bcc)."
 
-#: mail/mail-callbacks.c:327
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr ""
 "���� �� ������ �������� ���� ���������� ��� ���������� ������������Bcc)."
 
-#: mail/mail-callbacks.c:331
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -9435,21 +11066,17 @@ msgstr ""
 "�������� ��� ������ ����������� ����.\n"
 "�� ������ ����� � �����;"
 
-#: mail/mail-callbacks.c:461
-msgid "This message contains invalid recipients:"
-msgstr "���� �� ������ ��� �������� �������� ����������:"
-
-#: mail/mail-callbacks.c:496
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr "������ �� ������� ���������� ����������� �� �������� ���� �� ������."
 
-#: mail/mail-callbacks.c:584
+#: mail/mail-callbacks.c:497
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "������ �� ��������� ���� ���������� ��� �� ��������� �� �������� ���� �� "
 "������."
 
-#: mail/mail-callbacks.c:703
+#: mail/mail-callbacks.c:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -9458,28 +11085,28 @@ msgstr ""
 "����������.\n"
 "������ �� ������ ����� ��� ��' ������� ���������� �������;"
 
-#: mail/mail-callbacks.c:913
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "���� �������� ����������"
 
-#: mail/mail-callbacks.c:918
+#: mail/mail-callbacks.c:981
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "��� %a, %d-%m-%Y ���� %H:%M, �/� %%s ������:"
 
-#: mail/mail-callbacks.c:1363 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "���������� ���������(��) ���"
 
-#: mail/mail-callbacks.c:1365 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "��������� ���������(��) ���"
 
-#: mail/mail-callbacks.c:1862
+#: mail/mail-callbacks.c:2091
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "����� ������� ��� ������ �� �������������� ��� �� %d ��������;"
 
-#: mail/mail-callbacks.c:1887
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -9487,7 +11114,7 @@ msgstr ""
 "����������� �� �������������� ���� ��\n"
 "�������� ���� �������� ������."
 
-#: mail/mail-callbacks.c:1926
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -9495,24 +11122,39 @@ msgstr ""
 "����������� �� ������������ ���� ��\n"
 "�������� ��� ��� ������ �����������."
 
-#: mail/mail-callbacks.c:1940
+#: mail/mail-callbacks.c:2169
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "����� ������� ��� ������ �� ������������ ��� �� %d ��������;"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "��� ���� �������� ������"
 
-#: mail/mail-callbacks.c:2065
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "��������� �������;"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "���������� ��������� ��..."
 
-#: mail/mail-callbacks.c:2067
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "���������� ��������� ��..."
 
-#: mail/mail-callbacks.c:2238
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "�������� �������� �� ������������ ���������"
+
+#: mail/mail-callbacks.c:2373
+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
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -9524,7 +11166,7 @@ msgstr ""
 "\n"
 "����� ������� ��� ��� �������� ��� ���������;"
 
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -9533,23 +11175,28 @@ msgstr ""
 "������ ���� �� ������� ��� �����������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "������"
 
-#: mail/mail-callbacks.c:2449
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "���� ��������� %d ��� %d"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "�������� ���������"
 
-#: mail/mail-callbacks.c:2476
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "���������� US-Letter"
 
-#: mail/mail-callbacks.c:2515
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "������� � �������� ��� ���������"
 
-#: mail/mail-callbacks.c:2681
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -9608,11 +11255,35 @@ msgstr ""
 "�� ����� ����� ���� ��� �� �������� ��� ����������."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "������ ����������� Evolution"
 
-#: mail/mail-config.c:1954
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "���������"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "������"
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "�����"
+
+#. blue
+#: mail/mail-config.c:78 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"
@@ -9623,100 +11294,160 @@ msgstr ""
 "%s\n"
 "��� �� ������������ ����������"
 
-#: mail/mail-config.c:2207
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "������� ������� ���������"
 
-#: mail/mail-config.c:2285 mail/mail-config.c:2289
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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 " _Check for supported types "
-msgstr "_������� ��� ��� ��������������� ������ "
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " �����"
+#, 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
+#, fuzzy
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr "(�� SSL ��� ������������� �� ���� ��� ������ ��� evolution)"
+
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(�� SSL ��� ������������� �� ���� ��� ������ ��� evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 "�� ������� ����� ������������� ���� ����� ��� ���� ��� �������� "
 "���������������� ���������"
 
-#: mail/mail-config.glade.h:5
-msgid "Account"
-msgstr "�����������"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "����������� %d"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "����������� �����������"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "���������� �����������"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "�����������"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "������� �����������"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:12
+#, fuzzy
+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:10
-msgid "Always _sign outgoing messages when using this account"
+#: 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:11
-msgid "Always blind carbon-copy to:"
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
-msgid "Always carbon-copy to:"
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:13 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "�������"
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "��������� ������� ��� ������"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "�����������"
 
-#: mail/mail-config.glade.h:15
-msgid "Beep when new mail arrives"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "_��������� ������� ��� ��� ��������"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "������� ������ ����������: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_��������"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "������� ��� ��� ��������"
 
-#: mail/mail-config.glade.h:17
-msgid "Composer"
-msgstr "������������"
-
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "�������� ���� ���������"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:20
-msgid "Confirm when Expunging a folder"
-msgstr "����������� ���� �������� ��� ���� ������"
-
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9732,253 +11463,373 @@ msgstr ""
 "\n"
 "�������� \"�����������\" ��� �� ������������ ��� ��������� ���."
 
-#: mail/mail-config.glade.h:27
+#: 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:28
-msgid "Default Forward style is: "
-msgstr "�� ��' ������� ���� ��������� �����: "
+#: mail/mail-config.glade.h:39
+msgid "Default Behavior"
+msgstr ""
 
-#: mail/mail-config.glade.h:29
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "� ��' ������� ������������ ���������� �����: "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:41
 #, fuzzy
-msgid "Defaults"
-msgstr "��' �������"
+msgid "Deleting Mail"
+msgstr "���� ���������"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "�������� ����������..."
 
-#: mail/mail-config.glade.h:33
-msgid "Display"
-msgstr "�������"
-
-#: mail/mail-config.glade.h:34
-msgid "Do not notify me when new mail arrives"
-msgstr ""
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "��� ���� ������ �� ������� ��� ���������"
 
-#: mail/mail-config.glade.h:35 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:36
-msgid "Drafts"
-msgstr "��������"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "������� _���������:"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "_������������"
 
-#: mail/mail-config.glade.h:38 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "�����������..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:39
-msgid "Enabled"
-msgstr "������������"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "����������"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "�� Email ��������"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "��������� Email:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "�������� ��� ������� _������������ ���� �����"
+
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Execute Command..."
 msgstr "�������� ���������"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "�������� ��"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "���������"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "���������� ��������"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "���� �������� ����������..."
 
-#: mail/mail-config.glade.h:42
-msgid "HTML signature file:"
-msgstr "������ ��������� HTML:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_���������� ���������� ��"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "��' �������"
+
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:44 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:45
-msgid "In HTML mail"
-msgstr "�� �������� HTML"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "���� ��� ������"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "���������� ��� ��������"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "������� _�������"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "��������� ������������"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "���� Mailbox"
 
-#: mail/mail-config.glade.h:51
-msgid "Make this my _default account"
-msgstr "����� ����� � _��' ������� �����������"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "����������� ���������"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_������� ���������"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "��������"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "����������� NNTP:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "��������� ������������"
 
-#: mail/mail-config.glade.h:54
-msgid "News"
-msgstr "��������"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "���������� _��������"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "������������ �����������"
 
-#: mail/mail-config.glade.h:58
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "������_����:"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "PGP _Key ID:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "�������� �����"
 
-#: mail/mail-config.glade.h:62
-msgid "Play sound file when new mail arrives"
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
+"������� ���� �������� ��������� ���� ����� ������� ���� ���������� ���� "
+"��������� _����������� (Bcc)"
 
-#: mail/mail-config.glade.h:63
-msgid "Pretty Good Privacy"
+#: mail/mail-config.glade.h:89
+#, fuzzy
+msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:64
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr "������� ���� �������� ��������� HTML �� ������ ��� ��� �� ������"
-
-#: mail/mail-config.glade.h:65
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "������� ���� �������� ��������� �� �_���� ����"
-
-#: mail/mail-config.glade.h:66
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr ""
-"������� ���� �������� ��������� ���� ����� ������� ���� ���������� ���� "
-"��������� _����������� (Bcc)"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "�������� ����������� ������"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "��� ���� ������ �� ������� ��� ���������"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "�� �������"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_������������� ����� ��� ������� ���������"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "�������� ��:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "������� ���� ���������"
 
-#: mail/mail-config.glade.h:71
-msgid "Receiving Mail"
-msgstr "������� ���� ���������"
-
-#: mail/mail-config.glade.h:72
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "�������� �����"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "������������� ��� ������� ���������"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "������������ �����������"
 
-#: mail/mail-config.glade.h:75
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+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:76
-msgid "Security"
-msgstr "��������"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:77
-msgid "Select Filter Log file..."
-msgstr "�������� ������ ����������� �������"
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:78
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "�������� �� ���������� PGP"
 
-#: mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "������������� �� ��������"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "������ ���������:"
 
-#: mail/mail-config.glade.h:80
-msgid "Sending Mail"
-msgstr "�������� ���������"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "�������� ���� ����� ��� ���������"
 
-#: mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
-msgid "Sent"
-msgstr "�����������"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "������������� �� ��������"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "������� _������������ ���������:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "����������� ��� �������� ��������"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "� _����������� ������� �����������"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "��������� ����������"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "����� _����������: "
 
-#: mail/mail-config.glade.h:88
-msgid "Signature file:"
-msgstr "������ ���������:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "������������"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "���������� ���������"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "����"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "����������� �����"
 
-#: mail/mail-config.glade.h:91
-msgid "Sources"
-msgstr "�����"
-
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:124
 #, fuzzy
-msgid "Specify filename:"
+msgid "Specify _filename:"
 msgstr "����� ����:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
-msgid "Use s_ecure connection (SSL)"
-msgstr "����� �������� �������� (SSL)"
+#: mail/mail-config.glade.h:128
+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:96
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "_�������� HTML:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "����������"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9988,126 +11839,215 @@ msgstr ""
 "\n"
 "�������� \"�������\" ��� �� ����������. "
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "����������"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "�� ������� _����� ������� ��� ������� ��� �� �������"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr "�� _������������ ����� �� �������� ���� ����� ����� ��� �����������"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "����� _������������: "
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "����� _������������: "
+
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "_��������� ������� ��� ��� ��������"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_����������� ����������:"
 
-#: mail/mail-config.glade.h:106
-msgid "_Drafts folder:"
-msgstr "������� _���������:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:108
-msgid "_Email Address:"
-msgstr "��������� Email:"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "����������� ���� �������� ��� ���� ������"
 
-#: mail/mail-config.glade.h:109
-msgid "_Empty trash folders on exit"
-msgstr "�������� ��� ������� _������������ ���� �����"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "��' �������"
 
-#: mail/mail-config.glade.h:110
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:151
+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
+#, fuzzy
+msgid "_Filename:"
+msgstr "����� �������:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "�������� ��"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "_������ �����:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "�� �������� HTML"
+
+#: mail/mail-config.glade.h:160
 msgid "_HTML Signature:"
 msgstr "_�������� HTML:"
 
-#: mail/mail-config.glade.h:112
-msgid "_Highlight citations with"
-msgstr "_���������� ���������� ��"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "���������"
 
-#: mail/mail-config.glade.h:113
-msgid "_Host:"
-msgstr ""
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "������"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr "_������� ������� �� � ���������� ������� ��� ������ �����������"
 
-#: mail/mail-config.glade.h:115
-msgid "_Log filter actions to:"
-msgstr "_��������� �������� ������� ���:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "����� ����� � _��' ������� �����������"
 
-#: mail/mail-config.glade.h:116
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_������� ��������� �� ����������� ���� ���"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_�����:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_�� ��� ����������� ���� ������� ��� �� ������"
 
-#: mail/mail-config.glade.h:119
-msgid "_Organization:"
-msgstr "_����������:"
-
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "���� ����������� _PGP:"
 
-#: mail/mail-config.glade.h:121
-msgid "_Path:"
-msgstr "_����:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:122
-msgid "_Remember this password"
-msgstr "_������������� ����� ��� �������"
+#: mail/mail-config.glade.h:172
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr "������� ���� �������� ��������� HTML �� ������ ��� ��� �� ������"
 
-#: mail/mail-config.glade.h:123
-msgid "_Send mail in HTML format by default."
-msgstr "�������� ��������� �� ������� �� ����� HTML."
+#: mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "������� ���� �������� ��������� �� �_���� ����"
 
-#: mail/mail-config.glade.h:124
-msgid "_Server Type: "
-msgstr "����� �����������: "
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "���������"
 
-#: mail/mail-config.glade.h:125
-msgid "_Signature file:"
-msgstr "_������ ���������:"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "������� ���� ���������"
 
-#: mail/mail-config.glade.h:126
-msgid "_Username:"
-msgstr "_����� ������:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "�������� �� �����"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_��������"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_��������"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "�������� ���������"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "�������� ���� ��"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "����������"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_����"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " �����"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "������������1"
 
-#: mail/mail-config.glade.h:131
-msgid "placeholder"
-msgstr "�������������"
-
-#: mail/mail-config.glade.h:132
-msgid "seconds."
-msgstr "������������."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "��� ���� ������ � ���������� ������������ ��������� PGP."
@@ -10144,127 +12084,139 @@ msgstr "��� ���� ������ � ���������� ������������ ������� S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "��� ���� ������ � ���������� ������������ ���������������� S/MIME."
 
-#: mail/mail-display.c:252
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "���������� ����������..."
 
-#: mail/mail-display.c:359
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "��� ����� ������ � ���������� ��� ���������� ���������: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "���������� ���� �����..."
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "������� ���� ��� ������"
 
-#: mail/mail-display.c:363
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "������� �� %s..."
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "������� ���� ��� ������ (���� %s)"
 
-#: mail/mail-display.c:428
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "��������"
 
-#: mail/mail-display.c:449
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "��������� ��������� ��������"
 
-#: mail/mail-display.c:1171
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "������� ����������� ���������"
 
-#: mail/mail-display.c:1666
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "������� ��������� ���� ���������"
 
-#: mail/mail-display.c:1668
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "��������� ����� �����������"
 
-#: mail/mail-display.c:1671
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1674
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "���������� ������� ��..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr " %s ���������"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "��� ���� ������ � ������� ��� ��������� MIME. ������� �� ����."
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����������"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "��������� ���������"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "���"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "�������� ��"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:11
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "���������:"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "��������� �����������"
 
-#: mail/mail-format.c:2013
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
+msgstr ""
+"\n"
+"������������ ������������: "
+
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "������� �� ������ FTP (%s)"
 
-#: mail/mail-format.c:2027
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "������� �� ������ ������ (%s) ������ ���� ������ \"%s\""
 
-#: mail/mail-format.c:2032
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "������� �� ������ ������ (%s)"
 
-#: mail/mail-format.c:2061
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "������� �� ������������� �������� (%s)"
 
-#: mail/mail-format.c:2069
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "������� �� ������� ��������� �������� (����� \"%s\")"
 
-#: mail/mail-format.c:2074
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "��������������� ��������� ����� ���������."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "������������ �������"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -10273,27 +12225,27 @@ msgstr ""
 "��� ����� ������ �� ����������� � ������� metainfo, ������ �� ������������\n"
 "��� ��� �������� �� �������� ����� ����� ��� ������: %s: %s"
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "��� ����� ������ �� ����������� � ������� metainfo ��� %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "��� ���� ������ �� ��������� � ������� metadata %s: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "������� ������ ��� ������� \"%s\" �� ����� \"%s\""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s ��� ����� ������ �� ��������� ���� ����� ��� ����� ������� �������"
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -10301,11 +12253,11 @@ msgstr ""
 "�� ��� �������� �� �������� ����� ���� �� maibox, ����\n"
 "�� ������ �� �� ����������� ����� ���."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr "��� �������� �� �������� �� ����� ���� ��-������� �������."
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "���������� ���� � /%s"
@@ -10332,112 +12284,112 @@ msgstr ""
 msgid "Working"
 msgstr "���������"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "����������� �������"
 
-#: mail/mail-ops.c:251
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "���� ���������"
 
-#: mail/mail-ops.c:491 mail/mail-ops.c:520
+#: mail/mail-ops.c:538 mail/mail-ops.c:567
 msgid "However, the message was successfully sent."
 msgstr "���'��� ���� �� ������ �������� �� ��������."
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "������������ \"%s\""
 
-#: mail/mail-ops.c:676
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "�������� ��������� %d ��� %d"
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "�������� ��� ������ %d ��� %d"
 
-#: mail/mail-ops.c:697 mail/mail-send-recv.c:545
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "������������."
 
-#: mail/mail-ops.c:790
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "���������� ��������� ���� ������"
 
-#: mail/mail-ops.c:870
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "���������� ��������� ��� %s"
 
-#: mail/mail-ops.c:870
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "��������� ��������� ��� %s"
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "����������"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "���������"
 
-#: mail/mail-ops.c:1010
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "������ ������� ��� \"%s\""
 
-#: mail/mail-ops.c:1193
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "���������� ��������"
 
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "������� ������� %s"
 
-#: mail/mail-ops.c:1308
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "������� �������� %s"
 
-#: mail/mail-ops.c:1377
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "���������� � ������� %s"
 
-#: mail/mail-ops.c:1471
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "������������ � ������� '%s'"
 
-#: mail/mail-ops.c:1522
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "����������� � �������"
 
-#: mail/mail-ops.c:1558
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "����������� � �������"
 
-#: mail/mail-ops.c:1607
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "�������������� �� ������ %s"
 
-#: mail/mail-ops.c:1674
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "��������������� %d ������(��)"
 
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "����������� %d ������(��)"
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -10446,7 +12398,7 @@ msgstr ""
 "��� ����� ������ � ���������� ��� ������� ������: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -10455,11 +12407,11 @@ msgstr ""
 "������ ���� ��� ���������� ��������� ��� %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "���������� ����������"
 
-#: mail/mail-ops.c:1990
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -10468,27 +12420,27 @@ msgstr ""
 "��� ����� ������ � ���������� ������� ������: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "��� ���� ������ � ������� ���������:%s"
 
-#: mail/mail-ops.c:2090
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "���������� ��� �� %s"
 
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "������������ ��� %s"
 
-#: mail/mail-ops.c:2190
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_���������"
 
@@ -10524,42 +12476,42 @@ msgstr "������:"
 msgid "Matches:"
 msgstr "��������� ��:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "������� �������..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "������������: %s, �����: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "����: %s, �����: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "�����: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "�������� & ���� ���������"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "������� ����"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "��������..."
 
-#: 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:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "���������."
 
@@ -10576,25 +12528,40 @@ msgstr "�������� ������ ��������� ��� %s"
 msgid "Enter Password"
 msgstr "�������� ������ ���������"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "��� ���� ������ � ���������� ��� ������� ���������"
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "���������� ���������"
+
+#: mail/mail-signature-editor.c:178
+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-summary.c:467
+#: mail/mail-signature-editor.c:357
 #, fuzzy
-msgid "Mail Summary"
-msgstr "������ ���������"
+msgid "Signature name:"
+msgstr "������ ���������:"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "���������� ������ - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "���������� ������"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "���������� ������"
 
@@ -10638,87 +12605,145 @@ msgstr "���������� ������������ �������� '%s' ��� ��� �������."
 msgid "New VFolder"
 msgstr "���� ��������"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(����� ����)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - ������"
 
-#: mail/message-list.c:662
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:663
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:664
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "����������"
 
-#: mail/message-list.c:665
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:666
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "�������� ��������"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "����������"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "������"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "�����"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "���������"
 
-#: mail/message-list.c:937
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:944
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "������ %l:%M %p"
 
-#: mail/message-list.c:953
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%l:%M %p %a"
 
-#: mail/message-list.c:975
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2387
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "���������� ������ ���������"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "���� "
+
+#: 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:5
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "������"
 
-#: mail/message-list.etspec.h:8
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "�������"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "����"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "�������� �������"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "����������� �����"
+
+#: 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-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr "��������"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "�������� �� �����"
+
+#: 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
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -10740,7 +12765,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "��������� ��������� ���� ������ \"%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 "�������"
 
@@ -10784,6 +12809,35 @@ msgstr "_��������"
 msgid "_Unsubscribe"
 msgstr "_��������� ���������"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "������� ��� �������� ��� �������� ��� Evolution"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "������������ ��������� ��� Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "���������� ��� �� ��������� �������� Evolution"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "�������� ������������ ������� ���������."
+
+#: 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 ""
+
 #: my-evolution/Locations.h:1
 #, fuzzy
 msgid "Aarhus"
@@ -10967,10 +13021,6 @@ msgstr "������������"
 msgid "Al Baha"
 msgstr ""
 
-#: my-evolution/Locations.h:42
-msgid "Albania"
-msgstr "�������"
-
 #: my-evolution/Locations.h:43
 #, fuzzy
 msgid "Albany"
@@ -11021,10 +13071,6 @@ msgstr "�������/������"
 msgid "Alexandroupolis"
 msgstr ""
 
-#: my-evolution/Locations.h:54
-msgid "Algeria"
-msgstr "�������"
-
 #: my-evolution/Locations.h:55
 #, fuzzy
 msgid "Alghero"
@@ -11326,10 +13372,6 @@ msgstr ""
 msgid "Arequipa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:120
-msgid "Argentina"
-msgstr "���������"
-
 #: my-evolution/Locations.h:121
 #, fuzzy
 msgid "Arica"
@@ -11487,14 +13529,6 @@ msgstr "�������"
 msgid "Australasia"
 msgstr "���������"
 
-#: my-evolution/Locations.h:154
-msgid "Australia"
-msgstr "���������"
-
-#: my-evolution/Locations.h:155
-msgid "Austria"
-msgstr "�������"
-
 #: my-evolution/Locations.h:156
 msgid "Avalon"
 msgstr ""
@@ -11516,10 +13550,6 @@ msgstr "����"
 msgid "Bagotville"
 msgstr ""
 
-#: my-evolution/Locations.h:161
-msgid "Bahamas"
-msgstr "��������"
-
 #: my-evolution/Locations.h:162
 msgid "Bahia Blanca"
 msgstr ""
@@ -11528,10 +13558,6 @@ msgstr ""
 msgid "Bahias de Huatulco"
 msgstr ""
 
-#: my-evolution/Locations.h:164
-msgid "Bahrain"
-msgstr "��������"
-
 #: my-evolution/Locations.h:165
 msgid "Baker City"
 msgstr ""
@@ -11763,18 +13789,10 @@ msgstr ""
 msgid "Belfast/Harbour"
 msgstr ""
 
-#: my-evolution/Locations.h:216
-msgid "Belgium"
-msgstr "������"
-
 #: my-evolution/Locations.h:217
 msgid "Belgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:218
-msgid "Belize"
-msgstr "������"
-
 #: my-evolution/Locations.h:219
 #, fuzzy
 msgid "Belleville"
@@ -11998,10 +14016,6 @@ msgstr ""
 msgid "Boise"
 msgstr "����"
 
-#: my-evolution/Locations.h:270
-msgid "Bolivia"
-msgstr "�������"
-
 #: my-evolution/Locations.h:271
 msgid "Bologna"
 msgstr ""
@@ -12108,10 +14122,6 @@ msgstr "��������"
 msgid "Braunschweig"
 msgstr ""
 
-#: my-evolution/Locations.h:294
-msgid "Brazil"
-msgstr "��������"
-
 #: my-evolution/Locations.h:295
 #, fuzzy
 msgid "Bremen"
@@ -12224,10 +14234,6 @@ msgstr "������/����������"
 msgid "Buffalo"
 msgstr ""
 
-#: my-evolution/Locations.h:320
-msgid "Bulgaria"
-msgstr "���������"
-
 #: my-evolution/Locations.h:321
 msgid "Bullfrog"
 msgstr ""
@@ -12381,10 +14387,6 @@ msgstr ""
 msgid "Canaan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:354
-msgid "Canada"
-msgstr "�������"
-
 #: my-evolution/Locations.h:355
 msgid "Canarias/Fuerteventura"
 msgstr ""
@@ -12539,10 +14541,6 @@ msgstr "��������"
 msgid "Catania"
 msgstr "�������"
 
-#: my-evolution/Locations.h:389
-msgid "Cayman Islands"
-msgstr "����� ������"
-
 #: my-evolution/Locations.h:390
 msgid "Cayo Largo del Sur"
 msgstr ""
@@ -12759,10 +14757,6 @@ msgstr "�������/���������"
 msgid "Childress"
 msgstr "����"
 
-#: my-evolution/Locations.h:438
-msgid "Chile"
-msgstr "����"
-
 #: my-evolution/Locations.h:439
 #, fuzzy
 msgid "China Lake"
@@ -12815,10 +14809,6 @@ msgstr ""
 msgid "Christchurch"
 msgstr ""
 
-#: my-evolution/Locations.h:451
-msgid "Christmas Island"
-msgstr "����� �������������"
-
 #: my-evolution/Locations.h:452
 #, fuzzy
 msgid "Chulitna"
@@ -12954,10 +14944,6 @@ msgstr "����������"
 msgid "Colmar-Meyenheim"
 msgstr ""
 
-#: my-evolution/Locations.h:483
-msgid "Colombia"
-msgstr "��������"
-
 #: my-evolution/Locations.h:484
 #, fuzzy
 msgid "Colonia"
@@ -13110,10 +15096,6 @@ msgstr "��������"
 msgid "Corumba"
 msgstr "�����"
 
-#: my-evolution/Locations.h:517
-msgid "Costa Rica"
-msgstr "����� ����"
-
 #: my-evolution/Locations.h:518
 msgid "Cotulla"
 msgstr ""
@@ -13160,10 +15142,6 @@ msgstr "�������"
 msgid "Crestview"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:528
-msgid "Croatia"
-msgstr "�������"
-
 #: my-evolution/Locations.h:529
 msgid "Cross City"
 msgstr ""
@@ -13177,10 +15155,6 @@ msgstr ""
 msgid "Crotone"
 msgstr "��������"
 
-#: my-evolution/Locations.h:532
-msgid "Cuba"
-msgstr "�����"
-
 #: my-evolution/Locations.h:533
 #, fuzzy
 msgid "Cuba Awrs"
@@ -13235,14 +15209,6 @@ msgstr ""
 msgid "Cuzco"
 msgstr ""
 
-#: my-evolution/Locations.h:545
-msgid "Cyprus"
-msgstr "������"
-
-#: my-evolution/Locations.h:546
-msgid "Czech Republic"
-msgstr "������"
-
 #: my-evolution/Locations.h:547
 #, fuzzy
 msgid "Dagali"
@@ -13384,10 +15350,6 @@ msgstr ""
 msgid "Denison"
 msgstr "��������"
 
-#: my-evolution/Locations.h:580
-msgid "Denmark"
-msgstr "�����"
-
 #: my-evolution/Locations.h:581
 #, fuzzy
 msgid "Denton"
@@ -13488,8621 +15450,8436 @@ msgid "Diyarbakir"
 msgstr ""
 
 #: my-evolution/Locations.h:603
-msgid "Dobbiaco"
+msgid "Dnipropetrovsk"
 msgstr ""
 
 #: my-evolution/Locations.h:604
-msgid "Dodge City"
+msgid "Dobbiaco"
 msgstr ""
 
 #: my-evolution/Locations.h:605
-msgid "Doha"
+msgid "Dodge City"
 msgstr ""
 
 #: my-evolution/Locations.h:606
+msgid "Doha"
+msgstr ""
+
+#: my-evolution/Locations.h:607
 #, fuzzy
 msgid "Dole"
 msgstr "�����"
 
-#: my-evolution/Locations.h:607
-msgid "Dominican Republic"
-msgstr "���������� ����������"
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "�����"
 
-#: my-evolution/Locations.h:608
+#: my-evolution/Locations.h:610
 #, fuzzy
 msgid "Dongsha"
 msgstr "�����"
 
-#: my-evolution/Locations.h:609
+#: my-evolution/Locations.h:611
 msgid "Dongshi"
 msgstr ""
 
-#: my-evolution/Locations.h:610
+#: my-evolution/Locations.h:612
 msgid "Don Torcuato"
 msgstr ""
 
-#: my-evolution/Locations.h:611
+#: my-evolution/Locations.h:613
 msgid "Dortmund-Wickede"
 msgstr ""
 
-#: my-evolution/Locations.h:612
+#: my-evolution/Locations.h:614
 #, fuzzy
 msgid "Dothan"
 msgstr "�����"
 
-#: my-evolution/Locations.h:613
+#: my-evolution/Locations.h:615
 msgid "Douglas"
 msgstr ""
 
-#: my-evolution/Locations.h:614
+#: my-evolution/Locations.h:616
 #, fuzzy
 msgid "Dover"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:615
+#: my-evolution/Locations.h:617
 msgid "Dresden-Klotzsche"
 msgstr ""
 
-#: my-evolution/Locations.h:616
+#: my-evolution/Locations.h:618
 msgid "Drummond"
 msgstr ""
 
-#: my-evolution/Locations.h:617
+#: my-evolution/Locations.h:619
 #, fuzzy
 msgid "Dubai"
 msgstr "�����"
 
-#: my-evolution/Locations.h:618
+#: my-evolution/Locations.h:620
 msgid "Dubbo"
 msgstr ""
 
-#: my-evolution/Locations.h:619
+#: my-evolution/Locations.h:621
 #, fuzzy
 msgid "Dublin"
 msgstr "�������"
 
-#: my-evolution/Locations.h:620
+#: my-evolution/Locations.h:622
 msgid "Du Bois"
 msgstr ""
 
-#: my-evolution/Locations.h:621
+#: my-evolution/Locations.h:623
 msgid "Dubrovnik"
 msgstr ""
 
-#: my-evolution/Locations.h:622
+#: my-evolution/Locations.h:624
 msgid "Dubuque"
 msgstr ""
 
-#: my-evolution/Locations.h:623
+#: my-evolution/Locations.h:625
 #, fuzzy
 msgid "Dugway"
 msgstr "�����"
 
-#: my-evolution/Locations.h:624
+#: my-evolution/Locations.h:626
 #, fuzzy
 msgid "Duluth"
 msgstr "��' �������"
 
-#: my-evolution/Locations.h:625
+#: my-evolution/Locations.h:627
 #, fuzzy
 msgid "Dundee"
 msgstr "���� "
 
-#: my-evolution/Locations.h:626
+#: my-evolution/Locations.h:628
 #, fuzzy
 msgid "Durango"
 msgstr "����"
 
-#: my-evolution/Locations.h:627
+#: my-evolution/Locations.h:629
 msgid "Durango Awrs"
 msgstr ""
 
-#: my-evolution/Locations.h:628
+#: my-evolution/Locations.h:630
 msgid "Durazno"
 msgstr ""
 
-#: my-evolution/Locations.h:629
+#: my-evolution/Locations.h:631
 msgid "Durban Louis Botha "
 msgstr ""
 
-#: my-evolution/Locations.h:630
+#: my-evolution/Locations.h:632
 #, fuzzy
 msgid "Dusseldorf"
 msgstr "��������� �� �����"
 
-#: my-evolution/Locations.h:631
+#: my-evolution/Locations.h:633
 msgid "Dutch Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:632
+#: my-evolution/Locations.h:634
 msgid "Dyersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:633
+#: my-evolution/Locations.h:635
 #, fuzzy
 msgid "Eagle"
 msgstr "������������"
 
-#: my-evolution/Locations.h:634
+#: my-evolution/Locations.h:636
 msgid "Eagle Range"
 msgstr ""
 
-#: my-evolution/Locations.h:635
+#: my-evolution/Locations.h:637
 msgid "East London"
 msgstr ""
 
-#: my-evolution/Locations.h:636
+#: my-evolution/Locations.h:638
 msgid "East Midlands"
 msgstr ""
 
-#: my-evolution/Locations.h:637
+#: my-evolution/Locations.h:639
 #, fuzzy
 msgid "East St Louis"
 msgstr "���������� - ���������������"
 
-#: my-evolution/Locations.h:638
+#: my-evolution/Locations.h:640
 msgid "Eau Claire"
 msgstr ""
 
-#: my-evolution/Locations.h:639
-msgid "Ecuador"
-msgstr "����������"
-
-#: my-evolution/Locations.h:640
+#: my-evolution/Locations.h:642
 #, fuzzy
 msgid "Edinburgh"
 msgstr "���������:"
 
-#: my-evolution/Locations.h:641
+#: my-evolution/Locations.h:643
 #, fuzzy
 msgid "Edmonton"
 msgstr "�������/���������"
 
-#: my-evolution/Locations.h:642
+#: my-evolution/Locations.h:644
 msgid "Edmonton/Villeneuve"
 msgstr ""
 
-#: my-evolution/Locations.h:643
+#: my-evolution/Locations.h:645
 msgid "Eduardo Gomes International"
 msgstr ""
 
-#: my-evolution/Locations.h:644
+#: my-evolution/Locations.h:646
 msgid "Edwards AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:645
+#: my-evolution/Locations.h:647
 msgid "Egilsstadir"
 msgstr ""
 
-#: my-evolution/Locations.h:646
+#: my-evolution/Locations.h:648
 msgid "Eglin"
 msgstr ""
 
-#: my-evolution/Locations.h:647
+#: my-evolution/Locations.h:649
 msgid "Eglington/Londonderry"
 msgstr ""
 
-#: my-evolution/Locations.h:648
-msgid "Egypt"
-msgstr "��������"
-
-#: my-evolution/Locations.h:649
+#: my-evolution/Locations.h:651
 msgid "Eindhoven"
 msgstr ""
 
-#: my-evolution/Locations.h:650
+#: my-evolution/Locations.h:652
 msgid "Ekofisk"
 msgstr ""
 
-#: my-evolution/Locations.h:651
+#: my-evolution/Locations.h:653
 msgid "Elazig"
 msgstr ""
 
-#: my-evolution/Locations.h:652
+#: my-evolution/Locations.h:654
 msgid "El Centro"
 msgstr ""
 
-#: my-evolution/Locations.h:653
+#: my-evolution/Locations.h:655
 #, fuzzy
 msgid "El Dorado"
 msgstr "������"
 
-#: my-evolution/Locations.h:654
+#: my-evolution/Locations.h:656
 msgid "Elefsis"
 msgstr ""
 
-#: my-evolution/Locations.h:655
+#: my-evolution/Locations.h:657
 msgid "Elfin Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:656
+#: my-evolution/Locations.h:658
 msgid "Elizabeth City"
 msgstr ""
 
-#: my-evolution/Locations.h:657
+#: my-evolution/Locations.h:659
 msgid "Elk City"
 msgstr ""
 
-#: my-evolution/Locations.h:658
+#: my-evolution/Locations.h:660
 msgid "Elkhart"
 msgstr ""
 
-#: my-evolution/Locations.h:659
+#: my-evolution/Locations.h:661
 #, fuzzy
 msgid "Elkins"
 msgstr "�����"
 
-#: my-evolution/Locations.h:660
+#: my-evolution/Locations.h:662
 msgid "Elko"
 msgstr ""
 
-#: my-evolution/Locations.h:661
+#: my-evolution/Locations.h:663
 #, fuzzy
 msgid "Elmira"
 msgstr "Elm"
 
-#: my-evolution/Locations.h:662
+#: my-evolution/Locations.h:664
 #, fuzzy
 msgid "El Monte"
 msgstr "�����"
 
-#: my-evolution/Locations.h:663
+#: my-evolution/Locations.h:665
 msgid "El Paso"
 msgstr ""
 
-#: my-evolution/Locations.h:664
-msgid "El Salvador"
-msgstr "�� ��������"
-
-#: my-evolution/Locations.h:665
+#: my-evolution/Locations.h:667
 #, fuzzy
 msgid "El Salvador Int."
 msgstr "�� ��������"
 
-#: my-evolution/Locations.h:666
+#: my-evolution/Locations.h:668
 msgid "Elsenborn"
 msgstr ""
 
-#: my-evolution/Locations.h:667
+#: my-evolution/Locations.h:669
 #, fuzzy
 msgid "Ely"
 msgstr "Elm"
 
-#: my-evolution/Locations.h:668
+#: my-evolution/Locations.h:670
 msgid "Emmonak"
 msgstr ""
 
-#: my-evolution/Locations.h:669
+#: my-evolution/Locations.h:671
 #, fuzzy
 msgid "Emporia"
 msgstr "���������"
 
-#: my-evolution/Locations.h:670
+#: my-evolution/Locations.h:672
 msgid "Enid"
 msgstr ""
 
-#: my-evolution/Locations.h:671
+#: my-evolution/Locations.h:673
 #, fuzzy
 msgid "Enid/Woodring"
 msgstr "���������:"
 
-#: my-evolution/Locations.h:672
+#: my-evolution/Locations.h:674
 msgid "Enosburg Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:673
+#: my-evolution/Locations.h:675
 msgid "Ephrata"
 msgstr ""
 
-#: my-evolution/Locations.h:674
+#: my-evolution/Locations.h:676
 msgid "Ercan"
 msgstr ""
 
-#: my-evolution/Locations.h:675
+#: my-evolution/Locations.h:677
 #, fuzzy
 msgid "Erie"
 msgstr "��������"
 
-#: my-evolution/Locations.h:676
+#: my-evolution/Locations.h:678
 msgid "Erzurum"
 msgstr ""
 
-#: my-evolution/Locations.h:677
+#: my-evolution/Locations.h:679
 msgid "Esbjerg"
 msgstr ""
 
-#: my-evolution/Locations.h:678
+#: my-evolution/Locations.h:680
 msgid "Escanaba"
 msgstr ""
 
-#: my-evolution/Locations.h:679
+#: my-evolution/Locations.h:681
 msgid "Esfahan"
 msgstr ""
 
-#: my-evolution/Locations.h:680
+#: my-evolution/Locations.h:682
 msgid "Eskisehir"
 msgstr ""
 
-#: my-evolution/Locations.h:681
+#: my-evolution/Locations.h:683
 msgid "Estherville"
 msgstr ""
 
-#: my-evolution/Locations.h:682
-msgid "Estonia"
-msgstr "�������"
-
-#: my-evolution/Locations.h:683
+#: my-evolution/Locations.h:685
 #, fuzzy
 msgid "Eugene"
 msgstr "�������"
 
-#: my-evolution/Locations.h:684
+#: my-evolution/Locations.h:686
 #, fuzzy
 msgid "Eureka"
 msgstr "��������"
 
-#: my-evolution/Locations.h:685
+#: my-evolution/Locations.h:687
 #, fuzzy
 msgid "Europe"
 msgstr "������/�����"
 
-#: my-evolution/Locations.h:686
+#: my-evolution/Locations.h:688
 #, fuzzy
 msgid "Evanston"
 msgstr "�������"
 
-#: my-evolution/Locations.h:687
+#: my-evolution/Locations.h:689
 msgid "Evansville"
 msgstr ""
 
-#: my-evolution/Locations.h:688
+#: my-evolution/Locations.h:690
 #, fuzzy
 msgid "Everett"
 msgstr "����"
 
-#: my-evolution/Locations.h:689
+#: my-evolution/Locations.h:691
 msgid "Evergreen"
 msgstr ""
 
-#: my-evolution/Locations.h:690
+#: my-evolution/Locations.h:692
 msgid "Evreux-Fauville"
 msgstr ""
 
-#: my-evolution/Locations.h:691
+#: my-evolution/Locations.h:693
 #, fuzzy
 msgid "Exeter"
 msgstr "������"
 
-#: my-evolution/Locations.h:692
+#: my-evolution/Locations.h:694
 msgid "Ezeiza"
 msgstr ""
 
-#: my-evolution/Locations.h:693
+#: my-evolution/Locations.h:695
 #, fuzzy
 msgid "Fagernes"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:694
+#: my-evolution/Locations.h:696
 msgid "Fairbanks"
 msgstr ""
 
-#: my-evolution/Locations.h:695
+#: my-evolution/Locations.h:697
 msgid "Fairchild"
 msgstr ""
 
-#: my-evolution/Locations.h:696
+#: my-evolution/Locations.h:698
 #, fuzzy
 msgid "Fairfield"
 msgstr "����� _���"
 
-#: my-evolution/Locations.h:697
+#: my-evolution/Locations.h:699
 #, fuzzy
 msgid "Fairmont"
 msgstr "��������������"
 
-#: my-evolution/Locations.h:698
+#: my-evolution/Locations.h:700
 msgid "Fallon"
 msgstr ""
 
-#: my-evolution/Locations.h:699
+#: my-evolution/Locations.h:701
 msgid "Falls City"
 msgstr ""
 
-#: my-evolution/Locations.h:700
+#: my-evolution/Locations.h:702
 msgid "Falmouth-Otis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:701
+#: my-evolution/Locations.h:703
 msgid "Farbanks/Eielson AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:702
+#: my-evolution/Locations.h:704
 #, fuzzy
 msgid "Fargo"
 msgstr "����"
 
-#: my-evolution/Locations.h:703
+#: my-evolution/Locations.h:705
 #, fuzzy
 msgid "Farmingdale"
 msgstr "����������"
 
-#: my-evolution/Locations.h:704
+#: my-evolution/Locations.h:706
 #, fuzzy
 msgid "Farmington"
 msgstr "�������� ������"
 
-#: my-evolution/Locations.h:705
+#: my-evolution/Locations.h:707
 #, fuzzy
 msgid "Farmville"
 msgstr "������������ �����"
 
-#: my-evolution/Locations.h:706
+#: my-evolution/Locations.h:708
 #, fuzzy
 msgid "Faro"
 msgstr "���"
 
-#: my-evolution/Locations.h:707
+#: my-evolution/Locations.h:709
 msgid "Fayetteville"
 msgstr ""
 
-#: my-evolution/Locations.h:708
+#: my-evolution/Locations.h:710
 #, fuzzy
 msgid "Feng Nin"
 msgstr "�������� �����"
 
-#: my-evolution/Locations.h:709
+#: my-evolution/Locations.h:711
 msgid "Fergus Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:710
+#: my-evolution/Locations.h:712
 msgid "Fernando De Noronha"
 msgstr ""
 
-#: my-evolution/Locations.h:711
+#: my-evolution/Locations.h:713
 #, fuzzy
 msgid "Ferrara"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:712
+#: my-evolution/Locations.h:714
 #, fuzzy
 msgid "Figari"
 msgstr "�������"
 
-#: my-evolution/Locations.h:713
+#: my-evolution/Locations.h:715
 #, fuzzy
 msgid "Findlay"
 msgstr "���������"
 
-#: my-evolution/Locations.h:714
-msgid "Finland"
-msgstr "���������"
-
-#: my-evolution/Locations.h:715
+#: my-evolution/Locations.h:717
 #, fuzzy
 msgid "Firenze"
 msgstr "���������"
 
-#: my-evolution/Locations.h:716
+#: my-evolution/Locations.h:718
 msgid "Fitchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:717
+#: my-evolution/Locations.h:719
 msgid "Flagstaff"
 msgstr ""
 
-#: my-evolution/Locations.h:718
+#: my-evolution/Locations.h:720
 #, fuzzy
 msgid "Flint"
 msgstr "�����"
 
-#: my-evolution/Locations.h:719
+#: my-evolution/Locations.h:721
 #, fuzzy
 msgid "Flippin"
 msgstr "����������"
 
-#: my-evolution/Locations.h:720
+#: my-evolution/Locations.h:722
 #, fuzzy
 msgid "Florence"
 msgstr "������"
 
-#: my-evolution/Locations.h:721
+#: my-evolution/Locations.h:723
 #, fuzzy
 msgid "Florennes"
 msgstr "���������"
 
-#: my-evolution/Locations.h:722
+#: my-evolution/Locations.h:724
 #, fuzzy
 msgid "Flores"
 msgstr "������������ ��"
 
-#: my-evolution/Locations.h:723
+#: my-evolution/Locations.h:725
 msgid "Florianopolis"
 msgstr ""
 
-#: my-evolution/Locations.h:724
+#: my-evolution/Locations.h:726
 #, fuzzy
 msgid "Florida"
 msgstr "���������"
 
-#: my-evolution/Locations.h:725
+#: my-evolution/Locations.h:727
 #, fuzzy
 msgid "Floro"
 msgstr "���"
 
-#: my-evolution/Locations.h:726
+#: my-evolution/Locations.h:728
 msgid "Fond Du Lac"
 msgstr ""
 
-#: my-evolution/Locations.h:727
+#: my-evolution/Locations.h:729
 #, fuzzy
 msgid "Forde/Bringeland"
 msgstr "���������"
 
-#: my-evolution/Locations.h:728
+#: my-evolution/Locations.h:730
 #, fuzzy
 msgid "Forli"
 msgstr "_���"
 
-#: my-evolution/Locations.h:729
+#: my-evolution/Locations.h:731
 #, fuzzy
 msgid "Formosa"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:730
+#: my-evolution/Locations.h:732
 #, fuzzy
 msgid "Fortaleza"
 msgstr "�������/���������"
 
-#: my-evolution/Locations.h:731
+#: my-evolution/Locations.h:733
 msgid "Fort Belvoir"
 msgstr ""
 
-#: my-evolution/Locations.h:732
+#: my-evolution/Locations.h:734
 msgid "Fort Benning"
 msgstr ""
 
-#: my-evolution/Locations.h:733
+#: my-evolution/Locations.h:735
 msgid "Fort Bragg"
 msgstr ""
 
-#: my-evolution/Locations.h:734
+#: my-evolution/Locations.h:736
 msgid "Fort Campbell"
 msgstr ""
 
-#: my-evolution/Locations.h:735
+#: my-evolution/Locations.h:737
 msgid "Fort Carson"
 msgstr ""
 
-#: my-evolution/Locations.h:736
+#: my-evolution/Locations.h:738
 msgid "Fort Collins"
 msgstr ""
 
-#: my-evolution/Locations.h:737
+#: my-evolution/Locations.h:739
 msgid "Fort Collins/Lovel"
 msgstr ""
 
-#: my-evolution/Locations.h:738
+#: my-evolution/Locations.h:740
 msgid "Fort Dodge"
 msgstr ""
 
-#: my-evolution/Locations.h:739
+#: my-evolution/Locations.h:741
 msgid "Fort Drum"
 msgstr ""
 
-#: my-evolution/Locations.h:740
+#: my-evolution/Locations.h:742
 #, fuzzy
 msgid "Fort Eustis"
 msgstr "������������"
 
-#: my-evolution/Locations.h:741
+#: my-evolution/Locations.h:743
 msgid "Fort Greely/Allen AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:742
+#: my-evolution/Locations.h:744
 msgid "Fort Huachuca"
 msgstr ""
 
-#: my-evolution/Locations.h:743
+#: my-evolution/Locations.h:745
 msgid "Fort Knox"
 msgstr ""
 
-#: my-evolution/Locations.h:744
+#: my-evolution/Locations.h:746
 msgid "Fort Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:745
+#: my-evolution/Locations.h:747
 msgid "Fort Lauderdale (International)"
 msgstr ""
 
-#: my-evolution/Locations.h:746
+#: my-evolution/Locations.h:748
 #, fuzzy
 msgid "Fort Leonard"
 msgstr "��������"
 
-#: my-evolution/Locations.h:747
+#: my-evolution/Locations.h:749
 msgid "Fort Lewis"
 msgstr ""
 
-#: my-evolution/Locations.h:748
+#: my-evolution/Locations.h:750
 msgid "Fort Madison"
 msgstr ""
 
-#: my-evolution/Locations.h:749
+#: my-evolution/Locations.h:751
 #, fuzzy
 msgid "Fort Meade"
 msgstr "_�������� ���������"
 
-#: my-evolution/Locations.h:750
+#: my-evolution/Locations.h:752
 msgid "Fort Myers (Page Field)"
 msgstr ""
 
-#: my-evolution/Locations.h:751
+#: my-evolution/Locations.h:753
 msgid "Fort Myers (Southwest Florida International)"
 msgstr ""
 
-#: my-evolution/Locations.h:752
+#: my-evolution/Locations.h:754
 msgid "Fort Polk-Leesville"
 msgstr ""
 
-#: my-evolution/Locations.h:753
+#: my-evolution/Locations.h:755
 msgid "Fort Riley"
 msgstr ""
 
-#: my-evolution/Locations.h:754
+#: my-evolution/Locations.h:756
 msgid "Fort Sill"
 msgstr ""
 
-#: my-evolution/Locations.h:755
+#: my-evolution/Locations.h:757
 #, fuzzy
 msgid "Fort Smith"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:756
+#: my-evolution/Locations.h:758
 #, fuzzy
 msgid "Fort Stewart"
 msgstr "��� ���� ���������"
 
-#: my-evolution/Locations.h:757
+#: my-evolution/Locations.h:759
 msgid "Fort Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:758
+#: my-evolution/Locations.h:760
 #, fuzzy
 msgid "Fort Wayne"
 msgstr "������"
 
-#: my-evolution/Locations.h:759
+#: my-evolution/Locations.h:761
 msgid "Fort Worth-Alliance"
 msgstr ""
 
-#: my-evolution/Locations.h:760
+#: my-evolution/Locations.h:762
 msgid "Fort Worth-Meacham"
 msgstr ""
 
-#: my-evolution/Locations.h:761
+#: my-evolution/Locations.h:763
 msgid "Fort Worth NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:762
+#: my-evolution/Locations.h:764
 msgid "Fourchon"
 msgstr ""
 
-#: my-evolution/Locations.h:763
+#: my-evolution/Locations.h:765
 msgid "Foz Do Iguacu"
 msgstr ""
 
-#: my-evolution/Locations.h:764
-msgid "France"
-msgstr "������"
-
-#: my-evolution/Locations.h:765
+#: my-evolution/Locations.h:767
 msgid "Frankfort"
 msgstr ""
 
-#: my-evolution/Locations.h:766
+#: my-evolution/Locations.h:768
 msgid "Frankfurt/Main"
 msgstr ""
 
-#: my-evolution/Locations.h:767
+#: my-evolution/Locations.h:769
 #, fuzzy
 msgid "Franklin"
 msgstr "�������� �� _�������"
 
-#: my-evolution/Locations.h:768
+#: my-evolution/Locations.h:770
 #, fuzzy
 msgid "Fredericton"
 msgstr "���������"
 
-#: my-evolution/Locations.h:769
+#: my-evolution/Locations.h:771
 #, fuzzy
 msgid "Freeport"
 msgstr "���������"
 
-#: my-evolution/Locations.h:770
+#: my-evolution/Locations.h:772
 msgid "Frenchville"
 msgstr ""
 
-#: my-evolution/Locations.h:771
+#: my-evolution/Locations.h:773
 #, fuzzy
 msgid "Fresno"
 msgstr "�������� ����������"
 
-#: my-evolution/Locations.h:772
+#: my-evolution/Locations.h:774
 msgid "Fresno-Chandler"
 msgstr ""
 
-#: my-evolution/Locations.h:773
+#: my-evolution/Locations.h:775
 #, fuzzy
 msgid "Friday Harbor"
 msgstr "���������"
 
-#: my-evolution/Locations.h:774
+#: my-evolution/Locations.h:776
 msgid "Friedrichshafen"
 msgstr ""
 
-#: my-evolution/Locations.h:775
+#: my-evolution/Locations.h:777
 #, fuzzy
 msgid "Frigg"
 msgstr "_���"
 
-#: my-evolution/Locations.h:776
+#: my-evolution/Locations.h:778
 #, fuzzy
 msgid "Frontone"
 msgstr "��������������"
 
-#: my-evolution/Locations.h:777
+#: my-evolution/Locations.h:779
 #, fuzzy
 msgid "Frosinone"
 msgstr "���������"
 
-#: my-evolution/Locations.h:778
+#: my-evolution/Locations.h:780
 #, fuzzy
 msgid "Fryeburg"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:779
+#: my-evolution/Locations.h:781
 msgid "Fujairah"
 msgstr ""
 
-#: my-evolution/Locations.h:780
+#: my-evolution/Locations.h:782
 msgid "Fuji Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:781
+#: my-evolution/Locations.h:783
 msgid "Fukue Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:782
+#: my-evolution/Locations.h:784
 msgid "Fukui Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:783
+#: my-evolution/Locations.h:785
 msgid "Fukuoka Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:784
+#: my-evolution/Locations.h:786
 msgid "Fullerton"
 msgstr ""
 
-#: my-evolution/Locations.h:785
+#: my-evolution/Locations.h:787
 msgid "Funchal"
 msgstr ""
 
-#: my-evolution/Locations.h:786
+#: my-evolution/Locations.h:788
 #, fuzzy
 msgid "FYR Macedonia"
 msgstr "����� �������������� ���������� ��� ���������� (����)"
 
-#: my-evolution/Locations.h:787
+#: my-evolution/Locations.h:789
 msgid "Gadsden"
 msgstr ""
 
-#: my-evolution/Locations.h:788
+#: my-evolution/Locations.h:790
 #, fuzzy
 msgid "Gage"
 msgstr "������"
 
-#: my-evolution/Locations.h:789
+#: my-evolution/Locations.h:791
 #, fuzzy
 msgid "Gainesville"
 msgstr "���������"
 
-#: my-evolution/Locations.h:790
+#: my-evolution/Locations.h:792
 msgid "Galax-Hillsville"
 msgstr ""
 
-#: my-evolution/Locations.h:791
+#: my-evolution/Locations.h:793
 msgid "Galbraith Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:792
+#: my-evolution/Locations.h:794
 msgid "Galeao"
 msgstr ""
 
-#: my-evolution/Locations.h:793
+#: my-evolution/Locations.h:795
 #, fuzzy
 msgid "Galena"
 msgstr "�����"
 
-#: my-evolution/Locations.h:794
+#: my-evolution/Locations.h:796
 msgid "Galesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:795
+#: my-evolution/Locations.h:797
 #, fuzzy
 msgid "Gallup"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:796
+#: my-evolution/Locations.h:798
 msgid "Galveston"
 msgstr ""
 
-#: my-evolution/Locations.h:797
+#: my-evolution/Locations.h:799
 #, fuzzy
 msgid "Gambell"
 msgstr "�������"
 
-#: my-evolution/Locations.h:798
+#: my-evolution/Locations.h:800
 #, fuzzy
 msgid "Gander"
 msgstr "��������"
 
-#: my-evolution/Locations.h:799
+#: my-evolution/Locations.h:801
 #, fuzzy
 msgid "Garden City"
 msgstr "���������"
 
-#: my-evolution/Locations.h:800
+#: my-evolution/Locations.h:802
 msgid "Gary"
 msgstr ""
 
-#: my-evolution/Locations.h:801
+#: my-evolution/Locations.h:803
 #, fuzzy
 msgid "Gassim"
 msgstr "������"
 
-#: my-evolution/Locations.h:802
+#: my-evolution/Locations.h:804
 #, fuzzy
 msgid "Gatineau"
 msgstr "�������"
 
-#: my-evolution/Locations.h:803
+#: my-evolution/Locations.h:805
 msgid "Gaziantep"
 msgstr ""
 
-#: my-evolution/Locations.h:804
+#: my-evolution/Locations.h:806
 #, fuzzy
 msgid "Gdansk"
 msgstr "������"
 
-#: my-evolution/Locations.h:805
+#: my-evolution/Locations.h:807
 #, fuzzy
 msgid "Geneve"
 msgstr "������"
 
-#: my-evolution/Locations.h:806
+#: my-evolution/Locations.h:808
 #, fuzzy
 msgid "Genova"
 msgstr "������"
 
-#: my-evolution/Locations.h:807
+#: my-evolution/Locations.h:809
 msgid "George Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:808
+#: my-evolution/Locations.h:810
 msgid "Georgetown"
 msgstr ""
 
-#: my-evolution/Locations.h:809
-msgid "Georgia"
-msgstr "�������"
-
-#: my-evolution/Locations.h:810
-msgid "Germany"
-msgstr "��������"
-
-#: my-evolution/Locations.h:811
+#: my-evolution/Locations.h:813
 #, fuzzy
 msgid "Ghardaia"
 msgstr "�����"
 
-#: my-evolution/Locations.h:812
+#: my-evolution/Locations.h:814
 msgid "Ghedi"
 msgstr ""
 
-#: my-evolution/Locations.h:813
-msgid "Gibraltar"
-msgstr "���������"
-
-#: my-evolution/Locations.h:814
+#: my-evolution/Locations.h:816
 msgid "Gifu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:815
+#: my-evolution/Locations.h:817
 #, fuzzy
 msgid "Gila Bend"
 msgstr "���������"
 
-#: my-evolution/Locations.h:816
+#: my-evolution/Locations.h:818
 msgid "Gillette"
 msgstr ""
 
-#: my-evolution/Locations.h:817
+#: my-evolution/Locations.h:819
 msgid "Gilze-Rijen"
 msgstr ""
 
-#: my-evolution/Locations.h:818
+#: my-evolution/Locations.h:820
 msgid "Gioia del Colle"
 msgstr ""
 
-#: my-evolution/Locations.h:819
+#: my-evolution/Locations.h:821
 #, fuzzy
 msgid "Girona"
 msgstr "�������"
 
-#: my-evolution/Locations.h:820
+#: my-evolution/Locations.h:822
 #, fuzzy
 msgid "Gizan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:821
+#: my-evolution/Locations.h:823
 #, fuzzy
 msgid "Glasgow"
 msgstr "����"
 
-#: my-evolution/Locations.h:822
+#: my-evolution/Locations.h:824
 #, fuzzy
 msgid "Glendive"
 msgstr "��������"
 
-#: my-evolution/Locations.h:823
+#: my-evolution/Locations.h:825
 msgid "Glens Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:824
+#: my-evolution/Locations.h:826
 #, fuzzy
 msgid "Goiania"
 msgstr "��������"
 
-#: my-evolution/Locations.h:825
+#: my-evolution/Locations.h:827
 msgid "Goldsboro"
 msgstr ""
 
-#: my-evolution/Locations.h:826
+#: my-evolution/Locations.h:828
 #, fuzzy
 msgid "Goodland"
 msgstr "�������"
 
-#: my-evolution/Locations.h:827
+#: my-evolution/Locations.h:829
 #, fuzzy
 msgid "Goose Bay"
 msgstr "�������/����� ����"
 
-#: my-evolution/Locations.h:828
+#: my-evolution/Locations.h:830
 msgid "Goteborg (Landvetter)"
 msgstr ""
 
-#: my-evolution/Locations.h:829
+#: my-evolution/Locations.h:831
 msgid "Goteborg (Save)"
 msgstr ""
 
-#: my-evolution/Locations.h:830
+#: my-evolution/Locations.h:832
 #, fuzzy
 msgid "Granada"
 msgstr "�������"
 
-#: my-evolution/Locations.h:831
+#: my-evolution/Locations.h:833
 msgid "Grand Canyon"
 msgstr ""
 
-#: my-evolution/Locations.h:832
+#: my-evolution/Locations.h:834
 #, fuzzy
 msgid "Grand Cayman"
 msgstr "�������/������"
 
-#: my-evolution/Locations.h:833
+#: my-evolution/Locations.h:835
 msgid "Grand Forks"
 msgstr ""
 
-#: my-evolution/Locations.h:834
+#: my-evolution/Locations.h:836
 #, fuzzy
 msgid "Grand Island"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:835
+#: my-evolution/Locations.h:837
 msgid "Grand Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:836
+#: my-evolution/Locations.h:838
 msgid "Grand Junction"
 msgstr ""
 
-#: my-evolution/Locations.h:837
+#: my-evolution/Locations.h:839
 #, fuzzy
 msgid "Grand Marais"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:838
+#: my-evolution/Locations.h:840
 msgid "Grand Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:839
+#: my-evolution/Locations.h:841
 #, fuzzy
 msgid "Grandview"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:840
+#: my-evolution/Locations.h:842
 #, fuzzy
 msgid "Grangeville"
 msgstr "���������"
 
-#: my-evolution/Locations.h:841
+#: my-evolution/Locations.h:843
 #, fuzzy
 msgid "Grants"
 msgstr "��������"
 
-#: my-evolution/Locations.h:842
+#: my-evolution/Locations.h:844
 #, fuzzy
 msgid "Graz"
 msgstr "��������"
 
-#: my-evolution/Locations.h:843
+#: my-evolution/Locations.h:845
 msgid "Great Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:844
-msgid "Greece"
-msgstr "������"
-
-#: my-evolution/Locations.h:845
+#: my-evolution/Locations.h:847
 #, fuzzy
 msgid "Greeley"
 msgstr "������"
 
-#: my-evolution/Locations.h:846
+#: my-evolution/Locations.h:848
 #, fuzzy
 msgid "Green Bay"
 msgstr "����������"
 
-#: my-evolution/Locations.h:847
+#: my-evolution/Locations.h:849
 msgid "Green River"
 msgstr ""
 
-#: my-evolution/Locations.h:848
+#: my-evolution/Locations.h:850
 msgid "Greensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:849
+#: my-evolution/Locations.h:851
 #, fuzzy
 msgid "Greenville"
 msgstr "����������"
 
-#: my-evolution/Locations.h:850
+#: my-evolution/Locations.h:852
 msgid "Greenville-Spartanburg"
 msgstr ""
 
-#: my-evolution/Locations.h:851
+#: my-evolution/Locations.h:853
 #, fuzzy
 msgid "Greenwood"
 msgstr "����������"
 
-#: my-evolution/Locations.h:852
+#: my-evolution/Locations.h:854
 msgid "Grenoble-Saint-Geoirs"
 msgstr ""
 
-#: my-evolution/Locations.h:853
+#: my-evolution/Locations.h:855
 msgid "Griffiss AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:854
+#: my-evolution/Locations.h:856
 #, fuzzy
 msgid "Groningen"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:855
+#: my-evolution/Locations.h:857
 msgid "Grosseto"
 msgstr ""
 
-#: my-evolution/Locations.h:856
+#: my-evolution/Locations.h:858
 msgid "Groton"
 msgstr ""
 
-#: my-evolution/Locations.h:857
+#: my-evolution/Locations.h:859
 #, fuzzy
 msgid "Guadalajara"
 msgstr "����������"
 
-#: my-evolution/Locations.h:858
+#: my-evolution/Locations.h:860
 #, fuzzy
 msgid "Guadalupe Pass"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:859
+#: my-evolution/Locations.h:861
 #, fuzzy
 msgid "Guanare"
 msgstr "�������"
 
-#: my-evolution/Locations.h:860
+#: my-evolution/Locations.h:862
 msgid "Guangzhou"
 msgstr ""
 
-#: my-evolution/Locations.h:861
+#: my-evolution/Locations.h:863
 #, fuzzy
 msgid "Guantanamo"
 msgstr "����������"
 
-#: my-evolution/Locations.h:862
+#: my-evolution/Locations.h:864
 #, fuzzy
 msgid "Guarany"
 msgstr "��������"
 
-#: my-evolution/Locations.h:863
+#: my-evolution/Locations.h:865
 #, fuzzy
 msgid "Guaratingueta"
 msgstr "�������"
 
-#: my-evolution/Locations.h:864
+#: my-evolution/Locations.h:866
 msgid "Guarulhos"
 msgstr ""
 
-#: my-evolution/Locations.h:865
-msgid "Guatemala"
-msgstr "����������"
-
-#: my-evolution/Locations.h:866
+#: my-evolution/Locations.h:868
 msgid "Guayaquil/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:867
+#: my-evolution/Locations.h:869
 #, fuzzy
 msgid "Guaymas"
 msgstr "������"
 
-#: my-evolution/Locations.h:868
+#: my-evolution/Locations.h:870
 #, fuzzy
 msgid "Guernsey"
 msgstr "��������"
 
-#: my-evolution/Locations.h:869
+#: my-evolution/Locations.h:871
 #, fuzzy
 msgid "Guidonia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:870
+#: my-evolution/Locations.h:872
 msgid "Gulfport"
 msgstr ""
 
-#: my-evolution/Locations.h:871
+#: my-evolution/Locations.h:873
 #, fuzzy
 msgid "Gulkana"
 msgstr "�������"
 
-#: my-evolution/Locations.h:872
+#: my-evolution/Locations.h:874
 msgid "Gullfax C"
 msgstr ""
 
-#: my-evolution/Locations.h:873
+#: my-evolution/Locations.h:875
 #, fuzzy
 msgid "Gunnison"
 msgstr "��������"
 
-#: my-evolution/Locations.h:874
+#: my-evolution/Locations.h:876
 msgid "Gunnison (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:875
+#: my-evolution/Locations.h:877
 #, fuzzy
 msgid "Guriat"
 msgstr "�������"
 
-#: my-evolution/Locations.h:876
+#: my-evolution/Locations.h:878
 msgid "Gustavus"
 msgstr ""
 
-#: my-evolution/Locations.h:877
+#: my-evolution/Locations.h:879
 #, fuzzy
 msgid "Guymon"
 msgstr "�������"
 
-#: my-evolution/Locations.h:878
+#: my-evolution/Locations.h:880
 #, fuzzy
 msgid "Habana"
 msgstr "�������"
 
-#: my-evolution/Locations.h:879
+#: my-evolution/Locations.h:881
 msgid "Hachijojima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:880
+#: my-evolution/Locations.h:882
 msgid "Hachinohe Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:881
+#: my-evolution/Locations.h:883
 msgid "Hafr Al-Batin"
 msgstr ""
 
-#: my-evolution/Locations.h:882
+#: my-evolution/Locations.h:884
 msgid "Hagerstown"
 msgstr ""
 
 #. HAIL
-#: my-evolution/Locations.h:883 my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
 msgid "Hail"
 msgstr "������"
 
-#: my-evolution/Locations.h:884
+#: my-evolution/Locations.h:886
 msgid "Hailey-Sun Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:885
+#: my-evolution/Locations.h:887
 #, fuzzy
 msgid "Haines"
 msgstr "������������"
 
-#: my-evolution/Locations.h:886
-msgid "Haiti"
-msgstr "����"
-
-#: my-evolution/Locations.h:887
+#: my-evolution/Locations.h:889
 msgid "Hakodate Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:888
+#: my-evolution/Locations.h:890
 #, fuzzy
 msgid "Halifax"
 msgstr "�������/�������"
 
-#: my-evolution/Locations.h:889
+#: my-evolution/Locations.h:891
 msgid "Hamamatsu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:890
+#: my-evolution/Locations.h:892
 msgid "Hamburg"
 msgstr ""
 
-#: my-evolution/Locations.h:891
+#: my-evolution/Locations.h:893
 msgid "Hamburg-Finkenwerder"
 msgstr ""
 
-#: my-evolution/Locations.h:892
+#: my-evolution/Locations.h:894
 #, fuzzy
 msgid "Hamilton"
 msgstr "��������� �� ������"
 
-#: my-evolution/Locations.h:893
+#: my-evolution/Locations.h:895
 msgid "Hammerfest"
 msgstr ""
 
-#: my-evolution/Locations.h:894
+#: my-evolution/Locations.h:896
 msgid "Hampton"
 msgstr ""
 
-#: my-evolution/Locations.h:895
+#: my-evolution/Locations.h:897
 msgid "Hanamaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:896
+#: my-evolution/Locations.h:898
 msgid "Hancock"
 msgstr ""
 
-#: my-evolution/Locations.h:897
+#: my-evolution/Locations.h:899
 msgid "Hangzhou"
 msgstr ""
 
-#: my-evolution/Locations.h:898
+#: my-evolution/Locations.h:900
 msgid "Hanksville"
 msgstr ""
 
-#: my-evolution/Locations.h:899
+#: my-evolution/Locations.h:901
 msgid "Hannover"
 msgstr ""
 
-#: my-evolution/Locations.h:900
+#: my-evolution/Locations.h:902
 #, fuzzy
 msgid "Ha Noi"
 msgstr "������"
 
-#: my-evolution/Locations.h:901
+#: my-evolution/Locations.h:903
 msgid "Harbor Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:902
+#: my-evolution/Locations.h:904
 #, fuzzy
 msgid "Harlingen"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:903
+#: my-evolution/Locations.h:905
 msgid "Harlowton"
 msgstr ""
 
-#: my-evolution/Locations.h:904
+#: my-evolution/Locations.h:906
 msgid "Harrisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:905
+#: my-evolution/Locations.h:907
 msgid "Harrison"
 msgstr ""
 
-#: my-evolution/Locations.h:906
+#: my-evolution/Locations.h:908
 msgid "Harstad/Narvik/Evenes"
 msgstr ""
 
-#: my-evolution/Locations.h:907
+#: my-evolution/Locations.h:909
 msgid "Hartford"
 msgstr ""
 
-#: my-evolution/Locations.h:908
+#: my-evolution/Locations.h:910
 msgid "Hassi-Messaoud"
 msgstr ""
 
-#: my-evolution/Locations.h:909
+#: my-evolution/Locations.h:911
 #, fuzzy
 msgid "Hastings"
 msgstr "������������"
 
-#: my-evolution/Locations.h:910
+#: my-evolution/Locations.h:912
 msgid "Haugesund"
 msgstr ""
 
-#: my-evolution/Locations.h:911
+#: my-evolution/Locations.h:913
 #, fuzzy
 msgid "Havre"
 msgstr "������"
 
-#: my-evolution/Locations.h:912
+#: my-evolution/Locations.h:914
 #, fuzzy
 msgid "Hawaii"
 msgstr "����"
 
-#: my-evolution/Locations.h:913
+#: my-evolution/Locations.h:915
 msgid "Hawthorne"
 msgstr ""
 
-#: my-evolution/Locations.h:914
+#: my-evolution/Locations.h:916
 #, fuzzy
 msgid "Hayden"
 msgstr "��������"
 
-#: my-evolution/Locations.h:915
+#: my-evolution/Locations.h:917
 msgid "Hayes River"
 msgstr ""
 
-#: my-evolution/Locations.h:916
+#: my-evolution/Locations.h:918
 #, fuzzy
 msgid "Hays"
 msgstr "������"
 
-#: my-evolution/Locations.h:917
+#: my-evolution/Locations.h:919
 msgid "Hayward"
 msgstr ""
 
-#: my-evolution/Locations.h:918
+#: my-evolution/Locations.h:920
 msgid "Healy River"
 msgstr ""
 
-#: my-evolution/Locations.h:919
+#: my-evolution/Locations.h:921
 #, fuzzy
 msgid "Helena"
 msgstr "���� �����"
 
-#: my-evolution/Locations.h:920
+#: my-evolution/Locations.h:922
 #, fuzzy
 msgid "Helsinki"
 msgstr "������/�������"
 
-#: my-evolution/Locations.h:921
+#: my-evolution/Locations.h:923
 #, fuzzy
 msgid "Henderson"
 msgstr "��������"
 
-#: my-evolution/Locations.h:922
+#: my-evolution/Locations.h:924
 msgid "Hengchun"
 msgstr ""
 
-#: my-evolution/Locations.h:923
+#: my-evolution/Locations.h:925
 #, fuzzy
 msgid "Hermosillo"
 msgstr "�������/���������"
 
-#: my-evolution/Locations.h:924
+#: my-evolution/Locations.h:926
 msgid "Hibbing"
 msgstr ""
 
-#: my-evolution/Locations.h:925
+#: my-evolution/Locations.h:927
 msgid "Hickory"
 msgstr ""
 
-#: my-evolution/Locations.h:926
+#: my-evolution/Locations.h:928
 msgid "Hill City"
 msgstr ""
 
-#: my-evolution/Locations.h:927
+#: my-evolution/Locations.h:929
 #, fuzzy
 msgid "Hillsboro"
 msgstr "��������� �� ������"
 
-#: my-evolution/Locations.h:928
+#: my-evolution/Locations.h:930
 #, fuzzy
 msgid "Hilo"
 msgstr "������"
 
-#: my-evolution/Locations.h:929
+#: my-evolution/Locations.h:931
 msgid "Hinesville"
 msgstr ""
 
-#: my-evolution/Locations.h:930
+#: my-evolution/Locations.h:932
 msgid "Hiroshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:931
+#: my-evolution/Locations.h:933
 msgid "Hobart"
 msgstr ""
 
-#: my-evolution/Locations.h:932
+#: my-evolution/Locations.h:934
 #, fuzzy
 msgid "Hobbs"
 msgstr "����"
 
-#: my-evolution/Locations.h:933
+#: my-evolution/Locations.h:935
 msgid "Ho Chi Minh"
 msgstr ""
 
-#: my-evolution/Locations.h:934
+#: my-evolution/Locations.h:936
 msgid "Hodeidah"
 msgstr ""
 
-#: my-evolution/Locations.h:935
+#: my-evolution/Locations.h:937
 msgid "Hof"
 msgstr ""
 
-#: my-evolution/Locations.h:936
+#: my-evolution/Locations.h:938
 msgid "Hoffman"
 msgstr ""
 
-#: my-evolution/Locations.h:937
+#: my-evolution/Locations.h:939
 msgid "Hofu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:938
+#: my-evolution/Locations.h:940
 msgid "Hohenems"
 msgstr ""
 
-#: my-evolution/Locations.h:939
+#: my-evolution/Locations.h:941
 #, fuzzy
 msgid "Holguin"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:940
+#: my-evolution/Locations.h:942
 #, fuzzy
 msgid "Homer"
 msgstr "�����"
 
-#: my-evolution/Locations.h:941
+#: my-evolution/Locations.h:943
 #, fuzzy
 msgid "Homestead AFB"
 msgstr "������������ "
 
-#: my-evolution/Locations.h:942
+#: my-evolution/Locations.h:944
 #, fuzzy
 msgid "Hondo"
 msgstr "������"
 
-#: my-evolution/Locations.h:943
-msgid "Honduras"
-msgstr "�������"
-
-#: my-evolution/Locations.h:944
-msgid "Hong Kong"
-msgstr "����� �����"
-
-#: my-evolution/Locations.h:945
+#: my-evolution/Locations.h:947
 msgid "Honningsvag"
 msgstr ""
 
-#: my-evolution/Locations.h:946
+#: my-evolution/Locations.h:948
 msgid "Honolulu"
 msgstr ""
 
-#: my-evolution/Locations.h:947
+#: my-evolution/Locations.h:949
 msgid "Hoonah"
 msgstr ""
 
-#: my-evolution/Locations.h:948
+#: my-evolution/Locations.h:950
 msgid "Hoquiam"
 msgstr ""
 
-#: my-evolution/Locations.h:949
+#: my-evolution/Locations.h:951
 msgid "Hot Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:950
+#: my-evolution/Locations.h:952
 msgid "Houghton Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:951
+#: my-evolution/Locations.h:953
 #, fuzzy
 msgid "Houlton"
 msgstr "����������"
 
-#: my-evolution/Locations.h:952
+#: my-evolution/Locations.h:954
 #, fuzzy
 msgid "Houma"
 msgstr "�����"
 
-#: my-evolution/Locations.h:953
+#: my-evolution/Locations.h:955
 msgid "Houston-Bush"
 msgstr ""
 
-#: my-evolution/Locations.h:954
+#: my-evolution/Locations.h:956
 msgid "Houston-Clover"
 msgstr ""
 
-#: my-evolution/Locations.h:955
+#: my-evolution/Locations.h:957
 msgid "Houston-Ellington Field"
 msgstr ""
 
-#: my-evolution/Locations.h:956
+#: my-evolution/Locations.h:958
 msgid "Houston-Hobby"
 msgstr ""
 
-#: my-evolution/Locations.h:957
+#: my-evolution/Locations.h:959
 msgid "Houston-Hooks"
 msgstr ""
 
-#: my-evolution/Locations.h:958
+#: my-evolution/Locations.h:960
 #, fuzzy
 msgid "Howard AFB"
 msgstr "�������� ��"
 
-#: my-evolution/Locations.h:959
+#: my-evolution/Locations.h:961
 msgid "Hsinchu"
 msgstr ""
 
-#: my-evolution/Locations.h:960
+#: my-evolution/Locations.h:962
 msgid "Huanuco"
 msgstr ""
 
-#: my-evolution/Locations.h:961
+#: my-evolution/Locations.h:963
 msgid "Huehuetenango"
 msgstr ""
 
-#: my-evolution/Locations.h:962
+#: my-evolution/Locations.h:964
 #, fuzzy
 msgid "Hulien"
 msgstr "��������"
 
-#: my-evolution/Locations.h:963
+#: my-evolution/Locations.h:965
 msgid "Humberside"
 msgstr ""
 
-#: my-evolution/Locations.h:964
-msgid "Hungary"
-msgstr "��������"
-
-#: my-evolution/Locations.h:965
+#: my-evolution/Locations.h:967
 msgid "Huntington"
 msgstr ""
 
-#: my-evolution/Locations.h:966
+#: my-evolution/Locations.h:968
 #, fuzzy
 msgid "Huntsville"
 msgstr "�����"
 
-#: my-evolution/Locations.h:967
+#: my-evolution/Locations.h:969
 msgid "Hurlburt"
 msgstr ""
 
-#: my-evolution/Locations.h:968
+#: my-evolution/Locations.h:970
 #, fuzzy
 msgid "Huron"
 msgstr "����"
 
-#: my-evolution/Locations.h:969
+#: my-evolution/Locations.h:971
 msgid "Hutchinson"
 msgstr ""
 
-#: my-evolution/Locations.h:970
+#: my-evolution/Locations.h:972
 msgid "Hyakuri Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:971
+#: my-evolution/Locations.h:973
 msgid "Hyannis"
 msgstr ""
 
-#: my-evolution/Locations.h:972
+#: my-evolution/Locations.h:974
 msgid "Hyderabad"
 msgstr ""
 
-#: my-evolution/Locations.h:973
+#: my-evolution/Locations.h:975
 msgid "Hyeres-Le Palyvestre"
 msgstr ""
 
-#: my-evolution/Locations.h:974
+#: my-evolution/Locations.h:976
 #, fuzzy
 msgid "Iasi"
 msgstr "������"
 
-#: my-evolution/Locations.h:975
+#: my-evolution/Locations.h:977
 #, fuzzy
 msgid "Ibiza"
 msgstr "�����"
 
-#: my-evolution/Locations.h:976
-msgid "Iceland"
-msgstr "��������"
-
-#: my-evolution/Locations.h:977
+#: my-evolution/Locations.h:979
 msgid "Ichikawa"
 msgstr ""
 
-#: my-evolution/Locations.h:978
+#: my-evolution/Locations.h:980
 #, fuzzy
 msgid "Idaho"
 msgstr "�����"
 
-#: my-evolution/Locations.h:979
+#: my-evolution/Locations.h:981
 msgid "Idaho Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:980
+#: my-evolution/Locations.h:982
 msgid "Iguazu"
 msgstr ""
 
-#: my-evolution/Locations.h:981
+#: my-evolution/Locations.h:983
 msgid "Iki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:982
+#: my-evolution/Locations.h:984
 #, fuzzy
 msgid "Ilan"
 msgstr "��������"
 
-#: my-evolution/Locations.h:983
+#: my-evolution/Locations.h:985
 #, fuzzy
 msgid "Iliamna"
 msgstr "���� ��� ������"
 
-#: my-evolution/Locations.h:984
+#: my-evolution/Locations.h:986
 msgid "Illinois"
 msgstr ""
 
-#: my-evolution/Locations.h:985
+#: my-evolution/Locations.h:987
 #, fuzzy
 msgid "Imperial"
 msgstr "��������"
 
-#: my-evolution/Locations.h:986
+#: my-evolution/Locations.h:988
 msgid "Imperial (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:987
+#: my-evolution/Locations.h:989
 msgid "Imperial Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:988
+#: my-evolution/Locations.h:990
 #, fuzzy
 msgid "In Amenas"
 msgstr "�������"
 
-#: my-evolution/Locations.h:989
-msgid "India"
-msgstr "�����"
-
-#: my-evolution/Locations.h:990
+#: my-evolution/Locations.h:992
 #, fuzzy
 msgid "Indiana"
 msgstr "�����"
 
-#: my-evolution/Locations.h:991
+#: my-evolution/Locations.h:993
 #, fuzzy
 msgid "Indianapolis"
 msgstr "�������/�����������"
 
-#: my-evolution/Locations.h:992
+#: my-evolution/Locations.h:994
 #, fuzzy
 msgid "Indian Springs"
 msgstr "�������/���������"
 
-#: my-evolution/Locations.h:993
+#: my-evolution/Locations.h:995
 msgid "Innsbruck"
 msgstr ""
 
-#: my-evolution/Locations.h:994
+#: my-evolution/Locations.h:996
 msgid "International Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:995
+#: my-evolution/Locations.h:997
 msgid "Intracoastal"
 msgstr ""
 
-#: my-evolution/Locations.h:996
+#: my-evolution/Locations.h:998
 #, fuzzy
 msgid "Inverness"
 msgstr "�� �������"
 
-#: my-evolution/Locations.h:997
+#: my-evolution/Locations.h:999
 msgid "Inyokern"
 msgstr ""
 
-#: my-evolution/Locations.h:998
+#: my-evolution/Locations.h:1000
 #, fuzzy
 msgid "Iowa"
 msgstr "��������"
 
-#: my-evolution/Locations.h:999
+#: my-evolution/Locations.h:1001
 msgid "Iowa City"
 msgstr ""
 
-#: my-evolution/Locations.h:1000
+#: my-evolution/Locations.h:1002
 #, fuzzy
 msgid "Iqaluit"
 msgstr "�������/��������"
 
-#: my-evolution/Locations.h:1001
+#: my-evolution/Locations.h:1003
 msgid "Iquique/Diego Arac"
 msgstr ""
 
-#: my-evolution/Locations.h:1002
+#: my-evolution/Locations.h:1004
 msgid "Iquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1003
+#: my-evolution/Locations.h:1005
 #, fuzzy
 msgid "Iraklion"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1004
+#: my-evolution/Locations.h:1006
 msgid "Iran, Islamic Republic of"
 msgstr ""
 
-#: my-evolution/Locations.h:1005
-msgid "Ireland"
-msgstr "��������"
-
-#: my-evolution/Locations.h:1006
+#: my-evolution/Locations.h:1008
 #, fuzzy
 msgid "Iron Mountain"
 msgstr "�� ������ ��������"
 
-#: my-evolution/Locations.h:1007
+#: my-evolution/Locations.h:1009
 msgid "Ironwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1008
+#: my-evolution/Locations.h:1010
 msgid "Iruma Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1009
+#: my-evolution/Locations.h:1011
 msgid "Islamabad"
 msgstr ""
 
-#: my-evolution/Locations.h:1010
+#: my-evolution/Locations.h:1012
 msgid "Isle of Man"
 msgstr ""
 
-#: my-evolution/Locations.h:1011
+#: my-evolution/Locations.h:1013
 msgid "Islip"
 msgstr ""
 
-#: my-evolution/Locations.h:1012
+#: my-evolution/Locations.h:1014
 #, fuzzy
 msgid "Istanbul"
 msgstr "����/����������������"
 
-#: my-evolution/Locations.h:1013
+#: my-evolution/Locations.h:1015
 msgid "Itaituba"
 msgstr ""
 
-#: my-evolution/Locations.h:1014
-msgid "Italy"
-msgstr "������"
-
-#: my-evolution/Locations.h:1015
+#: my-evolution/Locations.h:1017
 msgid "Ithaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1016
+#: my-evolution/Locations.h:1018
+msgid "Ivano-Frankivsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1019
 msgid "Iwakuni MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1017
+#: my-evolution/Locations.h:1020
 msgid "Iwojima"
 msgstr ""
 
-#: my-evolution/Locations.h:1018
+#: my-evolution/Locations.h:1021
 msgid "Ixtapa"
 msgstr ""
 
-#: my-evolution/Locations.h:1019
+#: my-evolution/Locations.h:1022
 msgid "Izmir/Adnan Menderes"
 msgstr ""
 
-#: my-evolution/Locations.h:1020
+#: my-evolution/Locations.h:1023
 msgid "Izmir/Cigli"
 msgstr ""
 
-#: my-evolution/Locations.h:1021
+#: my-evolution/Locations.h:1024
 msgid "Izmit"
 msgstr ""
 
-#: my-evolution/Locations.h:1022
+#: my-evolution/Locations.h:1025
 #, fuzzy
 msgid "Izumo Airport"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1023
+#: my-evolution/Locations.h:1026
 msgid "Jackson"
 msgstr ""
 
-#: my-evolution/Locations.h:1024
+#: my-evolution/Locations.h:1027
 msgid "Jacksonville"
 msgstr ""
 
-#: my-evolution/Locations.h:1025
+#: my-evolution/Locations.h:1028
 msgid "Jacksonville-Craig Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1026
+#: my-evolution/Locations.h:1029
 msgid "Jacksonville NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1027
+#: my-evolution/Locations.h:1030
 msgid "Jaffrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1028
-msgid "Jamaica"
-msgstr "��������"
-
-#: my-evolution/Locations.h:1029
+#: my-evolution/Locations.h:1032
 msgid "Jamestown"
 msgstr ""
 
-#: my-evolution/Locations.h:1030
+#: my-evolution/Locations.h:1033
 #, fuzzy
 msgid "Janesville"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1031
+#: my-evolution/Locations.h:1034
 msgid "Jan Smuts"
 msgstr ""
 
-#: my-evolution/Locations.h:1032
-msgid "Japan"
-msgstr "�������"
-
-#: my-evolution/Locations.h:1033
+#: my-evolution/Locations.h:1036
 msgid "Jeddah King Abdul Aziz International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1034
+#: my-evolution/Locations.h:1037
 msgid "Jefferson City"
 msgstr ""
 
-#: my-evolution/Locations.h:1035
+#: my-evolution/Locations.h:1038
 msgid "Jerez"
 msgstr ""
 
-#: my-evolution/Locations.h:1036
+#: my-evolution/Locations.h:1039
 msgid "Jersey"
 msgstr ""
 
-#: my-evolution/Locations.h:1037
+#: my-evolution/Locations.h:1040
 msgid "Jinotega"
 msgstr ""
 
-#: my-evolution/Locations.h:1038
+#: my-evolution/Locations.h:1041
 msgid "Johan A. Pengel"
 msgstr ""
 
-#: my-evolution/Locations.h:1039
+#: my-evolution/Locations.h:1042
 msgid "Johnstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1040
+#: my-evolution/Locations.h:1043
 msgid "Jonesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1041
+#: my-evolution/Locations.h:1044
 #, fuzzy
 msgid "Jonkoping"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1042
+#: my-evolution/Locations.h:1045
 #, fuzzy
 msgid "Joplin"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1043
-msgid "Jordan"
-msgstr "��������"
-
-#: my-evolution/Locations.h:1044
+#: my-evolution/Locations.h:1047
 msgid "Juanjui"
 msgstr ""
 
-#: my-evolution/Locations.h:1045
+#: my-evolution/Locations.h:1048
 msgid "Juan Santamaria"
 msgstr ""
 
-#: my-evolution/Locations.h:1046
+#: my-evolution/Locations.h:1049
 #, fuzzy
 msgid "Juigalpa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1047
+#: my-evolution/Locations.h:1050
 #, fuzzy
 msgid "Jujuy"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1048
+#: my-evolution/Locations.h:1051
 #, fuzzy
 msgid "Juliaca"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1049
+#: my-evolution/Locations.h:1052
 #, fuzzy
 msgid "Junction"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1050
+#: my-evolution/Locations.h:1053
 #, fuzzy
 msgid "Juneau"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1051
+#: my-evolution/Locations.h:1054
 msgid "Kadena Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1052
+#: my-evolution/Locations.h:1055
 msgid "Kagoshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1053
+#: my-evolution/Locations.h:1056
 msgid "Kahului"
 msgstr ""
 
-#: my-evolution/Locations.h:1054
+#: my-evolution/Locations.h:1057
 msgid "Kailua-Kona"
 msgstr ""
 
-#: my-evolution/Locations.h:1055
+#: my-evolution/Locations.h:1058
 msgid "Kake"
 msgstr ""
 
-#: my-evolution/Locations.h:1056
+#: my-evolution/Locations.h:1059
 #, fuzzy
 msgid "Kalamata"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1057
+#: my-evolution/Locations.h:1060
 msgid "Kalamazoo"
 msgstr ""
 
-#: my-evolution/Locations.h:1058
+#: my-evolution/Locations.h:1061
 msgid "Kalispell"
 msgstr ""
 
-#: my-evolution/Locations.h:1059
+#: my-evolution/Locations.h:1062
 msgid "Kamigoto"
 msgstr ""
 
-#: my-evolution/Locations.h:1060
+#: my-evolution/Locations.h:1063
 msgid "Kaneohe"
 msgstr ""
 
-#: my-evolution/Locations.h:1061
+#: my-evolution/Locations.h:1064
 msgid "Kangshan"
 msgstr ""
 
-#: my-evolution/Locations.h:1062
+#: my-evolution/Locations.h:1065
 msgid "Kanoya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1063
+#: my-evolution/Locations.h:1066
 msgid "Kansai International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1064
+#: my-evolution/Locations.h:1067
 msgid "Kansas"
 msgstr ""
 
-#: my-evolution/Locations.h:1065
+#: my-evolution/Locations.h:1068
 msgid "Kansas City"
 msgstr ""
 
-#: my-evolution/Locations.h:1066
+#: my-evolution/Locations.h:1069
 msgid "Kansas City-Gladstone"
 msgstr ""
 
-#: my-evolution/Locations.h:1067
+#: my-evolution/Locations.h:1070
 msgid "Kaohsiung"
 msgstr ""
 
-#: my-evolution/Locations.h:1068
+#: my-evolution/Locations.h:1071
 #, fuzzy
 msgid "Karachi"
 msgstr "����/�������"
 
-#: my-evolution/Locations.h:1069
+#: my-evolution/Locations.h:1072
 #, fuzzy
 msgid "Karup"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1070
+#: my-evolution/Locations.h:1073
 msgid "Kassel-Calden"
 msgstr ""
 
-#: my-evolution/Locations.h:1071
+#: my-evolution/Locations.h:1074
 msgid "Kasumigaura Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1072
+#: my-evolution/Locations.h:1075
 msgid "Kasuminome Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1073
+#: my-evolution/Locations.h:1076
 msgid "Katowice"
 msgstr ""
 
-#: my-evolution/Locations.h:1074
+#: my-evolution/Locations.h:1077
 msgid "Kavala"
 msgstr ""
 
-#: my-evolution/Locations.h:1075
+#: my-evolution/Locations.h:1078
 msgid "Kayseri"
 msgstr ""
 
-#: my-evolution/Locations.h:1076
+#: my-evolution/Locations.h:1079
 #, fuzzy
 msgid "Kazan"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1077
+#: my-evolution/Locations.h:1080
 #, fuzzy
 msgid "Kearney"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1078
+#: my-evolution/Locations.h:1081
 #, fuzzy
 msgid "Keene"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1079
+#: my-evolution/Locations.h:1082
 msgid "Kefallinia"
 msgstr ""
 
-#: my-evolution/Locations.h:1080
+#: my-evolution/Locations.h:1083
 msgid "Keflavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1081
+#: my-evolution/Locations.h:1084
 #, fuzzy
 msgid "Kenai"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1082
+#: my-evolution/Locations.h:1085
 #, fuzzy
 msgid "Kenosha"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1083
+#: my-evolution/Locations.h:1086
 #, fuzzy
 msgid "Kentucky"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1084
+#: my-evolution/Locations.h:1087
 msgid "Keokuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1085
+#: my-evolution/Locations.h:1088
 msgid "Kerkira"
 msgstr ""
 
-#: my-evolution/Locations.h:1086
+#: my-evolution/Locations.h:1089
 #, fuzzy
 msgid "Kerman"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1087
+#: my-evolution/Locations.h:1090
 msgid "Ketchikan"
 msgstr ""
 
-#: my-evolution/Locations.h:1088
+#: my-evolution/Locations.h:1091
 #, fuzzy
 msgid "Key West"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1089
+#: my-evolution/Locations.h:1092
 msgid "Key West NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1090
+#: my-evolution/Locations.h:1093
 msgid "Khabarovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1091
+#: my-evolution/Locations.h:1094
 msgid "Khamis Mushait"
 msgstr ""
 
-#: my-evolution/Locations.h:1092
+#: my-evolution/Locations.h:1095
+msgid "Kharkiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1096
 #, fuzzy
 msgid "Kikai Island"
 msgstr "����� ����"
 
-#: my-evolution/Locations.h:1093
+#: my-evolution/Locations.h:1097
 msgid "Killeen"
 msgstr ""
 
-#: my-evolution/Locations.h:1094
+#: my-evolution/Locations.h:1098
 msgid "Killeen-Ft Hood"
 msgstr ""
 
-#: my-evolution/Locations.h:1095
+#: my-evolution/Locations.h:1099
 msgid "Killeen-Gray AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:1096
+#: my-evolution/Locations.h:1100
 msgid "King Khaled International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1097
+#: my-evolution/Locations.h:1101
 msgid "Kingman"
 msgstr ""
 
-#: my-evolution/Locations.h:1098
+#: my-evolution/Locations.h:1102
 msgid "King Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1099
+#: my-evolution/Locations.h:1103
 msgid "Kingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1100
+#: my-evolution/Locations.h:1104
 msgid "Kingsville"
 msgstr ""
 
-#: my-evolution/Locations.h:1101
+#: my-evolution/Locations.h:1105
 msgid "Kinloss"
 msgstr ""
 
-#: my-evolution/Locations.h:1102
+#: my-evolution/Locations.h:1106
 msgid "Kinston"
 msgstr ""
 
-#: my-evolution/Locations.h:1103
+#: my-evolution/Locations.h:1107
 msgid "Kirkenes"
 msgstr ""
 
-#: my-evolution/Locations.h:1104
+#: my-evolution/Locations.h:1108
 msgid "Kirksville"
 msgstr ""
 
-#: my-evolution/Locations.h:1105
+#: my-evolution/Locations.h:1109
 msgid "Kiruna"
 msgstr ""
 
-#: my-evolution/Locations.h:1106
+#: my-evolution/Locations.h:1110
 msgid "Kisarazu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1107
+#: my-evolution/Locations.h:1111
 msgid "Kishineu"
 msgstr ""
 
-#: my-evolution/Locations.h:1108
+#: my-evolution/Locations.h:1112
 msgid "Kitakyushu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1109
+#: my-evolution/Locations.h:1113
 msgid "Klagenfurt"
 msgstr ""
 
-#: my-evolution/Locations.h:1110
+#: my-evolution/Locations.h:1114
 msgid "Klamath Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1111
+#: my-evolution/Locations.h:1115
 msgid "Klawock"
 msgstr ""
 
-#: my-evolution/Locations.h:1112
+#: my-evolution/Locations.h:1116
 msgid "Kleine Brogel"
 msgstr ""
 
-#: my-evolution/Locations.h:1113
+#: my-evolution/Locations.h:1117
 #, fuzzy
 msgid "Kliningrad"
 msgstr "������/������������"
 
-#: my-evolution/Locations.h:1114
+#: my-evolution/Locations.h:1118
 msgid "Knoxville"
 msgstr ""
 
-#: my-evolution/Locations.h:1115
+#: my-evolution/Locations.h:1119
 msgid "Knoxville-Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:1116
+#: my-evolution/Locations.h:1120
 msgid "Kobenhavn/Kastrup"
 msgstr ""
 
-#: my-evolution/Locations.h:1117
+#: my-evolution/Locations.h:1121
 msgid "Kobenhavn/Roskilde"
 msgstr ""
 
-#: my-evolution/Locations.h:1118
+#: my-evolution/Locations.h:1122
 msgid "Kochi Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1119
+#: my-evolution/Locations.h:1123
 msgid "Kodiak"
 msgstr ""
 
-#: my-evolution/Locations.h:1120
+#: my-evolution/Locations.h:1124
 msgid "Kogalniceanu"
 msgstr ""
 
-#: my-evolution/Locations.h:1121
+#: my-evolution/Locations.h:1125
 msgid "Kogalym"
 msgstr ""
 
-#: my-evolution/Locations.h:1122
+#: my-evolution/Locations.h:1126
 msgid "Koksijde"
 msgstr ""
 
-#: my-evolution/Locations.h:1123
+#: my-evolution/Locations.h:1127
 msgid "Kolding/Vandrup"
 msgstr ""
 
-#: my-evolution/Locations.h:1124
+#: my-evolution/Locations.h:1128
 msgid "Koln/Bonn"
 msgstr ""
 
-#: my-evolution/Locations.h:1125
+#: my-evolution/Locations.h:1129
 msgid "Komatsu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1126
+#: my-evolution/Locations.h:1130
 msgid "Komatsujima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1127
+#: my-evolution/Locations.h:1131
 #, fuzzy
 msgid "Konya"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1128
+#: my-evolution/Locations.h:1132
 msgid "Korea, Democratic People's Republic of"
 msgstr ""
 
-#: my-evolution/Locations.h:1129
+#: my-evolution/Locations.h:1133
 #, fuzzy
 msgid "Korea, Republic of"
 msgstr "������"
 
-#: my-evolution/Locations.h:1130
+#: my-evolution/Locations.h:1134
 msgid "Kos"
 msgstr ""
 
-#: my-evolution/Locations.h:1131
+#: my-evolution/Locations.h:1135
 msgid "Kotzebue"
 msgstr ""
 
-#: my-evolution/Locations.h:1132
+#: my-evolution/Locations.h:1136
 #, fuzzy
 msgid "Kozani"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1133
+#: my-evolution/Locations.h:1137
 msgid "Krakow"
 msgstr ""
 
-#: my-evolution/Locations.h:1134
+#: my-evolution/Locations.h:1138
 #, fuzzy
 msgid "Krasnodar"
 msgstr "����/������������"
 
-#: my-evolution/Locations.h:1135
+#: my-evolution/Locations.h:1139
 #, fuzzy
 msgid "Krasnoyarsk"
 msgstr "����/������������"
 
-#: my-evolution/Locations.h:1136
+#: my-evolution/Locations.h:1140
 msgid "Kristiansand/Kjevik"
 msgstr ""
 
-#: my-evolution/Locations.h:1137
+#: my-evolution/Locations.h:1141
 msgid "Kristiansund/Kvernberget"
 msgstr ""
 
-#: my-evolution/Locations.h:1138
+#: my-evolution/Locations.h:1142
+msgid "Kryviy Rig/Lozovatka"
+msgstr ""
+
+#: my-evolution/Locations.h:1143
 msgid "Kumamoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1139
+#: my-evolution/Locations.h:1144
 #, fuzzy
 msgid "Kunming"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1140
+#: my-evolution/Locations.h:1145
 msgid "Kushiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1141
-msgid "Kuwait"
-msgstr "�������"
+#: my-evolution/Locations.h:1147
+msgid "Kyyiv/Boryspil"
+msgstr ""
 
-#: my-evolution/Locations.h:1142
+#: my-evolution/Locations.h:1148
+msgid "Kyyiv/Zhulyany"
+msgstr ""
+
+#: my-evolution/Locations.h:1149
 msgid "La Ceiba"
 msgstr ""
 
-#: my-evolution/Locations.h:1143
+#: my-evolution/Locations.h:1150
 #, fuzzy
 msgid "Laconia"
 msgstr "����� �������������� ���������� ��� ���������� (����)"
 
-#: my-evolution/Locations.h:1144
+#: my-evolution/Locations.h:1151
 msgid "La Coruna"
 msgstr ""
 
-#: my-evolution/Locations.h:1145
+#: my-evolution/Locations.h:1152
 #, fuzzy
 msgid "La Crosse"
 msgstr "����"
 
-#: my-evolution/Locations.h:1146
+#: my-evolution/Locations.h:1153
 msgid "La Esperanza"
 msgstr ""
 
-#: my-evolution/Locations.h:1147
+#: my-evolution/Locations.h:1154
 #, fuzzy
 msgid "Lafayette"
 msgstr "������"
 
-#: my-evolution/Locations.h:1148
+#: my-evolution/Locations.h:1155
 msgid "La Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1149
+#: my-evolution/Locations.h:1156
 #, fuzzy
 msgid "Lahaina"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1150
+#: my-evolution/Locations.h:1157
 #, fuzzy
 msgid "Lahore"
 msgstr "_����������"
 
-#: my-evolution/Locations.h:1151
+#: my-evolution/Locations.h:1158
 #, fuzzy
 msgid "Lajes"
 msgstr "����"
 
-#: my-evolution/Locations.h:1152
+#: my-evolution/Locations.h:1159
 msgid "La Junta"
 msgstr ""
 
-#: my-evolution/Locations.h:1153
+#: my-evolution/Locations.h:1160
 msgid "Lake Charles"
 msgstr ""
 
-#: my-evolution/Locations.h:1154
+#: my-evolution/Locations.h:1161
 msgid "Lake Hood"
 msgstr ""
 
-#: my-evolution/Locations.h:1155
+#: my-evolution/Locations.h:1162
 msgid "Lakehurst"
 msgstr ""
 
-#: my-evolution/Locations.h:1156
+#: my-evolution/Locations.h:1163
 #, fuzzy
 msgid "Lakeland"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1157
+#: my-evolution/Locations.h:1164
 msgid "Lake Tahoe"
 msgstr ""
 
-#: my-evolution/Locations.h:1158
+#: my-evolution/Locations.h:1165
 #, fuzzy
 msgid "Lakeview"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:1159
+#: my-evolution/Locations.h:1166
 #, fuzzy
 msgid "Lamar"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1160
+#: my-evolution/Locations.h:1167
 #, fuzzy
 msgid "La Mesa"
 msgstr "_�������� ���������"
 
-#: my-evolution/Locations.h:1161
+#: my-evolution/Locations.h:1168
 #, fuzzy
 msgid "Lamezia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1162
+#: my-evolution/Locations.h:1169
 #, fuzzy
 msgid "Lamoni"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1163
+#: my-evolution/Locations.h:1170
 msgid "Lampedusa"
 msgstr ""
 
-#: my-evolution/Locations.h:1164
+#: my-evolution/Locations.h:1171
 #, fuzzy
 msgid "Lanai"
 msgstr "������"
 
-#: my-evolution/Locations.h:1165
+#: my-evolution/Locations.h:1172
 #, fuzzy
 msgid "Lancaster"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1166
+#: my-evolution/Locations.h:1173
 #, fuzzy
 msgid "Lander"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1167
+#: my-evolution/Locations.h:1174
 #, fuzzy
 msgid "Langebaanweg"
 msgstr "������"
 
-#: my-evolution/Locations.h:1168
+#: my-evolution/Locations.h:1175
 msgid "Langley AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1169
+#: my-evolution/Locations.h:1176
 #, fuzzy
 msgid "Lannion"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1170
+#: my-evolution/Locations.h:1177
 #, fuzzy
 msgid "Lansing"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:1171
+#: my-evolution/Locations.h:1178
 msgid "Lanzhou"
 msgstr ""
 
-#: my-evolution/Locations.h:1172
+#: my-evolution/Locations.h:1179
 msgid "La Paz"
 msgstr ""
 
-#: my-evolution/Locations.h:1173
+#: my-evolution/Locations.h:1180
 msgid "La Paz/Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1174
+#: my-evolution/Locations.h:1181
 msgid "Laramie"
 msgstr ""
 
-#: my-evolution/Locations.h:1175
+#: my-evolution/Locations.h:1182
 #, fuzzy
 msgid "Laredo"
 msgstr "_����������"
 
-#: my-evolution/Locations.h:1176
+#: my-evolution/Locations.h:1183
 #, fuzzy
 msgid "Larnaka"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:1177
+#: my-evolution/Locations.h:1184
 #, fuzzy
 msgid "La Romana"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1178
+#: my-evolution/Locations.h:1185
 #, fuzzy
 msgid "Las Americas"
 msgstr "�������/�����"
 
-#: my-evolution/Locations.h:1179
+#: my-evolution/Locations.h:1186
 msgid "Las Tunas"
 msgstr ""
 
-#: my-evolution/Locations.h:1180
+#: my-evolution/Locations.h:1187
 msgid "Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1181
+#: my-evolution/Locations.h:1188
 #, fuzzy
 msgid "Latina"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1182
+#: my-evolution/Locations.h:1189
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1183
-msgid "Latvia"
-msgstr "��������"
-
-#: my-evolution/Locations.h:1184
+#: my-evolution/Locations.h:1191
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1185
+#: my-evolution/Locations.h:1192
 #, fuzzy
 msgid "Laurel"
 msgstr "_����������"
 
-#: my-evolution/Locations.h:1186
+#: my-evolution/Locations.h:1193
 #, fuzzy
 msgid "La Verne"
 msgstr "������� ���������"
 
-#: my-evolution/Locations.h:1187
+#: my-evolution/Locations.h:1194
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1188
+#: my-evolution/Locations.h:1195
 #, fuzzy
 msgid "Lawton"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1189
+#: my-evolution/Locations.h:1196
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1190
+#: my-evolution/Locations.h:1197
 #, fuzzy
 msgid "Learmouth"
 msgstr "������"
 
-#: my-evolution/Locations.h:1191
-msgid "Lebanon"
-msgstr "�������"
-
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1199
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1200
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1201
 #, fuzzy
 msgid "Leesburg"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1202
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1203
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1204
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1205
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Mans"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1207
 #, fuzzy
 msgid "Le Marine"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemmon"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1209
 #, fuzzy
 msgid "Lemoore"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1210
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1211
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1212
 #, fuzzy
 msgid "Leuchars"
 msgstr "������"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewisburg"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1214
 #, fuzzy
 msgid "Lewiston"
 msgstr "������"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1215
 #, fuzzy
 msgid "Lewistown"
 msgstr "������"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Lexington"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1217
 #, fuzzy
 msgid "Liberal"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1211
-msgid "Liberia"
-msgstr "�������"
-
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1219
 #, fuzzy
 msgid "Libya"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1220
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1221
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Liege"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1223
 #, fuzzy
 msgid "Lihue"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1224
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1225
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limnos"
 msgstr "����"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limoges"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Limon"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1229
 #, fuzzy
 msgid "Lincoln"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1230
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lisboa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1232
 #, fuzzy
 msgid "Lista"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1233
 #, fuzzy
 msgid "Litchfield"
 msgstr "������ ������"
 
-#: my-evolution/Locations.h:1227
-msgid "Lithuania"
-msgstr "���������"
-
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1235
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1236
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1237
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1238
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1239
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Ljubljana"
 msgstr "������/�����������"
 
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1241
 #, fuzzy
 msgid "Logan"
 msgstr "���������� ��"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1242
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "Lompoc"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1244
 #, fuzzy
 msgid "London"
 msgstr "������/�������"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1245
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1246
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1247
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1248
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1249
 #, fuzzy
 msgid "Londrina"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1250
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1251
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1252
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1253
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1254
 #, fuzzy
 msgid "Los Alamos"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1255
 #, fuzzy
 msgid "Los Angeles"
 msgstr "�������/��� ��������"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1256
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1257
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1258
 #, fuzzy
 msgid "Louisville"
 msgstr "�������/��������"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1259
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1260
 #, fuzzy
 msgid "Lousiana"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1261
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1262
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1263
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1264
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1265
 #, fuzzy
 msgid "Lugano"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1266
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1267
 #, fuzzy
 msgid "Luton"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1261
-msgid "Luxembourg"
-msgstr "������������"
-
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1269
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Luxor"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1271
+#, fuzzy
+msgid "Lviv"
+msgstr "��������"
+
+#: my-evolution/Locations.h:1272
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1273
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1275
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Maastricht"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macae"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Macapa"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Maceio"
 msgstr "����� �������������� ���������� ��� ���������� (����)"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Macon"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madinah"
 msgstr "����� �������������� ���������� ��� ���������� (����)"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1282
 #, fuzzy
 msgid "Madison"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1283
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1285
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1286
 #, fuzzy
 msgid "Magadan"
 msgstr "����/���������"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1287
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1288
 #, fuzzy
 msgid "Maine"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1289
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1290
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Makung"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malad City"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malaga"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1294
 #, fuzzy
 msgid "Malatya"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1295
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1296
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1289
-msgid "Malta"
-msgstr "�����"
-
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1298
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Managua"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manassas"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manaus"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1302
 #, fuzzy
 msgid "Manchester"
 msgstr "��������� ��:"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1303
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1304
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manisa"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manistee"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1307
 #, fuzzy
 msgid "Manitoba"
 msgstr "�������� ������ ���������"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1308
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mankato"
 msgstr "������"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Mansfield"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1311
 #, fuzzy
 msgid "Manta"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1312
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1313
 #, fuzzy
 msgid "Maraba"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1314
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1315
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1316
 #, fuzzy
 msgid "Marathon"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1317
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Margarita"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marianna"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1320
 #, fuzzy
 msgid "Marib"
 msgstr "����"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1321
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1322
 #, fuzzy
 msgid "Marietta"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1323
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1324
 #, fuzzy
 msgid "Marion"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1325
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1326
 #, fuzzy
 msgid "Marquette"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1327
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1328
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1329
 #, fuzzy
 msgid "Marshall"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1330
 #, fuzzy
 msgid "Marshalltown"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1331
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marte"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "������� _�� �� �����������"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsburg"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Martinsville"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1336
 #, fuzzy
 msgid "Maryland"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1337
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1338
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1339
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1340
 #, fuzzy
 msgid "Masirah"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1341
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1342
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Massena"
 msgstr "����� �������������� ���������� ��� ���������� (����)"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1344
 #, fuzzy
 msgid "Matamoros"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1345
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1346
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1347
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mattoon"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayaguez"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mayport"
 msgstr "������"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1351
 #, fuzzy
 msgid "Mazatlan"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1352
 #, fuzzy
 msgid "Mazu"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1353
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1354
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCall"
 msgstr "����"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McCarthy"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McClellan"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1358
 #, fuzzy
 msgid "McComb"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1359
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1360
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1361
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Meacham"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1363
 #, fuzzy
 msgid "Medford"
 msgstr "����"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1364
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1365
 #, fuzzy
 msgid "Mehamn"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1366
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melbourne"
 msgstr "���������/���������"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1368
 #, fuzzy
 msgid "Melfa"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1369
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1370
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1371
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1372
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1373
 #, fuzzy
 msgid "Mendoza"
 msgstr "�������/�������"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1374
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1375
 #, fuzzy
 msgid "Menominee"
 msgstr "�������/��������"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1376
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1377
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1378
 #, fuzzy
 msgid "Merida"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1379
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1380
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1381
 #, fuzzy
 msgid "Merril Field"
 msgstr "����� _���"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1382
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1383
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1384
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1385
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1386
 #, fuzzy
 msgid "Mexicali"
 msgstr "������"
 
-#: my-evolution/Locations.h:1379
-msgid "Mexico"
-msgstr "������"
-
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1388
 #, fuzzy
 msgid "Miami"
 msgstr "����"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1389
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1390
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1391
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middle East"
 msgstr "_������:"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middleton Island"
 msgstr "����� ����������"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Middletown"
 msgstr "_������:"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1395
 #, fuzzy
 msgid "Midland"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1396
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1397
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Milano/Malpensa"
 msgstr "�������/��������"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1399
 #, fuzzy
 msgid "Miles City"
 msgstr "����� �������:"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1400
 #, fuzzy
 msgid "Milford"
 msgstr "���"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1401
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1402
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1403
 #, fuzzy
 msgid "Milton"
 msgstr "������ ����/���� %s"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1405
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1406
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minatitlan"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1408
 #, fuzzy
 msgid "Minchumina"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1409
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1410
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1413
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1414
 #, fuzzy
 msgid "Minnesota"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1415
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1416
 #, fuzzy
 msgid "Minot"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1417
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1418
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1419
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Missoula"
 msgstr "���"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Missouri"
 msgstr "���"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1422
 #, fuzzy
 msgid "Mitchell"
 msgstr "��������� ��:"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1423
 #, fuzzy
 msgid "Mitilini"
 msgstr "����� ������������"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1424
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1425
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Moa"
 msgstr "��"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1427
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "������ ��������"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1428
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Mobridge"
 msgstr "������"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1430
 #, fuzzy
 msgid "Modesto"
 msgstr "������ ������"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1431
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Mojave"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Molde"
 msgstr "������"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1434
 #, fuzzy
 msgid "Moldova"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1435
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1436
 #, fuzzy
 msgid "Molokai"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1437
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1438
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Monclova"
 msgstr "������"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Moncton"
 msgstr "������"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1441
 #, fuzzy
 msgid "Monida"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1442
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Monroe"
 msgstr "������"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montague"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1445
 #, fuzzy
 msgid "Montana"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1446
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1447
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1448
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "������ ����������"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1449
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1450
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1451
 #, fuzzy
 msgid "Montego Bay"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1452
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1453
 #, fuzzy
 msgid "Monterey"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1454
 #, fuzzy
 msgid "Monterrey"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1455
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1456
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1457
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1458
 #, fuzzy
 msgid "Montgomery"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1459
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Monticello"
 msgstr "������"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1461
 #, fuzzy
 msgid "Montpelier"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1462
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1463
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1464
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1465
 #, fuzzy
 msgid "Montrose"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1466
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morelia"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Morgantown"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1469
 #, fuzzy
 msgid "Moriarty"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1462
-msgid "Morocco"
-msgstr "������"
-
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1471
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1472
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1473
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1474
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1475
 #, fuzzy
 msgid "Mosinee"
 msgstr "������"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1476
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1477
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1478
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1479
 #, fuzzy
 msgid "Mountain View"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1480
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1481
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "���������������"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1483
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1484
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1485
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1486
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1487
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1488
 #, fuzzy
 msgid "Mullan"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1489
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1490
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1491
 #, fuzzy
 msgid "Muncie"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1492
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1493
 #, fuzzy
 msgid "Murcia"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1494
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1495
 #, fuzzy
 msgid "Mus"
 msgstr "���."
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1496
 #, fuzzy
 msgid "Muscatine"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1497
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1498
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1499
 #, fuzzy
 msgid "Mykonos"
 msgstr "������"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1500
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1501
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1502
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1503
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1504
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1505
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1506
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1507
 #, fuzzy
 msgid "Najran"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1508
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1509
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1510
 #, fuzzy
 msgid "Namsos"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1512
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1513
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1514
 #, fuzzy
 msgid "Nanning"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1515
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1516
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Napa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Naples"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Napoli"
 msgstr "����"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1520
 #, fuzzy
 msgid "Narvik"
 msgstr "����."
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1521
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1522
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1523
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Nassau"
 msgstr "�������/�������"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natal"
 msgstr "������"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1526
 #, fuzzy
 msgid "Natchez"
 msgstr "��������� ��:"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1527
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1528
 #, fuzzy
 msgid "Nebraska"
 msgstr "��� �������"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1529
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1530
 #, fuzzy
 msgid "Nenana"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1523
-msgid "Netherlands"
-msgstr "��������"
-
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1532
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Nevada"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "Newark"
 msgstr "��� �������"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bedford"
 msgstr "���������� ��������"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1536
 #, fuzzy
 msgid "New Bern"
 msgstr "��� ��������"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1537
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1538
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1539
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "Newcastle"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "��� ��������"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1542
 #, fuzzy
 msgid "Newfoundland"
 msgstr "��� ��������"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1543
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Haven"
 msgstr "��� ���������"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Iberia"
 msgstr "��� ���������"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Jersey"
 msgstr "��� ������"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Mexico"
 msgstr "������"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1548
 #, fuzzy
 msgid "New Orleans"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1549
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1550
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1551
 #, fuzzy
 msgid "Newport"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1552
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1553
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1554
 #, fuzzy
 msgid "New River"
 msgstr "���� ��������"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1555
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "Newton"
 msgstr "���"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1557
 #, fuzzy
 msgid "New York"
 msgstr "���� ��������"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1558
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1559
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1552
-msgid "New Zealand"
-msgstr "��� ��������"
-
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1561
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
-msgid "Nicaragua"
-msgstr "����������"
-
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1563
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1564
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "����������:"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nipawin"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1567
 #, fuzzy
 msgid "Nis"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1568
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1569
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1570
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nogales"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Nome"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1573
 #, fuzzy
 msgid "Norfolk"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1566
-msgid "Norfolk Island"
-msgstr "����� �������"
-
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norfolk NAS"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "Norrkoping"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Adams"
 msgstr "����������������"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1578
 #, fuzzy
 msgid "North Bend"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1579
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Conway"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1581
 #, fuzzy
 msgid "North Dakota"
 msgstr "����������������"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1582
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1583
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "North Platte"
 msgstr "����������������"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northway"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "�������� ������ ��������"
 
-#: my-evolution/Locations.h:1579
-msgid "Norway"
-msgstr "��������"
-
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwich"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Norwood"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1590
 #, fuzzy
 msgid "Notodden"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1591
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1592
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1593
 #, fuzzy
 msgid "Novosibirsk"
 msgstr "����/������������"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1594
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1595
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1596
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "��� ���� ���������"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1597
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1598
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1599
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1600
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1601
 #, fuzzy
 msgid "Oakland"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1602
 #, fuzzy
 msgid "Oaxaca"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1603
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1604
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Ocala"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Oceanside"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Odense"
 msgstr "���"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1608
+#, fuzzy
+msgid "Odesa"
+msgstr "���"
+
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Oelwen"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1610
 #, fuzzy
 msgid "Ogden"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1611
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1612
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1613
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1614
 #, fuzzy
 msgid "Ohrid"
 msgstr "����"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1615
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1616
 #, fuzzy
 msgid "Ojika Island"
 msgstr "����� ����"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1617
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1618
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1619
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1623
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "���������� �������� �����"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1625
 #, fuzzy
 msgid "Olathe"
 msgstr "����"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1626
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1627
 #, fuzzy
 msgid "Olbia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1628
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1629
 #, fuzzy
 msgid "Omaha"
 msgstr "����"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1630
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1631
 #, fuzzy
 msgid "Omak"
 msgstr "����"
 
-#: my-evolution/Locations.h:1623
-msgid "Oman"
-msgstr "����"
-
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1633
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1634
 #, fuzzy
 msgid "Omsk"
 msgstr "����/����"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1635
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Ontario"
 msgstr "���������������"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oostende"
 msgstr "���������������"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1638
 #, fuzzy
 msgid "Oran"
 msgstr "����"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1639
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1640
 #, fuzzy
 msgid "Orange"
 msgstr "���."
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1641
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1642
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1643
 #, fuzzy
 msgid "Oregon"
 msgstr "���."
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1644
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orland"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1646
 #, fuzzy
 msgid "Orlando"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1647
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1648
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1649
 #, fuzzy
 msgid "Oruro"
 msgstr "������"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1650
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1651
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1652
 #, fuzzy
 msgid "Oscoda"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1653
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1654
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1655
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1656
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1657
 #, fuzzy
 msgid "Ostrava"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1658
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1659
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1660
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1661
 #, fuzzy
 msgid "Owyhee"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1662
 #, fuzzy
 msgid "Oxford"
 msgstr "���"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1663
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1664
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1665
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1666
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1667
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1668
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1669
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1670
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1671
 #, fuzzy
 msgid "Paganella"
 msgstr "������"
 
-#: my-evolution/Locations.h:1664
-msgid "Pakistan"
-msgstr "��������"
-
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1674
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palacios"
 msgstr "������"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1676
 #, fuzzy
 msgid "Palermo"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1677
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmdale"
 msgstr "������"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palmer"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1680
 #, fuzzy
 msgid "Palm Springs"
 msgstr "��������� ���������"
 
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1681
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1682
 #, fuzzy
 msgid "Pamplona"
 msgstr "������"
 
-#: my-evolution/Locations.h:1674
-msgid "Panama"
-msgstr "�������"
-
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Panama City"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Pantelleria"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Papa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1687
 #, fuzzy
 msgid "Paphos"
 msgstr "����"
 
-#: my-evolution/Locations.h:1679
-msgid "Paraguay"
-msgstr "���������"
-
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1689
 #, fuzzy
 msgid "Paris"
 msgstr "����."
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1690
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1691
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1692
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "������� �������"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1693
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1694
 #, fuzzy
 msgid "Pasco"
 msgstr "������� ���������"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1695
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1696
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1697
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1698
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1699
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1700
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1701
 #, fuzzy
 msgid "Patna"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1702
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1703
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1704
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1705
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Paysandu"
 msgstr "������ �����"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Payson"
 msgstr "�������� ����:"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pellston"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pelotas"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1710
 #, fuzzy
 msgid "Pendleton"
 msgstr "�������:"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1711
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1712
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1713
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1714
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1715
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1716
 #, fuzzy
 msgid "Peoria"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1717
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Pereira/Matecana"
 msgstr "�������/��������"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1719
 #, fuzzy
 msgid "Perm"
 msgstr "����."
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1720
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1721
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1722
 #, fuzzy
 msgid "Perth"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1714
-msgid "Peru"
-msgstr "�����"
-
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1724
 #, fuzzy
 msgid "Perugia"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1725
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1726
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1727
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1728
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1729
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Philip"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1731
 #, fuzzy
 msgid "Philipsburg"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1732
 #, fuzzy
 msgid "Phillips"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1733
 #, fuzzy
 msgid "Phoenix"
 msgstr "�������/������"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1736
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1737
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1738
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1739
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1740
 #, fuzzy
 msgid "Pierre"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pietersburg"
 msgstr "����/����������������"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1742
 #, fuzzy
 msgid "Pikeville"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1743
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1744
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1745
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1746
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1747
 #, fuzzy
 msgid "Pisa"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1748
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1750
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1751
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1752
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1753
 #, fuzzy
 msgid "Plymouth"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1754
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1755
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1756
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1757
 #, fuzzy
 msgid "Podgorica Titograd"
 msgstr "������ ������"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1758
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Hope"
 msgstr "�������� �������"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Lay"
 msgstr "�������� ���������"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1761
 #, fuzzy
 msgid "Point Mugu"
 msgstr "�������� ���������"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1762
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1763
 #, fuzzy
 msgid "Poitiers"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1755
-msgid "Poland"
-msgstr "�������"
-
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1765
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponca City"
 msgstr "����� ���������"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1767
 #, fuzzy
 msgid "Ponce"
 msgstr "������"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1768
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1769
 #, fuzzy
 msgid "Pontiac"
 msgstr "������"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1770
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1771
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Poprad"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1773
 #, fuzzy
 msgid "Port Alexander"
 msgstr "�������� �����������"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1774
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1775
 #, fuzzy
 msgid "Port Angeles"
 msgstr "�������� �������"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1776
 #, fuzzy
 msgid "Port-Au-Prince"
 msgstr "�������/����-�-�����"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1777
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Porterville"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hardy"
 msgstr "�������� ������"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1780
 #, fuzzy
 msgid "Port Hedland"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1781
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Portland"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1783
 #, fuzzy
 msgid "Porto"
 msgstr "_����:"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1784
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1785
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Portoroz"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1787
 #, fuzzy
 msgid "Porto Santo"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Porto Velho"
 msgstr "�������/����� ����"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1789
 #, fuzzy
 msgid "Port Said"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1790
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
-msgid "Portugal"
-msgstr "����������"
-
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1792
 #, fuzzy
 msgid "Posadas"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1793
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1794
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1795
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poza Rica"
 msgstr "����� ����"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Poznan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1798
 #, fuzzy
 msgid "Praha"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1799
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "������ ���������"
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1800
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1801
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "������������� ���������"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1802
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1803
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Pretoria"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Preveza"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Price-Carbon"
 msgstr "����� ��������"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Pristina"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Providence"
 msgstr "_��������/�������:"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provincetown"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1810
 #, fuzzy
 msgid "Provo"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1811
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1812
 #, fuzzy
 msgid "Pucallpa"
 msgstr "������"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1813
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Puebla"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1815
 #, fuzzy
 msgid "Pueblo"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1816
 #, fuzzy
 msgid "Puerto Barrios"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1817
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Escondido"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1820
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1821
 #, fuzzy
 msgid "Puerto Maldonado"
 msgstr "������ ������"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1822
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1823
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1815
-msgid "Puerto Rico"
-msgstr "������� ����"
-
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1825
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "�������� ���������"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1826
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pula"
 msgstr "������"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1828
 #, fuzzy
 msgid "Pullman"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1829
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1830
 #, fuzzy
 msgid "Punta Cana"
 msgstr "�������� �����������"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1831
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1832
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1833
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1834
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1835
 #, fuzzy
 msgid "Pyongyang"
 msgstr "����/������ ������"
 
-#: my-evolution/Locations.h:1827
-msgid "Qatar"
-msgstr "�����"
-
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quantico"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1838
 #, fuzzy
 msgid "Quebec"
 msgstr "����"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1839
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1840
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1841
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1842
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1843
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1844
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1845
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1846
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1847
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1848
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1849
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1850
 #, fuzzy
 msgid "Rapid City"
 msgstr "���������� �����"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1851
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1852
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Rawlins"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Reading"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Rebun Island"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1856
 #, fuzzy
 msgid "Recife"
 msgstr "������"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1857
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redding"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redig"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1860
 #, fuzzy
 msgid "Redmond"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1861
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1862
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1863
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1864
 #, fuzzy
 msgid "Regina"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1865
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Rennes"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Reno"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1868
 #, fuzzy
 msgid "Renton"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1869
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reus"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1871
 #, fuzzy
 msgid "Reyes"
 msgstr "������"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reykjavik"
 msgstr "����������/���������"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Reynosa"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Rhinelander"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1875
 #, fuzzy
 msgid "Rhode Island"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1876
 #, fuzzy
 msgid "Riberalta"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1877
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rieti"
 msgstr "����"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rifle"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1881
 #, fuzzy
 msgid "Riga"
 msgstr "�����:"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1882
 #, fuzzy
 msgid "Rijeka"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1883
 #, fuzzy
 msgid "Rimini"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1884
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1885
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1886
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1887
 #, fuzzy
 msgid "Rioja"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1888
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1889
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "���������� �������� �����"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1891
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1892
 #, fuzzy
 msgid "Rivera"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1893
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1894
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1895
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "�������"
+
+#: my-evolution/Locations.h:1897
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Riyadh"
 msgstr "����/�����"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1899
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1900
 #, fuzzy
 msgid "Roatan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1901
 #, fuzzy
 msgid "Robore"
 msgstr "����"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1902
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1903
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1904
 #, fuzzy
 msgid "Rockland"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1905
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1906
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1907
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1908
 #, fuzzy
 msgid "Rodos"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1909
 #, fuzzy
 msgid "Rogers"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1910
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1911
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
-msgid "Romania"
-msgstr "��������"
-
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1913
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1914
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1915
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1916
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1917
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1918
 #, fuzzy
 msgid "Roros"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1919
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Rosario"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1921
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1922
 #, fuzzy
 msgid "Roseglen"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1923
 #, fuzzy
 msgid "Rost"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1924
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1925
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1926
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1927
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1928
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1930
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1931
 #, fuzzy
 msgid "Russia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1932
 #, fuzzy
 msgid "Rutland"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1933
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1934
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1935
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1936
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1937
 #, fuzzy
 msgid "Sacramento"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1938
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1939
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1940
 #, fuzzy
 msgid "Saginaw"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1941
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1942
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1943
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1944
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1945
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1947
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Saint Paul"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Saiq"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salalah"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1951
 #, fuzzy
 msgid "Salem"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salida"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1953
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1954
 #, fuzzy
 msgid "Salina"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salinas"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1956
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salmon"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1958
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1959
 #, fuzzy
 msgid "Salta"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1960
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1961
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1962
 #, fuzzy
 msgid "Salto"
 msgstr "_���"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1963
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Salvador"
 msgstr "�� ��������"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1965
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samara"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1967
 #, fuzzy
 msgid "Samos"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1968
 #, fuzzy
 msgid "Samsun"
 msgstr "_���"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1969
 #, fuzzy
 msgid "Sana'A"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1970
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1971
 #, fuzzy
 msgid "San Angelo"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1972
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1973
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1974
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1975
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "San Carlos"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sandane"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1978
 #, fuzzy
 msgid "Sandberg"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1979
 #, fuzzy
 msgid "Sanderson"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1980
 #, fuzzy
 msgid "San Diego"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1984
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1985
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1986
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sand Point"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1988
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sanford"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1990
 #, fuzzy
 msgid "San Francisco"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "Sangju"
 msgstr "������"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1992
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1993
 #, fuzzy
 msgid "San Joaquin"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1994
 #, fuzzy
 msgid "San Jose"
 msgstr "���������� ��� ��������"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1995
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1996
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1997
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "San Juan"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1999
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:2000
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:2001
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:2002
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:2003
 #, fuzzy
 msgid "San Miguel"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:2004
 #, fuzzy
 msgid "San Nicholas Island"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:2005
 #, fuzzy
 msgid "San Salvador"
 msgstr "�� ��������"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:2006
 #, fuzzy
 msgid "San Sebastian"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:2007
 #, fuzzy
 msgid "Santa Ana"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:2008
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:2009
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:2010
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santa Maria"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2012
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santa Monica"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2014
 #, fuzzy
 msgid "Santander"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2015
 #, fuzzy
 msgid "Santarem"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2016
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2017
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2018
 #, fuzzy
 msgid "Santiago"
 msgstr "�������/���������"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2019
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2020
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2021
 #, fuzzy
 msgid "Santorini"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2022
 #, fuzzy
 msgid "Santos"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2023
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2024
 #, fuzzy
 msgid "Sao Luiz"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2025
 #, fuzzy
 msgid "Sao Paulo"
 msgstr "�������/��� �����"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2026
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2027
 #, fuzzy
 msgid "Sarajevo"
 msgstr "������/���������"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2028
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarasota"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2030
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2031
 #, fuzzy
 msgid "Sarzana"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2032
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2033
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2034
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
-msgid "Saudi Arabia"
-msgstr "�������� ������"
-
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2036
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2037
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2038
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2039
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2040
 #, fuzzy
 msgid "Sayun"
 msgstr "_���"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2041
 #, fuzzy
 msgid "Scatsta"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2042
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2043
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2044
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2045
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2046
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Scranton"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Seattle"
 msgstr "���������� US-Letter"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2050
 #, fuzzy
 msgid "Sedalia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2051
 #, fuzzy
 msgid "Seeb"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2052
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2053
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "�������� ���������"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2054
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2055
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2056
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2057
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2058
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2059
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Seward"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2061
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Shanghai"
 msgstr "����/������"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2063
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharjah"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2065
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Sharurah"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2067
 #, fuzzy
 msgid "Shawbury"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Shearwater"
 msgstr "���������� �������"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2069
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Sheldon"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2071
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Shelton"
 msgstr "�������:"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2073
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2074
 #, fuzzy
 msgid "Sheridan"
 msgstr "������"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2075
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2076
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2077
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2078
 #, fuzzy
 msgid "Shiraz"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2079
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2080
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2081
 msgid "Shoreham"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2082
 #, fuzzy
 msgid "Show Low"
 msgstr "������� ����������"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2083
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2084
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2085
 #, fuzzy
 msgid "Sidney"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2086
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2087
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2088
 #, fuzzy
 msgid "Silver City"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2089
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2080
-msgid "Singapore"
-msgstr "����������"
-
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2091
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2092
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2093
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2094
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2095
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2096
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2097
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2098
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skive"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Skopje"
 msgstr "������/������"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2101
 #, fuzzy
 msgid "Skwentna"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2102
 #, fuzzy
 msgid "Slana"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2093
-msgid "Slovakia"
-msgstr "��������"
-
-#: my-evolution/Locations.h:2094
-msgid "Slovenia"
-msgstr "��������"
-
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Smithers"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2106
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Snowshoe Lake"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Sochi"
 msgstr "������"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2109
 msgid "Socorro"
 msgstr ""
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2110
 msgid "Socotra"
 msgstr ""
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Soda Springs"
 msgstr "�������� �����"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Sofia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Soldotna"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2115
 #, fuzzy
 msgid "Somerset"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2116
 #, fuzzy
 msgid "Sonderborg"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2117
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2118
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2109
-msgid "South Africa"
-msgstr "����� ������"
-
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "Southampton"
 msgstr "���������������"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "South Bend"
 msgstr "������"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "South Carolina"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2123
 #, fuzzy
 msgid "South Dakota"
 msgstr "���������������"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2124
 #, fuzzy
 msgid "Southend"
 msgstr "������"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2125
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2126
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2117
-msgid "Spain"
-msgstr "�������"
-
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2128
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Spencer"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2130
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2131
 #, fuzzy
 msgid "Split"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2132
 #, fuzzy
 msgid "Spokane"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2133
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2134
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "Springfield"
 msgstr "������������"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2136
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2137
 #, fuzzy
 msgid "State College"
 msgstr "������������ ���:"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2138
 #, fuzzy
 msgid "Stauning"
 msgstr "������:"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2139
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2140
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2141
 #, fuzzy
 msgid "Staverton"
 msgstr "������:"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2142
 #, fuzzy
 msgid "Stavropol"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2143
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2144
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2145
 #, fuzzy
 msgid "Stephenville"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2146
 #, fuzzy
 msgid "St. George"
 msgstr "���� �����"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2147
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2148
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2149
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2150
 #, fuzzy
 msgid "St Joseph"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2151
 #, fuzzy
 msgid "St Louis"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2152
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2153
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2154
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2155
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2156
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2157
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "Storm Lake"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2159
 #, fuzzy
 msgid "Stornoway"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2160
 #, fuzzy
 msgid "St Paul"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2161
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2162
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2163
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2164
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "����� ����������"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2166
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2168
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sucre"
 msgstr "����"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2170
 #, fuzzy
 msgid "Sumburgh"
 msgstr "������������"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2171
 #, fuzzy
 msgid "Sumter"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2172
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2173
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2174
 #, fuzzy
 msgid "Sungshan/Taipei"
 msgstr "����/������"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2175
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
-msgid "Suriname"
-msgstr "��������"
-
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2177
 #, fuzzy
 msgid "Sutton"
 msgstr "_���"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2178
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2179
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2180
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
-msgid "Sweden"
-msgstr "�������"
-
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2182
 #, fuzzy
 msgid "Swift Current"
 msgstr "�������/������ �������"
 
-#: my-evolution/Locations.h:2173
-msgid "Switzerland"
-msgstr "�������"
-
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2184
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2185
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2186
+#, fuzzy
+msgid "Sympheropol"
+msgstr "�����������"
+
+#: my-evolution/Locations.h:2187
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2188
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2189
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabatinga"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2191
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tabuk"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2193
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2194
 #, fuzzy
 msgid "Tacna"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2195
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2196
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2197
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2198
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2199
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2200
 #, fuzzy
 msgid "Taejon"
 msgstr "����"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2201
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2202
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2203
 #, fuzzy
 msgid "Taif"
 msgstr "������"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Tainan"
 msgstr "������"
 
-#: my-evolution/Locations.h:2194
-msgid "Taiwan"
-msgstr "������"
-
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Taiyuan"
 msgstr "������"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2207
 #, fuzzy
 msgid "Taiz"
 msgstr "������"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2208
 #, fuzzy
 msgid "Tajima"
 msgstr "������"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2209
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2210
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2211
 #, fuzzy
 msgid "Talinn"
 msgstr "������"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2212
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2213
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2214
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2215
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2217
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tampere"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2219
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Tanana"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2221
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2222
 #, fuzzy
 msgid "Taos"
 msgstr "����"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Taoyuan"
 msgstr "������"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2224
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Taranto"
 msgstr "������"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2226
 #, fuzzy
 msgid "Tarbes"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tarija"
 msgstr "������"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2228
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2229
 #, fuzzy
 msgid "Tatalina"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2230
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2231
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2232
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2233
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tegucigalpa"
 msgstr "�������/��������������"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2235
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2236
 #, fuzzy
 msgid "Tela"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2237
 #, fuzzy
 msgid "Temple"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2238
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2239
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2240
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2241
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2242
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2243
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2244
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2245
 #, fuzzy
 msgid "Texas"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2246
 #, fuzzy
 msgid "The Dalles"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2247
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2248
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2249
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thisted"
 msgstr "������"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2251
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Thumrait"
 msgstr "������"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2253
 #, fuzzy
 msgid "Tianjin"
 msgstr "������"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2254
 #, fuzzy
 msgid "Tijuana"
 msgstr "�������/��������"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2255
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2256
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2257
 #, fuzzy
 msgid "Tirana"
 msgstr "������"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2258
 #, fuzzy
 msgid "Tiree"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2259
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2260
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2261
 #, fuzzy
 msgid "Titusville"
 msgstr "������"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2262
 #, fuzzy
 msgid "Tivat"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2263
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2264
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2265
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2266
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2267
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2268
 #, fuzzy
 msgid "Tokunoshima Island"
 msgstr "����� �������������"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2269
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2270
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2271
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2272
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Toledo"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Toluca"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2275
 #, fuzzy
 msgid "Tonopah"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2276
 #, fuzzy
 msgid "Topeka"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2277
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2278
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2279
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Toronto"
 msgstr "������"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Torp"
 msgstr "������:"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Torrance"
 msgstr "������"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Torreon"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2284
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "�������� ���������"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2285
 #, fuzzy
 msgid "Toulouse"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2286
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2287
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2288
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2289
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2290
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2291
 #, fuzzy
 msgid "Trabzon"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trapani"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2293
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trelew"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2295
 #, fuzzy
 msgid "Trenton"
 msgstr "���������������"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2296
 #, fuzzy
 msgid "Trevico"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2297
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2298
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2299
 #, fuzzy
 msgid "Trieste"
 msgstr "������"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2300
 #, fuzzy
 msgid "Trinidad"
 msgstr "������"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2301
 #, fuzzy
 msgid "Tripoli"
 msgstr "������/�������"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2302
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2303
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2304
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2305
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2306
 #, fuzzy
 msgid "Truckee"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2307
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2308
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2309
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2310
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2311
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2312
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2313
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2314
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2315
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tulcea"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Tulsa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Tupelo"
 msgstr "�_����"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2319
 #, fuzzy
 msgid "Turaif"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turin"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2310
-msgid "Turkey"
-msgstr "�������"
-
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2322
 #, fuzzy
 msgid "Turku"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2323
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2324
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2325
 #, fuzzy
 msgid "Twenthe"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2326
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2327
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyler"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2329
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2330
 #, fuzzy
 msgid "Tyumen"
 msgstr "�_����"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2331
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2332
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2333
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2335
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2336
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2337
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2338
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2339
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2340
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2341
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "������� ������� �������"
 
-#: my-evolution/Locations.h:2330
-msgid "United Kingdom"
-msgstr "������� ��������"
-
-#: my-evolution/Locations.h:2331
-msgid "United States"
-msgstr "�������� ���������"
-
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2344
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2345
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2346
 #, fuzzy
 msgid "Uruapan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2347
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2336
-msgid "Uruguay"
-msgstr "����������"
-
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2349
 #, fuzzy
 msgid "Urumqi"
 msgstr "����/��������"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2350
 #, fuzzy
 msgid "Utah"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2351
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2352
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2353
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2354
+#, fuzzy
+msgid "Uzhgorod"
+msgstr "������/����������"
+
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vadso"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2356
 #, fuzzy
 msgid "Vaerlose"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Vagar"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2358
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valdosta"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2360
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2361
 #, fuzzy
 msgid "Valencia"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2362
 #, fuzzy
 msgid "Valentine"
 msgstr "����/���������"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2363
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2364
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2365
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2366
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2367
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Van"
 msgstr "�����."
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2369
 #, fuzzy
 msgid "Vancouver"
 msgstr "�������/���������"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2370
 #, fuzzy
 msgid "Vandel"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2371
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2372
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2373
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Varadero"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2375
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2376
 #, fuzzy
 msgid "Varna"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2377
 #, fuzzy
 msgid "Vasteras"
 msgstr "����"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2378
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2379
 #, fuzzy
 msgid "Venezia"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2367
-msgid "Venezuela"
-msgstr "����������"
-
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2381
 #, fuzzy
 msgid "Venice"
 msgstr "Unicode"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2382
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2383
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2384
 #, fuzzy
 msgid "Vermont"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2385
 #, fuzzy
 msgid "Vernal"
 msgstr "������"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2386
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2387
 #, fuzzy
 msgid "Vicenza"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2388
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2389
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2390
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2391
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
-msgid "Viet Nam"
-msgstr "�������"
-
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2393
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2394
 #, fuzzy
 msgid "Vilhena"
 msgstr "����� �������:"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2395
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2396
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2397
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2398
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2399
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2400
 #, fuzzy
 msgid "Vilnius"
 msgstr "������/��������"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2401
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2402
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2403
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2404
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2405
 #, fuzzy
 msgid "Visalia"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2406
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2407
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2408
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2409
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2410
 #, fuzzy
 msgid "Vladivostok"
 msgstr "����/�����������"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2411
 #, fuzzy
 msgid "Vlieland"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2412
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2413
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2414
 #, fuzzy
 msgid "Volkel"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2415
 #, fuzzy
 msgid "Volk Field"
 msgstr "����� _���"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2416
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2417
 #, fuzzy
 msgid "Voslau"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2418
 #, fuzzy
 msgid "Waco"
 msgstr "������"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2419
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2420
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2421
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2422
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2423
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Wallops Island"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2425
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2426
 #, fuzzy
 msgid "Warner Robins"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2427
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2428
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2429
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2430
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Waterbury"
 msgstr "������"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2432
 #, fuzzy
 msgid "Waterloo"
 msgstr "������"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2433
 #, fuzzy
 msgid "Watertown"
 msgstr "������"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2434
 #, fuzzy
 msgid "Waterville"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2435
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2436
 #, fuzzy
 msgid "Wausau"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2437
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2438
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2439
 #, fuzzy
 msgid "Webster City"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wejh"
 msgstr "��"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2441
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2442
 #, fuzzy
 msgid "Wenatchee"
 msgstr "������"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "Wendover"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2444
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "West Burke"
 msgstr "������� �������"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2446
 #, fuzzy
 msgid "Westerland"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2447
 #, fuzzy
 msgid "Westfield"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2448
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2449
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2450
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2451
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2452
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2453
 #, fuzzy
 msgid "Wheeling"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2454
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "����� �������������"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2455
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2456
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2457
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2458
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2459
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2460
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2461
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2462
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2463
 #, fuzzy
 msgid "Wick"
 msgstr "����."
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2464
 #, fuzzy
 msgid "Wien"
 msgstr "��"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2465
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2466
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2467
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2468
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2469
 #, fuzzy
 msgid "Williston"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2470
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2471
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2472
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2473
 #, fuzzy
 msgid "Winchester"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2474
 #, fuzzy
 msgid "Windsor"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2475
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2476
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2477
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2478
 #, fuzzy
 msgid "Winnipeg"
 msgstr "�������/�����������"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2479
 #, fuzzy
 msgid "Winslow"
 msgstr "����"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2480
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2481
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2482
 #, fuzzy
 msgid "Winter Park"
 msgstr "�������� ������ ���������"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2483
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wisconsin"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2485
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2486
 #, fuzzy
 msgid "Wise"
 msgstr "��"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2487
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2488
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "����� �����"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Wooster"
 msgstr "���������:"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worcester"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2492
 #, fuzzy
 msgid "Worland"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2493
 #, fuzzy
 msgid "Worthington"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2494
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2495
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2496
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2497
 #, fuzzy
 msgid "Wyoming"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2498
 #, fuzzy
 msgid "Xiamen"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2499
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2500
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2501
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2502
 #, fuzzy
 msgid "Yakutat"
 msgstr "�������/���������"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2503
 #, fuzzy
 msgid "Yakutsk"
 msgstr "����/���������"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2504
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2505
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2506
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2507
 #, fuzzy
 msgid "Yao Airport"
 msgstr "��� ��������"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2508
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2509
 #, fuzzy
 msgid "Yekaterinburg"
 msgstr "����/����������������"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2510
 #, fuzzy
 msgid "Yellowknife"
 msgstr "�������/�����������"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2511
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
-msgid "Yemen"
-msgstr "������"
-
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2513
 #, fuzzy
 msgid "Yenbo"
 msgstr "������"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2514
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2515
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2516
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2517
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2518
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2519
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2520
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2521
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2522
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2523
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
-msgid "Yugoslavia"
-msgstr "�������������"
-
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2525
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2526
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2527
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2528
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2529
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2530
 #, fuzzy
 msgid "Zadar"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2531
 #, fuzzy
 msgid "Zagreb"
 msgstr "������/��������"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2532
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2533
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2534
 #, fuzzy
 msgid "Zanesville"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2535
 #, fuzzy
 msgid "Zaragoza"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2536
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2537
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2538
 #, fuzzy
 msgid "Zurich"
 msgstr "������/������"
 
-#: 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
-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:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "��������"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "����� ��������"
 
-#: my-evolution/e-summary-calendar.c:375
+#: my-evolution/e-summary-calendar.c:400
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: 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:151
 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
+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:81
-#: my-evolution/e-summary-weather.c:606
+#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:445
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Word of the Day"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "������� ������"
 
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "�������� ����������� ��������"
 
-#: my-evolution/e-summary-preferences.c:953
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "��������� ��� ����������� ��������� ��� ���� ��� ������ �� ����������"
 
-#: my-evolution/e-summary-preferences.c:957
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "�����:"
 
-#: my-evolution/e-summary-preferences.c:1503
-msgid "Summary Settings"
-msgstr "��������� ���������"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "������ ���� ��� ���� ��� RDF"
 
-#: my-evolution/e-summary-rdf.c:443
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr "���������� ��������"
 
-#: my-evolution/e-summary-tasks.c:241
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
+msgstr ""
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+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
+#, fuzzy
+msgid "Shown"
+msgstr "�������"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "��� �������� ��������"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(����� ���������)"
 
-#: my-evolution/e-summary-weather.c:70
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "� ������ ���"
 
-#: my-evolution/e-summary-weather.c:504
+#: 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 "������"
 
-#: my-evolution/e-summary-weather.c:667
-msgid "Regions"
-msgstr "��������"
-
-#: 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
 #, fuzzy
 msgid "Please wait..."
 msgstr "�������� ����������"
 
-#: 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:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "� �������� ��������� �������"
 
@@ -23254,148 +25031,123 @@ msgid "Drifting dust whirls"
 msgstr "�������������� ��������� ������"
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr " _��������"
-
-#: 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 "���� �� _�������"
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "���� �� ����������� _��������:"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr "_�������"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 msgid "How many days should the calendar display at once?"
 msgstr "����� ������ �� ��������� �� ���������� ���� ����;"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr "�������� ������� ��������� ��� �� ������������:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr "��������� ����������� ��������"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr "���� �����"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr "��� _��������"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr "������ _��������� (������������):"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr "_������ ��������� (������������):"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 msgid "S_how full path for folders"
 msgstr "_�������� ��������� ����� ��� �������"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr "�������� ���� ��� _��������"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _today's tasks"
 msgstr "�������� _��������� ��������"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr "�������� ������������ ��:"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "��������"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr "��������� ������"
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "_�������� �������:"
-
-#: 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
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr "_��������"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr "_����� ������"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr "_�����������"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 msgid "_News Feeds"
 msgstr "���������� _��������"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr "_��� �����"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr "_���������������"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr "_������"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-#, fuzzy
-msgid "Factory for the Evolution notes component."
-msgstr "���������� ��� ��� ����������� ��� Evolution."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Factory for the Notes control"
-msgstr "���������� ��� �� ��������� �������� Evolution"
+msgid "Default Folders"
+msgstr "������� �������"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "�� ���������� Evolution."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "�������� ������������"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "������� �����������"
 
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "����������� ��� 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"
@@ -23403,17 +25155,17 @@ msgstr ""
 "� ��� ������ ��� Evolution ������ �� ������������ �������������� ������\n"
 "���� ��������� ��� �������� Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "�������� �������� \"OK\"��� �� ������������� �� ������ � \"�������\" ��� "
 "�����."
 
-#: 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:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -23424,7 +25176,7 @@ msgstr ""
 "%s\n"
 "������: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -23433,7 +25185,7 @@ msgstr ""
 "������ ��� ������ ���� ��� ���������� ������� ���\n"
 "`%s'."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -23444,7 +25196,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -23455,7 +25207,7 @@ msgstr ""
 "��� ���� ��� ��������� ������. �������� ����� �����\n"
 "��������� ��� ��������� ��� ������������� �� Evolution."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -23466,7 +25218,7 @@ msgstr ""
 "������ �� ��������� ��� �� ��������� ��� Evolution �� �������� �����\n"
 "�������� ��������� �� ������ ��� ������������� ��  Evolution."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -23477,7 +25229,7 @@ msgstr ""
 "�������� �� �� ���������� ��� �� ����������\n"
 "� ����������� ��� ������� ������ ��� Evolution."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -23491,7 +25243,7 @@ msgstr ""
 "�� Evolution �������� �� ���������� \n"
 "������ �� ��������� ����� � ���������;"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -23502,49 +25254,53 @@ msgstr ""
 "��� Evolution.  �������� ����������� ��� ��� ��\n"
 "��������� �� Evolution ��� ����������� ��� ������� ������."
 
-#: 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."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "�������������"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "��� ����� ������ �� �������� � �������: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"��� ���� ������ � ����������� ��� ������� :\n"
+"%s"
+
+#: 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: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\":"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "��������� �������"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:373
 msgid "Move folder"
 msgstr "���������� �������"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23553,18 +25309,18 @@ msgstr ""
 "��� ���� ������ � �������� ��� �������:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "�������� \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23573,16 +25329,16 @@ msgstr ""
 "��� ���� ������ � ����������� ��� ������� :\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "����������� ������� \"%s\" ��:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "����������� �������"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23597,7 +25353,7 @@ msgstr ""
 "��� ���� ������ � ���������� ��� ������������� �������:\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 - ���������� ���� �������"
 
@@ -23613,7 +25369,7 @@ msgstr ""
 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:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr "(����� �����)"
 
@@ -23789,6 +25545,12 @@ msgstr ""
 "��� ����� ������ � ������������ ��� �������� ��� ������ ������������ ��� "
 "Evolution\n"
 
+#: shell/e-shell-user-creatable-items-handler.c:506
+#: shell/e-shell-user-creatable-items-handler.c:551
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "���"
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr "��� ���� ������� ����� �������."
@@ -23805,94 +25567,95 @@ msgstr "�� ����� ��� ������� ��� ������ �� �������� ��������."
 msgid "'.' and '..' are reserved folder names."
 msgstr "�� '.' and '..' ����� ��������� ������� �������."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "�� Bug buddy ��� ������� ��� $PATH ���."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "��� ���� ������ � �������� ��� Bug buddy"
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "���� ��� Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "�������� ��� ������..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "�������� ��� ������ ��� ������ �� ��������"
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "���������� ���� �����������"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:566
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "�������� ��� ������ ��� �� �������� �� ��� ����������:"
 
-#: 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
-#, c-format
-msgid "Error executing %s."
-msgstr "������ ���� ��� �������� ���%s."
-
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "������� �_���� �������"
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "������� �_���� �������"
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "����� ����� �������"
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(��� ����������� �������)"
 
-#: 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 "(����)"
 
-#: 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 ����� ��������� ��� ������. ����� ���� ��� ������� ��� "
 "�� �������������."
 
-#: shell/e-shell-view.c:1641
+#: 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:1880
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "�� Ximian Evolution ����� ����� �������. ����� ���� ��� ������� ��� �� "
 "����������."
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, 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:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "��� ���� ������ � ���������� ������� ����������� -- %s"
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23903,23 +25666,23 @@ msgstr ""
 "������������� ����������. �� ��������� �� ������������ �� Evolution ���\n"
 "�� �� ���������� ���� ��� �� ����� ���� �������� ��� ��������."
 
-#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "��"
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "�� ������ ����������"
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "��� ���� ������ � ������� ��� OAF"
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "��� ������� � ���� ��������� ���������"
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "������ ������"
 
@@ -24036,82 +25799,74 @@ msgstr "_��������"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "�������� ����� ��� ����������� ��� ��� ������ ������������"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "������ ���� ��� ���������� ��� ������������."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "������������"
 
-#: shell/e-shortcuts.c:1052
+#: shell/e-shortcuts.c:1033
 msgid "Inbox"
 msgstr "�����������"
 
-#: 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
-msgid "(No name)"
-msgstr "(����� �����)"
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "����"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "����� ������"
 
-#: 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:491
 msgid "The specified folder type is not valid"
 msgstr "� ������������ ����� ������� ��� ����� �������"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "������ �/�"
 
-#: 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:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "� ������������ ������� ��� �������"
 
-#: 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:505
 msgid "Operation not supported"
 msgstr "� ���������� ��� �������������"
 
-#: 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: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 ""
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "��� ���� ������ � ���������� ������� �� ���� �� �����"
 
@@ -24124,6 +25879,10 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ���� �����������)"
 
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<����� ���� ��� ��� �� ��������� ������>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -24161,67 +25920,67 @@ msgstr ""
 "�� ������ ��� �� ������� ������������� �����:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "������ CORBA"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "����� �������"
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "�� ������ ����������"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "���� ��� ���������"
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "����� ���������"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "��� �������"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "� ����� ��� �������������"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "� ���������� ��� �������������"
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "��������� ������"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "����������"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "�� ������ URI"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "���� �����������"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "��� ���� ������ ��������� �����"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "� ������� ���������� ���� �������"
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
 #, fuzzy
 msgid "Test type"
 msgstr "����� �������:"
@@ -24355,34 +26114,51 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 "��� ���� ������ ��� �� Evolution �� ������� �������� ��� �� �������� ������:"
 
-#: shell/main.c:83
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:89
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "�� Evolution ���� ������������..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "��� ���� ������ � �������� ��� ���������� ��� Ximian Evolution."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 "��� ���� ������ � ������������ ��� ������������� ��� Ximian Evolution: %s"
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "�������������� ������ �����������"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "�������� ���������"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "�������� ��� ������� ����������"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "�������� ���� ��� ������������ ��������� ��� ��� �� ��������� �� ������."
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "��� ���� ������ � ������������ ��� ���������� ���������� Bonobo"
 
@@ -24405,242 +26181,207 @@ msgstr "������� �������"
 msgid "No filename provided."
 msgstr "��� ����� ����� ����� �������."
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "��������� ����������� ��������� �� ���� ������"
+
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "��������� ��� ��������"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "��������� ��� ������..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "���������� ���� ������"
 
-#: 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:9 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "������� ��� ��������"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "�������� ����������� ������"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "_��� �����"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "���������� ����������� ��������� �� ���� ������"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "_���������� ��� ������..."
 
-#: 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:17
 msgid "Previews the contacts to be printed"
 msgstr "������������� ��� ������ ���� ��������"
 
-#: 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:22
 msgid "Save selected contacts as a VCard."
 msgstr "���������� ����������� ������ �� VCard."
 
-#: 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:24
 msgid "Select all contacts"
 msgstr "������� ���� ��� ������"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "�������� _��������� �� �����..."
-
-#: 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:26
 msgid "Send message to contact"
 msgstr "�������� ��������� �� �����"
 
-#: 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:28
 msgid "Stop"
 msgstr "�����������"
 
-#: 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:30
 #, fuzzy
 msgid "View the current contact"
 msgstr "� �������� ���"
 
-#: 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-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:16
+#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
+#: ui/evolution.xml.h:35
 msgid "_Actions"
 msgstr "�_��������"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Addressbook Sources..."
-msgstr "_����� ������� �����������..."
-
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_�����"
-
 #: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "_����� ������"
 
-#: 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 "_�������� ������..."
 
-#: 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:103
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "_��������..."
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "_���������� ��� ������..."
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "_���������� �� VCard"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_��������� ������"
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_������� ����"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "������ ��� ��������� ��� �����������"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "�������� _��������� �� �����..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "���������� ������� ��������� _������"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "���������� ���� _��������"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "���������� ���� _��������"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "������������� ��� ������� ��� �������� ��� �����"
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "�����"
 
-#: 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:6
 msgid "Go To"
 msgstr "�������� ���"
 
-#: 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:8
 msgid "Go forward"
 msgstr "�������� �������"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "�������� �� _����������"
 
-#: 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:12
 msgid "Go to today"
 msgstr "�������� ��� ������"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "�����"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "��� ��������"
-
-#: 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: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:16 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "_������������� ���������"
 
-#: 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:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "�������� ���� ������"
 
-#: 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:21
 msgid "Show one week"
 msgstr "�������� ���� ���������"
 
-#: 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:23
 msgid "Week"
 msgstr "��������"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "�_�������..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "��������� _�����������..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "����_������ ����������� ��������������"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "_�������..."
-
 #: 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
@@ -24670,18 +26411,18 @@ msgstr "������������� ��� ����������� ���������"
 msgid "Print this item"
 msgstr "�������� ����� ��� ���������"
 
-#: 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:240
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "����������"
 
+#: 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
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "���������� ��� ��������"
 
@@ -24697,8 +26438,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:40
 msgid "_File"
 msgstr "_������"
 
@@ -24716,10 +26457,14 @@ msgstr "���������� _��..."
 msgid "Save the contact and close the dialog box"
 msgstr "���������� ��� ������ ��� �������� ��� ������ ��������"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+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 "_����������"
 
@@ -24792,87 +26537,58 @@ msgid "Compose _New Message"
 msgstr "�������� ���� ���������"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-"������������ � �������������� ������������ ������������ ��� ����� �����������"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "���������� � ����������� ������� ��� �� ����������� ��� ���������"
 
-#: 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:6
 msgid "Empty _Trash"
 msgstr "�������� ������������"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "������ ���� �������� ���������"
 
-#: 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
-msgid "New Message"
-msgstr "��� ������"
-
-#: 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:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 "�������� �������� ���� ��� ������������ ��������� ��� ����� ���� ��������"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "�������� / ����"
-
-#: 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:11
 msgid "Show message preview window"
 msgstr "�������� ������ ��������������"
 
-#: 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:13
 msgid "Virtual Folder _Editor..."
 msgstr "_������������ ��������� �������"
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_������..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "_�������� ���������"
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "_��������� �������������..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_����� ��������������"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "_�������� / ����"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "_�������� ����� ��������..."
 
@@ -24968,11 +26684,11 @@ msgstr "��������� �������� ��� ����������� ���������"
 msgid "Threaded Message list"
 msgstr "����� ��������� ���� ����"
 
-#: 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 "_��������"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_�������"
 
@@ -24988,149 +26704,159 @@ msgstr "_���������..."
 msgid "_Threaded Message List"
 msgstr "����� ��������� ���� _����"
 
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "�������� ��������� ��� ������ �����������"
+
 #: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "�������� �������"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "�������� ��������� ��� ������ �����������"
+
+#: 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: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: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: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:9
 msgid "Copy selected messages to another folder"
 msgstr "��������� ����������� ��������� �� ���� ������"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "���������� ��������� ������� ��� �� ������"
 
-#: 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: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: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: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:15
 msgid "Create a virtual folder for these recipients"
 msgstr "���������� ��������� ������� ��� ������ ���� ����������"
 
-#: 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:17
 msgid "Create a virtual folder for this sender"
 msgstr "���������� ��������� ������� ��� ����� ��� ���������"
 
-#: 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:19
 msgid "Decrease the text size"
 msgstr "��������� ��������"
 
-#: 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:22
 msgid "Display the next message"
 msgstr "�������� �������� ���������"
 
-#: 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:24
 msgid "Display the next unread thread"
 msgstr "�������� �������� �� ������������ ����"
 
-#: 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:26
 msgid "Display the previous message"
 msgstr "�������� ������������ ���������"
 
-#: 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:26
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "��������"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "������ ���� ������ _������������..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "������ �� ���� ��� ���������..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "������ ���� _����������..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "������ ���� _�������..."
 
-#: 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
-msgid "Forward"
-msgstr "��������"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward As"
-msgstr "�������� ��"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Attached"
-msgstr "�������� �� _���������"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "������� ��� ����������� ��������� ��� ��������"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Inline"
-msgstr "�������� �� _�������"
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "_������ �����..."
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Forward _Quoted"
-msgstr "�������� _�� �������"
+msgid "Force images in HTML mail to be loaded"
+msgstr "����������� ������� ��� ������� ��� �������� 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 "�������� ��� ����������� ��������� ��� ���� ���� ���� ���������"
 
-#: 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:39
 msgid "Forward the selected message to someone"
 msgstr "�������� ��� ����������� ��������� �� �������"
 
-#: 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 "�������� ��� ����������� ��������� �� ������� �� ���������"
 
@@ -25146,24 +26872,32 @@ msgstr "������� _�������"
 msgid "Mark as I_mportant"
 msgstr "������� �� ���������"
 
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "������� _�� �� �����������"
+
 #: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "������� �� _��������"
 
 #: 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
-msgid "Mark the selected messages as important"
+#, fuzzy
+msgid "Mark the selected message(s) as important"
 msgstr "������� ��� ����������� ��������� �� ���������"
 
 #: 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
-msgid "Mark the selected messages as unimportant"
+#, fuzzy
+msgid "Mark the selected message(s) as unimportant"
 msgstr "������� ��� ����������� ��������� �� �� ���������"
 
 #: ui/evolution-mail-message.xml.h:51
@@ -25175,7 +26909,8 @@ msgid "Move"
 msgstr "����������"
 
 #: 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
@@ -25183,64 +26918,62 @@ msgid "Next"
 msgstr "�������"
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Important Message"
+#, fuzzy
+msgid "Next _Important Message"
 msgstr "������� ��������� ������"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Message"
-msgstr "������� ������"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "������� ����"
 
-#: 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:58
 msgid "Open the selected message in a new window"
 msgstr "������� ����������� ��������� �� ��� ��������"
 
-#: 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:60
 msgid "Original Si_ze"
 msgstr "������ _�������"
 
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "����������� �� ����������� ������"
+
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "����������� ��������� ������"
+
+#: 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:64
 msgid "Previous"
 msgstr "�����������"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Important Message"
-msgstr "����������� ��������� ������"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Message"
-msgstr "����������� ������"
-
-#: 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:67
 msgid "Print this message"
 msgstr "�������� ���������"
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply"
-msgstr "��������"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Re_direct"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "Reply to All"
-msgstr "�������� �� �����"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "�������� ��� ����������� ��������� �� �������"
 
 #: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
@@ -25311,8 +27044,9 @@ msgid "VFolder on _Subject..."
 msgstr "�������� ��� _����..."
 
 #: ui/evolution-mail-message.xml.h:92
-msgid "_Apply Filters"
-msgstr "_�������� �������"
+#, fuzzy
+msgid "_Attached"
+msgstr "���������"
 
 #: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
@@ -25327,43 +27061,71 @@ msgid "_Forward Message"
 msgstr "_�������� ���������"
 
 #: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "�������� ���"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "���� ��� ������"
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_����������"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "_������� ���������"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_���������� �� ������"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "������� ������"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_�������� �������"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 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
+#, fuzzy
+msgid "_Previous Message"
+msgstr "����������� ������"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "�� �������"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_��������"
 
+#: 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 "�������� ��� ���������"
 
 #: 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:36
 msgid "_Close"
 msgstr "_��������"
 
 #: 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:56
 msgid "_View"
 msgstr "_�������"
 
@@ -25388,11 +27150,11 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 "�������������� ���� �� ������ �� ��� ������������� ������������� 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 "_�����"
 
-#: 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"
 
@@ -25408,6 +27170,10 @@ msgstr "�������� ������� ��� ������� ��� ������"
 msgid "Insert text file..."
 msgstr "�������� ������� ��������..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "�������"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "������� �������"
@@ -25441,7 +27207,7 @@ msgid "Save in folder..."
 msgstr "���������� ��� ������..."
 
 #: 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 "���������� ��� �������� �������"
 
@@ -25466,6 +27232,7 @@ msgid "Send _later"
 msgstr "�������� _��������"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "�������� ��� ��������� �� ����� HTML"
 
@@ -25534,7 +27301,7 @@ msgid "_From Field"
 msgstr "����� _���"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_��������"
 
@@ -25546,11 +27313,7 @@ msgstr "�_������..."
 msgid "_Reply-To Field"
 msgstr "_����� ���������"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_��������"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_�������"
 
@@ -25606,43 +27369,41 @@ msgstr "����� ���� ��� ���������� ���������� ��� ��� ��������"
 msgid "Re_fresh Task"
 msgstr "_�������� ��������"
 
-#: 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:3
 msgid "Copy selected task"
 msgstr "��������� ����������� ��������"
 
-#: 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:6
 #, fuzzy
 msgid "Delete completed tasks"
 msgstr "�������� ����������� ��������"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "�������� ����������� ��������"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "Mar_k as Complete"
 msgstr "_�������� �� ������������"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "���������� �������� ��� �� ��������"
 
-#: ui/evolution-tasks.xml.h:15
-msgid "Tasks Settings..."
-msgstr "��������� ��������..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "������������� ��� ������ ���� ��������"
 
-#: ui/evolution-tasks.xml.h:22
-msgid "_Task"
-msgstr "_�������"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "�������� ���������"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25709,113 +27470,118 @@ msgid "Open this folder in an other window"
 msgstr "������� ����� ��� ������� �� ���� ��������"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "�������� / ����"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "�������� ��������� �� ������� ��� ���� ����"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "�������� ����������� ������� �� �� Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "������� ������� �����������"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "������� _������� �����������"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "������� ��� �������� �� ����� ��� Bug Buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "��������"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "�������� ��� ��������� ��� ������� ������������"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "�������� ��� ��������� ��� ������� ������������"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "�������� ��� �������� ��� ������."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "������� ����������� �������"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "������ ��������� ��� �� Evolution"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "_���� ��� Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_���������..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "_������ �������"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_�������� ���� ������..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_��������..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_����������..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_���"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "���� _�������"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "��������� ���������� _�������..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_�����������..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_�������� / ����"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_����������"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "_������ ������������"
 
-#: 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: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/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "��������� _���������..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "������ �����������"
@@ -25829,18 +27595,27 @@ msgid "Phone List"
 msgstr "����� ���������"
 
 #: 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:3
 msgid "By Sender"
 msgstr "���� ���������"
 
-#: 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:5
 msgid "By Subject"
 msgstr "���� ����"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "��������"
 
@@ -25876,11 +27651,21 @@ msgstr ""
 "������� ���� ����� ��� �������� ��� ���� ������� ����:\n"
 "�� �� ���� ������� ��� ��������� ������ ��������� ��� �����."
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "_�������� �������"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "_�������� �������"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "���������� ��������"
 
@@ -25973,24 +27758,20 @@ msgstr "���������"
 msgid "Visual"
 msgstr "��������������"
 
-#: widgets/misc/e-charset-picker.c:104
-msgid "New"
-msgstr "���"
-
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "������� ������ ����������: %s"
 
-#: 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:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "����..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "������������ ����������"
 
@@ -25998,22 +27779,32 @@ msgstr "������������ ����������"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "������������ ����������"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "���������� ����������"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "�������� ����"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "���������� ����������"
+
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "������� ���� ������������� �����������"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "����������"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "������"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "�������"
@@ -26027,11 +27818,21 @@ msgstr "������"
 msgid "Don't show this message again."
 msgstr "�� ��� �������������� ���� �� ������"
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "���_������"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "������ ����"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "����������"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "����������"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "������ ����"
 
@@ -26057,231 +27858,789 @@ msgstr "init_corba(): ��� ���� ������ � ������������ ��� GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 
-#~ msgid "Other Contacts"
-#~ msgstr "������ ������"
+#~ msgid "Card: "
+#~ msgstr "�����:"
 
-#~ msgid "(none)"
-#~ msgstr "(������)"
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "�����: "
 
-#~ msgid "Co_ntacts:"
-#~ msgstr "_������:"
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ " �������:     "
 
-#~ msgid "_Message Recipients:"
-#~ msgstr "���������� _���������:"
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  �������:      "
 
-#~ msgid "B_usiness"
-#~ msgstr "_�������"
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  ��������: "
 
-#~ msgid "Business _Fax"
-#~ msgstr "��� �_�������"
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  ����������:     "
 
-#~ msgid "_Business"
-#~ msgstr "����_���"
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  ��������:     "
 
-#~ msgid "_Home"
-#~ msgstr "��_���"
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "���������� ��������: "
 
-#~ msgid "_Mobile"
-#~ msgstr "_������"
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "���������:"
 
 #~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#~ "\n"
+#~ "  Postal Box:  "
 #~ msgstr ""
-#~ "����� ������� ��� ������\n"
-#~ "�� ��������� � �����;"
+#~ "\n"
+#~ "  ���.������:  "
 
-#~ msgid "American Samoa"
-#~ msgstr "����������� �����"
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  ����.:         "
 
-#~ msgid "Bangladesh"
-#~ msgstr "������������"
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  ����:      "
 
-#~ msgid "Belarus"
-#~ msgstr "����������"
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  ����:       "
 
-#~ msgid "Bermuda"
-#~ msgstr "���������"
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  �������:      "
 
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "��������� ����� ������� �������"
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ " ���.�������: "
 
-#~ msgid "Brunei Darussalam"
-#~ msgstr "�������� �����������"
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ " ����:     "
 
-#~ msgid "Burkina Faso"
-#~ msgstr "��������� ����"
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "������� ���������: "
 
-#~ msgid "Central African Republic"
-#~ msgstr "���������� ��������� �������"
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "��������:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "��������:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "E-mail:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "E-mail:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "���� ����: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Geo Location: "
+#~ msgstr ""
+#~ "\n"
+#~ "���������� ����: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "������������� ��������: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "���.: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  �����:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  ������:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "  ������2: "
 
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "����� ����� (�������)"
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "  ������3: "
 
-#~ msgid "Cote d'Ivoire"
-#~ msgstr "���� ������������"
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "  ������4: "
 
-#~ msgid "Djibouti"
-#~ msgstr "���������"
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "����������: "
 
-#~ msgid "Dominica"
-#~ msgstr "���������"
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "������: "
 
-#~ msgid "East Timor"
-#~ msgstr "��������� �����"
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "�������� ��������: "
 
-#~ msgid "Equatorial Guinea"
-#~ msgstr "��������� �������"
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "������� ������: "
 
-#~ msgid "Ethiopia"
-#~ msgstr "��������"
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "������� �� ��� ���������� LDAP..."
 
-#~ msgid "Fiji"
-#~ msgstr "�����"
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "������� �������� �� ��� ���������� LDAP..."
 
-#~ msgid "French Guiana"
-#~ msgstr "������� �������"
+#~ msgid "New _Contact"
+#~ msgstr "��� _�����"
 
-#~ msgid "French Polynesia"
-#~ msgstr "������� ���������"
+#~ msgid "New Contact _List"
+#~ msgstr "��� _����� ������"
 
-#~ msgid "Guinea-bissau"
-#~ msgstr "�������-�������"
+#~ msgid "Edit Addressbook"
+#~ msgstr "����������� ������� �����������"
 
-#~ msgid "Heard And McDonald Islands"
-#~ msgstr "���� ����� ��� ����� ����������"
+#~ msgid "Account Name"
+#~ msgstr "����� �����������"
 
-#~ msgid "Holy See"
-#~ msgstr "���� ����"
+#~ msgid "Add Addressbook"
+#~ msgstr "�������� ������� �����������"
 
-#~ msgid "Indonesia"
-#~ msgstr "���������"
+#~ msgid "Advanced"
+#~ msgstr "��� �������������"
 
-#~ msgid "Israel"
-#~ msgstr "������"
+#~ msgid "Base"
+#~ msgstr "����"
 
-#~ msgid "Kiribati"
-#~ msgstr "���������"
+#~ msgid "Server Name"
+#~ msgstr "����� ����������"
 
-#~ msgid "Kyrgyzstan"
-#~ msgstr "���������"
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr ""
+#~ "� �������� ���������� ����� ���������� ��� ��� �������� ���� ������� "
+#~ "�����������.  "
 
-#~ msgid "Madagascar"
-#~ msgstr "�����������"
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr ""
+#~ "� �������� ���������� ��� ����� ���������� ��� ���� ������������� "
+#~ "����������� ldap. "
 
-#~ msgid "Mauritius"
-#~ msgstr "���������"
+#~ 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 "Mozambique"
-#~ msgstr "���������"
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact your "
+#~ "server administrator for more information."
+#~ msgstr ""
+#~ "����� ����� � ������� ������ ��� ���� ��� ����������� ��� ���� ���������� "
+#~ "ldap. ������������� �� ��� ����������� ������� ��� ������������ �����������."
 
-#~ msgid "Namibia"
-#~ msgstr "��������"
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr ""
+#~ "���� ����� �� ����� ��� ���������� ���� ��������� �� ������ �����������"
 
-#~ msgid "Nepal"
-#~ msgstr "�����"
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "���� ����� � ���� ��� ������������ � ����������� ldap."
 
-#~ msgid "Netherlands Antilles"
-#~ msgstr "���������� ��������"
+#~ msgid "_My server requires authentication"
+#~ msgstr "_� ����������� ��� ������� �����������"
 
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "����� ������� ���������"
+#~ msgid "Name contains"
+#~ msgstr "�� ����� ��������"
 
-#~ msgid "Palestinian Territory"
-#~ msgstr "������������ �����"
+#~ msgid "C_ontaining:"
+#~ msgstr "_��������:"
 
-#~ msgid "Papua New Guinea"
-#~ msgstr "������-��� �������"
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "�������� ��� ������ ��� ��������� �� ��������:"
 
-#~ msgid "Republic Of Korea"
-#~ msgstr "�����"
+#~ msgid "Create a new appointment"
+#~ msgstr "���������� ���� ��������"
 
-#~ msgid "Republic Of Moldova"
-#~ msgstr "��������"
+#~ msgid "Create a new task"
+#~ msgstr "���������� ���� ��������"
+
+#~ msgid "New _Task"
+#~ msgstr "��� �������"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "���������� ���� �������� �� ��' ������� _����������"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "����� ����� ��� _���������:"
+
+#~ msgid "_Other"
+#~ msgstr "_�����"
+
+#~ msgid "_Delete this Task"
+#~ msgstr "_�������� ����� ��� ��������"
+
+#~ 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)"
+
+#, fuzzy
+#~ msgid "Error hashing password."
+#~ msgstr "������ ��������� ������"
+
+#, fuzzy
+#~ msgid "Invalid password."
+#~ msgstr "�� ������ ����������"
+
+#, fuzzy
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "�������� ���� ��� ��������� ��� �������������� \"%s\"."
+
+#, fuzzy
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "�������� ���� ��� ��������� ��� �������������� \"%s\"."
+
+#, fuzzy
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "��� ���� ������ � ���������� ������������ ������������� PGP."
+
+#, fuzzy
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "��� ���� ������ � ������� �� ��� ���������� :%s"
+
+#, fuzzy
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "��� ���� ������ � ���������� ��� ������� ���������"
+
+#~ msgid "NT Login"
+#~ msgstr "���������� ��"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "�������� �������� ��� ������ ��������� NNTP ��� %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "� ����������� �������� �� ����� ������"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "�������� ���� ��� �������� ��� �������� ������ ���� ����������"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "� ����������� �������� �� ����� ������/������ ���������"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "��� ���� ������ � ���� ��� ������ ������ ��� ��� ����������."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "��� ����� ������ �� ������� ��� ������ ������ ��� %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "��� ����� ������ ���������� ��� ������ ������ ��� %s: %s"
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr ""
+#~ "��� ����� ������ �� ����� ������� ���� ���������� ��� ��� ��������: %s"
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr ""
+#~ "��� ���� ������ �� �������� � �������: � ���������� ��� ��������� ����� "
+#~ "��������."
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "��� ����� ������ � ���� ��� ���������: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ msgstr "��� ����� ������ � ���� ��� ��������� ��� ��� ���������� POP %s: %s"
+
+#~ msgid ""
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ msgstr ""
+#~ "�� ������� ���� �� ����� ������� ���� ���������� ��� �� ��� ����� "
+#~ "������������ Kerberos 4."
+
+#~ msgid "Could not authenticate to KPOP server: %s"
+#~ msgstr "��� ����� ������ � ����������� ���� ���������� KPOP: %s"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "��� ���� ������ � ������� �� ��� ���������� :%s"
+
+#~ msgid "(Unknown)"
+#~ msgstr "(�������)"
+
+#~ msgid "Unexpected response from POP server: %s"
+#~ msgstr "���������� �������� ��� ��� ���������� ���: %s"
+
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "��� ���� ������ � ������ ��� ������ '���' ���� ���������"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr ""
+#~ "��� ����� ������ � �������� ��� ���������: ��� ����������� � ��������� "
+#~ "���������."
+
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "������ ��������� RCPT TO: %s:�� ������ ��� ��������"
+
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "������ ��������� DATA: %s:�� ������ ��� ��������"
+
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr ""
+#~ "������ ��������� DATA: ����������� ���������: %s: �� ������ ��� ��������"
+
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "����� ��������� QUIT:%s: ��-�������"
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "�������� ��� Evolution ��� ��� ����������� ������."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr ""
+#~ "��� ���� ������ � ������������ ��� ���������� ������� ��������� ��� "
+#~ "Evolution."
+
+#, fuzzy
+#~ msgid "Select a service"
+#~ msgstr "�������� ��� ������"
+
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "�������� e-mail"
+
+#, fuzzy
+#~ msgid "Run %s"
+#~ msgstr "URL: %s"
+
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "��������"
+
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "���������� ����� ��� ������� �� ���� ����"
+
+#, fuzzy
+#~ msgid "page"
+#~ msgstr "������"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "��� ���� ������ � �������� ��� �������:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr "������ ���� �� ������� ��� %s"
+
+#, fuzzy
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "��������� ��� �� ���������� ��������� ���������."
+
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "��������"
+
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "���������� ��� ��� ����������� ��� Evolution."
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "��������� ��� �� ���������� ��������� ���������."
+
+#, fuzzy
+#~ msgid "Update now"
+#~ msgstr "��������"
+
+#, fuzzy
+#~ msgid "Update every "
+#~ msgstr "���_����� ��������������"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "�������� �� URI �������"
+
+#, fuzzy
+#~ msgid "Needs Reply"
+#~ msgstr "�������� ��������������"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "������� ����������� ������������ (����������)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "��� ����� ������ � ������� �� ��� �������: %s"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "_��� ������ ������������"
+
+#~ msgid "Create vFolder from Search"
+#~ 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 "Russian Federation"
-#~ msgstr "������ ����������"
+#~ msgid " (default)"
+#~ msgstr " (��' �������)"
 
-#~ msgid "Rwanda"
-#~ msgstr "�������"
+#~ msgid "Mail Settings"
+#~ msgstr "��������� ���������"
 
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "����� ���� ��� �����"
+#~ msgid "This message contains invalid recipients:"
+#~ msgstr "���� �� ������ ��� �������� �������� ����������:"
 
-#~ msgid "Saint Vincent And The Grena-dines"
-#~ msgstr "����� ��������� ��� �����������"
+#~ msgid "Account"
+#~ msgstr "�����������"
 
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "��� ���� ��� ���������"
+#~ msgid "Always _encrypt to myself when sending encrypted mail"
+#~ msgstr ""
+#~ "�� ������� ����� ������������� ���� ����� ��� ���� ��� �������� "
+#~ "���������������� ���������"
+
+#~ msgid "Composer"
+#~ msgstr "������������"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "�� ��' ������� ���� ��������� �����: "
+
+#~ msgid "Display"
+#~ msgstr "�������"
+
+#~ msgid "Drafts"
+#~ msgstr "��������"
+
+#~ msgid "Edit..."
+#~ msgstr "�����������..."
+
+#~ msgid "HTML signature file:"
+#~ msgstr "������ ��������� HTML:"
+
+#~ msgid "News"
+#~ msgstr "��������"
 
-#~ msgid "Senegal"
-#~ msgstr "��������"
+#~ msgid "Select Filter Log file..."
+#~ msgstr "�������� ������ ����������� �������"
 
-#~ msgid "Sierra Leone"
-#~ msgstr "������ �����"
+#~ msgid "Sent"
+#~ msgstr "�����������"
 
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "����� ������� ��� ����� ���� ���������"
+#~ msgid "Sources"
+#~ msgstr "�����"
 
-#~ msgid "St. Pierre And Miquelon"
-#~ msgstr "����� ���� ��� �������"
+#~ msgid "_Email Address:"
+#~ msgstr "��������� Email:"
 
-#~ msgid "Svalbard And Jan Mayen Islands"
-#~ msgstr "����� ���������� ��� ���� ������"
+#~ msgid "_Log filter actions to:"
+#~ msgstr "_��������� �������� ������� ���:"
 
-#~ msgid "Swaziland"
-#~ msgstr "�����������"
+#~ msgid "_Organization:"
+#~ msgstr "_����������:"
 
-#~ msgid "Tajikistan"
-#~ msgstr "�����������"
+#~ msgid "_Remember this password"
+#~ msgstr "_������������� ����� ��� �������"
 
-#~ msgid "Togo"
-#~ msgstr "�����"
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "�������� ��������� �� ������� �� ����� HTML."
 
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "���������� ��� ��������"
+#~ msgid "_Server Type: "
+#~ msgstr "����� �����������: "
 
-#~ msgid "Turkmenistan"
-#~ msgstr "�������������"
+#~ msgid "_Signature file:"
+#~ msgstr "_������ ���������:"
 
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "����� ������ ��� ������"
+#~ msgid "placeholder"
+#~ msgstr "�������������"
 
-#~ msgid "Tuvalu"
-#~ msgstr "��������"
+#~ msgid "seconds."
+#~ msgstr "������������."
 
-#~ msgid "U.S. Virgin Islands"
-#~ msgstr "������������ �������� �����"
+#, fuzzy
+#~ msgid "Mail Summary"
+#~ msgstr "������ ���������"
+
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr ""
+#~ "��� ���� ������ � ������������ ��� ���������� ������� ��������� ��� "
+#~ "Evolution."
+
+#~ msgid "Regions"
+#~ msgstr "��������"
 
-#~ msgid "Uganda"
-#~ msgstr "��������"
+#~ msgid "Al_l stations:"
+#~ msgstr "���� �� _�������:"
 
-#~ msgid "Ukraine"
-#~ msgstr "��������"
+#~ msgid "All _folders:"
+#~ msgstr "���� �� _�������"
 
-#~ msgid "United Republic Of Tanzania"
-#~ msgstr "��������"
+#~ msgid "All news _feeds:"
+#~ msgstr "���� �� ����������� _��������:"
 
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "����� ����������� ����� �������� ���������"
+#~ msgid "_Display folders:"
+#~ msgstr "_�������� �������:"
 
-#~ msgid "Uzbekistan"
-#~ msgstr "������������"
+#~ msgid "_Display stations:"
+#~ msgstr "_�������� �������:"
 
-#~ msgid "Wallis And Futuna Islands"
-#~ msgstr "����� ������� ��� ��������"
+#~ msgid "_Displayed feeds:"
+#~ msgstr "_������������� ��������:"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution notes component."
+#~ msgstr "���������� ��� ��� ����������� ��� Evolution."
+
+#, fuzzy
+#~ msgid "Factory for the Notes control"
+#~ msgstr "���������� ��� �� ��������� �������� Evolution"
 
-#~ msgid "Western Sahara"
-#~ msgstr "������ ������"
+#~ msgid "Evolution "
+#~ msgstr "Evolution "
 
-#~ msgid "Zambia"
-#~ 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 "(����� �����)"
+
+#~ msgid "New List"
+#~ msgstr "_��� �����"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "������ ��� ��������� ��� �����������"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "���������� ������� ��������� _������"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "���������� ���� _��������"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "���������� ���� _��������"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "������������� ��� ������� ��� �������� ��� �����"
+
+#~ msgid "_Appointment..."
+#~ msgstr "�_�������..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "��������� _�����������..."
+
+#~ msgid "_Task..."
+#~ msgstr "_�������..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr ""
+#~ "������������ � �������������� ������������ ������������ ��� ����� �����������"
 
-#~ msgid "Zimbabwe"
-#~ msgstr "����������"
+#~ msgid "New Message"
+#~ msgstr "��� ������"
 
-#~ msgid "Evolution Alarm"
-#~ msgstr "����������� Evolution"
+#~ msgid "_Mail Settings..."
+#~ msgstr "_��������� �������������..."
+
+#~ msgid "Forward _Attached"
+#~ msgstr "�������� �� _���������"
+
+#~ msgid "Forward _Inline"
+#~ msgstr "�������� �� _�������"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "�������� _�� �������"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_�������� �������"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "�������� ��� �������� ��� �������� ��� ��������"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "��������� ��������..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "������� ��� ��������� ��� ���������"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "��������� _���������..."
+
+#~ msgid "Show All"
+#~ msgstr "�������� ����"
+
+#~ msgid "Sear_ch"
+#~ msgstr "���_������"
+
+#~ msgid "Other Contacts"
+#~ msgstr "������ ������"
+
+#~ msgid "(none)"
+#~ msgstr "(������)"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "_������:"
+
+#~ msgid "_Message Recipients:"
+#~ msgstr "���������� _���������:"
+
+#~ msgid "B_usiness"
+#~ msgstr "_�������"
+
+#~ msgid "Business _Fax"
+#~ msgstr "��� �_�������"
+
+#~ msgid "_Business"
+#~ msgstr "����_���"
+
+#~ msgid "_Home"
+#~ msgstr "��_���"
+
+#~ 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 "����� ���� ��� ��� �� ���������� ���� ��������������"
@@ -26320,9 +28679,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "90%"
 #~ msgstr "90%"
 
-#~ msgid "100%"
-#~ msgstr "100%"
-
 #~ msgid "Meeting begins: <b>"
 #~ msgstr "� ��������� �������: <b>"
 
@@ -26487,9 +28843,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ 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 "�� ������ �������� ���� �������� ��� ��� ��������������"
 
@@ -26521,9 +28874,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "Status: %s"
 #~ msgstr "_���������: %s"
 
-#~ msgid "Priority: %s"
-#~ msgstr "_������������� %s"
-
 #~ msgid "Percent Complete: %i"
 #~ msgstr "%i ������������"
 
@@ -26572,21 +28922,12 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "Subject is %s"
 #~ msgstr "�� ���� ����� %s"
 
-#~ msgid "Mail from %s"
-#~ msgstr "������ ��� ���/��� %s"
-
 #~ msgid "%s mailing list"
 #~ msgstr "%s ����� ������������"
 
-#~ msgid "Account %d"
-#~ msgstr "����������� %d"
-
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: �����������"
 
-#~ msgid "Special Folders"
-#~ msgstr "������� �������"
-
 #~ msgid ""
 #~ "This message is digitally signed. Click the lock icon for more information."
 #~ msgstr ""
@@ -26608,12 +28949,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ "���� �� ������ ����� ������� ������������� ��� ��� ������� �� ����� "
 #~ "���������."
 
-#~ msgid "Trash"
-#~ msgstr "�����������"
-
-#~ msgid "VFolders"
-#~ msgstr "��������"
-
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>��� ���� ������ � ������� �� ��� ���������� ������</b></dd>"
 
@@ -26637,12 +28972,3 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 
 #~ msgid "Outbox"
 #~ msgstr "����������"
-
-#~ msgid "Local Folders"
-#~ msgstr "������� �������"
-
-#~ msgid "Add to Saved Searches"
-#~ msgstr "������� ���� ������������� �����������"
-
-#~ msgid "Clear"
-#~ msgstr "����������"
diff --git a/po/en_AU.po b/po/en_AU.po
index 29a76df820..c2a3b38a34 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: 2001-11-14 19:26-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -30,21 +30,22 @@ msgid "Imports VCard files into Evolution."
 msgstr ""
 
 #: 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/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr ""
 
 #: 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/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Primary"
 msgstr ""
 
@@ -54,15 +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:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: 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
 msgid "Business"
 msgstr ""
 
@@ -72,12 +74,12 @@ msgid "Bus"
 msgstr ""
 
 #: 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:1720
 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:1722
 msgid "Company"
 msgstr ""
 
@@ -87,13 +89,14 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: 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
 msgid "Home"
 msgstr ""
 
 #: 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 "Organisation"
 
@@ -102,18 +105,20 @@ msgid "Org"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr ""
 
 #: 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:1721
 msgid "Car"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: 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:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr ""
 
@@ -122,13 +127,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: 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:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr ""
 
@@ -137,69 +142,68 @@ msgid "Bus 2"
 msgstr ""
 
 #: 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:1724
 msgid "Home 2"
 msgstr ""
 
 #: 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:1726
+#: 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:1656
-#: addressbook/gui/contact-editor/e-contact-editor.c:1714
-#: mail/mail-config.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 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/gui/contact-editor/e-contact-editor.c:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr ""
 
 #: 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 ""
 
 #: 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:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr ""
 
 #: 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 ""
 
@@ -208,7 +212,7 @@ msgid "Url"
 msgstr ""
 
 #: 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 ""
 
@@ -217,7 +221,7 @@ msgid "Dep"
 msgstr ""
 
 #: 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 ""
 
@@ -226,12 +230,12 @@ msgid "Off"
 msgstr ""
 
 #: 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/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 ""
 
@@ -240,7 +244,7 @@ msgid "Prof"
 msgstr ""
 
 #: 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 ""
 
@@ -253,7 +257,7 @@ msgid "Ass"
 msgstr ""
 
 #: 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 ""
 
@@ -262,12 +266,12 @@ msgid "Nick"
 msgstr ""
 
 #: 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/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 ""
 
@@ -280,7 +284,7 @@ msgid "CALUri"
 msgstr ""
 
 #: 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 ""
 
@@ -309,661 +313,881 @@ msgstr ""
 msgid "Family Name"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:788
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, c-format
 msgid "%x"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3712
-msgid "Card: "
+#: addressbook/backend/ebook/e-card.c:2679
+msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
+#: addressbook/backend/ebook/e-card.c:2687
+#, c-format
+msgid "VCard for %s"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
+#: 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:34
+#: 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:1385
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
+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
+msgid "Searching..."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
+#: addressbook/backend/pas/pas-backend-file.c:263
+msgid "Loading..."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
+#. need a different error message here.
+#: addressbook/backend/pas/pas-backend-file.c:272
+msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
+msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
+msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
+msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
+msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+msgid "Error performing search"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+msgid "Could not parse query string"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
+#: addressbook/conduit/address-conduit.c:293
+msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
+#: addressbook/conduit/address-conduit.c:536
+msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
+#: addressbook/conduit/address-conduit.c:549
+msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
+#: 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 ""
 
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
+#: 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 ""
 
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
+#: addressbook/conduit/address-conduit.c:1385
+#: addressbook/conduit/address-conduit.c:1388
+msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Addressbook Settings"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Configuration control for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3879
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
+#: 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
+msgid "Contacts"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
+msgid "Folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:74
+msgid "LDAP Server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:74
+msgid "LDAP server containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:562
+msgid "New Contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:562
+#: 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-component.c:565
+msgid "Contact _List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+msgid "Could not initialize gnome-vfs"
+msgstr "Could not initialise gnome-vfs"
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:525
 msgid ""
-"\n"
-"Unique String: "
+"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 ""
 
-#: addressbook/backend/ebook/e-card.c:3882
+#: addressbook/gui/component/addressbook.c:530
 msgid ""
-"\n"
-"Public Key: "
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4235
-msgid "Multiple VCards"
+#: 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."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
-msgid "VCard for %s"
+msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: 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/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1449
-#: calendar/conduits/todo/todo-conduit.c:1130
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
-msgid "Could not initialize Bonobo"
-msgstr "Could not initialise Bonobo"
+#: addressbook/gui/component/addressbook.c:769
+msgid "Name begins with"
+msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2215
-msgid "Searching..."
+#: addressbook/gui/component/addressbook.c:770
+msgid "Email is"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-msgid "Loading..."
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
 msgstr ""
 
-#. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:270
-msgid "Error in search expression."
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:475
-msgid "Connecting to LDAP server..."
+#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+msgid "Advanced..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:485
-msgid "Unable to connect to LDAP server."
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:501
-msgid "Waiting for connection to LDAP server..."
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:870
-msgid "Adding card to LDAP server..."
+#: 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
+msgid "Primary Email"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:971
-msgid "Removing card from LDAP server..."
+#: addressbook/gui/component/e-address-popup.c:587
+msgid "Select an Action"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
-msgid "Modifying card from LDAP server..."
+#: addressbook/gui/component/e-address-popup.c:593
+#, c-format
+msgid "Create a new contact \"%s\""
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2160
-msgid "Receiving LDAP search results..."
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2165
-msgid "Restarting search."
+#: addressbook/gui/component/e-address-popup.c:891
+msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:294
-msgid "Cursor could not be loaded\n"
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:307
-msgid "EBook not loaded\n"
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1089
-#: calendar/conduits/calendar/calendar-conduit.c:981
-#: calendar/conduits/todo/todo-conduit.c:694
-msgid "Could not start wombat server"
+#: addressbook/gui/component/e-address-popup.c:1046
+msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1090
-#: calendar/conduits/calendar/calendar-conduit.c:982
-#: calendar/conduits/todo/todo-conduit.c:695
-msgid "Could not start wombat"
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1120
-#: addressbook/conduit/address-conduit.c:1123
-msgid "Could not read pilot's Address application block"
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
+#: addressbook/gui/component/addressbook-config.c:197
+msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/component/addressbook-config.c:215
+msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/component/addressbook-config.c:235
+msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+#: addressbook/gui/component/addressbook-config.c:641
+msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
+#: addressbook/gui/component/addressbook-config.c:1143
+msgid "The server did not respond with a schema entry"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
+#: addressbook/gui/component/addressbook-config.c:1163
+msgid "Could not query for schema information"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/component/addressbook-config.c:1169
+msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/component/addressbook-config.c:1613
+msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/component/addressbook-config.c:1689
+msgid "Extra Completion folders"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the sample Addressbook control"
+#: addressbook/gui/component/ldap-config.glade.h:1
+msgid "  S_how Supported Bases "
 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
-msgid "Contacts"
+#: addressbook/gui/component/ldap-config.glade.h:2
+msgid "<< Fewer Options"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:71
-msgid "Folder containing contact information"
+#: addressbook/gui/component/ldap-config.glade.h:3
+msgid "<- _Remove"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:73
-msgid "LDAP Server"
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:73
-msgid "LDAP server containing contact information"
+#: addressbook/gui/component/ldap-config.glade.h:5
+msgid "1:00"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
-msgid "New Contact"
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact List"
+#: addressbook/gui/component/ldap-config.glade.h:8
+msgid "380"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
+#: 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/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+msgid "Always"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
+#: addressbook/gui/component/ldap-config.glade.h:18
+msgid "Attribute"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
+#: 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
+msgid "Connecting"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:25
+msgid "DN Customization"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "De_lete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:27
+msgid "Distinguished _name:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Email Address:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:29
+msgid "Evolution Attribute"
+msgstr ""
+
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:32
+msgid "Finished"
+msgstr ""
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+msgid "LDAP Configuration Assistant"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+msgid "Mappings"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+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/ldap-config.glade.h:44
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
+#: 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
+msgid "S_earch scope: "
+msgstr ""
+
+#. 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+msgid "Select"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:65
+msgid "Step 1: Server Information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search s_cope: "
+#: addressbook/gui/component/ldap-config.glade.h:66
+msgid "Step 2: Connecting to Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Server Name"
+#: addressbook/gui/component/ldap-config.glade.h:67
+msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "The information below is required in order to add an addressbook.  "
+#: 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/addressbook-config.glade.h:17
-msgid "This information is not required for most ldap servers. "
+#: 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/addressbook-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:87
 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 is the full name of your ldap server. For example, "
+"\"ldap.mycompany.com\"."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"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:20
-msgid "This is the name of the server where your addressbook is located."
+#: 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/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
+#: addressbook/gui/component/ldap-config.glade.h:91
+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/addressbook-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"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/addressbook-config.glade.h:23
-msgid "_Account name:"
+#: addressbook/gui/component/ldap-config.glade.h:102
+msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+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:90 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:139
 msgid "_Add"
 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"
+#: addressbook/gui/component/ldap-config.glade.h:105
+msgid "_Add ->"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
+#: addressbook/gui/component/ldap-config.glade.h:106
+msgid "_Add Mapping"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
+#: addressbook/gui/component/ldap-config.glade.h:107
+msgid "_Add to DN"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
+#: addressbook/gui/component/ldap-config.glade.h:108
+msgid "_Always"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-msgid "Could not initialize gnome-vfs"
-msgstr "Could not initialise gnome-vfs"
+#: addressbook/gui/component/ldap-config.glade.h:109
+msgid "_Delete Mapping"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:167
-msgid "Other Contacts"
+#: addressbook/gui/component/ldap-config.glade.h:110
+msgid "_Display name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:468
-msgid "Unable to open addressbook"
+#: addressbook/gui/component/ldap-config.glade.h:111
+msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:477
-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"
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:482
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:490
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: 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
+#: 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 ""
 
-#: addressbook/gui/component/addressbook.c:623
-#, c-format
-msgid "Enter password for %s (user %s)"
+#: addressbook/gui/component/ldap-config.glade.h:115
+msgid "_Edit Mapping"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:786
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
+#: addressbook/gui/component/ldap-config.glade.h:116
+msgid "_Evolution attribute:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:787
-msgid "Name contains"
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:788
-msgid "Email contains"
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:59
-msgid "Category is"
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
 msgstr ""
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
 msgstr ""
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1031
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
+#: addressbook/gui/component/ldap-config.glade.h:121
+msgid "_More Options >>"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1071
-msgid "The URI that the Folder Browser will display"
+#: addressbook/gui/component/ldap-config.glade.h:122
+msgid "_Port number:"
 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)"
+#: addressbook/gui/component/ldap-config.glade.h:123
+msgid "_Restore Defaults"
 msgstr ""
 
-#: 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:1686
-msgid "Primary Email"
+#: addressbook/gui/component/ldap-config.glade.h:124
+msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:587
-msgid "Select an Action"
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, c-format
-msgid "Create a new contact \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:126
+msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:127
+msgid "account-druid"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:891
-msgid "Querying Addressbook..."
+#: addressbook/gui/component/ldap-config.glade.h:128
+msgid "account-editor"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
+#: addressbook/gui/component/ldap-config.glade.h:129
+msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-msgid "Add to Contacts"
+#: addressbook/gui/component/ldap-config.glade.h:130
+msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1046
-msgid "Merge E-Mail Address"
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
+#: addressbook/gui/component/ldap-config.glade.h:133
+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/component/ldap-config.glade.h:136
+msgid "searching-tab"
 msgstr ""
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
@@ -975,9 +1199,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: 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: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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr ""
 
@@ -1006,7 +1230,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: addressbook/gui/component/select-names/e-select-names.c:600
+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"
@@ -1016,7 +1244,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"
@@ -1024,1218 +1252,1279 @@ 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:1
-msgid "C_ontaining:"
+msgid "Select Names"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Co_ntacts:"
+msgid "Selected Contacts:"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "F_ind"
+msgid "Show Contacts"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
+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
-msgid "_Category:"
+msgid "_Browse..."
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "_Folder:"
+msgid "_Category:"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Message Recipients:"
+msgid "_Folder:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "Anni_versary:"
+msgid "A_ssistant's name:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "B_usiness"
+msgid "Add_ress..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Business _Fax"
+msgid "Anni_versary:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
+msgid "Birthda_y:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "C_ontacts..."
+msgstr ""
+
+#: 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 ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid "D_epartment:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "File A_s:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "General"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Full _Name..."
 msgstr ""
 
-#: 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"
 "of that information here."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "No_tes:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Organi_zation:"
 msgstr "Organi_sation:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "Phone Types"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Wants to receive _HTML mail"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Address..."
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Assistant's name:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Birthday:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Business"
-msgstr ""
-
 #: 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..."
+msgid "P_rofession:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: 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:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
-msgid "_Delete"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Department:"
+msgid "Phone Types"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Full Name..."
+msgid "S_pouse:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Home"
+msgid "This is the _mailing address"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Job title:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "_Manager's Name:"
+msgid "Wants to receive _HTML mail"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Mobile"
+#: 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
+msgid "_Delete"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Nickname:"
+msgid "_Job title:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "_Office:"
+msgid "_Manager's Name:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Profession:"
+msgid "_Nickname:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-msgid "_Public Calendar URL:"
+msgid "_Office:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Spouse:"
+msgid "_Public Calendar URL:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 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:756
-msgid "Category editor not available."
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:763
-msgid "This contact belongs to these categories:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr ""
-
-#: 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 ""
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr ""
-
-#: 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/gui/contact-editor/e-contact-save-as.c:170
-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 ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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/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 ""
 
-#: 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 ""
 
-#: 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/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/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 ""
-
-#: 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 "Chile"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Comoros"
 msgstr "Comoros"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:56
-msgid "Countr_y:"
-msgstr ""
-
-#: 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/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 ""
 
-#: 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 ""
 
-#: 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/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 ""
 
-#: 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/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
+#: 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 ""
 
-#: 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
+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 ""
 
-#: 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
+#: my-evolution/Locations.h:1190
 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:1198
 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
 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:1234
 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:1268
 msgid "Luxembourg"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
 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/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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1387
 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
+msgid "Moldova, Republic Of"
+msgstr ""
+
+#: 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:1470
 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 ""
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
 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 ""
 
-#: 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:1560
 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:1562
 msgid "Nicaragua"
 msgstr ""
 
-#: 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 ""
 
-#: 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:1574
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
 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:1632
 msgid "Oman"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
 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
 msgid "Palestinian Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
 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:1688
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
 msgid "Peru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr ""
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
 msgid "Poland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
 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:1824
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
 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/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:2035
 msgid "Saudi Arabia"
 msgstr ""
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2090
 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:2103
 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:2104
 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 ""
 
-#: 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:2119
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Sudan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
 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/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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
 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:2183
 msgid "Switzerland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
 msgid "Taiwan"
 msgstr ""
 
-#: 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
+msgid "Tanzania, United Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
 msgstr ""
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
 msgid "Turkey"
 msgstr ""
 
-#: 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/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:2334
 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:2342
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr ""
-
-#: 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:2348
 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:2380
 msgid "Venezuela"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
 msgid "Viet Nam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+msgid "Virgin Islands, British"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
 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:2524
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+msgid "Category editor not available."
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+msgid "This contact belongs to these categories:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+msgid "Save Contact as VCard"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr ""
+
+#: 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 ""
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr ""
+
+#: 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/gui/contact-editor/e-contact-save-as.c:170
+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 ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "_Post Code:"
 
@@ -2333,10 +2622,14 @@ msgid "contact-list-editor"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 msgid "Contact List Editor"
 msgstr ""
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+msgid "Save List as VCard"
+msgstr ""
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
@@ -2379,7 +2672,7 @@ msgid ""
 msgstr ""
 
 #: 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 ""
 
@@ -2388,217 +2681,302 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: 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:140
 msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 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
-msgid "Save as VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: 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
-msgid "Forward Contact"
-msgstr ""
-
-#: 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: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:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr ""
-
-#: 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"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+msgid "Error getting book view"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: 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:1043
 msgid "Success"
 msgstr ""
 
-#: 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: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
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr ""
 
-#: 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:1071
 msgid "Permission denied"
 msgstr ""
 
-#: 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 ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr ""
 
-#: 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:607 camel/camel-service.c:643
+#: 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
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 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"
+#: addressbook/gui/widgets/e-addressbook-util.c:204
+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"
+#: addressbook/gui/widgets/e-addressbook-util.c:205
+msgid "Display Cards"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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:344
+msgid "Move card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+msgid "Copy card to"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+msgid "Move cards to"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+msgid "Copy cards to"
+msgstr ""
+
+#: 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:338
 msgid "Primary Phone"
 msgstr ""
 
-#: 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:854
+#: 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:341
 msgid "Callback Phone"
 msgstr ""
 
-#: 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:857
+#: 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:345
 msgid "Business Address"
 msgstr ""
 
-#: 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:861
+#: 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:348
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr ""
 
-#: 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:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+msgid "New Contact..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+msgid "New Contact List..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+msgid "Go to Folder..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+msgid "Import..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+msgid "Search for Contacts..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+msgid "Addressbook Sources..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+msgid "Pilot Settings..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Copy to folder..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Move to folder..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+msgid "Current View"
+msgstr ""
+
+#. 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:940
+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 ""
+
+#. 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
+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 ""
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -2612,19 +2990,40 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr ""
 
-#: 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 ""
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr ""
+
+#: 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
 msgid "10 pt. Tahoma"
 msgstr ""
@@ -2694,6 +3093,7 @@ msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr ""
 
@@ -2718,10 +3118,12 @@ msgid "Options"
 msgstr ""
 
 #: 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
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr ""
 
@@ -2737,7 +3139,9 @@ msgstr ""
 msgid "Paper source:"
 msgstr ""
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr ""
 
@@ -2793,62 +3197,48 @@ msgstr ""
 msgid "_Font..."
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1111
-msgid "Print cards"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-msgid "Print card"
-msgstr ""
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr ""
-
-#: calendar/cal-util/cal-component.c:1202
+#: calendar/cal-util/cal-component.c:1207
 msgid "Untitled appointment"
 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:405 mail/message-list.c:651
+#: 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
 msgid "High"
 msgstr ""
 
-#: 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:650
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 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:407 mail/message-list.c:649
+#: 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
 msgid "Low"
 msgstr ""
 
 #. 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
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:937
-#: calendar/conduits/todo/todo-conduit.c:649
+#: 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: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 ""
 
-#: calendar/conduits/todo/todo-conduit.c:756
-#: calendar/conduits/todo/todo-conduit.c:759
+#: calendar/conduits/todo/todo-conduit.c:206
+msgid "Default Priority:"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -2861,42 +3251,54 @@ 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."
+msgid "Calendar and Tasks"
 msgstr ""
 
 #: 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 executive summary component."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Calendar Summary component."
+msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+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
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 ""
@@ -2905,22 +3307,10 @@ 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 ""
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -2943,11 +3333,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: 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"
@@ -2955,18 +3345,28 @@ 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:2608
+#: 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 ""
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/alarm-queue.c:772
+msgid "Do not ask me about this program again."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Could not initialise GNOME"
 
@@ -2978,51 +3378,65 @@ msgstr ""
 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 ""
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. 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 ""
 
-#: 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 ""
 
-#: 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 "%m/%d/%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 ""
 
-#: 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 ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr ""
 
@@ -3043,32 +3457,27 @@ msgid "W"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr ""
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 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:479 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr ""
 
@@ -3081,12 +3490,13 @@ 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/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/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
+#: 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 ""
 
@@ -3098,23 +3508,15 @@ msgstr ""
 msgid "Assigned"
 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:803
+#: 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
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr ""
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1974 calendar/gui/e-day-view.c:1675
-#: calendar/gui/e-week-view.c:1182
-msgid "Searching"
-msgstr ""
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr ""
@@ -3131,63 +3533,72 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+msgid "Calendar"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
+#: calendar/gui/component-factory.c:68
+msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
+#: calendar/gui/component-factory.c:72 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
+msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
-msgid "Unmatched"
+#: calendar/gui/component-factory.c:73
+msgid "Folder containing to-do items"
 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
-msgid "Calendar"
+#: calendar/gui/component-factory.c:695
+msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:64
-msgid "Folder containing appointments and events"
+#: calendar/gui/component-factory.c:695
+msgid "_Meeting"
 msgstr ""
 
-#: 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
-msgid "Tasks"
+#: calendar/gui/component-factory.c:699
+msgid "New task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:69
-msgid "Folder containing to-do items"
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
+#: calendar/gui/component-factory.c:703
+msgid "New All Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:703
+msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
+#: calendar/gui/component-factory.c:707
+msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
+#: calendar/gui/component-factory.c:707
+msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Could not close temporary folder: %s"
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr ""
 
+#: 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 ""
@@ -3352,12 +3763,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 ""
@@ -3378,7 +3789,7 @@ msgstr ""
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -3386,12 +3797,11 @@ msgstr ""
 msgid "_Options..."
 msgstr ""
 
-#. 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/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr ""
 
@@ -3408,7 +3818,7 @@ msgstr ""
 msgid "hour(s)"
 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:189
 msgid "minute(s)"
 msgstr ""
 
@@ -3449,170 +3859,164 @@ msgid "Color for tasks due today"
 msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
+msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Days"
+#: calendar/gui/dialogs/recurrence-page.c:1125
+msgid "Friday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
+msgid "Hours"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
-msgid "Friday"
+msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Hours"
+#: calendar/gui/dialogs/recurrence-page.c:1121
+msgid "Monday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Minutes"
+#: calendar/gui/dialogs/recurrence-page.c:1126
+msgid "Saturday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
-msgid "Monday"
+msgid "Sh_ow a default reminder"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
+msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
-msgid "Saturday"
+msgid "Sta_rt of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
+msgid "Su_n"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Show week _numbers in date navigator"
+#: calendar/gui/dialogs/recurrence-page.c:1127
+msgid "Sunday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Sta_rt of day:"
-msgstr ""
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Su_n"
+msgid "T_hu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Sunday"
+msgid "T_ue"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "T_hu"
+msgid "Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "T_ue"
+#: calendar/gui/dialogs/recurrence-page.c:1124
+msgid "Thursday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
+msgid "Time"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:962
-msgid "Thursday"
+msgid "Time _zone:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Time"
+msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Time _zone:"
+#: calendar/gui/dialogs/recurrence-page.c:1122
+msgid "Tuesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
+#: calendar/gui/dialogs/recurrence-page.c:1123
+msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Time format:"
+#: ui/evolution-calendar.xml.h:24
+msgid "Work Week"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:960
-msgid "Tuesday"
+msgid "_12 hour (AM/PM)"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:961
-msgid "Wednesday"
+msgid "_24 hour"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
-msgid "Work Week"
+msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "_12 hour (AM/PM)"
+msgid "_Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "_24 hour"
+msgid "_Display"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_Ask for confirmation when deleting items"
+msgid "_End of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "_Compress weekends in month view"
+msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "_Display"
+#: mail/mail-config.glade.h:158
+msgid "_General"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "_End of day:"
+msgid "_Hide completed tasks after"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Fri"
+msgid "_Mon"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "_General"
+msgid "_Overdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Hide completed tasks after"
+msgid "_Sat"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "_Mon"
+msgid "_Show appointment end times in week and month views"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
+msgid "_Time divisions:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "_Sat"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Wed"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr ""
 
@@ -3676,71 +4080,60 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: 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: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: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/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:322
 msgid "Could not update object!"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1897
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1904
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -3798,7 +4191,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr ""
 
@@ -3812,13 +4205,13 @@ msgstr ""
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 msgid "Scheduling"
 msgstr ""
 
 #: calendar/gui/dialogs/event-editor.c:207
 #: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr ""
 
@@ -3851,30 +4244,39 @@ msgid "F_ree"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:8
+msgid "L_ocation:"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr ""
 
-#: 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 ""
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "_End time:"
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+msgid "_End time:"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr ""
 
@@ -3901,55 +4303,49 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
+msgid "Common Name"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
+msgid "Delegated From"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
+msgid "Delegated To"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
+msgid "Language"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
+msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
+msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:798
 #: 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: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/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"
 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 mail/mail-config.glade.h:85
+#: 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
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -3964,7 +4360,7 @@ msgid "_Change Organizer"
 msgstr "_Change Organiser"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:445
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr ""
 
@@ -3972,27 +4368,91 @@ msgstr ""
 msgid "_Other Organizer"
 msgstr "_Other Organiser"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: calendar/gui/dialogs/recurrence-page.c:126
+#: calendar/gui/dialogs/recurrence-page.c:146
+#: calendar/gui/dialogs/recurrence-page.c:156
+msgid "st"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+msgid "nd"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+msgid "rd"
+msgstr ""
+
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
-msgid "day"
+#: calendar/gui/dialogs/recurrence-page.c:1062
+msgid "first"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
-msgid "on the"
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
+#: calendar/gui/dialogs/recurrence-page.c:1064
+msgid "third"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+msgid "fourth"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+msgid "last"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "_Other Organiser"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+msgid "day"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1260
+msgid "on the"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr ""
 
@@ -4056,16 +4516,20 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:56
+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
+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?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
@@ -4083,7 +4547,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr ""
 
@@ -4095,15 +4559,19 @@ msgstr ""
 msgid "_Status:"
 msgstr ""
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr ""
+
 #: 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:324
 msgid "Assignment"
 msgstr ""
 
-#: 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.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:42
 msgid "Description:"
 msgstr ""
 
@@ -4115,188 +4583,147 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
+#: calendar/gui/e-calendar-table.c:751 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:437
-#, c-format
-msgid "100%"
+#: 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
+msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2724
-#: calendar/gui/e-week-view.c:1822
-msgid "Deleting selected objects"
+#: calendar/gui/e-calendar-table.c:973
+msgid "_Save as..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:941 calendar/gui/e-day-view.c:3544
-#: calendar/gui/e-week-view.c:3422 mail/folder-browser.c:1447
-#: shell/e-shortcuts-view.c:384
-msgid "_Open"
+#: calendar/gui/e-calendar-table.c:974 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 ""
 
-#: 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
+#: calendar/gui/e-calendar-table.c:978 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:947 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3433 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:979 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:949 calendar/gui/e-day-view.c:3530
-#: calendar/gui/e-day-view.c:3557 calendar/gui/e-week-view.c:3409
-#: calendar/gui/e-week-view.c:3435 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:980 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 ""
 
-#: calendar/gui/e-calendar-table.c:954
-msgid "_Mark as Complete"
+#: calendar/gui/e-calendar-table.c:984
+msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:956
-msgid "_Delete this Task"
+#: calendar/gui/e-calendar-table.c:985
+msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:986
+msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:987
+msgid "_Mark Selected Tasks as Complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7115
-#: calendar/gui/e-week-view.c:3918
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr ""
 
-#. 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 ""
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr ""
 
+#. 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 ""
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -4304,371 +4731,163 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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 ""
 
 #. 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 ""
 
 #. 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
 msgid "am"
 msgstr ""
 
 #. 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
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
-msgid "New All Day _Event"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3535 calendar/gui/e-week-view.c:3414
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
-msgid "_Go to Date..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-msgid "_Delete this Appointment"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
-msgid "Make this Occurrence _Movable"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
-msgid "Delete this _Occurrence"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
-msgid "Delete _All Occurrences"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:524
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Task begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:534
-msgid "Free/Busy info begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:538
-msgid "Begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:550
-msgid "Meeting ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:553
-msgid "Free/Busy info ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:557
-msgid "Ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:571
-msgid "Task Completed: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:581
-msgid "Task Due: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
-msgid "iCalendar Information"
-msgstr ""
-
-#. Title
-#: calendar/gui/e-itip-control.c:633
-msgid "iCalendar Error"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
-msgid "An unknown person"
-msgstr ""
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:737
-msgid "<i>None</i>"
-msgstr ""
-
-#: 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
-msgid "Choose an action:"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:779
-msgid "Update"
-msgstr ""
-
-#: 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
-msgid "OK"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:795
-msgid "Accept"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:796
-msgid "Tentatively accept"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:797
-msgid "Decline"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:811
-msgid "Send Free/Busy Information"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:824
-msgid "Update respondent status"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:838
-msgid "Send Latest Information"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:867
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:868
-msgid "Meeting Information"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:872
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:873
-msgid "Meeting Proposal"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:877
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:878
-msgid "Meeting Update"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:882
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:883
-msgid "Meeting Update Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:887
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:888
-msgid "Meeting Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:892
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:893
-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
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:898
-msgid "Bad Meeting Message"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:917
-#, c-format
-msgid "<b>%s</b> has published task information."
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:918
-msgid "Task Information"
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:922
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:923
-msgid "Task Proposal"
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:927
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:928
-msgid "Task Update"
+#: 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 ""
 
-#: calendar/gui/e-itip-control.c:932
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:933
-msgid "Task Update Request"
+#: 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-itip-control.c:937
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
+msgid "_Configure..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:938
-msgid "Task Reply"
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+msgid "_Configure Pilot..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:942
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
+#: 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
+msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:943
-msgid "Task Cancellation"
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:948
-msgid "Bad Task Message"
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:967
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:968
-msgid "Free/Busy Information"
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:972
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:973
-msgid "Free/Busy Request"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:977
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:978
-msgid "Free/Busy Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:983
-msgid "Bad Free/Busy Message"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1052
-msgid "The message does not appear to be properly formed"
+msgid "Error executing %s."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1071
-msgid "The message contains only unsupported requests."
+#: 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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1099 calendar/gui/e-itip-control.c:1105
-msgid "The attachment does not contain a valid calendar message"
+#: calendar/gui/e-itip-control.c:1564
+msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1130
-msgid "The attachment has no viewable calendar items"
+#: calendar/gui/e-itip-control.c:1566
+msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1231
-msgid "Update complete\n"
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1284
-msgid "Attendee status ould not be updated!\n"
+#: calendar/gui/e-itip-control.c:1638
+msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1288
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1348 calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
-msgid "Unable to find any of your identities in the attendees list!\n"
+#: calendar/gui/e-itip-control.c:1861
+msgid "Select Calendar Folder"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1868
+msgid "Select Tasks Folder"
 msgstr ""
 
 #: calendar/gui/e-itip-control.glade.h:2
@@ -4708,211 +4927,210 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1535
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr ""
 
-#: 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:771
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr ""
 
-#: 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:775
-#: calendar/gui/e-meeting-model.c:791
-#: 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 ""
-
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr ""
 
-#: 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:788
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr ""
 
-#: 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:816
+#: 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:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:819 calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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: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:2118 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
-#: 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 "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:428
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:641
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:660
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-tasks.c:543
+msgid "Completing tasks..."
+msgstr ""
+
+#: calendar/gui/e-tasks.c:566
+msgid "Deleting selected objects..."
+msgstr ""
+
+#: calendar/gui/e-tasks.c:659
+msgid "Expunging"
+msgstr ""
+
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1865
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
@@ -4973,265 +5191,250 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:220
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:570
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr ""
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr ""
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr ""
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr ""
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr ""
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr ""
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr ""
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2358 my-evolution/e-summary.c:619
-#: 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:2894
+#: 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:2550
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr ""
 
-#: 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 ""
+
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control-factory.c:75
+#: calendar/gui/tasks-control.c:456
 msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
+"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 ""
+
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+msgid "Do not ask me again."
+msgstr ""
+
+#: calendar/gui/tasks-control.c:612
+msgid "Print Tasks"
 msgstr ""
 
 #: calendar/gui/tasks-migrate.c:105
@@ -5266,130 +5469,1679 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/pcs/query.c:234
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+msgid "Factory to import iCalendar files into Evolution"
+msgstr ""
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+msgid "Imports iCalendar files into Evolution"
+msgstr ""
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+msgid "Imports vCalendar files into Evolution"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:638
+msgid "Calendar Events"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:663
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:670
+msgid "Gnome Calendar"
+msgstr ""
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:258
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:263
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:300
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:305
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:339
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:344
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:371
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:376
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:412
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:508
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:513
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:650
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:655
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:679
+#: 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:721
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: 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)"
 msgstr ""
 
-#: calendar/pcs/query.c:821
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:866
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:871
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1159
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
-#: camel/camel-cipher-context.c:171
+#.
+#. * 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
+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
+msgid "America/Adak"
+msgstr ""
+
+#: calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr ""
+
+#: calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr ""
+
+#: calendar/zones.h:62
+msgid "America/Antigua"
+msgstr ""
+
+#: calendar/zones.h:63
+msgid "America/Araguaina"
+msgstr ""
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr ""
+
+#: calendar/zones.h:66
+msgid "America/Barbados"
+msgstr ""
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: calendar/zones.h:68
+msgid "America/Belize"
+msgstr ""
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+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
+msgid "America/Caracas"
+msgstr ""
+
+#: calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr ""
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+msgid "America/Cayman"
+msgstr ""
+
+#: calendar/zones.h:79
+msgid "America/Chicago"
+msgstr ""
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr ""
+
+#: calendar/zones.h:82
+msgid "America/Costa_Rica"
+msgstr ""
+
+#: calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr ""
+
+#: calendar/zones.h:84
+msgid "America/Curacao"
+msgstr ""
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+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
+msgid "America/Dominica"
+msgstr ""
+
+#: calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr ""
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+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
+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
+msgid "America/Grenada"
+msgstr ""
+
+#: calendar/zones.h:100
+msgid "America/Guadeloupe"
+msgstr ""
+
+#: calendar/zones.h:101
+msgid "America/Guatemala"
+msgstr ""
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+msgid "America/Guyana"
+msgstr ""
+
+#: calendar/zones.h:104
+msgid "America/Halifax"
+msgstr ""
+
+#: calendar/zones.h:105
+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
+msgid "America/Jamaica"
+msgstr ""
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+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
+msgid "America/La_Paz"
+msgstr ""
+
+#: calendar/zones.h:120
+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
+msgid "America/Maceio"
+msgstr ""
+
+#: calendar/zones.h:124
+msgid "America/Managua"
+msgstr ""
+
+#: calendar/zones.h:125
+msgid "America/Manaus"
+msgstr ""
+
+#: calendar/zones.h:126
+msgid "America/Martinique"
+msgstr ""
+
+#: calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr ""
+
+#: calendar/zones.h:128
+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
+msgid "America/Montreal"
+msgstr ""
+
+#: calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr ""
+
+#: calendar/zones.h:137
+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
+msgid "America/Nome"
+msgstr ""
+
+#: calendar/zones.h:141
+msgid "America/Noronha"
+msgstr ""
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+msgid "America/Panama"
+msgstr ""
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+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
+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
+msgid "America/Regina"
+msgstr ""
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+msgid "America/Rosario"
+msgstr ""
+
+#: calendar/zones.h:157
+msgid "America/Santiago"
+msgstr ""
+
+#: calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr ""
+
+#: calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr ""
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr ""
+
+#: calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr ""
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr ""
+
+#: calendar/zones.h:165
+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
+msgid "America/Tijuana"
+msgstr ""
+
+#: calendar/zones.h:172
+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
+msgid "America/Yakutat"
+msgstr ""
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: calendar/zones.h:178
+msgid "Antarctica/Casey"
+msgstr ""
+
+#: calendar/zones.h:179
+msgid "Antarctica/Davis"
+msgstr ""
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: calendar/zones.h:181
+msgid "Antarctica/Mawson"
+msgstr ""
+
+#: calendar/zones.h:182
+msgid "Antarctica/McMurdo"
+msgstr ""
+
+#: calendar/zones.h:183
+msgid "Antarctica/Palmer"
+msgstr ""
+
+#: calendar/zones.h:184
+msgid "Antarctica/South_Pole"
+msgstr ""
+
+#: calendar/zones.h:185
+msgid "Antarctica/Syowa"
+msgstr ""
+
+#: calendar/zones.h:186
+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
+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
+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
+msgid "Asia/Hong_Kong"
+msgstr ""
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+#: calendar/zones.h:216
+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
+msgid "Asia/Kuwait"
+msgstr ""
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr ""
+
+#: calendar/zones.h:232
+msgid "Asia/Muscat"
+msgstr ""
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: calendar/zones.h:235
+msgid "Asia/Omsk"
+msgstr ""
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+msgid "Asia/Qatar"
+msgstr ""
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:247
+msgid "Asia/Singapore"
+msgstr ""
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+msgid "Atlantic/Bermuda"
+msgstr ""
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+msgid "Atlantic/Cape_Verde"
+msgstr ""
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+msgid "Australia/Adelaide"
+msgstr ""
+
+#: calendar/zones.h:274
+msgid "Australia/Brisbane"
+msgstr ""
+
+#: calendar/zones.h:275
+msgid "Australia/Broken_Hill"
+msgstr ""
+
+#: calendar/zones.h:276
+msgid "Australia/Darwin"
+msgstr ""
+
+#: calendar/zones.h:277
+msgid "Australia/Hobart"
+msgstr ""
+
+#: calendar/zones.h:278
+msgid "Australia/Lindeman"
+msgstr ""
+
+#: calendar/zones.h:279
+msgid "Australia/Lord_Howe"
+msgstr ""
+
+#: calendar/zones.h:280
+msgid "Australia/Melbourne"
+msgstr ""
+
+#: calendar/zones.h:281
+msgid "Australia/Perth"
+msgstr ""
+
+#: calendar/zones.h:282
+msgid "Australia/Sydney"
+msgstr ""
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:284
+msgid "Europe/Andorra"
+msgstr ""
+
+#: calendar/zones.h:285
+msgid "Europe/Athens"
+msgstr ""
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:296
+msgid "Europe/Gibraltar"
+msgstr ""
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:304
+msgid "Europe/Luxembourg"
+msgstr ""
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr ""
+
+#: calendar/zones.h:308
+msgid "Europe/Monaco"
+msgstr ""
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr ""
+
+#: calendar/zones.h:312
+msgid "Europe/Paris"
+msgstr ""
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:317
+msgid "Europe/San_Marino"
+msgstr ""
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "Comoros"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+msgid "Indian/Mahe"
+msgstr ""
+
+#: calendar/zones.h:341
+msgid "Indian/Maldives"
+msgstr ""
+
+#: calendar/zones.h:342
+msgid "Indian/Mauritius"
+msgstr ""
+
+#: calendar/zones.h:343
+msgid "Indian/Mayotte"
+msgstr ""
+
+#: calendar/zones.h:344
+msgid "Indian/Reunion"
+msgstr ""
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
+#: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:211
+#: 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
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:294
+#: camel/camel-cipher-context.c:292
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:336
+#: camel/camel-cipher-context.c:334
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
+#: camel/camel-data-cache.c:169
+msgid "Unable to create cache path"
+msgstr ""
+
+#: camel/camel-data-cache.c:441
+#, fuzzy, c-format
+msgid "Could not remove cache entry: %s: %s"
+msgstr "Could not close temporary folder: %s"
+
 #: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
@@ -5414,81 +7166,65 @@ msgstr ""
 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:710 camel/camel-filter-driver.c:719
 msgid "Syncing folders"
 msgstr "Synchronising folders"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr ""
+
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr ""
+
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Can not open message"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Synchronising folder"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr ""
-
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
+#: camel/camel-filter-search.c:126
+msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1040
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1080
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1262
-msgid "Moving messages"
-msgstr ""
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5497,24 +7233,39 @@ msgstr ""
 "Can not parse search expression: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1038
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1078
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1260
+msgid "Moving messages"
 msgstr ""
 
 #: camel/camel-lock-client.c:111
@@ -5622,114 +7373,119 @@ msgstr ""
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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:755
+#: 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:953
+#: 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:959
+#: 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:970
+#: 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:1143
+#: 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:1153
+#: 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:1160
+#: 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:1169
+#: 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:1337
+#: 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:1345
+#: 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:1352
+#: 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-provider.c:130
+#: camel/camel-pgp-mime.c:354
+msgid "This is a digitally signed message part"
+msgstr ""
+
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 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:270
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
+#: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -5827,12 +7583,12 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
+msgid "Login"
 msgstr ""
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
@@ -5843,9 +7599,19 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr ""
 
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+#: camel/camel-sasl-ntlm.c:33
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+
 #: 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
+#: 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 ""
 
@@ -5889,26 +7655,38 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:611
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:638
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:663
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:665
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
+#: camel/camel-service.c:725
+msgid "Resolving address"
+msgstr ""
+
+#: camel/camel-service.c:787
+msgid "Host lookup failed: host not found"
+msgstr ""
+
+#: camel/camel-service.c:790
+msgid "Host lookup failed: unknown reason"
+msgstr ""
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
@@ -5917,12 +7695,12 @@ msgstr ""
 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 ""
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5966,23 +7744,22 @@ msgstr ""
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Can not get folder: Invalid operation on this store"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Can not create folder: Invalid operation on this store"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
 msgstr ""
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:428
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5992,24 +7769,35 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: 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:491
+#, c-format
+msgid ""
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
 #, 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"
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
 msgstr ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organisational Unit: %s\n"
-"Organisation: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
 
 #: camel/camel-url.c:288
 #, c-format
@@ -6021,27 +7809,27 @@ msgstr ""
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr ""
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Can not delete folder: %s: Invalid operation"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Can not delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Can not rename folder: %s: Invalid operation"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Can not rename folder: %s: No such folder"
@@ -6050,76 +7838,76 @@ msgstr "Can not rename folder: %s: No such folder"
 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:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1566
-#: camel/providers/imap/camel-imap-folder.c:1978
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1717
-#: camel/providers/imap/camel-imap-folder.c:1798
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1723
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2015
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
@@ -6132,7 +7920,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: 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 ""
 
@@ -6164,28 +7952,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6193,101 +7981,120 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:76
+#: 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:82
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, 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 "Can not get folder: %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 ""
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: 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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: 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 "Could not close temporary folder: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -6307,7 +8114,7 @@ msgstr "Can not append message to maildir folder: %s: %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6319,7 +8126,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr ""
 
@@ -6328,7 +8135,7 @@ msgstr ""
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -6336,14 +8143,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -6351,41 +8158,62 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: 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:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: 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 "Can not open maildir directory path: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+msgid "Checking folder consistency"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-summary.c:629
+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
+msgid "Storing folder"
+msgstr "Synchronising folder"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Can not open mailbox: %s: %s\n"
@@ -6402,9 +8230,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6414,133 +8242,122 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#. 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 "Synchronising folder"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Synchronising folder failed: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: 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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
@@ -6559,12 +8376,12 @@ msgstr "Can not append message to mh folder: %s: %s"
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, 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:512
+#: 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"
@@ -6575,6 +8392,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
@@ -6584,75 +8402,54 @@ msgstr ""
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Spool folders can not be deleted"
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: 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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
+#: camel/providers/local/camel-spoold-store.c:117
 #, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
+msgid "Store `%s' does not exist or is not a directory"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/local/camel-spoold-store.c:173
 #, c-format
-msgid "Unable to save grouplist file for %s: %s"
+msgid "Mail tree %s"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
@@ -6663,161 +8460,193 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:495
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Synchronising folder failed: %s: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
 #, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
+msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
-msgid "Retrieving POP summary"
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
+#, c-format
+msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, c-format
-msgid "Could not check POP server for new messages: %s"
+msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
+#: camel/providers/nntp/camel-nntp-summary.c:566
+msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
-msgid "Expunging deleted messages"
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, c-format
+msgid "Operation failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, c-format
-msgid "Could not fetch message: %s"
+#: camel/providers/pop3/camel-pop3-folder.c:272
+msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
+#: 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/pop3/camel-pop3-folder.c:367
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:325
+msgid "Expunging deleted messages"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid "Message storage"
+#: 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 ""
+"Can not get message: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+msgid "Unknown reason"
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr ""
+
+#: 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:43
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: 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:84
 msgid "POP"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
+#: camel/providers/pop3/camel-pop3-store.c:210
+msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:214
-#, c-format
-msgid "Could not connect to server: %s"
+#: camel/providers/pop3/camel-pop3-store.c:251
+msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, 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
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:360
+#: camel/providers/pop3/camel-pop3-store.c:405
 #, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
+msgid "SASL `%s' Login failed: %s"
 msgstr ""
 
-#: 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:416
+msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:381
-#: camel/providers/pop3/camel-pop3-store.c:418
-msgid "(Unknown)"
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, c-format
+msgid "I/O Error: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, c-format
+msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:566
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr ""
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr ""
 
@@ -6827,49 +8656,49 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+msgid "Could not parse recipient list"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:204
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:248
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: 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 ""
 
@@ -6877,122 +8706,141 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: 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:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: 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:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr ""
 
-#: 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:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: 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: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:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: 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: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: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: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: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:205
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: 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:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr ""
 
-#: 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:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: 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:219
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:376
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:336
+msgid "server does not appear to support SSL"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+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:415
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7000,127 +8848,126 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+#, 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
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: 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:1081
+msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
+#. 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
+msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1030
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+msgid "QUIT response error"
 msgstr ""
 
 #: composer/e-msg-composer-attachment-bar.c:101
@@ -7148,19 +8995,19 @@ msgid "%.1fG"
 msgstr ""
 
 #. 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: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:531
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -7188,189 +9035,180 @@ msgid "MIME type:"
 msgstr ""
 
 #: 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:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr ""
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:402
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 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:228
+#: 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:696
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:894
-msgid "Save as..."
-msgstr ""
-
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1019
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1077
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1091
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1100
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1202
+#: composer/e-msg-composer.c:1176
 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:1356
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1363
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1535
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1910 composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2368
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2391 composer/e-msg-composer.c:2446
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Cannot initialise Evolution's composer."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:83
-msgid "Evolution"
+#: data/evolution.desktop.in.h:1
+msgid "The Evolution groupware suite"
 msgstr ""
 
 #: data/evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr ""
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Can not initialise the Ximian Evolution shell."
 
 #: data/evolution.keys.in.h:1
 msgid "address card"
@@ -7412,15 +9250,30 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
 #. Remember the password?
-#: e-util/e-passwords.c:347 mail/mail-session.c:267
+#: 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:268
+#: 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 ""
+
+#: e-util/e-pilot-settings.c:105
+msgid "Sync Categories:"
+msgstr ""
+
 #. 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
@@ -7492,13 +9345,13 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
@@ -7539,11 +9392,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:191
 msgid "seconds"
 msgstr ""
 
@@ -7610,7 +9459,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr ""
 
@@ -7623,33 +9472,25 @@ msgid "Filter Rules"
 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
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:364
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:267
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:314
-msgid "<click here to select a folder>"
-msgstr ""
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -7657,7 +9498,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr ""
 
@@ -7665,39 +9506,39 @@ msgstr ""
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+msgid "if any criterion are met"
 msgstr ""
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr ""
 
@@ -7741,6 +9582,11 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr ""
@@ -7753,6 +9599,10 @@ msgstr ""
 msgid "Attachments"
 msgstr ""
 
+#: filter/libfilter-i18n.h:6
+msgid "Beep"
+msgstr ""
+
 #: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr ""
@@ -7806,144 +9656,149 @@ msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Exist"
+msgid "Execute Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "exists"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Expression"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Important"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:25
-msgid "is"
+msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
+msgid "Important"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "is less than"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "is not"
+msgid "is after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "Mailing list"
+msgid "is before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "Message Body"
+msgid "is Flagged"
 msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "Message Header"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Message was received"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "Message was sent"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "Move to Folder"
+msgid "is not Flagged"
 msgstr ""
 
 #: filter/libfilter-i18n.h:35
-msgid "on or after"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "on or before"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "Read"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Recipients"
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
+msgid "Play Sound"
+msgstr ""
+
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+msgid "Read"
+msgstr ""
+
+#: filter/libfilter-i18n.h:41
+msgid "Recipients"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr ""
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1404
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 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 ""
 
@@ -7963,30 +9818,30 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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:101
 msgid "Mail"
 msgstr ""
 
@@ -8010,23 +9865,73 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, c-format
+msgid "Priority Filter \"%s\""
+msgstr ""
+
+#: 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 ""
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr ""
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Synchronising folders"
+
+#: 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:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+msgid "Mail Filters"
+msgstr ""
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8047,43 +9952,89 @@ msgid "Pine"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
+msgid "Composer Preferences"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: 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 ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr ""
 
-#: 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
+msgid "Font Preferences"
+msgstr ""
+
+#: 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:70
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
+#: 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:101
-msgid "Mail storage folder (internal)"
+msgid "Folder containing mail"
 msgstr ""
 
 #: mail/component-factory.c:102
@@ -8094,226 +10045,239 @@ msgstr ""
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr ""
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:951
-msgid "New _Mail Message"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Cannot initialise Evolution's mail config component."
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Cannot initialise Evolution's folder info component."
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+msgid "Connecting..."
+msgstr ""
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:271
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1049
-msgid "Create vFolder from Search"
+#: mail/folder-browser.c:1088
+msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:104
-msgid "_Save As..."
-msgstr ""
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+msgid "Fla_g Completed"
+msgstr ""
+
+#: mail/folder-browser.c:1624
+msgid "Cl_ear Flag"
+msgstr ""
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1467
-msgid "_Copy to Folder..."
+#: mail/folder-browser.c:1640
+msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:106
-msgid "_Undelete"
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1473
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1645
+msgid "Label"
 msgstr ""
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1649
+msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/folder-browser.c:1478
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1653
+msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1657
+msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1938
 #, c-format
-msgid "Filter on Mailing List (%s)"
+msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1632
+#: mail/folder-browser.c:1939
 #, c-format
-msgid "VFolder on Mailing List (%s)"
-msgstr ""
-
-#: mail/folder-browser.h:26
-msgid "Default"
+msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
 #: mail/folder-info.c:64
@@ -8337,41 +10301,33 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
+msgid "Current store format:"
 msgstr ""
 
 #: mail/local-config.glade.h:2
-msgid "Current store format:"
+msgid "Index body contents"
 msgstr ""
 
 #: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr ""
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr ""
-
-#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr ""
 
-#: 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"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: 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:8
 msgid "mbox"
 msgstr ""
 
-#: mail/local-config.glade.h:11
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr ""
 
@@ -8389,83 +10345,75 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:962
-msgid "Could not save signature file."
-msgstr ""
-
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
 msgstr ""
 
-#: 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?"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1654
-msgid "You may not create two accounts with the same name."
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
 msgstr ""
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
+#: 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-accounts.c:194
-msgid "Disable"
+#: 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-accounts.c:196
-msgid "Enable"
+#: mail/mail-account-gui.c:1985
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-msgid "Are you sure you want to delete this news account?"
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
 msgstr ""
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:783 mail/mail-config.glade.h:42
-msgid "Mail Settings"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
 msgstr ""
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
-#: mail/mail-autofilter.c:215
-#, c-format
-msgid "Subject is %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
 msgstr ""
 
-#: mail/mail-autofilter.c:231
-#, c-format
-msgid "Mail from %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+msgid "Account name"
 msgstr ""
 
-#: mail/mail-autofilter.c:287
-#, c-format
-msgid "%s mailing list"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8473,123 +10421,131 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: 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:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:280
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 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:299
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 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:469
-msgid "This message contains invalid recipients:"
-msgstr ""
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:600
+#: mail/mail-callbacks.c:497
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:838
+#: mail/mail-callbacks.c:623
+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
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 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:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1753
+#: mail/mail-callbacks.c:2091
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1778
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1831
+#: mail/mail-callbacks.c:2169
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1857
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1951
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2122 widgets/misc/e-messagebox.c:159
-msgid "Warning"
+#: mail/mail-callbacks.c:2366
+msgid "Go to next folder with unread messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2129
+#: mail/mail-callbacks.c:2373
+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
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8597,30 +10553,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2136
-msgid "Do not ask me again."
-msgstr ""
-
-#: mail/mail-callbacks.c:2244
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2256
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2319
+#: mail/mail-callbacks.c:2783
+#, c-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2863
+msgid "US-Letter"
+msgstr ""
+
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8662,16 +10623,31 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:326
-#, c-format
-msgid "Account %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+msgid "Work"
+msgstr ""
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+msgid "To Do"
 msgstr ""
 
-#: mail/mail-config.c:1859
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+msgid "Later"
+msgstr ""
+
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -8679,87 +10655,140 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, c-format
-msgid "%s: Inbox"
-msgstr ""
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2183 mail/mail-config.c:2187
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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 " _Check for supported types "
+msgid " "
 msgstr ""
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr "Colours"
+msgid " Edit "
+msgstr ""
 
 #: mail/mail-config.glade.h:3
-msgid "(SSL is not supported in this build of evolution)"
+msgid " New "
 msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid "A_lways encrypt to myself when sending encrypted mail"
+msgid " _Check for supported types "
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "Account"
+msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
-msgid "Account Information"
+msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
+#: mail/mail-config.glade.h:7
+msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-msgid "Accounts"
+msgid "Account Editor"
 msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
-msgid "Attachment"
+#: mail/mail-config.glade.h:11
+msgid "Advanced Options"
 msgstr ""
 
 #: mail/mail-config.glade.h:12
-msgid "Authentication"
+msgid "Afrikaans"
 msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Checking for New Mail"
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Composer"
+msgid "Alerts"
 msgstr ""
 
 #: mail/mail-config.glade.h:15
-msgid "Configuration"
+msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
-msgid "Confirm when Expunging a folder"
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+msgid "Attach original message"
+msgstr ""
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr ""
+
+#: mail/mail-config.glade.h:22
+msgid "Authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:23
+msgid "Automatically _detect links"
+msgstr ""
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+msgid "C_haracter set:"
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "C_lose"
+
+#: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Composing Messages"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
+msgid "Configuration"
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8769,353 +10798,521 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:37
+msgid "Dari"
+msgstr ""
+
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
-msgid "Default Forward style is: "
+#: mail/mail-config.glade.h:39
+msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Digital IDs..."
+#: mail/mail-config.glade.h:41
+msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
+#: mail/mail-config.glade.h:43
+msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:44
+#, 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
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-msgid "Drafts"
+#: mail/mail-config.glade.h:46
+msgid "Drafts _folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
+#: mail/mail-config.glade.h:49
+msgid "Emacs"
+msgstr ""
+
+#: mail/mail-config.glade.h:50
+msgid "Email Accounts"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+msgid "Email _address:"
+msgstr ""
+
+#: mail/mail-config.glade.h:52
+msgid "Empty _trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:53
+msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:54
+msgid "Fi_xed -width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:55
+msgid "Font Properties"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Format messages in _HTML"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
-msgid "HTML signature file:"
+#: mail/mail-config.glade.h:58
+msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
-msgid "IMAPv4 "
+#: mail/mail-config.glade.h:59
+msgid "Hulu"
 msgstr ""
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
+#: mail/mail-config.glade.h:60
+msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
+msgid "Identity"
 msgstr ""
 
-#: 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 ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "Labels and Colors"
+msgstr ""
+
+#: mail/mail-config.glade.h:67
+msgid "Loading Images"
+msgstr ""
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
+#: mail/mail-config.glade.h:72
+msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:73
+msgid "Message Display"
+msgstr ""
+
+#: mail/mail-config.glade.h:74
+msgid "Microsoft"
+msgstr ""
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
-msgid "News"
+#: mail/mail-config.glade.h:77
+msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:78
+msgid "News Servers"
+msgstr ""
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organi_sation:"
+
+#: mail/mail-config.glade.h:83
+msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:54
-msgid "Pretty Good Privacy"
+#: mail/mail-config.glade.h:88
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
-
-#: mail/mail-config.glade.h:56
-msgid "Prompt when sending messages with an _empty subject"
+#: mail/mail-config.glade.h:89
+msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
-msgid "Prompt when sending messages with only _Bcc recipients defined"
+#: mail/mail-config.glade.h:90
+msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Can not open message"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+msgid "Re_ply-To:"
+msgstr ""
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
+#: mail/mail-config.glade.h:99
+msgid "Receiving _Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:100
+msgid "Remember this _password"
 msgstr ""
 
-#: 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"
+#: mail/mail-config.glade.h:103
+msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
-msgid "Security"
+#: mail/mail-config.glade.h:104
+msgid "Same as text"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
+#: mail/mail-config.glade.h:105
+msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:110
+msgid "Select PGP program"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+msgid "Select a signature file"
+msgstr ""
+
+#: mail/mail-config.glade.h:112
+msgid "Select a signature script"
+msgstr ""
+
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr ""
+
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
+#: mail/mail-config.glade.h:120
+msgid "Shortcuts _type:"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+msgid "Signature"
+msgstr ""
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
+#: mail/mail-config.glade.h:124
+msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
-msgid "Use s_ecure connection (SSL)"
+#: mail/mail-config.glade.h:128
+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:87
+#: mail/mail-config.glade.h:130
+msgid "Use _HTML for this signature"
+msgstr ""
+
+#: mail/mail-config.glade.h:132
+msgid "V_ariable-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: 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:92
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+msgid "_Authentication type: "
+msgstr ""
+
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
-msgid "_Drafts folder:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
 msgstr ""
 
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
+#: mail/mail-config.glade.h:148
+msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
+#: mail/mail-config.glade.h:149
+msgid "_Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:151
+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:102
+#: mail/mail-config.glade.h:154
+msgid "_Filename:"
+msgstr ""
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+msgid "_Forward style:"
+msgstr ""
+
+#: mail/mail-config.glade.h:157
+msgid "_Full name:"
+msgstr ""
+
+#: mail/mail-config.glade.h:159
+msgid "_HTML Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:160
 msgid "_HTML Signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
-msgid "_Highlight citations with"
+#: mail/mail-config.glade.h:162
+msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
+#: mail/mail-config.glade.h:163
+msgid "_Language:"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
+#: mail/mail-config.glade.h:165
+msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
-msgid "_Organization:"
-msgstr "_Organisation:"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
+#: mail/mail-config.glade.h:172
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
-msgid "_Send mail in HTML format by default."
+#: mail/mail-config.glade.h:173
+msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
-msgid "_Server Type: "
+#: mail/mail-config.glade.h:174
+msgid "_Random"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:175
+msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
+#: mail/mail-config.glade.h:176
+msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
-msgid "_every"
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
-msgid "description"
+#: mail/mail-config.glade.h:178
+msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
-msgid "newswindow1"
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
+#: mail/mail-config.glade.h:180
+msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
-msgid "seconds."
+#: mail/mail-config.glade.h:181
+msgid "_Show animated images"
+msgstr ""
+
+#: mail/mail-config.glade.h:182
+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
+msgid "_Variable-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:186
+msgid "_every"
+msgstr ""
+
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr "Colours"
+
+#: mail/mail-config.glade.h:188
+msgid "description"
+msgstr ""
+
+#: mail/mail-config.glade.h:190
+msgid "newswindow1"
 msgstr ""
 
 #: mail/mail-crypto.c:59
@@ -9154,182 +11351,173 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1594
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr ""
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:1813
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-
-#: mail/mail-format.c:1836
-#, fuzzy
-msgid "Evolution does not recognize this type of signed message."
-msgstr "I do not recognise this type of calendar component."
-
-#: mail/mail-format.c:1844
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1852
-msgid "This message is digitally signed but can not be proven to be authentic."
+#: mail/mail-format.c:915
+msgid "Mailer"
 msgstr ""
 
-#: mail/mail-format.c:2068
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2087
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2129
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, 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:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Synchronising \"%s\""
@@ -9352,157 +11540,157 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr ""
 
-#: 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:557
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:677
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:696
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: 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:791
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr ""
-
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr ""
 
@@ -9542,64 +11730,84 @@ msgstr ""
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:246
 #, 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 ""
 
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:286
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr ""
 
-#: mail/mail-send-recv.c:348
+#: 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:350 mail/mail-send-recv.c:403
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:533
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-tools.c:255
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr ""
+
+#: mail/mail-signature-editor.c:178
+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:"
+msgstr ""
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr ""
 
@@ -9622,104 +11830,156 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
+#: mail/mail-vfolder.c:785
+msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:825
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:841
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:895
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr ""
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr ""
 
-#: mail/message-list.c:639
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:640
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:641
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:642
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:643
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:647
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:648
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:652
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:653
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:903
+#: mail/message-list.c:991
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:910
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:931
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:941
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr ""
 
-#: mail/message-list.etspec.h:2
-msgid "Flagged"
+#: mail/message-list.etspec.h:3
+msgid "Due By"
 msgstr ""
 
 #: mail/message-list.etspec.h:4
+msgid "Flag Status"
+msgstr ""
+
+#: mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr ""
 
+#: mail/message-tag-followup.c:57
+msgid "Call"
+msgstr ""
+
+#: mail/message-tag-followup.c:58
+msgid "Do Not Forward"
+msgstr ""
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+msgid "For Your Information"
+msgstr ""
+
+#: 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-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr ""
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr ""
+
+#: mail/message-tag-followup.c:66
+msgid "Review"
+msgstr ""
+
+#: 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\""
@@ -9741,7 +12001,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #: 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 ""
 
@@ -9786,86 +12046,9947 @@ msgid "_Unsubscribe"
 msgstr ""
 
 #: 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/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/component-factory.c:153
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
 #, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
+msgid "Factory for the Evolution Summary component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+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 ""
+
+#: my-evolution/Locations.h:1
+msgid "Aarhus"
+msgstr ""
+
+#: my-evolution/Locations.h:2
+msgid "Abakan"
+msgstr ""
+
+#: my-evolution/Locations.h:3
+msgid "Abbotsford"
+msgstr ""
+
+#: my-evolution/Locations.h:4
+msgid "Aberdeen"
+msgstr ""
+
+#: my-evolution/Locations.h:5
+msgid "Abha"
+msgstr ""
+
+#: my-evolution/Locations.h:6
+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
+msgid "Acarigua"
+msgstr ""
+
+#: my-evolution/Locations.h:13
+msgid "Adak"
+msgstr ""
+
+#: my-evolution/Locations.h:14
+msgid "Adana"
+msgstr ""
+
+#: my-evolution/Locations.h:15
+msgid "Adana/Incirlik"
+msgstr ""
+
+#: my-evolution/Locations.h:16
+msgid "Adelaide"
+msgstr ""
+
+#: my-evolution/Locations.h:17
+msgid "Aden"
+msgstr ""
+
+#: my-evolution/Locations.h:18
+msgid "Adrar"
+msgstr ""
+
+#: my-evolution/Locations.h:19
+msgid "Aeroparque"
+msgstr ""
+
+#: my-evolution/Locations.h:20
+msgid "Aeropuerto del Norte"
+msgstr ""
+
+#: my-evolution/Locations.h:21
+msgid "Afonsos"
+msgstr ""
+
+#: my-evolution/Locations.h:22
+msgid "Africa"
+msgstr ""
+
+#: my-evolution/Locations.h:23
+msgid "Afyon"
+msgstr ""
+
+#: my-evolution/Locations.h:24
+msgid "Agen"
+msgstr ""
+
+#: my-evolution/Locations.h:25
+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
+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 ""
+
+#: my-evolution/Locations.h:39
+msgid "Alamosa"
+msgstr ""
+
+#: my-evolution/Locations.h:40
+msgid "Alaska"
+msgstr ""
+
+#: my-evolution/Locations.h:41
+msgid "Al Baha"
+msgstr ""
+
+#: my-evolution/Locations.h:43
+msgid "Albany"
+msgstr ""
+
+#: my-evolution/Locations.h:44
+msgid "Albenga"
+msgstr ""
+
+#: my-evolution/Locations.h:45
+msgid "Alberta"
+msgstr ""
+
+#: my-evolution/Locations.h:46
+msgid "Alborg"
+msgstr ""
+
+#: my-evolution/Locations.h:47
+msgid "Albuquerque"
+msgstr ""
+
+#: my-evolution/Locations.h:48
+msgid "Alderney"
+msgstr ""
+
+#: my-evolution/Locations.h:49
+msgid "Alesund"
+msgstr ""
+
+#: my-evolution/Locations.h:50
+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
+msgid "Alghero"
+msgstr ""
+
+#: my-evolution/Locations.h:56
+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 ""
+
+#: my-evolution/Locations.h:62
+msgid "Alliance"
+msgstr ""
+
+#: my-evolution/Locations.h:63
+msgid "Alma"
+msgstr ""
+
+#: my-evolution/Locations.h:64
+msgid "Almeria"
+msgstr ""
+
+#: my-evolution/Locations.h:65
+msgid "Alpena"
+msgstr ""
+
+#: my-evolution/Locations.h:66
+msgid "Al Qaysumah"
+msgstr ""
+
+#: my-evolution/Locations.h:67
+msgid "Alta"
+msgstr ""
+
+#: my-evolution/Locations.h:68
+msgid "Altamira"
+msgstr ""
+
+#: my-evolution/Locations.h:69
+msgid "Alton"
+msgstr ""
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr ""
+
+#: my-evolution/Locations.h:71
+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 ""
+
+#: my-evolution/Locations.h:75
+msgid "Amarillo"
+msgstr ""
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr ""
+
+#: my-evolution/Locations.h:77
+msgid "Ambler"
+msgstr ""
+
+#: my-evolution/Locations.h:78
+msgid "Amelia"
+msgstr ""
+
+#: my-evolution/Locations.h:79
+msgid "Amendola"
+msgstr ""
+
+#: my-evolution/Locations.h:80
+msgid "Ames"
+msgstr ""
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr ""
+
+#: my-evolution/Locations.h:82
+msgid "Amsterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:83
+msgid "Anadyr"
+msgstr ""
+
+#: my-evolution/Locations.h:84
+msgid "Anaktuvuk"
+msgstr ""
+
+#: my-evolution/Locations.h:85
+msgid "Anapa"
+msgstr ""
+
+#: my-evolution/Locations.h:86
+msgid "Anchorage"
+msgstr ""
+
+#: my-evolution/Locations.h:87
+msgid "Anchorage - Elmendorf AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:88
+msgid "Ancona"
+msgstr ""
+
+#: my-evolution/Locations.h:89
+msgid "Andahuayla"
+msgstr ""
+
+#: my-evolution/Locations.h:90
+msgid "Anderson"
+msgstr ""
+
+#: my-evolution/Locations.h:91
+msgid "Andoya"
+msgstr ""
+
+#: my-evolution/Locations.h:92
+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
+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 ""
+
+#: my-evolution/Locations.h:101
+msgid "Anniston"
+msgstr ""
+
+#: my-evolution/Locations.h:102
+msgid "Antalya"
+msgstr ""
+
+#: my-evolution/Locations.h:103
+msgid "Antartica"
+msgstr ""
+
+#: my-evolution/Locations.h:104
+msgid "Antigo"
+msgstr ""
+
+#: my-evolution/Locations.h:105
+msgid "Antigua"
+msgstr ""
+
+#: my-evolution/Locations.h:106
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: my-evolution/Locations.h:107
+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
+msgid "Apalachicola"
+msgstr ""
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr ""
+
+#: my-evolution/Locations.h:112
+msgid "Aquadilla"
+msgstr ""
+
+#: my-evolution/Locations.h:113
+msgid "Aracaju"
+msgstr ""
+
+#: my-evolution/Locations.h:114
+msgid "Arad"
+msgstr ""
+
+#: my-evolution/Locations.h:115
+msgid "Arar"
+msgstr ""
+
+#: my-evolution/Locations.h:116
+msgid "Araxos"
+msgstr ""
+
+#: my-evolution/Locations.h:117
+msgid "Arcata"
+msgstr ""
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr ""
+
+#: my-evolution/Locations.h:119
+msgid "Arequipa"
+msgstr ""
+
+#: my-evolution/Locations.h:121
+msgid "Arica"
+msgstr ""
+
+#: my-evolution/Locations.h:122
+msgid "Arizona"
+msgstr ""
+
+#: my-evolution/Locations.h:123
+msgid "Arkansas"
+msgstr ""
+
+#: my-evolution/Locations.h:124
+msgid "Arkhangelsk"
+msgstr ""
+
+#: my-evolution/Locations.h:125
+msgid "Arlington"
+msgstr ""
+
+#: my-evolution/Locations.h:126
+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 ""
+
+#: my-evolution/Locations.h:131
+msgid "Ashfield"
+msgstr ""
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:133
+msgid "Ashland"
+msgstr ""
+
+#: my-evolution/Locations.h:134
+msgid "Asia"
+msgstr ""
+
+#: my-evolution/Locations.h:135
+msgid "Aspen"
+msgstr ""
+
+#: my-evolution/Locations.h:136
+msgid "Asswan"
+msgstr ""
+
+#: my-evolution/Locations.h:137
+msgid "Astoria"
+msgstr ""
+
+#: my-evolution/Locations.h:138
+msgid "Astrakhan"
+msgstr ""
+
+#: my-evolution/Locations.h:139
+msgid "Asturias"
+msgstr ""
+
+#: my-evolution/Locations.h:140
+msgid "Asuncion"
+msgstr ""
+
+#: my-evolution/Locations.h:141
+msgid "Athens"
+msgstr ""
+
+#: my-evolution/Locations.h:142
+msgid "Athinai"
+msgstr ""
+
+#: my-evolution/Locations.h:143
+msgid "Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:144
+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
+msgid "Auckland"
+msgstr ""
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:150
+msgid "Augusta"
+msgstr ""
+
+#: my-evolution/Locations.h:151
+msgid "Aurora"
+msgstr ""
+
+#: my-evolution/Locations.h:152
+msgid "Austin"
+msgstr ""
+
+#: my-evolution/Locations.h:153
+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 ""
+
+#: my-evolution/Locations.h:159
+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 ""
+
+#: my-evolution/Locations.h:170
+msgid "Ball Mountain"
+msgstr ""
+
+#: my-evolution/Locations.h:171
+msgid "Baltimore"
+msgstr ""
+
+#: my-evolution/Locations.h:172
+msgid "Baltimore-Glen Burnie"
+msgstr ""
+
+#: my-evolution/Locations.h:173
+msgid "Banak"
+msgstr ""
+
+#: my-evolution/Locations.h:174
+msgid "Bandarabbass"
+msgstr ""
+
+#: my-evolution/Locations.h:175
+msgid "Bangor"
+msgstr ""
+
+#: my-evolution/Locations.h:176
+msgid "Baracoa"
+msgstr ""
+
+#: my-evolution/Locations.h:177
+msgid "Barbers Point"
+msgstr ""
+
+#: my-evolution/Locations.h:178
+msgid "Barcelona"
+msgstr ""
+
+#: my-evolution/Locations.h:179
+msgid "Bardufoss"
+msgstr ""
+
+#: my-evolution/Locations.h:180
+msgid "Bar Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:181
+msgid "Bari"
+msgstr ""
+
+#: my-evolution/Locations.h:182
+msgid "Bariloche"
+msgstr ""
+
+#: my-evolution/Locations.h:183
+msgid "Barinas"
+msgstr ""
+
+#: my-evolution/Locations.h:184
+msgid "Barking Sand"
+msgstr ""
+
+#: my-evolution/Locations.h:185
+msgid "Barksdale"
+msgstr ""
+
+#: my-evolution/Locations.h:186
+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
+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
+msgid "Bastia"
+msgstr ""
+
+#: my-evolution/Locations.h:194
+msgid "Batesville"
+msgstr ""
+
+#: my-evolution/Locations.h:195
+msgid "Batman"
+msgstr ""
+
+#: my-evolution/Locations.h:196
+msgid "Baton Rouge"
+msgstr ""
+
+#: my-evolution/Locations.h:197
+msgid "Battle Creek"
+msgstr ""
+
+#: my-evolution/Locations.h:198
+msgid "Battle Mountain"
+msgstr ""
+
+#: my-evolution/Locations.h:199
+msgid "Bauru"
+msgstr ""
+
+#: my-evolution/Locations.h:200
+msgid "Bayamo"
+msgstr ""
+
+#: my-evolution/Locations.h:201
+msgid "Bayreuth"
+msgstr ""
+
+#: my-evolution/Locations.h:202
+msgid "Beatrice"
+msgstr ""
+
+#: my-evolution/Locations.h:203
+msgid "Beaufort"
+msgstr ""
+
+#: my-evolution/Locations.h:204
+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
+msgid "Beauvechain"
+msgstr ""
+
+#: my-evolution/Locations.h:208
+msgid "Beckley"
+msgstr ""
+
+#: my-evolution/Locations.h:209
+msgid "Bedford"
+msgstr ""
+
+#: my-evolution/Locations.h:210
+msgid "Beijing"
+msgstr ""
+
+#: my-evolution/Locations.h:211
+msgid "Beirut"
+msgstr ""
+
+#: my-evolution/Locations.h:212
+msgid "Beja"
+msgstr ""
+
+#: my-evolution/Locations.h:213
+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 ""
+
+#: my-evolution/Locations.h:219
+msgid "Belleville"
+msgstr ""
+
+#: my-evolution/Locations.h:220
+msgid "Bellingham"
+msgstr ""
+
+#: my-evolution/Locations.h:221
+msgid "Belmar-Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:222
+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
+msgid "Benbecula"
+msgstr ""
+
+#: my-evolution/Locations.h:226
+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
+msgid "Beograd"
+msgstr ""
+
+#: my-evolution/Locations.h:230
+msgid "Bergamo"
+msgstr ""
+
+#: my-evolution/Locations.h:231
+msgid "Bergen"
+msgstr ""
+
+#: my-evolution/Locations.h:232
+msgid "Bergstrom AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:233
+msgid "Berlevag"
+msgstr ""
+
+#: my-evolution/Locations.h:234
+msgid "Berlin"
+msgstr ""
+
+#: my-evolution/Locations.h:235
+msgid "Berlin-Tegel"
+msgstr ""
+
+#: my-evolution/Locations.h:236
+msgid "Berlin-Tempelhof"
+msgstr ""
+
+#: my-evolution/Locations.h:237
+msgid "Bern"
+msgstr ""
+
+#: my-evolution/Locations.h:238
+msgid "Bethel"
+msgstr ""
+
+#: my-evolution/Locations.h:239
+msgid "Bethlehem Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:240
+msgid "Bettles"
+msgstr ""
+
+#: my-evolution/Locations.h:241
+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 ""
+
+#: my-evolution/Locations.h:245
+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
+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 ""
+
+#: my-evolution/Locations.h:257
+msgid "Blanding"
+msgstr ""
+
+#: my-evolution/Locations.h:258
+msgid "Block Island"
+msgstr ""
+
+#: my-evolution/Locations.h:259
+msgid "Bloemfontein J. B. M. Hertzog "
+msgstr ""
+
+#: my-evolution/Locations.h:260
+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 ""
+
+#: my-evolution/Locations.h:267
+msgid "Bodo"
+msgstr ""
+
+#: my-evolution/Locations.h:268
+msgid "Bogota/Eldorado"
+msgstr ""
+
+#: my-evolution/Locations.h:269
+msgid "Boise"
+msgstr ""
+
+#: my-evolution/Locations.h:271
+msgid "Bologna"
+msgstr ""
+
+#: my-evolution/Locations.h:272
+msgid "Bolzano"
+msgstr ""
+
+#: my-evolution/Locations.h:273
+msgid "Bombay/Santacruz"
+msgstr ""
+
+#: my-evolution/Locations.h:274
+msgid "Boone"
+msgstr ""
+
+#: my-evolution/Locations.h:275
+msgid "Bordeaux"
+msgstr ""
+
+#: my-evolution/Locations.h:276
+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
+msgid "Bosnia-Herzegovina"
+msgstr ""
+
+#: my-evolution/Locations.h:280
+msgid "Boston"
+msgstr ""
+
+#: my-evolution/Locations.h:281
+msgid "Boulmer"
+msgstr ""
+
+#: my-evolution/Locations.h:282
+msgid "Bourges"
+msgstr ""
+
+#: my-evolution/Locations.h:283
+msgid "Bournemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:284
+msgid "Bowling Green"
+msgstr ""
+
+#: my-evolution/Locations.h:285
+msgid "Bozeman"
+msgstr ""
+
+#: my-evolution/Locations.h:286
+msgid "Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:287
+msgid "Bradshaw Field"
+msgstr ""
+
+#: my-evolution/Locations.h:288
+msgid "Brainerd"
+msgstr ""
+
+#: my-evolution/Locations.h:289
+msgid "Brasilia"
+msgstr ""
+
+#: my-evolution/Locations.h:290
+msgid "Brasschaat"
+msgstr ""
+
+#: my-evolution/Locations.h:291
+msgid "Bratislava"
+msgstr ""
+
+#: my-evolution/Locations.h:292
+msgid "Bratsk"
+msgstr ""
+
+#: my-evolution/Locations.h:293
+msgid "Braunschweig"
+msgstr ""
+
+#: my-evolution/Locations.h:295
+msgid "Bremen"
+msgstr ""
+
+#: my-evolution/Locations.h:296
+msgid "Bremerton"
+msgstr ""
+
+#: my-evolution/Locations.h:297
+msgid "Brest"
+msgstr ""
+
+#: my-evolution/Locations.h:298
+msgid "Bridgeport"
+msgstr ""
+
+#: my-evolution/Locations.h:299
+msgid "Brindisi"
+msgstr ""
+
+#: my-evolution/Locations.h:300
+msgid "Brisbane"
+msgstr ""
+
+#: my-evolution/Locations.h:301
+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
+msgid "Broadus"
+msgstr ""
+
+#: my-evolution/Locations.h:305
+msgid "Broken Bow"
+msgstr ""
+
+#: my-evolution/Locations.h:306
+msgid "Bronnoysund"
+msgstr ""
+
+#: my-evolution/Locations.h:307
+msgid "Brookings"
+msgstr ""
+
+#: my-evolution/Locations.h:308
+msgid "Brooksville"
+msgstr ""
+
+#: my-evolution/Locations.h:309
+msgid "Broome"
+msgstr ""
+
+#: my-evolution/Locations.h:310
+msgid "Brownsville"
+msgstr ""
+
+#: my-evolution/Locations.h:311
+msgid "Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:312
+msgid "Brussels-National Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:313
+msgid "Bryansk"
+msgstr ""
+
+#: my-evolution/Locations.h:314
+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
+msgid "Burbank"
+msgstr ""
+
+#: my-evolution/Locations.h:323
+msgid "Burgas"
+msgstr ""
+
+#: my-evolution/Locations.h:324
+msgid "Burley"
+msgstr ""
+
+#: my-evolution/Locations.h:325
+msgid "Burlington"
+msgstr ""
+
+#: my-evolution/Locations.h:326
+msgid "Burnet"
+msgstr ""
+
+#: my-evolution/Locations.h:327
+msgid "Burns"
+msgstr ""
+
+#: my-evolution/Locations.h:328
+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 ""
+
+#: my-evolution/Locations.h:332
+msgid "Cagliari"
+msgstr ""
+
+#: my-evolution/Locations.h:333
+msgid "Cairns"
+msgstr ""
+
+#: my-evolution/Locations.h:334
+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 ""
+
+#: my-evolution/Locations.h:338
+msgid "Calgary"
+msgstr ""
+
+#: my-evolution/Locations.h:339
+msgid "Cali/Alfonso Bonillaaragon"
+msgstr ""
+
+#: my-evolution/Locations.h:340
+msgid "Caliente"
+msgstr ""
+
+#: my-evolution/Locations.h:341
+msgid "California"
+msgstr ""
+
+#: my-evolution/Locations.h:342
+msgid "Calvi-Ste-Catherine"
+msgstr ""
+
+#: my-evolution/Locations.h:343
+msgid "Camaguey"
+msgstr ""
+
+#: my-evolution/Locations.h:344
+msgid "Camarillo"
+msgstr ""
+
+#: my-evolution/Locations.h:345
+msgid "Cambridge"
+msgstr ""
+
+#: my-evolution/Locations.h:346
+msgid "Cameron"
+msgstr ""
+
+#: my-evolution/Locations.h:347
+msgid "Camiri"
+msgstr ""
+
+#: my-evolution/Locations.h:348
+msgid "Campeche"
+msgstr ""
+
+#: my-evolution/Locations.h:349
+msgid "Campinas"
+msgstr ""
+
+#: my-evolution/Locations.h:350
+msgid "Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:351
+msgid "Campo Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr ""
+
+#: my-evolution/Locations.h:353
+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 ""
+
+#: my-evolution/Locations.h:363
+msgid "Cancun"
+msgstr ""
+
+#: my-evolution/Locations.h:364
+msgid "Cannes-Mandelieu"
+msgstr ""
+
+#: my-evolution/Locations.h:365
+msgid "Cantwell"
+msgstr ""
+
+#: my-evolution/Locations.h:366
+msgid "Cape Girardeau"
+msgstr ""
+
+#: my-evolution/Locations.h:367
+msgid "Cape Hatteras"
+msgstr ""
+
+#: my-evolution/Locations.h:368
+msgid "Cape Lisburne"
+msgstr ""
+
+#: my-evolution/Locations.h:369
+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
+msgid "Capo Mele"
+msgstr ""
+
+#: my-evolution/Locations.h:374
+msgid "Caracas La Carlota"
+msgstr ""
+
+#: my-evolution/Locations.h:375
+msgid "Caracas Maiquetia"
+msgstr ""
+
+#: my-evolution/Locations.h:376
+msgid "Caravelas"
+msgstr ""
+
+#: my-evolution/Locations.h:377
+msgid "Carbondale"
+msgstr ""
+
+#: my-evolution/Locations.h:378
+msgid "Cardiff"
+msgstr ""
+
+#: my-evolution/Locations.h:379
+msgid "Caribou"
+msgstr ""
+
+#: my-evolution/Locations.h:380
+#, fuzzy
+msgid "Carlisle"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:381
+msgid "Carlsbad"
+msgstr ""
+
+#: my-evolution/Locations.h:382
+msgid "Carroll"
+msgstr ""
+
+#: my-evolution/Locations.h:383
+msgid "Cartagena/Rafael Nunez"
+msgstr ""
+
+#: my-evolution/Locations.h:384
+msgid "Casa Granda"
+msgstr ""
+
+#: my-evolution/Locations.h:385
+msgid "Cascade"
+msgstr ""
+
+#: my-evolution/Locations.h:386
+msgid "Casper"
+msgstr ""
+
+#: my-evolution/Locations.h:387
+msgid "Catacamas"
+msgstr ""
+
+#: my-evolution/Locations.h:388
+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 ""
+
+#: my-evolution/Locations.h:393
+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
+msgid "Cervia"
+msgstr ""
+
+#: my-evolution/Locations.h:397
+msgid "Chacarita"
+msgstr ""
+
+#: my-evolution/Locations.h:398
+msgid "Chadron"
+msgstr ""
+
+#: my-evolution/Locations.h:399
+msgid "Challis"
+msgstr ""
+
+#: my-evolution/Locations.h:400
+msgid "Chamberlain"
+msgstr ""
+
+#: my-evolution/Locations.h:401
+msgid "Chambery"
+msgstr ""
+
+#: my-evolution/Locations.h:402
+msgid "Champaign"
+msgstr ""
+
+#: my-evolution/Locations.h:403
+msgid "Chandalar Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:404
+#, fuzzy
+msgid "Chandler"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:405
+msgid "Chania"
+msgstr ""
+
+#: my-evolution/Locations.h:406
+msgid "Chanute"
+msgstr ""
+
+#: my-evolution/Locations.h:407
+msgid "Chariton"
+msgstr ""
+
+#: my-evolution/Locations.h:408
+msgid "Charleroi-Brussels South"
+msgstr ""
+
+#: my-evolution/Locations.h:409
+msgid "Charles City"
+msgstr ""
+
+#: my-evolution/Locations.h:410
+msgid "Charleston"
+msgstr ""
+
+#: my-evolution/Locations.h:411
+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 ""
+
+#: my-evolution/Locations.h:416
+#, fuzzy
+msgid "Cheju"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:417
+msgid "Chelyabinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:418
+msgid "Chengdu"
+msgstr ""
+
+#: my-evolution/Locations.h:419
+msgid "Cherbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:420
+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
+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 ""
+
+#: my-evolution/Locations.h:431
+#, fuzzy
+msgid "Chiclayo"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:432
+#, fuzzy
+msgid "Chico"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:433
+msgid "Chicopee Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:434
+#, fuzzy
+msgid "Chievres"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:435
+msgid "Chihhang"
+msgstr ""
+
+#: my-evolution/Locations.h:436
+msgid "Chihuahua"
+msgstr ""
+
+#: my-evolution/Locations.h:437
+#, fuzzy
+msgid "Childress"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:439
+msgid "China Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:440
+msgid "Chinandega"
+msgstr ""
+
+#: my-evolution/Locations.h:441
+msgid "Chinmem/Shatou"
+msgstr ""
+
+#: my-evolution/Locations.h:442
+#, fuzzy
+msgid "Chino"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:443
+msgid "Chippewa County"
+msgstr ""
+
+#: my-evolution/Locations.h:444
+#, fuzzy
+msgid "Chita"
+msgstr "Chile"
+
+#: 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
+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 ""
+
+#: my-evolution/Locations.h:462
+msgid "Clarinda"
+msgstr ""
+
+#: my-evolution/Locations.h:463
+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 ""
+
+#: my-evolution/Locations.h:468
+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
+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
+msgid "Cocos Island"
+msgstr ""
+
+#: my-evolution/Locations.h:477
+msgid "Cody"
+msgstr ""
+
+#: my-evolution/Locations.h:478
+msgid "Coeur d'Alene"
+msgstr ""
+
+#: my-evolution/Locations.h:479
+msgid "Cold Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:480
+msgid "Colima"
+msgstr ""
+
+#: my-evolution/Locations.h:481
+msgid "College Station"
+msgstr ""
+
+#: my-evolution/Locations.h:482
+msgid "Colmar-Meyenheim"
+msgstr ""
+
+#: my-evolution/Locations.h:484
+msgid "Colonia"
+msgstr ""
+
+#: my-evolution/Locations.h:485
+#, fuzzy
+msgid "Colorado"
+msgstr "Comoros"
+
+#: my-evolution/Locations.h:486
+msgid "Colorado Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:487
+msgid "Columbia"
+msgstr ""
+
+#: my-evolution/Locations.h:488
+msgid "Columbia-McEntire"
+msgstr ""
+
+#: my-evolution/Locations.h:489
+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 ""
+
+#: my-evolution/Locations.h:494
+#, fuzzy
+msgid "Colville"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:495
+msgid "Comodoro Rivadavia"
+msgstr ""
+
+#: my-evolution/Locations.h:496
+#, fuzzy
+msgid "Comox"
+msgstr "Comoros"
+
+#: my-evolution/Locations.h:497
+msgid "Conceicao Do Araguaia"
+msgstr ""
+
+#: my-evolution/Locations.h:498
+msgid "Concepcion"
+msgstr ""
+
+#: my-evolution/Locations.h:499
+msgid "Concord"
+msgstr ""
+
+#: my-evolution/Locations.h:500
+msgid "Concordia"
+msgstr ""
+
+#: my-evolution/Locations.h:501
+msgid "Connaught"
+msgstr ""
+
+#: my-evolution/Locations.h:502
+msgid "Connecticut"
+msgstr ""
+
+#: my-evolution/Locations.h:503
+#, fuzzy
+msgid "Conroe"
+msgstr "Comoros"
+
+#: my-evolution/Locations.h:504
+msgid "Constantine"
+msgstr ""
+
+#: my-evolution/Locations.h:505
+msgid "Copper Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:506
+msgid "Cordoba"
+msgstr ""
+
+#: my-evolution/Locations.h:507
+msgid "Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:508
+msgid "Cork"
+msgstr ""
+
+#: my-evolution/Locations.h:509
+#, fuzzy
+msgid "Coro"
+msgstr "Comoros"
+
+#: my-evolution/Locations.h:510
+#, fuzzy
+msgid "Corona"
+msgstr "Comoros"
+
+#: my-evolution/Locations.h:511
+msgid "Corpus Christi"
+msgstr ""
+
+#: my-evolution/Locations.h:512
+msgid "Corpus Christi NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:513
+msgid "Corrientes"
+msgstr ""
+
+#: my-evolution/Locations.h:514
+msgid "Corsicana"
+msgstr ""
+
+#: my-evolution/Locations.h:515
+msgid "Cortez"
+msgstr ""
+
+#: my-evolution/Locations.h:516
+msgid "Corumba"
+msgstr ""
+
+#: my-evolution/Locations.h:518
+msgid "Cotulla"
+msgstr ""
+
+#: my-evolution/Locations.h:519
+msgid "Council Bluffs"
+msgstr ""
+
+#: my-evolution/Locations.h:520
+msgid "Coventry"
+msgstr ""
+
+#: my-evolution/Locations.h:521
+msgid "Covington"
+msgstr ""
+
+#: my-evolution/Locations.h:522
+msgid "Cozumel"
+msgstr ""
+
+#: my-evolution/Locations.h:523
+msgid "Craig"
+msgstr ""
+
+#: my-evolution/Locations.h:524
+msgid "Cranfield"
+msgstr ""
+
+#: my-evolution/Locations.h:525
+msgid "Crescent City"
+msgstr ""
+
+#: my-evolution/Locations.h:526
+msgid "Creston"
+msgstr ""
+
+#: my-evolution/Locations.h:527
+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
+msgid "Crotone"
+msgstr ""
+
+#: my-evolution/Locations.h:533
+msgid "Cuba Awrs"
+msgstr ""
+
+#: my-evolution/Locations.h:534
+msgid "Cuernavaca"
+msgstr ""
+
+#: my-evolution/Locations.h:535
+msgid "Cuiaba"
+msgstr ""
+
+#: my-evolution/Locations.h:536
+#, fuzzy
+msgid "Culdrose"
+msgstr "C_lose"
+
+#: my-evolution/Locations.h:537
+msgid "Culiacan"
+msgstr ""
+
+#: my-evolution/Locations.h:538
+msgid "Cumana"
+msgstr ""
+
+#: my-evolution/Locations.h:539
+msgid "Cumberland"
+msgstr ""
+
+#: my-evolution/Locations.h:540
+msgid "Curitiba"
+msgstr ""
+
+#: my-evolution/Locations.h:541
+msgid "Curitiba Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:542
+msgid "Custer"
+msgstr ""
+
+#: my-evolution/Locations.h:543
+msgid "Cut Bank"
+msgstr ""
+
+#: my-evolution/Locations.h:544
+msgid "Cuzco"
+msgstr ""
+
+#: my-evolution/Locations.h:547
+msgid "Dagali"
+msgstr ""
+
+#: my-evolution/Locations.h:548
+msgid "Daggett"
+msgstr ""
+
+#: my-evolution/Locations.h:549
+msgid "Dalhart"
+msgstr ""
+
+#: my-evolution/Locations.h:550
+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 ""
+
+#: my-evolution/Locations.h:556
+msgid "Danbury"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:562
+msgid "Dayton"
+msgstr ""
+
+#: my-evolution/Locations.h:563
+msgid "Daytona Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:564
+msgid "Dayton-Fairborn"
+msgstr ""
+
+#: my-evolution/Locations.h:565
+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 ""
+
+#: my-evolution/Locations.h:571
+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 ""
+
+#: my-evolution/Locations.h:576
+msgid "Delta"
+msgstr ""
+
+#: my-evolution/Locations.h:577
+msgid "Deming"
+msgstr ""
+
+#: my-evolution/Locations.h:578
+msgid "Den Helder/De Kooy"
+msgstr ""
+
+#: my-evolution/Locations.h:579
+msgid "Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:581
+msgid "Denton"
+msgstr ""
+
+#: my-evolution/Locations.h:582
+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 ""
+
+#: my-evolution/Locations.h:587
+msgid "Des Moines"
+msgstr ""
+
+#: my-evolution/Locations.h:588
+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
+msgid "Dhahran"
+msgstr ""
+
+#: my-evolution/Locations.h:596
+msgid "Dickinson"
+msgstr ""
+
+#: my-evolution/Locations.h:597
+msgid "Dijon"
+msgstr ""
+
+#: my-evolution/Locations.h:598
+msgid "Dillingham"
+msgstr ""
+
+#: my-evolution/Locations.h:599
+msgid "Dillon"
+msgstr ""
+
+#: my-evolution/Locations.h:600
+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
+msgid "Dole"
+msgstr ""
+
+#: my-evolution/Locations.h:609
+msgid "Donetsk"
+msgstr ""
+
+#: my-evolution/Locations.h:610
+msgid "Dongsha"
+msgstr ""
+
+#: my-evolution/Locations.h:611
+msgid "Dongshi"
+msgstr ""
+
+#: my-evolution/Locations.h:612
+msgid "Don Torcuato"
+msgstr ""
+
+#: my-evolution/Locations.h:613
+msgid "Dortmund-Wickede"
+msgstr ""
+
+#: my-evolution/Locations.h:614
+msgid "Dothan"
+msgstr ""
+
+#: my-evolution/Locations.h:615
+msgid "Douglas"
+msgstr ""
+
+#: my-evolution/Locations.h:616
+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
+msgid "Dubai"
+msgstr ""
+
+#: my-evolution/Locations.h:620
+msgid "Dubbo"
+msgstr ""
+
+#: my-evolution/Locations.h:621
+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 ""
+
+#: my-evolution/Locations.h:625
+msgid "Dugway"
+msgstr ""
+
+#: my-evolution/Locations.h:626
+msgid "Duluth"
+msgstr ""
+
+#: my-evolution/Locations.h:627
+msgid "Dundee"
+msgstr ""
+
+#: my-evolution/Locations.h:628
+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
+msgid "Dusseldorf"
+msgstr ""
+
+#: my-evolution/Locations.h:633
+msgid "Dutch Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:634
+msgid "Dyersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:635
+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
+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
+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
+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 ""
+
+#: my-evolution/Locations.h:661
+msgid "Elkins"
+msgstr ""
+
+#: my-evolution/Locations.h:662
+msgid "Elko"
+msgstr ""
+
+#: my-evolution/Locations.h:663
+msgid "Elmira"
+msgstr ""
+
+#: my-evolution/Locations.h:664
+msgid "El Monte"
+msgstr ""
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr ""
+
+#: my-evolution/Locations.h:667
+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
+msgid "Emporia"
+msgstr ""
+
+#: my-evolution/Locations.h:672
+msgid "Enid"
+msgstr ""
+
+#: my-evolution/Locations.h:673
+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
+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 ""
+
+#: my-evolution/Locations.h:685
+msgid "Eugene"
+msgstr ""
+
+#: my-evolution/Locations.h:686
+msgid "Eureka"
+msgstr ""
+
+#: my-evolution/Locations.h:687
+msgid "Europe"
+msgstr ""
+
+#: my-evolution/Locations.h:688
+msgid "Evanston"
+msgstr ""
+
+#: my-evolution/Locations.h:689
+msgid "Evansville"
+msgstr ""
+
+#: my-evolution/Locations.h:690
+msgid "Everett"
+msgstr ""
+
+#: my-evolution/Locations.h:691
+msgid "Evergreen"
+msgstr ""
+
+#: my-evolution/Locations.h:692
+msgid "Evreux-Fauville"
+msgstr ""
+
+#: my-evolution/Locations.h:693
+msgid "Exeter"
+msgstr ""
+
+#: my-evolution/Locations.h:694
+msgid "Ezeiza"
+msgstr ""
+
+#: my-evolution/Locations.h:695
+msgid "Fagernes"
+msgstr ""
+
+#: my-evolution/Locations.h:696
+msgid "Fairbanks"
+msgstr ""
+
+#: my-evolution/Locations.h:697
+msgid "Fairchild"
+msgstr ""
+
+#: my-evolution/Locations.h:698
+msgid "Fairfield"
+msgstr ""
+
+#: my-evolution/Locations.h:699
+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
+msgid "Fargo"
+msgstr ""
+
+#: my-evolution/Locations.h:705
+msgid "Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:706
+msgid "Farmington"
+msgstr ""
+
+#: my-evolution/Locations.h:707
+msgid "Farmville"
+msgstr ""
+
+#: my-evolution/Locations.h:708
+msgid "Faro"
+msgstr ""
+
+#: my-evolution/Locations.h:709
+msgid "Fayetteville"
+msgstr ""
+
+#: my-evolution/Locations.h:710
+msgid "Feng Nin"
+msgstr ""
+
+#: my-evolution/Locations.h:711
+msgid "Fergus Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:712
+msgid "Fernando De Noronha"
+msgstr ""
+
+#: my-evolution/Locations.h:713
+msgid "Ferrara"
+msgstr ""
+
+#: my-evolution/Locations.h:714
+msgid "Figari"
+msgstr ""
+
+#: my-evolution/Locations.h:715
+msgid "Findlay"
+msgstr ""
+
+#: my-evolution/Locations.h:717
+msgid "Firenze"
+msgstr ""
+
+#: my-evolution/Locations.h:718
+msgid "Fitchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:719
+msgid "Flagstaff"
+msgstr ""
+
+#: my-evolution/Locations.h:720
+msgid "Flint"
+msgstr ""
+
+#: my-evolution/Locations.h:721
+msgid "Flippin"
+msgstr ""
+
+#: my-evolution/Locations.h:722
+msgid "Florence"
+msgstr ""
+
+#: my-evolution/Locations.h:723
+msgid "Florennes"
+msgstr ""
+
+#: my-evolution/Locations.h:724
+msgid "Flores"
+msgstr ""
+
+#: my-evolution/Locations.h:725
+msgid "Florianopolis"
+msgstr ""
+
+#: my-evolution/Locations.h:726
+msgid "Florida"
+msgstr ""
+
+#: my-evolution/Locations.h:727
+msgid "Floro"
+msgstr ""
+
+#: my-evolution/Locations.h:728
+msgid "Fond Du Lac"
+msgstr ""
+
+#: my-evolution/Locations.h:729
+msgid "Forde/Bringeland"
+msgstr ""
+
+#: my-evolution/Locations.h:730
+msgid "Forli"
+msgstr ""
+
+#: my-evolution/Locations.h:731
+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 ""
+
+#: my-evolution/Locations.h:742
+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 ""
+
+#: my-evolution/Locations.h:748
+msgid "Fort Leonard"
+msgstr ""
+
+#: my-evolution/Locations.h:749
+msgid "Fort Lewis"
+msgstr ""
+
+#: my-evolution/Locations.h:750
+msgid "Fort Madison"
+msgstr ""
+
+#: my-evolution/Locations.h:751
+msgid "Fort Meade"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:757
+msgid "Fort Smith"
+msgstr ""
+
+#: my-evolution/Locations.h:758
+msgid "Fort Stewart"
+msgstr ""
+
+#: my-evolution/Locations.h:759
+msgid "Fort Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:760
+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 ""
+
+#: my-evolution/Locations.h:769
+msgid "Franklin"
+msgstr ""
+
+#: my-evolution/Locations.h:770
+msgid "Fredericton"
+msgstr ""
+
+#: my-evolution/Locations.h:771
+msgid "Freeport"
+msgstr ""
+
+#: my-evolution/Locations.h:772
+msgid "Frenchville"
+msgstr ""
+
+#: my-evolution/Locations.h:773
+msgid "Fresno"
+msgstr ""
+
+#: my-evolution/Locations.h:774
+msgid "Fresno-Chandler"
+msgstr ""
+
+#: my-evolution/Locations.h:775
+msgid "Friday Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:776
+msgid "Friedrichshafen"
+msgstr ""
+
+#: my-evolution/Locations.h:777
+msgid "Frigg"
+msgstr ""
+
+#: my-evolution/Locations.h:778
+msgid "Frontone"
+msgstr ""
+
+#: my-evolution/Locations.h:779
+msgid "Frosinone"
+msgstr ""
+
+#: my-evolution/Locations.h:780
+msgid "Fryeburg"
+msgstr ""
+
+#: 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
+msgid "FYR Macedonia"
+msgstr ""
+
+#: my-evolution/Locations.h:789
+msgid "Gadsden"
+msgstr ""
+
+#: my-evolution/Locations.h:790
+msgid "Gage"
+msgstr ""
+
+#: my-evolution/Locations.h:791
+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
+msgid "Galena"
+msgstr ""
+
+#: my-evolution/Locations.h:796
+msgid "Galesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:797
+msgid "Gallup"
+msgstr ""
+
+#: my-evolution/Locations.h:798
+msgid "Galveston"
+msgstr ""
+
+#: my-evolution/Locations.h:799
+msgid "Gambell"
+msgstr ""
+
+#: my-evolution/Locations.h:800
+msgid "Gander"
+msgstr ""
+
+#: my-evolution/Locations.h:801
+msgid "Garden City"
+msgstr ""
+
+#: my-evolution/Locations.h:802
+msgid "Gary"
+msgstr ""
+
+#: my-evolution/Locations.h:803
+msgid "Gassim"
+msgstr ""
+
+#: my-evolution/Locations.h:804
+msgid "Gatineau"
+msgstr ""
+
+#: my-evolution/Locations.h:805
+msgid "Gaziantep"
+msgstr ""
+
+#: my-evolution/Locations.h:806
+msgid "Gdansk"
+msgstr ""
+
+#: my-evolution/Locations.h:807
+msgid "Geneve"
+msgstr ""
+
+#: my-evolution/Locations.h:808
+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
+msgid "Ghardaia"
+msgstr ""
+
+#: my-evolution/Locations.h:814
+msgid "Ghedi"
+msgstr ""
+
+#: my-evolution/Locations.h:816
+msgid "Gifu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:817
+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 ""
+
+#: my-evolution/Locations.h:821
+msgid "Girona"
+msgstr ""
+
+#: my-evolution/Locations.h:822
+msgid "Gizan"
+msgstr ""
+
+#: my-evolution/Locations.h:823
+msgid "Glasgow"
+msgstr ""
+
+#: my-evolution/Locations.h:824
+msgid "Glendive"
+msgstr ""
+
+#: my-evolution/Locations.h:825
+msgid "Glens Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:826
+msgid "Goiania"
+msgstr ""
+
+#: my-evolution/Locations.h:827
+msgid "Goldsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:828
+msgid "Goodland"
+msgstr ""
+
+#: my-evolution/Locations.h:829
+msgid "Goose Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:830
+msgid "Goteborg (Landvetter)"
+msgstr ""
+
+#: my-evolution/Locations.h:831
+msgid "Goteborg (Save)"
+msgstr ""
+
+#: my-evolution/Locations.h:832
+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
+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
+msgid "Grand Marais"
+msgstr ""
+
+#: my-evolution/Locations.h:840
+msgid "Grand Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:841
+msgid "Grandview"
+msgstr ""
+
+#: my-evolution/Locations.h:842
+msgid "Grangeville"
+msgstr ""
+
+#: my-evolution/Locations.h:843
+msgid "Grants"
+msgstr ""
+
+#: my-evolution/Locations.h:844
+msgid "Graz"
+msgstr ""
+
+#: my-evolution/Locations.h:845
+msgid "Great Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:847
+msgid "Greeley"
+msgstr ""
+
+#: my-evolution/Locations.h:848
+msgid "Green Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:849
+msgid "Green River"
+msgstr ""
+
+#: my-evolution/Locations.h:850
+msgid "Greensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:851
+msgid "Greenville"
+msgstr ""
+
+#: my-evolution/Locations.h:852
+msgid "Greenville-Spartanburg"
+msgstr ""
+
+#: my-evolution/Locations.h:853
+msgid "Greenwood"
+msgstr ""
+
+#: my-evolution/Locations.h:854
+msgid "Grenoble-Saint-Geoirs"
+msgstr ""
+
+#: my-evolution/Locations.h:855
+msgid "Griffiss AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:856
+msgid "Groningen"
+msgstr ""
+
+#: my-evolution/Locations.h:857
+msgid "Grosseto"
+msgstr ""
+
+#: my-evolution/Locations.h:858
+msgid "Groton"
+msgstr ""
+
+#: my-evolution/Locations.h:859
+msgid "Guadalajara"
+msgstr ""
+
+#: my-evolution/Locations.h:860
+msgid "Guadalupe Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:861
+msgid "Guanare"
+msgstr ""
+
+#: my-evolution/Locations.h:862
+msgid "Guangzhou"
+msgstr ""
+
+#: my-evolution/Locations.h:863
+msgid "Guantanamo"
+msgstr ""
+
+#: my-evolution/Locations.h:864
+msgid "Guarany"
+msgstr ""
+
+#: my-evolution/Locations.h:865
+msgid "Guaratingueta"
+msgstr ""
+
+#: my-evolution/Locations.h:866
+msgid "Guarulhos"
+msgstr ""
+
+#: my-evolution/Locations.h:868
+msgid "Guayaquil/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:869
+msgid "Guaymas"
+msgstr ""
+
+#: my-evolution/Locations.h:870
+msgid "Guernsey"
+msgstr ""
+
+#: my-evolution/Locations.h:871
+msgid "Guidonia"
+msgstr ""
+
+#: my-evolution/Locations.h:872
+msgid "Gulfport"
+msgstr ""
+
+#: my-evolution/Locations.h:873
+msgid "Gulkana"
+msgstr ""
+
+#: my-evolution/Locations.h:874
+msgid "Gullfax C"
+msgstr ""
+
+#: my-evolution/Locations.h:875
+msgid "Gunnison"
+msgstr ""
+
+#: my-evolution/Locations.h:876
+msgid "Gunnison (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:877
+msgid "Guriat"
+msgstr ""
+
+#: my-evolution/Locations.h:878
+msgid "Gustavus"
+msgstr ""
+
+#: my-evolution/Locations.h:879
+msgid "Guymon"
+msgstr ""
+
+#: my-evolution/Locations.h:880
+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 ""
+
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+msgid "Hail"
+msgstr ""
+
+#: my-evolution/Locations.h:886
+msgid "Hailey-Sun Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:887
+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
+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 ""
+
+#: my-evolution/Locations.h:902
+msgid "Ha Noi"
+msgstr ""
+
+#: my-evolution/Locations.h:903
+msgid "Harbor Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:904
+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 ""
+
+#: my-evolution/Locations.h:911
+msgid "Hastings"
+msgstr ""
+
+#: my-evolution/Locations.h:912
+msgid "Haugesund"
+msgstr ""
+
+#: my-evolution/Locations.h:913
+msgid "Havre"
+msgstr ""
+
+#: my-evolution/Locations.h:914
+msgid "Hawaii"
+msgstr ""
+
+#: my-evolution/Locations.h:915
+msgid "Hawthorne"
+msgstr ""
+
+#: my-evolution/Locations.h:916
+msgid "Hayden"
+msgstr ""
+
+#: my-evolution/Locations.h:917
+msgid "Hayes River"
+msgstr ""
+
+#: my-evolution/Locations.h:918
+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
+msgid "Helena"
+msgstr ""
+
+#: my-evolution/Locations.h:922
+msgid "Helsinki"
+msgstr ""
+
+#: my-evolution/Locations.h:923
+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
+msgid "Hillsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:930
+msgid "Hilo"
+msgstr ""
+
+#: my-evolution/Locations.h:931
+msgid "Hinesville"
+msgstr ""
+
+#: my-evolution/Locations.h:932
+msgid "Hiroshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:933
+msgid "Hobart"
+msgstr ""
+
+#: my-evolution/Locations.h:934
+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 ""
+
+#: my-evolution/Locations.h:941
+msgid "Holguin"
+msgstr ""
+
+#: my-evolution/Locations.h:942
+msgid "Homer"
+msgstr ""
+
+#: my-evolution/Locations.h:943
+msgid "Homestead AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:944
+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
+msgid "Houlton"
+msgstr ""
+
+#: my-evolution/Locations.h:954
+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 ""
+
+#: my-evolution/Locations.h:960
+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 ""
+
+#: my-evolution/Locations.h:964
+msgid "Hulien"
+msgstr ""
+
+#: my-evolution/Locations.h:965
+msgid "Humberside"
+msgstr ""
+
+#: my-evolution/Locations.h:967
+msgid "Huntington"
+msgstr ""
+
+#: my-evolution/Locations.h:968
+msgid "Huntsville"
+msgstr ""
+
+#: my-evolution/Locations.h:969
+msgid "Hurlburt"
+msgstr ""
+
+#: my-evolution/Locations.h:970
+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
+msgid "Iasi"
+msgstr ""
+
+#: my-evolution/Locations.h:977
+msgid "Ibiza"
+msgstr ""
+
+#: my-evolution/Locations.h:979
+msgid "Ichikawa"
+msgstr ""
+
+#: my-evolution/Locations.h:980
+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
+msgid "Ilan"
+msgstr ""
+
+#: my-evolution/Locations.h:985
+msgid "Iliamna"
+msgstr ""
+
+#: my-evolution/Locations.h:986
+msgid "Illinois"
+msgstr ""
+
+#: my-evolution/Locations.h:987
+msgid "Imperial"
+msgstr ""
+
+#: my-evolution/Locations.h:988
+msgid "Imperial (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:989
+msgid "Imperial Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:990
+msgid "In Amenas"
+msgstr ""
+
+#: my-evolution/Locations.h:992
+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 ""
+
+#: my-evolution/Locations.h:998
+msgid "Inverness"
+msgstr ""
+
+#: my-evolution/Locations.h:999
+msgid "Inyokern"
+msgstr ""
+
+#: my-evolution/Locations.h:1000
+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 ""
+
+#: my-evolution/Locations.h:1005
+msgid "Iraklion"
+msgstr ""
+
+#: my-evolution/Locations.h:1006
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1008
+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
+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 ""
+
+#: my-evolution/Locations.h:1025
+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
+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 ""
+
+#: my-evolution/Locations.h:1044
+msgid "Jonkoping"
+msgstr ""
+
+#: my-evolution/Locations.h:1045
+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
+msgid "Juigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:1050
+msgid "Jujuy"
+msgstr ""
+
+#: my-evolution/Locations.h:1051
+msgid "Juliaca"
+msgstr ""
+
+#: my-evolution/Locations.h:1052
+msgid "Junction"
+msgstr ""
+
+#: my-evolution/Locations.h:1053
+msgid "Juneau"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1059
+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 ""
+
+#: my-evolution/Locations.h:1071
+msgid "Karachi"
+msgstr ""
+
+#: my-evolution/Locations.h:1072
+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
+msgid "Kazan"
+msgstr ""
+
+#: my-evolution/Locations.h:1080
+msgid "Kearney"
+msgstr ""
+
+#: my-evolution/Locations.h:1081
+msgid "Keene"
+msgstr ""
+
+#: my-evolution/Locations.h:1082
+msgid "Kefallinia"
+msgstr ""
+
+#: my-evolution/Locations.h:1083
+msgid "Keflavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1084
+msgid "Kenai"
+msgstr ""
+
+#: my-evolution/Locations.h:1085
+msgid "Kenosha"
+msgstr ""
+
+#: my-evolution/Locations.h:1086
+msgid "Kentucky"
+msgstr ""
+
+#: my-evolution/Locations.h:1087
+msgid "Keokuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1088
+msgid "Kerkira"
+msgstr ""
+
+#: my-evolution/Locations.h:1089
+msgid "Kerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1090
+msgid "Ketchikan"
+msgstr ""
+
+#: my-evolution/Locations.h:1091
+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
+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
+msgid "Konya"
+msgstr ""
+
+#: my-evolution/Locations.h:1132
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1133
+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
+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
+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
+msgid "Laconia"
+msgstr ""
+
+#: my-evolution/Locations.h:1151
+msgid "La Coruna"
+msgstr ""
+
+#: my-evolution/Locations.h:1152
+msgid "La Crosse"
+msgstr ""
+
+#: my-evolution/Locations.h:1153
+msgid "La Esperanza"
+msgstr ""
+
+#: my-evolution/Locations.h:1154
+msgid "Lafayette"
+msgstr ""
+
+#: my-evolution/Locations.h:1155
+msgid "La Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1156
+msgid "Lahaina"
+msgstr ""
+
+#: my-evolution/Locations.h:1157
+msgid "Lahore"
+msgstr ""
+
+#: my-evolution/Locations.h:1158
+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
+msgid "Lakeland"
+msgstr ""
+
+#: my-evolution/Locations.h:1164
+msgid "Lake Tahoe"
+msgstr ""
+
+#: my-evolution/Locations.h:1165
+msgid "Lakeview"
+msgstr ""
+
+#: my-evolution/Locations.h:1166
+msgid "Lamar"
+msgstr ""
+
+#: my-evolution/Locations.h:1167
+msgid "La Mesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1168
+msgid "Lamezia"
+msgstr ""
+
+#: my-evolution/Locations.h:1169
+msgid "Lamoni"
+msgstr ""
+
+#: my-evolution/Locations.h:1170
+msgid "Lampedusa"
+msgstr ""
+
+#: my-evolution/Locations.h:1171
+msgid "Lanai"
+msgstr ""
+
+#: my-evolution/Locations.h:1172
+msgid "Lancaster"
+msgstr ""
+
+#: my-evolution/Locations.h:1173
+msgid "Lander"
+msgstr ""
+
+#: my-evolution/Locations.h:1174
+msgid "Langebaanweg"
+msgstr ""
+
+#: my-evolution/Locations.h:1175
+msgid "Langley AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1176
+msgid "Lannion"
+msgstr ""
+
+#: my-evolution/Locations.h:1177
+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 ""
+
+#: my-evolution/Locations.h:1182
+msgid "Laredo"
+msgstr ""
+
+#: my-evolution/Locations.h:1183
+msgid "Larnaka"
+msgstr ""
+
+#: my-evolution/Locations.h:1184
+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
+msgid "Latina"
+msgstr ""
+
+#: my-evolution/Locations.h:1189
+msgid "Latrobe"
+msgstr ""
+
+#: my-evolution/Locations.h:1191
+msgid "Laughlin"
+msgstr ""
+
+#: my-evolution/Locations.h:1192
+msgid "Laurel"
+msgstr ""
+
+#: my-evolution/Locations.h:1193
+msgid "La Verne"
+msgstr ""
+
+#: my-evolution/Locations.h:1194
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1195
+msgid "Lawton"
+msgstr ""
+
+#: my-evolution/Locations.h:1196
+msgid "Leadville"
+msgstr ""
+
+#: my-evolution/Locations.h:1197
+msgid "Learmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1199
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1201
+msgid "Leesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1202
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1205
+msgid "Leknes"
+msgstr ""
+
+#: my-evolution/Locations.h:1206
+msgid "Le Mans"
+msgstr ""
+
+#: my-evolution/Locations.h:1207
+msgid "Le Marine"
+msgstr ""
+
+#: my-evolution/Locations.h:1208
+msgid "Lemmon"
+msgstr ""
+
+#: my-evolution/Locations.h:1209
+msgid "Lemoore"
+msgstr ""
+
+#: my-evolution/Locations.h:1210
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1212
+msgid "Leuchars"
+msgstr ""
+
+#: my-evolution/Locations.h:1213
+msgid "Lewisburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1214
+msgid "Lewiston"
+msgstr ""
+
+#: my-evolution/Locations.h:1215
+msgid "Lewistown"
+msgstr ""
+
+#: my-evolution/Locations.h:1216
+msgid "Lexington"
+msgstr ""
+
+#: my-evolution/Locations.h:1217
+msgid "Liberal"
+msgstr ""
+
+#: my-evolution/Locations.h:1219
+msgid "Libya"
+msgstr ""
+
+#: my-evolution/Locations.h:1220
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1221
+msgid "Lidgerwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1222
+msgid "Liege"
+msgstr ""
+
+#: my-evolution/Locations.h:1223
+msgid "Lihue"
+msgstr ""
+
+#: my-evolution/Locations.h:1224
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1225
+msgid "Lima-Callao"
+msgstr ""
+
+#: my-evolution/Locations.h:1226
+msgid "Limnos"
+msgstr ""
+
+#: my-evolution/Locations.h:1227
+msgid "Limoges"
+msgstr ""
+
+#: my-evolution/Locations.h:1228
+msgid "Limon"
+msgstr ""
+
+#: my-evolution/Locations.h:1229
+msgid "Lincoln"
+msgstr ""
+
+#: my-evolution/Locations.h:1230
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1231
+msgid "Lisboa"
+msgstr ""
+
+#: my-evolution/Locations.h:1232
+msgid "Lista"
+msgstr ""
+
+#: my-evolution/Locations.h:1233
+msgid "Litchfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1240
+msgid "Ljubljana"
+msgstr ""
+
+#: my-evolution/Locations.h:1241
+msgid "Logan"
+msgstr ""
+
+#: my-evolution/Locations.h:1242
+msgid "Lolland Falster"
+msgstr ""
+
+#: my-evolution/Locations.h:1243
+msgid "Lompoc"
+msgstr ""
+
+#: my-evolution/Locations.h:1244
+msgid "London"
+msgstr ""
+
+#: my-evolution/Locations.h:1245
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1249
+msgid "Londrina"
+msgstr ""
+
+#: my-evolution/Locations.h:1250
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1253
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+#: my-evolution/Locations.h:1254
+msgid "Los Alamos"
+msgstr ""
+
+#: my-evolution/Locations.h:1255
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1260
+msgid "Lousiana"
+msgstr ""
+
+#: my-evolution/Locations.h:1261
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1265
+msgid "Lugano"
+msgstr ""
+
+#: my-evolution/Locations.h:1266
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1267
+msgid "Luton"
+msgstr ""
+
+#: my-evolution/Locations.h:1269
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1270
+msgid "Luxor"
+msgstr ""
+
+#: my-evolution/Locations.h:1271
+msgid "Lviv"
+msgstr ""
+
+#: my-evolution/Locations.h:1272
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1275
+msgid "Lyon-Satolas"
+msgstr ""
+
+#: my-evolution/Locations.h:1276
+msgid "Maastricht"
+msgstr ""
+
+#: my-evolution/Locations.h:1277
+msgid "Macae"
+msgstr ""
+
+#: my-evolution/Locations.h:1278
+msgid "Macapa"
+msgstr ""
+
+#: my-evolution/Locations.h:1279
+msgid "Maceio"
+msgstr ""
+
+#: my-evolution/Locations.h:1280
+msgid "Macon"
+msgstr ""
+
+#: my-evolution/Locations.h:1281
+msgid "Madinah"
+msgstr ""
+
+#: my-evolution/Locations.h:1282
+msgid "Madison"
+msgstr ""
+
+#: my-evolution/Locations.h:1283
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1285
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+#: my-evolution/Locations.h:1286
+msgid "Magadan"
+msgstr ""
+
+#: my-evolution/Locations.h:1287
+msgid "Magdalena"
+msgstr ""
+
+#: my-evolution/Locations.h:1288
+msgid "Maine"
+msgstr ""
+
+#: my-evolution/Locations.h:1289
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1290
+msgid "Makkah"
+msgstr ""
+
+#: my-evolution/Locations.h:1291
+msgid "Makung"
+msgstr ""
+
+#: my-evolution/Locations.h:1292
+msgid "Malad City"
+msgstr ""
+
+#: my-evolution/Locations.h:1293
+msgid "Malaga"
+msgstr ""
+
+#: my-evolution/Locations.h:1294
+msgid "Malatya"
+msgstr ""
+
+#: my-evolution/Locations.h:1295
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1296
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1298
+msgid "Mammoth Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1299
+msgid "Managua"
+msgstr ""
+
+#: my-evolution/Locations.h:1300
+msgid "Manassas"
+msgstr ""
+
+#: my-evolution/Locations.h:1301
+msgid "Manaus"
+msgstr ""
+
+#: my-evolution/Locations.h:1302
+msgid "Manchester"
+msgstr ""
+
+#: my-evolution/Locations.h:1303
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+msgid "Manhattan"
+msgstr ""
+
+#: my-evolution/Locations.h:1305
+msgid "Manisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1306
+msgid "Manistee"
+msgstr ""
+
+#: my-evolution/Locations.h:1307
+msgid "Manitoba"
+msgstr ""
+
+#: my-evolution/Locations.h:1308
+msgid "Manitowoc"
+msgstr ""
+
+#: my-evolution/Locations.h:1309
+msgid "Mankato"
+msgstr ""
+
+#: my-evolution/Locations.h:1310
+msgid "Mansfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1311
+msgid "Manta"
+msgstr ""
+
+#: my-evolution/Locations.h:1312
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1313
+msgid "Maraba"
+msgstr ""
+
+#: my-evolution/Locations.h:1314
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1315
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1316
+msgid "Marathon"
+msgstr ""
+
+#: my-evolution/Locations.h:1317
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1318
+msgid "Margarita"
+msgstr ""
+
+#: my-evolution/Locations.h:1319
+msgid "Marianna"
+msgstr ""
+
+#: my-evolution/Locations.h:1320
+msgid "Marib"
+msgstr ""
+
+#: my-evolution/Locations.h:1321
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1322
+msgid "Marietta"
+msgstr ""
+
+#: my-evolution/Locations.h:1323
+msgid "Marino di Ravenna"
+msgstr ""
+
+#: my-evolution/Locations.h:1324
+msgid "Marion"
+msgstr ""
+
+#: my-evolution/Locations.h:1325
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1326
+msgid "Marquette"
+msgstr ""
+
+#: my-evolution/Locations.h:1327
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+msgid "Marseilles"
+msgstr ""
+
+#: my-evolution/Locations.h:1329
+msgid "Marshall"
+msgstr ""
+
+#: my-evolution/Locations.h:1330
+msgid "Marshalltown"
+msgstr ""
+
+#: my-evolution/Locations.h:1331
+msgid "Marshfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1332
+msgid "Marte"
+msgstr ""
+
+#: my-evolution/Locations.h:1333
+msgid "Marthas Vineyard"
+msgstr ""
+
+#: my-evolution/Locations.h:1334
+msgid "Martinsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1335
+msgid "Martinsville"
+msgstr ""
+
+#: my-evolution/Locations.h:1336
+msgid "Maryland"
+msgstr ""
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1339
+msgid "Mashhad"
+msgstr ""
+
+#: my-evolution/Locations.h:1340
+msgid "Masirah"
+msgstr ""
+
+#: my-evolution/Locations.h:1341
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1343
+msgid "Massena"
+msgstr ""
+
+#: my-evolution/Locations.h:1344
+#, fuzzy
+msgid "Matamoros"
+msgstr "Comoros"
+
+#: my-evolution/Locations.h:1345
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1347
+msgid "Matsuyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1348
+msgid "Mattoon"
+msgstr ""
+
+#: my-evolution/Locations.h:1349
+msgid "Mayaguez"
+msgstr ""
+
+#: my-evolution/Locations.h:1350
+msgid "Mayport"
+msgstr ""
+
+#: my-evolution/Locations.h:1351
+msgid "Mazatlan"
+msgstr ""
+
+#: my-evolution/Locations.h:1352
+msgid "Mazu"
+msgstr ""
+
+#: my-evolution/Locations.h:1353
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1354
+msgid "McAllen"
+msgstr ""
+
+#: my-evolution/Locations.h:1355
+msgid "McCall"
+msgstr ""
+
+#: my-evolution/Locations.h:1356
+msgid "McCarthy"
+msgstr ""
+
+#: my-evolution/Locations.h:1357
+msgid "McClellan"
+msgstr ""
+
+#: my-evolution/Locations.h:1358
+msgid "McComb"
+msgstr ""
+
+#: my-evolution/Locations.h:1359
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1361
+msgid "Mc Gregor"
+msgstr ""
+
+#: my-evolution/Locations.h:1362
+msgid "Meacham"
+msgstr ""
+
+#: my-evolution/Locations.h:1363
+msgid "Medford"
+msgstr ""
+
+#: my-evolution/Locations.h:1364
+msgid "Medicine Lodge"
+msgstr ""
+
+#: my-evolution/Locations.h:1365
+msgid "Mehamn"
+msgstr ""
+
+#: my-evolution/Locations.h:1366
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1367
+msgid "Melbourne"
+msgstr ""
+
+#: my-evolution/Locations.h:1368
+msgid "Melfa"
+msgstr ""
+
+#: my-evolution/Locations.h:1369
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1373
+msgid "Mendoza"
+msgstr ""
+
+#: my-evolution/Locations.h:1374
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1377
+msgid "Merced"
+msgstr ""
+
+#: my-evolution/Locations.h:1378
+msgid "Merida"
+msgstr ""
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1380
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1381
+msgid "Merril Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1382
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1386
+msgid "Mexicali"
+msgstr ""
+
+#: my-evolution/Locations.h:1388
+msgid "Miami"
+msgstr ""
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1391
+msgid "Michigan"
+msgstr ""
+
+#: my-evolution/Locations.h:1392
+msgid "Middle East"
+msgstr ""
+
+#: my-evolution/Locations.h:1393
+msgid "Middleton Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1394
+msgid "Middletown"
+msgstr ""
+
+#: my-evolution/Locations.h:1395
+msgid "Midland"
+msgstr ""
+
+#: my-evolution/Locations.h:1396
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1398
+msgid "Milano/Malpensa"
+msgstr ""
+
+#: my-evolution/Locations.h:1399
+msgid "Miles City"
+msgstr ""
+
+#: my-evolution/Locations.h:1400
+msgid "Milford"
+msgstr ""
+
+#: my-evolution/Locations.h:1401
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1402
+msgid "Millville"
+msgstr ""
+
+#: my-evolution/Locations.h:1403
+msgid "Milton"
+msgstr ""
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1407
+msgid "Minatitlan"
+msgstr ""
+
+#: my-evolution/Locations.h:1408
+msgid "Minchumina"
+msgstr ""
+
+#: my-evolution/Locations.h:1409
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1414
+msgid "Minnesota"
+msgstr ""
+
+#: my-evolution/Locations.h:1415
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1416
+msgid "Minot"
+msgstr ""
+
+#: my-evolution/Locations.h:1417
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1419
+msgid "Mississippi"
+msgstr ""
+
+#: my-evolution/Locations.h:1420
+msgid "Missoula"
+msgstr ""
+
+#: my-evolution/Locations.h:1421
+msgid "Missouri"
+msgstr ""
+
+#: my-evolution/Locations.h:1422
+msgid "Mitchell"
+msgstr ""
+
+#: my-evolution/Locations.h:1423
+msgid "Mitilini"
+msgstr ""
+
+#: my-evolution/Locations.h:1424
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1425
+msgid "Miyazaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1426
+msgid "Moa"
+msgstr ""
+
+#: my-evolution/Locations.h:1427
+msgid "Mobile Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:1428
+msgid "Mobile Regional Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1429
+msgid "Mobridge"
+msgstr ""
+
+#: my-evolution/Locations.h:1430
+msgid "Modesto"
+msgstr ""
+
+#: my-evolution/Locations.h:1431
+msgid "Mo I Rana"
+msgstr ""
+
+#: my-evolution/Locations.h:1432
+msgid "Mojave"
+msgstr ""
+
+#: my-evolution/Locations.h:1433
+msgid "Molde"
+msgstr ""
+
+#: my-evolution/Locations.h:1434
+msgid "Moldova"
+msgstr ""
+
+#: my-evolution/Locations.h:1435
+msgid "Moline-Quad Cities"
+msgstr ""
+
+#: my-evolution/Locations.h:1436
+msgid "Molokai"
+msgstr ""
+
+#: my-evolution/Locations.h:1437
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1438
+msgid "Monchengladbach"
+msgstr ""
+
+#: my-evolution/Locations.h:1439
+msgid "Monclova"
+msgstr ""
+
+#: my-evolution/Locations.h:1440
+msgid "Moncton"
+msgstr ""
+
+#: my-evolution/Locations.h:1441
+msgid "Monida"
+msgstr ""
+
+#: my-evolution/Locations.h:1442
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+#: my-evolution/Locations.h:1443
+msgid "Monroe"
+msgstr ""
+
+#: my-evolution/Locations.h:1444
+msgid "Montague"
+msgstr ""
+
+#: my-evolution/Locations.h:1445
+msgid "Montana"
+msgstr ""
+
+#: my-evolution/Locations.h:1446
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1448
+msgid "Monte Bisbino"
+msgstr ""
+
+#: my-evolution/Locations.h:1449
+msgid "Monte Calamita"
+msgstr ""
+
+#: my-evolution/Locations.h:1450
+msgid "Monte Cimone"
+msgstr ""
+
+#: my-evolution/Locations.h:1451
+msgid "Montego Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:1452
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1453
+msgid "Monterey"
+msgstr ""
+
+#: my-evolution/Locations.h:1454
+msgid "Monterrey"
+msgstr ""
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1458
+msgid "Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1459
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1460
+msgid "Monticello"
+msgstr ""
+
+#: my-evolution/Locations.h:1461
+msgid "Montpelier"
+msgstr ""
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1465
+msgid "Montrose"
+msgstr ""
+
+#: my-evolution/Locations.h:1466
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1467
+msgid "Morelia"
+msgstr ""
+
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Morgantown"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:1469
+msgid "Moriarty"
+msgstr ""
+
+#: my-evolution/Locations.h:1471
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1474
+msgid "Moses Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1475
+msgid "Mosinee"
+msgstr ""
+
+#: my-evolution/Locations.h:1476
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain Home"
+msgstr ""
+
+#: my-evolution/Locations.h:1479
+msgid "Mountain View"
+msgstr ""
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1482
+msgid "Mount Shasta"
+msgstr ""
+
+#: my-evolution/Locations.h:1483
+msgid "Mount Vernon"
+msgstr ""
+
+#: my-evolution/Locations.h:1484
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1487
+msgid "Muir"
+msgstr ""
+
+#: my-evolution/Locations.h:1488
+msgid "Mullan"
+msgstr ""
+
+#: my-evolution/Locations.h:1489
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1490
+msgid "Munchen"
+msgstr ""
+
+#: my-evolution/Locations.h:1491
+msgid "Muncie"
+msgstr ""
+
+#: my-evolution/Locations.h:1492
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1493
+msgid "Murcia"
+msgstr ""
+
+#: my-evolution/Locations.h:1494
+msgid "Murmansk"
+msgstr ""
+
+#: my-evolution/Locations.h:1495
+msgid "Mus"
+msgstr ""
+
+#: my-evolution/Locations.h:1496
+msgid "Muscatine"
+msgstr ""
+
+#: my-evolution/Locations.h:1497
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1498
+msgid "Muskegon"
+msgstr ""
+
+#: my-evolution/Locations.h:1499
+msgid "Mykonos"
+msgstr ""
+
+#: my-evolution/Locations.h:1500
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1507
+msgid "Najran"
+msgstr ""
+
+#: my-evolution/Locations.h:1508
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1509
+msgid "Nalchik"
+msgstr ""
+
+#: my-evolution/Locations.h:1510
+msgid "Namsos"
+msgstr ""
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1513
+msgid "Nankishirahama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1514
+msgid "Nanning"
+msgstr ""
+
+#: my-evolution/Locations.h:1515
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1516
+msgid "Nantucket"
+msgstr ""
+
+#: my-evolution/Locations.h:1517
+msgid "Napa"
+msgstr ""
+
+#: my-evolution/Locations.h:1518
+msgid "Naples"
+msgstr ""
+
+#: my-evolution/Locations.h:1519
+msgid "Napoli"
+msgstr ""
+
+#: my-evolution/Locations.h:1520
+msgid "Narvik"
+msgstr ""
+
+#: my-evolution/Locations.h:1521
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1524
+msgid "Nassau"
+msgstr ""
+
+#: my-evolution/Locations.h:1525
+msgid "Natal"
+msgstr ""
+
+#: my-evolution/Locations.h:1526
+msgid "Natchez"
+msgstr ""
+
+#: my-evolution/Locations.h:1527
+msgid "Nawabshah"
+msgstr ""
+
+#: my-evolution/Locations.h:1528
+msgid "Nebraska"
+msgstr ""
+
+#: my-evolution/Locations.h:1529
+msgid "Needles"
+msgstr ""
+
+#: my-evolution/Locations.h:1530
+msgid "Nenana"
+msgstr ""
+
+#: my-evolution/Locations.h:1532
+msgid "Neuquen"
+msgstr ""
+
+#: my-evolution/Locations.h:1533
+msgid "Nevada"
+msgstr ""
+
+#: my-evolution/Locations.h:1534
+msgid "Newark"
+msgstr ""
+
+#: my-evolution/Locations.h:1535
+msgid "New Bedford"
+msgstr ""
+
+#: my-evolution/Locations.h:1536
+msgid "New Bern"
+msgstr ""
+
+#: my-evolution/Locations.h:1537
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1539
+msgid "Newburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1540
+msgid "Newcastle"
+msgstr ""
+
+#: my-evolution/Locations.h:1541
+msgid "New Delhi/Palam"
+msgstr ""
+
+#: my-evolution/Locations.h:1542
+msgid "Newfoundland"
+msgstr ""
+
+#: my-evolution/Locations.h:1543
+msgid "New Hampshire"
+msgstr ""
+
+#: my-evolution/Locations.h:1544
+msgid "New Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:1545
+msgid "New Iberia"
+msgstr ""
+
+#: my-evolution/Locations.h:1546
+msgid "New Jersey"
+msgstr ""
+
+#: my-evolution/Locations.h:1547
+msgid "New Mexico"
+msgstr ""
+
+#: my-evolution/Locations.h:1548
+msgid "New Orleans"
+msgstr ""
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1550
+msgid "New Orleans NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1551
+msgid "Newport"
+msgstr ""
+
+#: my-evolution/Locations.h:1552
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1553
+msgid "New Port Richey"
+msgstr ""
+
+#: my-evolution/Locations.h:1554
+msgid "New River"
+msgstr ""
+
+#: my-evolution/Locations.h:1555
+msgid "New Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1556
+msgid "Newton"
+msgstr ""
+
+#: my-evolution/Locations.h:1557
+msgid "New York"
+msgstr ""
+
+#: my-evolution/Locations.h:1558
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1559
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1561
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1564
+msgid "Niigata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1565
+msgid "Nimes-Garons"
+msgstr ""
+
+#: my-evolution/Locations.h:1566
+msgid "Nipawin"
+msgstr ""
+
+#: my-evolution/Locations.h:1567
+msgid "Nis"
+msgstr ""
+
+#: my-evolution/Locations.h:1568
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1570
+msgid "N Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1571
+msgid "Nogales"
+msgstr ""
+
+#: my-evolution/Locations.h:1572
+msgid "Nome"
+msgstr ""
+
+#: my-evolution/Locations.h:1573
+msgid "Norfolk"
+msgstr ""
+
+#: my-evolution/Locations.h:1575
+msgid "Norfolk NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1576
+msgid "Norrkoping"
+msgstr ""
+
+#: my-evolution/Locations.h:1577
+msgid "North Adams"
+msgstr ""
+
+#: my-evolution/Locations.h:1578
+msgid "North Bend"
+msgstr ""
+
+#: my-evolution/Locations.h:1579
+msgid "North Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:1580
+msgid "North Conway"
+msgstr ""
+
+#: my-evolution/Locations.h:1581
+msgid "North Dakota"
+msgstr ""
+
+#: my-evolution/Locations.h:1582
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1583
+msgid "North Kingstown"
+msgstr ""
+
+#: my-evolution/Locations.h:1584
+msgid "North Platte"
+msgstr ""
+
+#: my-evolution/Locations.h:1585
+msgid "Northway"
+msgstr ""
+
+#: my-evolution/Locations.h:1586
+msgid "Northwest Territories"
+msgstr ""
+
+#: my-evolution/Locations.h:1588
+msgid "Norwich"
+msgstr ""
+
+#: my-evolution/Locations.h:1589
+msgid "Norwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1590
+msgid "Notodden"
+msgstr ""
+
+#: my-evolution/Locations.h:1591
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1595
+msgid "Nueva Ocotepeque"
+msgstr ""
+
+#: my-evolution/Locations.h:1596
+msgid "Nuevo Laredo"
+msgstr ""
+
+#: my-evolution/Locations.h:1597
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+msgid "Oahu"
+msgstr ""
+
+#: my-evolution/Locations.h:1600
+msgid "Oak Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:1601
+msgid "Oakland"
+msgstr ""
+
+#: my-evolution/Locations.h:1602
+msgid "Oaxaca"
+msgstr ""
+
+#: my-evolution/Locations.h:1603
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+msgid "Obihiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1605
+msgid "Ocala"
+msgstr ""
+
+#: my-evolution/Locations.h:1606
+msgid "Oceanside"
+msgstr ""
+
+#: my-evolution/Locations.h:1607
+msgid "Odense"
+msgstr ""
+
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1609
+msgid "Oelwen"
+msgstr ""
+
+#: my-evolution/Locations.h:1610
+msgid "Ogden"
+msgstr ""
+
+#: my-evolution/Locations.h:1611
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1613
+msgid "Ohio"
+msgstr ""
+
+#: my-evolution/Locations.h:1614
+msgid "Ohrid"
+msgstr ""
+
+#: my-evolution/Locations.h:1615
+msgid "Oita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1616
+msgid "Ojika Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1617
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1624
+msgid "Okushiri Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1625
+msgid "Olathe"
+msgstr ""
+
+#: my-evolution/Locations.h:1626
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1627
+msgid "Olbia"
+msgstr ""
+
+#: my-evolution/Locations.h:1628
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1629
+msgid "Omaha"
+msgstr ""
+
+#: my-evolution/Locations.h:1630
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1631
+msgid "Omak"
+msgstr ""
+
+#: my-evolution/Locations.h:1633
+msgid "Ominato Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1634
+msgid "Omsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1635
+msgid "O'Neill"
+msgstr ""
+
+#: my-evolution/Locations.h:1636
+msgid "Ontario"
+msgstr ""
+
+#: my-evolution/Locations.h:1637
+msgid "Oostende"
+msgstr ""
+
+#: my-evolution/Locations.h:1638
+msgid "Oran"
+msgstr ""
+
+#: my-evolution/Locations.h:1639
+msgid "Oran/Es Senia"
+msgstr ""
+
+#: my-evolution/Locations.h:1640
+#, fuzzy
+msgid "Orange"
+msgstr "Organiser:"
+
+#: my-evolution/Locations.h:1641
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1642
+msgid "Ord-Sharp"
+msgstr ""
+
+#: my-evolution/Locations.h:1643
+msgid "Oregon"
+msgstr ""
+
+#: my-evolution/Locations.h:1644
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1645
+msgid "Orland"
+msgstr ""
+
+#: my-evolution/Locations.h:1646
+msgid "Orlando"
+msgstr ""
+
+#: my-evolution/Locations.h:1647
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1648
+msgid "Orsta-Volda"
+msgstr ""
+
+#: my-evolution/Locations.h:1649
+msgid "Oruro"
+msgstr ""
+
+#: my-evolution/Locations.h:1650
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1652
+msgid "Oscoda"
+msgstr ""
+
+#: my-evolution/Locations.h:1653
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1657
+msgid "Ostrava"
+msgstr ""
+
+#: my-evolution/Locations.h:1658
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1661
+msgid "Owyhee"
+msgstr ""
+
+#: my-evolution/Locations.h:1662
+msgid "Oxford"
+msgstr ""
+
+#: my-evolution/Locations.h:1663
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1670
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1671
+msgid "Paganella"
+msgstr ""
+
+#: my-evolution/Locations.h:1674
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1675
+msgid "Palacios"
+msgstr ""
+
+#: my-evolution/Locations.h:1676
+msgid "Palermo"
+msgstr ""
+
+#: my-evolution/Locations.h:1677
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1678
+msgid "Palmdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1679
+msgid "Palmer"
+msgstr ""
+
+#: my-evolution/Locations.h:1680
+msgid "Palm Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1681
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1682
+msgid "Pamplona"
+msgstr ""
+
+#: my-evolution/Locations.h:1684
+msgid "Panama City"
+msgstr ""
+
+#: my-evolution/Locations.h:1685
+msgid "Pantelleria"
+msgstr ""
+
+#: my-evolution/Locations.h:1686
+msgid "Papa"
+msgstr ""
+
+#: my-evolution/Locations.h:1687
+msgid "Paphos"
+msgstr ""
+
+#: my-evolution/Locations.h:1689
+msgid "Paris"
+msgstr ""
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1692
+msgid "Paris/Orly"
+msgstr ""
+
+#: my-evolution/Locations.h:1693
+msgid "Parkersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1694
+msgid "Pasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1695
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1700
+msgid "Passo Rolle"
+msgstr ""
+
+#: my-evolution/Locations.h:1701
+msgid "Patna"
+msgstr ""
+
+#: my-evolution/Locations.h:1702
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1706
+msgid "Paysandu"
+msgstr ""
+
+#: my-evolution/Locations.h:1707
+msgid "Payson"
+msgstr ""
+
+#: my-evolution/Locations.h:1708
+msgid "Pellston"
+msgstr ""
+
+#: my-evolution/Locations.h:1709
+msgid "Pelotas"
+msgstr ""
+
+#: my-evolution/Locations.h:1710
+msgid "Pendleton"
+msgstr ""
+
+#: my-evolution/Locations.h:1711
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1716
+msgid "Peoria"
+msgstr ""
+
+#: my-evolution/Locations.h:1717
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1718
+msgid "Pereira/Matecana"
+msgstr ""
+
+#: my-evolution/Locations.h:1719
+msgid "Perm"
+msgstr ""
+
+#: my-evolution/Locations.h:1720
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1721
+msgid "Perry-Foley"
+msgstr ""
+
+#: my-evolution/Locations.h:1722
+msgid "Perth"
+msgstr ""
+
+#: my-evolution/Locations.h:1724
+msgid "Perugia"
+msgstr ""
+
+#: my-evolution/Locations.h:1725
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1730
+msgid "Philip"
+msgstr ""
+
+#: my-evolution/Locations.h:1731
+msgid "Philipsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1732
+msgid "Phillips"
+msgstr ""
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1739
+msgid "Piedras Negras"
+msgstr ""
+
+#: my-evolution/Locations.h:1740
+msgid "Pierre"
+msgstr ""
+
+#: my-evolution/Locations.h:1741
+msgid "Pietersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1742
+msgid "Pikeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1743
+msgid "Pine Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+msgid "Pirassununga"
+msgstr ""
+
+#: my-evolution/Locations.h:1747
+msgid "Pisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1748
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1753
+msgid "Plymouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1754
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+msgid "Pocos De Caldas"
+msgstr ""
+
+#: my-evolution/Locations.h:1756
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1757
+msgid "Podgorica Titograd"
+msgstr ""
+
+#: my-evolution/Locations.h:1758
+msgid "Pohang Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1759
+msgid "Point Hope"
+msgstr ""
+
+#: my-evolution/Locations.h:1760
+msgid "Point Lay"
+msgstr ""
+
+#: my-evolution/Locations.h:1761
+msgid "Point Mugu"
+msgstr ""
+
+#: my-evolution/Locations.h:1762
+msgid "Point Piedras Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1763
+msgid "Poitiers"
+msgstr ""
+
+#: my-evolution/Locations.h:1765
+msgid "Pompano Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1766
+msgid "Ponca City"
+msgstr ""
+
+#: my-evolution/Locations.h:1767
+msgid "Ponce"
+msgstr ""
+
+#: my-evolution/Locations.h:1768
+msgid "Ponta Pora"
+msgstr ""
+
+#: my-evolution/Locations.h:1769
+msgid "Pontiac"
+msgstr ""
+
+#: my-evolution/Locations.h:1770
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1771
+msgid "Poplar Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1772
+msgid "Poprad"
+msgstr ""
+
+#: my-evolution/Locations.h:1773
+msgid "Port Alexander"
+msgstr ""
+
+#: my-evolution/Locations.h:1774
+msgid "Port Alsworth"
+msgstr ""
+
+#: my-evolution/Locations.h:1775
+msgid "Port Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1776
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1777
+msgid "Port Elizabeth"
+msgstr ""
+
+#: my-evolution/Locations.h:1778
+msgid "Porterville"
+msgstr ""
+
+#: my-evolution/Locations.h:1779
+msgid "Port Hardy"
+msgstr ""
+
+#: my-evolution/Locations.h:1780
+msgid "Port Hedland"
+msgstr ""
+
+#: my-evolution/Locations.h:1781
+msgid "Port Heiden"
+msgstr ""
+
+#: my-evolution/Locations.h:1782
+msgid "Portland"
+msgstr ""
+
+#: my-evolution/Locations.h:1783
+msgid "Porto"
+msgstr ""
+
+#: my-evolution/Locations.h:1784
+msgid "Porto Alegre"
+msgstr ""
+
+#: my-evolution/Locations.h:1785
+msgid "Porto Alegre Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:1786
+msgid "Portoroz"
+msgstr ""
+
+#: my-evolution/Locations.h:1787
+msgid "Porto Santo"
+msgstr ""
+
+#: my-evolution/Locations.h:1788
+msgid "Porto Velho"
+msgstr ""
+
+#: my-evolution/Locations.h:1789
+msgid "Port Said"
+msgstr ""
+
+#: my-evolution/Locations.h:1790
+msgid "Portsmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1792
+msgid "Posadas"
+msgstr ""
+
+#: my-evolution/Locations.h:1793
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1796
+msgid "Poza Rica"
+msgstr ""
+
+#: my-evolution/Locations.h:1797
+msgid "Poznan"
+msgstr ""
+
+#: my-evolution/Locations.h:1798
+msgid "Praha"
+msgstr ""
+
+#: my-evolution/Locations.h:1799
+msgid "Pratica di Mare"
+msgstr ""
+
+#: my-evolution/Locations.h:1800
+msgid "Prescott"
+msgstr ""
+
+#: my-evolution/Locations.h:1801
+msgid "Presidente Prudente"
+msgstr ""
+
+#: my-evolution/Locations.h:1802
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1804
+msgid "Pretoria"
+msgstr ""
+
+#: my-evolution/Locations.h:1805
+msgid "Preveza"
+msgstr ""
+
+#: my-evolution/Locations.h:1806
+msgid "Price-Carbon"
+msgstr ""
+
+#: my-evolution/Locations.h:1807
+msgid "Pristina"
+msgstr ""
+
+#: my-evolution/Locations.h:1808
+msgid "Providence"
+msgstr ""
+
+#: my-evolution/Locations.h:1809
+msgid "Provincetown"
+msgstr ""
+
+#: my-evolution/Locations.h:1810
+msgid "Provo"
+msgstr ""
+
+#: my-evolution/Locations.h:1811
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1812
+msgid "Pucallpa"
+msgstr ""
+
+#: my-evolution/Locations.h:1813
+msgid "Pudahuel"
+msgstr ""
+
+#: my-evolution/Locations.h:1814
+msgid "Puebla"
+msgstr ""
+
+#: my-evolution/Locations.h:1815
+msgid "Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:1816
+msgid "Puerto Barrios"
+msgstr ""
+
+#: my-evolution/Locations.h:1817
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1818
+msgid "Puerto Escondido"
+msgstr ""
+
+#: my-evolution/Locations.h:1819
+msgid "Puerto Lempira"
+msgstr ""
+
+#: my-evolution/Locations.h:1820
+msgid "Puerto Limon"
+msgstr ""
+
+#: my-evolution/Locations.h:1821
+msgid "Puerto Maldonado"
+msgstr ""
+
+#: my-evolution/Locations.h:1822
+msgid "Puerto Montt"
+msgstr ""
+
+#: my-evolution/Locations.h:1823
+msgid "Puerto Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1825
+msgid "Puerto Suarez"
+msgstr ""
+
+#: my-evolution/Locations.h:1826
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1827
+msgid "Pula"
+msgstr ""
+
+#: my-evolution/Locations.h:1828
+msgid "Pullman"
+msgstr ""
+
+#: my-evolution/Locations.h:1829
+msgid "Punta Arenas"
+msgstr ""
+
+#: my-evolution/Locations.h:1830
+msgid "Punta Cana"
+msgstr ""
+
+#: my-evolution/Locations.h:1831
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1835
+msgid "Pyongyang"
+msgstr ""
+
+#: my-evolution/Locations.h:1837
+msgid "Quantico"
+msgstr ""
+
+#: my-evolution/Locations.h:1838
+msgid "Quebec"
+msgstr ""
+
+#: my-evolution/Locations.h:1839
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1842
+msgid "Quimper"
+msgstr ""
+
+#: my-evolution/Locations.h:1843
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1850
+msgid "Rapid City"
+msgstr ""
+
+#: my-evolution/Locations.h:1851
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1852
+msgid "Ras Al Khaimah"
+msgstr ""
+
+#: my-evolution/Locations.h:1853
+msgid "Rawlins"
+msgstr ""
+
+#: my-evolution/Locations.h:1854
+msgid "Reading"
+msgstr ""
+
+#: my-evolution/Locations.h:1855
+msgid "Rebun Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1856
+msgid "Recife"
+msgstr ""
+
+#: my-evolution/Locations.h:1857
+msgid "Red Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1858
+msgid "Redding"
+msgstr ""
+
+#: my-evolution/Locations.h:1859
+msgid "Redig"
+msgstr ""
+
+#: my-evolution/Locations.h:1860
+msgid "Redmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1861
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1863
+msgid "Reggio Calabria"
+msgstr ""
+
+#: my-evolution/Locations.h:1864
+msgid "Regina"
+msgstr ""
+
+#: my-evolution/Locations.h:1865
+msgid "Reims-Champagne"
+msgstr ""
+
+#: my-evolution/Locations.h:1866
+msgid "Rennes"
+msgstr ""
+
+#: my-evolution/Locations.h:1867
+msgid "Reno"
+msgstr ""
+
+#: my-evolution/Locations.h:1868
+msgid "Renton"
+msgstr ""
+
+#: my-evolution/Locations.h:1869
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1870
+msgid "Reus"
+msgstr ""
+
+#: my-evolution/Locations.h:1871
+msgid "Reyes"
+msgstr ""
+
+#: my-evolution/Locations.h:1872
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1873
+msgid "Reynosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1874
+msgid "Rhinelander"
+msgstr ""
+
+#: my-evolution/Locations.h:1875
+msgid "Rhode Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1876
+msgid "Riberalta"
+msgstr ""
+
+#: my-evolution/Locations.h:1877
+msgid "Richmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1878
+msgid "Rickenbacker"
+msgstr ""
+
+#: my-evolution/Locations.h:1879
+msgid "Rieti"
+msgstr ""
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rifle"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:1881
+msgid "Riga"
+msgstr ""
+
+#: my-evolution/Locations.h:1882
+msgid "Rijeka"
+msgstr ""
+
+#: my-evolution/Locations.h:1883
+msgid "Rimini"
+msgstr ""
+
+#: my-evolution/Locations.h:1884
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1885
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1886
+msgid "Rio Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1887
+msgid "Rioja"
+msgstr ""
+
+#: my-evolution/Locations.h:1888
+msgid "Rio / Jacarepagua"
+msgstr ""
+
+#: my-evolution/Locations.h:1889
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+msgid "Rishiri Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1891
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+msgid "Rivera"
+msgstr ""
+
+#: my-evolution/Locations.h:1893
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1894
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1895
+msgid "Riverton"
+msgstr ""
+
+#: my-evolution/Locations.h:1896
+msgid "Rivne"
+msgstr ""
+
+#: my-evolution/Locations.h:1897
+msgid "Rivolto"
+msgstr ""
+
+#: my-evolution/Locations.h:1898
+msgid "Riyadh"
+msgstr ""
+
+#: my-evolution/Locations.h:1899
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1900
+msgid "Roatan"
+msgstr ""
+
+#: my-evolution/Locations.h:1901
+msgid "Robore"
+msgstr ""
+
+#: my-evolution/Locations.h:1902
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1903
+msgid "Rockford"
+msgstr ""
+
+#: my-evolution/Locations.h:1904
+msgid "Rockland"
+msgstr ""
+
+#: my-evolution/Locations.h:1905
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1907
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1908
+msgid "Rodos"
+msgstr ""
+
+#: my-evolution/Locations.h:1909
+msgid "Rogers"
+msgstr ""
+
+#: my-evolution/Locations.h:1910
+msgid "Roma/Ciampino"
+msgstr ""
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1917
+msgid "Roosevelt"
+msgstr ""
+
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Roros"
+msgstr "Comoros"
+
+#: my-evolution/Locations.h:1919
+msgid "Rorvik/Ryum"
+msgstr ""
+
+#: my-evolution/Locations.h:1920
+msgid "Rosario"
+msgstr ""
+
+#: my-evolution/Locations.h:1921
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1922
+msgid "Roseglen"
+msgstr ""
+
+#: my-evolution/Locations.h:1923
+msgid "Rost"
+msgstr ""
+
+#: my-evolution/Locations.h:1924
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1927
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1928
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1929
+msgid "Rurrenabaque"
+msgstr ""
+
+#: my-evolution/Locations.h:1930
+msgid "Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1931
+msgid "Russia"
+msgstr ""
+
+#: my-evolution/Locations.h:1932
+msgid "Rutland"
+msgstr ""
+
+#: my-evolution/Locations.h:1933
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1935
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1936
+msgid "Sabine Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:1937
+msgid "Sacramento"
+msgstr ""
+
+#: my-evolution/Locations.h:1938
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1939
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1940
+msgid "Saginaw"
+msgstr ""
+
+#: my-evolution/Locations.h:1941
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1944
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1945
+msgid "Saint Mary's"
+msgstr ""
+
+#: my-evolution/Locations.h:1946
+msgid "Saint Mawgan"
+msgstr ""
+
+#: my-evolution/Locations.h:1947
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1948
+msgid "Saint Paul"
+msgstr ""
+
+#: my-evolution/Locations.h:1949
+msgid "Saiq"
+msgstr ""
+
+#: my-evolution/Locations.h:1950
+msgid "Salalah"
+msgstr ""
+
+#: my-evolution/Locations.h:1951
+msgid "Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:1952
+msgid "Salida"
+msgstr ""
+
+#: my-evolution/Locations.h:1953
+msgid "Salida-Harriet"
+msgstr ""
+
+#: my-evolution/Locations.h:1954
+msgid "Salina"
+msgstr ""
+
+#: my-evolution/Locations.h:1955
+msgid "Salinas"
+msgstr ""
+
+#: my-evolution/Locations.h:1956
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1957
+msgid "Salmon"
+msgstr ""
+
+#: my-evolution/Locations.h:1958
+msgid "Salmon (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1959
+msgid "Salta"
+msgstr ""
+
+#: my-evolution/Locations.h:1960
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1961
+msgid "Salt Lake City"
+msgstr ""
+
+#: my-evolution/Locations.h:1962
+msgid "Salto"
+msgstr ""
+
+#: my-evolution/Locations.h:1963
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+msgid "Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:1965
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1966
+msgid "Samara"
+msgstr ""
+
+#: my-evolution/Locations.h:1967
+msgid "Samos"
+msgstr ""
+
+#: my-evolution/Locations.h:1968
+msgid "Samsun"
+msgstr ""
+
+#: my-evolution/Locations.h:1969
+msgid "Sana'A"
+msgstr ""
+
+#: my-evolution/Locations.h:1970
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+msgid "San Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1975
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1976
+msgid "San Carlos"
+msgstr ""
+
+#: my-evolution/Locations.h:1977
+msgid "Sandane"
+msgstr ""
+
+#: my-evolution/Locations.h:1978
+msgid "Sandberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1979
+msgid "Sanderson"
+msgstr ""
+
+#: my-evolution/Locations.h:1980
+msgid "San Diego"
+msgstr ""
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1986
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1987
+msgid "Sand Point"
+msgstr ""
+
+#: my-evolution/Locations.h:1988
+msgid "San Fernando De Apure"
+msgstr ""
+
+#: my-evolution/Locations.h:1989
+msgid "Sanford"
+msgstr ""
+
+#: my-evolution/Locations.h:1990
+msgid "San Francisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1991
+msgid "Sangju"
+msgstr ""
+
+#: my-evolution/Locations.h:1992
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1993
+msgid "San Joaquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1994
+msgid "San Jose"
+msgstr ""
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1997
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1998
+msgid "San Juan"
+msgstr ""
+
+#: my-evolution/Locations.h:1999
+msgid "Sankt-Peterburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2000
+msgid "Sanliurfa"
+msgstr ""
+
+#: my-evolution/Locations.h:2001
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2002
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2003
+msgid "San Miguel"
+msgstr ""
+
+#: my-evolution/Locations.h:2004
+msgid "San Nicholas Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2005
+msgid "San Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:2006
+msgid "San Sebastian"
+msgstr ""
+
+#: my-evolution/Locations.h:2007
+msgid "Santa Ana"
+msgstr ""
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+msgid "Santa Maria"
+msgstr ""
+
+#: my-evolution/Locations.h:2012
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2013
+msgid "Santa Monica"
+msgstr ""
+
+#: my-evolution/Locations.h:2014
+msgid "Santander"
+msgstr ""
+
+#: my-evolution/Locations.h:2015
+msgid "Santarem"
+msgstr ""
+
+#: my-evolution/Locations.h:2016
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2017
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+msgid "Santiago"
+msgstr ""
+
+#: my-evolution/Locations.h:2019
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2020
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2021
+msgid "Santorini"
+msgstr ""
+
+#: my-evolution/Locations.h:2022
+msgid "Santos"
+msgstr ""
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+msgid "Sao Luiz"
+msgstr ""
+
+#: my-evolution/Locations.h:2025
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2028
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+msgid "Sarasota"
+msgstr ""
+
+#: my-evolution/Locations.h:2030
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+msgid "Sarzana"
+msgstr ""
+
+#: my-evolution/Locations.h:2032
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2033
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2038
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2039
+msgid "Sawyer AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2040
+msgid "Sayun"
+msgstr ""
+
+#: my-evolution/Locations.h:2041
+msgid "Scatsta"
+msgstr ""
+
+#: my-evolution/Locations.h:2042
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2045
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2046
+msgid "Scottsdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Scranton"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:2048
+msgid "Seattle"
+msgstr ""
+
+#: my-evolution/Locations.h:2049
+msgid "Seattle-Boeing"
+msgstr ""
+
+#: my-evolution/Locations.h:2050
+msgid "Sedalia"
+msgstr ""
+
+#: my-evolution/Locations.h:2051
+msgid "Seeb"
+msgstr ""
+
+#: my-evolution/Locations.h:2052
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+msgid "Sendai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2058
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2059
+msgid "Sevilla"
+msgstr ""
+
+#: my-evolution/Locations.h:2060
+msgid "Seward"
+msgstr ""
+
+#: my-evolution/Locations.h:2061
+msgid "Sexton Summit"
+msgstr ""
+
+#: my-evolution/Locations.h:2062
+msgid "Shanghai"
+msgstr ""
+
+#: my-evolution/Locations.h:2063
+msgid "Shannon"
+msgstr ""
+
+#: my-evolution/Locations.h:2064
+msgid "Sharjah"
+msgstr ""
+
+#: my-evolution/Locations.h:2065
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+#: my-evolution/Locations.h:2066
+msgid "Sharurah"
+msgstr ""
+
+#: my-evolution/Locations.h:2067
+msgid "Shawbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2068
+msgid "Shearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2069
+msgid "Sheboygan"
+msgstr ""
+
+#: my-evolution/Locations.h:2070
+msgid "Sheldon"
+msgstr ""
+
+#: my-evolution/Locations.h:2071
+msgid "Shelter Cove"
+msgstr ""
+
+#: my-evolution/Locations.h:2072
+msgid "Shelton"
+msgstr ""
+
+#: my-evolution/Locations.h:2073
+msgid "Shenandoah"
+msgstr ""
+
+#: my-evolution/Locations.h:2074
+msgid "Sheridan"
+msgstr ""
+
+#: my-evolution/Locations.h:2075
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2076
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2077
+msgid "Shingle Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2078
+msgid "Shiraz"
+msgstr ""
+
+#: my-evolution/Locations.h:2079
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2080
+msgid "Shizuhama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2081
+msgid "Shoreham"
+msgstr ""
+
+#: my-evolution/Locations.h:2082
+msgid "Show Low"
+msgstr ""
+
+#: my-evolution/Locations.h:2083
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2084
+msgid "Shreveport Regional"
+msgstr ""
+
+#: my-evolution/Locations.h:2085
+msgid "Sidney"
+msgstr ""
+
+#: my-evolution/Locations.h:2086
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2087
+msgid "Siloam Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2088
+msgid "Silver City"
+msgstr ""
+
+#: my-evolution/Locations.h:2089
+msgid "Sindal"
+msgstr ""
+
+#: my-evolution/Locations.h:2091
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2097
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2098
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+#: my-evolution/Locations.h:2099
+msgid "Skive"
+msgstr ""
+
+#: my-evolution/Locations.h:2100
+msgid "Skopje"
+msgstr ""
+
+#: my-evolution/Locations.h:2101
+msgid "Skwentna"
+msgstr ""
+
+#: my-evolution/Locations.h:2102
+msgid "Slana"
+msgstr ""
+
+#: my-evolution/Locations.h:2105
+msgid "Smithers"
+msgstr ""
+
+#: my-evolution/Locations.h:2106
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2107
+msgid "Snowshoe Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2108
+msgid "Sochi"
+msgstr ""
+
+#: my-evolution/Locations.h:2109
+msgid "Socorro"
+msgstr ""
+
+#: my-evolution/Locations.h:2110
+msgid "Socotra"
+msgstr ""
+
+#: my-evolution/Locations.h:2111
+msgid "Soda Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2112
+msgid "Sofia"
+msgstr ""
+
+#: my-evolution/Locations.h:2113
+msgid "Sogndal"
+msgstr ""
+
+#: my-evolution/Locations.h:2114
+msgid "Soldotna"
+msgstr ""
+
+#: my-evolution/Locations.h:2115
+msgid "Somerset"
+msgstr ""
+
+#: my-evolution/Locations.h:2116
+msgid "Sonderborg"
+msgstr ""
+
+#: my-evolution/Locations.h:2117
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2120
+msgid "Southampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2121
+msgid "South Bend"
+msgstr ""
+
+#: my-evolution/Locations.h:2122
+msgid "South Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:2123
+msgid "South Dakota"
+msgstr ""
+
+#: my-evolution/Locations.h:2124
+msgid "Southend"
+msgstr ""
+
+#: my-evolution/Locations.h:2125
+msgid "South Marsh Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2126
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2128
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2129
+msgid "Spencer"
+msgstr ""
+
+#: my-evolution/Locations.h:2130
+msgid "Spickard"
+msgstr ""
+
+#: my-evolution/Locations.h:2131
+msgid "Split"
+msgstr ""
+
+#: my-evolution/Locations.h:2132
+msgid "Spokane"
+msgstr ""
+
+#: my-evolution/Locations.h:2133
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2134
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "Springfield"
+msgstr "Synchronising folder"
+
+#: my-evolution/Locations.h:2136
+msgid "Stampede Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:2137
+msgid "State College"
+msgstr ""
+
+#: my-evolution/Locations.h:2138
+msgid "Stauning"
+msgstr ""
+
+#: my-evolution/Locations.h:2139
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2140
+msgid "Stavanger/Sola"
+msgstr ""
+
+#: my-evolution/Locations.h:2141
+msgid "Staverton"
+msgstr ""
+
+#: my-evolution/Locations.h:2142
+msgid "Stavropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2143
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2144
+msgid "Steamboat Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2145
+msgid "Stephenville"
+msgstr ""
+
+#: my-evolution/Locations.h:2146
+msgid "St. George"
+msgstr ""
+
+#: my-evolution/Locations.h:2147
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2148
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2149
+msgid "St Johnsbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2150
+msgid "St Joseph"
+msgstr ""
+
+#: my-evolution/Locations.h:2151
+msgid "St Louis"
+msgstr ""
+
+#: my-evolution/Locations.h:2152
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2157
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2158
+msgid "Storm Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2159
+msgid "Stornoway"
+msgstr ""
+
+#: my-evolution/Locations.h:2160
+msgid "St Paul"
+msgstr ""
+
+#: my-evolution/Locations.h:2161
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2164
+msgid "Strevell"
+msgstr ""
+
+#: my-evolution/Locations.h:2165
+msgid "St Simon's Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2166
+msgid "Stumpy Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2167
+msgid "Sturgeon Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:2168
+msgid "Stuttgart"
+msgstr ""
+
+#: my-evolution/Locations.h:2169
+msgid "Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:2170
+msgid "Sumburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:2171
+msgid "Sumter"
+msgstr ""
+
+#: my-evolution/Locations.h:2172
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2174
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2175
+msgid "Superior"
+msgstr ""
+
+#: my-evolution/Locations.h:2177
+msgid "Sutton"
+msgstr ""
+
+#: my-evolution/Locations.h:2178
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2179
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2188
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2189
+msgid "Szombathely"
+msgstr ""
+
+#: my-evolution/Locations.h:2190
+msgid "Tabatinga"
+msgstr ""
+
+#: my-evolution/Locations.h:2191
+msgid "Tabriz"
+msgstr ""
+
+#: my-evolution/Locations.h:2192
+msgid "Tabuk"
+msgstr ""
+
+#: my-evolution/Locations.h:2193
+msgid "Tachikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+msgid "Tacna"
+msgstr ""
+
+#: my-evolution/Locations.h:2195
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2199
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+msgid "Taejon"
+msgstr ""
+
+#: my-evolution/Locations.h:2201
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2202
+msgid "Taichung"
+msgstr ""
+
+#: my-evolution/Locations.h:2203
+msgid "Taif"
+msgstr ""
+
+#: my-evolution/Locations.h:2204
+msgid "Tainan"
+msgstr ""
+
+#: my-evolution/Locations.h:2206
+msgid "Taiyuan"
+msgstr ""
+
+#: my-evolution/Locations.h:2207
+msgid "Taiz"
+msgstr ""
+
+#: my-evolution/Locations.h:2208
+msgid "Tajima"
+msgstr ""
+
+#: my-evolution/Locations.h:2209
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Talara"
+msgstr ""
+
+#: my-evolution/Locations.h:2211
+msgid "Talinn"
+msgstr ""
+
+#: my-evolution/Locations.h:2212
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tallahassee"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2215
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2216
+msgid "Tampa"
+msgstr ""
+
+#: my-evolution/Locations.h:2217
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2218
+msgid "Tampere"
+msgstr ""
+
+#: my-evolution/Locations.h:2219
+msgid "Tampico"
+msgstr ""
+
+#: my-evolution/Locations.h:2220
+msgid "Tanana"
+msgstr ""
+
+#: my-evolution/Locations.h:2221
+msgid "Tanegashima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2222
+msgid "Taos"
+msgstr ""
+
+#: my-evolution/Locations.h:2223
+msgid "Taoyuan"
+msgstr ""
+
+#: my-evolution/Locations.h:2224
+msgid "Tapachula"
+msgstr ""
+
+#: my-evolution/Locations.h:2225
+msgid "Taranto"
+msgstr ""
+
+#: my-evolution/Locations.h:2226
+msgid "Tarbes"
+msgstr ""
+
+#: my-evolution/Locations.h:2227
+msgid "Tarija"
+msgstr ""
+
+#: my-evolution/Locations.h:2228
+msgid "Tarvisio"
+msgstr ""
+
+#: my-evolution/Locations.h:2229
+msgid "Tatalina"
+msgstr ""
+
+#: my-evolution/Locations.h:2230
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2235
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2236
+msgid "Tela"
+msgstr ""
+
+#: my-evolution/Locations.h:2237
+msgid "Temple"
+msgstr ""
+
+#: my-evolution/Locations.h:2238
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2244
+msgid "Texarkana"
+msgstr ""
+
+#: my-evolution/Locations.h:2245
+msgid "Texas"
+msgstr ""
+
+#: my-evolution/Locations.h:2246
+msgid "The Dalles"
+msgstr ""
+
+#: my-evolution/Locations.h:2247
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2248
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2249
+msgid "Thiruvananthapuram"
+msgstr ""
+
+#: my-evolution/Locations.h:2250
+msgid "Thisted"
+msgstr ""
+
+#: my-evolution/Locations.h:2251
+msgid "Thompson Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2252
+msgid "Thumrait"
+msgstr ""
+
+#: my-evolution/Locations.h:2253
+msgid "Tianjin"
+msgstr ""
+
+#: my-evolution/Locations.h:2254
+msgid "Tijuana"
+msgstr ""
+
+#: my-evolution/Locations.h:2255
+msgid "Timisoara"
+msgstr ""
+
+#: my-evolution/Locations.h:2256
+msgid "Tin City"
+msgstr ""
+
+#: my-evolution/Locations.h:2257
+msgid "Tirana"
+msgstr ""
+
+#: my-evolution/Locations.h:2258
+msgid "Tiree"
+msgstr ""
+
+#: my-evolution/Locations.h:2259
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2260
+msgid "Tiruchchirapalli"
+msgstr ""
+
+#: my-evolution/Locations.h:2261
+msgid "Titusville"
+msgstr ""
+
+#: my-evolution/Locations.h:2262
+msgid "Tivat"
+msgstr ""
+
+#: my-evolution/Locations.h:2263
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2267
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+msgid "Tokunoshima Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2269
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2271
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2272
+msgid "Tokyo New International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2273
+msgid "Toledo"
+msgstr ""
+
+#: my-evolution/Locations.h:2274
+msgid "Toluca"
+msgstr ""
+
+#: my-evolution/Locations.h:2275
+msgid "Tonopah"
+msgstr ""
+
+#: my-evolution/Locations.h:2276
+msgid "Topeka"
+msgstr ""
+
+#: my-evolution/Locations.h:2277
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2279
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2280
+msgid "Toronto"
+msgstr ""
+
+#: my-evolution/Locations.h:2281
+msgid "Torp"
+msgstr ""
+
+#: my-evolution/Locations.h:2282
+msgid "Torrance"
+msgstr ""
+
+#: my-evolution/Locations.h:2283
+msgid "Torreon"
+msgstr ""
+
+#: my-evolution/Locations.h:2284
+msgid "Tottori Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2285
+msgid "Toulouse"
+msgstr ""
+
+#: my-evolution/Locations.h:2286
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2290
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2291
+msgid "Trabzon"
+msgstr ""
+
+#: my-evolution/Locations.h:2292
+msgid "Trapani"
+msgstr ""
+
+#: my-evolution/Locations.h:2293
+msgid "Traverse City"
+msgstr ""
+
+#: my-evolution/Locations.h:2294
+msgid "Trelew"
+msgstr ""
+
+#: my-evolution/Locations.h:2295
+msgid "Trenton"
+msgstr ""
+
+#: my-evolution/Locations.h:2296
+msgid "Trevico"
+msgstr ""
+
+#: my-evolution/Locations.h:2297
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2298
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2299
+msgid "Trieste"
+msgstr ""
+
+#: my-evolution/Locations.h:2300
+msgid "Trinidad"
+msgstr ""
+
+#: my-evolution/Locations.h:2301
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2304
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2305
+msgid "Troyes/Barberey"
+msgstr ""
+
+#: my-evolution/Locations.h:2306
+msgid "Truckee"
+msgstr ""
+
+#: my-evolution/Locations.h:2307
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2314
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2315
+msgid "Tulancingo"
+msgstr ""
+
+#: my-evolution/Locations.h:2316
+msgid "Tulcea"
+msgstr ""
+
+#: my-evolution/Locations.h:2317
+msgid "Tulsa"
+msgstr ""
+
+#: my-evolution/Locations.h:2318
+msgid "Tupelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2319
+msgid "Turaif"
+msgstr ""
+
+#: my-evolution/Locations.h:2320
+msgid "Turin"
+msgstr ""
+
+#: my-evolution/Locations.h:2322
+msgid "Turku"
+msgstr ""
+
+#: my-evolution/Locations.h:2323
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2324
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+#: my-evolution/Locations.h:2325
+msgid "Twenthe"
+msgstr ""
+
+#: my-evolution/Locations.h:2326
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2327
+msgid "Twin Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2328
+msgid "Tyler"
+msgstr ""
+
+#: my-evolution/Locations.h:2329
+msgid "Tyndall AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2330
+msgid "Tyumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2331
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2332
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2340
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2341
+msgid "United Arab Emirates "
+msgstr ""
+
+#: my-evolution/Locations.h:2344
+msgid "Unst"
+msgstr ""
+
+#: my-evolution/Locations.h:2345
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2346
+msgid "Uruapan"
+msgstr ""
+
+#: my-evolution/Locations.h:2347
+msgid "Uruguaiana"
+msgstr ""
+
+#: my-evolution/Locations.h:2349
+msgid "Urumqi"
+msgstr ""
+
+#: my-evolution/Locations.h:2350
+msgid "Utah"
+msgstr ""
+
+#: my-evolution/Locations.h:2351
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2353
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:2355
+msgid "Vadso"
+msgstr ""
+
+#: my-evolution/Locations.h:2356
+msgid "Vaerlose"
+msgstr ""
+
+#: my-evolution/Locations.h:2357
+msgid "Vagar"
+msgstr ""
+
+#: my-evolution/Locations.h:2358
+msgid "Valdez 2"
+msgstr ""
+
+#: my-evolution/Locations.h:2359
+msgid "Valdosta"
+msgstr ""
+
+#: my-evolution/Locations.h:2360
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2361
+msgid "Valencia"
+msgstr ""
+
+#: my-evolution/Locations.h:2362
+msgid "Valentine"
+msgstr ""
+
+#: my-evolution/Locations.h:2363
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2366
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2367
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2368
+msgid "Van"
+msgstr ""
+
+#: my-evolution/Locations.h:2369
+msgid "Vancouver"
+msgstr ""
+
+#: my-evolution/Locations.h:2370
+msgid "Vandel"
+msgstr ""
+
+#: my-evolution/Locations.h:2371
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2373
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+msgid "Varadero"
+msgstr ""
+
+#: my-evolution/Locations.h:2375
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2376
+msgid "Varna"
+msgstr ""
+
+#: my-evolution/Locations.h:2377
+msgid "Vasteras"
+msgstr ""
+
+#: my-evolution/Locations.h:2378
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2379
+msgid "Venezia"
+msgstr ""
+
+#: my-evolution/Locations.h:2381
+msgid "Venice"
+msgstr ""
+
+#: my-evolution/Locations.h:2382
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2383
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2384
+msgid "Vermont"
+msgstr ""
+
+#: my-evolution/Locations.h:2385
+msgid "Vernal"
+msgstr ""
+
+#: my-evolution/Locations.h:2386
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+msgid "Vicenza"
+msgstr ""
+
+#: my-evolution/Locations.h:2388
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2390
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2393
+msgid "Vigo"
+msgstr ""
+
+#: my-evolution/Locations.h:2394
+msgid "Vilhena"
+msgstr ""
+
+#: my-evolution/Locations.h:2395
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+msgid "Villahermosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2398
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2404
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+msgid "Visalia"
+msgstr ""
+
+#: my-evolution/Locations.h:2406
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2410
+msgid "Vladivostok"
+msgstr ""
+
+#: my-evolution/Locations.h:2411
+msgid "Vlieland"
+msgstr ""
+
+#: my-evolution/Locations.h:2412
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2413
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2414
+msgid "Volkel"
+msgstr ""
+
+#: my-evolution/Locations.h:2415
+msgid "Volk Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2416
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2417
+msgid "Voslau"
+msgstr ""
+
+#: my-evolution/Locations.h:2418
+msgid "Waco"
+msgstr ""
+
+#: my-evolution/Locations.h:2419
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2423
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2424
+msgid "Wallops Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2425
+msgid "Walnut Ridge"
+msgstr ""
+
+#: my-evolution/Locations.h:2426
+msgid "Warner Robins"
+msgstr ""
+
+#: my-evolution/Locations.h:2427
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2429
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2430
+msgid "Washington/Dulles"
+msgstr ""
+
+#: my-evolution/Locations.h:2431
+msgid "Waterbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2432
+msgid "Waterloo"
+msgstr ""
+
+#: my-evolution/Locations.h:2433
+msgid "Watertown"
+msgstr ""
+
+#: my-evolution/Locations.h:2434
+msgid "Waterville"
+msgstr ""
+
+#: my-evolution/Locations.h:2435
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+msgid "Wausau"
+msgstr ""
+
+#: my-evolution/Locations.h:2437
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2438
+msgid "Waynesboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2439
+msgid "Webster City"
+msgstr ""
+
+#: my-evolution/Locations.h:2440
+msgid "Wejh"
+msgstr ""
+
+#: my-evolution/Locations.h:2441
+msgid "Wellington"
+msgstr ""
+
+#: my-evolution/Locations.h:2442
+msgid "Wenatchee"
+msgstr ""
+
+#: my-evolution/Locations.h:2443
+msgid "Wendover"
+msgstr ""
+
+#: my-evolution/Locations.h:2444
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2445
+msgid "West Burke"
+msgstr ""
+
+#: my-evolution/Locations.h:2446
+msgid "Westerland"
+msgstr ""
+
+#: my-evolution/Locations.h:2447
+msgid "Westfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2448
+msgid "Westhampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2449
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2451
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2452
+msgid "West Yellowstone (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2453
+msgid "Wheeling"
+msgstr ""
+
+#: my-evolution/Locations.h:2454
+msgid "Whidbey Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2455
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2461
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2462
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2463
+msgid "Wick"
+msgstr ""
+
+#: my-evolution/Locations.h:2464
+msgid "Wien"
+msgstr ""
+
+#: my-evolution/Locations.h:2465
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2467
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2468
+msgid "Williamsport"
+msgstr ""
+
+#: my-evolution/Locations.h:2469
+msgid "Williston"
+msgstr ""
+
+#: my-evolution/Locations.h:2470
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2472
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2473
+msgid "Winchester"
+msgstr ""
+
+#: my-evolution/Locations.h:2474
+msgid "Windsor"
+msgstr ""
+
+#: my-evolution/Locations.h:2475
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2478
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+msgid "Winslow"
+msgstr ""
+
+#: my-evolution/Locations.h:2480
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2481
+msgid "Winter Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:2482
+msgid "Winter Park"
+msgstr ""
+
+#: my-evolution/Locations.h:2483
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+msgid "Wisconsin"
+msgstr ""
+
+#: my-evolution/Locations.h:2485
+msgid "Wisconsin Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:2486
+msgid "Wise"
+msgstr ""
+
+#: my-evolution/Locations.h:2487
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2488
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2489
+msgid "Woong Cheon"
+msgstr ""
+
+#: my-evolution/Locations.h:2490
+msgid "Wooster"
+msgstr ""
+
+#: my-evolution/Locations.h:2491
+msgid "Worcester"
+msgstr ""
+
+#: my-evolution/Locations.h:2492
+msgid "Worland"
+msgstr ""
+
+#: my-evolution/Locations.h:2493
+msgid "Worthington"
+msgstr ""
+
+#: my-evolution/Locations.h:2494
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2495
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2496
+msgid "Wuchia Observatory"
+msgstr ""
+
+#: my-evolution/Locations.h:2497
+msgid "Wyoming"
+msgstr ""
+
+#: my-evolution/Locations.h:2498
+msgid "Xiamen"
+msgstr ""
+
+#: my-evolution/Locations.h:2499
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2505
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2506
+msgid "Yankton"
+msgstr ""
+
+#: my-evolution/Locations.h:2507
+msgid "Yao Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2508
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2510
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2511
+msgid "Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2513
+msgid "Yenbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2514
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2522
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2528
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2529
+msgid "Zacatecas"
+msgstr ""
+
+#: my-evolution/Locations.h:2530
+msgid "Zadar"
+msgstr ""
+
+#: my-evolution/Locations.h:2531
+msgid "Zagreb"
+msgstr ""
+
+#: my-evolution/Locations.h:2532
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2533
+msgid "Zama Airfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2534
+msgid "Zanesville"
+msgstr ""
+
+#: my-evolution/Locations.h:2535
+msgid "Zaragoza"
+msgstr ""
+
+#: my-evolution/Locations.h:2536
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2537
+msgid "Zuni Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:2538
+msgid "Zurich"
+msgstr ""
+
+#: 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 ""
 
-#: 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:400
 msgid "%k:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:379
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-calendar.c:420
+msgid "No description"
+msgstr ""
+
+#: my-evolution/e-summary-mail.c:151
 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
+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:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:953
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:957
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1503
-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:300
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:528
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:248
+#: my-evolution/e-summary-shown.c:463
+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:487 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:287
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr ""
 
@@ -9873,23 +21994,23 @@ msgstr ""
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#: 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:501
 msgid "Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr ""
-
 #: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:488
+msgid "Please wait..."
+msgstr ""
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr ""
 
@@ -9897,42 +22018,10 @@ msgstr ""
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:66
+#: my-evolution/main.c:65
 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
-msgid "miles"
-msgstr ""
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr ""
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr ""
@@ -10331,11 +22420,6 @@ msgstr ""
 msgid "Freezing ice pellets"
 msgstr ""
 
-#. HAIL
-#: my-evolution/metar.c:217
-msgid "Hail"
-msgstr ""
-
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
@@ -11081,164 +23165,136 @@ msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr ""
-
-#: 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 ""
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 msgid "S_how full path for folders"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _today's tasks"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr ""
-
-#: 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
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 msgid "_News Feeds"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
+msgid "Configuration control for Evolution default folders."
 msgstr ""
 
-#: shell/e-activity-handler.c:200
-msgid "Show Details"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+msgid "Default Folders"
 msgstr ""
 
-#: shell/e-activity-handler.c:202
-msgid "Cancel Operation"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+msgid "The Evolution shell."
 msgstr ""
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
 msgstr ""
 
-#: shell/e-local-storage.c:175
-msgid "Outbox"
+#: shell/e-activity-handler.c:162
+msgid "Show Details"
 msgstr ""
 
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
+#: shell/e-activity-handler.c:164
+msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr ""
 
-#: 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 ""
 
-#: 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:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11246,14 +23302,38 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:281
+#: shell/e-setup.c:282
+#, c-format
+msgid ""
+"Evolution could not create directory\n"
+"%s:\n"
+"%s"
+msgstr ""
+
+#: 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:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11261,7 +23341,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:295
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11270,7 +23350,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:320
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11278,96 +23358,98 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-about-box.c:40
-msgid "Evolution "
-msgstr ""
-
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr ""
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Synchronising folder failed: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr "Can not get folder: %s: %s"
+
+#: 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: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 ""
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:148
+#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:267
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -11377,11 +23459,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:359
+#: shell/e-shell-folder-selection-dialog.c:376
 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:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr ""
 
@@ -11398,7 +23480,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
+#: 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 ""
 
@@ -11419,98 +23501,103 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:397
+#: shell/e-shell-importer.c:409
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+msgid "Evolution Error"
+msgstr ""
+
+#: shell/e-shell-importer.c:420
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:424
+#: shell/e-shell-importer.c:435
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:445
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:453
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:466
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:485
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:502
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:572
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:623
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:617
+#: shell/e-shell-importer.c:628
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:638
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:663
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:667
 msgid "Import a single file"
 msgstr ""
 
-#: 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
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: 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
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: 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
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1014
+#: shell/e-shell-importer.c:1027
 msgid "Select folder"
 msgstr ""
 
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1028
 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:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
@@ -11530,6 +23617,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr ""
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr ""
@@ -11546,89 +23639,88 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/e-shell-view-menu.c:409
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:410
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:530
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:531
+#: shell/e-shell-view-menu.c:566
 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 ""
-
-#: shell/e-shell-view-menu.c:570
-#, c-format
-msgid "Error executing %s."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:672
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: shell/e-shell-view.c:1630
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: 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 ""
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11636,19 +23728,23 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr ""
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr ""
 
@@ -11763,74 +23859,71 @@ msgstr ""
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
 msgstr ""
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr ""
 
-#: 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:491
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr ""
 
-#: 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:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr ""
 
-#: 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:505
 msgid "Operation not supported"
 msgstr ""
 
-#: 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: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 ""
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Can not create folder lock on %s: %s"
@@ -11841,94 +23934,101 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, 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/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:124
-#, 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"
+#: shell/evolution-test-component.c:47
+msgid "Test type"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
@@ -12044,291 +24144,263 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #: shell/main.c:89
+msgid "Evolution"
+msgstr ""
+
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:290
+#: shell/main.c:318
+msgid "Start in offline mode"
+msgstr ""
+
+#: shell/main.c:319
+msgid "Start in online mode"
+msgstr ""
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Can not initialise the Bonobo component system."
 
+#: tools/evolution-addressbook-abuse.c:80
 #: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr ""
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr ""
 
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr ""
+
 #: tools/evolution-addressbook-import.c:80
 msgid "No filename provided."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
+#: ui/evolution-addressbook.xml.h:3
+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:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Create new contact"
+#: ui/evolution-addressbook.xml.h:5
+msgid "Copy to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:5
-msgid "Create new contact list"
+#: ui/evolution-addressbook.xml.h:6
+msgid "Create new contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
+#: 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:9 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
+#: ui/evolution-addressbook.xml.h:13
+msgid "Move Contact(s) to Another Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
+#: ui/evolution-addressbook.xml.h:14
+msgid "Move to Folder..."
 msgstr ""
 
-#: 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:17
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: 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:22
 msgid "Save selected contacts as a VCard."
 msgstr ""
 
-#: 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:24
 msgid "Select all contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr ""
-
-#: 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:26
 msgid "Send message to contact"
 msgstr ""
 
-#: 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:28
 msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
-#: 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
-msgid "_Actions"
-msgstr ""
-
 #: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
+msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
+#: 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
+msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr ""
 
-#: 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 ""
 
-#: 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..."
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
+#: ui/evolution-addressbook.xml.h:45
+msgid "_Send Message to Contact..."
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a New _Task"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr ""
 
-#: 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:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr ""
 
-#: 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:8
 msgid "Go forward"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr ""
 
-#: 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:12
 msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr ""
-
-#: 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:16 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr ""
 
-#: 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:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr ""
 
-#: 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:21
 msgid "Show one week"
 msgstr ""
 
-#: 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:23
 msgid "Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr ""
-
 #: 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
@@ -12358,18 +24430,18 @@ msgstr ""
 msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
+#: 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 ""
 
-#: 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
-msgid "Save"
+#: 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-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 ""
 
@@ -12385,8 +24457,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:40
 msgid "_File"
 msgstr ""
 
@@ -12395,7 +24467,7 @@ msgid "Print En_velope..."
 msgstr ""
 
 #: 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 ""
@@ -12404,10 +24476,14 @@ msgstr ""
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+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 ""
 
@@ -12467,6 +24543,10 @@ 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 ""
@@ -12476,82 +24556,54 @@ msgid "Compose _New Message"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: 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:6
 msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr ""
 
-#: 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
-msgid "New Message"
-msgstr ""
-
-#: 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:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr ""
-
-#: 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:11
 msgid "Show message preview window"
 msgstr ""
 
-#: 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:13
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr ""
 
@@ -12644,11 +24696,11 @@ msgstr ""
 msgid "Threaded Message list"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr ""
 
@@ -12665,211 +24717,215 @@ msgid "_Threaded Message List"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "Apply filter rules to the selected messages"
+msgid "A_dd Sender to Addressbook"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:2
-msgid "Compose a reply to all of the recipients of the selected message"
+msgid "A_pply Filters"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Compose a reply to the mailing list of the selected message"
+msgid "Add Sender to Addressbook"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:4
-msgid "Compose a reply to the sender of the selected message"
+msgid "Apply filter rules to the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:6
-msgid "Copy selected messages to another folder"
+#: 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:7
-msgid "Create _Virtual Folder From Message"
+#: 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:8
-msgid "Create a rule to filter messages from this sender"
+#: 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:9
-msgid "Create a rule to filter messages to these recipients"
+msgid "Copy selected messages to another folder"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:10
-msgid "Create a rule to filter messages to this mailing list"
+msgid "Create _Virtual Folder From Message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:11
-msgid "Create a rule to filter messages with this subject"
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:12
-msgid "Create a virtual folder for these recipients"
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:13
-msgid "Create a virtual folder for this mailing list"
+msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:14
-msgid "Create a virtual folder for this sender"
+msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:15
-msgid "Create a virtual folder for this subject"
+msgid "Create a virtual folder for these recipients"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:16
-msgid "Decrease the text size"
+msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:18
-msgid "Display the next important message"
+#: ui/evolution-mail-message.xml.h:17
+msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:19
-msgid "Display the next message"
+#: ui/evolution-mail-message.xml.h:18
+msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:20
-msgid "Display the next unread message"
+#: ui/evolution-mail-message.xml.h:19
+msgid "Decrease the text size"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:21
-msgid "Display the next unread thread"
+msgid "Display the next important message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:22
-msgid "Display the previous important message"
+msgid "Display the next message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:23
-msgid "Display the previous message"
+msgid "Display the next unread message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:24
-msgid "Display the previous unread message"
+msgid "Display the next unread thread"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:25
-msgid "Filter on Mailing _List..."
+msgid "Display the previous important message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:26
-msgid "Filter on Se_nder..."
+msgid "Display the previous message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:27
-msgid "Filter on _Recipients..."
+msgid "Display the previous unread message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:28
-msgid "Filter on _Subject..."
+msgid "F_orward"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:29
-msgid "Force images in HTML mail to be loaded"
+msgid "Filter on Mailing _List..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:30
-msgid "Forward"
+msgid "Filter on Se_nder..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:31
-msgid "Forward As"
+msgid "Filter on _Recipients..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:32
-msgid "Forward _Attached"
+msgid "Filter on _Subject..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Inline"
+msgid "Flag selected message(s) for follow-up"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Quoted"
+msgid "Follow _Up..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: 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:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: 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-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:45
-msgid "Mark as Unimp_ortant"
+msgid "Mark as U_nread"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:46
-msgid "Mark the selected messages as having been read"
+msgid "Mark as Unimp_ortant"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:47
-msgid "Mark the selected messages as important"
+msgid "Mark the selected message(s) as having been read"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as not having been read"
+msgid "Mark the selected message(s) as important"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected messages as unimportant"
+msgid "Mark the selected message(s) as not having been read"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages for deletion"
+msgid "Mark the selected message(s) as unimportant"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:51
-msgid "Move"
+msgid "Mark the selected messages for deletion"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:52
-msgid "Move selected messages to another folder"
+msgid "Move"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:53
-msgid "Next"
+msgid "Move selected message(s) to another folder"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
+msgid "Next"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
+msgid "Next _Important Message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+msgid "Next _Thread"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+msgid "Next _Unread Message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:58
@@ -12885,159 +24941,178 @@ msgid "Original Si_ze"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:61
-msgid "Preview the message to be printed"
+msgid "P_revious Unread Message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
+msgid "Pr_evious Important Message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
+msgid "Preview the message to be printed"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
+msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Print this message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:68
-msgid "Print this message"
+msgid "Re_direct"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
+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-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr ""
 
-#: 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-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-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 ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr ""
 
-#: 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-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr ""
 
-#: 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-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
+#: ui/evolution-mail-message.xml.h:92
+msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
+msgid "_Go To"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:99
+msgid "_Inline"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:103
+msgid "_Next Message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+msgid "_Previous Message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:108
+msgid "_Quoted"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr ""
 
+#: 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 ""
 
 #: 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:36
 msgid "_Close"
 msgstr ""
 
 #: 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:56
 msgid "_View"
 msgstr ""
 
@@ -13061,11 +25136,11 @@ msgstr ""
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -13081,6 +25156,10 @@ msgstr ""
 msgid "Insert text file..."
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr ""
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr ""
@@ -13114,7 +25193,7 @@ msgid "Save in folder..."
 msgstr ""
 
 #: 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 ""
 
@@ -13139,6 +25218,7 @@ msgid "Send _later"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr ""
 
@@ -13207,7 +25287,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr ""
 
@@ -13219,11 +25299,7 @@ msgstr ""
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr ""
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr ""
 
@@ -13279,32 +25355,36 @@ msgstr ""
 msgid "Re_fresh Task"
 msgstr ""
 
-#: 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:3
 msgid "Copy selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete completed tasks"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+msgid "Mar_k as Complete"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings..."
+#: ui/evolution-tasks.xml.h:11
+msgid "Previews the list of tasks to be printed"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
+#: ui/evolution-tasks.xml.h:13
+msgid "Print the list of tasks"
 msgstr ""
 
 #: ui/evolution.xml.h:1
@@ -13372,113 +25452,117 @@ msgid "Open this folder in an other window"
 msgstr ""
 
 #: ui/evolution.xml.h:21
-msgid "Show information about Ximian Evolution"
+msgid "Send / Receive"
 msgstr ""
 
 #: ui/evolution.xml.h:22
-msgid "Submit Bug Report"
+msgid "Send queued items and retrieve new items"
 msgstr ""
 
 #: ui/evolution.xml.h:23
-msgid "Submit _Bug Report"
+msgid "Show information about Ximian Evolution"
 msgstr ""
 
 #: ui/evolution.xml.h:24
-msgid "Submit a bug report using Bug Buddy"
+msgid "Submit Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:25
-msgid "Toggle"
+msgid "Submit _Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:26
-msgid "Toggle whether to show the folder bar"
+msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
 #: ui/evolution.xml.h:27
-msgid "Toggle whether to show the shortcut bar"
+msgid "Toggle"
 msgstr ""
 
 #: ui/evolution.xml.h:28
-msgid "Toggle whether we are working offline."
+msgid "Toggle whether to show the folder bar"
 msgstr ""
 
 #: ui/evolution.xml.h:29
-msgid "View the selected folder"
+msgid "Toggle whether to show the shortcut bar"
+msgstr ""
+
+#: ui/evolution.xml.h:30
+msgid "Toggle whether we are working offline."
 msgstr ""
 
 #: ui/evolution.xml.h:31
+msgid "View the selected folder"
+msgstr ""
+
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr ""
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr ""
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr ""
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr ""
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:47
-msgid "_Shortcut"
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:48
-msgid "_Shortcut Bar"
+#: ui/evolution.xml.h:53
+msgid "_Shortcut"
 msgstr ""
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
+#: ui/evolution.xml.h:54
+msgid "_Shortcut Bar"
 msgstr ""
 
-#: 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/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr ""
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr ""
@@ -13492,18 +25576,26 @@ msgid "Phone List"
 msgstr ""
 
 #: views/mail/galview.xml.h:1
-msgid "By Sender"
+msgid "As Sent Folder"
 msgstr ""
 
 #: views/mail/galview.xml.h:2
-msgid "By Status"
+msgid "By Follow Up Flag"
 msgstr ""
 
 #: views/mail/galview.xml.h:3
-msgid "By Subject"
+msgid "By Sender"
 msgstr ""
 
 #: views/mail/galview.xml.h:4
+msgid "By Status"
+msgstr ""
+
+#: views/mail/galview.xml.h:5
+msgid "By Subject"
+msgstr ""
+
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr ""
 
@@ -13511,6 +25603,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 ""
+
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "Select a Time Zone"
 msgstr ""
@@ -13530,11 +25628,20 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+msgid "Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr ""
 
@@ -13566,76 +25673,80 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr ""
 
-#: 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 ""
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
+#: widgets/misc/e-charset-picker.c:95
+msgid "Visual"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:201
+#: 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:281
 msgid "Other..."
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr ""
 
@@ -13643,24 +25754,20 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: 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:162
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr ""
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
+#: widgets/misc/e-filter-bar.h:97
+msgid "_Save Search..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
+#: widgets/misc/e-filter-bar.h:98
+msgid "_Edit Saved Searches..."
 msgstr ""
 
 #: widgets/misc/e-messagebox.c:152
@@ -13684,11 +25791,19 @@ msgstr ""
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
+#: widgets/misc/e-search-bar.c:477
+msgid "_Find Now"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:478
+msgid "_Clear"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr ""
 
@@ -13714,6 +25829,30 @@ msgstr "Could not initialise GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
+#~ 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"
+#~ "Common Name: %s\n"
+#~ "Organisational Unit: %s\n"
+#~ "Organisation: %s\n"
+#~ "Locality: %s\n"
+#~ "State: %s\n"
+#~ "Country: %s"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organisation:"
+
+#, fuzzy
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "I do not recognise this type of calendar component."
+
 #~ msgid "Summarising folder"
 #~ msgstr "Synchronising folder"
 
@@ -13767,13 +25906,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 9ed1a7be17..17c8146de5 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: 2001-11-14 19:26-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -31,21 +31,22 @@ msgid "Imports VCard files into Evolution."
 msgstr ""
 
 #: 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/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr ""
 
 #: 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/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Primary"
 msgstr ""
 
@@ -55,15 +56,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:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: 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
 msgid "Business"
 msgstr ""
 
@@ -73,12 +75,12 @@ msgid "Bus"
 msgstr ""
 
 #: 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:1720
 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:1722
 msgid "Company"
 msgstr ""
 
@@ -89,13 +91,14 @@ msgstr "Colours"
 
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: 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
 msgid "Home"
 msgstr ""
 
 #: 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 "Organisation"
 
@@ -104,18 +107,20 @@ msgid "Org"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr ""
 
 #: 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:1721
 msgid "Car"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: 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:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr ""
 
@@ -124,13 +129,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: 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:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr ""
 
@@ -139,69 +144,68 @@ msgid "Bus 2"
 msgstr ""
 
 #: 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:1724
 msgid "Home 2"
 msgstr ""
 
 #: 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:1726
+#: 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:1656
-#: addressbook/gui/contact-editor/e-contact-editor.c:1714
-#: mail/mail-config.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 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/gui/contact-editor/e-contact-editor.c:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr ""
 
 #: 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 ""
 
 #: 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:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr ""
 
 #: 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 ""
 
@@ -210,7 +214,7 @@ msgid "Url"
 msgstr ""
 
 #: 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 ""
 
@@ -219,7 +223,7 @@ msgid "Dep"
 msgstr ""
 
 #: 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 ""
 
@@ -228,12 +232,12 @@ msgid "Off"
 msgstr ""
 
 #: 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/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 ""
 
@@ -242,7 +246,7 @@ msgid "Prof"
 msgstr ""
 
 #: 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 ""
 
@@ -255,7 +259,7 @@ msgid "Ass"
 msgstr ""
 
 #: 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 ""
 
@@ -264,12 +268,12 @@ msgid "Nick"
 msgstr ""
 
 #: 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/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 ""
 
@@ -282,7 +286,7 @@ msgid "CALUri"
 msgstr ""
 
 #: 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 ""
 
@@ -311,663 +315,896 @@ msgstr ""
 msgid "Family Name"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:788
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, c-format
 msgid "%x"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3712
-msgid "Card: "
+#: addressbook/backend/ebook/e-card.c:2679
+msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
+#: addressbook/backend/ebook/e-card.c:2687
+#, c-format
+msgid "VCard for %s"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
+#: 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:34
+#: 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:1385
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
+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
+msgid "Searching..."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
+#: addressbook/backend/pas/pas-backend-file.c:263
+msgid "Loading..."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
+#. need a different error message here.
+#: addressbook/backend/pas/pas-backend-file.c:272
+msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
+msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
+msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
+msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
+msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+msgid "Error performing search"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+msgid "Could not parse query string"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
+#: addressbook/conduit/address-conduit.c:293
+msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
+#: addressbook/conduit/address-conduit.c:536
+msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
+#: addressbook/conduit/address-conduit.c:549
+msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
+#: 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 ""
 
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
+#: 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 ""
 
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
+#: addressbook/conduit/address-conduit.c:1385
+#: addressbook/conduit/address-conduit.c:1388
+msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Addressbook Settings"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
+#: 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
+msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, 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
+msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#, 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
+msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
+msgid "This page can be used to configure Addressbook Settings"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
+#: addressbook/gui/component/addressbook-component.c:72
+#: 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
+msgid "Contacts"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
+#: addressbook/gui/component/addressbook-component.c:72
+msgid "Folder containing contact information"
 msgstr ""
 
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3879
+#: addressbook/gui/component/addressbook-component.c:74
+msgid "LDAP Server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:74
+msgid "LDAP server containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:562
+msgid "New Contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:562
+#: 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-component.c:565
+msgid "Contact _List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Could not initialise Bonobo"
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:525
 msgid ""
-"\n"
-"Unique String: "
+"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 ""
 
-#: addressbook/backend/ebook/e-card.c:3882
+#: addressbook/gui/component/addressbook.c:530
 msgid ""
-"\n"
-"Public Key: "
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4235
-msgid "Multiple VCards"
+#: 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."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
-msgid "VCard for %s"
+msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: 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/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1449
-#: calendar/conduits/todo/todo-conduit.c:1130
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
-msgid "Could not initialize Bonobo"
-msgstr "Could not initialise Bonobo"
+#: addressbook/gui/component/addressbook.c:769
+msgid "Name begins with"
+msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2215
-msgid "Searching..."
+#: addressbook/gui/component/addressbook.c:770
+msgid "Email is"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-msgid "Loading..."
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
 msgstr ""
 
-#. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:270
-msgid "Error in search expression."
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:475
-msgid "Connecting to LDAP server..."
+#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+msgid "Advanced..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:485
-msgid "Unable to connect to LDAP server."
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:501
-msgid "Waiting for connection to LDAP server..."
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:870
-msgid "Adding card to LDAP server..."
+#: 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
+msgid "Primary Email"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:971
-msgid "Removing card from LDAP server..."
+#: addressbook/gui/component/e-address-popup.c:587
+msgid "Select an Action"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
-msgid "Modifying card from LDAP server..."
+#: addressbook/gui/component/e-address-popup.c:593
+#, c-format
+msgid "Create a new contact \"%s\""
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2160
-msgid "Receiving LDAP search results..."
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2165
-msgid "Restarting search."
+#: addressbook/gui/component/e-address-popup.c:891
+msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:294
-msgid "Cursor could not be loaded\n"
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:307
-msgid "EBook not loaded\n"
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1089
-#: calendar/conduits/calendar/calendar-conduit.c:981
-#: calendar/conduits/todo/todo-conduit.c:694
-msgid "Could not start wombat server"
+#: addressbook/gui/component/e-address-popup.c:1046
+msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1090
-#: calendar/conduits/calendar/calendar-conduit.c:982
-#: calendar/conduits/todo/todo-conduit.c:695
-msgid "Could not start wombat"
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1120
-#: addressbook/conduit/address-conduit.c:1123
-msgid "Could not read pilot's Address application block"
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
+#: addressbook/gui/component/addressbook-config.c:197
+msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/component/addressbook-config.c:215
+msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/component/addressbook-config.c:235
+msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+#: addressbook/gui/component/addressbook-config.c:641
+msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
+#: addressbook/gui/component/addressbook-config.c:1143
+msgid "The server did not respond with a schema entry"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
+#: addressbook/gui/component/addressbook-config.c:1163
+msgid "Could not query for schema information"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: 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 "Factory for the Addressbook Minicard control"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Extra Completion folders"
+msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/component/ldap-config.glade.h:1
+msgid "  S_how Supported Bases "
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/component/ldap-config.glade.h:2
+msgid "<< Fewer Options"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the sample Addressbook control"
+#: addressbook/gui/component/ldap-config.glade.h:3
+msgid "<- _Remove"
 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
-msgid "Contacts"
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:71
-msgid "Folder containing contact information"
+#: addressbook/gui/component/ldap-config.glade.h:5
+msgid "1:00"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:73
-msgid "LDAP Server"
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:73
-msgid "LDAP server containing contact information"
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
-msgid "New Contact"
+#: addressbook/gui/component/ldap-config.glade.h:8
+msgid "380"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact List"
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
+#: addressbook/gui/component/ldap-config.glade.h:14
+msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+msgid "Always"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
+#: addressbook/gui/component/ldap-config.glade.h:16
+msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
+#: addressbook/gui/component/ldap-config.glade.h:18
+msgid "Attribute"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
+#: 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/addressbook-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Connecting"
+msgstr "Synchronise \"%s\""
+
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:25
+msgid "DN Customization"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "De_lete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:27
+msgid "Distinguished _name:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Email Address:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Cannot initialise the Evolution shell."
+
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:32
+msgid "Finished"
+msgstr ""
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Cannot initialise the Evolution shell."
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+msgid "Mappings"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+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/ldap-config.glade.h:44
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
+#: 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/addressbook-config.glade.h:13
-msgid "Search s_cope: "
+#: addressbook/gui/component/ldap-config.glade.h:48
+msgid "Re_store Defaults"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Server Name"
+#: addressbook/gui/component/ldap-config.glade.h:49
+msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#. 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Synchronising \"%s\""
+
+#: 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
+msgid "Step 1: Server Information"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Synchronise \"%s\""
+
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "The information below is required in order to add an addressbook.  "
+#: addressbook/gui/component/ldap-config.glade.h:70
+msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "This information is not required for most ldap servers. "
+#: 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/addressbook-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:73
 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."
+"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/addressbook-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"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/addressbook-config.glade.h:20
-msgid "This is the name of the server where your addressbook is located."
+#: 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/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
+#: 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/addressbook-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"This is the full name of your ldap server. For example, "
+"\"ldap.mycompany.com\"."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "_Account name:"
+#: 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/addressbook-config.glade.h:24
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:91
+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/gui/component/ldap-config.glade.h:102
+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
+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:90 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:139
 msgid "_Add"
 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"
+#: addressbook/gui/component/ldap-config.glade.h:105
+msgid "_Add ->"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
+#: addressbook/gui/component/ldap-config.glade.h:106
+msgid "_Add Mapping"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
+#: addressbook/gui/component/ldap-config.glade.h:107
+msgid "_Add to DN"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
+#: addressbook/gui/component/ldap-config.glade.h:108
+msgid "_Always"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#: addressbook/gui/component/ldap-config.glade.h:109
+msgid "_Delete Mapping"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "Could not initialise Bonobo"
+msgid "_Display name:"
+msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/addressbook-storage.c:167
-msgid "Other Contacts"
+#: addressbook/gui/component/ldap-config.glade.h:111
+msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:468
-msgid "Unable to open addressbook"
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:477
-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"
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:482
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: 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
+#: 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 ""
 
-#: addressbook/gui/component/addressbook.c:490
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/component/ldap-config.glade.h:115
+msgid "_Edit Mapping"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:623
-#, c-format
-msgid "Enter password for %s (user %s)"
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Cannot initialise the Evolution shell."
+
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:786
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:787
-msgid "Name contains"
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:788
-msgid "Email contains"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:59
-msgid "Category is"
+#: addressbook/gui/component/ldap-config.glade.h:121
+msgid "_More Options >>"
 msgstr ""
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
+#: addressbook/gui/component/ldap-config.glade.h:122
+msgid "_Port number:"
 msgstr ""
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1031
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
+#: addressbook/gui/component/ldap-config.glade.h:123
+msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1071
-msgid "The URI that the Folder Browser will display"
+#: addressbook/gui/component/ldap-config.glade.h:124
+msgid "_Search base:"
 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)"
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
 msgstr ""
 
-#: 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:1686
-msgid "Primary Email"
+#: addressbook/gui/component/ldap-config.glade.h:126
+msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:587
-msgid "Select an Action"
+#: addressbook/gui/component/ldap-config.glade.h:127
+msgid "account-druid"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, c-format
-msgid "Create a new contact \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:128
+msgid "account-editor"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:129
+msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:891
-msgid "Querying Addressbook..."
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Synchronise \"%s\""
+
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-msgid "Add to Contacts"
+#: addressbook/gui/component/ldap-config.glade.h:133
+msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1046
-msgid "Merge E-Mail Address"
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
+#: addressbook/gui/component/ldap-config.glade.h:136
+msgid "searching-tab"
 msgstr ""
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
@@ -979,9 +1216,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: 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: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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr ""
 
@@ -1010,7 +1247,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: addressbook/gui/component/select-names/e-select-names.c:600
+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"
@@ -1020,7 +1261,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"
@@ -1028,1222 +1269,1283 @@ 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:1
-msgid "C_ontaining:"
+msgid "Select Names"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Co_ntacts:"
+msgid "Selected Contacts:"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "F_ind"
+msgid "Show Contacts"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
+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
-msgid "_Category:"
+msgid "_Browse..."
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "_Folder:"
+msgid "_Category:"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Message Recipients:"
+msgid "_Folder:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "Anni_versary:"
+msgid "A_ssistant's name:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "B_usiness"
+msgid "Add_ress..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Business _Fax"
+msgid "Anni_versary:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
+msgid "Birthda_y:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "C_ontacts..."
+msgstr ""
+
+#: 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 ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid "D_epartment:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "File A_s:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "General"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Full _Name..."
 msgstr ""
 
-#: 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"
 "of that information here."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "No_tes:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "Organisation:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "Phone Types"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Wants to receive _HTML mail"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Address..."
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Assistant's name:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Birthday:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Business"
-msgstr ""
-
 #: 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..."
+msgid "P_rofession:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: 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:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
-msgid "_Delete"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Department:"
+msgid "Phone Types"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Full Name..."
+msgid "S_pouse:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Home"
+msgid "This is the _mailing address"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Job title:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "_Manager's Name:"
+msgid "Wants to receive _HTML mail"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Mobile"
+#: 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
+msgid "_Delete"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Nickname:"
+msgid "_Job title:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "_Office:"
+msgid "_Manager's Name:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Profession:"
+msgid "_Nickname:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-msgid "_Public Calendar URL:"
+msgid "_Office:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Spouse:"
+msgid "_Public Calendar URL:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 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:756
-msgid "Category editor not available."
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:763
-msgid "This contact belongs to these categories:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr ""
-
-#: 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 ""
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr ""
-
-#: 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/gui/contact-editor/e-contact-save-as.c:170
-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 ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
 msgstr ""
 
-#: 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 ""
 
-#: 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
 #, fuzzy
 msgid "Argentina"
 msgstr "Organisation"
 
-#: 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 ""
 
-#: 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/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 ""
 
-#: 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 ""
 
-#: 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/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/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 ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: my-evolution/Locations.h:438
 #, fuzzy
 msgid "Chile"
 msgstr "Colours"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 #, fuzzy
 msgid "Comoros"
 msgstr "Colours"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:56
-msgid "Countr_y:"
-msgstr ""
-
-#: 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/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 ""
 
-#: 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 ""
 
-#: 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/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 ""
 
-#: 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/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
+#: 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 ""
 
-#: 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
+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 ""
 
-#: 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
+#: my-evolution/Locations.h:1190
 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:1198
 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
 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:1234
 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:1268
 msgid "Luxembourg"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
 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/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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1387
 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
+msgid "Moldova, Republic Of"
+msgstr ""
+
+#: 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:1470
 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 ""
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
 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 ""
 
-#: 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:1560
 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:1562
 msgid "Nicaragua"
 msgstr ""
 
-#: 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 ""
 
-#: 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:1574
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
 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:1632
 msgid "Oman"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
 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
 msgid "Palestinian Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
 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:1688
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
 msgid "Peru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr ""
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
 msgid "Poland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
 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:1824
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
 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/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:2035
 msgid "Saudi Arabia"
 msgstr ""
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2090
 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:2103
 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:2104
 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 ""
 
-#: 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:2119
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Sudan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
 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/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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
 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:2183
 msgid "Switzerland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
 msgid "Taiwan"
 msgstr ""
 
-#: 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
+msgid "Tanzania, United Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
 msgstr ""
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
 msgid "Turkey"
 msgstr ""
 
-#: 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/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:2334
 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:2342
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr ""
-
-#: 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:2348
 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:2380
 msgid "Venezuela"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
 msgid "Viet Nam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+msgid "Virgin Islands, British"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
 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:2524
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+msgid "Category editor not available."
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+msgid "This contact belongs to these categories:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+msgid "Save Contact as VCard"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr ""
+
+#: 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 ""
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr ""
+
+#: 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/gui/contact-editor/e-contact-save-as.c:170
+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 ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "_Post Code:"
 
@@ -2341,10 +2643,14 @@ msgid "contact-list-editor"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 msgid "Contact List Editor"
 msgstr ""
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+msgid "Save List as VCard"
+msgstr ""
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
@@ -2387,7 +2693,7 @@ msgid ""
 msgstr ""
 
 #: 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 ""
 
@@ -2396,217 +2702,306 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: 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:140
 msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 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
-msgid "Save as VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: 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
-msgid "Forward Contact"
-msgstr ""
-
-#: 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: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:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr ""
-
-#: 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"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+msgid "Error getting book view"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: 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:1043
 msgid "Success"
 msgstr ""
 
-#: 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: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
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr ""
 
-#: 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:1071
 msgid "Permission denied"
 msgstr ""
 
-#: 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 ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr ""
 
-#: 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:607 camel/camel-service.c:643
+#: 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
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 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"
+#: addressbook/gui/widgets/e-addressbook-util.c:204
+#, fuzzy
+msgid "Display Cards?"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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 ""
 
-#. 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"
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+msgid "Move card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+msgid "Copy card to"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+msgid "Move cards to"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+msgid "Copy cards to"
+msgstr ""
+
+#: 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:338
 msgid "Primary Phone"
 msgstr ""
 
-#: 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:854
+#: 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:341
 msgid "Callback Phone"
 msgstr ""
 
-#: 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:857
+#: 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:345
 msgid "Business Address"
 msgstr ""
 
-#: 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:861
+#: 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:348
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr ""
 
-#: 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:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+msgid "New Contact..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+msgid "New Contact List..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+msgid "Go to Folder..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+msgid "Import..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+msgid "Search for Contacts..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+msgid "Addressbook Sources..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+msgid "Pilot Settings..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+msgid "Current View"
+msgstr ""
+
+#. 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:940
+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 ""
+
+#. 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
+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 ""
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -2620,19 +3015,40 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr ""
 
-#: 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 ""
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr ""
+
+#: 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
 msgid "10 pt. Tahoma"
 msgstr ""
@@ -2702,6 +3118,7 @@ msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr ""
 
@@ -2726,11 +3143,13 @@ msgid "Options"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 #, fuzzy
 msgid "Orientation"
 msgstr "Organisation"
 
 #: addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr ""
 
@@ -2746,7 +3165,9 @@ msgstr ""
 msgid "Paper source:"
 msgstr ""
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr ""
 
@@ -2802,62 +3223,48 @@ msgstr ""
 msgid "_Font..."
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1111
-msgid "Print cards"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-msgid "Print card"
-msgstr ""
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr ""
-
-#: calendar/cal-util/cal-component.c:1202
+#: calendar/cal-util/cal-component.c:1207
 msgid "Untitled appointment"
 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:405 mail/message-list.c:651
+#: 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
 msgid "High"
 msgstr ""
 
-#: 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:650
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 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:407 mail/message-list.c:649
+#: 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
 msgid "Low"
 msgstr ""
 
 #. 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
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:937
-#: calendar/conduits/todo/todo-conduit.c:649
+#: 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: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 ""
 
-#: calendar/conduits/todo/todo-conduit.c:756
-#: calendar/conduits/todo/todo-conduit.c:759
+#: calendar/conduits/todo/todo-conduit.c:206
+msgid "Default Priority:"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -2870,48 +3277,61 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+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:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory for the calendar iTip view control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the sample Calendar 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:12
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 #, 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
+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 ""
@@ -2920,23 +3340,10 @@ 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 the Evolution shell."
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -2960,11 +3367,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: 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"
@@ -2972,18 +3379,28 @@ 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:2608
+#: 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 ""
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/alarm-queue.c:772
+msgid "Do not ask me about this program again."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Could not initialise Bonobo"
@@ -2997,24 +3414,40 @@ msgstr "Cannot initialise Evolution's mail component."
 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 ""
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. 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 ""
 
-#: 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 ""
 
-#: 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
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%m/%d/%Y"
@@ -3022,27 +3455,25 @@ msgstr "%m/%d/%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 ""
 
-#: 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 ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr ""
 
@@ -3063,32 +3494,27 @@ msgid "W"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr ""
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 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:479 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr ""
 
@@ -3101,12 +3527,13 @@ 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/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/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
+#: 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 ""
 
@@ -3118,23 +3545,15 @@ msgstr ""
 msgid "Assigned"
 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:803
+#: 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
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr ""
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1974 calendar/gui/e-day-view.c:1675
-#: calendar/gui/e-week-view.c:1182
-msgid "Searching"
-msgstr ""
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr ""
@@ -3151,63 +3570,72 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+msgid "Calendar"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
+#: calendar/gui/component-factory.c:68
+msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
+#: calendar/gui/component-factory.c:72 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
+msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
-msgid "Unmatched"
+#: calendar/gui/component-factory.c:73
+msgid "Folder containing to-do items"
 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
-msgid "Calendar"
+#: calendar/gui/component-factory.c:695
+msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:64
-msgid "Folder containing appointments and events"
+#: calendar/gui/component-factory.c:695
+msgid "_Meeting"
 msgstr ""
 
-#: 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
-msgid "Tasks"
+#: calendar/gui/component-factory.c:699
+msgid "New task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:69
-msgid "Folder containing to-do items"
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
+#: calendar/gui/component-factory.c:703
+msgid "New All Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:703
+msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
+#: calendar/gui/component-factory.c:707
+msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
+#: calendar/gui/component-factory.c:707
+msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Synchronising \"%s\""
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr ""
 
+#: 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 ""
@@ -3372,12 +3800,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 ""
@@ -3398,7 +3826,7 @@ msgstr ""
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -3406,12 +3834,11 @@ msgstr ""
 msgid "_Options..."
 msgstr ""
 
-#. 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/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr ""
 
@@ -3428,7 +3855,7 @@ msgstr ""
 msgid "hour(s)"
 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:189
 msgid "minute(s)"
 msgstr ""
 
@@ -3470,171 +3897,164 @@ msgid "Color for tasks due today"
 msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
+msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Days"
+#: calendar/gui/dialogs/recurrence-page.c:1125
+msgid "Friday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
+msgid "Hours"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
-msgid "Friday"
+msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Hours"
+#: calendar/gui/dialogs/recurrence-page.c:1121
+msgid "Monday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Minutes"
+#: calendar/gui/dialogs/recurrence-page.c:1126
+msgid "Saturday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
-msgid "Monday"
+msgid "Sh_ow a default reminder"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
+msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
-msgid "Saturday"
+msgid "Sta_rt of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
+msgid "Su_n"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Show week _numbers in date navigator"
+#: calendar/gui/dialogs/recurrence-page.c:1127
+msgid "Sunday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Sta_rt of day:"
-msgstr ""
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Su_n"
+msgid "T_hu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Sunday"
+msgid "T_ue"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "T_hu"
+msgid "Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "T_ue"
+#: calendar/gui/dialogs/recurrence-page.c:1124
+msgid "Thursday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#, fuzzy
-msgid "Tas_ks due today:"
-msgstr "Colours for display"
+msgid "Time"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:962
-msgid "Thursday"
+msgid "Time _zone:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Time"
+msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Time _zone:"
+#: calendar/gui/dialogs/recurrence-page.c:1122
+msgid "Tuesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
+#: calendar/gui/dialogs/recurrence-page.c:1123
+msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Time format:"
+#: ui/evolution-calendar.xml.h:24
+msgid "Work Week"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:960
-msgid "Tuesday"
+msgid "_12 hour (AM/PM)"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:961
-msgid "Wednesday"
+msgid "_24 hour"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
-msgid "Work Week"
+msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "_12 hour (AM/PM)"
+msgid "_Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "_24 hour"
+msgid "_Display"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_Ask for confirmation when deleting items"
+msgid "_End of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "_Compress weekends in month view"
+msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "_Display"
+#: mail/mail-config.glade.h:158
+msgid "_General"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "_End of day:"
+msgid "_Hide completed tasks after"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Fri"
+msgid "_Mon"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "_General"
+msgid "_Overdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Hide completed tasks after"
+msgid "_Sat"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "_Mon"
+msgid "_Show appointment end times in week and month views"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
+msgid "_Time divisions:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "_Sat"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Wed"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr ""
 
@@ -3698,71 +4118,60 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: 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: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: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/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:322
 msgid "Could not update object!"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1897
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1904
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -3820,7 +4229,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr ""
 
@@ -3834,13 +4243,13 @@ msgstr ""
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 msgid "Scheduling"
 msgstr ""
 
 #: calendar/gui/dialogs/event-editor.c:207
 #: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr ""
 
@@ -3873,30 +4282,39 @@ msgid "F_ree"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:8
+msgid "L_ocation:"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr ""
 
-#: 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 ""
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "_End time:"
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+msgid "_End time:"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr ""
 
@@ -3923,55 +4341,49 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
+msgid "Common Name"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
+msgid "Delegated From"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
+msgid "Delegated To"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
+msgid "Language"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
+msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
+msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:798
 #: 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: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/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"
 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 mail/mail-config.glade.h:85
+#: 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
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -3988,7 +4400,7 @@ msgid "_Change Organizer"
 msgstr "Organisation:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:445
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr ""
 
@@ -3997,27 +4409,91 @@ msgstr ""
 msgid "_Other Organizer"
 msgstr "Organisation:"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: calendar/gui/dialogs/recurrence-page.c:126
+#: calendar/gui/dialogs/recurrence-page.c:146
+#: calendar/gui/dialogs/recurrence-page.c:156
+msgid "st"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+msgid "nd"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+msgid "rd"
+msgstr ""
+
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
-msgid "day"
+#: calendar/gui/dialogs/recurrence-page.c:1062
+msgid "first"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
-msgid "on the"
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
+#: calendar/gui/dialogs/recurrence-page.c:1064
+msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1065
+msgid "fourth"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+msgid "last"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Organisation:"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+msgid "day"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1260
+msgid "on the"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr ""
 
@@ -4081,16 +4557,20 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:56
+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
+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?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
@@ -4108,7 +4588,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr ""
 
@@ -4120,15 +4600,19 @@ msgstr ""
 msgid "_Status:"
 msgstr ""
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr ""
+
 #: 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:324
 msgid "Assignment"
 msgstr ""
 
-#: 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.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:42
 msgid "Description:"
 msgstr ""
 
@@ -4140,188 +4624,147 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
+#: calendar/gui/e-calendar-table.c:751 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:437
-#, c-format
-msgid "100%"
+#: 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
+msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2724
-#: calendar/gui/e-week-view.c:1822
-msgid "Deleting selected objects"
+#: calendar/gui/e-calendar-table.c:973
+msgid "_Save as..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:941 calendar/gui/e-day-view.c:3544
-#: calendar/gui/e-week-view.c:3422 mail/folder-browser.c:1447
-#: shell/e-shortcuts-view.c:384
-msgid "_Open"
+#: calendar/gui/e-calendar-table.c:974 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 ""
 
-#: 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
+#: calendar/gui/e-calendar-table.c:978 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:947 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3433 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:979 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:949 calendar/gui/e-day-view.c:3530
-#: calendar/gui/e-day-view.c:3557 calendar/gui/e-week-view.c:3409
-#: calendar/gui/e-week-view.c:3435 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:980 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 ""
 
-#: calendar/gui/e-calendar-table.c:954
-msgid "_Mark as Complete"
+#: calendar/gui/e-calendar-table.c:984
+msgid "_Assign Task"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:985
+msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:956
-msgid "_Delete this Task"
+#: calendar/gui/e-calendar-table.c:986
+msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7115
-#: calendar/gui/e-week-view.c:3918
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr ""
 
-#. 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 ""
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr ""
 
+#. 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 ""
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -4329,372 +4772,166 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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 ""
 
 #. 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 ""
 
 #. 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
 msgid "am"
 msgstr ""
 
 #. 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
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
-msgid "New All Day _Event"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3535 calendar/gui/e-week-view.c:3414
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
-msgid "_Go to Date..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-msgid "_Delete this Appointment"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
-msgid "Make this Occurrence _Movable"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
-msgid "Delete this _Occurrence"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
-msgid "Delete _All Occurrences"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:524
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Task begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:534
-msgid "Free/Busy info begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:538
-msgid "Begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:550
-msgid "Meeting ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:553
-msgid "Free/Busy info ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:557
-msgid "Ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:571
-msgid "Task Completed: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:581
-msgid "Task Due: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
-msgid "iCalendar Information"
-msgstr ""
-
-#. Title
-#: calendar/gui/e-itip-control.c:633
-msgid "iCalendar Error"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
-msgid "An unknown person"
-msgstr ""
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:737
-msgid "<i>None</i>"
-msgstr ""
-
-#: 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
-msgid "Choose an action:"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:779
-msgid "Update"
-msgstr ""
-
-#: 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
-msgid "OK"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:795
-msgid "Accept"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:796
-msgid "Tentatively accept"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:797
-msgid "Decline"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:811
-msgid "Send Free/Busy Information"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:824
-msgid "Update respondent status"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:838
-msgid "Send Latest Information"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:867
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:868
-msgid "Meeting Information"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:872
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:873
-msgid "Meeting Proposal"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:877
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:878
-msgid "Meeting Update"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:882
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:883
-msgid "Meeting Update Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:887
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:888
-msgid "Meeting Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:892
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:893
-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
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:898
-msgid "Bad Meeting Message"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:917
-#, c-format
-msgid "<b>%s</b> has published task information."
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:918
-msgid "Task Information"
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:922
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:923
-msgid "Task Proposal"
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:927
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:928
-msgid "Task Update"
+#: 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 ""
 
-#: calendar/gui/e-itip-control.c:932
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:933
-msgid "Task Update Request"
+#: 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-itip-control.c:937
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
+msgid "_Configure..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:938
-msgid "Task Reply"
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+msgid "_Configure Pilot..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:942
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
+#: 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
+msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:943
-msgid "Task Cancellation"
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:948
-msgid "Bad Task Message"
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:967
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:968
-msgid "Free/Busy Information"
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:972
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:973
-msgid "Free/Busy Request"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:977
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:978
-msgid "Free/Busy Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:983
-msgid "Bad Free/Busy Message"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1052
-msgid "The message does not appear to be properly formed"
+msgid "Error executing %s."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1071
-msgid "The message contains only unsupported requests."
+#: 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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1099 calendar/gui/e-itip-control.c:1105
-msgid "The attachment does not contain a valid calendar message"
+#: calendar/gui/e-itip-control.c:1564
+msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1130
-msgid "The attachment has no viewable calendar items"
+#: calendar/gui/e-itip-control.c:1566
+msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1231
-msgid "Update complete\n"
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1284
-msgid "Attendee status ould not be updated!\n"
+#: calendar/gui/e-itip-control.c:1638
+msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1288
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1348 calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Synchronising \"%s\""
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Synchronising \"%s\""
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4733,211 +4970,210 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1535
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr ""
 
-#: 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:771
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr ""
 
-#: 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:775
-#: calendar/gui/e-meeting-model.c:791
-#: 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 ""
-
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr ""
 
-#: 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:788
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr ""
 
-#: 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:816
+#: 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:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:819 calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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: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:2118 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
-#: 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 "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:428
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:641
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:660
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-tasks.c:543
+msgid "Completing tasks..."
+msgstr ""
+
+#: calendar/gui/e-tasks.c:566
+msgid "Deleting selected objects..."
+msgstr ""
+
+#: calendar/gui/e-tasks.c:659
+msgid "Expunging"
+msgstr ""
+
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1865
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
@@ -4998,266 +5234,251 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:220
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:570
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr ""
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr ""
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr ""
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr ""
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr ""
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr ""
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr ""
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2358 my-evolution/e-summary.c:619
-#: 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:2894
+#: 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:2550
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr ""
 
-#: 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 ""
+
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control-factory.c:75
+#: calendar/gui/tasks-control.c:456
 msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
+"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 ""
+
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+msgid "Do not ask me again."
+msgstr ""
+
+#: calendar/gui/tasks-control.c:612
+msgid "Print Tasks"
 msgstr ""
 
 #: calendar/gui/tasks-migrate.c:105
@@ -5292,130 +5513,1682 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/pcs/query.c:234
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/importers/icalendar-importer.c:638
+msgid "Calendar Events"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:663
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:670
+msgid "Gnome Calendar"
+msgstr ""
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:258
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:263
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:300
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:305
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:339
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:344
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:371
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:376
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:412
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:508
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:513
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:650
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:655
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:679
+#: 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:721
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: 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)"
 msgstr ""
 
-#: calendar/pcs/query.c:821
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:866
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:871
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1159
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
-#: camel/camel-cipher-context.c:171
+#.
+#. * 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
+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
+msgid "America/Adak"
+msgstr ""
+
+#: calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr ""
+
+#: calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr ""
+
+#: calendar/zones.h:62
+msgid "America/Antigua"
+msgstr ""
+
+#: calendar/zones.h:63
+msgid "America/Araguaina"
+msgstr ""
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr ""
+
+#: calendar/zones.h:66
+msgid "America/Barbados"
+msgstr ""
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: calendar/zones.h:68
+msgid "America/Belize"
+msgstr ""
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+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
+msgid "America/Caracas"
+msgstr ""
+
+#: calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr ""
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+msgid "America/Cayman"
+msgstr ""
+
+#: calendar/zones.h:79
+msgid "America/Chicago"
+msgstr ""
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr ""
+
+#: calendar/zones.h:82
+msgid "America/Costa_Rica"
+msgstr ""
+
+#: calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr ""
+
+#: calendar/zones.h:84
+msgid "America/Curacao"
+msgstr ""
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+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
+msgid "America/Dominica"
+msgstr ""
+
+#: calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr ""
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+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
+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
+msgid "America/Grenada"
+msgstr ""
+
+#: calendar/zones.h:100
+msgid "America/Guadeloupe"
+msgstr ""
+
+#: calendar/zones.h:101
+msgid "America/Guatemala"
+msgstr ""
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+msgid "America/Guyana"
+msgstr ""
+
+#: calendar/zones.h:104
+msgid "America/Halifax"
+msgstr ""
+
+#: calendar/zones.h:105
+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
+msgid "America/Jamaica"
+msgstr ""
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+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
+msgid "America/La_Paz"
+msgstr ""
+
+#: calendar/zones.h:120
+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
+msgid "America/Maceio"
+msgstr ""
+
+#: calendar/zones.h:124
+msgid "America/Managua"
+msgstr ""
+
+#: calendar/zones.h:125
+msgid "America/Manaus"
+msgstr ""
+
+#: calendar/zones.h:126
+msgid "America/Martinique"
+msgstr ""
+
+#: calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr ""
+
+#: calendar/zones.h:128
+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
+msgid "America/Montreal"
+msgstr ""
+
+#: calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr ""
+
+#: calendar/zones.h:137
+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
+msgid "America/Nome"
+msgstr ""
+
+#: calendar/zones.h:141
+msgid "America/Noronha"
+msgstr ""
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+msgid "America/Panama"
+msgstr ""
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+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
+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
+msgid "America/Regina"
+msgstr ""
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+msgid "America/Rosario"
+msgstr ""
+
+#: calendar/zones.h:157
+msgid "America/Santiago"
+msgstr ""
+
+#: calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr ""
+
+#: calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr ""
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr ""
+
+#: calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr ""
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr ""
+
+#: calendar/zones.h:165
+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
+msgid "America/Tijuana"
+msgstr ""
+
+#: calendar/zones.h:172
+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
+msgid "America/Yakutat"
+msgstr ""
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: calendar/zones.h:178
+msgid "Antarctica/Casey"
+msgstr ""
+
+#: calendar/zones.h:179
+msgid "Antarctica/Davis"
+msgstr ""
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: calendar/zones.h:181
+msgid "Antarctica/Mawson"
+msgstr ""
+
+#: calendar/zones.h:182
+msgid "Antarctica/McMurdo"
+msgstr ""
+
+#: calendar/zones.h:183
+msgid "Antarctica/Palmer"
+msgstr ""
+
+#: calendar/zones.h:184
+msgid "Antarctica/South_Pole"
+msgstr ""
+
+#: calendar/zones.h:185
+msgid "Antarctica/Syowa"
+msgstr ""
+
+#: calendar/zones.h:186
+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
+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
+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
+msgid "Asia/Hong_Kong"
+msgstr ""
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+#: calendar/zones.h:216
+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
+msgid "Asia/Kuwait"
+msgstr ""
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr ""
+
+#: calendar/zones.h:232
+msgid "Asia/Muscat"
+msgstr ""
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: calendar/zones.h:235
+msgid "Asia/Omsk"
+msgstr ""
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+msgid "Asia/Qatar"
+msgstr ""
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:247
+msgid "Asia/Singapore"
+msgstr ""
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+msgid "Atlantic/Bermuda"
+msgstr ""
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+msgid "Atlantic/Cape_Verde"
+msgstr ""
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+msgid "Australia/Adelaide"
+msgstr ""
+
+#: calendar/zones.h:274
+msgid "Australia/Brisbane"
+msgstr ""
+
+#: calendar/zones.h:275
+msgid "Australia/Broken_Hill"
+msgstr ""
+
+#: calendar/zones.h:276
+msgid "Australia/Darwin"
+msgstr ""
+
+#: calendar/zones.h:277
+msgid "Australia/Hobart"
+msgstr ""
+
+#: calendar/zones.h:278
+msgid "Australia/Lindeman"
+msgstr ""
+
+#: calendar/zones.h:279
+msgid "Australia/Lord_Howe"
+msgstr ""
+
+#: calendar/zones.h:280
+msgid "Australia/Melbourne"
+msgstr ""
+
+#: calendar/zones.h:281
+msgid "Australia/Perth"
+msgstr ""
+
+#: calendar/zones.h:282
+msgid "Australia/Sydney"
+msgstr ""
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:284
+msgid "Europe/Andorra"
+msgstr ""
+
+#: calendar/zones.h:285
+msgid "Europe/Athens"
+msgstr ""
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:296
+msgid "Europe/Gibraltar"
+msgstr ""
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:304
+msgid "Europe/Luxembourg"
+msgstr ""
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr ""
+
+#: calendar/zones.h:308
+msgid "Europe/Monaco"
+msgstr ""
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr ""
+
+#: calendar/zones.h:312
+msgid "Europe/Paris"
+msgstr ""
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:317
+msgid "Europe/San_Marino"
+msgstr ""
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "Colours"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+msgid "Indian/Mahe"
+msgstr ""
+
+#: calendar/zones.h:341
+msgid "Indian/Maldives"
+msgstr ""
+
+#: calendar/zones.h:342
+msgid "Indian/Mauritius"
+msgstr ""
+
+#: calendar/zones.h:343
+msgid "Indian/Mayotte"
+msgstr ""
+
+#: calendar/zones.h:344
+msgid "Indian/Reunion"
+msgstr ""
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
+#: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:211
+#: 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
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:294
+#: camel/camel-cipher-context.c:292
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:336
+#: camel/camel-cipher-context.c:334
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
+#: camel/camel-data-cache.c:169
+msgid "Unable to create cache path"
+msgstr ""
+
+#: camel/camel-data-cache.c:441
+#, fuzzy, c-format
+msgid "Could not remove cache entry: %s: %s"
+msgstr "Synchronising \"%s\""
+
 #: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
@@ -5440,107 +7213,106 @@ msgstr ""
 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:710 camel/camel-filter-driver.c:719
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr ""
+
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr ""
+
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr ""
-
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
+#: camel/camel-filter-search.c:126
+msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1040
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1080
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1262
-msgid "Moving messages"
-msgstr ""
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1038
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1078
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1260
+msgid "Moving messages"
 msgstr ""
 
 #: camel/camel-lock-client.c:111
@@ -5648,114 +7420,119 @@ msgstr ""
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
 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:628 camel/camel-pgp-context.c:802
 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: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:755
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:953
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:959
+#: 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:970
+#: 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:1143
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1153
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1160
+#: 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:1169
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1352
+#: camel/camel-pgp-context.c:1387
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-provider.c:130
+#: camel/camel-pgp-mime.c:354
+msgid "This is a digitally signed message part"
+msgstr ""
+
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 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:270
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
+#: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -5853,12 +7630,12 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
+msgid "Login"
 msgstr ""
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
@@ -5869,9 +7646,19 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr ""
 
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+#: camel/camel-sasl-ntlm.c:33
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+
 #: 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
+#: 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 ""
 
@@ -5915,26 +7702,39 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:611
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:638
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:663
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:665
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-service.c:787
+msgid "Host lookup failed: host not found"
+msgstr ""
+
+#: camel/camel-service.c:790
+msgid "Host lookup failed: unknown reason"
+msgstr ""
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
@@ -5943,12 +7743,12 @@ msgstr ""
 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 ""
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5992,24 +7792,23 @@ msgstr ""
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
 msgstr ""
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:428
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6019,16 +7818,34 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: 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:491
 #, 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"
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
 msgstr ""
 
 #: camel/camel-url.c:288
@@ -6041,27 +7858,27 @@ msgstr ""
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr ""
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Synchronising \"%s\""
@@ -6070,76 +7887,76 @@ msgstr "Synchronising \"%s\""
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1566
-#: camel/providers/imap/camel-imap-folder.c:1978
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1717
-#: camel/providers/imap/camel-imap-folder.c:1798
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1723
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2015
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
@@ -6152,7 +7969,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: 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 ""
 
@@ -6184,28 +8001,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6213,101 +8030,120 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:76
+#: 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:82
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, 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 ""
 
-#: 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:197
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: 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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: 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 "Synchronising \"%s\""
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -6327,7 +8163,7 @@ msgstr ""
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6337,7 +8173,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr ""
 
@@ -6346,7 +8182,7 @@ msgstr ""
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -6354,14 +8190,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -6369,41 +8205,63 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: 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:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: 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 ""
 
+#: camel/providers/local/camel-maildir-summary.c:525
+msgid "Checking folder consistency"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-summary.c:629
+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
+#, fuzzy
+msgid "Storing folder"
+msgstr "Synchronising \"%s\""
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -6420,9 +8278,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6430,134 +8288,122 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#. 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 "Synchronising \"%s\""
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Synchronising \"%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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: 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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
@@ -6576,12 +8422,12 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-folder.c:512
+#: camel/providers/local/camel-spool-folder.c:515
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr ""
@@ -6592,6 +8438,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
@@ -6601,75 +8448,54 @@ msgstr ""
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: 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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
+#: camel/providers/local/camel-spoold-store.c:117
 #, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
+msgid "Store `%s' does not exist or is not a directory"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/local/camel-spoold-store.c:173
 #, c-format
-msgid "Unable to save grouplist file for %s: %s"
+msgid "Mail tree %s"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
@@ -6680,161 +8506,191 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:495
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
+msgid "Could not get group: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
-msgid "Retrieving POP summary"
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, c-format
+msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
 #, c-format
-msgid "Could not check POP server for new messages: %s"
+msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, c-format
+msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
-msgid "Expunging deleted messages"
+#: camel/providers/nntp/camel-nntp-summary.c:566
+msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, c-format
-msgid "Could not fetch message: %s"
+msgid "Operation failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
+#: camel/providers/pop3/camel-pop3-folder.c:272
+msgid "Retrieving POP summary"
+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
+msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:367
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/pop3/camel-pop3-folder.c:325
+msgid "Expunging deleted messages"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid "Message storage"
+#: 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 "Synchronising \"%s\""
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+msgid "Unknown reason"
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr ""
+
+#: 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:43
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: 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:84
 msgid "POP"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
+#: camel/providers/pop3/camel-pop3-store.c:210
+msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:214
-#, c-format
-msgid "Could not connect to server: %s"
+#: camel/providers/pop3/camel-pop3-store.c:251
+msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, 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
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:360
+#: camel/providers/pop3/camel-pop3-store.c:405
 #, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
+msgid "SASL `%s' Login failed: %s"
 msgstr ""
 
-#: 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:416
+msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:381
-#: camel/providers/pop3/camel-pop3-store.c:418
-msgid "(Unknown)"
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, c-format
+msgid "I/O Error: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, c-format
+msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:566
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr ""
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr ""
 
@@ -6844,49 +8700,49 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+msgid "Could not parse recipient list"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:204
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:248
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: 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 ""
 
@@ -6894,122 +8750,141 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: 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:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: 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:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr ""
 
-#: 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:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: 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: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:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: 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: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: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: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: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:205
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: 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:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr ""
 
-#: 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:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: 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:219
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:376
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:336
+msgid "server does not appear to support SSL"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+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:415
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7017,127 +8892,125 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+msgid "Cannot send message: one or more invalid recipients"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: 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:1081
+msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
+#. 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
+msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1030
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+msgid "QUIT response error"
 msgstr ""
 
 #: composer/e-msg-composer-attachment-bar.c:101
@@ -7165,19 +9038,19 @@ msgid "%.1fG"
 msgstr ""
 
 #. 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: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:531
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -7205,190 +9078,181 @@ msgid "MIME type:"
 msgstr ""
 
 #: 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:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr ""
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:402
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 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:228
+#: 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:696
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:894
-msgid "Save as..."
-msgstr ""
-
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1019
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1077
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1091
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1100
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1202
+#: composer/e-msg-composer.c:1176
 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:1356
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1363
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1535
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1910 composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2368
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2391 composer/e-msg-composer.c:2446
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:83
-msgid "Evolution"
+#: data/evolution.desktop.in.h:1
+msgid "The Evolution groupware suite"
 msgstr ""
 
 #: data/evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr ""
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Cannot initialise the Evolution shell."
 
 #: data/evolution.keys.in.h:1
 msgid "address card"
@@ -7430,15 +9294,30 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
 #. Remember the password?
-#: e-util/e-passwords.c:347 mail/mail-session.c:267
+#: 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:268
+#: 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 ""
+
+#: e-util/e-pilot-settings.c:105
+msgid "Sync Categories:"
+msgstr ""
+
 #. 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
@@ -7518,13 +9397,13 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
@@ -7565,11 +9444,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:191
 msgid "seconds"
 msgstr ""
 
@@ -7636,7 +9511,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr ""
 
@@ -7649,33 +9524,25 @@ msgid "Filter Rules"
 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
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:364
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:267
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:314
-msgid "<click here to select a folder>"
-msgstr ""
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -7683,7 +9550,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr ""
 
@@ -7691,39 +9558,39 @@ msgstr ""
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+msgid "if any criterion are met"
 msgstr ""
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr ""
 
@@ -7767,6 +9634,11 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr ""
@@ -7779,6 +9651,10 @@ msgstr ""
 msgid "Attachments"
 msgstr ""
 
+#: filter/libfilter-i18n.h:6
+msgid "Beep"
+msgstr ""
+
 #: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr ""
@@ -7832,144 +9708,149 @@ msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Exist"
+msgid "Execute Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "exists"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Expression"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Important"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:25
-msgid "is"
+msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
+msgid "Important"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "is less than"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "is not"
+msgid "is after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "Mailing list"
+msgid "is before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "Message Body"
+msgid "is Flagged"
 msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "Message Header"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Message was received"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "Message was sent"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "Move to Folder"
+msgid "is not Flagged"
 msgstr ""
 
 #: filter/libfilter-i18n.h:35
-msgid "on or after"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "on or before"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "Read"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Recipients"
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
+msgid "Play Sound"
+msgstr ""
+
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+msgid "Read"
+msgstr ""
+
+#: filter/libfilter-i18n.h:41
+msgid "Recipients"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr ""
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1404
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 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 ""
 
@@ -7990,30 +9871,30 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Synchronise \"%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:101
 msgid "Mail"
 msgstr ""
 
@@ -8037,24 +9918,74 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, c-format
+msgid "Priority Filter \"%s\""
+msgstr ""
+
+#: 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 ""
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr ""
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Synchronise \"%s\""
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Synchronising \"%s\""
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+msgid "Mail Filters"
+msgstr ""
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8075,49 +10006,97 @@ msgid "Pine"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
+msgid "Composer Preferences"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:2
 #, fuzzy
-msgid "Evolution mail composer."
+msgid "Configuration control for the Evolution Display Fonts."
 msgstr "Cannot initialise Evolution's mail component."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:3
 #, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
 msgid "Evolution mail executive summary component."
 msgstr "Cannot initialise Evolution's mail summary component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 #, fuzzy
 msgid "Evolution mail folder display component."
 msgstr "Cannot initialise Evolution's mail summary component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 #, fuzzy
 msgid "Evolution mail folder factory component."
 msgstr "Cannot initialise Evolution's mail summary component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the Evolution composer."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the Mail Summary component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+msgid "Font Preferences"
+msgstr ""
+
+#: 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:70
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
+#: 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:101
-msgid "Mail storage folder (internal)"
+msgid "Folder containing mail"
 msgstr ""
 
 #: mail/component-factory.c:102
@@ -8128,228 +10107,242 @@ msgstr ""
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:129
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Synchronising \"%s\""
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:951
-msgid "New _Mail Message"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1009
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+msgid "Connecting..."
+msgstr ""
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:271
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1049
-msgid "Create vFolder from Search"
+#: mail/folder-browser.c:1088
+msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:104
-msgid "_Save As..."
-msgstr ""
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+msgid "Fla_g Completed"
+msgstr ""
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Colours"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1467
-msgid "_Copy to Folder..."
+#: mail/folder-browser.c:1640
+msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:106
-msgid "_Undelete"
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1473
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1645
+msgid "Label"
 msgstr ""
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1649
+msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/folder-browser.c:1478
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1653
+msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1657
+msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1938
 #, c-format
-msgid "Filter on Mailing List (%s)"
+msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1632
+#: mail/folder-browser.c:1939
 #, c-format
-msgid "VFolder on Mailing List (%s)"
-msgstr ""
-
-#: mail/folder-browser.h:26
-msgid "Default"
+msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
 #: mail/folder-info.c:64
@@ -8374,41 +10367,33 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
+msgid "Current store format:"
 msgstr ""
 
 #: mail/local-config.glade.h:2
-msgid "Current store format:"
+msgid "Index body contents"
 msgstr ""
 
 #: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr ""
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr ""
-
-#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr ""
 
-#: 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"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: 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:8
 msgid "mbox"
 msgstr ""
 
-#: mail/local-config.glade.h:11
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr ""
 
@@ -8426,83 +10411,75 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:962
-msgid "Could not save signature file."
-msgstr ""
-
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
 msgstr ""
 
-#: 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?"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1654
-msgid "You may not create two accounts with the same name."
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
 msgstr ""
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
+#: 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-accounts.c:194
-msgid "Disable"
+#: 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-accounts.c:196
-msgid "Enable"
+#: mail/mail-account-gui.c:1985
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-msgid "Are you sure you want to delete this news account?"
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
 msgstr ""
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:783 mail/mail-config.glade.h:42
-msgid "Mail Settings"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
 msgstr ""
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
-#: mail/mail-autofilter.c:215
-#, c-format
-msgid "Subject is %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
 msgstr ""
 
-#: mail/mail-autofilter.c:231
-#, c-format
-msgid "Mail from %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+msgid "Account name"
 msgstr ""
 
-#: mail/mail-autofilter.c:287
-#, c-format
-msgid "%s mailing list"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8510,123 +10487,131 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: 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:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:280
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 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:299
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 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:469
-msgid "This message contains invalid recipients:"
-msgstr ""
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:600
+#: mail/mail-callbacks.c:497
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:838
+#: mail/mail-callbacks.c:623
+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
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 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:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1753
+#: mail/mail-callbacks.c:2091
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1778
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1831
+#: mail/mail-callbacks.c:2169
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1857
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1951
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2122 widgets/misc/e-messagebox.c:159
-msgid "Warning"
+#: mail/mail-callbacks.c:2366
+msgid "Go to next folder with unread messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2129
+#: mail/mail-callbacks.c:2373
+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
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8634,30 +10619,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2136
-msgid "Do not ask me again."
-msgstr ""
-
-#: mail/mail-callbacks.c:2244
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2256
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2319
+#: mail/mail-callbacks.c:2783
+#, c-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2863
+msgid "US-Letter"
+msgstr ""
+
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8699,16 +10689,31 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:326
-#, c-format
-msgid "Account %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+msgid "Work"
+msgstr ""
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
 msgstr ""
 
-#: mail/mail-config.c:1859
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+msgid "To Do"
+msgstr ""
+
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+msgid "Later"
+msgstr ""
+
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -8716,89 +10721,140 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, c-format
-msgid "%s: Inbox"
-msgstr ""
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2183 mail/mail-config.c:2187
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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 " _Check for supported types "
+msgid " "
 msgstr ""
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " color"
-msgstr "Colours"
+msgid " Edit "
+msgstr ""
 
 #: mail/mail-config.glade.h:3
-msgid "(SSL is not supported in this build of evolution)"
+msgid " New "
 msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid "A_lways encrypt to myself when sending encrypted mail"
+msgid " _Check for supported types "
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "Account"
+msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
-msgid "Account Information"
+msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
+#: mail/mail-config.glade.h:7
+msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-msgid "Accounts"
+msgid "Account Editor"
 msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
-msgid "Attachment"
+#: mail/mail-config.glade.h:11
+msgid "Advanced Options"
 msgstr ""
 
 #: mail/mail-config.glade.h:12
-msgid "Authentication"
+msgid "Afrikaans"
 msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Checking for New Mail"
+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
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+msgid "Attach original message"
+msgstr ""
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr ""
+
+#: mail/mail-config.glade.h:22
+msgid "Authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:23
+msgid "Automatically _detect links"
+msgstr ""
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+msgid "C_haracter set:"
+msgstr ""
+
+#: mail/mail-config.glade.h:27
 #, fuzzy
-msgid "Composer"
+msgid "C_olors"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:15
-msgid "Configuration"
+#: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
-msgid "Confirm when Expunging a folder"
+#: mail/mail-config.glade.h:29
+msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:30
+msgid "Configuration"
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8808,356 +10864,523 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:37
+msgid "Dari"
+msgstr ""
+
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
-msgid "Default Forward style is: "
+#: mail/mail-config.glade.h:39
+msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+msgid "Deleting Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
+#: mail/mail-config.glade.h:44
+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:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr ""
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
+#: mail/mail-config.glade.h:49
+msgid "Emacs"
+msgstr ""
+
+#: mail/mail-config.glade.h:50
+msgid "Email Accounts"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+msgid "Email _address:"
+msgstr ""
+
+#: mail/mail-config.glade.h:52
+msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:53
+msgid "Execute Command..."
+msgstr ""
+
+#: mail/mail-config.glade.h:54
+msgid "Fi_xed -width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:55
+msgid "Font Properties"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Format messages in _HTML"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
-msgid "HTML signature file:"
+#: mail/mail-config.glade.h:58
+msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
-msgid "IMAPv4 "
+#: mail/mail-config.glade.h:59
+msgid "Hulu"
 msgstr ""
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
+#: mail/mail-config.glade.h:60
+msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
+msgid "Identity"
 msgstr ""
 
-#: 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 ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "Labels and Colors"
+msgstr ""
+
+#: mail/mail-config.glade.h:67
+msgid "Loading Images"
+msgstr ""
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Colours"
+
+#: mail/mail-config.glade.h:73
+msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:74
+msgid "Microsoft"
+msgstr ""
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
-msgid "News"
+#: mail/mail-config.glade.h:77
+msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:78
+msgid "News Servers"
+msgstr ""
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organisation:"
+
+#: mail/mail-config.glade.h:83
+msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:54
-msgid "Pretty Good Privacy"
+#: mail/mail-config.glade.h:88
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
-msgid "Prompt when sending HTML messages to contacts that don't want them"
+#: mail/mail-config.glade.h:89
+msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Prompt when sending messages with an _empty subject"
+#: mail/mail-config.glade.h:90
+msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
-msgid "Prompt when sending messages with only _Bcc recipients defined"
+#: mail/mail-config.glade.h:91
+msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:58
-msgid "Qmail maildir "
+#: mail/mail-config.glade.h:92
+msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
-msgid "Receiving Email"
+#: mail/mail-config.glade.h:97
+msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
+msgstr "Synchronise \"%s\""
+
+#: mail/mail-config.glade.h:100
+msgid "Remember this _password"
 msgstr ""
 
-#: 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"
+#: mail/mail-config.glade.h:103
+msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
-msgid "Security"
+#: mail/mail-config.glade.h:104
+msgid "Same as text"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
+#: mail/mail-config.glade.h:105
+msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:110
+msgid "Select PGP program"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+msgid "Select a signature file"
+msgstr ""
+
+#: mail/mail-config.glade.h:112
+msgid "Select a signature script"
+msgstr ""
+
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr ""
+
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
+#: mail/mail-config.glade.h:120
+msgid "Shortcuts _type:"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+msgid "Signature"
+msgstr ""
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
+#: mail/mail-config.glade.h:124
+msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
-msgid "Use s_ecure connection (SSL)"
+#: mail/mail-config.glade.h:128
+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 ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:132
+msgid "V_ariable-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: 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:92
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+msgid "_Authentication type: "
+msgstr ""
+
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
-#, fuzzy
-msgid "_Drafts folder:"
-msgstr "Synchronising \"%s\""
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
+#: mail/mail-config.glade.h:148
+msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
+#: mail/mail-config.glade.h:149
+msgid "_Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:151
+msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: 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:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+msgid "_Forward style:"
+msgstr ""
+
+#: mail/mail-config.glade.h:157
+msgid "_Full name:"
+msgstr ""
+
+#: mail/mail-config.glade.h:159
+msgid "_HTML Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:160
 msgid "_HTML Signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
-msgid "_Highlight citations with"
+#: mail/mail-config.glade.h:162
+msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
+#: mail/mail-config.glade.h:163
+msgid "_Language:"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
+#: mail/mail-config.glade.h:165
+msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
-#, fuzzy
-msgid "_Organization:"
-msgstr "Organisation:"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
+#: mail/mail-config.glade.h:172
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
-msgid "_Send mail in HTML format by default."
+#: mail/mail-config.glade.h:173
+msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
-msgid "_Server Type: "
+#: mail/mail-config.glade.h:174
+msgid "_Random"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:175
+msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
+#: mail/mail-config.glade.h:176
+msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
-msgid "_every"
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
-msgid "description"
+#: mail/mail-config.glade.h:178
+msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
-msgid "newswindow1"
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
+#: mail/mail-config.glade.h:180
+msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
-msgid "seconds."
+#: mail/mail-config.glade.h:181
+msgid "_Show animated images"
+msgstr ""
+
+#: mail/mail-config.glade.h:182
+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
+msgid "_Variable-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:186
+msgid "_every"
+msgstr ""
+
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr "Colours"
+
+#: mail/mail-config.glade.h:188
+msgid "description"
+msgstr ""
+
+#: mail/mail-config.glade.h:190
+msgid "newswindow1"
 msgstr ""
 
 #: mail/mail-crypto.c:59
@@ -9196,183 +11419,174 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1594
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr ""
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:1813
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+#: mail/mail-format.c:915
+msgid "Mailer"
 msgstr ""
 
-#: mail/mail-format.c:1836
-#, fuzzy
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/mail-format.c:1844
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1852
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:2068
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2087
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2129
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, 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:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Synchronising \"%s\""
@@ -9395,159 +11609,159 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Synchronising \"%s\""
 
-#: 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:557
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:677
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:696
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: 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:791
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr ""
-
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1424
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1518
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1569
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2138
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr ""
 
@@ -9587,64 +11801,84 @@ msgstr ""
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:246
 #, 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 ""
 
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:286
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr ""
 
-#: mail/mail-send-recv.c:348
+#: 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:350 mail/mail-send-recv.c:403
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:533
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-tools.c:255
+#: mail/mail-signature-editor.c:79
+#, c-format
+msgid "Could not save signature file: %s"
+msgstr ""
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr ""
+
+#: mail/mail-signature-editor.c:178
+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:"
+msgstr ""
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr ""
 
@@ -9667,105 +11901,158 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr ""
+#: mail/mail-vfolder.c:785
+#, fuzzy
+msgid "vFolders"
+msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:825
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:841
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:895
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr ""
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr ""
 
-#: mail/message-list.c:639
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:640
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:641
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:642
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:643
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:647
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:648
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:652
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:653
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:903
+#: mail/message-list.c:991
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:910
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:931
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:941
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr ""
 
-#: mail/message-list.etspec.h:2
-msgid "Flagged"
+#: mail/message-list.etspec.h:3
+msgid "Due By"
 msgstr ""
 
 #: mail/message-list.etspec.h:4
+msgid "Flag Status"
+msgstr ""
+
+#: mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr ""
 
+#: mail/message-tag-followup.c:57
+msgid "Call"
+msgstr ""
+
+#: mail/message-tag-followup.c:58
+msgid "Do Not Forward"
+msgstr ""
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+msgid "For Your Information"
+msgstr ""
+
+#: 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-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr ""
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr ""
+
+#: mail/message-tag-followup.c:66
+msgid "Review"
+msgstr ""
+
+#: 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\""
@@ -9787,7 +12074,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #: 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 ""
 
@@ -9834,86 +12121,9976 @@ msgstr ""
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 #, fuzzy
-msgid "Evolution component for the executive summary."
+msgid "Configuration control for the Evolution Summary."
 msgstr "Cannot initialise Evolution's mail summary component."
 
-#: my-evolution/component-factory.c:44
-msgid "Folder containing the Evolution Summary"
-msgstr ""
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/component-factory.c:153
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
 #, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
+msgid "Factory for the Evolution Summary component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+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 ""
+
+#: my-evolution/Locations.h:1
+msgid "Aarhus"
+msgstr ""
+
+#: my-evolution/Locations.h:2
+msgid "Abakan"
+msgstr ""
+
+#: my-evolution/Locations.h:3
+msgid "Abbotsford"
+msgstr ""
+
+#: my-evolution/Locations.h:4
+msgid "Aberdeen"
+msgstr ""
+
+#: my-evolution/Locations.h:5
+msgid "Abha"
+msgstr ""
+
+#: my-evolution/Locations.h:6
+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
+msgid "Acarigua"
+msgstr ""
+
+#: my-evolution/Locations.h:13
+msgid "Adak"
+msgstr ""
+
+#: my-evolution/Locations.h:14
+msgid "Adana"
+msgstr ""
+
+#: my-evolution/Locations.h:15
+msgid "Adana/Incirlik"
+msgstr ""
+
+#: my-evolution/Locations.h:16
+msgid "Adelaide"
+msgstr ""
+
+#: my-evolution/Locations.h:17
+msgid "Aden"
+msgstr ""
+
+#: my-evolution/Locations.h:18
+msgid "Adrar"
+msgstr ""
+
+#: my-evolution/Locations.h:19
+msgid "Aeroparque"
+msgstr ""
+
+#: my-evolution/Locations.h:20
+msgid "Aeropuerto del Norte"
+msgstr ""
+
+#: my-evolution/Locations.h:21
+msgid "Afonsos"
+msgstr ""
+
+#: my-evolution/Locations.h:22
+msgid "Africa"
+msgstr ""
+
+#: my-evolution/Locations.h:23
+msgid "Afyon"
+msgstr ""
+
+#: my-evolution/Locations.h:24
+#, fuzzy
+msgid "Agen"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:25
+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
+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 ""
+
+#: my-evolution/Locations.h:39
+msgid "Alamosa"
+msgstr ""
+
+#: my-evolution/Locations.h:40
+msgid "Alaska"
+msgstr ""
+
+#: my-evolution/Locations.h:41
+msgid "Al Baha"
+msgstr ""
+
+#: my-evolution/Locations.h:43
+msgid "Albany"
+msgstr ""
+
+#: my-evolution/Locations.h:44
+msgid "Albenga"
+msgstr ""
+
+#: my-evolution/Locations.h:45
+msgid "Alberta"
+msgstr ""
+
+#: my-evolution/Locations.h:46
+msgid "Alborg"
+msgstr ""
+
+#: my-evolution/Locations.h:47
+msgid "Albuquerque"
+msgstr ""
+
+#: my-evolution/Locations.h:48
+msgid "Alderney"
+msgstr ""
+
+#: my-evolution/Locations.h:49
+msgid "Alesund"
+msgstr ""
+
+#: my-evolution/Locations.h:50
+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
+msgid "Alghero"
+msgstr ""
+
+#: my-evolution/Locations.h:56
+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 ""
+
+#: my-evolution/Locations.h:62
+msgid "Alliance"
+msgstr ""
+
+#: my-evolution/Locations.h:63
+msgid "Alma"
+msgstr ""
+
+#: my-evolution/Locations.h:64
+msgid "Almeria"
+msgstr ""
+
+#: my-evolution/Locations.h:65
+msgid "Alpena"
+msgstr ""
+
+#: my-evolution/Locations.h:66
+msgid "Al Qaysumah"
+msgstr ""
+
+#: my-evolution/Locations.h:67
+msgid "Alta"
+msgstr ""
+
+#: my-evolution/Locations.h:68
+msgid "Altamira"
+msgstr ""
+
+#: my-evolution/Locations.h:69
+msgid "Alton"
+msgstr ""
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr ""
+
+#: my-evolution/Locations.h:71
+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 ""
+
+#: my-evolution/Locations.h:75
+msgid "Amarillo"
+msgstr ""
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr ""
+
+#: my-evolution/Locations.h:77
+msgid "Ambler"
+msgstr ""
+
+#: my-evolution/Locations.h:78
+msgid "Amelia"
+msgstr ""
+
+#: my-evolution/Locations.h:79
+msgid "Amendola"
+msgstr ""
+
+#: my-evolution/Locations.h:80
+msgid "Ames"
+msgstr ""
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr ""
+
+#: my-evolution/Locations.h:82
+msgid "Amsterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:83
+msgid "Anadyr"
+msgstr ""
+
+#: my-evolution/Locations.h:84
+msgid "Anaktuvuk"
+msgstr ""
+
+#: my-evolution/Locations.h:85
+msgid "Anapa"
+msgstr ""
+
+#: my-evolution/Locations.h:86
+msgid "Anchorage"
+msgstr ""
+
+#: my-evolution/Locations.h:87
+msgid "Anchorage - Elmendorf AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:88
+msgid "Ancona"
+msgstr ""
+
+#: my-evolution/Locations.h:89
+msgid "Andahuayla"
+msgstr ""
+
+#: my-evolution/Locations.h:90
+msgid "Anderson"
+msgstr ""
+
+#: my-evolution/Locations.h:91
+msgid "Andoya"
+msgstr ""
+
+#: my-evolution/Locations.h:92
+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
+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 ""
+
+#: my-evolution/Locations.h:101
+msgid "Anniston"
+msgstr ""
+
+#: my-evolution/Locations.h:102
+msgid "Antalya"
+msgstr ""
+
+#: my-evolution/Locations.h:103
+msgid "Antartica"
+msgstr ""
+
+#: my-evolution/Locations.h:104
+msgid "Antigo"
+msgstr ""
+
+#: my-evolution/Locations.h:105
+#, fuzzy
+msgid "Antigua"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:106
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: my-evolution/Locations.h:107
+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
+msgid "Apalachicola"
+msgstr ""
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr ""
+
+#: my-evolution/Locations.h:112
+msgid "Aquadilla"
+msgstr ""
+
+#: my-evolution/Locations.h:113
+msgid "Aracaju"
+msgstr ""
+
+#: my-evolution/Locations.h:114
+msgid "Arad"
+msgstr ""
+
+#: my-evolution/Locations.h:115
+msgid "Arar"
+msgstr ""
+
+#: my-evolution/Locations.h:116
+msgid "Araxos"
+msgstr ""
+
+#: my-evolution/Locations.h:117
+msgid "Arcata"
+msgstr ""
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr ""
+
+#: my-evolution/Locations.h:119
+msgid "Arequipa"
+msgstr ""
+
+#: my-evolution/Locations.h:121
+msgid "Arica"
+msgstr ""
+
+#: my-evolution/Locations.h:122
+#, fuzzy
+msgid "Arizona"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:123
+msgid "Arkansas"
+msgstr ""
+
+#: my-evolution/Locations.h:124
+msgid "Arkhangelsk"
+msgstr ""
+
+#: my-evolution/Locations.h:125
+#, fuzzy
+msgid "Arlington"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:126
+#, fuzzy
+msgid "Artigas"
+msgstr "Organisation"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:131
+msgid "Ashfield"
+msgstr ""
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:133
+msgid "Ashland"
+msgstr ""
+
+#: my-evolution/Locations.h:134
+msgid "Asia"
+msgstr ""
+
+#: my-evolution/Locations.h:135
+msgid "Aspen"
+msgstr ""
+
+#: my-evolution/Locations.h:136
+msgid "Asswan"
+msgstr ""
+
+#: my-evolution/Locations.h:137
+msgid "Astoria"
+msgstr ""
+
+#: my-evolution/Locations.h:138
+msgid "Astrakhan"
+msgstr ""
+
+#: my-evolution/Locations.h:139
+msgid "Asturias"
+msgstr ""
+
+#: my-evolution/Locations.h:140
+msgid "Asuncion"
+msgstr ""
+
+#: my-evolution/Locations.h:141
+msgid "Athens"
+msgstr ""
+
+#: my-evolution/Locations.h:142
+#, fuzzy
+msgid "Athinai"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:143
+msgid "Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:144
+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
+msgid "Auckland"
+msgstr ""
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:150
+msgid "Augusta"
+msgstr ""
+
+#: my-evolution/Locations.h:151
+msgid "Aurora"
+msgstr ""
+
+#: my-evolution/Locations.h:152
+msgid "Austin"
+msgstr ""
+
+#: my-evolution/Locations.h:153
+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 ""
+
+#: my-evolution/Locations.h:159
+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 ""
+
+#: my-evolution/Locations.h:170
+msgid "Ball Mountain"
+msgstr ""
+
+#: my-evolution/Locations.h:171
+msgid "Baltimore"
+msgstr ""
+
+#: my-evolution/Locations.h:172
+msgid "Baltimore-Glen Burnie"
+msgstr ""
+
+#: my-evolution/Locations.h:173
+msgid "Banak"
+msgstr ""
+
+#: my-evolution/Locations.h:174
+msgid "Bandarabbass"
+msgstr ""
+
+#: my-evolution/Locations.h:175
+msgid "Bangor"
+msgstr ""
+
+#: my-evolution/Locations.h:176
+msgid "Baracoa"
+msgstr ""
+
+#: my-evolution/Locations.h:177
+msgid "Barbers Point"
+msgstr ""
+
+#: my-evolution/Locations.h:178
+msgid "Barcelona"
+msgstr ""
+
+#: my-evolution/Locations.h:179
+msgid "Bardufoss"
+msgstr ""
+
+#: my-evolution/Locations.h:180
+msgid "Bar Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:181
+msgid "Bari"
+msgstr ""
+
+#: my-evolution/Locations.h:182
+msgid "Bariloche"
+msgstr ""
+
+#: my-evolution/Locations.h:183
+msgid "Barinas"
+msgstr ""
+
+#: my-evolution/Locations.h:184
+msgid "Barking Sand"
+msgstr ""
+
+#: my-evolution/Locations.h:185
+msgid "Barksdale"
+msgstr ""
+
+#: my-evolution/Locations.h:186
+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
+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
+msgid "Bastia"
+msgstr ""
+
+#: my-evolution/Locations.h:194
+msgid "Batesville"
+msgstr ""
+
+#: my-evolution/Locations.h:195
+msgid "Batman"
+msgstr ""
+
+#: my-evolution/Locations.h:196
+msgid "Baton Rouge"
+msgstr ""
+
+#: my-evolution/Locations.h:197
+msgid "Battle Creek"
+msgstr ""
+
+#: my-evolution/Locations.h:198
+msgid "Battle Mountain"
+msgstr ""
+
+#: my-evolution/Locations.h:199
+msgid "Bauru"
+msgstr ""
+
+#: my-evolution/Locations.h:200
+msgid "Bayamo"
+msgstr ""
+
+#: my-evolution/Locations.h:201
+msgid "Bayreuth"
+msgstr ""
+
+#: my-evolution/Locations.h:202
+msgid "Beatrice"
+msgstr ""
+
+#: my-evolution/Locations.h:203
+msgid "Beaufort"
+msgstr ""
+
+#: my-evolution/Locations.h:204
+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
+msgid "Beauvechain"
+msgstr ""
+
+#: my-evolution/Locations.h:208
+msgid "Beckley"
+msgstr ""
+
+#: my-evolution/Locations.h:209
+msgid "Bedford"
+msgstr ""
+
+#: my-evolution/Locations.h:210
+msgid "Beijing"
+msgstr ""
+
+#: my-evolution/Locations.h:211
+msgid "Beirut"
+msgstr ""
+
+#: my-evolution/Locations.h:212
+msgid "Beja"
+msgstr ""
+
+#: my-evolution/Locations.h:213
+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 ""
+
+#: my-evolution/Locations.h:219
+msgid "Belleville"
+msgstr ""
+
+#: my-evolution/Locations.h:220
+msgid "Bellingham"
+msgstr ""
+
+#: my-evolution/Locations.h:221
+msgid "Belmar-Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:222
+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
+msgid "Benbecula"
+msgstr ""
+
+#: my-evolution/Locations.h:226
+#, fuzzy
+msgid "Benina"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:227
+msgid "Benton Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:228
+msgid "Bentonville"
+msgstr ""
+
+#: my-evolution/Locations.h:229
+msgid "Beograd"
+msgstr ""
+
+#: my-evolution/Locations.h:230
+msgid "Bergamo"
+msgstr ""
+
+#: my-evolution/Locations.h:231
+msgid "Bergen"
+msgstr ""
+
+#: my-evolution/Locations.h:232
+msgid "Bergstrom AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:233
+msgid "Berlevag"
+msgstr ""
+
+#: my-evolution/Locations.h:234
+msgid "Berlin"
+msgstr ""
+
+#: my-evolution/Locations.h:235
+msgid "Berlin-Tegel"
+msgstr ""
+
+#: my-evolution/Locations.h:236
+msgid "Berlin-Tempelhof"
+msgstr ""
+
+#: my-evolution/Locations.h:237
+msgid "Bern"
+msgstr ""
+
+#: my-evolution/Locations.h:238
+msgid "Bethel"
+msgstr ""
+
+#: my-evolution/Locations.h:239
+msgid "Bethlehem Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:240
+msgid "Bettles"
+msgstr ""
+
+#: my-evolution/Locations.h:241
+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 ""
+
+#: my-evolution/Locations.h:245
+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
+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 ""
+
+#: my-evolution/Locations.h:257
+msgid "Blanding"
+msgstr ""
+
+#: my-evolution/Locations.h:258
+msgid "Block Island"
+msgstr ""
+
+#: my-evolution/Locations.h:259
+msgid "Bloemfontein J. B. M. Hertzog "
+msgstr ""
+
+#: my-evolution/Locations.h:260
+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 ""
+
+#: my-evolution/Locations.h:267
+msgid "Bodo"
+msgstr ""
+
+#: my-evolution/Locations.h:268
+msgid "Bogota/Eldorado"
+msgstr ""
+
+#: my-evolution/Locations.h:269
+#, fuzzy
+msgid "Boise"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:271
+msgid "Bologna"
+msgstr ""
+
+#: my-evolution/Locations.h:272
+msgid "Bolzano"
+msgstr ""
+
+#: my-evolution/Locations.h:273
+msgid "Bombay/Santacruz"
+msgstr ""
+
+#: my-evolution/Locations.h:274
+msgid "Boone"
+msgstr ""
+
+#: my-evolution/Locations.h:275
+msgid "Bordeaux"
+msgstr ""
+
+#: my-evolution/Locations.h:276
+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
+msgid "Bosnia-Herzegovina"
+msgstr ""
+
+#: my-evolution/Locations.h:280
+msgid "Boston"
+msgstr ""
+
+#: my-evolution/Locations.h:281
+msgid "Boulmer"
+msgstr ""
+
+#: my-evolution/Locations.h:282
+msgid "Bourges"
+msgstr ""
+
+#: my-evolution/Locations.h:283
+msgid "Bournemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:284
+msgid "Bowling Green"
+msgstr ""
+
+#: my-evolution/Locations.h:285
+msgid "Bozeman"
+msgstr ""
+
+#: my-evolution/Locations.h:286
+msgid "Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:287
+msgid "Bradshaw Field"
+msgstr ""
+
+#: my-evolution/Locations.h:288
+msgid "Brainerd"
+msgstr ""
+
+#: my-evolution/Locations.h:289
+msgid "Brasilia"
+msgstr ""
+
+#: my-evolution/Locations.h:290
+msgid "Brasschaat"
+msgstr ""
+
+#: my-evolution/Locations.h:291
+msgid "Bratislava"
+msgstr ""
+
+#: my-evolution/Locations.h:292
+msgid "Bratsk"
+msgstr ""
+
+#: my-evolution/Locations.h:293
+msgid "Braunschweig"
+msgstr ""
+
+#: my-evolution/Locations.h:295
+msgid "Bremen"
+msgstr ""
+
+#: my-evolution/Locations.h:296
+msgid "Bremerton"
+msgstr ""
+
+#: my-evolution/Locations.h:297
+msgid "Brest"
+msgstr ""
+
+#: my-evolution/Locations.h:298
+msgid "Bridgeport"
+msgstr ""
+
+#: my-evolution/Locations.h:299
+msgid "Brindisi"
+msgstr ""
+
+#: my-evolution/Locations.h:300
+msgid "Brisbane"
+msgstr ""
+
+#: my-evolution/Locations.h:301
+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
+msgid "Broadus"
+msgstr ""
+
+#: my-evolution/Locations.h:305
+msgid "Broken Bow"
+msgstr ""
+
+#: my-evolution/Locations.h:306
+msgid "Bronnoysund"
+msgstr ""
+
+#: my-evolution/Locations.h:307
+msgid "Brookings"
+msgstr ""
+
+#: my-evolution/Locations.h:308
+msgid "Brooksville"
+msgstr ""
+
+#: my-evolution/Locations.h:309
+msgid "Broome"
+msgstr ""
+
+#: my-evolution/Locations.h:310
+msgid "Brownsville"
+msgstr ""
+
+#: my-evolution/Locations.h:311
+msgid "Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:312
+msgid "Brussels-National Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:313
+msgid "Bryansk"
+msgstr ""
+
+#: my-evolution/Locations.h:314
+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
+msgid "Burbank"
+msgstr ""
+
+#: my-evolution/Locations.h:323
+msgid "Burgas"
+msgstr ""
+
+#: my-evolution/Locations.h:324
+msgid "Burley"
+msgstr ""
+
+#: my-evolution/Locations.h:325
+msgid "Burlington"
+msgstr ""
+
+#: my-evolution/Locations.h:326
+msgid "Burnet"
+msgstr ""
+
+#: my-evolution/Locations.h:327
+msgid "Burns"
+msgstr ""
+
+#: my-evolution/Locations.h:328
+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 ""
+
+#: my-evolution/Locations.h:332
+#, fuzzy
+msgid "Cagliari"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:333
+msgid "Cairns"
+msgstr ""
+
+#: my-evolution/Locations.h:334
+#, fuzzy
+msgid "Cairo"
+msgstr "Colours"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:338
+#, fuzzy
+msgid "Calgary"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:339
+msgid "Cali/Alfonso Bonillaaragon"
+msgstr ""
+
+#: my-evolution/Locations.h:340
+msgid "Caliente"
+msgstr ""
+
+#: my-evolution/Locations.h:341
+msgid "California"
+msgstr ""
+
+#: my-evolution/Locations.h:342
+msgid "Calvi-Ste-Catherine"
+msgstr ""
+
+#: my-evolution/Locations.h:343
+msgid "Camaguey"
+msgstr ""
+
+#: my-evolution/Locations.h:344
+msgid "Camarillo"
+msgstr ""
+
+#: my-evolution/Locations.h:345
+msgid "Cambridge"
+msgstr ""
+
+#: my-evolution/Locations.h:346
+msgid "Cameron"
+msgstr ""
+
+#: my-evolution/Locations.h:347
+msgid "Camiri"
+msgstr ""
+
+#: my-evolution/Locations.h:348
+msgid "Campeche"
+msgstr ""
+
+#: my-evolution/Locations.h:349
+msgid "Campinas"
+msgstr ""
+
+#: my-evolution/Locations.h:350
+#, fuzzy
+msgid "Campo"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:351
+msgid "Campo Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr ""
+
+#: my-evolution/Locations.h:353
+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 ""
+
+#: my-evolution/Locations.h:363
+msgid "Cancun"
+msgstr ""
+
+#: my-evolution/Locations.h:364
+msgid "Cannes-Mandelieu"
+msgstr ""
+
+#: my-evolution/Locations.h:365
+msgid "Cantwell"
+msgstr ""
+
+#: my-evolution/Locations.h:366
+msgid "Cape Girardeau"
+msgstr ""
+
+#: my-evolution/Locations.h:367
+msgid "Cape Hatteras"
+msgstr ""
+
+#: my-evolution/Locations.h:368
+msgid "Cape Lisburne"
+msgstr ""
+
+#: my-evolution/Locations.h:369
+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
+msgid "Capo Mele"
+msgstr ""
+
+#: my-evolution/Locations.h:374
+msgid "Caracas La Carlota"
+msgstr ""
+
+#: my-evolution/Locations.h:375
+msgid "Caracas Maiquetia"
+msgstr ""
+
+#: my-evolution/Locations.h:376
+msgid "Caravelas"
+msgstr ""
+
+#: my-evolution/Locations.h:377
+msgid "Carbondale"
+msgstr ""
+
+#: my-evolution/Locations.h:378
+msgid "Cardiff"
+msgstr ""
+
+#: my-evolution/Locations.h:379
+msgid "Caribou"
+msgstr ""
+
+#: my-evolution/Locations.h:380
+#, fuzzy
+msgid "Carlisle"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:381
+msgid "Carlsbad"
+msgstr ""
+
+#: my-evolution/Locations.h:382
+msgid "Carroll"
+msgstr ""
+
+#: my-evolution/Locations.h:383
+msgid "Cartagena/Rafael Nunez"
+msgstr ""
+
+#: my-evolution/Locations.h:384
+msgid "Casa Granda"
+msgstr ""
+
+#: my-evolution/Locations.h:385
+msgid "Cascade"
+msgstr ""
+
+#: my-evolution/Locations.h:386
+msgid "Casper"
+msgstr ""
+
+#: my-evolution/Locations.h:387
+msgid "Catacamas"
+msgstr ""
+
+#: my-evolution/Locations.h:388
+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 ""
+
+#: my-evolution/Locations.h:393
+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
+msgid "Cervia"
+msgstr ""
+
+#: my-evolution/Locations.h:397
+msgid "Chacarita"
+msgstr ""
+
+#: my-evolution/Locations.h:398
+msgid "Chadron"
+msgstr ""
+
+#: my-evolution/Locations.h:399
+msgid "Challis"
+msgstr ""
+
+#: my-evolution/Locations.h:400
+msgid "Chamberlain"
+msgstr ""
+
+#: my-evolution/Locations.h:401
+msgid "Chambery"
+msgstr ""
+
+#: my-evolution/Locations.h:402
+msgid "Champaign"
+msgstr ""
+
+#: my-evolution/Locations.h:403
+msgid "Chandalar Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:404
+#, fuzzy
+msgid "Chandler"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:405
+msgid "Chania"
+msgstr ""
+
+#: my-evolution/Locations.h:406
+msgid "Chanute"
+msgstr ""
+
+#: my-evolution/Locations.h:407
+msgid "Chariton"
+msgstr ""
+
+#: my-evolution/Locations.h:408
+msgid "Charleroi-Brussels South"
+msgstr ""
+
+#: my-evolution/Locations.h:409
+msgid "Charles City"
+msgstr ""
+
+#: my-evolution/Locations.h:410
+msgid "Charleston"
+msgstr ""
+
+#: my-evolution/Locations.h:411
+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 ""
+
+#: my-evolution/Locations.h:416
+#, fuzzy
+msgid "Cheju"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:417
+msgid "Chelyabinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:418
+msgid "Chengdu"
+msgstr ""
+
+#: my-evolution/Locations.h:419
+msgid "Cherbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:420
+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
+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 ""
+
+#: my-evolution/Locations.h:431
+#, fuzzy
+msgid "Chiclayo"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:432
+#, fuzzy
+msgid "Chico"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:433
+msgid "Chicopee Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:434
+#, fuzzy
+msgid "Chievres"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:435
+msgid "Chihhang"
+msgstr ""
+
+#: my-evolution/Locations.h:436
+msgid "Chihuahua"
+msgstr ""
+
+#: my-evolution/Locations.h:437
+#, fuzzy
+msgid "Childress"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:439
+msgid "China Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:440
+msgid "Chinandega"
+msgstr ""
+
+#: my-evolution/Locations.h:441
+msgid "Chinmem/Shatou"
+msgstr ""
+
+#: my-evolution/Locations.h:442
+#, fuzzy
+msgid "Chino"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:443
+msgid "Chippewa County"
+msgstr ""
+
+#: my-evolution/Locations.h:444
+#, fuzzy
+msgid "Chita"
+msgstr "Colours"
+
+#: 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
+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 ""
+
+#: my-evolution/Locations.h:462
+#, fuzzy
+msgid "Clarinda"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:463
+#, fuzzy
+msgid "Clarion"
+msgstr "Colours"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:468
+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
+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
+msgid "Cocos Island"
+msgstr ""
+
+#: my-evolution/Locations.h:477
+msgid "Cody"
+msgstr ""
+
+#: my-evolution/Locations.h:478
+msgid "Coeur d'Alene"
+msgstr ""
+
+#: my-evolution/Locations.h:479
+msgid "Cold Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:480
+#, fuzzy
+msgid "Colima"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:481
+msgid "College Station"
+msgstr ""
+
+#: my-evolution/Locations.h:482
+msgid "Colmar-Meyenheim"
+msgstr ""
+
+#: my-evolution/Locations.h:484
+msgid "Colonia"
+msgstr ""
+
+#: my-evolution/Locations.h:485
+#, fuzzy
+msgid "Colorado"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:486
+msgid "Colorado Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:487
+msgid "Columbia"
+msgstr ""
+
+#: my-evolution/Locations.h:488
+msgid "Columbia-McEntire"
+msgstr ""
+
+#: my-evolution/Locations.h:489
+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 ""
+
+#: my-evolution/Locations.h:494
+#, fuzzy
+msgid "Colville"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:495
+msgid "Comodoro Rivadavia"
+msgstr ""
+
+#: my-evolution/Locations.h:496
+#, fuzzy
+msgid "Comox"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:497
+msgid "Conceicao Do Araguaia"
+msgstr ""
+
+#: my-evolution/Locations.h:498
+msgid "Concepcion"
+msgstr ""
+
+#: my-evolution/Locations.h:499
+msgid "Concord"
+msgstr ""
+
+#: my-evolution/Locations.h:500
+msgid "Concordia"
+msgstr ""
+
+#: my-evolution/Locations.h:501
+msgid "Connaught"
+msgstr ""
+
+#: my-evolution/Locations.h:502
+msgid "Connecticut"
+msgstr ""
+
+#: my-evolution/Locations.h:503
+#, fuzzy
+msgid "Conroe"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:504
+msgid "Constantine"
+msgstr ""
+
+#: my-evolution/Locations.h:505
+msgid "Copper Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:506
+msgid "Cordoba"
+msgstr ""
+
+#: my-evolution/Locations.h:507
+msgid "Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:508
+msgid "Cork"
+msgstr ""
+
+#: my-evolution/Locations.h:509
+#, fuzzy
+msgid "Coro"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:510
+#, fuzzy
+msgid "Corona"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:511
+msgid "Corpus Christi"
+msgstr ""
+
+#: my-evolution/Locations.h:512
+msgid "Corpus Christi NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:513
+msgid "Corrientes"
+msgstr ""
+
+#: my-evolution/Locations.h:514
+msgid "Corsicana"
+msgstr ""
+
+#: my-evolution/Locations.h:515
+msgid "Cortez"
+msgstr ""
+
+#: my-evolution/Locations.h:516
+msgid "Corumba"
+msgstr ""
+
+#: my-evolution/Locations.h:518
+msgid "Cotulla"
+msgstr ""
+
+#: my-evolution/Locations.h:519
+msgid "Council Bluffs"
+msgstr ""
+
+#: my-evolution/Locations.h:520
+msgid "Coventry"
+msgstr ""
+
+#: my-evolution/Locations.h:521
+msgid "Covington"
+msgstr ""
+
+#: my-evolution/Locations.h:522
+msgid "Cozumel"
+msgstr ""
+
+#: my-evolution/Locations.h:523
+msgid "Craig"
+msgstr ""
+
+#: my-evolution/Locations.h:524
+msgid "Cranfield"
+msgstr ""
+
+#: my-evolution/Locations.h:525
+msgid "Crescent City"
+msgstr ""
+
+#: my-evolution/Locations.h:526
+msgid "Creston"
+msgstr ""
+
+#: my-evolution/Locations.h:527
+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
+msgid "Crotone"
+msgstr ""
+
+#: my-evolution/Locations.h:533
+msgid "Cuba Awrs"
+msgstr ""
+
+#: my-evolution/Locations.h:534
+msgid "Cuernavaca"
+msgstr ""
+
+#: my-evolution/Locations.h:535
+msgid "Cuiaba"
+msgstr ""
+
+#: my-evolution/Locations.h:536
+#, fuzzy
+msgid "Culdrose"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:537
+msgid "Culiacan"
+msgstr ""
+
+#: my-evolution/Locations.h:538
+msgid "Cumana"
+msgstr ""
+
+#: my-evolution/Locations.h:539
+msgid "Cumberland"
+msgstr ""
+
+#: my-evolution/Locations.h:540
+msgid "Curitiba"
+msgstr ""
+
+#: my-evolution/Locations.h:541
+msgid "Curitiba Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:542
+msgid "Custer"
+msgstr ""
+
+#: my-evolution/Locations.h:543
+msgid "Cut Bank"
+msgstr ""
+
+#: my-evolution/Locations.h:544
+msgid "Cuzco"
+msgstr ""
+
+#: my-evolution/Locations.h:547
+msgid "Dagali"
+msgstr ""
+
+#: my-evolution/Locations.h:548
+msgid "Daggett"
+msgstr ""
+
+#: my-evolution/Locations.h:549
+msgid "Dalhart"
+msgstr ""
+
+#: my-evolution/Locations.h:550
+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 ""
+
+#: my-evolution/Locations.h:556
+msgid "Danbury"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:562
+msgid "Dayton"
+msgstr ""
+
+#: my-evolution/Locations.h:563
+msgid "Daytona Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:564
+msgid "Dayton-Fairborn"
+msgstr ""
+
+#: my-evolution/Locations.h:565
+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 ""
+
+#: my-evolution/Locations.h:571
+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 ""
+
+#: my-evolution/Locations.h:576
+msgid "Delta"
+msgstr ""
+
+#: my-evolution/Locations.h:577
+msgid "Deming"
+msgstr ""
+
+#: my-evolution/Locations.h:578
+msgid "Den Helder/De Kooy"
+msgstr ""
+
+#: my-evolution/Locations.h:579
+msgid "Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:581
+msgid "Denton"
+msgstr ""
+
+#: my-evolution/Locations.h:582
+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 ""
+
+#: my-evolution/Locations.h:587
+msgid "Des Moines"
+msgstr ""
+
+#: my-evolution/Locations.h:588
+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
+msgid "Dhahran"
+msgstr ""
+
+#: my-evolution/Locations.h:596
+msgid "Dickinson"
+msgstr ""
+
+#: my-evolution/Locations.h:597
+msgid "Dijon"
+msgstr ""
+
+#: my-evolution/Locations.h:598
+msgid "Dillingham"
+msgstr ""
+
+#: my-evolution/Locations.h:599
+msgid "Dillon"
+msgstr ""
+
+#: my-evolution/Locations.h:600
+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
+msgid "Dole"
+msgstr ""
+
+#: my-evolution/Locations.h:609
+msgid "Donetsk"
+msgstr ""
+
+#: my-evolution/Locations.h:610
+msgid "Dongsha"
+msgstr ""
+
+#: my-evolution/Locations.h:611
+msgid "Dongshi"
+msgstr ""
+
+#: my-evolution/Locations.h:612
+msgid "Don Torcuato"
+msgstr ""
+
+#: my-evolution/Locations.h:613
+msgid "Dortmund-Wickede"
+msgstr ""
+
+#: my-evolution/Locations.h:614
+msgid "Dothan"
+msgstr ""
+
+#: my-evolution/Locations.h:615
+msgid "Douglas"
+msgstr ""
+
+#: my-evolution/Locations.h:616
+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
+msgid "Dubai"
+msgstr ""
+
+#: my-evolution/Locations.h:620
+msgid "Dubbo"
+msgstr ""
+
+#: my-evolution/Locations.h:621
+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 ""
+
+#: my-evolution/Locations.h:625
+msgid "Dugway"
+msgstr ""
+
+#: my-evolution/Locations.h:626
+msgid "Duluth"
+msgstr ""
+
+#: my-evolution/Locations.h:627
+msgid "Dundee"
+msgstr ""
+
+#: my-evolution/Locations.h:628
+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
+msgid "Dusseldorf"
+msgstr ""
+
+#: my-evolution/Locations.h:633
+msgid "Dutch Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:634
+msgid "Dyersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:635
+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
+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
+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
+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 ""
+
+#: my-evolution/Locations.h:661
+msgid "Elkins"
+msgstr ""
+
+#: my-evolution/Locations.h:662
+msgid "Elko"
+msgstr ""
+
+#: my-evolution/Locations.h:663
+msgid "Elmira"
+msgstr ""
+
+#: my-evolution/Locations.h:664
+msgid "El Monte"
+msgstr ""
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr ""
+
+#: my-evolution/Locations.h:667
+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
+msgid "Emporia"
+msgstr ""
+
+#: my-evolution/Locations.h:672
+msgid "Enid"
+msgstr ""
+
+#: my-evolution/Locations.h:673
+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
+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 ""
+
+#: my-evolution/Locations.h:685
+msgid "Eugene"
+msgstr ""
+
+#: my-evolution/Locations.h:686
+msgid "Eureka"
+msgstr ""
+
+#: my-evolution/Locations.h:687
+msgid "Europe"
+msgstr ""
+
+#: my-evolution/Locations.h:688
+msgid "Evanston"
+msgstr ""
+
+#: my-evolution/Locations.h:689
+msgid "Evansville"
+msgstr ""
+
+#: my-evolution/Locations.h:690
+msgid "Everett"
+msgstr ""
+
+#: my-evolution/Locations.h:691
+msgid "Evergreen"
+msgstr ""
+
+#: my-evolution/Locations.h:692
+msgid "Evreux-Fauville"
+msgstr ""
+
+#: my-evolution/Locations.h:693
+msgid "Exeter"
+msgstr ""
+
+#: my-evolution/Locations.h:694
+msgid "Ezeiza"
+msgstr ""
+
+#: my-evolution/Locations.h:695
+msgid "Fagernes"
+msgstr ""
+
+#: my-evolution/Locations.h:696
+msgid "Fairbanks"
+msgstr ""
+
+#: my-evolution/Locations.h:697
+msgid "Fairchild"
+msgstr ""
+
+#: my-evolution/Locations.h:698
+msgid "Fairfield"
+msgstr ""
+
+#: my-evolution/Locations.h:699
+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
+msgid "Fargo"
+msgstr ""
+
+#: my-evolution/Locations.h:705
+msgid "Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:706
+msgid "Farmington"
+msgstr ""
+
+#: my-evolution/Locations.h:707
+msgid "Farmville"
+msgstr ""
+
+#: my-evolution/Locations.h:708
+msgid "Faro"
+msgstr ""
+
+#: my-evolution/Locations.h:709
+msgid "Fayetteville"
+msgstr ""
+
+#: my-evolution/Locations.h:710
+msgid "Feng Nin"
+msgstr ""
+
+#: my-evolution/Locations.h:711
+msgid "Fergus Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:712
+msgid "Fernando De Noronha"
+msgstr ""
+
+#: my-evolution/Locations.h:713
+msgid "Ferrara"
+msgstr ""
+
+#: my-evolution/Locations.h:714
+msgid "Figari"
+msgstr ""
+
+#: my-evolution/Locations.h:715
+msgid "Findlay"
+msgstr ""
+
+#: my-evolution/Locations.h:717
+msgid "Firenze"
+msgstr ""
+
+#: my-evolution/Locations.h:718
+msgid "Fitchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:719
+msgid "Flagstaff"
+msgstr ""
+
+#: my-evolution/Locations.h:720
+msgid "Flint"
+msgstr ""
+
+#: my-evolution/Locations.h:721
+msgid "Flippin"
+msgstr ""
+
+#: my-evolution/Locations.h:722
+msgid "Florence"
+msgstr ""
+
+#: my-evolution/Locations.h:723
+msgid "Florennes"
+msgstr ""
+
+#: my-evolution/Locations.h:724
+msgid "Flores"
+msgstr ""
+
+#: my-evolution/Locations.h:725
+msgid "Florianopolis"
+msgstr ""
+
+#: my-evolution/Locations.h:726
+msgid "Florida"
+msgstr ""
+
+#: my-evolution/Locations.h:727
+msgid "Floro"
+msgstr ""
+
+#: my-evolution/Locations.h:728
+msgid "Fond Du Lac"
+msgstr ""
+
+#: my-evolution/Locations.h:729
+msgid "Forde/Bringeland"
+msgstr ""
+
+#: my-evolution/Locations.h:730
+msgid "Forli"
+msgstr ""
+
+#: my-evolution/Locations.h:731
+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 ""
+
+#: my-evolution/Locations.h:742
+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 ""
+
+#: my-evolution/Locations.h:748
+msgid "Fort Leonard"
+msgstr ""
+
+#: my-evolution/Locations.h:749
+msgid "Fort Lewis"
+msgstr ""
+
+#: my-evolution/Locations.h:750
+msgid "Fort Madison"
+msgstr ""
+
+#: my-evolution/Locations.h:751
+msgid "Fort Meade"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:757
+msgid "Fort Smith"
+msgstr ""
+
+#: my-evolution/Locations.h:758
+msgid "Fort Stewart"
+msgstr ""
+
+#: my-evolution/Locations.h:759
+msgid "Fort Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:760
+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 ""
+
+#: my-evolution/Locations.h:769
+msgid "Franklin"
+msgstr ""
+
+#: my-evolution/Locations.h:770
+msgid "Fredericton"
+msgstr ""
+
+#: my-evolution/Locations.h:771
+msgid "Freeport"
+msgstr ""
+
+#: my-evolution/Locations.h:772
+msgid "Frenchville"
+msgstr ""
+
+#: my-evolution/Locations.h:773
+msgid "Fresno"
+msgstr ""
+
+#: my-evolution/Locations.h:774
+msgid "Fresno-Chandler"
+msgstr ""
+
+#: my-evolution/Locations.h:775
+msgid "Friday Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:776
+msgid "Friedrichshafen"
+msgstr ""
+
+#: my-evolution/Locations.h:777
+msgid "Frigg"
+msgstr ""
+
+#: my-evolution/Locations.h:778
+msgid "Frontone"
+msgstr ""
+
+#: my-evolution/Locations.h:779
+msgid "Frosinone"
+msgstr ""
+
+#: my-evolution/Locations.h:780
+msgid "Fryeburg"
+msgstr ""
+
+#: 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
+msgid "FYR Macedonia"
+msgstr ""
+
+#: my-evolution/Locations.h:789
+msgid "Gadsden"
+msgstr ""
+
+#: my-evolution/Locations.h:790
+msgid "Gage"
+msgstr ""
+
+#: my-evolution/Locations.h:791
+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
+msgid "Galena"
+msgstr ""
+
+#: my-evolution/Locations.h:796
+msgid "Galesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:797
+msgid "Gallup"
+msgstr ""
+
+#: my-evolution/Locations.h:798
+msgid "Galveston"
+msgstr ""
+
+#: my-evolution/Locations.h:799
+msgid "Gambell"
+msgstr ""
+
+#: my-evolution/Locations.h:800
+msgid "Gander"
+msgstr ""
+
+#: my-evolution/Locations.h:801
+msgid "Garden City"
+msgstr ""
+
+#: my-evolution/Locations.h:802
+msgid "Gary"
+msgstr ""
+
+#: my-evolution/Locations.h:803
+msgid "Gassim"
+msgstr ""
+
+#: my-evolution/Locations.h:804
+msgid "Gatineau"
+msgstr ""
+
+#: my-evolution/Locations.h:805
+msgid "Gaziantep"
+msgstr ""
+
+#: my-evolution/Locations.h:806
+msgid "Gdansk"
+msgstr ""
+
+#: my-evolution/Locations.h:807
+msgid "Geneve"
+msgstr ""
+
+#: my-evolution/Locations.h:808
+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
+msgid "Ghardaia"
+msgstr ""
+
+#: my-evolution/Locations.h:814
+msgid "Ghedi"
+msgstr ""
+
+#: my-evolution/Locations.h:816
+msgid "Gifu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:817
+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 ""
+
+#: my-evolution/Locations.h:821
+msgid "Girona"
+msgstr ""
+
+#: my-evolution/Locations.h:822
+msgid "Gizan"
+msgstr ""
+
+#: my-evolution/Locations.h:823
+msgid "Glasgow"
+msgstr ""
+
+#: my-evolution/Locations.h:824
+msgid "Glendive"
+msgstr ""
+
+#: my-evolution/Locations.h:825
+msgid "Glens Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:826
+msgid "Goiania"
+msgstr ""
+
+#: my-evolution/Locations.h:827
+msgid "Goldsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:828
+msgid "Goodland"
+msgstr ""
+
+#: my-evolution/Locations.h:829
+msgid "Goose Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:830
+msgid "Goteborg (Landvetter)"
+msgstr ""
+
+#: my-evolution/Locations.h:831
+msgid "Goteborg (Save)"
+msgstr ""
+
+#: my-evolution/Locations.h:832
+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
+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
+msgid "Grand Marais"
+msgstr ""
+
+#: my-evolution/Locations.h:840
+msgid "Grand Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:841
+msgid "Grandview"
+msgstr ""
+
+#: my-evolution/Locations.h:842
+msgid "Grangeville"
+msgstr ""
+
+#: my-evolution/Locations.h:843
+msgid "Grants"
+msgstr ""
+
+#: my-evolution/Locations.h:844
+msgid "Graz"
+msgstr ""
+
+#: my-evolution/Locations.h:845
+msgid "Great Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:847
+msgid "Greeley"
+msgstr ""
+
+#: my-evolution/Locations.h:848
+msgid "Green Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:849
+msgid "Green River"
+msgstr ""
+
+#: my-evolution/Locations.h:850
+msgid "Greensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:851
+msgid "Greenville"
+msgstr ""
+
+#: my-evolution/Locations.h:852
+msgid "Greenville-Spartanburg"
+msgstr ""
+
+#: my-evolution/Locations.h:853
+msgid "Greenwood"
+msgstr ""
+
+#: my-evolution/Locations.h:854
+msgid "Grenoble-Saint-Geoirs"
+msgstr ""
+
+#: my-evolution/Locations.h:855
+msgid "Griffiss AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:856
+msgid "Groningen"
+msgstr ""
+
+#: my-evolution/Locations.h:857
+msgid "Grosseto"
+msgstr ""
+
+#: my-evolution/Locations.h:858
+msgid "Groton"
+msgstr ""
+
+#: my-evolution/Locations.h:859
+msgid "Guadalajara"
+msgstr ""
+
+#: my-evolution/Locations.h:860
+msgid "Guadalupe Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:861
+msgid "Guanare"
+msgstr ""
+
+#: my-evolution/Locations.h:862
+msgid "Guangzhou"
+msgstr ""
+
+#: my-evolution/Locations.h:863
+msgid "Guantanamo"
+msgstr ""
+
+#: my-evolution/Locations.h:864
+msgid "Guarany"
+msgstr ""
+
+#: my-evolution/Locations.h:865
+msgid "Guaratingueta"
+msgstr ""
+
+#: my-evolution/Locations.h:866
+msgid "Guarulhos"
+msgstr ""
+
+#: my-evolution/Locations.h:868
+msgid "Guayaquil/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:869
+msgid "Guaymas"
+msgstr ""
+
+#: my-evolution/Locations.h:870
+msgid "Guernsey"
+msgstr ""
+
+#: my-evolution/Locations.h:871
+msgid "Guidonia"
+msgstr ""
+
+#: my-evolution/Locations.h:872
+msgid "Gulfport"
+msgstr ""
+
+#: my-evolution/Locations.h:873
+msgid "Gulkana"
+msgstr ""
+
+#: my-evolution/Locations.h:874
+msgid "Gullfax C"
+msgstr ""
+
+#: my-evolution/Locations.h:875
+msgid "Gunnison"
+msgstr ""
+
+#: my-evolution/Locations.h:876
+msgid "Gunnison (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:877
+msgid "Guriat"
+msgstr ""
+
+#: my-evolution/Locations.h:878
+msgid "Gustavus"
+msgstr ""
+
+#: my-evolution/Locations.h:879
+msgid "Guymon"
+msgstr ""
+
+#: my-evolution/Locations.h:880
+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 ""
+
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+msgid "Hail"
+msgstr ""
+
+#: my-evolution/Locations.h:886
+msgid "Hailey-Sun Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:887
+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
+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 ""
+
+#: my-evolution/Locations.h:902
+msgid "Ha Noi"
+msgstr ""
+
+#: my-evolution/Locations.h:903
+msgid "Harbor Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:904
+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 ""
+
+#: my-evolution/Locations.h:911
+msgid "Hastings"
+msgstr ""
+
+#: my-evolution/Locations.h:912
+msgid "Haugesund"
+msgstr ""
+
+#: my-evolution/Locations.h:913
+msgid "Havre"
+msgstr ""
+
+#: my-evolution/Locations.h:914
+msgid "Hawaii"
+msgstr ""
+
+#: my-evolution/Locations.h:915
+msgid "Hawthorne"
+msgstr ""
+
+#: my-evolution/Locations.h:916
+msgid "Hayden"
+msgstr ""
+
+#: my-evolution/Locations.h:917
+msgid "Hayes River"
+msgstr ""
+
+#: my-evolution/Locations.h:918
+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
+msgid "Helena"
+msgstr ""
+
+#: my-evolution/Locations.h:922
+msgid "Helsinki"
+msgstr ""
+
+#: my-evolution/Locations.h:923
+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
+msgid "Hillsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:930
+msgid "Hilo"
+msgstr ""
+
+#: my-evolution/Locations.h:931
+msgid "Hinesville"
+msgstr ""
+
+#: my-evolution/Locations.h:932
+msgid "Hiroshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:933
+msgid "Hobart"
+msgstr ""
+
+#: my-evolution/Locations.h:934
+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 ""
+
+#: my-evolution/Locations.h:941
+msgid "Holguin"
+msgstr ""
+
+#: my-evolution/Locations.h:942
+#, fuzzy
+msgid "Homer"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:943
+msgid "Homestead AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:944
+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
+msgid "Houlton"
+msgstr ""
+
+#: my-evolution/Locations.h:954
+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 ""
+
+#: my-evolution/Locations.h:960
+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 ""
+
+#: my-evolution/Locations.h:964
+msgid "Hulien"
+msgstr ""
+
+#: my-evolution/Locations.h:965
+msgid "Humberside"
+msgstr ""
+
+#: my-evolution/Locations.h:967
+msgid "Huntington"
+msgstr ""
+
+#: my-evolution/Locations.h:968
+msgid "Huntsville"
+msgstr ""
+
+#: my-evolution/Locations.h:969
+msgid "Hurlburt"
+msgstr ""
+
+#: my-evolution/Locations.h:970
+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
+msgid "Iasi"
+msgstr ""
+
+#: my-evolution/Locations.h:977
+msgid "Ibiza"
+msgstr ""
+
+#: my-evolution/Locations.h:979
+msgid "Ichikawa"
+msgstr ""
+
+#: my-evolution/Locations.h:980
+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
+msgid "Ilan"
+msgstr ""
+
+#: my-evolution/Locations.h:985
+msgid "Iliamna"
+msgstr ""
+
+#: my-evolution/Locations.h:986
+msgid "Illinois"
+msgstr ""
+
+#: my-evolution/Locations.h:987
+msgid "Imperial"
+msgstr ""
+
+#: my-evolution/Locations.h:988
+msgid "Imperial (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:989
+msgid "Imperial Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:990
+msgid "In Amenas"
+msgstr ""
+
+#: my-evolution/Locations.h:992
+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 ""
+
+#: my-evolution/Locations.h:998
+msgid "Inverness"
+msgstr ""
+
+#: my-evolution/Locations.h:999
+msgid "Inyokern"
+msgstr ""
+
+#: my-evolution/Locations.h:1000
+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 ""
+
+#: my-evolution/Locations.h:1005
+msgid "Iraklion"
+msgstr ""
+
+#: my-evolution/Locations.h:1006
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1008
+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
+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 ""
+
+#: my-evolution/Locations.h:1025
+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
+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 ""
+
+#: my-evolution/Locations.h:1044
+msgid "Jonkoping"
+msgstr ""
+
+#: my-evolution/Locations.h:1045
+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
+msgid "Juigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:1050
+msgid "Jujuy"
+msgstr ""
+
+#: my-evolution/Locations.h:1051
+msgid "Juliaca"
+msgstr ""
+
+#: my-evolution/Locations.h:1052
+msgid "Junction"
+msgstr ""
+
+#: my-evolution/Locations.h:1053
+msgid "Juneau"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1059
+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 ""
+
+#: my-evolution/Locations.h:1071
+msgid "Karachi"
+msgstr ""
+
+#: my-evolution/Locations.h:1072
+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
+msgid "Kazan"
+msgstr ""
+
+#: my-evolution/Locations.h:1080
+msgid "Kearney"
+msgstr ""
+
+#: my-evolution/Locations.h:1081
+msgid "Keene"
+msgstr ""
+
+#: my-evolution/Locations.h:1082
+msgid "Kefallinia"
+msgstr ""
+
+#: my-evolution/Locations.h:1083
+msgid "Keflavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1084
+msgid "Kenai"
+msgstr ""
+
+#: my-evolution/Locations.h:1085
+msgid "Kenosha"
+msgstr ""
+
+#: my-evolution/Locations.h:1086
+msgid "Kentucky"
+msgstr ""
+
+#: my-evolution/Locations.h:1087
+msgid "Keokuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1088
+msgid "Kerkira"
+msgstr ""
+
+#: my-evolution/Locations.h:1089
+msgid "Kerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1090
+msgid "Ketchikan"
+msgstr ""
+
+#: my-evolution/Locations.h:1091
+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
+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
+msgid "Konya"
+msgstr ""
+
+#: my-evolution/Locations.h:1132
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1133
+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
+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
+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
+msgid "Laconia"
+msgstr ""
+
+#: my-evolution/Locations.h:1151
+msgid "La Coruna"
+msgstr ""
+
+#: my-evolution/Locations.h:1152
+msgid "La Crosse"
+msgstr ""
+
+#: my-evolution/Locations.h:1153
+msgid "La Esperanza"
+msgstr ""
+
+#: my-evolution/Locations.h:1154
+msgid "Lafayette"
+msgstr ""
+
+#: my-evolution/Locations.h:1155
+msgid "La Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1156
+msgid "Lahaina"
+msgstr ""
+
+#: my-evolution/Locations.h:1157
+msgid "Lahore"
+msgstr ""
+
+#: my-evolution/Locations.h:1158
+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
+msgid "Lakeland"
+msgstr ""
+
+#: my-evolution/Locations.h:1164
+msgid "Lake Tahoe"
+msgstr ""
+
+#: my-evolution/Locations.h:1165
+msgid "Lakeview"
+msgstr ""
+
+#: my-evolution/Locations.h:1166
+msgid "Lamar"
+msgstr ""
+
+#: my-evolution/Locations.h:1167
+msgid "La Mesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1168
+msgid "Lamezia"
+msgstr ""
+
+#: my-evolution/Locations.h:1169
+msgid "Lamoni"
+msgstr ""
+
+#: my-evolution/Locations.h:1170
+msgid "Lampedusa"
+msgstr ""
+
+#: my-evolution/Locations.h:1171
+msgid "Lanai"
+msgstr ""
+
+#: my-evolution/Locations.h:1172
+msgid "Lancaster"
+msgstr ""
+
+#: my-evolution/Locations.h:1173
+msgid "Lander"
+msgstr ""
+
+#: my-evolution/Locations.h:1174
+msgid "Langebaanweg"
+msgstr ""
+
+#: my-evolution/Locations.h:1175
+msgid "Langley AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1176
+msgid "Lannion"
+msgstr ""
+
+#: my-evolution/Locations.h:1177
+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 ""
+
+#: my-evolution/Locations.h:1182
+msgid "Laredo"
+msgstr ""
+
+#: my-evolution/Locations.h:1183
+msgid "Larnaka"
+msgstr ""
+
+#: my-evolution/Locations.h:1184
+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
+msgid "Latina"
+msgstr ""
+
+#: my-evolution/Locations.h:1189
+msgid "Latrobe"
+msgstr ""
+
+#: my-evolution/Locations.h:1191
+msgid "Laughlin"
+msgstr ""
+
+#: my-evolution/Locations.h:1192
+msgid "Laurel"
+msgstr ""
+
+#: my-evolution/Locations.h:1193
+msgid "La Verne"
+msgstr ""
+
+#: my-evolution/Locations.h:1194
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1195
+msgid "Lawton"
+msgstr ""
+
+#: my-evolution/Locations.h:1196
+msgid "Leadville"
+msgstr ""
+
+#: my-evolution/Locations.h:1197
+msgid "Learmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1199
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1201
+msgid "Leesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1202
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1205
+msgid "Leknes"
+msgstr ""
+
+#: my-evolution/Locations.h:1206
+msgid "Le Mans"
+msgstr ""
+
+#: my-evolution/Locations.h:1207
+msgid "Le Marine"
+msgstr ""
+
+#: my-evolution/Locations.h:1208
+msgid "Lemmon"
+msgstr ""
+
+#: my-evolution/Locations.h:1209
+msgid "Lemoore"
+msgstr ""
+
+#: my-evolution/Locations.h:1210
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1212
+msgid "Leuchars"
+msgstr ""
+
+#: my-evolution/Locations.h:1213
+msgid "Lewisburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1214
+msgid "Lewiston"
+msgstr ""
+
+#: my-evolution/Locations.h:1215
+msgid "Lewistown"
+msgstr ""
+
+#: my-evolution/Locations.h:1216
+msgid "Lexington"
+msgstr ""
+
+#: my-evolution/Locations.h:1217
+msgid "Liberal"
+msgstr ""
+
+#: my-evolution/Locations.h:1219
+msgid "Libya"
+msgstr ""
+
+#: my-evolution/Locations.h:1220
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1221
+msgid "Lidgerwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1222
+msgid "Liege"
+msgstr ""
+
+#: my-evolution/Locations.h:1223
+msgid "Lihue"
+msgstr ""
+
+#: my-evolution/Locations.h:1224
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1225
+msgid "Lima-Callao"
+msgstr ""
+
+#: my-evolution/Locations.h:1226
+msgid "Limnos"
+msgstr ""
+
+#: my-evolution/Locations.h:1227
+msgid "Limoges"
+msgstr ""
+
+#: my-evolution/Locations.h:1228
+msgid "Limon"
+msgstr ""
+
+#: my-evolution/Locations.h:1229
+msgid "Lincoln"
+msgstr ""
+
+#: my-evolution/Locations.h:1230
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1231
+msgid "Lisboa"
+msgstr ""
+
+#: my-evolution/Locations.h:1232
+msgid "Lista"
+msgstr ""
+
+#: my-evolution/Locations.h:1233
+msgid "Litchfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1240
+msgid "Ljubljana"
+msgstr ""
+
+#: my-evolution/Locations.h:1241
+msgid "Logan"
+msgstr ""
+
+#: my-evolution/Locations.h:1242
+msgid "Lolland Falster"
+msgstr ""
+
+#: my-evolution/Locations.h:1243
+#, fuzzy
+msgid "Lompoc"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:1244
+msgid "London"
+msgstr ""
+
+#: my-evolution/Locations.h:1245
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1249
+msgid "Londrina"
+msgstr ""
+
+#: my-evolution/Locations.h:1250
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1253
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+#: my-evolution/Locations.h:1254
+msgid "Los Alamos"
+msgstr ""
+
+#: my-evolution/Locations.h:1255
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1260
+msgid "Lousiana"
+msgstr ""
+
+#: my-evolution/Locations.h:1261
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1265
+msgid "Lugano"
+msgstr ""
+
+#: my-evolution/Locations.h:1266
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1267
+msgid "Luton"
+msgstr ""
+
+#: my-evolution/Locations.h:1269
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1270
+msgid "Luxor"
+msgstr ""
+
+#: my-evolution/Locations.h:1271
+msgid "Lviv"
+msgstr ""
+
+#: my-evolution/Locations.h:1272
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1275
+msgid "Lyon-Satolas"
+msgstr ""
+
+#: my-evolution/Locations.h:1276
+msgid "Maastricht"
+msgstr ""
+
+#: my-evolution/Locations.h:1277
+msgid "Macae"
+msgstr ""
+
+#: my-evolution/Locations.h:1278
+msgid "Macapa"
+msgstr ""
+
+#: my-evolution/Locations.h:1279
+msgid "Maceio"
+msgstr ""
+
+#: my-evolution/Locations.h:1280
+msgid "Macon"
+msgstr ""
+
+#: my-evolution/Locations.h:1281
+msgid "Madinah"
+msgstr ""
+
+#: my-evolution/Locations.h:1282
+msgid "Madison"
+msgstr ""
+
+#: my-evolution/Locations.h:1283
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1285
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+#: my-evolution/Locations.h:1286
+msgid "Magadan"
+msgstr ""
+
+#: my-evolution/Locations.h:1287
+msgid "Magdalena"
+msgstr ""
+
+#: my-evolution/Locations.h:1288
+msgid "Maine"
+msgstr ""
+
+#: my-evolution/Locations.h:1289
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1290
+msgid "Makkah"
+msgstr ""
+
+#: my-evolution/Locations.h:1291
+msgid "Makung"
+msgstr ""
+
+#: my-evolution/Locations.h:1292
+msgid "Malad City"
+msgstr ""
+
+#: my-evolution/Locations.h:1293
+msgid "Malaga"
+msgstr ""
+
+#: my-evolution/Locations.h:1294
+msgid "Malatya"
+msgstr ""
+
+#: my-evolution/Locations.h:1295
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1296
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1298
+msgid "Mammoth Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1299
+msgid "Managua"
+msgstr ""
+
+#: my-evolution/Locations.h:1300
+msgid "Manassas"
+msgstr ""
+
+#: my-evolution/Locations.h:1301
+msgid "Manaus"
+msgstr ""
+
+#: my-evolution/Locations.h:1302
+msgid "Manchester"
+msgstr ""
+
+#: my-evolution/Locations.h:1303
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+msgid "Manhattan"
+msgstr ""
+
+#: my-evolution/Locations.h:1305
+msgid "Manisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1306
+msgid "Manistee"
+msgstr ""
+
+#: my-evolution/Locations.h:1307
+msgid "Manitoba"
+msgstr ""
+
+#: my-evolution/Locations.h:1308
+msgid "Manitowoc"
+msgstr ""
+
+#: my-evolution/Locations.h:1309
+msgid "Mankato"
+msgstr ""
+
+#: my-evolution/Locations.h:1310
+msgid "Mansfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1311
+msgid "Manta"
+msgstr ""
+
+#: my-evolution/Locations.h:1312
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1313
+msgid "Maraba"
+msgstr ""
+
+#: my-evolution/Locations.h:1314
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1315
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1316
+msgid "Marathon"
+msgstr ""
+
+#: my-evolution/Locations.h:1317
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1318
+msgid "Margarita"
+msgstr ""
+
+#: my-evolution/Locations.h:1319
+msgid "Marianna"
+msgstr ""
+
+#: my-evolution/Locations.h:1320
+msgid "Marib"
+msgstr ""
+
+#: my-evolution/Locations.h:1321
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1322
+msgid "Marietta"
+msgstr ""
+
+#: my-evolution/Locations.h:1323
+msgid "Marino di Ravenna"
+msgstr ""
+
+#: my-evolution/Locations.h:1324
+msgid "Marion"
+msgstr ""
+
+#: my-evolution/Locations.h:1325
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1326
+msgid "Marquette"
+msgstr ""
+
+#: my-evolution/Locations.h:1327
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+msgid "Marseilles"
+msgstr ""
+
+#: my-evolution/Locations.h:1329
+msgid "Marshall"
+msgstr ""
+
+#: my-evolution/Locations.h:1330
+msgid "Marshalltown"
+msgstr ""
+
+#: my-evolution/Locations.h:1331
+msgid "Marshfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1332
+msgid "Marte"
+msgstr ""
+
+#: my-evolution/Locations.h:1333
+msgid "Marthas Vineyard"
+msgstr ""
+
+#: my-evolution/Locations.h:1334
+msgid "Martinsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1335
+msgid "Martinsville"
+msgstr ""
+
+#: my-evolution/Locations.h:1336
+msgid "Maryland"
+msgstr ""
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1339
+msgid "Mashhad"
+msgstr ""
+
+#: my-evolution/Locations.h:1340
+msgid "Masirah"
+msgstr ""
+
+#: my-evolution/Locations.h:1341
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1343
+msgid "Massena"
+msgstr ""
+
+#: my-evolution/Locations.h:1344
+#, fuzzy
+msgid "Matamoros"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:1345
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1347
+msgid "Matsuyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1348
+msgid "Mattoon"
+msgstr ""
+
+#: my-evolution/Locations.h:1349
+msgid "Mayaguez"
+msgstr ""
+
+#: my-evolution/Locations.h:1350
+msgid "Mayport"
+msgstr ""
+
+#: my-evolution/Locations.h:1351
+msgid "Mazatlan"
+msgstr ""
+
+#: my-evolution/Locations.h:1352
+msgid "Mazu"
+msgstr ""
+
+#: my-evolution/Locations.h:1353
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1354
+msgid "McAllen"
+msgstr ""
+
+#: my-evolution/Locations.h:1355
+msgid "McCall"
+msgstr ""
+
+#: my-evolution/Locations.h:1356
+msgid "McCarthy"
+msgstr ""
+
+#: my-evolution/Locations.h:1357
+msgid "McClellan"
+msgstr ""
+
+#: my-evolution/Locations.h:1358
+#, fuzzy
+msgid "McComb"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:1359
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1361
+msgid "Mc Gregor"
+msgstr ""
+
+#: my-evolution/Locations.h:1362
+msgid "Meacham"
+msgstr ""
+
+#: my-evolution/Locations.h:1363
+msgid "Medford"
+msgstr ""
+
+#: my-evolution/Locations.h:1364
+msgid "Medicine Lodge"
+msgstr ""
+
+#: my-evolution/Locations.h:1365
+msgid "Mehamn"
+msgstr ""
+
+#: my-evolution/Locations.h:1366
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1367
+msgid "Melbourne"
+msgstr ""
+
+#: my-evolution/Locations.h:1368
+msgid "Melfa"
+msgstr ""
+
+#: my-evolution/Locations.h:1369
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1373
+msgid "Mendoza"
+msgstr ""
+
+#: my-evolution/Locations.h:1374
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1377
+msgid "Merced"
+msgstr ""
+
+#: my-evolution/Locations.h:1378
+msgid "Merida"
+msgstr ""
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1380
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1381
+msgid "Merril Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1382
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1386
+msgid "Mexicali"
+msgstr ""
+
+#: my-evolution/Locations.h:1388
+msgid "Miami"
+msgstr ""
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1391
+msgid "Michigan"
+msgstr ""
+
+#: my-evolution/Locations.h:1392
+msgid "Middle East"
+msgstr ""
+
+#: my-evolution/Locations.h:1393
+msgid "Middleton Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1394
+msgid "Middletown"
+msgstr ""
+
+#: my-evolution/Locations.h:1395
+msgid "Midland"
+msgstr ""
+
+#: my-evolution/Locations.h:1396
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1398
+msgid "Milano/Malpensa"
+msgstr ""
+
+#: my-evolution/Locations.h:1399
+msgid "Miles City"
+msgstr ""
+
+#: my-evolution/Locations.h:1400
+msgid "Milford"
+msgstr ""
+
+#: my-evolution/Locations.h:1401
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1402
+msgid "Millville"
+msgstr ""
+
+#: my-evolution/Locations.h:1403
+msgid "Milton"
+msgstr ""
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1407
+msgid "Minatitlan"
+msgstr ""
+
+#: my-evolution/Locations.h:1408
+msgid "Minchumina"
+msgstr ""
+
+#: my-evolution/Locations.h:1409
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1414
+msgid "Minnesota"
+msgstr ""
+
+#: my-evolution/Locations.h:1415
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1416
+msgid "Minot"
+msgstr ""
+
+#: my-evolution/Locations.h:1417
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1419
+msgid "Mississippi"
+msgstr ""
+
+#: my-evolution/Locations.h:1420
+msgid "Missoula"
+msgstr ""
+
+#: my-evolution/Locations.h:1421
+msgid "Missouri"
+msgstr ""
+
+#: my-evolution/Locations.h:1422
+msgid "Mitchell"
+msgstr ""
+
+#: my-evolution/Locations.h:1423
+msgid "Mitilini"
+msgstr ""
+
+#: my-evolution/Locations.h:1424
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1425
+msgid "Miyazaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1426
+msgid "Moa"
+msgstr ""
+
+#: my-evolution/Locations.h:1427
+msgid "Mobile Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:1428
+msgid "Mobile Regional Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1429
+msgid "Mobridge"
+msgstr ""
+
+#: my-evolution/Locations.h:1430
+msgid "Modesto"
+msgstr ""
+
+#: my-evolution/Locations.h:1431
+msgid "Mo I Rana"
+msgstr ""
+
+#: my-evolution/Locations.h:1432
+msgid "Mojave"
+msgstr ""
+
+#: my-evolution/Locations.h:1433
+msgid "Molde"
+msgstr ""
+
+#: my-evolution/Locations.h:1434
+msgid "Moldova"
+msgstr ""
+
+#: my-evolution/Locations.h:1435
+msgid "Moline-Quad Cities"
+msgstr ""
+
+#: my-evolution/Locations.h:1436
+msgid "Molokai"
+msgstr ""
+
+#: my-evolution/Locations.h:1437
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1438
+msgid "Monchengladbach"
+msgstr ""
+
+#: my-evolution/Locations.h:1439
+msgid "Monclova"
+msgstr ""
+
+#: my-evolution/Locations.h:1440
+msgid "Moncton"
+msgstr ""
+
+#: my-evolution/Locations.h:1441
+msgid "Monida"
+msgstr ""
+
+#: my-evolution/Locations.h:1442
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+#: my-evolution/Locations.h:1443
+msgid "Monroe"
+msgstr ""
+
+#: my-evolution/Locations.h:1444
+msgid "Montague"
+msgstr ""
+
+#: my-evolution/Locations.h:1445
+msgid "Montana"
+msgstr ""
+
+#: my-evolution/Locations.h:1446
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1448
+msgid "Monte Bisbino"
+msgstr ""
+
+#: my-evolution/Locations.h:1449
+msgid "Monte Calamita"
+msgstr ""
+
+#: my-evolution/Locations.h:1450
+msgid "Monte Cimone"
+msgstr ""
+
+#: my-evolution/Locations.h:1451
+msgid "Montego Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:1452
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1453
+msgid "Monterey"
+msgstr ""
+
+#: my-evolution/Locations.h:1454
+msgid "Monterrey"
+msgstr ""
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1458
+msgid "Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1459
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1460
+msgid "Monticello"
+msgstr ""
+
+#: my-evolution/Locations.h:1461
+msgid "Montpelier"
+msgstr ""
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1465
+msgid "Montrose"
+msgstr ""
+
+#: my-evolution/Locations.h:1466
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1467
+msgid "Morelia"
+msgstr ""
+
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Morgantown"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:1469
+msgid "Moriarty"
+msgstr ""
+
+#: my-evolution/Locations.h:1471
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1474
+msgid "Moses Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1475
+msgid "Mosinee"
+msgstr ""
+
+#: my-evolution/Locations.h:1476
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain Home"
+msgstr ""
+
+#: my-evolution/Locations.h:1479
+msgid "Mountain View"
+msgstr ""
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1482
+msgid "Mount Shasta"
+msgstr ""
+
+#: my-evolution/Locations.h:1483
+msgid "Mount Vernon"
+msgstr ""
+
+#: my-evolution/Locations.h:1484
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1487
+msgid "Muir"
+msgstr ""
+
+#: my-evolution/Locations.h:1488
+msgid "Mullan"
+msgstr ""
+
+#: my-evolution/Locations.h:1489
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1490
+msgid "Munchen"
+msgstr ""
+
+#: my-evolution/Locations.h:1491
+msgid "Muncie"
+msgstr ""
+
+#: my-evolution/Locations.h:1492
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1493
+msgid "Murcia"
+msgstr ""
+
+#: my-evolution/Locations.h:1494
+msgid "Murmansk"
+msgstr ""
+
+#: my-evolution/Locations.h:1495
+msgid "Mus"
+msgstr ""
+
+#: my-evolution/Locations.h:1496
+msgid "Muscatine"
+msgstr ""
+
+#: my-evolution/Locations.h:1497
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1498
+msgid "Muskegon"
+msgstr ""
+
+#: my-evolution/Locations.h:1499
+msgid "Mykonos"
+msgstr ""
+
+#: my-evolution/Locations.h:1500
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1507
+msgid "Najran"
+msgstr ""
+
+#: my-evolution/Locations.h:1508
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1509
+msgid "Nalchik"
+msgstr ""
+
+#: my-evolution/Locations.h:1510
+msgid "Namsos"
+msgstr ""
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1513
+msgid "Nankishirahama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1514
+#, fuzzy
+msgid "Nanning"
+msgstr "Synchronise \"%s\""
+
+#: my-evolution/Locations.h:1515
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1516
+msgid "Nantucket"
+msgstr ""
+
+#: my-evolution/Locations.h:1517
+msgid "Napa"
+msgstr ""
+
+#: my-evolution/Locations.h:1518
+msgid "Naples"
+msgstr ""
+
+#: my-evolution/Locations.h:1519
+msgid "Napoli"
+msgstr ""
+
+#: my-evolution/Locations.h:1520
+msgid "Narvik"
+msgstr ""
+
+#: my-evolution/Locations.h:1521
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1524
+msgid "Nassau"
+msgstr ""
+
+#: my-evolution/Locations.h:1525
+msgid "Natal"
+msgstr ""
+
+#: my-evolution/Locations.h:1526
+msgid "Natchez"
+msgstr ""
+
+#: my-evolution/Locations.h:1527
+msgid "Nawabshah"
+msgstr ""
+
+#: my-evolution/Locations.h:1528
+msgid "Nebraska"
+msgstr ""
+
+#: my-evolution/Locations.h:1529
+msgid "Needles"
+msgstr ""
+
+#: my-evolution/Locations.h:1530
+msgid "Nenana"
+msgstr ""
+
+#: my-evolution/Locations.h:1532
+msgid "Neuquen"
+msgstr ""
+
+#: my-evolution/Locations.h:1533
+msgid "Nevada"
+msgstr ""
+
+#: my-evolution/Locations.h:1534
+msgid "Newark"
+msgstr ""
+
+#: my-evolution/Locations.h:1535
+msgid "New Bedford"
+msgstr ""
+
+#: my-evolution/Locations.h:1536
+msgid "New Bern"
+msgstr ""
+
+#: my-evolution/Locations.h:1537
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1539
+msgid "Newburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1540
+msgid "Newcastle"
+msgstr ""
+
+#: my-evolution/Locations.h:1541
+msgid "New Delhi/Palam"
+msgstr ""
+
+#: my-evolution/Locations.h:1542
+msgid "Newfoundland"
+msgstr ""
+
+#: my-evolution/Locations.h:1543
+msgid "New Hampshire"
+msgstr ""
+
+#: my-evolution/Locations.h:1544
+msgid "New Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:1545
+msgid "New Iberia"
+msgstr ""
+
+#: my-evolution/Locations.h:1546
+msgid "New Jersey"
+msgstr ""
+
+#: my-evolution/Locations.h:1547
+msgid "New Mexico"
+msgstr ""
+
+#: my-evolution/Locations.h:1548
+msgid "New Orleans"
+msgstr ""
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1550
+msgid "New Orleans NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1551
+msgid "Newport"
+msgstr ""
+
+#: my-evolution/Locations.h:1552
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1553
+msgid "New Port Richey"
+msgstr ""
+
+#: my-evolution/Locations.h:1554
+msgid "New River"
+msgstr ""
+
+#: my-evolution/Locations.h:1555
+msgid "New Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1556
+msgid "Newton"
+msgstr ""
+
+#: my-evolution/Locations.h:1557
+msgid "New York"
+msgstr ""
+
+#: my-evolution/Locations.h:1558
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1559
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1561
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1564
+msgid "Niigata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1565
+msgid "Nimes-Garons"
+msgstr ""
+
+#: my-evolution/Locations.h:1566
+msgid "Nipawin"
+msgstr ""
+
+#: my-evolution/Locations.h:1567
+msgid "Nis"
+msgstr ""
+
+#: my-evolution/Locations.h:1568
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1570
+msgid "N Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1571
+msgid "Nogales"
+msgstr ""
+
+#: my-evolution/Locations.h:1572
+msgid "Nome"
+msgstr ""
+
+#: my-evolution/Locations.h:1573
+msgid "Norfolk"
+msgstr ""
+
+#: my-evolution/Locations.h:1575
+msgid "Norfolk NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1576
+msgid "Norrkoping"
+msgstr ""
+
+#: my-evolution/Locations.h:1577
+msgid "North Adams"
+msgstr ""
+
+#: my-evolution/Locations.h:1578
+msgid "North Bend"
+msgstr ""
+
+#: my-evolution/Locations.h:1579
+msgid "North Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:1580
+msgid "North Conway"
+msgstr ""
+
+#: my-evolution/Locations.h:1581
+msgid "North Dakota"
+msgstr ""
+
+#: my-evolution/Locations.h:1582
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1583
+msgid "North Kingstown"
+msgstr ""
+
+#: my-evolution/Locations.h:1584
+msgid "North Platte"
+msgstr ""
+
+#: my-evolution/Locations.h:1585
+msgid "Northway"
+msgstr ""
+
+#: my-evolution/Locations.h:1586
+msgid "Northwest Territories"
+msgstr ""
+
+#: my-evolution/Locations.h:1588
+msgid "Norwich"
+msgstr ""
+
+#: my-evolution/Locations.h:1589
+msgid "Norwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1590
+msgid "Notodden"
+msgstr ""
+
+#: my-evolution/Locations.h:1591
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1595
+msgid "Nueva Ocotepeque"
+msgstr ""
+
+#: my-evolution/Locations.h:1596
+msgid "Nuevo Laredo"
+msgstr ""
+
+#: my-evolution/Locations.h:1597
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+msgid "Oahu"
+msgstr ""
+
+#: my-evolution/Locations.h:1600
+msgid "Oak Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:1601
+msgid "Oakland"
+msgstr ""
+
+#: my-evolution/Locations.h:1602
+msgid "Oaxaca"
+msgstr ""
+
+#: my-evolution/Locations.h:1603
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+msgid "Obihiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1605
+msgid "Ocala"
+msgstr ""
+
+#: my-evolution/Locations.h:1606
+msgid "Oceanside"
+msgstr ""
+
+#: my-evolution/Locations.h:1607
+msgid "Odense"
+msgstr ""
+
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1609
+msgid "Oelwen"
+msgstr ""
+
+#: my-evolution/Locations.h:1610
+msgid "Ogden"
+msgstr ""
+
+#: my-evolution/Locations.h:1611
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1613
+msgid "Ohio"
+msgstr ""
+
+#: my-evolution/Locations.h:1614
+msgid "Ohrid"
+msgstr ""
+
+#: my-evolution/Locations.h:1615
+msgid "Oita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1616
+msgid "Ojika Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1617
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1624
+msgid "Okushiri Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1625
+msgid "Olathe"
+msgstr ""
+
+#: my-evolution/Locations.h:1626
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1627
+msgid "Olbia"
+msgstr ""
+
+#: my-evolution/Locations.h:1628
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1629
+msgid "Omaha"
+msgstr ""
+
+#: my-evolution/Locations.h:1630
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1631
+msgid "Omak"
+msgstr ""
+
+#: my-evolution/Locations.h:1633
+msgid "Ominato Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1634
+msgid "Omsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1635
+msgid "O'Neill"
+msgstr ""
+
+#: my-evolution/Locations.h:1636
+#, fuzzy
+msgid "Ontario"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:1637
+msgid "Oostende"
+msgstr ""
+
+#: my-evolution/Locations.h:1638
+msgid "Oran"
+msgstr ""
+
+#: my-evolution/Locations.h:1639
+msgid "Oran/Es Senia"
+msgstr ""
+
+#: my-evolution/Locations.h:1640
+#, fuzzy
+msgid "Orange"
+msgstr "Organisation:"
+
+#: my-evolution/Locations.h:1641
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1642
+msgid "Ord-Sharp"
+msgstr ""
+
+#: my-evolution/Locations.h:1643
+msgid "Oregon"
+msgstr ""
+
+#: my-evolution/Locations.h:1644
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1645
+msgid "Orland"
+msgstr ""
+
+#: my-evolution/Locations.h:1646
+msgid "Orlando"
+msgstr ""
+
+#: my-evolution/Locations.h:1647
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1648
+msgid "Orsta-Volda"
+msgstr ""
+
+#: my-evolution/Locations.h:1649
+msgid "Oruro"
+msgstr ""
+
+#: my-evolution/Locations.h:1650
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1652
+msgid "Oscoda"
+msgstr ""
+
+#: my-evolution/Locations.h:1653
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1657
+msgid "Ostrava"
+msgstr ""
+
+#: my-evolution/Locations.h:1658
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1661
+msgid "Owyhee"
+msgstr ""
+
+#: my-evolution/Locations.h:1662
+msgid "Oxford"
+msgstr ""
+
+#: my-evolution/Locations.h:1663
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1670
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1671
+msgid "Paganella"
+msgstr ""
+
+#: my-evolution/Locations.h:1674
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1675
+msgid "Palacios"
+msgstr ""
+
+#: my-evolution/Locations.h:1676
+msgid "Palermo"
+msgstr ""
+
+#: my-evolution/Locations.h:1677
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1678
+msgid "Palmdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1679
+msgid "Palmer"
+msgstr ""
+
+#: my-evolution/Locations.h:1680
+msgid "Palm Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1681
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1682
+msgid "Pamplona"
+msgstr ""
+
+#: my-evolution/Locations.h:1684
+msgid "Panama City"
+msgstr ""
+
+#: my-evolution/Locations.h:1685
+msgid "Pantelleria"
+msgstr ""
+
+#: my-evolution/Locations.h:1686
+msgid "Papa"
+msgstr ""
+
+#: my-evolution/Locations.h:1687
+msgid "Paphos"
+msgstr ""
+
+#: my-evolution/Locations.h:1689
+msgid "Paris"
+msgstr ""
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1692
+msgid "Paris/Orly"
+msgstr ""
+
+#: my-evolution/Locations.h:1693
+msgid "Parkersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1694
+msgid "Pasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1695
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1700
+msgid "Passo Rolle"
+msgstr ""
+
+#: my-evolution/Locations.h:1701
+msgid "Patna"
+msgstr ""
+
+#: my-evolution/Locations.h:1702
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1706
+msgid "Paysandu"
+msgstr ""
+
+#: my-evolution/Locations.h:1707
+msgid "Payson"
+msgstr ""
+
+#: my-evolution/Locations.h:1708
+msgid "Pellston"
+msgstr ""
+
+#: my-evolution/Locations.h:1709
+msgid "Pelotas"
+msgstr ""
+
+#: my-evolution/Locations.h:1710
+msgid "Pendleton"
+msgstr ""
+
+#: my-evolution/Locations.h:1711
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1716
+msgid "Peoria"
+msgstr ""
+
+#: my-evolution/Locations.h:1717
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1718
+msgid "Pereira/Matecana"
+msgstr ""
+
+#: my-evolution/Locations.h:1719
+msgid "Perm"
+msgstr ""
+
+#: my-evolution/Locations.h:1720
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1721
+msgid "Perry-Foley"
+msgstr ""
+
+#: my-evolution/Locations.h:1722
+msgid "Perth"
+msgstr ""
+
+#: my-evolution/Locations.h:1724
+msgid "Perugia"
+msgstr ""
+
+#: my-evolution/Locations.h:1725
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1730
+msgid "Philip"
+msgstr ""
+
+#: my-evolution/Locations.h:1731
+msgid "Philipsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1732
+msgid "Phillips"
+msgstr ""
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1739
+msgid "Piedras Negras"
+msgstr ""
+
+#: my-evolution/Locations.h:1740
+msgid "Pierre"
+msgstr ""
+
+#: my-evolution/Locations.h:1741
+msgid "Pietersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1742
+msgid "Pikeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1743
+msgid "Pine Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+msgid "Pirassununga"
+msgstr ""
+
+#: my-evolution/Locations.h:1747
+msgid "Pisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1748
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1753
+msgid "Plymouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1754
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+msgid "Pocos De Caldas"
+msgstr ""
+
+#: my-evolution/Locations.h:1756
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1757
+msgid "Podgorica Titograd"
+msgstr ""
+
+#: my-evolution/Locations.h:1758
+msgid "Pohang Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1759
+msgid "Point Hope"
+msgstr ""
+
+#: my-evolution/Locations.h:1760
+msgid "Point Lay"
+msgstr ""
+
+#: my-evolution/Locations.h:1761
+msgid "Point Mugu"
+msgstr ""
+
+#: my-evolution/Locations.h:1762
+msgid "Point Piedras Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1763
+msgid "Poitiers"
+msgstr ""
+
+#: my-evolution/Locations.h:1765
+msgid "Pompano Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1766
+msgid "Ponca City"
+msgstr ""
+
+#: my-evolution/Locations.h:1767
+msgid "Ponce"
+msgstr ""
+
+#: my-evolution/Locations.h:1768
+msgid "Ponta Pora"
+msgstr ""
+
+#: my-evolution/Locations.h:1769
+msgid "Pontiac"
+msgstr ""
+
+#: my-evolution/Locations.h:1770
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1771
+msgid "Poplar Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1772
+msgid "Poprad"
+msgstr ""
+
+#: my-evolution/Locations.h:1773
+msgid "Port Alexander"
+msgstr ""
+
+#: my-evolution/Locations.h:1774
+msgid "Port Alsworth"
+msgstr ""
+
+#: my-evolution/Locations.h:1775
+msgid "Port Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1776
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1777
+msgid "Port Elizabeth"
+msgstr ""
+
+#: my-evolution/Locations.h:1778
+msgid "Porterville"
+msgstr ""
+
+#: my-evolution/Locations.h:1779
+msgid "Port Hardy"
+msgstr ""
+
+#: my-evolution/Locations.h:1780
+msgid "Port Hedland"
+msgstr ""
+
+#: my-evolution/Locations.h:1781
+msgid "Port Heiden"
+msgstr ""
+
+#: my-evolution/Locations.h:1782
+msgid "Portland"
+msgstr ""
+
+#: my-evolution/Locations.h:1783
+msgid "Porto"
+msgstr ""
+
+#: my-evolution/Locations.h:1784
+msgid "Porto Alegre"
+msgstr ""
+
+#: my-evolution/Locations.h:1785
+msgid "Porto Alegre Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:1786
+msgid "Portoroz"
+msgstr ""
+
+#: my-evolution/Locations.h:1787
+msgid "Porto Santo"
+msgstr ""
+
+#: my-evolution/Locations.h:1788
+msgid "Porto Velho"
+msgstr ""
+
+#: my-evolution/Locations.h:1789
+msgid "Port Said"
+msgstr ""
+
+#: my-evolution/Locations.h:1790
+msgid "Portsmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1792
+msgid "Posadas"
+msgstr ""
+
+#: my-evolution/Locations.h:1793
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1796
+msgid "Poza Rica"
+msgstr ""
+
+#: my-evolution/Locations.h:1797
+msgid "Poznan"
+msgstr ""
+
+#: my-evolution/Locations.h:1798
+msgid "Praha"
+msgstr ""
+
+#: my-evolution/Locations.h:1799
+msgid "Pratica di Mare"
+msgstr ""
+
+#: my-evolution/Locations.h:1800
+msgid "Prescott"
+msgstr ""
+
+#: my-evolution/Locations.h:1801
+msgid "Presidente Prudente"
+msgstr ""
+
+#: my-evolution/Locations.h:1802
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1804
+msgid "Pretoria"
+msgstr ""
+
+#: my-evolution/Locations.h:1805
+msgid "Preveza"
+msgstr ""
+
+#: my-evolution/Locations.h:1806
+msgid "Price-Carbon"
+msgstr ""
+
+#: my-evolution/Locations.h:1807
+#, fuzzy
+msgid "Pristina"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:1808
+msgid "Providence"
+msgstr ""
+
+#: my-evolution/Locations.h:1809
+msgid "Provincetown"
+msgstr ""
+
+#: my-evolution/Locations.h:1810
+msgid "Provo"
+msgstr ""
+
+#: my-evolution/Locations.h:1811
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1812
+msgid "Pucallpa"
+msgstr ""
+
+#: my-evolution/Locations.h:1813
+msgid "Pudahuel"
+msgstr ""
+
+#: my-evolution/Locations.h:1814
+msgid "Puebla"
+msgstr ""
+
+#: my-evolution/Locations.h:1815
+msgid "Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:1816
+msgid "Puerto Barrios"
+msgstr ""
+
+#: my-evolution/Locations.h:1817
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1818
+msgid "Puerto Escondido"
+msgstr ""
+
+#: my-evolution/Locations.h:1819
+msgid "Puerto Lempira"
+msgstr ""
+
+#: my-evolution/Locations.h:1820
+msgid "Puerto Limon"
+msgstr ""
+
+#: my-evolution/Locations.h:1821
+msgid "Puerto Maldonado"
+msgstr ""
+
+#: my-evolution/Locations.h:1822
+msgid "Puerto Montt"
+msgstr ""
+
+#: my-evolution/Locations.h:1823
+msgid "Puerto Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1825
+msgid "Puerto Suarez"
+msgstr ""
+
+#: my-evolution/Locations.h:1826
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1827
+msgid "Pula"
+msgstr ""
+
+#: my-evolution/Locations.h:1828
+msgid "Pullman"
+msgstr ""
+
+#: my-evolution/Locations.h:1829
+msgid "Punta Arenas"
+msgstr ""
+
+#: my-evolution/Locations.h:1830
+msgid "Punta Cana"
+msgstr ""
+
+#: my-evolution/Locations.h:1831
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1835
+msgid "Pyongyang"
+msgstr ""
+
+#: my-evolution/Locations.h:1837
+msgid "Quantico"
+msgstr ""
+
+#: my-evolution/Locations.h:1838
+msgid "Quebec"
+msgstr ""
+
+#: my-evolution/Locations.h:1839
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1842
+msgid "Quimper"
+msgstr ""
+
+#: my-evolution/Locations.h:1843
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1850
+msgid "Rapid City"
+msgstr ""
+
+#: my-evolution/Locations.h:1851
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1852
+msgid "Ras Al Khaimah"
+msgstr ""
+
+#: my-evolution/Locations.h:1853
+msgid "Rawlins"
+msgstr ""
+
+#: my-evolution/Locations.h:1854
+msgid "Reading"
+msgstr ""
+
+#: my-evolution/Locations.h:1855
+msgid "Rebun Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1856
+msgid "Recife"
+msgstr ""
+
+#: my-evolution/Locations.h:1857
+msgid "Red Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1858
+msgid "Redding"
+msgstr ""
+
+#: my-evolution/Locations.h:1859
+msgid "Redig"
+msgstr ""
+
+#: my-evolution/Locations.h:1860
+msgid "Redmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1861
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1863
+msgid "Reggio Calabria"
+msgstr ""
+
+#: my-evolution/Locations.h:1864
+msgid "Regina"
+msgstr ""
+
+#: my-evolution/Locations.h:1865
+msgid "Reims-Champagne"
+msgstr ""
+
+#: my-evolution/Locations.h:1866
+msgid "Rennes"
+msgstr ""
+
+#: my-evolution/Locations.h:1867
+msgid "Reno"
+msgstr ""
+
+#: my-evolution/Locations.h:1868
+msgid "Renton"
+msgstr ""
+
+#: my-evolution/Locations.h:1869
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1870
+msgid "Reus"
+msgstr ""
+
+#: my-evolution/Locations.h:1871
+msgid "Reyes"
+msgstr ""
+
+#: my-evolution/Locations.h:1872
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1873
+msgid "Reynosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1874
+msgid "Rhinelander"
+msgstr ""
+
+#: my-evolution/Locations.h:1875
+msgid "Rhode Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1876
+msgid "Riberalta"
+msgstr ""
+
+#: my-evolution/Locations.h:1877
+msgid "Richmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1878
+msgid "Rickenbacker"
+msgstr ""
+
+#: my-evolution/Locations.h:1879
+msgid "Rieti"
+msgstr ""
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rifle"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:1881
+msgid "Riga"
+msgstr ""
+
+#: my-evolution/Locations.h:1882
+msgid "Rijeka"
+msgstr ""
+
+#: my-evolution/Locations.h:1883
+msgid "Rimini"
+msgstr ""
+
+#: my-evolution/Locations.h:1884
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1885
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1886
+msgid "Rio Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1887
+msgid "Rioja"
+msgstr ""
+
+#: my-evolution/Locations.h:1888
+msgid "Rio / Jacarepagua"
+msgstr ""
+
+#: my-evolution/Locations.h:1889
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+msgid "Rishiri Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1891
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+msgid "Rivera"
+msgstr ""
+
+#: my-evolution/Locations.h:1893
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1894
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1895
+msgid "Riverton"
+msgstr ""
+
+#: my-evolution/Locations.h:1896
+msgid "Rivne"
+msgstr ""
+
+#: my-evolution/Locations.h:1897
+msgid "Rivolto"
+msgstr ""
+
+#: my-evolution/Locations.h:1898
+msgid "Riyadh"
+msgstr ""
+
+#: my-evolution/Locations.h:1899
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1900
+msgid "Roatan"
+msgstr ""
+
+#: my-evolution/Locations.h:1901
+msgid "Robore"
+msgstr ""
+
+#: my-evolution/Locations.h:1902
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1903
+msgid "Rockford"
+msgstr ""
+
+#: my-evolution/Locations.h:1904
+msgid "Rockland"
+msgstr ""
+
+#: my-evolution/Locations.h:1905
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1907
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1908
+msgid "Rodos"
+msgstr ""
+
+#: my-evolution/Locations.h:1909
+msgid "Rogers"
+msgstr ""
+
+#: my-evolution/Locations.h:1910
+msgid "Roma/Ciampino"
+msgstr ""
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1917
+msgid "Roosevelt"
+msgstr ""
+
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Roros"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:1919
+msgid "Rorvik/Ryum"
+msgstr ""
+
+#: my-evolution/Locations.h:1920
+msgid "Rosario"
+msgstr ""
+
+#: my-evolution/Locations.h:1921
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1922
+msgid "Roseglen"
+msgstr ""
+
+#: my-evolution/Locations.h:1923
+msgid "Rost"
+msgstr ""
+
+#: my-evolution/Locations.h:1924
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1927
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1928
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1929
+msgid "Rurrenabaque"
+msgstr ""
+
+#: my-evolution/Locations.h:1930
+msgid "Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1931
+msgid "Russia"
+msgstr ""
+
+#: my-evolution/Locations.h:1932
+msgid "Rutland"
+msgstr ""
+
+#: my-evolution/Locations.h:1933
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1935
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1936
+msgid "Sabine Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:1937
+msgid "Sacramento"
+msgstr ""
+
+#: my-evolution/Locations.h:1938
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1939
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1940
+msgid "Saginaw"
+msgstr ""
+
+#: my-evolution/Locations.h:1941
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1944
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1945
+msgid "Saint Mary's"
+msgstr ""
+
+#: my-evolution/Locations.h:1946
+msgid "Saint Mawgan"
+msgstr ""
+
+#: my-evolution/Locations.h:1947
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1948
+msgid "Saint Paul"
+msgstr ""
+
+#: my-evolution/Locations.h:1949
+msgid "Saiq"
+msgstr ""
+
+#: my-evolution/Locations.h:1950
+msgid "Salalah"
+msgstr ""
+
+#: my-evolution/Locations.h:1951
+msgid "Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:1952
+msgid "Salida"
+msgstr ""
+
+#: my-evolution/Locations.h:1953
+msgid "Salida-Harriet"
+msgstr ""
+
+#: my-evolution/Locations.h:1954
+msgid "Salina"
+msgstr ""
+
+#: my-evolution/Locations.h:1955
+msgid "Salinas"
+msgstr ""
+
+#: my-evolution/Locations.h:1956
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1957
+msgid "Salmon"
+msgstr ""
+
+#: my-evolution/Locations.h:1958
+msgid "Salmon (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1959
+msgid "Salta"
+msgstr ""
+
+#: my-evolution/Locations.h:1960
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1961
+msgid "Salt Lake City"
+msgstr ""
+
+#: my-evolution/Locations.h:1962
+msgid "Salto"
+msgstr ""
+
+#: my-evolution/Locations.h:1963
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+msgid "Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:1965
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1966
+msgid "Samara"
+msgstr ""
+
+#: my-evolution/Locations.h:1967
+msgid "Samos"
+msgstr ""
+
+#: my-evolution/Locations.h:1968
+msgid "Samsun"
+msgstr ""
+
+#: my-evolution/Locations.h:1969
+msgid "Sana'A"
+msgstr ""
+
+#: my-evolution/Locations.h:1970
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+msgid "San Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1975
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1976
+msgid "San Carlos"
+msgstr ""
+
+#: my-evolution/Locations.h:1977
+msgid "Sandane"
+msgstr ""
+
+#: my-evolution/Locations.h:1978
+msgid "Sandberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1979
+msgid "Sanderson"
+msgstr ""
+
+#: my-evolution/Locations.h:1980
+msgid "San Diego"
+msgstr ""
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1986
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1987
+msgid "Sand Point"
+msgstr ""
+
+#: my-evolution/Locations.h:1988
+msgid "San Fernando De Apure"
+msgstr ""
+
+#: my-evolution/Locations.h:1989
+msgid "Sanford"
+msgstr ""
+
+#: my-evolution/Locations.h:1990
+msgid "San Francisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1991
+msgid "Sangju"
+msgstr ""
+
+#: my-evolution/Locations.h:1992
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1993
+msgid "San Joaquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1994
+msgid "San Jose"
+msgstr ""
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1997
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1998
+msgid "San Juan"
+msgstr ""
+
+#: my-evolution/Locations.h:1999
+msgid "Sankt-Peterburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2000
+msgid "Sanliurfa"
+msgstr ""
+
+#: my-evolution/Locations.h:2001
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2002
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2003
+msgid "San Miguel"
+msgstr ""
+
+#: my-evolution/Locations.h:2004
+msgid "San Nicholas Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2005
+msgid "San Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:2006
+msgid "San Sebastian"
+msgstr ""
+
+#: my-evolution/Locations.h:2007
+msgid "Santa Ana"
+msgstr ""
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+msgid "Santa Maria"
+msgstr ""
+
+#: my-evolution/Locations.h:2012
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2013
+msgid "Santa Monica"
+msgstr ""
+
+#: my-evolution/Locations.h:2014
+msgid "Santander"
+msgstr ""
+
+#: my-evolution/Locations.h:2015
+msgid "Santarem"
+msgstr ""
+
+#: my-evolution/Locations.h:2016
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2017
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+msgid "Santiago"
+msgstr ""
+
+#: my-evolution/Locations.h:2019
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2020
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2021
+msgid "Santorini"
+msgstr ""
+
+#: my-evolution/Locations.h:2022
+msgid "Santos"
+msgstr ""
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+msgid "Sao Luiz"
+msgstr ""
+
+#: my-evolution/Locations.h:2025
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2028
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+msgid "Sarasota"
+msgstr ""
+
+#: my-evolution/Locations.h:2030
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+msgid "Sarzana"
+msgstr ""
+
+#: my-evolution/Locations.h:2032
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2033
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2038
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2039
+msgid "Sawyer AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2040
+msgid "Sayun"
+msgstr ""
+
+#: my-evolution/Locations.h:2041
+msgid "Scatsta"
+msgstr ""
+
+#: my-evolution/Locations.h:2042
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2045
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2046
+msgid "Scottsdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Scranton"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:2048
+msgid "Seattle"
+msgstr ""
+
+#: my-evolution/Locations.h:2049
+msgid "Seattle-Boeing"
+msgstr ""
+
+#: my-evolution/Locations.h:2050
+msgid "Sedalia"
+msgstr ""
+
+#: my-evolution/Locations.h:2051
+msgid "Seeb"
+msgstr ""
+
+#: my-evolution/Locations.h:2052
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+msgid "Sendai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2058
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2059
+msgid "Sevilla"
+msgstr ""
+
+#: my-evolution/Locations.h:2060
+msgid "Seward"
+msgstr ""
+
+#: my-evolution/Locations.h:2061
+msgid "Sexton Summit"
+msgstr ""
+
+#: my-evolution/Locations.h:2062
+msgid "Shanghai"
+msgstr ""
+
+#: my-evolution/Locations.h:2063
+msgid "Shannon"
+msgstr ""
+
+#: my-evolution/Locations.h:2064
+msgid "Sharjah"
+msgstr ""
+
+#: my-evolution/Locations.h:2065
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+#: my-evolution/Locations.h:2066
+msgid "Sharurah"
+msgstr ""
+
+#: my-evolution/Locations.h:2067
+msgid "Shawbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2068
+msgid "Shearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2069
+msgid "Sheboygan"
+msgstr ""
+
+#: my-evolution/Locations.h:2070
+msgid "Sheldon"
+msgstr ""
+
+#: my-evolution/Locations.h:2071
+msgid "Shelter Cove"
+msgstr ""
+
+#: my-evolution/Locations.h:2072
+msgid "Shelton"
+msgstr ""
+
+#: my-evolution/Locations.h:2073
+msgid "Shenandoah"
+msgstr ""
+
+#: my-evolution/Locations.h:2074
+msgid "Sheridan"
+msgstr ""
+
+#: my-evolution/Locations.h:2075
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2076
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2077
+msgid "Shingle Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2078
+msgid "Shiraz"
+msgstr ""
+
+#: my-evolution/Locations.h:2079
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2080
+msgid "Shizuhama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2081
+msgid "Shoreham"
+msgstr ""
+
+#: my-evolution/Locations.h:2082
+msgid "Show Low"
+msgstr ""
+
+#: my-evolution/Locations.h:2083
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2084
+msgid "Shreveport Regional"
+msgstr ""
+
+#: my-evolution/Locations.h:2085
+msgid "Sidney"
+msgstr ""
+
+#: my-evolution/Locations.h:2086
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2087
+msgid "Siloam Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2088
+msgid "Silver City"
+msgstr ""
+
+#: my-evolution/Locations.h:2089
+msgid "Sindal"
+msgstr ""
+
+#: my-evolution/Locations.h:2091
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2097
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2098
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+#: my-evolution/Locations.h:2099
+msgid "Skive"
+msgstr ""
+
+#: my-evolution/Locations.h:2100
+msgid "Skopje"
+msgstr ""
+
+#: my-evolution/Locations.h:2101
+msgid "Skwentna"
+msgstr ""
+
+#: my-evolution/Locations.h:2102
+msgid "Slana"
+msgstr ""
+
+#: my-evolution/Locations.h:2105
+msgid "Smithers"
+msgstr ""
+
+#: my-evolution/Locations.h:2106
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2107
+msgid "Snowshoe Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2108
+msgid "Sochi"
+msgstr ""
+
+#: my-evolution/Locations.h:2109
+msgid "Socorro"
+msgstr ""
+
+#: my-evolution/Locations.h:2110
+msgid "Socotra"
+msgstr ""
+
+#: my-evolution/Locations.h:2111
+msgid "Soda Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2112
+msgid "Sofia"
+msgstr ""
+
+#: my-evolution/Locations.h:2113
+msgid "Sogndal"
+msgstr ""
+
+#: my-evolution/Locations.h:2114
+msgid "Soldotna"
+msgstr ""
+
+#: my-evolution/Locations.h:2115
+msgid "Somerset"
+msgstr ""
+
+#: my-evolution/Locations.h:2116
+msgid "Sonderborg"
+msgstr ""
+
+#: my-evolution/Locations.h:2117
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2120
+msgid "Southampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2121
+msgid "South Bend"
+msgstr ""
+
+#: my-evolution/Locations.h:2122
+msgid "South Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:2123
+msgid "South Dakota"
+msgstr ""
+
+#: my-evolution/Locations.h:2124
+msgid "Southend"
+msgstr ""
+
+#: my-evolution/Locations.h:2125
+msgid "South Marsh Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2126
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2128
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2129
+msgid "Spencer"
+msgstr ""
+
+#: my-evolution/Locations.h:2130
+msgid "Spickard"
+msgstr ""
+
+#: my-evolution/Locations.h:2131
+msgid "Split"
+msgstr ""
+
+#: my-evolution/Locations.h:2132
+msgid "Spokane"
+msgstr ""
+
+#: my-evolution/Locations.h:2133
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2134
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "Springfield"
+msgstr "Synchronising \"%s\""
+
+#: my-evolution/Locations.h:2136
+msgid "Stampede Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:2137
+msgid "State College"
+msgstr ""
+
+#: my-evolution/Locations.h:2138
+#, fuzzy
+msgid "Stauning"
+msgstr "Synchronise \"%s\""
+
+#: my-evolution/Locations.h:2139
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2140
+msgid "Stavanger/Sola"
+msgstr ""
+
+#: my-evolution/Locations.h:2141
+msgid "Staverton"
+msgstr ""
+
+#: my-evolution/Locations.h:2142
+msgid "Stavropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2143
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2144
+msgid "Steamboat Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2145
+msgid "Stephenville"
+msgstr ""
+
+#: my-evolution/Locations.h:2146
+msgid "St. George"
+msgstr ""
+
+#: my-evolution/Locations.h:2147
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2148
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2149
+msgid "St Johnsbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2150
+msgid "St Joseph"
+msgstr ""
+
+#: my-evolution/Locations.h:2151
+msgid "St Louis"
+msgstr ""
+
+#: my-evolution/Locations.h:2152
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2157
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2158
+msgid "Storm Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2159
+msgid "Stornoway"
+msgstr ""
+
+#: my-evolution/Locations.h:2160
+msgid "St Paul"
+msgstr ""
+
+#: my-evolution/Locations.h:2161
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2164
+msgid "Strevell"
+msgstr ""
+
+#: my-evolution/Locations.h:2165
+msgid "St Simon's Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2166
+msgid "Stumpy Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2167
+msgid "Sturgeon Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:2168
+msgid "Stuttgart"
+msgstr ""
+
+#: my-evolution/Locations.h:2169
+msgid "Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:2170
+msgid "Sumburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:2171
+msgid "Sumter"
+msgstr ""
+
+#: my-evolution/Locations.h:2172
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2174
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2175
+msgid "Superior"
+msgstr ""
+
+#: my-evolution/Locations.h:2177
+msgid "Sutton"
+msgstr ""
+
+#: my-evolution/Locations.h:2178
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2179
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2188
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2189
+msgid "Szombathely"
+msgstr ""
+
+#: my-evolution/Locations.h:2190
+#, fuzzy
+msgid "Tabatinga"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:2191
+msgid "Tabriz"
+msgstr ""
+
+#: my-evolution/Locations.h:2192
+msgid "Tabuk"
+msgstr ""
+
+#: my-evolution/Locations.h:2193
+msgid "Tachikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+msgid "Tacna"
+msgstr ""
+
+#: my-evolution/Locations.h:2195
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2199
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+msgid "Taejon"
+msgstr ""
+
+#: my-evolution/Locations.h:2201
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2202
+msgid "Taichung"
+msgstr ""
+
+#: my-evolution/Locations.h:2203
+msgid "Taif"
+msgstr ""
+
+#: my-evolution/Locations.h:2204
+msgid "Tainan"
+msgstr ""
+
+#: my-evolution/Locations.h:2206
+msgid "Taiyuan"
+msgstr ""
+
+#: my-evolution/Locations.h:2207
+msgid "Taiz"
+msgstr ""
+
+#: my-evolution/Locations.h:2208
+msgid "Tajima"
+msgstr ""
+
+#: my-evolution/Locations.h:2209
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Talara"
+msgstr ""
+
+#: my-evolution/Locations.h:2211
+msgid "Talinn"
+msgstr ""
+
+#: my-evolution/Locations.h:2212
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tallahassee"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2215
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2216
+msgid "Tampa"
+msgstr ""
+
+#: my-evolution/Locations.h:2217
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2218
+msgid "Tampere"
+msgstr ""
+
+#: my-evolution/Locations.h:2219
+msgid "Tampico"
+msgstr ""
+
+#: my-evolution/Locations.h:2220
+msgid "Tanana"
+msgstr ""
+
+#: my-evolution/Locations.h:2221
+msgid "Tanegashima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2222
+msgid "Taos"
+msgstr ""
+
+#: my-evolution/Locations.h:2223
+msgid "Taoyuan"
+msgstr ""
+
+#: my-evolution/Locations.h:2224
+msgid "Tapachula"
+msgstr ""
+
+#: my-evolution/Locations.h:2225
+msgid "Taranto"
+msgstr ""
+
+#: my-evolution/Locations.h:2226
+msgid "Tarbes"
+msgstr ""
+
+#: my-evolution/Locations.h:2227
+msgid "Tarija"
+msgstr ""
+
+#: my-evolution/Locations.h:2228
+msgid "Tarvisio"
+msgstr ""
+
+#: my-evolution/Locations.h:2229
+#, fuzzy
+msgid "Tatalina"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:2230
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2235
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2236
+msgid "Tela"
+msgstr ""
+
+#: my-evolution/Locations.h:2237
+msgid "Temple"
+msgstr ""
+
+#: my-evolution/Locations.h:2238
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2244
+msgid "Texarkana"
+msgstr ""
+
+#: my-evolution/Locations.h:2245
+msgid "Texas"
+msgstr ""
+
+#: my-evolution/Locations.h:2246
+msgid "The Dalles"
+msgstr ""
+
+#: my-evolution/Locations.h:2247
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2248
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2249
+msgid "Thiruvananthapuram"
+msgstr ""
+
+#: my-evolution/Locations.h:2250
+msgid "Thisted"
+msgstr ""
+
+#: my-evolution/Locations.h:2251
+msgid "Thompson Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2252
+msgid "Thumrait"
+msgstr ""
+
+#: my-evolution/Locations.h:2253
+msgid "Tianjin"
+msgstr ""
+
+#: my-evolution/Locations.h:2254
+msgid "Tijuana"
+msgstr ""
+
+#: my-evolution/Locations.h:2255
+msgid "Timisoara"
+msgstr ""
+
+#: my-evolution/Locations.h:2256
+msgid "Tin City"
+msgstr ""
+
+#: my-evolution/Locations.h:2257
+msgid "Tirana"
+msgstr ""
+
+#: my-evolution/Locations.h:2258
+msgid "Tiree"
+msgstr ""
+
+#: my-evolution/Locations.h:2259
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2260
+msgid "Tiruchchirapalli"
+msgstr ""
+
+#: my-evolution/Locations.h:2261
+msgid "Titusville"
+msgstr ""
+
+#: my-evolution/Locations.h:2262
+msgid "Tivat"
+msgstr ""
+
+#: my-evolution/Locations.h:2263
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2267
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+msgid "Tokunoshima Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2269
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2271
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2272
+msgid "Tokyo New International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2273
+msgid "Toledo"
+msgstr ""
+
+#: my-evolution/Locations.h:2274
+msgid "Toluca"
+msgstr ""
+
+#: my-evolution/Locations.h:2275
+msgid "Tonopah"
+msgstr ""
+
+#: my-evolution/Locations.h:2276
+msgid "Topeka"
+msgstr ""
+
+#: my-evolution/Locations.h:2277
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2279
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2280
+msgid "Toronto"
+msgstr ""
+
+#: my-evolution/Locations.h:2281
+msgid "Torp"
+msgstr ""
+
+#: my-evolution/Locations.h:2282
+msgid "Torrance"
+msgstr ""
+
+#: my-evolution/Locations.h:2283
+msgid "Torreon"
+msgstr ""
+
+#: my-evolution/Locations.h:2284
+msgid "Tottori Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2285
+#, fuzzy
+msgid "Toulouse"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:2286
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2290
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2291
+msgid "Trabzon"
+msgstr ""
+
+#: my-evolution/Locations.h:2292
+msgid "Trapani"
+msgstr ""
+
+#: my-evolution/Locations.h:2293
+msgid "Traverse City"
+msgstr ""
+
+#: my-evolution/Locations.h:2294
+msgid "Trelew"
+msgstr ""
+
+#: my-evolution/Locations.h:2295
+#, fuzzy
+msgid "Trenton"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:2296
+msgid "Trevico"
+msgstr ""
+
+#: my-evolution/Locations.h:2297
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2298
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2299
+msgid "Trieste"
+msgstr ""
+
+#: my-evolution/Locations.h:2300
+msgid "Trinidad"
+msgstr ""
+
+#: my-evolution/Locations.h:2301
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2304
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2305
+msgid "Troyes/Barberey"
+msgstr ""
+
+#: my-evolution/Locations.h:2306
+msgid "Truckee"
+msgstr ""
+
+#: my-evolution/Locations.h:2307
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2314
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2315
+msgid "Tulancingo"
+msgstr ""
+
+#: my-evolution/Locations.h:2316
+msgid "Tulcea"
+msgstr ""
+
+#: my-evolution/Locations.h:2317
+msgid "Tulsa"
+msgstr ""
+
+#: my-evolution/Locations.h:2318
+msgid "Tupelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2319
+msgid "Turaif"
+msgstr ""
+
+#: my-evolution/Locations.h:2320
+msgid "Turin"
+msgstr ""
+
+#: my-evolution/Locations.h:2322
+msgid "Turku"
+msgstr ""
+
+#: my-evolution/Locations.h:2323
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2324
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+#: my-evolution/Locations.h:2325
+msgid "Twenthe"
+msgstr ""
+
+#: my-evolution/Locations.h:2326
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2327
+msgid "Twin Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2328
+#, fuzzy
+msgid "Tyler"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:2329
+msgid "Tyndall AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2330
+msgid "Tyumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2331
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2332
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2340
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2341
+msgid "United Arab Emirates "
+msgstr ""
+
+#: my-evolution/Locations.h:2344
+msgid "Unst"
+msgstr ""
+
+#: my-evolution/Locations.h:2345
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2346
+msgid "Uruapan"
+msgstr ""
+
+#: my-evolution/Locations.h:2347
+msgid "Uruguaiana"
+msgstr ""
+
+#: my-evolution/Locations.h:2349
+msgid "Urumqi"
+msgstr ""
+
+#: my-evolution/Locations.h:2350
+msgid "Utah"
+msgstr ""
+
+#: my-evolution/Locations.h:2351
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2353
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:2355
+msgid "Vadso"
+msgstr ""
+
+#: my-evolution/Locations.h:2356
+#, fuzzy
+msgid "Vaerlose"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:2357
+msgid "Vagar"
+msgstr ""
+
+#: my-evolution/Locations.h:2358
+msgid "Valdez 2"
+msgstr ""
+
+#: my-evolution/Locations.h:2359
+msgid "Valdosta"
+msgstr ""
+
+#: my-evolution/Locations.h:2360
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2361
+msgid "Valencia"
+msgstr ""
+
+#: my-evolution/Locations.h:2362
+msgid "Valentine"
+msgstr ""
+
+#: my-evolution/Locations.h:2363
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2366
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2367
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2368
+msgid "Van"
+msgstr ""
+
+#: my-evolution/Locations.h:2369
+msgid "Vancouver"
+msgstr ""
+
+#: my-evolution/Locations.h:2370
+msgid "Vandel"
+msgstr ""
+
+#: my-evolution/Locations.h:2371
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2373
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+msgid "Varadero"
+msgstr ""
+
+#: my-evolution/Locations.h:2375
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2376
+msgid "Varna"
+msgstr ""
+
+#: my-evolution/Locations.h:2377
+msgid "Vasteras"
+msgstr ""
+
+#: my-evolution/Locations.h:2378
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2379
+msgid "Venezia"
+msgstr ""
+
+#: my-evolution/Locations.h:2381
+msgid "Venice"
+msgstr ""
+
+#: my-evolution/Locations.h:2382
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2383
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2384
+msgid "Vermont"
+msgstr ""
+
+#: my-evolution/Locations.h:2385
+msgid "Vernal"
+msgstr ""
+
+#: my-evolution/Locations.h:2386
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+msgid "Vicenza"
+msgstr ""
+
+#: my-evolution/Locations.h:2388
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2390
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2393
+msgid "Vigo"
+msgstr ""
+
+#: my-evolution/Locations.h:2394
+msgid "Vilhena"
+msgstr ""
+
+#: my-evolution/Locations.h:2395
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+msgid "Villahermosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2398
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2404
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+msgid "Visalia"
+msgstr ""
+
+#: my-evolution/Locations.h:2406
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2410
+msgid "Vladivostok"
+msgstr ""
+
+#: my-evolution/Locations.h:2411
+msgid "Vlieland"
+msgstr ""
+
+#: my-evolution/Locations.h:2412
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2413
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2414
+msgid "Volkel"
+msgstr ""
+
+#: my-evolution/Locations.h:2415
+msgid "Volk Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2416
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2417
+msgid "Voslau"
+msgstr ""
+
+#: my-evolution/Locations.h:2418
+msgid "Waco"
+msgstr ""
+
+#: my-evolution/Locations.h:2419
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2423
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2424
+msgid "Wallops Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2425
+msgid "Walnut Ridge"
+msgstr ""
+
+#: my-evolution/Locations.h:2426
+msgid "Warner Robins"
+msgstr ""
+
+#: my-evolution/Locations.h:2427
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2429
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2430
+msgid "Washington/Dulles"
+msgstr ""
+
+#: my-evolution/Locations.h:2431
+msgid "Waterbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2432
+msgid "Waterloo"
+msgstr ""
+
+#: my-evolution/Locations.h:2433
+msgid "Watertown"
+msgstr ""
+
+#: my-evolution/Locations.h:2434
+msgid "Waterville"
+msgstr ""
+
+#: my-evolution/Locations.h:2435
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+msgid "Wausau"
+msgstr ""
+
+#: my-evolution/Locations.h:2437
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2438
+msgid "Waynesboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2439
+msgid "Webster City"
+msgstr ""
+
+#: my-evolution/Locations.h:2440
+msgid "Wejh"
+msgstr ""
+
+#: my-evolution/Locations.h:2441
+msgid "Wellington"
+msgstr ""
+
+#: my-evolution/Locations.h:2442
+msgid "Wenatchee"
+msgstr ""
+
+#: my-evolution/Locations.h:2443
+msgid "Wendover"
+msgstr ""
+
+#: my-evolution/Locations.h:2444
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2445
+msgid "West Burke"
+msgstr ""
+
+#: my-evolution/Locations.h:2446
+msgid "Westerland"
+msgstr ""
+
+#: my-evolution/Locations.h:2447
+msgid "Westfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2448
+msgid "Westhampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2449
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2451
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2452
+msgid "West Yellowstone (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2453
+msgid "Wheeling"
+msgstr ""
+
+#: my-evolution/Locations.h:2454
+msgid "Whidbey Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2455
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2461
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2462
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2463
+msgid "Wick"
+msgstr ""
+
+#: my-evolution/Locations.h:2464
+msgid "Wien"
+msgstr ""
+
+#: my-evolution/Locations.h:2465
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2467
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2468
+msgid "Williamsport"
+msgstr ""
+
+#: my-evolution/Locations.h:2469
+msgid "Williston"
+msgstr ""
+
+#: my-evolution/Locations.h:2470
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2472
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2473
+msgid "Winchester"
+msgstr ""
+
+#: my-evolution/Locations.h:2474
+msgid "Windsor"
+msgstr ""
+
+#: my-evolution/Locations.h:2475
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2478
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+msgid "Winslow"
+msgstr ""
+
+#: my-evolution/Locations.h:2480
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2481
+msgid "Winter Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:2482
+msgid "Winter Park"
+msgstr ""
+
+#: my-evolution/Locations.h:2483
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+msgid "Wisconsin"
+msgstr ""
+
+#: my-evolution/Locations.h:2485
+msgid "Wisconsin Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:2486
+msgid "Wise"
+msgstr ""
+
+#: my-evolution/Locations.h:2487
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2488
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2489
+msgid "Woong Cheon"
+msgstr ""
+
+#: my-evolution/Locations.h:2490
+#, fuzzy
+msgid "Wooster"
+msgstr "Colours"
+
+#: my-evolution/Locations.h:2491
+msgid "Worcester"
+msgstr ""
+
+#: my-evolution/Locations.h:2492
+msgid "Worland"
+msgstr ""
+
+#: my-evolution/Locations.h:2493
+msgid "Worthington"
+msgstr ""
+
+#: my-evolution/Locations.h:2494
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2495
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2496
+msgid "Wuchia Observatory"
+msgstr ""
+
+#: my-evolution/Locations.h:2497
+msgid "Wyoming"
+msgstr ""
+
+#: my-evolution/Locations.h:2498
+msgid "Xiamen"
+msgstr ""
+
+#: my-evolution/Locations.h:2499
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2505
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2506
+msgid "Yankton"
+msgstr ""
+
+#: my-evolution/Locations.h:2507
+msgid "Yao Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2508
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2510
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2511
+msgid "Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2513
+msgid "Yenbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2514
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2522
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2528
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2529
+msgid "Zacatecas"
+msgstr ""
+
+#: my-evolution/Locations.h:2530
+msgid "Zadar"
+msgstr ""
+
+#: my-evolution/Locations.h:2531
+msgid "Zagreb"
+msgstr ""
+
+#: my-evolution/Locations.h:2532
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2533
+msgid "Zama Airfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2534
+msgid "Zanesville"
+msgstr ""
+
+#: my-evolution/Locations.h:2535
+msgid "Zaragoza"
+msgstr ""
+
+#: my-evolution/Locations.h:2536
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2537
+msgid "Zuni Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:2538
+msgid "Zurich"
+msgstr ""
+
+#: 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 ""
 
-#: 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:400
 msgid "%k:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:379
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-calendar.c:420
+msgid "No description"
+msgstr ""
+
+#: my-evolution/e-summary-mail.c:151
 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
+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:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:953
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:957
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1503
-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:300
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:528
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:248
+#: my-evolution/e-summary-shown.c:463
+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:487 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:287
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr ""
 
@@ -9921,23 +22098,23 @@ msgstr ""
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#: 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:501
 msgid "Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr ""
-
 #: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:488
+msgid "Please wait..."
+msgstr ""
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr ""
 
@@ -9945,43 +22122,11 @@ msgstr ""
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:66
+#: my-evolution/main.c:65
 #, 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
-msgid "miles"
-msgstr ""
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr ""
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr ""
@@ -10380,11 +22525,6 @@ msgstr ""
 msgid "Freezing ice pellets"
 msgstr ""
 
-#. HAIL
-#: my-evolution/metar.c:217
-msgid "Hail"
-msgstr ""
-
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
@@ -11130,167 +23270,138 @@ msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr ""
-
-#: 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
-#, fuzzy
-msgid "All _folders:"
-msgstr "Synchronising \"%s\""
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 msgid "S_how full path for folders"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _today's tasks"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:22
-#, fuzzy
-msgid "_Display folders:"
-msgstr "Synchronising \"%s\""
-
-#: 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
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 msgid "_News Feeds"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Synchronising \"%s\""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 #, fuzzy
 msgid "The Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-activity-handler.c:200
-msgid "Show Details"
-msgstr ""
-
-#: shell/e-activity-handler.c:202
-msgid "Cancel Operation"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
 msgstr ""
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr ""
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
+#: shell/e-activity-handler.c:162
+msgid "Show Details"
 msgstr ""
 
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
+#: shell/e-activity-handler.c:164
+msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr ""
 
-#: 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 ""
 
-#: 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:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11298,14 +23409,38 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:281
+#: shell/e-setup.c:282
+#, c-format
+msgid ""
+"Evolution could not create directory\n"
+"%s:\n"
+"%s"
+msgstr ""
+
+#: 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:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11313,7 +23448,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:295
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11322,7 +23457,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:320
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11330,99 +23465,100 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-about-box.c:40
-#, fuzzy
-msgid "Evolution "
-msgstr "Cannot initialise the Evolution shell."
-
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr ""
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr "Synchronising \"%s\""
+
+#: 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: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 ""
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 #, fuzzy
 msgid "Copy folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:556
 #, fuzzy
 msgid "Rename folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:148
+#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:267
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -11432,11 +23568,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:359
+#: shell/e-shell-folder-selection-dialog.c:376
 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:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr ""
 
@@ -11453,7 +23589,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
+#: 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 ""
 
@@ -11474,99 +23610,105 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:397
+#: shell/e-shell-importer.c:409
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/e-shell-importer.c:420
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:424
+#: shell/e-shell-importer.c:435
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:445
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:453
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:466
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:485
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:502
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:572
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:623
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:617
+#: shell/e-shell-importer.c:628
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:638
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:663
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:667
 msgid "Import a single file"
 msgstr ""
 
-#: 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
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: 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
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: 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
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1014
+#: shell/e-shell-importer.c:1027
 #, fuzzy
 msgid "Select folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1028
 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:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
@@ -11586,6 +23728,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr ""
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr ""
@@ -11602,89 +23750,88 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-view-menu.c:409
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:410
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:530
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:531
+#: shell/e-shell-view-menu.c:566
 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 ""
-
-#: shell/e-shell-view-menu.c:570
-#, c-format
-msgid "Error executing %s."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:672
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: shell/e-shell-view.c:1630
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: 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 ""
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11692,19 +23839,23 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr ""
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr ""
 
@@ -11819,74 +23970,71 @@ msgstr ""
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-storage-set-view.c:658
-#, fuzzy, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr "Synchronising \"%s\""
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr ""
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr ""
 
-#: 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:491
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr ""
 
-#: 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:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr ""
 
-#: 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:505
 msgid "Operation not supported"
 msgstr ""
 
-#: 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: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 ""
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Synchronising \"%s\""
@@ -11897,95 +24045,102 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, 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/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Synchronising \"%s\""
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:124
-#, 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"
+#: shell/evolution-test-component.c:47
+msgid "Test type"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
@@ -12102,292 +24257,265 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #: shell/main.c:89
+msgid "Evolution"
+msgstr ""
+
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:210
+#: shell/main.c:227
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:290
+#: shell/main.c:318
+msgid "Start in offline mode"
+msgstr ""
+
+#: shell/main.c:319
+msgid "Start in online mode"
+msgstr ""
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
+#: tools/evolution-addressbook-abuse.c:80
 #: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr ""
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr ""
 
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr ""
+
 #: tools/evolution-addressbook-import.c:80
 msgid "No filename provided."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
+#: ui/evolution-addressbook.xml.h:3
+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:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Synchronising \"%s\""
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr ""
-
-#: 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:11
 msgid "Delete selected contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
+#: ui/evolution-addressbook.xml.h:13
+msgid "Move Contact(s) to Another Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
+#: ui/evolution-addressbook.xml.h:14
+msgid "Move to Folder..."
 msgstr ""
 
-#: 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:17
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: 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:22
 msgid "Save selected contacts as a VCard."
 msgstr ""
 
-#: 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:24
 msgid "Select all contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr ""
-
-#: 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:26
 msgid "Send message to contact"
 msgstr ""
 
-#: 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:28
 msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
-#: 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
-msgid "_Actions"
-msgstr ""
-
 #: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
+msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
+#: 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
+msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr ""
 
-#: 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 ""
 
-#: 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..."
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
+#: ui/evolution-addressbook.xml.h:45
+msgid "_Send Message to Contact..."
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a New _Task"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr ""
 
-#: 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:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr ""
 
-#: 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:8
 msgid "Go forward"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr ""
 
-#: 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:12
 msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr ""
-
-#: 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:16 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr ""
 
-#: 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:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr ""
 
-#: 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:21
 msgid "Show one week"
 msgstr ""
 
-#: 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:23
 msgid "Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr ""
-
 #: 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
@@ -12419,18 +24547,18 @@ msgstr ""
 msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
+#: 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 ""
 
-#: 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
-msgid "Save"
+#: 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-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 ""
 
@@ -12446,8 +24574,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:40
 msgid "_File"
 msgstr ""
 
@@ -12456,7 +24584,7 @@ msgid "Print En_velope..."
 msgstr ""
 
 #: 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 ""
@@ -12465,10 +24593,14 @@ msgstr ""
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+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 ""
 
@@ -12528,6 +24660,10 @@ 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 ""
@@ -12537,82 +24673,54 @@ msgid "Compose _New Message"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: 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:6
 msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr ""
 
-#: 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
-msgid "New Message"
-msgstr ""
-
-#: 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:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr ""
-
-#: 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:11
 msgid "Show message preview window"
 msgstr ""
 
-#: 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:13
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr ""
 
@@ -12705,11 +24813,11 @@ msgstr ""
 msgid "Threaded Message list"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr ""
 
@@ -12726,211 +24834,215 @@ msgid "_Threaded Message List"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "Apply filter rules to the selected messages"
+msgid "A_dd Sender to Addressbook"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:2
-msgid "Compose a reply to all of the recipients of the selected message"
+msgid "A_pply Filters"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Compose a reply to the mailing list of the selected message"
+msgid "Add Sender to Addressbook"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:4
-msgid "Compose a reply to the sender of the selected message"
+msgid "Apply filter rules to the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:6
-msgid "Copy selected messages to another folder"
+#: 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:7
-msgid "Create _Virtual Folder From Message"
+#: 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:8
-msgid "Create a rule to filter messages from this sender"
+#: 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:9
-msgid "Create a rule to filter messages to these recipients"
+msgid "Copy selected messages to another folder"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:10
-msgid "Create a rule to filter messages to this mailing list"
+msgid "Create _Virtual Folder From Message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:11
-msgid "Create a rule to filter messages with this subject"
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:12
-msgid "Create a virtual folder for these recipients"
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:13
-msgid "Create a virtual folder for this mailing list"
+msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:14
-msgid "Create a virtual folder for this sender"
+msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:15
-msgid "Create a virtual folder for this subject"
+msgid "Create a virtual folder for these recipients"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:16
-msgid "Decrease the text size"
+msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:18
-msgid "Display the next important message"
+#: ui/evolution-mail-message.xml.h:17
+msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:19
-msgid "Display the next message"
+#: ui/evolution-mail-message.xml.h:18
+msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:20
-msgid "Display the next unread message"
+#: ui/evolution-mail-message.xml.h:19
+msgid "Decrease the text size"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:21
-msgid "Display the next unread thread"
+msgid "Display the next important message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:22
-msgid "Display the previous important message"
+msgid "Display the next message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:23
-msgid "Display the previous message"
+msgid "Display the next unread message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:24
-msgid "Display the previous unread message"
+msgid "Display the next unread thread"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:25
-msgid "Filter on Mailing _List..."
+msgid "Display the previous important message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:26
-msgid "Filter on Se_nder..."
+msgid "Display the previous message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:27
-msgid "Filter on _Recipients..."
+msgid "Display the previous unread message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:28
-msgid "Filter on _Subject..."
+msgid "F_orward"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:29
-msgid "Force images in HTML mail to be loaded"
+msgid "Filter on Mailing _List..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:30
-msgid "Forward"
+msgid "Filter on Se_nder..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:31
-msgid "Forward As"
+msgid "Filter on _Recipients..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:32
-msgid "Forward _Attached"
+msgid "Filter on _Subject..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Inline"
+msgid "Flag selected message(s) for follow-up"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Quoted"
+msgid "Follow _Up..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: 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:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: 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-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:45
-msgid "Mark as Unimp_ortant"
+msgid "Mark as U_nread"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:46
-msgid "Mark the selected messages as having been read"
+msgid "Mark as Unimp_ortant"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:47
-msgid "Mark the selected messages as important"
+msgid "Mark the selected message(s) as having been read"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as not having been read"
+msgid "Mark the selected message(s) as important"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected messages as unimportant"
+msgid "Mark the selected message(s) as not having been read"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages for deletion"
+msgid "Mark the selected message(s) as unimportant"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:51
-msgid "Move"
+msgid "Mark the selected messages for deletion"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:52
-msgid "Move selected messages to another folder"
+msgid "Move"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:53
-msgid "Next"
+msgid "Move selected message(s) to another folder"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
+msgid "Next"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
+msgid "Next _Important Message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+msgid "Next _Thread"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+msgid "Next _Unread Message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:58
@@ -12946,160 +25058,179 @@ msgid "Original Si_ze"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:61
-msgid "Preview the message to be printed"
+msgid "P_revious Unread Message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
+msgid "Pr_evious Important Message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
+msgid "Preview the message to be printed"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
+msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Print this message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:68
-msgid "Print this message"
+msgid "Re_direct"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
+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-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr ""
 
-#: 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-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-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 ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr ""
 
-#: 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-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr ""
 
-#: 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-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
+#: ui/evolution-mail-message.xml.h:92
+msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
+msgid "_Go To"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:99
+msgid "_Inline"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:103
+msgid "_Next Message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+msgid "_Previous Message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:108
+msgid "_Quoted"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr ""
 
+#: 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 ""
 
 #: 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:36
 #, fuzzy
 msgid "_Close"
 msgstr "Colours"
 
 #: 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:56
 msgid "_View"
 msgstr ""
 
@@ -13123,11 +25254,11 @@ msgstr ""
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -13143,6 +25274,10 @@ msgstr ""
 msgid "Insert text file..."
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr ""
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr ""
@@ -13176,7 +25311,7 @@ msgid "Save in folder..."
 msgstr ""
 
 #: 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 ""
 
@@ -13201,6 +25336,7 @@ msgid "Send _later"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr ""
 
@@ -13269,7 +25405,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr ""
 
@@ -13281,11 +25417,7 @@ msgstr ""
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr ""
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr ""
 
@@ -13341,32 +25473,36 @@ msgstr ""
 msgid "Re_fresh Task"
 msgstr ""
 
-#: 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:3
 msgid "Copy selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete completed tasks"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+msgid "Mar_k as Complete"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings..."
+#: ui/evolution-tasks.xml.h:11
+msgid "Previews the list of tasks to be printed"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
+#: ui/evolution-tasks.xml.h:13
+msgid "Print the list of tasks"
 msgstr ""
 
 #: ui/evolution.xml.h:1
@@ -13435,114 +25571,118 @@ msgid "Open this folder in an other window"
 msgstr ""
 
 #: ui/evolution.xml.h:21
-msgid "Show information about Ximian Evolution"
+msgid "Send / Receive"
 msgstr ""
 
 #: ui/evolution.xml.h:22
-msgid "Submit Bug Report"
+msgid "Send queued items and retrieve new items"
 msgstr ""
 
 #: ui/evolution.xml.h:23
-msgid "Submit _Bug Report"
+msgid "Show information about Ximian Evolution"
 msgstr ""
 
 #: ui/evolution.xml.h:24
-msgid "Submit a bug report using Bug Buddy"
+msgid "Submit Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:25
-msgid "Toggle"
+msgid "Submit _Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:26
-msgid "Toggle whether to show the folder bar"
+msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
 #: ui/evolution.xml.h:27
-msgid "Toggle whether to show the shortcut bar"
+msgid "Toggle"
 msgstr ""
 
 #: ui/evolution.xml.h:28
-msgid "Toggle whether we are working offline."
+msgid "Toggle whether to show the folder bar"
 msgstr ""
 
 #: ui/evolution.xml.h:29
-msgid "View the selected folder"
+msgid "Toggle whether to show the shortcut bar"
+msgstr ""
+
+#: ui/evolution.xml.h:30
+msgid "Toggle whether we are working offline."
 msgstr ""
 
 #: ui/evolution.xml.h:31
+msgid "View the selected folder"
+msgstr ""
+
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Cannot initialise the Evolution shell."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr ""
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr ""
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr ""
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr ""
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:47
-msgid "_Shortcut"
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:48
-msgid "_Shortcut Bar"
+#: ui/evolution.xml.h:53
+msgid "_Shortcut"
 msgstr ""
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
+#: ui/evolution.xml.h:54
+msgid "_Shortcut Bar"
 msgstr ""
 
-#: 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/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr ""
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr ""
@@ -13556,18 +25696,27 @@ msgid "Phone List"
 msgstr ""
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "Synchronising \"%s\""
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr ""
 
-#: 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:5
 msgid "By Subject"
 msgstr ""
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr ""
 
@@ -13575,6 +25724,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 ""
+
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "Select a Time Zone"
 msgstr ""
@@ -13594,11 +25749,20 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+msgid "Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr ""
 
@@ -13630,77 +25794,81 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 #, fuzzy
 msgid "Traditional"
 msgstr "Organisation"
 
-#: 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 ""
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
+#: widgets/misc/e-charset-picker.c:95
+msgid "Visual"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:201
+#: 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:281
 msgid "Other..."
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr ""
 
@@ -13708,25 +25876,20 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: 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:162
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
+#: widgets/misc/e-filter-bar.h:97
+msgid "_Save Search..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:95
-#, fuzzy
-msgid "Clear"
-msgstr "Colours"
-
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
+#: widgets/misc/e-filter-bar.h:98
+msgid "_Edit Saved Searches..."
 msgstr ""
 
 #: widgets/misc/e-messagebox.c:152
@@ -13750,11 +25913,21 @@ msgstr ""
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
+#: widgets/misc/e-search-bar.c:477
+msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Colours"
+
+#: widgets/misc/e-search-bar.c:835
+#, fuzzy
+msgid "Clear"
+msgstr "Colours"
+
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr ""
 
@@ -13784,19 +25957,33 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
 #, fuzzy
-#~ msgid "Summarising folder"
-#~ msgstr "Synchronising \"%s\""
+#~ msgid "_Organization:"
+#~ msgstr "Organisation:"
 
 #, fuzzy
-#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
 #, fuzzy
-#~ msgid "Factory for the Evolution addressbook component."
+#~ msgid "Cannot initialize Evolution's Summary component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
 #, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
+#~ msgid "All _folders:"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Summarising folder"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
 #, fuzzy
@@ -13807,10 +25994,6 @@ msgstr "Could not initialise Bonobo"
 #~ msgstr "%m/%d/%Y"
 
 #, fuzzy
-#~ msgid "Factory for the Evolution executive summary component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
 #~ msgid "Colors for Tasks"
 #~ msgstr "Colours for display"
 
@@ -13851,13 +26034,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 c91202ebb6..6803746884 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-03-03 21:23+0100\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -32,7 +32,7 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importa archivos VCard a Evolution."
 
 #: 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 "Archivar como"
 
@@ -43,11 +43,12 @@ msgstr "Archivar como"
 # src/file-manager/fm-search-list-view.c:140
 # src/nautilus-bookmarks-window.c:172
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nombre"
 
 #: 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 "Correo electr�nico"
 
@@ -63,7 +64,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/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asistente"
 
@@ -103,7 +104,7 @@ msgid "Home"
 msgstr "Casa"
 
 #: 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 "Organizaci�n"
 
@@ -125,7 +126,7 @@ 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/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
@@ -135,7 +136,7 @@ msgstr "Fax de Trab"
 
 #: 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/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax de casa"
 
@@ -155,7 +156,7 @@ msgstr "Casa 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/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "RDSI"
 
@@ -165,55 +166,54 @@ msgstr "RDSI"
 #: 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
 msgid "Other"
 msgstr "Otro"
 
 #: 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/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/widgets/e-addressbook-view.c:353
+#: 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/widgets/e-addressbook-view.c:354
+#: 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/widgets/e-addressbook-view.c:355
+#: 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: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/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/widgets/e-addressbook-view.c:359
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Correo electr�nico 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 "Sitio Web"
 
@@ -222,7 +222,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 "Departamento"
 
@@ -231,7 +231,7 @@ msgid "Dep"
 msgstr "Dep"
 
 #: 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 "Oficina"
 
@@ -242,12 +242,12 @@ msgstr "Off"
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # components/music/nautilus-music-view.c:198
 #: 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 "T�tulo"
 
 #: 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 "Profesi�n"
 
@@ -256,7 +256,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: 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 "Gestor"
 
@@ -269,7 +269,7 @@ msgid "Ass"
 msgstr "Asist"
 
 #: 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 "Nick"
 
@@ -278,12 +278,12 @@ msgid "Nick"
 msgstr "Nick"
 
 #: 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 "C�nyuge"
 
 #: 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 "Nota"
 
@@ -296,7 +296,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: 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 de disponibilidad"
 
@@ -330,11 +330,11 @@ msgstr "Apellido"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "VCards m�ltiples"
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -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:62
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
 #: 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:2364
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Buscando..."
 
@@ -368,37 +368,35 @@ msgstr "Cargando..."
 msgid "Error in search expression."
 msgstr "Error buscando la expresi�n."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:516
-msgid "Connecting to LDAP server..."
-msgstr "Conectando al servidor LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:526
-msgid "Unable to connect to LDAP server."
-msgstr "No pude conectarme al servidor LDAP."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:542
-msgid "Waiting for connection to LDAP server..."
-msgstr "Esperando la conexi�n al servidor LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "A�adiendo tarjeta al servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Eliminando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1174
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Modificando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2281
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Reiniciando b�squeda."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Recibiendo los resultados de la b�squeda LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2287
-msgid "Restarting search."
-msgstr "Reiniciando b�squeda."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Error eliminando tarjeta"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "No pude analizar la URL `%s'"
 
 #: addressbook/conduit/address-conduit.c:293
 #, fuzzy
@@ -439,423 +437,865 @@ msgid "A Bonobo control for displaying an address."
 msgstr "Un control Bonobo para mostrar una direcci�n."
 
 #: 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 "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
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Visor de Minitarjetas de Direcciones de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Componente de Evolution para manejar contactos."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Factor�a para el control de ejemplo de la Agenda"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "La carpeta contiene informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "El servidor LDAP contiene informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:558
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Nuevo contacto"
 
-#: addressbook/gui/component/addressbook-component.c:558
-#: ui/evolution-addressbook.xml.h:34
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Nueva lista de contactos"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Contact _List"
 msgstr "Lista de _contactos"
 
-#: addressbook/gui/component/addressbook-config.c:225
-msgid "Edit Addressbook"
-msgstr "Editar agenda de direcciones"
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+msgid "Could not initialize gnome-vfs"
+msgstr "No se puede inicializar gnome-vfs"
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr "No es posible abrir la agenda de direcciones"
+
+#: 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 ""
+"No podemos abrir este agenda de direcciones.  Esto significa\n"
+"que ha introducido una URI err�nea, o que el servidor LDAP est�\n"
+"ca�do"
+
+#: 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"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Esta versi�n de Evolution no implementa LDAP compilado.\n"
+"Si quiere usar LDAP en Evolution debe compilar el programa\n"
+"de las fuentes del CVS una vez que haya obtenido LDAP del\n"
+"siguiente enlace.\n"
+
+#: 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."
+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
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Introduzca la contrase�a para %s (usuario %s)"
+
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "finaliza con"
+
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "Correo electr�nico 2"
+
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "Categor�a es"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: 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
+msgid "Advanced..."
+msgstr "Avanzado..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
+msgstr "Cualquier categor�a"
+
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
+msgstr "La URI que mostrar� el visor de carpetas"
+
+#: 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
+msgid "Primary Email"
+msgstr "Correo electr�nico principal"
+
+#: addressbook/gui/component/e-address-popup.c:587
+msgid "Select an Action"
+msgstr "Elija un archivo"
+
+#: addressbook/gui/component/e-address-popup.c:593
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crear nuevo contacto �%s�"
+
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "A�adir direcci�n al contacto existente �%s�"
+
+#: addressbook/gui/component/e-address-popup.c:891
+msgid "Querying Addressbook..."
+msgstr "Consultando la Agenda de Direcciones..."
+
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
+msgstr "Editar informaci�n de contacto"
+
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+msgid "Add to Contacts"
+msgstr "A�adir a Contactos"
+
+#: addressbook/gui/component/e-address-popup.c:1046
+msgid "Merge E-Mail Address"
+msgstr "Fusionar Direcciones de Correo"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
+msgstr "Deshabilitar Consultas"
+
+#: addressbook/gui/component/e-address-widget.c:364
+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/addressbook-config.glade.h:1
-msgid "100"
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "1234"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#, fuzzy
-msgid "A_uthenticate with server using:"
-msgstr "Autenticaci�n requerida"
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Nombre de la cuenta"
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "A�adir agenda de direcciones"
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "Fuentes de la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Avanzado"
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Alarmas"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "An�nimo"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Base"
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
+msgstr ""
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-properties-window.c:1031
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "B�sico"
+#: addressbook/gui/component/ldap-config.glade.h:18
+msgid "Attribute"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: 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 "Conectica"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
-msgid "Check this if the server requires you to authenticate."
-msgstr "_Mi servidor requiere autenticaci�n"
+msgid "DN Customization"
+msgstr "Sin informaci�n"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:1865
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "De_lete"
 msgstr "Bo_rrar"
 
 # src/nautilus-first-time-druid.c:290
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
-msgid "Distinguished name (DN)"
+msgid "Distinguished _name:"
 msgstr "Distinguido"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
-msgid "Email address"
-msgstr "Direcci�n de correo:"
+msgid "Email Address:"
+msgstr "Dir_ecci�n de correo:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
+msgid "Evolution Attribute"
+msgstr "Alarma de Evolution"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution usar� esta direcci�n de correo para autenticarte contra el servidor"
 
-#: 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 usar� esta direcci�n de correo para autenticarte contra el servidor"
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "Bus_car"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "General"
+
+#: 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 "Configuraci�n"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+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
+#, fuzzy
+msgid "Never"
+msgstr "_cada"
+
+#: 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 "Uno"
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "Base de _b�squeda:"
+#: 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 "Predeterminados"
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Predeterminados"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
 msgstr "Rango de b�_squeda: "
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Nombre del servidor"
+#. 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 "Buscando"
+
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Seleccionar todo"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Borrado"
+
+#: 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 "Informaci�n de la Fuente"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Conectando al servidor..."
+
+#: 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:20
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-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.  "
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Schema no soportado"
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
+#: 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 ""
-"Esta informaci�n no es requerida por la mayor�a de los servidores LDAP."
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:73
 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."
+"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 ""
-"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."
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"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 ""
-"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."
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
-"This is the maximum number of cards to download.  Setting this number too "
-"large will slow down this addressbook."
+"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 ""
-"Este es el m�ximo n�mero de tarjetas a descargar.  Si pone este n�mero "
-"demasiado alto relentizar� su agenda."
 
-#: addressbook/gui/component/addressbook-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:81
 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."
+"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 ""
-"Este es el m�todo que usar� evolution para autenticarse.  Note que configurarlo "
-"como \"Direcci�n de Correo\" requiere acceso an�nimo a su servidor ldap."
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Este es el nombre del servidor donde est� su agenda."
+#: 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:28
-msgid "This is the port that your ldap server uses."
-msgstr "Este es el puerto que usa su servidor LDAP."
+#: 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 ""
+"Este es el m�ximo n�mero de tarjetas a descargar.  Si pone este n�mero "
+"demasiado alto relentizar� su agenda."
+
+#: 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 ""
+"Este es el m�todo que usar� evolution para autenticarse.  Note que "
+"configurarlo como \"Direcci�n de Correo\" requiere acceso an�nimo a su "
+"servidor ldap."
 
-#: addressbook/gui/component/addressbook-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:91
+#, fuzzy
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
+"It is for display purposes only. "
 msgstr ""
 "Este nombre ser� usado para identificar su cuenta, Es solo para poder "
 "mostrarlo en pantalla."
 
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "Nombre de la cuent_a:"
+#: 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 ""
+
+# src/nautilus-first-time-druid.c:290
+#: addressbook/gui/component/ldap-config.glade.h:101
+#, fuzzy
+msgid "Using distinguished name (DN)"
+msgstr "Distinguido"
+
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+msgid "Using email address"
+msgstr "Direcci�n de correo:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+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:100
+#: mail/mail-config.glade.h:139
 msgid "_Add"
 msgstr "_A�adir"
 
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_A�adir"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "A�adir acci�n"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "A�adir acci�n"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Alarmas"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Borrar todo"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Mostrar"
+
 # src/nautilus-first-time-druid.c:290
-#: addressbook/gui/component/addressbook-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
-msgid "_Distinguished Name:"
+msgid "_Distinguished Name (DN):"
 msgstr "Distinguido"
 
-#: addressbook/gui/component/addressbook-config.glade.h:33
+#: 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"
+msgid "_Download limit:"
 msgstr "Descargar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-undo-signal-handlers.c:174
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:109
-#: 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
+#: 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
+#: 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:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
-msgid "_Email address:"
-msgstr "Dir_ecci�n de correo:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Puerto:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "Nombre del _servidor:"
-
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-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"
+msgid "_Edit Mapping"
+msgstr "_Editar cita"
 
-#: addressbook/gui/component/addressbook.c:525
-msgid "Unable to open addressbook"
-msgstr "No es posible abrir la agenda de direcciones"
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Alarma de Evolution"
 
-#: addressbook/gui/component/addressbook.c:534
-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"
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
 msgstr ""
-"No podemos abrir este agenda de direcciones.  Esto significa\n"
-"que ha introducido una URI err�nea, o que el servidor LDAP est�\n"
-"ca�do"
 
-#: addressbook/gui/component/addressbook.c:539
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
 msgstr ""
-"Esta versi�n de Evolution no implementa LDAP compilado.\n"
-"Si quiere usar LDAP en Evolution debe compilar el programa\n"
-"de las fuentes del CVS una vez que haya obtenido LDAP del\n"
-"siguiente enlace.\n"
 
-#: addressbook/gui/component/addressbook.c:547
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
 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:655
-#: addressbook/gui/component/addressbook.c:658
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Introduzca la contrase�a para %s (usuario %s)"
 
-#: addressbook/gui/component/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Cualquier campo contiene"
-
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
-msgstr "El nombre contiene"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
-msgstr "El mensaje contiene"
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Opciones"
 
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:59
-msgid "Category is"
-msgstr "Categor�a es"
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Puerto:"
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Avanzado..."
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Predeterminados"
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1082
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
-msgstr "Cualquier categor�a"
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "Base de _b�squeda:"
 
-#: addressbook/gui/component/addressbook.c:1167
-msgid "The URI that the Folder Browser will display"
-msgstr "La URI que mostrar� el visor de carpetas"
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "Nombre del _servidor:"
 
-# #-#-#-#-#  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/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Tiempo de recordatorio (minutos)"
 
-#: 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
-msgid "Primary Email"
-msgstr "Correo electr�nico principal"
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Cuenta %d"
 
-#: addressbook/gui/component/e-address-popup.c:587
-msgid "Select an Action"
-msgstr "Elija un archivo"
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "editor-de-listas-de-contactos"
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Crear nuevo contacto �%s�"
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Sin tarjetas"
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "A�adir direcci�n al contacto existente �%s�"
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Reconectar a %s"
 
-#: addressbook/gui/component/e-address-popup.c:891
-msgid "Querying Addressbook..."
-msgstr "Consultando la Agenda de Direcciones..."
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
-msgstr "Editar informaci�n de contacto"
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-msgid "Add to Contacts"
-msgstr "A�adir a Contactos"
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "General"
 
-#: addressbook/gui/component/e-address-popup.c:1046
-msgid "Merge E-Mail Address"
-msgstr "Fusionar Direcciones de Correo"
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
-msgstr "Deshabilitar Consultas"
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
-msgstr "Habilitar Consultas (�Peligroso!)"
+#: addressbook/gui/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "Buscando"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
@@ -868,7 +1308,7 @@ 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
 #: 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
 msgid "Remove"
@@ -900,6 +1340,11 @@ msgid "Unnamed Contact"
 msgstr "Contactos sin nombre"
 
 #: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "El remitente contiene"
+
+#: 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"
@@ -914,7 +1359,7 @@ msgstr ""
 "Trowbridge <trow@ximian.com> con una descripci�n detallada de las "
 "circunstancias bajo las que ocurri� este error.  Gracias."
 
-#: 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"
@@ -926,31 +1371,40 @@ msgstr ""
 "Puede que necesites salir y reiniciar Evolution para arreglar\n"
 "este problema."
 
-#: 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 "Seleccionas contactos de la agenda"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "C_onteniendo:"
+msgid "Select Names"
+msgstr "_Seleccionar nombres"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "Bus_car"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "�Borrar contacto?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "_Seleccionar nombres"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Contactos"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Mostrar contactos que concuerden con el siguiente criterio:"
+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 "_Mover..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Categor�a:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Carpeta:"
 
@@ -1011,10 +1465,6 @@ msgstr "Archivar c_omo:"
 msgid "Full _Name..."
 msgstr "_Nombre completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "General"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1059,10 +1509,11 @@ 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:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1492 mail/mail-config.glade.h:107
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -2118,14 +2569,6 @@ 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?"
 
@@ -2159,7 +2602,7 @@ msgid "Edit Full"
 msgstr "Editar Todo"
 
 #: 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 "Nombre Completo"
 
@@ -2365,7 +2808,7 @@ msgstr ""
 "ya existen en esta carpeta.  �Quiere a�adirlo de todos modos?"
 
 #: 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 "B�squeda avanzada"
 
@@ -2378,106 +2821,24 @@ msgstr "B�squeda avanzada"
 msgid "Search"
 msgstr "Buscar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:136
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Sin tarjetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:139
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d tarjetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:369
+#: addressbook/gui/widgets/e-addressbook-model.c:370
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Error al configurar el propietario"
 
-#: 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:910
-#: addressbook/gui/widgets/e-addressbook-view.c:1024
-#: addressbook/gui/widgets/e-addressbook-view.c:1646
-#: ui/evolution-addressbook.xml.h:22
-msgid "Save as VCard"
-msgstr "Guardar como VCard"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:2114
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:312
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Abrir"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-#: ui/evolution-addressbook.xml.h:13
-msgid "Forward Contact"
-msgstr "Reenviar contacto"
-
-#
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:1026
-msgid "Send Message to Contact"
-msgstr "Enviar un mensaje al contacto"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1027
-#: 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:66
-#: ui/my-evolution.xml.h:2
-msgid "Print"
-msgstr "Imprimir"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:318
-#: addressbook/gui/widgets/e-addressbook-view.c:1029
-msgid "Print Envelope"
-msgstr "Imprimir cabecera"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:322
-#: addressbook/gui/widgets/e-addressbook-view.c:1033
-#, fuzzy
-msgid "Copy to folder..."
-msgstr "_Copiar a la carpeta..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
-#: addressbook/gui/widgets/e-addressbook-view.c:1034
-#, fuzzy
-msgid "Move to folder..."
-msgstr "_Mover a la carpeta..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:1037
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:7
-msgid "Cut"
-msgstr "Cortar"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
-#: addressbook/gui/widgets/e-addressbook-view.c:1038
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:7
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Copiar"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: addressbook/gui/widgets/e-addressbook-view.c:1039
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:12
-msgid "Paste"
-msgstr "Pegar"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:1865
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1040 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:295 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:19
-msgid "Delete"
-msgstr "Suprimir"
-
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
 #: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
@@ -2485,14 +2846,15 @@ msgid "Error modifying card"
 msgstr "Error modificando tarjeta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1020
+#: shell/evolution-shell-component.c:1043
 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 shell/e-shell.c:1941
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: 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
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -2500,8 +2862,8 @@ msgstr "Error desconocido"
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 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:1071
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -2519,9 +2881,9 @@ 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
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: 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
 msgid "Cancelled"
 msgstr "Cancelar"
 
@@ -2553,7 +2915,7 @@ 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:1444
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Error eliminando tarjeta"
 
@@ -2579,86 +2941,191 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:342
+#: addressbook/gui/widgets/e-addressbook-util.c:344
 msgid "Move card to"
 msgstr "Mover tarjeta a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:346
 msgid "Copy card to"
 msgstr "Copiar tarjeta a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Move cards to"
 msgstr "Mover tarjetas a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:351
 msgid "Copy cards to"
 msgstr "Copiar tarjetas a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:331
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Pulse aqu� para a�adir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Tel�fono principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Tel�fono del asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Tel�fono del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Tel�fono para rellamadas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Tel�fono de la compa��a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Tel�fono de casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Direcci�n del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Direcci�n de su casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Tel�fono m�vil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Tel�fono del coche"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Tel�fono del trabajo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Tel�fono de casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:351
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Otro tel�fono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Guardar como VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Nuevo contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Nueva lista de contactos"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Ir a la carpeta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Importar..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "Bu_scar contactos"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Fuentes de la _Agenda..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Configuraci�n del pilot..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Reenviar contacto"
+
+#
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Enviar un mensaje al contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Imprimir cabecera"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "_Copiar a la carpeta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "_Mover a la carpeta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Vista actual"
+
+#. 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:940
 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"
 
@@ -2666,7 +3133,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:945
 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"
 
@@ -2683,7 +3150,7 @@ msgstr "y una tarjeta m�s."
 msgid "Save in addressbook"
 msgstr "Guardar en la agenda de direcciones"
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
@@ -2697,7 +3164,7 @@ msgstr ""
 "\n"
 "Pulse dos veces aqu� para crear un nuevo contacto."
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
+#: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
 "\n"
 "\n"
@@ -2796,6 +3263,7 @@ msgid "Include:"
 msgstr "Incluye:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Horizontal"
 
@@ -2820,6 +3288,7 @@ msgid "Options"
 msgstr "Opciones"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Orientaci�n"
 
@@ -2840,7 +3309,9 @@ msgstr "Papel"
 msgid "Paper source:"
 msgstr "Fuente del papel:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Vertical"
 
@@ -2904,29 +3375,25 @@ msgstr "_Tipo de letra..."
 msgid "Untitled appointment"
 msgstr "Cita sin t�tulo"
 
-#: 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:653
+#: 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
 msgid "High"
 msgstr "Alta"
 
-#: 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:652
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
-#: 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:651
+#: 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
 msgid "Low"
 msgstr "Baja"
 
 #. 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
 msgid "Undefined"
 msgstr "Sin definir"
 
@@ -2958,42 +3425,56 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Un control bonobo de ejemplo que muestra un calendario."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Configuraci�n del calendario y de las tareas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Componente de Evolution para manejar el calendario."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 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:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 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:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 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:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 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:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 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
+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 "Servicio de notificaci�n de alarmas"
@@ -3002,22 +3483,10 @@ 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
-msgid "Evolution Alarm"
-msgstr "Alarma de Evolution"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3057,7 +3526,7 @@ msgstr ""
 "Evolution mostrar� un di�logo de recordatorio normal."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:429 mail/mail-callbacks.c:2573
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advertencia"
@@ -3083,7 +3552,7 @@ 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:57
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "No se puede inicializar GNOME"
 
@@ -3095,67 +3564,65 @@ msgstr "No pude crear el servicio de la alarma de notificaci�n"
 msgid "Could not create the alarm notify service factory"
 msgstr "No pude crear la factor�a del servicio de la alarma de notificaci�n"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "La descripci�n contiene"
 
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: 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 de %b de %Y"
 
-#: 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: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 de %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 "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:385
 msgid "Private"
 msgstr "Privado"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "P�blico"
 
@@ -3176,32 +3643,27 @@ msgid "W"
 msgstr "W"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
 msgid "Free"
 msgstr "Libre"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:479 calendar/gui/print.c:2246
 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:480 calendar/gui/print.c:2249
 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-calendar-table.c:481 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2252
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Completado"
 
@@ -3217,9 +3679,10 @@ 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/mail-account-gui.c:1512
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:404
-#: mail/mail-config.glade.h:56
+#: 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
 #: 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
@@ -3236,21 +3699,13 @@ 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/e-meeting-model.c:821
 msgid "Yes"
 msgstr "Si"
 
 #: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
 msgid "No"
 msgstr "No"
 
-#. 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 "Buscando"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Vista Diaria"
@@ -3267,58 +3722,75 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Carpeta conteniendo citas y eventos"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1733
-#: my-evolution/e-summary-tasks.c:250 my-evolution/e-summary-tasks.c:267
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Tareas"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Carpeta que contiene elementos por hacer"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:695
 msgid "New meeting"
 msgstr "Nueva reuni�n"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:695
 msgid "_Meeting"
 msgstr "_Reuni�n"
 
-#: calendar/gui/component-factory.c:687
+#: calendar/gui/component-factory.c:699
 msgid "New task"
 msgstr "Nueva tarea"
 
-#: calendar/gui/component-factory.c:687 ui/evolution-tasks.xml.h:21
+#: calendar/gui/component-factory.c:699
 msgid "_Task"
 msgstr "_Tarea"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Nueva cita"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Cit_a"
+
+#: calendar/gui/component-factory.c:707
 msgid "New appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:707
 msgid "_Appointment"
 msgstr "Cit_a"
 
-#: calendar/gui/control-factory.c:103
+#: calendar/gui/control-factory.c:123
+#, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "No puedo abrir la carpeta en '%s'"
 
-#: calendar/gui/control-factory.c:130
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrar� el calendario"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "otro enlace hacia %s"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Opciones de las Alarmas Auditivas"
@@ -3364,8 +3836,9 @@ 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 ""
-"Este es un recordatorio por correo, pero Evolution todav�a no implementa esta "
-"clase de recordatorios.  No podr� editar las opciones de este recordatorio."
+"Este es un recordatorio por correo, pero Evolution todav�a no implementa "
+"esta clase de recordatorios.  No podr� editar las opciones de este "
+"recordatorio."
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
@@ -3383,9 +3856,7 @@ msgstr "extra tiempo cada"
 msgid "hours"
 msgstr "horas"
 
-#: 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 "minutos"
 
@@ -3513,7 +3984,7 @@ msgstr "Recordatorios"
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -3542,7 +4013,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:131
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -3583,171 +4054,169 @@ msgid "Color for tasks due today"
 msgstr "Color para las tareas para hoy"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Crear una nueva cita con un _recordatorio por defecto"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "D�as"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Primer d�a de la se_mana:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Viernes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Lunes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Tareas fuera de pla_zo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "S�bado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
 msgstr ""
-"Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 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:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "Do_m"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Ta_reas de plazo hoy:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "Ju_e"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "M_ar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Ta_reas de plazo hoy:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "Lista de _Tareas"
 
-#: 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 "Jueves"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Hora"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "_Zona horaria:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Di_visiones de tiempo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Formato del tiempo:"
 
-#: 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 "Martes"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Mi�rcoles"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Semana Laboral"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_aci�n al borrar elementos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir fines de semana en la vista mensual"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Mostrar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Vier"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_General"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar tareas completadas tras"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Otro"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Tareas fuera de pla_zo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_Sab"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "Lista de _Tareas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Di_visiones de tiempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "M_ier"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "antes de comenzar la cita"
 
@@ -3812,73 +4281,60 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, �actualizar el editor?"
 
-#: 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 " a "
 
-#: 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 "(Completado "
 
-#: 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 "Completado "
 
-#: 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 " (Falta "
 
-#: 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 "Falta "
 
-#: calendar/gui/dialogs/comp-editor.c:321
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "�No pude actualizar el objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2226
-#: mail/mail-display.c:113
-msgid "Overwrite file?"
-msgstr "�Sobreescribir archivo?"
-
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2233
-#: mail/mail-display.c:117
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ya existe una archivo con ese nombre.\n"
-"�Sobreescribirlo?"
-
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "�Imposible obtener versi�n actual!"
 
@@ -3936,7 +4392,7 @@ msgstr "Delegado A:"
 msgid "Enter Delegate"
 msgstr "Escribir delegado"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Cita"
 
@@ -4003,7 +4459,7 @@ msgid "Pu_blic"
 msgstr "P�_blico"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Mostrar tiempo como"
 
@@ -4048,50 +4504,44 @@ msgstr "Participantes"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "Nombre com�n"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegado por"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegado a"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Idioma"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Miembro"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:853
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Papel"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1199
-#: 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
+#: 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"
 msgstr "Estado"
@@ -4100,9 +4550,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: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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
@@ -4125,27 +4575,100 @@ msgstr "_Invitar a otros..."
 msgid "_Other Organizer"
 msgstr "_Otro organizador"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene recurrencias que no pueden ser editadas por Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "en"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "lista"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "segundo"
+
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/file-manager/fm-properties-window.c:1560
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Otro"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Norte"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "lista"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Otro fax"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "d�a"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "en el"
 
-#: 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 "ocurrencias"
 
@@ -4242,7 +4765,7 @@ msgid "Progress"
 msgstr "Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:755
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4254,15 +4777,21 @@ msgstr "_Prioridad:"
 msgid "_Status:"
 msgstr "E_stado:"
 
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/file-manager/fm-properties-window.c:1031
+#: calendar/gui/dialogs/task-editor.c:178
+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:325
+#: calendar/gui/dialogs/task-editor.c:324
 msgid "Assignment"
 msgstr "Asignaci�n"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Descripci�n:"
 
@@ -4274,118 +4803,82 @@ msgstr "Fecha de Ini_cio:"
 msgid "_Due Date:"
 msgstr "Fecha _de Fin:"
 
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:438
-#, 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:751 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: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: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
 msgid "_Open"
 msgstr "_Abrir"
 
-#: 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:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Guardar como..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "Im_primir..."
+
+#: calendar/gui/e-calendar-table.c:978 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: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:16
+#: calendar/gui/e-calendar-table.c:979 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: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:20
+#: calendar/gui/e-calendar-table.c:980 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 "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Asignar tarea"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Reenviar como i_Calendar"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Marcar como completo"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "_Borrar esta tarea"
-
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas como completas"
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: 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:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1247
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Pulse para a�adir una tarea"
 
@@ -4393,48 +4886,47 @@ msgstr "Pulse para a�adir una tarea"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Completo"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Fecha de vencimiento"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Fecha de plazo"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Fecha fin"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Posici�n geogr�fica"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioridad"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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:16
-#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1498 shell/e-summary-storage.c:79
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Resumen"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4468,418 +4960,178 @@ msgstr "%02i divisiones por minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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 de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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 de %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
 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
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3525
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "Nueva cit_a"
 
-#: 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 "Nuevo _evento para todo el d�a"
 
-#: 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 "Nueva reuni�n"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#, fuzzy
+msgid "New Task"
+msgstr "Nueva tarea"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Imprimir..."
+
+#: 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 "Ir a _hoy"
 
-#: 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 "_Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3435
-msgid "_Delete this Appointment"
-msgstr "_Borrar esta cita"
+#: 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 "_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
+#, fuzzy
+msgid "_Configure..."
+msgstr "Configurar"
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
+msgid "_Save As..."
+msgstr "Guardar _como..."
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Concertar un _encuentro"
+
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Reenviar como i_Calendar"
+
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta ocurrencia _movible"
 
-#: 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 "Borrar esta _Ocurrencia"
 
-#: 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 "Borrar tod_as las ocurrencias"
 
-#: calendar/gui/e-itip-control.c:545
-msgid "Meeting begins: <b>"
-msgstr "La reuni�n empieza: <b>"
-
-#: calendar/gui/e-itip-control.c:550
-msgid "Task begins: <b>"
-msgstr "La tarea empieza: <b>"
-
-#: calendar/gui/e-itip-control.c:555
-msgid "Free/Busy info begins: <b>"
-msgstr "La informaci�n de disponibilidad comienza: <b>"
-
-#: calendar/gui/e-itip-control.c:559
-msgid "Begins: <b>"
-msgstr "Empieza: <b>"
-
-#: calendar/gui/e-itip-control.c:571
-msgid "Meeting ends: <b>"
-msgstr "La reuni�n termina: <b>"
-
-#: calendar/gui/e-itip-control.c:574
-msgid "Free/Busy info ends: <b>"
-msgstr "La informaci�n de disponibilidad finaliza: <b>"
-
-#: calendar/gui/e-itip-control.c:578
-msgid "Ends: <b>"
-msgstr "Termina: <b>"
-
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Completed: <b>"
-msgstr "Tarea completada: <b>"
-
-#: calendar/gui/e-itip-control.c:602
-msgid "Task Due: <b>"
-msgstr "Plazo para la tarea: <b>"
-
-#: calendar/gui/e-itip-control.c:639 calendar/gui/e-itip-control.c:688
-msgid "iCalendar Information"
-msgstr "Informaci�n del calendario"
-
-#. Title
-#: calendar/gui/e-itip-control.c:654
-msgid "iCalendar Error"
-msgstr "Error de calendario"
-
-#: calendar/gui/e-itip-control.c:719 calendar/gui/e-itip-control.c:735
-msgid "An unknown person"
-msgstr "Una persona desconocida"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:742
-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:758
-msgid "<i>None</i>"
-msgstr "<i>Ninguna<i>"
-
-#: calendar/gui/e-itip-control.c:770
-#, fuzzy
-msgid "Status:"
-msgstr "E_stado:"
-
-#: 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
-msgid "Accepted"
-msgstr "Aceptado"
-
-#: calendar/gui/e-itip-control.c:779
-#, fuzzy
-msgid "Tentatively Accepted"
-msgstr "Aceptar tentativamente"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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-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
-msgid "Declined"
-msgstr "Rechazado"
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
+#, c-format
+msgid "Error executing %s."
+msgstr "Error ejecutando %s."
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-file.c:2936
-#: 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:171
-#: camel/providers/smtp/camel-smtp-transport.c:226 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: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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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: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
-msgid "Choose an action:"
-msgstr "Elija una acci�n:"
-
-#: calendar/gui/e-itip-control.c:834
-msgid "Update"
-msgstr "Actualizar"
-
-#: 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:1931 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "Aceptar"
-
-#: calendar/gui/e-itip-control.c:850
-msgid "Accept"
-msgstr "Aceptar"
-
-#: calendar/gui/e-itip-control.c:851
-msgid "Tentatively accept"
-msgstr "Aceptar tentativamente"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Decline"
-msgstr "Rechazar"
-
-#: calendar/gui/e-itip-control.c:866
-msgid "Send Free/Busy Information"
-msgstr "Enviar informaci�n de disponibilidad"
-
-#: calendar/gui/e-itip-control.c:879
-msgid "Update respondent status"
-msgstr "Actualizar el estado del remitente"
-
-#: calendar/gui/e-itip-control.c:892
-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:905 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: calendar/gui/e-itip-control.c:953
-#, 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:954
-msgid "Meeting Information"
-msgstr "Informaci�n  de reuniones"
-
-#: calendar/gui/e-itip-control.c:958
-#, 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:959
-msgid "Meeting Proposal"
-msgstr "Propuesta de reuni�n"
-
-#: calendar/gui/e-itip-control.c:963
-#, 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:964
-msgid "Meeting Update"
-msgstr "Actualizaci�n de la reuni�n"
-
-#: calendar/gui/e-itip-control.c:968
-#, 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:969
-msgid "Meeting Update Request"
-msgstr "Petici�n de actualizaci�n de la reuni�n"
-
-#: calendar/gui/e-itip-control.c:992
-#, 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:993
-msgid "Meeting Reply"
-msgstr "Respuesta de reuni�n"
-
-#: calendar/gui/e-itip-control.c:997
-#, 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:998
-msgid "Meeting Cancellation"
-msgstr "Cancelaci�n de reuni�n"
-
-#: calendar/gui/e-itip-control.c:1002 calendar/gui/e-itip-control.c:1073
-#: calendar/gui/e-itip-control.c:1108
-#, 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:1003
-msgid "Bad Meeting Message"
-msgstr "Mensaje de reuni�n err�neo"
-
-#: calendar/gui/e-itip-control.c:1023
-#, 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:1024
-msgid "Task Information"
-msgstr "Informaci�n de la tarea"
-
-#: calendar/gui/e-itip-control.c:1028
-#, 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:1029
-msgid "Task Proposal"
-msgstr "Propuesta de tarea"
-
-#: calendar/gui/e-itip-control.c:1033
-#, 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:1034
-msgid "Task Update"
-msgstr "Actualizaci�n de tarea"
-
-#: calendar/gui/e-itip-control.c:1038
-#, 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:1039
-msgid "Task Update Request"
-msgstr "Petici�n de actualizaci�n de tarea"
-
-#: calendar/gui/e-itip-control.c:1063
-#, 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:1064
-msgid "Task Reply"
-msgstr "Respuesta a una tarea"
-
-#: calendar/gui/e-itip-control.c:1068
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> ha cancelado una tarea."
-
-#: calendar/gui/e-itip-control.c:1069
-msgid "Task Cancellation"
-msgstr "Cancelaci�n de tarea"
-
-#: calendar/gui/e-itip-control.c:1074
-msgid "Bad Task Message"
-msgstr "Mensaje de tarea err�neo"
-
-#: calendar/gui/e-itip-control.c:1093
-#, 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:1094
-msgid "Free/Busy Information"
-msgstr "Informaci�n de disponibilidad"
-
-#: calendar/gui/e-itip-control.c:1098
-#, 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:1099
-msgid "Free/Busy Request"
-msgstr "Petici�n de disponibilidad"
-
-#: calendar/gui/e-itip-control.c:1103
-#, 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:1104
-msgid "Free/Busy Reply"
-msgstr "Respuesta sobre disponibilidad"
-
-#: calendar/gui/e-itip-control.c:1109
-msgid "Bad Free/Busy Message"
-msgstr "Mensaje de disponibilidad err�neo"
-
-#: calendar/gui/e-itip-control.c:1182
-msgid "The message does not appear to be properly formed"
-msgstr "Parece que el mensaje no est� bien construido"
-
-#: calendar/gui/e-itip-control.c:1201
-msgid "The message contains only unsupported requests."
-msgstr "Este mensaje solo contiene peticiones no soportadas."
-
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1235
-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:1260
-msgid "The attachment has no viewable calendar items"
-msgstr "El adjunto no tiene elementos de calendario visibles"
-
-#: calendar/gui/e-itip-control.c:1338
-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"
-
-#: calendar/gui/e-itip-control.c:1369
+#: 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:1371
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Actualizaci�n completada\n"
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 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:1424
+#: 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:1426
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1428
-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:1456
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Borrado completo"
 
-#: calendar/gui/e-itip-control.c:1486 calendar/gui/e-itip-control.c:1536
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "�Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1488 calendar/gui/e-itip-control.c:1540
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "�El elemento no puedo ser enviado!\n"
 
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Seleccionar carpeta"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Seleccionar carpeta"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4921,7 +5173,7 @@ msgstr "fecha de inicio"
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1640
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
@@ -4934,57 +5186,58 @@ 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:789
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Individual"
 
 #: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
 msgid "Group"
 msgstr "Grupo"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
 msgid "Resource"
 msgstr "Recurso"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
 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:805
 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:806
+#: calendar/gui/e-meeting-model.c:535
 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:807
 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:808
 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:834
+#: calendar/gui/e-meeting-model.c:543
 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-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Tentativa"
 
 #: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:838
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -4994,14 +5247,14 @@ 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:471
+#: calendar/gui/e-meeting-time-sel-item.c:475
 #: calendar/gui/e-meeting-time-sel.c:2088
 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:475
+#: calendar/gui/e-meeting-time-sel-item.c:479
 #: calendar/gui/e-meeting-time-sel.c:2118 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"
@@ -5009,7 +5262,7 @@ 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"
@@ -5074,41 +5327,55 @@ msgstr "Hora de _inicio de la reuni�n:"
 msgid "Meeting _end time:"
 msgstr "Hora de _fin de la reuni�n:"
 
-#: calendar/gui/e-tasks.c:351
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tarea en %s"
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:186
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No puedo cargar las tareas en `%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 "El m�todo necesario para cargar `%s' no est� implementado"
 
-#: calendar/gui/e-tasks.c:643
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Fecha de vencimiento"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Borrando los objetos seleccionados"
+
+#: calendar/gui/e-tasks.c:659
 #, fuzzy
 msgid "Expunging"
 msgstr "Comprimiendo carpeta"
 
-#: 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 "Nueva cit_a..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "_Borrar esta cita"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "No puedo abrir la carpeta en `%s'"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1872
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abriendo calendario en %s"
@@ -5169,284 +5436,223 @@ msgstr "Octubre"
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr "Es necesario por lo menos un asistente"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:346
-msgid "Event information"
-msgstr "Informaci�n del evento"
-
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:348
-msgid "Task information"
-msgstr "Informaci�n de la tarea"
-
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:350
-msgid "Journal information"
-msgstr "Informaci�n de la entrada de diario"
-
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:367
-msgid "Free/Busy information"
-msgstr "Informaci�n de disponibilidad"
-
-#: calendar/gui/itip-utils.c:321
-msgid "Calendar information"
-msgstr "Informaci�n del calendario"
-
-#: calendar/gui/itip-utils.c:361
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Informaci�n de disponibilidad (de %s a %s)"
-
-#: calendar/gui/itip-utils.c:373
-msgid "iCalendar information"
-msgstr "Informaci�n de iCalendar"
-
-#: calendar/gui/itip-utils.c:582
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Debes participar en el evento."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr "No pude crear la factor�a del componente editor"
 
-#: 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 "Do"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Lun"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Mar"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Mi�r"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Jue"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Vier"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Sab"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "D�a seleccionado (%a %d de %b de %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 de %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 de %b de %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "A�o seleccionado (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Tarea"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Estado: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Prioridad: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Porcentaje Completado: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Categor�as: %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "Contactos: "
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2882 my-evolution/e-summary.c:605
-#: ui/evolution-addressbook.xml.h:20 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Configurar impresi�n"
 
@@ -5456,11 +5662,11 @@ msgid ""
 msgstr ""
 "No pude crear una vista de tareas.  Por favor compruebe su ORBit y su OAF."
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrar� la carpeta de tareas"
 
-#: calendar/gui/tasks-control.c:437
+#: calendar/gui/tasks-control.c:456
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -5473,11 +5679,16 @@ msgstr ""
 "\n"
 "�Borrar realmente esos mensajes?"
 
-#: calendar/gui/tasks-control.c:444 mail/mail-callbacks.c:2359
-#: mail/mail-callbacks.c:2587
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Imprimir tarjetas"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5495,8 +5706,8 @@ msgid ""
 msgstr ""
 "Evolution ha intentado tomar las tareas que estaban en su carpeta de "
 "calendario y migrarlas autom�ticamente a la nueva carpeta de tareas.\n"
-"Algunas tareas no han podido ser migradas, as� que este proceso puede que sea "
-"reintentado otra vez en el futuro."
+"Algunas tareas no han podido ser migradas, as� que este proceso puede que "
+"sea reintentado otra vez en el futuro."
 
 #: calendar/gui/tasks-migrate.c:120
 #, c-format
@@ -5504,14 +5715,14 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"No pude abrir `%s'; no se migrar�n elementos de la carpeta de calendario a la "
-"carpeta de tareas."
+"No pude abrir `%s'; no se migrar�n elementos de la carpeta de calendario a "
+"la carpeta de tareas."
 
 #: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
-"The method required to load `%s' is not supported; no items from the calendar "
-"folder will be migrated to the tasks folder."
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
 msgstr ""
 "El m�todo requerido para cargar `%s' no est� implementado. No se migrar�n "
 "elementos de la carpeta de calendario a la carpeta de tareas."
@@ -5535,107 +5746,126 @@ msgstr "Importa archivos VCard a Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importa archivos VCard a Evolution."
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Mensaje del Calendario"
+
+#: 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 ha encontrado archivos de correo de Pine.\n"
+"�Quiere importarlos a Evolution?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Agenda"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now espera 0 argumentos"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time espera 1 argumento"
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time espera que el argumento 1 sea una cadena"
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "el argumento 1 de make-time debe ser una cadena tipo ISO 8601 hora/fecha"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day espera 2 argumentos"
 
-#: 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 espera que el argumento 1 sea 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 espera que el argumento 2 sea un entero"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin espera 1 argumento"
 
-#: 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 espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end espera 1 argumento"
 
-#: 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 espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype espera 0 argumentos"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? espera 2 argumentos"
 
-#: 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? espera que el argumento 1 sea 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? espera que el argumento 2 sea time_t"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? espera 2 argumentos"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? espera que el argumento 1 sea una cadena"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? espera que el argumento 2 sea una cadena"
 
-#: calendar/pcs/query.c:691
+#: calendar/pcs/query.c:693
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", "
 "\"description\""
 msgstr ""
 "contains? espera que el argumento 1 sea �any�, �summary� � �description�"
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? espera al menos 1 argumento"
 
-#: 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? espera que todos los argumentos sean cadenas o que uno y solo "
-"un argumento sea un booleano falso (#f)"
+"has-categories? espera que todos los argumentos sean cadenas o que uno y "
+"solo un argumento sea un booleano falso (#f)"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "�esta completo? espera 0 argumentos"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before espera 1 argumentos"
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before espera que el argumento 1 sea time_t"
 
@@ -7177,12 +7407,12 @@ msgstr "El cifrado no est� implementada por este cifrado"
 msgid "Decryption is not supported by this cipher"
 msgstr "El descifrado no est� implementada por este cifrado"
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr "Imposible reemplazar archivo."
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:441
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "No puedo abrir directorio de cache: %s"
@@ -7217,52 +7447,51 @@ msgstr "Resincronizando con el servidor"
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar trabajando en l�nea para completar esta operaci�n"
 
-#: 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 "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error analizando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "No pude abrir la carpeta temporal"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "No pude procesar la carpeta temporal"
 
-#: camel/camel-filter-driver.c:889
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "No puedo abrir el mensaje"
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Error en el mensaje %d de %d"
@@ -7277,7 +7506,7 @@ msgstr "Error al decodificar el mensaje."
 msgid "Error executing filter search: %s: %s"
 msgstr "Error ejecutando la b�squeda del filtro: %s: %s"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -7286,7 +7515,7 @@ msgstr ""
 "No puedo analizar la expresi�n de b�squeda %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -7295,35 +7524,31 @@ msgstr ""
 "Error ejecutando la b�squeda seg�n la expresi�n %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 "(concordar todas) requiere un �nico resultado booleano"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Realizando b�squeda en cabecera desconocida: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Tipo inv�lido en el contenido del cuerpo, esperando una cadena"
-
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Operaci�n no implementada: a�adir mensaje: para %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, 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:1080
+#: camel/camel-folder.c:1078
 #, 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:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Moviendo mensajes"
 
@@ -7432,167 +7657,119 @@ msgstr "Por favor introduzca su frase de paso%s %s"
 msgid "Please enter your %s passphrase"
 msgstr "Por favor introduzca su frase de paso %s"
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:763
+#: 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:588 camel/camel-pgp-context.c:769
+#: 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:756
+#: 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:955
+#: 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:961
+#: 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:972
+#: 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:1145
+#: 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:1155
+#: 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:1162
+#: 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:1171
+#: 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:1340
+#: 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:1348
+#: 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-pgp-context.c:1355
+#: 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-pgp-mime.c:329
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "Esta parte del mensaje esta firmada digitalmente"
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Por favor introduzca su contrase�a para %s"
-
-#: camel/camel-pkcs7-context.c:213
-#, fuzzy
-msgid "Error hashing password."
-msgstr "Error a�adiendo tarjeta"
-
-#: camel/camel-pkcs7-context.c:222
-#, fuzzy
-msgid "Invalid password."
-msgstr "Argumento inv�lido"
-
-#: camel/camel-pkcs7-context.c:329
-#, fuzzy, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Error al buscar el certificado para �%s�."
-
-#: camel/camel-pkcs7-context.c:378
-#, fuzzy, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Error al buscar el certificado para �%s�."
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:590
-#, fuzzy
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "No pude crear un contexto de cifrado PGP."
-
-#: camel/camel-pkcs7-context.c:620
-#, fuzzy, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "No pude conectar con el servidor: %s"
-
-#: camel/camel-pkcs7-context.c:626
-#, fuzzy
-msgid "Could not encrypt: encoding failed."
-msgstr "No pude guardar el archivo de firma."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr ""
-
-#: 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 ""
 "No pude cargar %s: La carga de m�dulos no est� implementada es este sistema."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "No puedo cargar %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 "No pude cagar %s: No hay c�digo de inicializaci�n en el m�dulo."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s servidor %s"
 
-#: camel/camel-remote-store.c:207
+#: 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:264
+#: 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:267
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(servidor desconocido)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7646,8 +7823,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Esta opci�n conectar� con el servidor usando una clave segura CRAM-MD5, si el "
-"servidor lo implementa."
+"Esta opci�n conectar� con el servidor usando una clave segura CRAM-MD5, si "
+"el servidor lo implementa."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -7655,8 +7832,8 @@ msgstr "DIGEST-MD5"
 
 #: camel/camel-sasl-digest-md5.c:45
 msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, if "
-"the server supports it."
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
 msgstr ""
 "Esta opci�n conectar� con el servidor usando una clave segura DIGEST-MD5, si "
 "el servidor lo implementa."
@@ -7692,8 +7869,7 @@ msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:42
-msgid ""
-"This option will connect to the server using Kerberos 4 authentication."
+msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "Esta opci�n conectar� con el servidor usando autenticaci�n Kerberos 4."
 
 #: camel/camel-sasl-kerberos4.c:161
@@ -7706,7 +7882,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticaci�n err�nea desde el servidor."
 
@@ -7722,9 +7898,20 @@ msgstr "Esta opci�n conectar� con el servidor usando una simple contrase�a."
 msgid "Unknown authentication state."
 msgstr "Estado de la autenticaci�n desconocido."
 
+#: 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 "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:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:61
+#: 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"
 
@@ -7768,26 +7955,41 @@ msgstr "La URL '%s' necesita un componente de servidor"
 msgid "URL '%s' needs a path component"
 msgstr "La URL '%s' necesita un componente de ruta"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolviendo: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Error al resolver: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Error al resolver: %s: servidor no encontrado"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Error al resolver: %s: raz�n desconocida"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Resolviendo: %s"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Error al resolver: %s: servidor no encontrado"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Error al resolver: %s: raz�n desconocida"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Proveedor de correo de la carpeta virtual"
@@ -7796,12 +7998,12 @@ msgstr "Proveedor de correo de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para leer correo como una b�squeda de otras carpetas"
 
-#: camel/camel-session.c: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 "No hay proveedor para el protocolo `%s'"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7810,6 +8012,11 @@ msgstr ""
 "No puedo crear el directorio %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Por favor introduzca su contrase�a para %s"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Por favor indique el apodo de un certificado con el que firmar."
@@ -7842,15 +8049,15 @@ msgstr "Error al decodificar el mensaje."
 msgid "Failed to verify certificates."
 msgstr "Error al verificar el certificado."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No puedo obtener la carpeta: Operaci�n no v�lida"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No puedo crear la carpeta: Operaci�n no v�lida"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -7859,7 +8066,7 @@ msgstr ""
 "Responsable: %s\n"
 "Asunto: %s"
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7876,7 +8083,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:438
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7885,17 +8092,17 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 #, fuzzy
 msgid "BAD"
 msgstr "AND"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:500
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7920,27 +8127,27 @@ msgstr "No pude analizar la URL `%s'"
 msgid "No such message %s in %s"
 msgstr "No existe el mensaje %s en %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "No existe el mensaje: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No puedo borrar la carpeta: %s: Operaci�n no v�lida"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "No puedo borrar la carpeta: %s: No existe tal"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "No puedo renombrar la carpeta: %s: Operaci�n no v�lida"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No pude cambiarle el nombre a la carpeta: %s: No existe"
@@ -7973,52 +8180,52 @@ msgstr "La respuesta del servidor IMAP no conten�a informaci�n de %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente ha respondido OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No puedo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Este mensaje no est� disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo informaci�n de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Buscando mensajes nuevos"
 
-#: camel/providers/imap/camel-imap-folder.c:2145
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de 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 "No puedo abrir directorio de 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 "Error al cachear el mensaje %s: %s"
@@ -8031,7 +8238,7 @@ msgstr "Comprobando si hay correo nuevo"
 msgid "Check for new messages in all folders"
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:925
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -8061,33 +8268,32 @@ 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:82
-msgid ""
-"This option will connect to the IMAP server using a plaintext password."
+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:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:393
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, 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:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:434
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "No escribi� una clave."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8098,56 +8304,57 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 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:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "Directorios de correo en formato MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 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:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Reparto local"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 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:63
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Directorios de correo en formato Maildir"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 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:80
+#: 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:81
+#: 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:91
+#: camel/providers/local/camel-local-provider.c:116
 msgid "Directory tree of mbox files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8155,56 +8362,62 @@ msgid ""
 "folders first."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La direcci�n %s no es absoluta"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s no es un directorio normal"
 
-#: camel/providers/local/camel-local-store.c: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 "No pude acceder a la carpeta: %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 "Los almacenes locales no tienen una carpeta de entrada"
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Archivo de correo local %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No pude cambiarle el nombre de la carpeta %s a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:374
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "No pude cambiar el nombre a la carpeta: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No pude borrar el resumen la carpeta `%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 "No pude borrar el �ndice de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "No puedo guardar el resumen: %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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "No pude a�adir mensajes al resumen: raz�n desconocida"
 
@@ -8246,7 +8459,7 @@ msgstr "No existe ese mensaje"
 msgid "Invalid message contents"
 msgstr "Contenido inv�lido en el mensaje"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8256,14 +8469,14 @@ msgstr ""
 "No pude abrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no existe."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8273,33 +8486,56 @@ msgstr ""
 "No pude crear la carpeta `%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' no es un directorio tipo maildir."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "No pude borrar la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "no es un directorio tipo maildir"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "No pude analizar la carpeta `%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 "No puedo abrir el maildir en esta ruta: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Comprobando si hay correo nuevo"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "Guardando carpeta"
+
 #: camel/providers/local/camel-mbox-folder.c:151
 #: camel/providers/local/camel-spool-folder.c:277
 #, c-format
@@ -8345,7 +8581,7 @@ msgstr "La carpeta parece estar corrompida e irrecuperable."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fallo la construcci�n del mensaje: �Buz�n corrompido?"
 
-#: 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"
@@ -8354,7 +8590,7 @@ msgstr ""
 "No puedo abrir el archivo `%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"
@@ -8363,14 +8599,14 @@ msgstr ""
 "No pude crear el archivo `%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' no es un archivo normal."
 
-#: 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"
@@ -8379,96 +8615,85 @@ msgstr ""
 "No pude borrar la carpeta `%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 "La carpeta `%s' no esta vac�a. No fue borrada."
 
-#. 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 "Guardando carpeta"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "No pude abrir la carpeta: %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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "No pude comprobar la carpeta: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "No pude abrir el archivo %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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, 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: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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "No pude cerrar la carpeta origen %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "No pude cerrar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, 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:873
-#: camel/providers/local/camel-spool-summary.c:544
-#: camel/providers/local/camel-spool-summary.c:1110
+#: camel/providers/local/camel-mbox-summary.c:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconocido: %s"
@@ -8488,7 +8713,7 @@ msgstr "No pude a�adir el mensaje a la carpeta mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' no es un directorio."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "No puedo abrir el directorio MH en la ruta: %s: %s"
@@ -8504,6 +8729,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La carpeta `%s/%s' no existe."
@@ -8513,29 +8739,31 @@ msgstr "La carpeta `%s/%s' no existe."
 msgid "Spool mail file %s"
 msgstr "Archivo de cola de correo %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Las carpetas de correo no pueden ser renombradas"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Las carpetas de correo no pueden ser borradas"
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8544,65 +8772,24 @@ 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:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "No pude archivar %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Por favor introduzca la contrase�a NNTP para %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "El servidor rechazo el nombre de usuario"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Fallo al enviar el nombre de usuario al servidor"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "El servidor rechazo el nombre de usuario � la contrase�a"
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Error interno: uid en formato no v�lido: %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 "No puedo obtener mensaje %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 "Usuario cancelado"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "No pude obtener la lista de grupos del servidor."
+#: 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/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 "No pude cargar el archivo de listas de grupos para %s: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "No pude guardar el archivo de listas de grupos para %s: %s"
+#: 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"
@@ -8612,12 +8799,12 @@ 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:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "Noticias USENET v�a %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8661,32 +8848,47 @@ msgstr "Usuario cancelado"
 msgid "Operation failed: %s"
 msgstr "Operaci�n cancelada"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Obteniendo resumen 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 "Usuario cancelado"
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "No puedo obtener mensaje %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:316
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Eliminando los mensajes borrados"
 
-#: 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 "No hay mensajes con 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 "Obteniendo mensaje 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 "No puedo obtener mensaje %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipitaciones indeterminadas"
@@ -8704,7 +8906,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:60
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -8723,20 +8925,39 @@ msgstr ""
 #: 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."
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
 msgstr ""
-"Esta opci�n es para conectar con servidores POP usando una contrase�a cifrada "
-"por medio del protocolo APOP. Esto no funcionar� para todos los usuarios ni "
-"siquiera en servidores que dicen implementarlo."
+"Esta opci�n es para conectar con servidores POP usando una contrase�a "
+"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:172
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, 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
+#, 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:213
-#: camel/providers/pop3/camel-pop3-store.c:316
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8744,27 +8965,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:229
+#: camel/providers/pop3/camel-pop3-store.c:405
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:240
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, fuzzy
 msgid "SASL Protocol error"
 msgstr "Error cr�tico"
 
-#: camel/providers/pop3/camel-pop3-store.c:255
+#: camel/providers/pop3/camel-pop3-store.c:431
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "Error de I/O"
 
-#: camel/providers/pop3/camel-pop3-store.c:276
+#: camel/providers/pop3/camel-pop3-store.c:452
 #, 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:327
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8773,13 +8995,13 @@ msgstr ""
 "No pude conectar con el servidor POP.\n"
 "Error al enviar la contrase�a: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, 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:82
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8790,54 +9012,50 @@ msgid ""
 msgstr ""
 "Para enviar correo pas�ndoselo al programa �sendmail� en el sistema local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "No pude analizar la URL `%s'"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "No pude comunicar con sendmail: %s: correo no enviado"
 
-#: 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 "No pude hacer un fork a sendmail: %s: correo no enviado"
 
-#: 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 "No pude enviar mensaje: %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 "sendmail finalizo con %s: correo no enviado."
 
-#: 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 "No pude ejecutar %s: correo no enviado."
 
-#: 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 finalizo con estado %d: correo no enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-msgid "Could not find 'From' address in message"
-msgstr "No pude encontrar la direcci�n 'De' en el mensaje"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-#, fuzzy
-msgid "Could not parse recipient list"
-msgstr "No pude analizar la URL `%s'"
-
-#: 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:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr "Env�o de correo v�a el programa sendmail"
 
-#: 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"
 
@@ -8845,125 +9063,148 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Para enviar correo conect�ndose a un servidor de correo usando SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Error de sintaxis, comando no reconocido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Error de sintaxis en los par�metros o los argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Par�metro del comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Estado del sistema, o respuesta a la ayuda del sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Mensaje de ayuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Servicio cerrando los canales de transmisi�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio no disponible, cerrando los canales de transmisi�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Acci�n de correo requerida en orden, completada"
 
-#: 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 "El usuario no es local: lo reenviar� a <forward-path>"
 
-#: 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 ""
 "Acci�n solicitada del correo no realizada: el mailbox no est� disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Acci�n solicitada no realizada: el mailbox no est� disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Acci�n solicitada abortada: error en procesamiento"
 
-#: 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 "El usuario no es local: por favor pruebe con <forward-path>"
 
-#: 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 ""
 "Acci�n solicitada no realizada: la capacidad del sistema es insuficiente"
 
-#: 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 "Acci�n solicitada no realizada: excedi� la capacidad de almacenamiento"
 
-#: 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 "Acci�n solicitada no realizada: nombre no permitido para mailbox"
 
-#: 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 "Comience a escribir el mensaje; finalice con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Fallo en la transacci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Es necesaria una transici�n de contrase�a"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "El m�todo de autenticaci�n es demasiado d�bil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Cifrado requerida por el mecanismo de autenticaci�n pedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal en la autenticaci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Autenticaci�n requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, 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:383
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "Expir� el tiempo para AUTH: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, 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"
 msgstr ""
 "El servidor SMTP %s no implementa el m�todo de autenticaci�n requerido %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:421
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:442
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8974,94 +9215,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Env�o de correo SMTP v�a %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:591
-msgid "Cannot send message: sender address not defined."
-msgstr "No puedo enviar el mensaje: direcci�n del remitente no definida."
-
-#: camel/providers/smtp/camel-smtp-transport.c:598
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:603 mail/mail-ops.c:603
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr "No puedo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:624
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, 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:798
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "Saludo del SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:820
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:840
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, 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:884
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "Autenticaci�n SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:890
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Error al crear el objeto de autenticaci�n SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:905
-#: camel/providers/smtp/camel-smtp-transport.c:917
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Expir� el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:926
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "Error en la petici�n de AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:974
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 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:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1014
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Respuesta de error a MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Expir� el tiempo para DATA: %s: correo no enviado"
@@ -9069,40 +9306,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:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 #, fuzzy
 msgid "DATA response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
-#: camel/providers/smtp/camel-smtp-transport.c:1163
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1177
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Respuesta de autenticaci�n err�nea desde el servidor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1200
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Expir� el tiempo para RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 #, fuzzy
 msgid "RSET response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1237
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Respuesta de error a RSET: %s"
@@ -9132,7 +9369,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 "adjunto"
 
@@ -9172,11 +9409,11 @@ msgid "MIME type:"
 msgstr "Tipo 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 "Sugerir mostrar adjuntos autom�ticamente"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Presione aqu� para acceder a la agenda"
 
@@ -9185,47 +9422,47 @@ msgstr "Presione aqu� para acceder a la agenda"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Asunto:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:188
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 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:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9233,12 +9470,12 @@ msgstr ""
 "Escriba las direcciones que recibir�n una copia del mensaje sin aparecer en "
 "la lista de destinatarios del mensaje."
 
-#: 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 "Adjuntar un archivo"
 
-#: composer/e-msg-composer.c:710
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9247,38 +9484,34 @@ msgstr ""
 "Error cargando el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:927
-msgid "Save as..."
-msgstr "Guardar como..."
-
-#: composer/e-msg-composer.c:936
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "�Aviso!"
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, �Sobreescribir?"
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:981
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1020
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "No pude obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1027
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9287,7 +9520,7 @@ msgstr ""
 "No pude buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1034
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9296,7 +9529,7 @@ msgstr ""
 "No pude truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9305,7 +9538,7 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1145
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9313,7 +9546,7 @@ msgstr ""
 "Ximian Evolution ha encontrado archivos no guardados de una sesi�n previa.\n"
 "�Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1303
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9323,23 +9556,23 @@ msgstr ""
 "\n"
 "�Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1310
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
-#: composer/e-msg-composer.c:1333
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1482
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Insertar Archivo"
 
-#: composer/e-msg-composer.c:1868 composer/e-msg-composer.c:2462
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2479
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9347,7 +9580,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:2502 composer/e-msg-composer.c:2557
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9355,7 +9588,7 @@ msgstr ""
 "No pude crear una ventana de composici�n:\n"
 "No puedo activar el componente del editor HTML."
 
-#: composer/evolution-composer.c:383
+#: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -9363,7 +9596,7 @@ msgstr ""
 "No pude crear una ventana de composici�n, porque no ha configurado\n"
 "todav�a ninguna identidad en el componente de correo."
 
-#: composer/evolution-composer.c:398
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "No puedo inicializar el componente de escritura correo de Evolution."
 
@@ -9415,12 +9648,21 @@ 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
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Ya existe una archivo con ese nombre.\n"
+"�Sobreescribirlo?"
+
 #. 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 "Recuerda esta contrase�a"
 
-#: 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 "Recordar esta clave durante el resto de esta sesi�n"
 
@@ -9519,177 +9761,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 "Componente Evolution para el resumen de trabajo."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Componente de correo del resumen de trabajo de Evolution."
-
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "No puedo inicializar el componente de resumen de Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Elija un archivo"
-
-#: 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 ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Enviar un correo"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "otro enlace hacia %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "Ejecutar"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/nautilus-window.c:1267
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Cerrar"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Mueve esta carpeta a otro sitio"
-
-# src/file-manager/dfos-xfer.c:961
-#: executive-summary/component/e-summary-url.c:77
-#, fuzzy, c-format
-msgid "Move %s to the right"
-msgstr "Moviendo archivos a la Papelera"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Configurar"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "P�gina"
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"No puedo renombrar la carpeta:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Error cargando %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: 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 ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the RDF summary."
-msgstr "Factor�a para el componente de Resumen de Correo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "Resumen"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "Factor�a para el compositor de correo de Evolution."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "Factor�a para el componente de Resumen de Correo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-# src/nautilus-window-toolbars.c:161
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-#, fuzzy
-msgid "Test service"
-msgstr "Servicios web"
-
-#: 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 "Error"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Actualizar"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "_Actualizar Libre/Ocupado"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "a�o"
@@ -9722,11 +9793,7 @@ msgstr "hora"
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "segundo"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "segundos"
 
@@ -9801,7 +9868,7 @@ msgstr " hace"
 msgid "ago"
 msgstr "hace"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:996
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9822,7 +9889,7 @@ msgstr "Entonces"
 msgid "Add action"
 msgstr "A�adir acci�n"
 
-#: 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."
@@ -9830,19 +9897,11 @@ msgstr ""
 "Se ha olvidado de elegir una carpeta.\n"
 "Vuelva y especifique una carpeta v�lida donde entregar el correo."
 
-#: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:849
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Escribir URI de la carpeta"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<pinche aqu� para seleccionar una carpeta>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9852,7 +9911,7 @@ msgstr ""
 "Error en la expresi�n regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Prueba"
 
@@ -9881,7 +9940,8 @@ msgid "if all criteria are met"
 msgstr "si se cumplen todos los criterios"
 
 #: filter/filter-rule.c:769
-msgid "if any criteria are met"
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "si se cumple alg�n criterio"
 
 #: filter/filter-rule.c:780
@@ -9938,212 +9998,228 @@ msgstr "con todas las carpetas locales"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Asignar puntuaci�n"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Asignar Color"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Asignar puntuaci�n"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belen"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contiene"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Fecha de recepci�n"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Fecha de env�o"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Borrado"
 
-#: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr "No Existe"
-
-#: filter/libfilter-i18n.h:11
-msgid "Draft"
-msgstr "Borrador"
-
-#: filter/libfilter-i18n.h:12
-msgid "Execute Shell Command"
-msgstr "Ejecutar comando de shell"
-
 #: filter/libfilter-i18n.h:13
-msgid "Exist"
-msgstr "Salir"
+msgid "does not contain"
+msgstr "no contiene"
 
 #: filter/libfilter-i18n.h:14
-msgid "Expression"
-msgstr "Expresi�n"
+msgid "does not end with"
+msgstr "no acaba en"
 
 #: filter/libfilter-i18n.h:15
-msgid "Follow Up"
-msgstr ""
+msgid "does not exist"
+msgstr "no existe"
 
 #: filter/libfilter-i18n.h:16
-msgid "Important"
-msgstr "Importante"
+msgid "does not sound like"
+msgstr "no suena como"
 
 #: filter/libfilter-i18n.h:17
-msgid "Mailing list"
-msgstr "Lista de correo"
+msgid "does not start with"
+msgstr "no comienza por"
 
 #: filter/libfilter-i18n.h:18
-msgid "Message Body"
-msgstr "Cuerpo del mensaje"
+msgid "Do Not Exist"
+msgstr "No Existe"
 
 #: filter/libfilter-i18n.h:19
-msgid "Message Header"
-msgstr "Cabecera del mensaje"
+msgid "Draft"
+msgstr "Borrador"
 
 #: filter/libfilter-i18n.h:20
-msgid "Move to Folder"
-msgstr "Mover a la carpeta"
+msgid "ends with"
+msgstr "finaliza con"
 
 #: filter/libfilter-i18n.h:21
-msgid "Read"
-msgstr "Le�do"
+msgid "Execute Shell Command"
+msgstr "Ejecutar comando de shell"
 
 #: filter/libfilter-i18n.h:22
-msgid "Recipients"
-msgstr "Destinatarios"
+msgid "Exist"
+msgstr "Salir"
 
 #: filter/libfilter-i18n.h:23
-msgid "Regex Match"
-msgstr "Expresi�n regular"
+msgid "exists"
+msgstr "existe"
 
 #: filter/libfilter-i18n.h:24
-msgid "Replied to"
-msgstr "Respondido a"
+msgid "Expression"
+msgstr "Expresi�n"
 
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:8
-msgid "Score"
-msgstr "Puntuaci�n"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1552
-msgid "Sender"
-msgstr "Remitente"
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Importante"
 
 #: filter/libfilter-i18n.h:27
-msgid "Set Status"
-msgstr "Poner estado"
+msgid "is"
+msgstr "es"
 
 #: filter/libfilter-i18n.h:28
-msgid "Size (kB)"
-msgstr "Tama�o (Kb)"
+#, fuzzy
+msgid "is after"
+msgstr "estaba despu�s de"
 
 #: filter/libfilter-i18n.h:29
-msgid "Source Account"
-msgstr "Fuente de la cuenta"
+#, fuzzy
+msgid "is before"
+msgstr "estaba antes de"
 
 #: filter/libfilter-i18n.h:30
-msgid "Specific header"
-msgstr "Cabecera espec�fica"
+#, fuzzy
+msgid "is Flagged"
+msgstr "Marcado"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "es mayor que"
 
 #: filter/libfilter-i18n.h:32
-msgid "Stop Processing"
-msgstr "Parar el proceso"
+msgid "is less than"
+msgstr "es menor que"
 
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:932
-#: mail/message-list.etspec.h:12
-msgid "Subject"
-msgstr "Asunto"
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "no es"
 
 #: filter/libfilter-i18n.h:34
-msgid "contains"
-msgstr "contiene"
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Marcado"
 
 #: filter/libfilter-i18n.h:35
-msgid "does not contain"
-msgstr "no contiene"
+msgid "Mailing list"
+msgstr "Lista de correo"
 
 #: filter/libfilter-i18n.h:36
-msgid "does not end with"
-msgstr "no acaba en"
+msgid "Message Body"
+msgstr "Cuerpo del mensaje"
 
 #: filter/libfilter-i18n.h:37
-msgid "does not exist"
-msgstr "no existe"
+msgid "Message Header"
+msgstr "Cabecera del mensaje"
 
 #: filter/libfilter-i18n.h:38
-msgid "does not sound like"
-msgstr "no suena como"
+msgid "Move to Folder"
+msgstr "Mover a la carpeta"
 
 #: filter/libfilter-i18n.h:39
-msgid "does not start with"
-msgstr "no comienza por"
+#, fuzzy
+msgid "Play Sound"
+msgstr "Tocar un sonido:"
 
-#: filter/libfilter-i18n.h:40
-msgid "ends with"
-msgstr "finaliza con"
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+msgid "Read"
+msgstr "Le�do"
 
 #: filter/libfilter-i18n.h:41
-msgid "exists"
-msgstr "existe"
+msgid "Recipients"
+msgstr "Destinatarios"
 
 #: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "is Flagged"
-msgstr "Marcado"
+msgid "Regex Match"
+msgstr "Expresi�n regular"
 
 #: filter/libfilter-i18n.h:43
-#, fuzzy
-msgid "is after"
-msgstr "estaba despu�s de"
+msgid "Replied to"
+msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "is before"
-msgstr "estaba antes de"
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
+msgid "Score"
+msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:45
-msgid "is greater than"
-msgstr "es mayor que"
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+msgid "Sender"
+msgstr "Remitente"
 
 #: filter/libfilter-i18n.h:46
-msgid "is less than"
-msgstr "es menor que"
+msgid "Set Status"
+msgstr "Poner estado"
 
 #: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Marcado"
+msgid "Size (kB)"
+msgstr "Tama�o (Kb)"
 
 #: filter/libfilter-i18n.h:48
-msgid "is not"
-msgstr "no es"
+msgid "sounds like"
+msgstr "suena como"
 
 #: filter/libfilter-i18n.h:49
-msgid "is"
-msgstr "es"
+msgid "Source Account"
+msgstr "Fuente de la cuenta"
 
 #: filter/libfilter-i18n.h:50
-msgid "sounds like"
-msgstr "suena como"
+msgid "Specific header"
+msgstr "Cabecera espec�fica"
 
 #: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "comienza por"
 
+#: filter/libfilter-i18n.h:53
+msgid "Stop Processing"
+msgstr "Parar el proceso"
+
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
+msgid "Subject"
+msgstr "Asunto"
+
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Reglas"
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "A�adir Regla"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Editar Regla"
 
@@ -10163,30 +10239,30 @@ msgstr "Debes especificar al menos una carpeta como fuente."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution est� importando su antiguo correo de 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 "Importando..."
 
-#: 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 "Por favor espere"
 
-#: 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 "Importando %s como %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 "Guardando %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:101
 msgid "Mail"
 msgstr "Correo"
 
@@ -10214,23 +10290,74 @@ msgstr ""
 "Evolution ha encontrado archivos de GnomeCard.\n"
 "�Quiere importarlos a Evolution?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Prioridad: %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 est� importando su vieja informaci�n de Netscape"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Papelera"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Archivo de correo local %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Analizando el directorio"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Comenzando a importar"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Configuraci�n"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Editar filtros"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10254,45 +10381,95 @@ msgstr ""
 msgid "Pine"
 msgstr "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
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Factor�a para el compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Factor�a para el control de tareas de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Factor�a para el compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Factor�a para el compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Componente Evolution para manejar el correo."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Compositor de correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Componente de correo del resumen de trabajo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Componente para mostrar carpetas de correo de Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Componente para factor�a de carpetas de correo de Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Factor�a para el compositor de correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Factor�a para el componente de Resumen de Correo."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Si_n recurrencia"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Cuentas"
+
+#: 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 "Interfaz de configuraci�n del correo"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Carpeta conteniendo correo"
+#: 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:101
-msgid "Mail storage folder (internal)"
-msgstr "Carpeta para guardar correo (interno)"
+msgid "Folder containing mail"
+msgstr "Carpeta conteniendo correo"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -10302,24 +10479,19 @@ msgstr "Papelera virtual"
 msgid "Virtual Trash folder"
 msgstr "Carpetas de papeleras virtuales"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "No puedo conectar con el almac�n: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Esta carpeta no contiene mensajes."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Cambiar las propiedades de esta carpeta"
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10327,231 +10499,240 @@ msgstr ""
 "Algunas de tus opciones de correo parece que est�n corruptas, por favor "
 "comprueba que todo est� en orden."
 
-#: mail/component-factory.c:971
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr "No ha definido un sistema para enviar el correo"
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Nuevo mensaje de correo"
 
-#: mail/component-factory.c:971 ui/evolution-mail-global.xml.h:19
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1003
 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:1013
+#: mail/component-factory.c:1009
 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:1229
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Conectando al servidor..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser-ui.c:327
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para �%s�"
 
-#: mail/folder-browser-ui.c:329
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:299 mail/mail-display.c:300 mail/mail-display.c:809
+#: mail/folder-browser.c:305 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:754
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d nuevos"
 
-#: mail/folder-browser.c:757 mail/folder-browser.c:765
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d ocultos"
 
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionado"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d sin enviar"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d enviar"
 
-#: mail/folder-browser.c:775
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1062
-msgid "Create vFolder from Search"
-msgstr "Crear carpeta virtual de la b�squeda"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Crear una Carpeta _Virtual seg�n el mensaje"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "Carpeta virtual seg�n el a_sunto"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "Carpeta virtual seg�n el _remitente"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "Carpeta virtual seg�n los _destinatarios"
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual seg�n la _Lista de Correo"
 
-#: mail/folder-browser.c:1453
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtrar seg�n el As_unto"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtrar seg�n el Re_mitente"
 
-#: mail/folder-browser.c:1455
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filtrar seg�n los Des_tinatarios"
 
-#: mail/folder-browser.c:1456
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filtrar seg�n la Lista de _Correo"
 
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
 
-#: mail/folder-browser.c:1465 ui/evolution-mail-message.xml.h:109
-msgid "_Save As..."
-msgstr "Guardar _como..."
-
-#: mail/folder-browser.c:1466
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1470 ui/evolution-mail-message.xml.h:108
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:1471 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Resp. a la _Lista"
 
-#: mail/folder-browser.c:1472 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:32
+#: mail/folder-browser.c:1622
 #, fuzzy
-msgid "Follow _Up..."
+msgid "Follo_w Up..."
 msgstr "_Nombre completo..."
 
-#: mail/folder-browser.c:1478
+#: mail/folder-browser.c:1623
 #, fuzzy
-msgid "Flag Com_pleted"
+msgid "Fla_g Completed"
 msgstr "Completado"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1624
 #, fuzzy
-msgid "Clear Fla_g"
+msgid "Cl_ear Flag"
 msgstr "Limpiar"
 
 #. separator here?
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_car como le�do"
 
-#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Marcar como _no le�do"
 
-#: mail/folder-browser.c:1485
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/folder-browser.c:1486
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Marcar como No Im_portante"
 
-#: mail/folder-browser.c:1490 ui/evolution-addressbook.xml.h:40
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Recuperar"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:1491 ui/evolution-addressbook.xml.h:37
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1493 ui/evolution-mail-message.xml.h:111
-msgid "_Undelete"
-msgstr "_Recuperar"
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
 
-#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "A�adir Remitente a la Agenda de Direcciones"
 
-#: mail/folder-browser.c:1500
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:1502
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:1693
-msgid "Filter on Mailing List"
-msgstr "Filtrar seg�n la lista de correo"
-
-#: mail/folder-browser.c:1694
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "Carpeta virtual seg�n la Lista de Correo"
 
-#: mail/folder-browser.c:1696
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrar seg�n la lista de correo (%s)"
 
-#: mail/folder-browser.c:1697
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "Carpeta virtual seg�n la Lista de Correo (%s)"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:1865
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Predeterminado"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Obteniendo informaci�n de la carpeta"
@@ -10573,44 +10754,38 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importa archivos de Outlook Express 4 a Evolution."
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "El cuerpo contiene"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Formato de almacenamiento actual:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Indexando:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Formato Mailbox"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "El cuerpo contiene"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nuevo formato de almacenamiento:"
 
-#: 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"
 "recoverable.  Please use this feature with care."
 msgstr ""
-"Nota: Cuando se convierte entre distintos formatos de buz�n de correo, puede\n"
+"Nota: Cuando se convierte entre distintos formatos de buz�n de correo, "
+"puede\n"
 "que un fallo (como la falta de disco) no sea recuperable autom�ticamente.\n"
 "Por favor use esta opci�n con cuidado."
 
-#: 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"
 
@@ -10628,86 +10803,79 @@ msgstr "Editor de Noticias de Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:974
-msgid "Could not save signature file."
-msgstr "No pude guardar el archivo de firma."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:1051
-msgid "Save signature"
-msgstr "Guardar firma"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "Nombre de _usuario:"
 
-#: mail/mail-account-gui.c:1057
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+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 ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Esta firma ha cambiado, pero no ha sido guardada.\n"
-"\n"
-"�Quiere guardar los cambios?"
 
-#: mail/mail-account-gui.c:1681
+#: mail/mail-account-gui.c:1985
 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:149
-msgid " (default)"
-msgstr " (predeterminada)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Inhabilitar"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Habilitar"
-
-#: mail/mail-accounts.c:292
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "�Esta seguro que quiere borrar esta cuenta?"
 
-#: mail/mail-accounts.c:296
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "No borrar"
 
-#: mail/mail-accounts.c:299
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "�Realmente quiere borrar realmente la cuenta?"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.c:535
-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:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Inhabilitar"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:50
-msgid "Mail Settings"
-msgstr "Configuraci�n del correo"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Habilitar"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Enviar a %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "�Esta seguro que quiere borrar esta cuenta de noticias?"
 
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Asunto es %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Habilitada"
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Correo de %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Nombre de la cuent_a:"
 
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "lista de correo %s"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Puerto Rico"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "A�adir Regla de Filtro"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10719,7 +10887,7 @@ msgstr ""
 "recibir o escribir mensajes.\n"
 "�Querr�a configurarlo ahora?"
 
-#: mail/mail-callbacks.c:145
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10727,7 +10895,7 @@ msgstr ""
 "Necesita configurar una identidad para\n"
 "poder escribir mensajes de correo."
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10735,12 +10903,8 @@ msgstr ""
 "Necesita configurar un transporte de\n"
 "correo para poder enviarlo."
 
-#: mail/mail-callbacks.c:189
-msgid "You have not set a mail transport method"
-msgstr "No ha definido un sistema para enviar el correo"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10748,11 +10912,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:239
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "�Enviar de todos modos?"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10760,7 +10924,7 @@ msgstr ""
 "Este mensaje no tiene asunto.\n"
 "�Quiere enviarlo?"
 
-#: mail/mail-callbacks.c:325
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10769,11 +10933,11 @@ msgstr ""
 "esconder la lista de direcciones, este mensaje solo contendr� destinatarios "
 "Bcc."
 
-#: mail/mail-callbacks.c:329
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "Este mensaje solo contiene destinatarios Bcc."
 
-#: mail/mail-callbacks.c:333
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10783,15 +10947,15 @@ msgstr ""
 "cabecera Apparently-To.\n"
 "�Enviar de todos modos?"
 
-#: mail/mail-callbacks.c:438
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:527
+#: mail/mail-callbacks.c:497
 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:646
+#: mail/mail-callbacks.c:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10799,28 +10963,28 @@ msgstr ""
 "No pude abrir la carpeta de borradores para esta cuenta.\n"
 "�Quiere usar la carpeta de borradores predeterminada?"
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
-#: mail/mail-callbacks.c:983
+#: mail/mail-callbacks.c:981
 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:1429 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:1431 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2091
 #, 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:2102
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10828,7 +10992,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:2141
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10836,35 +11000,39 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2169
 #, 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:2181
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:2280
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "�Sobreescribir archivo?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:2282
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2366
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Mostrar el siguiente mensaje no le�do"
 
-#: mail/mail-callbacks.c:2351
+#: mail/mail-callbacks.c:2373
 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:2580
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10876,7 +11044,7 @@ msgstr ""
 "\n"
 "�Borrar realmente esos mensajes?"
 
-#: mail/mail-callbacks.c:2690
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10885,36 +11053,36 @@ msgstr ""
 "Error cargando la informaci�n del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2702
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2775
+#: mail/mail-callbacks.c:2783
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%ld de %ld"
 
-#: mail/mail-callbacks.c:2827
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:2854
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2889
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresi�n del mensaje"
 
-#: mail/mail-callbacks.c:3055
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, 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-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"
+"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 ""
 "Por favor escriba debajo su nombre y direcci�n de correo. Los campos  "
@@ -10927,8 +11095,8 @@ msgid ""
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"Por favor rellene la informaci�n acerca del servidor de correo de entrada. Si "
-"no est� seguro, preg�ntele a su\n"
+"Por favor rellene la informaci�n acerca del servidor de correo de entrada. "
+"Si no est� seguro, preg�ntele a su\n"
 "administrador de sistemas o a su Proveedor de Servicios de Internet."
 
 #: mail/mail-config-druid.c:150
@@ -10950,8 +11118,9 @@ msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and\n"
 "outgoing mail transport method which you provided will be grouped together "
-"to\nmake an Evolution mail account. Please enter a name for this account in "
-"the space below.\n"
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
 "Casi ha acabado con el proceso de configuraci�n del correo. La identidad, el "
@@ -10962,16 +11131,35 @@ msgstr ""
 "Este nombre solo se usar� para mostrar informaci�n."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
-#: mail/mail-config.c:356
-#, c-format
-msgid "Account %d"
-msgstr "Cuenta %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Corcho"
 
-#: mail/mail-config.c:2036
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: mail/mail-config.c:78 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"
@@ -10982,109 +11170,158 @@ msgstr ""
 "%s\n"
 "No se crear�n atajos."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2047
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Entrada"
-
-#: mail/mail-config.c:2297
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: mail/mail-config.c:2375 mail/mail-config.c:2379
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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
-msgid " _Check for supported types "
-msgstr "_Comprobar tipos soportados "
+#, fuzzy
+msgid " "
+msgstr ", "
 
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# libnautilus-private/nautilus-undo-signal-handlers.c:174
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr "color"
+#, 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
+#, 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:4
+#: mail/mail-config.glade.h:6
 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:5
+#: mail/mail-config.glade.h:7
 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:6
-msgid "Account"
-msgstr "Cuenta"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Cuenta %d"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Informaci�n de la cuenta"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gesti�n de la cuenta"
 
-#: mail/mail-config.glade.h:9
-msgid "Accounts"
-msgstr "Cuentas"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Cancelar operaci�n"
+
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Arkansas"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:13
+#, 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
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "Siempre cifrarm_e a m� mismo cuando env�e correo cifrado"
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "Arica"
 
-#: mail/mail-config.glade.h:13
-msgid "Always _sign outgoing messages when using this account"
-msgstr "Firmar _siempre el correo saliente al usar esta cuenta"
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Adjuntar un archivo al mensaje"
 
-#: mail/mail-config.glade.h:14 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autenticaci�n"
 
-#: mail/mail-config.glade.h:16
-msgid "Beep when new mail arrives"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "Comprobar el correo _autom�ticamente"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Juego de caracteres desconocido: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_Cerrar"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Comprobando si hay correo nuevo"
 
-#: mail/mail-config.glade.h:18
-msgid "Composer"
-msgstr "Nuevo"
-
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Nuevo mensaje"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Configuraci�n"
 
-#: mail/mail-config.glade.h:21
-msgid "Confirm when Expunging a folder"
-msgstr "Confirmar antes de comprimir una carpeta"
-
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11100,261 +11337,376 @@ msgstr ""
 "\n"
 "Pulse �Finalizar� para guardar su configuraci�n."
 
-#: mail/mail-config.glade.h:28
+#: 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:29
-msgid "Default Forward style is: "
-msgstr "El estilo predeterminado de Reenv�o es: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Prioridad por defecto:"
 
-#: mail/mail-config.glade.h:30
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Juego de caracteres predeterminado: "
 
-#: mail/mail-config.glade.h:31
-msgid "Defaults"
-msgstr "Predeterminados"
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Obteniendo mensajes"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "ID digitales..."
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-global-preferences.c:149
-#: mail/mail-config.glade.h:34
-msgid "Display"
-msgstr "Mostrar"
-
-#: mail/mail-config.glade.h:35
-msgid "Do not notify me when new mail arrives"
-msgstr ""
+#: mail/mail-config.glade.h:44
+#, 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:36 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:37 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Borradores"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Carpeta de _borradores:"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "_Habilitar"
 
-#: mail/mail-config.glade.h:39 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Editar..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Enabled"
-msgstr "Habilitada"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Este"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "El mensaje contiene"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "Dir_ecci�n de correo:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "Vaciar pap_elera al salir"
+
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Ejecutar comando de shell"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "finaliza con"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Propiedades"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Mensaje reenviados"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Obtener ID digital..."
 
-#: mail/mail-config.glade.h:43
-msgid "HTML signature file:"
-msgstr "Archivo de firma en HTML:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Resaltar citas con"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Honolul�"
+
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: 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 "Identidad"
 
-#: mail/mail-config.glade.h:46
-msgid "In HTML mail"
-msgstr "Correo en HTML"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Incluido en l�nea"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Guardar y cerrar"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Cargar _Im�genes"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Configuraci�n del correo"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Localizaci�n del Mailbox"
 
-#: mail/mail-config.glade.h:52
-msgid "Make this my _default account"
-msgstr "Hacer de esta mi cuenta pre_determinada"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Cabecera del mensaje"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_Mostrar Mensaje"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Micronesia"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Notificaci�n"
 
-#: mail/mail-config.glade.h:55
-msgid "News"
-msgstr "Noticias"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Fuentes de _noticias"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Informaci�n opcional"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organi_zaci�n:"
+
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de la _clave PGP:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Elije un color"
 
-#: mail/mail-config.glade.h:63
-msgid "Play sound file when new mail arrives"
-msgstr ""
+#: mail/mail-config.glade.h:88
+#, 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:64
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:65
-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:66
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Pr_eguntar al mandar mensajes con el asunto vac�o"
-
-#: mail/mail-config.glade.h:67
-msgid "Prompt 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:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Imprimir los contactos seleccionados"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "No puedo abrir el mensaje"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:70
+#: 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"
 
-#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Responder a:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:72
-msgid "Receiving Mail"
-msgstr "Recibiendo Mensajes"
-
-#: mail/mail-config.glade.h:73
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Opciones de recepci�n"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Recuerda esta contrase�a"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Informaci�n requerida"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+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:77
-msgid "Security"
-msgstr "Seguridad"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:78
-msgid "Select Filter Log file..."
-msgstr "Seleccione un archivo de actividad para los filtros..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "Seleccione el binario de PGP"
 
-#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Enviando correo"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Archivo de firma:"
 
-#: mail/mail-config.glade.h:81
-msgid "Sending Mail"
-msgstr "Enviando Correo"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Borrar todas menos la firma"
 
-#: mail/mail-config.glade.h:83 mail/message-list.etspec.h:9
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Enviado"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Mensajes Enviados y Borradores"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:117
 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:87
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Configuraci�n del servidor"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "_Tipo de servidor:"
 
-#: mail/mail-config.glade.h:89
-msgid "Signature file:"
-msgstr "Archivo de firma:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Atajos"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Guardar firma"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Fuente"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Informaci�n de la Fuente"
 
-#: mail/mail-config.glade.h:92
-msgid "Sources"
-msgstr "Fuentes"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:124
 #, fuzzy
-msgid "Specify filename:"
+msgid "Specify _filename:"
 msgstr "Nombre del estilo:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Mailbox est�ndar de Unix"
 
-#: mail/mail-config.glade.h:96
-msgid "Use s_ecure connection (SSL)"
-msgstr "U_se conexiones seguras (SSL)"
+#: mail/mail-config.glade.h:128
+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:97
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "Firma en _HTML:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Variable"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11364,130 +11716,216 @@ msgstr ""
 "\n"
 "Pulse �Siguiente� para comenzar. "
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Este"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "C_argar im�genes fuera de la red"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:141
 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:103
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "Tipo de _autenticaci�n: "
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tipo de _autenticaci�n: "
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "Comprobar el correo _autom�ticamente"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "ID del _certificado:"
 
-#: mail/mail-config.glade.h:108
-msgid "_Drafts folder:"
-msgstr "Carpeta de _borradores:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:111
-msgid "_Empty trash folders on exit"
-msgstr "Vaciar pap_elera al salir"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Confirmar antes de comprimir una carpeta"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Predeterminados"
+
+#: mail/mail-config.glade.h:151
+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
+#, fuzzy
+msgid "_Filename:"
+msgstr "Nombre de archivo:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "_Reenviar Mensaje"
+
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nombre _completo:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "Correo en HTML"
+
+#: mail/mail-config.glade.h:160
 #, fuzzy
-msgid "_HTML signature:"
+msgid "_HTML Signature:"
 msgstr "Firma en _HTML:"
 
-#: mail/mail-config.glade.h:114
-msgid "_Highlight citations with"
-msgstr "_Resaltar citas con"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Identidad"
 
-#: mail/mail-config.glade.h:115
-msgid "_Host:"
-msgstr "_Servidor:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Idioma"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:164
 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:117
-msgid "_Log filter actions to:"
-msgstr "Registrar acciones de _los filtros en:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Hacer de esta mi cuenta pre_determinada"
 
-#: mail/mail-config.glade.h:118
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como Le�do tras"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_No cargar nunca im�genes desde la red"
 
-#: mail/mail-config.glade.h:121
-msgid "_Organization:"
-msgstr "_Organizaci�n:"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "Localizaci�n del binario de _PGP:"
 
-#: mail/mail-config.glade.h:123
-msgid "_Path:"
-msgstr "R_uta:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:124
-msgid "_Remember this password"
-msgstr "_Recuerda esta contrase�a"
+#: mail/mail-config.glade.h:172
+#, 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:125
-msgid "_Send mail in HTML format by default."
-msgstr "Enviar el men_saje en formato HTML de forma predeterminada"
+#: mail/mail-config.glade.h:173
+#, 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:126
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Radio"
+
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Recibiendo Mensajes"
+
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Re: Todos"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 #, fuzzy
-msgid "_Server type: "
-msgstr "Tipo de _servidor: "
+msgid "_Script:"
+msgstr "_Seguridad"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Seguridad"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Enviando Correo"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Mostrar tiempo como"
 
-#: mail/mail-config.glade.h:127
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
 msgstr "_Archivo de firma:"
 
-#: mail/mail-config.glade.h:128
-msgid "_Username:"
-msgstr "Nombre de _usuario:"
+#: 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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Variable"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_cada"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr "color"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "descripci�n"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:133
-msgid "placeholder"
-msgstr "placeholder"
-
-#: mail/mail-config.glade.h:134
-msgid "seconds."
-msgstr "segundos."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "No pude crear un contexto de firma PGP."
@@ -11524,154 +11962,137 @@ msgstr "No pude crear un contexto sobre tipo S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "No pude crear un contexto de decodificaci�n S/MIME."
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:310
+#: mail/mail-display.c:344
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Guardar en disco..."
 
-#: mail/mail-display.c:358
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:360
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver incluido (v�a %s)"
 
-#: mail/mail-display.c:425
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-display.c:446
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Visores externos"
 
-#: mail/mail-display.c:1224
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1717
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Abrir enlace en el Navegador"
 
-#: mail/mail-display.c:1719
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Copiar Direcci�n del enlace"
 
-#: mail/mail-display.c:1722
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Guardar enlace como (ARR�GLAME)"
 
-#: mail/mail-display.c:1725
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Direcci�n err�nea"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:6
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:13
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1784
-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:1807
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution no reconoce este tipo de mensajes firmados."
-
-#: mail/mail-format.c:1815
-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:1823
-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:915
+#, fuzzy
+msgid "Mailer"
+msgstr "Correo"
 
-#: mail/mail-format.c:2066
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2080
+#: mail/mail-format.c:2120
 #, 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:2085
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:2114
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2122
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo �%s�)"
 
-#: mail/mail-format.c:2127
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando carpeta"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11680,27 +12101,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:763
+#: mail/mail-local.c:762
 #, 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:815
+#: mail/mail-local.c:814
 #, 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:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta �%s� al formato �%s�"
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, 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:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11708,11 +12129,11 @@ msgstr ""
 "Si no puede volver a abrir este buz�n, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 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:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar /%s"
@@ -11739,121 +12160,116 @@ msgstr ""
 msgid "Working"
 msgstr "Trabajando"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtrando carpeta"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: 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 "Aun as�, este mensaje fue enviado correctamente."
 
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando �%s�"
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: 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 "Completado."
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, 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:940
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Moviendo"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:725
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1053
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en �%s�"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1103 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Papelera"
-
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1279
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1420
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta '%s'"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1601
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Obteniendo %d mensajes(s)"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Guardando %d mensaje(s)"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11862,7 +12278,7 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11871,11 +12287,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11884,27 +12300,27 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Ejecutando el comando de shell: %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -11942,42 +12358,42 @@ msgstr "Buscar:"
 msgid "Matches:"
 msgstr "Coincide:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Camino: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Cancelar todo"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: 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 "Esperando..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Cancelado"
 
@@ -11994,26 +12410,40 @@ msgstr "Introduzca su contrase�a para %s"
 msgid "Enter Password"
 msgstr "Introduzca contrase�a"
 
-#: mail/mail-summary.c:109
-#, fuzzy
-msgid "Incomplete message written on pipe!"
-msgstr "Mensaje cifrado no mostrado"
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "No pude guardar el archivo de firma."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Guardar firma"
 
-#: mail/mail-summary.c:467
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Esta firma ha cambiado, pero no ha sido guardada.\n"
+"\n"
+"�Quiere guardar los cambios?"
+
+#: mail/mail-signature-editor.c:357
 #, fuzzy
-msgid "Mail Summary"
-msgstr "Resumen de correo"
+msgid "Signature name:"
+msgstr "Archivo de firma:"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Reenviado mensaje - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Mensaje reenviado"
 
@@ -12040,10 +12470,6 @@ msgstr ""
 "    '%s'\n"
 "Y han sido actualizadas."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "Carpetas virtuales"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "Carpetas virtuales"
@@ -12061,96 +12487,96 @@ msgstr "Tratando de editar una carpeta virtual `%s' que no existe."
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Sin asunto)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensaje"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:644
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "M�ltiples mensajes sin leer"
 
-#: mail/message-list.c:645
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "M�ltiples mensajes"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "La m�s baja"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "M�s baja"
 
-#: mail/message-list.c:654
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "M�s alta"
 
-#: mail/message-list.c:655
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "La m�s alta"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:967
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:976
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:988
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2365
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
 #, fuzzy
 msgid "Due By"
 msgstr "Falta "
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1199
-#: mail/message-list.etspec.h:3
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Flag Status"
 msgstr "Estado"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Marcado"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr ""
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Recibido"
 
@@ -12162,6 +12588,56 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tama�o"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "McCall"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Avanzar"
+
+#: mail/message-tag-followup.c:59
+#, fuzzy
+msgid "Follow-Up"
+msgstr "_Nombre completo..."
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Informaci�n de la Fuente"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward"
+msgstr ""
+"#-#-#-#-#  evolution-es.po (evolution 1.0)  #-#-#-#-#\n"
+"Reenviar#-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#\n"
+"Adelante"
+
+#: 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 "Responder"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Re: Todos"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Previsualizaci�n"
+
+#: mail/message-tag-followup.c:315
+#, fuzzy
+msgid "Flag to Follow Up"
+msgstr "_Nombre completo..."
+
 #: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -12183,7 +12659,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "De-suscribiendo la carpeta �%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 "Carpeta"
 
@@ -12227,6 +12703,35 @@ msgstr "_Suscribir"
 msgid "_Unsubscribe"
 msgstr "De-s_uscribir"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "La carpeta contiene el Resumen de Evolution"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Compositor de correo de Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Factor�a para el control de tareas de Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Componente de correo del resumen de trabajo de Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Configuraci�n del resumen"
+
+#: 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 "Aarhus"
@@ -22031,14 +22536,10 @@ msgstr ""
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "La carpeta contiene el Resumen de Evolution"
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "No puedo inicializar el componente de resumen de Evolution."
-
 #: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "Citas"
@@ -22059,44 +22560,50 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Sin descripci�n"
 
-#: my-evolution/e-summary-mail.c:120
+#: my-evolution/e-summary-mail.c:151
 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
+msgid "Local Folders"
+msgstr "Carpetas locales"
+
 #. 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:92
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "LEMD:LEVS:LEVC"
 
-#: my-evolution/e-summary-preferences.c:453
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Palabra del D�a"
 
-#: my-evolution/e-summary-preferences.c:474
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Frase del D�a"
 
-#: my-evolution/e-summary-preferences.c:735
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "A�adir una fuente de noticias"
 
-#: my-evolution/e-summary-preferences.c:743
+#: my-evolution/e-summary-preferences.c:728
 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:747
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Nombre:"
 
-#: my-evolution/e-summary-preferences.c:1225
-msgid "Summary Settings"
-msgstr "Configuraci�n del resumen"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "Error obteniendo RDF"
@@ -22105,6 +22612,30 @@ msgstr "Error obteniendo RDF"
 msgid "News Feed"
 msgstr "Fuentes de noticias"
 
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, 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"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Shannon"
+
 #: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "No hay tareas"
@@ -22126,19 +22657,19 @@ msgstr "Lo siento, pero hubo un error al leer %s."
 msgid "Weather"
 msgstr "Tiempo"
 
-#: 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 "Por favor espere..."
 
-#: 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 "Imprimir resumen"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Ha fallado la impresi�n del resumen"
 
@@ -22146,38 +22677,6 @@ msgstr "Ha fallado la impresi�n del resumen"
 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"
@@ -23408,63 +23907,54 @@ msgstr "_Horario"
 msgid "_Weather"
 msgstr "_Tiempo"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-#, fuzzy
-msgid "Factory for the Evolution notes component."
-msgstr "Factor�a para el compositor de correo de Evolution."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Factory for the Notes control"
-msgstr "Factor�a para el control de tareas de Evolution."
+msgid "Default Folders"
+msgstr "Seleccionar carpeta"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "La shell de Evolution."
 
-#: shell/e-activity-handler.c:160
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Mostrar detalles"
 
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Cancelar operaci�n"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Entrada"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Salida"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Carpetas locales"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instalaci�n de 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 ""
-"Esta nueva versi�n de Evolution necesita instalar archivos "
-"adicionales\nen su carpeta personal de Evolution"
+"Esta nueva versi�n de Evolution necesita instalar archivos adicionales\n"
+"en su carpeta personal de Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Por favor, pulse en �Aceptar� para instalar los archivos, o �Cancelar� para "
 "salir."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "No pude actualizar correctamente los archivos"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -23475,7 +23965,7 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -23484,7 +23974,7 @@ msgstr ""
 "Ha ocurrido un error mientras se copiaban archivos a\n"
 "`%s'."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -23495,7 +23985,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -23506,7 +23996,7 @@ msgstr ""
 "no tiene los permisos adecuados. Por favor\n"
 "h�galo legible y ejecutable, y reinicie Evolution."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -23517,7 +24007,7 @@ msgstr ""
 "debe ser eliminador para que Evolution funcione correctamente.\n"
 "Por favor elimine ese archivo y reinicie Evolution."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -23528,7 +24018,7 @@ msgstr ""
 "Por favor, renombre lo para permitir la instalaci�n\n"
 "de los archivos de usuario de Evolution."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -23542,7 +24032,7 @@ msgstr ""
 "Evolution.\n"
 "�Quiere que borre ese directorio?"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -23553,50 +24043,53 @@ msgstr ""
 "de Evolution. Por favor, renombre lo para permitir la\n"
 "instalaci�n de los archivos de usuario de Evolution."
 
-#: shell/e-shell-about-box.c:40
-msgid "Evolution "
-msgstr "Evolution "
-
-#: shell/e-shell-about-box.c:41
-#, fuzzy
-msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Producido por"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "No pude comprobar la carpeta: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"No puedo renombrar la carpeta:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "No puedo mover una carpeta sobre si misma."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "No puedo copiar una carpeta sobre si misma."
 
-#: 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 "No puedo mover una carpeta a uno de sus descendientes."
 
-#: 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 "Especificar una carpeta en la que copiar la carpeta �%s�:"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Copiar una carpeta"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Mover una carpeta"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23605,18 +24098,18 @@ msgstr ""
 "No pude borrar la carpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Borrar �%s�"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23625,16 +24118,16 @@ msgstr ""
 "No puedo renombrar la carpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renombrar carpeta �%s� a:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23649,7 +24142,7 @@ msgstr ""
 "No puedo crear la carpeta especificada:\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 - Crear nuevas carpetas"
 
@@ -23681,8 +24174,8 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"Elija el archivo que quiere importar a Evolution, y seleccione de la lista el "
-"tipo de archivo que es.\n"
+"Elija el archivo que quiere importar a Evolution, y seleccione de la lista "
+"el tipo de archivo que es.\n"
 "\n"
 "Si no lo sabe, puede elegir �Autom�tico� y Evolution tratar� de encargarse."
 
@@ -23732,8 +24225,8 @@ msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
-"No hay ninguna herramienta para importar datos que pueda encargarse "
-"de\n%s"
+"No hay ninguna herramienta para importar datos que pueda encargarse de\n"
+"%s"
 
 #: shell/e-shell-importer.c:445
 msgid "Importing"
@@ -23837,8 +24330,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:503
-#: shell/e-shell-user-creatable-items-handler.c:548
+#: shell/e-shell-user-creatable-items-handler.c:506
+#: shell/e-shell-user-creatable-items-handler.c:551
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nuevo"
@@ -23860,92 +24353,95 @@ 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:165
+#: shell/e-shell-view-menu.c:168
 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:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug buddy"
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Acerca de Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:427
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
-#: shell/e-shell-view-menu.c:428
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Seleccione la carpeta que quiere abrir"
 
-#: shell/e-shell-view-menu.c:548
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Crear un nuevo atajo"
 
-#: shell/e-shell-view-menu.c:549
+#: shell/e-shell-view-menu.c:566
 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:580
-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."
-
-#: shell/e-shell-view-menu.c:588
-#, c-format
-msgid "Error executing %s."
-msgstr "Error ejecutando %s."
-
-#: shell/e-shell-view-menu.c:691
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:704 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Trabajar Desconectado"
 
-#: shell/e-shell-view-menu.c:717 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shell-view.c:220
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostr�ndose)"
 
-#: shell/e-shell-view.c:1703
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1705
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(nada)"
 
-#: shell/e-shell-view.c:1752
+#: shell/e-shell-view.c:1867
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution est� conectado.  Pulse este bot�n para trabajar "
 "desconectado."
 
-#: shell/e-shell-view.c:1759
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution est� en proceso de desconectarse."
 
-#: shell/e-shell-view.c:1765
+#: shell/e-shell-view.c:1880
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution est� desconectado.  Pulse este bot�n para trabajar "
 "conectado."
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"El error del sistema de activaci�n es:\n"
+"%s"
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23956,19 +24452,23 @@ 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:1933
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Aceptar"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Argumentos inv�lidos"
 
-#: shell/e-shell.c:1935
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "No puedo registrarme en OAF"
 
-#: shell/e-shell.c:1937
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "No se encontr� la base de datos de configuraci�n"
 
-#: shell/e-shell.c:1939 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Error gen�rico"
 
@@ -24087,76 +24587,72 @@ msgstr "Bo_rrar"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"No puedo transferir la carpeta:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Entrada"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Sin nombre)"
+#: 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 "Sin errores"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Es tipo de archivo especificado no es v�lido"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "Error de I/O"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "No hay suficiente espacio para crear la carpeta"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Esta carpeta no est� vac�a"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "No se encontr� la carpeta especificada"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funci�n sin implementar en este manejador"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Operaci�n no implementada"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "El tipo especificado no est� implementado por este manejador"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "La carpeta especificada no puede ser modificado o borrado"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "No puedo mover una carpeta dentro de uno de sus descendientes"
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "No puedo crear una carpeta con ese nombre"
 
@@ -24166,10 +24662,13 @@ 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
+msgid "<click here to select a folder>"
+msgstr "<pinche aqu� para seleccionar una carpeta>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -24207,67 +24706,67 @@ msgstr ""
 "El error del sistema de activaci�n es:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "Error CORBA"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Interrumpido"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Argumento inv�lido"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Ya tiene un due�o"
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Sin due�o"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "No encontrado"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Tipo no soportado"
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Schema no soportado"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Operaci�n no soportada"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Error interno"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Salir"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "URI no v�lida"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Tiene subcarpetas"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "No queda sitio"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "El antiguo due�o a muerto"
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
 #, fuzzy
 msgid "Test type"
 msgstr "tipo de soporte"
@@ -24396,49 +24895,49 @@ 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:88
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:94
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution est� terminando ..."
 
-#: shell/main.c:223
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No puedo acceder a la shell de Ximian Evolution."
 
-#: shell/main.c:232
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "No puedo inicializar la shell de Ximian Evolution: %s"
 
-#: shell/main.c:302
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Deshabilitar pantalla de entrada"
 
-#: shell/main.c:303
+#: shell/main.c:318
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Comenzando a importar"
 
-#: shell/main.c:304
+#: shell/main.c:319
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Comenzando importadores inteligentes"
 
-#: shell/main.c:305
+#: shell/main.c:320
 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:323
+#: shell/main.c:338
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:353
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
@@ -24466,7 +24965,7 @@ msgstr "No ha especificado un nombre de archivo."
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Copiar mensajes seleccionados a otra carpeta"
 
-#: 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 "Copiar la selecci�n"
 
@@ -24483,7 +24982,7 @@ msgstr "Crear nuevo contacto"
 msgid "Create new contact list"
 msgstr "Crear nueva lista de contactos"
 
-#: 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 "Cortar la selecci�n"
 
@@ -24491,56 +24990,52 @@ msgstr "Cortar la selecci�n"
 msgid "Delete selected contacts"
 msgstr "Borrar los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "Dump"
-msgstr "Volcar"
-
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:13
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Mover mensajes seleccionados a otra carpeta"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:14
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: 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 "Pegar el contenido del porta papeles"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Vista previa de los contactos a imprimir"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Imprimir los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Guardar los contactos seleccionados en una VCard."
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Seleccionar todos los contactos"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Enviar un mensaje a los contactos seleccionados"
 
 #
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Enviar un mensaje al contacto"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Enviar los contactos seleccionados a otra persona."
 
@@ -24548,195 +25043,132 @@ msgstr "Enviar los contactos seleccionados a otra persona."
 # components/music/nautilus-music-view.c:1158
 # src/file-manager/dfos-xfer.c:352 src/file-manager/dfos-xfer.c:372
 # src/nautilus-window-toolbars.c:156
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Parar la carga"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 #, fuzzy
 msgid "View the current contact"
 msgstr "la fecha actual"
 
-#: 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:92 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:15
+#: 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
 msgid "_Actions"
 msgstr "A_cciones"
 
 #: ui/evolution-addressbook.xml.h:33
-msgid "_Addressbook Sources..."
-msgstr "Fuentes de la _Agenda..."
-
-#: ui/evolution-addressbook.xml.h:35
 msgid "_Contact List"
 msgstr "Lista de _contactos"
 
-#: 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 "_Reenviar contactos..."
 
-#: 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:106
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "Im_primir..."
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "_Mover a la carpeta..."
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "G_uardar como vCard"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "Bu_scar contactos"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Seleccionar todo"
 
 #
-#: ui/evolution-addressbook.xml.h:47
+#: ui/evolution-addressbook.xml.h:45
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Enviar un _mensaje al contacto..."
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Configurar las opciones del calendario"
-
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Crear un nuevo _evento de todo el d�a"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "Crear una nueva _tarea"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Crear una _nueva cita"
-
-#: ui/evolution-calendar.xml.h:7
-#, fuzzy
-msgid "Create a _New Meeting"
-msgstr "Crear una _nueva cita"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
-msgstr "Crear una nueva cita"
-
-#: ui/evolution-calendar.xml.h:9
-#, fuzzy
-msgid "Create a new meeting request"
-msgstr "Crear una nueva tarea"
-
-#: ui/evolution-calendar.xml.h:10 ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "Crear una nueva tarea"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create an event for the whole day"
-msgstr "Crear un evento para todo el d�a"
-
-#: ui/evolution-calendar.xml.h:13
 msgid "Day"
 msgstr "D�a"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Borrar la cita"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Ir a"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Volver"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Avanzar"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Ir a una _fecha"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Ir a una fecha espec�fica"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Ir a hoy"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Vista previa del calendario a imprimir"
 
-#: 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 "Vista pre_via"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Imprimir este calendario"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicar informaci�n de disponibilidad para este calendario"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Mostrar un d�a"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Mostrar una semana"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Mostrar un semana laboral"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "Cit_a..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Configuraci�n del calendario..."
-
-#: ui/evolution-calendar.xml.h:40
-#, fuzzy
-msgid "_Meeting..."
-msgstr "Reuni�n"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Publish Free/Busy Information"
-msgstr "_Publicar la informaci�n de disponibilidad"
-
-#: ui/evolution-calendar.xml.h:44
-msgid "_Task..."
-msgstr "_Tarea..."
-
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/nautilus-window.c:1267
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
@@ -24768,18 +25200,18 @@ msgstr "Ver el elemento que va a ser impreso"
 msgid "Print this item"
 msgstr "Imprimir este elemento"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Imprimir..."
-
 #: 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 "Guardar"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Guardar como..."
+
 #: 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 "Guardar y cerrar"
 
@@ -24797,8 +25229,8 @@ msgstr "Guardar este elemento a disco"
 #: 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:40
 msgid "_File"
 msgstr "_Archivo"
 
@@ -24824,7 +25256,7 @@ msgstr "Enviar un _mensaje al contacto..."
 #: 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 "_Guardar"
 
@@ -24885,6 +25317,12 @@ 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"
@@ -24894,75 +25332,55 @@ msgid "Compose _New Message"
 msgstr "Componer un _nuevo mensaje"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Crear o editar cuentas de correo y otras preferencias"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear o editar reglas para el filtrado de mensajes"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Crear o editar definiciones de carpetas virtuales"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Vaciar _Papelera"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Olvidar _contrase�a"
 
-#: 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 "Olvidar las contrase�as recordadas con lo que ser� preguntado de nuevo"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Abrir una ventana para escribir un mensaje de correo"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todos los mensajes borrados de todas las carpetas"
 
-#: ui/evolution-mail-global.xml.h:12
-msgid "Send / Receive"
-msgstr "Enviar / Recibir"
-
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send queued mail and retrieve new mail"
-msgstr "Enviar el correo en la cola y obtener el nuevo"
-
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Mostrar ventana de vista previa del mensajes"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Suscribirse o de-suscribirse de carpetas de los servidores remotos"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de carpetas virtuales..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filtros..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Settings..."
-msgstr "_Configuraci�n del correo..."
-
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "Vista _previa"
 
-#: ui/evolution-mail-global.xml.h:22
-msgid "_Send / Receive"
-msgstr "_Enviar / Recibir"
-
-#: ui/evolution-mail-global.xml.h:23
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "_Suscribirse a las carpetas..."
 
@@ -25059,11 +25477,11 @@ msgstr "Oculta temporalmente los mensajes seleccionados"
 msgid "Threaded Message list"
 msgstr "Lista de Mensajes Encadenados"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:19
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_Comprimir"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Carpeta"
 
@@ -25079,217 +25497,235 @@ msgstr "_Propiedades..."
 msgid "_Threaded Message List"
 msgstr "_Lista de Mensajes Encadenados"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "Add Sender to Address _Book"
+msgid "A_dd Sender to Addressbook"
 msgstr "A�adir Remitente a la Agenda de Direcciones"
 
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Aplicar filtro"
+
 #: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "A�adir Remitente a la Agenda de Direcciones"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar filtros a los mensajes seleccionados"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Responder a todos los destinatarios del mensaje seleccionado"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Responder a la lista de correo remitente del mensaje seleccionado"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Responder al remitente del mensaje seleccionado"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Copiar mensajes seleccionados a otra carpeta"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Crear una Carpeta _Virtual seg�n el mensaje"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crear una regla para filtrar los mensajes de este remitente"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crear una regla para filtrar los mensajes de estos destinatarios"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crear una regla para filtrar los mensajes de esta lista de correo"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crear una regla para filtrar los mensajes con este asunto"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Crear una carpeta virtual para estos destinatarios"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Crear una carpeta virtual para esta lista de correo"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Crear una carpeta virtual para este remitente"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Crear una carpeta virtual para este asunto"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Reducir el tama�o del texto"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Mostrar el siguiente mensaje importante"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Mostrar el mensaje siguiente"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Mostrar el siguiente mensaje no le�do"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Mostrar el siguiente hilo no le�do"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Mostrar el anterior mensaje importante"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Mostrar el mensaje anterior"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Mostrar el anterior mensaje no le�do"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr ""
+"#-#-#-#-#  evolution-es.po (evolution 1.0)  #-#-#-#-#\n"
+"Reenviar#-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#\n"
+"Adelante"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar seg�n la _lista de correo..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filtrar seg�n el remite_nte..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filtrar seg�n los destinata_rios..."
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filtrar seg�n el a_sunto..."
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Marcar los mensajes seleccionados para borrar"
 
-#: ui/evolution-mail-message.xml.h:33
-msgid "Force images in HTML mail to be loaded"
-msgstr "Forzar que las im�genes en los correos en HTML sean cargadas"
-
 #: ui/evolution-mail-message.xml.h:34
 #, fuzzy
-msgid "Forward"
-msgstr ""
-"#-#-#-#-#  evolution-es.po (evolution 1.0)  #-#-#-#-#\n"
-"Reenviar#-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#\n"
-"Adelante"
+msgid "Follow _Up..."
+msgstr "_Nombre completo..."
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr "Forzar que las im�genes en los correos en HTML sean cargadas"
+
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Reenviar el mensaje seleccionado en el cuerpo de un nuevo mensaje"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reenviar el mensaje seleccionado citado como una respuesta"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Reenviar el mensaje seleccionado a alguien"
 
-#: 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 "Reenviar el mensaje seleccionado como un adjunto a alguien"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Incrementar el tama�o del texto"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Cargar _Im�genes"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Marcar como I_mportante"
 
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Marcar como _no le�do"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Marcar como No Imp_ortante"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Marcar los mensajes seleccionados como le�dos"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Marcar los mensajes seleccionados como importantes"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Marcar los mensajes seleccionados como no le�dos"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Marcar los mensajes seleccionados como no importantes"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar los mensajes seleccionados para borrar"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Mover mensajes seleccionados a otra carpeta"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # components/music/nautilus-music-view.c:1170
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Siguiente"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "Siguiente mensaje importante"
-
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
-msgstr "Siguiente mensaje"
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "Siguiente mensaje importante"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Siguiente hilo"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Siguiente mensaje no le�do"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -25305,155 +25741,151 @@ msgid "Original Si_ze"
 msgstr "Ta_ma�o original"
 
 #: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Mensaje anterior no le�do"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Mensaje importante previo"
+
+#: ui/evolution-mail-message.xml.h:63
 msgid "Preview the message to be printed"
 msgstr "Ver el mensaje que va a ser impreso"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # components/music/nautilus-music-view.c:1122
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "Mensaje importante previo"
-
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "Mensaje previo"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "Mensaje anterior no le�do"
-
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Imprimir este mensaje"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Re_direct"
 msgstr "Directorio de inicio"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Reenviar el mensaje seleccionado a alguien"
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "Reply"
-msgstr "Responder"
-
-#: ui/evolution-mail-message.xml.h:72
-msgid "Reply to All"
-msgstr "Re: Todos"
-
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr "Dejar el texto en su tama�o original"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "Bu_scar mensaje..."
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "_M�s peque�o"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "Guardar el mensaje en un archivo de texto"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:78
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "Configurar los datos de la p�gina para la impresora actual"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "Mostrar la fuente del men_saje"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "Mostrar cabeceras completas"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "Mostrar mensajes en el estilo normal"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "Mostrar mensajes con todas las cabeceras"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "Mostrar la fuentes sin formatear del mensaje"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "Ta_ma�o del texto"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Recuperar los mensajes seleccionados"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "Carpeta virtual seg�n la _Lista de Correo..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "Carpeta virtual seg�n el Remite_nte..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "Carpeta virtual seg�n los Destinata_rios..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "Carpeta virtual seg�n el A_sunto..."
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Apply Filters"
-msgstr "_Aplicar filtro"
-
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Attached"
 msgstr "Adjuntar"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "_Copiar a la Carpeta"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "_Crear filtro del mensaje"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "_Reenviar Mensaje"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Ir a"
+
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Inline"
 msgstr "Incluido en l�nea"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Mayor"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "_Mostrar Mensaje"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Mover a la Carpeta"
 
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Siguiente mensaje"
+
 #: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "Vista _Normal"
@@ -25462,31 +25894,39 @@ msgstr "Vista _Normal"
 msgid "_Open Message"
 msgstr "_Abrir Mensaje"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Mensaje previo"
+
+#: ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:110 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_Herramientas"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Recuperar"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
 #: 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:36
 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:50
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
 msgid "_View"
 msgstr "_Vista"
 
@@ -25510,11 +25950,11 @@ msgstr "Cifrar este mensaje con PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Cifra este mensaje con su certificado de cifrado 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 "For_mato"
 
-#: 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"
 
@@ -25530,6 +25970,12 @@ msgstr "Insertar un archivo como texto en el mensaje"
 msgid "Insert text file..."
 msgstr "Insertar un archivo de texto..."
 
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/file-manager/fm-directory-view.c:2114
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Abrir"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Abrir un archivo"
@@ -25563,7 +26009,7 @@ msgid "Save in folder..."
 msgstr "Guardar en carpeta..."
 
 #: 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 "Guardar archivo actual"
 
@@ -25588,6 +26034,7 @@ msgid "Send _later"
 msgstr "Enviar _mas tarde"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
@@ -25656,7 +26103,7 @@ msgid "_From Field"
 msgstr "Campo _De"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -25668,13 +26115,9 @@ msgstr "_Abrir..."
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Seguridad"
-
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/nautilus-window-menus.c:1325
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "A_yuda"
 
@@ -25730,39 +26173,41 @@ msgstr "Obtener la �ltima informaci�n de la tarea"
 msgid "Re_fresh Task"
 msgstr "Re_leer Tarea"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Configurar la vista de las tareas"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Copiar las tareas seleccionadas"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Cortar las tareas seleccionadas"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 #, fuzzy
 msgid "Delete completed tasks"
 msgstr "Borrar las tareas seleccionadas"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Borrar las tareas seleccionadas"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "Mar_k as Complete"
 msgstr "_Marcar como completo"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Pegar la tarea del portapapeles"
 
-#: ui/evolution-tasks.xml.h:14
-msgid "Tasks Settings..."
-msgstr "Configuraci�n de las tareas..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Vista previa de los contactos a imprimir"
+
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Imprimir este mensaje"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25831,116 +26276,121 @@ msgid "Open this folder in an other window"
 msgstr "Abre esta carpeta en una nueva ventana"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Enviar / Recibir"
+
+#: ui/evolution.xml.h:22
+#, 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
 msgid "Show information about Ximian Evolution"
 msgstr "Mostrar informaci�n acerca de Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Enviar reporte de fallo"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Enviar reporte de _fallo"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un reporte de fallo usando Bug Buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Activar"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Activar si se muestra la barra de carpetas"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Activar si se muestra la barra de atajos"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Activar si se estamos trabajando desconectados o no."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Ver la carpeta seleccionada"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ de Ximian Evolution"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "_Acerca de Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "Barra de _carpetas"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 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:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Nueva carpeta"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_Configuraci�n del pilot..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Enviar / Recibir"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "Barra de atajo_s"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "Barra de atajo_s"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Cambiar las propiedades del resumen"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Imprimir resumen"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Recargar"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Regenerar la vista"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "_Configuraci�n del resumen..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Tarjetas de Visita"
@@ -26122,20 +26572,20 @@ msgstr "Ucraniano"
 msgid "Visual"
 msgstr "Visalia"
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Juego de caracteres desconocido: %s"
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Introduzca el Juego de caracteres a usar"
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Otro..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Codificaci�n de Caracteres"
 
@@ -26143,30 +26593,32 @@ msgstr "Codificaci�n de Caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Editor de b�squedas"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Guardar b�squeda"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "A�adir a las b�squedas guardadas"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Limpiar"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Guardar b�squeda"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Mostrar todo"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "A�adir a las b�squedas guardadas"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informaci�n"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Error"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Pregunta"
@@ -26180,11 +26632,21 @@ msgstr "Mensaje"
 msgid "Don't show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: widgets/misc/e-search-bar.c:342
-msgid "Sear_ch"
-msgstr "Bus_car"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Buscar ahora"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Limpiar"
 
-#: widgets/misc/e-search-bar.c:468
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Limpiar"
+
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Buscar ahora"
 
@@ -26210,3 +26672,778 @@ 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"
+
+#, 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?"
+#~ msgstr ""
+#~ "�Esta seguro que quiere\n"
+#~ "borrar este contacto?"
+
+#~ msgid "Starting:"
+#~ msgstr "Comenzando:"
+
+#~ msgid "Ending:"
+#~ msgstr "Finalizando:"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Crear una nueva cita con un _recordatorio por defecto"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "Primer d�a de la se_mana:"
+
+#~ msgid "_Other"
+#~ msgstr "_Otro"
+
+#~ msgid "Click here to add an attendee"
+#~ msgstr "Pulse aqu� para a�adir un contacto"
+
+#~ 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 "_Borrar esta tarea"
+
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "La reuni�n empieza: <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "La tarea empieza: <b>"
+
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "La informaci�n de disponibilidad comienza: <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Empieza: <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "La reuni�n termina: <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "La informaci�n de disponibilidad finaliza: <b>"
+
+#~ msgid "Ends: <b>"
+#~ msgstr "Termina: <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Tarea completada: <b>"
+
+#~ msgid "Task Due: <b>"
+#~ msgstr "Plazo para la tarea: <b>"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "Informaci�n del calendario"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "Error de calendario"
+
+#~ msgid "An unknown person"
+#~ msgstr "Una persona desconocida"
+
+#~ 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."
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ninguna<i>"
+
+#, fuzzy
+#~ msgid "Status:"
+#~ msgstr "E_stado:"
+
+#, fuzzy
+#~ msgid "Tentatively Accepted"
+#~ msgstr "Aceptar tentativamente"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Elija una acci�n:"
+
+#~ msgid "Update"
+#~ msgstr "Actualizar"
+
+#~ msgid "Accept"
+#~ msgstr "Aceptar"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Aceptar tentativamente"
+
+#~ msgid "Decline"
+#~ msgstr "Rechazar"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Enviar informaci�n de disponibilidad"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Actualizar el estado del remitente"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Enviar �ltima informaci�n"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> ha publicado informaci�n de reuniones."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Informaci�n  de reuniones"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> solicita su presencia en una reuni�n."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Propuesta de reuni�n"
+
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ msgstr "<b>%s</b> desea apuntarse a una reuni�n existente."
+
+#~ msgid "Meeting Update"
+#~ msgstr "Actualizaci�n de la reuni�n"
+
+#~ 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."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Petici�n de actualizaci�n de la reuni�n"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b> ha contestado a la petici�n de reuni�n."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Respuesta de reuni�n"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> ha cancelado una reuni�n."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Cancelaci�n de reuni�n"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Mensaje de reuni�n err�neo"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> ha publicado la informaci�n de la tarea."
+
+#~ msgid "Task Information"
+#~ msgstr "Informaci�n de la tarea"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> te pide que realices una tarea."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Propuesta de tarea"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> desea a�adir a una tarea existente."
+
+#~ msgid "Task Update"
+#~ msgstr "Actualizaci�n de tarea"
+
+#~ 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 "Task Update Request"
+#~ msgstr "Petici�n de actualizaci�n de tarea"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b> ha contestado a una asignaci�n de tarea."
+
+#~ msgid "Task Reply"
+#~ msgstr "Respuesta a una tarea"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> ha cancelado una tarea."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Cancelaci�n de tarea"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Mensaje de tarea err�neo"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> ha publicado la informaci�n de disponibilidad."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Informaci�n de disponibilidad"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> pide su informaci�n de disponibilidad."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Petici�n de disponibilidad"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "<b>%s</b> ha contestado a una petici�n de disponibilidad."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Respuesta sobre disponibilidad"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Mensaje de disponibilidad err�neo"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Este mensaje solo contiene peticiones no soportadas."
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "El adjunto no contiene un calendario de mensaje v�lido"
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "El adjunto no tiene elementos de calendario visibles"
+
+#~ 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"
+
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "Informaci�n de disponibilidad (de %s a %s)"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Error hashing password."
+#~ msgstr "Error a�adiendo tarjeta"
+
+#, fuzzy
+#~ msgid "Invalid password."
+#~ msgstr "Argumento inv�lido"
+
+#, fuzzy
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Error al buscar el certificado para �%s�."
+
+#, fuzzy
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Error al buscar el certificado para �%s�."
+
+#, fuzzy
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "No pude crear un contexto de cifrado PGP."
+
+#, fuzzy
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "No pude conectar con el servidor: %s"
+
+#, fuzzy
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "No pude guardar el archivo de firma."
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Por favor introduzca la contrase�a NNTP para %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "El servidor rechazo el nombre de usuario"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Fallo al enviar el nombre de usuario al servidor"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "El servidor rechazo el nombre de usuario � la contrase�a"
+
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "Error interno: uid en formato no v�lido: %s"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "No pude obtener la lista de grupos del servidor."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "No pude cargar el archivo de listas de grupos para %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "No pude guardar el archivo de listas de grupos para %s: %s"
+
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "No pude encontrar la direcci�n 'De' en el mensaje"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "No puedo enviar el mensaje: direcci�n del remitente no definida."
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "Componente Evolution para el resumen de trabajo."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "No puedo inicializar el componente de resumen de Evolution."
+
+#, fuzzy
+#~ msgid "Select a service"
+#~ msgstr "Elija un archivo"
+
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "Enviar un correo"
+
+#, fuzzy
+#~ msgid "Run %s"
+#~ msgstr "Ejecutar"
+
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/nautilus-window.c:1267
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "Cerrar"
+
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "Mueve esta carpeta a otro sitio"
+
+# src/file-manager/dfos-xfer.c:961
+#, fuzzy
+#~ msgid "Move %s to the right"
+#~ msgstr "Moviendo archivos a la Papelera"
+
+#, fuzzy
+#~ msgid "page"
+#~ msgstr "P�gina"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No puedo renombrar la carpeta:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr "Error cargando %s"
+
+#, fuzzy
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Factor�a para el componente de Resumen de Correo."
+
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Resumen"
+
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Factor�a para el compositor de correo de Evolution."
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "Factor�a para el componente de Resumen de Correo."
+
+# src/nautilus-window-toolbars.c:161
+#, fuzzy
+#~ msgid "Test service"
+#~ msgstr "Servicios web"
+
+#, fuzzy
+#~ msgid "Update now"
+#~ msgstr "Actualizar"
+
+#, fuzzy
+#~ msgid "Update every "
+#~ msgstr "_Actualizar Libre/Ocupado"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Escribir URI de la carpeta"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Carpeta para guardar correo (interno)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "No puedo conectar con el almac�n: %s"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Crear carpeta virtual de la b�squeda"
+
+#~ 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"
+
+#~ msgid "Composer"
+#~ msgstr "Nuevo"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "El estilo predeterminado de Reenv�o es: "
+
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# libnautilus-private/nautilus-global-preferences.c:149
+#~ 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"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "Registrar acciones de _los filtros en:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organizaci�n:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Recuerda esta contrase�a"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Enviar el men_saje en formato HTML de forma predeterminada"
+
+#, fuzzy
+#~ msgid "_Server type: "
+#~ msgstr "Tipo de _servidor: "
+
+#~ msgid "placeholder"
+#~ msgstr "placeholder"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Mail Summary"
+#~ msgstr "Resumen de correo"
+
+#~ 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."
+
+#, fuzzy
+#~ 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)"
+
+#~ msgid "Dump"
+#~ msgstr "Volcar"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Configurar las opciones del calendario"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Crear un nuevo _evento de todo el d�a"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Crear una nueva _tarea"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Crear una _nueva cita"
+
+#, fuzzy
+#~ msgid "Create a _New Meeting"
+#~ msgstr "Crear una _nueva cita"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Crear una nueva cita"
+
+#, fuzzy
+#~ msgid "Create a new meeting request"
+#~ msgstr "Crear una nueva tarea"
+
+#~ msgid "Create a new task"
+#~ msgstr "Crear una nueva tarea"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Crear un evento para todo el d�a"
+
+#~ msgid "_Appointment..."
+#~ msgstr "Cit_a..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Configuraci�n del calendario..."
+
+#, fuzzy
+#~ msgid "_Meeting..."
+#~ msgstr "Reuni�n"
+
+#~ msgid "_Task..."
+#~ msgstr "_Tarea..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Crear o editar cuentas de correo y otras preferencias"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_Configuraci�n del correo..."
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Aplicar filtro"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Configurar la vista de las tareas"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Configuraci�n de las tareas..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Cambiar las propiedades del resumen"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "_Configuraci�n del resumen..."
+
+#~ msgid "Show All"
+#~ msgstr "Mostrar todo"
+
+#~ msgid "Sear_ch"
+#~ msgstr "Bus_car"
diff --git a/po/et.po b/po/et.po
index de53f9fafd..b9ec8025a1 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-01-24 13:27-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -37,21 +37,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Impordib VKaardi-vormingus failid Evolution'i."
 
 #: 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 "Fail kui"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nimi"
 
 #: 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 "E-post"
 
 #: 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:1731
 msgid "Primary"
 msgstr "Esmane"
 
@@ -61,16 +62,16 @@ 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:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 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:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
 msgid "Business"
 msgstr "�ri"
 
@@ -80,12 +81,12 @@ msgid "Bus"
 msgstr "T��"
 
 #: 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:1720
 msgid "Callback"
 msgstr "Tagasihelistamine"
 
 #: 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:1722
 msgid "Company"
 msgstr "Firma"
 
@@ -96,13 +97,13 @@ 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:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
 msgid "Home"
 msgstr "Kodu"
 
 #: 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 "Organisatsioon"
 
@@ -112,19 +113,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:1727
 msgid "Mobile"
 msgstr "Mobiil"
 
 #: 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:1721
 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:1647
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax t��l"
 
@@ -133,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:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "�ri 2"
 
@@ -148,69 +149,68 @@ msgid "Bus 2"
 msgstr "�ri 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:1724
 msgid "Home 2"
 msgstr "Kodu 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:1726
+#: 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:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "Muu"
 
 #: 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:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: 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:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-post 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 "Koduleht"
 
@@ -219,7 +219,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 "Osakond"
 
@@ -228,7 +228,7 @@ msgid "Dep"
 msgstr "Osak"
 
 #: 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 "Kontor"
 
@@ -237,12 +237,12 @@ msgid "Off"
 msgstr "Kont"
 
 #: 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 "Tiitel"
 
 #: 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 "Elukutse"
 
@@ -251,7 +251,7 @@ msgid "Prof"
 msgstr "Ala"
 
 #: 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 "Juht"
 
@@ -264,7 +264,7 @@ msgid "Ass"
 msgstr "Abil"
 
 #: 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 "H��dnimi"
 
@@ -273,12 +273,12 @@ msgid "Nick"
 msgstr "H��dnimi"
 
 #: 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 "Abikaasa"
 
 #: 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 "M�rkus"
 
@@ -291,7 +291,7 @@ msgid "CALUri"
 msgstr ""
 
 #: 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 "Vaba-kinni URL"
 
@@ -320,302 +320,16 @@ msgstr "Kategooriad"
 msgid "Family Name"
 msgstr "Perekonnanimi"
 
-#: 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 "Kaart: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Nimi: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Prefiks:\t"
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Antud:      "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Lisa: "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Perekond:\t"
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Suffiks:\t"
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"S�nniaeg: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Aadress: "
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Postkast:  "
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Nr:         "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  T�nav:\t"
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Linn:\t"
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Piirkond:\t"
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Postiindeks:\t"
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Riik:\t"
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Posti Etikett: "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefonid:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-post:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-post:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Postiprogramm:"
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Ajav��nd: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geogr asukoht: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Amet: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"T��koht: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Nimi:  "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  �ksus:  "
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  �ksus2: "
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  �ksus3: "
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  �ksus4: "
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategooriad: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Kommentaar: "
-
-#. 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"
-"Unikaalne fraas: "
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Avalik v�ti: "
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Mitu VKaarti"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VKaart %s jaoks"
@@ -623,85 +337,89 @@ msgstr "VKaart %s jaoks"
 #: 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:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Ei saa laadida Bonobot"
 
-#: 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:2732
 msgid "Searching..."
 msgstr "Otsin..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Laen..."
 
 #. 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 "Viga otsingu avaldises."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:483
-msgid "Connecting to LDAP server..."
-msgstr "�hendan LDAP serveriga..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:493
-msgid "Unable to connect to LDAP server."
-msgstr "Ei saa luua �hendust LDAP serveriga."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:509
-msgid "Waiting for connection to LDAP server..."
-msgstr "Ootan �hendust LDAP serveriga..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:912
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Lisan kaardi LDAP serverisse..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1013
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Eemaldan kaardi LDAP serverist..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Muudan kaarti LDAP serveris..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2214
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Alustan otsingut uuesti."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "V�tan vastu LDAP otsingu tulemused..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2219
-msgid "Restarting search."
-msgstr "Alustan otsingut uuesti."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Viga kaardi eemaldamisel"
 
-#: addressbook/conduit/address-conduit.c:296
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Ei saa salvestada kokkuv�tet: %s: %s"
+
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "E-posti aadress:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Kursorit ei saa laadida\n"
 
-#: addressbook/conduit/address-conduit.c:309
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "EBook ei ole laetud\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 "Ei saa k�ivitada wombat serverit"
 
-#: 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 "EI saa k�ivitada wombatit"
 
-#: 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 ""
 
@@ -718,222 +436,109 @@ 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
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution Addressbook minicard viewer"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Evolution component for handling contacts."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Factory for the Addressbook Minicard control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory for the sample Addressbook control"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontaktid"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Kontaktide infot sisaldav kaust"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP server"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "Kontaktide infot sisaldav LDAP server"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Uus kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
-msgstr "Uus k_ontakt"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Uus kontaktide nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
-msgstr "Uus kontaktide _nimekiri"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
-msgstr "Muuda aadressiraamatut"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
-msgstr "Konto nimi"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "Uus aadressiraamat"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
-msgstr "Aadressiraamatu allikas"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "Edasij�udnutele"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
-msgstr "Baas"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "P�hiline"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "De_lete"
-msgstr "_Kustuta"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "E-posti aadress:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution kasutab seda e-posti aadressi sinu autentimiseks serverile"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "One"
-msgstr "�ks"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
-msgstr "Otsi _baasist:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search s_cope: "
-msgstr "Otsi _kehtivuspiirkonnast:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Server Name"
-msgstr "Serveri nimi"
-
-#: 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 "Allolev informatsioon on kohustuslik aadressiraamatu lisamiseks."
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "This information is not required for most ldap servers. "
-msgstr "See informatsioon ei ole kohustuslik enamiku ldap serverite jaoks,"
-
-#: 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 ""
-"Seda infot kasutab teie LDAP server otsingus osalevate s�lmede m��ramiseks. "
-"T�psema info saamiseks v�ta �hendust oma serveri administraatoriga."
-
-#: 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 ""
-"See on baass�lm sinu otsinguteks ldap serveris.T�psema info saamiseks v�ta "
-"�hendust oma serveri administraatoriga. "
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "This is the name of the server where your addressbook is located."
-msgstr "See m��rab serveri nime, kus asub su aadressiraamat."
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
-msgstr "See on sinu LDAP serveri poolt kasutatav port."
-
-#: 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 ""
-"Seda nime kasutatakse sinu konto tuvastamiseks (programmisiseselt ja ainult "
-"n�itamiseks."
-
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "_Account name:"
-msgstr "_Konto nimi:"
-
-#: 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 "_Lisa"
-
-#: 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 "_Redaktor"
-
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
-msgstr "_Server vajab kasutaja tuvastamist"
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
-msgstr "_Port:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
-msgstr "_Serveri nimi:"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "Kontaktide _nimekiri"
 
-#: 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "Ei saa gnome-vfs initsialiseerida"
 
-#: addressbook/gui/component/addressbook-storage.c:167
-msgid "Other Contacts"
-msgstr "Teised kontaktid"
-
-#: addressbook/gui/component/addressbook.c:485
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Aadressiraamatu avamine eba�nnestus"
 
-#: 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"
@@ -943,7 +548,7 @@ msgstr ""
 "olla see, et sisestasid vale URI v�i kasutatav LDAP server\n"
 "on maas"
 
-#: 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"
@@ -955,7 +560,7 @@ msgstr ""
 "ise Evolution'i l�htetekstidest kokku kompileerima.\n"
 "Eelnevalt laadi OpenLDAP allj�rgneva viida abil.\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."
@@ -963,57 +568,50 @@ 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:640
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Palun sisesta %s parool (kasutaja %s)"
 
-#: addressbook/gui/component/addressbook.c:808
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Suvaline v�li sisaldab"
-
-#: addressbook/gui/component/addressbook.c:809
-msgid "Name contains"
-msgstr "Nimi sisaldab"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "l�ppeb"
 
-#: addressbook/gui/component/addressbook.c:810
-msgid "Email contains"
-msgstr "E-posti aadress sisaldab"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "E-post 2"
 
-#: addressbook/gui/component/addressbook.c:811
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategooria on"
 
 #. 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:772
+#: 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
 msgid "Advanced..."
 msgstr "Edasij�udnutele..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1030
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Suvaline kategooria"
 
-#: addressbook/gui/component/addressbook.c:1112
+#: addressbook/gui/component/addressbook.c:1083
 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:1686
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 msgid "Primary Email"
 msgstr "Peamine e-post"
 
@@ -1059,6 +657,615 @@ 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
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "Aadressiraamatu allikas"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Alarmid"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anon��mne"
+
+#: 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 "Info puudub"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "_Kustuta"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Loendi _nimi:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "E-posti aadress:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Evolution'i alarm "
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr "Evolution kasutab seda e-posti aadressi sinu autentimiseks serverile"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr "Evolution kasutab seda e-posti aadressi sinu autentimiseks serverile"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "_Otsi"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "�ldine"
+
+#: 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 "H��lestus"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Veerised"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_intervalliga:"
+
+#: 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 "�ks"
+
+#: 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 "Otsi _kehtivuspiirkonnast:"
+
+#. 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 "Otsin"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Vali k�ik"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Kustutatud"
+
+#: 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 "Allika info"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "�hendun serverisse..."
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Toetamata skeem"
+
+#: 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 ""
+"Seda nime kasutatakse sinu konto tuvastamiseks (programmisiseselt ja ainult "
+"n�itamiseks."
+
+#: 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 "See on e-_postiaadress"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+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:139
+msgid "_Add"
+msgstr "_Lisa"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Lisa"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Lisa tegevus"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Lisa tegevus"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Alarmid"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Kustuta k�ik"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "N_�ita"
+
+#: 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:152 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 "_Redaktor"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Muuda kohtumist"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution'i alarm "
+
+#: 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 "_H��lestus"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Port:"
+
+#: 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 "Otsi _baasist:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Serveri nimi:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Easil�kkamise aeg (minutites)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Konto %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "kontaktide-nimekirja-redaktor"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Kaardid puuduvad"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Taastan �henduse: %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 "�ldine"
+
+#: 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 "Otsin"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
@@ -1068,9 +1275,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: 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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Eemalda"
 
@@ -1099,7 +1306,12 @@ msgstr "(%d n�itamata)"
 msgid "Unnamed Contact"
 msgstr "Nimetu kontakt"
 
-#: 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 "Saatja sisaldab"
+
+#: 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"
@@ -1109,7 +1321,7 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: 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"
@@ -1117,42 +1329,43 @@ msgid ""
 "correct this problem."
 msgstr ""
 
-#: 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 "Kontaktide valimine aadressiraamatust"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "_Sisaldab:"
+msgid "Select Names"
+msgstr "Vali nimed"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Co_ntacts:"
-msgstr "Ko_ntaktid:"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Kustutada kontakt?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "F_ind"
-msgstr "_Otsi"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Kontaktid"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "Vali nimed"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
-msgstr "N�ita j�rgnevale kriteeriumile vastavaid kontakte:"
+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 "_T�sta mujale..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "Kate_gooria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Kaust:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Message Recipients:"
-msgstr "_S�numi adressaadid:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "A_ssistant's name:"
 msgstr "Assistendi n_imi:"
@@ -1185,7 +1398,7 @@ msgstr "Koost��"
 
 #. 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:1365
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
@@ -1210,10 +1423,6 @@ msgstr "Fai_l kui:"
 msgid "Full _Name..."
 msgstr "T_�isnimi..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "�ldine"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid ""
@@ -1258,10 +1467,11 @@ 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: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: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
 msgid "_Delete"
 msgstr "_Kustuta"
 
@@ -1289,1123 +1499,1122 @@ msgstr "_Avaliku kalendri URL:"
 msgid "_Web page address:"
 msgstr "Kodulehe aad_ress"
 
-#: 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:757
-msgid "Category editor not available."
-msgstr "Kategooriaredaktor pole saadaval."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:764
-msgid "This contact belongs to these categories:"
-msgstr "Antud kontakt kuulub j�rgnevatesse kategooriatesse:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:978
-msgid "Save Contact as VCard"
-msgstr "Kontakti salvestamine VKaardina"
-
-#: 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 "Ei leidnud vidinat v�ljale: `%s'"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
-msgstr "Kontakti kiirlisamine"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
-msgstr "Redigeeri k�ike"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr "T�isnimi"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
-msgid "E-mail"
-msgstr "E-post"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
-msgid "card.vcf"
-msgstr "kaart.vcf"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
-msgid "list"
-msgstr "nimekiri"
-
-#: 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 on juba olemas\n"
-"Kas soovid �le kirjutada?"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Aadress _2:"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
+msgstr "�hendriigid"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: 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 "Albaania"
 
-#: 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 "Al�eeria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "American Samoa"
 msgstr "Ameerika Samoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Antigua And Barbuda"
 msgstr "Antigua ja Barbuda"
 
-#: 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 "Argentiina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Armenia"
 msgstr "Armeenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Aruba"
 msgstr "Aruba"
 
-#: 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 "Austraalia"
 
-#: 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 "Austria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Azerbaijan"
 msgstr "Aserbaid�aan"
 
-#: 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 "Bahama"
 
-#: 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 "Bahrein"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Belarus"
 msgstr "Valgevene"
 
-#: 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 "Belgia"
 
-#: 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 "Belize"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: 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 "Boliivia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia ja Hertsegoviina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bouvet Island"
 msgstr "Bouvet' saar"
 
-#: 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 "Brasiilia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "British Indian Ocean Territory"
 msgstr "Briti India ookeani ala"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:33
-msgid "British Virgin Islands"
-msgstr "Briti Neitsisaared"
-
-#: 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 "Bulgaaria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Cambodia"
 msgstr "Kambod�a"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: 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 "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cape Verde"
 msgstr "Roheneemesaared"
 
-#: 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 "Kaimanisaared"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Central African Republic"
 msgstr "Kesk-Aafrika Vabariik"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Chad"
 msgstr "T�aad"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-msgid "Check Address"
-msgstr "Kontrolli aadressi"
-
-#: 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 "T�iili"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "China"
 msgstr "Hiina"
 
-#: 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 "J�ulusaar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cocos (Keeling) Islands"
 msgstr "Kookossaared"
 
-#: 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 "Kolumbia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Comoros"
 msgstr "Komoorid"
 
-#: 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 "Kongo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Cook Islands"
 msgstr "Cooki saared"
 
-#: 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 "Costa Rica"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cote d'Ivoire"
 msgstr "Elevandiluurannik"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:56
-msgid "Countr_y:"
-msgstr "_Riik:"
-
-#: 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 "Horvaatia"
 
-#: 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 "Kuuba"
 
-#: 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 "K�pros"
 
-#: 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 "T�ehhi"
 
-#: 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 "Taani"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Dominica"
 msgstr "Dominica"
 
-#: 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 "Dominikaani vabariik"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "East Timor"
 msgstr "Ida-Timor"
 
-#: 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 "Ecuador"
 
-#: 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 "Egiptus"
 
-#: 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 "El Salvador"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Equatorial Guinea"
 msgstr "Ekvatoriaal-Guinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: 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 "Eesti"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Ethiopia"
 msgstr "Etioopia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Falkland Islands"
 msgstr "Falklandi saared"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Faroe Islands"
 msgstr "F��ri saared"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Fiji"
 msgstr "Fid�i"
 
-#: 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 "Soome"
 
-#: 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 "Prantsusmaa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "French Guiana"
 msgstr "Prantsuse Guajaana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "French Polynesia"
 msgstr "Prantsuse Pol�neesia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Southern Territories"
 msgstr "Prantsuse L�unaalad"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Gambia"
 msgstr "Gambia"
 
-#: 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 "Gruusia"
 
-#: 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 "Saksamaa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Ghana"
 msgstr "Ghana"
 
-#: 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 "Gibraltar"
 
-#: 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 "Kreeka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Greenland"
 msgstr "Gr��nimaa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: 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 "Guatemala"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guinea-bissau"
 msgstr "Guinea-Bissau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guyana"
 msgstr "Guyana"
 
-#: 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 "Heard ja McDonald"
 
-#: 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 "Hong-Kong"
 
-#: 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 "Ungari"
 
-#: 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 "Island"
 
-#: 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 "India"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Indonesia"
 msgstr "Indoneesia"
 
-#: 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 "Iirimaa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Israel"
 msgstr "Iisrael"
 
-#: 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 "Itaalia"
 
-#: 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 "Jamaica"
 
-#: 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 "Jaapan"
 
-#: 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 "Jordaania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Kazakhstan"
 msgstr "Kasahstan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Kenya"
 msgstr "Keenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: 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 Vabariik"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuveit"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Kyrgyzstan"
 msgstr "K�rg�zstan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:117
-#: my-evolution/Locations.h:1183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "L�ti"
 
-#: 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:1198
 msgid "Lebanon"
 msgstr "Liibanon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: 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:1218
 msgid "Liberia"
 msgstr "Libeeria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: 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:1234
 msgid "Lithuania"
 msgstr "Leedu"
 
-#: 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:1268
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Macau"
 msgstr "Macau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Macedonia"
 msgstr "Makedoonia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Malaysia"
 msgstr "Malaisia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Maldives"
 msgstr "Malediivid"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Mali"
 msgstr "Mali"
 
-#: 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:1297
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Marshall Islands"
 msgstr "Marshalli saared"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Mauritania"
 msgstr "Mauritaania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: 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:1387
 msgid "Mexico"
 msgstr "Mehhiko"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Micronesia"
 msgstr "Mikroneesia"
 
-#: 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 Vabariik"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mongolia"
 msgstr "Mongoolia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: 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:1470
 msgid "Morocco"
 msgstr "Maroko"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mozambique"
 msgstr "Mosambiik"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Namibia"
 msgstr "Namiibia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Nepal"
 msgstr "Nepal"
 
-#: 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:1531
 msgid "Netherlands"
 msgstr "Holland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Netherlands Antilles"
 msgstr "Hollandi Antillid"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "New Caledonia"
 msgstr "Uus-Kaledoonia"
 
-#: 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:1560
 msgid "New Zealand"
 msgstr "Uus-Meremaa"
 
-#: 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:1562
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nigeria"
 msgstr "Nigeeria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niue"
 msgstr "Niue"
 
-#: 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:1574
 msgid "Norfolk Island"
 msgstr "Norfolk"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Northern Mariana Islands"
 msgstr "P�hja-Mariaanid"
 
-#: 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:1587
 msgid "Norway"
 msgstr "Norra"
 
-#: 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:1632
 msgid "Oman"
 msgstr "Omaan"
 
-#: 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:1673
 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 "Palau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Palestinian Territory"
 msgstr "Palestiina territoorium"
 
-#: 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:1683
 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 "Paapua Uus-Guinea"
 
-#: 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:1688
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: 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:1723
 msgid "Peru"
 msgstr "Peruu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr "Filipiinid"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: 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:1764
 msgid "Poland"
 msgstr "Poola"
 
-#: 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:1791
 msgid "Portugal"
 msgstr "Portugal"
 
-#: 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:1824
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: 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:1836
 msgid "Qatar"
 msgstr "Katar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:173
-msgid "Republic Of Korea"
-msgstr "Korea Vabariik"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:174
-msgid "Republic Of Moldova"
-msgstr "Moldova Vabariik"
-
-#: 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:1912
 msgid "Romania"
 msgstr "Rumeenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Russian Federation"
 msgstr "Venemaa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts ja Nevis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: 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 "Saint Vincent ja Grenadiinid"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Sao Tome And Principe"
 msgstr "S�o Tom� ja Pr�ncipe"
 
-#: 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:2035
 msgid "Saudi Arabia"
 msgstr "Saudi Araabia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Seychelles"
 msgstr "Sei�ellid"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: 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:2090
 msgid "Singapore"
 msgstr "Singapur"
 
-#: 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:2103
 msgid "Slovakia"
 msgstr "Slovakkia"
 
-#: 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:2104
 msgid "Slovenia"
 msgstr "Sloveenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Solomon Islands"
 msgstr "Saalomoni Saared"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Somalia"
 msgstr "Somaalia"
 
-#: 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:2119
 msgid "South Africa"
 msgstr "L�una-Aafrika Vabariik"
 
-#: 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 ""
 
-#: 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:2127
 msgid "Spain"
 msgstr "Hispaania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "St. Helena"
 msgstr "Saint Helena"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre And Miquelon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Sudan"
 msgstr "Sudaan"
 
-#: 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:2176
 msgid "Suriname"
 msgstr "Suriname"
 
-#: 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 "Teravm�ed"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Swaziland"
 msgstr "Svaasimaa"
 
-#: 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:2181
 msgid "Sweden"
 msgstr "Rootsi"
 
-#: 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:2183
 msgid "Switzerland"
 msgstr "�veits"
 
-#: 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:2205
 msgid "Taiwan"
 msgstr "Taivan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Tajikistan"
 msgstr "Tad�ikistan"
 
-#: 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 "Tansaania"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
 msgstr "Tai"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Trinidad And Tobago"
 msgstr "Trinidad ja Tobago"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tunisia"
 msgstr "Tuneesia"
 
-#: 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:2321
 msgid "Turkey"
 msgstr "T�rgi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Turkmenistan"
 msgstr "T�rkmenistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Turks And Caicos Islands"
 msgstr "Turks ja Caicos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:218
-msgid "U.S. Virgin Islands"
-msgstr "Neitsisaared, USA"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "United Arab Emirates"
 msgstr "Araabia �hendemiraadid"
 
-#: 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:2342
 msgid "United Kingdom"
 msgstr "�hendkuningriik"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr "Tansaania"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-#: my-evolution/Locations.h:2331
-msgid "United States"
-msgstr "�hendriigid"
-
-#: 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 "�hendriikida hajasaared"
 
-#: 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:2348
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: 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:2380
 msgid "Venezuela"
 msgstr "Venetsueela"
 
-#: 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:2392
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#, fuzzy
+msgid "Virgin Islands, British"
+msgstr "Neitsisaared, USA"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#, fuzzy
+msgid "Virgin Islands, U.S."
+msgstr "Neitsisaared, USA"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis ja Futuna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Western Sahara"
 msgstr "L��ne-Sahara"
 
-#: 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:2512
 msgid "Yemen"
 msgstr "Jeemen"
 
-#: 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:2524
 msgid "Yugoslavia"
 msgstr "Jugoslaavia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Zambia"
 msgstr "Sambia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Kustutada kontakt?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+msgid "Category editor not available."
+msgstr "Kategooriaredaktor pole saadaval."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+msgid "This contact belongs to these categories:"
+msgstr "Antud kontakt kuulub j�rgnevatesse kategooriatesse:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+msgid "Save Contact as VCard"
+msgstr "Kontakti salvestamine VKaardina"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Ei leidnud vidinat v�ljale: `%s'"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+msgid "Contact Quick-Add"
+msgstr "Kontakti kiirlisamine"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+msgid "Edit Full"
+msgstr "Redigeeri k�ike"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr "T�isnimi"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+msgid "E-mail"
+msgstr "E-post"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr "kaart.vcf"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+msgid "list"
+msgstr "nimekiri"
+
+#: 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 on juba olemas\n"
+"Kas soovid �le kirjutada?"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Aadress _2:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "Kontrolli aadressi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "_Riik:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "_Aadress:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "_Linn:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Sidejaoskonna postkast:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Maakond/Provints:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "_Postiindeks:"
 
@@ -2557,7 +2766,7 @@ msgstr ""
 "eksisteerib antud kaustas. Kas sa soovid seda ikka lisada?"
 
 #: 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 "Eriotsing"
 
@@ -2566,217 +2775,319 @@ msgstr "Eriotsing"
 msgid "Search"
 msgstr "Otsi"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 kaart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d kaarti"
 
-#: 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 "Salvesta VKaardina"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Ava"
-
-#: 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 "Saada kontakt edasi"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-msgid "Send Message to Contact"
-msgstr "Saada kontaktile s�num"
-
-#: 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 "Tr�ki"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr "Tr�ki �mbrik"
-
-#: 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 "Kustuta"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Viga kaardi muutmisel"
 
-#: 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:1043
 msgid "Success"
 msgstr "�nnestus"
 
-#: 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: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
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Hoidla offlain"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "Juurdep��s keelatud"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Kaarti ei leitud"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "Kaardi ID on juba olemas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Mitte toetatud protokoll"
 
-#: 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/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
 msgid "Cancelled"
 msgstr "Katkestatud"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Muu viga"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Viga listi lisamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Viga kaardi lisamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Viga listi muutmisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Viga listi eemaldamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Viga kaardi eemaldamisel"
 
-#. 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,�,z,t,u,v,w,�,�,�,�,x,y"
+#: addressbook/gui/widgets/e-addressbook-util.c:204
+#, fuzzy
+msgid "Display Cards?"
+msgstr "Kuva"
 
-#. 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,�,z,t,u,v,w,�,�,�,�,x,y"
+#: addressbook/gui/widgets/e-addressbook-util.c:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "Kuva"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Monte Scuro"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Kaardid puuduvad"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Kaardid puuduvad"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Kaardid puuduvad"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Kontakti lisamiseks vajuta siia *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Assistendi telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Telefon t��l"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Tagasihelistamise telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Firma telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Kodune telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Aadress t��l"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Kodune aadress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Autotelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Telefon t��l 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Kodune telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Muu telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Salvesta VKaardina"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Uus kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Uus kontaktide nimekiri"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Mine kausta"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Impordi..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Otsi kontakte"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Aadressiraamatu allikad..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Pilot'i s�tted"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Saada kontakt edasi"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Saada kontaktile s�num"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Tr�ki �mbrik"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "Ko_peeri kausta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "_T�sta kausta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: 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
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "K�e_solev vaade"
+
+#. 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:940
+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"
+
+#. 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
+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"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -2790,11 +3101,12 @@ msgstr "ja �ks teine kaart."
 msgid "Save in addressbook"
 msgstr "Salvesta aadressiraamatusse"
 
-#: 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 ""
@@ -2804,10 +3116,37 @@ msgstr ""
 "\n"
 "Uue kontakti lisamiseks tee siin topeltkl�ps."
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Selles vaates kired puuduvad\n"
+"\n"
+"Uue kontakti lisamiseks tee siin topeltkl�ps."
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Kaardi vaade"
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr "Tr�ki �mbrik"
+
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr "Tr�ki kaardid"
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+msgid "Print card"
+msgstr "Tr�ki kaart"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10-punktine Tahoma"
@@ -2877,6 +3216,7 @@ msgid "Include:"
 msgstr "Lisa:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "R�htpaigutus"
 
@@ -2901,11 +3241,12 @@ msgid "Options"
 msgstr "H��lestus"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Suund"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "Lehek�lg"
 
@@ -2921,7 +3262,9 @@ msgstr "Paber"
 msgid "Paper source:"
 msgstr "Paberiallikas:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "P�stpaigutus"
 
@@ -2977,1575 +3320,49 @@ msgstr "Laius:"
 msgid "_Font..."
 msgstr "_Kirjat��p..."
 
-#: addressbook/printing/e-contact-print.c:1115
-msgid "Print cards"
-msgstr "Tr�ki kaardid"
-
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
-msgid "Print card"
-msgstr "Tr�ki kaart"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr "Tr�ki �mbrik"
-
-#.
-#. * 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 "Aafrika/Addis_Ababa"
-
-#: calendar/zones.h:10
-msgid "Africa/Algiers"
-msgstr "Aafrika/Alzeeria"
-
-#: 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 "Aafrika/Kairo"
-
-#: 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 "Aafrika/Dakar"
-
-#: calendar/zones.h:24
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
-
-#: calendar/zones.h:25
-msgid "Africa/Djibouti"
-msgstr "Aafrika/Djibouti"
-
-#: 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 "Aafrika/Harare"
-
-#: calendar/zones.h:31
-msgid "Africa/Johannesburg"
-msgstr "Aafrika/Johannesburg"
-
-#: 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 "Aafrika/Lagos"
-
-#: 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 "Aafrika/Nairobi"
-
-#: 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 "Aafrika/Sao_Tome"
-
-#: calendar/zones.h:55
-msgid "Africa/Timbuktu"
-msgstr ""
-
-#: calendar/zones.h:56
-msgid "Africa/Tripoli"
-msgstr "Aafrika/Tripoli"
-
-#: calendar/zones.h:57
-msgid "Africa/Tunis"
-msgstr ""
-
-#: calendar/zones.h:58
-msgid "Africa/Windhoek"
-msgstr ""
-
-#: calendar/zones.h:59
-msgid "America/Adak"
-msgstr ""
-
-#: calendar/zones.h:60
-msgid "America/Anchorage"
-msgstr ""
-
-#: calendar/zones.h:61
-msgid "America/Anguilla"
-msgstr "Ameerika/Anguilla"
-
-#: calendar/zones.h:62
-msgid "America/Antigua"
-msgstr ""
-
-#: calendar/zones.h:63
-msgid "America/Araguaina"
-msgstr ""
-
-#: calendar/zones.h:64
-msgid "America/Aruba"
-msgstr ""
-
-#: calendar/zones.h:65
-msgid "America/Asuncion"
-msgstr ""
-
-#: calendar/zones.h:66
-msgid "America/Barbados"
-msgstr "Ameerika/Barbados"
-
-#: calendar/zones.h:67
-msgid "America/Belem"
-msgstr ""
-
-#: calendar/zones.h:68
-msgid "America/Belize"
-msgstr "Ameerika/Belize"
-
-#: calendar/zones.h:69
-msgid "America/Boa_Vista"
-msgstr ""
-
-#: calendar/zones.h:70
-msgid "America/Bogota"
-msgstr ""
-
-#: calendar/zones.h:71
-msgid "America/Boise"
-msgstr ""
-
-#: calendar/zones.h:72
-msgid "America/Buenos_Aires"
-msgstr "Ameerika/Buenos_Aires"
-
-#: calendar/zones.h:73
-msgid "America/Cambridge_Bay"
-msgstr ""
-
-#: calendar/zones.h:74
-msgid "America/Cancun"
-msgstr ""
-
-#: calendar/zones.h:75
-msgid "America/Caracas"
-msgstr ""
-
-#: calendar/zones.h:76
-msgid "America/Catamarca"
-msgstr ""
-
-#: calendar/zones.h:77
-msgid "America/Cayenne"
-msgstr ""
-
-#: calendar/zones.h:78
-msgid "America/Cayman"
-msgstr ""
-
-#: calendar/zones.h:79
-msgid "America/Chicago"
-msgstr "Ameerika/Chicago"
-
-#: calendar/zones.h:80
-msgid "America/Chihuahua"
-msgstr ""
-
-#: calendar/zones.h:81
-msgid "America/Cordoba"
-msgstr ""
-
-#: calendar/zones.h:82
-msgid "America/Costa_Rica"
-msgstr "Ameerika/Costa_Rica"
-
-#: calendar/zones.h:83
-msgid "America/Cuiaba"
-msgstr ""
-
-#: calendar/zones.h:84
-msgid "America/Curacao"
-msgstr ""
-
-#: calendar/zones.h:85
-msgid "America/Danmarkshavn"
-msgstr ""
-
-#: calendar/zones.h:86
-msgid "America/Dawson"
-msgstr ""
-
-#: calendar/zones.h:87
-msgid "America/Dawson_Creek"
-msgstr ""
-
-#: calendar/zones.h:88
-msgid "America/Denver"
-msgstr "Ameerika/Denver"
-
-#: calendar/zones.h:89
-msgid "America/Detroit"
-msgstr "Ameerika/Detroit"
-
-#: calendar/zones.h:90
-msgid "America/Dominica"
-msgstr "Ameeria/Dominica"
-
-#: calendar/zones.h:91
-msgid "America/Edmonton"
-msgstr "Ameerika/Edmonton"
-
-#: calendar/zones.h:92
-msgid "America/Eirunepe"
-msgstr ""
-
-#: calendar/zones.h:93
-msgid "America/El_Salvador"
-msgstr "Ameerika/El_Salvador"
-
-#: calendar/zones.h:94
-msgid "America/Fortaleza"
-msgstr ""
-
-#: calendar/zones.h:95
-msgid "America/Glace_Bay"
-msgstr ""
-
-#: calendar/zones.h:96
-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
-msgid "America/Grenada"
-msgstr "Ameeria/Grenada"
-
-#: calendar/zones.h:100
-msgid "America/Guadeloupe"
-msgstr "Ameerika/Guadeloupe"
-
-#: calendar/zones.h:101
-msgid "America/Guatemala"
-msgstr "Ameerika/Guatemala"
-
-#: calendar/zones.h:102
-msgid "America/Guayaquil"
-msgstr ""
-
-#: calendar/zones.h:103
-msgid "America/Guyana"
-msgstr ""
-
-#: calendar/zones.h:104
-msgid "America/Halifax"
-msgstr "Ameerika/Halifax"
-
-#: calendar/zones.h:105
-msgid "America/Havana"
-msgstr "Ameerika/Havana"
-
-#: calendar/zones.h:106
-msgid "America/Hermosillo"
-msgstr "Ameerika/Hermosillo"
-
-#: 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 "Ameerika/Indianapolis"
-
-#: calendar/zones.h:112
-msgid "America/Inuvik"
-msgstr ""
-
-#: calendar/zones.h:113
-msgid "America/Iqaluit"
-msgstr ""
-
-#: calendar/zones.h:114
-msgid "America/Jamaica"
-msgstr "Ameerika/Jamaika"
-
-#: calendar/zones.h:115
-msgid "America/Jujuy"
-msgstr ""
-
-#: calendar/zones.h:116
-msgid "America/Juneau"
-msgstr "Ameerika/Juneau"
-
-#: calendar/zones.h:117
-msgid "America/Kentucky/Louisville"
-msgstr "Ameerika/Kentucky/Louisville"
-
-#: calendar/zones.h:118
-msgid "America/Kentucky/Monticello"
-msgstr ""
-
-#: calendar/zones.h:119
-msgid "America/La_Paz"
-msgstr "Ameerika/La_Paz"
-
-#: calendar/zones.h:120
-msgid "America/Lima"
-msgstr "Ameerika/Lima"
-
-#: calendar/zones.h:121
-msgid "America/Los_Angeles"
-msgstr "Ameerika/Los_Angeles"
-
-#: calendar/zones.h:122
-msgid "America/Louisville"
-msgstr "Ameerika/Louisville"
-
-#: calendar/zones.h:123
-msgid "America/Maceio"
-msgstr ""
-
-#: calendar/zones.h:124
-msgid "America/Managua"
-msgstr "Ameerika/Managua"
-
-#: calendar/zones.h:125
-msgid "America/Manaus"
-msgstr "Ameerika/Manaus"
-
-#: calendar/zones.h:126
-msgid "America/Martinique"
-msgstr "Ameerika/Martinique"
-
-#: calendar/zones.h:127
-msgid "America/Mazatlan"
-msgstr "Ameerika/Mazatlan"
-
-#: calendar/zones.h:128
-msgid "America/Mendoza"
-msgstr "Ameerika/Mendoza"
-
-#: 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 "Ameerika/Montevideo"
-
-#: calendar/zones.h:135
-msgid "America/Montreal"
-msgstr "Ameerika/Montreal"
-
-#: calendar/zones.h:136
-msgid "America/Montserrat"
-msgstr ""
-
-#: calendar/zones.h:137
-msgid "America/Nassau"
-msgstr ""
-
-#: calendar/zones.h:138
-msgid "America/New_York"
-msgstr "Ameerika/New_York"
-
-#: calendar/zones.h:139
-msgid "America/Nipigon"
-msgstr ""
-
-#: calendar/zones.h:140
-msgid "America/Nome"
-msgstr ""
-
-#: calendar/zones.h:141
-msgid "America/Noronha"
-msgstr ""
-
-#: calendar/zones.h:142
-msgid "America/North_Dakota/Center"
-msgstr ""
-
-#: calendar/zones.h:143
-msgid "America/Panama"
-msgstr "Ameerika/Panama"
-
-#: calendar/zones.h:144
-msgid "America/Pangnirtung"
-msgstr ""
-
-#: calendar/zones.h:145
-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
-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
-msgid "America/Regina"
-msgstr ""
-
-#: calendar/zones.h:155
-msgid "America/Rio_Branco"
-msgstr ""
-
-#: calendar/zones.h:156
-msgid "America/Rosario"
-msgstr ""
-
-#: calendar/zones.h:157
-msgid "America/Santiago"
-msgstr "Ameerika/Santiago"
-
-#: calendar/zones.h:158
-msgid "America/Santo_Domingo"
-msgstr ""
-
-#: calendar/zones.h:159
-msgid "America/Sao_Paulo"
-msgstr ""
-
-#: calendar/zones.h:160
-msgid "America/Scoresbysund"
-msgstr ""
-
-#: calendar/zones.h:161
-msgid "America/Shiprock"
-msgstr ""
-
-#: calendar/zones.h:162
-msgid "America/St_Johns"
-msgstr ""
-
-#: calendar/zones.h:163
-msgid "America/St_Kitts"
-msgstr ""
-
-#: calendar/zones.h:164
-msgid "America/St_Lucia"
-msgstr ""
-
-#: calendar/zones.h:165
-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
-msgid "America/Tijuana"
-msgstr ""
-
-#: calendar/zones.h:172
-msgid "America/Tortola"
-msgstr ""
-
-#: calendar/zones.h:173
-msgid "America/Vancouver"
-msgstr "Ameerika/Vancouver"
-
-#: calendar/zones.h:174
-msgid "America/Whitehorse"
-msgstr ""
-
-#: calendar/zones.h:175
-msgid "America/Winnipeg"
-msgstr "Ameerika/Winnipeg"
-
-#: calendar/zones.h:176
-msgid "America/Yakutat"
-msgstr ""
-
-#: calendar/zones.h:177
-msgid "America/Yellowknife"
-msgstr ""
-
-#: calendar/zones.h:178
-msgid "Antarctica/Casey"
-msgstr ""
-
-#: calendar/zones.h:179
-msgid "Antarctica/Davis"
-msgstr ""
-
-#: calendar/zones.h:180
-msgid "Antarctica/DumontDUrville"
-msgstr ""
-
-#: calendar/zones.h:181
-msgid "Antarctica/Mawson"
-msgstr ""
-
-#: calendar/zones.h:182
-msgid "Antarctica/McMurdo"
-msgstr ""
-
-#: calendar/zones.h:183
-msgid "Antarctica/Palmer"
-msgstr ""
-
-#: calendar/zones.h:184
-msgid "Antarctica/South_Pole"
-msgstr ""
-
-#: calendar/zones.h:185
-msgid "Antarctica/Syowa"
-msgstr ""
-
-#: calendar/zones.h:186
-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 "Aasia/Bagdad"
-
-#: calendar/zones.h:196
-msgid "Asia/Bahrain"
-msgstr "Aasia/Bahrein"
-
-#: calendar/zones.h:197
-msgid "Asia/Baku"
-msgstr "Aasia/Bakuu"
-
-#: calendar/zones.h:198
-msgid "Asia/Bangkok"
-msgstr "Aasia/Bangkok"
-
-#: calendar/zones.h:199
-msgid "Asia/Beirut"
-msgstr "Aasia/Beirut"
-
-#: calendar/zones.h:200
-msgid "Asia/Bishkek"
-msgstr ""
-
-#: calendar/zones.h:201
-msgid "Asia/Brunei"
-msgstr "Aasia/Brunei"
-
-#: 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
-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 "Aasia/Dubai"
-
-#: calendar/zones.h:210
-msgid "Asia/Dushanbe"
-msgstr ""
-
-#: calendar/zones.h:211
-msgid "Asia/Gaza"
-msgstr "Aasia/Gaza"
-
-#: calendar/zones.h:212
-msgid "Asia/Harbin"
-msgstr ""
-
-#: calendar/zones.h:213
-msgid "Asia/Hong_Kong"
-msgstr "Aasia/Hong_Kong"
-
-#: calendar/zones.h:214
-msgid "Asia/Hovd"
-msgstr ""
-
-#: calendar/zones.h:215
-msgid "Asia/Irkutsk"
-msgstr "Aasia/Irkuts"
-
-#: calendar/zones.h:216
-msgid "Asia/Istanbul"
-msgstr "Aasia/Istanbu"
-
-#: calendar/zones.h:217
-msgid "Asia/Jakarta"
-msgstr "Aasia/Jakarta"
-
-#: calendar/zones.h:218
-msgid "Asia/Jayapura"
-msgstr ""
-
-#: calendar/zones.h:219
-msgid "Asia/Jerusalem"
-msgstr "Aasia/Jeruusalem"
-
-#: calendar/zones.h:220
-msgid "Asia/Kabul"
-msgstr "Aasia/Kabul"
-
-#: 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 "Aasia/Krasnojarsk"
-
-#: calendar/zones.h:226
-msgid "Asia/Kuala_Lumpur"
-msgstr "Aasia/Kuala_Lumpur"
-
-#: calendar/zones.h:227
-msgid "Asia/Kuching"
-msgstr ""
-
-#: calendar/zones.h:228
-msgid "Asia/Kuwait"
-msgstr "Aasia/Kuveit"
-
-#: calendar/zones.h:229
-msgid "Asia/Macao"
-msgstr ""
-
-#: calendar/zones.h:230
-msgid "Asia/Magadan"
-msgstr ""
-
-#: calendar/zones.h:231
-msgid "Asia/Manila"
-msgstr "Aasia/Manila"
-
-#: calendar/zones.h:232
-msgid "Asia/Muscat"
-msgstr ""
-
-#: calendar/zones.h:233
-msgid "Asia/Nicosia"
-msgstr ""
-
-#: calendar/zones.h:234
-msgid "Asia/Novosibirsk"
-msgstr "Aasia/Novosibirsk"
-
-#: calendar/zones.h:235
-msgid "Asia/Omsk"
-msgstr "Aasia/Omsk"
-
-#: calendar/zones.h:236
-msgid "Asia/Phnom_Penh"
-msgstr ""
-
-#: calendar/zones.h:237
-msgid "Asia/Pontianak"
-msgstr ""
-
-#: calendar/zones.h:238
-msgid "Asia/Pyongyang"
-msgstr ""
-
-#: calendar/zones.h:239
-msgid "Asia/Qatar"
-msgstr ""
-
-#: calendar/zones.h:240
-msgid "Asia/Rangoon"
-msgstr ""
-
-#: calendar/zones.h:241
-msgid "Asia/Riyadh"
-msgstr ""
-
-#: calendar/zones.h:242
-msgid "Asia/Saigon"
-msgstr ""
-
-#: calendar/zones.h:243
-msgid "Asia/Sakhalin"
-msgstr ""
-
-#: calendar/zones.h:244
-msgid "Asia/Samarkand"
-msgstr "Aasia/Samarkand"
-
-#: calendar/zones.h:245
-msgid "Asia/Seoul"
-msgstr ""
-
-#: calendar/zones.h:246
-msgid "Asia/Shanghai"
-msgstr "Aasia/Shanghai"
-
-#: calendar/zones.h:247
-msgid "Asia/Singapore"
-msgstr "Aasia/Singapur"
-
-#: calendar/zones.h:248
-msgid "Asia/Taipei"
-msgstr "Aasia/Taipei"
-
-#: calendar/zones.h:249
-msgid "Asia/Tashkent"
-msgstr ""
-
-#: calendar/zones.h:250
-msgid "Asia/Tbilisi"
-msgstr "Aasia/Tbilisi"
-
-#: calendar/zones.h:251
-msgid "Asia/Tehran"
-msgstr "Aasia/Tehran"
-
-#: calendar/zones.h:252
-msgid "Asia/Thimphu"
-msgstr ""
-
-#: calendar/zones.h:253
-msgid "Asia/Tokyo"
-msgstr "Aasia/Tokio"
-
-#: calendar/zones.h:254
-msgid "Asia/Ujung_Pandang"
-msgstr ""
-
-#: calendar/zones.h:255
-msgid "Asia/Ulaanbaatar"
-msgstr "Aasia/Ulaanbaator"
-
-#: calendar/zones.h:256
-msgid "Asia/Urumqi"
-msgstr ""
-
-#: calendar/zones.h:257
-msgid "Asia/Vientiane"
-msgstr ""
-
-#: calendar/zones.h:258
-msgid "Asia/Vladivostok"
-msgstr "Aasia/Vladivostok"
-
-#: calendar/zones.h:259
-msgid "Asia/Yakutsk"
-msgstr "Aasia/Jakuts"
-
-#: calendar/zones.h:260
-msgid "Asia/Yekaterinburg"
-msgstr "Aasia/Jekaterinburg"
-
-#: calendar/zones.h:261
-msgid "Asia/Yerevan"
-msgstr "Aasia/Jerevan"
-
-#: calendar/zones.h:262
-msgid "Atlantic/Azores"
-msgstr ""
-
-#: calendar/zones.h:263
-msgid "Atlantic/Bermuda"
-msgstr ""
-
-#: calendar/zones.h:264
-msgid "Atlantic/Canary"
-msgstr ""
-
-#: calendar/zones.h:265
-msgid "Atlantic/Cape_Verde"
-msgstr ""
-
-#: calendar/zones.h:266
-msgid "Atlantic/Faeroe"
-msgstr ""
-
-#: calendar/zones.h:267
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
-
-#: calendar/zones.h:268
-msgid "Atlantic/Madeira"
-msgstr ""
-
-#: calendar/zones.h:269
-msgid "Atlantic/Reykjavik"
-msgstr ""
-
-#: calendar/zones.h:270
-msgid "Atlantic/South_Georgia"
-msgstr ""
-
-#: calendar/zones.h:271
-msgid "Atlantic/St_Helena"
-msgstr ""
-
-#: calendar/zones.h:272
-msgid "Atlantic/Stanley"
-msgstr ""
-
-#: calendar/zones.h:273
-msgid "Australia/Adelaide"
-msgstr ""
-
-#: calendar/zones.h:274
-msgid "Australia/Brisbane"
-msgstr ""
-
-#: calendar/zones.h:275
-msgid "Australia/Broken_Hill"
-msgstr ""
-
-#: calendar/zones.h:276
-msgid "Australia/Darwin"
-msgstr ""
-
-#: calendar/zones.h:277
-msgid "Australia/Hobart"
-msgstr ""
-
-#: calendar/zones.h:278
-msgid "Australia/Lindeman"
-msgstr ""
-
-#: calendar/zones.h:279
-msgid "Australia/Lord_Howe"
-msgstr ""
-
-#: calendar/zones.h:280
-msgid "Australia/Melbourne"
-msgstr ""
-
-#: calendar/zones.h:281
-msgid "Australia/Perth"
-msgstr ""
-
-#: calendar/zones.h:282
-msgid "Australia/Sydney"
-msgstr "Austraalia/Sydney"
-
-#: calendar/zones.h:283
-msgid "Europe/Amsterdam"
-msgstr "Euroopa/Amsterdam"
-
-#: calendar/zones.h:284
-msgid "Europe/Andorra"
-msgstr "Euroopa/Andorra"
-
-#: calendar/zones.h:285
-msgid "Europe/Athens"
-msgstr "Euroopa/Ateena"
-
-#: calendar/zones.h:286
-msgid "Europe/Belfast"
-msgstr "Euroopa/Belfast"
-
-#: calendar/zones.h:287
-msgid "Europe/Belgrade"
-msgstr "Euroopa/Belgrad"
-
-#: calendar/zones.h:288
-msgid "Europe/Berlin"
-msgstr "Euroopa/Berliin"
-
-#: calendar/zones.h:289
-msgid "Europe/Bratislava"
-msgstr "Euroopa/Bratislava"
-
-#: calendar/zones.h:290
-msgid "Europe/Brussels"
-msgstr "Euroopa/Br�ssel"
-
-#: calendar/zones.h:291
-msgid "Europe/Bucharest"
-msgstr "Euroopa/Bukarest"
-
-#: calendar/zones.h:292
-msgid "Europe/Budapest"
-msgstr "Euroopa/Budapest"
-
-#: calendar/zones.h:293
-msgid "Europe/Chisinau"
-msgstr ""
-
-#: calendar/zones.h:294
-msgid "Europe/Copenhagen"
-msgstr "Euroopa/Kopenhaagen"
-
-#: calendar/zones.h:295
-msgid "Europe/Dublin"
-msgstr "Euroopa/Dublin"
-
-#: calendar/zones.h:296
-msgid "Europe/Gibraltar"
-msgstr "Euroopa/Gibraltar"
-
-#: calendar/zones.h:297
-msgid "Europe/Helsinki"
-msgstr "Euroopa/Helsingi"
-
-#: calendar/zones.h:298
-msgid "Europe/Istanbul"
-msgstr "Euroopa/Istanbul"
-
-#: calendar/zones.h:299
-msgid "Europe/Kaliningrad"
-msgstr "Euroopa/Kaliningrad"
-
-#: calendar/zones.h:300
-msgid "Europe/Kiev"
-msgstr "Euroopa/Kiiev"
-
-#: calendar/zones.h:301
-msgid "Europe/Lisbon"
-msgstr "Euroopa/Lisbon"
-
-#: calendar/zones.h:302
-msgid "Europe/Ljubljana"
-msgstr "Euroopa/Ljubljana"
-
-#: calendar/zones.h:303
-msgid "Europe/London"
-msgstr "Euroopa/London"
-
-#: calendar/zones.h:304
-msgid "Europe/Luxembourg"
-msgstr ""
-
-#: calendar/zones.h:305
-msgid "Europe/Madrid"
-msgstr "Euroopa/Madriid"
-
-#: calendar/zones.h:306
-msgid "Europe/Malta"
-msgstr "Euroopa/Malta"
-
-#: calendar/zones.h:307
-msgid "Europe/Minsk"
-msgstr "Euroopa/Minsk"
-
-#: calendar/zones.h:308
-msgid "Europe/Monaco"
-msgstr "Euroopa/Monaco"
-
-#: calendar/zones.h:309
-msgid "Europe/Moscow"
-msgstr "Euroopa/Moskva"
-
-#: calendar/zones.h:310
-msgid "Europe/Nicosia"
-msgstr ""
-
-#: calendar/zones.h:311
-msgid "Europe/Oslo"
-msgstr "Euroopa/Oslo"
-
-#: calendar/zones.h:312
-msgid "Europe/Paris"
-msgstr "Euroopa/Pariis"
-
-#: calendar/zones.h:313
-msgid "Europe/Prague"
-msgstr "Euroopa/Praha"
-
-#: calendar/zones.h:314
-msgid "Europe/Riga"
-msgstr "Euroopa/Riia"
-
-#: calendar/zones.h:315
-msgid "Europe/Rome"
-msgstr "Euroopa/Rooma"
-
-#: calendar/zones.h:316
-msgid "Europe/Samara"
-msgstr "Euroopa/Samaara"
-
-#: calendar/zones.h:317
-msgid "Europe/San_Marino"
-msgstr "Euroopa/San_Marino"
-
-#: calendar/zones.h:318
-msgid "Europe/Sarajevo"
-msgstr "Euroopa/Sarajevo"
-
-#: calendar/zones.h:319
-msgid "Europe/Simferopol"
-msgstr "Euroopa/Simferoopol"
-
-#: calendar/zones.h:320
-msgid "Europe/Skopje"
-msgstr "Euroopa/Skopje"
-
-#: calendar/zones.h:321
-msgid "Europe/Sofia"
-msgstr "Euroopa/Sofia"
-
-#: calendar/zones.h:322
-msgid "Europe/Stockholm"
-msgstr "Euroopa/Stockholm"
-
-#: calendar/zones.h:323
-msgid "Europe/Tallinn"
-msgstr "Euroopa/Tallinn"
-
-#: calendar/zones.h:324
-msgid "Europe/Tirane"
-msgstr "Euroopa/Tirana"
-
-#: calendar/zones.h:325
-msgid "Europe/Uzhgorod"
-msgstr "Euroopa/Uzhgorod"
-
-#: calendar/zones.h:326
-msgid "Europe/Vaduz"
-msgstr ""
-
-#: calendar/zones.h:327
-msgid "Europe/Vatican"
-msgstr "Euroopa/Vatikan"
-
-#: calendar/zones.h:328
-msgid "Europe/Vienna"
-msgstr "Euroopa/Viin"
-
-#: calendar/zones.h:329
-msgid "Europe/Vilnius"
-msgstr "Euroopa/Vilnius"
-
-#: calendar/zones.h:330
-msgid "Europe/Warsaw"
-msgstr "Euroopa/Varssavi"
-
-#: calendar/zones.h:331
-msgid "Europe/Zagreb"
-msgstr "Euroopa/Zagreb"
-
-#: calendar/zones.h:332
-msgid "Europe/Zaporozhye"
-msgstr "Europe/Zaporozie"
-
-#: calendar/zones.h:333
-msgid "Europe/Zurich"
-msgstr "Euroopa/Z�rich"
-
-#: calendar/zones.h:334
-msgid "Indian/Antananarivo"
-msgstr ""
-
-#: calendar/zones.h:335
-msgid "Indian/Chagos"
-msgstr ""
-
-#: calendar/zones.h:336
-msgid "Indian/Christmas"
-msgstr ""
-
-#: calendar/zones.h:337
-msgid "Indian/Cocos"
-msgstr ""
-
-#: calendar/zones.h:338
-msgid "Indian/Comoro"
-msgstr ""
-
-#: calendar/zones.h:339
-msgid "Indian/Kerguelen"
-msgstr ""
-
-#: calendar/zones.h:340
-msgid "Indian/Mahe"
-msgstr ""
-
-#: calendar/zones.h:341
-msgid "Indian/Maldives"
-msgstr ""
-
-#: calendar/zones.h:342
-msgid "Indian/Mauritius"
-msgstr ""
-
-#: calendar/zones.h:343
-msgid "Indian/Mayotte"
-msgstr ""
-
-#: calendar/zones.h:344
-msgid "Indian/Reunion"
-msgstr ""
-
-#: calendar/zones.h:345
-msgid "Pacific/Apia"
-msgstr ""
-
-#: calendar/zones.h:346
-msgid "Pacific/Auckland"
-msgstr ""
-
-#: calendar/zones.h:347
-msgid "Pacific/Chatham"
-msgstr ""
-
-#: calendar/zones.h:348
-msgid "Pacific/Easter"
-msgstr ""
-
-#: calendar/zones.h:349
-msgid "Pacific/Efate"
-msgstr ""
-
-#: calendar/zones.h:350
-msgid "Pacific/Enderbury"
-msgstr ""
-
-#: calendar/zones.h:351
-msgid "Pacific/Fakaofo"
-msgstr ""
-
-#: calendar/zones.h:352
-msgid "Pacific/Fiji"
-msgstr ""
-
-#: calendar/zones.h:353
-msgid "Pacific/Funafuti"
-msgstr ""
-
-#: calendar/zones.h:354
-msgid "Pacific/Galapagos"
-msgstr ""
-
-#: calendar/zones.h:355
-msgid "Pacific/Gambier"
-msgstr ""
-
-#: calendar/zones.h:356
-msgid "Pacific/Guadalcanal"
-msgstr ""
-
-#: calendar/zones.h:357
-msgid "Pacific/Guam"
-msgstr ""
-
-#: calendar/zones.h:358
-msgid "Pacific/Honolulu"
-msgstr ""
-
-#: calendar/zones.h:359
-msgid "Pacific/Johnston"
-msgstr ""
-
-#: calendar/zones.h:360
-msgid "Pacific/Kiritimati"
-msgstr ""
-
-#: calendar/zones.h:361
-msgid "Pacific/Kosrae"
-msgstr ""
-
-#: calendar/zones.h:362
-msgid "Pacific/Kwajalein"
-msgstr ""
-
-#: calendar/zones.h:363
-msgid "Pacific/Majuro"
-msgstr ""
-
-#: calendar/zones.h:364
-msgid "Pacific/Marquesas"
-msgstr ""
-
-#: calendar/zones.h:365
-msgid "Pacific/Midway"
-msgstr ""
-
-#: calendar/zones.h:366
-msgid "Pacific/Nauru"
-msgstr ""
-
-#: calendar/zones.h:367
-msgid "Pacific/Niue"
-msgstr ""
-
-#: calendar/zones.h:368
-msgid "Pacific/Norfolk"
-msgstr ""
-
-#: calendar/zones.h:369
-msgid "Pacific/Noumea"
-msgstr ""
-
-#: calendar/zones.h:370
-msgid "Pacific/Pago_Pago"
-msgstr ""
-
-#: calendar/zones.h:371
-msgid "Pacific/Palau"
-msgstr ""
-
-#: calendar/zones.h:372
-msgid "Pacific/Pitcairn"
-msgstr ""
-
-#: calendar/zones.h:373
-msgid "Pacific/Ponape"
-msgstr ""
-
-#: calendar/zones.h:374
-msgid "Pacific/Port_Moresby"
-msgstr ""
-
-#: calendar/zones.h:375
-msgid "Pacific/Rarotonga"
-msgstr ""
-
-#: calendar/zones.h:376
-msgid "Pacific/Saipan"
-msgstr ""
-
-#: calendar/zones.h:377
-msgid "Pacific/Tahiti"
-msgstr ""
-
-#: calendar/zones.h:378
-msgid "Pacific/Tarawa"
-msgstr ""
-
-#: calendar/zones.h:379
-msgid "Pacific/Tongatapu"
-msgstr ""
-
-#: calendar/zones.h:380
-msgid "Pacific/Truk"
-msgstr ""
-
-#: calendar/zones.h:381
-msgid "Pacific/Wake"
-msgstr ""
-
-#: calendar/zones.h:382
-msgid "Pacific/Wallis"
-msgstr ""
-
-#: calendar/zones.h:383
-msgid "Pacific/Yap"
-msgstr ""
-
 #: calendar/cal-util/cal-component.c:1207
 msgid "Untitled appointment"
 msgstr "Nimetu s�ndmus"
 
-#: 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:405 mail/message-list.c:668
+#: 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
 msgid "High"
 msgstr "K�rge"
 
-#: 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/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Keskmine"
 
-#: 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:407 mail/message-list.c:666
+#: 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
 msgid "Low"
 msgstr "Madal"
 
 #. 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
 msgid "Undefined"
 msgstr "M��ramata"
 
-#: 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 "Viga kalendriserveriga suhtlemisel"
 
-#: 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 "T�_htsus:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -4558,42 +3375,56 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Bonobo n�idisv�li kalendri kuvamiseks."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Kalendri ja �lesannete s�tted"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+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:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution'i kalendri iTip/iMip vaataja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution'i kalendrihaldamise komponent."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 "Alarmi teenus"
@@ -4602,22 +3433,10 @@ 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
-msgid "Evolution Alarm"
-msgstr "Evolution'i alarm "
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -4640,11 +3459,11 @@ msgstr "Easil�kkamise aeg (minutites)"
 msgid "_Edit appointment"
 msgstr "_Muuda kohtumist"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:670
+#: calendar/gui/alarm-notify/alarm-queue.c:675
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: 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"
@@ -4656,11 +3475,17 @@ msgstr ""
 "meili teel.  Evolution kuvab selle asemel hariliku\n"
 "meeldetuletusdialoogi."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:781
-#, c-format
+#: calendar/gui/alarm-notify/alarm-queue.c:753
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Hoiatus"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:758
+#, fuzzy, 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"
@@ -4673,7 +3498,12 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi k�ivitada?"
 
-#: 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 "Seda k�simust rohkem mitte esitada."
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "GNOME l�htestamine nurjus"
 
@@ -4685,50 +3515,65 @@ msgstr "Ei saa tekitada alarmiga m�rguande teenust"
 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 "Kokkuv�te sisaldab"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Kirjeldus sisaldab"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentaar sisaldab"
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr "Puudub"
+
+#: 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
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:800
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 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:384
 msgid "Private"
 msgstr "Isiklik"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Salajane"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Avalik"
 
@@ -4749,32 +3594,27 @@ msgid "W"
 msgstr "L�"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Vaba"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 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:479 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "L�petatud"
 
@@ -4790,9 +3630,10 @@ 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/mail-account-gui.c:1485
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
-#: mail/mail-config.glade.h:47
+#: 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
 #: 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
@@ -4807,23 +3648,15 @@ msgstr "Korduv"
 msgid "Assigned"
 msgstr "M��ratud"
 
-#: 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:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
 msgid "Yes"
 msgstr "Jah"
 
-#: 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:310
 msgid "No"
 msgstr "Ei"
 
-#. 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 "Otsin"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "P�eva vaade"
@@ -4840,63 +3673,79 @@ msgstr "N�dala vaade"
 msgid "Month View"
 msgstr "Kuu vaade"
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
-msgstr "Kokkuv�te sisaldab"
-
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
-msgstr "Kirjeldus sisaldab"
-
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "Kommentaar sisaldab"
-
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1072
-msgid "Unmatched"
-msgstr "Puudub"
-
-#: 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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Kohtumisi ja s�ndmusi sisaldav kaust"
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "�lesanded"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "�lesandeid sisaldav kaust"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "Lisab uue s�ndmuse"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "Uudistekanalite seadistused"
+
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "Kohtumine"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "Uus �lesanne"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "_�lesanne"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Uus s�ndmus"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "Uus _s�ndmus"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
-msgstr "Lisab uue �lesande"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Uus s�ndmus"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "Uus _�lesanne"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "S�ndmus"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Ei saa avada '%s' kausta"
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URI, mida kalender n�itab"
 
+#: 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 "Helialarmi h��lestus"
@@ -5089,7 +3938,7 @@ msgstr "Meeldetuletajad"
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuv�te:"
 
@@ -5097,11 +3946,11 @@ msgstr "Kokkuv�te:"
 msgid "_Options..."
 msgstr "_H��lestus..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "after"
 msgstr "p�rast"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "enne"
 
@@ -5118,7 +3967,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:120
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr "minuti(t)"
 
@@ -5159,170 +4008,168 @@ msgid "Color for tasks due today"
 msgstr "T�na l�ppevate �lesannete v�rvus"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Loo uusi s�ndmusi koos vaikimisi _meeldetuletajaga"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "P�ev(a)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "N�dala e_simene p�ev:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Reede"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Tund(i)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minut(it)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Esmasp�ev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "_Hilinenud �lesanded:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Laup�ev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-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:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "_Kuup�eva valikul kuvatakse n�dalate numbreid"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_P"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "P�hap�ev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "T�na _l�ppevad �lesanded:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "_N"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "_T"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "T�na _l�ppevad �lesanded:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "�lesannete n_imekiri"
 
-#: 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 "Neljap�ev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Kell"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Ajav_��nd:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Aja jaotused:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Aja vorming:"
 
-#: 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 "Teisip�ev"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Kolmap�ev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "T��n�dal"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tunnine (EL/PL)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 tunnine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "_K�si luba kirjete kustutamisel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "_N�dalal�pud kuvatakse kokkusurutud vormis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "N_�ita"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_R"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_�ldine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "_Peida l�petatud �lesanded p�rast"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_E"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "�le_j��nud"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "_Hilinenud �lesanded:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_L"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "�lesannete n_imekiri"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Aja jaotused:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_K"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "enne s�ndmuse algust"
 
@@ -5357,7 +4204,8 @@ msgstr "Antud p�eviku sissekanne on kustutatud."
 #: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
+msgstr ""
+"%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
 
 #: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
@@ -5388,73 +4236,60 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Muudatusi ei ole tehtud. Kas v�rskendada redaktorit?"
 
-#: 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 " kuni "
 
-#: 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 " (Valmis "
 
-#: 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 "L�petatud "
 
-#: 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 " (T�htaeg "
 
-#: 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 "T�htaeg "
 
-#: calendar/gui/dialogs/comp-editor.c:303
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "Ei saanud uuendada objekti!"
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Muuda s�ndmust"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "S�ndmus - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "�lesanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "P�eviku sissekanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Kokkuv�te puudub"
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "Kirjutada fail �le?"
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1915
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Antud nimega fail eksisteerib.\n"
-"Kirjutada �le?"
-
-#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "Salvesta kui..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -5512,7 +4347,7 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "S�ndmus"
 
@@ -5526,13 +4361,13 @@ msgstr "Kordumine"
 
 #: 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:365
 msgid "Scheduling"
 msgstr "Planeering"
 
 #: 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:368
 msgid "Meeting"
 msgstr "Kohtumine"
 
@@ -5579,7 +4414,7 @@ msgid "Pu_blic"
 msgstr "A_valik"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "N�ita aega kui"
 
@@ -5624,55 +4459,49 @@ msgstr "Osav�tja"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "�hine nimi"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Kust Delegeeritud"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Kuhu Delegeeritud"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Keel"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Liige"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:810
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Roll"
 
-#: 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: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"
 msgstr "Olek"
 
-#: 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "T��p"
@@ -5687,7 +4516,7 @@ msgid "_Change Organizer"
 msgstr "_Muuda organiseerijat:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "_Kustu teisi..."
 
@@ -5695,27 +4524,98 @@ msgstr "_Kustu teisi..."
 msgid "_Other Organizer"
 msgstr "_Teine organiseerija"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "See s�ndmus sisaldab ressursse, mida Evolution ei saa muuta."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "j�rgnevatel n�dalap�evadel:"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "nimekiri"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "sekund"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Muu"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "P�hjast"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "nimekiri"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Muu faks"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "kuup�ev"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "iga"
 
-#: 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 "korda"
 
@@ -5780,17 +4680,23 @@ msgstr "n�dal(at)"
 msgid "year(s)"
 msgstr "aasta(t)"
 
-#: 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 "Kohtumise infot on muudetud. Kas soovid saata uuendatud versiooni?"
+
+#: calendar/gui/dialogs/send-comp.c:59
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Kohtumise infot on muudetud. Kas soovid saata uuendatud versiooni?"
 
-#: 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 "�lesande infot on muudetud. Kas soovid saata uuendatud versiooni?"
 
-#: calendar/gui/dialogs/send-comp.c:65
-msgid "The journal entry has changed. Send an updated version?"
-msgstr "P�eviku sissekannet on muudetud. Kas soovid saata uuendatud versiooni?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
+msgstr "�lesande infot on muudetud. Kas soovid saata uuendatud versiooni?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
@@ -5807,7 +4713,7 @@ msgid "Progress"
 msgstr "Edenemine"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:966
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -5819,15 +4725,19 @@ msgstr "T�_htsus:"
 msgid "_Status:"
 msgstr "_Olek:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+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:322
+#: calendar/gui/dialogs/task-editor.c:324
 msgid "Assignment"
 msgstr "Kellele m��ratud"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Kirjeldus:"
 
@@ -5839,191 +4749,154 @@ msgstr "_Alguskuup�ev:"
 msgid "_Due Date:"
 msgstr "_T�htaeg:"
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, 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:751 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: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: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
 msgid "_Open"
 msgstr "A_va"
 
-#: 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:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Salvesta kui..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "_Tr�ki..."
+
+#: calendar/gui/e-calendar-table.c:978 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: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:979 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: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:980 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 "_Aseta"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "M��ra �lesanne"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Edasta i_Kalendrina"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_M�rgi l�petatuks"
 
-#: calendar/gui/e-calendar-table.c:956
-msgid "_Delete this Task"
-msgstr "K_ustuta �lesanne"
-
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_M�rgi �lesanded l�petatuks"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud �lesanded"
 
-#: 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:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "�lesande lisamiseks vajuta siia"
 
-#. 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 ""
-"Kuup�ev peab olema sisestatud formaadis: \n"
-"\n"
-"%s"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmid"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "L�petatud"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "L�petamise kuup�ev"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "T�htaeg"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "L�peb kuup�eval"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Geograafiline asukoht"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "T�htsus"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Kokkuv�te"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "�lesannete sorteerimine"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 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 ""
+"Kuup�ev peab olema sisestatud formaadis: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -6031,388 +4904,172 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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
 msgid "am"
 msgstr "el"
 
 #. 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
 msgid "pm"
 msgstr "pl"
 
-#: 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 "Uus _s�ndmus"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Uus kogu p�eva _s�ndmus"
 
-#: 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 "Kohtumine"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Uus �lesanne"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Tr�ki"
+
+#: 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 "Mine t�nasele _p�evale"
 
-#: 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 "_Mine kuup�evale..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3430
-msgid "_Delete this Appointment"
-msgstr "K_ustuta valitud s�ndmus"
+#: 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 "_Publitseeri vaba/h�ivatud infot"
+
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
+#, fuzzy
+msgid "_Configure..."
+msgstr "H��lestus"
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
+msgid "_Save As..."
+msgstr "_Salvesta kui..."
+
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "_Ajasta kohtumine"
+
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Edasta i_Kalendrina"
+
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "M�rgi see s�ndmus _nihutatavaks"
 
-#: 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 "Ku_stuta see s�ndmus"
 
-#: 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 "Kustuta k_�ik s�ndmused"
 
-#: calendar/gui/e-itip-control.c:536
-msgid "Meeting begins: <b>"
-msgstr "Kohtumise algus: <b>"
-
-#: calendar/gui/e-itip-control.c:541
-msgid "Task begins: <b>"
-msgstr "�lesande algus: <b>"
-
-#: calendar/gui/e-itip-control.c:546
-msgid "Free/Busy info begins: <b>"
-msgstr "H�ivatuse informatsioon algab: <b>"
-
-#: calendar/gui/e-itip-control.c:550
-msgid "Begins: <b>"
-msgstr "Algus: <b>"
-
-#: calendar/gui/e-itip-control.c:562
-msgid "Meeting ends: <b>"
-msgstr "Kohtumise l�pp: <b>"
-
-#: calendar/gui/e-itip-control.c:565
-msgid "Free/Busy info ends: <b>"
-msgstr "H�ivatuse informatsioon l�peb: <b>"
-
-#: calendar/gui/e-itip-control.c:569
-msgid "Ends: <b>"
-msgstr "L�pp: <b>"
-
-#: calendar/gui/e-itip-control.c:583
-msgid "Task Completed: <b>"
-msgstr "Valmis: <b>"
-
-#: calendar/gui/e-itip-control.c:593
-msgid "Task Due: <b>"
-msgstr "�lesande t�htaeg: <b>"
-
-#: calendar/gui/e-itip-control.c:630 calendar/gui/e-itip-control.c:679
-msgid "iCalendar Information"
-msgstr "iKalendri informatsioon"
-
-#. Title
-#: calendar/gui/e-itip-control.c:645
-msgid "iCalendar Error"
-msgstr "iKalendri viga"
-
-#: calendar/gui/e-itip-control.c:710 calendar/gui/e-itip-control.c:726
-msgid "An unknown person"
-msgstr "Tundmatu isik"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:733
-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:749
-msgid "<i>None</i>"
-msgstr "<i>Puudub</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
-msgid "Choose an action:"
-msgstr "Vali tegevus"
-
-#: calendar/gui/e-itip-control.c:791
-msgid "Update"
-msgstr "Uuenda"
-
-#: 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
-msgid "OK"
-msgstr "Olgu"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Accept"
-msgstr "N�ustu"
-
-# !PARANDA!
-#: calendar/gui/e-itip-control.c:808
-msgid "Tentatively accept"
-msgstr "Proovin�usolek"
-
-#: calendar/gui/e-itip-control.c:809
-msgid "Decline"
-msgstr "L�kka tagasi"
-
-#: calendar/gui/e-itip-control.c:823
-msgid "Send Free/Busy Information"
-msgstr "Vaba/h�ivatud info saatmine"
-
-#: calendar/gui/e-itip-control.c:836
-msgid "Update respondent status"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:849
-msgid "Send Latest Information"
-msgstr "Saadab v�rskeima informatsiooni"
-
-#: calendar/gui/e-itip-control.c:862 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "T�hista"
-
-#: calendar/gui/e-itip-control.c:910
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> publitseeris kohtumise info."
-
-#: calendar/gui/e-itip-control.c:911
-msgid "Meeting Information"
-msgstr "Kohtumise info"
-
-#: calendar/gui/e-itip-control.c:915
-#, 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:916
-msgid "Meeting Proposal"
-msgstr "Ettepanek kohtumiseks"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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-itip-control.c:920
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
+msgid "Error executing %s."
+msgstr "Viga %s k�ivitamisel."
 
-# !PARANDA!
-#: calendar/gui/e-itip-control.c:921
-msgid "Meeting Update"
-msgstr "Kohtumise info uuendus"
-
-#: calendar/gui/e-itip-control.c:925
-#, 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:926
-msgid "Meeting Update Request"
-msgstr "Soov muuta kohtumist"
-
-#: 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
+#: 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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:949
-#, 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:950
-msgid "Meeting Reply"
-msgstr "Kohtumise vastus"
-
-#: calendar/gui/e-itip-control.c:954
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> t�histas kohtumise."
-
-#: calendar/gui/e-itip-control.c:955
-msgid "Meeting Cancellation"
-msgstr "Kokkusaamise t�histamine"
-
-#: calendar/gui/e-itip-control.c:959 calendar/gui/e-itip-control.c:1030
-#: calendar/gui/e-itip-control.c:1065
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:960
-msgid "Bad Meeting Message"
-msgstr "Vigane kohtmise s�num"
-
-#: calendar/gui/e-itip-control.c:980
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> avalikustas �lesande info."
-
-#: calendar/gui/e-itip-control.c:981
-msgid "Task Information"
-msgstr "�lesande info"
-
-# !PARANDA!
-#: calendar/gui/e-itip-control.c:985
-#, 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:986
-msgid "Task Proposal"
-msgstr "Ettepanek �lesandeks"
-
-#: calendar/gui/e-itip-control.c:990
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:991
-msgid "Task Update"
-msgstr "�lesande uuendus"
-
-#: calendar/gui/e-itip-control.c:995
-#, 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:996
-msgid "Task Update Request"
-msgstr "Soov muuta �lesannet"
-
-#: calendar/gui/e-itip-control.c:1020
-#, 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:1021
-msgid "Task Reply"
-msgstr "�lesande vastus"
-
-#: calendar/gui/e-itip-control.c:1025
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> katkestas �lesande."
-
-#: calendar/gui/e-itip-control.c:1026
-msgid "Task Cancellation"
-msgstr "�lesande t�histamine"
-
-#: calendar/gui/e-itip-control.c:1031
-msgid "Bad Task Message"
-msgstr "Vigane �lesande s�num"
-
-#: calendar/gui/e-itip-control.c:1050
-#, 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:1051
-msgid "Free/Busy Information"
-msgstr "Vaba/h�ivatud info"
-
-#: calendar/gui/e-itip-control.c:1055
-#, 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:1056
-msgid "Free/Busy Request"
-msgstr "Soov saada vaba/h�ivatud infot"
-
-#: calendar/gui/e-itip-control.c:1060
-#, 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:1061
-msgid "Free/Busy Reply"
-msgstr "Vaba/h�ivatud vastus"
-
-#: calendar/gui/e-itip-control.c:1066
-msgid "Bad Free/Busy Message"
-msgstr "Vigane vaba/h�ivatud s�num"
-
-#: calendar/gui/e-itip-control.c:1139
-msgid "The message does not appear to be properly formed"
-msgstr "S�num ei tundu olevalt �igesti vormistatud"
-
-#: calendar/gui/e-itip-control.c:1158
-msgid "The message contains only unsupported requests."
-msgstr "S�num sisaldab ainult toetamata p�ringuid."
-
-#: calendar/gui/e-itip-control.c:1186 calendar/gui/e-itip-control.c:1192
-msgid "The attachment does not contain a valid calendar message"
-msgstr "Manus ei sisalda arusaadavat kalendriteadet"
-
-#: calendar/gui/e-itip-control.c:1217
-msgid "The attachment has no viewable calendar items"
-msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
-
-#: calendar/gui/e-itip-control.c:1316
+#: 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:1318
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Uuendamine l�petatud\n"
 
-#: calendar/gui/e-itip-control.c:1363
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 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:1371
+#: 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:1373
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Osav�tja olek uuendatud\n"
 
-#: calendar/gui/e-itip-control.c:1375
-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:1403
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Eemaldamine l�petatud"
 
-#: calendar/gui/e-itip-control.c:1422 calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:1424 calendar/gui/e-itip-control.c:1476
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Kirje saatmine eba�nnestus!\n"
 
-#: calendar/gui/e-itip-control.c:1649
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr "Osav�tjate nimekirjast ei leitud �htegi sinu identiteeti!\n"
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Vali kaust"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Vali kaust"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -6451,204 +5108,214 @@ msgstr "l�ppkuup."
 msgid "date-start"
 msgstr "alguskuup."
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Juhid"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1570
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Vajalikud osalejad"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "V�imalikud osalejad"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "Mitteosalejad"
 
-#: 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:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Individuaalne"
 
-#: 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:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Grupp"
 
-#: 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:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Ressurss"
 
-#: 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:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Ruum"
 
-#: 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:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "Juht"
 
-#: 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:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "N�utav osaleja"
 
-#: 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:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "V�imalik osav�tja"
 
-#: 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:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
-#: 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:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 msgid "Needs Action"
 msgstr "Vajab tegevust"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:824
+#: 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:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:825
+#: 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: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:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Katseline"
 
-#: 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:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "Delegeeritud"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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:2118 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:436
 msgid "Out of Office"
 msgstr "Kontorist v�ljas"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Info puudub"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_H��lestus"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "N�ita tunde _t��p�eva piires"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
 #, fuzzy
 msgid "Show _Zoomed Out"
 msgstr "N�ita kontsentreeritult"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "_V�rskenda vaba/h�ivatud"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Automaatne valik"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "_K�ik inimesed ja ressursid"
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "K�ik _inimesed ja �ks ressurss"
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "_Vajalikud inimesed"
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "Vajalikud inimesed ja _�ks ressurss"
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "Kohtumise _algus:"
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Kohtumise l_�pp:"
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan %s �lesanded"
 
-#: 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 "Ei saa laadida '%s' �lesandeid"
 
-#: 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' laadimiseks vajalik meetod ei ole toetatud."
 
-#: calendar/gui/e-week-view.c:3408 calendar/gui/e-week-view.c:3446
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "L�petamise kuup�ev"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Kustutan valitud objektid"
+
+#: calendar/gui/e-tasks.c:659
+#, fuzzy
+msgid "Expunging"
+msgstr "T�hjendan kausta"
+
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Uus _s�ndmus..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "K_ustuta valitud s�ndmus"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' avamiseks vajalik meetod on toetamata"
 
-#: calendar/gui/gnome-cal.c:1865
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Avan %s kalendri"
@@ -6709,297 +5376,260 @@ msgstr "Oktoober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr "Vaja on v�hemalt �hte osav�tjat"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "Organiseerija peab olema m��rtud."
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-msgid "Event information"
-msgstr "Teave s�ndmuse kohta"
-
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-msgid "Task information"
-msgstr "Teave �lesande kohta"
-
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-msgid "Journal information"
-msgstr ""
-
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-msgid "Free/Busy information"
-msgstr "Vaba/H�ivatud informatsioon"
-
-#: calendar/gui/itip-utils.c:321
-msgid "Calendar information"
-msgstr "Kalendri info"
-
-#: calendar/gui/itip-utils.c:370
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Vaba/H�ivatud informatsioon (%s - %s)"
-
-#: calendar/gui/itip-utils.c:382
-msgid "iCalendar information"
-msgstr "iKalendri informatsioon"
-
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema s�ndmusest osav�tja."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 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 "P"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "E"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "T"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "K"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "N"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "R"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "L"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valitud p�ev (%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 "Valitud n�dal (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Valitud kuu (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Valitud aasta (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "�lesanne"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Olek: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "T�htsus: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Valmis (%): %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Kategooriad: %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "Kontaktid:"
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Tr�ki kalender"
 
-#: 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Tr�kkimise eelvaade"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Tr�ki kirje"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Tr�kkimise s�tted"
 
-#: calendar/gui/tasks-control.c:126
-msgid "The URI of the tasks folder to display"
-msgstr "Kuvatava �lesannete kausta URI"
-
 #: calendar/gui/tasks-control-factory.c:75
-msgid "Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Ei suutnud tekitada �lesannete vaadet.  Kontrolli oma ORBit ja OAF "
 "seadistust."
 
+#: calendar/gui/tasks-control.c:147
+msgid "The URI of the tasks folder to display"
+msgstr "Kuvatava �lesannete kausta 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 ""
+"See tegevus eemaldab k�ik kustutatud s�numid. Hiljem ei ole neid s�numeid "
+"enam v�imalik taastada.\n"
+"\n"
+"Kas t�esti eemaldame kustutatud s�numid?"
+
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+msgid "Do not ask me again."
+msgstr "Seda k�simust rohkem mitte esitada."
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Tr�ki kaardid"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -7026,7 +5656,8 @@ msgstr ""
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
-msgstr "`%s' ei suudetud avada, �htegi elementi kalendrikaustast �le kanda ei saanud."
+msgstr ""
+"`%s' ei suudetud avada, �htegi elementi kalendrikaustast �le kanda ei saanud."
 
 #: calendar/gui/tasks-migrate.c:133
 #, fuzzy, c-format
@@ -7041,103 +5672,138 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "PETKNRL"
 
-#: 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 "Impordib VKaardi-vormingus failid Evolution'i."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "Impordib VKaardi-vormingus failid Evolution'i."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "Impordib VKaardi-vormingus failid Evolution'i."
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Kalendri s�num"
+
+#: 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 leidis Pine postifaile.\n"
+"Kas sa soovid neid Evolutionisse importida?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Kalender"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now n�uab 0 argumenti"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time n�uab 1 argumenti"
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time 1. argument peab olema string"
 
-#: 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 1. argument peab olema ISO 8601 vormingus kuup�eva/kella string"
+msgstr ""
+"make-time 1. argument peab olema ISO 8601 vormingus kuup�eva/kella string"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day vajab 2 argumenti"
 
-#: 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 1. argument peab olema time_t"
 
-#: calendar/pcs/query.c:324
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:356
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:388
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:691
+#: 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:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
@@ -7145,6 +5811,1519 @@ msgstr ""
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Otsinguavaldise t�itmine ei andnud t�ev��rtuset��pi v��rtust"
 
+#.
+#. * 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 "Aafrika/Addis_Ababa"
+
+#: calendar/zones.h:10
+msgid "Africa/Algiers"
+msgstr "Aafrika/Alzeeria"
+
+#: 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 "Aafrika/Kairo"
+
+#: 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 "Aafrika/Dakar"
+
+#: calendar/zones.h:24
+msgid "Africa/Dar_es_Salaam"
+msgstr ""
+
+#: calendar/zones.h:25
+msgid "Africa/Djibouti"
+msgstr "Aafrika/Djibouti"
+
+#: 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 "Aafrika/Harare"
+
+#: calendar/zones.h:31
+msgid "Africa/Johannesburg"
+msgstr "Aafrika/Johannesburg"
+
+#: 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 "Aafrika/Lagos"
+
+#: 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 "Aafrika/Nairobi"
+
+#: 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 "Aafrika/Sao_Tome"
+
+#: calendar/zones.h:55
+msgid "Africa/Timbuktu"
+msgstr ""
+
+#: calendar/zones.h:56
+msgid "Africa/Tripoli"
+msgstr "Aafrika/Tripoli"
+
+#: calendar/zones.h:57
+msgid "Africa/Tunis"
+msgstr ""
+
+#: calendar/zones.h:58
+msgid "Africa/Windhoek"
+msgstr ""
+
+#: calendar/zones.h:59
+msgid "America/Adak"
+msgstr ""
+
+#: calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr ""
+
+#: calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr "Ameerika/Anguilla"
+
+#: calendar/zones.h:62
+msgid "America/Antigua"
+msgstr ""
+
+#: calendar/zones.h:63
+msgid "America/Araguaina"
+msgstr ""
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr ""
+
+#: calendar/zones.h:66
+msgid "America/Barbados"
+msgstr "Ameerika/Barbados"
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: calendar/zones.h:68
+msgid "America/Belize"
+msgstr "Ameerika/Belize"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+msgid "America/Bogota"
+msgstr ""
+
+#: calendar/zones.h:71
+msgid "America/Boise"
+msgstr ""
+
+#: calendar/zones.h:72
+msgid "America/Buenos_Aires"
+msgstr "Ameerika/Buenos_Aires"
+
+#: calendar/zones.h:73
+msgid "America/Cambridge_Bay"
+msgstr ""
+
+#: calendar/zones.h:74
+msgid "America/Cancun"
+msgstr ""
+
+#: calendar/zones.h:75
+msgid "America/Caracas"
+msgstr ""
+
+#: calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr ""
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+msgid "America/Cayman"
+msgstr ""
+
+#: calendar/zones.h:79
+msgid "America/Chicago"
+msgstr "Ameerika/Chicago"
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr ""
+
+#: calendar/zones.h:82
+msgid "America/Costa_Rica"
+msgstr "Ameerika/Costa_Rica"
+
+#: calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr ""
+
+#: calendar/zones.h:84
+msgid "America/Curacao"
+msgstr ""
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+msgid "America/Dawson"
+msgstr ""
+
+#: calendar/zones.h:87
+msgid "America/Dawson_Creek"
+msgstr ""
+
+#: calendar/zones.h:88
+msgid "America/Denver"
+msgstr "Ameerika/Denver"
+
+#: calendar/zones.h:89
+msgid "America/Detroit"
+msgstr "Ameerika/Detroit"
+
+#: calendar/zones.h:90
+msgid "America/Dominica"
+msgstr "Ameeria/Dominica"
+
+#: calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr "Ameerika/Edmonton"
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+msgid "America/El_Salvador"
+msgstr "Ameerika/El_Salvador"
+
+#: calendar/zones.h:94
+msgid "America/Fortaleza"
+msgstr ""
+
+#: calendar/zones.h:95
+msgid "America/Glace_Bay"
+msgstr ""
+
+#: calendar/zones.h:96
+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
+msgid "America/Grenada"
+msgstr "Ameeria/Grenada"
+
+#: calendar/zones.h:100
+msgid "America/Guadeloupe"
+msgstr "Ameerika/Guadeloupe"
+
+#: calendar/zones.h:101
+msgid "America/Guatemala"
+msgstr "Ameerika/Guatemala"
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+msgid "America/Guyana"
+msgstr ""
+
+#: calendar/zones.h:104
+msgid "America/Halifax"
+msgstr "Ameerika/Halifax"
+
+#: calendar/zones.h:105
+msgid "America/Havana"
+msgstr "Ameerika/Havana"
+
+#: calendar/zones.h:106
+msgid "America/Hermosillo"
+msgstr "Ameerika/Hermosillo"
+
+#: 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 "Ameerika/Indianapolis"
+
+#: calendar/zones.h:112
+msgid "America/Inuvik"
+msgstr ""
+
+#: calendar/zones.h:113
+msgid "America/Iqaluit"
+msgstr ""
+
+#: calendar/zones.h:114
+msgid "America/Jamaica"
+msgstr "Ameerika/Jamaika"
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+msgid "America/Juneau"
+msgstr "Ameerika/Juneau"
+
+#: calendar/zones.h:117
+msgid "America/Kentucky/Louisville"
+msgstr "Ameerika/Kentucky/Louisville"
+
+#: calendar/zones.h:118
+msgid "America/Kentucky/Monticello"
+msgstr ""
+
+#: calendar/zones.h:119
+msgid "America/La_Paz"
+msgstr "Ameerika/La_Paz"
+
+#: calendar/zones.h:120
+msgid "America/Lima"
+msgstr "Ameerika/Lima"
+
+#: calendar/zones.h:121
+msgid "America/Los_Angeles"
+msgstr "Ameerika/Los_Angeles"
+
+#: calendar/zones.h:122
+msgid "America/Louisville"
+msgstr "Ameerika/Louisville"
+
+#: calendar/zones.h:123
+msgid "America/Maceio"
+msgstr ""
+
+#: calendar/zones.h:124
+msgid "America/Managua"
+msgstr "Ameerika/Managua"
+
+#: calendar/zones.h:125
+msgid "America/Manaus"
+msgstr "Ameerika/Manaus"
+
+#: calendar/zones.h:126
+msgid "America/Martinique"
+msgstr "Ameerika/Martinique"
+
+#: calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr "Ameerika/Mazatlan"
+
+#: calendar/zones.h:128
+msgid "America/Mendoza"
+msgstr "Ameerika/Mendoza"
+
+#: 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 "Ameerika/Montevideo"
+
+#: calendar/zones.h:135
+msgid "America/Montreal"
+msgstr "Ameerika/Montreal"
+
+#: calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr ""
+
+#: calendar/zones.h:137
+msgid "America/Nassau"
+msgstr ""
+
+#: calendar/zones.h:138
+msgid "America/New_York"
+msgstr "Ameerika/New_York"
+
+#: calendar/zones.h:139
+msgid "America/Nipigon"
+msgstr ""
+
+#: calendar/zones.h:140
+msgid "America/Nome"
+msgstr ""
+
+#: calendar/zones.h:141
+msgid "America/Noronha"
+msgstr ""
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+msgid "America/Panama"
+msgstr "Ameerika/Panama"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+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
+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
+msgid "America/Regina"
+msgstr ""
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+msgid "America/Rosario"
+msgstr ""
+
+#: calendar/zones.h:157
+msgid "America/Santiago"
+msgstr "Ameerika/Santiago"
+
+#: calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr ""
+
+#: calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr ""
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr ""
+
+#: calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr ""
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr ""
+
+#: calendar/zones.h:165
+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
+msgid "America/Tijuana"
+msgstr ""
+
+#: calendar/zones.h:172
+msgid "America/Tortola"
+msgstr ""
+
+#: calendar/zones.h:173
+msgid "America/Vancouver"
+msgstr "Ameerika/Vancouver"
+
+#: calendar/zones.h:174
+msgid "America/Whitehorse"
+msgstr ""
+
+#: calendar/zones.h:175
+msgid "America/Winnipeg"
+msgstr "Ameerika/Winnipeg"
+
+#: calendar/zones.h:176
+msgid "America/Yakutat"
+msgstr ""
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: calendar/zones.h:178
+msgid "Antarctica/Casey"
+msgstr ""
+
+#: calendar/zones.h:179
+msgid "Antarctica/Davis"
+msgstr ""
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: calendar/zones.h:181
+msgid "Antarctica/Mawson"
+msgstr ""
+
+#: calendar/zones.h:182
+msgid "Antarctica/McMurdo"
+msgstr ""
+
+#: calendar/zones.h:183
+msgid "Antarctica/Palmer"
+msgstr ""
+
+#: calendar/zones.h:184
+msgid "Antarctica/South_Pole"
+msgstr ""
+
+#: calendar/zones.h:185
+msgid "Antarctica/Syowa"
+msgstr ""
+
+#: calendar/zones.h:186
+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 "Aasia/Bagdad"
+
+#: calendar/zones.h:196
+msgid "Asia/Bahrain"
+msgstr "Aasia/Bahrein"
+
+#: calendar/zones.h:197
+msgid "Asia/Baku"
+msgstr "Aasia/Bakuu"
+
+#: calendar/zones.h:198
+msgid "Asia/Bangkok"
+msgstr "Aasia/Bangkok"
+
+#: calendar/zones.h:199
+msgid "Asia/Beirut"
+msgstr "Aasia/Beirut"
+
+#: calendar/zones.h:200
+msgid "Asia/Bishkek"
+msgstr ""
+
+#: calendar/zones.h:201
+msgid "Asia/Brunei"
+msgstr "Aasia/Brunei"
+
+#: 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
+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 "Aasia/Dubai"
+
+#: calendar/zones.h:210
+msgid "Asia/Dushanbe"
+msgstr ""
+
+#: calendar/zones.h:211
+msgid "Asia/Gaza"
+msgstr "Aasia/Gaza"
+
+#: calendar/zones.h:212
+msgid "Asia/Harbin"
+msgstr ""
+
+#: calendar/zones.h:213
+msgid "Asia/Hong_Kong"
+msgstr "Aasia/Hong_Kong"
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr "Aasia/Irkuts"
+
+#: calendar/zones.h:216
+msgid "Asia/Istanbul"
+msgstr "Aasia/Istanbu"
+
+#: calendar/zones.h:217
+msgid "Asia/Jakarta"
+msgstr "Aasia/Jakarta"
+
+#: calendar/zones.h:218
+msgid "Asia/Jayapura"
+msgstr ""
+
+#: calendar/zones.h:219
+msgid "Asia/Jerusalem"
+msgstr "Aasia/Jeruusalem"
+
+#: calendar/zones.h:220
+msgid "Asia/Kabul"
+msgstr "Aasia/Kabul"
+
+#: 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 "Aasia/Krasnojarsk"
+
+#: calendar/zones.h:226
+msgid "Asia/Kuala_Lumpur"
+msgstr "Aasia/Kuala_Lumpur"
+
+#: calendar/zones.h:227
+msgid "Asia/Kuching"
+msgstr ""
+
+#: calendar/zones.h:228
+msgid "Asia/Kuwait"
+msgstr "Aasia/Kuveit"
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr "Aasia/Manila"
+
+#: calendar/zones.h:232
+msgid "Asia/Muscat"
+msgstr ""
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr "Aasia/Novosibirsk"
+
+#: calendar/zones.h:235
+msgid "Asia/Omsk"
+msgstr "Aasia/Omsk"
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+msgid "Asia/Qatar"
+msgstr ""
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr "Aasia/Samarkand"
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr "Aasia/Shanghai"
+
+#: calendar/zones.h:247
+msgid "Asia/Singapore"
+msgstr "Aasia/Singapur"
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr "Aasia/Taipei"
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr "Aasia/Tbilisi"
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr "Aasia/Tehran"
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr "Aasia/Tokio"
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr "Aasia/Ulaanbaator"
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr "Aasia/Vladivostok"
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr "Aasia/Jakuts"
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr "Aasia/Jekaterinburg"
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr "Aasia/Jerevan"
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+msgid "Atlantic/Bermuda"
+msgstr ""
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+msgid "Atlantic/Cape_Verde"
+msgstr ""
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+msgid "Australia/Adelaide"
+msgstr ""
+
+#: calendar/zones.h:274
+msgid "Australia/Brisbane"
+msgstr ""
+
+#: calendar/zones.h:275
+msgid "Australia/Broken_Hill"
+msgstr ""
+
+#: calendar/zones.h:276
+msgid "Australia/Darwin"
+msgstr ""
+
+#: calendar/zones.h:277
+msgid "Australia/Hobart"
+msgstr ""
+
+#: calendar/zones.h:278
+msgid "Australia/Lindeman"
+msgstr ""
+
+#: calendar/zones.h:279
+msgid "Australia/Lord_Howe"
+msgstr ""
+
+#: calendar/zones.h:280
+msgid "Australia/Melbourne"
+msgstr ""
+
+#: calendar/zones.h:281
+msgid "Australia/Perth"
+msgstr ""
+
+#: calendar/zones.h:282
+msgid "Australia/Sydney"
+msgstr "Austraalia/Sydney"
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr "Euroopa/Amsterdam"
+
+#: calendar/zones.h:284
+msgid "Europe/Andorra"
+msgstr "Euroopa/Andorra"
+
+#: calendar/zones.h:285
+msgid "Europe/Athens"
+msgstr "Euroopa/Ateena"
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr "Euroopa/Belfast"
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr "Euroopa/Belgrad"
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr "Euroopa/Berliin"
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr "Euroopa/Bratislava"
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr "Euroopa/Br�ssel"
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr "Euroopa/Bukarest"
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr "Euroopa/Budapest"
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr "Euroopa/Kopenhaagen"
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr "Euroopa/Dublin"
+
+#: calendar/zones.h:296
+msgid "Europe/Gibraltar"
+msgstr "Euroopa/Gibraltar"
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr "Euroopa/Helsingi"
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr "Euroopa/Istanbul"
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr "Euroopa/Kaliningrad"
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr "Euroopa/Kiiev"
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr "Euroopa/Lisbon"
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr "Euroopa/Ljubljana"
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr "Euroopa/London"
+
+#: calendar/zones.h:304
+msgid "Europe/Luxembourg"
+msgstr ""
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr "Euroopa/Madriid"
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr "Euroopa/Malta"
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr "Euroopa/Minsk"
+
+#: calendar/zones.h:308
+msgid "Europe/Monaco"
+msgstr "Euroopa/Monaco"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr "Euroopa/Moskva"
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr "Euroopa/Oslo"
+
+#: calendar/zones.h:312
+msgid "Europe/Paris"
+msgstr "Euroopa/Pariis"
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr "Euroopa/Praha"
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr "Euroopa/Riia"
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr "Euroopa/Rooma"
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr "Euroopa/Samaara"
+
+#: calendar/zones.h:317
+msgid "Europe/San_Marino"
+msgstr "Euroopa/San_Marino"
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr "Euroopa/Sarajevo"
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr "Euroopa/Simferoopol"
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr "Euroopa/Skopje"
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr "Euroopa/Sofia"
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr "Euroopa/Stockholm"
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr "Euroopa/Tallinn"
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr "Euroopa/Tirana"
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr "Euroopa/Uzhgorod"
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr "Euroopa/Vatikan"
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr "Euroopa/Viin"
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr "Euroopa/Vilnius"
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr "Euroopa/Varssavi"
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr "Euroopa/Zagreb"
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr "Europe/Zaporozie"
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr "Euroopa/Z�rich"
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+msgid "Indian/Comoro"
+msgstr ""
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+msgid "Indian/Mahe"
+msgstr ""
+
+#: calendar/zones.h:341
+msgid "Indian/Maldives"
+msgstr ""
+
+#: calendar/zones.h:342
+msgid "Indian/Mauritius"
+msgstr ""
+
+#: calendar/zones.h:343
+msgid "Indian/Mayotte"
+msgstr ""
+
+#: calendar/zones.h:344
+msgid "Indian/Reunion"
+msgstr ""
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
 #: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
 msgstr "See �iffer ei toeta allkirjastamist"
@@ -7166,6 +7345,18 @@ msgstr "See �iffer ei toeta kr�pteerimist"
 msgid "Decryption is not supported by this cipher"
 msgstr "See �iffer ei toeta dekr�pteerimist"
 
+#: camel/camel-data-cache.c:169
+#, fuzzy
+msgid "Unable to create cache path"
+msgstr ""
+"V�ljundfaili loomine nurjus: %s\n"
+" %s"
+
+#: camel/camel-data-cache.c:441
+#, fuzzy, c-format
+msgid "Could not remove cache entry: %s: %s"
+msgstr "Ei suuda avada puhverkataloogi: %s"
+
 #: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
@@ -7196,81 +7387,66 @@ msgstr "Taass�nkroniseeritakse serveriga"
 msgid "You must be working online to complete this operation"
 msgstr "Selle operatsiooni t�itmiseks pead olema onlainis"
 
-#: 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 "Kaustade s�nkroniseerimine"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, 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
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Viga filtri t�itmisel: %s: %s"
+
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Puhverkausta pole v�imalik avada"
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Puhverkausta pole v�imalik t��delda"
 
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "V�etakse vastu teadet %d (%d%%)"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "S�numi avamine eba�nnestus"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nurjumine teate %d juures"
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Kausta s�nkroniseerimine"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "T�mban %d. s�numit %dst"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d. teate juures %d'st tekkis viga"
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Viga filtri anal��sil: %s: %s"
-
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Viga filtri t�itmisel: %s: %s"
+#: camel/camel-filter-search.c:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "S�numi lahtikr�ptimine eba�nnestus."
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Viga filtri abil otsimisel %s: %s"
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Toetamata operatsioon: lisa s�num: %s"
-
-#: camel/camel-folder.c:1040
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Toetamata operatsioon: otsimine avaldise j�rgi: %s"
-
-#: camel/camel-folder.c:1080
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Toetamata operatsioon: otsing UID j�rgi: %s"
-
-#: camel/camel-folder.c:1262
-msgid "Moving messages"
-msgstr "S�numite liigutamine"
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -7279,7 +7455,7 @@ msgstr ""
 "Otsinguavaldist ei ole v�imalik anal��sida: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -7288,20 +7464,34 @@ msgstr ""
 "Viga otsinguavaldise t�itmisel: %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
 #, fuzzy
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) n�uab �htainust t�ev��rtust��pi tulemust"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, fuzzy, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "T�idetakse p�ring tundmatul p�isel: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-#, fuzzy
-msgid "Invalid type in body-contains, expecting string"
-msgstr "(body-contains) Vale t��p, oodati stringi"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Toetamata operatsioon: lisa s�num: %s"
+
+#: camel/camel-folder.c:1038
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Toetamata operatsioon: otsimine avaldise j�rgi: %s"
+
+#: camel/camel-folder.c:1078
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Toetamata operatsioon: otsing UID j�rgi: %s"
+
+#: camel/camel-folder.c:1260
+msgid "Moving messages"
+msgstr "S�numite liigutamine"
 
 #: camel/camel-lock-client.c:111
 #, fuzzy, c-format
@@ -7408,124 +7598,122 @@ msgstr "Palun sisesta oma %s parool %s jaoks"
 msgid "Please enter your %s passphrase"
 msgstr "Palun sisesta oma %s parool"
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 "Seda teadet pole v�imalik allkirjastada: puudub allkirjastatav algtekst."
 
-#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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:755
+#: 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:953
+#: 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:959
+#: 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:970
+#: 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:1143
+#: 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:1153
+#: 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:1160
+#: 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:1169
+#: 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:1337
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Seda teadet pole v�imalik dekr�pteerida: puudub dekr�pteeritav algtekst"
+msgstr ""
+"Seda teadet pole v�imalik dekr�pteerida: puudub dekr�pteeritav algtekst"
 
-#: camel/camel-pgp-context.c:1345
+#: 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:1352
+#: 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:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "See on s�numi digitaalselt allkirjastatud osa"
 
-#: camel/camel-pgp-mime.c:485
-msgid "This is an encrypted message part"
-msgstr "See on digitaalselt allkirjastatud osa"
-
-#: 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 "Ei saa laadida %s: s�steem ei toeta moodulite laadimist."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Ei saa laadida %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 "Ei saa laadida %s: moodulis puudub initsialiseerimiskood."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:207
+#: 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:264
+#: 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:267
-#: camel/providers/smtp/camel-smtp-transport.c:273
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(tundmatu host)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "Operatsioon katekstatud"
 
-#: camel/camel-remote-store.c:484
+#: 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"
@@ -7633,13 +7821,14 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Serverilt saadi vigane autentimise vastus."
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
-msgstr "NT meldimine"
+#, 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."
@@ -7649,9 +7838,20 @@ msgstr "See valik loob �henduse serveriga kasutades tavalist parooli."
 msgid "Unknown authentication state."
 msgstr "Tundmatu autentimise olek."
 
+#: 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 "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:301
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: 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"
 
@@ -7695,26 +7895,41 @@ msgstr "URL '%s' vajab hosti osa"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vajab kataloogitee osa"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Lahendan: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Viga nime lahendamisel: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Hostinime lahendamine eba�nnestus: %s: ei leia hosti"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Hostinime lahendamine eba�nnestus: %s: p�hjus teadmata"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Lahendan: %s"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Hostinime lahendamine eba�nnestus: %s: ei leia hosti"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Hostinime lahendamine eba�nnestus: %s: p�hjus teadmata"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
@@ -7723,12 +7938,12 @@ msgstr ""
 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 ""
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7774,36 +7989,22 @@ msgstr "S�numi lahtikr�ptimine eba�nnestus."
 msgid "Failed to verify certificates."
 msgstr "Sertifikaatide kontroll eba�nnestus."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-# !PARANDA! - Locality & State
-#: 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 ""
-"E-post: %s\n"
-"�hine nimi: %s\n"
-"Organisatsiooni �ksus: %s\n"
-"Organisatsiooni: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Riik: %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"
@@ -7813,6 +8014,36 @@ msgid ""
 "Do you wish to accept anyway?"
 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
+#, c-format
+msgid ""
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
+msgstr ""
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -7823,27 +8054,27 @@ msgstr ""
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "S�numit %s ei leitud"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kausta kustutamine nurjus: %s: kausta ei ole olemas"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kausta �mbernimetamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
@@ -7852,76 +8083,76 @@ msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Ootamatu vastus IMAP serverilt: %s"
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAPi k�sk eba�nnestus: %s"
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr "Serveri vastus l�ppes liiga vara."
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, 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:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ootamatu OK vastus IMAP serverilt: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ei saa luua kataloogi %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ei saa laadida %s kokkuv�tet"
 
-#: camel/providers/imap/camel-imap-folder.c:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Kontrollin muudetud s�numite olemasolu"
 
-#: camel/providers/imap/camel-imap-folder.c:1585
-#: camel/providers/imap/camel-imap-folder.c:2028
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "See s�num ei ole hetkel k�ttesaadav"
 
-#: camel/providers/imap/camel-imap-folder.c:1740
-#: camel/providers/imap/camel-imap-folder.c:1821
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "V�tan kokkuv�tvat infot uute s�numite kohta"
 
-#: camel/providers/imap/camel-imap-folder.c:1746
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Kontrollin uute s�numite olemasolu"
 
-#: camel/providers/imap/camel-imap-folder.c:2065
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "Ei leia s�numi sisu FETCH vastuses."
 
-#: 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 "Ei suuda avada puhverkataloogi: %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 "S�numi %s puhverdamine eba�nnestus: %s"
@@ -7934,7 +8165,7 @@ msgstr "Kontrollin uusi s�numeid"
 msgid "Check for new messages in all folders"
 msgstr "Kontrolli uusi s�numeid k�ikides kaustades"
 
-#: 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 "Kaustad"
 
@@ -7966,28 +8197,28 @@ msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:389
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentimist��bi %s tugi puudub"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Sa ei sisestanud parooli."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -7995,104 +8226,123 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
 # !PARANDA! - no kuidas siis t�lkida?
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Kohalik postijagaja"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:62
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "\"Maildir\" vormingus postikataloog"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr "Kohalikku posti hoitakse maildir vorminguga kataloogides."
 
-#: camel/providers/local/camel-local-provider.c:80
+#: 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:81
+#: camel/providers/local/camel-local-provider.c:101
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 "Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga "
 "puhverfailides"
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, 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 ""
 
-#: 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:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Kohaliku posti fail %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ei saa muuda kausta %s nime %s-ks: %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 "Kausta �mbernimetamine eba�nnestus: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Ei saa kustutada kausta kokkuv�ttefaili '%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 "Ei saa kustutada kausta indeksfaili '%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Ei saa salvestada kokkuv�tet: %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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -8112,7 +8362,7 @@ msgstr "S�numi lisamine maildir kausta nurjus: %s: %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8124,7 +8374,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "S�numit ei leitud"
 
@@ -8133,7 +8383,7 @@ msgstr "S�numit ei leitud"
 msgid "Invalid message contents"
 msgstr "Vigane s�numi sisu"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8143,14 +8393,14 @@ msgstr ""
 "Ei saa avada kausta '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Kausta '%s' ei ole olemas."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8160,41 +8410,64 @@ msgstr ""
 "Ei saa luua kausta '%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' ei ole maildir vormingus kataloog."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ei saa kustutada kausta '%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "ei ole maildir vormingus kataloog"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ei saa lugeda kausta '%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 ""
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Kontrollin uusi s�numeid"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "Kausta s�ilitamine"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -8211,9 +8484,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8223,16 +8496,16 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: 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"
@@ -8241,7 +8514,7 @@ msgstr ""
 "Ei saa avada faili '%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"
@@ -8250,14 +8523,14 @@ msgstr ""
 "Ei saa luua faili '%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' ei ole tavaline fail."
 
-#: 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"
@@ -8266,96 +8539,85 @@ msgstr ""
 "Ei saa kustutada kausta '%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 "Kaust '%s' ei ole t�hi, j�tan kustutamata."
 
-#. 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 "Kausta s�ilitamine"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ei saa avada kausta: %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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ei saa kontrollida kausta: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ei saa avada faili: %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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ei saa avada ajutist kirjakasti: %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
+#: 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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Ajutise kausta sulgemine eba�nnestus: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kausta �mbernimetamine eba�nnestus: %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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tundmatu viga: %s"
@@ -8374,12 +8636,12 @@ msgstr "S�numi lisamine mh vormingus kausta nurjus: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "'%s' ei ole kataloog"
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-folder.c:512
+#: camel/providers/local/camel-spool-folder.c:515
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr ""
@@ -8390,6 +8652,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Kausta '%s/%s' ei ole olemas."
@@ -8399,76 +8662,55 @@ msgstr "Kausta '%s/%s' ei ole olemas."
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: 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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, 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 "Palun sisesta %s@%s NNTP parool"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Server keeldus kasutajanime vastu v�tmast"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Kasutajanime saatmine serverile eba�nnestus"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Server keeldus kasutajanime/parooli vastu v�tmast"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Ei leia s�numit %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Ei saanud gruppide nimekirja serverist k�tte."
+#: 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/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"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-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"
@@ -8478,144 +8720,187 @@ msgstr "USENETi uudised"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Uudisteserveri kausta avamine nurjus: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENETi uudised �le %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:495
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "Faili .newsrc avamine v�i loomine %s jaoks nurjus: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Kausta %s ei leitud"
 
-#: 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 "Toru loomine eba�nnestus: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "IMAPi k�sk eba�nnestus: %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 "Kontrollin uute s�numite olemasolu"
+
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "Tundmatu viga: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:566
+#, fuzzy
+msgid "Use cancel"
+msgstr "T�hista"
+
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "Operatsioon katekstatud"
+
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "V�tan vastu POP kokkuv�tet"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "Uute s�numite kontrollimine POP serverist nurjus: %s"
+#: 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 "Operatsioon katekstatud"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Ei saa salvestada kokkuv�tet: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "H�vitan kustutatud s�numid"
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "S�numi v�tmine nurjus: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr ""
-
-#: 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 ""
 
-#: 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 "V�tan vastu POP s�numit nr %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
-msgid "Message storage"
+#: 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 ""
+"Ei saa k�tte s�numit: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Teadmata sademed"
 
 #: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "J�ta s�numid serverisse"
 
-#: 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 "Kustuta %s p�eva m��dumisel"
 
-#: 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:84
 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 "E-posti laetakse alla POP serverist"
 
-#: 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 ""
 
-#: 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 ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:91
-msgid "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, 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:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr ""
+#: 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:214
-#, c-format
-msgid "Could not connect to server: %s"
-msgstr "�henduse loomine serveriga nurjus: %s"
+#: camel/providers/pop3/camel-pop3-store.c:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Autentimine eba�nnestus."
 
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, 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:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sPalun sisesta %s@%s POP3 parool"
-
-#: camel/providers/pop3/camel-pop3-store.c:377
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
-"Error sending username: %s"
+"No support for requested authentication mechanism."
 msgstr ""
-"Ei saa luua �hendust POP serveriga.\n"
-"Viga kasutajanime saatmisel: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
-msgid "(Unknown)"
-msgstr "(Tundmatu)"
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "IMAPi k�sk eba�nnestus: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+#: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "I/O viga"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8624,18 +8909,13 @@ msgstr ""
 "Ei saa luua �hendust POP serveriga.\n"
 "Viga parooli saatmisel: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Kausta '%s' ei ole olemas."
 
-#: camel/providers/pop3/camel-pop3-store.c:563
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "Ootamatu vastus POP serverilt: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8643,53 +8923,53 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr ""
-"E-posti saatmiseks kohaliku s�steemi programmi \"sendmail\" abil."
+msgstr "E-posti saatmiseks kohaliku s�steemi programmi \"sendmail\" abil."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "Toru loomine eba�nnestus: %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 "Ei saa luua toru sendmailiga: %s: s�numit ei saadetud"
 
-#: 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'i haruprotsessi pole v�imalik tekitada: %s: e-post j�i saatmata"
 
-#: 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 "Ei saa saata s�numit: %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 l�petas t�� signaaliga %s: s�numit ei saadetud."
 
-#: 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 "Ei saa k�ivitada %s: s�numit ei saadetud."
 
-#: 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 l�petas t�� staatusega %d: s�numit ei saadetud."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr "Ei suuda leida s�numist 'Kellele' aadressi"
-
-#: 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 "S�numite trantsport sendmail programmiga"
 
-#: 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"
 
@@ -8697,122 +8977,145 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "E-posti saatmiseks SMTP protokolli abil l�bi v�rgus oleva mailhub'i.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: 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:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: 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:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: 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:184
 msgid "Help message"
 msgstr "Abis�num"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Teenus on valmis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Teenus sulgeb �lekandekanali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Teenus ei ole saadaval, sulgen �lekandekanali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: 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: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: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:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: 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: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: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: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: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:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: 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:216
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Autentimise mehhanism on liiga n�rk"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: 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:222
 msgid "Temporary authentication failure"
 msgstr "Ajutine autentimine eba�nnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Autentimine on vajalik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:317
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, 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:379
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "AUTH p�ring �letas ajalimiidi: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, 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"
 msgstr "SMTP server %s ei toeta k�situd autentimist��pi %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8823,129 +9126,133 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, 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:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posti saatmine %s kaudu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr "Ei saa saata s�numit: saatja aadress on m��ramata."
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:593 mail/mail-ops.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "S�numi saatmine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+#, 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
 msgid "SMTP Greeting"
 msgstr "SMTP tervitus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO vastuse viga: %s: mittefataalne"
 
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "SMTP autentimine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Viga SASL autentimisobjekti loomise."
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "AUTH p�ring nurjus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Halb autentimisvastus serverilt.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:893
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1081
+#, fuzzy
+msgid "MAIL FROM response error"
 msgstr "MAIL FROM vastuse viga: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "RCPT TO vastuse viga: %s: s�num j�i saatmata"
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA p�ring �letas ajalimiidi: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "DATA vastuse viga: %s: s�numi 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
+#, fuzzy
+msgid "DATA response error"
+msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1030
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "DATA vastuse viga: s�numi t�histamine: %s: s�numi j�i saatmata"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "Serverilt saadi vigane autentimise vastus."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "QUIT vastuse viga: %s: mittefataalne"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "RSET vastuse viga: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -8972,19 +9279,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 "manus"
 
-#: 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 "Eemalda valitud kirjed manuste nimekirjast"
 
-#: composer/e-msg-composer-attachment-bar.c:533
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "Lisa manus..."
 
-#: composer/e-msg-composer-attachment-bar.c:534
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "Lisa s�numile manus"
 
@@ -9012,67 +9319,67 @@ msgid "MIME type:"
 msgstr "MIME t��p:"
 
 #: 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 "Soovita manuse automaatset kuvamist"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu vaatamiseks kliki siia"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Saatja:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Vastus:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Teema:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Adressaat:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Sisesta s�numi adressaadid"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:397
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr "Sisesta aadressid, millele saadetakse s�numi pimekoopiad."
 
-#: 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 "Lisab s�numile faili"
 
-#: composer/e-msg-composer.c:698
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9081,58 +9388,48 @@ msgstr ""
 "Viga faili %s lugemisel:\n"
 "%s"
 
-#: composer/e-msg-composer.c:896
-msgid "Save as..."
-msgstr "Salvesta kui..."
-
-#: composer/e-msg-composer.c:905
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Hoiatus!"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Fail on juba olemas. Kirjutada �le?"
 
-#: composer/e-msg-composer.c:931
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Viga faili salvestamisel: %s"
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Viga faili laadimisel: %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 ""
-
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1079
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1086
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1093
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9141,7 +9438,7 @@ msgstr ""
 "Viga kirja automaatsel salvestamisel: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9149,7 +9446,7 @@ msgstr ""
 "Ximian Evolution leidis eelmisest sessioonist salvestamata faile.\n"
 "Kas sa soovid �ritada nende taastamist?"
 
-#: composer/e-msg-composer.c:1358
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9159,29 +9456,29 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Hoiatus: salvestamata s�num"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Ava fail"
 
-#: composer/e-msg-composer.c:1537
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Sisesta fail"
 
-#: composer/e-msg-composer.c:1923 composer/e-msg-composer.c:2366
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "S�numi koostamine"
 
-#: composer/e-msg-composer.c:2383
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2406 composer/e-msg-composer.c:2461
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9189,13 +9486,13 @@ msgstr ""
 "Ei saa luua s�numiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
-#: 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."
 msgstr ""
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
@@ -9247,15 +9544,33 @@ msgstr "Teema sisaldab"
 msgid "Subject does not contain"
 msgstr "Teema ei sisalda"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Antud nimega fail eksisteerib.\n"
+"Kirjutada �le?"
+
 #. 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 "J�ta see parool meelde"
 
-#: 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 ""
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "Kategooriad"
+
 #. 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
@@ -9374,11 +9689,7 @@ msgstr "tund"
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "sekund"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "sekundit"
 
@@ -9452,7 +9763,7 @@ msgstr " tagasi"
 msgid "ago"
 msgstr "tagasi"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:956
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %l:%M %p"
 
@@ -9465,16 +9776,16 @@ msgid "Filter Rules"
 msgstr "Filtreerimisreeglid"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "Siis"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Lisa tegevus"
 
 # !PARANDA! - kas "mine tagasi" on ikka hea?
-#: 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."
@@ -9482,19 +9793,11 @@ msgstr ""
 "Sa unustasid kausta valimata.\n"
 "Palun mine tagasi ja vali kaust, kuhu post toimetada."
 
-#: 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:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Vali kaust"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Sisesta kausta URI"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<kausta valimiseks kliki siia>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9504,7 +9807,7 @@ msgstr ""
 "Viga regulaaravaldises '%s':\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test"
 
@@ -9512,39 +9815,40 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "Sa pead sellele filtrile nime m��rama."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Reegli nimi: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Nimetu"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Kui"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "K�ivita tegevused"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "kui k�ik tingimised on t�idetud"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "kui m�ni tingimus on t�idetud"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Lisa tingimus"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "sissetulev"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "v�ljaminev"
 
@@ -9590,208 +9894,228 @@ msgstr "koos k�igi kohalike kalatoogidega"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "M��ra skoor"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "M��ra v�rvus"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "M��ra skoor"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Manused"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belem"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "sisaldab"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopeeri kausta"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Vastuv�tmise kuup�ev"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Saatmise kuup�ev"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr "Ei ole olemas"
-
-#: filter/libfilter-i18n.h:11
-msgid "Draft"
-msgstr "Mustand"
-
-#: filter/libfilter-i18n.h:12
-msgid "Exist"
-msgstr "On olemas"
-
 #: filter/libfilter-i18n.h:13
-msgid "Expression"
-msgstr "Avaldis"
+msgid "does not contain"
+msgstr "ei sisalda"
 
 #: filter/libfilter-i18n.h:14
-msgid "Important"
-msgstr "T�htis"
+msgid "does not end with"
+msgstr "ei l�ppe"
 
 #: filter/libfilter-i18n.h:15
-msgid "Mailing list"
-msgstr "Postiloend (list)"
+msgid "does not exist"
+msgstr "ei ole olemas"
 
 #: filter/libfilter-i18n.h:16
-msgid "Message Body"
-msgstr "S�numi sisu"
+msgid "does not sound like"
+msgstr "ei k�la kui"
 
 #: filter/libfilter-i18n.h:17
-msgid "Message Header"
-msgstr "Kirja p�is"
+msgid "does not start with"
+msgstr "ei alga"
 
 #: filter/libfilter-i18n.h:18
-msgid "Message was received"
-msgstr "S�num v�eti vastu"
+msgid "Do Not Exist"
+msgstr "Ei ole olemas"
 
 #: filter/libfilter-i18n.h:19
-msgid "Message was sent"
-msgstr "S�num saadeti"
+msgid "Draft"
+msgstr "Mustand"
 
 #: filter/libfilter-i18n.h:20
-msgid "Move to Folder"
-msgstr "T�sta kausta"
+msgid "ends with"
+msgstr "l�ppeb"
 
 #: filter/libfilter-i18n.h:21
-msgid "Read"
-msgstr "Loetud"
+msgid "Execute Shell Command"
+msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Recipients"
-msgstr "Adressaadid"
+msgid "Exist"
+msgstr "On olemas"
 
 #: filter/libfilter-i18n.h:23
-msgid "Regex Match"
-msgstr "Regulaaravaldis vastab"
+msgid "exists"
+msgstr "on olemas"
 
 #: filter/libfilter-i18n.h:24
-msgid "Replied to"
-msgstr "Vastatud kellele"
+msgid "Expression"
+msgstr "Avaldis"
 
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
-msgid "Score"
-msgstr "Skoor"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1404
-msgid "Sender"
-msgstr "Saatja"
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "T�htis"
 
 #: filter/libfilter-i18n.h:27
-msgid "Set Status"
-msgstr "M��ra olek"
+msgid "is"
+msgstr "on"
 
 #: filter/libfilter-i18n.h:28
-msgid "Size (kB)"
-msgstr "Suurus (kB)"
+#, fuzzy
+msgid "is after"
+msgstr "on p�rast"
 
 #: filter/libfilter-i18n.h:29
-msgid "Source Account"
-msgstr "L�htekonto"
+#, fuzzy
+msgid "is before"
+msgstr "on enne"
 
 #: filter/libfilter-i18n.h:30
-msgid "Specific header"
-msgstr "P�ise erip�ra"
+#, fuzzy
+msgid "is Flagged"
+msgstr "T�histatud"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "on suurem kui"
 
 #: filter/libfilter-i18n.h:32
-msgid "Stop Processing"
-msgstr "Peata t��tlemine"
+msgid "is less than"
+msgstr "on v�iksem kui"
 
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
-msgid "Subject"
-msgstr "Teema"
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "ei ole"
+
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "T�histatud"
+
+#: filter/libfilter-i18n.h:35
+msgid "Mailing list"
+msgstr "Postiloend (list)"
 
 #: filter/libfilter-i18n.h:36
-msgid "contains"
-msgstr "sisaldab"
+msgid "Message Body"
+msgstr "S�numi sisu"
 
 #: filter/libfilter-i18n.h:37
-msgid "does not contain"
-msgstr "ei sisalda"
+msgid "Message Header"
+msgstr "Kirja p�is"
 
 #: filter/libfilter-i18n.h:38
-msgid "does not end with"
-msgstr "ei l�ppe"
+msgid "Move to Folder"
+msgstr "T�sta kausta"
 
 #: filter/libfilter-i18n.h:39
-msgid "does not exist"
-msgstr "ei ole olemas"
+#, fuzzy
+msgid "Play Sound"
+msgstr "M�ngi heli:"
 
-#: filter/libfilter-i18n.h:40
-msgid "does not sound like"
-msgstr "ei k�la kui"
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+msgid "Read"
+msgstr "Loetud"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not start with"
-msgstr "ei alga"
+msgid "Recipients"
+msgstr "Adressaadid"
 
 #: filter/libfilter-i18n.h:42
-msgid "ends with"
-msgstr "l�ppeb"
+msgid "Regex Match"
+msgstr "Regulaaravaldis vastab"
 
 #: filter/libfilter-i18n.h:43
-msgid "exists"
-msgstr "on olemas"
+msgid "Replied to"
+msgstr "Vastatud kellele"
 
-#: filter/libfilter-i18n.h:44
-msgid "is greater than"
-msgstr "on suurem kui"
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
+msgid "Score"
+msgstr "Skoor"
 
-#: filter/libfilter-i18n.h:45
-msgid "is less than"
-msgstr "on v�iksem kui"
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+msgid "Sender"
+msgstr "Saatja"
 
 #: filter/libfilter-i18n.h:46
-msgid "is not"
-msgstr "ei ole"
+msgid "Set Status"
+msgstr "M��ra olek"
 
 #: filter/libfilter-i18n.h:47
-msgid "is"
-msgstr "on"
+msgid "Size (kB)"
+msgstr "Suurus (kB)"
 
 #: filter/libfilter-i18n.h:48
-msgid "on or after"
-msgstr "sel hetkel v�i hiljem"
+msgid "sounds like"
+msgstr "k�lab kui"
 
 #: filter/libfilter-i18n.h:49
-msgid "on or before"
-msgstr "sel hetkel v�i varem"
+msgid "Source Account"
+msgstr "L�htekonto"
 
 #: filter/libfilter-i18n.h:50
-msgid "sounds like"
-msgstr "k�lab kui"
+msgid "Specific header"
+msgstr "P�ise erip�ra"
 
 #: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "algab"
 
-#: filter/libfilter-i18n.h:52
-msgid "was after"
-msgstr "on p�rast"
-
 #: filter/libfilter-i18n.h:53
-msgid "was before"
-msgstr "on enne"
+msgid "Stop Processing"
+msgstr "Peata t��tlemine"
+
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
+msgid "Subject"
+msgstr "Teema"
 
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Reeglid"
 
-#: filter/rule-editor.c:284
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Reegli lisamine"
 
-#: filter/rule-editor.c:357
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Reegli muutmine"
 
@@ -9811,30 +10135,30 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution impordib sinu s�numeid programmist Elm'i"
 
-#: 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 "Impordin"
 
-#: 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 "Palun oota"
 
-#: 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 ""
 
-#: 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 "Kontrollin %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:101
 msgid "Mail"
 msgstr "Post"
 
@@ -9862,23 +10186,74 @@ msgstr ""
 "Evolution leidis GnomeCardi faile.\n"
 "Kas sa soovid neid Evolutionisse importida?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "T�htsus: %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 impordib sinu Netscape andmeid"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Pr�gi"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Kohaliku posti fail %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Kontrollin kausta"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Impordi alustamine"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "S�tted"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Muuda filtreid"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -9903,43 +10278,89 @@ msgid "Pine"
 msgstr "Pine"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
+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 ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolution'i s�numiredaktor."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Evolution'i s�numikausta kuvamise komponent."
 
-#: 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 "E_i kordu"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Kontod"
+
+#: 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 "E-posti seadistamisliides"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
+#: 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:101
-msgid "Mail storage folder (internal)"
+msgid "Folder containing mail"
 msgstr ""
 
 #: mail/component-factory.c:102
@@ -9950,227 +10371,253 @@ msgstr ""
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr ""
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "See kaust ei saa sisaldada s�numeid."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Omadused..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Muudab selle kataloogi omadusi"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Uus s�num"
 
-#: mail/component-factory.c:951
-msgid "New _Mail Message"
-msgstr "Uus _s�num"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "_Saada s�num"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "�hendun serverisse..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" omadused"
 
-#: mail/folder-browser-ui.c:274
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Omadused"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "uued: %d"
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "peidetud: %d"
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "valitud: %d"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "saatmata: %d"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "saadetud: %d"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "kokku: %d"
 
-#: mail/folder-browser.c:1049
-msgid "Create vFolder from Search"
-msgstr "Loo otsingureeglitest vKaust"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Loo s�numi baasil _Virtuaalne Kaust"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "VKaust _teema j�rgi"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "VKaust _saatja j�rgi"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "VKaust _adressaatide j�rgi"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema j�rgi"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja j�rgi"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide j�rgi"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi j�rgi"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut s�numit..."
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
-msgid "_Save As..."
-msgstr "_Salvesta kui..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Tr�ki"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Vasta k�igile"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Saada edasi"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "L�petatud"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Puhasta"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_M�rgi loetuks"
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "M�rgi kui l_ugemata"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "M�rgi t�_htsaks"
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "M�rgi v�het_�htsaks"
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Taasta"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "_T�sta kausta..."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "Ko_peeri kausta..."
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
-msgid "_Undelete"
-msgstr "_Taasta"
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
 
-#: mail/folder-browser.c:1473 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Lisa saatja aadressiraamatusse"
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Rakenda filtrid"
 
-#: mail/folder-browser.c:1478
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "Loo s�numi baasil _reegel"
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr ""
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
+msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
-msgstr ""
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "Filter  p_ostiloendi j�rgi"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Vaikimisi"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "VKaust _postiloendi j�rgi"
 
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
@@ -10193,41 +10640,34 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Impordib Outlook Express 4 faile Evolution'i"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
+msgid "Current store format:"
 msgstr ""
 
 #: mail/local-config.glade.h:2
-msgid "Current store format:"
-msgstr ""
+#, fuzzy
+msgid "Index body contents"
+msgstr "Sisu sisaldab"
 
 #: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Indekseerin:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Postkasti vorming"
-
-#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr ""
 
-#: 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"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: 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"
 
@@ -10245,86 +10685,79 @@ msgstr "Evolution'i uudiseredaktor"
 msgid "Evolution Account Editor"
 msgstr "Evolution'i kontoredaktor"
 
-#: mail/mail-account-gui.c:962
-msgid "Could not save signature file."
-msgstr "Ei saa salvestada allkirjafaili."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Host:"
 
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "Allkirja salvestamine"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "_Konto nimi:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+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:1045
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Allkirja on muudetud, kuid mitte salvestatud.\n"
-"\n"
-"Kas sa soovid muudatused salvestada?"
 
-#: mail/mail-account-gui.c:1654
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua �he nimega kahte kontot."
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (vaikimisi)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Keela"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Luba"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "Oled sa kindel, et soovid seda kontot kustutada?"
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "�ra kustuta"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Kas t�esti kustutame konto?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-msgid "Are you sure you want to delete this news account?"
-msgstr "Oled sa kindel, et soovid seda uudistekontot kustutada?"
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Keela"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:798 mail/mail-config.glade.h:42
-msgid "Mail Settings"
-msgstr "S�numite s�tted"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Luba"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "S�numi saaja: %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "Oled sa kindel, et soovid seda uudistekontot kustutada?"
 
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Teema on %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Lubatud"
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "S�numi saatja: %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "_Konto nimi:"
 
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "postiloend %s"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Puerto Rico"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10332,34 +10765,30 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: 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:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:280
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Saata sellegipoolest?"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10367,90 +10796,103 @@ msgstr ""
 "Sellel s�numil on teema v�li t�hi.\n"
 "Kas saadame ilma teemata?"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 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:299
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 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:469
-msgid "This message contains invalid recipients:"
-msgstr ""
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:600
+#: mail/mail-callbacks.c:497
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:838
+#: mail/mail-callbacks.c:623
+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
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 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:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "T�sta s�num(id) kausta..."
 
-#: mail/mail-callbacks.c:1283 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopeeri s�num(id) kausta..."
 
-#: mail/mail-callbacks.c:1759
+#: mail/mail-callbacks.c:2091
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1784
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1837
+#: mail/mail-callbacks.c:2169
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1863
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "�htegi s�numit ei ole valitud"
 
-#: mail/mail-callbacks.c:1962
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Kirjutada fail �le?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "S�numi salvestamine teise nimega..."
 
-#: mail/mail-callbacks.c:1964
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "S�numite salvestamine teise nimega..."
 
-#: mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Hoiatus"
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Kuvab j�rgmise lugemata s�numi"
+
+#: mail/mail-callbacks.c:2373
+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:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10462,11 +10904,7 @@ msgstr ""
 "\n"
 "Kas t�esti eemaldame kustutatud s�numid?"
 
-#: mail/mail-callbacks.c:2142
-msgid "Do not ask me again."
-msgstr "Seda k�simust rohkem mitte esitada."
-
-#: mail/mail-callbacks.c:2250
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10475,23 +10913,28 @@ msgstr ""
 "Viga filtriinfo laadimisel:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2262
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtrid"
 
-#: mail/mail-callbacks.c:2325
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "T�mban %d. s�numit %dst"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "S�numi tr�kkimine"
 
-#: mail/mail-callbacks.c:2352
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2371
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "S�numi tr�kkimine nurjus"
 
-#: mail/mail-callbacks.c:2473
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -10545,16 +10988,35 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution'i kontoassistent"
 
-#: mail/mail-config.c:326
-#, c-format
-msgid "Account %d"
-msgstr "Konto %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
 
-#: mail/mail-config.c:1859
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: mail/mail-config.c:78 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"
@@ -10562,87 +11024,154 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Sisendkast"
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: mail/mail-config.c:2190 mail/mail-config.c:2194
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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
-msgid " _Check for supported types "
-msgstr "_Tuvasta toetatavad t��bid"
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " v�rvusega"
+#, 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
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
-msgid "Account"
-msgstr "Konto"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Konto kohta k�iv info:"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Kontohaldus"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "Kontod"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Katkesta tegevus"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Arkansas"
+
+#: mail/mail-config.glade.h:13
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: 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:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "Arica"
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Lisa s�numile manus"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentimine"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "_Kontrolli uusi s�numeid automaatselt"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Tundmatu m�rgistik: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_Sulge"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Uute s�numite kontroll"
 
-#: mail/mail-config.glade.h:14
-msgid "Composer"
-msgstr "S�numiredaktor"
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Composing Messages"
+msgstr "S�numi koostamine"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "H��lestus"
 
-#: mail/mail-config.glade.h:16
-msgid "Confirm when Expunging a folder"
-msgstr "Kausta puhastamisel k�si kinnitust"
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10658,234 +11187,375 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"L�peta\"."
 
-#: mail/mail-config.glade.h:23
+#: 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:24
-msgid "Default Forward style is: "
-msgstr "Vaikimisi edasisaatmise moodus on: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Vaikimisi kodeering: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "E-posti v�tmine"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Diditaalsed ID'd..."
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr "Kuva"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "S�numi avamine eba�nnestus"
 
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Mustandid"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "_Mustandite kaust:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "_Luba"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Muuda..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
-msgstr "Lubatud"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Idast"
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "E-posti aadress sisaldab"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "E-posti aadress:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "Programmist v�ljumisel _puhasta pr�gikaust"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "K�ivita tegevused"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "l�ppeb"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Omadused"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Edasi saadetud s�numid"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Hangi Digitaalne ID..."
 
-#: mail/mail-config.glade.h:35
-msgid "HTML signature file:"
-msgstr "HTML allkirjafail:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_R�huta tsitaate"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Honolulu"
+
+#: 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 "Identiteet"
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr "HTML s�numis"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "S�numi sees"
 
-#: 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 "Salvesta ja sulge"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "_Lae pildid"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "E-posti seadistamine"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
-msgstr "See konto on minu _vaikimisi konto"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Kirja p�is"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "S�numi _kuvamine"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikroneesia"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP server:"
 
-#: mail/mail-config.glade.h:46
-msgid "News"
-msgstr "Uudised"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "E-posti seadistamine"
+
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "_Uudistekanalid"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
 
 # !PARANDA! - siia peaks leidma s�na, mis ei oleks eitav
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Mittekohustuslik info"
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "T_��koht:"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "PGP _V�tme ID:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Vali v�rvus"
 
-#: 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 ""
-"T�psustus, kui p��takse saata HTML s�numit isikule, kes seda ei soovi"
-
-#: mail/mail-config.glade.h:56
-msgid "Prompt when sending messages with an _empty subject"
-msgstr ""
-"T�psustus, kui p��takse saata s�numit ilma teemata"
-
-#: mail/mail-config.glade.h:57
-msgid "Prompt when sending messages with only _Bcc recipients defined"
+#: mail/mail-config.glade.h:88
+#, 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:58
+#: mail/mail-config.glade.h:89
+#, fuzzy
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy"
+
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Tr�kib valitud kontaktid"
+
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "S�numi avamine eba�nnestus"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: mail/mail-config.glade.h:60
+#: 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"
 
-#: 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 "Vastus:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "E-posti vastuv�tmine"
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
-msgstr "Posti vastuv�tmine"
-
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Vastuv�tmise valikud"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "J�ta see parool meelde"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Kohustuslik info"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+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:67
-msgid "Security"
-msgstr "Turvalisus"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
-msgstr "Vali filtreerimislogi fail..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "Vali PGP programm"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "E-posti saatmine"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Allkirjafail"
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
-msgstr "Posti saatmine"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Kustuta k�ik peale allkirja"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Saadetud"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "E-posti saatmine"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Saadetud _s�numite kaust:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Saadetud s�numid ja mustandid"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Serveri seadistused"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "Serveri _t��p: "
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
-msgstr "Allkirjafail"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Kiirvalikud"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Allkirja salvestamine"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Allikas"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Allika info"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "Allikad"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "Stiili nimi:"
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
-msgstr "Erikaustad"
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Standardne Unix'i mbox"
 
-#: mail/mail-config.glade.h:86
-msgid "Use s_ecure connection (SSL)"
-msgstr "Kasuta turvalist �hendust (_SSL)"
+#: mail/mail-config.glade.h:128
+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:87
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "_HTML allkiri:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Muutlik"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10895,126 +11565,215 @@ msgstr ""
 "\n"
 "J�tkamiseks vajuta \"J�rgmine\". "
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Idast"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "L_ae pildid alati v�rgust"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr "V�ljuvad s�numid _allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Autentimise t��p: "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "_Autentimise t��p: "
+
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "_Kontrolli uusi s�numeid automaatselt"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Sertifikaadi ID:"
 
-#: mail/mail-config.glade.h:97
-msgid "_Drafts folder:"
-msgstr "_Mustandite kaust:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
-msgstr "_E-posti aadress:"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Kausta puhastamisel k�si kinnitust"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
-msgstr "Programmist v�ljumisel _puhasta pr�gikaust"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Vaikimisi"
 
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:151
+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
+#, fuzzy
+msgid "_Filename:"
+msgstr "Faili nimi:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Saada edasi m��ratud kujul"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "_T�isnimi"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:159
+#, 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:103
-msgid "_Highlight citations with"
-msgstr "_R�huta tsitaate"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Identiteet"
 
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
-msgstr "_Host:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Keel"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr "_Lae pildid ainult, kui saatja on aadressiraamatus"
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
-msgstr "_Logi filtreerimised faili:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "See konto on minu _vaikimisi konto"
 
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_M�rgi s�num loetuks peale"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_�ra lae �htegi pilti v�rgust"
 
-#: mail/mail-config.glade.h:110
-msgid "_Organization:"
-msgstr "_Organisatsioon"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "_PGP programmi asukoht:"
 
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
-msgstr "_Kataloog:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
-msgstr "_J�ta see parool meelde"
+#: mail/mail-config.glade.h:172
+#, 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:114
-msgid "_Send mail in HTML format by default."
-msgstr "_Vaikimisi saadetakse HTML vormingus s�numeid"
+#: mail/mail-config.glade.h:173
+#, 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:115
-msgid "_Server Type: "
-msgstr "_Serveri t��p: "
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Raadio"
 
-#: mail/mail-config.glade.h:116
-msgid "_Signature file:"
-msgstr "_Allkirjafail:"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Posti vastuv�tmine"
 
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
-msgstr "_Konto nimi:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Vasta k�igile"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Turvalisus"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Turvalisus"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Posti saatmine"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "N�ita aega kui"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Muutlik"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_intervalliga:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " v�rvusega"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "kirjeldus"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr ""
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr "sekundit."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr ""
@@ -11051,184 +11810,176 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Salvesta kaasatud fail"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Ajutise kataloogi loomine nurjus: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Salvesta kettale..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Kuva s�numi sees"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Kuva s�numi sees (%s abil)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "�ra kuva"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1136
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1605
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1607
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Kopeeri viida asukoht"
 
-#: mail/mail-display.c:1610
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1613
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Salvesta pilt kui..."
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "\"%s\" t��pi manus"
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Kuup�ev"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Kellelt"
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Kellele"
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Koopia"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Pimekoopia"
 
-#: mail/mail-format.c:1814
-msgid "This message is digitally signed. Click the lock icon for more information."
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
 msgstr ""
-"See s�num on digitaalselt allkirjastatud. Lisainfo jaoks kliki lukuikoonil."
-
-# !PARANDA! - kas on ikka t�pne t�lge?
-#: mail/mail-format.c:1837
-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?
-#: mail/mail-format.c:1845
-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:1853
-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."
+"\n"
+"Postiprogramm:"
 
-#: mail/mail-format.c:2069
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2088
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: mail/mail-format.c:2117
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2130
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, 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:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ei saa salvestada kausta metainfot faili %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kausta %s metaandmete kustutamine nurjus: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Muudan kausta \"%s\" vormingusse \"%s\""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
@@ -11255,117 +12006,112 @@ msgstr ""
 msgid "Working"
 msgstr "T��tan"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtreerin kausta"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "E-posti v�tmine"
 
-#: 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 "Sellegipoolest saadeti s�num edukalt."
 
-#: mail/mail-ops.c:554
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Saadan \"%s\""
 
-#: mail/mail-ops.c:674
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Saadan s�numit %d (kokku: %d)"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: 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 "Valmis."
 
-#: mail/mail-ops.c:788
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Salvestan s�numi kausta"
 
-#: mail/mail-ops.c:868
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "T�stan s�numid %s"
 
-#: mail/mail-ops.c:868
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:895
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "T�stan"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopeerin"
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Kontrollin kaustu \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1058 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Pr�gi"
-
-#: mail/mail-ops.c:1191
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Edasi saadetud s�numid"
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avan kausta %s"
 
-#: mail/mail-ops.c:1306
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1375
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eemaldan kausta %s"
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "S�ilitan Kausta '%s'"
 
-#: mail/mail-ops.c:1520
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "V�rskendan kausta"
 
-#: mail/mail-ops.c:1556
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "T�hjendan kausta"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "V�tan vastu s�numit %s"
 
-#: mail/mail-ops.c:1672
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "V�tan vastu %d teadet"
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvestan %d s�numit"
 
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11374,40 +12120,45 @@ msgstr ""
 "V�ljundfaili loomine nurjus: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2088
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "�hendun lahti: %s"
 
-#: mail/mail-ops.c:2089
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taastan �henduse: %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Otsi"
 
@@ -11443,68 +12194,92 @@ msgstr "Leia:"
 msgid "Matches:"
 msgstr "Vastavusi:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, t��p: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kataloog: %s, t��p: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "T��p: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "S�numite saatmine ja vastuv�tmine"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Katkesta k�ik"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Uuendan..."
 
-#: 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 "Ootan..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Katkestatud."
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas t��."
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Palun sisesta %s parool"
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
-#: mail/mail-tools.c:256
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Ei saa salvestada allkirjafaili."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Allkirja salvestamine"
+
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Allkirja on muudetud, kuid mitte salvestatud.\n"
+"\n"
+"Kas sa soovid muudatused salvestada?"
+
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "Allkirjafail"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Edasi saadetud s�num - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Edasi saadetud s�num"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Edasi saadetud s�num"
 
@@ -11527,10 +12302,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "VKaustad"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "vKaustad"
@@ -11548,87 +12319,145 @@ msgstr "Proovitake redigeerida olematut vkausta '%s'."
 msgid "New VFolder"
 msgstr "Uus VKaust"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Teema puudub)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - s�num"
 
-#: mail/message-list.c:656
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "N�gemata"
 
-#: mail/message-list.c:657
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "N�htud"
 
-#: mail/message-list.c:658
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Vastatud"
 
-#: mail/message-list.c:659
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Mitu n�gemata s�numit"
 
-#: mail/message-list.c:660
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Mitu s�numit"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: mail/message-list.c:665
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Madal"
 
-#: mail/message-list.c:669
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "K�rge"
 
-#: mail/message-list.c:670
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "K�rgeim"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "T�na %l:%M %p"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a, %l:%M %p"
 
-#: mail/message-list.c:958
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:2358
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "S�numite nimekirja koostamine"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "T�htaeg "
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Olek"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "T�histatud"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Vastu v�etud"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Suurus"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "McCall"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Liigub edasi"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Allika info"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Saada edasi"
+
+#: 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 "Vasta"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Vasta k�igile"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Eelvaade"
+
+#: 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\""
@@ -11650,7 +12479,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Kausta \"%s\" tellimuse l�petamine"
 
 #: 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 "Kaust"
 
@@ -11695,1423 +12524,31 @@ msgid "_Unsubscribe"
 msgstr "_L�peta tellimus"
 
 #: 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/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolution'i s�numiredaktor."
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+msgid "Factory for Evolution Summary's configuration control."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
-msgid "Appointments"
-msgstr "S�ndmused"
-
-#: my-evolution/e-summary-calendar.c:341
-msgid "No appointments"
-msgstr "S�ndmused puuduvad"
-
-#: 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 "Kirjeldus puudub"
-
-#: my-evolution/e-summary-mail.c:129
-msgid "Mail summary"
-msgstr "S�numite kokkuv�te"
-
-#. 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 "EETN"
-
-#: my-evolution/e-summary-preferences.c:445
-msgid "Dictionary.com Word of the Day"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+msgid "Factory for the Evolution Summary component."
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:466
-msgid "Quotes of the Day"
-msgstr "P�eva lause"
-
-#: my-evolution/e-summary-preferences.c:946
-msgid "Add a news feed"
-msgstr "Lisa uudistekanal"
-
-#: my-evolution/e-summary-preferences.c:954
-msgid "Enter the URL of the news feed you wish to add"
-msgstr "Sisesta lisatava uudistekanali URL"
-
-#: my-evolution/e-summary-preferences.c:958
-msgid "Name:"
-msgstr "Nimi:"
-
-#: my-evolution/e-summary-preferences.c:1504
-msgid "Summary Settings"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
 msgstr "Kokkuv�tte s�tted"
 
-#: 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 "Viga RDF'i allalaadimisel"
-
-#: my-evolution/e-summary-rdf.c:528
-msgid "News Feed"
+#: 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/e-summary-tasks.c:248
-msgid "No tasks"
-msgstr "�lesanded puuduvad"
-
-#: my-evolution/e-summary-tasks.c:287
-msgid "(No Description)"
-msgstr "(Kirjeldus puudub)"
-
-#: my-evolution/e-summary-weather.c:71
-msgid "My Weather"
-msgstr "Ilmateade"
-
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr "<dd><b>Ilmaserveriga �henduse loomine eba�nnestus</b></dd>"
-
-#: my-evolution/e-summary-weather.c:559
-msgid "Weather"
-msgstr "Ilm"
-
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr "Regioonid"
-
-#: my-evolution/e-summary.c:193
-msgid "%A, %B %e %Y"
-msgstr "%A, %e. %B %Y"
-
-#: my-evolution/e-summary.c:493
-msgid "Please wait..."
-msgstr "Palun oota..."
-
-#: my-evolution/e-summary.c:584 ui/my-evolution.xml.h:3
-msgid "Print Summary"
-msgstr "Kokkuv�tte tr�kkimine"
-
-#: my-evolution/e-summary.c:630
-msgid "Printing of Summary failed"
-msgstr "Kokkuv�tte tr�kkimine eba�nnestus"
-
-#: my-evolution/main.c:66
-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"
-
-#: my-evolution/metar.c:45
-msgid "Broken clouds"
-msgstr "Pilver�balad"
-
-#: my-evolution/metar.c:46
-msgid "Scattered clouds"
-msgstr "Vahelduv pilvisus"
-
-#: my-evolution/metar.c:47
-msgid "Few clouds"
-msgstr "V�hene pilvisus"
-
-#: my-evolution/metar.c:48
-msgid "Overcast"
-msgstr "Lauspilves"
-
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
-msgid "Invalid"
-msgstr "Vigane"
-
-#: my-evolution/metar.c:63
-msgid "Variable"
-msgstr "Muutlik"
-
-#: my-evolution/metar.c:64
-msgid "North"
-msgstr "P�hjast"
-
-#: my-evolution/metar.c:64
-msgid "North - NorthEast"
-msgstr "P�hjast - kirdest"
-
-#: my-evolution/metar.c:64
-msgid "Northeast"
-msgstr "Kirdest"
-
-#: my-evolution/metar.c:64
-msgid "East - NorthEast"
-msgstr "Idast - kirdest"
-
-#: my-evolution/metar.c:65
-msgid "East"
-msgstr "Idast"
-
-#: my-evolution/metar.c:65
-msgid "East - Southeast"
-msgstr "Idast - kagust"
-
-#: my-evolution/metar.c:65
-msgid "Southeast"
-msgstr "Kagust"
-
-#: my-evolution/metar.c:65
-msgid "South - Southeast"
-msgstr "L�unast - kagust"
-
-#: my-evolution/metar.c:66
-msgid "South"
-msgstr "L�unast"
-
-#: my-evolution/metar.c:66
-msgid "South - Southwest"
-msgstr "L�unast - edelast"
-
-#: my-evolution/metar.c:66
-msgid "Southwest"
-msgstr "Edelast"
-
-#: my-evolution/metar.c:66
-msgid "West - Southwest"
-msgstr "L��nest - edelast"
-
-#: my-evolution/metar.c:67
-msgid "West"
-msgstr "L��nest"
-
-#: my-evolution/metar.c:67
-msgid "West - Northwest"
-msgstr "L��nest - loodest"
-
-#: my-evolution/metar.c:67
-msgid "Northwest"
-msgstr "Loodest"
-
-#: my-evolution/metar.c:67
-msgid "North - Northwest"
-msgstr "P�hjast - loodest"
-
-#. DRIZZLE
-#: my-evolution/metar.c:127
-msgid "Drizzle"
-msgstr "Uduvihm"
-
-#: my-evolution/metar.c:128
-msgid "Drizzle in the vicinity"
-msgstr "Uduvihm l�heduses"
-
-#: my-evolution/metar.c:129
-msgid "Light drizzle"
-msgstr "N�rk uduvihm"
-
-#: my-evolution/metar.c:130
-msgid "Moderate drizzle"
-msgstr "M��dukas uduvihm"
-
-#: my-evolution/metar.c:131
-msgid "Heavy drizzle"
-msgstr "Tugev uduvihm"
-
-#: my-evolution/metar.c:132
-msgid "Shallow drizzle"
-msgstr "Madal uduvihm"
-
-#: my-evolution/metar.c:133
-msgid "Patches of drizzle"
-msgstr "Paiguti sajab uduvihma"
-
-#: my-evolution/metar.c:134
-msgid "Partial drizzle"
-msgstr "Aeg-ajalt sajab uduvihma"
-
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
-msgid "Thunderstorm"
-msgstr "�ike"
-
-#: my-evolution/metar.c:136
-msgid "Windy drizzle"
-msgstr "Uduvihm tuulega"
-
-#: my-evolution/metar.c:137
-msgid "Showers"
-msgstr "Vihmavalingud"
-
-#: my-evolution/metar.c:138
-msgid "Drifting drizzle"
-msgstr "Liikuv uduvihm"
-
-#: my-evolution/metar.c:139
-msgid "Freezing drizzle"
-msgstr "J��tuv uduvihm"
-
-#. RAIN
-#: my-evolution/metar.c:142
-msgid "Rain"
-msgstr "Vihm"
-
-#: my-evolution/metar.c:143
-msgid "Rain in the vicinity"
-msgstr "L�heduses sajab"
-
-#: my-evolution/metar.c:144
-msgid "Light rain"
-msgstr "Kerge vihm"
-
-#: my-evolution/metar.c:145
-msgid "Moderate rain"
-msgstr "M��dukas vihm"
-
-#: my-evolution/metar.c:146
-msgid "Heavy rain"
-msgstr "Tugev vihm"
-
-#: my-evolution/metar.c:147
-msgid "Shallow rain"
-msgstr "Madal vihm"
-
-#: my-evolution/metar.c:148
-msgid "Patches of rain"
-msgstr "Paiguti sajab vihma"
-
-#: my-evolution/metar.c:149
-msgid "Partial rainfall"
-msgstr "Hoovihmad"
-
-#: my-evolution/metar.c:151
-msgid "Blowing rainfall"
-msgstr "Vihm tuulega"
-
-#: my-evolution/metar.c:152
-msgid "Rain showers"
-msgstr "Vihmavalingud"
-
-#: my-evolution/metar.c:153
-msgid "Drifting rain"
-msgstr "Liikuv vihm"
-
-#: my-evolution/metar.c:154
-msgid "Freezing rain"
-msgstr "J��tuv vihm"
-
-#. SNOW
-#: my-evolution/metar.c:157
-msgid "Snow"
-msgstr "Lumi"
-
-#: my-evolution/metar.c:158
-msgid "Snow in the vicinity"
-msgstr "L�heduses sajab lund"
-
-#: my-evolution/metar.c:159
-msgid "Light snow"
-msgstr "N�rk lumesadu"
-
-#: my-evolution/metar.c:160
-msgid "Moderate snow"
-msgstr "M��dukas lumesadu"
-
-#: my-evolution/metar.c:161
-msgid "Heavy snow"
-msgstr "Tugev lumesadu"
-
-#: my-evolution/metar.c:162
-msgid "Shallow snow"
-msgstr "Madal lumesadu"
-
-#: my-evolution/metar.c:163
-msgid "Patches of snow"
-msgstr "Paiguti sajab lund"
-
-#: my-evolution/metar.c:164
-msgid "Partial snowfall"
-msgstr "Hooti sajab lund"
-
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
-msgid "Snowstorm"
-msgstr "Lumetorm"
-
-#: my-evolution/metar.c:166
-msgid "Blowing snowfall"
-msgstr "Lumesadu tuulega"
-
-#: my-evolution/metar.c:167
-msgid "Snow showers"
-msgstr "Hootised lumesajud"
-
-#: my-evolution/metar.c:168
-msgid "Drifting snow"
-msgstr "Liikuv lumesadu"
-
-#: my-evolution/metar.c:169
-msgid "Freezing snow"
-msgstr "J��tuv lumesadu"
-
-#. SNOW_GRAINS
-#: my-evolution/metar.c:172
-msgid "Snow grains"
-msgstr "Lumeterad"
-
-#: my-evolution/metar.c:173
-msgid "Snow grains in the vicinity"
-msgstr "L�heduses sajab lumeteri"
-
-#: my-evolution/metar.c:174
-msgid "Light snow grains"
-msgstr "N�rgalt lumeteri"
-
-#: my-evolution/metar.c:175
-msgid "Moderate snow grains"
-msgstr "M��dukalt lumeteri"
-
-#: my-evolution/metar.c:176
-msgid "Heavy snow grains"
-msgstr "Tihedalt lumeteri"
-
-#: my-evolution/metar.c:177
-msgid "Shallow snow grains"
-msgstr "Madalal sajab lumeteri"
-
-#: my-evolution/metar.c:178
-msgid "Patches of snow grains"
-msgstr "Paiguti sajab lumeteri"
-
-#: my-evolution/metar.c:179
-msgid "Partial snow grains"
-msgstr "Hooti sajab lumeteri"
-
-#: my-evolution/metar.c:181
-msgid "Blowing snow grains"
-msgstr "Lumeterad tuulega"
-
-#: my-evolution/metar.c:182
-msgid "Snow grain showers"
-msgstr "Lumeterade valingud"
-
-#: my-evolution/metar.c:183
-msgid "Drifting snow grains"
-msgstr "Liikuvad lumeterad"
-
-#: my-evolution/metar.c:184
-msgid "Freezing snow grains"
-msgstr "J��tuvad lumeterad"
-
-#. ICE_CRYSTALS
-#: my-evolution/metar.c:187
-msgid "Ice crystals"
-msgstr "J��kristallid"
-
-#: my-evolution/metar.c:188
-msgid "Ice crystals in the vicinity"
-msgstr "J��kristallid l�heduses"
-
-#: my-evolution/metar.c:189
-msgid "Few ice crystals"
-msgstr "V�he j��kristalle"
-
-#: my-evolution/metar.c:190
-msgid "Moderate ice crystals"
-msgstr "M��dukalt j��kristalle"
-
-#: my-evolution/metar.c:191
-msgid "Heavy ice crystals"
-msgstr "Tihedalt j��kristalle"
-
-#: my-evolution/metar.c:193
-msgid "Patches of ice crystals"
-msgstr "Paiguti on j��kristalle"
-
-#: my-evolution/metar.c:194
-msgid "Partial ice crystals"
-msgstr "Hooti sajab j��kristalle"
-
-#: my-evolution/metar.c:195
-msgid "Ice crystal storm"
-msgstr "J��kristallide torm"
-
-#: my-evolution/metar.c:196
-msgid "Blowing ice crystals"
-msgstr "J��kristallid tuulega"
-
-#: my-evolution/metar.c:197
-msgid "Showers of ice crystals"
-msgstr "J��kristallide valingud"
-
-#: my-evolution/metar.c:198
-msgid "Drifting ice crystals"
-msgstr "Liikuvad j�kristallid"
-
-#: my-evolution/metar.c:199
-msgid "Freezing ice crystals"
-msgstr "J��tuvad j��kristallid"
-
-#. ICE_PELLETS
-#: my-evolution/metar.c:202
-msgid "Ice pellets"
-msgstr "J��terad"
-
-#: my-evolution/metar.c:203
-msgid "Ice pellets in the vicinity"
-msgstr "J��terad l�heduses"
-
-#: my-evolution/metar.c:204
-msgid "Few ice pellets"
-msgstr "V�he j��teri"
-
-#: my-evolution/metar.c:205
-msgid "Moderate ice pellets"
-msgstr "M��dukalt j��teri"
-
-#: my-evolution/metar.c:206
-msgid "Heavy ice pellets"
-msgstr "Tihedalt j��teri"
-
-#: my-evolution/metar.c:207
-msgid "Shallow ice pellets"
-msgstr "Madalad j��terad"
-
-#: my-evolution/metar.c:208
-msgid "Patches of ice pellets"
-msgstr "Paiguti j��teri"
-
-#: my-evolution/metar.c:209
-msgid "Partial ice pellets"
-msgstr "Hooti j��teri"
-
-#: my-evolution/metar.c:210
-msgid "Ice pellet storm"
-msgstr "J��terade torm"
-
-#: my-evolution/metar.c:211
-msgid "Blowing ice pellets"
-msgstr "J��terad tuulega"
-
-#: my-evolution/metar.c:212
-msgid "Showers of ice pellets"
-msgstr "J��terade valingud"
-
-#: my-evolution/metar.c:213
-msgid "Drifting ice pellets"
-msgstr "Liikuvad j��terad"
-
-#: my-evolution/metar.c:214
-msgid "Freezing ice pellets"
-msgstr "J��tuvad j��terad"
-
-#. HAIL
-#: my-evolution/Locations.h:883 my-evolution/metar.c:217
-msgid "Hail"
-msgstr "Rahe"
-
-#: my-evolution/metar.c:218
-msgid "Hail in the vicinity"
-msgstr "Rahe l�heduses"
-
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
-msgid "Light hail"
-msgstr "N�rk rahesadu"
-
-#: my-evolution/metar.c:220
-msgid "Moderate hail"
-msgstr "M��dukas rahesadu"
-
-#: my-evolution/metar.c:221
-msgid "Heavy hail"
-msgstr "Tugev rahesadu"
-
-#: my-evolution/metar.c:222
-msgid "Shallow hail"
-msgstr "Madal rahesadu"
-
-#: my-evolution/metar.c:223
-msgid "Patches of hail"
-msgstr "Paiguti on rahesadu"
-
-#: my-evolution/metar.c:224
-msgid "Partial hail"
-msgstr "Hooti on rahesadu"
-
-#: my-evolution/metar.c:225
-msgid "Hailstorm"
-msgstr "Rahetorm"
-
-#: my-evolution/metar.c:226
-msgid "Blowing hail"
-msgstr "Rahesadu tuulega"
-
-#: my-evolution/metar.c:227
-msgid "Hail showers"
-msgstr "Rahehood"
-
-#: my-evolution/metar.c:228
-msgid "Drifting hail"
-msgstr "Liikuv rahesadu"
-
-#: my-evolution/metar.c:229
-msgid "Freezing hail"
-msgstr "J��tuv rahesadu"
-
-#. SMALL_HAIL
-#: my-evolution/metar.c:232
-msgid "Small hail"
-msgstr "Peen rahe"
-
-#: my-evolution/metar.c:233
-msgid "Small hail in the vicinity"
-msgstr "Peen rahe l�heduses"
-
-#: my-evolution/metar.c:235
-msgid "Moderate small hail"
-msgstr "M��dukalt peent rahet"
-
-#: my-evolution/metar.c:236
-msgid "Heavy small hail"
-msgstr "Tugevalt peent rahet"
-
-#: my-evolution/metar.c:237
-msgid "Shallow small hail"
-msgstr "Madal peen rahe"
-
-#: my-evolution/metar.c:238
-msgid "Patches of small hail"
-msgstr "Paiguti on peent rahet"
-
-#: my-evolution/metar.c:239
-msgid "Partial small hail"
-msgstr "Hooti on peent rahet"
-
-#: my-evolution/metar.c:240
-msgid "Small hailstorm"
-msgstr "Peene rahe tuisk"
-
-#: my-evolution/metar.c:241
-msgid "Blowing small hail"
-msgstr "Peen rahe tuulega"
-
-#: my-evolution/metar.c:242
-msgid "Showers of small hail"
-msgstr "Peene rahe hood"
-
-#: my-evolution/metar.c:243
-msgid "Drifting small hail"
-msgstr "Liikuv peene rahe sadu"
-
-#: my-evolution/metar.c:244
-msgid "Freezing small hail"
-msgstr "J��tuv peene rahe sadu"
-
-#. PRECIPITATION
-#: my-evolution/metar.c:247
-msgid "Unknown precipitation"
-msgstr "Teadmata sademed"
-
-#: my-evolution/metar.c:248
-msgid "Precipitation in the vicinity"
-msgstr "Sademed l�heduses"
-
-#: my-evolution/metar.c:249
-msgid "Light precipitation"
-msgstr "N�rgad sademed"
-
-#: my-evolution/metar.c:250
-msgid "Moderate precipitation"
-msgstr "M��dukad sademed"
-
-#: my-evolution/metar.c:251
-msgid "Heavy precipitation"
-msgstr "Tugevad sademed"
-
-#: my-evolution/metar.c:252
-msgid "Shallow precipitation"
-msgstr "Madalad sademed"
-
-#: my-evolution/metar.c:253
-msgid "Patches of precipitation"
-msgstr "Paiguti sademeid"
-
-#: my-evolution/metar.c:254
-msgid "Partial precipitation"
-msgstr "Hooti sademeid"
-
-#: my-evolution/metar.c:255
-msgid "Unknown thunderstorm"
-msgstr "Teadmata �ike"
-
-#: my-evolution/metar.c:256
-msgid "Blowing precipitation"
-msgstr "Sademed tuulega"
-
-#: my-evolution/metar.c:257
-msgid "Showers, type unknown"
-msgstr "Teadmata sademete hood"
-
-#: my-evolution/metar.c:258
-msgid "Drifting precipitation"
-msgstr "Liikuvad sademed"
-
-#: my-evolution/metar.c:259
-msgid "Freezing precipitation"
-msgstr "J��tuvad sademed"
-
-#. MIST
-#: my-evolution/metar.c:262
-msgid "Mist"
-msgstr "Hajus udu"
-
-#: my-evolution/metar.c:263
-msgid "Mist in the vicinity"
-msgstr "L�heduses on hajus udu"
-
-#: my-evolution/metar.c:264
-msgid "Light mist"
-msgstr "Kerge uduvine"
-
-#: my-evolution/metar.c:265
-msgid "Moderate mist"
-msgstr "Keskmise hajusat udu"
-
-#: my-evolution/metar.c:266
-msgid "Thick mist"
-msgstr "Tihedalt hajusat udu"
-
-#: my-evolution/metar.c:267
-msgid "Shallow mist"
-msgstr "Madal hajus udu"
-
-#: my-evolution/metar.c:268
-msgid "Patches of mist"
-msgstr "Paiguti hajusat udu"
-
-#: my-evolution/metar.c:269
-msgid "Partial mist"
-msgstr "Hooti hajusat udu"
-
-#: my-evolution/metar.c:271
-msgid "Mist with wind"
-msgstr "Hajus udu tuulega"
-
-#: my-evolution/metar.c:273
-msgid "Drifting mist"
-msgstr "Liikuv hajus udu"
-
-#: my-evolution/metar.c:274
-msgid "Freezing mist"
-msgstr "J��tuv hajus udu"
-
-#. FOG
-#: my-evolution/metar.c:277
-msgid "Fog"
-msgstr "Udu"
-
-#: my-evolution/metar.c:278
-msgid "Fog in the vicinity"
-msgstr "Udu l�heduses"
-
-#: my-evolution/metar.c:279
-msgid "Light fog"
-msgstr "N�rk udu"
-
-#: my-evolution/metar.c:280
-msgid "Moderate fog"
-msgstr "M��dukas udu"
-
-#: my-evolution/metar.c:281
-msgid "Thick fog"
-msgstr "Paks udu"
-
-#: my-evolution/metar.c:282
-msgid "Shallow fog"
-msgstr "Madal udu"
-
-#: my-evolution/metar.c:283
-msgid "Patches of fog"
-msgstr "Paiguti udu"
-
-#: my-evolution/metar.c:284
-msgid "Partial fog"
-msgstr "Hooti udu"
-
-#: my-evolution/metar.c:286
-msgid "Fog with wind"
-msgstr "Udu tuulega"
-
-#: my-evolution/metar.c:288
-msgid "Drifting fog"
-msgstr "Liikuv udu"
-
-#: my-evolution/metar.c:289
-msgid "Freezing fog"
-msgstr "J��tuv udu"
-
-#. SMOKE
-#: my-evolution/metar.c:292
-msgid "Smoke"
-msgstr "Suits"
-
-#: my-evolution/metar.c:293
-msgid "Smoke in the vicinity"
-msgstr "Suits l�heduses"
-
-#: my-evolution/metar.c:294
-msgid "Thin smoke"
-msgstr "V�hene suits"
-
-#: my-evolution/metar.c:295
-msgid "Moderate smoke"
-msgstr "M��dukas suits"
-
-#: my-evolution/metar.c:296
-msgid "Thick smoke"
-msgstr "Paks suits"
-
-#: my-evolution/metar.c:297
-msgid "Shallow smoke"
-msgstr "Madal suits"
-
-#: my-evolution/metar.c:298
-msgid "Patches of smoke"
-msgstr "Paiguti suitsu"
-
-#: my-evolution/metar.c:299
-msgid "Partial smoke"
-msgstr "Hooti suitsu"
-
-#: my-evolution/metar.c:300
-msgid "Thunderous smoke"
-msgstr "Tormiline suits"
-
-#: my-evolution/metar.c:301
-msgid "Smoke with wind"
-msgstr "Suits tuulega"
-
-#: my-evolution/metar.c:303
-msgid "Drifting smoke"
-msgstr "Liikuv suits"
-
-#. VOLCANIC_ASH
-#: my-evolution/metar.c:307
-msgid "Volcanic ash"
-msgstr "Vulkaaniline tuhk"
-
-#: my-evolution/metar.c:308
-msgid "Volcanic ash in the vicinity"
-msgstr "Vulkaaniline tuhk l�heduses"
-
-#: my-evolution/metar.c:310
-msgid "Moderate volcanic ash"
-msgstr "M��dukalt vulkaanilist tuhka"
-
-#: my-evolution/metar.c:311
-msgid "Thick volcanic ash"
-msgstr "Tihedalt vulkaanilist tuhke"
-
-#: my-evolution/metar.c:312
-msgid "Shallow volcanic ash"
-msgstr "Madal vulkaaniline tuhk"
-
-#: my-evolution/metar.c:313
-msgid "Patches of volcanic ash"
-msgstr "Paiguti vulkaanilist tuhka"
-
-#: my-evolution/metar.c:314
-msgid "Partial volcanic ash"
-msgstr "Hooti vulkaanilist tuhka"
-
-#: my-evolution/metar.c:315
-msgid "Thunderous volcanic ash"
-msgstr "Tormiliselt vulkaanilist tuhke"
-
-#: my-evolution/metar.c:316
-msgid "Blowing volcanic ash"
-msgstr "Vulkaaniline tuhk tuulega"
-
-#: my-evolution/metar.c:317
-msgid "Showers of volcanic ash"
-msgstr "Vulkaanilise tuha valangud"
-
-#: my-evolution/metar.c:318
-msgid "Drifting volcanic ash"
-msgstr "Liikuv vulkaaniline tuhk"
-
-#: my-evolution/metar.c:319
-msgid "Freezing volcanic ash"
-msgstr "J��tuv vulkaaniline tuhk"
-
-#. SAND
-#: my-evolution/metar.c:322
-msgid "Sand"
-msgstr "Liiv"
-
-#: my-evolution/metar.c:323
-msgid "Sand in the vicinity"
-msgstr "Liiv l�heduses"
-
-#: my-evolution/metar.c:324
-msgid "Light sand"
-msgstr "Pisut liiva"
-
-#: my-evolution/metar.c:325
-msgid "Moderate sand"
-msgstr "M��dukalt liiva"
-
-#: my-evolution/metar.c:326
-msgid "Heavy sand"
-msgstr "Tihedalt liiva"
-
-#: my-evolution/metar.c:328
-msgid "Patches of sand"
-msgstr "Paiguti liiva"
-
-#: my-evolution/metar.c:329
-msgid "Partial sand"
-msgstr "Hooti liiva"
-
-#: my-evolution/metar.c:331
-msgid "Blowing sand"
-msgstr "Liiv tuulega"
-
-#: my-evolution/metar.c:333
-msgid "Drifting sand"
-msgstr "Liikuv liiv"
-
-#. HAZE
-#: my-evolution/metar.c:337
-msgid "Haze"
-msgstr "Vine"
-
-#: my-evolution/metar.c:338
-msgid "Haze in the vicinity"
-msgstr "Vine l�heduses"
-
-#: my-evolution/metar.c:339
-msgid "Light haze"
-msgstr "Kerge vine"
-
-#: my-evolution/metar.c:340
-msgid "Moderate haze"
-msgstr "M��dukas vine"
-
-#: my-evolution/metar.c:341
-msgid "Thick haze"
-msgstr "Paks vine"
-
-#: my-evolution/metar.c:342
-msgid "Shallow haze"
-msgstr "Madal vine"
-
-#: my-evolution/metar.c:343
-msgid "Patches of haze"
-msgstr "Paiguti vine"
-
-#: my-evolution/metar.c:344
-msgid "Partial haze"
-msgstr "Hooti vine"
-
-#: my-evolution/metar.c:346
-msgid "Haze with wind"
-msgstr "Vine tuulega"
-
-#: my-evolution/metar.c:348
-msgid "Drifting haze"
-msgstr "Liikuv vine"
-
-#: my-evolution/metar.c:349
-msgid "Freezing haze"
-msgstr "J��tuv vine"
-
-#. SPRAY
-#: my-evolution/metar.c:352
-msgid "Spray"
-msgstr "Veetolm"
-
-#: my-evolution/metar.c:353
-msgid "Spray in the vicinity"
-msgstr "Veetolm l�heduses"
-
-#: my-evolution/metar.c:354
-msgid "Light spray"
-msgstr "N�rgalt veetolmu"
-
-#: my-evolution/metar.c:355
-msgid "Moderate spray"
-msgstr "M��dukalt veetolmu"
-
-#: my-evolution/metar.c:356
-msgid "Heavy spray"
-msgstr "Tihedalt veetolmu"
-
-#: my-evolution/metar.c:357
-msgid "Shallow spray"
-msgstr "Madalal veetolmu"
-
-#: my-evolution/metar.c:358
-msgid "Patches of spray"
-msgstr "Paiguti veetolmu"
-
-#: my-evolution/metar.c:359
-msgid "Partial spray"
-msgstr "Hooti veetolmu"
-
-#: my-evolution/metar.c:361
-msgid "Blowing spray"
-msgstr "Veetolm tuulega"
-
-#: my-evolution/metar.c:363
-msgid "Drifting spray"
-msgstr "Liikuv veetolm"
-
-#: my-evolution/metar.c:364
-msgid "Freezing spray"
-msgstr "J��tuv veetolm"
-
-#. DUST
-#: my-evolution/metar.c:367
-msgid "Dust"
-msgstr "Tolm"
-
-#: my-evolution/metar.c:368
-msgid "Dust in the vicinity"
-msgstr "Tolm l�heduses"
-
-#: my-evolution/metar.c:369
-msgid "Light dust"
-msgstr "Pisut tolmu"
-
-#: my-evolution/metar.c:370
-msgid "Moderate dust"
-msgstr "M��dukalt tolmu"
-
-#: my-evolution/metar.c:371
-msgid "Heavy dust"
-msgstr "Paksult tolmu"
-
-#: my-evolution/metar.c:373
-msgid "Patches of dust"
-msgstr "Paiguti tolmu"
-
-#: my-evolution/metar.c:374
-msgid "Partial dust"
-msgstr "Hooti tolmu"
-
-#: my-evolution/metar.c:376
-msgid "Blowing dust"
-msgstr "Tolm tuulega"
-
-#: my-evolution/metar.c:378
-msgid "Drifting dust"
-msgstr "Liikuv tolm"
-
-#. SQUALL
-#: my-evolution/metar.c:382
-msgid "Squall"
-msgstr "Tuuleiilid"
-
-#: my-evolution/metar.c:383
-msgid "Squall in the vicinity"
-msgstr "Tuuleiilid l�heduses"
-
-#: my-evolution/metar.c:384
-msgid "Light squall"
-msgstr "N�rgad tuuleiilid"
-
-#: my-evolution/metar.c:385
-msgid "Moderate squall"
-msgstr "M��dukad tuuleiilid"
-
-#: my-evolution/metar.c:386
-msgid "Heavy squall"
-msgstr "Tugevad tuuleiilid"
-
-#: my-evolution/metar.c:389
-msgid "Partial squall"
-msgstr "Hooti tuuleiilid"
-
-#: my-evolution/metar.c:390
-msgid "Thunderous squall"
-msgstr "Tormipuhangud"
-
-#: my-evolution/metar.c:391
-msgid "Blowing squall"
-msgstr "Puhanguline tuul"
-
-#: my-evolution/metar.c:393
-msgid "Drifting squall"
-msgstr "Liikuvad tuuleiilid"
-
-#: my-evolution/metar.c:394
-msgid "Freezing squall"
-msgstr "J��tuvad tuuleiilid"
-
-#. SANDSTORM
-#: my-evolution/metar.c:397
-msgid "Sandstorm"
-msgstr "Liivatorm"
-
-#: my-evolution/metar.c:398
-msgid "Sandstorm in the vicinity"
-msgstr "Liivatorm l�heduses"
-
-#: my-evolution/metar.c:399
-msgid "Light standstorm"
-msgstr "N�rk liivatorm"
-
-#: my-evolution/metar.c:400
-msgid "Moderate sandstorm"
-msgstr "M��dukas liivatorm"
-
-#: my-evolution/metar.c:401
-msgid "Heavy sandstorm"
-msgstr "Tugev liivatorm"
-
-#: my-evolution/metar.c:402
-msgid "Shallow sandstorm"
-msgstr "Madal liivatorm"
-
-#: my-evolution/metar.c:404
-msgid "Partial sandstorm"
-msgstr "Hooti liivatorm"
-
-#: my-evolution/metar.c:405
-msgid "Thunderous sandstorm"
-msgstr "Metsik liivatorm"
-
-#: my-evolution/metar.c:406
-msgid "Blowing sandstorm"
-msgstr "Tugev liivatorm"
-
-#: my-evolution/metar.c:408
-msgid "Drifting sandstorm"
-msgstr "Liikuv liivatorm"
-
-#: my-evolution/metar.c:409
-msgid "Freezing sandstorm"
-msgstr "J��tuv liivatorm"
-
-#. DUSTSTORM
-#: my-evolution/metar.c:412
-msgid "Duststorm"
-msgstr "Tolmutorm"
-
-#: my-evolution/metar.c:413
-msgid "Duststorm in the vicinity"
-msgstr "Tolmutorm l�heduses"
-
-#: my-evolution/metar.c:414
-msgid "Light duststorm"
-msgstr "N�rk tolmutorm"
-
-#: my-evolution/metar.c:415
-msgid "Moderate duststorm"
-msgstr "M��dukas tolmutorm"
-
-#: my-evolution/metar.c:416
-msgid "Heavy duststorm"
-msgstr "Tugev tolmutorm"
-
-#: my-evolution/metar.c:417
-msgid "Shallow duststorm"
-msgstr "Madal tolmutorm"
-
-#: my-evolution/metar.c:419
-msgid "Partial duststorm"
-msgstr "Hooti tolmutorm"
-
-#: my-evolution/metar.c:420
-msgid "Thunderous duststorm"
-msgstr "Metsik tolmutorm"
-
-#: my-evolution/metar.c:421
-msgid "Blowing duststorm"
-msgstr "Tugev tolmutorm"
-
-#: my-evolution/metar.c:423
-msgid "Drifting duststorm"
-msgstr "Liikuv tolmutorm"
-
-#: my-evolution/metar.c:424
-msgid "Freezing duststorm"
-msgstr "J��tuv tolmutorm"
-
-#. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
-msgid "Funnel cloud"
-msgstr "Tuulispask"
-
-#: my-evolution/metar.c:428
-msgid "Funnel cloud in the vicinity"
-msgstr "Tuulispask l�heduses"
-
-#: my-evolution/metar.c:429
-msgid "Light funnel cloud"
-msgstr "N�rk tuulispask"
-
-#: my-evolution/metar.c:430
-msgid "Moderate funnel cloud"
-msgstr "M��dukas tuulispask"
-
-#: my-evolution/metar.c:431
-msgid "Thick funnel cloud"
-msgstr "Tugev tuulispask"
-
-#: my-evolution/metar.c:432
-msgid "Shallow funnel cloud"
-msgstr "Madal tuulispask"
-
-#: my-evolution/metar.c:433
-msgid "Patches of funnel clouds"
-msgstr "Paiguti tuulispasad"
-
-#: my-evolution/metar.c:434
-msgid "Partial funnel clouds"
-msgstr "Hooti tuulispasad"
-
-#: my-evolution/metar.c:436
-msgid "Funnel cloud w/ wind"
-msgstr "Tuulispask ja tugev tuul"
-
-#: my-evolution/metar.c:438
-msgid "Drifting funnel cloud"
-msgstr "Liikuv tuulispask"
-
-#. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
-msgid "Tornado"
-msgstr "Tornaado"
-
-#: my-evolution/metar.c:443
-msgid "Tornado in the vicinity"
-msgstr "Tornaado l�heduses"
-
-#: my-evolution/metar.c:445
-msgid "Moderate tornado"
-msgstr "M��dukas tornaado"
-
-#: my-evolution/metar.c:446
-msgid "Raging tornado"
-msgstr "Raevukas tornaado"
-
-#: my-evolution/metar.c:449
-msgid "Partial tornado"
-msgstr "Hooti tornadadod"
-
-#: my-evolution/metar.c:450
-msgid "Thunderous tornado"
-msgstr "Metsik tornaado"
-
-#: my-evolution/metar.c:453
-msgid "Drifting tornado"
-msgstr "Liikuv tornaado"
-
-#: my-evolution/metar.c:454
-msgid "Freezing tornado"
-msgstr "J��tuv tornaado"
-
-#. DUST_WHIRLS
-#: my-evolution/metar.c:457
-msgid "Dust whirls"
-msgstr "Tolmup��rised"
-
-#: my-evolution/metar.c:458
-msgid "Dust whirls in the vicinity"
-msgstr "Tolmup��rised l�heduses"
-
-#: my-evolution/metar.c:459
-msgid "Light dust whirls"
-msgstr "N�rgad tolmup��rised"
-
-#: my-evolution/metar.c:460
-msgid "Moderate dust whirls"
-msgstr "M��dukad tolmup��rised"
-
-#: my-evolution/metar.c:461
-msgid "Heavy dust whirls"
-msgstr "Tugevad tolmup��rised"
-
-#: my-evolution/metar.c:462
-msgid "Shallow dust whirls"
-msgstr "Madalad tolmup��rised"
-
-#: my-evolution/metar.c:463
-msgid "Patches of dust whirls"
-msgstr "Paiguti tolmup��rised"
-
-#: my-evolution/metar.c:464
-msgid "Partial dust whirls"
-msgstr "Hooti tolmup��rised"
-
-#: my-evolution/metar.c:466
-msgid "Blowing dust whirls"
-msgstr "Tolmup��rised tuulega"
-
-#: my-evolution/metar.c:468
-msgid "Drifting dust whirls"
-msgstr "Liikuvad tolmup��rised"
-
-#: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr " _Eemalda"
-
-#: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ews feed"
-msgstr "Li_sa uudistekanal"
-
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "_K�ik ilmajaamad:"
-
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "_K�ik kaustad:"
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "_K�ik uudistekanalid:"
-
-#: my-evolution/my-evolution.glade.h:6
-msgid "C_elsius"
-msgstr "_Celsius"
-
-#: my-evolution/my-evolution.glade.h:8
-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:9
-msgid "Ma_x number of items shown:"
-msgstr "Maksimaalne kuvatavate kir_jete arv:"
-
-#: my-evolution/my-evolution.glade.h:10
-msgid "News Feed Settings"
-msgstr "Uudistekanalite seadistused"
-
-#: my-evolution/my-evolution.glade.h:11
-msgid "One mont_h"
-msgstr "�hte _kuud"
-
-#: my-evolution/my-evolution.glade.h:12
-msgid "One w_eek"
-msgstr "�hte _n�dalat"
-
-#: my-evolution/my-evolution.glade.h:13
-msgid "R_efresh time (seconds):"
-msgstr "V_�rskendamise aeg"
-
-#: my-evolution/my-evolution.glade.h:14
-msgid "Refresh _time (seconds):"
-msgstr "V_�rskendamise vahemik (sekundites):"
-
-#: my-evolution/my-evolution.glade.h:15
-msgid "S_how full path for folders"
-msgstr "_N�ita kaustadele t�ielikku otsinguteed"
-
-#: my-evolution/my-evolution.glade.h:16
-msgid "Show _all tasks"
-msgstr "N�ita k_�iki �lesandeid"
-
-#: my-evolution/my-evolution.glade.h:17
-msgid "Show _today's tasks"
-msgstr "N�ita _t�naseid �lesandeid"
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Show temperatures in:"
-msgstr "Temperatuuri n�itamise �hikud:"
-
-#: my-evolution/my-evolution.glade.h:19
-msgid "Tasks "
-msgstr "�lesanded "
-
-#: my-evolution/my-evolution.glade.h:20
-msgid "Weather settings"
-msgstr "Ilmajaama s�tted"
-
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "Ku_vatavad kaustad:"
-
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "Ku_vatavad ilmajaamad:"
-
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
-msgstr "Ku_vatavad uudistekanalid"
-
-#: my-evolution/my-evolution.glade.h:25
-msgid "_Fahrenheit"
-msgstr "_Fahrenheit"
-
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Five days"
-msgstr "_Viite p�eva"
-
-#: my-evolution/my-evolution.glade.h:27
-msgid "_Mail"
-msgstr "E-_Post"
-
-#: my-evolution/my-evolution.glade.h:28
-msgid "_News Feeds"
-msgstr "_Uudistekanalid"
-
-#: my-evolution/my-evolution.glade.h:29
-msgid "_One day"
-msgstr "_�hte p�eva"
-
-#: my-evolution/my-evolution.glade.h:30
-msgid "_Schedule"
-msgstr "_Ajakava"
-
-#: my-evolution/my-evolution.glade.h:31
-msgid "_Weather"
-msgstr "_Ilmateade"
-
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
 msgstr "�rhus"
@@ -15429,7473 +14866,8901 @@ 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 "Dodge City"
 
-#: 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 "Valmis"
+
+#: 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 "D�sseldorf"
 
-#: 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 "Ida-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 "Ida-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 "Elizabeth City"
 
-#: my-evolution/Locations.h:657
+#: my-evolution/Locations.h:659
 msgid "Elk City"
 msgstr "Elk City"
 
-#: 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 "Euroopa"
 
-#: 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 "Falls City"
 
-#: 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 (Rahvusvaheline)"
 
-#: 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 (Edela-Florida rahvusvaheline)"
 
-#: 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 "Fukue Lennujaam"
 
-#: my-evolution/Locations.h:782
+#: my-evolution/Locations.h:784
 msgid "Fukui Airport"
 msgstr "Fukui Lennujaam"
 
-#: my-evolution/Locations.h:783
+#: my-evolution/Locations.h:785
 msgid "Fukuoka Airport"
 msgstr "Fukuoka Lennujaam"
 
-#: 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 "Makedoonia"
 
-#: 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 "Garden City"
 
-#: 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 "Genf"
 
-#: my-evolution/Locations.h:806
+#: my-evolution/Locations.h:808
 msgid "Genova"
 msgstr "Genua"
 
-#: my-evolution/Locations.h:807
+#: my-evolution/Locations.h:809
 msgid "George Airport"
 msgstr "George'i Lennujaam"
 
-#: 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 "Goose Bay"
 
-#: my-evolution/Locations.h:828
+#: my-evolution/Locations.h:830
 msgid "Goteborg (Landvetter)"
 msgstr "G�teborg (Landvetter)"
 
-#: my-evolution/Locations.h:829
+#: my-evolution/Locations.h:831
 msgid "Goteborg (Save)"
 msgstr "G�teborg (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 "Grand Island"
 
-#: 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 "Green Bay"
 
-#: 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 "Gr�ningen"
 
-#: 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 "Havanna"
 
-#: my-evolution/Locations.h:879
+#: my-evolution/Locations.h:881
 msgid "Hachijojima Airport"
 msgstr "Hachijojima Lennujaam"
 
-#: 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 "Rahe"
+
+#: 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 "Hakodate Lennujaam"
 
-#: 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 "Hanamaki Lennujaam"
 
-#: 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 "Hanoi"
 
-#: 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 "Helsingi"
 
-#: 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 "Hill City"
 
-#: 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 "Hiroshima Lennujaam"
 
-#: 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 "Ho Chi 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 "Iki Lennujaam"
 
-#: 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 "Iowa City"
 
-#: 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 "Iraan"
 
-#: 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 "Mani saar"
 
-#: 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 "Izumo Lennuv�li"
 
-#: 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 "Jacksonville-Craigi Lennuv�li"
 
-#: 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 "Jeddah King Abdul Azizi Rahvusvaheline Lennuv�li"
 
-#: my-evolution/Locations.h:1034
+#: my-evolution/Locations.h:1037
 msgid "Jefferson City"
 msgstr "Jefferson City"
 
-#: 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 "J�nk�ping"
 
-#: 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 "Kagoshima Lennuv�li"
 
-#: 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 "Kansai Rahvusvaheline Lennuv�li"
 
-#: 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 "Kansas City"
 
-#: my-evolution/Locations.h:1066
+#: my-evolution/Locations.h:1069
 msgid "Kansas City-Gladstone"
 msgstr "Kansas City-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 "Kaasan"
 
-#: 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 "Habarovsvk"
 
-#: 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 "Kikai Island"
 
-#: 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 "King Khaledi Rahvusvaheline Lennuv�li"
 
-#: 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 "Kitakyushu Lennujaam"
 
-#: 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 "Kaliningrad"
 
-#: 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 "Kopenhaagen/Kastrup"
 
-#: my-evolution/Locations.h:1117
+#: my-evolution/Locations.h:1121
 msgid "Kobenhavn/Roskilde"
 msgstr "Kopenhaagen/Roskilde"
 
-#: my-evolution/Locations.h:1118
+#: my-evolution/Locations.h:1122
 msgid "Kochi Airport"
 msgstr "Kochi Lennujaam"
 
-#: 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 "K�ln/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 Demokraatlik Rahvavabariik"
 
-#: my-evolution/Locations.h:1129
+#: my-evolution/Locations.h:1133
 msgid "Korea, Republic of"
 msgstr "Korea Vabariik"
 
-#: 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 "Krasnojarsk"
 
-#: 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 "Kumamoto Lennujaam"
 
-#: 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 "Kushiro Lennujaam"
 
-#: 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:1191
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1185
+#: my-evolution/Locations.h:1192
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1186
+#: my-evolution/Locations.h:1193
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1187
+#: my-evolution/Locations.h:1194
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1188
+#: my-evolution/Locations.h:1195
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1189
+#: my-evolution/Locations.h:1196
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1190
+#: my-evolution/Locations.h:1197
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1199
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1200
 msgid "Leeds and Bradford"
 msgstr "Leeds ja Bradford"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1201
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1202
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1203
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1204
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1205
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1206
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1207
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1208
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1209
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1210
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1211
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1212
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1213
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1214
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1215
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1216
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1217
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1219
 msgid "Libya"
 msgstr "Liib�a"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1220
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1221
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1222
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1223
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1224
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1225
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1226
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1227
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1228
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1229
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1230
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1231
 msgid "Lisboa"
 msgstr "Lissabon"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1232
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1233
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1235
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1236
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1237
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1238
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1239
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1240
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1241
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1242
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1243
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1244
 msgid "London"
 msgstr "London"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1245
 msgid "London/City"
 msgstr "London/City"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1246
 msgid "London/Gatwick"
 msgstr "London/Gatwick"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1247
 msgid "London/Heathrow"
 msgstr "London/Heathrow"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1248
 msgid "London/Stansted"
 msgstr "London/Stansted"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1249
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1250
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1251
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1252
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1253
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1254
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1255
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1256
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1257
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1258
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1259
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1260
 msgid "Lousiana"
 msgstr "Lousiana"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1261
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1262
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1263
 msgid "Lubeck-Blankensee"
 msgstr "L��bek-Blankensee"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1264
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1265
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1266
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1267
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1269
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1270
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1271
+#, fuzzy
+msgid "Lviv"
+msgstr "L�ti"
+
+#: my-evolution/Locations.h:1272
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1273
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1275
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1276
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1277
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1278
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1279
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1280
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1281
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1282
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1283
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1285
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1286
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1287
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1288
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1289
 msgid "Makhachkala"
 msgstr "Mahhat�kala"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1290
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1291
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1292
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1293
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1294
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1295
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1296
 msgid "Malmo/Sturup"
 msgstr "Malm�/Sturup"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1298
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1299
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1300
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1301
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1302
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1303
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1304
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1305
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1306
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1307
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1308
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1309
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1310
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1311
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1312
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1313
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1314
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1315
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1316
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1317
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1318
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1319
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1320
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1321
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1322
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1323
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1324
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1325
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1326
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1327
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1328
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1329
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1330
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1331
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1332
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1333
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1334
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1335
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1336
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1337
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1338
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1339
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1340
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1341
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1342
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1343
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1344
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1345
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Lennujaam"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1346
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1347
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Lennujaam"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1348
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1349
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1350
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1351
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1352
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1353
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1354
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1355
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1356
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1357
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1358
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1359
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1360
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1361
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1362
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1363
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1364
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1365
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1366
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1367
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1368
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1369
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1370
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Lennujaam"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1371
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1372
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1373
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1374
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1375
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1376
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1377
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1378
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1379
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1380
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1381
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1382
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1383
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1384
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1385
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1386
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1388
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1389
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1390
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1391
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1392
 msgid "Middle East"
 msgstr "L�his-Ida"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1393
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1394
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1395
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1396
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1397
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1398
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1399
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1400
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1401
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1402
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1403
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1405
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1406
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1407
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1408
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1409
 msgid "Mineralnye Vody"
 msgstr "Mineraln�je Vod�"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1410
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1413
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1414
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1415
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1416
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1417
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1418
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1419
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1420
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1421
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1422
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1423
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1424
 msgid "Miyakejima Airport"
 msgstr "Miyakejima Lennujaam"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1425
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Lennujaam"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1426
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1427
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1428
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regionaalne Lennujaam"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1429
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1430
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1431
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1432
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1433
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1434
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1435
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1436
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1437
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Lennujaam"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1438
 msgid "Monchengladbach"
 msgstr "M�nchengladbach"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1439
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1440
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1441
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1442
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1443
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1444
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1445
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1446
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1447
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1448
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1449
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1450
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1451
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1452
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1453
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1454
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1455
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1456
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1457
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1458
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1459
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1460
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1461
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1462
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1463
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1464
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1465
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1466
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1467
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1468
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1469
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1471
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1472
 msgid "Moscow Domodedovo"
 msgstr "Moskva Domodedovo"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1473
 msgid "Moscow Sheremetyevo"
 msgstr "Moskva �eremetjevo"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1474
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1475
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1476
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1477
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1478
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1479
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1480
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1481
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1482
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1483
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1484
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1485
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1486
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1487
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1488
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1489
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1490
 msgid "Munchen"
 msgstr "M�nchen"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1491
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1492
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1493
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1494
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1495
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1496
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1497
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1498
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1499
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1500
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1501
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1502
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1503
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Lennujaam"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1504
 msgid "Nagoya Airport"
 msgstr "Nagoya Lennujaam"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1505
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1506
 msgid "Naha Airport"
 msgstr "Naha Lennujaam"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1507
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1508
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Lennujaam"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1509
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1510
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1512
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1513
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama Lennujaam"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1514
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1515
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1516
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1517
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1518
 msgid "Naples"
 msgstr "Naples"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1519
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1520
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1521
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1522
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1523
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1524
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1525
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1526
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1527
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1528
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1529
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1530
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1532
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1533
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1534
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1535
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1536
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1537
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1538
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1539
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1540
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1541
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1542
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1543
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1544
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1545
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1546
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1547
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1548
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1549
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1550
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1551
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1552
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1553
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1554
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1555
 msgid "New Tokyo International Airport"
 msgstr "Tokyo Uus Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1556
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1557
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1558
 msgid "New York-JFK Arpt"
 msgstr "New York JFK Lennujaam"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1559
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1561
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1563
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1564
 msgid "Niigata Airport"
 msgstr "Niigata Lennujaam"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1565
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1566
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1567
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1568
 msgid "Nizhny Novgorod"
 msgstr "Ni�ni Novgorod"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1569
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1570
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1571
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1572
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1573
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1575
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1576
 msgid "Norrkoping"
 msgstr "Norrk�ping"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1577
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1578
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1579
 msgid "North Carolina"
 msgstr "P�hja-Carolina"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1580
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1581
 msgid "North Dakota"
 msgstr "P�hja-Dakota"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1582
 msgid "Northeast Philadelphia"
 msgstr "Kirde-Philadelphia"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1583
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1584
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1585
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1586
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1588
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1589
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1590
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1591
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1592
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1593
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1594
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1595
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1596
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1597
 msgid "Nurnberg"
 msgstr "N�rnberg"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1598
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1599
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1600
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1601
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1602
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1603
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1604
 msgid "Obihiro Airport"
 msgstr "Obihiro Lennujaam"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1605
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1606
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1607
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1608
+#, fuzzy
+msgid "Odesa"
+msgstr "Odense"
+
+#: my-evolution/Locations.h:1609
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1610
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1611
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1612
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1613
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1614
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1615
 msgid "Oita Airport"
 msgstr "Oita Lennujaam"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1616
 msgid "Ojika Island"
 msgstr "Ojika saar"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1617
 msgid "Okayama Airport"
 msgstr "Okayama Lennujaam"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1618
 msgid "Oki Airport"
 msgstr "Oki Lennujaam"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1619
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1623
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1624
 msgid "Okushiri Island"
 msgstr "Okushiri saar"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1625
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1626
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1627
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1628
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1629
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1630
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1631
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1633
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1634
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1635
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1636
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1637
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1638
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1639
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1640
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1641
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1642
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1643
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1644
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1645
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1646
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1647
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando Rahvusvaheline)"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1648
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1649
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1650
 msgid "Osaka International Airport"
 msgstr "Osaka Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1651
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1652
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1653
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1654
 msgid "Oshima Airport"
 msgstr "Oshima Lennujaam"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1655
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1656
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1657
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1658
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1659
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1660
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1661
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1662
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1663
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1664
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1665
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1666
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1667
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1668
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1669
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1670
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1671
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1674
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1675
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1676
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1677
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1678
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1679
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1680
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1681
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1682
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1684
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1685
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1686
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1687
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1689
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1690
 msgid "Paris/Charles De Gaulle"
 msgstr "Pariis/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1691
 msgid "Paris/Le Bourget"
 msgstr "Pariis/Le Bourget"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1692
 msgid "Paris/Orly"
 msgstr "Pariis/Orly"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1693
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1694
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1695
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1696
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1697
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1698
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1699
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1700
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1701
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1702
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1703
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1704
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1705
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1706
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1707
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1708
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1709
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1710
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1711
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1712
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1713
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1714
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1715
 msgid "People's Republic of China"
 msgstr "Hiina Rahvavabariik"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1716
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1717
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1718
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1719
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1720
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1721
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1722
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1724
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1725
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1726
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1727
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamt�atski"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1728
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1729
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1730
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1731
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1732
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1733
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1736
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1737
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1738
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1739
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1740
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1741
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1742
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1743
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1744
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1745
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1746
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1747
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1748
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1750
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1751
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1752
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1753
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1754
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1755
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1756
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1757
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1758
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1759
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1760
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1761
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1762
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1763
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1765
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1766
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1767
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1768
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1769
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1770
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1771
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1772
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1773
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1774
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1775
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1776
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1777
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1778
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1779
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1780
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1781
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1782
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1783
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1785
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Lennujaam"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1786
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1787
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1788
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1789
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1790
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1792
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1793
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1794
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1795
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1796
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1797
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1798
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1799
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1800
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1801
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1802
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1803
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1804
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1805
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1806
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1807
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1808
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1809
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1810
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1811
 msgid "Pskov"
 msgstr "Pihkva"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1812
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1813
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1814
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1815
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1816
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1817
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1818
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1819
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1820
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1821
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1822
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1823
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1825
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1826
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1827
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1828
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1829
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1830
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1831
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1832
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1833
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1834
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1835
 msgid "Pyongyang"
 msgstr "Pj�ngjang"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1837
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1838
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1839
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1840
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1841
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1842
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1843
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1844
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1845
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1846
 msgid "Raduzhny"
 msgstr "Radu�n�i"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1847
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1848
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1849
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1850
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1851
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1852
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1853
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1854
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1855
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1856
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1857
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1858
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1859
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1860
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1861
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1862
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1863
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1864
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1865
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1866
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1867
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1868
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1869
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1870
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1871
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1872
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1873
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1874
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1875
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1876
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1877
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1878
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1879
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1880
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1881
 msgid "Riga"
 msgstr "Riia"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1882
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1883
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1884
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1885
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1886
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1887
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1888
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1889
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1890
 msgid "Rishiri Island"
 msgstr "Rishiri saar"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1891
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1892
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1893
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1894
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1895
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "Rivera"
+
+#: my-evolution/Locations.h:1897
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1898
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1899
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1900
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1901
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1902
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1903
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1904
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1905
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1906
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1907
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1908
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1909
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1910
 msgid "Roma/Ciampino"
 msgstr "Rooma/Ciampino"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1911
 msgid "Roma/Fiumicino"
 msgstr "Rooma/Fiumicino"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1913
 msgid "Roma/Urbe"
 msgstr "Rooma/Urbe"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1914
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1915
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1916
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1917
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1918
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1919
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1920
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1921
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1922
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1923
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1924
 msgid "Rostov-Na-Donu"
 msgstr "Rostov Doni ��res"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1925
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1926
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1927
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1928
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1929
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1930
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1931
 msgid "Russia"
 msgstr "Venemaa"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1932
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1933
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1934
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1935
 msgid "Saarbrucken"
 msgstr "Saarbr�cken"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1936
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1937
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1938
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1939
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Munitsipaallennujaam"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1940
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1941
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1942
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1943
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1944
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1945
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1946
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1947
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1948
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1949
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1950
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1951
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1952
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1953
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1954
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1955
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1956
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1957
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1958
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1959
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1960
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1961
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1962
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1963
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1964
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1965
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1966
 msgid "Samara"
 msgstr "Samaara"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1967
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1968
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1969
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1970
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1971
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1972
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1973
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1974
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1975
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1976
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1977
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1978
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1979
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1980
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1984
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1985
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1986
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1987
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1988
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1989
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1990
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1991
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1992
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1993
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1994
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1995
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1996
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1997
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1998
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1999
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:2000
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:2001
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:2002
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:2003
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:2004
 msgid "San Nicholas Island"
 msgstr "San Nicholase saar"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:2005
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:2006
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:2007
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:2008
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:2009
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:2010
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2011
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2012
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2013
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2014
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2015
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2016
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2017
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2018
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2019
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2020
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2021
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2022
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2023
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2024
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2025
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2026
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2027
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2028
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2029
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2030
 msgid "Saratov"
 msgstr "Saraatov"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2031
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2032
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2033
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2034
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2036
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2037
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2038
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2039
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2040
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2041
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2042
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2043
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2044
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2045
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2046
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2047
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2048
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2049
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2050
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2051
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2052
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2053
 msgid "Sendai Airport"
 msgstr "Sendai Lennujaam"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2054
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2055
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2056
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2057
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2058
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2059
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2060
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2061
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2062
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2063
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2064
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2065
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2066
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2067
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2068
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2069
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2070
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2071
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2072
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2073
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2074
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2075
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2076
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2077
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2078
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2079
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2080
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2081
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2082
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2083
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2084
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2085
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2086
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2087
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2088
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2089
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2091
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2092
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2093
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2094
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2095
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2096
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2097
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2098
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2099
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2100
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2101
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2102
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2105
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2106
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2107
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2108
 msgid "Sochi"
 msgstr "Sot�i"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2109
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2110
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2111
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2112
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2113
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2114
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2115
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2116
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2117
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2118
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2120
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2121
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2122
 msgid "South Carolina"
 msgstr "L�una-Carolina"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2123
 msgid "South Dakota"
 msgstr "L�una-Dakota"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2124
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2125
 msgid "South Marsh Island"
 msgstr "South Marshi saar"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2126
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2128
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2129
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2130
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2131
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2132
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2133
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2134
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2135
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2136
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2137
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2138
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2139
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2140
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2141
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2142
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2143
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2144
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2145
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2146
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2147
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2148
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2149
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2150
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2151
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2152
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2153
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2154
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2155
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2156
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2157
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2158
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2159
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2160
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2161
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2162
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2163
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2164
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2165
 msgid "St Simon's Island"
 msgstr "St Simoni saar"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2166
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2167
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2168
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2169
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2170
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2171
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2172
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2173
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2174
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2175
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2177
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2178
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2179
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2180
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2182
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2184
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2185
 msgid "Syktyvkar"
 msgstr "S�kt�vkar"
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2186
+#, fuzzy
+msgid "Sympheropol"
+msgstr "Stavropol"
+
+#: my-evolution/Locations.h:2187
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2188
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2189
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2190
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2191
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2192
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2193
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2194
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2195
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2196
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2197
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2198
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2199
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2200
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2201
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2202
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2203
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2204
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2206
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2207
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2208
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2209
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Lennujaam"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2210
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2211
 msgid "Talinn"
 msgstr "Tallinn"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2212
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2213
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2214
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2215
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2216
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2217
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2218
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2219
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2220
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2221
 msgid "Tanegashima Airport"
 msgstr "Tanegashima Lennujaam"
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2222
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2223
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2224
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2225
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2226
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2227
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2228
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2229
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2230
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2231
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2232
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2233
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2234
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2235
 msgid "Tehran-Mehrabad"
 msgstr "Teheran-Mehrabad"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2236
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2237
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2238
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2239
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2240
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2241
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2242
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2243
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2244
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2245
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2246
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2247
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2248
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2249
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2250
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2251
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2252
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2253
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2254
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2255
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2256
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2257
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2258
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2259
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2260
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2261
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2262
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2263
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2264
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2265
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2266
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2267
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2268
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima saar"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2269
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2270
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2271
 msgid "Tokyo International Airport"
 msgstr "Tokyo Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2272
 msgid "Tokyo New International Airport"
 msgstr "Tokyo Uus Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2273
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2274
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2275
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2276
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2277
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2278
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2279
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2280
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2281
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2282
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2283
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2284
 msgid "Tottori Airport"
 msgstr "Tottori Lennujaam"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2285
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2286
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2287
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2288
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2289
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2290
 msgid "Toyama Airport"
 msgstr "Toyama Lennujaam"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2291
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2292
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2293
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2294
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2295
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2296
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2297
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2298
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2299
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2300
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2301
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2302
 msgid "Tromso/Langnes"
 msgstr "Troms�/Langnes"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2303
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2304
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2305
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2306
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2307
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2308
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2309
 msgid "Tsushima Airport"
 msgstr "Tsushima Lennujaam"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2310
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2311
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2312
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2313
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2314
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2315
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2316
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2317
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2318
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2319
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2320
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2322
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2323
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2324
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2325
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2326
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2327
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2328
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2329
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2330
 msgid "Tyumen"
 msgstr "Tjumen"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2331
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2332
 msgid "Ufa"
 msgstr "Ufaa"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2333
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2335
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2336
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2337
 msgid "Ulyanovsk"
 msgstr "Uljanovsk"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2338
 msgid "Umea"
 msgstr "Ume�"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2339
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2340
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2341
 msgid "United Arab Emirates "
 msgstr "Araabia �hendemiraadid"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2344
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2345
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2346
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2347
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2349
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2350
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2351
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2352
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2353
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2354
+#, fuzzy
+msgid "Uzhgorod"
+msgstr "Euroopa/Uzhgorod"
+
+#: my-evolution/Locations.h:2355
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2356
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2357
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2358
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2359
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2360
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2361
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2362
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2363
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2364
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2365
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2366
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2367
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2368
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2369
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2370
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2371
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2372
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2373
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2374
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2375
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2376
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2377
 msgid "Vasteras"
 msgstr "V�ster�s"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2378
 msgid "Vaxjo"
 msgstr "Vaxj�"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2379
 msgid "Venezia"
 msgstr "Veneetsia"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2381
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2382
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2383
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2384
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2385
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2386
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2387
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2388
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2389
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2390
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2391
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2393
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2394
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2395
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2396
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2397
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2398
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2399
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2400
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2401
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2402
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2403
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tehn. Lennujaam"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2404
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2405
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2406
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2407
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2408
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2409
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2410
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2411
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2412
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2413
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2414
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2415
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2416
 msgid "Voronezh"
 msgstr "Vorone�"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2417
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2418
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2419
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasseri Lennujaam"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2420
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2421
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2422
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Lennujaam"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2423
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2424
 msgid "Wallops Island"
 msgstr "Wallopsi saar"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2425
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2426
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2427
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2428
 msgid "Warszawa"
 msgstr "Varssavi"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2429
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2430
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2431
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2432
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2433
 msgid "Watertown"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2434
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2435
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2436
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2437
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2438
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2439
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2440
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2441
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2442
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2443
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2444
 msgid "West Atlanta"
 msgstr "L��ne-Atlanta"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2445
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2446
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2447
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2448
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2449
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2450
 msgid "West Virginia"
 msgstr "L��ne-Virginia"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2451
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2452
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2453
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2454
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2455
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2456
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2457
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2458
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2459
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2460
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2461
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2462
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2463
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2464
 msgid "Wien"
 msgstr "Viin"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2465
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2466
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2467
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2468
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2469
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2470
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2471
 msgid "Willow Airport"
 msgstr "Willow Lennujaam"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2472
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2473
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2474
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2475
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2476
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2477
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2478
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2479
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2480
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2481
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2482
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2483
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2484
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2485
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2486
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2487
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2488
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2489
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2490
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2491
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2492
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2493
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2494
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2495
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2496
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatoorium"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2497
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2498
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2499
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2500
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2501
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2502
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2503
 msgid "Yakutsk"
 msgstr "Jakutsk"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2504
 msgid "Yamagata Airport"
 msgstr "Yamagata Lennujaam"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2505
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube Lennujaam"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2506
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2507
 msgid "Yao Airport"
 msgstr "Yao Lennujaam"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2508
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2509
 msgid "Yekaterinburg"
 msgstr "Jekaterinburg"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2510
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2511
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2513
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2514
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2515
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2516
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2517
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2518
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2519
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2520
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2521
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2522
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2523
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2525
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2526
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2527
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2528
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Ju�no-Sahhalinsk"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2529
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2530
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2531
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2532
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2533
 msgid "Zama Airfield"
 msgstr "Zama Lennuv�li"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2534
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2535
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2536
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2537
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2538
 msgid "Zurich"
 msgstr "Z�rich"
 
-# !PARANDA!
+#: 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 "S�ndmused"
+
+#: my-evolution/e-summary-calendar.c:366
+msgid "No appointments"
+msgstr "S�ndmused puuduvad"
+
+#: 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 "Kirjeldus puudub"
+
+#: my-evolution/e-summary-mail.c:151
+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
+msgid "Local Folders"
+msgstr "Kohalikud kaustad"
+
+#. 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:92
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS"
+msgstr "EETN"
+
+#: my-evolution/e-summary-preferences.c:471
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:492
+msgid "Quotes of the Day"
+msgstr "P�eva lause"
+
+#: my-evolution/e-summary-preferences.c:720
+msgid "Add a news feed"
+msgstr "Lisa uudistekanal"
+
+#: my-evolution/e-summary-preferences.c:728
+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
+msgid "Error downloading RDF"
+msgstr "Viga RDF'i allalaadimisel"
+
+#: my-evolution/e-summary-rdf.c:444
+msgid "News Feed"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+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
+#, fuzzy
+msgid "Shown"
+msgstr "Vihmavalingud"
+
+#: my-evolution/e-summary-tasks.c:251
+msgid "No tasks"
+msgstr "�lesanded puuduvad"
+
+#: my-evolution/e-summary-tasks.c:291
+msgid "(No Description)"
+msgstr "(Kirjeldus puudub)"
+
+#: my-evolution/e-summary-weather.c:71
+msgid "My Weather"
+msgstr "Ilmateade"
+
+#: 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 "Ilm"
+
+#: my-evolution/e-summary.c:193
+msgid "%A, %B %e %Y"
+msgstr "%A, %e. %B %Y"
+
+#: my-evolution/e-summary.c:488
+msgid "Please wait..."
+msgstr "Palun oota..."
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Kokkuv�tte tr�kkimine"
+
+#: my-evolution/e-summary.c:626
+msgid "Printing of Summary failed"
+msgstr "Kokkuv�tte tr�kkimine eba�nnestus"
+
+#: my-evolution/main.c:65
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "Bonobo laadimine eba�nnestus.\n"
+
+#: my-evolution/metar.c:44
+msgid "Clear sky"
+msgstr "Selge taevas"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr "Pilver�balad"
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr "Vahelduv pilvisus"
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr "V�hene pilvisus"
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr "Lauspilves"
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+msgid "Invalid"
+msgstr "Vigane"
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr "Muutlik"
+
+#: my-evolution/metar.c:64
+msgid "North"
+msgstr "P�hjast"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr "P�hjast - kirdest"
+
+#: my-evolution/metar.c:64
+msgid "Northeast"
+msgstr "Kirdest"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr "Idast - kirdest"
+
+#: my-evolution/metar.c:65
+msgid "East"
+msgstr "Idast"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr "Idast - kagust"
+
+#: my-evolution/metar.c:65
+msgid "Southeast"
+msgstr "Kagust"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr "L�unast - kagust"
+
+#: my-evolution/metar.c:66
+msgid "South"
+msgstr "L�unast"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr "L�unast - edelast"
+
+#: my-evolution/metar.c:66
+msgid "Southwest"
+msgstr "Edelast"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr "L��nest - edelast"
+
+#: my-evolution/metar.c:67
+msgid "West"
+msgstr "L��nest"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr "L��nest - loodest"
+
+#: my-evolution/metar.c:67
+msgid "Northwest"
+msgstr "Loodest"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr "P�hjast - loodest"
+
+#. DRIZZLE
+#: my-evolution/metar.c:127
+msgid "Drizzle"
+msgstr "Uduvihm"
+
+#: my-evolution/metar.c:128
+msgid "Drizzle in the vicinity"
+msgstr "Uduvihm l�heduses"
+
+#: my-evolution/metar.c:129
+msgid "Light drizzle"
+msgstr "N�rk uduvihm"
+
+#: my-evolution/metar.c:130
+msgid "Moderate drizzle"
+msgstr "M��dukas uduvihm"
+
+#: my-evolution/metar.c:131
+msgid "Heavy drizzle"
+msgstr "Tugev uduvihm"
+
+#: my-evolution/metar.c:132
+msgid "Shallow drizzle"
+msgstr "Madal uduvihm"
+
+#: my-evolution/metar.c:133
+msgid "Patches of drizzle"
+msgstr "Paiguti sajab uduvihma"
+
+#: my-evolution/metar.c:134
+msgid "Partial drizzle"
+msgstr "Aeg-ajalt sajab uduvihma"
+
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
+msgid "Thunderstorm"
+msgstr "�ike"
+
+#: my-evolution/metar.c:136
+msgid "Windy drizzle"
+msgstr "Uduvihm tuulega"
+
+#: my-evolution/metar.c:137
+msgid "Showers"
+msgstr "Vihmavalingud"
+
+#: my-evolution/metar.c:138
+msgid "Drifting drizzle"
+msgstr "Liikuv uduvihm"
+
+#: my-evolution/metar.c:139
+msgid "Freezing drizzle"
+msgstr "J��tuv uduvihm"
+
+#. RAIN
+#: my-evolution/metar.c:142
+msgid "Rain"
+msgstr "Vihm"
+
+#: my-evolution/metar.c:143
+msgid "Rain in the vicinity"
+msgstr "L�heduses sajab"
+
+#: my-evolution/metar.c:144
+msgid "Light rain"
+msgstr "Kerge vihm"
+
+#: my-evolution/metar.c:145
+msgid "Moderate rain"
+msgstr "M��dukas vihm"
+
+#: my-evolution/metar.c:146
+msgid "Heavy rain"
+msgstr "Tugev vihm"
+
+#: my-evolution/metar.c:147
+msgid "Shallow rain"
+msgstr "Madal vihm"
+
+#: my-evolution/metar.c:148
+msgid "Patches of rain"
+msgstr "Paiguti sajab vihma"
+
+#: my-evolution/metar.c:149
+msgid "Partial rainfall"
+msgstr "Hoovihmad"
+
+#: my-evolution/metar.c:151
+msgid "Blowing rainfall"
+msgstr "Vihm tuulega"
+
+#: my-evolution/metar.c:152
+msgid "Rain showers"
+msgstr "Vihmavalingud"
+
+#: my-evolution/metar.c:153
+msgid "Drifting rain"
+msgstr "Liikuv vihm"
+
+#: my-evolution/metar.c:154
+msgid "Freezing rain"
+msgstr "J��tuv vihm"
+
+#. SNOW
+#: my-evolution/metar.c:157
+msgid "Snow"
+msgstr "Lumi"
+
+#: my-evolution/metar.c:158
+msgid "Snow in the vicinity"
+msgstr "L�heduses sajab lund"
+
+#: my-evolution/metar.c:159
+msgid "Light snow"
+msgstr "N�rk lumesadu"
+
+#: my-evolution/metar.c:160
+msgid "Moderate snow"
+msgstr "M��dukas lumesadu"
+
+#: my-evolution/metar.c:161
+msgid "Heavy snow"
+msgstr "Tugev lumesadu"
+
+#: my-evolution/metar.c:162
+msgid "Shallow snow"
+msgstr "Madal lumesadu"
+
+#: my-evolution/metar.c:163
+msgid "Patches of snow"
+msgstr "Paiguti sajab lund"
+
+#: my-evolution/metar.c:164
+msgid "Partial snowfall"
+msgstr "Hooti sajab lund"
+
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
+msgid "Snowstorm"
+msgstr "Lumetorm"
+
+#: my-evolution/metar.c:166
+msgid "Blowing snowfall"
+msgstr "Lumesadu tuulega"
+
+#: my-evolution/metar.c:167
+msgid "Snow showers"
+msgstr "Hootised lumesajud"
+
+#: my-evolution/metar.c:168
+msgid "Drifting snow"
+msgstr "Liikuv lumesadu"
+
+#: my-evolution/metar.c:169
+msgid "Freezing snow"
+msgstr "J��tuv lumesadu"
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:172
+msgid "Snow grains"
+msgstr "Lumeterad"
+
+#: my-evolution/metar.c:173
+msgid "Snow grains in the vicinity"
+msgstr "L�heduses sajab lumeteri"
+
+#: my-evolution/metar.c:174
+msgid "Light snow grains"
+msgstr "N�rgalt lumeteri"
+
+#: my-evolution/metar.c:175
+msgid "Moderate snow grains"
+msgstr "M��dukalt lumeteri"
+
+#: my-evolution/metar.c:176
+msgid "Heavy snow grains"
+msgstr "Tihedalt lumeteri"
+
+#: my-evolution/metar.c:177
+msgid "Shallow snow grains"
+msgstr "Madalal sajab lumeteri"
+
+#: my-evolution/metar.c:178
+msgid "Patches of snow grains"
+msgstr "Paiguti sajab lumeteri"
+
+#: my-evolution/metar.c:179
+msgid "Partial snow grains"
+msgstr "Hooti sajab lumeteri"
+
+#: my-evolution/metar.c:181
+msgid "Blowing snow grains"
+msgstr "Lumeterad tuulega"
+
+#: my-evolution/metar.c:182
+msgid "Snow grain showers"
+msgstr "Lumeterade valingud"
+
+#: my-evolution/metar.c:183
+msgid "Drifting snow grains"
+msgstr "Liikuvad lumeterad"
+
+#: my-evolution/metar.c:184
+msgid "Freezing snow grains"
+msgstr "J��tuvad lumeterad"
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:187
+msgid "Ice crystals"
+msgstr "J��kristallid"
+
+#: my-evolution/metar.c:188
+msgid "Ice crystals in the vicinity"
+msgstr "J��kristallid l�heduses"
+
+#: my-evolution/metar.c:189
+msgid "Few ice crystals"
+msgstr "V�he j��kristalle"
+
+#: my-evolution/metar.c:190
+msgid "Moderate ice crystals"
+msgstr "M��dukalt j��kristalle"
+
+#: my-evolution/metar.c:191
+msgid "Heavy ice crystals"
+msgstr "Tihedalt j��kristalle"
+
+#: my-evolution/metar.c:193
+msgid "Patches of ice crystals"
+msgstr "Paiguti on j��kristalle"
+
+#: my-evolution/metar.c:194
+msgid "Partial ice crystals"
+msgstr "Hooti sajab j��kristalle"
+
+#: my-evolution/metar.c:195
+msgid "Ice crystal storm"
+msgstr "J��kristallide torm"
+
+#: my-evolution/metar.c:196
+msgid "Blowing ice crystals"
+msgstr "J��kristallid tuulega"
+
+#: my-evolution/metar.c:197
+msgid "Showers of ice crystals"
+msgstr "J��kristallide valingud"
+
+#: my-evolution/metar.c:198
+msgid "Drifting ice crystals"
+msgstr "Liikuvad j�kristallid"
+
+#: my-evolution/metar.c:199
+msgid "Freezing ice crystals"
+msgstr "J��tuvad j��kristallid"
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:202
+msgid "Ice pellets"
+msgstr "J��terad"
+
+#: my-evolution/metar.c:203
+msgid "Ice pellets in the vicinity"
+msgstr "J��terad l�heduses"
+
+#: my-evolution/metar.c:204
+msgid "Few ice pellets"
+msgstr "V�he j��teri"
+
+#: my-evolution/metar.c:205
+msgid "Moderate ice pellets"
+msgstr "M��dukalt j��teri"
+
+#: my-evolution/metar.c:206
+msgid "Heavy ice pellets"
+msgstr "Tihedalt j��teri"
+
+#: my-evolution/metar.c:207
+msgid "Shallow ice pellets"
+msgstr "Madalad j��terad"
+
+#: my-evolution/metar.c:208
+msgid "Patches of ice pellets"
+msgstr "Paiguti j��teri"
+
+#: my-evolution/metar.c:209
+msgid "Partial ice pellets"
+msgstr "Hooti j��teri"
+
+#: my-evolution/metar.c:210
+msgid "Ice pellet storm"
+msgstr "J��terade torm"
+
+#: my-evolution/metar.c:211
+msgid "Blowing ice pellets"
+msgstr "J��terad tuulega"
+
+#: my-evolution/metar.c:212
+msgid "Showers of ice pellets"
+msgstr "J��terade valingud"
+
+#: my-evolution/metar.c:213
+msgid "Drifting ice pellets"
+msgstr "Liikuvad j��terad"
+
+#: my-evolution/metar.c:214
+msgid "Freezing ice pellets"
+msgstr "J��tuvad j��terad"
+
+#: my-evolution/metar.c:218
+msgid "Hail in the vicinity"
+msgstr "Rahe l�heduses"
+
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
+msgid "Light hail"
+msgstr "N�rk rahesadu"
+
+#: my-evolution/metar.c:220
+msgid "Moderate hail"
+msgstr "M��dukas rahesadu"
+
+#: my-evolution/metar.c:221
+msgid "Heavy hail"
+msgstr "Tugev rahesadu"
+
+#: my-evolution/metar.c:222
+msgid "Shallow hail"
+msgstr "Madal rahesadu"
+
+#: my-evolution/metar.c:223
+msgid "Patches of hail"
+msgstr "Paiguti on rahesadu"
+
+#: my-evolution/metar.c:224
+msgid "Partial hail"
+msgstr "Hooti on rahesadu"
+
+#: my-evolution/metar.c:225
+msgid "Hailstorm"
+msgstr "Rahetorm"
+
+#: my-evolution/metar.c:226
+msgid "Blowing hail"
+msgstr "Rahesadu tuulega"
+
+#: my-evolution/metar.c:227
+msgid "Hail showers"
+msgstr "Rahehood"
+
+#: my-evolution/metar.c:228
+msgid "Drifting hail"
+msgstr "Liikuv rahesadu"
+
+#: my-evolution/metar.c:229
+msgid "Freezing hail"
+msgstr "J��tuv rahesadu"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:232
+msgid "Small hail"
+msgstr "Peen rahe"
+
+#: my-evolution/metar.c:233
+msgid "Small hail in the vicinity"
+msgstr "Peen rahe l�heduses"
+
+#: my-evolution/metar.c:235
+msgid "Moderate small hail"
+msgstr "M��dukalt peent rahet"
+
+#: my-evolution/metar.c:236
+msgid "Heavy small hail"
+msgstr "Tugevalt peent rahet"
+
+#: my-evolution/metar.c:237
+msgid "Shallow small hail"
+msgstr "Madal peen rahe"
+
+#: my-evolution/metar.c:238
+msgid "Patches of small hail"
+msgstr "Paiguti on peent rahet"
+
+#: my-evolution/metar.c:239
+msgid "Partial small hail"
+msgstr "Hooti on peent rahet"
+
+#: my-evolution/metar.c:240
+msgid "Small hailstorm"
+msgstr "Peene rahe tuisk"
+
+#: my-evolution/metar.c:241
+msgid "Blowing small hail"
+msgstr "Peen rahe tuulega"
+
+#: my-evolution/metar.c:242
+msgid "Showers of small hail"
+msgstr "Peene rahe hood"
+
+#: my-evolution/metar.c:243
+msgid "Drifting small hail"
+msgstr "Liikuv peene rahe sadu"
+
+#: my-evolution/metar.c:244
+msgid "Freezing small hail"
+msgstr "J��tuv peene rahe sadu"
+
+#. PRECIPITATION
+#: my-evolution/metar.c:247
+msgid "Unknown precipitation"
+msgstr "Teadmata sademed"
+
+#: my-evolution/metar.c:248
+msgid "Precipitation in the vicinity"
+msgstr "Sademed l�heduses"
+
+#: my-evolution/metar.c:249
+msgid "Light precipitation"
+msgstr "N�rgad sademed"
+
+#: my-evolution/metar.c:250
+msgid "Moderate precipitation"
+msgstr "M��dukad sademed"
+
+#: my-evolution/metar.c:251
+msgid "Heavy precipitation"
+msgstr "Tugevad sademed"
+
+#: my-evolution/metar.c:252
+msgid "Shallow precipitation"
+msgstr "Madalad sademed"
+
+#: my-evolution/metar.c:253
+msgid "Patches of precipitation"
+msgstr "Paiguti sademeid"
+
+#: my-evolution/metar.c:254
+msgid "Partial precipitation"
+msgstr "Hooti sademeid"
+
+#: my-evolution/metar.c:255
+msgid "Unknown thunderstorm"
+msgstr "Teadmata �ike"
+
+#: my-evolution/metar.c:256
+msgid "Blowing precipitation"
+msgstr "Sademed tuulega"
+
+#: my-evolution/metar.c:257
+msgid "Showers, type unknown"
+msgstr "Teadmata sademete hood"
+
+#: my-evolution/metar.c:258
+msgid "Drifting precipitation"
+msgstr "Liikuvad sademed"
+
+#: my-evolution/metar.c:259
+msgid "Freezing precipitation"
+msgstr "J��tuvad sademed"
+
+#. MIST
+#: my-evolution/metar.c:262
+msgid "Mist"
+msgstr "Hajus udu"
+
+#: my-evolution/metar.c:263
+msgid "Mist in the vicinity"
+msgstr "L�heduses on hajus udu"
+
+#: my-evolution/metar.c:264
+msgid "Light mist"
+msgstr "Kerge uduvine"
+
+#: my-evolution/metar.c:265
+msgid "Moderate mist"
+msgstr "Keskmise hajusat udu"
+
+#: my-evolution/metar.c:266
+msgid "Thick mist"
+msgstr "Tihedalt hajusat udu"
+
+#: my-evolution/metar.c:267
+msgid "Shallow mist"
+msgstr "Madal hajus udu"
+
+#: my-evolution/metar.c:268
+msgid "Patches of mist"
+msgstr "Paiguti hajusat udu"
+
+#: my-evolution/metar.c:269
+msgid "Partial mist"
+msgstr "Hooti hajusat udu"
+
+#: my-evolution/metar.c:271
+msgid "Mist with wind"
+msgstr "Hajus udu tuulega"
+
+#: my-evolution/metar.c:273
+msgid "Drifting mist"
+msgstr "Liikuv hajus udu"
+
+#: my-evolution/metar.c:274
+msgid "Freezing mist"
+msgstr "J��tuv hajus udu"
+
+#. FOG
+#: my-evolution/metar.c:277
+msgid "Fog"
+msgstr "Udu"
+
+#: my-evolution/metar.c:278
+msgid "Fog in the vicinity"
+msgstr "Udu l�heduses"
+
+#: my-evolution/metar.c:279
+msgid "Light fog"
+msgstr "N�rk udu"
+
+#: my-evolution/metar.c:280
+msgid "Moderate fog"
+msgstr "M��dukas udu"
+
+#: my-evolution/metar.c:281
+msgid "Thick fog"
+msgstr "Paks udu"
+
+#: my-evolution/metar.c:282
+msgid "Shallow fog"
+msgstr "Madal udu"
+
+#: my-evolution/metar.c:283
+msgid "Patches of fog"
+msgstr "Paiguti udu"
+
+#: my-evolution/metar.c:284
+msgid "Partial fog"
+msgstr "Hooti udu"
+
+#: my-evolution/metar.c:286
+msgid "Fog with wind"
+msgstr "Udu tuulega"
+
+#: my-evolution/metar.c:288
+msgid "Drifting fog"
+msgstr "Liikuv udu"
+
+#: my-evolution/metar.c:289
+msgid "Freezing fog"
+msgstr "J��tuv udu"
+
+#. SMOKE
+#: my-evolution/metar.c:292
+msgid "Smoke"
+msgstr "Suits"
+
+#: my-evolution/metar.c:293
+msgid "Smoke in the vicinity"
+msgstr "Suits l�heduses"
+
+#: my-evolution/metar.c:294
+msgid "Thin smoke"
+msgstr "V�hene suits"
+
+#: my-evolution/metar.c:295
+msgid "Moderate smoke"
+msgstr "M��dukas suits"
+
+#: my-evolution/metar.c:296
+msgid "Thick smoke"
+msgstr "Paks suits"
+
+#: my-evolution/metar.c:297
+msgid "Shallow smoke"
+msgstr "Madal suits"
+
+#: my-evolution/metar.c:298
+msgid "Patches of smoke"
+msgstr "Paiguti suitsu"
+
+#: my-evolution/metar.c:299
+msgid "Partial smoke"
+msgstr "Hooti suitsu"
+
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
+msgstr "Tormiline suits"
+
+#: my-evolution/metar.c:301
+msgid "Smoke with wind"
+msgstr "Suits tuulega"
+
+#: my-evolution/metar.c:303
+msgid "Drifting smoke"
+msgstr "Liikuv suits"
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:307
+msgid "Volcanic ash"
+msgstr "Vulkaaniline tuhk"
+
+#: my-evolution/metar.c:308
+msgid "Volcanic ash in the vicinity"
+msgstr "Vulkaaniline tuhk l�heduses"
+
+#: my-evolution/metar.c:310
+msgid "Moderate volcanic ash"
+msgstr "M��dukalt vulkaanilist tuhka"
+
+#: my-evolution/metar.c:311
+msgid "Thick volcanic ash"
+msgstr "Tihedalt vulkaanilist tuhke"
+
+#: my-evolution/metar.c:312
+msgid "Shallow volcanic ash"
+msgstr "Madal vulkaaniline tuhk"
+
+#: my-evolution/metar.c:313
+msgid "Patches of volcanic ash"
+msgstr "Paiguti vulkaanilist tuhka"
+
+#: my-evolution/metar.c:314
+msgid "Partial volcanic ash"
+msgstr "Hooti vulkaanilist tuhka"
+
+#: my-evolution/metar.c:315
+msgid "Thunderous volcanic ash"
+msgstr "Tormiliselt vulkaanilist tuhke"
+
+#: my-evolution/metar.c:316
+msgid "Blowing volcanic ash"
+msgstr "Vulkaaniline tuhk tuulega"
+
+#: my-evolution/metar.c:317
+msgid "Showers of volcanic ash"
+msgstr "Vulkaanilise tuha valangud"
+
+#: my-evolution/metar.c:318
+msgid "Drifting volcanic ash"
+msgstr "Liikuv vulkaaniline tuhk"
+
+#: my-evolution/metar.c:319
+msgid "Freezing volcanic ash"
+msgstr "J��tuv vulkaaniline tuhk"
+
+#. SAND
+#: my-evolution/metar.c:322
+msgid "Sand"
+msgstr "Liiv"
+
+#: my-evolution/metar.c:323
+msgid "Sand in the vicinity"
+msgstr "Liiv l�heduses"
+
+#: my-evolution/metar.c:324
+msgid "Light sand"
+msgstr "Pisut liiva"
+
+#: my-evolution/metar.c:325
+msgid "Moderate sand"
+msgstr "M��dukalt liiva"
+
+#: my-evolution/metar.c:326
+msgid "Heavy sand"
+msgstr "Tihedalt liiva"
+
+#: my-evolution/metar.c:328
+msgid "Patches of sand"
+msgstr "Paiguti liiva"
+
+#: my-evolution/metar.c:329
+msgid "Partial sand"
+msgstr "Hooti liiva"
+
+#: my-evolution/metar.c:331
+msgid "Blowing sand"
+msgstr "Liiv tuulega"
+
+#: my-evolution/metar.c:333
+msgid "Drifting sand"
+msgstr "Liikuv liiv"
+
+#. HAZE
+#: my-evolution/metar.c:337
+msgid "Haze"
+msgstr "Vine"
+
+#: my-evolution/metar.c:338
+msgid "Haze in the vicinity"
+msgstr "Vine l�heduses"
+
+#: my-evolution/metar.c:339
+msgid "Light haze"
+msgstr "Kerge vine"
+
+#: my-evolution/metar.c:340
+msgid "Moderate haze"
+msgstr "M��dukas vine"
+
+#: my-evolution/metar.c:341
+msgid "Thick haze"
+msgstr "Paks vine"
+
+#: my-evolution/metar.c:342
+msgid "Shallow haze"
+msgstr "Madal vine"
+
+#: my-evolution/metar.c:343
+msgid "Patches of haze"
+msgstr "Paiguti vine"
+
+#: my-evolution/metar.c:344
+msgid "Partial haze"
+msgstr "Hooti vine"
+
+#: my-evolution/metar.c:346
+msgid "Haze with wind"
+msgstr "Vine tuulega"
+
+#: my-evolution/metar.c:348
+msgid "Drifting haze"
+msgstr "Liikuv vine"
+
+#: my-evolution/metar.c:349
+msgid "Freezing haze"
+msgstr "J��tuv vine"
+
+#. SPRAY
+#: my-evolution/metar.c:352
+msgid "Spray"
+msgstr "Veetolm"
+
+#: my-evolution/metar.c:353
+msgid "Spray in the vicinity"
+msgstr "Veetolm l�heduses"
+
+#: my-evolution/metar.c:354
+msgid "Light spray"
+msgstr "N�rgalt veetolmu"
+
+#: my-evolution/metar.c:355
+msgid "Moderate spray"
+msgstr "M��dukalt veetolmu"
+
+#: my-evolution/metar.c:356
+msgid "Heavy spray"
+msgstr "Tihedalt veetolmu"
+
+#: my-evolution/metar.c:357
+msgid "Shallow spray"
+msgstr "Madalal veetolmu"
+
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
+msgstr "Paiguti veetolmu"
+
+#: my-evolution/metar.c:359
+msgid "Partial spray"
+msgstr "Hooti veetolmu"
+
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
+msgstr "Veetolm tuulega"
+
+#: my-evolution/metar.c:363
+msgid "Drifting spray"
+msgstr "Liikuv veetolm"
+
+#: my-evolution/metar.c:364
+msgid "Freezing spray"
+msgstr "J��tuv veetolm"
+
+#. DUST
+#: my-evolution/metar.c:367
+msgid "Dust"
+msgstr "Tolm"
+
+#: my-evolution/metar.c:368
+msgid "Dust in the vicinity"
+msgstr "Tolm l�heduses"
+
+#: my-evolution/metar.c:369
+msgid "Light dust"
+msgstr "Pisut tolmu"
+
+#: my-evolution/metar.c:370
+msgid "Moderate dust"
+msgstr "M��dukalt tolmu"
+
+#: my-evolution/metar.c:371
+msgid "Heavy dust"
+msgstr "Paksult tolmu"
+
+#: my-evolution/metar.c:373
+msgid "Patches of dust"
+msgstr "Paiguti tolmu"
+
+#: my-evolution/metar.c:374
+msgid "Partial dust"
+msgstr "Hooti tolmu"
+
+#: my-evolution/metar.c:376
+msgid "Blowing dust"
+msgstr "Tolm tuulega"
+
+#: my-evolution/metar.c:378
+msgid "Drifting dust"
+msgstr "Liikuv tolm"
+
+#. SQUALL
+#: my-evolution/metar.c:382
+msgid "Squall"
+msgstr "Tuuleiilid"
+
+#: my-evolution/metar.c:383
+msgid "Squall in the vicinity"
+msgstr "Tuuleiilid l�heduses"
+
+#: my-evolution/metar.c:384
+msgid "Light squall"
+msgstr "N�rgad tuuleiilid"
+
+#: my-evolution/metar.c:385
+msgid "Moderate squall"
+msgstr "M��dukad tuuleiilid"
+
+#: my-evolution/metar.c:386
+msgid "Heavy squall"
+msgstr "Tugevad tuuleiilid"
+
+#: my-evolution/metar.c:389
+msgid "Partial squall"
+msgstr "Hooti tuuleiilid"
+
+#: my-evolution/metar.c:390
+msgid "Thunderous squall"
+msgstr "Tormipuhangud"
+
+#: my-evolution/metar.c:391
+msgid "Blowing squall"
+msgstr "Puhanguline tuul"
+
+#: my-evolution/metar.c:393
+msgid "Drifting squall"
+msgstr "Liikuvad tuuleiilid"
+
+#: my-evolution/metar.c:394
+msgid "Freezing squall"
+msgstr "J��tuvad tuuleiilid"
+
+#. SANDSTORM
+#: my-evolution/metar.c:397
+msgid "Sandstorm"
+msgstr "Liivatorm"
+
+#: my-evolution/metar.c:398
+msgid "Sandstorm in the vicinity"
+msgstr "Liivatorm l�heduses"
+
+#: my-evolution/metar.c:399
+msgid "Light standstorm"
+msgstr "N�rk liivatorm"
+
+#: my-evolution/metar.c:400
+msgid "Moderate sandstorm"
+msgstr "M��dukas liivatorm"
+
+#: my-evolution/metar.c:401
+msgid "Heavy sandstorm"
+msgstr "Tugev liivatorm"
+
+#: my-evolution/metar.c:402
+msgid "Shallow sandstorm"
+msgstr "Madal liivatorm"
+
+#: my-evolution/metar.c:404
+msgid "Partial sandstorm"
+msgstr "Hooti liivatorm"
+
+#: my-evolution/metar.c:405
+msgid "Thunderous sandstorm"
+msgstr "Metsik liivatorm"
+
+#: my-evolution/metar.c:406
+msgid "Blowing sandstorm"
+msgstr "Tugev liivatorm"
+
+#: my-evolution/metar.c:408
+msgid "Drifting sandstorm"
+msgstr "Liikuv liivatorm"
+
+#: my-evolution/metar.c:409
+msgid "Freezing sandstorm"
+msgstr "J��tuv liivatorm"
+
+#. DUSTSTORM
+#: my-evolution/metar.c:412
+msgid "Duststorm"
+msgstr "Tolmutorm"
+
+#: my-evolution/metar.c:413
+msgid "Duststorm in the vicinity"
+msgstr "Tolmutorm l�heduses"
+
+#: my-evolution/metar.c:414
+msgid "Light duststorm"
+msgstr "N�rk tolmutorm"
+
+#: my-evolution/metar.c:415
+msgid "Moderate duststorm"
+msgstr "M��dukas tolmutorm"
+
+#: my-evolution/metar.c:416
+msgid "Heavy duststorm"
+msgstr "Tugev tolmutorm"
+
+#: my-evolution/metar.c:417
+msgid "Shallow duststorm"
+msgstr "Madal tolmutorm"
+
+#: my-evolution/metar.c:419
+msgid "Partial duststorm"
+msgstr "Hooti tolmutorm"
+
+#: my-evolution/metar.c:420
+msgid "Thunderous duststorm"
+msgstr "Metsik tolmutorm"
+
+#: my-evolution/metar.c:421
+msgid "Blowing duststorm"
+msgstr "Tugev tolmutorm"
+
+#: my-evolution/metar.c:423
+msgid "Drifting duststorm"
+msgstr "Liikuv tolmutorm"
+
+#: my-evolution/metar.c:424
+msgid "Freezing duststorm"
+msgstr "J��tuv tolmutorm"
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:427
+msgid "Funnel cloud"
+msgstr "Tuulispask"
+
+#: my-evolution/metar.c:428
+msgid "Funnel cloud in the vicinity"
+msgstr "Tuulispask l�heduses"
+
+#: my-evolution/metar.c:429
+msgid "Light funnel cloud"
+msgstr "N�rk tuulispask"
+
+#: my-evolution/metar.c:430
+msgid "Moderate funnel cloud"
+msgstr "M��dukas tuulispask"
+
+#: my-evolution/metar.c:431
+msgid "Thick funnel cloud"
+msgstr "Tugev tuulispask"
+
+#: my-evolution/metar.c:432
+msgid "Shallow funnel cloud"
+msgstr "Madal tuulispask"
+
+#: my-evolution/metar.c:433
+msgid "Patches of funnel clouds"
+msgstr "Paiguti tuulispasad"
+
+#: my-evolution/metar.c:434
+msgid "Partial funnel clouds"
+msgstr "Hooti tuulispasad"
+
+#: my-evolution/metar.c:436
+msgid "Funnel cloud w/ wind"
+msgstr "Tuulispask ja tugev tuul"
+
+#: my-evolution/metar.c:438
+msgid "Drifting funnel cloud"
+msgstr "Liikuv tuulispask"
+
+#. TORNADO
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
+msgid "Tornado"
+msgstr "Tornaado"
+
+#: my-evolution/metar.c:443
+msgid "Tornado in the vicinity"
+msgstr "Tornaado l�heduses"
+
+#: my-evolution/metar.c:445
+msgid "Moderate tornado"
+msgstr "M��dukas tornaado"
+
+#: my-evolution/metar.c:446
+msgid "Raging tornado"
+msgstr "Raevukas tornaado"
+
+#: my-evolution/metar.c:449
+msgid "Partial tornado"
+msgstr "Hooti tornadadod"
+
+#: my-evolution/metar.c:450
+msgid "Thunderous tornado"
+msgstr "Metsik tornaado"
+
+#: my-evolution/metar.c:453
+msgid "Drifting tornado"
+msgstr "Liikuv tornaado"
+
+#: my-evolution/metar.c:454
+msgid "Freezing tornado"
+msgstr "J��tuv tornaado"
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:457
+msgid "Dust whirls"
+msgstr "Tolmup��rised"
+
+#: my-evolution/metar.c:458
+msgid "Dust whirls in the vicinity"
+msgstr "Tolmup��rised l�heduses"
+
+#: my-evolution/metar.c:459
+msgid "Light dust whirls"
+msgstr "N�rgad tolmup��rised"
+
+#: my-evolution/metar.c:460
+msgid "Moderate dust whirls"
+msgstr "M��dukad tolmup��rised"
+
+#: my-evolution/metar.c:461
+msgid "Heavy dust whirls"
+msgstr "Tugevad tolmup��rised"
+
+#: my-evolution/metar.c:462
+msgid "Shallow dust whirls"
+msgstr "Madalad tolmup��rised"
+
+#: my-evolution/metar.c:463
+msgid "Patches of dust whirls"
+msgstr "Paiguti tolmup��rised"
+
+#: my-evolution/metar.c:464
+msgid "Partial dust whirls"
+msgstr "Hooti tolmup��rised"
+
+#: my-evolution/metar.c:466
+msgid "Blowing dust whirls"
+msgstr "Tolmup��rised tuulega"
+
+#: my-evolution/metar.c:468
+msgid "Drifting dust whirls"
+msgstr "Liikuvad tolmup��rised"
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add n_ews feed"
+msgstr "Li_sa uudistekanal"
+
+#: my-evolution/my-evolution.glade.h:2
+msgid "C_elsius"
+msgstr "_Celsius"
+
+#: my-evolution/my-evolution.glade.h:4
+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
+msgid "Ma_x number of items shown:"
+msgstr "Maksimaalne kuvatavate kir_jete arv:"
+
+#: my-evolution/my-evolution.glade.h:6
+msgid "News Feed Settings"
+msgstr "Uudistekanalite seadistused"
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "One mont_h"
+msgstr "�hte _kuud"
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "One w_eek"
+msgstr "�hte _n�dalat"
+
+#: my-evolution/my-evolution.glade.h:9
+msgid "R_efresh time (seconds):"
+msgstr "V_�rskendamise aeg"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "Refresh _time (seconds):"
+msgstr "V_�rskendamise vahemik (sekundites):"
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "S_how full path for folders"
+msgstr "_N�ita kaustadele t�ielikku otsinguteed"
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Show _all tasks"
+msgstr "N�ita k_�iki �lesandeid"
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "Show _today's tasks"
+msgstr "N�ita _t�naseid �lesandeid"
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "Show temperatures in:"
+msgstr "Temperatuuri n�itamise �hikud:"
+
+#: my-evolution/my-evolution.glade.h:15
+msgid "Tasks "
+msgstr "�lesanded "
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "Weather settings"
+msgstr "Ilmajaama s�tted"
+
+#: my-evolution/my-evolution.glade.h:17
+msgid "_Fahrenheit"
+msgstr "_Fahrenheit"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "_Five days"
+msgstr "_Viite p�eva"
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "_Mail"
+msgstr "E-_Post"
+
+#: my-evolution/my-evolution.glade.h:20
+msgid "_News Feeds"
+msgstr "_Uudistekanalid"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "_One day"
+msgstr "_�hte p�eva"
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "_Schedule"
+msgstr "_Ajakava"
+
+#: my-evolution/my-evolution.glade.h:23
+msgid "_Weather"
+msgstr "_Ilmateade"
+
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Erikaustad"
+
+# !PARANDA!
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution'i shell"
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "N�ita detaile"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Katkesta tegevus"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Sisendkast"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "V�ljundkast"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Kohalikud kaustad"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolutioni installimine"
 
-#: 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 ""
 
-#: 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:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -22906,14 +23771,14 @@ msgstr ""
 "%s\n"
 "Viga: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -22924,7 +23789,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -22932,7 +23797,7 @@ msgid ""
 "readable and executable and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -22940,7 +23805,7 @@ msgid ""
 "Please remove this file and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -22948,7 +23813,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -22957,7 +23822,7 @@ 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"
@@ -22965,49 +23830,53 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: 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."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Ei saa kontrollida kausta: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Kausta �mbernimetamine eba�nnestus:\n"
+"%s"
+
+#: 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: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 "M��ra kaust, mille alla tuleb kaust \"%s\" kopeerida:"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Kausta kopeerimine"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Kausta �mbert�stmine"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23016,18 +23885,18 @@ msgstr ""
 "Kausta kustutamine nurjus:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Kustuta \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23036,16 +23905,16 @@ msgstr ""
 "Kausta �mbernimetamine eba�nnestus:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Kausta nime muutmine"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23060,7 +23929,7 @@ msgstr ""
 "Kirjeldatud kausta loomine nurjus:\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 - Uue kausta loomine"
 
@@ -23076,7 +23945,7 @@ msgstr ""
 msgid "New..."
 msgstr "Uus..."
 
-#: 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 "(Pealkirjata)"
 
@@ -23243,6 +24112,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Uus"
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr "Kausta nimi on kirjeldamata."
@@ -23259,90 +24134,91 @@ msgstr "Kausta nimi ei tohi sisaldada kaldkriipse."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' on reserveeritud kaustanimed."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Ei leidnud Bug Buddy't sinu $PATH'ist."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolutionist"
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Ava kaust..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Vali kaust, mida soovid avada"
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Uue kiirvaliku loomine"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:566
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vali kaust, millele kiirvalik peab osutama:"
 
-#: shell/e-shell-view-menu.c:577
-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."
-
-#: shell/e-shell-view-menu.c:585
-#, c-format
-msgid "Error executing %s."
-msgstr "Viga %s k�ivitamisel."
-
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "�hendu v_�rku"
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Kausta ei n�idata)"
 
-#: 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 "(Puudub)"
 
-#: shell/e-shell-view.c:1634
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+#: shell/e-shell-view.c:1867
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution on hetkel v�rku �hendatud.  Autonoomsesse olekusse "
 "siirdumiseks vajuta seda nuppu."
 
-#: shell/e-shell-view.c:1641
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
 
-#: shell/e-shell-view.c:1647
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+#: shell/e-shell-view.c:1880
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution on hetkel autonoomses olekus. V�rku �hendumiseks vajuta "
 "seda nuppu."
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23353,19 +24229,23 @@ 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:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Olgu"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Ei leia h��lestusandmebaasi"
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "�ldine viga"
 
@@ -23482,74 +24362,72 @@ msgstr "_Eemalda"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eemaldab kiirvalikute ribalt selle korralduse"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Viga kiirvalikute salvestamisel."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Kiirvalikud"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Sisendkast"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Nimi puudub)"
+#: 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 "Vigu ei tekkinud"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Selle nimega kaust on juba olemas"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Kirjeldatud kaustat��p on vigane"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "I/O viga"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Pole piisavalt ruumi kausta loomiseks"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Kaust ei ole t�hi"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Antud kausta ei leitud"
 
-#: 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:505
 msgid "Operation not supported"
 msgstr "Operatsioon ei ole toetatud"
 
-#: 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:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "Kirjeldatud kausta ei saa muuta ega eemaldada"
 
-#: 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:513
 msgid "Cannot create a folder with that name"
 msgstr "Sa ei saa luua selle nimega kausta"
 
@@ -23559,98 +24437,106 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<kausta valimiseks kliki siia>"
+
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Tundmatu viga."
+
+#: 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/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "CORBA viga"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Katkestatud"
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Vigane parameeter"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Omanik puudub"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Ei leitud"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Toetamata t��p"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Toetamata skeem"
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Toetamata tegevus"
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Sisemine viga"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Olemas"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Vigane URI"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Sisaldab alamkaustu"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Vaba ruum on otsas"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Tundmatu viga."
-
-#: 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/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "Faili t��p:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -23769,297 +24655,273 @@ 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:83
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:89
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution l�petab t�� ..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Keela tiitelkuva"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Impordi alustamine"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Impordi alustamine"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo komponentide s�steemi l�htestamine nurjus"
 
+#: tools/evolution-addressbook-abuse.c:80
 #: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Viga vaikimisi aadressiraamatu laadimisel."
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "V�ljundfail"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Sisendfail"
 
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr "V�ljundfail"
+
 #: tools/evolution-addressbook-import.c:80
 msgid "No filename provided."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Kopeeri"
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Kopeerib valitud s�numi teise kausta"
 
-#: 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 "Kopeerib valiku"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Ko_peeri kausta..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Loob uue kontakti"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Loob uue kontaktide nimekirja"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "L�ika"
-
-#: 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 "L�ikab valiku"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "Kustutab valitud kontaktid"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Uus nimekiri"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "T�stab valitud s�numi teise kausta"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Aseta"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "_T�sta kausta..."
 
-#: 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 "Kleebib l�ikepuhvri"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Tr�kitavate kontaktide eelvaatlemine"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Tr�kib valitud kontaktid"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Salvestab valitud kontaktid VKaardina."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Vali k�ik"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Valib k�ik kontaktid"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "Saada _kontaktile s�num"
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Saada s�num valitud kontaktidele"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Saadab s�numi kontaktile"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Saadab valitud kontaktid teisele isikule."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Peata"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Peata laadimine"
 
-#: 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 "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:18 ui/evolution-mail-list.xml.h:23
+#: 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-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
+#: ui/evolution.xml.h:35
 msgid "_Actions"
 msgstr "_Tegevused"
 
-#: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr "_Aadressiraamatu allikad..."
-
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "Kontaktide _nimekiri"
 
-#: 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 "_Saada kontakt edasi..."
 
-#: 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 "_Tr�ki..."
-
 #: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "_T�sta kausta..."
+
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "_Salvesta VKaardina"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_Otsi kontakte"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Vali k�ik"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Kalendri seadistamine"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "Saada _kontaktile s�num"
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Loo uus _terve-p�eva-s�ndmus"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a New _Task"
-msgstr "Loo uus _�lesanne"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Loo uus _s�ndmus"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "Lisab terve p�eva kestva s�ndmuse"
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "P�ev"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Kustuta s�ndmus"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Mine"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Liigub tagasi"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Liigub edasi"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "_Mine valitud p�evale"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Aktiveerib valitud kuup�eva"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Aktiveerib t�nase p�eva"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Kuu"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Uus s�ndmus"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr "Uus �lesanne"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Tr�kitava kalendri eelvaatlemine"
 
-#: 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 "Tr�kkimise _eelvaade"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Tr�kib selle kalendri"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 "Publitseerib selle kalendri vaba- ja h�ivatud aja kohta k�ivat informatsiooni"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "N�itab �hte p�eva"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "N�itab �hte kuud"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "N�itab �hte n�dalat"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "N�itab �hte t��n�dalat"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "N�dal"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "Ko_htumine..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Kalendri s�tted..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "_Publitseeri vaba/h�ivatud infot"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "_�lesanne"
-
 #: 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
@@ -24089,18 +24951,18 @@ msgstr "Tr�kitava elemendi eelvaatlemine"
 msgid "Print this item"
 msgstr "Tr�kib elemendi"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Tr�ki"
-
 #: 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 "Salvesta"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Salvesta kui..."
+
 #: 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 "Salvesta ja sulge"
 
@@ -24116,8 +24978,8 @@ msgstr "Salvestab elemendi kettale"
 #: 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:40
 msgid "_File"
 msgstr "_Fail"
 
@@ -24135,10 +24997,14 @@ msgstr "S_alvesta kui..."
 msgid "Save the contact and close the dialog box"
 msgstr "Salvestab kontakti ja sulgeb dialoogiakna"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "Saada _kontaktile s�num"
+
 #: 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 "_Salvesta"
 
@@ -24198,6 +25064,10 @@ 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"
@@ -24207,82 +25077,54 @@ msgid "Compose _New Message"
 msgstr "Koosta _uus s�num"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Loob v�i muudab mailikontosid ja muid s�tteid"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Loob v�i muudab uute s�numite filtreerimisreegleid"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Loob v�i muudab virtuaalsete kaustade kirjeldusi"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Puhasta pr�gist"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Unusta _paroolid"
 
-#: 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 "Unustab meeldej�etud paroolid, vajadusel k�sitakse paroolid uuesti."
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Uus s�num"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Avab s�numi koostamiseks uue akna"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Eemaldab l�plikult k�ikidest kaustadest k�ik kustutatud s�numid"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "Saada / v�ta vastu"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Saadab j�rjekorras olevad v�ljaminevad kirjad ja t�mbab �ra uued kirjad."
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "N�itab s�numi eelvaate akent"
 
-#: 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:13
 msgid "Virtual Folder _Editor..."
 msgstr "Virtuaalse kausta _redaktor..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filtrid..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "_Saada s�num"
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "_S�numite s�tted..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Eelvaate paan"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "_Saada / V�ta vastu"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "Kaustade _tellimine..."
 
@@ -24315,7 +25157,8 @@ msgid "Hide _Read Messages"
 msgstr "Peida _loetud s�numid"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
@@ -24374,11 +25217,11 @@ msgstr "Viib valitud s�numid ajutiselt peitu"
 msgid "Threaded Message list"
 msgstr "Esitab s�numeid jutul�ngadena"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_Puhasta"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Kaust"
 
@@ -24394,148 +25237,157 @@ msgstr "_Omadused..."
 msgid "_Threaded Message List"
 msgstr "_Esita s�numeid jutul�ngadena"
 
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Lisa saatja aadressiraamatusse"
+
 #: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Rakenda filtrid"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Lisa saatja aadressiraamatusse"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Rakendab filtreerimisreeglid valitud s�numitele"
 
-#: 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 "Koostab vastuse k�igile valitud s�numi adressaatidele"
 
-#: 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 "Koostab vastuse valitud s�numi postiloendisse"
 
-#: 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 "Koostab vastuse valitud s�numi koostajale"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopeerib valitud s�numi teise kausta"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Loo s�numi baasil _Virtuaalne Kaust"
 
-#: 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 "Loob reegli filtreerimaks selle saatja poolt saadetud s�numeid"
 
-#: 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 ""
-"Loob reegli filtreerimaks nendele adressaatidele saadetud s�numeid"
+msgstr "Loob reegli filtreerimaks nendele adressaatidele saadetud s�numeid"
 
-#: 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 "Loob reegli filtreerimaks sellese postiloendisse saadetud s�numeid"
 
-#: 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 "Loob reegli filtreerimaks selle teemaga s�numeid"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Loob virtuaalse kausta selle s�numi adressaatide j�rgi"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Loob virtuaalse kausta selle s�numi postiloendi j�rgi"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Loob virtuaalse kausta selle s�numi saatja j�rgi"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Loob virtuaalse kausta selle s�numi teema j�rgi"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "V�hendab teksti suurust"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Kuvab j�rgmise t�htsa s�numi"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Kuvab j�rgmise s�numi"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Kuvab j�rgmise lugemata s�numi"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Kuvab j�rgmise lugemata jutul�nga"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Kuvab eelmise t�htsa s�numi"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Kuvab eelmise s�numi"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Kuvab eelmise lugemata s�numi"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Saada edasi"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filter _postiloendi j�rgi"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filter _saatja j�rgi"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filter _adressaatide j�rgi"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filter _teema j�rgi"
 
-#: ui/evolution-mail-message.xml.h:30
-msgid "Force images in HTML mail to be loaded"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward"
-msgstr "Saada edasi"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward As"
-msgstr "Saada edasi m��ratud kujul"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Attached"
-msgstr "Saada manusena"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "M�rgib valitud s�numi kustutamisele kuuluvaks"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Inline"
-msgstr "Saada s�numi sees"
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "T_�isnimi..."
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Forward _Quoted"
-msgstr "Saada tsitaadina"
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: 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 "Saadab valitud s�numi kellelegi edasi (saadetava s�numi sees)"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Saadab valitud s�numi kellelegi edasi (tsitaadina)"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Saadab valitud s�numi kellelegi edasi"
 
-#: 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 "Saadab valitud s�numi kellelegi edasi (manusena)"
 
@@ -24551,24 +25403,32 @@ msgstr "_Lae pildid"
 msgid "Mark as I_mportant"
 msgstr "M�rgi t_�htsaks"
 
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "M�rgi kui l_ugemata"
+
 #: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "M�rgi v�het�_htsaks"
 
 #: 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 "M�rgib valitud s�numi loetuks"
 
 #: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as important"
+#, fuzzy
+msgid "Mark the selected message(s) as important"
 msgstr "M�rgib valitud s�numi t�htsaks"
 
 #: 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 "M�rgib valitud s�numi lugemata s�numiks"
 
 #: ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as unimportant"
+#, fuzzy
+msgid "Mark the selected message(s) as unimportant"
 msgstr "M�rgib valitud s�numi v�het�htsaks"
 
 #: ui/evolution-mail-message.xml.h:51
@@ -24580,7 +25440,8 @@ msgid "Move"
 msgstr "T�sta"
 
 #: ui/evolution-mail-message.xml.h:53
-msgid "Move selected messages to another folder"
+#, fuzzy
+msgid "Move selected message(s) to another folder"
 msgstr "T�stab valitud s�numi teise kausta"
 
 #: ui/evolution-mail-message.xml.h:54
@@ -24588,64 +25449,63 @@ msgid "Next"
 msgstr "J�rgmine"
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Important Message"
+#, fuzzy
+msgid "Next _Important Message"
 msgstr "J�rgmisele t�htsale s�numile"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Message"
-msgstr "J�rgmisele s�numile"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "J�rgmisele jutul�ngale"
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Next Unread Message"
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "J�rgmisele lugemata s�numile"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Avab valitud s�numi uues aknas"
 
-#: 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 "Valitud s�numi uuesti saatmiseks ava see s�numiredaktoris"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "_Algne suurus"
 
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Eelmisele lugemata s�numile"
+
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Eelmisele t�htsale s�numile"
+
+#: ui/evolution-mail-message.xml.h:63
 msgid "Preview the message to be printed"
 msgstr "Tr�kitava s�numi eelvaatlemine"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous"
 msgstr "Eelmine"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Important Message"
-msgstr "Eelmisele t�htsale s�numile"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Message"
-msgstr "Eelmisele s�numile"
-
-#: ui/evolution-mail-message.xml.h:66
-msgid "Previous Unread Message"
-msgstr "Eelmisele lugemata s�numile"
-
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Tr�kib valitud s�numi"
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply"
-msgstr "Vasta"
+#: 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 "Vasta k�igile"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Saadab valitud s�numi kellelegi edasi"
 
 #: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
@@ -24716,8 +25576,9 @@ msgid "VFolder on _Subject..."
 msgstr "VKaust _teema j�rgi..."
 
 #: ui/evolution-mail-message.xml.h:92
-msgid "_Apply Filters"
-msgstr "_Rakenda filtreid"
+#, fuzzy
+msgid "_Attached"
+msgstr "Manusta"
 
 #: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
@@ -24732,43 +25593,71 @@ msgid "_Forward Message"
 msgstr "Saada s�num _edasi"
 
 #: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Mine"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "S�numi sees"
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Suurem"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "S�numi _kuvamine"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_T�sta teise kausta"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "J�rgmisele s�numile"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Harilik kuva"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_Ava s�num"
 
-#: 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 "Eelmisele s�numile"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Tsitaadina"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "T_��riistad"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Taasta"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Sulgeb akna"
 
 #: 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:36
 msgid "_Close"
 msgstr "_Sulge"
 
 #: 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:56
 msgid "_View"
 msgstr "_Vaade"
 
@@ -24792,11 +25681,11 @@ msgstr "Kr�pteeri s�num PGPga"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Kr�ptib kirja sinu S/MIME kr�ptimissertifikaadi abil"
 
-#: 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 "Vor_mindamine"
 
-#: 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"
 
@@ -24812,6 +25701,10 @@ msgstr "Lisa fail s�numisse tekstina"
 msgid "Insert text file..."
 msgstr "Lisa tekstifail..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Ava"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Ava fail"
@@ -24845,7 +25738,7 @@ msgid "Save in folder..."
 msgstr "Salvesta kausta..."
 
 #: 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 "Salvesta k�esolev fail"
 
@@ -24870,6 +25763,7 @@ msgid "Send _later"
 msgstr "Saada _hiljem"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Saada s�num HTML formaadis"
 
@@ -24938,7 +25832,7 @@ msgid "_From Field"
 msgstr "_Kellele v�li"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Lisa"
 
@@ -24950,11 +25844,7 @@ msgstr "_Ava..."
 msgid "_Reply-To Field"
 msgstr "_Vasta-kellele v�li"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Turvalisus"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Abi"
 
@@ -25010,33 +25900,41 @@ msgstr "Uuri v�rskeimat infot �lesande kohta"
 msgid "Re_fresh Task"
 msgstr "_V�rskenda �lesanne"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Muudab �lesannete vaate s�tteid"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopeerib valitud �lesanne"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "L�ikab valitud �lesanne"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "Kustutab valitud �lesanded"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Kustutab valitud �lesanded"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "_M�rgi l�petatuks"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Asetab l�ikepuhvrist �lesande"
 
-#: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings..."
-msgstr "�lesannete s�tted..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Tr�kitavate kontaktide eelvaatlemine"
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
-msgstr "_�lesanne"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Tr�kib valitud s�numi"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25103,113 +26001,119 @@ msgid "Open this folder in an other window"
 msgstr "Avab kausta uues aknas"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Saada / v�ta vastu"
+
+#: ui/evolution.xml.h:22
+#, 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
 msgid "Show information about Ximian Evolution"
 msgstr "N�ita infot Ximian Evolutioni kohta"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Saada veateade"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Saada _veateade"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Saada veateade kasutades Bug Buddy't"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "L�litab kaustade riba sisse v�i v�lja"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "L�litab kiirvkorralduste riba sisse v�i v�lja"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "L�litab autonoomse reziimi sisse v�i v�lja"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "N�itab valitud kausta"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolutioni _KKK"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolutionist..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "Ko_peeri..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "_Kaustade riba"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_Mine kausta"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Impordi..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_T�sta mujale..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Uus"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "Uus k_aust"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_Pilot'i s�tted"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Muuda nime..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Saada / V�ta vastu"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "Kiir_valik"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "Kiir_valikute riba"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Muudab kokkuv�tte s�tteid"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Tr�kib kokkuv�tte "
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Lae uuesti"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Laeb vaate uuesti"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "_Kokkuv�tte s�tted"
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Aadressikaardid"
@@ -25223,18 +26127,27 @@ msgid "Phone List"
 msgstr "Telefoninumbrite loetelu"
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "Vali kaust"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Saatja j�rgi"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Oleku j�rgi"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Teema j�rgi"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "S�numid"
 
@@ -25269,11 +26182,21 @@ msgstr ""
 "Vasaku hiirenupuga saab kaarti suurendada ja ajav��ndit valida.\n"
 "Paremat hiirenupuga saab kaarti v�hendada."
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "K�e_solev vaade"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "K�e_solev vaade"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "Kirjelda vaateid"
 
@@ -25305,76 +26228,81 @@ msgstr "Aeg peab olema j�rgnevas vormingus: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Protsendi v��rtus peab olema 0 - 100."
 
-#: widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "Balti"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "Kesk-Euroopa"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "Hiina"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr "Kirillitsa"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "Kreeka"
 
-#: 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 "Jaapani"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Korean"
 msgstr "Korea"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "T�rgi"
 
-#: 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 "L��ne-Euroopa"
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 msgid "Traditional"
 msgstr "Traditsiooniline"
 
-#: 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 "Lihtsustatud"
 
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:92
 msgid "Ukrainian"
 msgstr "Ukraina"
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "Uus"
+#: 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 "Tundmatu m�rgistik: %s"
 
-#: widgets/misc/e-charset-picker.c:201
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Sisesta kasutatav m�rgistik"
 
-#: widgets/misc/e-charset-picker.c:276
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Muu..."
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Kodeering"
 
@@ -25382,25 +26310,23 @@ msgstr "Kodeering"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Otsinguredaktor"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Lisa salvestatud otsingutesse"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Puhasta"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Salvesta otsing"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "N�ita k�iki"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Lisa salvestatud otsingutesse"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -25423,11 +26349,21 @@ msgstr "S�num"
 msgid "Don't show this message again."
 msgstr "Seda teadet enam mitte n�idata."
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "_Otsing"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Otsi n��d"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Puhasta"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Puhasta"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Otsi n��d"
 
@@ -25453,3 +26389,936 @@ msgstr "init_corba(): GNOME l�htestamine nurjus"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 
+#~ msgid "Card: "
+#~ msgstr "Kaart: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Nimi: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Prefiks:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Antud:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Lisa: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Perekond:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Suffiks:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "S�nniaeg: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Aadress: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postkast:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  Nr:         "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  T�nav:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Linn:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Piirkond:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postiindeks:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Riik:\t"
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Posti Etikett: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefonid:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefon:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "E-post:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "E-post:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Ajav��nd: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Geo Location: "
+#~ msgstr ""
+#~ "\n"
+#~ "Geogr asukoht: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "Amet: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "T��koht: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Nimi:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  �ksus:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "  �ksus2: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "  �ksus3: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "  �ksus4: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kategooriad: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kommentaar: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Unikaalne fraas: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Avalik v�ti: "
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "�hendan LDAP serveriga..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Ootan �hendust LDAP serveriga..."
+
+#~ msgid "New _Contact"
+#~ msgstr "Uus k_ontakt"
+
+#~ msgid "New Contact _List"
+#~ msgstr "Uus kontaktide _nimekiri"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Muuda aadressiraamatut"
+
+#~ msgid "Account Name"
+#~ msgstr "Konto nimi"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Uus aadressiraamat"
+
+#~ msgid "Advanced"
+#~ msgstr "Edasij�udnutele"
+
+#~ msgid "Base"
+#~ msgstr "Baas"
+
+#~ msgid "Server Name"
+#~ msgstr "Serveri nimi"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "Allolev informatsioon on kohustuslik aadressiraamatu lisamiseks."
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ 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."
+#~ msgstr ""
+#~ "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."
+#~ msgstr ""
+#~ "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."
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "See on sinu LDAP serveri poolt kasutatav port."
+
+#~ 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:"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "Ko_ntaktid:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "N�ita j�rgnevale kriteeriumile vastavaid kontakte:"
+
+#~ 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"
+
+#~ msgid "Republic Of Korea"
+#~ msgstr "Korea Vabariik"
+
+#~ 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"
+
+#~ msgid "Create a new task"
+#~ msgstr "Lisab uue �lesande"
+
+#~ msgid "New _Task"
+#~ msgstr "Uus _�lesanne"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Loo uusi s�ndmusi koos vaikimisi _meeldetuletajaga"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "N�dala e_simene p�ev:"
+
+#~ 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"
+
+#~ msgid "This is an encrypted message part"
+#~ msgstr "See on digitaalselt allkirjastatud osa"
+
+#~ msgid "NT Login"
+#~ msgstr "NT meldimine"
+
+# !PARANDA! - Locality & State
+#~ msgid ""
+#~ "EMail: %s\n"
+#~ "Common Name: %s\n"
+#~ "Organization Unit: %s\n"
+#~ "Organization: %s\n"
+#~ "Locality: %s\n"
+#~ "State: %s\n"
+#~ "Country: %s"
+#~ msgstr ""
+#~ "E-post: %s\n"
+#~ "�hine nimi: %s\n"
+#~ "Organisatsiooni �ksus: %s\n"
+#~ "Organisatsiooni: %s\n"
+#~ "Locality: %s\n"
+#~ "State: %s\n"
+#~ "Riik: %s"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Palun sisesta %s@%s NNTP parool"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Server keeldus kasutajanime vastu v�tmast"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Kasutajanime saatmine serverile eba�nnestus"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Server keeldus kasutajanime/parooli vastu v�tmast"
+
+#~ msgid "Message %s not found."
+#~ msgstr "Ei leia s�numit %s"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Ei saanud gruppide nimekirja serverist k�tte."
+
+#~ msgid "Could not open directory for news server: %s"
+#~ msgstr "Uudisteserveri kausta avamine nurjus: %s"
+
+#~ msgid "Unable to open or create .newsrc file for %s: %s"
+#~ msgstr "Faili .newsrc avamine v�i loomine %s jaoks nurjus: %s"
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Uute s�numite kontrollimine POP serverist nurjus: %s"
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "S�numi v�tmine nurjus: %s"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "�henduse loomine serveriga nurjus: %s"
+
+#~ 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"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "Ei saa saata s�numit: saatja aadress on m��ramata."
+
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "RCPT TO vastuse viga: %s: s�num j�i saatmata"
+
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "DATA vastuse viga: %s: s�numi j�i saatmata"
+
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr "DATA vastuse viga: s�numi t�histamine: %s: s�numi j�i saatmata"
+
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "QUIT vastuse viga: %s: mittefataalne"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Sisesta kausta URI"
+
+#~ msgid "Message was received"
+#~ msgstr "S�num v�eti vastu"
+
+#~ msgid "Message was sent"
+#~ msgstr "S�num saadeti"
+
+#~ msgid "on or after"
+#~ msgstr "sel hetkel v�i hiljem"
+
+#~ msgid "on or before"
+#~ msgstr "sel hetkel v�i varem"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "Uus _s�num"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Loo otsingureeglitest vKaust"
+
+#~ msgid "Indexing:"
+#~ msgstr "Indekseerin:"
+
+#~ 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"
+
+#~ msgid "_Email Address:"
+#~ msgstr "_E-posti aadress:"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "_Logi filtreerimised faili:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organisatsioon"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_J�ta see parool meelde"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "_Vaikimisi saadetakse HTML vormingus s�numeid"
+
+#~ msgid "_Server Type: "
+#~ msgstr "_Serveri t��p: "
+
+#~ msgid "_Signature file:"
+#~ msgstr "_Allkirjafail:"
+
+#~ 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:"
+
+#~ msgid "_Display stations:"
+#~ msgstr "Ku_vatavad ilmajaamad:"
+
+#~ 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."
+
+#~ msgid "(No name)"
+#~ msgstr "(Nimi puudub)"
+
+#~ msgid "New List"
+#~ msgstr "Uus nimekiri"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Kalendri seadistamine"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Loo uus _terve-p�eva-s�ndmus"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Loo uus _�lesanne"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Loo uus _s�ndmus"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Lisab terve p�eva kestva s�ndmuse"
+
+#~ msgid "_Appointment..."
+#~ msgstr "Ko_htumine..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Kalendri s�tted..."
+
+#~ msgid "_Task..."
+#~ msgstr "_�lesanne"
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Loob v�i muudab mailikontosid ja muid s�tteid"
+
+#~ msgid "New Message"
+#~ msgstr "Uus s�num"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_S�numite s�tted..."
+
+#~ msgid "Forward _Attached"
+#~ msgstr "Saada manusena"
+
+#~ msgid "Forward _Inline"
+#~ msgstr "Saada s�numi sees"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "Saada tsitaadina"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Rakenda filtreid"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Muudab �lesannete vaate s�tteid"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "�lesannete s�tted..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Muudab kokkuv�tte s�tteid"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "_Kokkuv�tte s�tted"
+
+#~ msgid "Show All"
+#~ msgstr "N�ita k�iki"
+
+#~ msgid "Sear_ch"
+#~ msgstr "_Otsing"
diff --git a/po/eu.po b/po/eu.po
index 004301f590..6a20d209e4 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-02-26 17:19+0100\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -30,16 +30,17 @@ msgid "Imports VCard files into Evolution."
 msgstr "VCard fitxategiak Evolution-era inportatzen ditu."
 
 #: 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 "Jaso honela"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Izena"
 
 #: 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 "Helb. el."
 
@@ -55,7 +56,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/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Laguntzailea"
 
@@ -95,7 +96,7 @@ msgid "Home"
 msgstr "Etxekoa"
 
 #: 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 "Erakundea"
 
@@ -117,7 +118,7 @@ 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/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Laneko faxa"
 
@@ -127,7 +128,7 @@ msgstr "Lan 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/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Etxeko faxa"
 
@@ -147,7 +148,7 @@ msgstr "Etxeko 2.a"
 
 #: 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/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -155,55 +156,54 @@ msgstr "ISDN"
 #: 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
 msgid "Other"
 msgstr "Bestelakoa"
 
 #: 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/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/widgets/e-addressbook-view.c:353
+#: 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/widgets/e-addressbook-view.c:354
+#: 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/widgets/e-addressbook-view.c:355
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex-a"
 
 #: 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 "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/widgets/e-addressbook-view.c:358
+#: 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/widgets/e-addressbook-view.c:359
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "3. helb. el."
 
 #: 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 "Web gunea"
 
@@ -212,7 +212,7 @@ msgid "Url"
 msgstr "URLa"
 
 #: 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 "Saila"
 
@@ -221,7 +221,7 @@ msgid "Dep"
 msgstr "Sai"
 
 #: 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 "Bulegoa"
 
@@ -230,12 +230,12 @@ msgid "Off"
 msgstr "Bul"
 
 #: 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 "Kargua"
 
 #: 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 "Lanbidea"
 
@@ -244,7 +244,7 @@ msgid "Prof"
 msgstr "Lanb"
 
 #: 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 "Zuzendaria"
 
@@ -257,7 +257,7 @@ msgid "Ass"
 msgstr "Lag"
 
 #: 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 "Goitizena"
 
@@ -266,12 +266,12 @@ msgid "Nick"
 msgstr "Goit"
 
 #: 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 "Ezkontidea"
 
 #: 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 "Oharra"
 
@@ -284,7 +284,7 @@ msgid "CALUri"
 msgstr "EguURI"
 
 #: 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 "Libre-okupatuta URLa"
 
@@ -318,11 +318,11 @@ msgstr "Deitura"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "VCard anitz"
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "%s(r)en VCard-a"
@@ -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:62
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
 #: 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:2364
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Bilatzen..."
 
@@ -356,37 +356,35 @@ msgstr "Kargatzen..."
 msgid "Error in search expression."
 msgstr "Errorea bilaketa-adierazpenean."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:516
-msgid "Connecting to LDAP server..."
-msgstr "LDAP zerbitzariarekin konektatzen..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:526
-msgid "Unable to connect to LDAP server."
-msgstr "Ezin da LDAP zerbitzariarekin konektatu."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:542
-msgid "Waiting for connection to LDAP server..."
-msgstr "LDAP zerbitzariarekin konektatu zain..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "LDAP zerbitzarian txartela gehitzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "LDAP zerbitzaritik txartela kentzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1174
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP zerbitzariko txartela aldatzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2281
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Bilaketa berrabiarazten."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "LDAP bilaketaren emaitzak jasotzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2287
-msgid "Restarting search."
-msgstr "Bilaketa berrabiarazten."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Errorea txartela kentzean"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Ezin izan da `%s' URLa analizatu"
 
 #: addressbook/conduit/address-conduit.c:293
 msgid "Default Sync Address:"
@@ -426,201 +424,637 @@ msgid "A Bonobo control for displaying an address."
 msgstr "Bonobo-ren kontrola helbidea bistaratzeko."
 
 #: 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 "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
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Kontaktuak maneiatzeko Evolution-en osagaia"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Helbide-liburuko minitxartelak kontrolatzeko fabrika"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Helbide-liburuko helbideen bistaratzailearen fabrika"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Mostrako helbide-liburuaren kontrolerako fabrika"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontaktuak"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Kontaktuen informazioa duen karpeta"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP zerbitzaria"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "Kontaktuen informazioa duen LDAP zerbitzaria"
 
-#: addressbook/gui/component/addressbook-component.c:558
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/component/addressbook-component.c:558
-#: ui/evolution-addressbook.xml.h:34
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontaktua"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Kontaktuen zerrenda berria"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Contact _List"
 msgstr "_Kontaktuen zerrenda"
 
-#: addressbook/gui/component/addressbook-config.c:225
-msgid "Edit Addressbook"
-msgstr "Editatu helbide-liburua"
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+msgid "Could not initialize gnome-vfs"
+msgstr "Ezin izan da gnome-vfs hasieratu"
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr "Ezin da helbide-liburua ireki"
+
+#: 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 ""
+"Ezin izan dugu helbide-liburu hori ireki.  Horrek esan nahi du\n"
+"okerreko URIa idatzi duzula, edo LDAP zerbitzaria\n"
+"ez dabilela"
+
+#: 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"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Evolution-en bertsio honek ez dauka konpilatuta LDAP\n"
+"euskarria.  LDAP erabili nahi baduzu Evolution-en\n"
+"programa konpilatu behar duzu CVS iturburuetatik\n"
+"beheko estekatik OpenLDAP eskuratuz.\n"
+
+#: 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."
+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
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
+
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "honela amaitzen da"
+
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "2. helb. el."
+
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "Kategoria da"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: 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
+msgid "Advanced..."
+msgstr "Aurreratua..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
+msgstr "Edozein kategoria"
+
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
+msgstr "Karpeta-arakatzaileak bistaratuko duen URIa"
+
+#: 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
+msgid "Primary Email"
+msgstr "Helb el. nagusia"
+
+#: addressbook/gui/component/e-address-popup.c:587
+msgid "Select an Action"
+msgstr "Hautatu ekintza bat"
+
+#: addressbook/gui/component/e-address-popup.c:593
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Sortu kontaktu berria \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Gehitu helbidea lehendik dagoen kontaktuari \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:891
+msgid "Querying Addressbook..."
+msgstr "Helbide-liburuan kontsulta egiten..."
+
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
+msgstr "Editatu kontaktu-informazioa"
+
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+msgid "Add to Contacts"
+msgstr "Gehitu kontaktuei"
+
+#: addressbook/gui/component/e-address-popup.c:1046
+msgid "Merge E-Mail Address"
+msgstr "Fusionatu helbide elektronikoa"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
+msgstr "Desgaitu kontsultak"
+
+#: addressbook/gui/component/e-address-widget.c:364
+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/addressbook-config.glade.h:1
-msgid "100"
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "A_uthenticate with server using:"
-msgstr "Zerbitzariarekin a_utentifikatzeko erabili:"
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Kontuaren izena"
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Gehitu helbide-liburua"
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "Helbide-liburuaren iturburuak"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Aurreratua"
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Alarmak"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonimoa"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Oinarria"
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Oinarrizkoa"
+#: addressbook/gui/component/ldap-config.glade.h:18
+msgid "Attribute"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr "Hautatu hau zerbitzariak autentifikazioa eskatzen badu."
+#: 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/addressbook-config.glade.h:11
+#: 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 "Ez dago informaziorik"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "De_lete"
 msgstr "E_zabatu"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr "Izen bereizitua (DN)"
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "_Izen bereizitua:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "Helbide elektronikoa"
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Email Address:"
+msgstr "_Helbide elektronikoa:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Evolution-en alarma"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
-"Evolution-ek izen bereizitu (DN) hau erabiliko du zu zerbitzarian "
+"Evolution-ek helbide elektroniko hau erabiliko du zu zerbitzarian "
 "autentifikatzeko"
 
-#: 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-ek helbide elektroniko hau erabiliko du zu zerbitzarian "
 "autentifikatzeko"
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "_Bilatu:"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Orokorra"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+#, fuzzy
+msgid "LDAP Attribute"
+msgstr "LDAP autentifikazioa"
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Konfigurazioa"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Marjinak"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_dagoen, maiztasun honekin"
+
+#: 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 "Bat"
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "Bilaketa-_oinarria:"
+#: 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 "Lehenespenak"
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Lehenespenak"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
 msgstr "Bilaketa _barrutia: "
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Zerbitzari-izena"
+#. 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 "Bilaketa"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Hautatu denak"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Ezabatuta"
+
+#: 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/addressbook-config.glade.h:20
+#: 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 "Iturburu-informazioa"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Zerbitzariarekin konektatzen..."
+
+#: 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 "Sub"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Beheko informazioa beharrezkoa da helbide-liburua gehitzeko. "
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Onartzen ez den eskema"
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "Informazio hau ez da beharrezkoa ldap zerbitzari gehienentzat. "
+#: 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/addressbook-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:78
 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."
+"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 ""
-"Zure ldap zerbitzariak informazio hau erabiltzen du bilaketan zein nodo "
-"erabiliko den zehazteko.  Informazio gehiago lortzeko, galdetu "
-"zerbitzariaren administratzaileari."
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"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 ""
-"Hau da ldap zerbitzarian egiten dituzun bilaketa guztietarako oinarrizko "
-"nodoa. Informazio gehiago lortzeko, galdetu zerbitzariaren "
-"administratzaileari."
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the maximum number of cards to download.  Setting this number too "
-"large will slow down this addressbook."
+"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 ""
 "Hau, deskargatzeko gehieneko txartel-kopurua da.  Zenbaki handiegia ezartzen "
 "baduzu, helbide-liburuaren funtzionamendua mantsotuko da."
 
-#: 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 "
@@ -630,204 +1064,218 @@ msgstr ""
 "izan hemen \"Helbide elektronikoa\" ezartzen baduzu sarbide anonimoa beharko "
 "duzula zure ldap zerbitzarirako."
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Hau da zure helbide-liburua kokatzen den zerbitzariaren izena."
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "Hau da zure ldap zerbitzariak erabiltzen duen ataka."
-
-#: addressbook/gui/component/addressbook-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:91
+#, fuzzy
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
+"It is for display purposes only. "
 msgstr ""
 "Izen hau erabiliko da zure kontua identifikatzeko.  Bistaratzeko bakarrik "
 "erabiliko da."
 
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "_Kontu-izena:"
+#: 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 "Izen bereizitua (DN)"
+
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+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
+msgid "Whenever Possible"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:31
+#: 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:100
+#: mail/mail-config.glade.h:139
 msgid "_Add"
 msgstr "_Gehitu"
 
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr "_Izen bereizitua:"
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Gehitu"
 
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr "_Deskarga-muga"
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Gehitu ekintza"
 
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:109
-#: 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:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:18
-msgid "_Edit"
-msgstr "_Edizioa"
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Gehitu ekintza"
 
-#: addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:110
-msgid "_Email address:"
-msgstr "_Helbide elektronikoa:"
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Alarmak"
 
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Ataka:"
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "Ezaba_tu dena"
 
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "Zer_bitzariaren izena:"
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Bistaratzea"
 
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-msgid "Could not initialize gnome-vfs"
-msgstr "Ezin izan da gnome-vfs hasieratu"
+#: addressbook/gui/component/ldap-config.glade.h:111
+#, fuzzy
+msgid "_Distinguished Name (DN):"
+msgstr "Izen bereizitua (DN)"
 
-#: addressbook/gui/component/addressbook-storage.c:168
-msgid "Other Contacts"
-msgstr "Beste kontaktu batzuk"
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:525
-msgid "Unable to open addressbook"
-msgstr "Ezin da helbide-liburua ireki"
+#: addressbook/gui/component/ldap-config.glade.h:113
+#, fuzzy
+msgid "_Download limit:"
+msgstr "_Deskarga-muga"
 
-#: addressbook/gui/component/addressbook.c:534
-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 ""
-"Ezin izan dugu helbide-liburu hori ireki.  Horrek esan nahi du\n"
-"okerreko URIa idatzi duzula, edo LDAP zerbitzaria\n"
-"ez dabilela"
+#: 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
+#: 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 "_Edizioa"
 
-#: addressbook/gui/component/addressbook.c:539
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-"Evolution-en bertsio honek ez dauka konpilatuta LDAP\n"
-"euskarria.  LDAP erabili nahi baduzu Evolution-en\n"
-"programa konpilatu behar duzu CVS iturburuetatik\n"
-"beheko estekatik OpenLDAP eskuratuz.\n"
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Editatu hitzordua"
 
-#: addressbook/gui/component/addressbook.c:547
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution-en alarma"
+
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
 msgstr ""
-"Ezin izan dugu helbide-liburu hori ireki.  Egiaztatu bide-izena\n"
-"badagoela eta atzitzeko baimena baduzula. "
 
-#: addressbook/gui/component/addressbook.c:655
-#: addressbook/gui/component/addressbook.c:658
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Edozein eremuk hau dauka"
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
-msgstr "Izenak hau dauka"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
-msgstr "Helb. el.ak hau dauka"
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "Au_kerak"
 
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:59
-msgid "Category is"
-msgstr "Kategoria da"
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Ataka:"
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Aurreratua..."
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Lehenespenak"
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1082
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
-msgstr "Edozein kategoria"
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "Bilaketa-_oinarria:"
 
-#: addressbook/gui/component/addressbook.c:1167
-msgid "The URI that the Folder Browser will display"
-msgstr "Karpeta-arakatzaileak bistaratuko duen URIa"
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "Zer_bitzariaren izena:"
 
-#.
-#. * 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/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Alarma-errepikaren denbora (minututan)"
 
-#: 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
-msgid "Primary Email"
-msgstr "Helb el. nagusia"
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "%d kontua"
 
-#: addressbook/gui/component/e-address-popup.c:587
-msgid "Select an Action"
-msgstr "Hautatu ekintza bat"
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "contact-list-editor"
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Sortu kontaktu berria \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Txartelik ez"
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Gehitu helbidea lehendik dagoen kontaktuari \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "%s(r)ekin berriro konektatzen"
 
-#: addressbook/gui/component/e-address-popup.c:891
-msgid "Querying Addressbook..."
-msgstr "Helbide-liburuan kontsulta egiten..."
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
-msgstr "Editatu kontaktu-informazioa"
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-msgid "Add to Contacts"
-msgstr "Gehitu kontaktuei"
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "Orokorra"
 
-#: addressbook/gui/component/e-address-popup.c:1046
-msgid "Merge E-Mail Address"
-msgstr "Fusionatu helbide elektronikoa"
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
-msgstr "Desgaitu kontsultak"
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
-msgstr "Gaitu kontsultak (Arriskutsua!)"
+#: addressbook/gui/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "Bilaketa"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
@@ -838,7 +1286,7 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Helbide-liburuko izen-hautaketaren interfazerako fabrika"
 
 #: 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
 msgid "Remove"
@@ -870,6 +1318,11 @@ msgid "Unnamed Contact"
 msgstr "Kontaktu izengabea"
 
 #: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "bidaltzaileak hau dauka"
+
+#: 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"
@@ -885,7 +1338,7 @@ msgstr ""
 "errorea nola gertatu den ahalik eta xehetasun handienaz kontatuz. \n"
 "  Eskerrik asko."
 
-#: 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"
@@ -897,31 +1350,40 @@ msgstr ""
 "Evolution-etik irten eta berriro sartu beharko duzu\n"
 "arazoa konpontzeko."
 
-#: 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 "Hautatu kontaktuak helbide-liburutik"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "_hau dauka:"
+msgid "Select Names"
+msgstr "Hautatu izenak"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "_Bilatu:"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Kontaktua ezabatu?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Hautatu izenak"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Kontaktu garrantzitsuenak"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Erakutsi irizpide hauekin bat datozen kontaktuak:"
+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 "_Lekuz aldatu..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Karpeta:"
 
@@ -982,10 +1444,6 @@ msgstr "Jaso h_onela:"
 msgid "Full _Name..."
 msgstr "_Izen osoa..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Orokorra"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1030,10 +1488,11 @@ 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:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1492 mail/mail-config.glade.h:107
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "E_zabatu..."
 
@@ -2117,7 +2576,7 @@ msgid "Edit Full"
 msgstr "Editatu osorik"
 
 #: 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 "Izen osoa"
 
@@ -2323,7 +2782,7 @@ msgstr ""
 "badago karpeta honetan. Hala ere gehitu nahi duzu?"
 
 #: 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 "Bilaketa aurreratua"
 
@@ -2332,99 +2791,24 @@ msgstr "Bilaketa aurreratua"
 msgid "Search"
 msgstr "Bilatu"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:136
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Txartelik ez"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:139
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "txartel bat"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d txartel"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:369
+#: addressbook/gui/widgets/e-addressbook-model.c:370
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Errorea %s abiaraztean"
 
-#: 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:910
-#: addressbook/gui/widgets/e-addressbook-view.c:1024
-#: addressbook/gui/widgets/e-addressbook-view.c:1646
-#: ui/evolution-addressbook.xml.h:22
-msgid "Save as VCard"
-msgstr "Gorde VCard gisa"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:312
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Ireki"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-#: ui/evolution-addressbook.xml.h:13
-msgid "Forward Contact"
-msgstr "Birbidali kontaktua"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:1026
-msgid "Send Message to Contact"
-msgstr "Bidali mezua kontaktuari"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1027
-#: 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:66
-#: ui/my-evolution.xml.h:2
-msgid "Print"
-msgstr "Inprimatu"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:318
-#: addressbook/gui/widgets/e-addressbook-view.c:1029
-msgid "Print Envelope"
-msgstr "Inprimatu gutun-azala"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:322
-#: addressbook/gui/widgets/e-addressbook-view.c:1033
-msgid "Copy to folder..."
-msgstr "Kopiatu karpeta honetan..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
-#: addressbook/gui/widgets/e-addressbook-view.c:1034
-msgid "Move to folder..."
-msgstr "Eraman karpeta honetara..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:1037
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:7
-msgid "Cut"
-msgstr "Ebaki"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
-#: addressbook/gui/widgets/e-addressbook-view.c:1038
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:7
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Kopiatu"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: addressbook/gui/widgets/e-addressbook-view.c:1039
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:12
-msgid "Paste"
-msgstr "Itsatsi"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1040 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:295 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:19
-msgid "Delete"
-msgstr "Ezabatu"
-
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
 #: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
@@ -2432,14 +2816,15 @@ msgid "Error modifying card"
 msgstr "Errorea txartela aldatzean"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1020
+#: shell/evolution-shell-component.c:1043
 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 shell/e-shell.c:1941
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: 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
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
@@ -2447,8 +2832,8 @@ msgstr "Errore ezezaguna"
 msgid "Repository offline"
 msgstr "Biltegia deskonektatuta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 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:1071
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
@@ -2466,9 +2851,9 @@ 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
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: 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
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
@@ -2500,7 +2885,7 @@ 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:1444
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Errorea txartela kentzean"
 
@@ -2522,86 +2907,186 @@ 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:342
+#: addressbook/gui/widgets/e-addressbook-util.c:344
 msgid "Move card to"
 msgstr "Eraman txartela hona"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:346
 msgid "Copy card to"
 msgstr "Kopiatu txartela hemen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Move cards to"
 msgstr "Eraman txartelak hona"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:351
 msgid "Copy cards to"
 msgstr "Kopiatu txartelak hemen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:331
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Egin klik hemen kontaktua gehitzeko *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Telefono nagusia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Laguntzailearen telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Laneko telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Atzera deitzeko telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Enpresako telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Etxeko telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Laneko helbidea"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Etxeko helbidea"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Telefono mugikorra"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Autoko telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Laneko 2. telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Etxeko 2.telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:351
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Beste telefono bat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Gorde VCard gisa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Kontaktu berria"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Kontaktuen zerrenda berria"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Joan karpeta honetara..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Inportatu..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Bilatu kontaktuak"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Helbide-liburuaren iturburuak..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Pilot-en ezarpenak..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Birbidali kontaktua"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Bidali mezua kontaktuari"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Inprimatu gutun-azala"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Copy to folder..."
+msgstr "Kopiatu karpeta honetan..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Move to folder..."
+msgstr "Eraman karpeta honetara..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Ebaki"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Uneko ikuspegia"
+
+#. 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:940
 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 +3094,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:945
 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 +3111,7 @@ msgstr "eta beste txartel bat."
 msgid "Save in addressbook"
 msgstr "Gorde helbide-liburuan"
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
@@ -2640,7 +3125,7 @@ msgstr ""
 "\n"
 "Egin klik bikoitza hemen kontaktu berria sortzeko. "
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
+#: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
 "\n"
 "\n"
@@ -2737,6 +3222,7 @@ msgid "Include:"
 msgstr "Sartu:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Horizontala"
 
@@ -2761,6 +3247,7 @@ msgid "Options"
 msgstr "Aukerak"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Orientazioa"
 
@@ -2781,7 +3268,9 @@ msgstr "Papera"
 msgid "Paper source:"
 msgstr "Paper-iturria:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Bertikala"
 
@@ -2841,29 +3330,25 @@ msgstr "_Letra-tipoa..."
 msgid "Untitled appointment"
 msgstr "Hitzordu izengabea"
 
-#: 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:653
+#: 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
 msgid "High"
 msgstr "Handia"
 
-#: 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:652
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normala"
 
-#: 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:651
+#: 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
 msgid "Low"
 msgstr "Txikia"
 
 #. 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
 msgid "Undefined"
 msgstr "Definitu gabe"
 
@@ -2895,41 +3380,55 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Egutegia bistaratzen duen mostrako Bonobo kontrola."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Egutegiaren eta zereginen ezarpenak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Egutegia maneiatzeko Evolution-en osagaia."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr "Evolution-en Zereginen kontrolerako fabrika."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "Egutegiaren iTip ikuspegiaren kontrolerako fabrika"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "Mostrako egutegi-kontrolerako fabrika"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Egutegi-osagaien editorearen elkarrizketak zentralizatzeko fabrika"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr "Osagaien editorearen fabrika sortzeko fabrika"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 "Alarma bidezko jakinarazpen-zerbitzua"
@@ -2938,22 +3437,10 @@ 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
-msgid "Evolution Alarm"
-msgstr "Evolution-en alarma"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -2993,7 +3480,7 @@ msgstr ""
 "dago. Oroigarri normala bistaratuko da."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:419 mail/mail-callbacks.c:2573
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Abisua"
@@ -3019,7 +3506,7 @@ 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:57
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Ezin izan da GNOME hasieratu"
 
@@ -3031,52 +3518,52 @@ msgstr "Ezin izan da sortu alarma bidezko jakinarazpen-zerbitzua"
 msgid "Could not create the alarm notify service factory"
 msgstr "Ezin izan da sortu alarma bidezko jakinarazpen-zerbitzuaren fabrika"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Laburpenak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Azalpenak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Iruzkinak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "Ez dator bat"
 
-#: calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%A, %Y %B %d"
 
 #. 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, %b %d"
 
-#: 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, %Y %b %d"
 
-#: 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 "%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:485
-#: 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:834
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3084,16 +3571,14 @@ msgstr ""
 "konfigurazioa."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:385
 msgid "Private"
 msgstr "Pribatua"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
 msgid "Confidential"
 msgstr "Konfidentziala"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Publikoa"
 
@@ -3114,32 +3599,27 @@ msgid "W"
 msgstr "M"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
 msgid "Free"
 msgstr "Libre"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:479 calendar/gui/print.c:2246
 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:480 calendar/gui/print.c:2249
 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-calendar-table.c:481 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2252
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Eginda"
 
@@ -3155,9 +3635,10 @@ 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/mail-account-gui.c:1512
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:404
-#: mail/mail-config.glade.h:56
+#: 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
 #: 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
@@ -3174,21 +3655,13 @@ 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/e-meeting-model.c:821
 msgid "Yes"
 msgstr "Bai"
 
 #: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
 msgid "No"
 msgstr "Ez"
 
-#. 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 "Bilaketa"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Egunaren ikuspegia"
@@ -3205,54 +3678,75 @@ msgstr "Astearen ikuspegia"
 msgid "Month View"
 msgstr "Hilabetearen ikuspegia"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Egutegia"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Hitzorduak eta gertaerak dituen karpeta"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1733
-#: my-evolution/e-summary-tasks.c:250 my-evolution/e-summary-tasks.c:267
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Zereginak"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Egiteko elementuak dauzkan karpeta"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:695
 msgid "New meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:695
 msgid "_Meeting"
 msgstr "_Bilera"
 
-#: calendar/gui/component-factory.c:687
+#: calendar/gui/component-factory.c:699
 msgid "New task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/component-factory.c:687 ui/evolution-tasks.xml.h:21
+#: calendar/gui/component-factory.c:699
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Hitzordu berria"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "_Hitzordua"
+
+#: calendar/gui/component-factory.c:707
 msgid "New appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:707
 msgid "_Appointment"
 msgstr "_Hitzordua"
 
-#: calendar/gui/control-factory.c:120
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Ezin izan da karpeta ireki`%s'(e)n"
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "Egutegiak bistaratuko duen URIa"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "Aldatu ikuspegia -> %s"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Audio alarmaren aukerak"
@@ -3317,9 +3811,7 @@ msgstr "bider, maiztasun honekin:"
 msgid "hours"
 msgstr "ordu "
 
-#: 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 "minutu "
 
@@ -3447,7 +3939,7 @@ msgstr "Oroigarriak"
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "Laburpena:"
 
@@ -3476,7 +3968,7 @@ msgstr "hitzordu-amaiera baino"
 msgid "hour(s)"
 msgstr "ordu"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "minutu"
 
@@ -3517,171 +4009,169 @@ msgid "Color for tasks due today"
 msgstr "Gaurko zereginen kolorea"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Sortu hitzordu berria _oroigarri lehenetsiarekin"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "egun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Asteko _lehenengo eguna:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Ostirala"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "ordu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "minutu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Astelehena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "A_tzeratutako zereginak:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Larunbata"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
 msgstr ""
-"Erakutsi hitzorduen a_maiera-orduak astearen eta hilabetearen ikuspegietan"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "Erakutsi aste-_zenbakiak data-nabigatzailean"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_Ig."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Igandea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Ga_urko zereginak:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "O_g."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "A_r."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Ga_urko zereginak:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "Z_ereginen zerrenda"
 
-#: 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 "Osteguna"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Ordua"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Or_du-zona:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Orduen zati_keta:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Ordu-formatua:"
 
-#: 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 "Asteartea"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Asteazkena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Lan-astea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ordu (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 ordu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Eskatu berrespena elementuak ezabatzeko"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "_Konprimitu asteburuak hilabetearen ikuspegian"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Bistaratzea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Or."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Orokorra"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "Ez_kutatu burututako zereginak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Al."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "Be_stelakoa"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "A_tzeratutako zereginak:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_Lr."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "Z_ereginen zerrenda"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Orduen zati_keta:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "A_z."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "hitzordua hasi aurretik"
 
@@ -3746,73 +4236,60 @@ msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 
-#: 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:2212
 msgid " (Completed "
 msgstr "(Eginda "
 
-#: 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 "Eginda "
 
-#: 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 "(Falta: "
 
-#: 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 "Falta: "
 
-#: calendar/gui/dialogs/comp-editor.c:321
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "Ezin izan da objektua eguneratu!"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Editatu hitzordua"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Hitzordua - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Zeregina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Egunkariko sarrera - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Laburpenik ez"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2226
-#: mail/mail-display.c:113
-msgid "Overwrite file?"
-msgstr "Fitxategia gainidatzi?"
-
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2233
-#: mail/mail-display.c:117
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Izen hori duen fitxategia badago lehendik.\n"
-"Gainidatzi?"
-
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Ezin da uneko bertsioa lortu!"
 
@@ -3870,7 +4347,7 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Hitzordua"
 
@@ -4006,7 +4483,6 @@ msgid "Member"
 msgstr "Kidea"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-itip-control.c:853
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
@@ -4018,14 +4494,14 @@ 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:31
+#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
 #: mail/message-list.etspec.h:11
 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 mail/mail-config.glade.h:95
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Mota"
@@ -4048,27 +4524,98 @@ msgstr "_Gonbidatu beste batzuk..."
 msgid "_Other Organizer"
 msgstr "_Beste antolatzaile bat"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution-ek editatu ezin dituen errepikapenak dauzka hitzordu honek."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "-"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "zerrenda"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "segundo "
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Bestelakoa"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Iparraldea"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "zerrenda"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Beste fax bat"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "eguna"
 
-#: 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
-msgid "th"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr "aldiz"
 
@@ -4165,7 +4712,7 @@ msgid "Progress"
 msgstr "Lanean"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:755
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URLa:"
 
@@ -4177,15 +4724,19 @@ msgstr "_Lehentasuna:"
 msgid "_Status:"
 msgstr "_Egoera:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "Oinarrizkoa"
+
 #: 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:324
 msgid "Assignment"
 msgstr "Esleipena"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Azalpena:"
 
@@ -4197,115 +4748,80 @@ msgstr "Ha_siera-data:"
 msgid "_Due Date:"
 msgstr "_Mugaeguna:"
 
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "0%"
-msgstr "%0"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "10%"
-msgstr "%10"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "20%"
-msgstr "%20"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "30%"
-msgstr "%30"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "40%"
-msgstr "%40"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "50%"
-msgstr "%50"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "60%"
-msgstr "%60"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "70%"
-msgstr "%70"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "80%"
-msgstr "%80"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "90%"
-msgstr "%90"
-
-#: calendar/gui/e-calendar-table.c:438
-#, 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:751 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: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: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
 msgid "_Open"
 msgstr "_Ireki"
 
-#: 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:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Gorde honela..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "_Inprimatu..."
+
+#: calendar/gui/e-calendar-table.c:978 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: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:16
+#: calendar/gui/e-calendar-table.c:979 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: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:20
+#: calendar/gui/e-calendar-table.c:980 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 "_Itsatsi"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Esleitu zeregina"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Birbidali _iCalendar gisa"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "_Ezabatu zeregin hau"
-
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "Ma_rkatu zereginak 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: 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:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
-#: calendar/gui/e-calendar-table.c:1247
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Egin klik zeregina gehitzeko"
 
@@ -4313,8 +4829,8 @@ msgstr "Egin klik zeregina gehitzeko"
 msgid "Alarms"
 msgstr "Alarmak"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:924
-#: camel/camel-filter-driver.c:1026
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Eginda"
 
@@ -4345,8 +4861,7 @@ 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:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1498 shell/e-summary-storage.c:79
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Laburpena"
 
@@ -4388,407 +4903,172 @@ msgstr "%02i minutu-zatiketa"
 
 #. 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, %B %d"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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"
 
 #. 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
 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
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3525
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "Hitz_ordu berria"
 
-#: 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 "Egun osoko gertaera _berria"
 
-#: 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 "Bilera berria"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Zeregin berria"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Inprimatu..."
+
+#: 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 "_Joan gaurko egunera"
 
-#: 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 "_Joan data jakin batera..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3435
-msgid "_Delete this Appointment"
-msgstr "Ezabatu _hitzordu hau"
+#: 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 "_Argitaratu libre/okupatuta informazioa"
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
+#, fuzzy
+msgid "_Configure..."
+msgstr "Konfiguratu %s"
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
+msgid "_Save As..."
+msgstr "_Gorde honela..."
+
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Antolatu _bilera"
+
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Birbidali _iCalendar gisa"
+
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "Egin _agerraldi hau aldagarri"
 
-#: 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 "Ezabatu _agerraldi hau"
 
-#: 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 "Ezabatu agerraldi _guztiak"
 
-#: calendar/gui/e-itip-control.c:545
-msgid "Meeting begins: <b>"
-msgstr "Bileraren hasiera: <b>"
-
-#: calendar/gui/e-itip-control.c:550
-msgid "Task begins: <b>"
-msgstr "Zereginaren hasiera: <b>"
-
-#: calendar/gui/e-itip-control.c:555
-msgid "Free/Busy info begins: <b>"
-msgstr "Libre/okupatura informazioaren hasiera: <b>"
-
-#: calendar/gui/e-itip-control.c:559
-msgid "Begins: <b>"
-msgstr "Hasiera: <b>"
-
-#: calendar/gui/e-itip-control.c:571
-msgid "Meeting ends: <b>"
-msgstr "Bileraren amaiera: <b>"
-
-#: calendar/gui/e-itip-control.c:574
-msgid "Free/Busy info ends: <b>"
-msgstr "Libre/okupatura informazioaren amaiera: <b>"
-
-#: calendar/gui/e-itip-control.c:578
-msgid "Ends: <b>"
-msgstr "Amaiera: <b>"
-
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Completed: <b>"
-msgstr "Zeregina eginda: <b>"
-
-#: calendar/gui/e-itip-control.c:602
-msgid "Task Due: <b>"
-msgstr "Zeregina egiteko: <b>"
-
-#: calendar/gui/e-itip-control.c:639 calendar/gui/e-itip-control.c:688
-msgid "iCalendar Information"
-msgstr "iCalendar informazioa"
-
-#. Title
-#: calendar/gui/e-itip-control.c:654
-msgid "iCalendar Error"
-msgstr "iCalendar errorea"
-
-#: calendar/gui/e-itip-control.c:719 calendar/gui/e-itip-control.c:735
-msgid "An unknown person"
-msgstr "Pertsona ezezaguna"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:742
-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:758
-msgid "<i>None</i>"
-msgstr "<i>Bat ere ez</i>"
-
-#: calendar/gui/e-itip-control.c:770
-msgid "Status:"
-msgstr "Egoera:"
-
-#: 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
-msgid "Accepted"
-msgstr "Onartua"
-
-#: calendar/gui/e-itip-control.c:779
-msgid "Tentatively Accepted"
-msgstr "Oraingoz onartua"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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-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
-msgid "Declined"
-msgstr "Ukatua"
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
+#, c-format
+msgid "Error executing %s."
+msgstr "Errorea %s exekutatzean."
 
-#: 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:171
-#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:317
-#: mail/mail-display.c:827 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:442
+#: 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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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: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
-msgid "Choose an action:"
-msgstr "Aukeratu ekintza bat:"
-
-#: calendar/gui/e-itip-control.c:834
-msgid "Update"
-msgstr "Eguneratu"
-
-#: 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:1931 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "Ados"
-
-#: calendar/gui/e-itip-control.c:850
-msgid "Accept"
-msgstr "Onartu"
-
-#: calendar/gui/e-itip-control.c:851
-msgid "Tentatively accept"
-msgstr "Onartu oraingoz"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Decline"
-msgstr "Ukatu"
-
-#: calendar/gui/e-itip-control.c:866
-msgid "Send Free/Busy Information"
-msgstr "Bidali libre/okupatuta informazioa"
-
-#: calendar/gui/e-itip-control.c:879
-msgid "Update respondent status"
-msgstr "Eguneratu erantzun-emailearen egoera"
-
-#: calendar/gui/e-itip-control.c:892
-msgid "Send Latest Information"
-msgstr "Bidali azken orduko informazioa"
-
-#: calendar/gui/e-itip-control.c:905 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Utzi"
-
-#: calendar/gui/e-itip-control.c:953
-#, 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:954
-msgid "Meeting Information"
-msgstr "Bileraren informazioa"
-
-#: calendar/gui/e-itip-control.c:958
-#, 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:959
-msgid "Meeting Proposal"
-msgstr "Bilera-proposamena"
-
-#: calendar/gui/e-itip-control.c:963
-#, 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:964
-msgid "Meeting Update"
-msgstr "Bilera-eguneratzea"
-
-#: calendar/gui/e-itip-control.c:968
-#, 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:969
-msgid "Meeting Update Request"
-msgstr "Bilera-eguneratzearen eskaera"
-
-#: calendar/gui/e-itip-control.c:992
-#, 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:993
-msgid "Meeting Reply"
-msgstr "Bilera-erantzuna"
-
-#: calendar/gui/e-itip-control.c:997
-#, 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:998
-msgid "Meeting Cancellation"
-msgstr "Bilera bertan behera uztea"
-
-#: calendar/gui/e-itip-control.c:1002 calendar/gui/e-itip-control.c:1073
-#: calendar/gui/e-itip-control.c:1108
-#, 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:1003
-msgid "Bad Meeting Message"
-msgstr "Bilera-mezu txarra"
-
-#: calendar/gui/e-itip-control.c:1023
-#, 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:1024
-msgid "Task Information"
-msgstr "Zereginaren informazioa"
-
-#: calendar/gui/e-itip-control.c:1028
-#, 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:1029
-msgid "Task Proposal"
-msgstr "Zeregin-proposamena"
-
-#: calendar/gui/e-itip-control.c:1033
-#, 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:1034
-msgid "Task Update"
-msgstr "Zeregin-eguneratzea"
-
-#: calendar/gui/e-itip-control.c:1038
-#, 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:1039
-msgid "Task Update Request"
-msgstr "Zeregin-eguneratzearen eskaera"
-
-#: calendar/gui/e-itip-control.c:1063
-#, 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:1064
-msgid "Task Reply"
-msgstr "Zereginaren erantzuna"
-
-#: calendar/gui/e-itip-control.c:1068
-#, 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:1069
-msgid "Task Cancellation"
-msgstr "Zeregina bertan behera uztea"
-
-#: calendar/gui/e-itip-control.c:1074
-msgid "Bad Task Message"
-msgstr "Zeregin-mezu txarra"
-
-#: calendar/gui/e-itip-control.c:1093
-#, 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:1094
-msgid "Free/Busy Information"
-msgstr "Libre/okupatuta informazioa"
-
-#: calendar/gui/e-itip-control.c:1098
-#, 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:1099
-msgid "Free/Busy Request"
-msgstr "Libre/okupatuta eskaera"
-
-#: calendar/gui/e-itip-control.c:1103
-#, 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:1104
-msgid "Free/Busy Reply"
-msgstr "Libre/okupatuta erantzuna"
-
-#: calendar/gui/e-itip-control.c:1109
-msgid "Bad Free/Busy Message"
-msgstr "Libre/okupatuta mezu txarra"
-
-#: calendar/gui/e-itip-control.c:1182
-msgid "The message does not appear to be properly formed"
-msgstr "Ez dirudi mezua behar bezala osatuta dagoenik"
-
-#: calendar/gui/e-itip-control.c:1201
-msgid "The message contains only unsupported requests."
-msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
-
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1235
-msgid "The attachment does not contain a valid calendar message"
-msgstr "Eranskinak ez du baliozko egutegi-mezurik"
-
-#: calendar/gui/e-itip-control.c:1260
-msgid "The attachment has no viewable calendar items"
-msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
-
-#: calendar/gui/e-itip-control.c:1338
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr "Ezin da zure identitaterik aurkitu partaideen zerrendan!\n"
-
-#: calendar/gui/e-itip-control.c:1369
+#: 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:1371
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 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:1424
+#: 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:1426
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: calendar/gui/e-itip-control.c:1428
-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:1456
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: calendar/gui/e-itip-control.c:1486 calendar/gui/e-itip-control.c:1536
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: calendar/gui/e-itip-control.c:1488 calendar/gui/e-itip-control.c:1540
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Hautatu karpeta"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Hautatu karpeta"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4830,7 +5110,7 @@ msgstr "data-hasiera"
 msgid "Chair Persons"
 msgstr "Mahaiburuak"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1640
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Beharrezko partaideak"
 
@@ -4843,57 +5123,58 @@ 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:789
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Indibiduala"
 
 #: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
 msgid "Group"
 msgstr "Taldea"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
 msgid "Resource"
 msgstr "Baliabidea"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
 msgid "Room"
 msgstr "Gela"
 
 #: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
 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:806
+#: calendar/gui/e-meeting-model.c:535
 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:807
 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:808
 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:834
+#: calendar/gui/e-meeting-model.c:543
 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-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:434
 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:838
 msgid "Delegated"
 msgstr "Delegatua"
 
@@ -4903,14 +5184,14 @@ 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:471
+#: calendar/gui/e-meeting-time-sel-item.c:475
 #: calendar/gui/e-meeting-time-sel.c:2088
 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:475
+#: calendar/gui/e-meeting-time-sel-item.c:479
 #: calendar/gui/e-meeting-time-sel.c:2118 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"
@@ -4918,7 +5199,7 @@ msgstr "%a, %Y/%m/%d"
 
 #. 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"
@@ -4983,40 +5264,54 @@ msgstr "Bilera _hasteko ordua:"
 msgid "Meeting _end time:"
 msgstr "Bilera amai_tzeko ordua:"
 
-#: calendar/gui/e-tasks.c:351
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: calendar/gui/e-tasks.c:381
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ezin izan dira zereginak kargatu`%s'(e)n"
 
-#: 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 "`%s'kargatzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/e-tasks.c:643
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Egite-data"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Hautatutako objektuak ezabatzen"
+
+#: calendar/gui/e-tasks.c:659
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: 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 "Hitz_ordu berria..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "Ezabatu _hitzordu hau"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1872
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s - egutegia irekitzen"
@@ -5077,284 +5372,223 @@ msgstr "urria"
 msgid "September"
 msgstr "iraila"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr "Partaide bat behar da gutxienez"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "Antolatzailea ezarri behar da."
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:346
-msgid "Event information"
-msgstr "Gertaera-informazioa"
-
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:348
-msgid "Task information"
-msgstr "Zereginaren informazioa"
-
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:350
-msgid "Journal information"
-msgstr "Egunkari-informazioa"
-
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:367
-msgid "Free/Busy information"
-msgstr "Libre/okupatuta informazioa"
-
-#: calendar/gui/itip-utils.c:321
-msgid "Calendar information"
-msgstr "Egutegi-informazioa"
-
-#: calendar/gui/itip-utils.c:361
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Libre/okupatuta informazioa (%s - %s)"
-
-#: calendar/gui/itip-utils.c:373
-msgid "iCalendar information"
-msgstr "iCalendar informazioa"
-
-#: calendar/gui/itip-utils.c:582
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Gertaerako partaidea izan behar duzu."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr "Ezin izan da sortu osagai-editorearen fabrika"
 
-#: 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 "Ig"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Al"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Ar"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Az"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Og"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Or"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Lr"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Hautatutako eguna (%a, %Y %b %d)"
 
-#: 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:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr "%a, %Y %d"
 
-#: 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, %Y %b %d"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Hautatutako astea (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Hautatutako hilabetea (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Hautatutako urtea (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Zeregina"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Egoera: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Lehentasuna: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Osatutako ehunekoa: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URLa: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Kategoriak: %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "Kontaktuak "
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Inprimatu egutegia"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2882 my-evolution/e-summary.c:605
-#: ui/evolution-addressbook.xml.h:20 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Inprimatzeko aurrebista"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Inprimatu elementua"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Prestatu inprimaketa"
 
@@ -5365,11 +5599,11 @@ msgstr ""
 "Ezin izan da egutegiaren ikuspegia sortu.  Egiaztatu ORBit eta OAF "
 "konfigurazioa."
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "Bistaratu beharreko zeregin-karpetaren URIa"
 
-#: calendar/gui/tasks-control.c:427
+#: 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"
@@ -5381,11 +5615,16 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: calendar/gui/tasks-control.c:434 mail/mail-callbacks.c:2359
-#: mail/mail-callbacks.c:2587
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "Ez galdetu berriro."
 
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Inprimatu txartelak"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5440,91 +5679,110 @@ msgstr "iCalendar fitxategiak Evolution-era inportatzen ditu"
 msgid "Imports vCalendar files into Evolution"
 msgstr "VCalendar fitxategiak Evolution-era inportatzen ditu"
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Egutegi-mezua"
+
+#: 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-ek Pine posta-fitxategiak aurkitu ditu.\n"
+"Evolution-era inportatu nahi dituzu?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Egutegia"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "'time-now'k 0 argumentu espero ditu"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "'make-time'k argumentu bat espero du"
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "'make-time'k espero du 1 argumentua kate bat izatea"
 
-#: 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'ren 1 argumentuak ISO 8601 data/ordu katea izan behar du."
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "'time-add-day'k 2 argumentu espero ditu"
 
-#: 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'k espero du 1 argumentua time_t izatea"
 
-#: 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'k espero du 2 argumentua osoko zenbakia izatea"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "'time-day-begin'ek argumentu bat espero du"
 
-#: 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'ek espero du 1 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "'time-day-end'ek argumentu bat espero du"
 
-#: 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'ek espero du 1 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "'get-vtype'ek 0 argumentu espero ditu"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "'occur-in-time-range?'k 2 argumentu espero ditu"
 
-#: 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?'k espero du 1 argumentua time_t izatea"
 
-#: 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?'k espero du 2 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "'contains?'ek 2 argumentu espero ditu"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "'contains?'ek espero du 1 argumentua kate bat izatea"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "'contains?'ek espero du 2 argumentua kate bat izatea"
 
-#: calendar/pcs/query.c:691
+#: 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:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "'has-categories?'ek gutxienez argumentu bat espero du"
 
-#: 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)"
@@ -5532,15 +5790,15 @@ msgstr ""
 "'has-categories?'ek espero du argumentu guztiak kateak izatea eta argumentu "
 "bakarra izatea boolear faltsua (#f)"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "'is-completed?'ek 0 argumentu espero ditu"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "'completed-before?'k argumentu bat espero du"
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "'completed-before?'k espero du 1 argumentua time_t izatea"
 
@@ -7081,11 +7339,11 @@ msgstr "Zifraketa honek ez du enkriptatzerik onartzen"
 msgid "Decryption is not supported by this cipher"
 msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 msgid "Unable to create cache path"
 msgstr "Ezin da cache-bidea sortu"
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:441
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ezin izan da kendu cache-sarrera: %s: %s"
@@ -7120,52 +7378,51 @@ msgstr "Zerbitzariarekin birsinkronizatzen"
 msgid "You must be working online to complete this operation"
 msgstr "Linean jardun behar duzu lanean eragiketa hau bukatzeko"
 
-#: 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 "Karpetak sinkronizatzen"
 
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errorea iragazkia analizatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errorea iragazkia exekutatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Ezin da spool-karpeta ireki"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Ezin da spool-karpeta prozesatu"
 
-#: camel/camel-filter-driver.c:889
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) mezua lortzen"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Ezin da mezua ireki"
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Huts egin du %d mezuan"
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Karpeta sinkronizatzen"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d mezua hartzen"
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
@@ -7179,7 +7436,7 @@ msgstr "Huts egin du mezua berreskuratzean"
 msgid "Error executing filter search: %s: %s"
 msgstr "Errorea iragazki-bilaketa exekutatzean: %s: %s"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -7188,7 +7445,7 @@ msgstr ""
 "Ezin izan da bilaketa-adierazpena analizatu: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -7197,35 +7454,31 @@ msgstr ""
 "Errorea bilaketa-adierazpena exekutatzean: %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 "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Kontsulta egiten goiburuko ezezagunean: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Mota baliogabea gorputzaren edukian, katea espero da"
-
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Eragiketa hau ez da onartzen: mezua erantsi: %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Eragiketa hau ez da onartzen: uid bidezko bilaketa: %s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Mezuak eramaten"
 
@@ -7336,171 +7589,125 @@ msgstr "Idatzi zure %s pasaesaldia %s(e)rako"
 msgid "Please enter your %s passphrase"
 msgstr "Idatzi %s pasaesaldia"
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:763
+#: 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:588 camel/camel-pgp-context.c:769
+#: 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:756
+#: 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:955
+#: 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:961
+#: 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:972
+#: camel/camel-pgp-context.c:1004
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 "Ezin da mezua egiaztatu: ezin izan da aldi baterako fitxategia sortu: %s"
 
-#: camel/camel-pgp-context.c:1145
+#: 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:1155
+#: 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:1162
+#: 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:1171
+#: 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:1340
+#: 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:1348
+#: 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:1355
+#: 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"
+"Ezin da mezua desenkriptatu: ezin izan da GPG/PGPrako kanalizaziorik sortu: "
+"%s"
 
-#: camel/camel-pgp-mime.c:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Idatzi %s(e)rako pasahitza"
-
-#: camel/camel-pkcs7-context.c:213
-msgid "Error hashing password."
-msgstr "Errorea pasahitzaren hash-a egitean."
-
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr "Pasahitz baliogabea."
-
-#: camel/camel-pkcs7-context.c:329
-#, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Ezin izan da sinatu: \"%s\"(r)en ziurtagiria ez da aurkitu."
-
-#: camel/camel-pkcs7-context.c:378
-#, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Ezin izan da garbi sinatu: \"%s\"(r)en ziurtagiria ez da aurkitu."
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "Ezin izan da enkriptatu: huts egin du datuak sortzean."
-
-#: camel/camel-pkcs7-context.c:590
-msgid "Could not encrypt: failed to create encryption context."
-msgstr ""
-"Ezin izan da enkriptatu: huts egin du enkriptatze-testuingurua sortzean."
-
-#: camel/camel-pkcs7-context.c:620
-#, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr ""
-"Ezin izan dira datuak enkriptatu: erabiltzaile-gako baliogabea: \"%s\"."
-
-#: camel/camel-pkcs7-context.c:626
-msgid "Could not encrypt: encoding failed."
-msgstr "Ezin izan da enkriptatu: kodetzeak huts egin du."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr "Huts egin du desenkriptatzean: Ezezaguna"
-
-#: 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 ""
 "Ezin izan da %s kargatu: Moduluak kargatzea ez da onartzen sistema honetan."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Ezin izan da %s kargatu: %s"
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 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:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s zerbitzaria %s"
 
-#: camel/camel-remote-store.c:207
+#: 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:264
+#: 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:267
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(ostalari ezezaguna)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7615,7 +7822,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
 
@@ -7632,9 +7839,22 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Autentifikazio-egoera ezezaguna."
 
+#: 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 ""
+"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:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:61
+#: 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"
 
@@ -7678,26 +7898,41 @@ msgstr "'%s' URLak ostalari-osagaia behar du"
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLak bide-izenaren osagaia behar du"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ebazten: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Huts egin du izen-bilaketan: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, 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:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Ebazten: %s"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Ostalari-bilaketak huts egin du: %s: ez da ostalaria aurkitu"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Karpeta birtualen posta-hornitzailea"
@@ -7706,12 +7941,12 @@ msgstr "Karpeta birtualen posta-hornitzailea"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Mezuak beste karpeta-multzo bateko kontsulta gisa irakurtzeko"
 
-#: 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 "Ez dago hornitzailerik `%s' protokolorako"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7720,6 +7955,11 @@ msgstr ""
 "Ezin izan da %s direktorioa sortu:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Idatzi %s(e)rako pasahitza"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Idatzi ziurtagiri baten goitizena, sinatzeko erabiltzeko."
@@ -7752,15 +7992,15 @@ msgstr "Huts egin du mezua deskodetzean."
 msgid "Failed to verify certificates."
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ezin da karpeta hartu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ezin da karpeta sortu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -7769,7 +8009,7 @@ msgstr ""
 "Jaulkitzailea: %s\n"
 "Gaia: %s"
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7786,7 +8026,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:438
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7799,16 +8039,16 @@ msgstr ""
 "Hatz-marka:        %s\n"
 "Sinadura:          %s"
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr "ONA"
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr "TXARRA"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:500
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7833,27 +8073,27 @@ msgstr "Ezin izan da `%s' URLa analizatu"
 msgid "No such message %s in %s"
 msgstr "%s mezurik ez dago %s(e)n"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Halako mezurik ez dago: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ezin da karpeta ezabatu: %s: eragiketa baliogabea"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ezin da karpeta ezabatu: %s: ez dago horrelako karpetarik"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ezin da karpetaren izena aldatu: %s: eragiketa baliogabea"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -7887,52 +8127,52 @@ msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ustekabeko baiezko erantzuna IMAP zerbitzaritik: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, 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:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Aldatutako mezuen bila eskaneatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Mezu hau orain ez dago erabilgarri "
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "Mezu berrien laburpen-informazioa bilatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Mezu berrien bila eskaneatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:2145
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "Ezin izan da mezuaren gorputza aurkitu FETCH erantzunean."
 
-#: 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 "Ezin izan da cache-direktorioa ireki: %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 "Huts egin du %s mezua cache-an gordetzean: %s"
@@ -7945,7 +8185,7 @@ msgstr "Mezu berririk dagoen begiratzen"
 msgid "Check for new messages in all folders"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:925
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
 msgid "Folders"
 msgstr "Karpetak"
 
@@ -7979,29 +8219,29 @@ msgstr ""
 "Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
 "pasahitzaren bidez."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:393
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s motako autentifikazioa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:434
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Ez duzu idatzi pasahitza."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8012,57 +8252,58 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 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:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "MH formatuko posta-direktorioak"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 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:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Banaketa lokala"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 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:63
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Maildir formatuko posta-direktorioak"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr "Posta lokala gordetzeko maildir direktorioetan."
 
-#: camel/providers/local/camel-local-provider.c:80
+#: 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:81
+#: camel/providers/local/camel-local-provider.c:101
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 "Posta lokala irakurri eta gordetzeko mbox spool fitxategi estandarretan."
 
-#: camel/providers/local/camel-local-provider.c:91
+#: 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:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8074,56 +8315,62 @@ msgstr ""
 "OHARRA: Hornitzaile hau esperimentala da oraindik, beraz, egin babeskopia "
 "postako karpetei lehenik."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s gordetze-erroa ez da bide-izen absolutua"
 
-#: 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 gordetze-erroa ez da direktorio erregularra"
 
-#: 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 "Ezin da karpeta hartu: %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 "Biltegi lokalek ez dute sarrerako ontzirik"
 
-#: 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 posta-fitxategi lokala"
 
-#: 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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ezin izan zaio karpeta-izena aldatu %s --> %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 "Ezin izan da karpetaren izena aldatu: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Ezin izan da karpetaren `%s'laburpen-fitxategia ezabatu: %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 "Ezin izan da karpetaren `%s'indize-fitxategia ezabatu: %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Ezin izan da laburpena gorde: %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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ezin zaio mezua gehitu laburpenari: arrazoi ezezaguna"
 
@@ -8164,7 +8411,7 @@ msgstr "Ez dago horrelako mezurik"
 msgid "Invalid message contents"
 msgstr "Mezu-eduki baliogabea"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8174,14 +8421,14 @@ msgstr ""
 "Ezin izan da `%s' karpeta ireki:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "`%s' karpeta ez dago."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8191,33 +8438,56 @@ msgstr ""
 "Ezin izan da `%s' karpeta sortu:\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' ez da maildir direktorioa."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "ez da maildir direktorioa"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ezin izan da `%s' karpeta eskaneatu: %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 "Ezin da maildir direktorioaren bide-izena ireki: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Mezu berririk dagoen begiratzen"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "Karpeta biltegiratzen"
+
 #: camel/providers/local/camel-mbox-folder.c:151
 #: camel/providers/local/camel-spool-folder.c:277
 #, c-format
@@ -8263,7 +8533,7 @@ msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Mezu-eraikuntzak huts egin du: Postontzia hondatuta?"
 
-#: 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"
@@ -8272,7 +8542,7 @@ msgstr ""
 "Ezin izan da `%s' fitxategia ireki:\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"
@@ -8281,14 +8551,14 @@ msgstr ""
 "Ezin izan da `%s' fitxategia sortu:\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' ez da fitxategi erregularra."
 
-#: 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"
@@ -8297,98 +8567,87 @@ msgstr ""
 "Ezin izan da `%s' karpeta ezabatu:\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 "`%s' karpeta ez dago hutsik. Ez da ezabatu."
 
-#. 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 "Karpeta biltegiratzen"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ezin izan da karpeta ireki: %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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ezin da karpeta egiaztatu: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ezin izan da fitxategia ireki: %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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ezin da aldi baterako postontzia ireki: %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
+#: 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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "Ezin izan da itxi %s iturburu-karpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, 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:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore ezezaguna: %s"
@@ -8407,7 +8666,7 @@ msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' ez da direktorioa."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ezin da MH direktorioaren bide-izena ireki: %s: %s"
@@ -8423,6 +8682,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "`%s/%s' karpetarik ez dago."
@@ -8432,29 +8692,31 @@ msgstr "`%s/%s' karpetarik ez dago."
 msgid "Spool mail file %s"
 msgstr "%s spool-eko posta fitxategia"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-karpetei ezin zaie izena aldatu"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-karpetak ezin dira ezabatu"
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8463,65 +8725,24 @@ 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:940
+#: 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/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Idatzi %s@%s(r)en NNTP pasahitza"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Zerbitzariak erabiltzaile-izena ezetsi du"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Huts egin du erabiltzaile-izena zerbitzarira bidaltzean"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Zerbitzariak erabiltzaile-izena/pasahitza ezetsi du"
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Barne-errorea: uid formatu baliogabean: %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 "Ezin da %s mezua hartu: %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 "Erabiltzaileak bertan behera utzi du"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Ezin izan da talde-zerrenda hartu zerbitzaritik."
+#: 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/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 "Ezin da %s(r)en talde-zerrendaren fitxategia kargatu: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Ezin da %s(r)en talde-zerrendaren fitxategia gorde: %s"
+#: 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"
@@ -8532,12 +8753,12 @@ 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:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET berriak %s bidez"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8580,32 +8801,47 @@ msgstr "Utzi bertan behera"
 msgid "Operation failed: %s"
 msgstr "Eragiketak huts egin du: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "POP laburpena berreskuratzen"
 
-#: 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 "Erabiltzaileak bertan behera utzi du"
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ezin da POP laburpena hartu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:316
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Ezabatutako mezuak betiko borratzen"
 
-#: 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 "Ez dago %s uid-a duen mezurik"
 
 #. 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 "%d POP mezua berreskuratzen"
 
-#: 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 "Ezin da %s mezua hartu: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
 msgid "Unknown reason"
 msgstr "Arrazoi ezezaguna"
 
@@ -8622,7 +8858,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:60
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -8649,13 +8885,32 @@ 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:172
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, 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
+#, 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:213
-#: camel/providers/pop3/camel-pop3-store.c:316
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8663,26 +8918,27 @@ msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Ez du eskatutako autentifikazio-mekanismoa onartzen."
 
-#: camel/providers/pop3/camel-pop3-store.c:229
+#: camel/providers/pop3/camel-pop3-store.c:405
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "SASL `%s' saio-hasierak huts egin du: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:240
+#: camel/providers/pop3/camel-pop3-store.c:416
 msgid "SASL Protocol error"
 msgstr "SASL protokolo-errorea"
 
-#: camel/providers/pop3/camel-pop3-store.c:255
+#: camel/providers/pop3/camel-pop3-store.c:431
 #, c-format
 msgid "I/O Error: %s"
 msgstr "S/Iko errorea: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:276
+#: camel/providers/pop3/camel-pop3-store.c:452
 #, 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:327
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8691,13 +8947,13 @@ msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea pasahitza bidaltzean: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, 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:82
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8707,54 +8963,50 @@ msgid ""
 "system."
 msgstr "Sistema lokalean \"sendmail\" programara pasatuz posta banatzeko."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+msgid "Could not parse recipient list"
+msgstr "Ezin izan da hartzaileen zerrenda analizatu"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Ezin izan da sendmail-erako kanalizaziorik sortu: %s: posta ez da bidali"
 
-#: 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 "Ezin izan da sendmail-en fork-a egin: %s: posta ez da bidali"
 
-#: 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 "Ezin izan da mezua bidali: %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 "sendmail %s seinalearekin irten da: posta ez da bidali."
 
-#: 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 "Ezin izan da %s exekutatu: posta ez da bidali."
 
-#: 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 egoerarekin irten da: posta ez da bidali."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-msgid "Could not find 'From' address in message"
-msgstr "Ezin izan da 'Nork' helbidea aurkitu mezuan"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-msgid "Could not parse recipient list"
-msgstr "Ezin izan da hartzaileen zerrenda analizatu"
-
-#: 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:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta-banaketa sendmail programaren bidez"
 
-#: 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"
 
@@ -8762,124 +9014,147 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTP erabiliz urruneko mailhub batekin konektatuta posta banatzeko.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaxi-errorea; komandoa ezezaguna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintaxi-errorea parametroetan edo argumentuetan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Komandoa inplementatu gabe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Komando-parametroa inplementatu gabe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Sistema-egoera, edo sistema-laguntzaren erantzuna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Laguntza-mezua"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Zerbitzua prest"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Zerbitzua transmisio-kanala ixten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Zerbitzua ez dago erabilgarri; transmisio kanala ixten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Eskatutako posta-ekintza ondo; eginda"
 
-#: 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 "Erabiltzailea ez da lokala;<forward-path>-era birbidaliko da"
 
-#: 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 "Ez da egin eskatutako posta-ekintza: postontzia ez dago erabilgarri"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Ez da egin eskatutako ekintza: postontzia ez dago erabilgarri"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Eskatutako ekintza abortatu egin da: errorea prozesatzean"
 
-#: 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 "Erabiltzailea ez da lokala; proba egin <forward-path>-ekin"
 
-#: 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 "Ez da egin eskatutako ekintza: sistema-biltegia ez da nahikoa"
 
-#: 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 ""
 "Eskatutako posta-ekintza abortatu egin da: biltegi-esleipena gaindituta"
 
-#: 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 "Ez da egin eskatutako ekintza: postontzi-izena ez da onartu"
 
-#: 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 "Hasi posta-sarrera; bukatu <CRLF>.<CRLF>-rekin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Transakzioak huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Pasahitz-trantsizioa behar da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Autentifikazio-mekanismoa ahulegia da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Eskatutako autentifikazio-mekanismoak beharrezkoa du enkriptatzea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Aldi baterako autentifikazioak huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Autentifikazioa behar da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, 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:383
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "AUTH eskaera denboraz kanpo: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, 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"
 msgstr ""
 "%s SMTP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:421
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:442
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8890,92 +9165,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP zerbitzaria"
 
-#: camel/providers/smtp/camel-smtp-transport.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posta-banaketa %s bidez"
 
-#: camel/providers/smtp/camel-smtp-transport.c:591
-msgid "Cannot send message: sender address not defined."
-msgstr "Ezin da mezua bidali: bidaltzailearen helbidea ez da zehaztu."
-
-#: camel/providers/smtp/camel-smtp-transport.c:598
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:603 mail/mail-ops.c:603
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Mezua bidaltzen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:624
+#: camel/providers/smtp/camel-smtp-transport.c:688
 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:798
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "SMTP Agurra"
 
-#: camel/providers/smtp/camel-smtp-transport.c:820
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:840
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO erantzunaren errorea: %s: ez da ezinbestekoa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:884
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:890
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Errorea SASL autentifikazio-objektua sortzean."
 
-#: camel/providers/smtp/camel-smtp-transport.c:905
-#: camel/providers/smtp/camel-smtp-transport.c:917
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:926
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "AUTH eskaerak huts egin du."
 
-#: camel/providers/smtp/camel-smtp-transport.c:974
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1014
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
@@ -8983,36 +9254,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:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 msgid "DATA response error"
 msgstr "DATA erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
-#: camel/providers/smtp/camel-smtp-transport.c:1163
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1177
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 msgid "DATA termination response error"
 msgstr "DATA amaitze-erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1200
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 msgid "RSET response error"
 msgstr "RSET erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1237
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 msgid "QUIT response error"
 msgstr "QUIT erantzunaren errorea"
 
@@ -9041,7 +9312,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 "eranskina"
 
@@ -9081,56 +9352,56 @@ msgid "MIME type:"
 msgstr "MIME mota:"
 
 #: 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 "Proposatu eranskina automatikoki bistaratzea"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Egin klik hemen helbide-liburura joateko"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Nork:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Erantzun honi:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Gaia:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Nori: "
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Idatzi mezuaren hartzaileak"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 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:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9138,12 +9409,12 @@ msgstr ""
 "Idatzi hartzaileen zerrendan agertu gabe mezuaren kopia jasoko dutenen "
 "helbideak."
 
-#: 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 "Erantsi fitxategi bat"
 
-#: composer/e-msg-composer.c:710
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9152,38 +9423,34 @@ msgstr ""
 "Errorea %s fitxategia irakurtzean:\n"
 "%s"
 
-#: composer/e-msg-composer.c:927
-msgid "Save as..."
-msgstr "Gorde honela..."
-
-#: composer/e-msg-composer.c:936
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Kontuz!"
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Fitxategia badago; gainidatzi?"
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errorea fitxategia gordetzean: %s"
 
-#: composer/e-msg-composer.c:981
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errorea fitxategia kargatzean: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errorea fitxategia atzitzean: %s"
 
-#: composer/e-msg-composer.c:1020
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Ezin da mezua editoretik berreskuratu"
 
-#: composer/e-msg-composer.c:1027
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9192,7 +9459,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1034
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9201,7 +9468,7 @@ msgstr ""
 "Ezin da fitxategia trunkatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9210,7 +9477,7 @@ msgstr ""
 "Errorea mezua automatikoki gordetzean: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1145
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9218,7 +9485,7 @@ msgstr ""
 "Aurreko saioko fitxategi gorde gabeak aurkitu ditu Ximian Evolution-ek.\n"
 "Berreskuratzen saiatu nahi duzu?"
 
-#: composer/e-msg-composer.c:1303
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9228,23 +9495,23 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: composer/e-msg-composer.c:1310
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Kontuz: mezua aldatu egin da"
 
-#: composer/e-msg-composer.c:1333
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Ireki fitxategia"
 
-#: composer/e-msg-composer.c:1482
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Txertatu fitxategia"
 
-#: composer/e-msg-composer.c:1868 composer/e-msg-composer.c:2462
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Prestatu mezua"
 
-#: composer/e-msg-composer.c:2479
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9252,7 +9519,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da helbidea hautatzeko kontrola aktibatu."
 
-#: composer/e-msg-composer.c:2502 composer/e-msg-composer.c:2557
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9260,7 +9527,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/evolution-composer.c:383
+#: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -9268,7 +9535,7 @@ msgstr ""
 "Ezin izan da mezuak prestatzeko leihoa sortu, oraindik ez \n"
 "duzulako identitaterik konfiguratu posta-osagaian."
 
-#: composer/evolution-composer.c:398
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ezin da Evolution-en mezu-prestatzailea hasieratu."
 
@@ -9320,12 +9587,21 @@ 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
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Izen hori duen fitxategia badago lehendik.\n"
+"Gainidatzi?"
+
 #. 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 "Gogoratu pasahitz hau"
 
-#: 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 "Gogoratu pasahitz hau saio hau amaitu arte"
 
@@ -9423,171 +9699,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 "Evolution-en laneko laburpena egiteko osagaia."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Evolution-en laneko laburpena egiteko osagaiaren fabrika."
-
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Ezin da hasieratu Evolution-en laneko laburpena egiteko osagaia."
-
-#: executive-summary/component/e-summary-callbacks.c:125
-msgid "Select a service"
-msgstr "Hautatu zerbitzua"
-
-#: 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 ""
-"Beste HTML orri bat hauta dezakezu Laneko Laburpenaren atzeko planorako.\n"
-"\n"
-"Utzi hutsik lehenetsirako"
-
-#: 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 "Ireki %s GNOME aplikazio lehenetsiarekin"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Ireki %s GNOME web arakatzaile lehenetsiarekin"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Bidali mezua -> %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Aldatu ikuspegia -> %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Exekutatu %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Itxi %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Eraman %s ezkerrera"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Eraman %s eskuinera"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Eraman %s aurreko errenkadara"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Eraman %s hurrengo errenkadara"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Konfiguratu %s"
-
-#
-#: executive-summary/component/e-summary-url.c:553
-msgid "page"
-msgstr "orrialdea"
-
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Ezin da HTML fitxategia ireki:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Errorea datuak irakurtzean:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr "Fitxategiak ez du lekurik zerbitzuentzat.\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 ""
-"Laneko laburpeneko osagaiak ezin izan du Bonobo hasieratu.\n"
-"RootPOA-ri buruzko abisu bat agertu bada, seguru asko esan nahi du\n"
-"GOADen kontra konpilatu duzula Bonobo eta ez OAFen kontra."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "RDF laburpenerako fabrika."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF Laburpena"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Probako bonobo-ren osagairako fabrika."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Probako osagairako fabrika."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Probako bonobo-ren zerbitzua"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Proba-zerbitzua"
-
-#: 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 "Errorea"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "Eguneratu automatikoki"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "Eguneratu orain"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "Eguneratze-maiztasuna"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "urte "
@@ -9620,11 +9731,7 @@ msgstr "ordu "
 msgid "minute"
 msgstr "minutu "
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "segundo "
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "segundo "
 
@@ -9699,7 +9806,7 @@ msgstr "lehenago"
 msgid "ago"
 msgstr "lehenago"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:996
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9720,7 +9827,7 @@ msgstr "Orduan"
 msgid "Add action"
 msgstr "Gehitu ekintza"
 
-#: 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."
@@ -9728,19 +9835,11 @@ msgstr ""
 "Karpeta aukeratzea ahaztu zaizu.\n"
 "Zoaz atzera eta zehaztu posta banatzeko baliozko karpeta bat."
 
-#: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:849
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Idatzi karpetaren URIa"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<egin klik hemen karpeta hautatzeko>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9750,7 +9849,7 @@ msgstr ""
 "Errorea '%s' adierazpen erregularrean:\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Proba"
 
@@ -9779,7 +9878,8 @@ msgid "if all criteria are met"
 msgstr "irizpide guztiak betetzen badira"
 
 #: filter/filter-rule.c:769
-msgid "if any criteria are met"
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "irizpideren bat betetzen bada"
 
 #: filter/filter-rule.c:780
@@ -9836,208 +9936,224 @@ msgstr "karpeta lokal guztiekin"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Esleitu puntuazioa"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Esleitu kolorea"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Esleitu puntuazioa"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Eranskinak"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belem"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "hau dauka"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiatu karpeta honetan"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Jasotze-data"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Bidaltze-data"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr "Ez"
-
-#: filter/libfilter-i18n.h:11
-msgid "Draft"
-msgstr "Zirriborroa"
-
-#: filter/libfilter-i18n.h:12
-msgid "Execute Shell Command"
-msgstr "Exekutatu shell komandoa"
-
 #: filter/libfilter-i18n.h:13
-msgid "Exist"
-msgstr "Bai"
+msgid "does not contain"
+msgstr "ez dauka hau"
 
 #: filter/libfilter-i18n.h:14
-msgid "Expression"
-msgstr "Adierazpena"
+msgid "does not end with"
+msgstr "ez da honela amaitzen"
 
 #: filter/libfilter-i18n.h:15
-msgid "Follow Up"
-msgstr "Jarraitu"
+msgid "does not exist"
+msgstr "ez dago"
 
 #: filter/libfilter-i18n.h:16
-msgid "Important"
-msgstr "Garrantzitsua"
+msgid "does not sound like"
+msgstr "ez da honen antzekoa"
 
 #: filter/libfilter-i18n.h:17
-msgid "Mailing list"
-msgstr "Posta-zerrenda"
+msgid "does not start with"
+msgstr "ez da honela hasten"
 
 #: filter/libfilter-i18n.h:18
-msgid "Message Body"
-msgstr "Mezuaren gorputza"
+msgid "Do Not Exist"
+msgstr "Ez"
 
 #: filter/libfilter-i18n.h:19
-msgid "Message Header"
-msgstr "Mezuaren goiburukoa"
+msgid "Draft"
+msgstr "Zirriborroa"
 
 #: filter/libfilter-i18n.h:20
-msgid "Move to Folder"
-msgstr "Eraman karpeta honetara"
+msgid "ends with"
+msgstr "honela amaitzen da"
 
 #: filter/libfilter-i18n.h:21
-msgid "Read"
-msgstr "Irakurrita"
+msgid "Execute Shell Command"
+msgstr "Exekutatu shell komandoa"
 
 #: filter/libfilter-i18n.h:22
-msgid "Recipients"
-msgstr "Hartzailea"
+msgid "Exist"
+msgstr "Bai"
 
 #: filter/libfilter-i18n.h:23
-msgid "Regex Match"
-msgstr "Adierazpen erregularra"
+msgid "exists"
+msgstr "badago"
 
 #: filter/libfilter-i18n.h:24
-msgid "Replied to"
-msgstr "Erantzunda"
+msgid "Expression"
+msgstr "Adierazpena"
 
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:8
-msgid "Score"
-msgstr "Puntuazioa"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr "Jarraitu"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1552
-msgid "Sender"
-msgstr "Bidaltzailea"
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Garrantzitsua"
 
 #: filter/libfilter-i18n.h:27
-msgid "Set Status"
-msgstr "Ezarri egoera"
+msgid "is"
+msgstr "da"
 
 #: filter/libfilter-i18n.h:28
-msgid "Size (kB)"
-msgstr "Tamaina (kB)"
+msgid "is after"
+msgstr "honen ondorengoa da"
 
 #: filter/libfilter-i18n.h:29
-msgid "Source Account"
-msgstr "Iturburu-kontua"
+msgid "is before"
+msgstr "honen aurrekoa da"
 
 #: filter/libfilter-i18n.h:30
-msgid "Specific header"
-msgstr "Goiburuko espezifikoa"
+msgid "is Flagged"
+msgstr "Banderaduna da"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "hau baino handiagoa da"
 
 #: filter/libfilter-i18n.h:32
-msgid "Stop Processing"
-msgstr "Gelditu prozesatzea"
+msgid "is less than"
+msgstr "hau baino txikiagoa da"
 
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:932
-#: mail/message-list.etspec.h:12
-msgid "Subject"
-msgstr "Gaia"
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "ez da"
 
 #: filter/libfilter-i18n.h:34
-msgid "contains"
-msgstr "hau dauka"
+msgid "is not Flagged"
+msgstr "ez da Banderaduna"
 
 #: filter/libfilter-i18n.h:35
-msgid "does not contain"
-msgstr "ez dauka hau"
+msgid "Mailing list"
+msgstr "Posta-zerrenda"
 
 #: filter/libfilter-i18n.h:36
-msgid "does not end with"
-msgstr "ez da honela amaitzen"
+msgid "Message Body"
+msgstr "Mezuaren gorputza"
 
 #: filter/libfilter-i18n.h:37
-msgid "does not exist"
-msgstr "ez dago"
+msgid "Message Header"
+msgstr "Mezuaren goiburukoa"
 
 #: filter/libfilter-i18n.h:38
-msgid "does not sound like"
-msgstr "ez da honen antzekoa"
+msgid "Move to Folder"
+msgstr "Eraman karpeta honetara"
 
 #: filter/libfilter-i18n.h:39
-msgid "does not start with"
-msgstr "ez da honela hasten"
+#, fuzzy
+msgid "Play Sound"
+msgstr "Jo soinua:"
 
-#: filter/libfilter-i18n.h:40
-msgid "ends with"
-msgstr "honela amaitzen da"
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+msgid "Read"
+msgstr "Irakurrita"
 
 #: filter/libfilter-i18n.h:41
-msgid "exists"
-msgstr "badago"
+msgid "Recipients"
+msgstr "Hartzailea"
 
 #: filter/libfilter-i18n.h:42
-msgid "is Flagged"
-msgstr "Banderaduna da"
+msgid "Regex Match"
+msgstr "Adierazpen erregularra"
 
 #: filter/libfilter-i18n.h:43
-msgid "is after"
-msgstr "honen ondorengoa da"
+msgid "Replied to"
+msgstr "Erantzunda"
 
-#: filter/libfilter-i18n.h:44
-msgid "is before"
-msgstr "honen aurrekoa da"
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
+msgid "Score"
+msgstr "Puntuazioa"
 
-#: filter/libfilter-i18n.h:45
-msgid "is greater than"
-msgstr "hau baino handiagoa da"
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+msgid "Sender"
+msgstr "Bidaltzailea"
 
 #: filter/libfilter-i18n.h:46
-msgid "is less than"
-msgstr "hau baino txikiagoa da"
+msgid "Set Status"
+msgstr "Ezarri egoera"
 
 #: filter/libfilter-i18n.h:47
-msgid "is not Flagged"
-msgstr "ez da Banderaduna"
+msgid "Size (kB)"
+msgstr "Tamaina (kB)"
 
 #: filter/libfilter-i18n.h:48
-msgid "is not"
-msgstr "ez da"
+msgid "sounds like"
+msgstr "honen antzekoa da"
 
 #: filter/libfilter-i18n.h:49
-msgid "is"
-msgstr "da"
+msgid "Source Account"
+msgstr "Iturburu-kontua"
 
 #: filter/libfilter-i18n.h:50
-msgid "sounds like"
-msgstr "honen antzekoa da"
+msgid "Specific header"
+msgstr "Goiburuko espezifikoa"
 
 #: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "honela hasten da"
 
+#: filter/libfilter-i18n.h:53
+msgid "Stop Processing"
+msgstr "Gelditu prozesatzea"
+
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
+msgid "Subject"
+msgstr "Gaia"
+
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Arauak"
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Gehitu araua"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Editatu araua"
 
@@ -10057,30 +10173,30 @@ msgstr "Gutxienez karpeta bat zehaztu behar duzu iturburu gisa."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Elm posta zaharra inportatzen ari da Evolution"
 
-#: 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 "Inportatzen..."
 
-#: 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 "Itxaron"
 
-#: 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 "%s inportatzen %s gisa."
 
-#: 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 "%s eskaneatzen"
 
-#: 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:101
 msgid "Mail"
 msgstr "Posta"
 
@@ -10108,23 +10224,74 @@ msgstr ""
 "Evolution-ek GnomeCard fitxategiak aurkitu ditu.\n"
 "Evolution-era inportatu nahi dituzu?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Lehentasuna: %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 "Netscape-ko datu zaharrak inportatzen ari da Evolution"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Zakarrontzia"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "%s posta-fitxategi lokala"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Direktorioa eskaneatzen"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Inportatzen hasten"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Editatu iragazkiak"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10148,45 +10315,97 @@ msgstr ""
 msgid "Pine"
 msgstr "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 "Egutegi-hobespenak"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Evolution-en mezu-prestatzailerako fabrika."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Evolution-en mezu-prestatzailerako fabrika."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Evolution-en mezu-prestatzailerako fabrika."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Posta maneiatzeko Evolution-en osagaia."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolution-en mezu-prestatzailea."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Evolution-en postaren laneko laburpenaren osagaia."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Posta-karpetak bistaratzeko Evolution-en osagaia."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Posta-karpeten fabrikarako Evolution-en osagaia."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Evolution-en mezu-prestatzailerako fabrika."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Posta-laburpenaren osagairako fabrika."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Egutegi-hobespenak"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Kontuak"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Egutegi-hobespenak"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "Posta konfiguratzeko interfazea"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Posta duen karpeta"
+#: 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:101
-msgid "Mail storage folder (internal)"
-msgstr "Posta biltegiratzeko karpeta (barnekoa)"
+msgid "Folder containing mail"
+msgstr "Posta duen karpeta"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -10196,24 +10415,19 @@ msgstr "Zakarrontzi birtualak"
 msgid "Virtual Trash folder"
 msgstr "Zakarrontzi birtualaren karpeta"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Ezin izan da biltegiarekin konektatu: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Karpeta honek ezin du mezurik eduki."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Propietateak..."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Aldatu karpeta honen propietateak"
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10221,223 +10435,237 @@ msgstr ""
 "Posta-ezarpen batzuk hondatuta daudela ematen du, begira ezazu dena ondo "
 "dagoen."
 
-#: mail/component-factory.c:971
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr "Ez duzu ezarri posta garraiatzeko metodorik"
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: mail/component-factory.c:971 ui/evolution-mail-global.xml.h:19
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Posta-mezua"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ezin da Evolution-en posta-osagaia hasieratu."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1003
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Ezin da Evolution-en posta konfiguratzeko osagaia hasieratu."
 
-#: mail/component-factory.c:1013
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Ezin da Evolution-en karpeta-informazioaren osagaia hasieratu."
 
-#: mail/component-factory.c:1229
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Zerbitzariarekin konektatzen..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Ezin da biltegia shell-arekin erregistratu"
 
-#: mail/folder-browser-ui.c:327
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" - propietateak"
 
-#: mail/folder-browser-ui.c:329
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Propietateak"
 
-#: mail/folder-browser.c:299 mail/mail-display.c:310 mail/mail-display.c:819
+#: mail/folder-browser.c:305 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:754
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d berri"
 
-#: mail/folder-browser.c:757 mail/folder-browser.c:765
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d ezkutu"
 
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr "%d ikusgarri"
 
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d hautatuta"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d bidali gabe"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d bidali"
 
-#: mail/folder-browser.c:775
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d guztira"
 
-#: mail/folder-browser.c:1062
-msgid "Create vFolder from Search"
-msgstr "Sortu karpeta birtuala bilaketatik"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Sortu _karpeta birtuala mezutik"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "_Gaiaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "_Hartzailearen araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1453
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "G_aiaren araberako iragazkia"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: mail/folder-browser.c:1455
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: mail/folder-browser.c:1456
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: mail/folder-browser.c:1465 ui/evolution-mail-message.xml.h:109
-msgid "_Save As..."
-msgstr "_Gorde honela..."
-
-#: mail/folder-browser.c:1466
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: mail/folder-browser.c:1470 ui/evolution-mail-message.xml.h:108
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/folder-browser.c:1471 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: mail/folder-browser.c:1472 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:32
-msgid "Follow _Up..."
+#: mail/folder-browser.c:1622
+#, fuzzy
+msgid "Follo_w Up..."
 msgstr "Jarrait_u..."
 
-#: mail/folder-browser.c:1478
-msgid "Flag Com_pleted"
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
 msgstr "Bandera o_satuta"
 
-#: mail/folder-browser.c:1479
-msgid "Clear Fla_g"
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
 msgstr "Garbitu ban_dera"
 
 #. separator here?
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/folder-browser.c:1485
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/folder-browser.c:1486
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Markatu ez-garra_ntzitsu gisa"
 
-#: mail/folder-browser.c:1490 ui/evolution-addressbook.xml.h:40
-msgid "_Move to Folder..."
-msgstr "_Eraman karpeta honetara..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Desezabatu"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
+msgstr "Eraman karpeta honetara..."
 
-#: mail/folder-browser.c:1491 ui/evolution-addressbook.xml.h:37
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: mail/folder-browser.c:1493 ui/evolution-mail-message.xml.h:111
-msgid "_Undelete"
-msgstr "_Desezabatu"
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
 
-#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
-msgstr "Gehitu bidaltzailea helbide-liburuan"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
+msgstr "Gehitu bidaltzailea _helbide-liburuan"
 
-#: mail/folder-browser.c:1500
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Aplikatu iragazkiak"
 
-#: mail/folder-browser.c:1502
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
-#: mail/folder-browser.c:1693
-msgid "Filter on Mailing List"
-msgstr "Posta-zerrendaren araberako iragazkia"
-
-#: mail/folder-browser.c:1694
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "Posta-zerrendaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1696
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Posta-zerrendaren araberako iragazkia (%s)"
 
-#: mail/folder-browser.c:1697
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "Posta-zerrendaren araberako karpeta birtuala (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Lehenetsi"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Karpeta-informazioa hartzen"
@@ -10459,26 +10687,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Outlook Express 4ko fitxategiak inportatzen ditu Evolution-era"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Gorputzaren edukia"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Biltegiaren uneko formatua:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Indexatzea:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Postontziaren formatua"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Gorputzaren edukia"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Biltegiaren formatu berria:"
 
-#: 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"
@@ -10488,15 +10709,15 @@ msgstr ""
 "daitezkeen hutsegiteak (adibidez, diskoa betetzea) beharbada\n"
 "ezingo dira automatikoki berreskuratu.  Kontuz ibili, beraz."
 
-#: 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"
 
@@ -10514,86 +10735,79 @@ msgstr "Evolution-en berri-editorea"
 msgid "Evolution Account Editor"
 msgstr "Evolution-en kontu-editorea"
 
-#: mail/mail-account-gui.c:974
-msgid "Could not save signature file."
-msgstr "Ezin izan da sinadura-fitxategia gorde."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Ostalaria:"
 
-#: mail/mail-account-gui.c:1051
-msgid "Save signature"
-msgstr "Gorde sinadura"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "_Erabiltzaile-izena:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+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:1057
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Sinadura hau aldatu egin duzu, baina ez duzu gorde.\n"
-"\n"
-"Aldaketak gorde nahi dituzu?"
 
-#: mail/mail-account-gui.c:1681
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr "Ezin dituzu izen bereko bi kontu izan."
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr "(lehenetsia)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Desgaitu"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Gaitu"
-
-#: mail/mail-accounts.c:292
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
 
-#: mail/mail-accounts.c:296
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Ez ezabatu"
 
-#: mail/mail-accounts.c:299
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Ziur zaude kontua ezabatu nahi duzula?"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.c:535
-msgid "Are you sure you want to delete this news account?"
-msgstr "Ziur zaude kontu berri hau ezabatu nahi duzula?"
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Desgaitu"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:50
-msgid "Mail Settings"
-msgstr "Postaren ezarpenak"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Gaitu"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Mezu-hartzailea: %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "Ziur zaude kontu berri hau ezabatu nahi duzula?"
 
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Gaia: %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Gaituta"
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Mezu-bidaltzailea: %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "_Kontu-izena:"
 
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "%s posta-zerrenda"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Puerto Rico"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Gehitu iragazkiaren araua"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10605,7 +10819,7 @@ msgstr ""
 "jaso edo prestatu ahal izateko.\n"
 "Orain konfiguratu nahi duzu?"
 
-#: mail/mail-callbacks.c:145
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10613,7 +10827,7 @@ msgstr ""
 "Identitatea konfiguratu behar duzu\n"
 "mezua idatzi ahal izateko."
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10621,12 +10835,8 @@ msgstr ""
 "Posta-garraioa konfiguratu behar duzu\n"
 "mezua idatzi ahal izateko."
 
-#: mail/mail-callbacks.c:189
-msgid "You have not set a mail transport method"
-msgstr "Ez duzu ezarri posta garraiatzeko metodorik"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10634,11 +10844,11 @@ msgstr ""
 "HTML formatuko mezua bidaltzera zoaz, baina hartzaile hauek ez dute HTML "
 "formatuko mezurik jaso nahi:\n"
 
-#: mail/mail-callbacks.c:239
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Hala ere bidali nahi duzu?"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10646,7 +10856,7 @@ msgstr ""
 "Mezu honek ez du gairik.\n"
 "Ziur zaude bidali nahi duzula?"
 
-#: mail/mail-callbacks.c:325
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10654,11 +10864,11 @@ msgstr ""
 "Mezua bidali behar diozun kontaktu-zerrenda helbidea ezkutuan edukitzeko "
 "konfiguratuta dagoenez, Bcc hartzaileak bakarrik izango ditu mezuak."
 
-#: mail/mail-callbacks.c:329
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "Mezu honek Bcc hartzaileak bakarrik ditu."
 
-#: mail/mail-callbacks.c:333
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10668,15 +10878,15 @@ msgstr ""
 "goiburukoa gehituz.\n"
 "Hala ere bidali nahi duzu?"
 
-#: mail/mail-callbacks.c:438
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr "Hartzaileak zehaztu behar dituzu mezua bidaltzeko."
 
-#: mail/mail-callbacks.c:527
+#: mail/mail-callbacks.c:497
 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:646
+#: mail/mail-callbacks.c:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10684,30 +10894,30 @@ msgstr ""
 "Ezin da kontu honetako zirriborroen karpeta ireki.\n"
 "Zirriborroen karpeta lehenetsia erabili nahi duzu?"
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "bidaltzaile ezezaguna"
 
-#: mail/mail-callbacks.c:983
+#: mail/mail-callbacks.c:981
 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:1429 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Eraman mezua(k) hona"
 
-#: mail/mail-callbacks.c:1431 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopiatu mezua(k) hemen"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2091
 #, 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:2102
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10715,7 +10925,7 @@ msgstr ""
 "Zirriborroen karpetan gordetako mezuak bakarrik\n"
 "edita ditzakezu."
 
-#: mail/mail-callbacks.c:2141
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10723,28 +10933,32 @@ msgstr ""
 "Bidalitako mezuen karpetako mezuak bakarrik\n"
 "bidal ditzakezu berriro."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2169
 #, 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:2181
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Ez duzu mezurik hautatu"
 
-#: mail/mail-callbacks.c:2280
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Fitxategia gainidatzi?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Gorde mezua honela..."
 
-#: mail/mail-callbacks.c:2282
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Gorde mezuak honela..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2366
 msgid "Go to next folder with unread messages?"
 msgstr "Irakurri gabeko mezuak dituen hurrengo karpetara joan?"
 
-#: mail/mail-callbacks.c:2351
+#: mail/mail-callbacks.c:2373
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -10752,7 +10966,7 @@ msgstr ""
 "Karpeta honetan ez dago mezu gehiago.\n"
 "Hurrengo karpetara joan nahi duzu?"
 
-#: mail/mail-callbacks.c:2580
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10764,7 +10978,7 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: mail/mail-callbacks.c:2690
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10773,28 +10987,28 @@ msgstr ""
 "Errorea iragazki-informazioa kargatzean:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2702
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Iragazkiak"
 
-#: mail/mail-callbacks.c:2775
+#: mail/mail-callbacks.c:2783
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d orria"
 
-#: mail/mail-callbacks.c:2827
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
-#: mail/mail-callbacks.c:2854
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2889
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Huts egin du mezua inprimatzean"
 
-#: mail/mail-callbacks.c:3055
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, 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?"
@@ -10852,16 +11066,35 @@ msgstr ""
 "bakarrik erabiliko da kontu-izen hori."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution-eko kontuaren morroia"
 
-#: mail/mail-config.c:356
-#, c-format
-msgid "Account %d"
-msgstr "%d kontua"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
 
-#: mail/mail-config.c:2036
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: mail/mail-config.c:78 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"
@@ -10872,107 +11105,154 @@ msgstr ""
 "%s\n"
 "Ez da lasterbiderik sortuko."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2047
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Sarrerako ontzia"
-
-#: mail/mail-config.c:2297
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Zerbitzua egiaztatzen"
 
-#: mail/mail-config.c:2375 mail/mail-config.c:2379
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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
-msgid " _Check for supported types "
-msgstr "_Begiratu zein mota onartzen diren"
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr "kolorea"
+#, 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
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL ez da onartzen evolution-en bertsio honetan)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
-#: mail/mail-config.glade.h:6
-msgid "Account"
-msgstr "Kontua"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "%d kontua"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Kontuaren informazioa"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Kontuaren kudeaketa"
 
-#: mail/mail-config.glade.h:9
-msgid "Accounts"
-msgstr "Kontuak"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Utzi bertan behera eragiketa"
+
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Arkansas"
+
+#: mail/mail-config.glade.h:13
+#, 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:10
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Beti bidali _Bcc kopia honi:"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Beti bidali Cc kopia honi:"
 
-#: mail/mail-config.glade.h:12
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "_Enkriptatu beti neure buruari posta enkriptatua bidaltzean"
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "Arica"
 
-#: mail/mail-config.glade.h:13
-msgid "Always _sign outgoing messages when using this account"
-msgstr "Beti _sinatu kontu honetatik bidalitako mezuak"
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Erantsi fitxategi bat mezuari"
 
-#: mail/mail-config.glade.h:14 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Eranskina"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentifikazioa"
 
-#: mail/mail-config.glade.h:16
-msgid "Beep when new mail arrives"
-msgstr "Egin bip mezu berriak iristen direnean"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Karaktere-joko ezezaguna: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_Itxi"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Mezu berririk dagoen begiratzen"
 
-#: mail/mail-config.glade.h:18
-msgid "Composer"
-msgstr "Mezu-prestatzailea"
-
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Mezuak prestatzen"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
-#: mail/mail-config.glade.h:21
-msgid "Confirm when Expunging a folder"
-msgstr "Berretsi karpeta betiko borratzean"
-
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10988,249 +11268,367 @@ msgstr ""
 "\n"
 "Egin klik \"Amaitu\" botoian, ezarpenak gordetzeko."
 
-#: mail/mail-config.glade.h:28
+#: 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:29
-msgid "Default Forward style is: "
-msgstr "Birbidaltzeko estilo lehenetsia: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Lehentasun lehenetsia:"
 
-#: mail/mail-config.glade.h:30
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Karaktere-kodeketa lehenetsia: "
 
-#: mail/mail-config.glade.h:31
-msgid "Defaults"
-msgstr "Lehenespenak"
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Mezuak bilatzen"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "ID digitalak..."
 
-#: mail/mail-config.glade.h:34
-msgid "Display"
-msgstr "Bistaratzea"
-
-#: mail/mail-config.glade.h:35
-msgid "Do not notify me when new mail arrives"
-msgstr "Ez jakinarazi mezu berriak iristen direnean"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Ezin da mezua ireki"
 
-#: mail/mail-config.glade.h:36 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Eginda"
 
-#: mail/mail-config.glade.h:37 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Zirriborroak"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Z_irriborroen karpeta:"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "_Gaitu"
 
-#: mail/mail-config.glade.h:39 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Editatu..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Enabled"
-msgstr "Gaituta"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Ekialdea"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Helb. el.ak hau dauka"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "_Helbide elektronikoa:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "_Hustu zakarrontziko karpetak irtetean"
+
+#: mail/mail-config.glade.h:53
 msgid "Execute Command..."
 msgstr "Exekutatu komandoa..."
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "honela amaitzen da"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Propietateak"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Birbidalitako mezuak"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Hartu ID digitala..."
 
-#: mail/mail-config.glade.h:43
-msgid "HTML signature file:"
-msgstr "HTML sinaduraren fitxategia:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Aipuak nabarmentzeko erabili "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Honolulu"
+
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: 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 "Identitatea"
 
-#: mail/mail-config.glade.h:46
-msgid "In HTML mail"
-msgstr "HTML postan"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Barnean"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Gorde eta itxi"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Kargatu iru_diak"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Posta-konfigurazioa"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Postontziaren kokalekua"
 
-#: mail/mail-config.glade.h:52
-msgid "Make this my _default account"
-msgstr "Lehenetsi _kontu hau"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Mezuaren goiburukoa"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_Mezu-bistaratzea"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikronesia"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP zerbitzaria:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Mezu berrien jakinarazpena"
 
-#: mail/mail-config.glade.h:55
-msgid "News"
-msgstr "Berriak"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Be_rri-iturriak"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Aukerako informazioa"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "E_rakundea:"
+
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/_GPG gakoaren IDa:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Aukeratu kolorea"
 
-#: mail/mail-config.glade.h:63
-msgid "Play sound file when new mail arrives"
-msgstr "Jo soinua mezu berriak iristean"
+#: mail/mail-config.glade.h:88
+#, 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:64
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:65
-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:66
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Abisatu mezuak gairik _gabe bidali aurretik"
-
-#: mail/mail-config.glade.h:67
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Inprimatu hautatutako kontaktuak"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Ezin da mezua ireki"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Aipamen gisa"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Gogoratu pasahitz hau"
 
-#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:6
-msgid "Receiving Email"
-msgstr "Mezuak jaso"
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Erantzun honi:"
 
-#: mail/mail-config.glade.h:72
-msgid "Receiving Mail"
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+msgid "Receiving Email"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config.glade.h:73
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Jasotzeko aukerak"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Gogoratu pasahitz hau"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Beharrezko informazioa"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:103
+#, fuzzy
+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:77
-msgid "Security"
-msgstr "Segurtasuna"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:78
-msgid "Select Filter Log file..."
-msgstr "Hautatu iragazkiaren egunkari-fitxategia..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "Hautatu PGP bitarra"
 
-#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Mezuak bidali"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Sinadura-fitxategia:"
 
-#: mail/mail-config.glade.h:81
-msgid "Sending Mail"
-msgstr "Mezuak bidali"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Ezabatu dena sinadura izan ezik"
 
-#: mail/mail-config.glade.h:83 mail/message-list.etspec.h:9
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Bidalita"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "Mezuak bidali"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "_Bidalitako mezuen karpeta:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Bidalitako mezuak eta zirriborroak"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Zerbitzariak _autentifikazioa behar du"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Zerbitzariaren konfigurazioa"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "_Zerbitzari-mota: "
 
-#: mail/mail-config.glade.h:89
-msgid "Signature file:"
-msgstr "Sinadura-fitxategia:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Lasterbideak"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Gorde sinadura"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Iturburua"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Iturburu-informazioa"
 
-#: mail/mail-config.glade.h:92
-msgid "Sources"
-msgstr "Iturburuak"
-
-#: mail/mail-config.glade.h:93
-msgid "Specify filename:"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
 msgstr "Zehaztu fitxategi-izena:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Unix mbox estandarra"
 
-#: mail/mail-config.glade.h:96
-msgid "Use s_ecure connection (SSL)"
-msgstr "Erabili konexio segurua (_SSL)"
+#: mail/mail-config.glade.h:128
+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:97
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "_HTML sinadura:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Aldakorra"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11240,126 +11638,217 @@ msgstr ""
 "\n"
 "Hasteko, egin klik \"Hurrengoa\"n."
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Ekialdea"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "_Kargatu beti irudiak saretik kanpo"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Autentifikazio-mota: "
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:143
 msgid "_Authentication type: "
 msgstr "_Autentifikazio-mota: "
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:145
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "Egin bip mezu berriak iristen direnean"
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Ziurtagiri-IDa:"
 
-#: mail/mail-config.glade.h:108
-msgid "_Drafts folder:"
-msgstr "Z_irriborroen karpeta:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:111
-msgid "_Empty trash folders on exit"
-msgstr "_Hustu zakarrontziko karpetak irtetean"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Berretsi karpeta betiko borratzean"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Lehenespenak"
+
+#: mail/mail-config.glade.h:151
+#, 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
+#, fuzzy
+msgid "_Filename:"
+msgstr "Fitxategi-izena:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Birbidali honela"
+
+#: mail/mail-config.glade.h:157
 msgid "_Full name:"
 msgstr "_Izen osoa:"
 
-#: mail/mail-config.glade.h:113
-msgid "_HTML signature:"
+#: mail/mail-config.glade.h:159
+#, 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:114
-msgid "_Highlight citations with"
-msgstr "_Aipuak nabarmentzeko erabili "
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Identitatea"
 
-#: mail/mail-config.glade.h:115
-msgid "_Host:"
-msgstr "_Ostalaria:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Hizkuntza"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr "_Kargatu irudiak bidaltzailea helbide-liburuan badago"
 
-#: mail/mail-config.glade.h:117
-msgid "_Log filter actions to:"
-msgstr "_Iragazki-ekintzen egunkaria:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Lehenetsi _kontu hau"
 
-#: mail/mail-config.glade.h:118
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_Markatu mezuak irakurritako gisa"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_Inoiz ez kargatu irudirik saretik kanpo"
 
-#: mail/mail-config.glade.h:121
-msgid "_Organization:"
-msgstr "E_rakundea:"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "_PGP bide-izen bitarra:"
 
-#: mail/mail-config.glade.h:123
-msgid "_Path:"
-msgstr "_Bide-izena:"
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Play sound file when new mail arrives"
+msgstr "Jo soinua mezu berriak iristean"
 
-#: mail/mail-config.glade.h:124
-msgid "_Remember this password"
-msgstr "Gogora_tu pasahitz hau"
+#: mail/mail-config.glade.h:172
+#, 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:125
-msgid "_Send mail in HTML format by default."
-msgstr "_Bidali mezuak HTML formatuan lehenespen gisa."
+#: mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "Abisatu mezuak gairik _gabe bidali aurretik"
 
-#: mail/mail-config.glade.h:126
-msgid "_Server type: "
-msgstr "_Zerbitzari-mota: "
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Irrati-telefonoa"
+
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Mezuak jaso"
 
-#: mail/mail-config.glade.h:127
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Erantzun denei"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "Se_gurtasuna"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "Se_gurtasuna"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Mezuak bidali"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Erakutsi ordua honela"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
 msgstr "_Sinadura-fitxategia:"
 
-#: mail/mail-config.glade.h:128
-msgid "_Username:"
-msgstr "_Erabiltzaile-izena:"
+#: 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:129
+#: mail/mail-config.glade.h:185
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Aldakorra"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_dagoen, maiztasun honekin"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr "kolorea"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "azalpena"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:133
-msgid "placeholder"
-msgstr "leku-marka"
-
-#: mail/mail-config.glade.h:134
-msgid "seconds."
-msgstr "segundoren ondoren."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Ezin izan da PGP sinadura-testuingurua sortu."
@@ -11396,152 +11885,137 @@ msgstr "Ezin izan da S/MIME gutun-azal testuingurua sortu."
 msgid "Could not create a S/MIME decode context."
 msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
 
-#: mail/mail-display.c:255
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Gorde eranskina"
 
-#: mail/mail-display.c:320
+#: mail/mail-display.c:344
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Ezin izan da aldi baterako `%s' fitxategia sortu: %s"
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Gorde diskoan..."
 
-#: mail/mail-display.c:368
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Ikusi barnean"
 
-#: mail/mail-display.c:370
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Ireki honekin: %s..."
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ikusi barnean (%s bidez)"
 
-#: mail/mail-display.c:435
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Ezkutatu"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Kanpoko ikustailea"
 
-#: mail/mail-display.c:1259
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Mezuaren edukia kargatzen"
 
-#: mail/mail-display.c:1754
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Ireki esteka arakatzailean"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Kopiatu estekaren helbidea"
 
-#: mail/mail-display.c:1759
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Gorde esteka honela (FIXME) "
 
-#: mail/mail-display.c:1762
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Gorde irudia honela..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s eranskina"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Helbide okerra"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:6
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Nork"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Erantzun honi"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:13
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Nori"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1767
-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:1790
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution-ek ez du ezagutzen mota honetako mezu sinaturik."
-
-#: mail/mail-format.c:1798
-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:1806
-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:915
+#, fuzzy
+msgid "Mailer"
+msgstr "Posta"
 
-#: mail/mail-format.c:2049
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP gunerako erakuslea (%s)"
 
-#: mail/mail-format.c:2063
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
 
-#: mail/mail-format.c:2068
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "(%s) fitxategi lokalerako erakuslea"
 
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "(%s)urruneko datuetarako erakuslea"
 
-#: mail/mail-format.c:2105
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 
-#: mail/mail-format.c:2110
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Kanpoko goputz-zatia gaizki osatuta dago."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Karpeta birkonfiguratzen"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11550,27 +12024,27 @@ msgstr ""
 "Ezin da gorde karpetaren metainformazioa; beharbada karpeta\n"
 "hau ezingo duzu gehiago ireki: %s: %s"
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ezin da karpetaren metainformazioa gorde %s(e)n: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ezin dira %s karpetaren metadatuak ezabatu: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" karpeta\"%s\" formatura aldatzen"
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, 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:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11578,11 +12052,11 @@ msgstr ""
 "Aurrerantzean ezin baduzu postontzi hau ireki,\n"
 "eskuz konpondu beharko duzu."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 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:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Birkonfiguratu /%s"
@@ -11609,117 +12083,112 @@ msgstr ""
 msgid "Working"
 msgstr "Lanean"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Karpeta iragazten"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Mezuak bilatzen"
 
-#: 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 "Hala ere, mezua ongi bidali da."
 
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" bidaltzen"
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
 
-#: 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 "Osatuta."
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Mezua karpetan gordetzen"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/mail-ops.c:940
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Lekuz aldatzen"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopiatzen"
 
-#: mail/mail-ops.c:1053
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1103 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Zakarrontzia"
-
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-ops.c:1279
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "%s biltegia irekitzen"
 
-#: mail/mail-ops.c:1420
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Karpeta freskatzen"
 
-#: mail/mail-ops.c:1601
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Karpeta betiko borratzen"
 
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s mezua berreskuratzen"
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d mezu berreskuratzen"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d mezu gordetzen"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11728,7 +12197,7 @@ msgstr ""
 "Ezin da sortu irteerako fitxategia: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11737,11 +12206,11 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11750,27 +12219,27 @@ msgstr ""
 "Ezin da irteerako fitxategia sortu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s(e)tik deskonektatzen"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Shell komandoa exekutatzen %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Bilatu"
 
@@ -11806,42 +12275,42 @@ msgstr "Bilatu:"
 msgid "Matches:"
 msgstr "Bat datozenak:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Bertan behera uzten..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Zerbitzaria: %s, Mota: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Bide-izena: %s, Mota: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Mezuak bidali eta jaso"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Utzi dena"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Eguneratzen..."
 
-#: 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 "Zain..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Bertan behera utzita."
 
@@ -11858,24 +12327,40 @@ msgstr "Idatzi %s(r)en pasahitza"
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "Mezu osatu gabea idatzita kanalizazioan!"
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Ezin izan da sinadura-fitxategia gorde."
 
-#: mail/mail-summary.c:467
-msgid "Mail Summary"
-msgstr "Posta-laburpena"
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Gorde sinadura"
+
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Sinadura hau aldatu egin duzu, baina ez duzu gorde.\n"
+"\n"
+"Aldaketak gorde nahi dituzu?"
+
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "Sinadura-fitxategia:"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Birbidalitako mezua - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Birbidalitako mezua"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Birbidalitako mezua"
 
@@ -11902,10 +12387,6 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "Karpeta birtualak"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "Karpeta birtualak"
@@ -11923,92 +12404,92 @@ msgstr "'%s' kBirtuala editatu nahian dabil, baina ez dago."
 msgid "New VFolder"
 msgstr "Karpeta birtual berria"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Gairik ez)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mezua"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Ikusita"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: mail/message-list.c:644
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
 
-#: mail/message-list.c:645
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Hainbat mezu"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Txikiena"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Txikia"
 
-#: mail/message-list.c:654
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Handia"
 
-#: mail/message-list.c:655
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Handiena"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:967
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Gaur %l:%M %p"
 
-#: mail/message-list.c:976
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Atzo %l:%M %p"
 
-#: mail/message-list.c:988
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:2365
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Noizko: "
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "Bandera-egoera"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Banderaduna"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr "Jarraitu banderari"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Jasotze-data"
 
@@ -12016,6 +12497,52 @@ msgstr "Jasotze-data"
 msgid "Size"
 msgstr "Tamaina"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "McCall"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Joan aurrera"
+
+#: mail/message-tag-followup.c:59
+#, fuzzy
+msgid "Follow-Up"
+msgstr "Jarraitu"
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Iturburu-informazioa"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Birbidali"
+
+#: 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 "Erantzun"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Erantzun denei"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Aurrebista"
+
+#: mail/message-tag-followup.c:315
+#, fuzzy
+msgid "Flag to Follow Up"
+msgstr "Jarraitzeko bandera"
+
 #: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -12037,7 +12564,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" karpetaren harpidetza kentzen"
 
 #: 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 "Karpeta"
 
@@ -12081,6 +12608,35 @@ msgstr "_Harpidetu"
 msgid "_Unsubscribe"
 msgstr "Harpidetza _kendu"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "Evolution-en laburpena daukan karpeta"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolution-en mezu-prestatzailea."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Evolution-en laneko laburpena egiteko osagaiaren fabrika."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Egutegi-hobespenak"
+
+#: 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 "Aarhus"
@@ -21874,14 +22430,10 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "Evolution-en laburpena daukan karpeta"
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Ezin da Evolution-en laburpen-osagaia hasieratu."
-
 #: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "Hitzorduak"
@@ -21902,44 +22454,50 @@ msgstr "%l:%M %B %d"
 msgid "No description"
 msgstr "Azalpenik ez"
 
-#: my-evolution/e-summary-mail.c:120
+#: my-evolution/e-summary-mail.c:151
 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
+msgid "Local Folders"
+msgstr "Karpeta lokalak"
+
 #. 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:92
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:453
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com-en Eguneko Hitza"
 
-#: my-evolution/e-summary-preferences.c:474
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Eguneko aipuak"
 
-#: my-evolution/e-summary-preferences.c:735
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Gehitu berri-iturria"
 
-#: my-evolution/e-summary-preferences.c:743
+#: my-evolution/e-summary-preferences.c:728
 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:747
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Izena:"
 
-#: my-evolution/e-summary-preferences.c:1225
-msgid "Summary Settings"
-msgstr "Laburpen-ezarpenak:"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "Errorea RDF deskargatzean"
@@ -21948,6 +22506,28 @@ msgstr "Errorea RDF deskargatzean"
 msgid "News Feed"
 msgstr "Berri-iturriak"
 
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "Gehitu"
+
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr "_Kendu"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Shannon"
+
 #: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Zereginik ez"
@@ -21968,19 +22548,19 @@ msgstr "Errorea izan da datuak deskargatzean"
 msgid "Weather"
 msgstr "Eguraldia"
 
-#: my-evolution/e-summary.c:190
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %Y %B %e"
 
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "Itxaron..."
 
-#: 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 "Inprimatu laburpena"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Huts egin du laburpena inprimatzean"
 
@@ -21988,38 +22568,6 @@ msgstr "Huts egin du laburpena inprimatzean"
 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"
@@ -23250,43 +23798,36 @@ msgstr "An_tolatu"
 msgid "_Weather"
 msgstr "Eg_uraldia"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
-msgstr "Evolution-en ohar-osagairako fabrika."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr "Ohar-kontrolerako fabrika."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Karpeta bereziak"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution-en shell-a."
 
-#: shell/e-activity-handler.c:160
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Erakutsi xehetasunak"
 
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Utzi bertan behera eragiketa"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Sarrerako ontzia"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Irteerako ontzia"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Karpeta lokalak"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution-en instalazioa"
 
-#: 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"
@@ -23294,15 +23835,15 @@ msgstr ""
 "Evolution-en bertsio berri honek fitxategi gehigarriak instalatu\n"
 "behar ditu Evolution-eko zure direktorio pertsonalean"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "Egin klik \"Ados\"en fitxategiak instalatzeko, edo \"Utzi\"n irteteko."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Fitxategiak ezin izan dira behar bezala eguneratu"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -23313,7 +23854,7 @@ msgstr ""
 " %s\n"
 "Errorea: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -23322,7 +23863,7 @@ msgstr ""
 "Errorea gertatu da `%s'(e)n \n"
 "fitxategiak kopiatzean."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -23333,7 +23874,7 @@ msgstr ""
 "direktorioa sortu:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -23344,7 +23885,7 @@ msgstr ""
 "ez du behar den baimenik. Eman iezaiozu irakurtzeko \n"
 "eta exekutatzeko baimena eta berrabiarazi Evolution."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -23355,7 +23896,7 @@ msgstr ""
 "kendu egin behar da Evolution-ek ondo funtziona dezan.\n"
 "Ken ezazu eta berrabiarazi Evolution."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -23366,7 +23907,7 @@ msgstr ""
 "Aldatu lekuz, Evolution-en erabiltzaile-fitxategiak\n"
 "instalatu ahal izateko."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -23380,7 +23921,7 @@ msgstr ""
 "exekutatu ahal izateko.\n"
 "Direktorio hori kendu nahi duzu?"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -23392,49 +23933,53 @@ msgstr ""
 "Evolution-en erabiltzaile-fitxategiak\n"
 "instalatu ahal izateko."
 
-#: shell/e-shell-about-box.c:40
-msgid "Evolution "
-msgstr "Evolution "
-
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Hauei esker daukazu:"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Ezin da karpeta egiaztatu: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Ezin izan da karpetaren izena aldatu:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Karpeta bat ezin da bere buruaren gainera eraman."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Karpeta bat ezin da bere buruaren gainean kopiatu."
 
-#: 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 "Karpeta bat ezin da bere menpeko karpeta batera eraman."
 
-#: 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 "Adierazi zein karpetatan kopiatu nahi duzun \"%s\" karpeta:"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Kopiatu karpeta"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Eraman karpeta"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23443,18 +23988,18 @@ msgstr ""
 "Ezin da karpeta ezabatu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Ezabatu \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23463,16 +24008,16 @@ msgstr ""
 "Ezin izan da karpetaren izena aldatu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Karpetaren izena aldatu"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23487,7 +24032,7 @@ msgstr ""
 "Ezin da sortu adierazitako karpeta:\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 - Sortu karpeta berria"
 
@@ -23676,8 +24221,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:503
-#: shell/e-shell-user-creatable-items-handler.c:548
+#: shell/e-shell-user-creatable-items-handler.c:506
+#: shell/e-shell-user-creatable-items-handler.c:551
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Berria"
@@ -23698,92 +24243,95 @@ 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:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ez da aurkitu zure $BIDE-IZENEAN."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Ezin izan da Bug Buddy exekutatu."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution-i buruz"
 
-#: shell/e-shell-view-menu.c:427
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Joan karpeta honetara..."
 
-#: shell/e-shell-view-menu.c:428
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Hautatu ireki nahi duzun karpeta"
 
-#: shell/e-shell-view-menu.c:548
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Sortu lasterbide berria"
 
-#: shell/e-shell-view-menu.c:549
+#: shell/e-shell-view-menu.c:566
 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:580
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Ez dirudi GNOME Pilot tresnak instalatuta dauzkazunik sisteman."
-
-#: shell/e-shell-view-menu.c:588
-#, c-format
-msgid "Error executing %s."
-msgstr "Errorea %s exekutatzean."
-
-#: shell/e-shell-view-menu.c:691
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: shell/e-shell-view-menu.c:704 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: shell/e-shell-view-menu.c:717 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
-#: shell/e-shell-view.c:220
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Ez dago karpetarik bistaratuta)"
 
-#: shell/e-shell-view.c:1699
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1701
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(bat ere ez)"
 
-#: shell/e-shell-view.c:1748
+#: shell/e-shell-view.c:1867
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution linean dago. Egin klik botoi honetan lineaz kanpo lan "
 "egiteko."
 
-#: shell/e-shell-view.c:1755
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
 
-#: shell/e-shell-view.c:1761
+#: shell/e-shell-view.c:1880
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution lineaz kanpo dago. Egin klik botoi honetan linean lan "
 "egiteko."
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Aktibazio-sistemak eman duen errorea:\n"
+"%s"
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ezin da biltegi lokala ezarri -- %s"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23794,19 +24342,23 @@ msgstr ""
 "ustekabean itxi da. Evolution-etik irten eta berriro sartu beharko \n"
 "duzu datu horiek berriro atzitzeko."
 
-#: shell/e-shell.c:1933
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Ados"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Argumentu baliogabeak"
 
-#: shell/e-shell.c:1935
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Ezin da OAFen erregistratu"
 
-#: shell/e-shell.c:1937
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Ez da aurkitu konfigurazioko datu-basea"
 
-#: shell/e-shell.c:1939 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Errore generikoa"
 
@@ -23923,76 +24475,72 @@ msgstr "_Kendu"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Kendu lasterbide hau lasterbide-barratik"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Errorea lasterbideak gordetzean."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Lasterbideak"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Ezin izan da karpeta transferitu:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Sarrerako ontzia"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Izenik ez)"
+#: 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 "Errorerik ez"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Badago lehendik izen hori duen karpeta bat"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Adierazitako karpeta-mota ez da baliozkoa"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "S/Iko errorea"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Ez dago karpeta sortzeko behar adina leku"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Karpeta ez dago hutsik"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Adierazitako karpeta ez da aurkitu"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funtzioa ez dago inplementatuta biltegiratze honetan"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Eragiketa ez da onartzen"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Adierazitako mota ez da onartzen biltegiratze honetan"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "Adierazitako karpeta ezin da aldatu edo kendu"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Karpeta bat ezin da bere azpikoen ume bihurtu."
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "Ezin da izen horretako karpetarik sortu"
 
@@ -24002,10 +24550,13 @@ 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
+msgid "<click here to select a folder>"
+msgstr "<egin klik hemen karpeta hautatzeko>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -24043,67 +24594,67 @@ msgstr ""
 "Aktibazio-sistemak eman duen errorea:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "CORBA errorea"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Etenda"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Argumentu baliogabea"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Badu jabea"
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Jaberik ez"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Ez da aurkitu"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Onartzen ez den mota"
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Onartzen ez den eskema"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Onartzen ez den eragiketa"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Barne-errorea"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Badago"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "URI baliogabea"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Azpikarpetak ditu"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Ez dago lekurik"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Jabe zaharra hil egin da"
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
 msgid "Test type"
 msgstr "Proba-mota:"
 
@@ -24231,40 +24782,40 @@ msgstr "Ez galdetu berriro"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution-ek datu-iturburu hauek aurkitu ditu:"
 
-#: shell/main.c:88
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution "
 
-#: shell/main.c:94
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ixten ari da..."
 
-#: shell/main.c:223
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ezin da Ximian Evolution-en shell-a atzitu."
 
-#: shell/main.c:232
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ezin da Ximian Evolution-en shell-a abiarazi: %s"
 
-#: shell/main.c:302
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Desgaitu splash pantaila"
 
-#: shell/main.c:303
+#: shell/main.c:318
 msgid "Start in offline mode"
 msgstr "Hasi lineaz kanpo"
 
-#: shell/main.c:304
+#: shell/main.c:319
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
-#: shell/main.c:305
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr "Bidali osagai guztien arazketa-irteera fitxategi batera."
 
-#: shell/main.c:323
+#: shell/main.c:338
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -24273,7 +24824,7 @@ msgstr ""
 "%s: --online eta --offline ezin dira batera erabili.\n"
 "  Erabili %s --help informazio gehiago lortzeko.\n"
 
-#: shell/main.c:353
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ezin da Bonobo osagaiaren sistema hasieratu."
 
@@ -24300,7 +24851,7 @@ msgstr "Ez da fitxategi-izenik eman."
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopiatu kontaktua(k) beste karpeta batean..."
 
-#: 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 "Kopiatu hautapena"
 
@@ -24316,7 +24867,7 @@ msgstr "Sortu kontaktu berria"
 msgid "Create new contact list"
 msgstr "Sortu kontaktu-zerrenda berria"
 
-#: 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 "Ebaki hautapena"
 
@@ -24324,237 +24875,173 @@ msgstr "Ebaki hautapena"
 msgid "Delete selected contacts"
 msgstr "Ezabatu hautatutako kontaktuak"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "Dump"
-msgstr "Irauli"
-
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:13
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Eraman kontaktua(k) beste karpeta batera..."
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:14
 msgid "Move to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: 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 "Itsatsi arbela"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Inprimatuko diren kontaktuen aurrebista eskaintzen du"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Inprimatu hautatutako kontaktuak"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Gorde hautatutako kontaktuak VCard gisa."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Hautatu denak"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Hautatu kontaktu guztiak"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Bidali mezua hautatutako kontaktuei."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Bidali mezua kontaktuari"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Bidali hautatutako kontaktuak beste norbaiti."
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Gelditu"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Utzi kargatzeari"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 msgid "View the current contact"
 msgstr "Ikusi uneko kontaktua"
 
-#: 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:92 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:15
+#: 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
 msgid "_Actions"
 msgstr "_Ekintzak"
 
 #: ui/evolution-addressbook.xml.h:33
-msgid "_Addressbook Sources..."
-msgstr "_Helbide-liburuaren iturburuak..."
-
-#: ui/evolution-addressbook.xml.h:35
 msgid "_Contact List"
 msgstr "_Kontaktuen zerrenda"
 
-#: 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 "_Birbidali kontaktua..."
 
-#: 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:106
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "_Inprimatu..."
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "_Eraman karpeta honetara..."
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "_Gorde VCard gisa"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_Bilatu kontaktuak"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Hautatu denak"
 
-#: ui/evolution-addressbook.xml.h:47
+#: ui/evolution-addressbook.xml.h:45
 msgid "_Send Message to Contact..."
 msgstr "Bidali _mezua kontaktuari..."
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Konfiguratu egutegiaren ezarpenak"
-
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Sortu egun osoko _gertaera berria"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "Sortu _zeregin berria"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Sortu _hitzordu berria"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a _New Meeting"
-msgstr "Sortu _bilera berria"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
-msgstr "Sortu hitzordu berria"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new meeting request"
-msgstr "Sortu bilera-eskaera berria."
-
-#: ui/evolution-calendar.xml.h:10 ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "Sortu zeregin berria"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create an event for the whole day"
-msgstr "Sortu egun osoko gertaera"
-
-#: ui/evolution-calendar.xml.h:13
 msgid "Day"
 msgstr "Eguna"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Ezabatu hitzordu hau"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Joan"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Joan atzera"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Joan aurrera"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Joan _data jakin batera"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Joan data jakin batera"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "_Joan gaurko egunera"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "_Hilabetea"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Inprimatuko den egutegiaren aurrebista eskaintzen du"
 
-#: 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 "_Inprimatzeko aurrebista"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Inprimatu egutegi hau"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Argitaratu egutegi honen libre/okupatuta informazioa"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Erakutsi egun bat"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Erakutsi hilabete bat"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Erakutsi aste bat"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Erakutsi lan-astea"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Astea"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "Hit_zordua..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Egutegiaren ezarpenak..."
-
-#: ui/evolution-calendar.xml.h:40
-msgid "_Meeting..."
-msgstr "_Bilera..."
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Publish Free/Busy Information"
-msgstr "_Argitaratu libre/okupatuta informazioa"
-
-#: ui/evolution-calendar.xml.h:44
-msgid "_Task..."
-msgstr "_Zeregina..."
-
 #: 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
@@ -24584,18 +25071,18 @@ msgstr "Inprimatutako elementuaren aurrebista ikusi"
 msgid "Print this item"
 msgstr "Inprimatu elementu hau"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Inprimatu..."
-
 #: 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 "Gorde"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Gorde honela..."
+
 #: 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 "Gorde eta itxi"
 
@@ -24611,8 +25098,8 @@ msgstr "Gorde elementu hau diskoan"
 #: 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:40
 msgid "_File"
 msgstr "Fi_txategia"
 
@@ -24637,7 +25124,7 @@ msgstr "Bidali _mezua kontaktuari..."
 #: 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 "_Gorde"
 
@@ -24697,6 +25184,10 @@ 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"
@@ -24706,74 +25197,54 @@ msgid "Compose _New Message"
 msgstr "Prestatu mezu _berria"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Sortu edo editatu posta-kontuak eta bestelako hobespenak"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Sortu edo editatu mezu berriak iragazteko arauak"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Sortu edo editatu karpeta birtualen definizioak"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Hustu _zakarrontzia"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Ahaztu _pasahitzak"
 
-#: 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 "Ahaztu gogoratutako pasahitzak (horrela berriz galdetuko dizkizu)"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Ireki posta-mezua idazteko leihoa"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Betiko kendu ezabatutako mezu guztiak karpeta guztietatik"
 
-#: ui/evolution-mail-global.xml.h:12
-msgid "Send / Receive"
-msgstr "Bidali / Jaso"
-
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send queued mail and retrieve new mail"
-msgstr "Bidali ilarako mezuak eta hartu mezu berriak"
-
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Erakutsi mezu-aurrebistaren leihoa"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Harpidetza egin edo kendu urruneko zerbitzarietako karpetetan"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "_Karpeta birtualen editorea..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Iragazkiak..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Settings..."
-msgstr "_Postaren ezarpenak..."
-
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "Au_rrebistako panela"
 
-#: ui/evolution-mail-global.xml.h:22
-msgid "_Send / Receive"
-msgstr "_Bidali / Jaso"
-
-#: ui/evolution-mail-global.xml.h:23
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "_Egin karpeten harpidetza..."
 
@@ -24866,11 +25337,11 @@ msgstr "Aldi baterako ezkutatu hautatutako mezuak"
 msgid "Threaded Message list"
 msgstr "Hari bateko mezuen zerrenda"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:19
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_Borratu betiko"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Karpeta"
 
@@ -24886,204 +25357,223 @@ msgstr "_Propietateak..."
 msgid "_Threaded Message List"
 msgstr "_Hariko mezuen zerrenda"
 
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Gehitu bidaltzailea helbide-liburuan"
+
 #: ui/evolution-mail-message.xml.h:2
-msgid "Add Sender to Address _Book"
-msgstr "Gehitu bidaltzailea _helbide-liburuan"
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Aplikatu iragazkiak"
 
 #: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Gehitu bidaltzailea helbide-liburuan"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplikatu iragazki-arauak hautatutako mezuei"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Prestatu hautatutako mezuaren hartzaile guztientzako erantzuna"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Prestatu hautatutako mezuaren posta-zerrendarentzako erantzuna"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Prestatu hautatutako mezuaren bidaltzailearentzako erantzuna"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopiatu hautatutako mezuak beste karpeta batean"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Sortu _karpeta birtuala mezutik"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Sortu araua bidaltzaile hau duten mezuak iragazteko"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Sortu araua hartzaile hauek dituzten mezuak iragazteko"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Sortu araua posta-zerrenda honetako mezuak iragazteko"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Sortu araua gai hau duten mezuak iragazteko"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Sortu karpeta birtuala hartzaile hauentzat"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Sortu karpeta birtuala posta-zerrenda honentzat"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Sortu karpeta birtuala bidaltzaile honentzat"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Sortu karpeta birtuala gai honentzat"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Txikitu testuaren tamaina"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Bistaratu hurrengo mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Bistaratu hurrengo mezua"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Bistaratu irakurri gabeko hurrengo mezua"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Bistaratu irakurri gabeko hurrengo haria"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Bistaratu aurreko mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Bistaratu aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Bistaratu irakurri gabeko aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Birbidali"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "_Posta-zerrendaren araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Bi_daltzailearen araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Hart_zailearen araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "G_aiaren araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:33
 msgid "Flag selected message(s) for follow-up"
 msgstr "Markatu hautatutako mezuak jarraipena egiteko"
 
-#: ui/evolution-mail-message.xml.h:33
-msgid "Force images in HTML mail to be loaded"
-msgstr "Kargarazi HTML postako irudiak"
-
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward"
-msgstr "Birbidali"
+msgid "Follow _Up..."
+msgstr "Jarrait_u..."
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr "Kargarazi HTML postako irudiak"
+
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Birbidali hautatutako mezua beste mezu baten testuaren barnean"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Birbidali hautatutako mezua erantzun gisa aipatuta"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Birbidali hautatutako mezua norbaiti"
 
-#: 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 "Birbidali hautatutako mezua norbaiti eranskin gisa"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Handitu testuaren tamaina"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Kargatu iru_diak"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Markatu ga_rrantzitsu gisa"
 
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Markatu i_rakurri gabeko gisa"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Markatu ez-garran_tzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected message(s) as having been read"
 msgstr "Markatu hautatutako mezua(k) irakurritako gisa"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as important"
 msgstr "Markatu hautatutako mezua(k) garrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Markatu hautatutako mezua(k) irakurri gabeko gisa"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Markatu hautatutako mezua(k) ez-garrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Markatu hautatutako mezuak ezabatzeko"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Eraman"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move selected message(s) to another folder"
 msgstr "Eraman hautatutako mezua(k) beste karpeta batera"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "Hurrengo mezu garrantzitsua"
-
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
-msgstr "Hurrengo mezua"
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "Hurrengo mezu garrantzitsua"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Hurrengo haria"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Hurrengo irakurri gabeko mezua"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -25099,149 +25589,145 @@ msgid "Original Si_ze"
 msgstr "Jatorrizko ta_maina"
 
 #: ui/evolution-mail-message.xml.h:61
-msgid "Preview the message to be printed"
-msgstr "Inprimatuko den mezuaren aurrebista eskaintzen du"
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Irakurri gabeko aurreko mezua"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "Aurrekoa"
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Aurreko mezu garrantzitsua"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "Aurreko mezu garrantzitsua"
+msgid "Preview the message to be printed"
+msgstr "Inprimatuko den mezuaren aurrebista eskaintzen du"
 
 #: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "Aurreko mezua"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "Irakurri gabeko aurreko mezua"
+msgid "Previous"
+msgstr "Aurrekoa"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Inprimatu mezu hau"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:68
 msgid "Re_direct"
 msgstr "Birbi_deratu"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:69
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Birbideratu (errebotatu) hautatutako mezua norbaiti"
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "Reply"
-msgstr "Erantzun"
-
-#: ui/evolution-mail-message.xml.h:72
-msgid "Reply to All"
-msgstr "Erantzun denei"
-
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr "Testua jatorrizko tamainan berrezartzen du"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "Bi_latu mezuan..."
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "T_xikiagoa"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "Gorde mezua testu-fitxategi gisa"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:78
 msgid "Search for text in the body of the displayed message"
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "Konfiguratu orrialde-ezarpenak uneko inprimagailuarentzat"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "Erakutsi posta-itur_burua"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "Erakutsi _goiburuko osoak"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "Erakutsi mezua estilo normalean"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "Erakutsi mezua posta-goiburuko guztiekin"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "Erakutsi mezu-iturburua formatu gabe"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "Testu-tamai_na"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Desezabatu hautatutako mezuak"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "_Posta-zerrendaren araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "_Bidaltzailearen araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "_Hartzailearen araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "_Gaiaren araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Apply Filters"
-msgstr "_Aplikatu iragazkiak"
-
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Attached"
 msgstr "_Erantsita"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "_Kopiatu karpetan"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "_Sortu iragazkia mezutik"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "_Birbidali mezua"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Joan"
+
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Inline"
 msgstr "_Barnean"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Handiagoa"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "_Mezu-bistaratzea"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Eraman karpetara"
 
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Hurrengo mezua"
+
 #: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Bistaratze normala"
@@ -25250,28 +25736,36 @@ msgstr "_Bistaratze normala"
 msgid "_Open Message"
 msgstr "_Ireki mezua"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Aurreko mezua"
+
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Quoted"
 msgstr "_Aipamen gisa"
 
-#: ui/evolution-mail-message.xml.h:110 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_Tresnak"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Desezabatu"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Itxi leiho hau"
 
 #: 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:36
 msgid "_Close"
 msgstr "_Itxi"
 
 #: 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:56
 msgid "_View"
 msgstr "I_kusi"
 
@@ -25295,11 +25789,11 @@ msgstr "Enkriptatu mezu hau PGPrekin"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Enkriptatu mezu hau zure S/MIME enkriptatze-ziurtagiriarekin"
 
-#: 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 "For_matua"
 
-#: 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"
 
@@ -25315,6 +25809,10 @@ msgstr "Txertatu fitxategia mezuan testu gisa"
 msgid "Insert text file..."
 msgstr "Txertatu testu-fitxategia..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Ireki"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Ireki fitxategia"
@@ -25348,7 +25846,7 @@ msgid "Save in folder..."
 msgstr "Gorde karpetan..."
 
 #: 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 "Gorde uneko fitxategia"
 
@@ -25373,6 +25871,7 @@ msgid "Send _later"
 msgstr "Bidali _geroago"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Bidali mezua HTML formatuan"
 
@@ -25441,7 +25940,7 @@ msgid "_From Field"
 msgstr "'Nork' e_remua"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Txertatu"
 
@@ -25453,11 +25952,7 @@ msgstr "_Ireki..."
 msgid "_Reply-To Field"
 msgstr "'Erant_zun honi' eremua"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "Se_gurtasuna"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Laguntza"
 
@@ -25513,37 +26008,39 @@ msgstr "Lortu atazari buruzko azken informazioa"
 msgid "Re_fresh Task"
 msgstr "_Freskatu zeregina"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Konfiguratu zereginen ikuspegiaren ezarpenak"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiatu hautatutako zeregina"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Ebaki hautatutako zeregina"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete completed tasks"
 msgstr "Ezabatu osatutako zereginak"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Ezabatu hautatutako zereginak"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 msgid "Mar_k as Complete"
 msgstr "Markatu 'Osatuta' gisa"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Itsatsi zeregina arbeletik"
 
-#: ui/evolution-tasks.xml.h:14
-msgid "Tasks Settings..."
-msgstr "Zeregin-ezarpenak..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Inprimatuko diren kontaktuen aurrebista eskaintzen du"
+
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Inprimatu mezu hau"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25610,113 +26107,118 @@ msgid "Open this folder in an other window"
 msgstr "Ireki karpeta hau beste leiho batean"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Bidali / Jaso"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Bidali ilarako mezuak eta hartu mezu berriak"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "Erakutsi Ximian Evolution-i buruzko informazioa"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Bidali programa-erroreen berri-ematea"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "_Bidali akatsen berri-ematea"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Eman programa-erroreen berri Bug Buddy erabiliz"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Txandakatu"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Erakutsi/ezkutatu karpeta-barra "
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Erakutsi/ezkutatu lasterbide-barra "
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Gaitu/desgaitu lineaz kanpo lanean aritzea."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Bistaratu hautatutako karpeta"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Xiimian Evolution-i buruzko MEGak (FAQ)"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "Ximian E_volution-i buruz..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "Ko_piatu..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "_Karpeta-barra"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_Joan karpeta honetara..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Inportatu..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Lekuz aldatu..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "Berr_ia"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "Kar_peta berria"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_Pilot-en ezarpenak..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "I_zena aldatu..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Bidali / Jaso"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Lasterbidea"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "La_sterbide-barra"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Aldatu laburpenaren ezarpenak"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Inprimatu laburpena"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Berritu"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Berritu ikuspegia"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "_Laburpenaren ezarpenak..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Helbide-txartelak"
@@ -25890,20 +26392,20 @@ msgstr "Ukrainarra"
 msgid "Visual"
 msgstr "Bisuala"
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Karaktere-joko ezezaguna: %s"
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Adierazi erabili behar den karaktere-jokoa"
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Besterik..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Karaktere-kodeketa"
 
@@ -25911,30 +26413,32 @@ msgstr "Karaktere-kodeketa"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Bilaketa-editorea"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Gorde bilaketa"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Gehitu gordetako bilaketei"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Garbitu"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Gorde bilaketa"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Erakutsi dena"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Gehitu gordetako bilaketei"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informazioa"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Errorea"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Galdera"
@@ -25948,11 +26452,21 @@ msgstr "Mezua"
 msgid "Don't show this message again."
 msgstr "Ez erakutsi mezu hau berriro."
 
-#: widgets/misc/e-search-bar.c:342
-msgid "Sear_ch"
-msgstr "Bi_latu"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Bilatu orain"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Garbitu"
 
-#: widgets/misc/e-search-bar.c:468
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Garbitu"
+
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Bilatu orain"
 
@@ -25978,21 +26492,785 @@ 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."
+
+#~ 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 "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."
+
+#~ msgid "Other Contacts"
+#~ msgstr "Beste kontaktu batzuk"
+
+#~ msgid "Name contains"
+#~ msgstr "Izenak hau dauka"
+
+#~ msgid "(none)"
+#~ msgstr "(bat ere ez)"
+
+#~ msgid "C_ontaining:"
+#~ msgstr "_hau dauka:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Erakutsi irizpide hauekin bat datozen kontaktuak:"
+
+#~ msgid "Starting:"
+#~ msgstr "Hasi:"
+
+#~ msgid "Ending:"
+#~ msgstr "Amaitu:"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Sortu hitzordu berria _oroigarri lehenetsiarekin"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "Asteko _lehenengo eguna:"
+
+#~ msgid "_Other"
+#~ msgstr "Be_stelakoa"
+
+#~ 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 "_Ezabatu zeregin hau"
+
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "Bileraren hasiera: <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "Zereginaren hasiera: <b>"
+
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Libre/okupatura informazioaren hasiera: <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Hasiera: <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Bileraren amaiera: <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Libre/okupatura informazioaren amaiera: <b>"
+
+#~ msgid "Ends: <b>"
+#~ msgstr "Amaiera: <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Zeregina eginda: <b>"
+
+#~ msgid "Task Due: <b>"
+#~ msgstr "Zeregina egiteko: <b>"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "iCalendar informazioa"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "iCalendar errorea"
+
+#~ msgid "An unknown person"
+#~ msgstr "Pertsona ezezaguna"
+
+#~ 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."
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Bat ere ez</i>"
+
+#~ msgid "Status:"
+#~ msgstr "Egoera:"
+
+#~ msgid "Tentatively Accepted"
+#~ msgstr "Oraingoz onartua"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Aukeratu ekintza bat:"
+
+#~ msgid "Update"
+#~ msgstr "Eguneratu"
+
+#~ msgid "Accept"
+#~ msgstr "Onartu"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Onartu oraingoz"
+
+#~ msgid "Decline"
+#~ msgstr "Ukatu"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Bidali libre/okupatuta informazioa"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Eguneratu erantzun-emailearen egoera"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Bidali azken orduko informazioa"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b>(e)k bilera-informazioa argitaratu du."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Bileraren informazioa"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Bilera-proposamena"
+
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ msgstr "<b>%s</b>(e)k bilera batean sartu nahi du."
+
+#~ msgid "Meeting Update"
+#~ msgstr "Bilera-eguneratzea"
+
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ msgstr "<b>%s</b>(e)k bilera-informazio berria jaso nahi du."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Bilera-eguneratzearen eskaera"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b>(e)k bilera-eskaerari erantzun dio."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Bilera-erantzuna"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b>(e)k bilera bertan behera utzi du."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Bilera bertan behera uztea"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b>(e)k mezu ulertezina bidali du."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Bilera-mezu txarra"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b>(e)k zeregin-informazioa argitaratu du."
+
+#~ msgid "Task Information"
+#~ msgstr "Zereginaren informazioa"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Zeregin-proposamena"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du."
+
+#~ msgid "Task Update"
+#~ msgstr "Zeregin-eguneratzea"
+
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "<b>%s</b>(e)k zereginaren informazio berria jaso nahi du."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Zeregin-eguneratzearen eskaera"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b>(e)k zeregin-esleipenari erantzun dio."
+
+#~ msgid "Task Reply"
+#~ msgstr "Zereginaren erantzuna"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Zeregina bertan behera uztea"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Zeregin-mezu txarra"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b>(e)k libre/okupatuta informazioa argitaratu du."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Libre/okupatuta informazioa"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b>(e)k libre/okupatuta informazioa eskatzen dizu."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Libre/okupatuta eskaera"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "<b>%s</b>(e)k libre/okupatuta eskaerari erantzun dio."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Libre/okupatuta erantzuna"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Libre/okupatuta mezu txarra"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "Eranskinak ez du baliozko egutegi-mezurik"
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
+
+#~ 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"
+
+#~ msgid "Error hashing password."
+#~ msgstr "Errorea pasahitzaren hash-a egitean."
+
+#~ msgid "Invalid password."
+#~ msgstr "Pasahitz baliogabea."
+
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Ezin izan da sinatu: \"%s\"(r)en ziurtagiria ez da aurkitu."
+
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Ezin izan da garbi sinatu: \"%s\"(r)en ziurtagiria ez da aurkitu."
+
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ msgstr "Ezin izan da enkriptatu: huts egin du datuak sortzean."
+
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr ""
+#~ "Ezin izan da enkriptatu: huts egin du enkriptatze-testuingurua sortzean."
+
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr ""
+#~ "Ezin izan dira datuak enkriptatu: erabiltzaile-gako baliogabea: \"%s\"."
+
+#~ 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"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Zerbitzariak erabiltzaile-izena ezetsi du"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Huts egin du erabiltzaile-izena zerbitzarira bidaltzean"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Zerbitzariak erabiltzaile-izena/pasahitza ezetsi du"
+
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "Barne-errorea: uid formatu baliogabean: %s"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Ezin izan da talde-zerrenda hartu zerbitzaritik."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Ezin da %s(r)en talde-zerrendaren fitxategia kargatu: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Ezin da %s(r)en talde-zerrendaren fitxategia gorde: %s"
+
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "Ezin izan da 'Nork' helbidea aurkitu mezuan"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "Ezin da mezua bidali: bidaltzailearen helbidea ez da zehaztu."
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "Evolution-en laneko laburpena egiteko osagaia."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Ezin da hasieratu Evolution-en laneko laburpena egiteko osagaia."
+
+#~ msgid "Select a service"
+#~ msgstr "Hautatu zerbitzua"
+
+#~ 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 ""
+#~ "Beste HTML orri bat hauta dezakezu Laneko Laburpenaren atzeko planorako.\n"
+#~ "\n"
+#~ "Utzi hutsik lehenetsirako"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Ireki %s GNOME aplikazio lehenetsiarekin"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Ireki %s GNOME web arakatzaile lehenetsiarekin"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Bidali mezua -> %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Exekutatu %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Itxi %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Eraman %s ezkerrera"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Eraman %s eskuinera"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Eraman %s aurreko errenkadara"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Eraman %s hurrengo errenkadara"
+
+#
+#~ msgid "page"
+#~ msgstr "orrialdea"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ezin da HTML fitxategia ireki:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Errorea datuak irakurtzean:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Fitxategiak ez du lekurik zerbitzuentzat.\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 ""
+#~ "Laneko laburpeneko osagaiak ezin izan du Bonobo hasieratu.\n"
+#~ "RootPOA-ri buruzko abisu bat agertu bada, seguru asko esan nahi du\n"
+#~ "GOADen kontra konpilatu duzula Bonobo eta ez OAFen kontra."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "RDF laburpenerako fabrika."
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF Laburpena"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Probako bonobo-ren osagairako fabrika."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Probako osagairako fabrika."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Probako bonobo-ren zerbitzua"
+
+#~ msgid "Test service"
+#~ msgstr "Proba-zerbitzua"
+
+#~ msgid "Update automatically"
+#~ msgstr "Eguneratu automatikoki"
+
+#~ msgid "Update now"
+#~ msgstr "Eguneratu orain"
+
+#~ msgid "Update every "
+#~ msgstr "Eguneratze-maiztasuna"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Idatzi karpetaren URIa"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Posta biltegiratzeko karpeta (barnekoa)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Ezin izan da biltegiarekin konektatu: %s"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Sortu karpeta birtuala bilaketatik"
+
+#~ 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"
+
+#~ msgid "Composer"
+#~ msgstr "Mezu-prestatzailea"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Birbidaltzeko estilo lehenetsia: "
+
+#~ 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"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "_Iragazki-ekintzen egunkaria:"
+
+#~ msgid "_Organization:"
+#~ msgstr "E_rakundea:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "Gogora_tu pasahitz hau"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "_Bidali mezuak HTML formatuan lehenespen gisa."
+
+#~ msgid "_Server type: "
+#~ msgstr "_Zerbitzari-mota: "
+
+#~ msgid "placeholder"
+#~ msgstr "leku-marka"
+
+#~ 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!"
+
+#~ msgid "Mail Summary"
+#~ msgstr "Posta-laburpena"
+
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Ezin da Evolution-en laburpen-osagaia 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)"
+
+#~ msgid "Dump"
+#~ msgstr "Irauli"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Konfiguratu egutegiaren ezarpenak"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Sortu egun osoko _gertaera berria"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Sortu _zeregin berria"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Sortu _hitzordu berria"
+
+#~ msgid "Create a _New Meeting"
+#~ msgstr "Sortu _bilera berria"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Sortu hitzordu berria"
+
+#~ msgid "Create a new meeting request"
+#~ msgstr "Sortu bilera-eskaera berria."
+
+#~ msgid "Create a new task"
+#~ msgstr "Sortu zeregin berria"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Sortu egun osoko gertaera"
+
+#~ msgid "_Appointment..."
+#~ msgstr "Hit_zordua..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Egutegiaren ezarpenak..."
+
+#~ msgid "_Meeting..."
+#~ msgstr "_Bilera..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Zeregina..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Sortu edo editatu posta-kontuak eta bestelako hobespenak"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_Postaren ezarpenak..."
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Aplikatu iragazkiak"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Konfiguratu zereginen ikuspegiaren ezarpenak"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Zeregin-ezarpenak..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Aldatu laburpenaren ezarpenak"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "_Laburpenaren ezarpenak..."
+
+#~ msgid "Show All"
+#~ msgstr "Erakutsi dena"
+
+#~ msgid "Sear_ch"
+#~ msgstr "Bi_latu"
+
 #~ msgid "Back"
 #~ msgstr "Atzera"
 
-#~ msgid "Flag for Follow-up"
-#~ msgstr "Jarraitzeko bandera"
-
 #~ msgid "New List"
 #~ msgstr "Zerrenda berria"
 
 #~ msgid "New Appointment"
 #~ msgstr "Hitzordu berria"
 
-#~ msgid "New Task"
-#~ msgstr "Zeregin berria"
-
 #~ msgid "New Message"
 #~ msgstr "Mezu berria"
 
@@ -26297,8 +27575,7 @@ 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."
@@ -26306,13 +27583,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Could not authenticate to KPOP server: %s"
 #~ msgstr "Ezin izan da KPOP zerbitzarian autentifikatu: %s"
 
-#~ msgid ""
-#~ "Unable to connect to POP server.\n"
-#~ "Error sending username: %s"
-#~ msgstr ""
-#~ "Ezin da POP zerbitzariarekin konektatu.\n"
-#~ "Errorea erabiltzaile-izena bidaltzean: %s"
-
 #~ msgid "(Unknown)"
 #~ msgstr "(Ezezaguna)"
 
@@ -26371,9 +27641,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Regions"
 #~ msgstr "Eskualdeak"
 
-#~ msgid " _Remove"
-#~ msgstr "_Kendu"
-
 #~ msgid "Al_l stations:"
 #~ msgstr "Estazio _guztiak:"
 
@@ -26392,9 +27659,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "_Displayed feeds:"
 #~ msgstr "Bistaratutako _iturriak:"
 
-#~ msgid "Forward As"
-#~ msgstr "Birbidali honela"
-
 #~ msgid "Forward _Attached"
 #~ msgstr "Birbidali _erantsita"
 
@@ -26407,9 +27671,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "Idatzi zure helbide elektronikoa eta pasahitza %s(e)n sartzeko"
 
-#~ msgid "LDAP Authentication"
-#~ msgstr "LDAP autentifikazioa"
-
 #~ msgid "Password:"
 #~ msgstr "Pasahitza:"
 
@@ -26481,17 +27742,13 @@ 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"
-
-#~ msgid "Calendar Preferences"
-#~ msgstr "Egutegi-hobespenak"
+#~ "Lehentasunak 'Handia', 'Normala', 'Txikia' edo 'Definitu gabe' izan behar du"
 
 #~ msgid "_Invite Others"
 #~ msgstr "_Egin gonbita beste batzuei"
@@ -26587,9 +27844,8 @@ 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 "
@@ -26607,9 +27863,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Goals/Objectives"
 #~ msgstr "Xedeak/Helburuak"
 
-#~ msgid "Hot Contacts"
-#~ msgstr "Kontaktu garrantzitsuenak"
-
 #~ msgid "Strategies"
 #~ msgstr "Estrategiak"
 
@@ -26628,12 +27881,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%Y/%m/%d"
 
-#~ msgid "Add"
-#~ msgstr "Gehitu"
-
-#~ msgid "Edit"
-#~ msgstr "Editatu"
-
 #~ msgid "Elm mail"
 #~ msgstr "Elm posta"
 
@@ -26655,9 +27902,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Message list should display in a _threaded fashion by default"
 #~ msgstr "Mezuen zerrenda _hari moduan bistaratu behar luke lehenespen gisa"
 
-#~ msgid "Special Folders"
-#~ msgstr "Karpeta bereziak"
-
 #~ msgid "_Remember PGP Passphrase until exit"
 #~ msgstr "_Gogoratu PGP pasaesaldia irten arte"
 
@@ -26708,8 +27952,7 @@ 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"
+#~ "Egin klik \"Ados\"en Evolution-en erabiltzaile-fitxategiak hemen instalatzeko"
 
 #~ msgid "Delete folder '%s'"
 #~ msgstr "Ezabatu '%s' karpeta"
@@ -26756,12 +27999,11 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ "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"
+#~ "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"
+#~ "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"
diff --git a/po/fi.po b/po/fi.po
index ad39753ccc..f38ecb1371 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-11-14 19:26-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -30,21 +30,22 @@ msgid "Imports VCard files into Evolution."
 msgstr ""
 
 #: 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/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nimi"
 
 #: 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 "S�hk�posti"
 
 #: 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:1731
 msgid "Primary"
 msgstr "Ensisijainen"
 
@@ -54,15 +55,16 @@ 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:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: 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
 msgid "Business"
 msgstr "Ty�"
 
@@ -72,12 +74,12 @@ msgid "Bus"
 msgstr ""
 
 #: 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:1720
 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:1722
 msgid "Company"
 msgstr "Yritys"
 
@@ -87,13 +89,14 @@ msgstr "Yrit"
 
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: 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
 msgid "Home"
 msgstr "Koti"
 
 #: 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 "Organisaatio"
 
@@ -102,18 +105,20 @@ msgid "Org"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
 #: 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:1721
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: 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:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Ty�/faksi"
 
@@ -122,13 +127,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: 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:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "Ty� 2"
 
@@ -137,69 +142,68 @@ msgid "Bus 2"
 msgstr "Ty� 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:1724
 msgid "Home 2"
 msgstr "Koti 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:1726
+#: 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:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "Muut"
 
 #: 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:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr ""
 
 #: 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 ""
 
 #: 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:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "S�hk�posti 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 ""
 
@@ -208,7 +212,7 @@ msgid "Url"
 msgstr ""
 
 #: 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 "Osasto"
 
@@ -217,7 +221,7 @@ msgid "Dep"
 msgstr ""
 
 #: 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 "Asema"
 
@@ -226,12 +230,12 @@ msgid "Off"
 msgstr "Asm"
 
 #: 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/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 "Ammatti"
 
@@ -240,7 +244,7 @@ msgid "Prof"
 msgstr ""
 
 #: 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 ""
 
@@ -253,7 +257,7 @@ msgid "Ass"
 msgstr ""
 
 #: 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 "Kutsumanimi"
 
@@ -262,12 +266,12 @@ msgid "Nick"
 msgstr ""
 
 #: 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 "Puoliso"
 
 #: 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 ""
 
@@ -280,7 +284,7 @@ msgid "CALUri"
 msgstr ""
 
 #: 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 ""
 
@@ -309,713 +313,929 @@ msgstr "Ryhm�t"
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: addressbook/backend/ebook/e-card-simple.c:788
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, c-format
 msgid "%x"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3712
-msgid "Card: "
-msgstr "Kortti: "
+#: addressbook/backend/ebook/e-card.c:2679
+msgid "Multiple VCards"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
+#: addressbook/backend/ebook/e-card.c:2687
+#, c-format
+msgid "VCard for %s"
 msgstr ""
-"\n"
-"Nimi: "
 
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
+#: 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:34
+#: 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:1385
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
+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
+msgid "Searching..."
+msgstr "Etsit��n..."
+
+#: addressbook/backend/pas/pas-backend-file.c:263
+msgid "Loading..."
+msgstr "Ladataan..."
+
+#. need a different error message here.
+#: addressbook/backend/pas/pas-backend-file.c:272
+msgid "Error in search expression."
 msgstr ""
-"\n"
-"  Etuliite:   "
 
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
+msgid "Adding card to LDAP server..."
 msgstr ""
-"\n"
-"  Etunimi:    "
 
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
+msgid "Removing card from LDAP server..."
 msgstr ""
-"\n"
-"  Muut nimet: "
 
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
+msgid "Modifying card from LDAP server..."
 msgstr ""
-"\n"
-"  Sukunimi:   "
 
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
+msgid "Receiving LDAP search results..."
 msgstr ""
-"\n"
-"Syntym�p�iv�: "
 
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Virhe kortin poistossa"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "URL:n `%s' j�sent�minen ep�onnistui"
+
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "S�hk�postiosoite:"
+
+#: addressbook/conduit/address-conduit.c:536
+msgid "Cursor could not be loaded\n"
+msgstr "Kohdistimen lataaminen ep�onnistui\n"
+
+#: addressbook/conduit/address-conduit.c:549
+msgid "EBook not loaded\n"
 msgstr ""
-"\n"
-"Osoite:"
 
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
+#: 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 ""
-"\n"
-"  Postilokero: "
 
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
+#: 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 ""
 
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
+#: addressbook/conduit/address-conduit.c:1385
+#: addressbook/conduit/address-conduit.c:1388
+msgid "Could not read pilot's Address application block"
 msgstr ""
-"\n"
-"  Katu:        "
 
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
 msgstr ""
-"\n"
-"  Kaupunki:    "
 
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
-"\n"
-"  Postinumero: "
 
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
+#: 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 ""
-"\n"
-"  Maa:         "
 
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Configuration control for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
-"\n"
-"Puhelimet:\n"
 
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
 msgstr ""
-"\n"
-"Puhelin:"
 
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Evolution Addressbook minicard viewer"
 msgstr ""
-"\n"
-"S�hk�posti:\n"
 
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Evolution component for handling contacts."
 msgstr ""
-"\n"
-"S�hk�posti:"
 
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+msgid "Factory for the Addressbook's address displayer"
 msgstr ""
-"\n"
-"Aikavy�hyke: "
 
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+msgid "Factory for the Addressbook's address popup"
 msgstr ""
-"\n"
-"Maant. sijainti: "
 
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
+msgid "This page can be used to configure Addressbook Settings"
 msgstr ""
-"\n"
-"  Nimi:  "
 
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
-"\n"
-"  Yksikk�: "
 
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
+#: addressbook/gui/component/addressbook-component.c:72
+#: 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
+msgid "Contacts"
+msgstr "Kontaktit"
+
+#: addressbook/gui/component/addressbook-component.c:72
+msgid "Folder containing contact information"
 msgstr ""
-"\n"
-"  Yksikk�2: "
 
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
+#: addressbook/gui/component/addressbook-component.c:74
+msgid "LDAP Server"
+msgstr "LDAP-palvelin"
+
+#: addressbook/gui/component/addressbook-component.c:74
+msgid "LDAP server containing contact information"
 msgstr ""
-"\n"
-"  Yksikk�3: "
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/gui/component/addressbook-component.c:562
+msgid "New Contact"
+msgstr "Uusi kontakti"
+
+#: addressbook/gui/component/addressbook-component.c:562
+#: 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-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Kontaktiluettelo"
+
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+msgid "Could not initialize gnome-vfs"
+msgstr "gnome-vfs:n alustus ei onnistunut"
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr "Osoitekirjaa ei voitu avata"
+
+#: addressbook/gui/component/addressbook.c:525
 msgid ""
-"\n"
-"  Unit4: "
+"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 ""
-"\n"
-"  Yksikk�4: "
 
-#: addressbook/backend/ebook/e-card.c:3865
+#: addressbook/gui/component/addressbook.c:530
 msgid ""
-"\n"
-"Categories: "
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
 msgstr ""
-"\n"
-"Ryhm�t: "
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/gui/component/addressbook.c:538
 msgid ""
-"\n"
-"Comment: "
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
 msgstr ""
 
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3879
-msgid ""
-"\n"
-"Unique String: "
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
+#, c-format
+msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "loppuu merkkijonoon"
+
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "S�hk�posti 2"
+
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
 msgstr ""
-"\n"
-"Julkinen avain: "
 
-#: addressbook/backend/ebook/e-card.c:4235
-msgid "Multiple VCards"
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: 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
+msgid "Advanced..."
+msgstr "Edistyneet..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4243
-#, c-format
-msgid "VCard for %s"
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: 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/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1449
-#: calendar/conduits/todo/todo-conduit.c:1130
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
-msgid "Could not initialize Bonobo"
-msgstr "Bonobon alustus ei onnistunut"
+#: 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
+msgid "Primary Email"
+msgstr "Ensisijainen s�hk�posti"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2215
-msgid "Searching..."
-msgstr "Etsit��n..."
+#: addressbook/gui/component/e-address-popup.c:587
+msgid "Select an Action"
+msgstr "Valitse toiminto"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-msgid "Loading..."
-msgstr "Ladataan..."
+#: addressbook/gui/component/e-address-popup.c:593
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Luo uusi kontakti \"%s\""
 
-#. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:270
-msgid "Error in search expression."
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Lis�� osoite olemassaolevaan kontaktiin \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:891
+msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:475
-msgid "Connecting to LDAP server..."
-msgstr "Yhdistet��n LDAP-palvelimeen..."
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+msgid "Add to Contacts"
+msgstr "Lis�� kontakteihin"
+
+#: addressbook/gui/component/e-address-popup.c:1046
+msgid "Merge E-Mail Address"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
+msgstr "�l� salli kyselyj�"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Enable Queries (Dangerous!)"
+msgstr "Salli kyselyt (Vaarallista!)"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:485
-msgid "Unable to connect to LDAP server."
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
 msgstr "Yhdist�minen palvelimeen ep�onnistui."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:501
-msgid "Waiting for connection to LDAP server..."
-msgstr "Odotetaan yhteytt� LDAP-palvelimeen..."
+#: addressbook/gui/component/addressbook-config.c:215
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr "Yhdist�minen palvelimeen ep�onnistui."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:870
-msgid "Adding card to LDAP server..."
+#: addressbook/gui/component/addressbook-config.c:235
+msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:971
-msgid "Removing card from LDAP server..."
+#: addressbook/gui/component/addressbook-config.c:641
+msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
-msgid "Modifying card from LDAP server..."
+#: addressbook/gui/component/addressbook-config.c:1143
+msgid "The server did not respond with a schema entry"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2160
-msgid "Receiving LDAP search results..."
+#: addressbook/gui/component/addressbook-config.c:1163
+msgid "Could not query for schema information"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2165
-msgid "Restarting search."
+#: addressbook/gui/component/addressbook-config.c:1169
+msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:294
-msgid "Cursor could not be loaded\n"
-msgstr "Kohdistimen lataaminen ep�onnistui\n"
-
-#: addressbook/conduit/address-conduit.c:307
-msgid "EBook not loaded\n"
+#: addressbook/gui/component/addressbook-config.c:1613
+msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1089
-#: calendar/conduits/calendar/calendar-conduit.c:981
-#: calendar/conduits/todo/todo-conduit.c:694
-msgid "Could not start wombat server"
+#: 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/conduit/address-conduit.c:1090
-#: calendar/conduits/calendar/calendar-conduit.c:982
-#: calendar/conduits/todo/todo-conduit.c:695
-msgid "Could not start wombat"
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1120
-#: addressbook/conduit/address-conduit.c:1123
-msgid "Could not read pilot's Address application block"
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
+#: addressbook/gui/component/ldap-config.glade.h:14
+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
+#, fuzzy
+msgid "Always"
+msgstr "p�iv��"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/component/ldap-config.glade.h:18
+msgid "Attribute"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+#: 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/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Connecting"
+msgstr "Hakuasetukset"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the sample Addressbook control"
+#: addressbook/gui/component/ldap-config.glade.h:25
+msgid "DN Customization"
 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
-msgid "Contacts"
-msgstr "Kontaktit"
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "_Poista"
 
-#: addressbook/gui/component/addressbook-component.c:71
-msgid "Folder containing contact information"
+#: addressbook/gui/component/ldap-config.glade.h:27
+msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:73
-msgid "LDAP Server"
-msgstr "LDAP-palvelin"
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "S�hk�postiosoite:"
 
-#: addressbook/gui/component/addressbook-component.c:73
-msgid "LDAP server containing contact information"
+#: 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/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
-msgid "New Contact"
-msgstr "Uusi kontakti"
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
-msgstr "_Uusi kontakti"
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "Etsi:"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact List"
-msgstr "Uusi kontaktiluettelo"
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Yleiset"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
-msgstr "Uusi kontakti_luettelo"
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "LDAP Attribute"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
-msgstr "Muokkaa osoitekirjaa"
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Palvelimen asetukset"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
-msgstr "389"
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Reunukset"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
-msgstr "Tilin nimi"
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "Joka"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "Lis�� osoitekirja"
+#: 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/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
-msgstr "Osoitekirjal�hteet"
+#: addressbook/gui/component/ldap-config.glade.h:41
+msgid "Objectclasses"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "Edistynyt"
+#: addressbook/gui/component/ldap-config.glade.h:42
+msgid "Objectclasses Used in Evolution:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
+#: addressbook/gui/component/ldap-config.glade.h:43
+msgid "Objectclasses Used on Server:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
+#: addressbook/gui/component/ldap-config.glade.h:44
+msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "De_lete"
-msgstr "_Poista"
+#: 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/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "S�hk�postiosoite:"
+#: addressbook/gui/component/ldap-config.glade.h:47
+msgid "R_estore Defaults"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: 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 "_Etsi viesti�"
+
+#. 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 "Etsit��n..."
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Valitse kaikki"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Poistettu"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"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/addressbook-config.glade.h:11
-msgid "One"
+#: 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/addressbook-config.glade.h:12
-msgid "Search _base:"
+#: 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/addressbook-config.glade.h:13
-msgid "Search s_cope: "
+#: 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/addressbook-config.glade.h:14
-msgid "Server Name"
-msgstr "Palvelimen nimi"
+#: 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 "L�hteen tiedot"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Yhdistet��n LDAP-palvelimeen..."
+
+#: addressbook/gui/component/ldap-config.glade.h:67
+msgid "Step 3: Searching the Directory"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Allaolevat tiedot vaaditaan osoitekirjan lis��miseksi.  "
+#: 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/addressbook-config.glade.h:17
-msgid "This information is not required for most ldap servers. "
+#: 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/addressbook-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:81
 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 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/addressbook-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"This is the full name of your ldap server. For example, "
+"\"ldap.mycompany.com\"."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "This is the name of the server where your addressbook is located."
+#: 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/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
+#: 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/addressbook-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:91
+#, fuzzy
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
+"It is for display purposes only. "
 msgstr ""
 "T�t� nime� k�ytet��n tilisi tunnistamiseksi. Se on vain sinua itse�si varten"
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "_Account name:"
-msgstr "_Tilin nimi:"
+#: 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/addressbook-config.glade.h:24
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+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
+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:90 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:139
 msgid "_Add"
 msgstr "_Lis��"
 
-#: 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 "_Muokkaa"
-
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
-msgstr "Palveli_meni vaati todennuksen"
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Lis��"
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
-msgstr "_Portti:"
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Lis�� toiminto"
 
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
-msgstr "Palvelimen _nimi: "
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Lis�� toiminto"
 
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-msgid "Could not initialize gnome-vfs"
-msgstr "gnome-vfs:n alustus ei onnistunut"
+#: addressbook/gui/component/ldap-config.glade.h:108
+msgid "_Always"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:167
-msgid "Other Contacts"
-msgstr "Muut kontaktit"
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Poista kaikki"
 
-#: addressbook/gui/component/addressbook.c:468
-msgid "Unable to open addressbook"
-msgstr "Osoitekirjaa ei voitu avata"
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_P�iv�"
 
-#: addressbook/gui/component/addressbook.c:477
-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"
+#: addressbook/gui/component/ldap-config.glade.h:111
+msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:482
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:490
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:623
-#, c-format
-msgid "Enter password for %s (user %s)"
-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
+#: 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 "_Muokkaa"
 
-#: addressbook/gui/component/addressbook.c:786
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Mik� tahansa kentt� sis�lt��"
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Muokkaa tapaamista"
 
-#: addressbook/gui/component/addressbook.c:787
-msgid "Name contains"
-msgstr "Nimi sis�lt��"
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution"
 
-#: addressbook/gui/component/addressbook.c:788
-msgid "Email contains"
-msgstr "S�hk�posti sis�lt��"
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:59
-msgid "Category is"
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
 msgstr ""
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Edistyneet..."
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
+msgstr ""
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1031
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1071
-msgid "The URI that the Folder Browser will display"
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Asetukset"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Portti:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+msgid "_Restore Defaults"
 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)"
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "_Etsi"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "Palvelimen _nimi: "
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+msgid "_Timeout (minutes):"
 msgstr ""
 
-#: 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:1686
-msgid "Primary Email"
-msgstr "Ensisijainen s�hk�posti"
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Tili"
 
-#: addressbook/gui/component/e-address-popup.c:587
-msgid "Select an Action"
-msgstr "Valitse toiminto"
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "kontaktinhallinta"
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Luo uusi kontakti \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Ei kortteja"
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Lis�� osoite olemassaolevaan kontaktiin \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Hakuasetukset"
 
-#: addressbook/gui/component/e-address-popup.c:891
-msgid "Querying Addressbook..."
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-msgid "Add to Contacts"
-msgstr "Lis�� kontakteihin"
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "Yleiset"
 
-#: addressbook/gui/component/e-address-popup.c:1046
-msgid "Merge E-Mail Address"
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
-msgstr "�l� salli kyselyj�"
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
-msgstr "Salli kyselyt (Vaarallista!)"
+#: addressbook/gui/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "Etsit��n..."
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
@@ -1026,9 +1246,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: 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: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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Poista"
 
@@ -1057,7 +1277,12 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Nimet�n kontakti"
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "L�hett�j�kentt� sis�lt��"
+
+#: 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"
@@ -1067,7 +1292,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"
@@ -1075,1220 +1300,1293 @@ 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:1
-msgid "C_ontaining:"
-msgstr "S_is�lt��:"
+msgid "Select Names"
+msgstr "Valitse nimet"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Co_ntacts:"
-msgstr "Ko_ntaktit:"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Poista kontakti?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "F_ind"
-msgstr "Etsi:"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Kontaktit"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "Valitse nimet"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
+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 "_Siirr�..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Ryhm�:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Kansio:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Message Recipients:"
-msgstr "_Vastaanottajat:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "Anni_versary:"
+msgid "A_ssistant's name:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "B_usiness"
-msgstr "T_y�paikka"
+#, fuzzy
+msgid "Add_ress..."
+msgstr "_Osoite..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Business _Fax"
-msgstr "Ty�-_faksi"
+msgid "Anni_versary:"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#, fuzzy
+msgid "Birthda_y:"
+msgstr "_Syntym�p�iv�:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#, fuzzy
+msgid "C_ontacts..."
+msgstr "_Kontaktit..."
+
+#: 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 "Ry_hm�t..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Kontaktinhallinta"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "D_epartment:"
+msgstr "_Osasto:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "File A_s:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "General"
-msgstr "Yleiset"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#, fuzzy
+msgid "Full _Name..."
+msgstr "_Koko nimi..."
 
-#: 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"
 "of that information here."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr "Uusi puhelintyyppi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "No_tes:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Organi_zation:"
 msgstr "Organi_saatio:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#, fuzzy
+msgid "P_rofession:"
+msgstr "_Ammatti:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Phone Types"
 msgstr "Puhelintyypit"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Wants to receive _HTML mail"
-msgstr "Haluaa s�hk�postit HTML-muodossa"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Address..."
-msgstr "_Osoite..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Assistant's name:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Birthday:"
-msgstr "_Syntym�p�iv�:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+msgid "S_pouse:"
+msgstr "Puoli_so:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Business"
-msgstr "_Ty�"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#, fuzzy
+msgid "This is the _mailing address"
+msgstr "_T�m� on postitusosoite"
 
-#: 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 "_Kontaktit..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "Wants to receive _HTML mail"
+msgstr "Haluaa s�hk�postit HTML-muodossa"
 
-#: 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: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:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "_Poista"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Department:"
-msgstr "_Osasto:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Full Name..."
-msgstr "_Koko nimi..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Home"
-msgstr "_Koti"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Job title:"
 msgstr "_Teht�v�nimike:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Mobile"
-msgstr "_Matkapuhelin"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
 msgstr "_Kutsumanimi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
 msgstr "_Asema:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Profession:"
-msgstr "_Ammatti:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Public Calendar URL:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Spouse:"
-msgstr "Puoli_so:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr "_T�m� on postitusosoite"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "_Kotisivun osoite:"
 
-#: 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:756
-msgid "Category editor not available."
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:763
-msgid "This contact belongs to these categories:"
-msgstr "T�m� kontakti kuuluu n�ihin ryhmiin:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
-msgstr "Kontaktin pikalis�ys"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr "Koko nimi"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
-msgid "E-mail"
-msgstr "S�hk�posti"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
-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 ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Osoite _2:"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
+msgstr "Yhdysvallat"
 
-#: 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 ""
 
-#: 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 "Argentiina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Aruba"
 msgstr "Aruba"
 
-#: 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 "Australia"
 
-#: 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 "It�valta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Azerbaijan"
 msgstr "Azerbaidzan"
 
-#: 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 "Bahamasaaret"
 
-#: 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 "Bahrain"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Belarus"
 msgstr "Valko-Ven�j�"
 
-#: 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 "Belgia"
 
-#: 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 "Belize"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bermuda"
 msgstr "Bermudasaaret"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: 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 "Bosnia-Hertsegovina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bouvet Island"
 msgstr ""
 
-#: 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 "Neitsytsaaret"
-
-#: 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 "Bulgaria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Cambodia"
 msgstr "Kambodza"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: 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 "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cape Verde"
 msgstr "Kap Verde"
 
-#: 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 "Caymansaaret"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Central African Republic"
 msgstr "Keski-Afrikan Tasavalta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Chad"
 msgstr "Tsad"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-msgid "Check Address"
-msgstr "Tarkista osoite"
-
-#: 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 "Chile"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "China"
 msgstr "Kiina"
 
-#: 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 "Joulusaaret"
 
-#: 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 "Kolumbia"
 
-#: 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 "Kongo"
 
-#: 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 "Costa Rica"
 
-#: 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 "M_aa:"
-
-#: 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 "Kroatia"
 
-#: 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 "Kuuba"
 
-#: 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 "Kypros"
 
-#: 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 "Tsekinmaa"
 
-#: 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 "Tanska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Dominica"
 msgstr "Dominica"
 
-#: 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 "Dominikaaninen Tasavalta"
 
-#: 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 "Ecuador"
 
-#: 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 "Egypti"
 
-#: 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 "El Salvador"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Equatorial Guinea"
 msgstr "P�iv�ntasaajan Guinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: 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 "Viro"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Falkland Islands"
 msgstr "Falklandsaaret"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Faroe Islands"
 msgstr "F�rsaaret"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Fiji"
 msgstr "Fidzi"
 
-#: 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 "Suomi"
 
-#: 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 "Ranska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "French Guiana"
 msgstr "Ranskan Guiana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "French Polynesia"
 msgstr "Polynesia"
 
-#: 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 "Gabon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Gambia"
 msgstr "Gambia"
 
-#: 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 "Georgia"
 
-#: 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 "Saksa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Ghana"
 msgstr "Ghana"
 
-#: 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 "Gibraltar"
 
-#: 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 "Kreikka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Greenland"
 msgstr "Gr�nlanti"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guinea-bissau"
 msgstr "Guinea Bissau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guyana"
 msgstr "Guyana"
 
-#: 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 "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 ""
 
-#: 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 "Honduras"
 
-#: 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 "Hong Kong"
 
-#: 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 "Unkari"
 
-#: 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 "Islanti"
 
-#: 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 "Intia"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irlanti"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Israel"
 msgstr "Israel"
 
-#: 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 "Italia"
 
-#: 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 "Jamaika"
 
-#: 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 "Japani"
 
-#: 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 "Jordania"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#, fuzzy
+msgid "Korea, Republic Of"
+msgstr "Tsekinmaa"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: 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 "Laos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Latvia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: my-evolution/Locations.h:1198
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: 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:1218
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: my-evolution/Locations.h:1234
 msgid "Lithuania"
 msgstr "Liettua"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: my-evolution/Locations.h:1268
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Malaysia"
 msgstr "Malesia"
 
-#: 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 "Mali"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
 msgid "Malta"
 msgstr "Malta"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: 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:1387
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: 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
+msgid "Moldova, Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Monaco"
 msgstr "Monaco"
 
-#: 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:1470
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Namibia"
 msgstr "Namibia"
 
-#: 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 "Nepali"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
 msgid "Netherlands"
 msgstr "Alankomaat"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Netherlands Antilles"
 msgstr "Alankomaiden Antillit"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "New Caledonia"
 msgstr "Uusi Kaledonia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1560
 msgid "New Zealand"
 msgstr "Uusi-Seelanti"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: my-evolution/Locations.h:1562
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: 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 "Nigeria"
 
-#: 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:1574
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
 msgid "Norway"
 msgstr "Norja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1632
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
 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 "Papua Uusi-Guinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1688
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr "Filippiinit"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
 msgid "Poland"
 msgstr "Puola"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1824
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
 msgid "Qatar"
 msgstr "Qatar"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
 msgid "Romania"
 msgstr "Romania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Russian Federation"
 msgstr "Ven�j�"
 
-#: 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 "San Marino"
 
-#: 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:2035
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Senegal"
 msgstr "Senegal"
 
-#: 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:2090
 msgid "Singapore"
 msgstr "Singapore"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: my-evolution/Locations.h:2103
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: my-evolution/Locations.h:2104
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2119
 msgid "South Africa"
 msgstr "Etel�-Afrikka"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
 msgid "Spain"
 msgstr "Espanja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: 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 "Sudan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
 msgid "Suriname"
 msgstr "Surinam"
 
-#: 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/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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
 msgid "Sweden"
 msgstr "Ruotsi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2183
 msgid "Switzerland"
 msgstr "Sveitsi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: 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
+msgid "Tanzania, United Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
 msgstr "Thaimaa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Togo"
 msgstr "Togo"
 
-#: 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 "Tonga"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Trinidad And Tobago"
 msgstr "Trinidad ja Tobago"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
 msgid "Turkey"
 msgstr "Turkki"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "United Arab Emirates"
 msgstr "Yhdistyneet arabiemiirikunnat"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2342
 msgid "United Kingdom"
 msgstr "Iso-Britannia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-msgid "United States"
-msgstr "Yhdysvallat"
-
-#: 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:2348
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: 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:2380
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#, fuzzy
+msgid "Virgin Islands, British"
+msgstr "Neitsytsaaret"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#, fuzzy
+msgid "Virgin Islands, U.S."
+msgstr "Neitsytsaaret"
+
+#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
 msgid "Yemen"
 msgstr "Jemen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2524
 msgid "Yugoslavia"
 msgstr "Jugoslavia"
 
-#: 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 "Zimbabwe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Poista kontakti?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+msgid "Category editor not available."
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+msgid "This contact belongs to these categories:"
+msgstr "T�m� kontakti kuuluu n�ihin ryhmiin:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+msgid "Save Contact as VCard"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+msgid "Contact Quick-Add"
+msgstr "Kontaktin pikalis�ys"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+msgid "Edit Full"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr "Koko nimi"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+msgid "E-mail"
+msgstr "S�hk�posti"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+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 ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Osoite _2:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "Tarkista osoite"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "M_aa:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Postilokero:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Osavaltio/l��ni:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "Po_stinumero:"
 
@@ -2386,10 +2684,14 @@ msgid "contact-list-editor"
 msgstr "kontaktinhallinta"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 msgid "Contact List Editor"
 msgstr "Kontaktinhallinta"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+msgid "Save List as VCard"
+msgstr ""
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
@@ -2432,7 +2734,7 @@ msgid ""
 msgstr ""
 
 #: 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 "Edistynyt haku"
 
@@ -2441,217 +2743,319 @@ msgstr "Edistynyt haku"
 msgid "Search"
 msgstr "Etsi"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 kortti"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d korttia"
 
-#: 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 ""
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Avaa"
-
-#: 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:270
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-msgid "Send Message to Contact"
-msgstr "L�het� viesti kontaktille"
-
-#: 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 "Tulosta"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr ""
-
-#: 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 "Poista"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: 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:1043
 msgid "Success"
 msgstr ""
 
-#: 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: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
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr ""
 
-#: 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:1071
 msgid "Permission denied"
 msgstr ""
 
-#: 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 ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr ""
 
-#: 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:607 camel/camel-service.c:643
+#: 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
 msgid "Cancelled"
 msgstr "Peruutettu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Muu virhe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Virhe kortin lis��misess�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Virhe kortin poistossa"
 
-#. 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 ""
+#: addressbook/gui/widgets/e-addressbook-util.c:204
+#, fuzzy
+msgid "Display Cards?"
+msgstr "Kirjoita viesti"
 
-#. 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"
+#: addressbook/gui/widgets/e-addressbook-util.c:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "Kirjoita viesti"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Ei kortteja"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Ei kortteja"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Ei kortteja"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Ei kortteja"
+
+#: 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:338
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: 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:854
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Ty�puhelin"
 
-#: 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:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Ty�osoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Ty�puhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Uusi kontakti"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Uusi kontaktiluettelo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Siirry kansioon..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Siirry kansioon..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Etsi kontakteja"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Osoitekirjan l�hteet..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_S�hk�postiasetukset..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "L�het� viesti kontaktille"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "_Kopioi kansioon..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "_Siirr� kansioon..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Leikkaa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Nykyinen n�kym�"
+
+#. 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:940
+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 ""
+
+#. 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
+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 ""
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -2665,19 +3069,40 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr "Tallenna osoitekirjaan"
 
-#: 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 ""
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr "Tulosta kirjekuori"
+
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+msgid "Print card"
+msgstr "Tulosta kortti"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -2747,6 +3172,7 @@ msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Vaaka"
 
@@ -2771,10 +3197,12 @@ msgid "Options"
 msgstr "Asetukset"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Suunta"
 
 #: addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "Sivu"
 
@@ -2790,7 +3218,9 @@ msgstr "Paperi"
 msgid "Paper source:"
 msgstr "Paperil�hde:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Pysty"
 
@@ -2846,62 +3276,49 @@ msgstr "Leveys:"
 msgid "_Font..."
 msgstr "_Kirjasin..."
 
-#: addressbook/printing/e-contact-print.c:1111
-msgid "Print cards"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-msgid "Print card"
-msgstr "Tulosta kortti"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr "Tulosta kirjekuori"
-
-#: calendar/cal-util/cal-component.c:1202
+#: calendar/cal-util/cal-component.c:1207
 msgid "Untitled appointment"
 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:405 mail/message-list.c:651
+#: 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
 msgid "High"
 msgstr "Korkea"
 
-#: 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:650
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: 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:407 mail/message-list.c:649
+#: 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
 msgid "Low"
 msgstr "Matala"
 
 #. 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
 msgid "Undefined"
 msgstr "M��rittelem�t�n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:937
-#: calendar/conduits/todo/todo-conduit.c:649
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: 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 ""
 
-#: calendar/conduits/todo/todo-conduit.c:756
-#: calendar/conduits/todo/todo-conduit.c:759
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "_Prioriteetti:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -2914,41 +3331,54 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "_Kalenterin asetukset..."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+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:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 ""
@@ -2957,24 +3387,10 @@ 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
-msgid "Ending:"
-msgstr ""
-
 #: 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"
@@ -2997,11 +3413,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "_Muokkaa tapaamista"
 
-#: 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"
@@ -3009,18 +3425,29 @@ 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:2608
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Varoitus"
+
+#: 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 "�l� kysy t�t� en�� uudelleen"
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "GNOMEn alustus ei onnistunut"
 
@@ -3032,26 +3459,43 @@ msgstr ""
 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 "Yhteenveto sis�lt��"
+
+#: calendar/gui/cal-search-bar.c:51
+#, fuzzy
+msgid "Description contains"
+msgstr "Kuvaus:"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentti sis�lt��"
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:405
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A, %e %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: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/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
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: 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
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %e %B %Y"
@@ -3059,27 +3503,25 @@ msgstr "%A, %e %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:805
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Henkil�kohtainen"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Julkinen"
 
@@ -3100,33 +3542,28 @@ msgid "W"
 msgstr "L"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "Pe"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 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:479 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr ""
 
@@ -3139,12 +3576,13 @@ 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/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/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
+#: 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 "M��rittelem�t�n"
 
@@ -3156,24 +3594,15 @@ msgstr ""
 msgid "Assigned"
 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:803
+#: 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
 msgid "Yes"
 msgstr "Kyll�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr "Ei"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1974 calendar/gui/e-day-view.c:1675
-#: calendar/gui/e-week-view.c:1182
-#, fuzzy
-msgid "Searching"
-msgstr "Etsit��n..."
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 #, fuzzy
 msgid "Day View"
@@ -3194,65 +3623,81 @@ msgstr "Viikko"
 msgid "Month View"
 msgstr "Kuukausi"
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
-msgstr "Yhteenveto sis�lt��"
-
-#: calendar/gui/cal-search-bar.c:57
-#, fuzzy
-msgid "Description contains"
-msgstr "Kuvaus:"
-
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "Kommentti sis�lt��"
-
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
-msgid "Unmatched"
-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
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Teht�v�t"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "Luo uusi tapaaminen"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "Uusi teht�v�"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "_Teht�v�"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Uusi tapaaminen"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "Uusi t_apaaminen"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
-msgstr "Luo uusi teht�v�"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Uusi tapaaminen"
 
-#: calendar/gui/component-factory.c:649
+#: calendar/gui/component-factory.c:707
 #, fuzzy
-msgid "New _Task"
-msgstr "Uusi teht�v�"
+msgid "_Appointment"
+msgstr "Tapaaminen"
+
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr ""
+"Tiedoston %s poistaminen ep�onnistui:\n"
+"%s"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URI jonka kalenteri n�ytt��"
 
+#: 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 ""
@@ -3428,12 +3873,12 @@ msgstr "Luo uusi tapaaminen"
 msgid "%s at the end of the appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: 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 ""
@@ -3455,7 +3900,7 @@ msgstr "Muistutukset"
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "Kuvaus:"
 
@@ -3464,12 +3909,11 @@ msgstr "Kuvaus:"
 msgid "_Options..."
 msgstr "_Asetukset"
 
-#. 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 "j�lkeen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "ennen"
 
@@ -3486,7 +3930,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "tunti(a)"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "minuutti"
 
@@ -3529,197 +3973,188 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
-msgid "Create new appointments with a default _reminder"
-msgstr "Luo uusi tapaaminen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
 msgid "Days"
 msgstr "p�iv��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Perjantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "Hours"
 msgstr "tuntia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
 msgid "Minutes"
 msgstr "minuutti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Maanantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, fuzzy
-msgid "Show appointment _end times in week and month views"
-msgstr "N�yt� tapaamisten loppumisajat"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #, fuzzy
 msgid "Show week _numbers in date navigator"
 msgstr "N�yt� viikkonumerot"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #, fuzzy
 msgid "Su_n"
 msgstr "Su"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "T_asks due today:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_hu"
 msgstr "To"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "T_ue"
 msgstr "Ti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "Teht�v�t"
 
-#: 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 "Torstai"
 
-#: 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:26
 #, fuzzy
 msgid "Time _zone:"
 msgstr ""
 "\n"
 "Aikavy�hyke: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
-msgid "Time di_visions:"
-msgstr "Mitat:"
-
-#: 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: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 "Tiistai"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Work Week"
 msgstr "Ty�viikk_o"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #, fuzzy
 msgid "_12 hour (AM/PM)"
 msgstr "12 tuntia (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #, fuzzy
 msgid "_24 hour"
 msgstr "24 tuntia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #, fuzzy
 msgid "_Compress weekends in month view"
 msgstr "Tiivist� viikonloput"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 #, fuzzy
 msgid "_Display"
 msgstr "_P�iv�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "_End of day:"
 msgstr "P�iv�n loppu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
 msgid "_Fri"
 msgstr "Pe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_General"
 msgstr "Yleiset"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Mon"
 msgstr "Ma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#, fuzzy
-msgid "_Other"
-msgstr "Muut"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "_Overdue tasks:"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Sat"
 msgstr "La"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "_Task List"
-msgstr "Teht�v�t"
+msgid "_Show appointment end times in week and month views"
+msgstr "N�yt� tapaamisten loppumisajat"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Mitat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Wed"
 msgstr "Ke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "before the start of the appointment"
 msgstr "Luo uusi tapaaminen"
@@ -3787,76 +4222,63 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: 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:2212
 #, fuzzy
 msgid " (Completed "
 msgstr "Valmis"
 
-#: 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
 #, fuzzy
 msgid "Completed "
 msgstr "Valmis"
 
-#: 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:2221
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:303
+#: calendar/gui/dialogs/comp-editor.c:322
 #, fuzzy
 msgid "Could not update object!"
 msgstr "Tiedostojen p�ivitys ei onnistunut"
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Teht�v� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1897
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "Kirjoita tiedoston yli?"
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1904
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Saman niminen tiedosto on jo olemassa.\n"
-"Kirjoitetaanko sen yli?"
-
-#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "Tallenna nimell�..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -3917,7 +4339,7 @@ msgstr "Poistettu"
 msgid "Enter Delegate"
 msgstr "Poistettu"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Tapaaminen"
 
@@ -3931,14 +4353,14 @@ msgstr ""
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 #, 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:365
+#: calendar/gui/dialogs/event-editor.c:368
 #, fuzzy
 msgid "Meeting"
 msgstr "Peruuta tapaaminen"
@@ -3974,31 +4396,43 @@ msgid "F_ree"
 msgstr "_Viikko"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
+#, fuzzy
+msgid "L_ocation:"
+msgstr ""
+"\n"
+"Maant. sijainti: "
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Y_ksityinen"
 
-#: 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 "Ju_lkinen"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 #, fuzzy
 msgid "Show Time As"
 msgstr "N�yt�"
 
-#: 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 "K_uvaus:"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Kontaktit..."
+
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
@@ -4026,58 +4460,52 @@ msgstr "Osanottaja"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
+msgid "Common Name"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
 msgid "Delegated From"
 msgstr "Poistettu"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
 msgid "Delegated To"
 msgstr "Poistettu"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 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:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 #, fuzzy
 msgid "Member"
 msgstr "Joulukuu"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:798
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Rooli"
 
-#: 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/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"
 msgstr "Tila"
 
-#: 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tyyppi"
@@ -4093,7 +4521,7 @@ msgid "_Change Organizer"
 msgstr "Organisoija:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:445
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr ""
 
@@ -4102,27 +4530,98 @@ msgstr ""
 msgid "_Other Organizer"
 msgstr "Organisoija:"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "_Etunimi:"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "sekunti"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Muut"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "tunti"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "Liit�"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Muu faksi"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "p�iv�"
 
-#: 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
-msgid "th"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr ""
 
@@ -4188,16 +4687,20 @@ msgstr "viikkoa"
 msgid "year(s)"
 msgstr "vuotta"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:56
+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
+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?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
@@ -4215,7 +4718,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4227,16 +4730,20 @@ msgstr "_Prioriteetti:"
 msgid "_Status:"
 msgstr "_Tila:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr ""
+
 #: 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:324
 #, fuzzy
 msgid "Assignment"
 msgstr "Tapaaminen"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Kuvaus:"
 
@@ -4248,195 +4755,156 @@ msgstr "_Alkamisp�iv�:"
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: 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:751 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:941 calendar/gui/e-day-view.c:3544
-#: calendar/gui/e-week-view.c:3422 mail/folder-browser.c:1447
-#: shell/e-shortcuts-view.c:384
+#: 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
 msgid "_Open"
 msgstr "_Avaa"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Tallenna nimell�..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "T_ulosta..."
+
+#: calendar/gui/e-calendar-table.c:978 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:947 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3433 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:979 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:949 calendar/gui/e-day-view.c:3530
-#: calendar/gui/e-day-view.c:3557 calendar/gui/e-week-view.c:3409
-#: calendar/gui/e-week-view.c:3435 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:980 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 "L_iit�"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:984
+msgid "_Assign Task"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Ladataan kalenteria"
+
+#: calendar/gui/e-calendar-table.c:986
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:956
+#: calendar/gui/e-calendar-table.c:987
 #, fuzzy
-msgid "_Delete this Task"
-msgstr "Poista t�m� teht�v�"
-
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Mark Tasks as Complete"
-msgstr ""
+msgid "_Mark Selected Tasks as Complete"
+msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:992
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Poista teht�v�"
 
-#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7115
-#: calendar/gui/e-week-view.c:3918
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr ""
 
-#. 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 ""
-"P�iv�ys tulee antaa seuraavassa muodossa: \n"
-"\n"
-"%s"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Kuvaus"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 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 ""
+"P�iv�ys tulee antaa seuraavassa muodossa: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -4444,412 +4912,177 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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"
 
 #. 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"
 
 #. 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
 msgid "am"
 msgstr "am"
 
 #. 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
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "Uusi t_apaaminen"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Uusi koko p�_iv�n tapahtuma"
 
-#: calendar/gui/e-day-view.c:3535 calendar/gui/e-week-view.c:3414
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
-msgid "_Go to Date..."
-msgstr "Siirry _p�iv��n..."
-
-#: calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-msgid "_Delete this Appointment"
-msgstr "P_oista t�m� tapaaminen"
-
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
-msgid "Make this Occurrence _Movable"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
-msgid "Delete this _Occurrence"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
-msgid "Delete _All Occurrences"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:524
-#, fuzzy
-msgid "Meeting begins: <b>"
-msgstr "L�hteen tiedot"
-
-#: calendar/gui/e-itip-control.c:529
-#, fuzzy
-msgid "Task begins: <b>"
-msgstr "Valmis"
-
-#: calendar/gui/e-itip-control.c:534
-#, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "L�hteen tiedot"
-
-#: calendar/gui/e-itip-control.c:538
-#, fuzzy
-msgid "Begins: <b>"
-msgstr "L�hteen tiedot"
-
-#: calendar/gui/e-itip-control.c:550
-#, fuzzy
-msgid "Meeting ends: <b>"
-msgstr "L�hteen tiedot"
-
-#: calendar/gui/e-itip-control.c:553
-#, fuzzy
-msgid "Free/Busy info ends: <b>"
-msgstr "L�hteen tiedot"
-
-#: calendar/gui/e-itip-control.c:557
-#, fuzzy
-msgid "Ends: <b>"
-msgstr "L�hteen tiedot"
-
-#: calendar/gui/e-itip-control.c:571
-#, fuzzy
-msgid "Task Completed: <b>"
-msgstr "Valmis"
-
-#: calendar/gui/e-itip-control.c:581
-#, fuzzy
-msgid "Task Due: <b>"
-msgstr "Valmis"
-
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
-#, fuzzy
-msgid "iCalendar Information"
-msgstr "Pakolliset tiedot"
-
-#. Title
-#: calendar/gui/e-itip-control.c:633
-#, fuzzy
-msgid "iCalendar Error"
-msgstr "Kalenteri"
-
-#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
-#, fuzzy
-msgid "An unknown person"
-msgstr "Tuntematon virhe"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:737
-msgid "<i>None</i>"
-msgstr ""
-
-#: 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
-#, fuzzy
-msgid "Choose an action:"
-msgstr "Valitse toiminto"
-
-#: calendar/gui/e-itip-control.c:779
-#, fuzzy
-msgid "Update"
-msgstr "Teht�v�t"
-
-#: 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
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:795
-#, fuzzy
-msgid "Accept"
-msgstr "Hyv�ksy "
-
-#: calendar/gui/e-itip-control.c:796
-msgid "Tentatively accept"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:797
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 #, fuzzy
-msgid "Decline"
-msgstr "Poistettu"
-
-#: calendar/gui/e-itip-control.c:811
-#, fuzzy
-msgid "Send Free/Busy Information"
-msgstr "L�hteen tiedot"
-
-#: calendar/gui/e-itip-control.c:824
-msgid "Update respondent status"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:838
-#, fuzzy
-msgid "Send Latest Information"
-msgstr "Tiedoksi"
-
-#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Peruuta"
-
-#: calendar/gui/e-itip-control.c:867
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:868
-#, fuzzy
-msgid "Meeting Information"
-msgstr "Valinnaiset tiedot"
-
-#: calendar/gui/e-itip-control.c:872
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:873
-#, fuzzy
-msgid "Meeting Proposal"
+msgid "New Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:877
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Uusi teht�v�"
 
-#: calendar/gui/e-itip-control.c:878
-#, fuzzy
-msgid "Meeting Update"
-msgstr "Peruuta tapaaminen"
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Tulosta..."
 
-#: calendar/gui/e-itip-control.c:882
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
+#: 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 ""
 
-#: calendar/gui/e-itip-control.c:883
-#, fuzzy
-msgid "Meeting Update Request"
-msgstr "Peruuta tapaaminen"
-
-#: calendar/gui/e-itip-control.c:887
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr ""
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+msgid "_Go to Date..."
+msgstr "Siirry _p�iv��n..."
 
-#: calendar/gui/e-itip-control.c:888
+#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: ui/evolution-calendar.xml.h:31
 #, fuzzy
-msgid "Meeting Reply"
-msgstr "Peruuta tapaaminen"
-
-#: calendar/gui/e-itip-control.c:892
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
+msgid "_Publish Free/Busy Information"
+msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:893
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
 #, fuzzy
-msgid "Meeting Cancellation"
-msgstr "Valitse toiminto"
-
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
-#: calendar/gui/e-itip-control.c:982
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
+msgid "_Configure..."
+msgstr "Palvelimen asetukset"
 
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
 #, fuzzy
-msgid "Bad Meeting Message"
-msgstr "Hae viestist�"
+msgid "_Configure Pilot..."
+msgstr "Palvelimen asetukset"
 
-#: calendar/gui/e-itip-control.c:917
-#, c-format
-msgid "<b>%s</b> has published task information."
-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
+msgid "_Save As..."
+msgstr "Tallenna _nimell�..."
 
-#: calendar/gui/e-itip-control.c:918
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 #, fuzzy
-msgid "Task Information"
-msgstr "Tiedoksi"
-
-#: calendar/gui/e-itip-control.c:922
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr ""
+msgid "_Schedule Meeting..."
+msgstr "Varjostus"
 
-#: calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 #, fuzzy
-msgid "Task Proposal"
-msgstr "Peruuta tapaaminen"
+msgid "_Forward as iCalendar..."
+msgstr "_Kontaktit..."
 
-#: calendar/gui/e-itip-control.c:927
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:928
-#, fuzzy
-msgid "Task Update"
-msgstr "Teht�v�t"
-
-#: calendar/gui/e-itip-control.c:932
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:933
-#, fuzzy
-msgid "Task Update Request"
-msgstr "Teht�v�t"
-
-#: calendar/gui/e-itip-control.c:937
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:938
-#, fuzzy
-msgid "Task Reply"
-msgstr "Vastaa"
-
-#: calendar/gui/e-itip-control.c:942
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:943
-#, fuzzy
-msgid "Task Cancellation"
-msgstr "Peruuta operaatio"
-
-#: calendar/gui/e-itip-control.c:948
-#, fuzzy
-msgid "Bad Task Message"
-msgstr "Hae viestist�"
-
-#: calendar/gui/e-itip-control.c:967
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, fuzzy, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "Pakolliset tiedot"
-
-#: calendar/gui/e-itip-control.c:968
-#, fuzzy
-msgid "Free/Busy Information"
-msgstr "L�hteen tiedot"
-
-#: calendar/gui/e-itip-control.c:972
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:973
-#, fuzzy
-msgid "Free/Busy Request"
-msgstr "Edellinen viesti"
-
-#: calendar/gui/e-itip-control.c:977
-#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:978
-#, fuzzy
-msgid "Free/Busy Reply"
-msgstr "Edellinen viesti"
-
-#: calendar/gui/e-itip-control.c:983
-#, fuzzy
-msgid "Bad Free/Busy Message"
-msgstr "Edellinen viesti"
-
-#: calendar/gui/e-itip-control.c:1052
-msgid "The message does not appear to be properly formed"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1071
-msgid "The message contains only unsupported requests."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
-msgid "The attachment does not contain a valid calendar message"
-msgstr ""
+msgid "Error executing %s."
+msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: calendar/gui/e-itip-control.c:1130
-msgid "The attachment has no viewable calendar items"
-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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1229
+#: calendar/gui/e-itip-control.c:1564
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Kohdistimen lataaminen ep�onnistui\n"
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1566
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Valmis"
 
-#: 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:1592 calendar/gui/e-itip-control.c:1642
+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:1613
+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:1625
+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:1638
+#, fuzzy
+msgid "Attendee status could not be updated!\n"
+msgstr "Kohdistimen lataaminen ep�onnistui\n"
+
+#: calendar/gui/e-itip-control.c:1640
+msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1348 calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "L�hetetty"
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Valitse kansio"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Valitse kansio"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4888,221 +5121,221 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Autopuhelin"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1535
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 #, fuzzy
 msgid "Required Participants"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr ""
 
-#: 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:771
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 #, fuzzy
 msgid "Group"
 msgstr "Ryhm�n nimi:"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 #, fuzzy
 msgid "Resource"
 msgstr "Paperil�hde:"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr ""
 
-#: 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:775
-#: calendar/gui/e-meeting-model.c:791
-#: 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 "Tuntematon"
-
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr ""
 
-#: 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:788
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr ""
 
-#: 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:816
+#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 #, fuzzy
 msgid "Needs Action"
 msgstr "Lis�� toiminto"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:817
+#: 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:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:818
+#: 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:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:819 calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 #, fuzzy
 msgid "Delegated"
 msgstr "Poistettu"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 #, fuzzy
 msgid "In Process"
 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: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:2088
 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: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:2118 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
-#: 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 "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:428
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:641
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:660
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-tasks.c:543
+msgid "Completing tasks..."
+msgstr ""
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Poista valitut kontaktit"
+
+#: calendar/gui/e-tasks.c:659
+msgid "Expunging"
+msgstr ""
+
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "P_oista t�m� tapaaminen"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1865
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
@@ -5163,272 +5396,255 @@ msgstr "Lokakuu"
 msgid "September"
 msgstr "Syyskuu"
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:220
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:570
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
 
-#: 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 "Su"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Ma"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Ti"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Ke"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "To"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Pe"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "La"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: 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: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 %b %d %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2205
-#, fuzzy
-msgid "Task"
-msgstr "_Teht�v�"
-
-#: calendar/gui/print.c:2262
-#, fuzzy, c-format
-msgid "Status: %s"
-msgstr "_Tila:"
-
-#: calendar/gui/print.c:2280
-#, fuzzy, c-format
-msgid "Priority: %s"
-msgstr "_Prioriteetti:"
-
-#: calendar/gui/print.c:2294
-#, fuzzy, c-format
-msgid "Percent Complete: %i"
-msgstr "Valmis"
-
-#: calendar/gui/print.c:2306
-#, fuzzy, c-format
-msgid "URL: %s"
-msgstr "URL:"
-
-#: calendar/gui/print.c:2320
-#, fuzzy, c-format
-msgid "Categories: %s"
-msgstr ""
-"\n"
-"Ryhm�t: "
-
-#: calendar/gui/print.c:2331
-#, fuzzy
-msgid "Contacts: "
-msgstr "Ko_ntaktit:"
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2358 my-evolution/e-summary.c:619
-#: 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Tulosta kohta"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Tulostusasetukset"
 
-#: 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 ""
+
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control-factory.c:75
+#: calendar/gui/tasks-control.c:456
 msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
+"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 ""
 
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "�l� kysy t�t� en�� uudelleen"
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Tulosta kortti"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5461,130 +5677,1723 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTKTPL"
 
-#: calendar/pcs/query.c:234
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+msgid "Factory to import iCalendar files into Evolution"
+msgstr ""
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+msgid "Imports iCalendar files into Evolution"
+msgstr ""
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+msgid "Imports vCalendar files into Evolution"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Kalenteri"
+
+#: 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 l�ysi Pinen s�hk�postitiedostoja.\n"
+"Haluatko tuoda n�m� Evolutioniin?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Kalenteri"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:258
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:263
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:300
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:305
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:339
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:344
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:371
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:376
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:412
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:508
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:513
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:650
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:655
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:679
+#: 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:721
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: 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)"
 msgstr ""
 
-#: calendar/pcs/query.c:821
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:866
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:871
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1159
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
-#: camel/camel-cipher-context.c:171
+#.
+#. * 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 "Djibouti"
+
+#: 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
+msgid "America/Adak"
+msgstr ""
+
+#: calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr ""
+
+#: calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr ""
+
+#: calendar/zones.h:62
+msgid "America/Antigua"
+msgstr ""
+
+#: calendar/zones.h:63
+#, fuzzy
+msgid "America/Araguaina"
+msgstr "Nicaragua"
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr ""
+
+#: calendar/zones.h:66
+#, fuzzy
+msgid "America/Barbados"
+msgstr "Barbados"
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: calendar/zones.h:68
+#, fuzzy
+msgid "America/Belize"
+msgstr "Belize"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+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
+msgid "America/Caracas"
+msgstr ""
+
+#: calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr ""
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+msgid "America/Cayman"
+msgstr ""
+
+#: calendar/zones.h:79
+msgid "America/Chicago"
+msgstr ""
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr ""
+
+#: calendar/zones.h:82
+#, fuzzy
+msgid "America/Costa_Rica"
+msgstr "Costa Rica"
+
+#: calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr ""
+
+#: calendar/zones.h:84
+msgid "America/Curacao"
+msgstr ""
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+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 "Dominica"
+
+#: calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr ""
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+#, fuzzy
+msgid "America/El_Salvador"
+msgstr "El Salvador"
+
+#: calendar/zones.h:94
+msgid "America/Fortaleza"
+msgstr ""
+
+#: calendar/zones.h:95
+msgid "America/Glace_Bay"
+msgstr ""
+
+#: calendar/zones.h:96
+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 "Grenada"
+
+#: calendar/zones.h:100
+#, fuzzy
+msgid "America/Guadeloupe"
+msgstr "Guadeloupe"
+
+#: calendar/zones.h:101
+#, fuzzy
+msgid "America/Guatemala"
+msgstr "Guatemala"
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+#, fuzzy
+msgid "America/Guyana"
+msgstr "Guyana"
+
+#: calendar/zones.h:104
+msgid "America/Halifax"
+msgstr ""
+
+#: calendar/zones.h:105
+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 "Jamaika"
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+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
+msgid "America/La_Paz"
+msgstr ""
+
+#: calendar/zones.h:120
+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
+msgid "America/Maceio"
+msgstr ""
+
+#: calendar/zones.h:124
+msgid "America/Managua"
+msgstr ""
+
+#: calendar/zones.h:125
+msgid "America/Manaus"
+msgstr ""
+
+#: calendar/zones.h:126
+msgid "America/Martinique"
+msgstr ""
+
+#: calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr ""
+
+#: calendar/zones.h:128
+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
+msgid "America/Montreal"
+msgstr ""
+
+#: calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr ""
+
+#: calendar/zones.h:137
+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
+msgid "America/Nome"
+msgstr ""
+
+#: calendar/zones.h:141
+msgid "America/Noronha"
+msgstr ""
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+#, fuzzy
+msgid "America/Panama"
+msgstr "Panama"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+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
+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
+msgid "America/Regina"
+msgstr ""
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+msgid "America/Rosario"
+msgstr ""
+
+#: calendar/zones.h:157
+msgid "America/Santiago"
+msgstr ""
+
+#: calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr ""
+
+#: calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr ""
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr ""
+
+#: calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr ""
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr ""
+
+#: calendar/zones.h:165
+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 "Azerbaidzan"
+
+#: calendar/zones.h:172
+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
+msgid "America/Yakutat"
+msgstr ""
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: calendar/zones.h:178
+msgid "Antarctica/Casey"
+msgstr ""
+
+#: calendar/zones.h:179
+msgid "Antarctica/Davis"
+msgstr ""
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: calendar/zones.h:181
+msgid "Antarctica/Mawson"
+msgstr ""
+
+#: calendar/zones.h:182
+msgid "Antarctica/McMurdo"
+msgstr ""
+
+#: calendar/zones.h:183
+msgid "Antarctica/Palmer"
+msgstr ""
+
+#: calendar/zones.h:184
+msgid "Antarctica/South_Pole"
+msgstr ""
+
+#: calendar/zones.h:185
+msgid "Antarctica/Syowa"
+msgstr ""
+
+#: calendar/zones.h:186
+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 "Bahrain"
+
+#: 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 "Kolumbia"
+
+#: 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 "Hong Kong"
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+#: calendar/zones.h:216
+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 "Kuwait"
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr ""
+
+#: calendar/zones.h:232
+msgid "Asia/Muscat"
+msgstr ""
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: calendar/zones.h:235
+msgid "Asia/Omsk"
+msgstr ""
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+#, fuzzy
+msgid "Asia/Qatar"
+msgstr "Qatar"
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:247
+#, fuzzy
+msgid "Asia/Singapore"
+msgstr "Singapore"
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+#, fuzzy
+msgid "Atlantic/Bermuda"
+msgstr "Bermudasaaret"
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+#, fuzzy
+msgid "Atlantic/Cape_Verde"
+msgstr "Kap Verde"
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+#, fuzzy
+msgid "Australia/Adelaide"
+msgstr "Australia"
+
+#: calendar/zones.h:274
+#, fuzzy
+msgid "Australia/Brisbane"
+msgstr "Australia"
+
+#: calendar/zones.h:275
+#, fuzzy
+msgid "Australia/Broken_Hill"
+msgstr "Australia"
+
+#: calendar/zones.h:276
+#, fuzzy
+msgid "Australia/Darwin"
+msgstr "Australia"
+
+#: calendar/zones.h:277
+#, fuzzy
+msgid "Australia/Hobart"
+msgstr "Australia"
+
+#: calendar/zones.h:278
+#, fuzzy
+msgid "Australia/Lindeman"
+msgstr "Australia"
+
+#: calendar/zones.h:279
+#, fuzzy
+msgid "Australia/Lord_Howe"
+msgstr "Australia"
+
+#: calendar/zones.h:280
+#, fuzzy
+msgid "Australia/Melbourne"
+msgstr "Australia"
+
+#: calendar/zones.h:281
+#, fuzzy
+msgid "Australia/Perth"
+msgstr "Australia"
+
+#: calendar/zones.h:282
+#, fuzzy
+msgid "Australia/Sydney"
+msgstr "Australia"
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:284
+msgid "Europe/Andorra"
+msgstr ""
+
+#: calendar/zones.h:285
+#, fuzzy
+msgid "Europe/Athens"
+msgstr "Ominaisuudet"
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:296
+#, fuzzy
+msgid "Europe/Gibraltar"
+msgstr "Gibraltar"
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:304
+#, fuzzy
+msgid "Europe/Luxembourg"
+msgstr "Luxemburg"
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr ""
+
+#: calendar/zones.h:308
+#, fuzzy
+msgid "Europe/Monaco"
+msgstr "Monaco"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr ""
+
+#: calendar/zones.h:312
+#, fuzzy
+msgid "Europe/Paris"
+msgstr "Ominaisuudet"
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:317
+#, fuzzy
+msgid "Europe/San_Marino"
+msgstr "San Marino"
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+msgid "Indian/Comoro"
+msgstr ""
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+#, fuzzy
+msgid "Indian/Mahe"
+msgstr "Intia"
+
+#: calendar/zones.h:341
+msgid "Indian/Maldives"
+msgstr ""
+
+#: calendar/zones.h:342
+#, fuzzy
+msgid "Indian/Mauritius"
+msgstr "Mauritius"
+
+#: calendar/zones.h:343
+msgid "Indian/Mayotte"
+msgstr ""
+
+#: calendar/zones.h:344
+msgid "Indian/Reunion"
+msgstr ""
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
+#: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:211
+#: 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
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:294
+#: camel/camel-cipher-context.c:292
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:336
+#: camel/camel-cipher-context.c:334
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
+#: camel/camel-data-cache.c:169
+msgid "Unable to create cache path"
+msgstr ""
+
+#: camel/camel-data-cache.c:441
+#, fuzzy, c-format
+msgid "Could not remove cache entry: %s: %s"
+msgstr "V�limuistihakemistoa ei voitu avata: %s"
+
 #: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
@@ -5609,108 +7418,108 @@ msgstr ""
 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:710 camel/camel-filter-driver.c:719
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, 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
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Virhe suoritettaessa suodatinta: %s: %s"
+
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viesti� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Viesti� ei voida avata"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viesti� %d / %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Virhe j�sennett�ess� suodatinta: %s: %s"
-
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Virhe suoritettaessa suodatinta: %s: %s"
+#: camel/camel-filter-search.c:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1040
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1080
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1262
-#, fuzzy
-msgid "Moving messages"
-msgstr "L�hetet��n viesti�"
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1038
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1078
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
+#: camel/camel-folder.c:1260
+#, fuzzy
+msgid "Moving messages"
+msgstr "L�hetet��n viesti�"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -5816,124 +7625,129 @@ msgstr ""
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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:755
+#: 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:953
+#: 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:959
+#: 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:970
+#: 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:1143
+#: 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:1153
+#: 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:1160
+#: 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:1169
+#: 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:1337
+#: 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:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1352
+#: 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-provider.c:130
+#: camel/camel-pgp-mime.c:354
+msgid "This is a digitally signed message part"
+msgstr ""
+
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Moduulin %s lataaminen ep�onnistui: J�rjestelm�si ei tue moduulien "
 "lataamista."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:264
+#: 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:267
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
+#: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -6031,13 +7845,14 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
-msgstr ""
+#, fuzzy
+msgid "Login"
+msgstr "l�htev�t"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
@@ -6047,9 +7862,20 @@ msgstr "T�m� valitsin yhdist�� palvelimeen yksinkertaista salasanaa k�ytt�en."
 msgid "Unknown authentication state."
 msgstr "Tuntematon todennustila."
 
+#: 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�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:301
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: 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"
 
@@ -6094,26 +7920,39 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:611
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:638
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:663
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:665
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Poistetaan kansiota %s"
+
+#: camel/camel-service.c:787
+msgid "Host lookup failed: host not found"
+msgstr ""
+
+#: camel/camel-service.c:790
+msgid "Host lookup failed: unknown reason"
+msgstr ""
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
@@ -6122,12 +7961,12 @@ msgstr ""
 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 ""
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6173,25 +8012,24 @@ msgstr "Viestin salauksen purkaminen ep�onnistui."
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
 msgstr ""
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:428
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6201,16 +8039,34 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: 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:491
 #, 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"
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
 msgstr ""
 
 #: camel/camel-url.c:288
@@ -6223,27 +8079,27 @@ msgstr "URL:n `%s' j�sent�minen ep�onnistui"
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Ei kyseist� viesti�: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
@@ -6252,76 +8108,76 @@ msgstr "Kansion hakeminen ei onnistu: %s: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Et voi kopioida viestej� t�st� roskakorista."
 
-#: camel/providers/imap/camel-imap-command.c:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-komento ep�onnistui: %s"
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Etsit��n muuttuneita viestej�"
 
-#: camel/providers/imap/camel-imap-folder.c:1566
-#: camel/providers/imap/camel-imap-folder.c:1978
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "T�t� viesti� ei ole juuri nyt saatavilla"
 
-#: camel/providers/imap/camel-imap-folder.c:1717
-#: camel/providers/imap/camel-imap-folder.c:1798
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1723
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Etsit��n uusia viestej�"
 
-#: camel/providers/imap/camel-imap-folder.c:2015
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: 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 "V�limuistihakemistoa ei voitu avata: %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
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
@@ -6334,7 +8190,7 @@ msgstr "Tarkastetaan onko uutta s�hk�postia"
 msgid "Check for new messages in all folders"
 msgstr "Etsi uusia viestej� kaikista kansioista"
 
-#: 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 "Kansiot"
 
@@ -6367,28 +8223,28 @@ msgstr ""
 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:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6396,104 +8252,125 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:64
 #, fuzzy
 msgid "Local delivery"
 msgstr "Paikalliset kansiot"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:76
+#: 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:82
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, 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 "Kansion hakeminen ei onnistu: %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 ""
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Hakemistoa %s ei voitu uudelleennimet� seuraavaksi: %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 ""
+"Tiedoston %s poistaminen ep�onnistui:\n"
+"%s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, 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:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -6514,7 +8391,7 @@ msgstr ""
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6524,7 +8401,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr ""
 
@@ -6533,7 +8410,7 @@ msgstr ""
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -6541,14 +8418,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Kansiota `%s' ei ole olemassa."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -6556,41 +8433,65 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kansion `%s' poistaminen ep�onnistui: %s"
 
-#: 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:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: 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 ""
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Tarkastetaan onko uutta s�hk�postia"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+#, fuzzy
+msgid "Storing folder"
+msgstr "Synkronoidaan kansiota"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -6607,9 +8508,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6619,138 +8520,126 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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' ei ole tavallinen tiedosto."
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#. 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 "Synkronoidaan kansiota"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, 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:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, 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:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: 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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
@@ -6770,12 +8659,12 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr "`%s' ei ole hakemisto."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-folder.c:512
+#: camel/providers/local/camel-spool-folder.c:515
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr ""
@@ -6786,6 +8675,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Kansiota `%s/%s' ei ole olemassa."
@@ -6795,77 +8685,56 @@ msgstr "Kansiota `%s/%s' ei ole olemassa."
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: 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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: 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/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "K�ytt�j�tunnuksen l�hetys palvelimelle ep�onnistui"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Ei saatu ryhm�luetteloa palvelimelta."
+#: 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/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"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/local/camel-spoold-store.c:173
 #, c-format
-msgid "Unable to save grouplist file for %s: %s"
+msgid "Mail tree %s"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
@@ -6876,161 +8745,195 @@ 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:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:495
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Ei kyseist� viesti�: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "Putken luonti ep�onnistui: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "IMAP-komento ep�onnistui: %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 "Etsit��n uusia viestej�"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "Tuntematon virhe: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:566
+#, fuzzy
+msgid "Use cancel"
+msgstr "Peruuta"
+
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "Virhe tallennettaessa tiedostoa: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Haetaan POP-yhteenvetoa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "Uusien viestien haku POP-palvelimelta ep�onnistui: %s"
+#: 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 "Peruutettu"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: 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:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "Viestin hakeminen ep�onnistui: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Viesti� ei saatu POP-palvelimelta %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 ""
 
-#: 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 "Haetaan POP-viesti� %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 "Kansion hakeminen ei onnistu: %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Tuntematon virhe"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "J�t� viestit palvelimelle"
 
-#: 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 "Poista %s:n p�iv�n kuluttua"
 
-#: 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:84
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, 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:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
+#: camel/providers/pop3/camel-pop3-store.c:210
+msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:214
-#, c-format
-msgid "Could not connect to server: %s"
+#: 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
+#, 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:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr ""
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "IMAP-komento ep�onnistui: %s"
 
-#: 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:416
+msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:381
-#: camel/providers/pop3/camel-pop3-store.c:418
-msgid "(Unknown)"
-msgstr "(tuntematon)"
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "I/O-virhe"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, c-format
+msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:566
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "Odottamaton vastaus POP-palvelimelta: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7040,49 +8943,50 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "URL:n `%s' j�sent�minen ep�onnistui"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: 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 ""
 
-#: 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 "Viestin l�hett�minen ep�onnistui: %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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr ""
-
-#: 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 ""
 
-#: 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"
 
@@ -7090,122 +8994,141 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: 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:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: 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:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr ""
 
-#: 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:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: 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: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:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: 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: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: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: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: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:205
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: 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:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr ""
 
-#: 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:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "V�liaikainen todennusvirhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:376
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+msgid "server does not appear to support SSL"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+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:415
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7213,127 +9136,126 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr "Viesti� ei voida l�hett��: l�hett�j�n osoitetta ei ole m��ritelty."
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:593 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "L�hetet��n viesti�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+#, 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
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "SMTP-todennus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: 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:1081
+msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
+#. 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
+msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1030
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+msgid "QUIT response error"
 msgstr ""
 
 #: composer/e-msg-composer-attachment-bar.c:101
@@ -7361,19 +9283,19 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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 "liite"
 
-#: 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 "Poista seuraavat tiedostot liiteluettelosta"
 
-#: composer/e-msg-composer-attachment-bar.c:531
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "Lis�� liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "Lis�� viestiin liitetiedoston"
 
@@ -7401,56 +9323,56 @@ msgid "MIME type:"
 msgstr "MIME-tyyppi:"
 
 #: 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:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "L�hett�j�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Kopiot:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:397
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Piilokopiot:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7458,12 +9380,12 @@ msgstr ""
 "Anna osoitteet joihin l�hetet��n kopiot viestist� ilman ett� muut "
 "vastaanottajat n�kisiv�t t�t� (Bcc)"
 
-#: 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 "Liit� tiedosto"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7472,58 +9394,48 @@ msgstr ""
 "Tiedoston %s lukeminen ep�onnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:894
-msgid "Save as..."
-msgstr "Tallenna nimell�..."
-
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Varoitus!"
 
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1019
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1077
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1091
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1100
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7532,7 +9444,7 @@ msgstr ""
 "Virhe tallennettaessa tiedostoa automaattisesti: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1202
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7540,7 +9452,7 @@ msgstr ""
 "Ximian Evolution on l�yt�nyt tallentamattomia tiedostoja edelliselt� \n"
 "istunnolta. Haluatko koettaa niiden palauttamista?"
 
-#: composer/e-msg-composer.c:1356
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7550,29 +9462,29 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:1363
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Varoitus: Muutettu viesti"
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:1535
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Liit� tiedosto"
 
-#: composer/e-msg-composer.c:1910 composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:2368
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2391 composer/e-msg-composer.c:2446
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7580,24 +9492,25 @@ msgstr ""
 "Viestimuokkain -ikkunan luominen ep�onnistui:\n"
 "HTML-muokkainkomponentin k�ynnistys ei onnistunut."
 
-#: 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."
 msgstr ""
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutionin muokkaimen alustus ei onnistunut."
 
-#: 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:1
 msgid "The Evolution groupware suite"
 msgstr ""
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Evolution"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr ""
@@ -7638,15 +9551,33 @@ 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
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Saman niminen tiedosto on jo olemassa.\n"
+"Kirjoitetaanko sen yli?"
+
 #. Remember the password?
-#: e-util/e-passwords.c:347 mail/mail-session.c:267
+#: e-util/e-passwords.c:363 mail/mail-session.c:269
 msgid "Remember this password"
 msgstr "Muista t�m� salasana"
 
-#: e-util/e-passwords.c:349 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 ""
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "Ryhm�t"
+
 #. 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
@@ -7718,13 +9649,13 @@ 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"
 
 #. 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"
 
@@ -7765,11 +9696,7 @@ msgstr "tunti"
 msgid "minute"
 msgstr "minuutti"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "sekunti"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -7836,7 +9763,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -7849,33 +9776,25 @@ msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "Sitten"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Lis�� toiminto"
 
-#: 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."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:364
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:267
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:314
-msgid "<click here to select a folder>"
-msgstr ""
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -7883,7 +9802,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr ""
 
@@ -7892,39 +9811,40 @@ msgstr ""
 msgid "You must name this filter."
 msgstr "Muuta t�m�n kansion nime�"
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "S��nn�n nimi: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Nimet�n"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "kaikki ehdot t�ytet��n"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "mik��n ehdoista t�yttyy"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Lis�� ehto"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "tulevat"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "l�htev�t"
 
@@ -7968,6 +9888,11 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr ""
@@ -7980,6 +9905,11 @@ msgstr ""
 msgid "Attachments"
 msgstr "Liitteet"
 
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belize"
+
 #: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "sis�lt��"
@@ -8033,144 +9963,153 @@ msgid "ends with"
 msgstr "loppuu merkkijonoon"
 
 #: filter/libfilter-i18n.h:21
-msgid "Exist"
+msgid "Execute Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "exists"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Expression"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Important"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr "on"
+msgid "Follow Up"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "on suurempi kuin"
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr "on pienempi kuin"
+msgid "is"
+msgstr "on"
 
 #: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr "ei ole"
+#, fuzzy
+msgid "is after"
+msgstr "j�lkeen"
 
 #: filter/libfilter-i18n.h:29
-msgid "Mailing list"
-msgstr ""
+#, fuzzy
+msgid "is before"
+msgstr "ennen"
 
 #: filter/libfilter-i18n.h:30
-msgid "Message Body"
+msgid "is Flagged"
 msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "Message Header"
-msgstr "Viestin otsikko"
+msgid "is greater than"
+msgstr "on suurempi kuin"
 
 #: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr "Viesti vastaanotettu"
+msgid "is less than"
+msgstr "on pienempi kuin"
 
 #: filter/libfilter-i18n.h:33
-msgid "Message was sent"
-msgstr "Viesti l�hetetty"
+msgid "is not"
+msgstr "ei ole"
 
 #: filter/libfilter-i18n.h:34
-msgid "Move to Folder"
-msgstr "Siirr� kansioon"
+#, fuzzy
+msgid "is not Flagged"
+msgstr "ei ole"
 
 #: filter/libfilter-i18n.h:35
-msgid "on or after"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "on or before"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
+msgid "Message Header"
+msgstr "Viestin otsikko"
+
+#: filter/libfilter-i18n.h:38
+msgid "Move to Folder"
+msgstr "Siirr� kansioon"
+
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "Puola"
+
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Lue"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr ""
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1404
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "L�hett�j�"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Koko (kt)"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "alkaa merkkijonolla"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Aihe"
 
-#: 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 "S��nn�t"
 
-#: filter/rule-editor.c:278
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Lis�� s��nt�"
 
-#: filter/rule-editor.c:344
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Muokkaa s��nt��"
 
@@ -8191,30 +10130,30 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: 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 "Tuodaan..."
 
-#: 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 "Odota, ole hyv�"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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:101
 msgid "Mail"
 msgstr ""
 
@@ -8242,23 +10181,74 @@ msgstr ""
 "Evolution l�ysi GnomeCardin tiedostoja.\n"
 "Haluatko tuoda n�m� Evolutioniin?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "_Prioriteetti:"
+
+#: 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 ""
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Roskakori"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Paikallinen viestitiedosto %s"
+
+#: 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:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Asetukset"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Suodattimet"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8284,46 +10274,91 @@ msgid "Pine"
 msgstr "Tulosta"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
+msgid "Composer Preferences"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
+msgid "Configuration control for the Evolution Display Fonts."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
+msgid "Configuration control for the Evolution Mail Accounts."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
+msgid "Configuration control for the Evolution Mailer."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
+msgid "Configuration control for the Evolution Message Composer."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
+msgid "Evolution component for handling mail."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Mail Summary component."
+msgid "Evolution mail composer."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Evolution mail executive summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Evolution mail folder display component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+msgid "Evolution mail folder factory component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+msgid "Factory for the Evolution composer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+msgid "Font Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Tilit"
+
+#: 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 ""
 
-#: mail/component-factory.c:100
+#: 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:101
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr ""
-
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr ""
@@ -8332,234 +10367,256 @@ msgstr ""
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:129
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "T�m� kansio ei voi sis�lt�� viestej�."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Ominaisuudet..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Muuta t�m�n kansion ominaisuuksia"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/component-factory.c:967
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:951
-#, fuzzy
-msgid "New _Mail Message"
-msgstr "Seuraava viesti"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr ""
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1009
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Peruutetaan..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:271
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Kansion \"%s\" ominaisuudet"
 
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Poistettu"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d l�hett�m�t�nt�"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d l�hett�m�t�nt�"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d yhteens�"
 
-#: mail/folder-browser.c:1049
+#: mail/folder-browser.c:1088
 #, fuzzy
-msgid "Create vFolder from Search"
+msgid "Create _Virtual Folder From Search..."
 msgstr "_Luo viestist� suodatin"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Suodata _l�hett�j�n mukaan"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Tulosta viesti..."
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:104
-msgid "_Save As..."
-msgstr "Tallenna _nimell�..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Vastaa l�hett�j�lle"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_V�lit�"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Valmis"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Kalenteri"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Merkitse t�rke�ks_i"
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
-msgstr ""
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
+msgstr "Merkitse t�rke�ks_i"
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Palauta"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "_Siirr� kansioon..."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:106
-msgid "_Undelete"
-msgstr "_Palauta"
+#: mail/folder-browser.c:1645
+msgid "Label"
+msgstr ""
 
-#: mail/folder-browser.c:1473
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Lis�� l�hett�j� osoitekirjaan"
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Toteuta suodattimet"
 
-#: mail/folder-browser.c:1478
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "_Luo viestist� s��nt�"
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "Suodata postituslistan mukaan"
 
-#: 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:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
-msgstr ""
-
-#: mail/folder-browser.h:26
-#, fuzzy
-msgid "Default"
-msgstr "_Oletukset"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "Suodata postituslistan mukaan (%s)"
 
 #: mail/folder-info.c:64
 #, fuzzy
@@ -8583,42 +10640,34 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
 #: mail/local-config.glade.h:1
-#, fuzzy
-msgid "Body contents"
-msgstr "sis�lt��"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr ""
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr ""
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr ""
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "sis�lt��"
 
-#: 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:4
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr ""
 
-#: 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:9
 msgid "mh"
 msgstr ""
 
@@ -8636,87 +10685,78 @@ msgstr "Evolutionin keskusteluryhm�muokkain"
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:962
-msgid "Could not save signature file."
-msgstr "Allekirjoitustiedoston luonti ep�onnistui."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Is�nt�palvelin:"
 
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "Tallenna allekirjoitus"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "K�ytt�j�t_unnus:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "_Polku:"
 
-#: mail/mail-account-gui.c:1045
+#: 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 ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"T�t� allekirjoitusta on muutettu, mutta sit� ei ole tallennettu.\n"
-"\n"
-"Haluatko tallentaa muutokset?"
 
-#: mail/mail-account-gui.c:1654
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (oletus)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "�l� k�yt�"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "K�yt�"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa t�m�n tilin?"
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "�l� poista"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Poistetaanko tili todella?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-msgid "Are you sure you want to delete this news account?"
-msgstr "Haluatko varmasti poistaa t�m�n keskusteluryhm�tilin?"
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "�l� k�yt�"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:783 mail/mail-config.glade.h:42
-#, fuzzy
-msgid "Mail Settings"
-msgstr "_S�hk�postiasetukset..."
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "K�yt�"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr ""
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "Haluatko varmasti poistaa t�m�n keskusteluryhm�tilin?"
 
-#: mail/mail-autofilter.c:215
-#, c-format
-msgid "Subject is %s"
-msgstr "Aihe on %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "K�yt�"
 
-#: mail/mail-autofilter.c:231
-#, c-format
-msgid "Mail from %s"
-msgstr ""
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "_Tilin nimi:"
 
-#: mail/mail-autofilter.c:287
-#, c-format
-msgid "%s mailing list"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Lis�� suodatuss��nt�"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8728,35 +10768,31 @@ msgstr ""
 "vastaanottaa tai kirjoittaa viestej�.\n"
 "Haluatko tehd� asetukset nyt?"
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: 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:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:280
+#: mail/mail-callbacks.c:209
 #, fuzzy
 msgid "Send anyway?"
 msgstr "L�het� s�hk�postia"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8764,59 +10800,61 @@ msgstr ""
 "Viestill� ei ole aihetta.\n"
 "L�hetet��nk� toedella?"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 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:299
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 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:469
-msgid "This message contains invalid recipients:"
-msgstr ""
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 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:600
+#: mail/mail-callbacks.c:497
 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:838
+#: mail/mail-callbacks.c:623
+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
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Tuntematon virhe"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Siirr� viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1283 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1753
+#: mail/mail-callbacks.c:2091
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1778
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8824,7 +10862,7 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8832,28 +10870,39 @@ msgstr ""
 "Voit l�hett�� uudelleen vain\n"
 "\"L�hetetyt\"-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:1831
+#: mail/mail-callbacks.c:2169
 #, 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:1857
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Ei viestej� valittuna"
 
-#: mail/mail-callbacks.c:1951
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Kirjoita tiedoston yli?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimell�..."
 
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimell�..."
 
-#: mail/mail-callbacks.c:2122 widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Varoitus"
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "N�yt� seuraava lukematon viesti"
+
+#: mail/mail-callbacks.c:2373
+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:2129
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8861,31 +10910,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2136
-#, fuzzy
-msgid "Do not ask me again."
-msgstr "�l� kysy t�t� en�� uudelleen"
-
-#: mail/mail-callbacks.c:2244
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2256
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: mail/mail-callbacks.c:2319
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Haetaan viesti� %d / %d"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2863
+msgid "US-Letter"
+msgstr ""
+
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Viestin tulostus ep�onnistui"
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8927,17 +10980,35 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-config.c:326
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "Tili"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Ty�viikk_o"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
 
-#: mail/mail-config.c:1859
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: mail/mail-config.c:78 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"
@@ -8945,90 +11016,152 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, fuzzy, c-format
-msgid "%s: Inbox"
-msgstr "Saapuneet"
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2183 mail/mail-config.c:2187
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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:2
-msgid " color"
-msgstr " "
+#: mail/mail-config.glade.h:5
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
-msgid "Account"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
 msgstr "Tili"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "Tilit"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Peruuta operaatio"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:12
+msgid "Afrikaans"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:13
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: 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
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Lis�� viestiin liitetiedoston"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Liite"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Todennus"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "T_arkasta onko uutta postia joka"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+msgid "C_haracter set:"
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_Sulje"
+
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Tarkastetaan onko uutta s�hk�postia"
 
-#: mail/mail-config.glade.h:14
-msgid "Composer"
-msgstr "Muokkain"
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Composing Messages"
+msgstr "Kirjoita viesti"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:16
-msgid "Confirm when Expunging a folder"
-msgstr ""
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9038,366 +11171,577 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: 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:24
-msgid "Default Forward style is: "
-msgstr ""
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Tuleva posti"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr ""
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Viesti� ei voida avata"
 
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Luonnokset"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Luonnoskansio:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "K�_yt�"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Muokkaa..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
-msgstr "K�yt�"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "S�hk�posti"
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "S�hk�posti sis�lt��"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "S�hk�postiosoite:"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "Tyhj_enn� roskakorit lopetettaessa"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "Suorita toiminnot"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "loppuu merkkijonoon"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Ominaisuudet"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "V�litetyt viestit"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
-msgid "HTML signature file:"
-msgstr "HTML-allekirjoitustiedosto:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Korosta lainaukset v�rill�"
+
+#: mail/mail-config.glade.h:59
+msgid "Hulu"
+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 ""
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr ""
-
-#: 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 "Tallenna ja sulje"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Lataa k_uvat"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
-msgstr "Tee t�st� _oletustilini"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Viestin otsikko"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "Viestit"
+
+#: mail/mail-config.glade.h:74
+msgid "Microsoft"
+msgstr ""
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP-palvelin"
 
-#: mail/mail-config.glade.h:46
-msgid "News"
-msgstr "Keskusteluryhm�t"
+#: mail/mail-config.glade.h:77
+msgid "New Mail Notification"
+msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "NNTP-palvelin"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organi_saatio:"
+
+#: mail/mail-config.glade.h:83
+msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Valitse v�ri"
 
-#: mail/mail-config.glade.h:54
-msgid "Pretty Good Privacy"
-msgstr ""
-
-#: mail/mail-config.glade.h:55
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
+#: mail/mail-config.glade.h:88
+#, 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:56
-msgid "Prompt when sending messages with an _empty subject"
+#: mail/mail-config.glade.h:89
+msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr ""
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Tulosta valitut kontaktit"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Viesti� ei voida avata"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Muista t�m� salasana"
 
-#: 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 "Vastausosoite:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Otetaan vastaan s�hk�postia"
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
-msgstr "Tuleva posti"
-
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Hakuasetukset"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Muista t�m� salasana"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+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:67
-msgid "Security"
-msgstr "Turvallisuus"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "Valitse PGP-ohjelma"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "L�hetet��n s�hk�postia"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Allekirjoitustiedosto:"
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
-msgstr "L�htev� posti"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Poista kaikki paitsi allekirjoitus"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "L�hetetyt"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "L�hetet��n s�hk�postia"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "L�hetettyjen kansio:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "L�hetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
-msgstr "Allekirjoitustiedosto:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Oikotiet"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Tallenna allekirjoitus"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "L�hde"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "L�hteen tiedot"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "L�hteet"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "Tyylin nimi:"
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
-msgstr "Erikoiskansiot"
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:128
+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 s_ecure connection (SSL)"
-msgstr "K�yt� salattua yhteytt� (_SSL)"
+msgid "Use _HTML for this signature"
+msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:132
+msgid "V_ariable-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: 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:92
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Todennustapa:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "Todennustapa:"
+
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
+msgid "_Confirm when expunging a folder"
+msgstr ""
+
+#: mail/mail-config.glade.h:149
 #, fuzzy
-msgid "_Drafts folder:"
-msgstr "Luonnoskansio:"
+msgid "_Defaults"
+msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
-msgstr "S�hk�postiosoit_e:"
+#: mail/mail-config.glade.h:151
+msgid "_Do not notify me when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
-msgstr "Tyhj_enn� roskakorit lopetettaessa"
+#: mail/mail-config.glade.h:153
+msgid "_Enable spell checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:154
+#, fuzzy
+msgid "_Filename:"
+msgstr "Tiedostonimi:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "_V�litet� viesti"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "_Koko nimi:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:159
+#, 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:103
-msgid "_Highlight citations with"
-msgstr "_Korosta lainaukset v�rill�"
+#: mail/mail-config.glade.h:162
+msgid "_Identity"
+msgstr ""
 
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
-msgstr "_Is�nt�palvelin:"
+#: mail/mail-config.glade.h:163
+msgid "_Language:"
+msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
-msgstr ""
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Tee t�st� _oletustilini"
 
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
-msgid "_Organization:"
-msgstr "_Organisaatio:"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "_PGP-ohjelman polku:"
 
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
-msgstr "_Polku:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
-msgstr "_Muista t�m� salasana"
+#: mail/mail-config.glade.h:172
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr ""
 
-#: mail/mail-config.glade.h:114
-msgid "_Send mail in HTML format by default."
-msgstr "L�het� s�hk�postit oletuksena _HTML-muodossa."
+#: mail/mail-config.glade.h:173
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:174
+msgid "_Random"
+msgstr ""
+
+#: mail/mail-config.glade.h:175
 #, fuzzy
-msgid "_Server Type: "
-msgstr "Palvelintyyppi: "
+msgid "_Receiving Mail"
+msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:116
-msgid "_Signature file:"
-msgstr "Allekirjoitu_stiedosto:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Vastaa kaikille"
 
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
-msgstr "K�ytt�j�t_unnus:"
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "Turvalli_suus"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "Turvalli_suus"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "L�htev� posti"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "N�yt�"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+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
+msgid "_Variable-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "_every"
 msgstr "Joka"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " "
+
+#: mail/mail-config.glade.h:188
 #, fuzzy
 msgid "description"
 msgstr "Kuvaus:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr ""
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr "sekuntia."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr ""
@@ -9434,183 +11778,176 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Tallenna liite"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr ""
 
-#: 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 ""
 
-#: 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 "Piilota"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Ulkoinen katselin"
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Ladataan viestin sis�lt��"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:1594
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Kopioi linkin sijainti"
 
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Tallenna linkki nimell�"
 
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Tallenna kuva nimell�..."
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "P�iv�ys"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Ep�kelpo osoite"
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "L�hett�j�"
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Vastausosoite:"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Kopiot:"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 #, fuzzy
 msgid "Bcc"
 msgstr "Piilokopiot:"
 
-#: mail/mail-format.c:1813
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-
-#: mail/mail-format.c:1836
-msgid "Evolution does not recognize this type of signed message."
-msgstr ""
-
-#: mail/mail-format.c:1844
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1852
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
+msgstr "_Matkapuhelin"
 
-#: mail/mail-format.c:2068
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2087
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2129
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synkronoidaan kansiota"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, 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:762
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr "Et voi muuttaa ei-paikallisen kansion tyyppi�."
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Synkronoidaan kansiota"
@@ -9633,157 +11970,157 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr ""
 
-#: 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:557
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "L�hetet��n \"%s\""
 
-#: mail/mail-ops.c:677
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "L�hetet��n viesti� %d / %d"
 
-#: mail/mail-ops.c:696
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: 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 "Valmis."
 
-#: mail/mail-ops.c:791
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Siirret��n"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Roskakori"
-
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "V�litetyt viestit"
 
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1518
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viesti� %s"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Haetaan %d viesti(�)"
 
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Tallennetaan %d viesti(�)"
 
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2138
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Hakuasetukset"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Etsi"
 
@@ -9823,67 +12160,91 @@ msgstr "Osumia:"
 msgid "Cancelling..."
 msgstr "Peruutetaan..."
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:246
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tyyppi:"
 
-#: mail/mail-send-recv.c:286
+#: mail/mail-send-recv.c:287
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "L�het� & Vastaanota postia"
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:289
 #, fuzzy
 msgid "Cancel All"
 msgstr "Peruuta"
 
-#: mail/mail-send-recv.c:348
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "P�ivitet��n..."
 
-#: 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 "Odotetaan..."
 
-#: mail/mail-send-recv.c:533
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Peruutettu."
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 #, fuzzy
 msgid "Enter Password"
 msgstr "Salasana"
 
-#: mail/mail-tools.c:255
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Allekirjoitustiedoston luonti ep�onnistui."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Tallenna allekirjoitus"
+
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"T�t� allekirjoitusta on muutettu, mutta sit� ei ole tallennettu.\n"
+"\n"
+"Haluatko tallentaa muutokset?"
+
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "Allekirjoitustiedosto:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "V�litetty viesti - %s"
 
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "V�litetty viesti"
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "V�litetty viesti"
 
@@ -9906,106 +12267,163 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
+#: mail/mail-vfolder.c:785
 #, fuzzy
-msgid "VFolders"
+msgid "vFolders"
 msgstr "Kansiot"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:825
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Kansio"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:841
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:895
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Ei aihetta)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Viesti"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "N�hty"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "N�kem�tt�"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Vastattu"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:643
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:647
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:648
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "T�n��n %l:%M %p"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
-#: mail/message-list.etspec.h:2
-msgid "Flagged"
+#: mail/message-list.etspec.h:3
+msgid "Due By"
 msgstr ""
 
 #: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Tila"
+
+#: mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Otettu vastaan"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Koko"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "Peruutettu"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "V�lit�"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "L�hteen tiedot"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "V�lit�"
+
+#: 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 "Vastaa"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Vastaa kaikille"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Esikatselu:"
+
+#: 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\""
@@ -10027,7 +12445,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #: 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 "Kansio"
 
@@ -10077,90 +12495,10801 @@ msgid "_Unsubscribe"
 msgstr "Poista tilaus"
 
 #: 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"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+msgid "Factory for Evolution Summary's configuration control."
 msgstr ""
 
-#: my-evolution/component-factory.c:153
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
 #, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
+msgid "Factory for the Evolution Summary component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Yhteenveto sis�lt��"
+
+#: 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
+#, fuzzy
+msgid "Aarhus"
+msgstr "Valko-Ven�j�"
+
+#: my-evolution/Locations.h:2
+#, fuzzy
+msgid "Abakan"
+msgstr "Azerbaidzan"
+
+#: my-evolution/Locations.h:3
+msgid "Abbotsford"
+msgstr ""
+
+#: my-evolution/Locations.h:4
+#, fuzzy
+msgid "Aberdeen"
+msgstr "Osanottaja"
+
+#: my-evolution/Locations.h:5
+#, fuzzy
+msgid "Abha"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:6
+#, fuzzy
+msgid "Abilene"
+msgstr "Matkapuhelin"
+
+#: 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 "Nicaragua"
+
+#: my-evolution/Locations.h:13
+msgid "Adak"
+msgstr ""
+
+#: my-evolution/Locations.h:14
+#, fuzzy
+msgid "Adana"
+msgstr "Edistynyt"
+
+#: my-evolution/Locations.h:15
+msgid "Adana/Incirlik"
+msgstr ""
+
+#: my-evolution/Locations.h:16
+msgid "Adelaide"
+msgstr ""
+
+#: my-evolution/Locations.h:17
+#, fuzzy
+msgid "Aden"
+msgstr "Ruotsi"
+
+#: my-evolution/Locations.h:18
+#, fuzzy
+msgid "Adrar"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:19
+msgid "Aeroparque"
+msgstr ""
+
+#: my-evolution/Locations.h:20
+msgid "Aeropuerto del Norte"
+msgstr ""
+
+#: my-evolution/Locations.h:21
+msgid "Afonsos"
+msgstr ""
+
+#: my-evolution/Locations.h:22
+#, fuzzy
+msgid "Africa"
+msgstr "Etel�-Afrikka"
+
+#: my-evolution/Locations.h:23
+msgid "Afyon"
+msgstr ""
+
+#: my-evolution/Locations.h:24
+#, fuzzy
+msgid "Agen"
+msgstr "Argentiina"
+
+#: my-evolution/Locations.h:25
+#, fuzzy
+msgid "Aguascaliantes"
+msgstr "Australia"
+
+#: 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 "Panama"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:39
+msgid "Alamosa"
+msgstr ""
+
+#: my-evolution/Locations.h:40
+#, fuzzy
+msgid "Alaska"
+msgstr "_Teht�v�"
+
+#: my-evolution/Locations.h:41
+msgid "Al Baha"
+msgstr ""
+
+#: my-evolution/Locations.h:43
+msgid "Albany"
+msgstr ""
+
+#: my-evolution/Locations.h:44
+msgid "Albenga"
+msgstr ""
+
+#: my-evolution/Locations.h:45
+msgid "Alberta"
+msgstr ""
+
+#: my-evolution/Locations.h:46
+msgid "Alborg"
+msgstr ""
+
+#: my-evolution/Locations.h:47
+msgid "Albuquerque"
+msgstr ""
+
+#: my-evolution/Locations.h:48
+#, fuzzy
+msgid "Alderney"
+msgstr "Kansion nimi:"
+
+#: my-evolution/Locations.h:49
+msgid "Alesund"
+msgstr ""
+
+#: my-evolution/Locations.h:50
+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 "Korkeampi"
+
+#: my-evolution/Locations.h:56
+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 ""
+
+#: my-evolution/Locations.h:62
+#, fuzzy
+msgid "Alliance"
+msgstr "Edistynyt"
+
+#: my-evolution/Locations.h:63
+msgid "Alma"
+msgstr ""
+
+#: my-evolution/Locations.h:64
+#, fuzzy
+msgid "Almeria"
+msgstr "Armenia"
+
+#: my-evolution/Locations.h:65
+#, fuzzy
+msgid "Alpena"
+msgstr "Armenia"
+
+#: my-evolution/Locations.h:66
+msgid "Al Qaysumah"
+msgstr ""
+
+#: my-evolution/Locations.h:67
+#, fuzzy
+msgid "Alta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:68
+msgid "Altamira"
+msgstr ""
+
+#: my-evolution/Locations.h:69
+#, fuzzy
+msgid "Alton"
+msgstr "T_oiminnot"
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr ""
+
+#: my-evolution/Locations.h:71
+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 ""
+
+#: my-evolution/Locations.h:75
+#, fuzzy
+msgid "Amarillo"
+msgstr "S�hk�posti"
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr ""
+
+#: my-evolution/Locations.h:77
+#, fuzzy
+msgid "Ambler"
+msgstr "Joulukuu"
+
+#: my-evolution/Locations.h:78
+#, fuzzy
+msgid "Amelia"
+msgstr "Armenia"
+
+#: my-evolution/Locations.h:79
+#, fuzzy
+msgid "Amendola"
+msgstr "Armenia"
+
+#: my-evolution/Locations.h:80
+#, fuzzy
+msgid "Ames"
+msgstr "Suodattimet"
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr ""
+
+#: my-evolution/Locations.h:82
+#, fuzzy
+msgid "Amsterdam"
+msgstr "It�valta"
+
+#: my-evolution/Locations.h:83
+msgid "Anadyr"
+msgstr ""
+
+#: my-evolution/Locations.h:84
+msgid "Anaktuvuk"
+msgstr ""
+
+#: my-evolution/Locations.h:85
+#, fuzzy
+msgid "Anapa"
+msgstr "Japani"
+
+#: my-evolution/Locations.h:86
+msgid "Anchorage"
+msgstr ""
+
+#: my-evolution/Locations.h:87
+msgid "Anchorage - Elmendorf AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:88
+#, fuzzy
+msgid "Ancona"
+msgstr "Tili"
+
+#: my-evolution/Locations.h:89
+msgid "Andahuayla"
+msgstr ""
+
+#: my-evolution/Locations.h:90
+msgid "Anderson"
+msgstr ""
+
+#: my-evolution/Locations.h:91
+msgid "Andoya"
+msgstr ""
+
+#: my-evolution/Locations.h:92
+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 "Armenia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:101
+msgid "Anniston"
+msgstr ""
+
+#: my-evolution/Locations.h:102
+#, fuzzy
+msgid "Antalya"
+msgstr "Italia"
+
+#: my-evolution/Locations.h:103
+#, fuzzy
+msgid "Antartica"
+msgstr "It�valta"
+
+#: my-evolution/Locations.h:104
+msgid "Antigo"
+msgstr ""
+
+#: my-evolution/Locations.h:105
+#, fuzzy
+msgid "Antigua"
+msgstr "Argentiina"
+
+#: my-evolution/Locations.h:106
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: my-evolution/Locations.h:107
+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
+msgid "Apalachicola"
+msgstr ""
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr ""
+
+#: my-evolution/Locations.h:112
+msgid "Aquadilla"
+msgstr ""
+
+#: my-evolution/Locations.h:113
+msgid "Aracaju"
+msgstr ""
+
+#: my-evolution/Locations.h:114
+#, fuzzy
+msgid "Arad"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:115
+#, fuzzy
+msgid "Arar"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:116
+#, fuzzy
+msgid "Araxos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:117
+#, fuzzy
+msgid "Arcata"
+msgstr "Kroatia"
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr ""
+
+#: my-evolution/Locations.h:119
+#, fuzzy
+msgid "Arequipa"
+msgstr "Armenia"
+
+#: my-evolution/Locations.h:121
+#, fuzzy
+msgid "Arica"
+msgstr "Armenia"
+
+#: my-evolution/Locations.h:122
+#, fuzzy
+msgid "Arizona"
+msgstr "Argentiina"
+
+#: my-evolution/Locations.h:123
+msgid "Arkansas"
+msgstr ""
+
+#: my-evolution/Locations.h:124
+msgid "Arkhangelsk"
+msgstr ""
+
+#: my-evolution/Locations.h:125
+#, fuzzy
+msgid "Arlington"
+msgstr "Suunta"
+
+#: my-evolution/Locations.h:126
+#, fuzzy
+msgid "Artigas"
+msgstr "Argentiina"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:131
+msgid "Ashfield"
+msgstr ""
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:133
+#, fuzzy
+msgid "Ashland"
+msgstr "Thaimaa"
+
+#: my-evolution/Locations.h:134
+#, fuzzy
+msgid "Asia"
+msgstr "It�valta"
+
+#: my-evolution/Locations.h:135
+#, fuzzy
+msgid "Aspen"
+msgstr "Avaa"
+
+#: my-evolution/Locations.h:136
+msgid "Asswan"
+msgstr ""
+
+#: my-evolution/Locations.h:137
+#, fuzzy
+msgid "Astoria"
+msgstr "It�valta"
+
+#: my-evolution/Locations.h:138
+#, fuzzy
+msgid "Astrakhan"
+msgstr "Australia"
+
+#: my-evolution/Locations.h:139
+#, fuzzy
+msgid "Asturias"
+msgstr "It�valta"
+
+#: my-evolution/Locations.h:140
+#, fuzzy
+msgid "Asuncion"
+msgstr "Todennus"
+
+#: my-evolution/Locations.h:141
+#, fuzzy
+msgid "Athens"
+msgstr "Liitteet"
+
+#: my-evolution/Locations.h:142
+#, fuzzy
+msgid "Athinai"
+msgstr "Kiina"
+
+#: my-evolution/Locations.h:143
+#, fuzzy
+msgid "Atlanta"
+msgstr "Liit�"
+
+#: my-evolution/Locations.h:144
+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 "Islanti"
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:150
+#, fuzzy
+msgid "Augusta"
+msgstr "Elokuu"
+
+#: my-evolution/Locations.h:151
+#, fuzzy
+msgid "Aurora"
+msgstr "It�valta"
+
+#: my-evolution/Locations.h:152
+#, fuzzy
+msgid "Austin"
+msgstr "It�valta"
+
+#: my-evolution/Locations.h:153
+#, fuzzy
+msgid "Australasia"
+msgstr "Australia"
+
+#: my-evolution/Locations.h:156
+msgid "Avalon"
+msgstr ""
+
+#: my-evolution/Locations.h:157
+msgid "Aviano"
+msgstr ""
+
+#: my-evolution/Locations.h:158
+msgid "Ayacucho"
+msgstr ""
+
+#: my-evolution/Locations.h:159
+#, fuzzy
+msgid "Bage"
+msgstr "Sivu"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:170
+#, fuzzy
+msgid "Ball Mountain"
+msgstr "S�hk�posti sis�lt��"
+
+#: my-evolution/Locations.h:171
+#, fuzzy
+msgid "Baltimore"
+msgstr "Balttilainen"
+
+#: my-evolution/Locations.h:172
+msgid "Baltimore-Glen Burnie"
+msgstr ""
+
+#: my-evolution/Locations.h:173
+#, fuzzy
+msgid "Banak"
+msgstr "Botswana"
+
+#: my-evolution/Locations.h:174
+#, fuzzy
+msgid "Bandarabbass"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:175
+msgid "Bangor"
+msgstr ""
+
+#: my-evolution/Locations.h:176
+#, fuzzy
+msgid "Baracoa"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:177
+msgid "Barbers Point"
+msgstr ""
+
+#: my-evolution/Locations.h:178
+msgid "Barcelona"
+msgstr ""
+
+#: my-evolution/Locations.h:179
+#, fuzzy
+msgid "Bardufoss"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:180
+msgid "Bar Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:181
+#, fuzzy
+msgid "Bari"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:182
+msgid "Bariloche"
+msgstr ""
+
+#: my-evolution/Locations.h:183
+#, fuzzy
+msgid "Barinas"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:184
+msgid "Barking Sand"
+msgstr ""
+
+#: my-evolution/Locations.h:185
+msgid "Barksdale"
+msgstr ""
+
+#: my-evolution/Locations.h:186
+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 "F�rsaaret"
+
+#: 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 "Latvia"
+
+#: my-evolution/Locations.h:194
+msgid "Batesville"
+msgstr ""
+
+#: my-evolution/Locations.h:195
+#, fuzzy
+msgid "Batman"
+msgstr "Bhutan"
+
+#: my-evolution/Locations.h:196
+msgid "Baton Rouge"
+msgstr ""
+
+#: my-evolution/Locations.h:197
+msgid "Battle Creek"
+msgstr ""
+
+#: my-evolution/Locations.h:198
+#, fuzzy
+msgid "Battle Mountain"
+msgstr "Nimi sis�lt��"
+
+#: my-evolution/Locations.h:199
+#, fuzzy
+msgid "Bauru"
+msgstr "Valko-Ven�j�"
+
+#: my-evolution/Locations.h:200
+#, fuzzy
+msgid "Bayamo"
+msgstr "Bahamasaaret"
+
+#: my-evolution/Locations.h:201
+msgid "Bayreuth"
+msgstr ""
+
+#: my-evolution/Locations.h:202
+#, fuzzy
+msgid "Beatrice"
+msgstr "Balttilainen"
+
+#: my-evolution/Locations.h:203
+msgid "Beaufort"
+msgstr ""
+
+#: my-evolution/Locations.h:204
+#, fuzzy
+msgid "Beaumont"
+msgstr "kuukausi"
+
+#: 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 "Bahrain"
+
+#: my-evolution/Locations.h:208
+#, fuzzy
+msgid "Beckley"
+msgstr "Belize"
+
+#: my-evolution/Locations.h:209
+#, fuzzy
+msgid "Bedford"
+msgstr "ennen"
+
+#: my-evolution/Locations.h:210
+#, fuzzy
+msgid "Beijing"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:211
+#, fuzzy
+msgid "Beirut"
+msgstr "Valko-Ven�j�"
+
+#: my-evolution/Locations.h:212
+msgid "Beja"
+msgstr ""
+
+#: my-evolution/Locations.h:213
+#, fuzzy
+msgid "Belem"
+msgstr "Belize"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:219
+#, fuzzy
+msgid "Belleville"
+msgstr "Belize"
+
+#: my-evolution/Locations.h:220
+msgid "Bellingham"
+msgstr ""
+
+#: my-evolution/Locations.h:221
+msgid "Belmar-Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:222
+#, fuzzy
+msgid "Belo Horizonte"
+msgstr "Belize"
+
+#: 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 "Venezuela"
+
+#: my-evolution/Locations.h:226
+#, fuzzy
+msgid "Benina"
+msgstr "Benin"
+
+#: 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 "Lue"
+
+#: my-evolution/Locations.h:230
+msgid "Bergamo"
+msgstr ""
+
+#: my-evolution/Locations.h:231
+#, fuzzy
+msgid "Bergen"
+msgstr "N�kem�tt�"
+
+#: my-evolution/Locations.h:232
+msgid "Bergstrom AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:233
+msgid "Berlevag"
+msgstr ""
+
+#: my-evolution/Locations.h:234
+#, fuzzy
+msgid "Berlin"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:235
+msgid "Berlin-Tegel"
+msgstr ""
+
+#: my-evolution/Locations.h:236
+msgid "Berlin-Tempelhof"
+msgstr ""
+
+#: my-evolution/Locations.h:237
+#, fuzzy
+msgid "Bern"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:238
+#, fuzzy
+msgid "Bethel"
+msgstr "S��tiedot"
+
+#: my-evolution/Locations.h:239
+msgid "Bethlehem Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:240
+#, fuzzy
+msgid "Bettles"
+msgstr "Belize"
+
+#: my-evolution/Locations.h:241
+#, fuzzy
+msgid "Beverly"
+msgstr "Joka"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:245
+#, fuzzy
+msgid "Big Piney"
+msgstr "Tulosta"
+
+#: my-evolution/Locations.h:246
+msgid "Big River Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:247
+msgid "Bilbao"
+msgstr ""
+
+#: my-evolution/Locations.h:248
+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 ""
+
+#: my-evolution/Locations.h:257
+#, fuzzy
+msgid "Blanding"
+msgstr "Varjostus"
+
+#: my-evolution/Locations.h:258
+#, fuzzy
+msgid "Block Island"
+msgstr "Falklandsaaret"
+
+#: my-evolution/Locations.h:259
+msgid "Bloemfontein J. B. M. Hertzog "
+msgstr ""
+
+#: my-evolution/Locations.h:260
+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 ""
+
+#: my-evolution/Locations.h:267
+msgid "Bodo"
+msgstr ""
+
+#: my-evolution/Locations.h:268
+msgid "Bogota/Eldorado"
+msgstr ""
+
+#: my-evolution/Locations.h:269
+#, fuzzy
+msgid "Boise"
+msgstr "Sulje"
+
+#: my-evolution/Locations.h:271
+msgid "Bologna"
+msgstr ""
+
+#: my-evolution/Locations.h:272
+#, fuzzy
+msgid "Bolzano"
+msgstr "Puola"
+
+#: my-evolution/Locations.h:273
+msgid "Bombay/Santacruz"
+msgstr ""
+
+#: my-evolution/Locations.h:274
+#, fuzzy
+msgid "Boone"
+msgstr "M��rittelem�t�n"
+
+#: my-evolution/Locations.h:275
+msgid "Bordeaux"
+msgstr ""
+
+#: my-evolution/Locations.h:276
+#, fuzzy
+msgid "Borger"
+msgstr "_Suuret kuvakkeet"
+
+#: 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 "Bosnia-Hertsegovina"
+
+#: my-evolution/Locations.h:280
+#, fuzzy
+msgid "Boston"
+msgstr "Viro"
+
+#: my-evolution/Locations.h:281
+#, fuzzy
+msgid "Boulmer"
+msgstr "Kansio"
+
+#: my-evolution/Locations.h:282
+#, fuzzy
+msgid "Bourges"
+msgstr "L�hteet"
+
+#: my-evolution/Locations.h:283
+msgid "Bournemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:284
+msgid "Bowling Green"
+msgstr ""
+
+#: my-evolution/Locations.h:285
+#, fuzzy
+msgid "Bozeman"
+msgstr "Korealainen"
+
+#: my-evolution/Locations.h:286
+#, fuzzy
+msgid "Bradford"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:287
+msgid "Bradshaw Field"
+msgstr ""
+
+#: my-evolution/Locations.h:288
+#, fuzzy
+msgid "Brainerd"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:289
+msgid "Brasilia"
+msgstr ""
+
+#: my-evolution/Locations.h:290
+msgid "Brasschaat"
+msgstr ""
+
+#: my-evolution/Locations.h:291
+msgid "Bratislava"
+msgstr ""
+
+#: my-evolution/Locations.h:292
+#, fuzzy
+msgid "Bratsk"
+msgstr "Luonnokset"
+
+#: my-evolution/Locations.h:293
+msgid "Braunschweig"
+msgstr ""
+
+#: my-evolution/Locations.h:295
+#, fuzzy
+msgid "Bremen"
+msgstr "Jemen"
+
+#: my-evolution/Locations.h:296
+msgid "Bremerton"
+msgstr ""
+
+#: my-evolution/Locations.h:297
+msgid "Brest"
+msgstr ""
+
+#: my-evolution/Locations.h:298
+msgid "Bridgeport"
+msgstr ""
+
+#: my-evolution/Locations.h:299
+#, fuzzy
+msgid "Brindisi"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:300
+msgid "Brisbane"
+msgstr ""
+
+#: my-evolution/Locations.h:301
+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 "Barbados"
+
+#: my-evolution/Locations.h:305
+msgid "Broken Bow"
+msgstr ""
+
+#: my-evolution/Locations.h:306
+msgid "Bronnoysund"
+msgstr ""
+
+#: my-evolution/Locations.h:307
+msgid "Brookings"
+msgstr ""
+
+#: my-evolution/Locations.h:308
+msgid "Brooksville"
+msgstr ""
+
+#: my-evolution/Locations.h:309
+#, fuzzy
+msgid "Broome"
+msgstr "Ala:"
+
+#: my-evolution/Locations.h:310
+msgid "Brownsville"
+msgstr ""
+
+#: my-evolution/Locations.h:311
+#, fuzzy
+msgid "Brunswick"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:312
+msgid "Brussels-National Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:313
+msgid "Bryansk"
+msgstr ""
+
+#: my-evolution/Locations.h:314
+#, fuzzy
+msgid "Bryce Canyon"
+msgstr "Yrityksen mukaan"
+
+#: 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 "Bhutan"
+
+#: my-evolution/Locations.h:323
+msgid "Burgas"
+msgstr ""
+
+#: my-evolution/Locations.h:324
+#, fuzzy
+msgid "Burley"
+msgstr "Turkki"
+
+#: my-evolution/Locations.h:325
+msgid "Burlington"
+msgstr ""
+
+#: my-evolution/Locations.h:326
+#, fuzzy
+msgid "Burnet"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:327
+#, fuzzy
+msgid "Burns"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:328
+#, fuzzy
+msgid "Bursa"
+msgstr "Bulgaria"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:332
+#, fuzzy
+msgid "Cagliari"
+msgstr "Kalenteri"
+
+#: my-evolution/Locations.h:333
+#, fuzzy
+msgid "Cairns"
+msgstr "Auto"
+
+#: my-evolution/Locations.h:334
+#, fuzzy
+msgid "Cairo"
+msgstr "Auto"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:338
+#, fuzzy
+msgid "Calgary"
+msgstr "Kalenteri"
+
+#: my-evolution/Locations.h:339
+msgid "Cali/Alfonso Bonillaaragon"
+msgstr ""
+
+#: my-evolution/Locations.h:340
+#, fuzzy
+msgid "Caliente"
+msgstr "Kalenteri"
+
+#: my-evolution/Locations.h:341
+#, fuzzy
+msgid "California"
+msgstr "Uusi Kaledonia"
+
+#: my-evolution/Locations.h:342
+msgid "Calvi-Ste-Catherine"
+msgstr ""
+
+#: my-evolution/Locations.h:343
+#, fuzzy
+msgid "Camaguey"
+msgstr "Paraguay"
+
+#: 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 "Kamerun"
+
+#: my-evolution/Locations.h:347
+#, fuzzy
+msgid "Camiri"
+msgstr "Auto"
+
+#: my-evolution/Locations.h:348
+#, fuzzy
+msgid "Campeche"
+msgstr "Valmis"
+
+#: my-evolution/Locations.h:349
+#, fuzzy
+msgid "Campinas"
+msgstr "Kambodza"
+
+#: my-evolution/Locations.h:350
+#, fuzzy
+msgid "Campo"
+msgstr "Yrit"
+
+#: my-evolution/Locations.h:351
+#, fuzzy
+msgid "Campo Grande"
+msgstr "Kap Verde"
+
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr ""
+
+#: my-evolution/Locations.h:353
+#, fuzzy
+msgid "Canaan"
+msgstr "Kanada"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:363
+#, fuzzy
+msgid "Cancun"
+msgstr "Peruuta"
+
+#: my-evolution/Locations.h:364
+msgid "Cannes-Mandelieu"
+msgstr ""
+
+#: my-evolution/Locations.h:365
+#, fuzzy
+msgid "Cantwell"
+msgstr "Peruuta"
+
+#: my-evolution/Locations.h:366
+#, fuzzy
+msgid "Cape Girardeau"
+msgstr "Kap Verde"
+
+#: my-evolution/Locations.h:367
+#, fuzzy
+msgid "Cape Hatteras"
+msgstr "Kap Verde"
+
+#: my-evolution/Locations.h:368
+#, fuzzy
+msgid "Cape Lisburne"
+msgstr "Paperil�hde:"
+
+#: my-evolution/Locations.h:369
+#, fuzzy
+msgid "Cape Newenham"
+msgstr "Kap Verde"
+
+#: 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 "Kap Verde"
+
+#: my-evolution/Locations.h:374
+msgid "Caracas La Carlota"
+msgstr ""
+
+#: my-evolution/Locations.h:375
+msgid "Caracas Maiquetia"
+msgstr ""
+
+#: my-evolution/Locations.h:376
+#, fuzzy
+msgid "Caravelas"
+msgstr "Peruuta teht�v�"
+
+#: my-evolution/Locations.h:377
+#, fuzzy
+msgid "Carbondale"
+msgstr "Kambodza"
+
+#: my-evolution/Locations.h:378
+#, fuzzy
+msgid "Cardiff"
+msgstr "Kortti: "
+
+#: my-evolution/Locations.h:379
+#, fuzzy
+msgid "Caribou"
+msgstr "Auto"
+
+#: my-evolution/Locations.h:380
+#, fuzzy
+msgid "Carlisle"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:381
+#, fuzzy
+msgid "Carlsbad"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:382
+#, fuzzy
+msgid "Carroll"
+msgstr "Auto"
+
+#: my-evolution/Locations.h:383
+msgid "Cartagena/Rafael Nunez"
+msgstr ""
+
+#: my-evolution/Locations.h:384
+msgid "Casa Granda"
+msgstr ""
+
+#: my-evolution/Locations.h:385
+#, fuzzy
+msgid "Cascade"
+msgstr "Vaaka"
+
+#: my-evolution/Locations.h:386
+#, fuzzy
+msgid "Casper"
+msgstr "Paperi"
+
+#: my-evolution/Locations.h:387
+#, fuzzy
+msgid "Catacamas"
+msgstr "Bahamasaaret"
+
+#: my-evolution/Locations.h:388
+#, fuzzy
+msgid "Catania"
+msgstr "Kroatia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:393
+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 "Kroatia"
+
+#: my-evolution/Locations.h:397
+msgid "Chacarita"
+msgstr ""
+
+#: my-evolution/Locations.h:398
+#, fuzzy
+msgid "Chadron"
+msgstr "Tsad"
+
+#: my-evolution/Locations.h:399
+msgid "Challis"
+msgstr ""
+
+#: my-evolution/Locations.h:400
+#, fuzzy
+msgid "Chamberlain"
+msgstr "Kamerun"
+
+#: my-evolution/Locations.h:401
+#, fuzzy
+msgid "Chambery"
+msgstr "Kamerun"
+
+#: my-evolution/Locations.h:402
+#, fuzzy
+msgid "Champaign"
+msgstr "Yritys"
+
+#: my-evolution/Locations.h:403
+msgid "Chandalar Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:404
+#, fuzzy
+msgid "Chandler"
+msgstr "Tsad"
+
+#: my-evolution/Locations.h:405
+#, fuzzy
+msgid "Chania"
+msgstr "Kiina"
+
+#: my-evolution/Locations.h:406
+#, fuzzy
+msgid "Chanute"
+msgstr "Peruuta"
+
+#: my-evolution/Locations.h:407
+#, fuzzy
+msgid "Chariton"
+msgstr "Kamerun"
+
+#: my-evolution/Locations.h:408
+msgid "Charleroi-Brussels South"
+msgstr ""
+
+#: my-evolution/Locations.h:409
+msgid "Charles City"
+msgstr ""
+
+#: my-evolution/Locations.h:410
+#, fuzzy
+msgid "Charleston"
+msgstr "Autopuhelin"
+
+#: my-evolution/Locations.h:411
+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 ""
+
+#: my-evolution/Locations.h:416
+#, fuzzy
+msgid "Cheju"
+msgstr "Chile"
+
+#: 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 "Luxemburg"
+
+#: my-evolution/Locations.h:420
+#, fuzzy
+msgid "Cherry Point"
+msgstr "Muu puhelin"
+
+#: 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 "Kiina"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:431
+#, fuzzy
+msgid "Chiclayo"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:432
+#, fuzzy
+msgid "Chico"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:433
+msgid "Chicopee Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:434
+#, fuzzy
+msgid "Chievres"
+msgstr "Kiinalainen"
+
+#: my-evolution/Locations.h:435
+#, fuzzy
+msgid "Chihhang"
+msgstr "Kiina"
+
+#: my-evolution/Locations.h:436
+msgid "Chihuahua"
+msgstr ""
+
+#: my-evolution/Locations.h:437
+#, fuzzy
+msgid "Childress"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:439
+#, fuzzy
+msgid "China Lake"
+msgstr "Kiina"
+
+#: my-evolution/Locations.h:440
+#, fuzzy
+msgid "Chinandega"
+msgstr "Kiina"
+
+#: my-evolution/Locations.h:441
+msgid "Chinmem/Shatou"
+msgstr ""
+
+#: my-evolution/Locations.h:442
+#, fuzzy
+msgid "Chino"
+msgstr "Kiina"
+
+#: my-evolution/Locations.h:443
+msgid "Chippewa County"
+msgstr ""
+
+#: my-evolution/Locations.h:444
+#, fuzzy
+msgid "Chita"
+msgstr "Kiina"
+
+#: 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 "Kiina"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:462
+#, fuzzy
+msgid "Clarinda"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:463
+#, fuzzy
+msgid "Clarion"
+msgstr "Kamerun"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:468
+#, fuzzy
+msgid "Cleveland"
+msgstr "Gr�nlanti"
+
+#: 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 "Kolumbia"
+
+#: 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 "Joulusaaret"
+
+#: my-evolution/Locations.h:477
+#, fuzzy
+msgid "Cody"
+msgstr "Kopioi"
+
+#: my-evolution/Locations.h:478
+msgid "Coeur d'Alene"
+msgstr ""
+
+#: my-evolution/Locations.h:479
+#, fuzzy
+msgid "Cold Bay"
+msgstr "_Kansiopalkki"
+
+#: my-evolution/Locations.h:480
+#, fuzzy
+msgid "Colima"
+msgstr "Kolumbia"
+
+#: my-evolution/Locations.h:481
+msgid "College Station"
+msgstr ""
+
+#: my-evolution/Locations.h:482
+msgid "Colmar-Meyenheim"
+msgstr ""
+
+#: my-evolution/Locations.h:484
+#, fuzzy
+msgid "Colonia"
+msgstr "Kolumbia"
+
+#: my-evolution/Locations.h:485
+#, fuzzy
+msgid "Colorado"
+msgstr "Kolumbia"
+
+#: my-evolution/Locations.h:486
+msgid "Colorado Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:487
+#, fuzzy
+msgid "Columbia"
+msgstr "Kolumbia"
+
+#: my-evolution/Locations.h:488
+msgid "Columbia-McEntire"
+msgstr ""
+
+#: my-evolution/Locations.h:489
+#, fuzzy
+msgid "Columbus"
+msgstr "Kolumbia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:494
+#, fuzzy
+msgid "Colville"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:495
+msgid "Comodoro Rivadavia"
+msgstr ""
+
+#: my-evolution/Locations.h:496
+#, fuzzy
+msgid "Comox"
+msgstr "Yrit"
+
+#: my-evolution/Locations.h:497
+msgid "Conceicao Do Araguaia"
+msgstr ""
+
+#: my-evolution/Locations.h:498
+#, fuzzy
+msgid "Concepcion"
+msgstr "Peruuta operaatio"
+
+#: my-evolution/Locations.h:499
+#, fuzzy
+msgid "Concord"
+msgstr "Kongo"
+
+#: my-evolution/Locations.h:500
+msgid "Concordia"
+msgstr ""
+
+#: my-evolution/Locations.h:501
+msgid "Connaught"
+msgstr ""
+
+#: my-evolution/Locations.h:502
+#, fuzzy
+msgid "Connecticut"
+msgstr "Kontaktit"
+
+#: my-evolution/Locations.h:503
+#, fuzzy
+msgid "Conroe"
+msgstr "Kongo"
+
+#: my-evolution/Locations.h:504
+#, fuzzy
+msgid "Constantine"
+msgstr "S_is�lt��:"
+
+#: my-evolution/Locations.h:505
+msgid "Copper Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:506
+#, fuzzy
+msgid "Cordoba"
+msgstr "Kolumbia"
+
+#: my-evolution/Locations.h:507
+#, fuzzy
+msgid "Cordova"
+msgstr "Jordania"
+
+#: my-evolution/Locations.h:508
+msgid "Cork"
+msgstr ""
+
+#: my-evolution/Locations.h:509
+#, fuzzy
+msgid "Coro"
+msgstr "Kongo"
+
+#: my-evolution/Locations.h:510
+#, fuzzy
+msgid "Corona"
+msgstr "Kroatia"
+
+#: my-evolution/Locations.h:511
+msgid "Corpus Christi"
+msgstr ""
+
+#: my-evolution/Locations.h:512
+msgid "Corpus Christi NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:513
+#, fuzzy
+msgid "Corrientes"
+msgstr "_Nykyinen n�kym�"
+
+#: my-evolution/Locations.h:514
+#, fuzzy
+msgid "Corsicana"
+msgstr "Costa Rica"
+
+#: my-evolution/Locations.h:515
+msgid "Cortez"
+msgstr ""
+
+#: my-evolution/Locations.h:516
+#, fuzzy
+msgid "Corumba"
+msgstr "Kuuba"
+
+#: my-evolution/Locations.h:518
+msgid "Cotulla"
+msgstr ""
+
+#: my-evolution/Locations.h:519
+msgid "Council Bluffs"
+msgstr ""
+
+#: my-evolution/Locations.h:520
+#, fuzzy
+msgid "Coventry"
+msgstr "M_aa:"
+
+#: my-evolution/Locations.h:521
+#, fuzzy
+msgid "Covington"
+msgstr "Kongo"
+
+#: my-evolution/Locations.h:522
+msgid "Cozumel"
+msgstr ""
+
+#: my-evolution/Locations.h:523
+#, fuzzy
+msgid "Craig"
+msgstr "Kroatia"
+
+#: my-evolution/Locations.h:524
+#, fuzzy
+msgid "Cranfield"
+msgstr "Peruutettu"
+
+#: my-evolution/Locations.h:525
+msgid "Crescent City"
+msgstr ""
+
+#: my-evolution/Locations.h:526
+#, fuzzy
+msgid "Creston"
+msgstr "Kysymys"
+
+#: my-evolution/Locations.h:527
+#, fuzzy
+msgid "Crestview"
+msgstr "Esikatselu:"
+
+#: 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 "Kamerun"
+
+#: my-evolution/Locations.h:533
+#, fuzzy
+msgid "Cuba Awrs"
+msgstr "Kuuba"
+
+#: my-evolution/Locations.h:534
+msgid "Cuernavaca"
+msgstr ""
+
+#: my-evolution/Locations.h:535
+#, fuzzy
+msgid "Cuiaba"
+msgstr "Kuuba"
+
+#: my-evolution/Locations.h:536
+#, fuzzy
+msgid "Culdrose"
+msgstr "Sulje"
+
+#: my-evolution/Locations.h:537
+msgid "Culiacan"
+msgstr ""
+
+#: my-evolution/Locations.h:538
+#, fuzzy
+msgid "Cumana"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:539
+msgid "Cumberland"
+msgstr ""
+
+#: my-evolution/Locations.h:540
+#, fuzzy
+msgid "Curitiba"
+msgstr "Kroatia"
+
+#: my-evolution/Locations.h:541
+msgid "Curitiba Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:542
+#, fuzzy
+msgid "Custer"
+msgstr "Leikkaa"
+
+#: my-evolution/Locations.h:543
+msgid "Cut Bank"
+msgstr ""
+
+#: my-evolution/Locations.h:544
+msgid "Cuzco"
+msgstr ""
+
+#: my-evolution/Locations.h:547
+#, fuzzy
+msgid "Dagali"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:548
+msgid "Daggett"
+msgstr ""
+
+#: my-evolution/Locations.h:549
+msgid "Dalhart"
+msgstr ""
+
+#: my-evolution/Locations.h:550
+#, fuzzy
+msgid "Dalian"
+msgstr "Taiwan"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:556
+#, fuzzy
+msgid "Danbury"
+msgstr "Tammikuu"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:562
+#, fuzzy
+msgid "Dayton"
+msgstr "_P�iv�"
+
+#: my-evolution/Locations.h:563
+msgid "Daytona Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:564
+msgid "Dayton-Fairborn"
+msgstr ""
+
+#: my-evolution/Locations.h:565
+#, fuzzy
+msgid "Dayton-South Airport"
+msgstr "�l� tuo"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:571
+#, fuzzy
+msgid "Deelen"
+msgstr "Poista"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:576
+#, fuzzy
+msgid "Delta"
+msgstr "Poista"
+
+#: my-evolution/Locations.h:577
+#, fuzzy
+msgid "Deming"
+msgstr "Peruuta tapaaminen"
+
+#: my-evolution/Locations.h:578
+msgid "Den Helder/De Kooy"
+msgstr ""
+
+#: my-evolution/Locations.h:579
+#, fuzzy
+msgid "Denison"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:581
+#, fuzzy
+msgid "Denton"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:582
+#, fuzzy
+msgid "Denver"
+msgstr "L�hett�j�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:587
+#, fuzzy
+msgid "Des Moines"
+msgstr ""
+"\n"
+"Aikavy�hyke: "
+
+#: my-evolution/Locations.h:588
+#, fuzzy
+msgid "Destin"
+msgstr "Kysymys"
+
+#: 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 "Bahrain"
+
+#: my-evolution/Locations.h:596
+#, fuzzy
+msgid "Dickinson"
+msgstr "Mitat:"
+
+#: my-evolution/Locations.h:597
+#, fuzzy
+msgid "Dijon"
+msgstr "Valmis"
+
+#: my-evolution/Locations.h:598
+msgid "Dillingham"
+msgstr ""
+
+#: my-evolution/Locations.h:599
+#, fuzzy
+msgid "Dillon"
+msgstr "Valmis"
+
+#: my-evolution/Locations.h:600
+#, fuzzy
+msgid "Dinard"
+msgstr "Tulosta kortti"
+
+#: 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 "Rooli"
+
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "Valmis"
+
+#: my-evolution/Locations.h:610
+#, fuzzy
+msgid "Dongsha"
+msgstr "Tonga"
+
+#: my-evolution/Locations.h:611
+msgid "Dongshi"
+msgstr ""
+
+#: my-evolution/Locations.h:612
+msgid "Don Torcuato"
+msgstr ""
+
+#: my-evolution/Locations.h:613
+msgid "Dortmund-Wickede"
+msgstr ""
+
+#: my-evolution/Locations.h:614
+#, fuzzy
+msgid "Dothan"
+msgstr "Valmis"
+
+#: my-evolution/Locations.h:615
+msgid "Douglas"
+msgstr ""
+
+#: my-evolution/Locations.h:616
+#, fuzzy
+msgid "Dover"
+msgstr "Valmis"
+
+#: 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 "Kuuba"
+
+#: my-evolution/Locations.h:620
+msgid "Dubbo"
+msgstr ""
+
+#: my-evolution/Locations.h:621
+#, fuzzy
+msgid "Dublin"
+msgstr "Julkinen"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:625
+#, fuzzy
+msgid "Dugway"
+msgstr "_P�iv�"
+
+#: my-evolution/Locations.h:626
+#, fuzzy
+msgid "Duluth"
+msgstr "_Oletukset"
+
+#: my-evolution/Locations.h:627
+#, fuzzy
+msgid "Dundee"
+msgstr "Kes�kuu"
+
+#: my-evolution/Locations.h:628
+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
+msgid "Dusseldorf"
+msgstr ""
+
+#: my-evolution/Locations.h:633
+msgid "Dutch Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:634
+msgid "Dyersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:635
+#, fuzzy
+msgid "Eagle"
+msgstr "K�yt�"
+
+#: 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
+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 "kuukausi"
+
+#: 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 "El Salvador"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:661
+msgid "Elkins"
+msgstr ""
+
+#: my-evolution/Locations.h:662
+msgid "Elko"
+msgstr ""
+
+#: my-evolution/Locations.h:663
+#, fuzzy
+msgid "Elmira"
+msgstr "Elm"
+
+#: my-evolution/Locations.h:664
+#, fuzzy
+msgid "El Monte"
+msgstr "_Kuukausi"
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr ""
+
+#: my-evolution/Locations.h:667
+#, fuzzy
+msgid "El Salvador Int."
+msgstr "El Salvador"
+
+#: my-evolution/Locations.h:668
+msgid "Elsenborn"
+msgstr ""
+
+#: my-evolution/Locations.h:669
+#, fuzzy
+msgid "Ely"
+msgstr "Elm"
+
+#: my-evolution/Locations.h:670
+msgid "Emmonak"
+msgstr ""
+
+#: my-evolution/Locations.h:671
+#, fuzzy
+msgid "Emporia"
+msgstr "Tuo"
+
+#: my-evolution/Locations.h:672
+msgid "Enid"
+msgstr ""
+
+#: my-evolution/Locations.h:673
+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 "Eritrea"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:685
+#, fuzzy
+msgid "Eugene"
+msgstr "Kes�kuu"
+
+#: my-evolution/Locations.h:686
+#, fuzzy
+msgid "Eureka"
+msgstr "Eritrea"
+
+#: my-evolution/Locations.h:687
+msgid "Europe"
+msgstr ""
+
+#: my-evolution/Locations.h:688
+#, fuzzy
+msgid "Evanston"
+msgstr "Viro"
+
+#: my-evolution/Locations.h:689
+msgid "Evansville"
+msgstr ""
+
+#: my-evolution/Locations.h:690
+#, fuzzy
+msgid "Everett"
+msgstr "Joka"
+
+#: my-evolution/Locations.h:691
+msgid "Evergreen"
+msgstr ""
+
+#: my-evolution/Locations.h:692
+msgid "Evreux-Fauville"
+msgstr ""
+
+#: my-evolution/Locations.h:693
+#, fuzzy
+msgid "Exeter"
+msgstr "S��tiedot"
+
+#: my-evolution/Locations.h:694
+msgid "Ezeiza"
+msgstr ""
+
+#: my-evolution/Locations.h:695
+msgid "Fagernes"
+msgstr ""
+
+#: my-evolution/Locations.h:696
+msgid "Fairbanks"
+msgstr ""
+
+#: my-evolution/Locations.h:697
+msgid "Fairchild"
+msgstr ""
+
+#: my-evolution/Locations.h:698
+msgid "Fairfield"
+msgstr ""
+
+#: my-evolution/Locations.h:699
+#, fuzzy
+msgid "Fairmont"
+msgstr "Kirjasinlajit"
+
+#: 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 "L�hett�j�"
+
+#: my-evolution/Locations.h:705
+msgid "Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:706
+msgid "Farmington"
+msgstr ""
+
+#: my-evolution/Locations.h:707
+#, fuzzy
+msgid "Farmville"
+msgstr "Sukunimi"
+
+#: my-evolution/Locations.h:708
+#, fuzzy
+msgid "Faro"
+msgstr "L�hett�j�"
+
+#: my-evolution/Locations.h:709
+msgid "Fayetteville"
+msgstr ""
+
+#: my-evolution/Locations.h:710
+#, fuzzy
+msgid "Feng Nin"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:711
+msgid "Fergus Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:712
+msgid "Fernando De Noronha"
+msgstr ""
+
+#: my-evolution/Locations.h:713
+#, fuzzy
+msgid "Ferrara"
+msgstr "Helmikuu"
+
+#: my-evolution/Locations.h:714
+#, fuzzy
+msgid "Figari"
+msgstr "Nigeria"
+
+#: my-evolution/Locations.h:715
+#, fuzzy
+msgid "Findlay"
+msgstr "Perjantai"
+
+#: my-evolution/Locations.h:717
+#, fuzzy
+msgid "Firenze"
+msgstr "Pe"
+
+#: my-evolution/Locations.h:718
+msgid "Fitchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:719
+msgid "Flagstaff"
+msgstr ""
+
+#: my-evolution/Locations.h:720
+#, fuzzy
+msgid "Flint"
+msgstr "Etsi:"
+
+#: my-evolution/Locations.h:721
+#, fuzzy
+msgid "Flippin"
+msgstr "Filippiinit"
+
+#: my-evolution/Locations.h:722
+#, fuzzy
+msgid "Florence"
+msgstr "Ranska"
+
+#: my-evolution/Locations.h:723
+#, fuzzy
+msgid "Florennes"
+msgstr "Pe"
+
+#: my-evolution/Locations.h:724
+#, fuzzy
+msgid "Flores"
+msgstr "Kansiot"
+
+#: my-evolution/Locations.h:725
+msgid "Florianopolis"
+msgstr ""
+
+#: my-evolution/Locations.h:726
+#, fuzzy
+msgid "Florida"
+msgstr "Perjantai"
+
+#: my-evolution/Locations.h:727
+#, fuzzy
+msgid "Floro"
+msgstr "L�hett�j�"
+
+#: my-evolution/Locations.h:728
+msgid "Fond Du Lac"
+msgstr ""
+
+#: my-evolution/Locations.h:729
+#, fuzzy
+msgid "Forde/Bringeland"
+msgstr "Suomi"
+
+#: my-evolution/Locations.h:730
+#, fuzzy
+msgid "Forli"
+msgstr "Pe"
+
+#: my-evolution/Locations.h:731
+#, fuzzy
+msgid "Formosa"
+msgstr "Tavallinen"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:742
+#, fuzzy
+msgid "Fort Eustis"
+msgstr "Oikotiet"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:748
+#, fuzzy
+msgid "Fort Leonard"
+msgstr "V�lit�"
+
+#: my-evolution/Locations.h:749
+msgid "Fort Lewis"
+msgstr ""
+
+#: my-evolution/Locations.h:750
+msgid "Fort Madison"
+msgstr ""
+
+#: my-evolution/Locations.h:751
+#, fuzzy
+msgid "Fort Meade"
+msgstr "_V�litet� viesti"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:757
+msgid "Fort Smith"
+msgstr ""
+
+#: my-evolution/Locations.h:758
+#, fuzzy
+msgid "Fort Stewart"
+msgstr "V�lit�"
+
+#: my-evolution/Locations.h:759
+msgid "Fort Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:760
+#, fuzzy
+msgid "Fort Wayne"
+msgstr "Ranska"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:769
+msgid "Franklin"
+msgstr ""
+
+#: my-evolution/Locations.h:770
+#, fuzzy
+msgid "Fredericton"
+msgstr "Kuvaus:"
+
+#: my-evolution/Locations.h:771
+#, fuzzy
+msgid "Freeport"
+msgstr "Pe"
+
+#: my-evolution/Locations.h:772
+msgid "Frenchville"
+msgstr ""
+
+#: my-evolution/Locations.h:773
+#, fuzzy
+msgid "Fresno"
+msgstr "Pe"
+
+#: my-evolution/Locations.h:774
+msgid "Fresno-Chandler"
+msgstr ""
+
+#: my-evolution/Locations.h:775
+#, fuzzy
+msgid "Friday Harbor"
+msgstr "Perjantai"
+
+#: my-evolution/Locations.h:776
+msgid "Friedrichshafen"
+msgstr ""
+
+#: my-evolution/Locations.h:777
+#, fuzzy
+msgid "Frigg"
+msgstr "Pe"
+
+#: my-evolution/Locations.h:778
+#, fuzzy
+msgid "Frontone"
+msgstr "Kirjasinlajit"
+
+#: my-evolution/Locations.h:779
+#, fuzzy
+msgid "Frosinone"
+msgstr "Ammatti"
+
+#: my-evolution/Locations.h:780
+#, fuzzy
+msgid "Fryeburg"
+msgstr "Helmikuu"
+
+#: 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 "Uusi Kaledonia"
+
+#: my-evolution/Locations.h:789
+msgid "Gadsden"
+msgstr ""
+
+#: my-evolution/Locations.h:790
+#, fuzzy
+msgid "Gage"
+msgstr "Sivu"
+
+#: my-evolution/Locations.h:791
+#, fuzzy
+msgid "Gainesville"
+msgstr "Peruutettu"
+
+#: 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 "Ghana"
+
+#: my-evolution/Locations.h:796
+msgid "Galesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:797
+#, fuzzy
+msgid "Gallup"
+msgstr "Guadeloupe"
+
+#: my-evolution/Locations.h:798
+msgid "Galveston"
+msgstr ""
+
+#: my-evolution/Locations.h:799
+#, fuzzy
+msgid "Gambell"
+msgstr "Gambia"
+
+#: my-evolution/Locations.h:800
+#, fuzzy
+msgid "Gander"
+msgstr "Yl�tunniste:"
+
+#: my-evolution/Locations.h:801
+msgid "Garden City"
+msgstr ""
+
+#: my-evolution/Locations.h:802
+msgid "Gary"
+msgstr ""
+
+#: my-evolution/Locations.h:803
+#, fuzzy
+msgid "Gassim"
+msgstr "Guam"
+
+#: my-evolution/Locations.h:804
+#, fuzzy
+msgid "Gatineau"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:805
+msgid "Gaziantep"
+msgstr ""
+
+#: my-evolution/Locations.h:806
+#, fuzzy
+msgid "Gdansk"
+msgstr "p�iv��"
+
+#: my-evolution/Locations.h:807
+#, fuzzy
+msgid "Geneve"
+msgstr "Kreikka"
+
+#: my-evolution/Locations.h:808
+#, fuzzy
+msgid "Genova"
+msgstr "Yleiset"
+
+#: 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 "Ghana"
+
+#: my-evolution/Locations.h:814
+msgid "Ghedi"
+msgstr ""
+
+#: my-evolution/Locations.h:816
+msgid "Gifu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:817
+#, fuzzy
+msgid "Gila Bend"
+msgstr "Suomi"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:821
+#, fuzzy
+msgid "Girona"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:822
+#, fuzzy
+msgid "Gizan"
+msgstr "Gabon"
+
+#: my-evolution/Locations.h:823
+msgid "Glasgow"
+msgstr ""
+
+#: my-evolution/Locations.h:824
+msgid "Glendive"
+msgstr ""
+
+#: my-evolution/Locations.h:825
+msgid "Glens Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:826
+#, fuzzy
+msgid "Goiania"
+msgstr "Romania"
+
+#: my-evolution/Locations.h:827
+msgid "Goldsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:828
+#, fuzzy
+msgid "Goodland"
+msgstr "Puola"
+
+#: my-evolution/Locations.h:829
+#, fuzzy
+msgid "Goose Bay"
+msgstr "Siirry t�h�n p�iv��n"
+
+#: my-evolution/Locations.h:830
+msgid "Goteborg (Landvetter)"
+msgstr ""
+
+#: my-evolution/Locations.h:831
+msgid "Goteborg (Save)"
+msgstr ""
+
+#: my-evolution/Locations.h:832
+#, fuzzy
+msgid "Granada"
+msgstr "Grenada"
+
+#: 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 "Falklandsaaret"
+
+#: 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 "San Marino"
+
+#: my-evolution/Locations.h:840
+msgid "Grand Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:841
+msgid "Grandview"
+msgstr ""
+
+#: my-evolution/Locations.h:842
+#, fuzzy
+msgid "Grangeville"
+msgstr "Peruutettu"
+
+#: my-evolution/Locations.h:843
+#, fuzzy
+msgid "Grants"
+msgstr "Luonnokset"
+
+#: my-evolution/Locations.h:844
+msgid "Graz"
+msgstr ""
+
+#: my-evolution/Locations.h:845
+msgid "Great Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:847
+#, fuzzy
+msgid "Greeley"
+msgstr "Kreikka"
+
+#: my-evolution/Locations.h:848
+#, fuzzy
+msgid "Green Bay"
+msgstr "Gr�nlanti"
+
+#: my-evolution/Locations.h:849
+msgid "Green River"
+msgstr ""
+
+#: my-evolution/Locations.h:850
+msgid "Greensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:851
+#, fuzzy
+msgid "Greenville"
+msgstr "Gr�nlanti"
+
+#: my-evolution/Locations.h:852
+msgid "Greenville-Spartanburg"
+msgstr ""
+
+#: my-evolution/Locations.h:853
+#, fuzzy
+msgid "Greenwood"
+msgstr "Gr�nlanti"
+
+#: my-evolution/Locations.h:854
+msgid "Grenoble-Saint-Geoirs"
+msgstr ""
+
+#: my-evolution/Locations.h:855
+msgid "Griffiss AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:856
+#, fuzzy
+msgid "Groningen"
+msgstr "Varoitus"
+
+#: 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 "Guatemala"
+
+#: my-evolution/Locations.h:860
+#, fuzzy
+msgid "Guadalupe Pass"
+msgstr "Guadeloupe"
+
+#: my-evolution/Locations.h:861
+#, fuzzy
+msgid "Guanare"
+msgstr "Guyana"
+
+#: my-evolution/Locations.h:862
+msgid "Guangzhou"
+msgstr ""
+
+#: my-evolution/Locations.h:863
+#, fuzzy
+msgid "Guantanamo"
+msgstr "Guatemala"
+
+#: my-evolution/Locations.h:864
+#, fuzzy
+msgid "Guarany"
+msgstr "Saksa"
+
+#: my-evolution/Locations.h:865
+#, fuzzy
+msgid "Guaratingueta"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:866
+msgid "Guarulhos"
+msgstr ""
+
+#: my-evolution/Locations.h:868
+msgid "Guayaquil/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:869
+#, fuzzy
+msgid "Guaymas"
+msgstr "Guam"
+
+#: my-evolution/Locations.h:870
+#, fuzzy
+msgid "Guernsey"
+msgstr "Saksa"
+
+#: my-evolution/Locations.h:871
+#, fuzzy
+msgid "Guidonia"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:872
+msgid "Gulfport"
+msgstr ""
+
+#: my-evolution/Locations.h:873
+#, fuzzy
+msgid "Gulkana"
+msgstr "Guyana"
+
+#: my-evolution/Locations.h:874
+msgid "Gullfax C"
+msgstr ""
+
+#: my-evolution/Locations.h:875
+msgid "Gunnison"
+msgstr ""
+
+#: my-evolution/Locations.h:876
+msgid "Gunnison (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:877
+#, fuzzy
+msgid "Guriat"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:878
+msgid "Gustavus"
+msgstr ""
+
+#: my-evolution/Locations.h:879
+#, fuzzy
+msgid "Guymon"
+msgstr "Guyana"
+
+#: my-evolution/Locations.h:880
+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 ""
+
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+msgid "Hail"
+msgstr ""
+
+#: my-evolution/Locations.h:886
+msgid "Hailey-Sun Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:887
+#, fuzzy
+msgid "Haines"
+msgstr "Ukraina"
+
+#: 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 "Haiti"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:902
+msgid "Ha Noi"
+msgstr ""
+
+#: my-evolution/Locations.h:903
+msgid "Harbor Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:904
+#, fuzzy
+msgid "Harlingen"
+msgstr "Varoitus"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:911
+#, fuzzy
+msgid "Hastings"
+msgstr "Asetukset"
+
+#: my-evolution/Locations.h:912
+msgid "Haugesund"
+msgstr ""
+
+#: my-evolution/Locations.h:913
+#, fuzzy
+msgid "Havre"
+msgstr "Tallenna"
+
+#: my-evolution/Locations.h:914
+#, fuzzy
+msgid "Hawaii"
+msgstr "Haiti"
+
+#: my-evolution/Locations.h:915
+msgid "Hawthorne"
+msgstr ""
+
+#: my-evolution/Locations.h:916
+#, fuzzy
+msgid "Hayden"
+msgstr "Yl�tunniste:"
+
+#: my-evolution/Locations.h:917
+msgid "Hayes River"
+msgstr ""
+
+#: my-evolution/Locations.h:918
+#, fuzzy
+msgid "Hays"
+msgstr "p�iv��"
+
+#: 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 "N�kem�tt�"
+
+#: my-evolution/Locations.h:922
+msgid "Helsinki"
+msgstr ""
+
+#: my-evolution/Locations.h:923
+#, fuzzy
+msgid "Henderson"
+msgstr "Yl�tunniste:"
+
+#: 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
+msgid "Hillsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:930
+msgid "Hilo"
+msgstr ""
+
+#: my-evolution/Locations.h:931
+msgid "Hinesville"
+msgstr ""
+
+#: my-evolution/Locations.h:932
+msgid "Hiroshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:933
+#, fuzzy
+msgid "Hobart"
+msgstr "Is�nt�palvelin"
+
+#: my-evolution/Locations.h:934
+#, fuzzy
+msgid "Hobbs"
+msgstr "Is�nt�palvelin"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:941
+#, fuzzy
+msgid "Holguin"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:942
+#, fuzzy
+msgid "Homer"
+msgstr "Koti"
+
+#: my-evolution/Locations.h:943
+#, fuzzy
+msgid "Homestead AFB"
+msgstr "Valmis"
+
+#: my-evolution/Locations.h:944
+#, fuzzy
+msgid "Hondo"
+msgstr "Honduras"
+
+#: 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 "l�htev�t"
+
+#: my-evolution/Locations.h:954
+#, fuzzy
+msgid "Houma"
+msgstr "Koti"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:960
+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 ""
+
+#: my-evolution/Locations.h:964
+#, fuzzy
+msgid "Hulien"
+msgstr "Piilota"
+
+#: my-evolution/Locations.h:965
+msgid "Humberside"
+msgstr ""
+
+#: my-evolution/Locations.h:967
+msgid "Huntington"
+msgstr ""
+
+#: my-evolution/Locations.h:968
+msgid "Huntsville"
+msgstr ""
+
+#: my-evolution/Locations.h:969
+msgid "Hurlburt"
+msgstr ""
+
+#: my-evolution/Locations.h:970
+#, fuzzy
+msgid "Huron"
+msgstr "tuntia"
+
+#: 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
+msgid "Iasi"
+msgstr ""
+
+#: my-evolution/Locations.h:977
+#, fuzzy
+msgid "Ibiza"
+msgstr "Intia"
+
+#: my-evolution/Locations.h:979
+msgid "Ichikawa"
+msgstr ""
+
+#: my-evolution/Locations.h:980
+#, fuzzy
+msgid "Idaho"
+msgstr "Intia"
+
+#: 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 "Islanti"
+
+#: my-evolution/Locations.h:985
+msgid "Iliamna"
+msgstr ""
+
+#: my-evolution/Locations.h:986
+msgid "Illinois"
+msgstr ""
+
+#: my-evolution/Locations.h:987
+#, fuzzy
+msgid "Imperial"
+msgstr "Huhtikuu"
+
+#: my-evolution/Locations.h:988
+msgid "Imperial (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:989
+msgid "Imperial Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:990
+#, fuzzy
+msgid "In Amenas"
+msgstr "Armenia"
+
+#: my-evolution/Locations.h:992
+#, fuzzy
+msgid "Indiana"
+msgstr "Intia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:998
+#, fuzzy
+msgid "Inverness"
+msgstr "Ammatti"
+
+#: my-evolution/Locations.h:999
+msgid "Inyokern"
+msgstr ""
+
+#: my-evolution/Locations.h:1000
+#, fuzzy
+msgid "Iowa"
+msgstr "Norja"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1005
+#, fuzzy
+msgid "Iraklion"
+msgstr "Tiedoksi"
+
+#: my-evolution/Locations.h:1006
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1008
+#, fuzzy
+msgid "Iron Mountain"
+msgstr "Kommentti sis�lt��"
+
+#: 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 "Italia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1025
+#, fuzzy
+msgid "Izumo Airport"
+msgstr "Tuo"
+
+#: 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 "Japanilainen"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1044
+#, fuzzy
+msgid "Jonkoping"
+msgstr "Kopioidaan"
+
+#: my-evolution/Locations.h:1045
+#, fuzzy
+msgid "Joplin"
+msgstr "Kopioidaan"
+
+#: 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 "Japani"
+
+#: my-evolution/Locations.h:1050
+#, fuzzy
+msgid "Jujuy"
+msgstr "Hein�kuu"
+
+#: my-evolution/Locations.h:1051
+#, fuzzy
+msgid "Juliaca"
+msgstr "Julkinen"
+
+#: my-evolution/Locations.h:1052
+#, fuzzy
+msgid "Junction"
+msgstr "Todennus"
+
+#: my-evolution/Locations.h:1053
+#, fuzzy
+msgid "Juneau"
+msgstr "Kes�kuu"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1059
+#, fuzzy
+msgid "Kalamata"
+msgstr "Malta"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1071
+#, fuzzy
+msgid "Karachi"
+msgstr "Maaliskuu"
+
+#: my-evolution/Locations.h:1072
+#, fuzzy
+msgid "Karup"
+msgstr "Ryhm�n nimi:"
+
+#: 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 "Japani"
+
+#: my-evolution/Locations.h:1080
+#, fuzzy
+msgid "Kearney"
+msgstr "Kenia"
+
+#: my-evolution/Locations.h:1081
+#, fuzzy
+msgid "Keene"
+msgstr "N�kem�tt�"
+
+#: 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 "Kenia"
+
+#: my-evolution/Locations.h:1085
+#, fuzzy
+msgid "Kenosha"
+msgstr "Kenia"
+
+#: my-evolution/Locations.h:1086
+#, fuzzy
+msgid "Kentucky"
+msgstr "Kenia"
+
+#: 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 "Saksa"
+
+#: my-evolution/Locations.h:1090
+msgid "Ketchikan"
+msgstr ""
+
+#: my-evolution/Locations.h:1091
+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 "Joulusaaret"
+
+#: 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 "Kenia"
+
+#: my-evolution/Locations.h:1132
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1133
+#, fuzzy
+msgid "Korea, Republic of"
+msgstr "Tsekinmaa"
+
+#: 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 "Korealainen"
+
+#: 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 "tulevat"
+
+#: 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 "Liettua"
+
+#: my-evolution/Locations.h:1151
+msgid "La Coruna"
+msgstr ""
+
+#: my-evolution/Locations.h:1152
+#, fuzzy
+msgid "La Crosse"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1153
+msgid "La Esperanza"
+msgstr ""
+
+#: my-evolution/Locations.h:1154
+msgid "Lafayette"
+msgstr ""
+
+#: my-evolution/Locations.h:1155
+msgid "La Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1156
+#, fuzzy
+msgid "Lahaina"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:1157
+#, fuzzy
+msgid "Lahore"
+msgstr "_Suuret kuvakkeet"
+
+#: my-evolution/Locations.h:1158
+#, fuzzy
+msgid "Lajes"
+msgstr "Laos"
+
+#: 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 "Islanti"
+
+#: my-evolution/Locations.h:1164
+msgid "Lake Tahoe"
+msgstr ""
+
+#: my-evolution/Locations.h:1165
+#, fuzzy
+msgid "Lakeview"
+msgstr "Esikatselu:"
+
+#: my-evolution/Locations.h:1166
+#, fuzzy
+msgid "Lamar"
+msgstr "Qatar"
+
+#: my-evolution/Locations.h:1167
+msgid "La Mesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1168
+#, fuzzy
+msgid "Lamezia"
+msgstr "Gambia"
+
+#: my-evolution/Locations.h:1169
+#, fuzzy
+msgid "Lamoni"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1170
+msgid "Lampedusa"
+msgstr ""
+
+#: my-evolution/Locations.h:1171
+#, fuzzy
+msgid "Lanai"
+msgstr "Ghana"
+
+#: my-evolution/Locations.h:1172
+#, fuzzy
+msgid "Lancaster"
+msgstr "Vaaka"
+
+#: my-evolution/Locations.h:1173
+#, fuzzy
+msgid "Lander"
+msgstr "Yl�tunniste:"
+
+#: my-evolution/Locations.h:1174
+msgid "Langebaanweg"
+msgstr ""
+
+#: my-evolution/Locations.h:1175
+msgid "Langley AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1176
+#, fuzzy
+msgid "Lannion"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1177
+#, fuzzy
+msgid "Lansing"
+msgstr "Varoitus"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1182
+#, fuzzy
+msgid "Laredo"
+msgstr "_Suuret kuvakkeet"
+
+#: my-evolution/Locations.h:1183
+#, fuzzy
+msgid "Larnaka"
+msgstr "Sri Lanka"
+
+#: my-evolution/Locations.h:1184
+#, fuzzy
+msgid "La Romana"
+msgstr "Romania"
+
+#: 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 "Latvia"
+
+#: my-evolution/Locations.h:1189
+msgid "Latrobe"
+msgstr ""
+
+#: my-evolution/Locations.h:1191
+msgid "Laughlin"
+msgstr ""
+
+#: my-evolution/Locations.h:1192
+#, fuzzy
+msgid "Laurel"
+msgstr "_Suuret kuvakkeet"
+
+#: my-evolution/Locations.h:1193
+#, fuzzy
+msgid "La Verne"
+msgstr "Kap Verde"
+
+#: my-evolution/Locations.h:1194
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1195
+#, fuzzy
+msgid "Lawton"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1196
+msgid "Leadville"
+msgstr ""
+
+#: my-evolution/Locations.h:1197
+msgid "Learmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1199
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1201
+#, fuzzy
+msgid "Leesburg"
+msgstr "Luxemburg"
+
+#: my-evolution/Locations.h:1202
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1205
+msgid "Leknes"
+msgstr ""
+
+#: my-evolution/Locations.h:1206
+msgid "Le Mans"
+msgstr ""
+
+#: my-evolution/Locations.h:1207
+#, fuzzy
+msgid "Le Marine"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1208
+#, fuzzy
+msgid "Lemmon"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1209
+#, fuzzy
+msgid "Lemoore"
+msgstr "Poista"
+
+#: my-evolution/Locations.h:1210
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1212
+#, fuzzy
+msgid "Leuchars"
+msgstr "vuotta"
+
+#: my-evolution/Locations.h:1213
+#, fuzzy
+msgid "Lewisburg"
+msgstr "Luxemburg"
+
+#: my-evolution/Locations.h:1214
+#, fuzzy
+msgid "Lewiston"
+msgstr "Uusi luettelo"
+
+#: my-evolution/Locations.h:1215
+msgid "Lewistown"
+msgstr ""
+
+#: my-evolution/Locations.h:1216
+#, fuzzy
+msgid "Lexington"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1217
+#, fuzzy
+msgid "Liberal"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1219
+#, fuzzy
+msgid "Libya"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1220
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1221
+msgid "Lidgerwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1222
+msgid "Liege"
+msgstr ""
+
+#: my-evolution/Locations.h:1223
+msgid "Lihue"
+msgstr ""
+
+#: my-evolution/Locations.h:1224
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1225
+msgid "Lima-Callao"
+msgstr ""
+
+#: my-evolution/Locations.h:1226
+#, fuzzy
+msgid "Limnos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1227
+#, fuzzy
+msgid "Limoges"
+msgstr "Matalin"
+
+#: my-evolution/Locations.h:1228
+#, fuzzy
+msgid "Limon"
+msgstr "kuukausi"
+
+#: my-evolution/Locations.h:1229
+#, fuzzy
+msgid "Lincoln"
+msgstr "tulevat"
+
+#: my-evolution/Locations.h:1230
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1231
+#, fuzzy
+msgid "Lisboa"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1232
+#, fuzzy
+msgid "Lista"
+msgstr "Pakistan"
+
+#: my-evolution/Locations.h:1233
+msgid "Litchfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1240
+msgid "Ljubljana"
+msgstr ""
+
+#: my-evolution/Locations.h:1241
+#, fuzzy
+msgid "Logan"
+msgstr "Tonga"
+
+#: my-evolution/Locations.h:1242
+msgid "Lolland Falster"
+msgstr ""
+
+#: my-evolution/Locations.h:1243
+#, fuzzy
+msgid "Lompoc"
+msgstr "Yrit"
+
+#: my-evolution/Locations.h:1244
+#, fuzzy
+msgid "London"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1245
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1249
+#, fuzzy
+msgid "Londrina"
+msgstr "Honduras"
+
+#: my-evolution/Locations.h:1250
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1253
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+#: my-evolution/Locations.h:1254
+msgid "Los Alamos"
+msgstr ""
+
+#: my-evolution/Locations.h:1255
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1260
+#, fuzzy
+msgid "Lousiana"
+msgstr "Botswana"
+
+#: my-evolution/Locations.h:1261
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1265
+#, fuzzy
+msgid "Lugano"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1266
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1267
+#, fuzzy
+msgid "Luton"
+msgstr "l�htev�t"
+
+#: my-evolution/Locations.h:1269
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1270
+#, fuzzy
+msgid "Luxor"
+msgstr "Luxemburg"
+
+#: my-evolution/Locations.h:1271
+#, fuzzy
+msgid "Lviv"
+msgstr "Latvia"
+
+#: my-evolution/Locations.h:1272
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1275
+msgid "Lyon-Satolas"
+msgstr ""
+
+#: my-evolution/Locations.h:1276
+#, fuzzy
+msgid "Maastricht"
+msgstr "Maaliskuu"
+
+#: my-evolution/Locations.h:1277
+#, fuzzy
+msgid "Macae"
+msgstr "Osumia:"
+
+#: my-evolution/Locations.h:1278
+msgid "Macapa"
+msgstr ""
+
+#: my-evolution/Locations.h:1279
+#, fuzzy
+msgid "Maceio"
+msgstr "Meksiko"
+
+#: my-evolution/Locations.h:1280
+#, fuzzy
+msgid "Macon"
+msgstr "Monaco"
+
+#: my-evolution/Locations.h:1281
+msgid "Madinah"
+msgstr ""
+
+#: my-evolution/Locations.h:1282
+msgid "Madison"
+msgstr ""
+
+#: my-evolution/Locations.h:1283
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1285
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+#: my-evolution/Locations.h:1286
+#, fuzzy
+msgid "Magadan"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:1287
+msgid "Magdalena"
+msgstr ""
+
+#: my-evolution/Locations.h:1288
+#, fuzzy
+msgid "Maine"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1289
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1290
+msgid "Makkah"
+msgstr ""
+
+#: my-evolution/Locations.h:1291
+msgid "Makung"
+msgstr ""
+
+#: my-evolution/Locations.h:1292
+#, fuzzy
+msgid "Malad City"
+msgstr "Malawi"
+
+#: my-evolution/Locations.h:1293
+#, fuzzy
+msgid "Malaga"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1294
+#, fuzzy
+msgid "Malatya"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1295
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1296
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1298
+msgid "Mammoth Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1299
+#, fuzzy
+msgid "Managua"
+msgstr "Paraguay"
+
+#: my-evolution/Locations.h:1300
+#, fuzzy
+msgid "Manassas"
+msgstr "Malesia"
+
+#: my-evolution/Locations.h:1301
+#, fuzzy
+msgid "Manaus"
+msgstr "Reunukset"
+
+#: my-evolution/Locations.h:1302
+#, fuzzy
+msgid "Manchester"
+msgstr "Osumia:"
+
+#: my-evolution/Locations.h:1303
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+msgid "Manhattan"
+msgstr ""
+
+#: my-evolution/Locations.h:1305
+#, fuzzy
+msgid "Manisa"
+msgstr "Romania"
+
+#: my-evolution/Locations.h:1306
+#, fuzzy
+msgid "Manistee"
+msgstr "Liit�"
+
+#: my-evolution/Locations.h:1307
+#, fuzzy
+msgid "Manitoba"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1308
+msgid "Manitowoc"
+msgstr ""
+
+#: my-evolution/Locations.h:1309
+#, fuzzy
+msgid "Mankato"
+msgstr "Monaco"
+
+#: my-evolution/Locations.h:1310
+msgid "Mansfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1311
+#, fuzzy
+msgid "Manta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1312
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1313
+msgid "Maraba"
+msgstr ""
+
+#: my-evolution/Locations.h:1314
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1315
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1316
+#, fuzzy
+msgid "Marathon"
+msgstr "Maaliskuu"
+
+#: my-evolution/Locations.h:1317
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1318
+#, fuzzy
+msgid "Margarita"
+msgstr "Reunukset"
+
+#: my-evolution/Locations.h:1319
+#, fuzzy
+msgid "Marianna"
+msgstr "Reunukset"
+
+#: my-evolution/Locations.h:1320
+#, fuzzy
+msgid "Marib"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1321
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1322
+#, fuzzy
+msgid "Marietta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1323
+msgid "Marino di Ravenna"
+msgstr ""
+
+#: my-evolution/Locations.h:1324
+#, fuzzy
+msgid "Marion"
+msgstr "Reunukset"
+
+#: my-evolution/Locations.h:1325
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1326
+msgid "Marquette"
+msgstr ""
+
+#: my-evolution/Locations.h:1327
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+msgid "Marseilles"
+msgstr ""
+
+#: my-evolution/Locations.h:1329
+#, fuzzy
+msgid "Marshall"
+msgstr "Maaliskuu"
+
+#: my-evolution/Locations.h:1330
+msgid "Marshalltown"
+msgstr ""
+
+#: my-evolution/Locations.h:1331
+msgid "Marshfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1332
+#, fuzzy
+msgid "Marte"
+msgstr "P�iv�ys"
+
+#: my-evolution/Locations.h:1333
+#, fuzzy
+msgid "Marthas Vineyard"
+msgstr "Merkitse luke_mattomaksi"
+
+#: my-evolution/Locations.h:1334
+#, fuzzy
+msgid "Martinsburg"
+msgstr "Reunukset"
+
+#: my-evolution/Locations.h:1335
+#, fuzzy
+msgid "Martinsville"
+msgstr "Reunukset"
+
+#: my-evolution/Locations.h:1336
+#, fuzzy
+msgid "Maryland"
+msgstr "Irlanti"
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1339
+msgid "Mashhad"
+msgstr ""
+
+#: my-evolution/Locations.h:1340
+#, fuzzy
+msgid "Masirah"
+msgstr "Malesia"
+
+#: my-evolution/Locations.h:1341
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1343
+msgid "Massena"
+msgstr ""
+
+#: my-evolution/Locations.h:1344
+msgid "Matamoros"
+msgstr ""
+
+#: my-evolution/Locations.h:1345
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1347
+msgid "Matsuyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1348
+msgid "Mattoon"
+msgstr ""
+
+#: my-evolution/Locations.h:1349
+msgid "Mayaguez"
+msgstr ""
+
+#: my-evolution/Locations.h:1350
+#, fuzzy
+msgid "Mayport"
+msgstr "Tuo"
+
+#: my-evolution/Locations.h:1351
+#, fuzzy
+msgid "Mazatlan"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1352
+msgid "Mazu"
+msgstr ""
+
+#: my-evolution/Locations.h:1353
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1354
+msgid "McAllen"
+msgstr ""
+
+#: my-evolution/Locations.h:1355
+#, fuzzy
+msgid "McCall"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1356
+#, fuzzy
+msgid "McCarthy"
+msgstr "Maaliskuu"
+
+#: my-evolution/Locations.h:1357
+#, fuzzy
+msgid "McClellan"
+msgstr "Islanti"
+
+#: my-evolution/Locations.h:1358
+#, fuzzy
+msgid "McComb"
+msgstr "Yrit"
+
+#: my-evolution/Locations.h:1359
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1361
+msgid "Mc Gregor"
+msgstr ""
+
+#: my-evolution/Locations.h:1362
+#, fuzzy
+msgid "Meacham"
+msgstr "Maaliskuu"
+
+#: my-evolution/Locations.h:1363
+#, fuzzy
+msgid "Medford"
+msgstr "ennen"
+
+#: my-evolution/Locations.h:1364
+msgid "Medicine Lodge"
+msgstr ""
+
+#: my-evolution/Locations.h:1365
+msgid "Mehamn"
+msgstr ""
+
+#: my-evolution/Locations.h:1366
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1367
+msgid "Melbourne"
+msgstr ""
+
+#: my-evolution/Locations.h:1368
+#, fuzzy
+msgid "Melfa"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1369
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1373
+#, fuzzy
+msgid "Mendoza"
+msgstr "Maanantai"
+
+#: my-evolution/Locations.h:1374
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1377
+msgid "Merced"
+msgstr ""
+
+#: my-evolution/Locations.h:1378
+#, fuzzy
+msgid "Merida"
+msgstr "Perjantai"
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1380
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1381
+msgid "Merril Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1382
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1386
+#, fuzzy
+msgid "Mexicali"
+msgstr "Meksiko"
+
+#: my-evolution/Locations.h:1388
+#, fuzzy
+msgid "Miami"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1391
+msgid "Michigan"
+msgstr ""
+
+#: my-evolution/Locations.h:1392
+#, fuzzy
+msgid "Middle East"
+msgstr "_Toinen nimi:"
+
+#: my-evolution/Locations.h:1393
+msgid "Middleton Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1394
+#, fuzzy
+msgid "Middletown"
+msgstr "_Toinen nimi:"
+
+#: my-evolution/Locations.h:1395
+#, fuzzy
+msgid "Midland"
+msgstr "Suomi"
+
+#: my-evolution/Locations.h:1396
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1398
+msgid "Milano/Malpensa"
+msgstr ""
+
+#: my-evolution/Locations.h:1399
+#, fuzzy
+msgid "Miles City"
+msgstr "Tiedoston tyyppi:"
+
+#: my-evolution/Locations.h:1400
+msgid "Milford"
+msgstr ""
+
+#: my-evolution/Locations.h:1401
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1402
+msgid "Millville"
+msgstr ""
+
+#: my-evolution/Locations.h:1403
+#, fuzzy
+msgid "Milton"
+msgstr "Ma"
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1407
+msgid "Minatitlan"
+msgstr ""
+
+#: my-evolution/Locations.h:1408
+#, fuzzy
+msgid "Minchumina"
+msgstr "tulevat"
+
+#: my-evolution/Locations.h:1409
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1414
+#, fuzzy
+msgid "Minnesota"
+msgstr "minuutti"
+
+#: my-evolution/Locations.h:1415
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1416
+#, fuzzy
+msgid "Minot"
+msgstr "ei ole"
+
+#: my-evolution/Locations.h:1417
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1419
+msgid "Mississippi"
+msgstr ""
+
+#: my-evolution/Locations.h:1420
+#, fuzzy
+msgid "Missoula"
+msgstr "Neiti"
+
+#: my-evolution/Locations.h:1421
+#, fuzzy
+msgid "Missouri"
+msgstr "Neiti"
+
+#: my-evolution/Locations.h:1422
+#, fuzzy
+msgid "Mitchell"
+msgstr "Osumia:"
+
+#: my-evolution/Locations.h:1423
+msgid "Mitilini"
+msgstr ""
+
+#: my-evolution/Locations.h:1424
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1425
+msgid "Miyazaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1426
+#, fuzzy
+msgid "Moa"
+msgstr "Ma"
+
+#: my-evolution/Locations.h:1427
+#, fuzzy
+msgid "Mobile Downtown"
+msgstr "Matkapuhelin"
+
+#: my-evolution/Locations.h:1428
+msgid "Mobile Regional Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1429
+#, fuzzy
+msgid "Mobridge"
+msgstr "Matkapuhelin"
+
+#: my-evolution/Locations.h:1430
+#, fuzzy
+msgid "Modesto"
+msgstr "Matalin"
+
+#: my-evolution/Locations.h:1431
+msgid "Mo I Rana"
+msgstr ""
+
+#: my-evolution/Locations.h:1432
+#, fuzzy
+msgid "Mojave"
+msgstr "Siirr�"
+
+#: my-evolution/Locations.h:1433
+#, fuzzy
+msgid "Molde"
+msgstr "Matkapuhelin"
+
+#: my-evolution/Locations.h:1434
+#, fuzzy
+msgid "Moldova"
+msgstr "Maanantai"
+
+#: my-evolution/Locations.h:1435
+msgid "Moline-Quad Cities"
+msgstr ""
+
+#: my-evolution/Locations.h:1436
+#, fuzzy
+msgid "Molokai"
+msgstr "Malawi"
+
+#: my-evolution/Locations.h:1437
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1438
+msgid "Monchengladbach"
+msgstr ""
+
+#: my-evolution/Locations.h:1439
+#, fuzzy
+msgid "Monclova"
+msgstr "Monaco"
+
+#: my-evolution/Locations.h:1440
+#, fuzzy
+msgid "Moncton"
+msgstr "Monaco"
+
+#: my-evolution/Locations.h:1441
+#, fuzzy
+msgid "Monida"
+msgstr "Maanantai"
+
+#: my-evolution/Locations.h:1442
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+#: my-evolution/Locations.h:1443
+#, fuzzy
+msgid "Monroe"
+msgstr "Monaco"
+
+#: my-evolution/Locations.h:1444
+#, fuzzy
+msgid "Montague"
+msgstr "_Kuukausi"
+
+#: my-evolution/Locations.h:1445
+#, fuzzy
+msgid "Montana"
+msgstr "Botswana"
+
+#: my-evolution/Locations.h:1446
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1448
+msgid "Monte Bisbino"
+msgstr ""
+
+#: my-evolution/Locations.h:1449
+msgid "Monte Calamita"
+msgstr ""
+
+#: my-evolution/Locations.h:1450
+#, fuzzy
+msgid "Monte Cimone"
+msgstr "Kuukausi"
+
+#: my-evolution/Locations.h:1451
+msgid "Montego Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:1452
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1453
+#, fuzzy
+msgid "Monterey"
+msgstr "_Kuukausi"
+
+#: my-evolution/Locations.h:1454
+msgid "Monterrey"
+msgstr ""
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1458
+msgid "Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1459
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1460
+#, fuzzy
+msgid "Monticello"
+msgstr "Monaco"
+
+#: my-evolution/Locations.h:1461
+#, fuzzy
+msgid "Montpelier"
+msgstr "Kuukausi"
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1465
+#, fuzzy
+msgid "Montrose"
+msgstr "Kirjasinlajit"
+
+#: my-evolution/Locations.h:1466
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1467
+#, fuzzy
+msgid "Morelia"
+msgstr "Korealainen"
+
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Morgantown"
+msgstr "Organisaatio"
+
+#: my-evolution/Locations.h:1469
+#, fuzzy
+msgid "Moriarty"
+msgstr "Ensisijainen"
+
+#: my-evolution/Locations.h:1471
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1474
+msgid "Moses Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1475
+#, fuzzy
+msgid "Mosinee"
+msgstr "Matkapuhelin"
+
+#: my-evolution/Locations.h:1476
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain Home"
+msgstr ""
+
+#: my-evolution/Locations.h:1479
+#, fuzzy
+msgid "Mountain View"
+msgstr "Kuukausi"
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1482
+msgid "Mount Shasta"
+msgstr ""
+
+#: my-evolution/Locations.h:1483
+#, fuzzy
+msgid "Mount Vernon"
+msgstr "Kuukausi"
+
+#: my-evolution/Locations.h:1484
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1487
+msgid "Muir"
+msgstr ""
+
+#: my-evolution/Locations.h:1488
+msgid "Mullan"
+msgstr ""
+
+#: my-evolution/Locations.h:1489
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1490
+msgid "Munchen"
+msgstr ""
+
+#: my-evolution/Locations.h:1491
+#, fuzzy
+msgid "Muncie"
+msgstr "Kes�kuu"
+
+#: my-evolution/Locations.h:1492
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1493
+#, fuzzy
+msgid "Murcia"
+msgstr "It�valta"
+
+#: my-evolution/Locations.h:1494
+msgid "Murmansk"
+msgstr ""
+
+#: my-evolution/Locations.h:1495
+#, fuzzy
+msgid "Mus"
+msgstr "Nti."
+
+#: my-evolution/Locations.h:1496
+msgid "Muscatine"
+msgstr ""
+
+#: my-evolution/Locations.h:1497
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1498
+msgid "Muskegon"
+msgstr ""
+
+#: my-evolution/Locations.h:1499
+#, fuzzy
+msgid "Mykonos"
+msgstr "Kirjasinlajit"
+
+#: my-evolution/Locations.h:1500
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1507
+#, fuzzy
+msgid "Najran"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:1508
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1509
+msgid "Nalchik"
+msgstr ""
+
+#: my-evolution/Locations.h:1510
+#, fuzzy
+msgid "Namsos"
+msgstr "Nimi"
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1513
+msgid "Nankishirahama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1514
+#, fuzzy
+msgid "Nanning"
+msgstr "Varoitus"
+
+#: my-evolution/Locations.h:1515
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1516
+msgid "Nantucket"
+msgstr ""
+
+#: my-evolution/Locations.h:1517
+#, fuzzy
+msgid "Napa"
+msgstr "Japani"
+
+#: my-evolution/Locations.h:1518
+#, fuzzy
+msgid "Naples"
+msgstr "Nimi"
+
+#: my-evolution/Locations.h:1519
+#, fuzzy
+msgid "Napoli"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1520
+msgid "Narvik"
+msgstr ""
+
+#: my-evolution/Locations.h:1521
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1524
+msgid "Nassau"
+msgstr ""
+
+#: my-evolution/Locations.h:1525
+#, fuzzy
+msgid "Natal"
+msgstr "Italia"
+
+#: my-evolution/Locations.h:1526
+#, fuzzy
+msgid "Natchez"
+msgstr "Osumia:"
+
+#: my-evolution/Locations.h:1527
+msgid "Nawabshah"
+msgstr ""
+
+#: my-evolution/Locations.h:1528
+#, fuzzy
+msgid "Nebraska"
+msgstr "Uusi teht�v�"
+
+#: my-evolution/Locations.h:1529
+msgid "Needles"
+msgstr ""
+
+#: my-evolution/Locations.h:1530
+#, fuzzy
+msgid "Nenana"
+msgstr "Grenada"
+
+#: my-evolution/Locations.h:1532
+msgid "Neuquen"
+msgstr ""
+
+#: my-evolution/Locations.h:1533
+#, fuzzy
+msgid "Nevada"
+msgstr "Grenada"
+
+#: my-evolution/Locations.h:1534
+#, fuzzy
+msgid "Newark"
+msgstr "Uusi teht�v�"
+
+#: my-evolution/Locations.h:1535
+msgid "New Bedford"
+msgstr ""
+
+#: my-evolution/Locations.h:1536
+#, fuzzy
+msgid "New Bern"
+msgstr "Uusi-Seelanti"
+
+#: my-evolution/Locations.h:1537
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1539
+msgid "Newburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1540
+#, fuzzy
+msgid "Newcastle"
+msgstr "Keskusteluryhm�t"
+
+#: my-evolution/Locations.h:1541
+#, fuzzy
+msgid "New Delhi/Palam"
+msgstr "Uusi-Seelanti"
+
+#: my-evolution/Locations.h:1542
+#, fuzzy
+msgid "Newfoundland"
+msgstr "Uusi-Seelanti"
+
+#: my-evolution/Locations.h:1543
+msgid "New Hampshire"
+msgstr ""
+
+#: my-evolution/Locations.h:1544
+#, fuzzy
+msgid "New Haven"
+msgstr "Uusi Kaledonia"
+
+#: my-evolution/Locations.h:1545
+#, fuzzy
+msgid "New Iberia"
+msgstr "Uusi Kaledonia"
+
+#: my-evolution/Locations.h:1546
+#, fuzzy
+msgid "New Jersey"
+msgstr "Seuraava viesti"
+
+#: my-evolution/Locations.h:1547
+#, fuzzy
+msgid "New Mexico"
+msgstr "Meksiko"
+
+#: my-evolution/Locations.h:1548
+#, fuzzy
+msgid "New Orleans"
+msgstr "Alankomaat"
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1550
+msgid "New Orleans NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1551
+#, fuzzy
+msgid "Newport"
+msgstr "Tuo"
+
+#: my-evolution/Locations.h:1552
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1553
+msgid "New Port Richey"
+msgstr ""
+
+#: my-evolution/Locations.h:1554
+#, fuzzy
+msgid "New River"
+msgstr "_Uusi kansio"
+
+#: my-evolution/Locations.h:1555
+msgid "New Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1556
+#, fuzzy
+msgid "Newton"
+msgstr "Uusi"
+
+#: my-evolution/Locations.h:1557
+#, fuzzy
+msgid "New York"
+msgstr "_Uusi kansio"
+
+#: my-evolution/Locations.h:1558
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1559
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1561
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1564
+msgid "Niigata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1565
+#, fuzzy
+msgid "Nimes-Garons"
+msgstr "Mitat:"
+
+#: my-evolution/Locations.h:1566
+#, fuzzy
+msgid "Nipawin"
+msgstr "Espanja"
+
+#: my-evolution/Locations.h:1567
+#, fuzzy
+msgid "Nis"
+msgstr "on"
+
+#: my-evolution/Locations.h:1568
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1570
+msgid "N Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1571
+#, fuzzy
+msgid "Nogales"
+msgstr "Tavallinen"
+
+#: my-evolution/Locations.h:1572
+#, fuzzy
+msgid "Nome"
+msgstr "Nimi"
+
+#: my-evolution/Locations.h:1573
+#, fuzzy
+msgid "Norfolk"
+msgstr "Tavallinen"
+
+#: my-evolution/Locations.h:1575
+msgid "Norfolk NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1576
+msgid "Norrkoping"
+msgstr ""
+
+#: my-evolution/Locations.h:1577
+msgid "North Adams"
+msgstr ""
+
+#: my-evolution/Locations.h:1578
+msgid "North Bend"
+msgstr ""
+
+#: my-evolution/Locations.h:1579
+msgid "North Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:1580
+#, fuzzy
+msgid "North Conway"
+msgstr "Norja"
+
+#: my-evolution/Locations.h:1581
+#, fuzzy
+msgid "North Dakota"
+msgstr "Syntym�p�iv�"
+
+#: my-evolution/Locations.h:1582
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1583
+msgid "North Kingstown"
+msgstr ""
+
+#: my-evolution/Locations.h:1584
+#, fuzzy
+msgid "North Platte"
+msgstr "Syntym�p�iv�"
+
+#: my-evolution/Locations.h:1585
+#, fuzzy
+msgid "Northway"
+msgstr "Norja"
+
+#: my-evolution/Locations.h:1586
+msgid "Northwest Territories"
+msgstr ""
+
+#: my-evolution/Locations.h:1588
+#, fuzzy
+msgid "Norwich"
+msgstr "Norja"
+
+#: my-evolution/Locations.h:1589
+#, fuzzy
+msgid "Norwood"
+msgstr "Norja"
+
+#: my-evolution/Locations.h:1590
+msgid "Notodden"
+msgstr ""
+
+#: my-evolution/Locations.h:1591
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1595
+msgid "Nueva Ocotepeque"
+msgstr ""
+
+#: my-evolution/Locations.h:1596
+#, fuzzy
+msgid "Nuevo Laredo"
+msgstr "Ei kortteja"
+
+#: my-evolution/Locations.h:1597
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+msgid "Oahu"
+msgstr ""
+
+#: my-evolution/Locations.h:1600
+msgid "Oak Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:1601
+#, fuzzy
+msgid "Oakland"
+msgstr "Thaimaa"
+
+#: my-evolution/Locations.h:1602
+#, fuzzy
+msgid "Oaxaca"
+msgstr "Jamaika"
+
+#: my-evolution/Locations.h:1603
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+msgid "Obihiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1605
+#, fuzzy
+msgid "Ocala"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1606
+#, fuzzy
+msgid "Oceanside"
+msgstr "Islanti"
+
+#: my-evolution/Locations.h:1607
+#, fuzzy
+msgid "Odense"
+msgstr "Avaa"
+
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1609
+#, fuzzy
+msgid "Oelwen"
+msgstr "Avaa"
+
+#: my-evolution/Locations.h:1610
+#, fuzzy
+msgid "Ogden"
+msgstr "Avaa"
+
+#: my-evolution/Locations.h:1611
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1613
+msgid "Ohio"
+msgstr ""
+
+#: my-evolution/Locations.h:1614
+#, fuzzy
+msgid "Ohrid"
+msgstr "Muut"
+
+#: my-evolution/Locations.h:1615
+msgid "Oita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1616
+#, fuzzy
+msgid "Ojika Island"
+msgstr "Joulusaaret"
+
+#: my-evolution/Locations.h:1617
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1624
+#, fuzzy
+msgid "Okushiri Island"
+msgstr "Neitsytsaaret"
+
+#: my-evolution/Locations.h:1625
+#, fuzzy
+msgid "Olathe"
+msgstr "Muut"
+
+#: my-evolution/Locations.h:1626
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1627
+#, fuzzy
+msgid "Olbia"
+msgstr "Kolumbia"
+
+#: my-evolution/Locations.h:1628
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1629
+#, fuzzy
+msgid "Omaha"
+msgstr "Oman"
+
+#: my-evolution/Locations.h:1630
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1631
+#, fuzzy
+msgid "Omak"
+msgstr "Oman"
+
+#: my-evolution/Locations.h:1633
+msgid "Ominato Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1634
+msgid "Omsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1635
+msgid "O'Neill"
+msgstr ""
+
+#: my-evolution/Locations.h:1636
+#, fuzzy
+msgid "Ontario"
+msgstr "Suunta"
+
+#: my-evolution/Locations.h:1637
+#, fuzzy
+msgid "Oostende"
+msgstr "Osanottaja"
+
+#: my-evolution/Locations.h:1638
+#, fuzzy
+msgid "Oran"
+msgstr "Oman"
+
+#: my-evolution/Locations.h:1639
+msgid "Oran/Es Senia"
+msgstr ""
+
+#: my-evolution/Locations.h:1640
+#, fuzzy
+msgid "Orange"
+msgstr "Ranska"
+
+#: my-evolution/Locations.h:1641
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1642
+msgid "Ord-Sharp"
+msgstr ""
+
+#: my-evolution/Locations.h:1643
+#, fuzzy
+msgid "Oregon"
+msgstr "Alueet"
+
+#: my-evolution/Locations.h:1644
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1645
+#, fuzzy
+msgid "Orland"
+msgstr "Irlanti"
+
+#: my-evolution/Locations.h:1646
+#, fuzzy
+msgid "Orlando"
+msgstr "Irlanti"
+
+#: my-evolution/Locations.h:1647
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1648
+msgid "Orsta-Volda"
+msgstr ""
+
+#: my-evolution/Locations.h:1649
+#, fuzzy
+msgid "Oruro"
+msgstr "Virhe"
+
+#: my-evolution/Locations.h:1650
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1652
+#, fuzzy
+msgid "Oscoda"
+msgstr "sekunti"
+
+#: my-evolution/Locations.h:1653
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1657
+#, fuzzy
+msgid "Ostrava"
+msgstr "Australia"
+
+#: my-evolution/Locations.h:1658
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1661
+#, fuzzy
+msgid "Owyhee"
+msgstr "viikko"
+
+#: my-evolution/Locations.h:1662
+msgid "Oxford"
+msgstr ""
+
+#: my-evolution/Locations.h:1663
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1670
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1671
+#, fuzzy
+msgid "Paganella"
+msgstr "Sivu"
+
+#: my-evolution/Locations.h:1674
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1675
+msgid "Palacios"
+msgstr ""
+
+#: my-evolution/Locations.h:1676
+#, fuzzy
+msgid "Palermo"
+msgstr "Paperi"
+
+#: my-evolution/Locations.h:1677
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1678
+msgid "Palmdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1679
+#, fuzzy
+msgid "Palmer"
+msgstr "Paperi"
+
+#: my-evolution/Locations.h:1680
+#, fuzzy
+msgid "Palm Springs"
+msgstr "_S�hk�postiasetukset..."
+
+#: my-evolution/Locations.h:1681
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1682
+msgid "Pamplona"
+msgstr ""
+
+#: my-evolution/Locations.h:1684
+#, fuzzy
+msgid "Panama City"
+msgstr "Panama"
+
+#: my-evolution/Locations.h:1685
+#, fuzzy
+msgid "Pantelleria"
+msgstr "Peruutettu"
+
+#: my-evolution/Locations.h:1686
+#, fuzzy
+msgid "Papa"
+msgstr "Japani"
+
+#: my-evolution/Locations.h:1687
+#, fuzzy
+msgid "Paphos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1689
+#, fuzzy
+msgid "Paris"
+msgstr "Ensisij"
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1692
+#, fuzzy
+msgid "Paris/Orly"
+msgstr "Ensisijainen"
+
+#: my-evolution/Locations.h:1693
+msgid "Parkersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1694
+#, fuzzy
+msgid "Pasco"
+msgstr "Salasana"
+
+#: my-evolution/Locations.h:1695
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1700
+msgid "Passo Rolle"
+msgstr ""
+
+#: my-evolution/Locations.h:1701
+#, fuzzy
+msgid "Patna"
+msgstr "Panama"
+
+#: my-evolution/Locations.h:1702
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1706
+#, fuzzy
+msgid "Paysandu"
+msgstr "Pakistan"
+
+#: my-evolution/Locations.h:1707
+#, fuzzy
+msgid "Payson"
+msgstr "p�iv��"
+
+#: my-evolution/Locations.h:1708
+#, fuzzy
+msgid "Pellston"
+msgstr "Kysymys"
+
+#: my-evolution/Locations.h:1709
+#, fuzzy
+msgid "Pelotas"
+msgstr "Lue"
+
+#: my-evolution/Locations.h:1710
+#, fuzzy
+msgid "Pendleton"
+msgstr "K��nn� valinta"
+
+#: my-evolution/Locations.h:1711
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1716
+#, fuzzy
+msgid "Peoria"
+msgstr "Georgia"
+
+#: my-evolution/Locations.h:1717
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1718
+msgid "Pereira/Matecana"
+msgstr ""
+
+#: my-evolution/Locations.h:1719
+#, fuzzy
+msgid "Perm"
+msgstr "Ensisij"
+
+#: my-evolution/Locations.h:1720
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1721
+msgid "Perry-Foley"
+msgstr ""
+
+#: my-evolution/Locations.h:1722
+#, fuzzy
+msgid "Perth"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1724
+#, fuzzy
+msgid "Perugia"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1725
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1730
+#, fuzzy
+msgid "Philip"
+msgstr "Filippiinit"
+
+#: my-evolution/Locations.h:1731
+#, fuzzy
+msgid "Philipsburg"
+msgstr "Filippiinit"
+
+#: my-evolution/Locations.h:1732
+#, fuzzy
+msgid "Phillips"
+msgstr "Filippiinit"
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1739
+msgid "Piedras Negras"
+msgstr ""
+
+#: my-evolution/Locations.h:1740
+#, fuzzy
+msgid "Pierre"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1741
+msgid "Pietersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1742
+msgid "Pikeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1743
+msgid "Pine Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+msgid "Pirassununga"
+msgstr ""
+
+#: my-evolution/Locations.h:1747
+#, fuzzy
+msgid "Pisa"
+msgstr "Pakistan"
+
+#: my-evolution/Locations.h:1748
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1753
+#, fuzzy
+msgid "Plymouth"
+msgstr "kuukausi"
+
+#: my-evolution/Locations.h:1754
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+msgid "Pocos De Caldas"
+msgstr ""
+
+#: my-evolution/Locations.h:1756
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1757
+msgid "Podgorica Titograd"
+msgstr ""
+
+#: my-evolution/Locations.h:1758
+msgid "Pohang Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1759
+#, fuzzy
+msgid "Point Hope"
+msgstr "Tulosta kirjekuori"
+
+#: my-evolution/Locations.h:1760
+#, fuzzy
+msgid "Point Lay"
+msgstr "Kuvaus"
+
+#: my-evolution/Locations.h:1761
+#, fuzzy
+msgid "Point Mugu"
+msgstr "Tulosta viesti"
+
+#: my-evolution/Locations.h:1762
+msgid "Point Piedras Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1763
+#, fuzzy
+msgid "Poitiers"
+msgstr "Ominaisuudet"
+
+#: my-evolution/Locations.h:1765
+msgid "Pompano Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1766
+msgid "Ponca City"
+msgstr ""
+
+#: my-evolution/Locations.h:1767
+#, fuzzy
+msgid "Ponce"
+msgstr "M��rittelem�t�n"
+
+#: my-evolution/Locations.h:1768
+msgid "Ponta Pora"
+msgstr ""
+
+#: my-evolution/Locations.h:1769
+#, fuzzy
+msgid "Pontiac"
+msgstr "Kontaktit"
+
+#: my-evolution/Locations.h:1770
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1771
+msgid "Poplar Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1772
+#, fuzzy
+msgid "Poprad"
+msgstr "Puola"
+
+#: my-evolution/Locations.h:1773
+#, fuzzy
+msgid "Port Alexander"
+msgstr "Tulosta kalenteri"
+
+#: my-evolution/Locations.h:1774
+msgid "Port Alsworth"
+msgstr ""
+
+#: my-evolution/Locations.h:1775
+#, fuzzy
+msgid "Port Angeles"
+msgstr "Tulosta kirjekuori"
+
+#: my-evolution/Locations.h:1776
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1777
+msgid "Port Elizabeth"
+msgstr ""
+
+#: my-evolution/Locations.h:1778
+#, fuzzy
+msgid "Porterville"
+msgstr "Pysty"
+
+#: my-evolution/Locations.h:1779
+#, fuzzy
+msgid "Port Hardy"
+msgstr "Tulosta kortti"
+
+#: my-evolution/Locations.h:1780
+#, fuzzy
+msgid "Port Hedland"
+msgstr "Puola"
+
+#: my-evolution/Locations.h:1781
+msgid "Port Heiden"
+msgstr ""
+
+#: my-evolution/Locations.h:1782
+#, fuzzy
+msgid "Portland"
+msgstr "Puola"
+
+#: my-evolution/Locations.h:1783
+#, fuzzy
+msgid "Porto"
+msgstr "_Portti:"
+
+#: my-evolution/Locations.h:1784
+msgid "Porto Alegre"
+msgstr ""
+
+#: my-evolution/Locations.h:1785
+msgid "Porto Alegre Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:1786
+#, fuzzy
+msgid "Portoroz"
+msgstr "Pysty"
+
+#: my-evolution/Locations.h:1787
+#, fuzzy
+msgid "Porto Santo"
+msgstr "Pysty"
+
+#: my-evolution/Locations.h:1788
+msgid "Porto Velho"
+msgstr ""
+
+#: my-evolution/Locations.h:1789
+#, fuzzy
+msgid "Port Said"
+msgstr "Pysty"
+
+#: my-evolution/Locations.h:1790
+msgid "Portsmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1792
+#, fuzzy
+msgid "Posadas"
+msgstr "Puola"
+
+#: my-evolution/Locations.h:1793
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1796
+#, fuzzy
+msgid "Poza Rica"
+msgstr "Costa Rica"
+
+#: my-evolution/Locations.h:1797
+#, fuzzy
+msgid "Poznan"
+msgstr "Puola"
+
+#: my-evolution/Locations.h:1798
+#, fuzzy
+msgid "Praha"
+msgstr "Paraguay"
+
+#: my-evolution/Locations.h:1799
+msgid "Pratica di Mare"
+msgstr ""
+
+#: my-evolution/Locations.h:1800
+msgid "Prescott"
+msgstr ""
+
+#: my-evolution/Locations.h:1801
+#, fuzzy
+msgid "Presidente Prudente"
+msgstr "Tulostuksen esikatselu"
+
+#: my-evolution/Locations.h:1802
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1804
+#, fuzzy
+msgid "Pretoria"
+msgstr "Georgia"
+
+#: my-evolution/Locations.h:1805
+#, fuzzy
+msgid "Preveza"
+msgstr "Esikatselu:"
+
+#: my-evolution/Locations.h:1806
+msgid "Price-Carbon"
+msgstr ""
+
+#: my-evolution/Locations.h:1807
+#, fuzzy
+msgid "Pristina"
+msgstr "Perinteinen"
+
+#: my-evolution/Locations.h:1808
+#, fuzzy
+msgid "Providence"
+msgstr "_Osavaltio/l��ni:"
+
+#: my-evolution/Locations.h:1809
+#, fuzzy
+msgid "Provincetown"
+msgstr "Esikatselu:"
+
+#: my-evolution/Locations.h:1810
+#, fuzzy
+msgid "Provo"
+msgstr "Edellinen"
+
+#: my-evolution/Locations.h:1811
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1812
+msgid "Pucallpa"
+msgstr ""
+
+#: my-evolution/Locations.h:1813
+msgid "Pudahuel"
+msgstr ""
+
+#: my-evolution/Locations.h:1814
+#, fuzzy
+msgid "Puebla"
+msgstr "Julkinen"
+
+#: my-evolution/Locations.h:1815
+#, fuzzy
+msgid "Pueblo"
+msgstr "Julkinen"
+
+#: my-evolution/Locations.h:1816
+msgid "Puerto Barrios"
+msgstr ""
+
+#: my-evolution/Locations.h:1817
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1818
+msgid "Puerto Escondido"
+msgstr ""
+
+#: my-evolution/Locations.h:1819
+msgid "Puerto Lempira"
+msgstr ""
+
+#: my-evolution/Locations.h:1820
+#, fuzzy
+msgid "Puerto Limon"
+msgstr "Kysymys"
+
+#: my-evolution/Locations.h:1821
+msgid "Puerto Maldonado"
+msgstr ""
+
+#: my-evolution/Locations.h:1822
+msgid "Puerto Montt"
+msgstr ""
+
+#: my-evolution/Locations.h:1823
+msgid "Puerto Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1825
+#, fuzzy
+msgid "Puerto Suarez"
+msgstr "Kuvaus"
+
+#: my-evolution/Locations.h:1826
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1827
+#, fuzzy
+msgid "Pula"
+msgstr "Puola"
+
+#: my-evolution/Locations.h:1828
+#, fuzzy
+msgid "Pullman"
+msgstr "Puola"
+
+#: my-evolution/Locations.h:1829
+msgid "Punta Arenas"
+msgstr ""
+
+#: my-evolution/Locations.h:1830
+#, fuzzy
+msgid "Punta Cana"
+msgstr "Tulosta kalenteri"
+
+#: my-evolution/Locations.h:1831
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1835
+msgid "Pyongyang"
+msgstr ""
+
+#: my-evolution/Locations.h:1837
+#, fuzzy
+msgid "Quantico"
+msgstr "Kysymys"
+
+#: my-evolution/Locations.h:1838
+#, fuzzy
+msgid "Quebec"
+msgstr "Aihe"
+
+#: my-evolution/Locations.h:1839
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1842
+msgid "Quimper"
+msgstr ""
+
+#: my-evolution/Locations.h:1843
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1850
+msgid "Rapid City"
+msgstr ""
+
+#: my-evolution/Locations.h:1851
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1852
+msgid "Ras Al Khaimah"
+msgstr ""
+
+#: my-evolution/Locations.h:1853
+msgid "Rawlins"
+msgstr ""
+
+#: my-evolution/Locations.h:1854
+#, fuzzy
+msgid "Reading"
+msgstr "Lue"
+
+#: my-evolution/Locations.h:1855
+#, fuzzy
+msgid "Rebun Island"
+msgstr "F�rsaaret"
+
+#: my-evolution/Locations.h:1856
+#, fuzzy
+msgid "Recife"
+msgstr "Otettu vastaan"
+
+#: my-evolution/Locations.h:1857
+msgid "Red Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1858
+msgid "Redding"
+msgstr ""
+
+#: my-evolution/Locations.h:1859
+#, fuzzy
+msgid "Redig"
+msgstr "Lue"
+
+#: my-evolution/Locations.h:1860
+#, fuzzy
+msgid "Redmond"
+msgstr "Muistutus"
+
+#: my-evolution/Locations.h:1861
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1863
+msgid "Reggio Calabria"
+msgstr ""
+
+#: my-evolution/Locations.h:1864
+#, fuzzy
+msgid "Regina"
+msgstr "Alueet"
+
+#: my-evolution/Locations.h:1865
+msgid "Reims-Champagne"
+msgstr ""
+
+#: my-evolution/Locations.h:1866
+#, fuzzy
+msgid "Rennes"
+msgstr "Muistutukset"
+
+#: my-evolution/Locations.h:1867
+#, fuzzy
+msgid "Reno"
+msgstr "Poista"
+
+#: my-evolution/Locations.h:1868
+#, fuzzy
+msgid "Renton"
+msgstr "Libanon"
+
+#: my-evolution/Locations.h:1869
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1870
+#, fuzzy
+msgid "Reus"
+msgstr "S��nn�t"
+
+#: my-evolution/Locations.h:1871
+#, fuzzy
+msgid "Reyes"
+msgstr "vuotta"
+
+#: my-evolution/Locations.h:1872
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1873
+#, fuzzy
+msgid "Reynosa"
+msgstr "Lue"
+
+#: my-evolution/Locations.h:1874
+#, fuzzy
+msgid "Rhinelander"
+msgstr "Suomi"
+
+#: my-evolution/Locations.h:1875
+#, fuzzy
+msgid "Rhode Island"
+msgstr "F�rsaaret"
+
+#: my-evolution/Locations.h:1876
+#, fuzzy
+msgid "Riberalta"
+msgstr "Gibraltar"
+
+#: my-evolution/Locations.h:1877
+msgid "Richmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1878
+#, fuzzy
+msgid "Rickenbacker"
+msgstr "Kutsumanimi"
+
+#: my-evolution/Locations.h:1879
+#, fuzzy
+msgid "Rieti"
+msgstr "Haiti"
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rifle"
+msgstr "Rooli"
+
+#: my-evolution/Locations.h:1881
+#, fuzzy
+msgid "Riga"
+msgstr "Oikea:"
+
+#: my-evolution/Locations.h:1882
+#, fuzzy
+msgid "Rijeka"
+msgstr "Lue"
+
+#: my-evolution/Locations.h:1883
+#, fuzzy
+msgid "Rimini"
+msgstr "Romania"
+
+#: my-evolution/Locations.h:1884
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1885
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1886
+msgid "Rio Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1887
+msgid "Rioja"
+msgstr ""
+
+#: my-evolution/Locations.h:1888
+#, fuzzy
+msgid "Rio / Jacarepagua"
+msgstr "Nicaragua"
+
+#: my-evolution/Locations.h:1889
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+#, fuzzy
+msgid "Rishiri Island"
+msgstr "Neitsytsaaret"
+
+#: my-evolution/Locations.h:1891
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+#, fuzzy
+msgid "Rivera"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1893
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1894
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1895
+msgid "Riverton"
+msgstr ""
+
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "Tulosta"
+
+#: my-evolution/Locations.h:1897
+#, fuzzy
+msgid "Rivolto"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:1898
+#, fuzzy
+msgid "Riyadh"
+msgstr "Lue"
+
+#: my-evolution/Locations.h:1899
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1900
+#, fuzzy
+msgid "Roatan"
+msgstr "Kroatia"
+
+#: my-evolution/Locations.h:1901
+#, fuzzy
+msgid "Robore"
+msgstr "ennen"
+
+#: my-evolution/Locations.h:1902
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1903
+msgid "Rockford"
+msgstr ""
+
+#: my-evolution/Locations.h:1904
+#, fuzzy
+msgid "Rockland"
+msgstr "Puola"
+
+#: my-evolution/Locations.h:1905
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1907
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1908
+msgid "Rodos"
+msgstr ""
+
+#: my-evolution/Locations.h:1909
+#, fuzzy
+msgid "Rogers"
+msgstr "Kansiot"
+
+#: my-evolution/Locations.h:1910
+#, fuzzy
+msgid "Roma/Ciampino"
+msgstr "Romania"
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1917
+msgid "Roosevelt"
+msgstr ""
+
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Roros"
+msgstr "tuntia"
+
+#: my-evolution/Locations.h:1919
+msgid "Rorvik/Ryum"
+msgstr ""
+
+#: my-evolution/Locations.h:1920
+msgid "Rosario"
+msgstr ""
+
+#: my-evolution/Locations.h:1921
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1922
+#, fuzzy
+msgid "Roseglen"
+msgstr "Rooli"
+
+#: my-evolution/Locations.h:1923
+#, fuzzy
+msgid "Rost"
+msgstr "Is�nt�palvelin"
+
+#: my-evolution/Locations.h:1924
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1927
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1928
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1929
+msgid "Rurrenabaque"
+msgstr ""
+
+#: my-evolution/Locations.h:1930
+msgid "Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1931
+#, fuzzy
+msgid "Russia"
+msgstr "It�valta"
+
+#: my-evolution/Locations.h:1932
+#, fuzzy
+msgid "Rutland"
+msgstr "Bhutan"
+
+#: my-evolution/Locations.h:1933
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1935
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1936
+msgid "Sabine Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:1937
+#, fuzzy
+msgid "Sacramento"
+msgstr "Osasto"
+
+#: my-evolution/Locations.h:1938
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1939
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1940
+#, fuzzy
+msgid "Saginaw"
+msgstr "Espanja"
+
+#: my-evolution/Locations.h:1941
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1944
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1945
+#, fuzzy
+msgid "Saint Mary's"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1946
+#, fuzzy
+msgid "Saint Mawgan"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1947
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1948
+msgid "Saint Paul"
+msgstr ""
+
+#: my-evolution/Locations.h:1949
+#, fuzzy
+msgid "Saiq"
+msgstr "Espanja"
+
+#: my-evolution/Locations.h:1950
+msgid "Salalah"
+msgstr ""
+
+#: my-evolution/Locations.h:1951
+#, fuzzy
+msgid "Salem"
+msgstr "Tallenna"
+
+#: my-evolution/Locations.h:1952
+#, fuzzy
+msgid "Salida"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:1953
+msgid "Salida-Harriet"
+msgstr ""
+
+#: my-evolution/Locations.h:1954
+#, fuzzy
+msgid "Salina"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:1955
+#, fuzzy
+msgid "Salinas"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:1956
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1957
+msgid "Salmon"
+msgstr ""
+
+#: my-evolution/Locations.h:1958
+msgid "Salmon (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1959
+#, fuzzy
+msgid "Salta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1960
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1961
+msgid "Salt Lake City"
+msgstr ""
+
+#: my-evolution/Locations.h:1962
+#, fuzzy
+msgid "Salto"
+msgstr "La"
+
+#: my-evolution/Locations.h:1963
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+#, fuzzy
+msgid "Salvador"
+msgstr "El Salvador"
+
+#: my-evolution/Locations.h:1965
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1966
+#, fuzzy
+msgid "Samara"
+msgstr "Jamaika"
+
+#: my-evolution/Locations.h:1967
+#, fuzzy
+msgid "Samos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1968
+#, fuzzy
+msgid "Samsun"
+msgstr "Su"
+
+#: my-evolution/Locations.h:1969
+msgid "Sana'A"
+msgstr ""
+
+#: my-evolution/Locations.h:1970
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+#, fuzzy
+msgid "San Angelo"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1975
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1976
+#, fuzzy
+msgid "San Carlos"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1977
+#, fuzzy
+msgid "Sandane"
+msgstr "Sudan"
+
+#: my-evolution/Locations.h:1978
+#, fuzzy
+msgid "Sandberg"
+msgstr "L�hett�j�"
+
+#: my-evolution/Locations.h:1979
+#, fuzzy
+msgid "Sanderson"
+msgstr "L�hett�j�"
+
+#: my-evolution/Locations.h:1980
+#, fuzzy
+msgid "San Diego"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1986
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1987
+#, fuzzy
+msgid "Sand Point"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1988
+msgid "San Fernando De Apure"
+msgstr ""
+
+#: my-evolution/Locations.h:1989
+msgid "Sanford"
+msgstr ""
+
+#: my-evolution/Locations.h:1990
+#, fuzzy
+msgid "San Francisco"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1991
+#, fuzzy
+msgid "Sangju"
+msgstr "Varjostus"
+
+#: my-evolution/Locations.h:1992
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1993
+#, fuzzy
+msgid "San Joaquin"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1994
+#, fuzzy
+msgid "San Jose"
+msgstr "Tallenna ja sulje"
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1997
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1998
+#, fuzzy
+msgid "San Juan"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1999
+msgid "Sankt-Peterburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2000
+#, fuzzy
+msgid "Sanliurfa"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:2001
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2002
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2003
+#, fuzzy
+msgid "San Miguel"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2004
+msgid "San Nicholas Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2005
+#, fuzzy
+msgid "San Salvador"
+msgstr "El Salvador"
+
+#: my-evolution/Locations.h:2006
+#, fuzzy
+msgid "San Sebastian"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2007
+msgid "Santa Ana"
+msgstr ""
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+#, fuzzy
+msgid "Santa Maria"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2012
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2013
+msgid "Santa Monica"
+msgstr ""
+
+#: my-evolution/Locations.h:2014
+#, fuzzy
+msgid "Santander"
+msgstr "L�hett�j�"
+
+#: my-evolution/Locations.h:2015
+#, fuzzy
+msgid "Santarem"
+msgstr "Qatar"
+
+#: my-evolution/Locations.h:2016
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2017
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+msgid "Santiago"
+msgstr ""
+
+#: my-evolution/Locations.h:2019
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2020
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2021
+#, fuzzy
+msgid "Santorini"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2022
+#, fuzzy
+msgid "Santos"
+msgstr "Tila"
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+msgid "Sao Luiz"
+msgstr ""
+
+#: my-evolution/Locations.h:2025
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2028
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+msgid "Sarasota"
+msgstr ""
+
+#: my-evolution/Locations.h:2030
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+#, fuzzy
+msgid "Sarzana"
+msgstr "Sri Lanka"
+
+#: my-evolution/Locations.h:2032
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2033
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2038
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2039
+msgid "Sawyer AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2040
+#, fuzzy
+msgid "Sayun"
+msgstr "Su"
+
+#: my-evolution/Locations.h:2041
+#, fuzzy
+msgid "Scatsta"
+msgstr "Tila"
+
+#: my-evolution/Locations.h:2042
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2045
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2046
+msgid "Scottsdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Scranton"
+msgstr "Organisaatio"
+
+#: my-evolution/Locations.h:2048
+msgid "Seattle"
+msgstr ""
+
+#: my-evolution/Locations.h:2049
+#, fuzzy
+msgid "Seattle-Boeing"
+msgstr "Asetukset"
+
+#: my-evolution/Locations.h:2050
+#, fuzzy
+msgid "Sedalia"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:2051
+#, fuzzy
+msgid "Seeb"
+msgstr "N�kem�tt�"
+
+#: my-evolution/Locations.h:2052
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+msgid "Sendai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2058
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2059
+msgid "Sevilla"
+msgstr ""
+
+#: my-evolution/Locations.h:2060
+#, fuzzy
+msgid "Seward"
+msgstr "Etsi"
+
+#: my-evolution/Locations.h:2061
+msgid "Sexton Summit"
+msgstr ""
+
+#: my-evolution/Locations.h:2062
+#, fuzzy
+msgid "Shanghai"
+msgstr "Varjostus"
+
+#: my-evolution/Locations.h:2063
+msgid "Shannon"
+msgstr ""
+
+#: my-evolution/Locations.h:2064
+#, fuzzy
+msgid "Sharjah"
+msgstr "Etsi"
+
+#: my-evolution/Locations.h:2065
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+#: my-evolution/Locations.h:2066
+#, fuzzy
+msgid "Sharurah"
+msgstr "Lauantai"
+
+#: my-evolution/Locations.h:2067
+#, fuzzy
+msgid "Shawbury"
+msgstr "Lauantai"
+
+#: my-evolution/Locations.h:2068
+msgid "Shearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2069
+msgid "Sheboygan"
+msgstr ""
+
+#: my-evolution/Locations.h:2070
+#, fuzzy
+msgid "Sheldon"
+msgstr "Ruotsi"
+
+#: my-evolution/Locations.h:2071
+msgid "Shelter Cove"
+msgstr ""
+
+#: my-evolution/Locations.h:2072
+#, fuzzy
+msgid "Shelton"
+msgstr "K��nn� valinta"
+
+#: my-evolution/Locations.h:2073
+msgid "Shenandoah"
+msgstr ""
+
+#: my-evolution/Locations.h:2074
+#, fuzzy
+msgid "Sheridan"
+msgstr "Sudan"
+
+#: my-evolution/Locations.h:2075
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2076
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2077
+msgid "Shingle Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2078
+#, fuzzy
+msgid "Shiraz"
+msgstr "Koko"
+
+#: my-evolution/Locations.h:2079
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2080
+msgid "Shizuhama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2081
+msgid "Shoreham"
+msgstr ""
+
+#: my-evolution/Locations.h:2082
+#, fuzzy
+msgid "Show Low"
+msgstr "N�yt� 1 viikko"
+
+#: my-evolution/Locations.h:2083
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2084
+msgid "Shreveport Regional"
+msgstr ""
+
+#: my-evolution/Locations.h:2085
+#, fuzzy
+msgid "Sidney"
+msgstr "Tulosta"
+
+#: my-evolution/Locations.h:2086
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2087
+msgid "Siloam Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2088
+#, fuzzy
+msgid "Silver City"
+msgstr "Turvallisuus"
+
+#: my-evolution/Locations.h:2089
+#, fuzzy
+msgid "Sindal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2091
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2097
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2098
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+#: my-evolution/Locations.h:2099
+#, fuzzy
+msgid "Skive"
+msgstr "Koko"
+
+#: my-evolution/Locations.h:2100
+#, fuzzy
+msgid "Skopje"
+msgstr "Pys�yt�"
+
+#: my-evolution/Locations.h:2101
+#, fuzzy
+msgid "Skwentna"
+msgstr "L�hetetyt"
+
+#: my-evolution/Locations.h:2102
+#, fuzzy
+msgid "Slana"
+msgstr "Slovakia"
+
+#: my-evolution/Locations.h:2105
+#, fuzzy
+msgid "Smithers"
+msgstr "minuutti"
+
+#: my-evolution/Locations.h:2106
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2107
+msgid "Snowshoe Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2108
+msgid "Sochi"
+msgstr ""
+
+#: my-evolution/Locations.h:2109
+msgid "Socorro"
+msgstr ""
+
+#: my-evolution/Locations.h:2110
+msgid "Socotra"
+msgstr ""
+
+#: my-evolution/Locations.h:2111
+msgid "Soda Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2112
+#, fuzzy
+msgid "Sofia"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:2113
+#, fuzzy
+msgid "Sogndal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2114
+msgid "Soldotna"
+msgstr ""
+
+#: my-evolution/Locations.h:2115
+msgid "Somerset"
+msgstr ""
+
+#: my-evolution/Locations.h:2116
+#, fuzzy
+msgid "Sonderborg"
+msgstr "L�hett�j�"
+
+#: my-evolution/Locations.h:2117
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2120
+msgid "Southampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2121
+msgid "South Bend"
+msgstr ""
+
+#: my-evolution/Locations.h:2122
+#, fuzzy
+msgid "South Carolina"
+msgstr "Etel�-Afrikka"
+
+#: my-evolution/Locations.h:2123
+msgid "South Dakota"
+msgstr ""
+
+#: my-evolution/Locations.h:2124
+#, fuzzy
+msgid "Southend"
+msgstr "L�het�"
+
+#: my-evolution/Locations.h:2125
+msgid "South Marsh Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2126
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2128
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2129
+#, fuzzy
+msgid "Spencer"
+msgstr "L�hett�j�"
+
+#: my-evolution/Locations.h:2130
+msgid "Spickard"
+msgstr ""
+
+#: my-evolution/Locations.h:2131
+#, fuzzy
+msgid "Split"
+msgstr "Espanja"
+
+#: my-evolution/Locations.h:2132
+#, fuzzy
+msgid "Spokane"
+msgstr "Espanja"
+
+#: my-evolution/Locations.h:2133
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2134
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "Springfield"
+msgstr "Yksinkertaistettu"
+
+#: my-evolution/Locations.h:2136
+msgid "Stampede Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:2137
+msgid "State College"
+msgstr ""
+
+#: my-evolution/Locations.h:2138
+#, fuzzy
+msgid "Stauning"
+msgstr "Asetukset"
+
+#: my-evolution/Locations.h:2139
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2140
+msgid "Stavanger/Sola"
+msgstr ""
+
+#: my-evolution/Locations.h:2141
+#, fuzzy
+msgid "Staverton"
+msgstr "Asetukset"
+
+#: my-evolution/Locations.h:2142
+#, fuzzy
+msgid "Stavropol"
+msgstr "Pys�yt�"
+
+#: my-evolution/Locations.h:2143
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2144
+msgid "Steamboat Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2145
+msgid "Stephenville"
+msgstr ""
+
+#: my-evolution/Locations.h:2146
+msgid "St. George"
+msgstr ""
+
+#: my-evolution/Locations.h:2147
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2148
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2149
+msgid "St Johnsbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2150
+#, fuzzy
+msgid "St Joseph"
+msgstr "Pys�yt�"
+
+#: my-evolution/Locations.h:2151
+#, fuzzy
+msgid "St Louis"
+msgstr "Pys�yt� lataaminen"
+
+#: my-evolution/Locations.h:2152
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2157
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2158
+#, fuzzy
+msgid "Storm Lake"
+msgstr "Sri Lanka"
+
+#: my-evolution/Locations.h:2159
+#, fuzzy
+msgid "Stornoway"
+msgstr "Norja"
+
+#: my-evolution/Locations.h:2160
+#, fuzzy
+msgid "St Paul"
+msgstr "Tila"
+
+#: my-evolution/Locations.h:2161
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2164
+msgid "Strevell"
+msgstr ""
+
+#: my-evolution/Locations.h:2165
+#, fuzzy
+msgid "St Simon's Island"
+msgstr "Joulusaaret"
+
+#: my-evolution/Locations.h:2166
+msgid "Stumpy Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2167
+#, fuzzy
+msgid "Sturgeon Bay"
+msgstr "Lauantai"
+
+#: my-evolution/Locations.h:2168
+msgid "Stuttgart"
+msgstr ""
+
+#: my-evolution/Locations.h:2169
+#, fuzzy
+msgid "Sucre"
+msgstr "L�hde"
+
+#: my-evolution/Locations.h:2170
+#, fuzzy
+msgid "Sumburgh"
+msgstr "Luxemburg"
+
+#: my-evolution/Locations.h:2171
+#, fuzzy
+msgid "Sumter"
+msgstr "Kuvaus"
+
+#: my-evolution/Locations.h:2172
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2174
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2175
+msgid "Superior"
+msgstr ""
+
+#: my-evolution/Locations.h:2177
+#, fuzzy
+msgid "Sutton"
+msgstr "Su"
+
+#: my-evolution/Locations.h:2178
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2179
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2188
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2189
+msgid "Szombathely"
+msgstr ""
+
+#: my-evolution/Locations.h:2190
+#, fuzzy
+msgid "Tabatinga"
+msgstr "Perinteinen"
+
+#: my-evolution/Locations.h:2191
+msgid "Tabriz"
+msgstr ""
+
+#: my-evolution/Locations.h:2192
+#, fuzzy
+msgid "Tabuk"
+msgstr "_Teht�v�"
+
+#: my-evolution/Locations.h:2193
+msgid "Tachikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+#, fuzzy
+msgid "Tacna"
+msgstr "Ghana"
+
+#: my-evolution/Locations.h:2195
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2199
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+#, fuzzy
+msgid "Taejon"
+msgstr "Sitten"
+
+#: my-evolution/Locations.h:2201
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2202
+msgid "Taichung"
+msgstr ""
+
+#: my-evolution/Locations.h:2203
+#, fuzzy
+msgid "Taif"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2204
+#, fuzzy
+msgid "Tainan"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2206
+#, fuzzy
+msgid "Taiyuan"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2207
+#, fuzzy
+msgid "Taiz"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2208
+#, fuzzy
+msgid "Tajima"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2209
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Talara"
+msgstr ""
+
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Talinn"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2212
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tallahassee"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2215
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2216
+#, fuzzy
+msgid "Tampa"
+msgstr "Japani"
+
+#: my-evolution/Locations.h:2217
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2218
+#, fuzzy
+msgid "Tampere"
+msgstr "Paperi"
+
+#: my-evolution/Locations.h:2219
+msgid "Tampico"
+msgstr ""
+
+#: my-evolution/Locations.h:2220
+#, fuzzy
+msgid "Tanana"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:2221
+msgid "Tanegashima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2222
+#, fuzzy
+msgid "Taos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:2223
+#, fuzzy
+msgid "Taoyuan"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2224
+msgid "Tapachula"
+msgstr ""
+
+#: my-evolution/Locations.h:2225
+#, fuzzy
+msgid "Taranto"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2226
+#, fuzzy
+msgid "Tarbes"
+msgstr "_Teht�v�"
+
+#: my-evolution/Locations.h:2227
+#, fuzzy
+msgid "Tarija"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2228
+msgid "Tarvisio"
+msgstr ""
+
+#: my-evolution/Locations.h:2229
+#, fuzzy
+msgid "Tatalina"
+msgstr "Perinteinen"
+
+#: my-evolution/Locations.h:2230
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2235
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2236
+#, fuzzy
+msgid "Tela"
+msgstr "Lue"
+
+#: my-evolution/Locations.h:2237
+#, fuzzy
+msgid "Temple"
+msgstr "Tyyppi"
+
+#: my-evolution/Locations.h:2238
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2244
+msgid "Texarkana"
+msgstr ""
+
+#: my-evolution/Locations.h:2245
+#, fuzzy
+msgid "Texas"
+msgstr "_Teht�v�"
+
+#: my-evolution/Locations.h:2246
+msgid "The Dalles"
+msgstr ""
+
+#: my-evolution/Locations.h:2247
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2248
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2249
+msgid "Thiruvananthapuram"
+msgstr ""
+
+#: my-evolution/Locations.h:2250
+msgid "Thisted"
+msgstr ""
+
+#: my-evolution/Locations.h:2251
+msgid "Thompson Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2252
+#, fuzzy
+msgid "Thumrait"
+msgstr "Torstai"
+
+#: my-evolution/Locations.h:2253
+#, fuzzy
+msgid "Tianjin"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2254
+#, fuzzy
+msgid "Tijuana"
+msgstr "Liettua"
+
+#: my-evolution/Locations.h:2255
+msgid "Timisoara"
+msgstr ""
+
+#: my-evolution/Locations.h:2256
+msgid "Tin City"
+msgstr ""
+
+#: my-evolution/Locations.h:2257
+#, fuzzy
+msgid "Tirana"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2258
+#, fuzzy
+msgid "Tiree"
+msgstr "Pe"
+
+#: my-evolution/Locations.h:2259
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2260
+msgid "Tiruchchirapalli"
+msgstr ""
+
+#: my-evolution/Locations.h:2261
+msgid "Titusville"
+msgstr ""
+
+#: my-evolution/Locations.h:2262
+#, fuzzy
+msgid "Tivat"
+msgstr "Henkil�kohtainen"
+
+#: my-evolution/Locations.h:2263
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2267
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+#, fuzzy
+msgid "Tokunoshima Island"
+msgstr "Joulusaaret"
+
+#: my-evolution/Locations.h:2269
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2271
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2272
+msgid "Tokyo New International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2273
+#, fuzzy
+msgid "Toledo"
+msgstr "M��rit�"
+
+#: my-evolution/Locations.h:2274
+msgid "Toluca"
+msgstr ""
+
+#: my-evolution/Locations.h:2275
+#, fuzzy
+msgid "Tonopah"
+msgstr "Tonga"
+
+#: my-evolution/Locations.h:2276
+#, fuzzy
+msgid "Topeka"
+msgstr "Yl�:"
+
+#: my-evolution/Locations.h:2277
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2279
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2280
+msgid "Toronto"
+msgstr ""
+
+#: my-evolution/Locations.h:2281
+#, fuzzy
+msgid "Torp"
+msgstr "Yl�:"
+
+#: my-evolution/Locations.h:2282
+#, fuzzy
+msgid "Torrance"
+msgstr "Ranska"
+
+#: my-evolution/Locations.h:2283
+#, fuzzy
+msgid "Torreon"
+msgstr "Korealainen"
+
+#: my-evolution/Locations.h:2284
+msgid "Tottori Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2285
+#, fuzzy
+msgid "Toulouse"
+msgstr "Sulje"
+
+#: my-evolution/Locations.h:2286
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2290
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2291
+#, fuzzy
+msgid "Trabzon"
+msgstr "Gabon"
+
+#: my-evolution/Locations.h:2292
+#, fuzzy
+msgid "Trapani"
+msgstr "Japani"
+
+#: my-evolution/Locations.h:2293
+msgid "Traverse City"
+msgstr ""
+
+#: my-evolution/Locations.h:2294
+#, fuzzy
+msgid "Trelew"
+msgstr "Pe"
+
+#: my-evolution/Locations.h:2295
+#, fuzzy
+msgid "Trenton"
+msgstr "Suunta"
+
+#: my-evolution/Locations.h:2296
+#, fuzzy
+msgid "Trevico"
+msgstr "Edellinen"
+
+#: my-evolution/Locations.h:2297
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2298
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2299
+msgid "Trieste"
+msgstr ""
+
+#: my-evolution/Locations.h:2300
+msgid "Trinidad"
+msgstr ""
+
+#: my-evolution/Locations.h:2301
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2304
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2305
+msgid "Troyes/Barberey"
+msgstr ""
+
+#: my-evolution/Locations.h:2306
+#, fuzzy
+msgid "Truckee"
+msgstr "Turkki"
+
+#: my-evolution/Locations.h:2307
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2314
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2315
+msgid "Tulancingo"
+msgstr ""
+
+#: my-evolution/Locations.h:2316
+#, fuzzy
+msgid "Tulcea"
+msgstr "Tiistai"
+
+#: my-evolution/Locations.h:2317
+#, fuzzy
+msgid "Tulsa"
+msgstr "Tunisia"
+
+#: my-evolution/Locations.h:2318
+#, fuzzy
+msgid "Tupelo"
+msgstr "Ti"
+
+#: my-evolution/Locations.h:2319
+#, fuzzy
+msgid "Turaif"
+msgstr "Turkkilainen"
+
+#: my-evolution/Locations.h:2320
+#, fuzzy
+msgid "Turin"
+msgstr "Turkkilainen"
+
+#: my-evolution/Locations.h:2322
+#, fuzzy
+msgid "Turku"
+msgstr "Turkki"
+
+#: my-evolution/Locations.h:2323
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2324
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+#: my-evolution/Locations.h:2325
+msgid "Twenthe"
+msgstr ""
+
+#: my-evolution/Locations.h:2326
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2327
+msgid "Twin Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2328
+#, fuzzy
+msgid "Tyler"
+msgstr "Tyyppi"
+
+#: my-evolution/Locations.h:2329
+msgid "Tyndall AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2330
+#, fuzzy
+msgid "Tyumen"
+msgstr "Ti"
+
+#: my-evolution/Locations.h:2331
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2332
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2340
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2341
+#, fuzzy
+msgid "United Arab Emirates "
+msgstr "Yhdistyneet arabiemiirikunnat"
+
+#: my-evolution/Locations.h:2344
+#, fuzzy
+msgid "Unst"
+msgstr "N�hty"
+
+#: my-evolution/Locations.h:2345
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2346
+#, fuzzy
+msgid "Uruapan"
+msgstr "Japani"
+
+#: my-evolution/Locations.h:2347
+#, fuzzy
+msgid "Uruguaiana"
+msgstr "Uruguay"
+
+#: my-evolution/Locations.h:2349
+msgid "Urumqi"
+msgstr ""
+
+#: my-evolution/Locations.h:2350
+#, fuzzy
+msgid "Utah"
+msgstr "."
+
+#: my-evolution/Locations.h:2351
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2353
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:2355
+msgid "Vadso"
+msgstr ""
+
+#: my-evolution/Locations.h:2356
+#, fuzzy
+msgid "Vaerlose"
+msgstr "Sulje"
+
+#: my-evolution/Locations.h:2357
+#, fuzzy
+msgid "Vagar"
+msgstr "Qatar"
+
+#: my-evolution/Locations.h:2358
+msgid "Valdez 2"
+msgstr ""
+
+#: my-evolution/Locations.h:2359
+#, fuzzy
+msgid "Valdosta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:2360
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2361
+#, fuzzy
+msgid "Valencia"
+msgstr "Kalenteri"
+
+#: my-evolution/Locations.h:2362
+msgid "Valentine"
+msgstr ""
+
+#: my-evolution/Locations.h:2363
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2366
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2367
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2368
+msgid "Van"
+msgstr ""
+
+#: my-evolution/Locations.h:2369
+msgid "Vancouver"
+msgstr ""
+
+#: my-evolution/Locations.h:2370
+#, fuzzy
+msgid "Vandel"
+msgstr "Peruuta"
+
+#: my-evolution/Locations.h:2371
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2373
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+#, fuzzy
+msgid "Varadero"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:2375
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2376
+#, fuzzy
+msgid "Varna"
+msgstr "Ghana"
+
+#: my-evolution/Locations.h:2377
+#, fuzzy
+msgid "Vasteras"
+msgstr "j�lkeen"
+
+#: my-evolution/Locations.h:2378
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2379
+#, fuzzy
+msgid "Venezia"
+msgstr "Venezuela"
+
+#: my-evolution/Locations.h:2381
+#, fuzzy
+msgid "Venice"
+msgstr "Unicode"
+
+#: my-evolution/Locations.h:2382
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2383
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2384
+#, fuzzy
+msgid "Vermont"
+msgstr "kuukausi"
+
+#: my-evolution/Locations.h:2385
+#, fuzzy
+msgid "Vernal"
+msgstr "Yleiset"
+
+#: my-evolution/Locations.h:2386
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+#, fuzzy
+msgid "Vicenza"
+msgstr "Venezuela"
+
+#: my-evolution/Locations.h:2388
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2390
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2393
+msgid "Vigo"
+msgstr ""
+
+#: my-evolution/Locations.h:2394
+#, fuzzy
+msgid "Vilhena"
+msgstr "Tiedostonimi:"
+
+#: my-evolution/Locations.h:2395
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+msgid "Villahermosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2398
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2404
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+#, fuzzy
+msgid "Visalia"
+msgstr "Australia"
+
+#: my-evolution/Locations.h:2406
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2410
+msgid "Vladivostok"
+msgstr ""
+
+#: my-evolution/Locations.h:2411
+#, fuzzy
+msgid "Vlieland"
+msgstr "Suomi"
+
+#: my-evolution/Locations.h:2412
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2413
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2414
+#, fuzzy
+msgid "Volkel"
+msgstr "Rooli"
+
+#: my-evolution/Locations.h:2415
+#, fuzzy
+msgid "Volk Field"
+msgstr "_Kopio-kentt�"
+
+#: my-evolution/Locations.h:2416
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2417
+msgid "Voslau"
+msgstr ""
+
+#: my-evolution/Locations.h:2418
+#, fuzzy
+msgid "Waco"
+msgstr "Monaco"
+
+#: my-evolution/Locations.h:2419
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2423
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2424
+#, fuzzy
+msgid "Wallops Island"
+msgstr "Falklandsaaret"
+
+#: my-evolution/Locations.h:2425
+msgid "Walnut Ridge"
+msgstr ""
+
+#: my-evolution/Locations.h:2426
+#, fuzzy
+msgid "Warner Robins"
+msgstr "Varoitus"
+
+#: my-evolution/Locations.h:2427
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2429
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2430
+msgid "Washington/Dulles"
+msgstr ""
+
+#: my-evolution/Locations.h:2431
+#, fuzzy
+msgid "Waterbury"
+msgstr "S��tiedot"
+
+#: my-evolution/Locations.h:2432
+#, fuzzy
+msgid "Waterloo"
+msgstr "S��tiedot"
+
+#: my-evolution/Locations.h:2433
+#, fuzzy
+msgid "Watertown"
+msgstr "S��tiedot"
+
+#: my-evolution/Locations.h:2434
+#, fuzzy
+msgid "Waterville"
+msgstr "Ryhm�t"
+
+#: my-evolution/Locations.h:2435
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+msgid "Wausau"
+msgstr ""
+
+#: my-evolution/Locations.h:2437
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2438
+msgid "Waynesboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2439
+msgid "Webster City"
+msgstr ""
+
+#: my-evolution/Locations.h:2440
+#, fuzzy
+msgid "Wejh"
+msgstr "Ke"
+
+#: my-evolution/Locations.h:2441
+msgid "Wellington"
+msgstr ""
+
+#: my-evolution/Locations.h:2442
+#, fuzzy
+msgid "Wenatchee"
+msgstr "S��tiedot"
+
+#: my-evolution/Locations.h:2443
+#, fuzzy
+msgid "Wendover"
+msgstr "L�hett�j�"
+
+#: my-evolution/Locations.h:2444
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2445
+#, fuzzy
+msgid "West Burke"
+msgstr "L�nsieurooppalainen"
+
+#: my-evolution/Locations.h:2446
+#, fuzzy
+msgid "Westerland"
+msgstr "Alankomaat"
+
+#: my-evolution/Locations.h:2447
+msgid "Westfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2448
+msgid "Westhampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2449
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2451
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2452
+msgid "West Yellowstone (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2453
+#, fuzzy
+msgid "Wheeling"
+msgstr "Varjostus"
+
+#: my-evolution/Locations.h:2454
+#, fuzzy
+msgid "Whidbey Island"
+msgstr "Joulusaaret"
+
+#: my-evolution/Locations.h:2455
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2461
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2462
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2463
+msgid "Wick"
+msgstr ""
+
+#: my-evolution/Locations.h:2464
+#, fuzzy
+msgid "Wien"
+msgstr "Ke"
+
+#: my-evolution/Locations.h:2465
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2467
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2468
+msgid "Williamsport"
+msgstr ""
+
+#: my-evolution/Locations.h:2469
+msgid "Williston"
+msgstr ""
+
+#: my-evolution/Locations.h:2470
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2472
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2473
+#, fuzzy
+msgid "Winchester"
+msgstr "Liechtenstein"
+
+#: my-evolution/Locations.h:2474
+msgid "Windsor"
+msgstr ""
+
+#: my-evolution/Locations.h:2475
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2478
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+#, fuzzy
+msgid "Winslow"
+msgstr "nyt"
+
+#: my-evolution/Locations.h:2480
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2481
+msgid "Winter Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:2482
+#, fuzzy
+msgid "Winter Park"
+msgstr "Salasana"
+
+#: my-evolution/Locations.h:2483
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+#, fuzzy
+msgid "Wisconsin"
+msgstr "sekuntia"
+
+#: my-evolution/Locations.h:2485
+msgid "Wisconsin Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:2486
+#, fuzzy
+msgid "Wise"
+msgstr "Ke"
+
+#: my-evolution/Locations.h:2487
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2488
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2489
+#, fuzzy
+msgid "Woong Cheon"
+msgstr "Hong Kong"
+
+#: my-evolution/Locations.h:2490
+#, fuzzy
+msgid "Wooster"
+msgstr "Alatunniste:"
+
+#: my-evolution/Locations.h:2491
+#, fuzzy
+msgid "Worcester"
+msgstr "L�hteet"
+
+#: my-evolution/Locations.h:2492
+#, fuzzy
+msgid "Worland"
+msgstr "Puola"
+
+#: my-evolution/Locations.h:2493
+msgid "Worthington"
+msgstr ""
+
+#: my-evolution/Locations.h:2494
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2495
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2496
+msgid "Wuchia Observatory"
+msgstr ""
+
+#: my-evolution/Locations.h:2497
+#, fuzzy
+msgid "Wyoming"
+msgstr "tulevat"
+
+#: my-evolution/Locations.h:2498
+#, fuzzy
+msgid "Xiamen"
+msgstr "Nimi"
+
+#: my-evolution/Locations.h:2499
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2505
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2506
+msgid "Yankton"
+msgstr ""
+
+#: my-evolution/Locations.h:2507
+#, fuzzy
+msgid "Yao Airport"
+msgstr "�l� tuo"
+
+#: my-evolution/Locations.h:2508
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2510
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2511
+msgid "Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2513
+#, fuzzy
+msgid "Yenbo"
+msgstr "Jemen"
+
+#: my-evolution/Locations.h:2514
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2522
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2528
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2529
+msgid "Zacatecas"
+msgstr ""
+
+#: my-evolution/Locations.h:2530
+#, fuzzy
+msgid "Zadar"
+msgstr "Kalenteri"
+
+#: my-evolution/Locations.h:2531
+#, fuzzy
+msgid "Zagreb"
+msgstr "Sivu"
+
+#: my-evolution/Locations.h:2532
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2533
+msgid "Zama Airfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2534
+#, fuzzy
+msgid "Zanesville"
+msgstr "Peruutettu"
+
+#: my-evolution/Locations.h:2535
+#, fuzzy
+msgid "Zaragoza"
+msgstr "Paraguay"
+
+#: my-evolution/Locations.h:2536
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2537
+msgid "Zuni Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:2538
+#, fuzzy
+msgid "Zurich"
+msgstr "Turkkilainen"
+
+#: 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 "Tapaamiset"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "Ei tapaamisia"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:400
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:379
+#: my-evolution/e-summary-calendar.c:402
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-calendar.c:420
+#, fuzzy
+msgid "No description"
+msgstr "Kuvaus:"
+
+#: my-evolution/e-summary-mail.c:151
 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
+msgid "Local Folders"
+msgstr "Paikalliset kansiot"
+
 #. 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:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:953
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:957
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Nimi:"
 
-#: my-evolution/e-summary-preferences.c:1503
-#, fuzzy
-msgid "Summary Settings"
-msgstr "Yhteenveto sis�lt��"
-
-#: 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
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Virhe ladattaessa RDF:��</b>"
 
-#: my-evolution/e-summary-rdf.c:528
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:248
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
+msgstr ""
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "_Lis��"
+
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr "Poista"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "N�yt� kaikki"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Ei teht�vi�"
 
-#: my-evolution/e-summary-tasks.c:287
+#: my-evolution/e-summary-tasks.c:291
 #, fuzzy
 msgid "(No Description)"
 msgstr "Kuvaus:"
@@ -10169,25 +23298,26 @@ msgstr "Kuvaus:"
 msgid "My Weather"
 msgstr "S��tiedot"
 
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr "<dd><b>S��tietopalvelimeen ei saatu yhteytt�</b></dd>"
+#: 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:501
 #, fuzzy
 msgid "Weather"
 msgstr "S��tiedot"
 
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr "Alueet"
-
 #: my-evolution/e-summary.c:193
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %d, %Y"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:488
+#, fuzzy
+msgid "Please wait..."
+msgstr "Odota, ole hyv�"
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
 msgstr "Kuvaus"
@@ -10197,46 +23327,10 @@ msgstr "Kuvaus"
 msgid "Printing of Summary failed"
 msgstr "Viestin tulostus ep�onnistui"
 
-#: my-evolution/main.c:66
+#: my-evolution/main.c:65
 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 ""
@@ -10635,11 +23729,6 @@ msgstr ""
 msgid "Freezing ice pellets"
 msgstr ""
 
-#. HAIL
-#: my-evolution/metar.c:217
-msgid "Hail"
-msgstr ""
-
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
@@ -11387,162 +24476,132 @@ msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-#, fuzzy
-msgid " _Remove"
-msgstr "Poista"
-
-#: 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
-#, fuzzy
-msgid "All _folders:"
-msgstr "Paikalliset kansiot"
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 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:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 #, fuzzy
 msgid "One mont_h"
 msgstr "Yksi kuukausi"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "One w_eek"
 msgstr "Yksi �viikko"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "R_efresh time (seconds):"
 msgstr "Virkistysaika (sekunneissa):"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 #, fuzzy
 msgid "Refresh _time (seconds):"
 msgstr "Virkistysaika (sekunneissa):"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "N�yt� t�ydet _otsikkotiedot"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "Show _all tasks"
 msgstr "N�yt� kaikki teht�v�t"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "N�yt� t�m�np�iv�iset teht�v�t"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "Teht�v�t "
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:22
-#, fuzzy
-msgid "_Display folders:"
-msgstr "N�yt� toinen kansio"
-
-#: 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
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 #, fuzzy
 msgid "_Five days"
 msgstr "Viisi p�iv��"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "_Mail"
 msgstr "_Matkapuhelin"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 msgid "_News Feeds"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr "_Yksi p�iv�"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr "_S��tiedot"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Erikoiskansiot"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution-kuori."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "N�yt� yksityiskohdat"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Peruuta operaatio"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Saapuneet"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "L�htev�t"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Paikalliset kansiot"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolutionin asennus"
 
-#: 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"
@@ -11550,17 +24609,17 @@ msgstr ""
 "T�m�n Evolutionin uuden version t�ytyy asentaa uusia tiedostoja\n"
 "henkil�kohtaiseen Evolution-hakemistoosi"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Napsauta \"OK\" asentaaksesi tiedostot, tai \"Peruuta\" lopettaaksesi "
 "asennuksen."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Tiedostojen p�ivitys ei onnistunut"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11571,14 +24630,40 @@ msgstr ""
 "%s\n"
 "Virhe: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:281
+#: shell/e-setup.c:282
+#, fuzzy, c-format
+msgid ""
+"Evolution could not create directory\n"
+"%s:\n"
+"%s"
+msgstr ""
+"Hakemistoa %s ei voitu luoda:\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:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11586,7 +24671,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:295
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11595,7 +24680,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:320
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11603,98 +24688,99 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-about-box.c:40
-#, fuzzy
-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."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: 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: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 ""
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Kopioi kansio"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Siir� kansio"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Poista"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: shell/e-shell-folder-commands.c:425
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Haluatko todella poistaa kansion '%s'?"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:502
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:549
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nime� kansio '%s' uudelleen"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:556
 #, fuzzy
 msgid "Rename folder"
 msgstr "Nime� kansio '%s' uudelleen"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:148
+#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:267
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -11704,11 +24790,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:359
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Uusi..."
 
-#: 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 "(Nimet�n)"
 
@@ -11725,7 +24811,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
+#: 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 ""
 
@@ -11746,98 +24832,104 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:397
+#: shell/e-shell-importer.c:409
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Kansiota `%s' ei ole olemassa."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: shell/e-shell-importer.c:420
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:424
+#: shell/e-shell-importer.c:435
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:445
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:453
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:466
 #, c-format
 msgid "Error starting %s"
 msgstr "Virhe %s:n k�ynnistyksess�"
 
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:485
 #, c-format
 msgid "Error loading %s"
 msgstr "Virhe %s:n lataamisessa"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:502
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:572
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:623
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: shell/e-shell-importer.c:617
+#: shell/e-shell-importer.c:628
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:638
 msgid "File type:"
 msgstr "Tiedoston tyyppi:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:663
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:667
 msgid "Import a single file"
 msgstr ""
 
-#: 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
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: 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
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: 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
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "L�hett�j�:"
 
-#: shell/e-shell-importer.c:1014
+#: shell/e-shell-importer.c:1027
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1028
 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:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Tuo"
 
@@ -11857,6 +24949,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Uusi"
+
 #: shell/e-shell-utils.c:114
 #, fuzzy
 msgid "No folder name specified."
@@ -11875,91 +24973,90 @@ msgstr "T�m� kansio ei voi sis�lt�� viestej�."
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug budday ei l�ytynyt $PATH:istasi."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Tietoja Evolutionista..."
 
-#: shell/e-shell-view-menu.c:409
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Siirry kansioon..."
 
-#: shell/e-shell-view-menu.c:410
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:530
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:531
+#: shell/e-shell-view-menu.c:566
 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 ""
-
-#: shell/e-shell-view-menu.c:570
-#, fuzzy, c-format
-msgid "Error executing %s."
-msgstr "Virhe suoritettaessa suodatinta: %s: %s"
-
-#: shell/e-shell-view-menu.c:672
+#: shell/e-shell-view-menu.c:732
 #, fuzzy
 msgid "_Work Online"
 msgstr "Ty�skentele linjoilla"
 
-#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Ty�skentele poissa linjoilta"
 
-#: 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 ""
 
-#: shell/e-shell-view.c:1576
+#: shell/e-shell-view.c:1820
 #, fuzzy
 msgid "(None)"
 msgstr "(Ei nime�)"
 
-#: 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 ""
 
-#: shell/e-shell-view.c:1630
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: 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 ""
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11967,19 +25064,23 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -12096,74 +25197,71 @@ msgstr "Poista"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Poista t�m� oikotie oikotiepalkista"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Virhe tallennettaessa oikoteit�."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Oikotiet"
 
-#: shell/e-storage-set-view.c:658
-#, fuzzy, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Saapuneet"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Ei nime�)"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Ei virhett�"
 
-#: 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:491
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: 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:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr ""
 
-#: 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:505
 msgid "Operation not supported"
 msgstr ""
 
-#: 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: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 ""
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
@@ -12174,102 +25272,110 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "Tuntematon virhe"
+
+#: 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/evolution-shell-component.c:1045
 #, fuzzy
 msgid "CORBA error"
 msgstr "I/O-virhe"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 #, fuzzy
 msgid "No owner"
 msgstr "M��rittelem�t�n"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Tar_kista tuetut tavat"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 #, fuzzy
 msgid "Internal error"
 msgstr "I/O-virhe"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 #, fuzzy
 msgid "Exists"
 msgstr "_Poistu"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Luonnoskansio:"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 #, fuzzy
 msgid "No space left"
 msgstr "Ei viestej� valittuna"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:124
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr "Tuntematon virhe"
-
-#: 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/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "Tiedoston tyyppi:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -12394,314 +25500,288 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #: shell/main.c:89
+msgid "Evolution"
+msgstr "Evolution"
+
+#: shell/main.c:95
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolutionin aseukseni"
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Aloita uudelta sivulta"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Aloita uudelta sivulta"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttij�rjestelm�n alustus ep�onnistui"
 
+#: 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 "Virhe avattaessa tiedostoa: %s"
 
-#: tools/evolution-addressbook-export.c:46
-#, fuzzy
-msgid "Output File"
-msgstr "Avaa tiedosto"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "Liit� tiedosto"
 
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Avaa tiedosto"
+
 #: tools/evolution-addressbook-import.c:80
 #, fuzzy
 msgid "No filename provided."
 msgstr "Vastaanottajia ei ole m��ritelty"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Kopioi"
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: 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 "Kopioi valinta"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "_Kopioi kansioon..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Luo uusi kontakti"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Luo uusi kontaktiluettelo"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "Leikkaa"
-
-#: 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 "Leikkaa valinta"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "Poista valitut kontaktit"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:13
 #, fuzzy
-msgid "New List"
-msgstr "Uusi luettelo"
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Siirr� valitut viestit toiseen kansioon"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Liit�"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "_Siirr� kansioon..."
 
-#: 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 "Liit� leikep�yt�"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Esikatselee tulostettavia kontakteja"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Tulosta valitut kontaktit"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Valitse kaikki kontaktit"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#, fuzzy
-msgid "Send _Message to Contact..."
-msgstr "L�het� _viesti kontaktille..."
-
-#: 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:26
 msgid "Send message to contact"
 msgstr "L�het� viesti kontaktille"
 
-#: 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:28
 msgid "Stop"
 msgstr "Pys�yt�"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Pys�yt� lataaminen"
 
-#: 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 "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: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-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
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr "_Osoitekirjan l�hteet..."
-
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr "_Kontakti"
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "_Kontaktiluettelo"
 
-#: 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
 #, fuzzy
 msgid "_Forward Contact..."
 msgstr "_Kontaktit..."
 
-#: 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 "T_ulosta..."
-
 #: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "_Siirr� kansioon..."
+
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "_Etsi kontakteja"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "Valitse k_aikki"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-addressbook.xml.h:45
 #, fuzzy
-msgid "Create a New All Day _Event"
-msgstr "Luo uusi koko p�iv�n _tapahtuma"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
-msgid "Create a New _Task"
-msgstr "Luo uusi teht�v�"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Luo uusi t_apaaminen"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "Luo uusi koko p�iv�n tapahtuma"
+msgid "_Send Message to Contact..."
+msgstr "L�het� _viesti kontaktille..."
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:4
 #, fuzzy
 msgid "Day"
 msgstr "_P�iv�"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
 msgid "Delete the appointment"
 msgstr "Poista t�m� tapaaminen"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Siirry"
 
-#: 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:8
 #, fuzzy
 msgid "Go forward"
 msgstr "V�lit�"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr ""
 
-#: 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:12
 #, fuzzy
 msgid "Go to today"
 msgstr "Siirry t�h�n p�iv��n"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
 msgid "Month"
 msgstr "_Kuukausi"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Uusi tapaaminen"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr "Uusi teht�v�"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Esikatselee tulostettavaa kalenteria"
 
-#: 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 "Tulostuksen esikatselu"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Print this calendar"
 msgstr "Tulosta t�m� kalenteri"
 
-#: 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
 #, fuzzy
 msgid "Show one day"
 msgstr "N�yt� 1 p�iv�"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Show one month"
 msgstr "N�yt� 1 kuukausi"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Show one week"
 msgstr "N�yt� 1 viikko"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "N�yt� ty�viikko"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 #, fuzzy
 msgid "Week"
 msgstr "_Viikko"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "T_apaaminen..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Kalenterin asetukset..."
-
-#: ui/evolution-calendar.xml.h:42
-#, fuzzy
-msgid "_Publish Free/Busy Information"
-msgstr "Pakolliset tiedot"
-
-#: ui/evolution-calendar.xml.h:43
-#, fuzzy
-msgid "_Task..."
-msgstr "_Teht�v�"
-
 #: 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
@@ -12732,18 +25812,18 @@ msgstr "Esikatsele tulostettavaa kohtaa"
 msgid "Print this item"
 msgstr "Tulosta t�m� kohta"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Tulosta..."
-
-#: 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 "Tallenna"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Tallenna nimell�..."
+
 #: 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 "Tallenna ja sulje"
 
@@ -12760,8 +25840,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:40
 msgid "_File"
 msgstr "_Tiedosto"
 
@@ -12770,7 +25850,7 @@ msgid "Print En_velope..."
 msgstr ""
 
 #: 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 "Tallenna _nimell�..."
@@ -12779,10 +25859,15 @@ msgstr "Tallenna _nimell�..."
 msgid "Save the contact and close the dialog box"
 msgstr "Tallenna kontakti ja sulje ikkuna"
 
+#: ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "L�het� _viesti kontaktille..."
+
 #: 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 "_Tallenna"
 
@@ -12842,6 +25927,10 @@ 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"
@@ -12851,83 +25940,54 @@ msgid "Compose _New Message"
 msgstr "Kirjoita uusi viesti"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: 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:6
 msgid "Empty _Trash"
 msgstr "_Tyhjenn� roskakori"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "_Unohda salasanat"
 
-#: 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
-#, fuzzy
-msgid "New Message"
-msgstr "Seuraava viesti"
-
-#: 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:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "L�het� / Vastaanota"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "L�het� jonossa olevat viestit ja hae uudet viestit"
-
-#: 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:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "S_uodattimet..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "_S�hk�postiasetukset..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Esikatseluruutu:"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "_L�het� / Vastaanota"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr ""
 
@@ -13021,11 +26081,11 @@ msgstr "Piilota valitut viestit v�liaikaisesti"
 msgid "Threaded Message list"
 msgstr "S�ikeistetty viesti-ikkuna"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Kansio"
 
@@ -13042,212 +26102,229 @@ msgid "_Threaded Message List"
 msgstr "S�ikeis_tetty viesti-ikkuna"
 
 #: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Lis�� l�hett�j� osoitekirjaan"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Toteuta suodattimet"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Lis�� l�hett�j� osoitekirjaan"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr ""
 
-#: 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-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-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Vastaa valitun viestin l�hett�j�lle"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: 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-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-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-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-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr ""
 
-#: 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-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: 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-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "N�yt� seuraava t�rke� viesti"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "N�yt� seuraava viesti"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "N�yt� seuraava lukematon viesti"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "N�yt� seuraava lukematon s�ie"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "N�yt� edellinen t�rke� viesti"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "N�yt� edellinen viesti"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "N�yt� edellinen lukematon viesti"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "V�lit�"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Suodata postitus_listan mukaan..."
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Suodata _l�hett�j�n mukaan..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Suodata _vastaanottajien mukaan..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Suodata _aiheen mukaan..."
 
-#: ui/evolution-mail-message.xml.h:29
-msgid "Force images in HTML mail to be loaded"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:30
-msgid "Forward"
-msgstr "V�lit�"
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward As"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward _Attached"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Inline"
-msgstr ""
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Merkitse valitut viestit poistettaviksi"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Quoted"
+msgid "Follow _Up..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: 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:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: 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-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Increase the text size"
 msgstr "Liit� tekstitiedosto..."
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Lataa k_uvat"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Merkitse _t�rke�ksi"
 
 #: ui/evolution-mail-message.xml.h:45
-msgid "Mark as Unimp_ortant"
-msgstr ""
+msgid "Mark as U_nread"
+msgstr "Merkitse luke_mattomaksi"
 
 #: ui/evolution-mail-message.xml.h:46
-msgid "Mark the selected messages as having been read"
-msgstr "Merkitse valitut viestit luetuiksi"
+msgid "Mark as Unimp_ortant"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:47
-msgid "Mark the selected messages as important"
-msgstr "Merkitse valitut viestit t�rkeiksi"
+#, fuzzy
+msgid "Mark the selected message(s) as having been read"
+msgstr "Merkitse valitut viestit luetuiksi"
 
 #: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as not having been read"
-msgstr "Merkitse valitut viestit lukemattomiksi"
+#, fuzzy
+msgid "Mark the selected message(s) as important"
+msgstr "Merkitse valitut viestit t�rkeiksi"
 
 #: ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected messages as unimportant"
-msgstr ""
+#, fuzzy
+msgid "Mark the selected message(s) as not having been read"
+msgstr "Merkitse valitut viestit lukemattomiksi"
 
 #: ui/evolution-mail-message.xml.h:50
+#, fuzzy
+msgid "Mark the selected message(s) as unimportant"
+msgstr "Merkitse valitut viestit t�rkeiksi"
+
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Siirr�"
 
-#: 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 "Siirr� valitut viestit toiseen kansioon"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Seuraava"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "Seuraava t�rke� viesti"
-
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
-msgstr "Seuraava viesti"
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "Seuraava t�rke� viesti"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Seuraava s�ie"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Seuraava lukematon viesti"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -13264,161 +26341,188 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-msgid "Preview the message to be printed"
-msgstr "Esikatsele tulostettavaa viesti�"
+msgid "P_revious Unread Message"
+msgstr "Edellinen lukematon viesti"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "Edellinen"
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Edellinen t�rke� viesti"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "Edellinen t�rke� viesti"
+#, fuzzy
+msgid "Preview the message to be printed"
+msgstr "Esikatsele tulostettavaa viesti�"
 
 #: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "Edellinen viesti"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "Edellinen lukematon viesti"
+msgid "Previous"
+msgstr "Edellinen"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Tulosta t�m� viesti"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "Vastaa"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Re_direct"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "Vastaa kaikille"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Peruuta valittujen viestien poistaminen"
 
-#: 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-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "_Etsi viesti�"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "Tallenna viesti tiedostona"
 
-#: 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-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "N�yt� t�ydet _otsikkotiedot"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "N�yt� viesti normaalimuodossa"
 
-#: 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-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-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Peruuta valittujen viestien poistaminen"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Attached"
+msgstr "Liit�"
+
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "_Luo viestist� suodatin"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "_V�litet� viesti"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Siirry"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "Ty�skentele linjoilla"
+
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Larger"
 msgstr "_Suuret kuvakkeet"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Siirr� kansioon"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Seuraava viesti"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_Avaa viesti"
 
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Edellinen viesti"
+
+#: ui/evolution-mail-message.xml.h:108
+msgid "_Quoted"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "T_y�kalut"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Palauta"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 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: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:36
 msgid "_Close"
 msgstr "_Sulje"
 
 #: 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:56
 msgid "_View"
 msgstr "_N�yt�"
 
@@ -13442,12 +26546,12 @@ msgstr "Salaa t�m� viesti PGP:ll�"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
-#: 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 "Tavallinen"
 
-#: 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"
@@ -13464,6 +26568,10 @@ msgstr "Liit� tiedosto viestiin tekstin�"
 msgid "Insert text file..."
 msgstr "Liit� tekstitiedosto..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Avaa"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Avaa tiedosto"
@@ -13497,7 +26605,7 @@ msgid "Save in folder..."
 msgstr "Tallenna kansioon..."
 
 #: 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 "Tallenna nykyinen tiedosto"
 
@@ -13522,6 +26630,7 @@ msgid "Send _later"
 msgstr "L�het� _my�hemmin"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "L�het� viesti HTML-muodossa"
 
@@ -13590,7 +26699,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "Li_s��"
 
@@ -13602,11 +26711,7 @@ msgstr "_Avaa..."
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kentt�"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "Turvalli_suus"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Ohje"
 
@@ -13663,34 +26768,41 @@ msgstr ""
 msgid "Re_fresh Task"
 msgstr ""
 
-#: 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:3
 msgid "Copy selected task"
 msgstr "Kopioi valittu teht�v�"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Leikkaa valittu teht�v�"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "Poista valitut teht�v�t"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Poista valitut teht�v�t"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "Valmis"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Liit� teht�v� leikep�yd�lt�"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:11
 #, fuzzy
-msgid "Tasks Settings..."
-msgstr "Teht�v�n asetukset"
+msgid "Previews the list of tasks to be printed"
+msgstr "Esikatselee tulostettavia kontakteja"
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
-msgstr "_Teht�v�"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Tulosta t�m� viesti"
 
 #: ui/evolution.xml.h:1
 #, fuzzy
@@ -13758,121 +26870,124 @@ msgid "Open this folder in an other window"
 msgstr "Avaa valittu kansio uudessa ikkunassa"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "L�het� / Vastaanota"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "L�het� jonossa olevat viestit ja hae uudet viestit"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "L�het� virheraportti"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "L�het� _virheraportti"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "L�het� virheraportti k�ytt�en Bug Buddy:a"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "M��rit�"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "M��rit�, n�ytet��nk� kansiopalkki"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "M��rit�, n�ytet��nk� oikotiepalkki"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "M��rit�, ty�skennell��nk� poissa linjoilta."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Tietoja Evolutionista..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "_Kansiopalkki"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Import..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Siirr�..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Uusi"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Uusi kansio"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "_S�hk�postiasetukset..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Nime� uudelleen..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_L�het� / Vastaanota"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Oikotie"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "_Oikotiepalkki"
 
-#: ui/my-evolution.xml.h:1
-#, fuzzy
-msgid "Change the settings for the summary"
-msgstr "Muuta t�m�n kansion nime�"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print summary"
 msgstr "Postin yhteenveto"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 #, fuzzy
 msgid "Reload"
 msgstr "Lue"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr ""
 
-#: ui/my-evolution.xml.h:8
-#, fuzzy
-msgid "_Summary Settings..."
-msgstr "_S�hk�postiasetukset..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Osoitekortit"
@@ -13886,18 +27001,27 @@ msgid "Phone List"
 msgstr ""
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "Valitse kansio"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "L�hett�j�n mukaan"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Tilan mukaan"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Aiheen mukaan"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Viestit"
 
@@ -13905,6 +27029,12 @@ msgstr "Viestit"
 msgid "With Category"
 msgstr "Ryhm�n mukaan"
 
+#. Check for UTC.
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+msgid "UTC"
+msgstr ""
+
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 #, fuzzy
 msgid "Select a Time Zone"
@@ -13929,11 +27059,21 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "_Nykyinen n�kym�"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "_Nykyinen n�kym�"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr ""
 
@@ -13965,76 +27105,81 @@ msgstr "Ajan tulee olla muodossa: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "Balttilainen"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "Keskieurooppalainen"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "Kiinalainen"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr "Kyrillinen"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "Kreikkalainen"
 
-#: 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 "Japanilainen"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Korean"
 msgstr "Korealainen"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turkkilainen"
 
-#: 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 "L�nsieurooppalainen"
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 msgid "Traditional"
 msgstr "Perinteinen"
 
-#: 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 "Yksinkertaistettu"
 
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:92
 msgid "Ukrainian"
 msgstr "Ukrainalainen"
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "Uusi"
+#: widgets/misc/e-charset-picker.c:95
+#, fuzzy
+msgid "Visual"
+msgstr "�l� k�yt�"
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:201
+#: 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:281
 msgid "Other..."
 msgstr "Muut..."
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr ""
 
@@ -14042,27 +27187,23 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: 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:162
 msgid "Save Search"
 msgstr "Tallenna haku"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:97
 #, fuzzy
-msgid "Add to Saved Searches"
+msgid "_Save Search..."
 msgstr "Tallenna haku"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:98
 #, fuzzy
-msgid "Clear"
-msgstr "Kalenteri"
-
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "N�yt� kaikki"
+msgid "_Edit Saved Searches..."
+msgstr "Tallenna haku"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -14085,11 +27226,22 @@ msgstr "Viesti"
 msgid "Don't show this message again."
 msgstr "�l� n�yt� t�t� viesti� uudelleen."
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "_Etsi"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Etsi nyt"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Kalenteri"
+
+#: widgets/misc/e-search-bar.c:835
+#, fuzzy
+msgid "Clear"
+msgstr "Kalenteri"
+
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Etsi nyt"
 
@@ -14115,6 +27267,609 @@ msgstr "init_corba(): GNOME:n alustus ep�onnistui"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Nimi: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Etuliite:   "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Etunimi:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Muut nimet: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Sukunimi:   "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Syntym�p�iv�: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Osoite:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postilokero: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Katu:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Kaupunki:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postinumero: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Maa:         "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Puhelimet:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Puhelin:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "S�hk�posti:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "S�hk�posti:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Aikavy�hyke: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Nimi:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Yksikk�: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Yksikk�2: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Yksikk�3: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Yksikk�4: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Ryhm�t: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Julkinen avain: "
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Odotetaan yhteytt� LDAP-palvelimeen..."
+
+#~ msgid "New _Contact"
+#~ msgstr "_Uusi kontakti"
+
+#~ msgid "New Contact _List"
+#~ msgstr "Uusi kontakti_luettelo"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Muokkaa osoitekirjaa"
+
+#~ msgid "Account Name"
+#~ msgstr "Tilin nimi"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Lis�� osoitekirja"
+
+#~ msgid "Server Name"
+#~ msgstr "Palvelimen nimi"
+
+#~ 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:"
+
+#~ msgid "_Message Recipients:"
+#~ msgstr "_Vastaanottajat:"
+
+#~ msgid "B_usiness"
+#~ msgstr "T_y�paikka"
+
+#~ msgid "Business _Fax"
+#~ msgstr "Ty�-_faksi"
+
+#~ msgid "_Business"
+#~ msgstr "_Ty�"
+
+#~ msgid "_Home"
+#~ msgstr "_Koti"
+
+#~ 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"
+
+#~ msgid "Create a new task"
+#~ msgstr "Luo uusi teht�v�"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Uusi teht�v�"
+
+#, fuzzy
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Luo uusi tapaaminen"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Ei saatu ryhm�luetteloa palvelimelta."
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Uusien viestien haku POP-palvelimelta ep�onnistui: %s"
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Viestin hakeminen ep�onnistui: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ msgstr "Viesti� ei saatu POP-palvelimelta %s: %s"
+
+#~ 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."
+
+#~ msgid "Message was received"
+#~ msgstr "Viesti vastaanotettu"
+
+#~ msgid "Message was sent"
+#~ msgstr "Viesti l�hetetty"
+
+#, fuzzy
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Composer"
+#~ msgstr "Muokkain"
+
+#~ msgid "Edit..."
+#~ msgstr "Muokkaa..."
+
+#~ msgid "HTML signature file:"
+#~ msgstr "HTML-allekirjoitustiedosto:"
+
+#~ msgid "_Email Address:"
+#~ msgstr "S�hk�postiosoit_e:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organisaatio:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Muista t�m� salasana"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "L�het� s�hk�postit oletuksena _HTML-muodossa."
+
+#, fuzzy
+#~ msgid "_Server Type: "
+#~ msgstr "Palvelintyyppi: "
+
+#~ msgid "_Signature file:"
+#~ msgstr "Allekirjoitu_stiedosto:"
+
+#~ msgid "seconds."
+#~ msgstr "sekuntia."
+
+#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#~ 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"
+
+#, fuzzy
+#~ 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�)"
+
+#, fuzzy
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Luo uusi koko p�iv�n _tapahtuma"
+
+#, fuzzy
+#~ msgid "Create a New _Task"
+#~ msgstr "Luo uusi teht�v�"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Luo uusi t_apaaminen"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Luo uusi koko p�iv�n tapahtuma"
+
+#~ msgid "_Appointment..."
+#~ msgstr "T_apaaminen..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Kalenterin asetukset..."
+
+#, fuzzy
+#~ msgid "_Task..."
+#~ msgstr "_Teht�v�"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_S�hk�postiasetukset..."
+
+#, fuzzy
+#~ msgid "Tasks Settings..."
+#~ msgstr "Teht�v�n asetukset"
+
+#, fuzzy
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Muuta t�m�n kansion nime�"
+
+#, fuzzy
+#~ msgid "_Summary Settings..."
+#~ msgstr "_S�hk�postiasetukset..."
+
+#~ msgid "Sear_ch"
+#~ msgstr "_Etsi"
+
 #~ msgid "I couldn't remove the item from your calendar file!\n"
 #~ msgstr "En pystynyt poistamaan kohtaa kalenteritiedostostasi!\n"
 
@@ -14151,10 +27906,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgstr "V�limuistihakemistoa ei voitu avata: %s"
 
 #, fuzzy
-#~ msgid "Ximian Evolution"
-#~ msgstr "Evolution"
-
-#, fuzzy
 #~ msgid "%s - Ximian Evolution %s"
 #~ msgstr "%s - Evolution %s"
 
diff --git a/po/fr.po b/po/fr.po
index 44d45c97f8..0dde8de4d6 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-04-16 10:58+0200\n"
+"POT-Creation-Date: 2002-05-07 15:46-0400\n"
 "PO-Revision-Date: 2002-04-16 10:58+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -33,7 +33,7 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importation fichiers VCard dans Evolution"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:333
+#: addressbook/gui/widgets/e-addressbook-view.c:335
 msgid "File As"
 msgstr "Classer comme"
 
@@ -43,7 +43,7 @@ msgid "Name"
 msgstr "Nom"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:337
 msgid "Email"
 msgstr "E-mail"
 
@@ -59,7 +59,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/widgets/e-addressbook-view.c:367
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Adjoint"
 
@@ -99,7 +99,7 @@ msgid "Home"
 msgstr "Maison"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:344
 msgid "Organization"
 msgstr "Organisation"
 
@@ -121,7 +121,7 @@ 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/widgets/e-addressbook-view.c:347
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax professionnel"
 
@@ -131,7 +131,7 @@ msgstr "Fax prof."
 
 #: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1725
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax maison"
 
@@ -151,7 +151,7 @@ msgstr "Maison 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:351
+#: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "RNIS"
 
@@ -164,49 +164,49 @@ msgstr "Autre"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1729
-#: addressbook/gui/widgets/e-addressbook-view.c:353
+#: 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/widgets/e-addressbook-view.c:354
+#: 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/widgets/e-addressbook-view.c:355
+#: 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/widgets/e-addressbook-view.c:356
+#: 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:357
+#: 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:359
+#: 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/widgets/e-addressbook-view.c:360
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-mail 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:361
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Web Site"
 msgstr "Site Web"
 
@@ -215,7 +215,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:364
 msgid "Department"
 msgstr "Service"
 
@@ -224,7 +224,7 @@ msgid "Dep"
 msgstr "Serv"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:365
 msgid "Office"
 msgstr "Bureau"
 
@@ -233,12 +233,12 @@ msgid "Off"
 msgstr "Bur."
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:364
+#: addressbook/gui/widgets/e-addressbook-view.c:366
 msgid "Title"
 msgstr "Titre"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.c:367
 msgid "Profession"
 msgstr "Profession"
 
@@ -247,7 +247,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:368
 msgid "Manager"
 msgstr "Directeur"
 
@@ -260,7 +260,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:368
+#: addressbook/gui/widgets/e-addressbook-view.c:370
 msgid "Nickname"
 msgstr "Surnom"
 
@@ -269,12 +269,12 @@ msgid "Nick"
 msgstr "Snom"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:369
+#: addressbook/gui/widgets/e-addressbook-view.c:371
 msgid "Spouse"
 msgstr "Conjoint(e)"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/widgets/e-addressbook-view.c:372
 msgid "Note"
 msgstr "Note"
 
@@ -287,7 +287,7 @@ msgid "CALUri"
 msgstr "CalURI"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:371
+#: addressbook/gui/widgets/e-addressbook-view.c:373
 msgid "Free-busy URL"
 msgstr "URL Libre-Occupé"
 
@@ -321,11 +321,11 @@ msgstr "Nom de famille"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Multiples VCards"
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard pour %s"
@@ -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:2738
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 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:1129
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Ajout de la carte sur le serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1232
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Suppression de la carte du serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1468
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Modification de la carte du serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2592
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
 msgid "Restarting search."
 msgstr "Redémarrage de la recherche."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2684
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Récupération des résultats de recherche LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2765
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
 msgid "Error performing search"
 msgstr "Erreur lors de la recherche"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2789
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
 msgid "Could not parse query string"
 msgstr "Ne peut analyser la chaîne de recherche"
 
@@ -429,58 +429,73 @@ msgid "A sample Bonobo control which displays an addressbook."
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 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:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Directory Servers"
 msgstr "Serveurs de répertoire"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Visualisateur de minicard du carnet d'adresses"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Composant pour le traitement des contacts."
 
-#: 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 Minicard control"
 msgstr "Utilitaire de contrôle Minicard du carnet d'adresses"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 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:12
-msgid "Factory for the configuration control for the Evolution Addressbook."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#, 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:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 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:14
-msgid ""
-"This page can be used to configure access to directory servers using the "
-"LDAP protocol"
+#: 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
+#, 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
 #: 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:1042
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -513,209 +528,11 @@ msgstr "Nouvelle liste de contacts"
 msgid "Contact _List"
 msgstr "_Liste de Contacts"
 
-#: addressbook/gui/component/addressbook-config.c:238
-msgid "Edit Addressbook"
-msgstr "Éditer le carnet d'adresses"
-
-#: 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 "S'_identifier sur le serveur en utilisant : "
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Nom du compte"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Ajouter un carnet d'adresses"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Addressbook Sources"
-msgstr "Sources du carnet d'adresses"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Avancée"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Basique"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr "Cochez ici si le serveur nécessite une identification."
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "De_lete"
-msgstr "_Supprimer"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr "Nom distinctif (DN)"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "Adresse électronique"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
-msgstr ""
-"Evolution utilisera le Nom Distinctif (DN) pour vous authentifier sur le "
-"serveur"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolution utilisera cette adresse de courrier électronique pour vous "
-"authentifier sur le serveur"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr "Un"
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "_Racine de la recherche :"
-
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
-msgstr "_Domaine de recherche :"
-
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Nom du serveur"
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
-msgstr "Sous"
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
-msgstr ""
-"Les renseignements ci-dessous sont demandés pour ajouter un carnet d'adresses"
-
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "Ces renseignements ne sont demandés par la plupart des serveurs 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."
-msgstr ""
-"Ces renseignements sont utilisés par votre serveur KDAP pour préciser les "
-"noeuds utilisés dans une recherche. Contactez votre administrateur de "
-"serveur pour plus de renseignements."
-
-#: 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 ""
-"Noeud de base pour toutes vos recherches sur le serveur LDAP. Contactez "
-"votre administrateur de serveur pour plus d'informations."
-
-#: 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 ""
-"Ceci sera le nombre maximum de carte à télécharger. Si vous spécifiez un "
-"nombre trop élevé, cela ralentira votre carnet d'adresse."
-
-#: 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."
-msgstr ""
-"Ceci est la méthode utilisée par evolution pour vous authentifier sur le "
-"serveur LDAP. Notez bien que spécifiez « Adresse électronique » implique que "
-"l'accès anonyme au serveur soit autorisé."
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Nom du serveur où votre carnet d'adresses est situé."
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "C'est le port que votre serveur LDAP utilise."
-
-#: 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 ""
-"Ce som sera utilisé pour identifier votre compte (dans un but d'affichage "
-"uniquement)."
-
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "Nom du _Compte"
-
-#: 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:147
-msgid "_Add"
-msgstr "_Ajouter"
-
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr "Nom _Distinctif : "
-
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr "Limite de _téléchargement"
-
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:157
-#: 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 "_Éditer"
-
-#: addressbook/gui/component/addressbook-config.glade.h:35
-msgid "_Email address:"
-msgstr "Adresse électronique :"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "Port :"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "Nom du serveur :"
-
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "Ne peut initialiser gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:168
-msgid "Other Contacts"
-msgstr "Autres contacts"
-
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
@@ -749,54 +566,45 @@ 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:644
-#: addressbook/gui/component/addressbook.c:647
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:769
 msgid "Name begins with"
 msgstr "Nom commence par"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:770
 msgid "Email is"
 msgstr "Adresse est"
 
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:771
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "La catégorie est"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:773
+#: addressbook/gui/component/addressbook.c:772
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
-#: addressbook/gui/component/addressbook.c:774 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
 msgid "Advanced..."
 msgstr "Avancée..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1002
+#: addressbook/gui/component/addressbook.c:1001
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Toute catégorie"
 
-#: addressbook/gui/component/addressbook.c:1084
+#: addressbook/gui/component/addressbook.c:1083
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que le navigateur de dossier affichera"
 
-#.
-#. * 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 "(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
@@ -845,6 +653,633 @@ msgstr "Désactiver les interrogations"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Activer les Interrogations (Dangereux!)"
 
+#: 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-config.c:215
+#, 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:235
+#, fuzzy
+msgid "Could not perform query on Root DSE"
+msgstr "Ne peut analyser la chaîne de recherche"
+
+#: 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 ""
+"Informations de trace opaque invalides :\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1169
+#, 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:1613
+#, 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:1689
+#, 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 "<< Fewer Options"
+msgstr "Options"
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "<- _Remove"
+msgstr "<- Supprimer"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "1234"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "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
+msgid "Always"
+msgstr "Toujours"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonyme"
+
+#: 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 "Connexion..."
+
+#: 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 "Pas d'information"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "_Supprimer"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Nom _Distinctif : "
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Email Address:"
+msgstr "Adresse électronique :"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Alarme d'Evolution"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr ""
+"Evolution utilisera cette adresse de courrier électronique pour vous "
+"authentifier sur le serveur"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolution utilisera cette adresse de courrier électronique pour vous "
+"authentifier sur le serveur"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "_Rechercher"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Général"
+
+#: 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 "Configuration"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Marges"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+msgid "Never"
+msgstr "Jamais"
+
+#: 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 "Un"
+
+#: 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 "Restaurer les valeurs par défaut"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Restaurer les valeurs par défaut"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "_Domaine de recherche :"
+
+#. 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 "Recherche"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Sélectionner tout"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Supprimé"
+
+#: 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 "Informations de source"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Connexion au serveur"
+
+#: 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 "Sous"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Schéma non supporté"
+
+#: 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 ""
+"Ceci sera le nombre maximum de carte à télécharger. Si vous spécifiez un "
+"nombre trop élevé, cela ralentira votre carnet d'adresse."
+
+#: 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 ""
+"Ceci est la méthode utilisée par evolution pour vous authentifier sur le "
+"serveur LDAP. Notez bien que spécifiez « Adresse électronique » implique "
+"que l'accès anonyme au serveur soit autorisé."
+
+#: 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 ""
+"Ce som sera utilisé pour identifier votre compte (dans un but d'affichage "
+"uniquement)."
+
+#: 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 "Nom distinctif (DN)"
+
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+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:136
+msgid "Whenever Possible"
+msgstr "Lorsque c'est possible"
+
+#: 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:139
+msgid "_Add"
+msgstr "_Ajouter"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "Ajouter ->"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Ajouter l'action"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Ajouter l'action"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Toujours"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Supprimer tout"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Affichage"
+
+#: addressbook/gui/component/ldap-config.glade.h:111
+#, fuzzy
+msgid "_Distinguished Name (DN):"
+msgstr "Nom distinctif (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 "Limite de _téléchargement"
+
+#: 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
+#: 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 "_Éditer"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "Éditer le rendez-vous"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Alarme d'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 "_Options"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "Port :"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Restaurer les valeurs par défaut"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "_Racine de la recherche :"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "Nom du serveur :"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Durée du report (minutes)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Compte %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "Éditeur de compte"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Pas de cartes"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Reconnexion à %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 "Général"
+
+#: 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 "Recherche"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Interface de sélection de nom du carnet d'adresses d'Evolution"
@@ -856,7 +1291,7 @@ msgstr ""
 "d'adresses d'Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:852
+#: 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
 msgid "Remove"
@@ -887,7 +1322,12 @@ msgstr "(%d cachés)"
 msgid "Unnamed Contact"
 msgstr "Contact sans nom"
 
-#: addressbook/gui/component/select-names/e-select-names.c:603
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "L'expéditeur contient"
+
+#: 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"
@@ -904,7 +1344,7 @@ msgstr ""
 "des circonstances sous lesquelles cette erreur est survenue. \n"
 "Merci."
 
-#: addressbook/gui/component/select-names/e-select-names.c:611
+#: 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"
@@ -916,31 +1356,40 @@ msgstr ""
 "Vous devrez peut-être redémarrer Evolution pour résoudre ce\n"
 "problème."
 
-#: addressbook/gui/component/select-names/e-select-names.c:693
+#: addressbook/gui/component/select-names/e-select-names.c:806
 msgid "Select Contacts from Addressbook"
 msgstr "Sélectionnez les contacts dans le carnet d'adresses"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "C_ontenant :"
+msgid "Select Names"
+msgstr "Sélectionnez des noms"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "_Rechercher"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Supprimer le contact ?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Sélectionnez des noms"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Contacts"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Afficher les contacts satisfaisant aux critères suivants :"
+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 "_Déplacer..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Catégorie :"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Dossier :"
 
@@ -1001,11 +1450,6 @@ msgstr "C_lasser comme :"
 msgid "Full _Name..."
 msgstr "_Nom complet..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: mail/mail-config.glade.h:57
-msgid "General"
-msgstr "Général"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1049,12 +1493,11 @@ 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:707
-#: calendar/gui/e-calendar-table.c:1001 calendar/gui/e-day-view.c:3609
-#: filter/filter.glade.h:8 mail/folder-browser.c:1629
-#: mail/mail-config.glade.h:155 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: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
 msgid "_Delete"
 msgstr "_Supprimer"
 
@@ -2105,14 +2548,6 @@ 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 ""
-"Êtes-vous sûr de vouloir \n"
-"supprimer ce contact ?"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Supprimer le contact ?"
 
@@ -2146,7 +2581,7 @@ msgid "Edit Full"
 msgstr "Éditer entièrement"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:334
+#: addressbook/gui/widgets/e-addressbook-view.c:336
 msgid "Full Name"
 msgstr "Nom complet"
 
@@ -2283,8 +2718,8 @@ msgstr "Membres"
 #: 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 ""
-"Saisissez une adresse électronique ou déplacez un contact dans la liste ci-"
-"dessous"
+"Saisissez une adresse électronique ou déplacez un contact dans la liste "
+"ci-dessous"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_Hide addresses when sending mail to this list"
@@ -2380,94 +2815,6 @@ msgstr "%d cartes"
 msgid "Error getting book view"
 msgstr "Erreur d'obtention de la vue livre"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:149
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:912
-#: addressbook/gui/widgets/e-addressbook-view.c:1022
-#: addressbook/gui/widgets/e-addressbook-view.c:1705
-#: ui/evolution-addressbook.xml.h:21
-msgid "Save as VCard"
-msgstr "Enregistrer comme VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Ouvrir"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1023
-#: ui/evolution-addressbook.xml.h:12
-msgid "Forward Contact"
-msgstr "Faire suivre au contact"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:317
-#: addressbook/gui/widgets/e-addressbook-view.c:1024
-msgid "Send Message to Contact"
-msgstr "Envoyer un _message au contact"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:318
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-#: 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-reflow-adapter.c:320
-#: addressbook/gui/widgets/e-addressbook-view.c:1027
-msgid "Print Envelope"
-msgstr "Imprimer En_veloppe..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:324
-#: addressbook/gui/widgets/e-addressbook-view.c:1031
-msgid "Copy to folder..."
-msgstr "Copier vers le dossier..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:325
-#: addressbook/gui/widgets/e-addressbook-view.c:1032
-msgid "Move to folder..."
-msgstr "Déplacer vers le dossier..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: addressbook/gui/widgets/e-addressbook-view.c:1035
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Couper"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1036
-#: 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-reflow-adapter.c:330
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:381
-#: addressbook/gui/widgets/e-addressbook-view.c:1037
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
-msgid "Paste"
-msgstr "Coller"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:331
-#: addressbook/gui/widgets/e-addressbook-view.c:1038
-#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:214
-#: 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-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
-msgid "New Contact..."
-msgstr "Nouveau contact..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
-#: addressbook/gui/widgets/e-addressbook-view.c:1089
-msgid "New Contact List..."
-msgstr "Nouvelle liste de contacts..."
-
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
 #: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
@@ -2481,7 +2828,8 @@ 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 shell/e-shell.c:2096
+#: 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
 msgid "Unknown error"
 msgstr "Erreur inconnue"
@@ -2509,9 +2857,9 @@ 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:2276
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: 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
 msgid "Cancelled"
 msgstr "Annulée"
 
@@ -2543,7 +2891,7 @@ 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:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Suppression de carte : Erreur"
 
@@ -2564,88 +2912,187 @@ msgid ""
 msgstr ""
 "Vous avez demander à ce que %d cartes soit affichées. Cette opération va "
 "ouvrir\n"
-"%d nouvelles fenêtres sour votre écran. Voulez-vous vraiment tout afficher ?"
+"%d nouvelles fenêtres sour votre écran. Voulez-vous vraiment tout afficher "
+"?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:343
+#: addressbook/gui/widgets/e-addressbook-util.c:344
 msgid "Move card to"
 msgstr "Déplacer la carte vers"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:345
+#: addressbook/gui/widgets/e-addressbook-util.c:346
 msgid "Copy card to"
 msgstr "Copier la carte vers"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Move cards to"
 msgstr "Déplacer les cartes vers"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:351
 msgid "Copy cards to"
 msgstr "Copier les cartes vers"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:332
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Cliquez ici pour ajouter un contact *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Téléphone Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Téléphone Adjoint"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Téléphone Travail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Répondeur"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Téléphone Société"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:341
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Téléphone Maison"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Adresse Travail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Adresse Maison"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Téléphone Mobile"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Téléphone Voiture"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Téléphone Travail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:350
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Téléphone Maison 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:352
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Autre Téléphone"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Enregistrer comme VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+msgid "New Contact..."
+msgstr "Nouveau contact..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+msgid "New Contact List..."
+msgstr "Nouvelle liste de contacts..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Aller au dossier..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Importer..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Rechercher des contacts"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Sources du carnet d'adresses"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Paramétrage du Pilot..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Faire suivre au contact"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Envoyer un _message au contact"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Imprimer En_veloppe..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Copy to folder..."
+msgstr "Copier vers le dossier..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Move to folder..."
+msgstr "Déplacer vers le dossier..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Couper"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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: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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "Vue _courante"
+
+#. 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:581
+#: addressbook/gui/widgets/e-addressbook-view.c:940
 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"
 
@@ -2653,7 +3100,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:586
+#: addressbook/gui/widgets/e-addressbook-view.c:945
 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"
 
@@ -2670,7 +3117,7 @@ msgstr "et une autre carte."
 msgid "Save in addressbook"
 msgstr "Enregistrer dans le carnet d'adresses"
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
@@ -2684,7 +3131,7 @@ msgstr ""
 "\n"
 "Double-cliquez ici pour créer un nouveau Contact."
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
+#: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
 "\n"
 "\n"
@@ -2889,29 +3336,25 @@ msgstr "_Police..."
 msgid "Untitled appointment"
 msgstr "Rendez-vous sans titre"
 
-#: 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:416 mail/message-list.c:684
+#: 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
 msgid "High"
 msgstr "Haute"
 
-#: 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:417 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
-#: 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:418 mail/message-list.c:682
+#: 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
 msgid "Low"
 msgstr "Basse"
 
 #. 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:419
 msgid "Undefined"
 msgstr "Indéfinie"
 
@@ -2981,7 +3424,8 @@ msgstr "Utilitaire de contrôle du Calendrier"
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
-"Usine à composants pour centraliser les éditeurs de composants du calendrier"
+"Usine à composants pour centraliser les éditeurs de composants du "
+"calendrier"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
@@ -3000,22 +3444,10 @@ msgstr "Service de notification d'alarme"
 msgid "Factory for the alarm notification service"
 msgstr "Utilitaire pour le service de notification d'alarme"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-msgid "Starting:"
-msgstr "Débute : "
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-msgid "Ending:"
-msgstr "Fini : "
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "Heure invalide"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-msgid "Evolution Alarm"
-msgstr "Alarme d'Evolution"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3056,7 +3488,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:2598
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avertissement"
@@ -3106,7 +3538,7 @@ msgstr "La description contient"
 msgid "Comment contains"
 msgstr "Le commentaire contient"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1118
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "Différent"
 
@@ -3117,7 +3549,7 @@ 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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1421 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3135,11 +3567,11 @@ msgstr "%A %d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1468
+#: 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:775
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3147,16 +3579,14 @@ 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
 msgid "Private"
 msgstr "Privé"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:396
 msgid "Confidential"
 msgstr "Confidentiel"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:394
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "_Public"
 
@@ -3177,32 +3607,27 @@ msgid "W"
 msgstr "O"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:468
 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
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
 #: shell/evolution-shell-component.c:1065
 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:2267
 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:2270
 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:2273
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Achevée"
 
@@ -3218,11 +3643,10 @@ 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:1591
-#: mail/mail-account-gui.c:1059 mail/mail-account-gui.c:1060
-#: mail/mail-account-gui.c:1661 mail/mail-accounts.c:427
-#: mail/mail-accounts.c:436 mail/mail-accounts.c:486
-#: mail/mail-config.glade.h:87 mail/message-tag-followup.c:64
+#: 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
 #: 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
@@ -3239,21 +3663,13 @@ 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
 msgid "Yes"
 msgstr "Oui"
 
 #: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
 msgid "No"
 msgstr "Non"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1695
-#: calendar/gui/e-week-view.c:1206
-msgid "Searching"
-msgstr "Recherche"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Vue journalière"
@@ -3270,8 +3686,8 @@ msgstr "Vue hebdomadaire"
 msgid "Month View"
 msgstr "Vue mensuelle"
 
-#: calendar/gui/component-factory.c:67 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Calendrier"
 
@@ -3279,11 +3695,10 @@ msgstr "Calendrier"
 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:1754
-#: calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
-#: my-evolution/e-summary-tasks.c:250 my-evolution/e-summary-tasks.c:267
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1039
+#: 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
 msgid "Tasks"
 msgstr "Tâches"
@@ -3530,7 +3945,7 @@ msgstr "Rappels"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Résumé :"
 
@@ -3559,7 +3974,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:181
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -3600,170 +4015,168 @@ msgid "Color for tasks due today"
 msgstr "Couleur des tâches du jour"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Créer un nouveau rendez-vous avec un _rappel par défaut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Jours"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "_Premier jour de la semaine :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Vendredi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Heures"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Lundi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Tâches en _retard :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Samedi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-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:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "Afficher les numéros de semaine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_Dim"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "_Tâches d'aujourd'hui :"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "_Jeu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "_Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "_Tâches d'aujourd'hui :"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "Liste des _tâches"
 
-#: 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 "Jeudi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Horaire"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Fuseau _horaire :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Di_visions horaires :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Format de date :"
 
-#: 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 "Mardi"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Sem. Travail"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 heures (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 heures"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 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:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "_Compresser les week-ends dans la vue mensuelle"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Affichage"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Général"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "_Cacher les tâches achevées après"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Autre"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Tâches en _retard :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_Sam"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "Liste des _tâches"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Di_visions horaires :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "M_er"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "Avant le début du  rendez-vous"
 
@@ -3831,23 +4244,23 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Vous n'avez fait aucune modification, Mettre à jour l'éditeur ?"
 
-#: 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 " À "
 
-#: 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 " (Terminé"
 
-#: 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 "Terminé"
 
-#: 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 "(Date d'échéance"
 
-#: 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 "Date d'échéance"
 
@@ -3879,8 +4292,8 @@ msgid "No summary"
 msgstr "Aucun résumé"
 
 #: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3801
-#: calendar/gui/e-week-view.c:3707 composer/e-msg-composer.c:955
+#: 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
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
@@ -3913,7 +4326,8 @@ msgstr "Êtes-vous sûr de vouloir supprimer l'entrée de journal « %s » ?"
 
 #: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Êtes-vous sûr de vouloir supprimer cet entrée de journal sans titre ?"
+msgstr ""
+"Êtes-vous sûr de vouloir supprimer cet entrée de journal sans titre ?"
 
 #: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
@@ -3942,7 +4356,7 @@ msgstr "Délégué À :"
 msgid "Enter Delegate"
 msgstr "Saisissez un délégué"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2224
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Rendez-vous"
 
@@ -4009,7 +4423,7 @@ msgid "Pu_blic"
 msgstr "Pu_blic"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Afficher l'heure comme"
 
@@ -4054,55 +4468,49 @@ msgstr "Présents"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Cliquez ici pour ajouter un participant"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Nom Courant"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Délégué par"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Délégué À"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Langue"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Membre"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:864
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "Réponse S.V.P"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 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:52
+#: 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"
 msgstr "État"
 
-#: 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
+#: 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
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
@@ -4125,27 +4533,98 @@ msgstr "_Inviter d'autres personnes..."
 msgid "_Other Organizer"
 msgstr "_Autre organizer"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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 "1er"
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "2ème"
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "3ème"
+
+#: 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 "ième"
+
+#: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ce rendez-vous contient des récurrences qu'Evolution ne peut éditer."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "le"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "liste"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "seconde"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Autre"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Nord"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "liste"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Fax Autre"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "jour"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "le"
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr "ième"
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr "récurrences"
 
@@ -4216,7 +4695,8 @@ msgstr "Les informations de la réunion ont été créées. Envoyer ?"
 #: calendar/gui/dialogs/send-comp.c:59
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
-"Les informations de la réunion ont changé.Envoyer une version mise à jour ?"
+"Les informations de la réunion ont changé.Envoyer une version mise à jour "
+"?"
 
 #: calendar/gui/dialogs/send-comp.c:66
 msgid "The task assignment information has been created. Send it?"
@@ -4242,7 +4722,7 @@ msgid "Progress"
 msgstr "En cours"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:730
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL :"
 
@@ -4254,15 +4734,19 @@ msgstr "_Priorité :"
 msgid "_Status:"
 msgstr "_État :"
 
+#: calendar/gui/dialogs/task-editor.c:178
+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
 msgid "Assignment"
 msgstr "Tâche"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:812
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Description :"
 
@@ -4274,121 +4758,76 @@ msgstr "Date de _début :"
 msgid "_Due Date:"
 msgstr "Date d'_échéance :"
 
-#: calendar/gui/e-calendar-table.c:438
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:439
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:440
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:441
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:442
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:443
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:444
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:445
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:446
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:447
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:448
-msgid "100%"
-msgstr "100%"
-
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2744
-#: calendar/gui/e-week-view.c:1846
+#: calendar/gui/e-calendar-table.c:751 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:3583
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1602
+#: 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
 msgid "_Open"
 msgstr "Ouvrir"
 
-#: calendar/gui/e-calendar-table.c:974
+#: calendar/gui/e-calendar-table.c:973
 msgid "_Save as..."
 msgstr "Enregistrer _sous..."
 
-#: calendar/gui/e-calendar-table.c:976 calendar/gui/e-day-view.c:3587
-#: calendar/gui/e-week-view.c:3442 calendar/gui/e-week-view.c:3475
+#: calendar/gui/e-calendar-table.c:974 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 "_Imprimer..."
 
-#: calendar/gui/e-calendar-table.c:981 calendar/gui/e-day-view.c:3593
-#: calendar/gui/e-week-view.c:3481 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:978 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:983 calendar/gui/e-day-view.c:3595
-#: calendar/gui/e-week-view.c:3483 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:979 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:985 calendar/gui/e-day-view.c:3559
-#: calendar/gui/e-day-view.c:3597 calendar/gui/e-week-view.c:3447
-#: calendar/gui/e-week-view.c:3485 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:980 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 "C_oller"
 
-#: calendar/gui/e-calendar-table.c:990
+#: calendar/gui/e-calendar-table.c:984
 msgid "_Assign Task"
 msgstr "_Affecter une tâche"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:985
 msgid "_Forward as iCalendar"
 msgstr "_Faire suivre comme iCalendar"
 
-#: calendar/gui/e-calendar-table.c:994
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "Marquer comme terminé"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:987
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marquer les tâches comme terminées"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "Supprimer les tâches sélectionnées"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7366
-#: calendar/gui/e-week-view.c:4155
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
-#: calendar/gui/e-calendar-table.c:1354
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une tâche"
 
@@ -4396,48 +4835,47 @@ 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:1055
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Terminé"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Date d'Achèvement"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Date d'échéance"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Date de fin"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Emplacement géographique"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Priorité"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 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:767
-#: shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Résumé"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Tri par tâche"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4471,447 +4909,175 @@ msgstr "%02i divisions par 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:1407
-#: 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:1434
+#: 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:632 calendar/gui/e-week-view.c:368
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:371
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3543
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "Nouveau _rendez-vous"
 
-#: calendar/gui/e-day-view.c:3545 calendar/gui/e-week-view.c:3433
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Nouvel évènement de journée complète"
 
-#: calendar/gui/e-day-view.c:3547 calendar/gui/e-week-view.c:3435
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 msgid "New Meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/e-day-view.c:3549 calendar/gui/e-week-view.c:3437
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
 msgid "New Task"
 msgstr "Nlle Tâche"
 
-#: calendar/gui/e-day-view.c:3554 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimer..."
 
-#: calendar/gui/e-day-view.c:3564 calendar/gui/e-week-view.c:3452
+#: 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 "Aller à aujourd'hui"
 
-#: calendar/gui/e-day-view.c:3566 calendar/gui/e-week-view.c:3454
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 msgid "_Go to Date..."
 msgstr "Aller à la date"
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
+#: 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 "_Publier l'information Libre/Occupé"
 
-#: calendar/gui/e-day-view.c:3576 calendar/gui/e-week-view.c:3464
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
 #: ui/evolution.xml.h:37
 msgid "_Configure..."
 msgstr "_Configurer..."
 
-#: calendar/gui/e-day-view.c:3585 calendar/gui/e-week-view.c:3473
-#: mail/folder-browser.c:1604 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+msgid "_Configure Pilot..."
+msgstr "_Configurer..."
+
+#: 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
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: calendar/gui/e-day-view.c:3602 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: calendar/gui/e-day-view.c:3604 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar"
 
-#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3499
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurence déplaçable"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3501
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette occurence"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3503
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 msgid "Delete _All Occurrences"
 msgstr "Supprimer toutes les occurences"
 
-#: calendar/gui/e-itip-control.c:556
-msgid "Meeting begins: <b>"
-msgstr "La réunion commence : <b>"
-
-#: calendar/gui/e-itip-control.c:561
-msgid "Task begins: <b>"
-msgstr "La tâche commence : <b>"
-
-#: calendar/gui/e-itip-control.c:566
-msgid "Free/Busy info begins: <b>"
-msgstr "L'information Libre/Occupé commence : <b>"
-
-#: calendar/gui/e-itip-control.c:570
-msgid "Begins: <b>"
-msgstr "Débute : <b>"
-
-#: calendar/gui/e-itip-control.c:582
-msgid "Meeting ends: <b>"
-msgstr "La réunion se termine : <b>"
-
-#: calendar/gui/e-itip-control.c:585
-msgid "Free/Busy info ends: <b>"
-msgstr "l'information Libre/Occupé se termine : <b>"
-
-#: calendar/gui/e-itip-control.c:589
-msgid "Ends: <b>"
-msgstr "Finit : <b>"
-
-#: calendar/gui/e-itip-control.c:603
-msgid "Task Completed: <b>"
-msgstr "Tâche achevée : <b>"
-
-#: calendar/gui/e-itip-control.c:613
-msgid "Task Due: <b>"
-msgstr "Tâche escomptée : "
-
-#: calendar/gui/e-itip-control.c:650 calendar/gui/e-itip-control.c:699
-msgid "iCalendar Information"
-msgstr "Information iCalendar"
-
-#. Title
-#: calendar/gui/e-itip-control.c:665
-msgid "iCalendar Error"
-msgstr "Erreur iCalendar"
-
-#: calendar/gui/e-itip-control.c:730 calendar/gui/e-itip-control.c:746
-msgid "An unknown person"
-msgstr "Une personne inconnue"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:753
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
-"<br> Veuillez vérifier les information suivantes puis sélectionner une "
-"action\n"
-"du menu ci-dessous."
-
-#: calendar/gui/e-itip-control.c:769
-msgid "<i>None</i>"
-msgstr "<i>Aucun</i>"
-
-#: calendar/gui/e-itip-control.c:781
-msgid "Status:"
-msgstr "État :"
-
-#: calendar/gui/e-itip-control.c:786 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
-msgid "Accepted"
-msgstr "Accepté"
-
-#: calendar/gui/e-itip-control.c:790 calendar/gui/itip-utils.c:326
-msgid "Tentatively Accepted"
-msgstr "Accepté pour voir"
+"Les utilitaires Gnome Pilot ne semblent pas installés sur ce système."
 
-#: calendar/gui/e-itip-control.c:794 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
-msgid "Declined"
-msgstr "Refusé"
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
+#, c-format
+msgid "Error executing %s."
+msgstr "Erreur à l'exécution de %s"
 
-#: calendar/gui/e-itip-control.c:798 calendar/gui/e-itip-control.c:997
-#: calendar/gui/e-itip-control.c:1068 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: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
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:318
-#: mail/mail-display.c:849 widgets/misc/e-charset-picker.c:58
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: calendar/gui/e-itip-control.c:844 calendar/gui/e-itip-control.c:860
-#: calendar/gui/e-itip-control.c:876 calendar/gui/e-itip-control.c:889
-#: calendar/gui/e-itip-control.c:902 calendar/gui/e-itip-control.c:915
-msgid "Choose an action:"
-msgstr "Sélectionner une action :"
-
-#: calendar/gui/e-itip-control.c:845
-msgid "Update"
-msgstr "Mise à jour"
-
-#: calendar/gui/e-itip-control.c:846 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:917
-#: shell/e-shell.c:2086 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:861
-msgid "Accept"
-msgstr "Accepter"
-
-#: calendar/gui/e-itip-control.c:862
-msgid "Tentatively accept"
-msgstr "Accepter pour voir"
-
-#: calendar/gui/e-itip-control.c:863
-msgid "Decline"
-msgstr "Refuser"
-
-#: calendar/gui/e-itip-control.c:877
-msgid "Send Free/Busy Information"
-msgstr "Envoyer l'information Libre-Occupé"
-
-#: calendar/gui/e-itip-control.c:890
-msgid "Update respondent status"
-msgstr "Mettre à jour le status de l'interlocuteur"
-
-#: calendar/gui/e-itip-control.c:903
-msgid "Send Latest Information"
-msgstr "Envoyer les dernières informations"
-
-#: calendar/gui/e-itip-control.c:916 calendar/gui/itip-utils.c:343
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Annuler"
-
-#: calendar/gui/e-itip-control.c:964
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> a publié les informations de la réunion"
-
-#: calendar/gui/e-itip-control.c:965
-msgid "Meeting Information"
-msgstr "Informations de la réunion"
-
-#: calendar/gui/e-itip-control.c:969
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> demande votre présence à cette réunion."
-
-#: calendar/gui/e-itip-control.c:970
-msgid "Meeting Proposal"
-msgstr "Proposition de réunion"
-
-#: calendar/gui/e-itip-control.c:974
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "<b>%s</b> espère être intégré à une réunion existante."
-
-#: calendar/gui/e-itip-control.c:975
-msgid "Meeting Update"
-msgstr "Mise à jour de la réunion"
-
-#: calendar/gui/e-itip-control.c:979
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> espère recevoir les informations de la dernière réunion."
-
-#: calendar/gui/e-itip-control.c:980
-msgid "Meeting Update Request"
-msgstr "Demande de mise à jour de la réunion"
-
-#: calendar/gui/e-itip-control.c:1003
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> a répondu à une demande de réunion"
-
-#: calendar/gui/e-itip-control.c:1004
-msgid "Meeting Reply"
-msgstr "Réponse à une réunion"
-
-#: calendar/gui/e-itip-control.c:1008
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> a annulé une réunion."
-
-#: calendar/gui/e-itip-control.c:1009
-msgid "Meeting Cancellation"
-msgstr "Annulation de réunion"
-
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1119
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> a envoyé un message incompréhensible."
-
-#: calendar/gui/e-itip-control.c:1014
-msgid "Bad Meeting Message"
-msgstr "Mauvais message de réunion"
-
-#: calendar/gui/e-itip-control.c:1034
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> a publié les informations de la tâche."
-
-#: calendar/gui/e-itip-control.c:1035
-msgid "Task Information"
-msgstr "Informations de la tâche"
-
-#: calendar/gui/e-itip-control.c:1039
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> demande que vous exécutiez une tâche."
-
-#: calendar/gui/e-itip-control.c:1040
-msgid "Task Proposal"
-msgstr "Tâche proposée"
-
-#: calendar/gui/e-itip-control.c:1044
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b>%s</b> espère être intégré à une tâche existante."
-
-#: calendar/gui/e-itip-control.c:1045
-msgid "Task Update"
-msgstr "Mise à jour de tâche"
-
-#: calendar/gui/e-itip-control.c:1049
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> espère recevoir les informationss de la dernière tâche"
-
-#: calendar/gui/e-itip-control.c:1050
-msgid "Task Update Request"
-msgstr "Demande de mise à jour de tâche"
-
-#: calendar/gui/e-itip-control.c:1074
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> a répondu à une assignation de tâche."
-
-#: calendar/gui/e-itip-control.c:1075
-msgid "Task Reply"
-msgstr "Répondre à la tâche"
-
-#: calendar/gui/e-itip-control.c:1079
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> a annulé une tâche."
-
-#: calendar/gui/e-itip-control.c:1080
-msgid "Task Cancellation"
-msgstr "Annulation de tâche"
-
-#: calendar/gui/e-itip-control.c:1085
-msgid "Bad Task Message"
-msgstr "Mauvais message de tâche"
-
-#: calendar/gui/e-itip-control.c:1104
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> a publié une information Libre-Occupé"
-
-#: calendar/gui/e-itip-control.c:1105
-msgid "Free/Busy Information"
-msgstr "Information Libre-Occupé"
-
-#: calendar/gui/e-itip-control.c:1109
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> demande votre information Libre/Occupé"
-
-#: calendar/gui/e-itip-control.c:1110
-msgid "Free/Busy Request"
-msgstr "Demande Libre-Occupé"
-
-#: calendar/gui/e-itip-control.c:1114
-#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> a répondu à une demande Libre/Occupé"
-
-#: calendar/gui/e-itip-control.c:1115
-msgid "Free/Busy Reply"
-msgstr "Réponse Libre-Occupé"
-
-#: calendar/gui/e-itip-control.c:1120
-msgid "Bad Free/Busy Message"
-msgstr "Mauvais message Libre-Occupé"
-
-#: calendar/gui/e-itip-control.c:1193
-msgid "The message does not appear to be properly formed"
-msgstr "Le message ne semble pas être correctement rempli"
-
-#: calendar/gui/e-itip-control.c:1212
-msgid "The message contains only unsupported requests."
-msgstr "Le message ne contient que des requêtes non-supportées."
-
-#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1246
-msgid "The attachment does not contain a valid calendar message"
-msgstr "L'attachement ne contient pas d'information de calendrier valide"
-
-#: calendar/gui/e-itip-control.c:1271
-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:1403
+#: 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:1405
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Mise à jour terminée\n"
 
-#: calendar/gui/e-itip-control.c:1446
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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
 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 ?"
+"Cette réponse ne provient pas d'un participant. L'ajouter comme participant "
+"?"
 
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1625
 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:1472
+#: 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:1474
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Status du participant mis à jour\n"
 
-#: calendar/gui/e-itip-control.c:1476
-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:1504
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Effacement Terminé"
 
-#: calendar/gui/e-itip-control.c:1534 calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Item envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1536 calendar/gui/e-itip-control.c:1588
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 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
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Sélectionnez un Dossier"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Sélectionnez un Dossier"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4966,57 +5132,58 @@ 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:533
 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
 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
 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
 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
 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:535
 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
 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
 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:543
 msgid "Needs Action"
 msgstr "Nécessite une action"
 
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+msgid "Accepted"
+msgstr "Accepté"
+
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+msgid "Declined"
+msgstr "Refusé"
+
 #: 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-time-sel.c:434
 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
 msgid "Delegated"
 msgstr "Délégué"
 
@@ -5121,29 +5288,39 @@ 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:654
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Date d'Achèvement"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Supprimer les objets sélectionnés"
+
+#: calendar/gui/e-tasks.c:659
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: calendar/gui/e-week-view.c:3431
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Nouveau _RDV"
 
-#: calendar/gui/e-week-view.c:3497
+#: calendar/gui/e-week-view.c:3489
 msgid "_Delete this Appointment"
 msgstr "Supprimer ce rendez-vous"
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ne peut ouvrir le dossier dans « %s »"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1879
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ouverture du calendrier à %s"
@@ -5212,38 +5389,6 @@ msgstr "Au moins un participant est nécessaire"
 msgid "An organizer must be set."
 msgstr "Un organizer doit être configuré"
 
-#: calendar/gui/itip-utils.c:295
-msgid "Event information"
-msgstr "Information évenement"
-
-#: calendar/gui/itip-utils.c:297
-msgid "Task information"
-msgstr "Informations de la tâche"
-
-#: calendar/gui/itip-utils.c:299
-msgid "Journal information"
-msgstr "Informations du journal"
-
-#: calendar/gui/itip-utils.c:301
-msgid "Free/Busy information"
-msgstr "Information Libre-Occupé"
-
-#: calendar/gui/itip-utils.c:303
-msgid "Calendar information"
-msgstr "Information calendrier"
-
-#: calendar/gui/itip-utils.c:339
-msgid "Updated"
-msgstr "Mis à jour"
-
-#: calendar/gui/itip-utils.c:347
-msgid "Refresh"
-msgstr "Rafraîchir"
-
-#: calendar/gui/itip-utils.c:351
-msgid "Counter-proposal"
-msgstr "Contre-proposition"
-
 #: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Vous devez être inscrit comme participant à l'événement."
@@ -5405,87 +5550,54 @@ msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1840
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Jour sélectionné (%a %d %b %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 "Semaine sélectionnée (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1885
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Mois sélectionné (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Année sélectionnée (%Y)"
 
-#: calendar/gui/print.c:2226
-msgid "Task"
-msgstr "Tâche"
-
-#: calendar/gui/print.c:2283
-#, c-format
-msgid "Status: %s"
-msgstr "État : %s"
-
-#: calendar/gui/print.c:2301
-#, c-format
-msgid "Priority: %s"
-msgstr "Priorité : %s"
-
-#: calendar/gui/print.c:2315
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Pourcentage terminé : %i"
-
-#: calendar/gui/print.c:2327
-#, c-format
-msgid "URL: %s"
-msgstr "URL : %s"
-
-#: calendar/gui/print.c:2341
-#, c-format
-msgid "Categories: %s"
-msgstr "Catégories : %s"
-
-#: calendar/gui/print.c:2352
-msgid "Contacts: "
-msgstr "Contacts :"
-
-#: calendar/gui/print.c:2407
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Imprimer le Calendrier"
 
-#: calendar/gui/print.c:2498 calendar/gui/print.c:2590
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2880
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Aperçu Avant Impression"
 
-#: calendar/gui/print.c:2527
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Imprime cet élément"
 
-#: calendar/gui/print.c:2608
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Configuration de l'impression"
 
@@ -5507,13 +5619,14 @@ msgid ""
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Cette opération va définitivement effacer toutes les tâches marquées comme "
-"complétées. Si vous continuez, vous ne pourrez plus récupérer ces tâches.\n"
+"Cette opération va définitivement effacer toutes les tâches marquées "
+"comme complétées. Si vous continuez, vous ne pourrez plus récupérer ces "
+"tâches.\n"
 "\n"
 "Voulez-vous vraiment effacer les tâches ?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2373
-#: mail/mail-callbacks.c:2612
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "Ne plus me demander."
 
@@ -5575,10 +5688,6 @@ msgstr "Importation fichiers iCalendar dans Evolution"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importe des fichiers vCalendar dans Evolution"
 
-#: calendar/importers/icalendar-importer.c:424
-msgid "Reminder!!"
-msgstr "Rappel !!"
-
 #: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Évenements Calendrier"
@@ -5595,90 +5704,91 @@ msgstr ""
 msgid "Gnome Calendar"
 msgstr "Calendrier Gnome"
 
-#: calendar/pcs/query.c:247
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now attend 0 argument"
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time attend 1 argument"
 
-#: calendar/pcs/query.c:276
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time attend une chaîne de caractères pour l'argument 1"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time attend une chaîne de date ISO 8601 pour l'argument 1"
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add attend 2 arguments"
 
-#: calendar/pcs/query.c:318
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:325
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add attend un entier pour l'argument 2"
 
-#: calendar/pcs/query.c:352
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin attend 1 argument"
 
-#: calendar/pcs/query.c:357
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:384
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time_day-end attend 1 argument"
 
-#: calendar/pcs/query.c:389
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:425
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype attend 0 argument"
 
-#: calendar/pcs/query.c:521
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "Occur-in-time-range ? attend 2 arguments"
 
-#: calendar/pcs/query.c:526
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "Occur-in-time-range ? attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:533
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "Occur-in-time-range ? attend un time_t pour l'argument 2"
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains ? attend 2 arguments"
 
-#: calendar/pcs/query.c:668
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains ? attend une chaîne pour l'argument 1"
 
-#: calendar/pcs/query.c:675
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains ? attend une chaîne pour l'argument 2"
 
-#: calendar/pcs/query.c:692
+#: 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 ? attend « any », « summary », « description » pour l'argument 1"
+"contains ? attend « any », « summary », « description » pour "
+"l'argument 1"
 
-#: calendar/pcs/query.c:734
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories ? attend au moins 1 argument"
 
-#: calendar/pcs/query.c:746
+#: 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)"
@@ -5686,19 +5796,19 @@ msgstr ""
 "has-categories ? attend tous les arguments comme chaîne ou seulement 1 "
 "argument comme booléen faux (#f)"
 
-#: calendar/pcs/query.c:834
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed ? attend 0 argument"
 
-#: calendar/pcs/query.c:879
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before. attend 1 argument"
 
-#: calendar/pcs/query.c:884
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? attends un t_time comme premier argument"
 
-#: calendar/pcs/query.c:1161
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "L'évaluation de l'expression de recherche ne produit pas un booléen"
 
@@ -7235,11 +7345,11 @@ msgstr "Le codage n'est pas supporté par ce message chiffré"
 msgid "Decryption is not supported by this cipher"
 msgstr "Le décodage n'est pas supporté par ce message chiffré"
 
-#: camel/camel-data-cache.c:167
+#: camel/camel-data-cache.c:169
 msgid "Unable to create cache path"
 msgstr "Impossible de créer le répertoire de cache"
 
-#: camel/camel-data-cache.c:439
+#: camel/camel-data-cache.c:441
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Impossible de supprimer l'entrée du cache : %s : %s"
@@ -7278,12 +7388,12 @@ 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:1198
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, 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:1204
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur exécution du filtre : %s : %s"
@@ -7297,7 +7407,6 @@ msgid "Unable to process spool folder"
 msgstr "Ne peut traiter le dossier de spool"
 
 #: camel/camel-filter-driver.c:911
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Récupération du message %d (%d%%)"
 
@@ -7310,16 +7419,16 @@ msgstr "Ne peut ouvrir le message"
 msgid "Failed on message %d"
 msgstr "Anomalie message %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1050
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/camel-filter-driver.c:1017
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Récupération du message %d parmis %d"
 
-#: camel/camel-filter-driver.c:1032
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Anomalie message %d du %d"
@@ -7355,27 +7464,27 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(compare tout) demande un unique résultat booléen"
 
-#: camel/camel-folder-search.c:649
+#: camel/camel-folder-search.c:650
 #, c-format
 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:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Action non supportée : Ajout du message : pour %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, 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:1080
+#: camel/camel-folder.c:1078
 #, 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:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Déplacement des messages"
 
@@ -7410,8 +7519,8 @@ msgstr "Ne peut créer le fichier de verrouillage pour %s : %s"
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
-"Échéance du délai pour obtenir le fichier de verrouillage sur %s. Essayez de "
-"nouveau plus tard."
+"Échéance du délai pour obtenir le fichier de verrouillage sur %s. Essayez "
+"de nouveau plus tard."
 
 #: camel/camel-lock.c:204
 #, c-format
@@ -7487,75 +7596,79 @@ 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"
 
-#: camel/camel-pgp-context.c:622
+#: 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:629 camel/camel-pgp-context.c:803
+#: 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:635 camel/camel-pgp-context.c:809
+#: 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 ""
 "Impossible de signer ce message : ne peut créer le tube vers GPG/PGP : %s"
 
-#: camel/camel-pgp-context.c:796
+#: 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:988
+#: 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"
+msgstr ""
+"Impossible de vérifier ce message : pas de partie plaintext à vérifier"
 
-#: camel/camel-pgp-context.c:994
+#: 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"
+"Impossible de vérifier ce message : ne peut pas créer le tube vers GPG/PGP "
+": %s"
 
-#: camel/camel-pgp-context.c:1005
+#: 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"
+"Impossible de vérifier ce message : ne peut créer de fichier temporaire : "
+"%s"
 
-#: camel/camel-pgp-context.c:1178
+#: 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:1188
+#: 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:1195
+#: 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:1204
+#: 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é"
+msgstr ""
+"Impossible de crypter ce message : aucun déstinataire n'est spécifié"
 
-#: camel/camel-pgp-context.c:1373
+#: 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:1381
+#: 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:1388
+#: 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"
+"Impossible de décrypter ce message : ne peut créer le tube vers GPG/PGP : "
+"%s"
 
-#: camel/camel-pgp-mime.c:332
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "Ceci est une partie de message numériquement signée"
 
@@ -7600,14 +7713,14 @@ msgstr "Ne peut se connecter à %s (port %d) : %s"
 msgid "(unknown host)"
 msgstr "(Hôte inconnu)"
 
-#: camel/camel-remote-store.c:348 camel/camel-remote-store.c:410
-#: camel/camel-remote-store.c:471
+#: 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 "Opération annulée"
 
-#: camel/camel-remote-store.c:474
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7709,8 +7822,8 @@ msgstr "Kerberos 4"
 #: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
-"Cette option vous connectera au serveur IMAP en utilisant l'authentification/"
-"nKerberos 4 pour vous identifier."
+"Cette option vous connectera au serveur IMAP en utilisant "
+"l'authentification/nKerberos 4 pour vous identifier."
 
 #: camel/camel-sasl-kerberos4.c:161
 #, c-format
@@ -7722,7 +7835,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Mauvaise réponse d'identification du serveur."
 
@@ -7753,7 +7866,7 @@ 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:91
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -7797,26 +7910,41 @@ msgstr "L'URL « %s »  nécessite un composant  « Host »"
 msgid "URL '%s' needs a path component"
 msgstr "L'URL « %s » nécessite un chemin"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Résolution de : %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Échec de la résolution du nom : %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, 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:668
+#: camel/camel-service.c:675
 #, 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:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Résolution de : %s"
+
+#: camel/camel-service.c:787
+#, 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:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Échec de la résolution de l'hôte : %s : raison inconnue"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Founisseur de dossier de courrier virtuel"
@@ -7958,27 +8086,27 @@ msgstr "Ne peut analyser l'URL « %s »"
 msgid "No such message %s in %s"
 msgstr "Pas de tel message %s dans %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Aucun message correspondant : %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossible de supprimer le dossier : %s : Opération invalide"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossible de supprimer le dossier : %s : Dossier inéxistant"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Impossible de renommer le dossier : %s : Opération invalide"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossible de renommer le dossier : %s : Dossier inexistant"
@@ -8030,21 +8158,21 @@ msgstr "Le dossier a été détruit et recréé sur le serveur"
 msgid "Scanning for changed messages"
 msgstr "Examen des messages modifiés"
 
-#: camel/providers/imap/camel-imap-folder.c:1640
-#: camel/providers/imap/camel-imap-folder.c:2116
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Ce message n'est pas disponible"
 
-#: camel/providers/imap/camel-imap-folder.c:1795
-#: camel/providers/imap/camel-imap-folder.c:1869
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 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:1801
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Examen des nouveaux messages"
 
-#: camel/providers/imap/camel-imap-folder.c:2153
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "Ne peut trouver le corps du message dans la réponse FETCH."
 
@@ -8103,29 +8231,29 @@ msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
 "en clair."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
+#: camel/providers/imap/camel-imap-store.c:529
 #: camel/providers/smtp/camel-smtp-transport.c:468
 #, 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:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
+#: camel/providers/imap/camel-imap-store.c:568
 #: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Vous n'avez pas saisi de mot de passe."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8136,61 +8264,62 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Pas de tel dossier « %s »."
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 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:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "Rpéertoires de courrier au format MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 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:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Distribution locale"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 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:63
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Répertoires de courrier au format Maildir"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 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:80
+#: 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:81
+#: 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:91
+#: camel/providers/local/camel-local-provider.c:116
 msgid "Directory tree of mbox files"
 msgstr "Arborescence de répertoires des fichiers mbox"
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8232,17 +8361,23 @@ 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:864
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossible de renommer le dossier %s vers %s : %s"
 
-#: camel/providers/local/camel-local-store.c:375
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Impossible de renommer le dossier : %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
-msgstr "Impossible de supprimer le fichier de résumé de dossier « %s » : %s"
+msgstr ""
+"Impossible de supprimer le fichier de résumé de dossier « %s » : %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-local-store.c:389
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossible de supprimer le fichier d'index de dossier « %s » : %s"
@@ -8464,8 +8599,8 @@ msgstr "Impossible d'ouvrir le dossier : %s : %s"
 #, 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"
+"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
@@ -8496,7 +8631,8 @@ msgstr "Ne peut ouvrir la boîte à lettres temporaire : %s"
 #: 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"
+"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
@@ -8574,12 +8710,12 @@ msgstr "Le dossier « %s/%s » n'existe pas."
 msgid "Spool mail file %s"
 msgstr "Fichier de courrier spool %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
 #: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Les dossiers spool  ne peuvent être renommés."
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
 #: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Les dossiers spool  ne peuvent être effacés."
@@ -8689,9 +8825,9 @@ msgid "Retrieving POP summary"
 msgstr "Récupération résumé POP"
 
 #: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:444
-#: camel/providers/pop3/camel-pop3-folder.c:503
-#: camel/providers/pop3/camel-pop3-folder.c:520
+#: 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 "Opération annulée"
 
@@ -8700,31 +8836,31 @@ msgstr "Opération annulée"
 msgid "Cannot get POP summary: %s"
 msgstr "Impossible d'optenir le résumé POP : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:323
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Nettoyer les messages supprimés"
 
-#: camel/providers/pop3/camel-pop3-folder.c:418
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, c-format
 msgid "No message with uid %s"
 msgstr "Aucun message avec l'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:425
+#: camel/providers/pop3/camel-pop3-folder.c:427
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Récupération du message POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: 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 "Impossible d'obtenir le message : %s : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:512
+#: camel/providers/pop3/camel-pop3-folder.c:514
 msgid "Unknown reason"
 msgstr "Raison inconnue"
 
@@ -8741,13 +8877,14 @@ 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:90
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
 #: camel/providers/pop3/camel-pop3-provider.c:54
 msgid "For connecting to and downloading mail from POP servers."
-msgstr "Pour se connecter et télécharger son courrier depuis des serveurs POP."
+msgstr ""
+"Pour se connecter et télécharger son courrier depuis des serveurs POP."
 
 #: camel/providers/pop3/camel-pop3-provider.c:71
 msgid ""
@@ -8815,7 +8952,8 @@ msgstr "Erreur d'E/S : %s"
 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:503
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8824,13 +8962,13 @@ 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:593
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Aucun dossier « %s »."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8884,7 +9022,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:110
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -8960,7 +9098,8 @@ msgstr "Action demandée non prise : système de stockage insuffisant"
 
 #: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Action courrier demandée abandonnée : allocation de stockage excessif"
+msgstr ""
+"Action courrier demandée abandonnée : allocation de stockage excessif"
 
 #: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
@@ -9021,7 +9160,8 @@ 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"
-msgstr "Le serveur SMTP %s ne supporte pas le type d'identification demandé %s"
+msgstr ""
+"Le serveur SMTP %s ne supporte pas le type d'identification demandé %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
@@ -9054,7 +9194,7 @@ 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:604
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Envoi du message"
 
@@ -9066,62 +9206,62 @@ msgstr "Ne peut envoyer le message : aucun destinataire n'est défini."
 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:837
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "Accueil SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:863
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:883
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erreur réponse HELO : %s non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:931
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "Identification SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Erreur création objet identification SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:954
-#: camel/providers/smtp/camel-smtp-transport.c:966
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Demande AUTH expirée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "Erreur demande AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1036
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Mauvaise réponse d'identification du serveur.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1062
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1076
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "MAIL FROM response error"
 msgstr "Erreur réponse MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1101
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:1117
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Echec de RCPT TO  <%s>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Demande DATA expirée : %s : courrier non envoyé."
@@ -9129,35 +9269,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:1167
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 msgid "DATA response error"
 msgstr "Erreur réponse DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1207
-#: camel/providers/smtp/camel-smtp-transport.c:1225
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1239
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 msgid "DATA termination response error"
 msgstr "Erreur réponse de fin de DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1262
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Demande RSET dépassée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1276
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 msgid "RSET response error"
 msgstr "Erreur réponse RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1299
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 msgid "QUIT response error"
 msgstr "Erreur réponse QUIT"
 
@@ -9186,13 +9326,14 @@ msgid "%.1fG"
 msgstr "%.1fGo"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:150
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
 msgid "attachment"
 msgstr "pièce-jointe"
 
 #: composer/e-msg-composer-attachment-bar.c:506
 msgid "Remove selected items from the attachment list"
-msgstr "Supprimer les éléments sélectionnés de la liste des pièces-jointes"
+msgstr ""
+"Supprimer les éléments sélectionnés de la liste des pièces-jointes"
 
 #: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
@@ -9298,34 +9439,34 @@ msgstr ""
 "Erreur durant la lecture du fichier %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:964
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Avertissement !"
 
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Le fichier existe, l'écraser ?"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:1009
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:1040
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erreur accès au fichier : %s"
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Ne peut récupérer le message de l'éditeur"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9334,7 +9475,7 @@ msgstr ""
 "Ne peut rechercher dans le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1062
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9343,7 +9484,7 @@ msgstr ""
 "Ne peut tronquer le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9352,15 +9493,16 @@ msgstr ""
 "Erreur lors de l'auto-enregistrement du message : %s :\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
-"Evolution a trouvé des fichiers non enregistrés d'une session précédente.\n"
+"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:1331
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9370,23 +9512,23 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: composer/e-msg-composer.c:1338
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Avertissement : Message modifié"
 
-#: composer/e-msg-composer.c:1361
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:1510
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Insérer un fichier"
 
-#: composer/e-msg-composer.c:2046 composer/e-msg-composer.c:2645
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:2662
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9394,7 +9536,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:2685 composer/e-msg-composer.c:2740
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9402,14 +9544,6 @@ msgstr ""
 "Impossible de créer la fenêtre de composition :\n"
 "Ne peut activer le composant « Editeur HTML »."
 
-#: composer/e-msg-composer.c:3465
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
-"<b>"
-msgstr ""
-"<b>(L'éditeur contient un corps de message non textuel, qui ne peut être "
-"édité)<b>"
-
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9470,8 +9604,8 @@ 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:2241
-#: mail/mail-display.c:120
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -9480,11 +9614,11 @@ msgstr ""
 "L'écraser ?"
 
 #. 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 "Se souvenir du mot de passe"
 
-#: 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 "Se souvenir de ce mot de passe pour le reste de cette session"
 
@@ -9614,11 +9748,7 @@ msgstr "heure"
 msgid "minute"
 msgstr "minute"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "seconde"
-
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:183
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "secondes"
 
@@ -9723,7 +9853,7 @@ msgstr ""
 "y délivrer du courrier."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1484 mail/mail-account-gui.c:1498
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Sélectionnez un Dossier"
 
@@ -9736,7 +9866,7 @@ msgstr ""
 "Erreur dans l'expression régulière « %s » :\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:45
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test"
 
@@ -9914,7 +10044,7 @@ msgid "Follow Up"
 msgstr "Donner suite"
 
 #: filter/libfilter-i18n.h:26 mail/mail-config.c:74
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Important"
 
@@ -9970,7 +10100,7 @@ msgstr "Déplacer vers le dossier"
 msgid "Play Sound"
 msgstr "Jouer un son"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Lu"
 
@@ -9991,7 +10121,7 @@ msgstr "Répondu à"
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1546
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Expéditeur"
 
@@ -10056,29 +10186,29 @@ msgstr "Vous devez spécifier au moins un dossier comme source."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importe vos anciens courriers 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 "Importation"
 
-#: 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 "Veuillez attendre"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:687
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importation de %s comme %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:780
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Scrutation de %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:956
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
 #: importers/pine-importer.c:637 mail/component-factory.c:101
 msgid "Mail"
 msgstr "Courrier"
@@ -10107,23 +10237,74 @@ msgstr ""
 "Evolution a trouvé des fichiers GnomeCard.\n"
 "Voulez-vous les importer dans Evolution ?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Priorité : %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 importe vos anciennes données Netscape"
 
-#: importers/netscape-importer.c:886 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Corbeille"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Fichier de courrier local %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Scrutation du répertoire"
 
-#: importers/netscape-importer.c:895
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Début importation :"
 
-#: importers/netscape-importer.c:961
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Réglages"
 
-#: importers/netscape-importer.c:982
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Éditer les Filtres"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10152,69 +10333,84 @@ msgid "Composer Preferences"
 msgstr "Préférences de l'éditeur"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Configuration control for the Evolution Mail Accounts."
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
 msgstr "Contrôle de configuration pour les comptes de courrier d'Evolution."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Contrôle de configuration pour les comptes de courrier d'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
 msgid "Configuration control for the Evolution Mailer."
 msgstr "Contrôle de configuration pour le courrier d'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
 msgid "Configuration control for the Evolution Message Composer."
 msgstr "Contrôle de configuration pour l'éditeur de message d'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Composant Evolution pour le traitement du courrier."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Composeur de messages d'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Composant « Résumé » d'Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Composant d'affichage de dossier courrier."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Usine à composants pour les dossiers de courrier."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Utilitaire composeur de messagerie d'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Utilitaire pour le composant de résumé de messagerie."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12 mail/mail-config.glade.h:71
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Préférences du courrier"
+
+#: 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:13 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
 msgid "Mail Preferences"
 msgstr "Préférences du courrier"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "Interface de configuration de la messagerie"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#, fuzzy
+msgid "This Page can be used to configure the Fonts"
+msgstr "Cette page peut être utilisée pour configurer l'éditeur"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:18
 msgid "This page can be used to configure E-Mail Accounts"
 msgstr ""
 "Cette page peut être utilisée pour configurer ses comptes de courrier "
 "électronique"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19
 msgid "This page can be used to configure Mailer preferences"
 msgstr ""
 "Cette page peut être utilisée pour configurer les préférences du courrier"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
 msgid "This page can be used to configure the Composer"
 msgstr "Cette page peut être utilisée pour configurer l'éditeur"
 
@@ -10247,8 +10443,8 @@ msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
-"Certains de vos règlages de messagerie semblent corrompus, vérifiez que tout "
-"est en ordre."
+"Certains de vos règlages de messagerie semblent corrompus, vérifiez que "
+"tout est en ordre."
 
 #: mail/component-factory.c:925
 msgid "You have not set a mail transport method"
@@ -10293,186 +10489,182 @@ msgstr "Propriétés de « %s »"
 msgid "Properties"
 msgstr "Propriétés"
 
-#: mail/folder-browser.c:300 mail/mail-display.c:332 mail/mail-display.c:841
+#: mail/folder-browser.c:305 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:755
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d nouveaux"
 
-#: mail/folder-browser.c:758 mail/folder-browser.c:766
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d cachés"
 
-#: mail/folder-browser.c:762
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr "%d visibles"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d sélectionnés"
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d non envoyés"
 
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d envoyés"
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d au total"
 
-#: mail/folder-browser.c:1083
+#: mail/folder-browser.c:1088
 msgid "Create _Virtual Folder From Search..."
 msgstr "Créer un dossier _virtuel à partir d'une recherche..."
 
-#: mail/folder-browser.c:1575
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:1576
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xpéditeur"
 
-#: mail/folder-browser.c:1577
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/folder-browser.c:1578
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "Dossier virtuel sur la liste de diffusion"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtre sur l'expéditeur"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filtre sur les destinataires"
 
-#: mail/folder-browser.c:1585 mail/folder-browser.c:1917
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:1603 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Editer comme nouveau  message..."
 
-#: mail/folder-browser.c:1605
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Répondre à l'expéditeur"
 
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
-#: mail/folder-browser.c:1611 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
-#: mail/folder-browser.c:1612
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: mail/folder-browser.c:1616
+#: mail/folder-browser.c:1622
 msgid "Follo_w Up..."
 msgstr "_Donner suite..."
 
-#: mail/folder-browser.c:1617
+#: mail/folder-browser.c:1623
 msgid "Fla_g Completed"
 msgstr "Marquer _Achevé"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1624
 msgid "Cl_ear Flag"
 msgstr "_Effacer les marqueurs"
 
 #. separator here?
-#: mail/folder-browser.c:1622 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1629
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Marquer comme _Important"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1631
 msgid "_Mark as Unimportant"
 msgstr "Marquer comme Non Im_portant"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1636
 msgid "U_ndelete"
 msgstr "_Récupérer"
 
-#: mail/folder-browser.c:1634
+#: mail/folder-browser.c:1640
 msgid "Mo_ve to Folder..."
 msgstr "Déplacer _vers le dossier..."
 
-#: mail/folder-browser.c:1635 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: mail/folder-browser.c:1639
+#: mail/folder-browser.c:1645
 msgid "Label"
 msgstr "Étiquette"
 
-#: mail/folder-browser.c:1643
+#: mail/folder-browser.c:1649
 msgid "Add Sender to Address_book"
 msgstr "Ajouter l'expéditeur au _carnet d'adresses"
 
-#: mail/folder-browser.c:1647
+#: mail/folder-browser.c:1653
 msgid "Appl_y Filters"
 msgstr "Appliquer les _filtres"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1657
 msgid "Crea_te Rule From Message"
 msgstr "Créer une _règle à partir du message"
 
-#: mail/folder-browser.c:1918
+#: mail/folder-browser.c:1936
 msgid "VFolder on M_ailing List"
 msgstr "Dossier virtuel sur la liste de _diffusion"
 
-#: mail/folder-browser.c:1920
+#: mail/folder-browser.c:1938
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtre sur la _liste de diffusion (%s)"
 
-#: mail/folder-browser.c:1921
+#: mail/folder-browser.c:1939
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Dossier virtuel sur la liste de _diffusion (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Défaut"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Récupération des informations dossier"
@@ -10542,25 +10734,26 @@ msgstr "Editeur de News d'Evolution"
 msgid "Evolution Account Editor"
 msgstr "Éditeur de compte d'Evolution"
 
-#: mail/mail-account-gui.c:53 mail/mail-config.glade.h:10
-msgid "Always"
-msgstr "Toujours"
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Hôte :"
 
-#: mail/mail-account-gui.c:54 mail/mail-config.glade.h:144
-msgid "Whenever Possible"
-msgstr "Lorsque c'est possible"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "Nom d'_utilisateur :"
 
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:84
-msgid "Never"
-msgstr "Jamais"
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "_Chemin :"
 
-#: mail/mail-account-gui.c:1063 mail/mail-account-gui.c:1064
-#: mail/mail-account-gui.c:1305 mail/mail-account-gui.c:1310
-#: mail/mail-config.glade.h:102
+#: 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 "Aléatoirement"
 
-#: mail/mail-account-gui.c:1133 mail/mail-account-gui.c:1148
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
@@ -10569,66 +10762,46 @@ msgstr ""
 "dans la section avancée de la configuration\n"
 "des signatures."
 
-#: mail/mail-account-gui.c:1836
+#: mail/mail-account-gui.c:1985
 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:211
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce compte ?"
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "De pas supprimer"
 
-#: mail/mail-accounts.c:218
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Effacer réellement le compte ?"
 
-#: mail/mail-accounts.c:341 mail/mail-accounts.c:375
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
 msgid "Disable"
 msgstr "Désactiver."
 
-#: mail/mail-accounts.c:343 mail/mail-accounts.c:377
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
 msgid "Enable"
 msgstr "Activer"
 
-#: mail/mail-accounts.c:615 mail/mail-accounts.c:619
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
 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:714 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
 msgid "Enabled"
 msgstr "Activé"
 
-#: mail/mail-accounts.c:715 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Nom de Compte"
 
-#: mail/mail-accounts.c:716 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protocole"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Courrier à %s"
-
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Sujet est %s"
-
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Courrier de %s"
-
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "liste de diffusion %s"
-
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Ajouter une Règle de Filtre"
@@ -10700,8 +10873,8 @@ msgid ""
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"Il est possible que le serveur de courrier puisse révèler les destinataires "
-"en ajoutant un en-tête Apparently-To.\n"
+"Il est possible que le serveur de courrier puisse révèler les "
+"destinataires en ajoutant un en-tête Apparently-To.\n"
 "Envoyer quand même ?"
 
 #: mail/mail-callbacks.c:408
@@ -10729,20 +10902,20 @@ msgstr "Un expéditeur inconnu"
 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:1427 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Déplacez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1429 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:2085
+#: mail/mail-callbacks.c:2091
 #, 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:2110
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10750,7 +10923,7 @@ msgstr ""
 "Vous ne pouvez éditer des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:2149
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10758,32 +10931,32 @@ msgstr ""
 "Vous ne pouvez renvoyer des messages que\n"
 "lorsqu'ils sont dans le dossier Envoyés."
 
-#: mail/mail-callbacks.c:2163
+#: mail/mail-callbacks.c:2169
 #, 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:2189
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Aucun message sélectionné"
 
-#: mail/mail-callbacks.c:2234 mail/mail-display.c:116
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Écraser le fichier ?"
 
-#: mail/mail-callbacks.c:2288
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/mail-callbacks.c:2290
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Enregistrer les messages sous..."
 
-#: mail/mail-callbacks.c:2358
+#: mail/mail-callbacks.c:2366
 msgid "Go to next folder with unread messages?"
 msgstr "Aller au dossier suivant conntenant des messages non lus ?"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2373
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -10791,7 +10964,7 @@ msgstr ""
 "Il n'y a plus de nouveau messages dans ce dossier.\n"
 "Voulez-vous aller au dossier suivant ?"
 
-#: mail/mail-callbacks.c:2605
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10803,7 +10976,7 @@ msgstr ""
 "\n"
 "Effacer réellement ces messages ?"
 
-#: mail/mail-callbacks.c:2718
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10812,28 +10985,28 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:2730
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtres"
 
-#: mail/mail-callbacks.c:2773
+#: mail/mail-callbacks.c:2783
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d parmis %d"
 
-#: mail/mail-callbacks.c:2825
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:2852
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2887
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Échec de l'impression du message"
 
-#: mail/mail-callbacks.c:3073 mail/mail-callbacks.c:3113
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -10848,8 +11021,8 @@ msgid ""
 msgstr ""
 "Veuillez saisir votre nom et votre adresse électronique. Les champs « "
 "optionnels » ci-dessous n'ont pas besoin\n"
-"d'être remplis, à moins que vous ne désiriez inclure ces informations dans "
-"les messages que vous envoyez."
+"d'être remplis, à moins que vous ne désiriez inclure ces informations "
+"dans les messages que vous envoyez."
 
 #: mail/mail-config-druid.c:148
 msgid ""
@@ -10858,7 +11031,8 @@ msgid ""
 "administrator or Internet Service Provider."
 msgstr ""
 "Veuillez saisir les informations de votre serveur de courrier entrant.\n"
-"Si vous n'êtes pas sûr, demandez à votre administrateur système ou à votre\n"
+"Si vous n'êtes pas sûr, demandez à votre administrateur système ou à "
+"votre\n"
 "fournisseur d'accès Internet."
 
 #: mail/mail-config-druid.c:150
@@ -10872,7 +11046,8 @@ msgid ""
 "administrator or Internet Service Provider."
 msgstr ""
 "Veuillez saisir les informations nécessaires pour envoyer votre courrier.\n"
-"Si vous n'êtes pas sûr, demandez à votre administrateur système ou à votre\n"
+"Si vous n'êtes pas sûr, demandez à votre administrateur système ou à "
+"votre\n"
 "fournisseur d'accès Internet."
 
 #: mail/mail-config-druid.c:154
@@ -10894,181 +11069,185 @@ msgstr ""
 "Ce nom sera utilisé uniquement dans un but d'affichage."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:145
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
 msgid "Work"
 msgstr "Travail"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:92
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr "Personnel"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:136
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
 msgid "To Do"
 msgstr "À faire"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:69
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr "Plus tard"
 
-#: mail/mail-config.c:630
-#, c-format
-msgid "Account %d"
-msgstr "Compte %d"
-
-#: mail/mail-config.c:2454
+#: 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 ""
-"Impossible de récupérer la boîte de réception pour le nouveau stockage de "
-"courrier :\n"
+"Impossible de récupérer la boîte de réception pour le nouveau stockage "
+"de courrier :\n"
 "%s\n"
 "Aucun racourci ne sera créé."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2465
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s : Boîte de réception"
-
-#: mail/mail-config.c:2715
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Service de vérification"
 
-#: mail/mail-config.c:2793 mail/mail-config.c:2797
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 msgstr "Connexion au serveur"
 
-#: mail/mail-config.c:2995
+#: mail/mail-config.c:2999
 msgid "Unnamed"
 msgstr "Sans nom"
 
-#: mail/mail-config.c:3173
+#: mail/mail-config.c:3177
 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:2
+#: mail/mail-config.glade.h:5
 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:3
+#: mail/mail-config.glade.h:6
 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:4
+#: mail/mail-config.glade.h:7
 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:5
+#: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr "Éditeur de compte"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Information du compte"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gestionnaire de comptes"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:11
 msgid "Advanced Options"
 msgstr "Options avancées"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:12
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: mail/mail-config.glade.h:11
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "Toujours envoyée une copie cachée (_Bcc) à : "
-
-#: mail/mail-config.glade.h:12
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "Toujours envoyer une copie (_Cc) à :"
-
 #: mail/mail-config.glade.h:13
-msgid "Always _encrypt to myself when sending encrypted mail"
+#, 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
-msgid "Always _sign outgoing messages when using this account"
+#, 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:15
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr "Toujours envoyée une copie cachée (_Bcc) à : "
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr "Toujours envoyer une copie (_Cc) à :"
+
+#: mail/mail-config.glade.h:19
 msgid "Arabic"
 msgstr "Arabe"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Joindre le message d'origine"
 
-#: mail/mail-config.glade.h:17 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Pièce-jointe"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Identification"
 
-#: mail/mail-config.glade.h:19
-msgid "Automatically detect links"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
 msgstr "Détecter les liens autmatiquement"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltique (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltique (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:22
-msgid "Beep when new mail arrives"
-msgstr "Émettre un bip lorsque du courrier arrive"
-
-#: mail/mail-config.glade.h:23
-msgid "Character Set:"
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
 msgstr "Jeu de caractères : "
 
-#: mail/mail-config.glade.h:24
-msgid "Checking for New Mail"
-msgstr "Recherche de nouveau courrier"
-
-#: mail/mail-config.glade.h:25
-msgid "Colors"
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
 msgstr "Couleurs"
 
-#: mail/mail-config.glade.h:26
-msgid "Command"
-msgstr "Commande"
+#: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
+msgstr "Recherche de nouveau courrier"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Composer des messages"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Configuration"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11084,359 +11263,335 @@ msgstr ""
 "\n"
 "Cliquez sur « Terminer » pour enregistrer vos nouveaux paramètres."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:37
 msgid "Dari"
 msgstr "Dari"
 
-#: 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:39
 msgid "Default Behavior"
 msgstr "Comportement par defaut"
 
-#: mail/mail-config.glade.h:38
-msgid "Default Forward style:"
-msgstr "Style de transfert par défaut : "
-
-#: mail/mail-config.glade.h:39
-msgid "Default Reply style:"
-msgstr "Style de réponse par défaut : "
-
 #: mail/mail-config.glade.h:40
-msgid "Default character encoding:"
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Jeu de caractères par défaut : "
 
 #: mail/mail-config.glade.h:41
-msgid "Defaults"
-msgstr "Défauts"
-
-#: mail/mail-config.glade.h:42
 msgid "Deleting Mail"
 msgstr "Effacement du courrier"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "IDs numériques..."
 
-#: mail/mail-config.glade.h:45
-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:46
+#: mail/mail-config.glade.h:44
 msgid "Do not quote original message"
 msgstr "Ne pas citer le message d'origine"
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Fait"
 
-#: mail/mail-config.glade.h:48
-msgid "E_mail address:"
-msgstr "_Adresse électronique :"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Dossier des _brouillons : "
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "A_ctiver"
 
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "E_nable advanced options"
+msgstr "Activer les options avancées"
+
+#: mail/mail-config.glade.h:49
+msgid "Emacs"
+msgstr "Emacs"
+
 #: mail/mail-config.glade.h:50
-msgid "Ed_it..."
-msgstr "Éd_iter..."
+msgid "Email Accounts"
+msgstr "Comptes de courrier"
 
 #: mail/mail-config.glade.h:51
-msgid "Edi_t..."
-msgstr "Édi_ter..."
+#, fuzzy
+msgid "Email _address:"
+msgstr "Adresse électronique :"
 
 #: mail/mail-config.glade.h:52
-msgid "Emacs"
-msgstr "Emacs"
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "_Vider les dossiers corbeille en sortant"
 
 #: mail/mail-config.glade.h:53
-msgid "Email Accounts"
-msgstr "Comptes de courrier"
+msgid "Execute Command..."
+msgstr "Exécuter une commande..."
 
 #: mail/mail-config.glade.h:54
-msgid "Enable advanced options"
-msgstr "Activer les options avancées"
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "finit par"
 
 #: mail/mail-config.glade.h:55
-msgid "Execute Command..."
-msgstr "Exécuter une commande..."
+#, fuzzy
+msgid "Font Properties"
+msgstr "Propriétés"
 
 #: mail/mail-config.glade.h:56
-msgid "Forwards and Replies"
-msgstr "Transferts et réponses"
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Messages suivis"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Obtenir un ID numérique..."
 
-#: mail/mail-config.glade.h:59
-msgid "HTML Mail"
-msgstr "Courrier HTML"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "Mettre les citations en _surbrillance avec"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Hulu"
 msgstr "Hulu"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62 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:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "En ligne"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
-msgid "Keyboard Shortcuts"
-msgstr "Raccourcis claviers"
-
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr "Étiquettes et couleurs"
 
-#: mail/mail-config.glade.h:68
-msgid "Language:"
-msgstr "Langue : "
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr "Chargement des images"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Localisation de la boîte à lettres"
 
-#: mail/mail-config.glade.h:75
-msgid "Make this my _default account"
-msgstr "En faire mon compte par défaut"
-
-#: mail/mail-config.glade.h:76
-msgid "Mark messages as read after"
-msgstr "Marquer les messages comme lus après"
-
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:72
 msgid "Message Composer"
 msgstr "Éditeur de messages"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:73
 msgid "Message Display"
 msgstr "Affichage du message"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:74
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:80
-msgid "Misspelled color: "
-msgstr "Couleur de correction : "
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "Serveur NNTP :"
 
-#: mail/mail-config.glade.h:82
-msgid "N_ew..."
-msgstr "_Nouveau..."
-
-#: mail/mail-config.glade.h:83
-msgid "Ne_w..."
-msgstr "Nou_veau..."
-
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Notification du courrier entrant"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:78
 msgid "News Servers"
 msgstr "Serveurs de nouvelles"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Informations optionnelles"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "_Organisation :"
+
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _clé PGP : "
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
-#: mail/mail-config.glade.h:94
-msgid "Play sound file when new mail arrives"
-msgstr "Jouer un fichier son lorsque du courrier arrive"
+#: mail/mail-config.glade.h:88
+#, 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:95
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:96
-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:97
-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:98
-msgid "Prompt 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:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Imprimer les contacts sélectionnés"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Répertoire de courrier Qmail"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Citer le message d'origine"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Cité"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:95
 msgid "Randomized"
 msgstr "Aléatoire"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Se souvenir du mot de passe"
 
-#: mail/mail-config.glade.h:105 shell/glade/evolution-startup-wizard.glade.h:6
-msgid "Receiving Email"
-msgstr "Réception des messages"
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Répondre-à :"
 
-#: mail/mail-config.glade.h:106
-msgid "Receiving Mail"
+#: 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:107
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Options de réception"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Se souvenir du mot de passe"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Informations requises"
 
-#: mail/mail-config.glade.h:109
-msgid "Restore defaults"
-msgstr "Restaurer les valeurs par défaut"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+msgstr "Sécurité"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:104
 msgid "Same as text"
 msgstr "Même chose en texte"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME sécurisé (S/MIME)"
 
-#: mail/mail-config.glade.h:113
-msgid "Security"
-msgstr "Sécurité"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
 msgid "Select PGP program"
 msgstr "Sélectionner un programme PGP"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:111
 msgid "Select a signature file"
 msgstr "Sélectionnez un fichier de signature"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:112
 msgid "Select a signature script"
 msgstr "Sélectionnez un script de signature"
 
-#: mail/mail-config.glade.h:117 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Envoi du message"
 
-#: mail/mail-config.glade.h:118
-msgid "Sending Mail"
-msgstr "Envoi du message"
-
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Dossier des _messages envoyés : "
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Messages envoyés et brouillons"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Le serveur nécessite une identification"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "_Type de serveur : "
 
-#: mail/mail-config.glade.h:125
-msgid "Shortcut"
-msgstr "Raccourci"
-
-#: mail/mail-config.glade.h:126
-msgid "Shortcuts type:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
 msgstr "Types de raccourcis : "
 
-#: mail/mail-config.glade.h:127
-msgid "Show animated images"
-msgstr "Afficher les images animées"
-
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:121
 msgid "Signature"
 msgstr "Signature"
 
-#: mail/mail-config.glade.h:129
-msgid "Signatures"
-msgstr "Signatures"
-
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Source"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Informations de source"
 
-#: mail/mail-config.glade.h:132
-msgid "Specify filename:"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
 msgstr "Spécifiez le nom de fichier : "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:125
 msgid "Spell Checking"
 msgstr "Correction orthographique"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "mbox Unix standard"
 
-#: mail/mail-config.glade.h:135
-msgid "Text _Signature:"
-msgstr "_Signature texte :"
-
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:128
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11444,15 +11599,16 @@ msgstr ""
 "Saisissez le nom par lequel vous voulez désigner ce compte.\n"
 "Par example : « Travail » ou « Personnel »"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:130
 msgid "Use _HTML for this signature"
 msgstr "Utiliser _HTML pour cette signature"
 
-#: mail/mail-config.glade.h:140
-msgid "Use s_ecure connection (SSL):"
-msgstr "Utilisez une connexion _sécurisée (SSL)"
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Variable"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11462,137 +11618,211 @@ msgstr ""
 "\n"
 "Cliquez sur  « Suivant » pour commencer."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:138
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "_Toujours charger les images hors du réseau"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:141
 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:150
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "Type d'authentification : "
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:143
 msgid "_Authentication type: "
 msgstr "Type d'_authentification : "
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "Vérifier automatiquement la présence de nouveaux messages"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:145
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "Émettre un bip lorsque du courrier arrive"
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "ID de Certificat : "
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
 msgid "_Confirm when expunging a folder"
 msgstr "_Confirmer avant le nettoyage du dossier"
 
-#: mail/mail-config.glade.h:156
-msgid "_Drafts folder:"
-msgstr "Dossier des _brouillons : "
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Défauts"
 
-#: mail/mail-config.glade.h:158
-msgid "_Empty trash folders on exit"
-msgstr "_Vider les dossiers corbeille en sortant"
+#: mail/mail-config.glade.h:151
+#, 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:159
+#: mail/mail-config.glade.h:153
 msgid "_Enable spell checking"
 msgstr "_Activer la correction orthographique"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:154
 msgid "_Filename:"
 msgstr "Nom du _fichier :"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Style de transfert par défaut : "
+
+#: mail/mail-config.glade.h:157
 msgid "_Full name:"
 msgstr "_Nom complet :"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "Courrier HTML"
+
+#: mail/mail-config.glade.h:160
 msgid "_HTML Signature:"
 msgstr "Signature _HTML :"
 
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Identité"
+
 #: mail/mail-config.glade.h:163
-msgid "_Highlight quotations with"
-msgstr "Mettre les citations en _surbrillance avec"
+#, fuzzy
+msgid "_Language:"
+msgstr "Langue : "
 
 #: mail/mail-config.glade.h:164
-msgid "_Host:"
-msgstr "_Hôte :"
-
-#: 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:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "En faire mon compte par défaut"
+
 #: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
+msgstr "Marquer les messages comme lus après"
+
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_Ne jamais charger les images hors du réseau"
 
-#: mail/mail-config.glade.h:168
-msgid "_Organization:"
-msgstr "_Organisation :"
-
 #: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "Chemin binaire _PGP"
 
-#: mail/mail-config.glade.h:170
-msgid "_Path:"
-msgstr "_Chemin :"
-
 #: mail/mail-config.glade.h:171
-msgid "_Random"
-msgstr "_Aléatoire"
+#, fuzzy
+msgid "_Play sound file when new mail arrives"
+msgstr "Jouer un fichier son lorsque du courrier arrive"
 
 #: mail/mail-config.glade.h:172
-msgid "_Remember this password"
-msgstr "Se _souvenir du mot de passe"
+#, 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:173
-msgid "_Reply-To:"
-msgstr "_Répondre-À :"
+#, 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:174
-msgid "_Script:"
-msgstr "_Script : "
+msgid "_Random"
+msgstr "_Aléatoire"
 
 #: mail/mail-config.glade.h:175
-msgid "_Send messages in HTML format by default"
-msgstr "_Envoyer par défaut le courrier au format HTML"
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Réception des messages"
 
 #: mail/mail-config.glade.h:176
-msgid "_Server type: "
-msgstr "Type de _serveur : "
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Style de réponse par défaut : "
 
 #: mail/mail-config.glade.h:177
-msgid "_Username:"
-msgstr "Nom d'_utilisateur :"
+#, fuzzy
+msgid "_Restore defaults"
+msgstr "Restaurer les valeurs par défaut"
 
 #: mail/mail-config.glade.h:178
+msgid "_Script:"
+msgstr "_Script : "
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Sécurité"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Envoi du message"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Afficher les images animées"
+
+#: mail/mail-config.glade.h:182
+msgid "_Signatures"
+msgstr "_Signatures"
+
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Text Signature:"
+msgstr "_Signature texte :"
+
+#: mail/mail-config.glade.h:184
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "Utilisez une connexion _sécurisée (SSL)"
+
+#: mail/mail-config.glade.h:185
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Variable"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_toutes les"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:187
 msgid "color"
 msgstr "couleur"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "description"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
@@ -11632,20 +11862,20 @@ msgstr "Ne peut créer un contexte d'enveloppe S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Ne peut créer un contexte de décodage S/MIME."
 
-#: mail/mail-display.c:277
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Enregistrer la pièce-jointe"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:344
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Ne peut créer le fichier temporaire : « %s » : %s"
 
-#: mail/mail-display.c:388
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Enregistrer sur le disque..."
 
-#: mail/mail-display.c:390
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Voir en ligne"
 
@@ -11654,36 +11884,36 @@ msgstr "Voir en ligne"
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
 
-#: mail/mail-display.c:453
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Voir en ligne (via %s)"
 
-#: mail/mail-display.c:457
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Cacher"
 
-#: mail/mail-display.c:478
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Visualiseur externe"
 
-#: mail/mail-display.c:1266
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Chargement contenu de message"
 
-#: mail/mail-display.c:1816
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Ouvrir un lien dans le Navigateur"
 
-#: mail/mail-display.c:1818
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Copier l'emplacement du lien"
 
-#: mail/mail-display.c:1821
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Enregistrer le lien sous (FIXME)"
 
-#: mail/mail-display.c:1824
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Enregistrer l'image sous..."
 
@@ -11728,64 +11958,40 @@ msgstr "Bcc"
 msgid "Mailer"
 msgstr "Logiciel de messagerie"
 
-#: mail/mail-format.c:1706
-msgid "View messages..."
-msgstr "Voir les messages..."
-
-#: mail/mail-format.c:1800
-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:1823
-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:1831
-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:1839
-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:2082
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointeur sur le site FTP (%s)"
 
-#: mail/mail-format.c:2096
+#: mail/mail-format.c:2120
 #, 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:2101
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointeur sur le fichier local (%s)"
 
-#: mail/mail-format.c:2130
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointeur sur des données distantes (%s)"
 
-#: mail/mail-format.c:2138
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointeur sur des données externes inconnues (« %s » type)"
 
-#: mail/mail-format.c:2143
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Partie corps externe malformée"
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Reconfiguration du dossier"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11794,27 +12000,28 @@ 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:763
+#: mail/mail-local.c:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
-msgstr "Impossible d'enregistrer les méta-informations du dossier dans %s : %s"
+msgstr ""
+"Impossible d'enregistrer les méta-informations du dossier dans %s : %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, 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:1280
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Changement du dossier « %s » vers le format « %s »"
 
-#: mail/mail-local.c:1295
+#: mail/mail-local.c:1294
 #, 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:1317
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11822,11 +12029,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:1406
+#: mail/mail-local.c:1405
 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:1415
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigure /%s"
@@ -11853,117 +12060,112 @@ msgstr ""
 msgid "Working"
 msgstr "Travail en cours"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtrage du dossier"
 
-#: mail/mail-ops.c:259
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Rapatriement du courrier"
 
-#: 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 ">Toutefois, le message a été correctement envoyé."
 
-#: mail/mail-ops.c:600
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Expédition de « %s »"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Envoi du message %d du %d"
 
-#: mail/mail-ops.c:739
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Echec sur le message %d parmis %d"
 
-#: mail/mail-ops.c:741 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "Terminé"
 
-#: mail/mail-ops.c:834
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Enregistrement du message dans le dossier"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Déplacement des messages vers %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copie des messages vers %s"
 
-#: mail/mail-ops.c:941
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Déplacement"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Duplication"
 
-#: mail/mail-ops.c:1054
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scrutation des dossiers dans « %s »"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1104 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Corbeille"
-
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Messages suivis"
 
-#: mail/mail-ops.c:1280
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1352
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du stockage %s"
 
-#: mail/mail-ops.c:1421
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Effacement du dossier %s"
 
-#: mail/mail-ops.c:1515
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ecriture du dossier « %s »"
 
-#: mail/mail-ops.c:1566
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Rafraichissement du dossier"
 
-#: mail/mail-ops.c:1602
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Récupération du message %s"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Récupération de %d message(s)"
 
-#: mail/mail-ops.c:1804
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Enregistrement de %d message(s)"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11972,7 +12174,7 @@ msgstr ""
 "Ne peut créer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11981,11 +12183,11 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Enregistrement de la pièce-jointe"
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11994,22 +12196,22 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ne peut écrire les données : %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Déconnexion de %s"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnexion à %s"
 
-#: mail/mail-ops.c:2234
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Exécution de la commande : %s"
@@ -12107,11 +12309,11 @@ msgstr "Saisissez le mot de passe"
 msgid "Could not save signature file: %s"
 msgstr "Ne peut enregistrer le fichier de signature : %s"
 
-#: mail/mail-signature-editor.c:171
+#: mail/mail-signature-editor.c:172
 msgid "Save signature"
 msgstr "Enregistrer la signature"
 
-#: mail/mail-signature-editor.c:177
+#: mail/mail-signature-editor.c:178
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12121,20 +12323,20 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: mail/mail-signature-editor.c:356
+#: mail/mail-signature-editor.c:357
 msgid "Signature name:"
 msgstr "Nom de signature : "
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Message suivi - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Message suivi"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Message suivi"
 
@@ -12161,10 +12363,6 @@ msgstr ""
 "        « %s »\n"
 "Et ont été mis à jour."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "Dossiers virtuels"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "Dossiers virtuels"
@@ -12275,43 +12473,43 @@ msgstr "Reçu"
 msgid "Size"
 msgstr "Taille"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:57
 msgid "Call"
 msgstr "Appel"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:58
 msgid "Do Not Forward"
 msgstr "Ne pas faire suivre"
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:59
 msgid "Follow-Up"
 msgstr "Donner suite"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:60
 msgid "For Your Information"
 msgstr "Pour votre information"
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Faire suivre"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:62
 msgid "No Response Necessary"
 msgstr "Pas de réponse nécessaire"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
 msgid "Reply"
 msgstr "Répondre"
 
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
 msgid "Reply to All"
 msgstr "Répondre à tous"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Revoir"
 
-#: mail/message-tag-followup.c:312
+#: mail/message-tag-followup.c:315
 msgid "Flag to Follow Up"
 msgstr "Marquer à donner suite"
 
@@ -22222,11 +22420,17 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Pas de description"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:151
 msgid "Mail summary"
 msgstr "Résumé de courrier"
 
-#: my-evolution/e-summary-mail.c:398 shell/e-local-storage.c:1021
+#. 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 "Dossiers virtuels"
+
+#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
+#: my-evolution/e-summary-mail.c:761
 msgid "Local Folders"
 msgstr "Dossiers locaux"
 
@@ -22248,15 +22452,15 @@ msgstr "Dictionnary.com du jour"
 msgid "Quotes of the Day"
 msgstr "Citations du jour"
 
-#: my-evolution/e-summary-preferences.c:710
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Ajouter un serveur de news"
 
-#: my-evolution/e-summary-preferences.c:718
+#: my-evolution/e-summary-preferences.c:728
 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:722
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Nom :"
 
@@ -22268,15 +22472,24 @@ msgstr "Erreur lors du téléchargement des données RDF"
 msgid "News Feed"
 msgstr "Serveur de forums"
 
-#: my-evolution/e-summary-shown.c:467
-msgid "Add->"
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
 msgstr "Ajouter ->"
 
-#: my-evolution/e-summary-shown.c:473
-msgid "<-Remove"
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
 msgstr "<- Supprimer"
 
-#: my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Montré"
 
@@ -22320,38 +22533,6 @@ msgstr "Échec de l'impression du résumé"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Le composant « Résumé » n'a pas pu initialiser 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 "noeuds"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "kmh"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "Hp"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "mHp"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "miles"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilomètres"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Ciel clair"
@@ -23596,7 +23777,8 @@ msgstr "Le shell Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
 msgid "This page can be used to configure default folders"
-msgstr "Cette page peut être utilisée pour configurer les dossiers par défaut"
+msgstr ""
+"Cette page peut être utilisée pour configurer les dossiers par défaut"
 
 #: shell/e-activity-handler.c:162
 msgid "Show Details"
@@ -23606,23 +23788,6 @@ msgstr "Afficher les détails"
 msgid "Cancel Operation"
 msgstr "Annuler l'opération"
 
-#: shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Brouillons"
-
-#: shell/e-local-storage.c:174 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
-msgid "Outbox"
-msgstr "Boîte d'expédition"
-
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Envoyé"
-
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Installation d'Evolution"
@@ -23638,8 +23803,8 @@ msgstr ""
 #: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
-"Veuillez cliquez sur « Valider » pour installer les fichiers, ou « Annuler » "
-"pour quitter."
+"Veuillez cliquez sur « Valider » pour installer les fichiers, ou « "
+"Annuler » pour quitter."
 
 #: shell/e-setup.c:171
 msgid "Could not update files correctly"
@@ -24044,52 +24209,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:170
+#: shell/e-shell-view-menu.c:168
 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:178
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut être exécuté."
 
-#: shell/e-shell-view-menu.c:220
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "À propos de Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:446
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Aller au dossier..."
 
-#: shell/e-shell-view-menu.c:447
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Sélectionnez le dossier que vous voulez ouvrir"
 
-#: shell/e-shell-view-menu.c:567
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Créer un nouveau raccourci"
 
-#: shell/e-shell-view-menu.c:568
+#: shell/e-shell-view-menu.c:566
 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:619
-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."
-
-#: shell/e-shell-view-menu.c:627
-#, c-format
-msgid "Error executing %s."
-msgstr "Erreur à l'exécution de %s"
-
-#: shell/e-shell-view-menu.c:742
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "Travail _En ligne"
 
-#: shell/e-shell-view-menu.c:755 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Travail _Hors ligne"
 
-#: shell/e-shell-view-menu.c:768 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Travail _Hors ligne"
 
@@ -24097,34 +24253,34 @@ msgstr "Travail _Hors ligne"
 msgid "(No folder displayed)"
 msgstr "(Aucun dossier affiché)"
 
-#: 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 "(Aucun)"
 
-#: 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 Evolution est en ligne. Cliquez sur ce bouton pour travailler hors "
 "ligne."
 
-#: shell/e-shell-view.c:1858
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evloution va travailler hors ligne."
 
-#: 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 Evolution est hors ligne. Cliquez sur ce bouton pour travailler en "
 "ligne."
 
-#: shell/e-shell.c:165
+#: shell/e-shell.c:169
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24135,12 +24291,12 @@ msgstr ""
 "L'erreur du système d'activation est :\n"
 "%s"
 
-#: shell/e-shell.c:758
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne peut paramétrer le stockage local -- %s"
 
-#: shell/e-shell.c:1825
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24151,19 +24307,23 @@ msgstr ""
 "terminé de manière inattendue. Vous devrez relancer Evolution pour voir\n"
 "ces données à nouveau."
 
-#: shell/e-shell.c:2088
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Arguments invalides"
 
-#: shell/e-shell.c:2090
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Impossible enregistrer dans OAF"
 
-#: shell/e-shell.c:2092
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Base de données de configuration non trouvée"
 
-#: shell/e-shell.c:2094 shell/e-storage.c:487
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Erreur générique"
 
@@ -24288,14 +24448,9 @@ msgstr "Erreur lors de l'enregistrement des raccourcis."
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: shell/e-storage-set-view.c:650
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Impossible de transférer le dossier :\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Boîte de réception"
 
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
@@ -24359,7 +24514,6 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fait)"
 
@@ -24463,7 +24617,7 @@ msgstr "Pas de place restante"
 msgid "Old owner has died"
 msgstr "L'ancien propriétaire s'est terminé"
 
-#: shell/evolution-test-component.c:45
+#: shell/evolution-test-component.c:47
 msgid "Test type"
 msgstr "Type de test"
 
@@ -24994,6 +25148,10 @@ msgstr "Planifier une réunion pour cet élément"
 msgid "Customise My Evolution"
 msgstr "Adapter - Evolution"
 
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Annuler"
+
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Annuler l'opération courante du courrier"
@@ -25119,7 +25277,8 @@ msgstr "Inverser la sélection des messages"
 #: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
-"Sélectionner tous les messages dans le même Fil que le message sélectionné"
+"Sélectionner tous les messages dans le même Fil que le message "
+"sélectionné"
 
 #: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
@@ -25312,7 +25471,8 @@ msgstr "Transférer le message sélectionné à un correspondant"
 #: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
-"Transférer le message sélectionné à un correspondant en tant qu'attachement"
+"Transférer le message sélectionné à un correspondant en tant "
+"qu'attachement"
 
 #: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
@@ -25606,6 +25766,10 @@ msgstr "Insère un fichier comme texte dans le message"
 msgid "Insert text file..."
 msgstr "Insérer un fichier texte..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Ouvrir"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Ouvrir un fichier"
@@ -25745,10 +25909,6 @@ msgstr "_Ouvrir..."
 msgid "_Reply-To Field"
 msgstr "Champ _Répondre À"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Sécurité"
-
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "A_ide"
@@ -26077,8 +26237,8 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"Utilisez le bouton gauche de la souris pour zoomer une région de la carte et "
-"sélectionner un fuseau horaire.\n"
+"Utilisez le bouton gauche de la souris pour zoomer une région de la carte "
+"et sélectionner un fuseau horaire.\n"
 "Utilisez le bouton droit de la souris pour réduire."
 
 #: widgets/menus/gal-view-menus.c:268
@@ -26215,18 +26375,14 @@ 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:97
 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:98
 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-messagebox.c:152
 msgid "Information"
 msgstr "Information"
@@ -26286,6 +26442,520 @@ msgstr "init_corba() : Ne peut initialiser GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 
+#~ msgid "Edit Addressbook"
+#~ msgstr "Éditer le carnet d'adresses"
+
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "S'_identifier sur le serveur en utilisant : "
+
+#~ msgid "Account Name"
+#~ msgstr "Nom du compte"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Ajouter un carnet d'adresses"
+
+#~ msgid "Advanced"
+#~ msgstr "Avancée"
+
+#~ msgid "Base"
+#~ msgstr "Base"
+
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Cochez ici si le serveur nécessite une identification."
+
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
+#~ "server"
+#~ msgstr ""
+#~ "Evolution utilisera le Nom Distinctif (DN) pour vous authentifier sur le "
+#~ "serveur"
+
+#~ msgid "Server Name"
+#~ msgstr "Nom du serveur"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr ""
+#~ "Les renseignements ci-dessous sont demandés pour ajouter un carnet "
+#~ "d'adresses"
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr ""
+#~ "Ces renseignements ne sont demandés par la plupart des serveurs 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 ""
+#~ "Ces renseignements sont utilisés par votre serveur KDAP pour préciser les "
+#~ "noeuds utilisés dans une recherche. Contactez votre administrateur de "
+#~ "serveur pour plus de renseignements."
+
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact your "
+#~ "server administrator for more information."
+#~ msgstr ""
+#~ "Noeud de base pour toutes vos recherches sur le serveur LDAP. Contactez "
+#~ "votre administrateur de serveur pour plus d'informations."
+
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Nom du serveur où votre carnet d'adresses est situé."
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "C'est le port que votre serveur LDAP utilise."
+
+#~ msgid "_Account name:"
+#~ msgstr "Nom du _Compte"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Autres contacts"
+
+#~ msgid "(none)"
+#~ msgstr "(Inconnu)"
+
+#~ msgid "C_ontaining:"
+#~ msgstr "C_ontenant :"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Afficher les contacts satisfaisant aux critères suivants :"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Êtes-vous sûr de vouloir \n"
+#~ "supprimer ce contact ?"
+
+#~ msgid "Starting:"
+#~ msgstr "Débute : "
+
+#~ msgid "Ending:"
+#~ msgstr "Fini : "
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Créer un nouveau rendez-vous avec un _rappel par défaut"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "_Premier jour de la semaine :"
+
+#~ msgid "_Other"
+#~ msgstr "_Autre"
+
+#~ msgid "Click here to add an attendee"
+#~ msgstr "Cliquez ici pour ajouter un participant"
+
+#~ 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 "Meeting begins: <b>"
+#~ msgstr "La réunion commence : <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "La tâche commence : <b>"
+
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "L'information Libre/Occupé commence : <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Débute : <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "La réunion se termine : <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "l'information Libre/Occupé se termine : <b>"
+
+#~ msgid "Ends: <b>"
+#~ msgstr "Finit : <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Tâche achevée : <b>"
+
+#~ msgid "Task Due: <b>"
+#~ msgstr "Tâche escomptée : "
+
+#~ msgid "iCalendar Information"
+#~ msgstr "Information iCalendar"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "Erreur iCalendar"
+
+#~ msgid "An unknown person"
+#~ msgstr "Une personne inconnue"
+
+#~ msgid ""
+#~ "<br> Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr ""
+#~ "<br> Veuillez vérifier les information suivantes puis sélectionner une "
+#~ "action\n"
+#~ "du menu ci-dessous."
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Aucun</i>"
+
+#~ msgid "Status:"
+#~ msgstr "État :"
+
+#~ msgid "Tentatively Accepted"
+#~ msgstr "Accepté pour voir"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Sélectionner une action :"
+
+#~ msgid "Update"
+#~ msgstr "Mise à jour"
+
+#~ msgid "Accept"
+#~ msgstr "Accepter"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Accepter pour voir"
+
+#~ msgid "Decline"
+#~ msgstr "Refuser"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Envoyer l'information Libre-Occupé"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Mettre à jour le status de l'interlocuteur"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Envoyer les dernières informations"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> a publié les informations de la réunion"
+
+#~ msgid "Meeting Information"
+#~ msgstr "Informations de la réunion"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> demande votre présence à cette réunion."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Proposition de réunion"
+
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ msgstr "<b>%s</b> espère être intégré à une réunion existante."
+
+#~ msgid "Meeting Update"
+#~ msgstr "Mise à jour de la réunion"
+
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ msgstr ""
+#~ "<b>%s</b> espère recevoir les informations de la dernière réunion."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Demande de mise à jour de la réunion"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b> a répondu à une demande de réunion"
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Réponse à une réunion"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> a annulé une réunion."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Annulation de réunion"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> a envoyé un message incompréhensible."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Mauvais message de réunion"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> a publié les informations de la tâche."
+
+#~ msgid "Task Information"
+#~ msgstr "Informations de la tâche"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> demande que vous exécutiez une tâche."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Tâche proposée"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> espère être intégré à une tâche existante."
+
+#~ msgid "Task Update"
+#~ msgstr "Mise à jour de tâche"
+
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "<b>%s</b> espère recevoir les informationss de la dernière tâche"
+
+#~ msgid "Task Update Request"
+#~ msgstr "Demande de mise à jour de tâche"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b> a répondu à une assignation de tâche."
+
+#~ msgid "Task Reply"
+#~ msgstr "Répondre à la tâche"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> a annulé une tâche."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Annulation de tâche"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Mauvais message de tâche"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> a publié une information Libre-Occupé"
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Information Libre-Occupé"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> demande votre information Libre/Occupé"
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Demande Libre-Occupé"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "<b>%s</b> a répondu à une demande Libre/Occupé"
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Réponse Libre-Occupé"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Mauvais message Libre-Occupé"
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Le message ne semble pas être correctement rempli"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Le message ne contient que des requêtes non-supportées."
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ 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"
+
+#~ msgid "Event information"
+#~ msgstr "Information évenement"
+
+#~ msgid "Task information"
+#~ msgstr "Informations de la tâche"
+
+#~ msgid "Journal information"
+#~ msgstr "Informations du journal"
+
+#~ msgid "Free/Busy information"
+#~ msgstr "Information Libre-Occupé"
+
+#~ msgid "Calendar information"
+#~ msgstr "Information calendrier"
+
+#~ msgid "Updated"
+#~ msgstr "Mis à jour"
+
+#~ msgid "Refresh"
+#~ msgstr "Rafraîchir"
+
+#~ msgid "Counter-proposal"
+#~ msgstr "Contre-proposition"
+
+#~ msgid "Task"
+#~ msgstr "Tâche"
+
+#~ msgid "Status: %s"
+#~ msgstr "État : %s"
+
+#~ msgid "Percent Complete: %i"
+#~ msgstr "Pourcentage terminé : %i"
+
+#~ msgid "URL: %s"
+#~ msgstr "URL : %s"
+
+#~ msgid "Categories: %s"
+#~ msgstr "Catégories : %s"
+
+#~ msgid "Contacts: "
+#~ msgstr "Contacts :"
+
+#~ msgid "Reminder!!"
+#~ msgstr "Rappel !!"
+
+#~ msgid ""
+#~ "<b>(The composer contains a non-text message body, which cannot be "
+#~ "editted.)<b>"
+#~ msgstr ""
+#~ "<b>(L'éditeur contient un corps de message non textuel, qui ne peut être "
+#~ "édité)<b>"
+
+#~ msgid "Default"
+#~ msgstr "Défaut"
+
+#~ msgid "Mail to %s"
+#~ msgstr "Courrier à %s"
+
+#~ msgid "Subject is %s"
+#~ msgstr "Sujet est %s"
+
+#~ msgid "Mail from %s"
+#~ msgstr "Courrier de %s"
+
+#~ msgid "%s mailing list"
+#~ msgstr "liste de diffusion %s"
+
+#~ msgid "%s: Inbox"
+#~ msgstr "%s : Boîte de réception"
+
+#~ msgid "Always _encrypt to myself when sending encrypted mail"
+#~ msgstr "Toujours crypter pour moi lors de l'envoi de courrier crypté"
+
+#~ msgid "Command"
+#~ msgstr "Commande"
+
+#~ msgid "E_mail address:"
+#~ msgstr "_Adresse électronique :"
+
+#~ msgid "Ed_it..."
+#~ msgstr "Éd_iter..."
+
+#~ msgid "Edi_t..."
+#~ msgstr "Édi_ter..."
+
+#~ msgid "Forwards and Replies"
+#~ msgstr "Transferts et réponses"
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Raccourcis claviers"
+
+#~ msgid "Misspelled color: "
+#~ msgstr "Couleur de correction : "
+
+#~ msgid "N_ew..."
+#~ msgstr "_Nouveau..."
+
+#~ msgid "Ne_w..."
+#~ msgstr "Nou_veau..."
+
+#~ msgid "Shortcut"
+#~ msgstr "Raccourci"
+
+#~ msgid "Signatures"
+#~ msgstr "Signatures"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organisation :"
+
+#~ msgid "_Remember this password"
+#~ msgstr "Se _souvenir du mot de passe"
+
+#~ msgid "_Reply-To:"
+#~ msgstr "_Répondre-À :"
+
+#~ msgid "_Send messages in HTML format by default"
+#~ msgstr "_Envoyer par défaut le courrier au format HTML"
+
+#~ msgid "_Server type: "
+#~ msgstr "Type de _serveur : "
+
+#~ msgid "View messages..."
+#~ msgstr "Voir les messages..."
+
+#~ 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."
+
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr ""
+#~ "Evolution ne reconnait pas ce type de message signé numériquement."
+
+#~ 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."
+
+#~ 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."
+
+#~ msgid " F"
+#~ msgstr " F"
+
+#~ msgid " C"
+#~ msgstr " C"
+
+#~ msgid "knots"
+#~ msgstr "noeuds"
+
+#~ msgid "kph"
+#~ msgstr "kmh"
+
+#~ msgid "inHg"
+#~ msgstr "Hp"
+
+#~ msgid "mmHg"
+#~ msgstr "mHp"
+
+#~ msgid "miles"
+#~ msgstr "miles"
+
+#~ msgid "kilometers"
+#~ msgstr "kilomètres"
+
+#~ msgid "Drafts"
+#~ msgstr "Brouillons"
+
+#~ msgid "Outbox"
+#~ msgstr "Boîte d'expédition"
+
+#~ msgid "Sent"
+#~ msgstr "Envoyé"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossible de transférer le dossier :\n"
+#~ "%s"
+
+#~ msgid "_Advanced Search..."
+#~ msgstr "Recherche _avancée..."
+
 #~ msgid "Baltic (IS0-8859-13)"
 #~ msgstr "Baltique (IS0-8859-13)"
 
@@ -26406,9 +27076,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "Envoyer par défaut le courrier au format HTML"
 
-#~ msgid "_Signatures"
-#~ msgstr "_Signatures"
-
 #~ msgid "placeholder"
 #~ msgstr "bouche-trou"
 
@@ -26576,9 +27243,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "Server rejected username"
 #~ msgstr "Le serveur a rejeté le nom d'utilisateur"
 
-#~ msgid "Failed to send username to server"
-#~ msgstr "Échec d'envoi du nom d'utilisateur au serveur"
-
 #~ msgid "Server rejected username/password"
 #~ msgstr "Le serveur a rejeté le nom d'utilisateur/mot de passe"
 
diff --git a/po/ga.po b/po/ga.po
index b3b8fae497..fc98615fc0 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-02-11 05:38+0100\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -35,6 +35,7 @@ msgid "File As"
 msgstr "S�bh�il Mar"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ainm"
 
@@ -156,7 +157,6 @@ msgstr "ISDN"
 #: 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
 msgid "Other"
 msgstr "Eile"
 
@@ -319,11 +319,11 @@ msgstr "Ainm Chlainn"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard do %s"
@@ -336,59 +336,56 @@ 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:62
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: 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:2732
 msgid "Searching..."
 msgstr "Ag Cuardaigh..."
 
-#: addressbook/backend/pas/pas-backend-file.c:262
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Ag L��d��il..."
 
 #. 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:486
-msgid "Connecting to LDAP server..."
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:496
-msgid "Unable to connect to LDAP server."
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:512
-msgid "Waiting for connection to LDAP server..."
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:915
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1016
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2217
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2222
-msgid "Restarting search."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+msgid "Error performing search"
 msgstr ""
 
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Te�p ag fork: %s"
+
 #: addressbook/conduit/address-conduit.c:293
 #, fuzzy
 msgid "Default Sync Address:"
@@ -428,388 +425,826 @@ msgid "A Bonobo control for displaying an address."
 msgstr ""
 
 #: 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 ""
 
 #: 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
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 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:12
 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:13
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Tadhalla�"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "Freastala� LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:527
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:562
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Tadhall"
 
-#: addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "L��osta Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Contact _List"
 msgstr "Liost Tadhall"
 
-#: addressbook/gui/component/addressbook-config.c:223
-msgid "Edit Addressbook"
-msgstr "Eagar Leabhar Sheoladh"
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+msgid "Could not initialize gnome-vfs"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: 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 ""
+
+#: 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"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Pasfhocal do %s, le do thoil (�s�ideoir %s)"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook.c:769
+msgid "Name begins with"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:770
 #, fuzzy
-msgid "100"
+msgid "Email is"
+msgstr "Rphost 2"
+
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr ""
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: 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
+msgid "Advanced..."
+msgstr ""
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
+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
+msgid "Primary Email"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:587
+msgid "Select an Action"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:593
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:891
+msgid "Querying Addressbook..."
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+msgid "Add to Contacts"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:1046
+msgid "Merge E-Mail Address"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:364
+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
+#, fuzzy
+msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "A_uthenticate with server using:"
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Suim Leabhar Seoladh"
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
+# ##
+# ## Languages (ISO 639 code in brackets)
+# ## 	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
+#, fuzzy
+msgid "Always"
+msgstr "Af�iris"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Gan anim"
+
+#: 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/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "B��n"
+#: 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/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Gn�th"
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Connecting"
+msgstr "_Tadhall"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "DN Customization"
+msgstr "Gan Eolas"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "De_lete"
 msgstr "_Dealaigh"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
+#: addressbook/gui/component/ldap-config.glade.h:27
+msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
-msgid "Email address"
-msgstr "Seoladh Rpost:"
+msgid "Email Address:"
+msgstr "_Seoladh RPost:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Alairm 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/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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr "Aon"
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "Cuardaigh:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Gn�th"
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "LDAP Attribute"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Ainm do Fhreastala�"
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Socr�"
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
+# CH
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+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
+#, fuzzy
+msgid "Never"
+msgstr "_gach"
+
+#: 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/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
+#: addressbook/gui/component/ldap-config.glade.h:41
+msgid "Objectclasses"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
+#: addressbook/gui/component/ldap-config.glade.h:42
+msgid "Objectclasses Used in Evolution:"
 msgstr ""
 
-#: 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/ldap-config.glade.h:43
+msgid "Objectclasses Used on Server:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:44
+msgid "One"
+msgstr "Aon"
+
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"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 "Gn�th"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Gn�th"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#. 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 "Cuardaigh"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "T�g Gach Rud"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Scr�oste"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid ""
-"This is the maximum number of cards to download.  Setting this number too "
-"large will slow down this addressbook."
+"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/addressbook-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:55
 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."
+"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/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
+#: 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/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
+#: 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/addressbook-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"Specifying a display name is the last required step in configuring an LDAP "
+"server."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "Ainm _Chuntas:"
+#: addressbook/gui/component/ldap-config.glade.h:65
+#, fuzzy
+msgid "Step 1: Server Information"
+msgstr "Eolas"
 
-#: 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
-msgid "_Add"
-msgstr "_Suimigh"
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Cumraigh do %s"
 
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
+#: addressbook/gui/component/ldap-config.glade.h:67
+msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid "Step 4: Display Name"
 msgstr ""
 
-#: 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:41
-#: 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 "_Eagar"
+#: addressbook/gui/component/ldap-config.glade.h:69
+msgid "Sub"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:110
-#, fuzzy
-msgid "_Email address:"
-msgstr "_Seoladh RPost:"
+#: addressbook/gui/component/ldap-config.glade.h:70
+msgid "Supported Search Bases"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Poirt:"
+#: 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/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "Ainm _Freastala�:"
+#: 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/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-msgid "Could not initialize gnome-vfs"
+#: 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/addressbook-storage.c:168
-msgid "Other Contacts"
-msgstr "Tadhalla� Eile"
+#: 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/addressbook.c:499
-msgid "Unable to open addressbook"
+#: 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/addressbook.c:508
+#: addressbook/gui/component/ldap-config.glade.h:87
 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"
+"This is the full name of your ldap server. For example, "
+"\"ldap.mycompany.com\"."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:513
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+"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.c:521
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+"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/addressbook.c:655
-#: addressbook/gui/component/addressbook.c:658
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Pasfhocal do %s, le do thoil (�s�ideoir %s)"
+#: addressbook/gui/component/ldap-config.glade.h:91
+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/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
+#: 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/addressbook.c:837
-msgid "Name contains"
+#: addressbook/gui/component/ldap-config.glade.h:96
+msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
+#: 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/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:59
-msgid "Category is"
+#: addressbook/gui/component/ldap-config.glade.h:100
+msgid "U_se SSL/TLS:"
 msgstr ""
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
+#: addressbook/gui/component/ldap-config.glade.h:101
+msgid "Using distinguished name (DN)"
 msgstr ""
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1067
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+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
+msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1150
-msgid "The URI that the Folder Browser will display"
+#: 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:139
+msgid "_Add"
+msgstr "_Suimigh"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Suimigh"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+msgid "_Add Mapping"
 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/ldap-config.glade.h:107
+msgid "_Add to DN"
+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
-msgid "Primary Email"
+# ##
+# ## Languages (ISO 639 code in brackets)
+# ## 	The 'msgid' names and spellings for languages are those listed
+# ##     in iso-639.def from glibc
+# aa 
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Af�iris"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Dealaigh gach rud"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Taispea�n"
+
+#: addressbook/gui/component/ldap-config.glade.h:111
+msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:587
-msgid "Select an Action"
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, c-format
-msgid "Create a new contact \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
+#: 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
+#: 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 "_Eagar"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "Eagar coinne"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Alairm Evolution"
+
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:891
-msgid "Querying Addressbook..."
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-msgid "Add to Contacts"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1046
-msgid "Merge E-Mail Address"
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Roghanna"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Poirt:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Gn�th"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "C_uardaigh..."
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "Ainm _Freastala�:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Cuntas %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+msgid "account-editor"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Gan carta�"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Cumraigh do %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 "Gn�th"
+
+#: 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 "Cuardaigh"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr ""
@@ -819,9 +1254,9 @@ msgid "Factory for the Addressbook's name selection interface"
 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
+#: 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
 msgid "Remove"
 msgstr "Scr�os"
 
@@ -850,7 +1285,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:581
+#: addressbook/gui/component/select-names/e-select-names.c:600
+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"
@@ -860,7 +1299,7 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: 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"
@@ -868,32 +1307,41 @@ msgid ""
 "correct this problem."
 msgstr ""
 
-#: 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 "T�g Tadhalla� o Leabhar Seoladh"
 
+# FIXME SP?
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr ""
+msgid "Select Names"
+msgstr "T�g Ainmh�:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr ""
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Dealaigh Tadhall?"
 
-# FIXME SP?
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "T�g Ainmh�:"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Tadhalla�"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
+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 "_Bog..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Saghas:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Filltea�n:"
 
@@ -960,10 +1408,6 @@ msgstr "S�bh�il _Mar:"
 msgid "Full _Name..."
 msgstr "Ainm _Fhada..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Gn�th"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1007,10 +1451,11 @@ msgstr ""
 
 #: 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:1489 mail/mail-config.glade.h:107
-#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "_Dealaigh"
 
@@ -2509,7 +2954,7 @@ msgid ""
 msgstr ""
 
 #: 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 ""
 
@@ -2518,174 +2963,115 @@ msgstr ""
 msgid "Search"
 msgstr "Cuardaigh"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 card"
 
 # FIXME : Grammar ? 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d carta�"
 
-#: 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:915
-#: addressbook/gui/widgets/e-addressbook-view.c:1015
-#: addressbook/gui/widgets/e-addressbook-view.c:1635
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr "S�bh�il mar VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Osc�il"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
-#: addressbook/gui/widgets/e-addressbook-view.c:1016
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
-#: addressbook/gui/widgets/e-addressbook-view.c:1017
-msgid "Send Message to Contact"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+msgid "Error getting book view"
 msgstr ""
 
-# fa 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
-#: addressbook/gui/widgets/e-addressbook-view.c:1018
-#: 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:64
-#: ui/my-evolution.xml.h:2
-msgid "Print"
-msgstr "Priont�il"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
-#: addressbook/gui/widgets/e-addressbook-view.c:1020
-msgid "Print Envelope"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
-#: addressbook/gui/widgets/e-addressbook-view.c:1022
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
-msgid "Cut"
-msgstr "Gearr"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
-#: addressbook/gui/widgets/e-addressbook-view.c:1023
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:7
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "C�ip"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
-#: addressbook/gui/widgets/e-addressbook-view.c:1024
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
-msgid "Paste"
-msgstr "Greamaigh"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:1025 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:19
-msgid "Delete"
-msgstr "Dealaigh"
-
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: 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:1020
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: shell/evolution-shell-component.c:1043
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: 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:1895
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: 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
 msgid "Unknown error"
 msgstr "iEarraidh gan Aithne"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr ""
 
-#: 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:1071
 msgid "Permission denied"
 msgstr ""
 
-#: 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 ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr ""
 
-#: 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/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
 msgid "Cancelled"
 msgstr "Ceangailte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Earraidh Eile"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1433
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:202
+#: addressbook/gui/widgets/e-addressbook-util.c:204
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Taispea�n"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:203
+#: addressbook/gui/widgets/e-addressbook-util.c:205
 #, fuzzy
 msgid "Display Cards"
 msgstr "Taispea�n"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2693,6 +3079,26 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Gan carta�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Gan carta�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Gan carta�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Gan carta�"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr ""
@@ -2753,10 +3159,113 @@ 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "S�bh�il mar VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Tadhall Nua"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "L��osta Tadhall Nua"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_C�ip do Fillte�n..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "Chl�_fhoireann..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Post sce�l do Tadhall..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Leabhar Seoladh..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Albachta� Phoist"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr ""
+
+# fa 
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "_C�ip do Fillte�n..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "S�bh�il 'san _fillte�n"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Gearr"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "Radharc Carta"
+
+#. 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:585
+#: addressbook/gui/widgets/e-addressbook-view.c:940
 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"
 
@@ -2764,7 +3273,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:590
+#: addressbook/gui/widgets/e-addressbook-view.c:945
 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"
 
@@ -2781,15 +3290,22 @@ msgstr "agus aon card eile."
 msgid "Save in addressbook"
 msgstr ""
 
-#: 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 "Radharc Carta"
@@ -2877,6 +3393,7 @@ msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr ""
 
@@ -2901,6 +3418,7 @@ msgid "Options"
 msgstr "Roghanna"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Treoshu�omh"
 
@@ -2921,7 +3439,9 @@ msgstr "P�ip�ir"
 msgid "Paper source:"
 msgstr ""
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Portr�id"
 
@@ -2981,29 +3501,25 @@ msgstr "Chl�_fhoireann..."
 msgid "Untitled appointment"
 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:635
+#: 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
 msgid "High"
 msgstr "Ard"
 
-#: 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:634
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Gn�th"
 
-#: 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:633
+#: 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
 msgid "Low"
 msgstr "Bun"
 
 #. 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
 msgid "Undefined"
 msgstr ""
 
@@ -3036,41 +3552,54 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Teachtaireacht Feilire"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+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:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 ""
@@ -3079,22 +3608,10 @@ 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 "am neamhbhail�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-msgid "Evolution Alarm"
-msgstr "Alairm Evolution"
-
 # ##
 # ## Languages (ISO 639 code in brackets)
 # ## 	The 'msgid' names and spellings for languages are those listed
@@ -3135,7 +3652,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2401
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Rabhadh"
@@ -3155,7 +3672,7 @@ msgstr ""
 msgid "Do not ask me about this program again."
 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:58
 msgid "Could not initialize GNOME"
 msgstr "T�ip ag tosnaithe GNOME"
 
@@ -3167,67 +3684,65 @@ msgstr ""
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: 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:51
 msgid "Description contains"
 msgstr ""
 
-#: 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:1117
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%A, %e %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 "aa %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: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:834
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:385
 msgid "Private"
 msgstr "Priobhdach"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr ""
 
@@ -3248,32 +3763,27 @@ msgid "W"
 msgstr "I"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
 msgid "Free"
 msgstr "Saor"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:479 calendar/gui/print.c:2246
 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:480 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Cr�ochnaithe"
 
@@ -3286,9 +3796,10 @@ 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/mail-account-gui.c:1497
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:404
-#: mail/mail-config.glade.h:56
+#: 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
 #: 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
@@ -3303,23 +3814,15 @@ msgstr ""
 msgid "Assigned"
 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:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
 msgid "Yes"
 msgstr "T�"
 
-#: 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:310
 msgid "No"
 msgstr "N�l"
 
-#. 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 "Cuardaigh"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Radharc L�"
@@ -3336,60 +3839,80 @@ msgstr "Radharc Seachtain"
 msgid "Month View"
 msgstr "Radharc M�"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Feilire"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr ""
 
 # tg
-#: calendar/gui/component-factory.c:69 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Teascanna"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:653
-#, fuzzy
-msgid "New appointment"
-msgstr "Coinne Nua"
-
-#: calendar/gui/component-factory.c:654
-#, fuzzy
-msgid "_Appointment"
-msgstr "Coinne"
-
-#: calendar/gui/component-factory.c:659
+#: calendar/gui/component-factory.c:695
 #, fuzzy
 msgid "New meeting"
 msgstr "Bealach Nuacht�in"
 
-#: calendar/gui/component-factory.c:660
+#: calendar/gui/component-factory.c:695
 #, fuzzy
 msgid "_Meeting"
 msgstr "�lbachta�"
 
-#: calendar/gui/component-factory.c:665
+#: calendar/gui/component-factory.c:699
 #, fuzzy
 msgid "New task"
 msgstr "Teasc Nua"
 
-#: calendar/gui/component-factory.c:666 ui/evolution-tasks.xml.h:22
+#: calendar/gui/component-factory.c:699
 msgid "_Task"
 msgstr "_Teasc"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Coinne Nua"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Coinne"
+
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Coinne Nua"
+
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "Coinne"
+
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Te�p ag fork: %s"
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr ""
 
+#: 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 ""
@@ -3453,9 +3976,7 @@ msgstr ""
 msgid "hours"
 msgstr "uair"
 
-#: 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 "noimea�d"
 
@@ -3584,7 +4105,7 @@ msgstr ""
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "Coimri�:"
 
@@ -3613,7 +4134,7 @@ msgstr "deireadh an coinne"
 msgid "hour(s)"
 msgstr "uair"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "noimea(i)d"
 
@@ -3654,170 +4175,165 @@ msgid "Color for tasks due today"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Lae"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Aoine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Uair"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Noimea�d"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Luain"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Sathairn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Sta_rt of day:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domhnaigh"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "T_asks due today:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "D_ea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "_Mai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "L�osta _Teasc"
 
-#: 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 "Deardaoin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Am"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Am _Cr�os:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr ""
-
-#: 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: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 "Mairt"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Ce�daoin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Seachtain Oibre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 uair (IN/RN)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 uair"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Taispea�n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Aoi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Lua"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Eile"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "_Overdue tasks:"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_Sat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "L�osta _Teasc"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "_Show appointment end times in week and month views"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Guth�n sa Baile"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Cea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr ""
 
@@ -3881,71 +4397,60 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: 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:2212
 msgid " (Completed "
 msgstr " (Cr�ochnaithe "
 
-#: 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 "Cr�ochnaithe "
 
-#: 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:2221
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:321
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Teasc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Gan coimri�"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2201
-#: mail/mail-display.c:101
-msgid "Overwrite file?"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2208
-#: mail/mail-display.c:105
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: 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 "S�bh�il le..."
+#: 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
+msgid "Save as..."
+msgstr "S�nbh�il le..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4003,7 +4508,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Coinne"
 
@@ -4017,13 +4522,13 @@ msgstr ""
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 msgid "Scheduling"
 msgstr ""
 
 #: calendar/gui/dialogs/event-editor.c:207
 #: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr ""
 
@@ -4140,7 +4645,6 @@ msgid "Member"
 msgstr "Ball"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-itip-control.c:843
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
@@ -4152,14 +4656,14 @@ 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:47
-#: mail/message-list.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
+#: mail/message-list.etspec.h:11
 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 mail/mail-config.glade.h:95
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Saghas"
@@ -4174,7 +4678,7 @@ msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr ""
 
@@ -4182,27 +4686,98 @@ msgstr ""
 msgid "_Other Organizer"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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 "l�osta"
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "Post"
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "r"
+
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "l�osta"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "soic�nd"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Eile"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Tuaisceart"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "l�osta"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Facs Eile"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "l�"
 
-#: 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
-msgid "th"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr ""
 
@@ -4299,7 +4874,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:755
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4311,15 +4886,19 @@ msgstr "Tosa�ocht"
 msgid "_Status:"
 msgstr "_St�das:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+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:322
+#: calendar/gui/dialogs/task-editor.c:324
 msgid "Assignment"
 msgstr "Coinne"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Tuarasc�il:"
 
@@ -4331,119 +4910,84 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:438
-#, 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:751 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:960 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1460
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Osc�il"
 
-#: 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:973
+#, 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-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 "_Priont�il..."
+
+#: calendar/gui/e-calendar-table.c:978 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: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:39 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:979 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�ip"
 
 # PS
-#: 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:43 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:21
+#: calendar/gui/e-calendar-table.c:980 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
 #, fuzzy
 msgid "_Paste"
 msgstr "_Greamaigh"
 
-#: calendar/gui/e-calendar-table.c:973
-msgid "_Mark as Complete"
+#: calendar/gui/e-calendar-table.c:984
+msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "Scr�os an teasc seo"
+# ln
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Liong�ilis"
 
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:986
+msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
+msgstr "% Rinneadh:"
+
+#: calendar/gui/e-calendar-table.c:992
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
-#: calendar/gui/e-week-view.c:3929
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1247
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr ""
 
@@ -4457,8 +5001,8 @@ msgstr ""
 msgid "Alarms"
 msgstr "Af�iris"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:924
-#: camel/camel-filter-driver.c:1026
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr ""
 
@@ -4489,8 +5033,7 @@ 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: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-shortcuts.c:1030
 msgid "Summary"
 msgstr "Coimri�"
 
@@ -4529,420 +5072,171 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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
 msgid "am"
 msgstr "rn"
 
 #. 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
 msgid "pm"
 msgstr "in"
 
-#: calendar/gui/e-day-view.c:3525
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "_Coinne Nua"
 
-#: 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 ""
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
-#: ui/evolution-calendar.xml.h:19
-msgid "Go to _Today"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
-msgid "_Go to Date..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-msgid "_Delete this Appointment"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
-msgid "Make this Occurrence _Movable"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
-msgid "Delete this _Occurrence"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
-msgid "Delete _All Occurrences"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:535
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:540
-msgid "Task begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:545
-#, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "Eolas"
-
-#: calendar/gui/e-itip-control.c:549
-msgid "Begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:561
-#, fuzzy
-msgid "Meeting ends: <b>"
-msgstr "Eolas"
-
-#: calendar/gui/e-itip-control.c:564
-#, fuzzy
-msgid "Free/Busy info ends: <b>"
-msgstr "Eolas"
-
-#: calendar/gui/e-itip-control.c:568
-msgid "Ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:582
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 #, fuzzy
-msgid "Task Completed: <b>"
-msgstr "Cr�ochnaithe.`"
-
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Due: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-#, fuzzy
-msgid "iCalendar Information"
-msgstr "eolas fheilire"
-
-#. Title
-#: calendar/gui/e-itip-control.c:644
-#, fuzzy
-msgid "iCalendar Error"
-msgstr "Feilire"
-
-#: calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-#, fuzzy
-msgid "An unknown person"
-msgstr "iEarraidh gan Aithne"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:732
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:748
-msgid "<i>None</i>"
-msgstr "<i>Ar bith</i>"
+msgid "New Meeting"
+msgstr "Bealach Nuacht�in"
 
-#: calendar/gui/e-itip-control.c:760
-#, fuzzy
-msgid "Status:"
-msgstr "_St�das:"
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Teasc Nua"
 
-#: 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
-msgid "Accepted"
-msgstr ""
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Cl�d�il..."
 
-#: calendar/gui/e-itip-control.c:769
-msgid "Tentatively Accepted"
+#: 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 ""
 
-#: 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
-msgid "Declined"
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+msgid "_Go to Date..."
 msgstr ""
 
-#: 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
-msgid "Unknown"
-msgstr "Gan Aithne"
-
-#: 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
-#, fuzzy
-msgid "Choose an action:"
-msgstr "Fillte�n _Nua"
-
-#: calendar/gui/e-itip-control.c:824
-#, fuzzy
-msgid "Update"
-msgstr "Data"
-
-#: 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
-msgid "OK"
-msgstr "Ceart go Leor"
-
-#: calendar/gui/e-itip-control.c:840
-#, fuzzy
-msgid "Accept"
-msgstr "Cuntas"
-
-#: calendar/gui/e-itip-control.c:841
-msgid "Tentatively accept"
+#: 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-itip-control.c:842
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
 #, fuzzy
-msgid "Decline"
-msgstr "Dealaigh"
+msgid "_Configure..."
+msgstr "Socraigh Fillte�in..."
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
 #, fuzzy
-msgid "Send Free/Busy Information"
-msgstr "Eolas"
+msgid "_Configure Pilot..."
+msgstr "Socraigh Fillte�in..."
 
-#: calendar/gui/e-itip-control.c:869
-msgid "Update respondent status"
-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
+msgid "_Save As..."
+msgstr "_S�bh�il Mar..."
 
-#: calendar/gui/e-itip-control.c:882
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 #, fuzzy
-msgid "Send Latest Information"
-msgstr "Eolas Theasc"
+msgid "_Schedule Meeting..."
+msgstr "Ag Fanacht..."
 
-# FR
-#: calendar/gui/e-itip-control.c:895 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 #, fuzzy
-msgid "Cancel"
-msgstr "An Fhrainc"
-
-#: calendar/gui/e-itip-control.c:943
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:944
-msgid "Meeting Information"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:948
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:949
-msgid "Meeting Proposal"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:953
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:954
-msgid "Meeting Update"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:958
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:959
-msgid "Meeting Update Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:982
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:983
-msgid "Meeting Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:987
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:988
-msgid "Meeting Cancellation"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:992 calendar/gui/e-itip-control.c:1063
-#: calendar/gui/e-itip-control.c:1098
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:993
-msgid "Bad Meeting Message"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1013
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1014
-msgid "Task Information"
-msgstr "Eolas Theasc"
-
-#: calendar/gui/e-itip-control.c:1018
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1019
-msgid "Task Proposal"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1023
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1024
-msgid "Task Update"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1028
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1029
-msgid "Task Update Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1053
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1054
-msgid "Task Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1058
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1059
-msgid "Task Cancellation"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1064
-msgid "Bad Task Message"
-msgstr ""
+msgid "_Forward as iCalendar..."
+msgstr "Ag L�d�il feilire..."
 
-#: calendar/gui/e-itip-control.c:1083
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1084
-msgid "Free/Busy Information"
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1088
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1089
-msgid "Free/Busy Request"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1093
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1094
-msgid "Free/Busy Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1099
-msgid "Bad Free/Busy Message"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1172
-msgid "The message does not appear to be properly formed"
+msgid "Error executing %s."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1191
-msgid "The message contains only unsupported requests."
-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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1219 calendar/gui/e-itip-control.c:1225
-msgid "The attachment does not contain a valid calendar message"
+#: calendar/gui/e-itip-control.c:1564
+msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1250
-msgid "The attachment has no viewable calendar items"
+#: calendar/gui/e-itip-control.c:1566
+msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1349
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1351
-msgid "Update complete\n"
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1396
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1404
+#: calendar/gui/e-itip-control.c:1638
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: 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:1436
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1455 calendar/gui/e-itip-control.c:1505
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1457 calendar/gui/e-itip-control.c:1509
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1682
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Fillte�n _Nua"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Fillte�n _Nua"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4984,201 +5278,215 @@ msgid "date-start"
 msgstr ""
 
 # FIXME (Plural)
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Cathlaoirlaig"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr ""
 
 # IN 
-#: 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:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Pearsanta"
 
-#: 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:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Grupa"
 
-#: 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:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Goireas"
 
-#: 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:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Seomra"
 
 # th
-#: 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:264 calendar/gui/e-meeting-model.c:281
 #, fuzzy
 msgid "Chair"
 msgstr "T�alainnis"
 
-#: 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:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr ""
 
-#: 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:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr ""
 
-#: 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:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr ""
 
-#: 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:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 msgid "Needs Action"
 msgstr "Freagra"
 
-#: 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: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
 msgid "Tentative"
 msgstr ""
 
-#: 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:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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:2118 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:436
 msgid "Out of Office"
 msgstr "As an Oifig"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Gan Eolas"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Roghanna"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:362
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: 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 ""
 
-#: 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 ""
 
-#: calendar/gui/e-tasks.c:629
+#: calendar/gui/e-tasks.c:543
+msgid "Completing tasks..."
+msgstr ""
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/e-tasks.c:659
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
+#: calendar/gui/e-week-view.c:3438
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Coinne Nua..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1865
+#: calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Osc�il Feilire"
@@ -5247,299 +5555,225 @@ msgstr "D. F�mhair"
 msgid "September"
 msgstr "M. F�mhair"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-#, fuzzy
-msgid "Event information"
-msgstr "eolas fheilire"
-
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-#, fuzzy
-msgid "Task information"
-msgstr "Eolas Theasc"
-
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-#, fuzzy
-msgid "Journal information"
-msgstr "Eolas Cuntais"
-
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-#, fuzzy
-msgid "Free/Busy information"
-msgstr "Eolas"
-
-#: calendar/gui/itip-utils.c:321
-#, fuzzy
-msgid "Calendar information"
-msgstr "eolas fheilire"
-
-#: calendar/gui/itip-utils.c:370
-#, fuzzy, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Eolas"
-
-#: calendar/gui/itip-utils.c:382
-#, fuzzy
-msgid "iCalendar information"
-msgstr "eolas fheilire"
-
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Ce"
 
 # th
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 #, fuzzy
 msgid "Th"
 msgstr "T�alainnis"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Ao"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: 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: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 %b %d %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr ""
 
-# tg
-#: calendar/gui/print.c:2205
-#, fuzzy
-msgid "Task"
-msgstr "T�ids�cis"
-
-#: calendar/gui/print.c:2262
-#, fuzzy, c-format
-msgid "Status: %s"
-msgstr "_St�das:"
-
-#: calendar/gui/print.c:2280
-#, fuzzy, c-format
-msgid "Priority: %s"
-msgstr "Tosa�ocht"
-
-#: calendar/gui/print.c:2294
-#, fuzzy, c-format
-msgid "Percent Complete: %i"
-msgstr "Cr�ochnaithe.`"
-
-#: calendar/gui/print.c:2306
-#, fuzzy, c-format
-msgid "URL: %s"
-msgstr "URL:"
-
-#: calendar/gui/print.c:2320
-#, fuzzy, c-format
-msgid "Categories: %s"
-msgstr ""
-"\n"
-"Aicm�:"
-
-#: calendar/gui/print.c:2331
-#, fuzzy
-msgid "Contacts: "
-msgstr ""
-"\n"
-"Tr�cht:"
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Priont�il Feilire"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2710 my-evolution/e-summary.c:605
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:65
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Priont�il Reamhtaispe�ntais"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Socraigh Priont�il "
 
@@ -5548,11 +5782,11 @@ msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: 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"
@@ -5560,10 +5794,16 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2415
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr ""
 
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Priont�il Carta�"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5608,103 +5848,119 @@ msgstr ""
 msgid "Imports vCalendar files into Evolution"
 msgstr ""
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Teachtaireacht Feilire"
+
+#: calendar/importers/icalendar-importer.c:663
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Feilire"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:317
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:324
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:356
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:388
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:691
+#: 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:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
@@ -7309,11 +7565,11 @@ msgstr ""
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:441
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Te�p ag fork: %s"
@@ -7342,53 +7598,52 @@ msgstr ""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: 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:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:889
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 #, fuzzy
 msgid "Syncing folder"
 msgstr "ag sioncronaich filtean"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
@@ -7403,49 +7658,45 @@ msgstr "_Post sce�l"
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: 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:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 #, fuzzy
 msgid "Moving messages"
 msgstr "Post an sce�l seo"
@@ -7555,163 +7806,118 @@ msgstr ""
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
 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:628 camel/camel-pgp-context.c:802
 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: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:755
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:953
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:959
+#: 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:970
+#: 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:1143
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1153
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1160
+#: 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:1169
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1352
+#: 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:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:213
-msgid "Error hashing password."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:329
-#, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:378
-#, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:590
-msgid "Could not encrypt: failed to create encryption context."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:620
-#, fuzzy, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Te�p ag fork: %s"
-
-#: camel/camel-pkcs7-context.c:626
-#, fuzzy
-msgid "Could not encrypt: encoding failed."
-msgstr "Te�p ag fork: %s"
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr ""
-
-#: 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 ""
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s freastala� %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:267
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(��st gan aithne)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7810,7 +8016,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -7827,9 +8033,19 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr ""
 
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+#: camel/camel-sasl-ntlm.c:33
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+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:69 mail/mail-config.glade.h:61
+#: 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"
 
@@ -7873,26 +8089,39 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Ag dealaigh fillte�n %s"
+
+#: camel/camel-service.c:787
+msgid "Host lookup failed: host not found"
+msgstr ""
+
+#: camel/camel-service.c:790
+msgid "Host lookup failed: unknown reason"
+msgstr ""
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
@@ -7901,18 +8130,23 @@ msgstr ""
 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 ""
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr ""
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
@@ -7946,24 +8180,24 @@ msgstr "_Post sce�l"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7975,7 +8209,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:438
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7984,16 +8218,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:500
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8013,27 +8247,27 @@ msgstr ""
 msgid "No such message %s in %s"
 msgstr "Ni raibh aon sceal %s i %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Ni raibh sceal sinn: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Te�p ag fork: %s"
@@ -8066,53 +8300,53 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Ag S�bh�il scealta"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2145
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, fuzzy, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Te�p ag fork: %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 ""
@@ -8125,7 +8359,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: 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 "Fillte�in"
 
@@ -8157,28 +8391,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:393
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:434
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8186,57 +8420,58 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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:91
+#: camel/providers/local/camel-local-provider.c:116
 msgid "Directory tree of mbox files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8244,56 +8479,62 @@ msgid ""
 "folders first."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: 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
 #, 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 ""
 
-#: 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:197
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: 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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: 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 "Te�p ag fork: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -8334,7 +8575,7 @@ msgstr "Post an sce�l seo"
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8342,14 +8583,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8357,33 +8598,55 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: 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:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Te�p ag fork: %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 ""
 
+#: camel/providers/local/camel-maildir-summary.c:525
+msgid "Checking folder consistency"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "Ag stoir filtean"
+
 #: camel/providers/local/camel-mbox-folder.c:151
 #: camel/providers/local/camel-spool-folder.c:277
 #, c-format
@@ -8427,124 +8690,113 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#. 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 "Ag stoir filtean"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Te�p ag fork: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: 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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Earraidh gan aithne: %s"
@@ -8563,7 +8815,7 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr "N�l aon Eolaire `%s' ann."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
@@ -8581,6 +8833,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
@@ -8590,95 +8843,55 @@ msgstr ""
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Te�p ag fork: %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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: 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/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: 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
+#: camel/providers/local/camel-spoold-store.c:117
 #, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Post an sce�l seo"
-
-#: 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
-#, fuzzy
-msgid "User cancelled"
-msgstr "Ceangailte"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr ""
+msgid "Store `%s' does not exist or is not a directory"
+msgstr "N�l aon Eolaire `%s' ann."
 
-#: 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"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-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"
@@ -8688,12 +8901,12 @@ msgstr "Nuachtain USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nuachtain USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8736,33 +8949,49 @@ msgstr "An Fhrainc"
 msgid "Operation failed: %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: 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
+#, fuzzy
+msgid "User cancelled"
+msgstr "Ceangailte"
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:316
+#: camel/providers/pop3/camel-pop3-folder.c:325
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Scr�os an sceal seo"
 
-#: 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 ""
 
 #. 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 ""
 
-#: 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
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Post an sce�l seo"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
 #, fuzzy
 msgid "Unknown reason"
 msgstr "iEarraidh gan Aithne"
@@ -8780,7 +9009,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:60
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -8801,51 +9030,68 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
 #, c-format
-msgid "Could not connect to POP server on %s."
+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:213
-#: camel/providers/pop3/camel-pop3-store.c:316
+#: 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
+#, 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
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:229
+#: camel/providers/pop3/camel-pop3-store.c:405
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:240
+#: camel/providers/pop3/camel-pop3-store.c:416
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:255
+#: camel/providers/pop3/camel-pop3-store.c:431
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "Earraidh I/A"
 
-#: camel/providers/pop3/camel-pop3-store.c:276
+#: camel/providers/pop3/camel-pop3-store.c:452
 #, 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:327
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, 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:82
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8855,54 +9101,50 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "Te�p ag fork: %s"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-msgid "Could not find 'From' address in message"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-#, fuzzy
-msgid "Could not parse recipient list"
-msgstr "Te�p ag fork: %s"
-
-#: 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:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: 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"
 
@@ -8910,122 +9152,141 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: 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:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: 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:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr ""
 
-#: 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: 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:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: 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: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:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: 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: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: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: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: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:209
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: 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:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr ""
 
-#: 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:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: 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:223
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:383
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:336
+msgid "server does not appear to support SSL"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+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:421
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:442
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9033,93 +9294,89 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP freastala� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:591
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:598
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 #, fuzzy
 msgid "Sending message"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:624
+#: camel/providers/smtp/camel-smtp-transport.c:688
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:820
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:840
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:883
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:904
-#: camel/providers/smtp/camel-smtp-transport.c:916
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:925
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:973
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:999
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1054
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9127,35 +9384,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:1104
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1144
-#: camel/providers/smtp/camel-smtp-transport.c:1162
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1176
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1199
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1236
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 msgid "QUIT response error"
 msgstr ""
 
@@ -9184,7 +9441,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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 "iat�n"
 
@@ -9226,11 +9483,11 @@ msgid "MIME type:"
 msgstr ""
 
 #: 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:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr ""
 
@@ -9238,108 +9495,104 @@ msgstr ""
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:403
 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:291
+#: 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:697
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:914
-msgid "Save as..."
-msgstr "S�nbh�il le..."
-
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Rabhadh!"
 
-#: composer/e-msg-composer.c:927
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:949
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:999
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1007
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1014
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1074
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9348,54 +9601,54 @@ msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1132
+#: composer/e-msg-composer.c:1176
 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:1290
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1297
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Osc�il Comhad"
 
-#: composer/e-msg-composer.c:1469
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1855 composer/e-msg-composer.c:2447
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2464
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2487 composer/e-msg-composer.c:2542
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
@@ -9448,12 +9701,19 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
 #. 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:270
+#: e-util/e-passwords.c:365 mail/mail-session.c:270
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -9562,168 +9822,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 ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr ""
-
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "T�g Comhad"
-
-#: 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 ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Post r�omhphost"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "De�n %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "D�n %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Socraigh Fillte�in..."
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Leathanach"
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr "Ag oscailt an t-eolaire %s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Earraidh ag s�bhh�il sc�ala� do: %s\n"
-" %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: 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 ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "Coimri�"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-#, fuzzy
-msgid "Test service"
-msgstr "Suimigh Seirbh�s"
-
-#: 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 "Earraidh"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Data"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "Data"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "bliain"
@@ -9760,11 +9858,7 @@ msgstr "��ghur"
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "soic�nd"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "soicind"
 
@@ -9832,7 +9926,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:923
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9845,34 +9939,26 @@ msgid "Filter Rules"
 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
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: 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:1633 mail/mail-account-gui.c:1647
 #, fuzzy
 msgid "Select Folder"
 msgstr "Fillte�n _Nua"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr ""
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9880,7 +9966,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:488 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 #, fuzzy
 msgid "Test"
 msgstr "An Tib�id"
@@ -9889,39 +9975,39 @@ msgstr "An Tib�id"
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Gan Tid�al"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+msgid "if any criterion are met"
 msgstr ""
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr ""
 
@@ -9967,193 +10053,217 @@ msgstr ""
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "Assign Color"
+msgid "Adjust Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Color"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Attachments"
+msgid "Assign Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "contains"
+msgid "Attachments"
 msgstr ""
 
+# BE
 #: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "An Bheilg"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr ""
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr ""
 
 # mt
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Scr�oste"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr ""
 
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
 # IR
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "riomh"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:34
+msgid "is not Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+# PL
+#: filter/libfilter-i18n.h:39
 #, fuzzy
-msgid "Needs Reply"
-msgstr "Freagrair"
+msgid "Play Sound"
+msgstr "An Pholainn"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr ""
 
 # Avoid; either use KR or KP
-#: filter/libfilter-i18n.h:39 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Sc�r"
 
-#: filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1546
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "M�id (kB)"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49 mail/mail-format.c:932
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Abair"
 
@@ -10161,11 +10271,11 @@ msgstr "Abair"
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr ""
 
@@ -10186,30 +10296,30 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: 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 "F�n le do thoil"
 
-#: 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 ""
 
-#: 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
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Ag Oscailt '%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:101
 msgid "Mail"
 msgstr "Post"
 
@@ -10233,23 +10343,74 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Tosa�ocht"
+
+#: 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 ""
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Bruscar"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Ag Oscailt '%s'"
+
+#: 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:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "�lbachta�"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "_Fillte�n"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10270,44 +10431,92 @@ msgstr ""
 msgid "Pine"
 msgstr "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 "Roghanna Feilire"
+
+#: 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 ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr ""
 
-#: 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 "Roghanna Feilire"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Cuntasa�"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Roghanna Feilire"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
+#: 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:101
-msgid "Mail storage folder (internal)"
+msgid "Folder containing mail"
 msgstr ""
 
 #: mail/component-factory.c:102
@@ -10318,35 +10527,34 @@ msgstr ""
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:129
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Te�p ag fork: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "�lbachta�..."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:969
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Teachaireacht Post Nua"
 
 # mt
-#: mail/component-factory.c:969 ui/evolution-mail-global.xml.h:20
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Sc�al R�omhphost"
 
@@ -10362,207 +10570,211 @@ msgstr ""
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 
-#: mail/component-factory.c:1225
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Ag Cealaigh..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:322
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Albachta� do \"%s\""
 
-#: mail/folder-browser-ui.c:324
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "�lbacta�"
 
-#: mail/folder-browser.c:298 mail/mail-display.c:298
+#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:752
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d nua"
 
-#: mail/folder-browser.c:755 mail/folder-browser.c:763
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:757
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr ""
 
 # c-format
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d �oml�n"
 
-#: mail/folder-browser.c:1060
-msgid "Create vFolder from Search"
-msgstr ""
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Fillte�n _Nua"
 
-#: mail/folder-browser.c:1443
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1444
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1451
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1452
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1453
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1461 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:107
-msgid "_Save As..."
-msgstr "_S�bh�il Mar..."
-
-#: mail/folder-browser.c:1463
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Priont�il"
 
-#: mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Freagrair do L�osta"
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Freagrair do _Gach rud"
 
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:1474
-msgid "Flag for Follow-up"
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1623
 #, fuzzy
-msgid "Flag Completed"
+msgid "Fla_g Completed"
 msgstr "Cr�ochnaithe"
 
-#: mail/folder-browser.c:1476
+#: mail/folder-browser.c:1624
 #, fuzzy
-msgid "Clear Flag"
+msgid "Cl_ear Flag"
 msgstr "Glan"
 
 #. separator here?
-#: mail/folder-browser.c:1480 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1481 ui/evolution-mail-message.xml.h:42
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1483
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1487
-msgid "_Move to Folder..."
-msgstr ""
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Athdealaigh"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
+msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1488
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_C�ip do Fillte�n..."
 
-#: mail/folder-browser.c:1490 ui/evolution-mail-message.xml.h:109
-msgid "_Undelete"
-msgstr "_Athdealaigh"
-
-#: mail/folder-browser.c:1494 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
-msgstr ""
+# PE
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "_Larger"
 
-#: mail/folder-browser.c:1497
-msgid "Apply Filters"
-msgstr ""
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
+msgstr "Suim Leabhar Seoladh"
 
-#: mail/folder-browser.c:1499
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1653
+msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1676
-msgid "Filter on Mailing List"
-msgstr ""
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
+msgstr "Teachtaireacht Feilire"
 
-#: mail/folder-browser.c:1677
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1938
 #, c-format
-msgid "Filter on Mailing List (%s)"
+msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1680
+#: mail/folder-browser.c:1939
 #, c-format
-msgid "VFolder on Mailing List (%s)"
+msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Gn�th"
-
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -10585,26 +10797,18 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
+msgid "Current store format:"
 msgstr ""
 
 #: mail/local-config.glade.h:2
-msgid "Current store format:"
+msgid "Index body contents"
 msgstr ""
 
 #: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr ""
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Form�id Boscaphoist"
-
-#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr ""
 
-#: 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"
@@ -10612,15 +10816,15 @@ msgid ""
 msgstr ""
 
 # so
-#: 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"
 
@@ -10638,84 +10842,79 @@ msgstr "Eagarth�ir Nuachr�in Evolution"
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:959
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_�st:"
+
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
 #, fuzzy
-msgid "Could not save signature file."
-msgstr "Te�p ag fork: %s"
+msgid "User_name:"
+msgstr "Ainm _�saideoir"
 
-#: mail/mail-account-gui.c:1036
-msgid "Save signature"
-msgstr ""
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+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:1042
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-account-gui.c:1666
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (gn�th)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "M�chumasach"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Chumasach"
-
-#: mail/mail-accounts.c:292
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:296
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:299
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.c:535
-msgid "Are you sure you want to delete this news account?"
-msgstr ""
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "M�chumasach"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:50
-msgid "Mail Settings"
-msgstr "Albachta� Phoist"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Chumasach"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Post do %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr ""
 
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Abair is %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr ""
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Sc�al � %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Ainm _Chuntas:"
 
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "l�osta r�omhphost %s"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Portr�id"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10723,121 +10922,132 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:145
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:189
-msgid "You have not set a mail transport method"
-msgstr ""
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:239
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Post ar aon n�s?"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:325
+#: mail/mail-callbacks.c:295
 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:329
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:333
+#: mail/mail-callbacks.c:303
 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:438
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:527
+#: mail/mail-callbacks.c:497
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:646
+#: mail/mail-callbacks.c:623
 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:971
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:975
+#: mail/mail-callbacks.c:981
 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:1423 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1425 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2052
+#: mail/mail-callbacks.c:2091
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2130
+#: mail/mail-callbacks.c:2169
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2156
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2255
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "S�bh�il Sc�al Mar..."
 
-#: mail/mail-callbacks.c:2257
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "S�bh�il Sc�ala Mar..."
 
-#: mail/mail-callbacks.c:2408
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Scr�os an sceal seo"
+
+#: mail/mail-callbacks.c:2373
+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
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10845,36 +11055,36 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2518
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2530
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2603
+#: mail/mail-callbacks.c:2783
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:2655
+#: mail/mail-callbacks.c:2836
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:2682
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2717
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2883
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -10916,16 +11126,34 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:354
-#, c-format
-msgid "Account %d"
-msgstr "Cuntas %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Ag Obair"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Gn�th"
 
-#: mail/mail-config.c:1995
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+msgid "To Do"
+msgstr ""
+
+#. blue
+#: mail/mail-config.c:78 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"
@@ -10933,108 +11161,153 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. 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: Inbosca"
-
-#: mail/mail-config.c:2256
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2334 mail/mail-config.c:2338
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
-msgid " _Check for supported types "
+#: 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
-msgid " color"
-msgstr " dath"
+#, fuzzy
+msgid " Edit "
+msgstr "_Eagar"
 
 #: mail/mail-config.glade.h:3
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr ""
+#, fuzzy
+msgid " New "
+msgstr "_Nua"
 
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of evolution)"
+msgid " _Check for supported types "
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "A_lways encrypt to myself when sending encrypted mail"
+msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
-msgid "Account"
-msgstr "Cuntas"
+msgid "(SSL is not supported in this build of evolution)"
+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
 msgid "Account Information"
 msgstr "Eolas Cuntais"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Bainisteoireacht Chuntas"
 
-#: mail/mail-config.glade.h:9
-msgid "Accounts"
-msgstr "Cuntasa�"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Roghanna"
+
+# AQ
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "an tAntartasch"
+
+#: mail/mail-config.glade.h:13
+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:10
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr ""
+# AT
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "An Ostair"
 
-#: mail/mail-config.glade.h:13
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:20
+msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:14 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "�dar�"
 
-#: mail/mail-config.glade.h:16
-msgid "Beep when new mail arrives"
+#: mail/mail-config.glade.h:23
+msgid "Automatically _detect links"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
-msgid "Checking for New Mail"
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
-msgid "Composer"
-msgstr "Scr�obh�ir"
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Earraidh gan aithne: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_D�n"
+
+#: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Cruthaigh Sc�al _Nua"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Socr�"
 
-#: mail/mail-config.glade.h:21
-msgid "Confirm when Expunging a folder"
-msgstr ""
-
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11044,386 +11317,569 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+# 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:29
-msgid "Default Forward style is: "
-msgstr ""
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Tosa�ocht"
 
-#: mail/mail-config.glade.h:30
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:41
 #, fuzzy
-msgid "Defaults"
-msgstr "Gn�th"
+msgid "Deleting Mail"
+msgstr "_Dealaigh gach rud"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:34
-msgid "Display"
-msgstr "Taispea�n"
-
-#: mail/mail-config.glade.h:35
-msgid "Do not notify me when new mail arrives"
+#: mail/mail-config.glade.h:44
+msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:36 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Cr�ochnaithe"
 
-#: mail/mail-config.glade.h:37 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr ""
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Gach _Fillte�in:"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "_Cumasach"
 
-#: mail/mail-config.glade.h:39 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Eagar..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Enabled"
+# ta
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Rpost"
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Cuntasa�"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "_Seoladh RPost:"
+
+#: mail/mail-config.glade.h:52
+msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:53
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:54
+msgid "Fi_xed -width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "�lbacta�"
+
+#: mail/mail-config.glade.h:56
+msgid "Format messages in _HTML"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:43
-msgid "HTML signature file:"
+#: mail/mail-config.glade.h:58
+msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Gn�th"
+
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: 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:46
-msgid "In HTML mail"
-msgstr "i HTML post"
-
 # ie
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "S�bh�il agus D�n"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Post an sce�l seo"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Socr� Post"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "�it do Bosca Phoist"
 
-#: mail/mail-config.glade.h:52
-msgid "Make this my _default account"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Scr�obh�ir"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_Post sce�l"
+
+#: mail/mail-config.glade.h:74
+msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "Freatala� NNTP:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Socr� Post"
 
-#: mail/mail-config.glade.h:55
-msgid "News"
-msgstr "Nuacht"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Fillte�n _Nua"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "_Eagr�:"
+
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Eochar PGP:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "T�g dath"
 
-#: mail/mail-config.glade.h:63
-msgid "Play sound file when new mail arrives"
+#: mail/mail-config.glade.h:88
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Priont�il an tadhalla� seo"
 
-#: mail/mail-config.glade.h:66
-msgid "Prompt when sending messages with an _empty subject"
+#: mail/mail-config.glade.h:91
+msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:67
-msgid "Prompt when sending messages with only _Bcc recipients defined"
+#: mail/mail-config.glade.h:92
+msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Qmail maildir "
+#: mail/mail-config.glade.h:93
+msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Quoted"
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Freagrair-Do"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
-msgid "Receiving Mail"
-msgstr ""
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
+msgstr "_Roghanna"
 
-#: mail/mail-config.glade.h:73
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:100
+msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+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:77
-msgid "Security"
-msgstr "Sl�nd�il"
-
-#: mail/mail-config.glade.h:78
-msgid "Select Filter Log file..."
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
-msgid "Sending Mail"
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:83 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
+# FIXME SP?
+#: mail/mail-config.glade.h:110
+#, 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
+msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "_Post sce�l filtean"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:89
-msgid "Signature file:"
+#: mail/mail-config.glade.h:120
+msgid "Shortcuts _type:"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+# SG
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Singeap�r"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
-msgid "Sources"
-msgstr ""
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:124
 #, fuzzy
-msgid "Specify filename:"
+msgid "Specify _filename:"
 msgstr "Ainm St�l:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
-msgid "Use s_ecure connection (SSL)"
+#: mail/mail-config.glade.h:128
+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:97
+#: mail/mail-config.glade.h:130
+msgid "Use _HTML for this signature"
+msgstr ""
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Luaineach"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: 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:102
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "Saghas _Udar� :"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Saghas _Udar� :"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-msgid "_Drafts folder:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
 msgstr ""
 
-#: mail/mail-config.glade.h:111
-msgid "_Empty trash folders on exit"
+#: mail/mail-config.glade.h:148
+msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Gn�th"
+
+#: mail/mail-config.glade.h:151
+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
+#, fuzzy
+msgid "_Filename:"
+msgstr "Ainm Chomad:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Sheoladh Chuig duine"
+
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Full name:"
 msgstr "Ainm _Fhada:"
 
-#: mail/mail-config.glade.h:113
-msgid "_HTML signature:"
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "i HTML post"
+
+#: mail/mail-config.glade.h:160
+msgid "_HTML Signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
-msgid "_Highlight citations with"
+#: mail/mail-config.glade.h:162
+msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
-msgid "_Host:"
-msgstr "_�st:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Teanga"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
-msgid "_Log filter actions to:"
+#: mail/mail-config.glade.h:165
+msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Ainm:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
-msgid "_Organization:"
-msgstr "_Buidheann"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
-msgid "_Path:"
-msgstr "_Sl�:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:124
-msgid "_Remember this password"
+#: mail/mail-config.glade.h:172
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
-msgid "_Send mail in HTML format by default."
+#: mail/mail-config.glade.h:173
+msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:174
 #, fuzzy
-msgid "_Server type: "
-msgstr "_Cineal Freastala�:"
+msgid "_Random"
+msgstr "Raidio"
 
-#: mail/mail-config.glade.h:127
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:175
+msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:128
-msgid "_Username:"
-msgstr "Ainm _�saideoir"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Freagrair do gach rud"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Sl�nd�il"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Sl�nd�il"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Post r�omhphost"
+
+#: mail/mail-config.glade.h:181
+msgid "_Show animated images"
+msgstr ""
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+msgstr "_St�das:"
 
-#: mail/mail-config.glade.h:129
+#: 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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Luaineach"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_gach"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " dath"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
-msgid "placeholder"
-msgstr ""
-
-#: mail/mail-config.glade.h:134
-msgid "seconds."
-msgstr "soicind."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr ""
@@ -11460,182 +11916,175 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Te�p ag fork: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr ""
 
-#: 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 "Osc�il san %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 ""
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1162
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1657
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1659
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1662
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1665
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "S�bh�il Iomha le..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "D�ta"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Droch Seoladh"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "�"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Freagrair-Do"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Do"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1767
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-
-#: mail/mail-format.c:1790
-msgid "Evolution does not recognize this type of signed message."
-msgstr ""
-
-#: mail/mail-format.c:1798
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1806
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
+msgstr "Post"
 
-#: mail/mail-format.c:2021
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2035
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2040
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2069
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2077
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, 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:762
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
 # c-format
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
@@ -11658,127 +12107,122 @@ msgstr ""
 msgid "Working"
 msgstr "Ag Obair"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr ""
 
-#: 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:599
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:723
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:742
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "_Post sce�l"
 
-#: 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 "Cr�ochnaithe.`"
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
 # mo 
-#: mail/mail-ops.c:940
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Ag C�ip"
 
-#: mail/mail-ops.c:1053
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1103 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Bruscar"
-
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1279
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1420
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ag dealaigh fillte�n %s"
 
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1569
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-ops.c:1601
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1721
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1807
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ag S�bh�il scealta"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11787,38 +12231,38 @@ msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
 
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "C_uardaigh..."
 
@@ -11855,42 +12299,42 @@ msgstr "Cuardaigh:"
 msgid "Matches:"
 msgstr ""
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Ag Cealaigh..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Freastala�: %s, Cin�al: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sl�: %s, Cin�al: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Cin�al:  %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Cealaigh gach rud"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr ""
 
-#: 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 "Ag Fanacht..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Ceangailte."
 
@@ -11907,25 +12351,37 @@ msgstr "Pasfhocal do %s, le do thoil"
 msgid "Enter Password"
 msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Te�p ag fork: %s"
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
 msgstr ""
 
-#: mail/mail-summary.c:467
+#: mail/mail-signature-editor.c:178
+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
 #, fuzzy
-msgid "Mail Summary"
-msgstr "Coimri� phoist"
+msgid "Signature name:"
+msgstr "Ainm St�l:"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr ""
 
@@ -11948,10 +12404,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr ""
-
 #: mail/mail-vfolder.c:785
 #, fuzzy
 msgid "vFolders"
@@ -11970,87 +12422,146 @@ msgstr ""
 msgid "New VFolder"
 msgstr "Fillte�n _Nua"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Gan abair)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Sce�l"
 
-#: mail/message-list.c:623
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:624
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:625
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:626
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:627
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:631
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:632
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:636
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:637
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:887
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:894
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Inni� %l:%M %p"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Inn� %l:%M %p"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2292
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr ""
 
-#: mail/message-list.etspec.h:2
-msgid "Flagged"
+#: mail/message-list.etspec.h:3
+msgid "Due By"
 msgstr ""
 
 #: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "St�das"
+
+#: mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "M�id"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "Post"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Sheoladh Chuig duine"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Gan Eolas"
+
+# NO
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward"
+msgstr "Sheoladh"
+
+#: 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 "Freagrair"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Freagrair do gach rud"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Reamhthaispe�intas"
+
+#: 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\""
@@ -12072,7 +12583,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #: 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 "Fillte�n"
 
@@ -12116,6 +12627,32 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Configuration control for the Evolution Summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Alairm Evolution"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+msgid "Factory for Evolution Summary's configuration control."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+msgid "Factory for the Evolution Summary component."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Roghanna Feilire"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+msgid "This page can be used to customize the appearance of the Summary page."
+msgstr ""
+
 # ##
 # ## Languages (ISO 639 code in brackets)
 # ## 	The 'msgid' names and spellings for languages are those listed
@@ -23089,14 +23626,10 @@ msgstr ""
 msgid "Zurich"
 msgstr "Tuircis"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr ""
-
 #: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "Coinn�"
@@ -23119,44 +23652,51 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "(Gan Tuarascail)"
 
-#: my-evolution/e-summary-mail.c:120
+#: my-evolution/e-summary-mail.c:151
 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
+#, fuzzy
+msgid "Local Folders"
+msgstr "_Fillte�n"
+
 #. 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:92
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:453
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Focal do Lae"
 
-#: my-evolution/e-summary-preferences.c:474
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:735
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:743
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:747
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Ainm:"
 
-#: my-evolution/e-summary-preferences.c:1225
-msgid "Summary Settings"
-msgstr ""
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr ""
@@ -23165,11 +23705,34 @@ msgstr ""
 msgid "News Feed"
 msgstr "Bealach Nuacht�in"
 
-#: my-evolution/e-summary-tasks.c:241
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "Gach Rud"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+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
+#, fuzzy
+msgid "Shown"
+msgstr "An tSualainn"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Gan Teascanna"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(Gan Tuarascail)"
 
@@ -23185,20 +23748,20 @@ msgstr ""
 msgid "Weather"
 msgstr "Aimsir"
 
-#: my-evolution/e-summary.c:190
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:488
 #, fuzzy
 msgid "Please wait..."
 msgstr "F�n le do thoil"
 
-#: 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 "Coimiri� Pr�ont"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr ""
 
@@ -23206,38 +23769,6 @@ msgstr ""
 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
-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
-msgid "miles"
-msgstr "m�le"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "km"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Geal"
@@ -24477,61 +25008,53 @@ msgstr ""
 msgid "_Weather"
 msgstr "_Aimsir"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
 msgstr ""
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr ""
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "_Fillte�in Speis�alta"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 #, fuzzy
 msgid "The Evolution shell."
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Taisp�an Sonra�"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Imbosca"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Asbosca"
-
-#: shell/e-local-storage.c:636
-#, fuzzy
-msgid "Local Folders"
-msgstr "_Fillte�n"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr ""
 
-#: 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 ""
 
-#: 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:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24539,14 +25062,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, fuzzy, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -24554,7 +25077,7 @@ msgid ""
 "%s"
 msgstr "Te�p ag fork: %s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -24562,7 +25085,7 @@ msgid ""
 "readable and executable and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -24570,7 +25093,7 @@ msgid ""
 "Please remove this file and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -24578,7 +25101,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -24587,7 +25110,7 @@ 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"
@@ -24595,84 +25118,86 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: 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 "C�ipcheart 1999, 2000, 2001 Ximian, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Te�p ag fork: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: 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: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 ""
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "C�ip Fillte�n"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Dealaigh \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 #, fuzzy
 msgid "Rename folder"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24685,7 +25210,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:304
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Cruthaigh fillte�n nua"
 
@@ -24699,7 +25224,7 @@ msgstr ""
 msgid "New..."
 msgstr "Nua..."
 
-#: 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 "(gan tide�l)"
 
@@ -24853,8 +25378,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 
-#: 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:506
+#: shell/e-shell-user-creatable-items-handler.c:551
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "_Nua"
@@ -24875,90 +25400,89 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Faoi Evolution..."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:565
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Scr�os an sceal seo"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:566
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: 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 ""
-
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "Sheoladh Chuig duine"
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:215
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1598
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1600
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(Ar Bith)"
 
-#: 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 ""
 
-#: shell/e-shell-view.c:1654
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: 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 ""
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1660
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24966,19 +25490,23 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1887
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Ceart go Leor"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1889
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1891
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1893 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr ""
 
@@ -25096,74 +25624,73 @@ msgstr "_Scr�os"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-storage-set-view.c:658
-#, fuzzy, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr "Te�p ag fork: %s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Imbosca"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(gan ainm)"
+# th
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "T�alainnis"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Gan Earraidh"
 
-#: 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:491
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "Earraidh I/A"
 
-#: 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:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr ""
 
-#: 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:505
 msgid "Operation not supported"
 msgstr ""
 
-#: 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: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 ""
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Te�p ag fork: %s"
@@ -25174,10 +25701,14 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, fuzzy, c-format
+#, fuzzy
 msgid "%s (%d%% complete)"
 msgstr "% Rinneadh:"
 
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr ""
+
 #: shell/evolution-shell-component-utils.c:124
 #, fuzzy, c-format
 msgid ""
@@ -25204,67 +25735,67 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "Earraidh CORBA"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Idirbhr�ste"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Gan �in�ar"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Earraidh Intire"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Post an sce�l seo"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
 #, fuzzy
 msgid "Test type"
 msgstr "Cin�al Comhad:"
@@ -25381,35 +25912,50 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:83
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:89
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:210
+#: shell/main.c:227
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:290
+#: shell/main.c:318
+msgid "Start in offline mode"
+msgstr ""
+
+#: shell/main.c:319
+msgid "Start in online mode"
+msgstr ""
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr ""
 
@@ -25433,268 +25979,212 @@ msgstr "Comhad Aschur"
 msgid "No filename provided."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "_C�ip do Fillte�n..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr ""
 
-#: 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:12
+#: 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:11
 #, fuzzy
 msgid "Delete selected contacts"
 msgstr "Scr�os an tadhalla� seo"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "L�osta Nua"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Fillte�n _Nua"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "S�bh�il 'san _fillte�n"
+
+#: 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:17
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Priont�il an tadhalla� seo"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "S�bh�il an tadhalla� seo mar VCard."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "T�g Gach Rud"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "T�g Gach tadhalla�"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#, fuzzy
-msgid "Send _Message to Contact..."
-msgstr "_Post sce�l do Tadhall..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "_Post sce�l"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Post sce�l do tadhall"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Post tadhalla� seo do perseanta eile."
 
 # st
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Stad"
 
-#: 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:30
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: 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-tasks.xml.h:16
+#: 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
 msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Addressbook Sources..."
-msgstr ""
-
 #: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "Liost Tadhall"
 
-#: 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 ""
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:44
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "_Priont�il..."
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "_S�bh�il Mar VCard"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_T�g Gach Rud"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:4
-#, fuzzy
-msgid "Create a New All Day _Event"
-msgstr "Cruthaigh All Day Event nua"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "Cruthaigh _Teasc Nua"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Cruthaigh Coinne _Nua"
-
-#: ui/evolution-calendar.xml.h:7
-#, fuzzy
-msgid "Create a _New Meeting"
-msgstr "Cruthaigh Coinne _Nua"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-addressbook.xml.h:45
 #, fuzzy
-msgid "Create a new meeting request"
-msgstr "Scr�os an sceal seo"
-
-#: ui/evolution-calendar.xml.h:10 ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create an event for the whole day"
-msgstr ""
+msgid "_Send Message to Contact..."
+msgstr "_Post sce�l do Tadhall..."
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "La"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
 msgid "Delete the appointment"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:37
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Go forward"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "M�"
 
-#: ui/evolution-calendar.xml.h:23
-msgid "New Appointment"
-msgstr "Coinne Nua"
-
-#: ui/evolution-calendar.xml.h:24 ui/evolution-tasks.xml.h:12
-msgid "New Task"
-msgstr "Teasc Nua"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27 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 "Priont�il reamh-taispe�ntas"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Priont�il an feilire seo"
 
-#: ui/evolution-calendar.xml.h:29
+#: 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:19
 msgid "Show one day"
 msgstr "Taispe�n aon la"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Taispe�in aon mh�"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Taispe�n aon seachtain"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Seachtain"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment..."
-msgstr "_Coinne..."
-
-#: ui/evolution-calendar.xml.h:38
-msgid "_Calendar Settings..."
-msgstr "_Albachta� Feilire..."
-
-#: ui/evolution-calendar.xml.h:42
-#, fuzzy
-msgid "_Meeting..."
-msgstr "Ag Fanacht..."
-
-#: ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:46
-msgid "_Task..."
-msgstr "_Teasc..."
-
 #: 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
@@ -25724,18 +26214,18 @@ msgstr ""
 msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Cl�d�il..."
-
 #: 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 "S�bh�il"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "S�bh�il le..."
+
 #: 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 "S�bh�il agus D�n"
 
@@ -25751,8 +26241,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:40
 msgid "_File"
 msgstr "_Comhad"
 
@@ -25770,10 +26260,15 @@ msgstr "S�bh�il _Mar..."
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
+#: ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "_Post sce�l do Tadhall..."
+
 #: 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�bh�il"
 
@@ -25833,6 +26328,12 @@ 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 ""
@@ -25842,78 +26343,54 @@ msgid "Compose _New Message"
 msgstr "Cruthaigh Sc�al _Nua"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: 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:6
 msgid "Empty _Trash"
 msgstr "Folamh _Buscar"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr ""
 
-#: 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
-msgid "New Message"
-msgstr "Sce�l Nua"
-
-#: 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:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr ""
-
-#: 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:11
 msgid "Show message preview window"
 msgstr ""
 
-#: 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:13
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "S�bh�il 'san _fillte�n"
@@ -26013,11 +26490,11 @@ msgstr ""
 msgid "Threaded Message list"
 msgstr "Post an sce�l seo"
 
-#: 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 ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Fillte�n"
 
@@ -26034,346 +26511,355 @@ msgstr "_Roghanna..."
 msgid "_Threaded Message List"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "Add Sender to Address _Book"
+msgid "A_dd Sender to Addressbook"
 msgstr "Suim Leabhar Seoladh"
 
+#: ui/evolution-mail-message.xml.h:2
+msgid "A_pply Filters"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:3
 #, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Suim Leabhar Seoladh"
+
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
 msgid "Apply filter rules to the selected messages"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:4
+#: 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:5
+#: 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:6
+#: ui/evolution-mail-message.xml.h:7
 #, fuzzy
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:9
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:12
+#: 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:13
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Display the next message"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:27
+# NO
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Sheoladh"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:31
-msgid "Force images in HTML mail to be loaded"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Fillte�n _Nua"
 
-# NO
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
-msgid "Forward"
-msgstr "Sheoladh"
+msgid "Follow _Up..."
+msgstr "Ainm _Fhada..."
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: 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:34
+#: ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:41
-msgid "Mark as I_mportant"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:43
-msgid "Mark as Unimp_ortant"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:44
-msgid "Mark the selected messages as having been read"
+msgid "Mark as I_mportant"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:45
-#, fuzzy
-msgid "Mark the selected messages as important"
-msgstr "Scr�os an sceal seo"
+msgid "Mark as U_nread"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:46
-msgid "Mark the selected messages as not having been read"
+msgid "Mark as Unimp_ortant"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-msgid "Mark the selected messages as unimportant"
+msgid "Mark the selected message(s) as having been read"
 msgstr "Scr�os an sceal seo"
 
 #: ui/evolution-mail-message.xml.h:48
 #, fuzzy
-msgid "Mark the selected messages for deletion"
-msgstr "Fillte�n _Nua"
+msgid "Mark the selected message(s) as important"
+msgstr "Scr�os an sceal seo"
 
 #: ui/evolution-mail-message.xml.h:49
-msgid "Move"
-msgstr "Bog"
+#, fuzzy
+msgid "Mark the selected message(s) as not having been read"
+msgstr "Scr�os an sceal seo"
 
 #: ui/evolution-mail-message.xml.h:50
 #, fuzzy
-msgid "Move selected messages to another folder"
-msgstr "Fillte�n _Nua"
+msgid "Mark the selected message(s) as unimportant"
+msgstr "Scr�os an sceal seo"
 
 #: ui/evolution-mail-message.xml.h:51
-msgid "Next"
-msgstr "Ar Lean"
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Fillte�n _Nua"
 
 #: ui/evolution-mail-message.xml.h:52
-msgid "Next Important Message"
-msgstr ""
+msgid "Move"
+msgstr "Bog"
 
 #: ui/evolution-mail-message.xml.h:53
-msgid "Next Message"
-msgstr "Sc�al ar Lean"
+#, fuzzy
+msgid "Move selected message(s) to another folder"
+msgstr "Fillte�n _Nua"
 
 #: ui/evolution-mail-message.xml.h:54
-msgid "Next Thread"
-msgstr ""
+msgid "Next"
+msgstr "Ar Lean"
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Unread Message"
-msgstr ""
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "Post an sce�l seo"
 
+# NL
 #: ui/evolution-mail-message.xml.h:56
-msgid "Open the selected message in a new window"
-msgstr "Post an sce�l seo"
+#, fuzzy
+msgid "Next _Thread"
+msgstr "An Isiltir"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Open the selected message in the composer to re-send it"
-msgstr ""
+#, fuzzy
+msgid "Next _Unread Message"
+msgstr "Sc�al ar Lean"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Original Si_ze"
-msgstr ""
+msgid "Open the selected message in a new window"
+msgstr "Post an sce�l seo"
 
 #: ui/evolution-mail-message.xml.h:59
-#, fuzzy
-msgid "Preview the message to be printed"
-msgstr "Post an sce�l seo"
+msgid "Open the selected message in the composer to re-send it"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:60
-msgid "Previous"
-msgstr "Riomh"
+msgid "Original Si_ze"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-msgid "Previous Important Message"
+msgid "P_revious Unread Message"
 msgstr "Post an sce�l seo"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous Message"
-msgstr ""
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Post an sce�l seo"
 
 #: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Previous Unread Message"
+msgid "Preview the message to be printed"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:64
+msgid "Previous"
+msgstr "Riomh"
+
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Clodaigh teachtairecht seo"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:68
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "Freagrair"
-
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "Freagrair do gach rud"
-
-#: 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-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr ""
 
-#: 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-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-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 ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr ""
 
-#: 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-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr ""
 
-#: 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-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Attached"
@@ -26394,57 +26880,74 @@ msgid "_Forward Message"
 msgstr "Sheoladh Chuig duine"
 
 #: ui/evolution-mail-message.xml.h:98
+msgid "_Go To"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Inline"
 msgstr "Sheoladh Chuig duine"
 
 # PE
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Larger"
 msgstr "_Larger"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Message Display"
 msgstr "_Post sce�l"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Sc�al ar Lean"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "Taispea�n _Gn�th"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_Oscail Teachtaireacht"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Post an sce�l seo"
+
+#: ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Quoted"
 msgstr "Sheoladh Chuig duine"
 
-#: 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:55
 msgid "_Tools"
 msgstr "_Uirlis�"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Athdealaigh"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 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: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:36
 msgid "_Close"
 msgstr "_D�n"
 
 #: 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:56
 msgid "_View"
 msgstr "_Radharc"
 
@@ -26468,11 +26971,11 @@ msgstr ""
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
-#: 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 "_Form�id"
 
-#: 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"
 
@@ -26488,6 +26991,10 @@ msgstr ""
 msgid "Insert text file..."
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Osc�il"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr ""
@@ -26522,7 +27029,7 @@ msgid "Save in folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
 #: 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 ""
 
@@ -26547,6 +27054,7 @@ msgid "Send _later"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Post an sce�l seo i HTML"
 
@@ -26620,7 +27128,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr ""
 
@@ -26632,11 +27140,7 @@ msgstr "_Osc�il..."
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Sl�nd�il"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "C_�idi�"
 
@@ -26692,39 +27196,41 @@ msgstr ""
 msgid "Re_fresh Task"
 msgstr ""
 
-#: 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:3
 msgid "Copy selected task"
 msgstr ""
 
-#: 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:6
 #, fuzzy
 msgid "Delete completed tasks"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "Mar_k as Complete"
 msgstr "% Rinneadh:"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:15
-msgid "Tasks Settings..."
-msgstr ""
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Post an sce�l seo"
+
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Clodaigh teachtairecht seo"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -26792,117 +27298,121 @@ msgid "Open this folder in an other window"
 msgstr "Post an sce�l seo"
 
 #: ui/evolution.xml.h:21
-msgid "Show information about Ximian Evolution"
+msgid "Send / Receive"
 msgstr ""
 
 #: ui/evolution.xml.h:22
-msgid "Submit Bug Report"
+msgid "Send queued items and retrieve new items"
 msgstr ""
 
 #: ui/evolution.xml.h:23
-msgid "Submit _Bug Report"
+msgid "Show information about Ximian Evolution"
 msgstr ""
 
 #: ui/evolution.xml.h:24
-msgid "Submit a bug report using Bug Buddy"
+msgid "Submit Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:25
-msgid "Toggle"
+msgid "Submit _Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:26
-msgid "Toggle whether to show the folder bar"
+msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
 #: ui/evolution.xml.h:27
-msgid "Toggle whether to show the shortcut bar"
+msgid "Toggle"
 msgstr ""
 
 #: ui/evolution.xml.h:28
-msgid "Toggle whether we are working offline."
+msgid "Toggle whether to show the folder bar"
 msgstr ""
 
 #: ui/evolution.xml.h:29
-msgid "View the selected folder"
+msgid "Toggle whether to show the shortcut bar"
+msgstr ""
+
+#: ui/evolution.xml.h:30
+msgid "Toggle whether we are working offline."
 msgstr ""
 
 #: ui/evolution.xml.h:31
+msgid "View the selected folder"
+msgstr ""
+
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "_Faoi Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_C�ip..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Import..."
 msgstr "Chl�_fhoireann..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Bog..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Nua"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "Albachta� Phoist"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:47
-msgid "_Shortcut"
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:48
-msgid "_Shortcut Bar"
+#: ui/evolution.xml.h:53
+msgid "_Shortcut"
 msgstr ""
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
+#: ui/evolution.xml.h:54
+msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr ""
 
 # IS
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 #, fuzzy
 msgid "Reload"
 msgstr "An �oslainn"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr ""
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr ""
-
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "Address Cards"
@@ -26922,19 +27432,23 @@ msgid "As Sent Folder"
 msgstr "Fillte�n _Nua"
 
 #: views/mail/galview.xml.h:2
-msgid "By Sender"
+msgid "By Follow Up Flag"
 msgstr ""
 
 #: views/mail/galview.xml.h:3
-msgid "By Status"
+msgid "By Sender"
 msgstr ""
 
 #: views/mail/galview.xml.h:4
+msgid "By Status"
+msgstr ""
+
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr ""
 
 # as 
-#: views/mail/galview.xml.h:5
+#: views/mail/galview.xml.h:6
 #, fuzzy
 msgid "Messages"
 msgstr "Asaimis"
@@ -27087,20 +27601,20 @@ msgstr "�cr�inis"
 msgid "Visual"
 msgstr "M�chumasach"
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, fuzzy, c-format
 msgid "Unknown character set: %s"
 msgstr "Earraidh gan aithne: %s"
 
-#: 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:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Eile..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr ""
 
@@ -27108,30 +27622,32 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr ""
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Glan"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "S�nbh�il le..."
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Taispe�n gach Rud"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "S�bh�il 'san _fillte�n"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Eolas"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Earraidh"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Freagra"
@@ -27145,11 +27661,20 @@ msgstr "Sce�l"
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "_Cuardaigh"
+#: widgets/misc/e-search-bar.c:477
+msgid "_Find Now"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Glan"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Glan"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr ""
 
@@ -27175,386 +27700,721 @@ msgstr ""
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
-msgid "Card: "
-msgstr "Carta: "
+#~ msgid "Edit Addressbook"
+#~ msgstr "Eagar Leabhar Sheoladh"
 
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Ainm: "
+#~ msgid "Add Addressbook"
+#~ msgstr "Suim Leabhar Seoladh"
 
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-" Clann:       "
+#~ msgid "Base"
+#~ msgstr "B��n"
 
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Data Breithe: "
+#~ msgid "Server Name"
+#~ msgstr "Ainm do Fhreastala�"
 
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Seoladh:"
+#~ msgid "Other Contacts"
+#~ msgstr "Tadhalla� Eile"
 
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-" Bosca Phoist: "
+#~ msgid "(none)"
+#~ msgstr "(gan ainm)"
 
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Sr�id:       "
+#~ msgid "_Other"
+#~ msgstr "_Eile"
 
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Cathair:     "
+#~ msgid "0%"
+#~ msgstr "0%"
 
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Cuige:      "
+#~ msgid "10%"
+#~ msgstr "10%"
 
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  C�d Phoist: "
+#~ msgid "20%"
+#~ msgstr "20%"
 
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  T�r:         "
+#~ msgid "30%"
+#~ msgstr "30%"
 
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telef�in:\n"
+#~ msgid "40%"
+#~ msgstr "40%"
 
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telef�n:"
+#~ msgid "50%"
+#~ msgstr "50%"
 
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"R-phost:\n"
+#~ msgid "60%"
+#~ msgstr "60%"
 
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"R-phost:"
+#~ msgid "70%"
+#~ msgstr "70%"
 
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Am Cr�os: "
+#~ msgid "80%"
+#~ msgstr "80%"
 
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Ainm:  "
+#~ msgid "90%"
+#~ msgstr "90%"
 
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Tr�cht:"
+#~ msgid "100%"
+#~ msgstr "100%"
 
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Eochair Poibl�: "
+#~ msgid "_Delete this Task"
+#~ msgstr "Scr�os an teasc seo"
 
-msgid "New _Contact"
-msgstr "_Tadhall Nua"
+#, fuzzy
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Eolas"
 
-msgid "B_usiness"
-msgstr "_Gn�"
+#, fuzzy
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Eolas"
 
-msgid "_Business"
-msgstr "_Gn�"
+#, fuzzy
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Eolas"
 
-msgid "_Home"
-msgstr "_Baile"
+#, fuzzy
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Cr�ochnaithe.`"
 
-msgid "New _Task"
-msgstr "_Teasc Nua"
+#, fuzzy
+#~ msgid "iCalendar Information"
+#~ msgstr "eolas fheilire"
 
-msgid "(Unknown)"
-msgstr "(Gan aithne)"
+#, fuzzy
+#~ msgid "iCalendar Error"
+#~ msgstr "Feilire"
 
-msgid "New _Mail Message"
-msgstr "Teachtaireacht _Post Nua"
+#, fuzzy
+#~ msgid "An unknown person"
+#~ msgstr "iEarraidh gan Aithne"
 
-msgid "Special Folders"
-msgstr "_Fillte�in Speis�alta"
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ar bith</i>"
 
-msgid "�F"
-msgstr "�F"
+#, fuzzy
+#~ msgid "Status:"
+#~ msgstr "_St�das:"
 
-msgid "�C"
-msgstr "�C"
+#, fuzzy
+#~ msgid "Choose an action:"
+#~ msgstr "Fillte�n _Nua"
 
-msgid " _Remove"
-msgstr "_Scr�os"
+#, fuzzy
+#~ msgid "Update"
+#~ msgstr "Data"
 
-msgid "All _folders:"
-msgstr "Gach _Fillte�in:"
+#, fuzzy
+#~ msgid "Accept"
+#~ msgstr "Cuntas"
 
 #, fuzzy
-msgid "%s at an unknown time"
-msgstr "iEarraidh gan Aithne"
+#~ msgid "Decline"
+#~ msgstr "Dealaigh"
+
+#, fuzzy
+#~ msgid "Send Latest Information"
+#~ msgstr "Eolas Theasc"
 
-msgid "GnomeCard:"
-msgstr "GnomeCard: "
+#~ msgid "Task Information"
+#~ msgstr "Eolas Theasc"
 
 #, fuzzy
-msgid "Encrypted message"
-msgstr "Post an sce�l seo"
+#~ msgid "Event information"
+#~ msgstr "eolas fheilire"
 
 #, fuzzy
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Te�p ag fork: %s"
+#~ msgid "Task information"
+#~ msgstr "Eolas Theasc"
 
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evolution %s"
+#, fuzzy
+#~ msgid "Journal information"
+#~ msgstr "Eolas Cuntais"
 
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evolution %s [%s]"
+#, fuzzy
+#~ msgid "Free/Busy information"
+#~ msgstr "Eolas"
 
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Go raibh maith agat\n"
-"An Fhoireann Evolution\n"
+#, fuzzy
+#~ msgid "Calendar information"
+#~ msgstr "eolas fheilire"
 
-msgid "Password:"
-msgstr "Pasfhocal:"
+#, fuzzy
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "Eolas"
 
 #, fuzzy
-msgid "Evolution Shortcuts"
-msgstr "Evolution"
+#~ msgid "iCalendar information"
+#~ msgstr "eolas fheilire"
 
-msgid "Delete folder '%s'"
-msgstr "Dealaigh Fillte�n '%s'"
+# tg
+#, fuzzy
+#~ msgid "Task"
+#~ msgstr "T�ids�cis"
 
-msgid "%d"
-msgstr "%d"
+#, fuzzy
+#~ msgid "Status: %s"
+#~ msgstr "_St�das:"
 
-msgid "%d/%m/%Y"
-msgstr "%d/%m/%Y"
+#, fuzzy
+#~ msgid "Percent Complete: %i"
+#~ msgstr "Cr�ochnaithe.`"
 
-msgid "%Y/%m/%d"
-msgstr "%a %d/%m/%Y"
+#, fuzzy
+#~ msgid "URL: %s"
+#~ msgstr "URL:"
 
-msgid "_Company:"
-msgstr "_Teoranta:"
+#, fuzzy
+#~ msgid "Categories: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Aicm�:"
 
-msgid "SASL"
-msgstr "SASL"
+#, fuzzy
+#~ msgid "Contacts: "
+#~ msgstr ""
+#~ "\n"
+#~ "Tr�cht:"
 
-msgid "Root DN:"
-msgstr "Pr�omh DN:"
+#, fuzzy
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Te�p ag fork: %s"
 
-msgid "URI"
-msgstr "URI"
+#, fuzzy
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "Te�p ag fork: %s"
 
-msgid "123"
-msgstr "123"
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "Post r�omhphost"
 
-msgid "a"
-msgstr "a"
+#~ msgid "Run %s"
+#~ msgstr "De�n %s"
 
-msgid "b"
-msgstr "b"
+#~ msgid "Close %s"
+#~ msgstr "D�n %s"
 
-msgid "c"
-msgstr "c"
+#, fuzzy
+#~ msgid "page"
+#~ msgstr "Leathanach"
 
-msgid "e"
-msgstr "e"
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr "Ag oscailt an t-eolaire %s"
 
-msgid "f"
-msgstr "f"
+#, fuzzy
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Earraidh ag s�bhh�il sc�ala� do: %s\n"
+#~ " %s"
 
-msgid "g"
-msgstr "g"
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Coimri�"
 
-msgid "h"
-msgstr "h"
+#, fuzzy
+#~ msgid "Test service"
+#~ msgstr "Suimigh Seirbh�s"
 
-msgid "i"
-msgstr "i"
+#, fuzzy
+#~ msgid "Update now"
+#~ msgstr "Data"
+
+#, fuzzy
+#~ msgid "Update every "
+#~ msgstr "Data"
 
-msgid "j"
-msgstr "j"
+#, fuzzy
+#~ msgid "Needs Reply"
+#~ msgstr "Freagrair"
 
-msgid "k"
-msgstr "k"
+#~ msgid "Default"
+#~ msgstr "Gn�th"
 
-msgid "l"
-msgstr "l"
+#~ msgid "Mailbox Format"
+#~ msgstr "Form�id Boscaphoist"
 
-msgid "m"
-msgstr "m"
+#~ msgid " (default)"
+#~ msgstr " (gn�th)"
 
-msgid "n"
-msgstr "n"
+#~ msgid "Mail Settings"
+#~ msgstr "Albachta� Phoist"
 
-msgid "o"
-msgstr "o"
+#~ msgid "Subject is %s"
+#~ msgstr "Abair is %s"
 
-msgid "p"
-msgstr "p"
+#~ msgid "Mail from %s"
+#~ msgstr "Sc�al � %s"
 
-msgid "q"
-msgstr "q"
+#~ msgid "%s mailing list"
+#~ msgstr "l�osta r�omhphost %s"
 
-msgid "r"
-msgstr "r"
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: Inbosca"
+
+#~ msgid "Account"
+#~ msgstr "Cuntas"
 
-msgid "s"
-msgstr "s"
+#~ msgid "Display"
+#~ msgstr "Taispea�n"
 
-msgid "t"
-msgstr "t"
+#~ msgid "Edit..."
+#~ msgstr "Eagar..."
 
-msgid "u"
-msgstr "u"
+#~ msgid "News"
+#~ msgstr "Nuacht"
 
-msgid "v"
-msgstr "v"
+#~ msgid "_Organization:"
+#~ msgstr "_Buidheann"
 
-msgid "w"
-msgstr "w"
+#, fuzzy
+#~ msgid "_Server type: "
+#~ msgstr "_Cineal Freastala�:"
 
-msgid "y"
-msgstr "y"
+#~ msgid "seconds."
+#~ msgstr "soicind."
 
-msgid "z"
-msgstr "z"
+#, fuzzy
+#~ msgid "Mail Summary"
+#~ msgstr "Coimri� phoist"
 
-msgid "Save calendar"
-msgstr "S�bh�il Feilire"
+#~ msgid "kph"
+#~ msgstr "kph"
 
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#~ msgid "inHg"
+#~ msgstr "inHg"
 
-msgid "Calendar Preferences"
-msgstr "Roghanna Feilire"
+#~ 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)"
+
+#~ msgid "New List"
+#~ msgstr "L�osta Nua"
+
+#, fuzzy
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Cruthaigh All Day Event nua"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Cruthaigh _Teasc Nua"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Cruthaigh Coinne _Nua"
+
+#, fuzzy
+#~ msgid "Create a _New Meeting"
+#~ msgstr "Cruthaigh Coinne _Nua"
+
+#, fuzzy
+#~ msgid "Create a new meeting request"
+#~ msgstr "Scr�os an sceal seo"
+
+#~ msgid "New Appointment"
+#~ msgstr "Coinne Nua"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Coinne..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Albachta� Feilire..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Teasc..."
+
+#~ msgid "New Message"
+#~ msgstr "Sce�l Nua"
+
+#~ msgid "Show All"
+#~ msgstr "Taispe�n gach Rud"
+
+#~ msgid "Sear_ch"
+#~ msgstr "_Cuardaigh"
+
+#~ msgid "Card: "
+#~ msgstr "Carta: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Ainm: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ " Clann:       "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Data Breithe: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Seoladh:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ " Bosca Phoist: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Sr�id:       "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Cathair:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Cuige:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  C�d Phoist: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  T�r:         "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telef�in:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telef�n:"
 
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "R-phost:\n"
 
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "R-phost:"
 
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Am Cr�os: "
 
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ainm:  "
 
-msgid "Background:"
-msgstr "D�lra:"
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Tr�cht:"
 
-msgid "View All"
-msgstr "Taidpe�in Gach Rud"
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Eochair Poibl�: "
 
-msgid "_Day"
-msgstr "_L�"
+#~ msgid "New _Contact"
+#~ msgstr "_Tadhall Nua"
 
-msgid "_Open Calendar"
-msgstr "_Osc�il Feilire"
+#~ msgid "B_usiness"
+#~ msgstr "_Gn�"
 
-msgid "About..."
-msgstr "Faoi..."
+#~ msgid "_Business"
+#~ msgstr "_Gn�"
 
-msgid "Address _Book... (FIXME)"
-msgstr "Leabhair Sheolaidh"
+#~ msgid "_Home"
+#~ msgstr "_Baile"
 
-msgid "C_lear"
-msgstr "G_lan"
+#~ msgid "New _Task"
+#~ msgstr "_Teasc Nua"
 
-msgid "Close this appointment"
-msgstr "D�n an coinne seo"
+#~ msgid "(Unknown)"
+#~ msgstr "(Gan aithne)"
 
-msgid "Pre_vious"
-msgstr "_Riomh"
+#~ msgid "New _Mail Message"
+#~ msgstr "Teachtaireacht _Post Nua"
 
-msgid "Print S_etup..."
-msgstr "Socraigh Priont�il..."
+#~ msgid "�F"
+#~ msgstr "�F"
 
-msgid "_About..."
-msgstr "_Faoi..."
+#~ msgid "�C"
+#~ msgstr "�C"
 
 #, fuzzy
-msgid "_Mail Message (FIXME)"
-msgstr "_Post sce�l"
+#~ msgid "%s at an unknown time"
+#~ msgstr "iEarraidh gan Aithne"
 
-msgid "_Move to Folder... (FIXME)"
-msgstr "S�bh�il 'san _fillte�n"
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeCard: "
 
-msgid "_Note (FIXME)"
-msgstr "_Nota"
+#, fuzzy
+#~ msgid "Encrypted message"
+#~ msgstr "Post an sce�l seo"
 
-msgid "_Task (FIXME)"
-msgstr "_Teasc"
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Te�p ag fork: %s"
+
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evolution %s"
 
-msgid "Print message..."
-msgstr "Clodaigh teachtairecht..."
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evolution %s [%s]"
 
-msgid "Reply to all"
-msgstr "Freagrair do Gach rud"
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Go raibh maith agat\n"
+#~ "An Fhoireann Evolution\n"
 
-msgid "_Reply"
-msgstr "_Freagrair"
+#~ msgid "Password:"
+#~ msgstr "Pasfhocal:"
 
-msgid "Save in _folder... (FIXME)"
-msgstr "S�bh�il 'san _fillte�n..."
+#, fuzzy
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "Evolution"
 
-msgid "_Appointment (FIXME)"
-msgstr "_Coinne"
+#~ msgid "Delete folder '%s'"
+#~ msgstr "Dealaigh Fillte�n '%s'"
+
+#~ msgid "%d"
+#~ msgstr "%d"
+
+#~ msgid "%d/%m/%Y"
+#~ msgstr "%d/%m/%Y"
+
+#~ msgid "%Y/%m/%d"
+#~ msgstr "%a %d/%m/%Y"
+
+#~ msgid "_Company:"
+#~ msgstr "_Teoranta:"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Root DN:"
+#~ msgstr "Pr�omh DN:"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "a"
+#~ msgstr "a"
+
+#~ msgid "b"
+#~ msgstr "b"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "e"
+#~ msgstr "e"
+
+#~ msgid "f"
+#~ msgstr "f"
+
+#~ msgid "g"
+#~ msgstr "g"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "i"
+#~ msgstr "i"
+
+#~ msgid "j"
+#~ msgstr "j"
+
+#~ msgid "k"
+#~ msgstr "k"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "m"
+#~ msgstr "m"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "o"
+#~ msgstr "o"
+
+#~ msgid "p"
+#~ msgstr "p"
+
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "u"
+#~ msgstr "u"
+
+#~ msgid "v"
+#~ msgstr "v"
+
+#~ msgid "w"
+#~ msgstr "w"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "z"
+#~ msgstr "z"
+
+#~ msgid "Save calendar"
+#~ msgstr "S�bh�il Feilire"
+
+#~ msgid "%I:%M%p"
+#~ msgstr "%I:%M%p"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid "Background:"
+#~ msgstr "D�lra:"
+
+#~ msgid "View All"
+#~ msgstr "Taidpe�in Gach Rud"
+
+#~ msgid "_Day"
+#~ msgstr "_L�"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Osc�il Feilire"
+
+#~ msgid "About..."
+#~ msgstr "Faoi..."
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "Leabhair Sheolaidh"
+
+#~ msgid "C_lear"
+#~ msgstr "G_lan"
+
+#~ msgid "Close this appointment"
+#~ msgstr "D�n an coinne seo"
+
+#~ msgid "Pre_vious"
+#~ msgstr "_Riomh"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Socraigh Priont�il..."
+
+#~ msgid "_About..."
+#~ msgstr "_Faoi..."
+
+#, fuzzy
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Post sce�l"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "S�bh�il 'san _fillte�n"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Nota"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Teasc"
+
+#~ msgid "Print message..."
+#~ msgstr "Clodaigh teachtairecht..."
+
+#~ msgid "Reply to all"
+#~ msgstr "Freagrair do Gach rud"
+
+#~ msgid "_Reply"
+#~ msgstr "_Freagrair"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "S�bh�il 'san _fillte�n..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Coinne"
 
 #~ msgid ""
 #~ "\n"
diff --git a/po/gl.po b/po/gl.po
index 79f57afb8c..92c3b52169 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-11-14 19:26-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -39,21 +39,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importa ficheiros VCard a 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 "Arquivar coma"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nome:"
 
 #: 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 "Correo Electr�nico"
 
 #: 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:1731
 msgid "Primary"
 msgstr "Principal"
 
@@ -64,15 +65,16 @@ 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:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asistente"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: 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
 msgid "Business"
 msgstr "Traballo"
 
@@ -83,12 +85,12 @@ msgid "Bus"
 msgstr "Ocupado"
 
 #: 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:1720
 msgid "Callback"
 msgstr "Resposta"
 
 #: 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:1722
 msgid "Company"
 msgstr "Compa��a"
 
@@ -99,13 +101,14 @@ msgstr "Copiar"
 
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: 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
 msgid "Home"
 msgstr "Particular"
 
 #: 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 "Organizaci�n"
 
@@ -117,18 +120,20 @@ msgstr ""
 "Org: "
 
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "M�bil"
 
 #: 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:1721
 msgid "Car"
 msgstr "Autom�bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: 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:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
@@ -138,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:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "Traballo 2"
 
@@ -154,69 +159,68 @@ msgid "Bus 2"
 msgstr "Ocupado"
 
 #: 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:1724
 msgid "Home 2"
 msgstr "Particular 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:1726
+#: 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:1656
-#: addressbook/gui/contact-editor/e-contact-editor.c:1714
-#: mail/mail-config.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "Outro"
 
 #: 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:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: 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:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Correo Electr�nico 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 "Sitio Web"
 
@@ -225,7 +229,7 @@ msgid "Url"
 msgstr ""
 
 #: 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 "Departamento"
 
@@ -234,7 +238,7 @@ msgid "Dep"
 msgstr ""
 
 #: 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 "Oficina"
 
@@ -244,12 +248,12 @@ msgid "Off"
 msgstr "Oficina"
 
 #: 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�tulo"
 
 #: 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 "Profesi�n"
 
@@ -258,7 +262,7 @@ msgid "Prof"
 msgstr ""
 
 #: 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 "Xestor"
 
@@ -272,7 +276,7 @@ msgid "Ass"
 msgstr ""
 
 #: 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 "Alcume"
 
@@ -282,12 +286,12 @@ msgid "Nick"
 msgstr "Alcume"
 
 #: 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 "C�nxuxe"
 
 #: 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 "Nota"
 
@@ -301,7 +305,7 @@ msgid "CALUri"
 msgstr ""
 
 #: 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 libre-ocupado"
 
@@ -335,302 +339,16 @@ msgstr "Categor�as"
 msgid "Family Name"
 msgstr "Nome Completo:"
 
-#: 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 "Tarxeta: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Nome: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Prefixo:    "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Entregado:      "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Adicional: "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Familia:     "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Sufixo:     "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Data de Nacemento: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Enderezo:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Apdo. de Correos: "
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Ext:         "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  R�a:         "
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Cidade:      "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Rexi�n:      "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  C�digo Postal: "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Pa�s:        "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Etiqueta de Entrega: "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Tel�fonos:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Tel�fono:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"Correo Electr�nico:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"Correo Electr�nico:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Cliente de Correo: "
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Fuso Horario: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Localizaci�n Xeogr�fica: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Posto Laboral: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Nome:  "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Unidade:  "
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Unidade2: "
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Unidade3: "
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Unidade4: "
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Categor�as: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Comentario: "
-
-#. 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"
-"Cadea Exclusiva: "
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Clave P�blica: "
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Varias VCards"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard de %s"
@@ -638,98 +356,96 @@ msgstr "VCard de %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: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:1130
-#: 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:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2215
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 #, fuzzy
 msgid "Searching..."
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 #, fuzzy
 msgid "Loading..."
 msgstr "Agardando..."
 
 #. 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 ""
 "Erro ao executar a expresi�n de busca: %s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:475
-#, fuzzy
-msgid "Connecting to LDAP server..."
-msgstr "Conectando ao servidor..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:485
-#, fuzzy
-msgid "Unable to connect to LDAP server."
-msgstr ""
-"Non foi posible autenticarse co servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/backend/pas/pas-backend-ldap.c:501
-#, fuzzy
-msgid "Waiting for connection to LDAP server..."
-msgstr "Conectando ao servidor..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:870
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Conectando ao servidor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:971
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Eliminando as tarxetas..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2160
-msgid "Receiving LDAP search results..."
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2165
-msgid "Restarting search."
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
+msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:294
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Erro ao elimina-la tarxeta"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Non foi posible analizar o URL `%s'"
+
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "Enderezo de Correo:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Non foi posible cargar o cursor\n"
 
-#: addressbook/conduit/address-conduit.c:307
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:1089
-#: calendar/conduits/calendar/calendar-conduit.c:981
-#: calendar/conduits/todo/todo-conduit.c:694
+#: 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 "Non foi posible iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:1090
-#: calendar/conduits/calendar/calendar-conduit.c:982
-#: calendar/conduits/todo/todo-conduit.c:695
+#: 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 "Non foi posible iniciar wombat"
 
-#: 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 "Non foi posible ler o bloque de aplicaci�n Enderezo do pilot"
 
@@ -746,227 +462,114 @@ msgid "A sample Bonobo control which displays an addressbook."
 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
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Compo�ente de Evolution para manexar contactos."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#, 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
 msgid "Factory for the sample Addressbook control"
 msgstr "F�brica para o control de exemplo do Libro de Enderezos"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Cartafol que cont�n informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor NNTP:"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "Cartafol que cont�n informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Novo Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
-msgstr "Novo C_ontacto"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
-msgstr "Nova _Lista de Contactos"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
-msgstr "Editar o Libro de Enderezos"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
-msgstr "Nome da Conta"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "Engadir Libro de Enderezos"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
-msgstr "Fontes do Libro de Enderezos"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "B�sico"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "De_lete"
-msgstr "E_liminar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "Enderezo de Correo:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "One"
-msgstr "�nico"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
-msgstr "_Base da busca:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search s_cope: "
-msgstr "�mbito da busca:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Server Name"
-msgstr "Nome do Servidor"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "The information below is required in order to add an addressbook.  "
-msgstr ""
-"A informaci�n de embaixo � necesaria para engadir un libro de enderezos.  "
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "This information is not required for most ldap servers. "
-msgstr "Esta informaci�n non � obrigatoria nos m�is dos servidores 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."
-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."
-
-#: 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 ""
-"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."
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-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."
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
-msgstr "Este e o porto que usa o servidor 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 ""
-"Este nome hase empregar para identifica-la conta. S� se empregar� para "
-"amosar."
-
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "_Account name:"
-msgstr "Nome da Cont_a:"
-
-#: 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 "_Engadir"
-
-#: 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 "_Editar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
-msgstr "O _meu servidor require autenticaci�n"
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
-msgstr "_Porto:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
-msgstr "Nome do _Servidor:"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "Lista de _Contactos"
 
-#: 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "Non foi posible inicializar gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:167
-msgid "Other Contacts"
-msgstr "Outros Contactos"
-
-#: addressbook/gui/component/addressbook.c:468
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: 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"
@@ -976,7 +579,7 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP est�\n"
 "f�ra de servicio"
 
-#: 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"
@@ -988,7 +591,7 @@ msgstr ""
 "debe compilar o programa desde as fontes do CVS\n"
 "logo de obter OpenLDAP desde o enlace de abaixo.\n"
 
-#: 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."
@@ -996,57 +599,50 @@ 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:623
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: addressbook/gui/component/addressbook.c:786
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Calquera campo cont�n"
-
-#: addressbook/gui/component/addressbook.c:787
-msgid "Name contains"
-msgstr "O nome cont�n"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "remata en"
 
-#: addressbook/gui/component/addressbook.c:788
-msgid "Email contains"
-msgstr "Enderezo cont�n"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "Correo Electr�nico 2"
 
-#: addressbook/gui/component/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "A categor�a �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:772
+#: 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
 msgid "Advanced..."
 msgstr "Avanzado..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1031
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Calquera Categor�a"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1083
 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:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1686
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 msgid "Primary Email"
 msgstr "Correo Electr�nico Principal"
 
@@ -1092,6 +688,625 @@ 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 "
+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
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "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
+#, fuzzy
+msgid "Always"
+msgstr "Alarmas"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "An�nimo"
+
+#: 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 "Desconectando de %s"
+
+#: 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 "Personalizar"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "E_liminar"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "_Nome da lista:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "Enderezo de Correo:"
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "B_uscar"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Xeral"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+#, fuzzy
+msgid "LDAP Attribute"
+msgstr "Autenticaci�n LDAP"
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Configuraci�n do Correo"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Marxes"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "Cada"
+
+#: 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 "�nico"
+
+#: 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 "Opci�ns por defecto"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Opci�ns por defecto"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "�mbito da busca:"
+
+#. 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 "Buscar M_ensaxe..."
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Seleccionar Todo"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Eliminada"
+
+#: 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 "Informaci�n da Fonte"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Conectando ao servidor..."
+
+#: 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 "Sub"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Armacenar busca como CartafolV"
+
+#: 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 ""
+"Este nome hase empregar para identifica-la conta. S� se empregar� para "
+"amosar."
+
+#: 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 "_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
+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:139
+msgid "_Add"
+msgstr "_Engadir"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Engadir"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Engadir acci�n"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Engadir acci�n"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Alarmas"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Borrar todo"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Amosar"
+
+#: 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:152 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 "_Editar"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Editar cita"
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Opci�ns"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Porto:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Opci�ns por defecto"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "_Base da busca:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "Nome do _Servidor:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Tempo de adiamento (minutos)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Conta"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "editor-de-contactos"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Desconectando de %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 "Xeral"
+
+#: 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 "Buscar M_ensaxe..."
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Interface de selecci�n de nome do Libro de Enderezos de Evolution"
@@ -1103,9 +1318,9 @@ msgstr ""
 "Evolution"
 
 #: 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: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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -1136,7 +1351,12 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Buscar un contacto"
+
+#: 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"
@@ -1146,7 +1366,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"
@@ -1154,1227 +1374,1302 @@ 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 "Seleccionar Contactos do Libro de Enderezos"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "C_ont�n:"
+msgid "Select Names"
+msgstr "Seleccionar Nomes"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Co_ntacts:"
-msgstr "Co_ntactos:"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "�Borrar Contacto?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "F_ind"
-msgstr "B_uscar"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Contactos"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "Seleccionar Nomes"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
-msgstr "Amosar contactos que cumpran os seguintes criterios:"
+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 "_Mover..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Categor�a:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "Carta_fol:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Message Recipients:"
-msgstr "Destinatarios da _Mensaxe:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "Anni_versary:"
-msgstr "Ani_versario:"
+#, fuzzy
+msgid "A_ssistant's name:"
+msgstr "Nome do _asistente:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "B_usiness"
-msgstr "T_raballo"
+#, fuzzy
+msgid "Add_ress..."
+msgstr "_Enderezo..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Business _Fax"
-msgstr "_Fax do Traballo"
+msgid "Anni_versary:"
+msgstr "Ani_versario:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#, fuzzy
+msgid "Birthda_y:"
+msgstr "_Aniversario:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "C_ontacts..."
+msgstr "C_ontactos..."
+
+#: 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 "Ca_tegor�as..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "D_epartment:"
+msgstr "_Departamento:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Detalles"
 
-#: 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 libre-ocupado"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "File A_s:"
 msgstr "Ar_quivar coma:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "General"
-msgstr "Xeral"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#, fuzzy
+msgid "Full _Name..."
+msgstr "Nome _Completo..."
 
-#: 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"
 "of that information here."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr "Novo tipo de tel�fono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "No_tes:"
 msgstr "No_tas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Organi_zation:"
 msgstr "Organi_zaci�n:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#, fuzzy
+msgid "P_rofession:"
+msgstr "_Profesi�n:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Phone Types"
 msgstr "Tipos de Tel�fono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Wants to receive _HTML mail"
-msgstr "Quere recibir correo en _HTML"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Address..."
-msgstr "_Enderezo..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Assistant's name:"
-msgstr "Nome do _asistente:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Birthday:"
-msgstr "_Aniversario:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+msgid "S_pouse:"
+msgstr "_C�nxuxe:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Business"
-msgstr "_Traballo"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#, fuzzy
+msgid "This is the _mailing address"
+msgstr "_Este � o enderezo de correo"
 
-#: 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 "_Contactos..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "Wants to receive _HTML mail"
+msgstr "Quere recibir correo en _HTML"
 
-#: 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: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:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Department:"
-msgstr "_Departamento:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Full Name..."
-msgstr "Nome _Completo..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Home"
-msgstr "_Particular"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Job title:"
 msgstr "_Posto de traballo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager's Name:"
 msgstr "Nome do _Administrador:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Mobile"
-msgstr "_M�bil"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
 msgstr "_Alcume:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Profession:"
-msgstr "_Profesi�n:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "_Public Calendar URL:"
 msgstr "Imprimir Axenda"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Spouse:"
-msgstr "_C�nxuxe:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr "_Este � o enderezo de correo"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "Enderezo da p�xina _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 ""
-"�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:756
-#, fuzzy
-msgid "Category editor not available."
-msgstr "Non hai unha descrici�n dispo�ible."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:763
-msgid "This contact belongs to these categories:"
-msgstr "Este contacto pertence a estas categor�as:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Non se puido atopa-lo control dun campo: `%s'"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
-msgstr "Engadir Contacto Rapidamente"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
-msgstr "Editar Completo"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr "Nome Completo:"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
-msgid "E-mail"
-msgstr "Correo Electr�nico"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
-#, fuzzy
-msgid "list"
-msgstr "Br�tema"
-
-#: 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 xa existe\n"
-"�Quere sobrescribilo?"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Enderezo _2:"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
+msgstr "Estados Unidos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
 msgid "Afghanistan"
 msgstr "Afganist�n"
 
-#: 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 "Albania"
 
-#: 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 "Alxeria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Anguilla"
 msgstr "Anguila"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Antarctica"
 msgstr "Ant�rtida"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Antigua And Barbuda"
 msgstr "Antiga e Barbuda"
 
-#: 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 "Arxentina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Aruba"
 msgstr "Aruba"
 
-#: 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 "Australia"
 
-#: 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 "Austria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Azerbaijan"
 msgstr "Acerbaix�n"
 
-#: 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 "Bahamas"
 
-#: 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 "Bahrain"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Belarus"
 msgstr "Bielorrusia"
 
-#: 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�lxica"
 
-#: 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 "Belice"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bermuda"
 msgstr "Bermudas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bhutan"
 msgstr "But�n"
 
-#: 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 "Bosnia e Hercegovina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Botswana"
 msgstr "Botsuana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bouvet Island"
 msgstr "Illa 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 "Brasil"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "British Indian Ocean Territory"
 msgstr "Territorios Brit�nicos do Oc�ano �ndico"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:33
-msgid "British Virgin Islands"
-msgstr "Illas Virxes Brit�nicas"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: 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 "Bulgaria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Cambodia"
 msgstr "Camboia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Cameroon"
 msgstr "Camer�n"
 
-#: 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 "Canad�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: 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 "Illas Caym�n"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Central African Republic"
 msgstr "Rep�blica Centroafricana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Chad"
 msgstr "Chad"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-msgid "Check Address"
-msgstr "Comprobar Enderezo"
-
-#: 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 "Chile"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "China"
 msgstr "China"
 
-#: 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 "Illa Christmas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cocos (Keeling) Islands"
 msgstr "Illas 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 "Colombia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Comoros"
 msgstr "Comores"
 
-#: 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 "Congo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Cook Islands"
 msgstr "Illas 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 "Costa Rica"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cote d'Ivoire"
 msgstr "Costa de Marf�n"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:56
-msgid "Countr_y:"
-msgstr "_Pa�s:"
-
-#: 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 "Croacia"
 
-#: 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 "Chipre"
 
-#: 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 "Rep�blica Checa"
 
-#: 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 "Dinamarca"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Djibouti"
 msgstr "Xibut�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Dominica"
 msgstr "Dominica"
 
-#: 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 "Rep�blica Dominicana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "East Timor"
 msgstr "Timor Oriental"
 
-#: 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 "Ecuador"
 
-#: 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 "Exipto"
 
-#: 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 "O Salvador"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Equatorial Guinea"
 msgstr "Guinea Ecuatorial"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: 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 "Estonia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Ethiopia"
 msgstr "Etiop�a"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Falkland Islands"
 msgstr "Illas Falkland (Malvinas)"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Faroe Islands"
 msgstr "Illas Feroe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Fiji"
 msgstr "Fiji"
 
-#: 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 "Finlandia"
 
-#: 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 "Francia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "French Guiana"
 msgstr "G�iana Francesa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "French Polynesia"
 msgstr "Polinesia Francesa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Southern Territories"
 msgstr "Territorios Franceses do Sul"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Gabon"
 msgstr "Gab�n"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Gambia"
 msgstr "Gambia"
 
-#: 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 "Xeorxia"
 
-#: 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 "Alema�a"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Xibraltar"
 
-#: 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 "Grecia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Greenland"
 msgstr "Grenlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Grenada"
 msgstr "Granada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guinea-bissau"
 msgstr "Guinea-Bissau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guyana"
 msgstr "G�iana"
 
-#: 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 "Hait�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Heard And McDonald Islands"
 msgstr "Illas Heard e McDonald"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Holy See"
 msgstr "Santa S�"
 
-#: 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 "Honduras"
 
-#: 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 "Hong Kong"
 
-#: 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 "Hungr�a"
 
-#: 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 "Islandia"
 
-#: 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 "India"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Israel"
 msgstr "Israel"
 
-#: 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 "Italia"
 
-#: 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 "Xamaica"
 
-#: 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 "Xap�n"
 
-#: 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 "Xordania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Kazakhstan"
 msgstr "Kazakhst�n"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Kenya"
 msgstr "Quenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kiribati"
 msgstr "Quiribati"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#, fuzzy
+msgid "Korea, Republic Of"
+msgstr "Rep�blica de Corea"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuvait"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Kyrgyzstan"
 msgstr "Kirgizst�n"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Letonia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: my-evolution/Locations.h:1198
 msgid "Lebanon"
 msgstr "L�bano"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: my-evolution/Locations.h:1234
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: my-evolution/Locations.h:1268
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Macau"
 msgstr "Macau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Malawi"
 msgstr "Malaui"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Malaysia"
 msgstr "Malaisia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Marshall Islands"
 msgstr "Illas Marshall"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Martinique"
 msgstr "Martinica"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Mauritius"
 msgstr "Mauricio"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mayotte"
 msgstr "Maiote"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1387
 msgid "Mexico"
 msgstr "M�xico"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+msgid "Moldova, Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Monaco"
 msgstr "M�naco"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: my-evolution/Locations.h:1470
 msgid "Morocco"
 msgstr "Marrocos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Nauru"
 msgstr "Naur�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
 msgid "Netherlands"
 msgstr "Pa�ses Baixos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Netherlands Antilles"
 msgstr "Antillas Holandesas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "New Caledonia"
 msgstr "Nova Caledonia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1560
 msgid "New Zealand"
 msgstr "Nova Celandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: my-evolution/Locations.h:1562
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Niger"
 msgstr "N�xer"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nigeria"
 msgstr "Nixeria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: my-evolution/Locations.h:1574
 msgid "Norfolk Island"
 msgstr "Illa Norfolk"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Northern Mariana Islands"
 msgstr "Illas Marianas do Norte"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
 msgid "Norway"
 msgstr "Noruega"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1632
 msgid "Oman"
 msgstr "Om�n"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
 msgid "Pakistan"
 msgstr "Paquist�n"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #, fuzzy
 msgid "Palestinian Territory"
 msgstr "Territorios Brit�nicos do Oc�ano �ndico"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
 msgid "Panama"
 msgstr "Panam�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Papua New Guinea"
 msgstr "Pap�a Nova Guinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1688
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
 msgid "Peru"
 msgstr "Per�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
 msgid "Poland"
 msgstr "Polonia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1824
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:173
-msgid "Republic Of Korea"
-msgstr "Rep�blica de Corea"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:174
-msgid "Republic Of Moldova"
-msgstr "Rep�blica de Moldavia"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Reunion"
 msgstr "Xuntanza"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
 msgid "Romania"
 msgstr "Roman�a"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Russian Federation"
 msgstr "Federaci�n Rusa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Saint Kitts And Nevis"
 msgstr "Santo Cristobo e Nevis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Saint Lucia"
 msgstr "Santa Luc�a"
 
-#: 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 "San Vicente e Granadinas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Sao Tome And Principe"
 msgstr "San Tom� e Pr�ncipe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: my-evolution/Locations.h:2035
 msgid "Saudi Arabia"
 msgstr "Arabia Saud�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Seychelles"
 msgstr "Seichelles"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Sierra Leone"
 msgstr "Serra Leoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2090
 msgid "Singapore"
 msgstr "Singapur"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: my-evolution/Locations.h:2103
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: my-evolution/Locations.h:2104
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Solomon Islands"
 msgstr "Illas Salom�n"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2119
 msgid "South Africa"
 msgstr "Sud�frica"
 
-#: 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 "Xeorxia do Sul e Illas Sandwich do Sul"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
 msgid "Spain"
 msgstr "Espa�a"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "St. Helena"
 msgstr "Santa Helena"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre e Miquel�n"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Sudan"
 msgstr "Sud�n"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
 msgid "Suriname"
 msgstr "Surinam"
 
-#: 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 "Illas Svalbard e Jan Mayen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Swaziland"
 msgstr "Suazilandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
 msgid "Sweden"
 msgstr "Suecia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2183
 msgid "Switzerland"
 msgstr "Su�za"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
 msgid "Taiwan"
 msgstr "Taiw�n"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Tajikistan"
 msgstr "Tajikist�n"
 
-#: 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 "Rep�blica Unida de Tanzania"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Tokelau"
 msgstr "Toquelau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Trinidad And Tobago"
 msgstr "Trinidad e Tobago"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tunisia"
 msgstr "Tunicia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
 msgid "Turkey"
 msgstr "Turqu�a"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Turkmenistan"
 msgstr "Turkmenist�n"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Turks And Caicos Islands"
 msgstr "Illas Turk e Caicos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:218
-msgid "U.S. Virgin Islands"
-msgstr "Illas Virxes"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
 msgid "Ukraine"
 msgstr "Ucra�na"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "United Arab Emirates"
 msgstr "Emiratos �rabes Unidos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2342
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr "Rep�blica Unida de Tanzania"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-msgid "United States"
-msgstr "Estados Unidos"
-
-#: 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 "Illas Exteriores Menores dos EEUU"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: my-evolution/Locations.h:2348
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Uzbekistan"
 msgstr "Uzbekist�n"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2380
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
 msgid "Viet Nam"
 msgstr "Viet 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 "Illas Virxes"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#, fuzzy
+msgid "Virgin Islands, U.S."
+msgstr "Illas Virxes"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Wallis And Futuna Islands"
 msgstr "Illas Wallis e Futuna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Western Sahara"
 msgstr "Sahara Occidental"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
 msgid "Yemen"
 msgstr "Iemen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2524
 msgid "Yugoslavia"
 msgstr "Iugoslavia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Zimbabwe"
 msgstr "Cimbabue"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "�Borrar Contacto?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#, fuzzy
+msgid "Category editor not available."
+msgstr "Non hai unha descrici�n dispo�ible."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+msgid "This contact belongs to these categories:"
+msgstr "Este contacto pertence a estas categor�as:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#, fuzzy
+msgid "Save Contact as VCard"
+msgstr "Gardar como VCard"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Non se puido atopa-lo control dun campo: `%s'"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+msgid "Contact Quick-Add"
+msgstr "Engadir Contacto Rapidamente"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+msgid "Edit Full"
+msgstr "Editar Completo"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr "Nome Completo:"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+msgid "E-mail"
+msgstr "Correo Electr�nico"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "Br�tema"
+
+#: 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 xa existe\n"
+"�Quere sobrescribilo?"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Enderezo _2:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "Comprobar Enderezo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "_Pa�s:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Apdo. de Correos:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "C�digo _Postal:"
 
@@ -2473,10 +2768,15 @@ msgid "contact-list-editor"
 msgstr "editor-de-contactos"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 msgid "Contact List Editor"
 msgstr "Editor de Listas de Contactos"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#, fuzzy
+msgid "Save List as VCard"
+msgstr "Gardar como VCard"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Engadir de Todas Maneiras"
@@ -2523,7 +2823,7 @@ msgstr ""
 "cartafol.  �Gostar�alle engadilo de todas maneiras?"
 
 #: 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 "Busca Avanzada"
 
@@ -2532,217 +2832,319 @@ msgstr "Busca Avanzada"
 msgid "Search"
 msgstr "Buscar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d tarxetas"
 
-#: 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 "Gardar como VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Abrir"
-
-#: 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 "Remitir Contacto"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-msgid "Send Message to Contact"
-msgstr "Enviar unha Mensaxe a un Contacto"
-
-#: 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 "Imprimir"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr "Imprimir Sobre"
-
-#: 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 "Eliminar"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Erro ao modifica-la tarxeta"
 
-#: 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:1043
 msgid "Success"
 msgstr "�xito"
 
-#: 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: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
 msgid "Unknown error"
 msgstr "Erro desco�ecido"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Tarxeta non atopada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "O ID da Tarxeta xa existe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protocolo non soportado"
 
-#: 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:607 camel/camel-service.c:643
+#: 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
 msgid "Cancelled"
 msgstr "Cancelada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Erro ao engadi-la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Erro ao engadi-la tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Erro ao modifica-la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Erro ao elimina-la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Erro ao elimina-la tarxeta"
 
-#. 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 ""
+#: addressbook/gui/widgets/e-addressbook-util.c:204
+#, fuzzy
+msgid "Display Cards?"
+msgstr "Amosar"
 
-#. 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"
+#: addressbook/gui/widgets/e-addressbook-util.c:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "Amosar"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Prema aqu� para engadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Tel�fono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Tel�fono do Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Tel�fono do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Tel�fono de Resposta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Tel�fono da Compa��a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Tel�fono Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Enderezo do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Enderezo Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Tel�fono M�bil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Tel�fono do Autom�bil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Tel�fono do Traballo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Outro Tel�fono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Gardar como VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Novo Contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Nova Lista de Contactos"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Ir � Cartafol..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "Importando..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Buscar Contactos"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Fontes do Libro de Enderezos..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Preferencias de Correo..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Remitir Contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Enviar unha Mensaxe a un Contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Imprimir Sobre"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "_Copiar a un Cartafol..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "_Mover � Cartafol.."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Vista Actual"
+
+#. 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:940
+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 ""
+
+#. 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
+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 ""
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -2756,11 +3158,12 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: 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 ""
@@ -2770,10 +3173,37 @@ msgstr ""
 "\n"
 "Faga dobre clic aqu� para crear un novo Contacto."
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Non hai elementos para amosar nesta vista\n"
+"\n"
+"Faga dobre clic aqu� para crear un novo Contacto."
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Vista de Tarxeta"
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr "Imprimir sobre"
+
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr "Imprimir tarxetas"
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+msgid "Print card"
+msgstr "Imprimir tarxeta"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 ptos. Tahoma"
@@ -2843,6 +3273,7 @@ msgid "Include:"
 msgstr "Inclu�r:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Horizontal"
 
@@ -2867,10 +3298,12 @@ msgid "Options"
 msgstr "Opci�ns"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Orientaci�n"
 
 #: addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "P�xina"
 
@@ -2886,7 +3319,9 @@ msgstr "Papel"
 msgid "Paper source:"
 msgstr "Orixe do papel:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Vertical"
 
@@ -2942,63 +3377,50 @@ msgstr "Largura:"
 msgid "_Font..."
 msgstr "_Fonte..."
 
-#: addressbook/printing/e-contact-print.c:1111
-msgid "Print cards"
-msgstr "Imprimir tarxetas"
-
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-msgid "Print card"
-msgstr "Imprimir tarxeta"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr "Imprimir sobre"
-
-#: calendar/cal-util/cal-component.c:1202
+#: calendar/cal-util/cal-component.c:1207
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "_Editar cita"
 
-#: 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:405 mail/message-list.c:651
+#: 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
 msgid "High"
 msgstr "Alta"
 
-#: 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:650
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
-#: 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:407 mail/message-list.c:649
+#: 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
 msgid "Low"
 msgstr "Baixa"
 
 #. 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
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: calendar/conduits/calendar/calendar-conduit.c:937
-#: calendar/conduits/todo/todo-conduit.c:649
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Erro ao se comunicar co servidor de axenda"
 
-#: 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 "Non foi posible ler o bloque de aplicaci�n da Axenda do pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:756
-#: calendar/conduits/todo/todo-conduit.c:759
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "_Prioridade:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non foi posible ler o bloque de aplicaci�n ToDo (PorFacer) do pilot"
 
@@ -3012,43 +3434,57 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Unha control Bonobo de exemplo que amosa unha axenda."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Preferencias da Axenda e as Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Compo�ente de Evolution para manexar a axenda."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, 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:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 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:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "F�brica para o control Axenda de exemplo"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 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:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 #, 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
+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 "Servicio de notificaci�n de alarma"
@@ -3057,25 +3493,11 @@ 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
-msgid "Ending:"
-msgstr ""
-
 #: 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"
@@ -3098,11 +3520,11 @@ msgstr "Tempo de adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:670
+#: calendar/gui/alarm-notify/alarm-queue.c:675
 msgid "No description available."
 msgstr "Non hai unha descrici�n dispo�ible."
 
-#: 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"
@@ -3110,18 +3532,29 @@ 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:2608
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Advertencia"
+
+#: 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 "Non preguntar de novo"
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Non foi posible inicializar GNOME"
 
@@ -3134,36 +3567,52 @@ msgstr "Non foi posible crear a f�brica do servicio de notificaci�ns de alarma"
 msgid "Could not create the alarm notify service factory"
 msgstr "Non foi posible crear a f�brica do servicio de notificaci�ns de alarma"
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "O resumo cont�n"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "A descrici�n cont�n"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "O comentario cont�n"
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr "Non concorda"
+
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%A, %d de %B de %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: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/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 de %B de %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 de %b"
 
-#: 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 ""
@@ -3171,16 +3620,14 @@ msgstr ""
 "ORBit e OAF."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privado"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "P�blico"
 
@@ -3201,32 +3648,27 @@ msgid "W"
 msgstr "O"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Libre"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 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:479 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Completada"
 
@@ -3242,12 +3684,13 @@ 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/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/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
+#: 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 "Nada"
 
@@ -3259,24 +3702,15 @@ msgstr "Recorrendo"
 msgid "Assigned"
 msgstr "Asignada"
 
-#: 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:803
+#: 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
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr "Non"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1974 calendar/gui/e-day-view.c:1675
-#: calendar/gui/e-week-view.c:1182
-#, fuzzy
-msgid "Searching"
-msgstr "Buscar M_ensaxe..."
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Vista Diaria"
@@ -3293,63 +3727,79 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
-msgstr "O resumo cont�n"
-
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
-msgstr "A descrici�n cont�n"
-
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "O comentario cont�n"
-
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
-msgid "Unmatched"
-msgstr "Non concorda"
-
-#: 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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Axenda"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Cartafol que cont�n citas e eventos"
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Cartafol que cont�n elementos para-facer"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "Crear unha nova cita"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "Configuraci�n da Fonte de Novas"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "Xuntanza"
+
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "Nova Tarefa"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "_Tarefa"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Nova Cita"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
-msgstr "Crear unha nova tarefa"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Nova Cita"
+
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "Cita"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "Nova T_arefa"
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "O URI que ha amosar a axenda"
 
+#: 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 "Opci�ns das Alarmas Sonoras"
@@ -3515,12 +3965,12 @@ msgstr "despois da fin da cita"
 msgid "%s at the end of the appointment"
 msgstr "despois da fin da cita"
 
-#: calendar/gui/dialogs/alarm-page.c:453
+#: calendar/gui/dialogs/alarm-page.c:452
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "Servidor %s %s"
 
-#: calendar/gui/dialogs/alarm-page.c:459
+#: calendar/gui/dialogs/alarm-page.c:458
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3541,7 +3991,7 @@ msgstr "Recordatorios"
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -3549,12 +3999,11 @@ msgstr "Resumo:"
 msgid "_Options..."
 msgstr "_Opci�ns..."
 
-#. 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 "despois"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "antes"
 
@@ -3571,7 +4020,7 @@ msgstr "fin da cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "minutos"
 
@@ -3612,170 +4061,168 @@ msgid "Color for tasks due today"
 msgstr "Cor para tarefas para hoxe"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "_Crear novas citas cun recordatorio por defecto"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "D�as"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "_Primeiro d�a da semana:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Venres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Luns"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Tarefas _retrasadas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "S�bado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-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:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 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:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Tarefas para _hoxe:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "_Xov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "_Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Tarefas para _hoxe:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "Lista de _Tarefas"
 
-#: 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 "Xoves"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Hora"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Fuso _horario:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Di_visi�ns horarias:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Formato da hora:"
 
-#: 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 "Martes"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "M�rcores"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Semana Laboral"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pedir confirmaci�n ao eliminar elementos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "_Comprimi-las fins de semana na vista mensual"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Amosar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Xeral"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "_Agocha-las tarefas completadas despois de"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Outro"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Tarefas _retrasadas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_S�b"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "Lista de _Tarefas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Di_visi�ns horarias:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "M�_r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "antes do comezo da cita"
 
@@ -3839,74 +4286,61 @@ msgstr "%s  Fixo cambios. �Quere esquecer estes cambios e actualizar o editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non fixo cambios, �quere actualizar o editor?"
 
-#: 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 " a "
 
-#: 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 " (Completada "
 
-#: 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 "Completada "
 
-#: 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 " (Pendente "
 
-#: 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 "Pendente "
 
-#: calendar/gui/dialogs/comp-editor.c:303
+#: calendar/gui/dialogs/comp-editor.c:322
 #, fuzzy
 msgid "Could not update object!"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1897
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "�Sobrescribir ficheiro?"
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1904
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Xa existe un ficheiro con ese nome.\n"
-"�Sobrescribilo?"
-
-#: 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 "Gardar Como..."
+#: 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
+msgid "Save as..."
+msgstr "Gardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "�Non foi posible obter a versi�n actual!"
 
@@ -3964,7 +4398,7 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Cita"
 
@@ -3978,14 +4412,14 @@ msgstr "Recorrencia"
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 #, 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:365
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "Xuntanza"
 
@@ -4018,30 +4452,42 @@ msgid "F_ree"
 msgstr "Lib_re"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
+#, fuzzy
+msgid "L_ocation:"
+msgstr ""
+"\n"
+"Localizaci�n Xeogr�fica: "
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_vado"
 
-#: 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 "P�_blico"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Amosa-lo Tempo Coma"
 
-#: 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 "_Resumo:"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Contactos..."
+
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "Hora de _finalizaci�n:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
@@ -4069,55 +4515,49 @@ msgstr "Asistente"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "Nome Com�n"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegada Por"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegada En"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Idioma"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Membro"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:798
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Papel"
 
-#: 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/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"
 msgstr "Estado"
 
-#: 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo:"
@@ -4132,7 +4572,7 @@ msgid "_Change Organizer"
 msgstr "_Cambiar Organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:445
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "_Convidar Outros..."
 
@@ -4140,27 +4580,98 @@ msgstr "_Convidar Outros..."
 msgid "_Other Organizer"
 msgstr "_Outro Organizador"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita cont�n recorrencias que Evolution non pode editar."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "o"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "Br�tema"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "segundo"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Outro"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Norte"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "Br�tema"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Outro Fax"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "d�a"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "no"
 
-#: 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 "ocorrencias"
 
@@ -4224,17 +4735,23 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: 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 "A informaci�n da xuntanza cambiou. �Enviar unha versi�n actualizada?"
+
+#: calendar/gui/dialogs/send-comp.c:59
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "A informaci�n da xuntanza cambiou. �Enviar unha versi�n actualizada?"
 
-#: 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 "A informaci�n da tarefa cambiou. �Enviar unha versi�n actualizada?"
 
-#: calendar/gui/dialogs/send-comp.c:65
-msgid "The journal entry has changed. Send an updated version?"
-msgstr "A entrada do diario cambiou. �Enviar unha versi�n actualizada?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
+msgstr "A informaci�n da tarefa cambiou. �Enviar unha versi�n actualizada?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
@@ -4251,7 +4768,7 @@ msgid "Progress"
 msgstr "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4263,15 +4780,19 @@ msgstr "_Prioridade:"
 msgid "_Status:"
 msgstr "E_stado:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+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:322
+#: calendar/gui/dialogs/task-editor.c:324
 msgid "Assignment"
 msgstr "Asignaci�n"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Descrici�n:"
 
@@ -4283,192 +4804,155 @@ msgstr "Data de _Inicio:"
 msgid "_Due Date:"
 msgstr "_Data L�mite"
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: 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:751 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:941 calendar/gui/e-day-view.c:3544
-#: calendar/gui/e-week-view.c:3422 mail/folder-browser.c:1447
-#: shell/e-shortcuts-view.c:384
+#: 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
 msgid "_Open"
 msgstr "_Abrir"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Gardar como..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "_Imprimir..."
+
+#: calendar/gui/e-calendar-table.c:978 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:947 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3433 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:979 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:949 calendar/gui/e-day-view.c:3530
-#: calendar/gui/e-day-view.c:3557 calendar/gui/e-week-view.c:3409
-#: calendar/gui/e-week-view.c:3435 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:980 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 "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Asignar Tarefa"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Remitir como i_Calendar"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:956
-msgid "_Delete this Task"
-msgstr "_Borrar esta Tarefa"
-
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca-las Tarefas como Completas"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7115
-#: calendar/gui/e-week-view.c:3918
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
 
-#. 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 ""
-"A data ten que se introducir no formato: \n"
-"\n"
-"%s"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Completo"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Data L�mite"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Data Final"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Posici�n Xeogr�fica"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Ordeamento das tarefas"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 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 ""
+"A data ten que se introducir no formato: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -4476,392 +4960,174 @@ msgstr "%02i divisi�ns de minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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 de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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 de %b"
 
 #. 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
 msgid "am"
 msgstr "am"
 
 #. 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
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "Nova C_ita"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Novo _Evento de D�a Completo"
 
-#: calendar/gui/e-day-view.c:3535 calendar/gui/e-week-view.c:3414
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "Ir a _Hoxe"
-
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
-msgid "_Go to Date..."
-msgstr "_Ir � Data..."
-
-#: calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-msgid "_Delete this Appointment"
-msgstr "_Borrar esta Cita"
-
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
-msgid "Make this Occurrence _Movable"
-msgstr "Facer esta Ocorrencia _Movible"
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
-msgid "Delete this _Occurrence"
-msgstr "Borrar esta _Ocorrencia"
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
-msgid "Delete _All Occurrences"
-msgstr "Borrar _T�dalas Ocorrencias"
-
-#: calendar/gui/e-itip-control.c:524
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Task begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:534
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 #, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "Informaci�n de Libre/Ocupado"
-
-#: calendar/gui/e-itip-control.c:538
-msgid "Begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:550
-#, fuzzy
-msgid "Meeting ends: <b>"
-msgstr "Hora do _final da reuni�n:"
+msgid "New Meeting"
+msgstr "Xuntanza"
 
-#: calendar/gui/e-itip-control.c:553
-#, fuzzy
-msgid "Free/Busy info ends: <b>"
-msgstr "Informaci�n de Libre/Ocupado"
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Nova Tarefa"
 
-#: calendar/gui/e-itip-control.c:557
-msgid "Ends: <b>"
-msgstr ""
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Imprimir..."
 
-#: calendar/gui/e-itip-control.c:571
-#, fuzzy
-msgid "Task Completed: <b>"
-msgstr " (Completada "
+#: 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 "Ir a _Hoxe"
 
-#: calendar/gui/e-itip-control.c:581
-msgid "Task Due: <b>"
-msgstr ""
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+msgid "_Go to Date..."
+msgstr "_Ir � Data..."
 
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
-#, fuzzy
-msgid "iCalendar Information"
-msgstr "informaci�n de axenda"
+#: 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 "_Publicar Informaci�n de Libre/Ocupado"
 
-#. Title
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
 #, fuzzy
-msgid "iCalendar Error"
-msgstr "Axenda"
+msgid "_Configure..."
+msgstr "_Configurar Cartafol..."
 
-#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
 #, fuzzy
-msgid "An unknown person"
-msgstr "un remitente desco�ecido"
+msgid "_Configure Pilot..."
+msgstr "_Configurar Cartafol..."
 
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
-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:737
-msgid "<i>None</i>"
-msgstr "<i>Ningunha</i>"
-
-#: 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
-#, fuzzy
-msgid "Choose an action:"
-msgstr "Escolla unha Acci�n"
+#: 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
+msgid "_Save As..."
+msgstr "Gardar _Como..."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 #, fuzzy
-msgid "Update"
-msgstr "Actualizaci�n de Tarefa"
-
-#: 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
-msgid "OK"
-msgstr "Aceptar"
+msgid "_Schedule Meeting..."
+msgstr "_Programar Xuntanza"
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 #, fuzzy
-msgid "Accept"
-msgstr "Aceptado"
+msgid "_Forward as iCalendar..."
+msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-itip-control.c:796
-#, fuzzy
-msgid "Tentatively accept"
-msgstr " Tentativa "
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+msgid "Make this Occurrence _Movable"
+msgstr "Facer esta Ocorrencia _Movible"
 
-#: calendar/gui/e-itip-control.c:797
-#, fuzzy
-msgid "Decline"
-msgstr "Rexeitado"
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+msgid "Delete this _Occurrence"
+msgstr "Borrar esta _Ocorrencia"
 
-#: calendar/gui/e-itip-control.c:811
-#, fuzzy
-msgid "Send Free/Busy Information"
-msgstr "Informaci�n de Libre/Ocupado"
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+msgid "Delete _All Occurrences"
+msgstr "Borrar _T�dalas Ocorrencias"
 
-#: calendar/gui/e-itip-control.c:824
-msgid "Update respondent status"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:838
-#, fuzzy
-msgid "Send Latest Information"
-msgstr "Informaci�n da Tarefa"
-
-#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: calendar/gui/e-itip-control.c:867
-#, 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:868
-msgid "Meeting Information"
-msgstr "Informaci�n da Xuntanza"
-
-#: calendar/gui/e-itip-control.c:872
-#, 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:873
-msgid "Meeting Proposal"
-msgstr "Proposta de Xuntanza"
-
-#: calendar/gui/e-itip-control.c:877
-#, 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:878
-msgid "Meeting Update"
-msgstr "Actualizaci�n da Xuntanza"
-
-#: calendar/gui/e-itip-control.c:882
-#, 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:883
-msgid "Meeting Update Request"
-msgstr "_Solicitude de Actualizaci�n de Xuntanza"
-
-#: calendar/gui/e-itip-control.c:887
-#, 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:888
-msgid "Meeting Reply"
-msgstr "Resposta de Xuntanza"
-
-#: calendar/gui/e-itip-control.c:892
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> cancelou unha reuni�n."
-
-#: calendar/gui/e-itip-control.c:893
-msgid "Meeting Cancellation"
-msgstr "Cancelaci�n da Xuntanza"
-
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
-#: calendar/gui/e-itip-control.c:982
-#, 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:898
-msgid "Bad Meeting Message"
-msgstr "Mensaxe Incorrecta sobre a Xuntanza"
-
-#: calendar/gui/e-itip-control.c:917
-#, 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:918
-msgid "Task Information"
-msgstr "Informaci�n da Tarefa"
-
-#: calendar/gui/e-itip-control.c:922
-#, 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:923
-msgid "Task Proposal"
-msgstr "Proposta de Tarefas"
-
-#: calendar/gui/e-itip-control.c:927
-#, 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:928
-msgid "Task Update"
-msgstr "Actualizaci�n de Tarefa"
-
-#: calendar/gui/e-itip-control.c:932
-#, 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:933
-msgid "Task Update Request"
-msgstr "Petici�n de Actualizaci�n de Tarefa"
-
-#: calendar/gui/e-itip-control.c:937
-#, 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:938
-msgid "Task Reply"
-msgstr "Resposta � Tarefa"
-
-#: calendar/gui/e-itip-control.c:942
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> cancelou unha tarefa."
-
-#: calendar/gui/e-itip-control.c:943
-msgid "Task Cancellation"
-msgstr "Cancelaci�n de Tarefa"
-
-#: calendar/gui/e-itip-control.c:948
-msgid "Bad Task Message"
-msgstr "Mensaxe Incorrecta sobre a Tarefa"
-
-#: calendar/gui/e-itip-control.c:967
-#, 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:968
-msgid "Free/Busy Information"
-msgstr "Informaci�n de Libre/Ocupado"
-
-#: calendar/gui/e-itip-control.c:972
-#, 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:973
-msgid "Free/Busy Request"
-msgstr "Petici�n de Libre/Ocupado"
-
-#: calendar/gui/e-itip-control.c:977
-#, 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:978
-msgid "Free/Busy Reply"
-msgstr "Resposta de Libre/Ocupado"
-
-#: calendar/gui/e-itip-control.c:983
-msgid "Bad Free/Busy Message"
-msgstr "Mensaxe de Libre/Ocupado Incorrecta"
-
-#: calendar/gui/e-itip-control.c:1052
-#, 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:1071
-#, fuzzy
-msgid "The message contains only unsupported requests."
-msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
-
-#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
-msgid "The attachment does not contain a valid calendar message"
-msgstr ""
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Erro ao executar o filtro: %s: %s"
 
-#: calendar/gui/e-itip-control.c:1130
-msgid "The attachment has no viewable calendar items"
-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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1229
+#: calendar/gui/e-itip-control.c:1564
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "�Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Actualizaci�n completada\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:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1284
-msgid "Attendee status ould not be updated!\n"
+#: calendar/gui/e-itip-control.c:1625
+msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1638
 #, fuzzy
-msgid "Attendee status updated\n"
+msgid "Attendee status could not be updated!\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1288
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1640
+#, fuzzy
+msgid "Attendee status updated\n"
+msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Eliminaci�n Completa"
 
-#: calendar/gui/e-itip-control.c:1348 calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "�Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "�Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1566
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Seleccionar Cartafol"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Seleccionar Cartafol"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4900,211 +5166,213 @@ msgstr "data-finalizaci�n"
 msgid "date-start"
 msgstr "data-comezo"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1535
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Participantes Requiridos"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "Participantes Opcionais"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "Non-Participantes"
 
-#: 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:771
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Cuarto"
 
-#: 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:775
-#: calendar/gui/e-meeting-model.c:791
-#: 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 "Desco�ecido"
-
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "Presidencia"
 
-#: 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:788
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "Participantes Requiridos"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "Participante Opcional"
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Non-Participante"
 
-#: 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:816
+#: 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 "Precisa dunha Acci�n"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:819 calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "Delegado"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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: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:2118 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
-#: 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 "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:428
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "F�ra da Oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Sen Informaci�n"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Opci�ns"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Amosar _S� as Horas de Traballo"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "Amozar sen _Zoom"
 
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "_Actualizar Libres/Ocupadas"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Autoescoller"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "_T�dalas Persoas e Recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "T�dalas _Persoas e Un Recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "Persoas _Requiridas"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "Persoas Requiridas e _Un Recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:641
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "Hora do _inicio da reuni�n:"
 
-#: calendar/gui/e-meeting-time-sel.c:660
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Hora do _final da reuni�n:"
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo armacenamento %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 "Non foi posible cargar as tarefas en `%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 "O m�todo requirido para cargar `%s' non est� soportado"
 
-#: calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Data na que se completa"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Elimina-los contactos seleccionados"
+
+#: calendar/gui/e-tasks.c:659
+#, fuzzy
+msgid "Expunging"
+msgstr "Limpar"
+
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "_Borrar esta Cita"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1865
+#: calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrir axenda"
@@ -5165,266 +5433,227 @@ msgstr "outubro"
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:220
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/itip-utils.c:570
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Non foi posible crear a f�brica do servicio de notificaci�ns de alarma"
 
-#: 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 "Do"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "S�"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "D�a seleccionado (%a, %d de %b de %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 de %b"
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr "%a %d de %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 de %b de %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Tarefa"
-
-#: calendar/gui/print.c:2262
-#, fuzzy, c-format
-msgid "Status: %s"
-msgstr "E_stado:"
-
-#: calendar/gui/print.c:2280
-#, fuzzy, c-format
-msgid "Priority: %s"
-msgstr "_Prioridade:"
-
-#: calendar/gui/print.c:2294
-#, fuzzy, c-format
-msgid "Percent Complete: %i"
-msgstr "Porcentaxe completada"
-
-#: calendar/gui/print.c:2306
-#, fuzzy, c-format
-msgid "URL: %s"
-msgstr "URL:"
-
-#: calendar/gui/print.c:2320
-#, fuzzy, c-format
-msgid "Categories: %s"
-msgstr ""
-"\n"
-"Categor�as: "
-
-#: calendar/gui/print.c:2331
-#, fuzzy
-msgid "Contacts: "
-msgstr "Co_ntactos:"
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Imprimir Axenda"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2358 my-evolution/e-summary.c:619
-#: 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Previsualizaci�n da Impresi�n"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Configuraci�n da Impresi�n"
 
-#: calendar/gui/tasks-control.c:126
-msgid "The URI of the tasks folder to display"
-msgstr "O URI do cartafol de tarefas a amosar"
-
 #: calendar/gui/tasks-control-factory.c:75
 #, fuzzy
 msgid ""
@@ -5433,6 +5662,33 @@ msgstr ""
 "Non foi posible crear o visor da axenda. Comprobe a s�a configuraci�n de "
 "ORBit e OAF."
 
+#: calendar/gui/tasks-control.c:147
+msgid "The URI of the tasks folder to display"
+msgstr "O URI do cartafol de tarefas a amosar"
+
+#: 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 ""
+"Esta operaci�n ha eliminar permanentemente todas as mensaxes marcadas como "
+"eliminadas. Se contin�a, non ser� capaz de recuperar estas mensaxes.\n"
+"\n"
+"�Eliminar realmente estas mensaxes?"
+
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+msgid "Do not ask me again."
+msgstr "Non preguntar de novo"
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Imprimir tarxetas"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5475,91 +5731,125 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
 
-#: calendar/pcs/query.c:234
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "F�brica para importar ficheiros VCard a Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "Importa ficheiros VCard a Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "Importa ficheiros VCard a Evolution."
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Mensaxe da Axenda"
+
+#: 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 atopou ficheiros de correo de Pine.\n"
+"�Gostar�alle importalos a Evolution?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Axenda"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now espera 0 argumentos"
 
-#: calendar/pcs/query.c:258
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time espera 1 argumento"
 
-#: calendar/pcs/query.c:263
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time espera que o argumento 1 sexa unha cadea"
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "o argumento 1 de make-time debe ser unha cadea data/hora ISO 8601"
 
-#: calendar/pcs/query.c:300
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day espera 2 argumentos"
 
-#: 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 espera que o argumento 1 sexa un 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 espera que o argumento 2 sexa un enteiro"
 
-#: calendar/pcs/query.c:339
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin espera 1 argumento"
 
-#: 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 espera que o argumento 1 sexa un time_t"
 
-#: calendar/pcs/query.c:371
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end espera 1 argumento"
 
-#: 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 espera que o argumento 1 sexa un time_t"
 
-#: calendar/pcs/query.c:412
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype espera 0 argumentos"
 
-#: calendar/pcs/query.c:508
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? espera 2 argumentos"
 
-#: 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? espera que o argumento 1 sexa un 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? espera que o argumento 2 sexa un time_t"
 
-#: calendar/pcs/query.c:650
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? espera 2 argumentos"
 
-#: calendar/pcs/query.c:655
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? espera que o argumento 1 sexa unha cadea"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? espera que o argumento 2 sexa unha cadea"
 
-#: calendar/pcs/query.c:679
+#: 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\""
 
-#: calendar/pcs/query.c:721
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? espera polo menos 1 argumento"
 
-#: 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)"
@@ -5567,44 +5857,1671 @@ msgstr ""
 "has-categories? espera que t�dolos argumentos sexan cadeas ou un e s� un "
 "argumento sexa un falso booleano (#f)"
 
-#: calendar/pcs/query.c:821
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? espera 0 argumentos"
 
-#: calendar/pcs/query.c:866
+#: calendar/pcs/query.c:880
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "is-completed? espera 0 argumentos"
 
-#: 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 espera que o argumento 1 sexa un 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 "A avaliaci�n da expresi�n de b�squeda non produce un valor booleano"
 
-#: camel/camel-cipher-context.c:171
+#.
+#. * 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 "Xibut�"
+
+#: 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 "Samoa Americana"
+
+#: calendar/zones.h:60
+#, fuzzy
+msgid "America/Anchorage"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:61
+#, fuzzy
+msgid "America/Anguilla"
+msgstr "Anguila"
+
+#: calendar/zones.h:62
+#, fuzzy
+msgid "America/Antigua"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:63
+#, fuzzy
+msgid "America/Araguaina"
+msgstr "Nicaragua"
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+#, fuzzy
+msgid "America/Asuncion"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:66
+#, fuzzy
+msgid "America/Barbados"
+msgstr "Barbados"
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: calendar/zones.h:68
+#, fuzzy
+msgid "America/Belize"
+msgstr "Belice"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+#, fuzzy
+msgid "America/Bogota"
+msgstr "Samoa Americana"
+
+#: 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 "Samoa Americana"
+
+#: calendar/zones.h:76
+#, fuzzy
+msgid "America/Catamarca"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+#, fuzzy
+msgid "America/Cayman"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:79
+#, fuzzy
+msgid "America/Chicago"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+#, fuzzy
+msgid "America/Cordoba"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:82
+#, fuzzy
+msgid "America/Costa_Rica"
+msgstr "Costa Rica"
+
+#: calendar/zones.h:83
+#, fuzzy
+msgid "America/Cuiaba"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:84
+#, fuzzy
+msgid "America/Curacao"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+#, fuzzy
+msgid "America/Dawson"
+msgstr "Samoa Americana"
+
+#: 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 "Dominica"
+
+#: calendar/zones.h:91
+#, fuzzy
+msgid "America/Edmonton"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+#, fuzzy
+msgid "America/El_Salvador"
+msgstr "O Salvador"
+
+#: 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 "Samoa Americana"
+
+#: 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 "Samoa Americana"
+
+#: calendar/zones.h:100
+#, fuzzy
+msgid "America/Guadeloupe"
+msgstr "Guadalupe"
+
+#: calendar/zones.h:101
+#, fuzzy
+msgid "America/Guatemala"
+msgstr "Guatemala"
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+#, fuzzy
+msgid "America/Guyana"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:104
+#, fuzzy
+msgid "America/Halifax"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:105
+#, fuzzy
+msgid "America/Havana"
+msgstr "Samoa Americana"
+
+#: 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 "Samoa Americana"
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+#, fuzzy
+msgid "America/Juneau"
+msgstr "Samoa Americana"
+
+#: 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 "Samoa Americana"
+
+#: calendar/zones.h:120
+#, fuzzy
+msgid "America/Lima"
+msgstr "Samoa Americana"
+
+#: 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 "Samoa Americana"
+
+#: calendar/zones.h:124
+#, fuzzy
+msgid "America/Managua"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:125
+#, fuzzy
+msgid "America/Manaus"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:126
+#, fuzzy
+msgid "America/Martinique"
+msgstr "Martinica"
+
+#: calendar/zones.h:127
+#, fuzzy
+msgid "America/Mazatlan"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:128
+#, fuzzy
+msgid "America/Mendoza"
+msgstr "Samoa Americana"
+
+#: 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 "Samoa Americana"
+
+#: calendar/zones.h:136
+#, fuzzy
+msgid "America/Montserrat"
+msgstr "Montserrat"
+
+#: calendar/zones.h:137
+#, fuzzy
+msgid "America/Nassau"
+msgstr "Samoa Americana"
+
+#: 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 "Samoa Americana"
+
+#: calendar/zones.h:141
+#, fuzzy
+msgid "America/Noronha"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+#, fuzzy
+msgid "America/Panama"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+#, fuzzy
+msgid "America/Paramaribo"
+msgstr "Samoa Americana"
+
+#: 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 "Porto Rico"
+
+#: 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 "Samoa Americana"
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+#, fuzzy
+msgid "America/Rosario"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:157
+#, fuzzy
+msgid "America/Santiago"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:158
+#, fuzzy
+msgid "America/Santo_Domingo"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:159
+#, fuzzy
+msgid "America/Sao_Paulo"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+#, fuzzy
+msgid "America/Shiprock"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:162
+#, fuzzy
+msgid "America/St_Johns"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+#, fuzzy
+msgid "America/St_Lucia"
+msgstr "Samoa Americana"
+
+#: calendar/zones.h:165
+#, fuzzy
+msgid "America/St_Thomas"
+msgstr "Samoa Americana"
+
+#: 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 "Acerbaix�n"
+
+#: calendar/zones.h:172
+#, fuzzy
+msgid "America/Tortola"
+msgstr "Samoa Americana"
+
+#: 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 "Samoa Americana"
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: calendar/zones.h:178
+#, fuzzy
+msgid "Antarctica/Casey"
+msgstr "Ant�rtida"
+
+#: calendar/zones.h:179
+#, fuzzy
+msgid "Antarctica/Davis"
+msgstr "Ant�rtida"
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: calendar/zones.h:181
+#, fuzzy
+msgid "Antarctica/Mawson"
+msgstr "Ant�rtida"
+
+#: calendar/zones.h:182
+#, fuzzy
+msgid "Antarctica/McMurdo"
+msgstr "Ant�rtida"
+
+#: calendar/zones.h:183
+#, fuzzy
+msgid "Antarctica/Palmer"
+msgstr "Ant�rtida"
+
+#: calendar/zones.h:184
+#, fuzzy
+msgid "Antarctica/South_Pole"
+msgstr "Ant�rtida"
+
+#: calendar/zones.h:185
+#, fuzzy
+msgid "Antarctica/Syowa"
+msgstr "Ant�rtida"
+
+#: calendar/zones.h:186
+#, fuzzy
+msgid "Antarctica/Vostok"
+msgstr "Ant�rtida"
+
+#: 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 "Bahrain"
+
+#: 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 "Colombia"
+
+#: 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 "Hong Kong"
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+#: calendar/zones.h:216
+#, fuzzy
+msgid "Asia/Istanbul"
+msgstr "Asistente"
+
+#: 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 "Kuvait"
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr ""
+
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Muscat"
+msgstr "Asistente"
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: calendar/zones.h:235
+#, fuzzy
+msgid "Asia/Omsk"
+msgstr "Asignar Tarefa"
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+#, fuzzy
+msgid "Asia/Qatar"
+msgstr "Qatar"
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:247
+#, fuzzy
+msgid "Asia/Singapore"
+msgstr "Singapur"
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+#, fuzzy
+msgid "Atlantic/Bermuda"
+msgstr "Bermudas"
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+#, fuzzy
+msgid "Atlantic/Cape_Verde"
+msgstr "Cabo Verde"
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+#, fuzzy
+msgid "Australia/Adelaide"
+msgstr "Australia"
+
+#: calendar/zones.h:274
+#, fuzzy
+msgid "Australia/Brisbane"
+msgstr "Australia"
+
+#: calendar/zones.h:275
+#, fuzzy
+msgid "Australia/Broken_Hill"
+msgstr "Australia"
+
+#: calendar/zones.h:276
+#, fuzzy
+msgid "Australia/Darwin"
+msgstr "Australia"
+
+#: calendar/zones.h:277
+#, fuzzy
+msgid "Australia/Hobart"
+msgstr "Australia"
+
+#: calendar/zones.h:278
+#, fuzzy
+msgid "Australia/Lindeman"
+msgstr "Australia"
+
+#: calendar/zones.h:279
+#, fuzzy
+msgid "Australia/Lord_Howe"
+msgstr "Australia"
+
+#: calendar/zones.h:280
+#, fuzzy
+msgid "Australia/Melbourne"
+msgstr "Australia"
+
+#: calendar/zones.h:281
+#, fuzzy
+msgid "Australia/Perth"
+msgstr "Australia"
+
+#: calendar/zones.h:282
+#, fuzzy
+msgid "Australia/Sydney"
+msgstr "Australia"
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:284
+#, fuzzy
+msgid "Europe/Andorra"
+msgstr "Andorra"
+
+#: calendar/zones.h:285
+#, fuzzy
+msgid "Europe/Athens"
+msgstr "Propiedades"
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:296
+#, fuzzy
+msgid "Europe/Gibraltar"
+msgstr "Xibraltar"
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:304
+#, fuzzy
+msgid "Europe/Luxembourg"
+msgstr "Luxemburgo"
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr ""
+
+#: calendar/zones.h:308
+#, fuzzy
+msgid "Europe/Monaco"
+msgstr "M�naco"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr ""
+
+#: calendar/zones.h:312
+#, fuzzy
+msgid "Europe/Paris"
+msgstr "Propiedades"
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:317
+#, fuzzy
+msgid "Europe/San_Marino"
+msgstr "San Marino"
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "Comores"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+#, fuzzy
+msgid "Indian/Mahe"
+msgstr "India"
+
+#: calendar/zones.h:341
+#, fuzzy
+msgid "Indian/Maldives"
+msgstr "Maldivas"
+
+#: calendar/zones.h:342
+#, fuzzy
+msgid "Indian/Mauritius"
+msgstr "Mauricio"
+
+#: calendar/zones.h:343
+#, fuzzy
+msgid "Indian/Mayotte"
+msgstr "Maiote"
+
+#: calendar/zones.h:344
+#, fuzzy
+msgid "Indian/Reunion"
+msgstr "Xuntanza"
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+#, fuzzy
+msgid "Pacific/Pitcairn"
+msgstr "Pitcairn"
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
+#: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
 msgstr "As sinaturas non est�n soportadas por este cifrado"
 
-#: camel/camel-cipher-context.c:211
+#: 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:251
+#: camel/camel-cipher-context.c:249
 msgid "Verifying is not supported by this cipher"
 msgstr "A verificaci�n non est� soportada neste cifrado"
 
-#: camel/camel-cipher-context.c:294
+#: camel/camel-cipher-context.c:292
 msgid "Encryption is not supported by this cipher"
 msgstr "Non se soporta o cifrado con esta cifra"
 
-#: camel/camel-cipher-context.c:336
+#: camel/camel-cipher-context.c:334
 msgid "Decryption is not supported by this cipher"
 msgstr "Non est� soportado o descifrado desta cifra"
 
+#: camel/camel-data-cache.c:169
+#, fuzzy
+msgid "Unable to create cache path"
+msgstr ""
+"Non foi posible crear o ficheiro de sa�da: %s\n"
+" %s"
+
+#: camel/camel-data-cache.c:441
+#, 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
 #, c-format
 msgid ""
@@ -5635,86 +7552,66 @@ msgstr "Volvendo a sincronizar co servidor"
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar traballando conectado para completar esta operaci�n"
 
-#: 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 "Sincronizando cartafoles"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, 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
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Erro ao executar o filtro: %s: %s"
+
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Erro ao analizar o filtro: %s: %s"
-
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Erro ao executar o filtro: %s: %s"
+#: camel/camel-filter-search.c:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar a busca por filtro: %s: %s"
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1040
-#, 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:1080
-#, 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:1262
-#, fuzzy
-msgid "Moving messages"
-msgstr "Copiando as mensaxes"
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5723,7 +7620,7 @@ msgstr ""
 "Non se pode analizar a expresi�n de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5732,18 +7629,38 @@ msgstr ""
 "Erro ao executar a expresi�n de busca: %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 "(coinciden-todas) require un �nico resultado booleano"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Efectuando petici�n sobre a cabeceira desco�ecida: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Tipo inv�lido no contido do corpo, esper�base unha cadea"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1038
+#, 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
+#, 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
+#, fuzzy
+msgid "Moving messages"
+msgstr "Copiando as mensaxes"
 
 #: camel/camel-lock-client.c:111
 #, c-format
@@ -5852,123 +7769,128 @@ msgstr "Introduza o seu contrasinal %s para %s"
 msgid "Please enter your %s passphrase"
 msgstr "Introduza o seu contrasinal %s"
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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:755
+#: 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:953
+#: 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:959
+#: 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:970
+#: 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:1143
+#: 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:1153
+#: 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:1160
+#: 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:1169
+#: 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:1337
+#: 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:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1352
+#: 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-provider.c:130
+#: camel/camel-pgp-mime.c:354
+msgid "This is a digitally signed message part"
+msgstr ""
+
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Non foi posible cargar %s: Non se soporta a carga de m�dulos neste sistema."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Non foi posible cargar %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 "Non foi posible cargar %s: Non hai c�digo de inicializaci�n no m�dulo."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "Servidor %s %s"
 
-#: camel/camel-remote-store.c:207
+#: 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:264
+#: 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:267
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(m�quina desco�ecida)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
-#: camel/camel-remote-store.c:484
+#: 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"
@@ -6047,8 +7969,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"
@@ -6080,12 +8002,13 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticaci�n do servidor."
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
+#, fuzzy
+msgid "Login"
 msgstr "Login de NT"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
@@ -6096,9 +8019,20 @@ msgstr "Esta opci�n conectarase � servidor usando un simple contrasinal."
 msgid "Unknown authentication state."
 msgstr "Estado de autenticaci�n desco�ecido."
 
+#: 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 "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:301
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: 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"
 
@@ -6142,26 +8076,41 @@ msgstr "O URL '%s' necesita unha parte co nome de m�quina"
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte coa ruta"
 
-#: camel/camel-service.c:611
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:638
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fallo na b�squeda do nome: %s"
 
-#: camel/camel-service.c:663
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Fallo na busca do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:665
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Fallo na busca do servidor: %s: motivo desco�ecido"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Resolvendo: %s"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Fallo na busca do servidor: %s: servidor non atopado"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Fallo na busca do servidor: %s: motivo desco�ecido"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Fornecedor de correo do cartafol virtual"
@@ -6170,12 +8119,12 @@ msgstr "Fornecedor de correo do cartafol virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para ler correo coma unha petici�n de outro conxunto de cartafoles"
 
-#: 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 "Non hai ning�n fornecedor dispo�ible para o protocolo `%s'"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6221,17 +8170,17 @@ msgstr "Non se puido descodifica-la mensaxe."
 msgid "Failed to verify certificates."
 msgstr "Non se puido verifica-los certificados."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 #, 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:282
+#: camel/camel-store.c:284
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6240,8 +8189,7 @@ msgstr ""
 "Expendedor: %s\n"
 "Asunto: %s"
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:428
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6256,24 +8204,40 @@ msgstr ""
 "\n"
 "�Desexa aceptar de todas maneiras?"
 
-#: 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:491
 #, 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"
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, fuzzy, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
 msgstr ""
-"Enderezo de Correo: %s\n"
-"Nome Com�n: %s\n"
-"Unidade en Organizaci�n: %s\n"
-"Organizaci�n: %s\n"
-"Localidade: %s\n"
-"Estado: %s\n"
-"Pa�s: %s"
+"Certificado incorrecto de %s:\n"
+"\n"
+"%s\n"
+"\n"
+"�Desexa aceptar de todas maneiras?"
 
 #: camel/camel-url.c:288
 #, c-format
@@ -6285,31 +8249,31 @@ msgstr "Non foi posible analizar o URL `%s'"
 msgid "No such message %s in %s"
 msgstr "Non existe a mensaxe %s en %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Non existe a mensaxe: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
@@ -6318,76 +8282,76 @@ msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 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:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr "A resposta do servidor rematou cedo de m�is."
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, 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:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, 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:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, 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:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, 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:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Buscando mensaxes cambiadas"
 
-#: camel/providers/imap/camel-imap-folder.c:1566
-#: camel/providers/imap/camel-imap-folder.c:1978
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non est� dispo�ible actualmente."
 
-#: camel/providers/imap/camel-imap-folder.c:1717
-#: camel/providers/imap/camel-imap-folder.c:1798
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "Recollendo informaci�n de resumo para as mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:1723
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Buscando mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:2015
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posible atopar o corpo da mensaxe na resposta 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 "Non foi posible abrir o directorio de cach�: %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
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Non se puido descodifica-la mensaxe."
@@ -6400,7 +8364,7 @@ msgstr "Comprobando o novo correo"
 msgid "Check for new messages in all folders"
 msgstr "Comprobar as novas mensaxes en t�dolos cartafoles"
 
-#: 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 "Cartafoles"
 
@@ -6433,28 +8397,28 @@ 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:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, 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:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6465,105 +8429,124 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 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:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "Directorios de correo en formato MH"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 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:52
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Entrega local"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:62
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "Directorios de correo en formato MH"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 #, 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:80
+#: 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:81
+#: camel/providers/local/camel-local-provider.c:101
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 "Para ler e armacenar correo local en ficheiros spool est�ndar de tipo mbox."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "A ra�z de almacenamento %s non � unha ruta absoluta"
 
-#: 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 "O ra�z de armacenamento %s non � un directorio normal."
 
-#: 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 "Non � posible obter o cartafol: %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 "Os armacenamentos locais non te�en un 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 "Ficheiro local de correo %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Non foi posible renomear o cartafol %s a %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 "Non foi posible renomear o cartafol: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de resumo de cartafol `%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 "Non foi posible borrar o ficheiro de �ndice de cartafol `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, 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:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Incapaz de engadir a mensaxe ao resumo: motivo desco�ecido"
 
@@ -6584,7 +8567,7 @@ msgstr "Non se pode engadir a mensaxe ao cartafol maildir: %s: %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6596,7 +8579,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "Non existe a mensaxe"
 
@@ -6605,7 +8588,7 @@ msgstr "Non existe a mensaxe"
 msgid "Invalid message contents"
 msgstr "Contido da mensaxe non v�lido"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -6615,14 +8598,14 @@ msgstr ""
 "Non � posible abrir o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "O cartafol `%s' non existe."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -6632,41 +8615,65 @@ msgstr ""
 "Non foi posible crear o cartafol `%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' non � un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Non foi posible borrar o cartafol `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "non � un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Non foi posible examina-lo cartafol `%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 "Non se pode abri-la ruta do directorio maildir: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Comprobando o novo correo"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+#, fuzzy
+msgid "Storing folder"
+msgstr "Sincronizando cartafol"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non se pode abri-la caixa do correo: %s: %s\n"
@@ -6684,9 +8691,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6696,16 +8703,16 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 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:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Contrucci�n da mensaxe fallida: �mailbox corrompido?"
 
-#: 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"
@@ -6714,7 +8721,7 @@ msgstr ""
 "Non foi posible abrir o ficheiro `%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"
@@ -6723,14 +8730,14 @@ msgstr ""
 "Non foi posible crear o ficheiro `%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' non � un ficheiro normal."
 
-#: 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"
@@ -6739,102 +8746,90 @@ msgstr ""
 "Non foi posible borrar o cartafol `%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 "O cartafol `%s' non est� baleiro. Non borrado."
 
-#. 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 "Sincronizando cartafol"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, 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:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Non � posible obter o cartafol: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, 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:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, 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: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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "Non foi posible pechar o cartafol orixe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, 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:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear o cartafol: %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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desco�ecido: %s"
@@ -6854,12 +8849,12 @@ msgstr "Non � posible engadir a mensaxe � cartafol mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' non � un directorio."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, 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:512
+#: 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"
@@ -6870,6 +8865,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "O cartafol `%s/%s' non existe."
@@ -6879,29 +8875,31 @@ msgstr "O cartafol `%s/%s' non existe."
 msgid "Spool mail file %s"
 msgstr "Ficheiro spool de correo %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Non se pode renomear os cartafoles spool"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Os cartafoles spool non se poden eliminar"
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6910,47 +8908,24 @@ 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:940
+#: 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/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Introduza o contrasinal NNTP para %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "O servidor rexeitou o nome de usuario"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Non se puido enviar o nome de usuario ao servidor"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "O servidor rexeitou o nome de usuario/contrasinal"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Mensaxe %s non atopada."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Non foi posible recibir a lista de grupos do servidor."
+#: 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/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 "Incapaz de cargar o ficheiro grouplist para %s: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Incapaz de gardar o ficheiro grouplist para %s: %s"
+#: 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"
@@ -6960,89 +8935,124 @@ 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:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Non foi posible abrir o directorio para o servidor de novas: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "Novas USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Esta opci�n autenticarase co servidor NNTP usando un contrasinal sen cifrar."
 
-#: 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 "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Non existe o cartafol %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "Non foi posible crear unha canalizaci�n: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "O comando IMAP fallou: %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 "Buscando mensaxes novas"
+
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "Erro desco�ecido: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:566
+#, fuzzy
+msgid "Use cancel"
+msgstr "Cancelar"
+
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "Operaci�n cancelada"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Recibindo o resumo de POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "Non foi posible comprobar se hai mensaxes novas no servidor POP: %s"
+#: 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 "Operaci�n cancelada"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
-"Non foi posible abrir o cartafol: o listado de mensaxes era incompleto."
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Non � posible obter o cartafol: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Eliminando as mensaxes borradas"
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "Non foi posible recoller a mensaxe: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Non foi posible recibir a mensaxe do servidor POP %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 "Non existe a mensaxe con 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 "Recibindo a mensaxe 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 ""
+"Non � posible obter a mensaxe: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Precipitaci�n desco�ecida"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "Armacenamento da mensaxe"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Deixar as mensaxes no servidor"
 
-#: 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 "Borrar despois de %s d�a(s)"
 
-#: 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:84
 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 "Para conectarse a servidores POP e descargar correo deles."
 
-#: 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."
@@ -7050,7 +9060,7 @@ msgstr ""
 "Esta opci�n conectarase � servidor POP usando un contrasinal sen cifrar. "
 "Esta � a �nica opci�n que soportan moitos servidores POP."
 
-#: camel/providers/pop3/camel-pop3-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 "
@@ -7060,47 +9070,32 @@ 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-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
-"Isto conectarase � servidor POP e usar� Kerberos 4 para autenticarse con el."
+"Non foi posible conectarse � servidor POP.\n"
+"Erro enviando o nome de usuario: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Non foi posible autenticarse co servidor KPOP: %s"
+#: camel/providers/pop3/camel-pop3-store.c:210
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operaci�n non soportada"
 
-#: camel/providers/pop3/camel-pop3-store.c:214
-#, c-format
-msgid "Could not connect to server: %s"
-msgstr "Non foi posible conectarse � servidor: %s."
+#: 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:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, 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:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sIntroduza o contrasinal POP3 para %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:378
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Non foi posible conectarse � servidor POP.\n"
-"Erro enviando o nome de usuario: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:381
-#: camel/providers/pop3/camel-pop3-store.c:418
-msgid "(Unknown)"
-msgstr "(Desco�ecido)"
-
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -7108,7 +9103,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
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "O comando IMAP fallou: %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "Erro de E/S"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7117,18 +9132,13 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
-#: camel/providers/pop3/camel-pop3-store.c:566
-#, fuzzy, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "Resposta inesperada do servidor IMAP: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7139,51 +9149,52 @@ msgid ""
 msgstr ""
 "Para entregar o correo pas�ndollo � programa \"sendmail\" no sistema local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "Non foi posible analizar o URL `%s'"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Non foi posible crear unha canalizaci�n para o sendmail: %s: correo non "
 "enviado"
 
-#: 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 "Non foi posible facer fork para o sendmail: %s: correo non enviado"
 
-#: 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 "Non foi posible enviar a mensaxe: %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 sa�u co sinal %s: correo non enviado."
 
-#: 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 "Non foi posible executar %s: correo non enviado."
 
-#: 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 sa�u con estado %d: correo non enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr "Non foi posible atopar o enderezo 'De' na mensaxe"
-
-#: 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 "Entrega de correo a trav�s do programa 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"
 
@@ -7193,127 +9204,150 @@ msgstr ""
 "Para entregar correo por conexi�n a un servidor de correo remoto usando "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Erro de sintaxe, comando non reco�ecido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Erro de sintaxe nos par�metros ou argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Par�metro do comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Resposta do estado do sistema ou da axuda do sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Mensaxe de axuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Servicio pechando a canle de transmisi�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio non dispo�ible, pechando a canle de transmisi�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Acci�n de correo pedida exitosa, completada"
 
-#: 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 "O usuario non � local; remitirase a <ruta de env�o>"
 
-#: 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 ""
 "A acci�n de correo pedida non foi levada a cabo: caixa de correo non "
 "dispo�ible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "A acci�n pedida non foi levada a cabo: caixa de correo non dispo�ible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Abortouse a acci�n solicitada: erro ao procesar"
 
-#: 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 "Usuario non local; t�nteo con <ruta-de-env�o>"
 
-#: 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 ""
 "A acci�n pedida non foi levada a cabo: insuficiente armacenamento no sistema"
 
-#: 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 ""
 "Abortouse a acci�n solicitada: excedeuse da asignaci�n de armacenamento"
 
-#: 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 ""
 "A acci�n pedida non foi levada a cabo: nome de caixa de correo non admitido"
 
-#: 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 "Comeza a introducci�n da mensaxe; remate con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "A transacci�n fallou"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Prec�sase unha transici�n de contrasinal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "O mecanismo de autenticaci�n � feble de m�is"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Neces�tase cifrado para o mecanismo de autenticaci�n solicitado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal de autenticaci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Autenticaci�n requirida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, 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:376
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "A petici�n AUTH expirou: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, 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"
 msgstr "O servidor SMTP %s non soporta o tipo de autenticaci�n %s requirida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:415
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7324,128 +9358,132 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo SMTP v�a %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr "Non se pode enviar a mensaxe: enderezo do autor non definido."
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:593 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+#, 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
 msgid "SMTP Greeting"
 msgstr "Sa�do SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erro na resposta HELO: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "Autenticaci�n SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao crear o obxecto de autenticaci�n SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "A petici�n AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "A petici�n AUTH fallou."
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Mala resposta de autenticaci�n do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:893
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1081
+#, fuzzy
+msgid "MAIL FROM response error"
 msgstr "Erro na resposta MAIL FROM: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Erro na resposta RCPT TO: %s: correo non enviado."
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "A petici�n DATA expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "Erro na resposta DATA: %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
+#, fuzzy
+msgid "DATA response error"
+msgstr "Erro na resposta 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:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "Erro na resposta DATA: remate da mensaxe: %s: correo non enviado"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "Mala resposta de autenticaci�n do servidor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "A petici�n RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "Erro na resposta QUIT: %s: non fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "Erro na resposta RSET: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -7472,19 +9510,19 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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 "anexo"
 
-#: 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 "Eliminar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:531
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "Anexar un ficheiro � mensaxe"
 
@@ -7512,56 +9550,56 @@ msgid "MIME type:"
 msgstr "Tipo 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 "Suxerir que se amose o anexo automaticamente"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Prema aqu� para o libro de enderezos"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:397
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7569,12 +9607,12 @@ msgstr ""
 "Introduza os enderezos que recibir�n unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: 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 "Anexar un ficheiro"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7583,46 +9621,34 @@ msgstr ""
 "Erro ao le-lo ficheiro %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:894
-msgid "Save as..."
-msgstr "Gardar como..."
-
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "�Aviso!"
 
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "O ficheiro existe, �sobrescribir?"
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao gardar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao cargar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1019
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Incapaz de abrir o cartafol de borradores para esta conta.\n"
-"�Gostar�alle usar o cartafol de borradores por defecto?"
-
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acceder ao ficheiro: %s"
 
-#: composer/e-msg-composer.c:1077
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7631,7 +9657,7 @@ msgstr ""
 "Non � posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1091
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7640,7 +9666,7 @@ msgstr ""
 "Non foi posible trunca-lo ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1100
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7649,7 +9675,7 @@ msgstr ""
 "Erro ao autogardar a mensaxe: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1202
+#: composer/e-msg-composer.c:1176
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -7658,7 +9684,7 @@ msgstr ""
 "Evolution atopou ficheiros non gravados dunha sesi�n anterior.\n"
 "�Gostar�alle probar a recuperalos?"
 
-#: composer/e-msg-composer.c:1356
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7668,30 +9694,30 @@ msgstr ""
 "\n"
 "�Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:1363
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mensaxe Remitida"
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1535
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Inserir Ficheiro"
 
-#: composer/e-msg-composer.c:1910 composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Compo�er unha mensaxe"
 
-#: composer/e-msg-composer.c:2368
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2391 composer/e-msg-composer.c:2446
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -7700,7 +9726,7 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque a�nda\n"
 "non configurou ningunha identidade no compo�ente de correo."
 
-#: 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."
@@ -7708,18 +9734,19 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque a�nda\n"
 "non configurou ningunha identidade no compo�ente de correo."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Non foi posible inicializar o compositor de Evolution."
 
-#: 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:1
 msgid "The Evolution groupware suite"
 msgstr "A suite de traballo en grupo Evolution"
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Evolution"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "tarxeta de enderezo"
@@ -7760,15 +9787,33 @@ 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
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Xa existe un ficheiro con ese nome.\n"
+"�Sobrescribilo?"
+
 #. Remember the password?
-#: e-util/e-passwords.c:347 mail/mail-session.c:267
+#: e-util/e-passwords.c:363 mail/mail-session.c:269
 msgid "Remember this password"
 msgstr "Lembrar este contrasinal"
 
-#: e-util/e-passwords.c:349 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 ""
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "Categor�as"
+
 #. 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
@@ -7848,13 +9893,13 @@ 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"
 
 #. 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"
 
@@ -7895,11 +9940,7 @@ msgstr "hora"
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "segundo"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "segundos"
 
@@ -7977,7 +10018,7 @@ msgstr " atr�s"
 msgid "ago"
 msgstr "atr�s"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B �s %k:%M"
 
@@ -7990,15 +10031,15 @@ msgid "Filter Rules"
 msgstr "Regras de Filtrado"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "Ent�n"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Engadir acci�n"
 
-#: filter/filter-folder.c:156
+#: filter/filter-folder.c:147
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -8007,19 +10048,11 @@ msgstr ""
 "Oops, esqueceu escoller un cartafol.\n"
 "Volva atr�s e especifique un cartafol v�lido no que deixar o correo."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:364
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Seleccionar Cartafol"
 
-#: filter/filter-folder.c:267
-msgid "Enter folder URI"
-msgstr "Introduza o URI do cartafol"
-
-#: filter/filter-folder.c:314
-msgid "<click here to select a folder>"
-msgstr "<prema aqu� para seleccionar un cartafol>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -8029,7 +10062,7 @@ msgstr ""
 "Erro na expresi�n regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Proba"
 
@@ -8038,39 +10071,40 @@ msgstr "Proba"
 msgid "You must name this filter."
 msgstr "Cambiar o nome deste cartafol"
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Sen t�tulo"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "Executar acci�ns"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "se se cumpren t�dolos criterios"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "se se cumpre alg�n criterio"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "sa�nte"
 
@@ -8114,6 +10148,12 @@ msgstr "con todos os cartafoles locais e cos remotos activos"
 msgid "with all local folders"
 msgstr "con todos os cartafoles locais"
 
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Asignar Puntuaci�n"
+
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Asignar Cor"
@@ -8126,6 +10166,11 @@ msgstr "Asignar Puntuaci�n"
 msgid "Attachments"
 msgstr "Anexos"
 
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belice"
+
 #: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "cont�n"
@@ -8179,144 +10224,154 @@ msgid "ends with"
 msgstr "remata en"
 
 #: filter/libfilter-i18n.h:21
+msgid "Execute Shell Command"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expresi�n"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "�"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "foi posterior a"
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "foi anterior a"
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Marcada"
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "� maior que"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "� menor que"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "non �"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Marcada"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "Lista de Correo"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "Cabeceira da Mensaxe"
 
-#: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr "Recibiuse a mensaxe"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message was sent"
-msgstr "Enviouse a mensaxe"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Mover a un Cartafol"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "en ou despois"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "en ou antes"
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "Tocar un son:"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Ler"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "Busca por Expresi�n Regular"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1404
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Autor"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Establecer Estado"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Tama�o (kB)"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "soa como"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "Conta Fonte"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Cabeceira espec�fica"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "comeza por"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:52
-msgid "was after"
-msgstr "foi posterior a"
-
-#: filter/libfilter-i18n.h:53
-msgid "was before"
-msgstr "foi anterior a"
-
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Regras"
 
-#: filter/rule-editor.c:278
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Engadir Regra"
 
-#: filter/rule-editor.c:344
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Editar Regra"
 
@@ -8338,30 +10393,30 @@ msgstr "Oops.  Necesita especificar polo menos un cartafol como fonte."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution est� importando o seu correo de Elm antigo"
 
-#: 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 "Importando..."
 
-#: 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 "Agarde, por favor"
 
-#: 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 "Importando %s coma %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 "Examinando %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:101
 msgid "Mail"
 msgstr "Correo"
 
@@ -8389,23 +10444,74 @@ msgstr ""
 "Evolution atopou ficheiros GnomeCard.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "_Prioridade:"
+
+#: 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 est� importando os datos antigos de Netscape"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Lixo"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Ficheiro local de correo %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Explorando o directorio"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Comezando a importaci�n"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Opci�ns"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Editar Filtros"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8432,44 +10538,96 @@ msgid "Pine"
 msgstr "Imprimir"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Preferencias da Axenda"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "F�brica para o compositor de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "F�brica para o compo�ente da axenda de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "F�brica para o compositor de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "F�brica para o compositor de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Compo�ente de evolution para manexar o correo."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Compositor de correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Compo�ente de resumo executivo do correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Compo�ente de mostra de cartafoles de correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Compo�ente de f�brica de cartafoles de correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "F�brica para o compositor de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "F�brica para a compo�ente Resumo de Correo."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Modifica-las preferencias"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Contas"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Preferencias da Axenda"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "Interface de configuraci�n do correo"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Cartafol que cont�n correo"
+#: 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:101
-msgid "Mail storage folder (internal)"
-msgstr "Cartafol de armacenamento de correo (interno)"
+msgid "Folder containing mail"
+msgstr "Cartafol que cont�n correo"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -8479,231 +10637,255 @@ msgstr "Lixo Virtual"
 msgid "Virtual Trash folder"
 msgstr "Cartafol de Lixo Virtual"
 
-#: mail/component-factory.c:129
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Non foi posible conectarse � servidor: %s."
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Este cartafol non pode conter mensaxes."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:925
+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
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/component-factory.c:951
-msgid "New _Mail Message"
-msgstr "Nova _Mensaxe"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "Enviar _Mensaxe"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 #, 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:990
+#: mail/component-factory.c:1009
 #, 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:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Conectando ao servidor..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o armacenamento co shell"
 
-#: mail/folder-browser-ui.c:271
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades de \"%s\""
 
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d nova(s)"
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d oculta(s)"
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionada(s)"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d sen enviar"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d sen enviar"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1049
-msgid "Create vFolder from Search"
-msgstr "Crear un CartafolV da Busca"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Crear Cartafol _Virtual Dende Mensaxe"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:104
-msgid "_Save As..."
-msgstr "Gardar _Como..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Responder � Autor"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Responder � _Lista"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Completada"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Limpar"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Recuperar"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "_Mover � Cartafol.."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:106
-msgid "_Undelete"
-msgstr "_Recuperar"
+#: mail/folder-browser.c:1645
+msgid "Label"
+msgstr ""
 
-#: mail/folder-browser.c:1473
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:1478
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
-msgstr "Filtrar pola Lista de Correo"
-
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "CartafolV pola Lista de Correo"
 
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrar pola Lista de Correo (%s)"
 
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "CartafolV pola Lista de Correo (%s)"
 
-#: mail/folder-browser.h:26
-#, fuzzy
-msgid "Default"
-msgstr "Por de_fecto"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Obtendo Informaci�n do Cartafol"
@@ -8725,28 +10907,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importa ficheiros de Outlook Express 4 a Evolution"
 
 #: mail/local-config.glade.h:1
-#, fuzzy
-msgid "Body contents"
-msgstr "O corpo cont�n"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Formato de armacenamento actual:"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:2
 #, fuzzy
-msgid "Indexing:"
-msgstr "�_ndice"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Formato mailbox"
+msgid "Index body contents"
+msgstr "O corpo cont�n"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Novo formato de armacenamento:"
 
-#: 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"
@@ -8757,15 +10930,15 @@ msgstr ""
 "poida que non sexa recuperable automaticamente. Por favor,\n"
 "use esta caracter�stica con cuidado."
 
-#: 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"
 
@@ -8783,89 +10956,79 @@ msgstr "Editor de Novas de Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:962
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Servidor:"
+
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
 #, fuzzy
-msgid "Could not save signature file."
-msgstr ""
-"Non foi posible abrir o ficheiro de sinatura %s:\n"
-"%s"
+msgid "User_name:"
+msgstr "Nome de _Usuario:"
 
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "Gravar sinatura"
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "_Ruta:"
 
-#: mail/mail-account-gui.c:1045
+#: 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 ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Esta sinatura cambiou, pero non se gravou.\n"
-"\n"
-"�Desexa gardar os cambios?"
 
-#: mail/mail-account-gui.c:1654
+#: mail/mail-account-gui.c:1985
 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:149
-msgid " (default)"
-msgstr " (por defecto)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Desactivar"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Activado"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "�Est� seguro de que quere borrar esta conta?"
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Non borrar"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "�Borrar esta conta de verdade?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-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:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Desactivar"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:783 mail/mail-config.glade.h:42
-msgid "Mail Settings"
-msgstr "Configuraci�n de Correo"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Activado"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Mensaxe para %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "�Est� seguro de que quere borrar esta conta de novas?"
 
-#: mail/mail-autofilter.c:215
-#, c-format
-msgid "Subject is %s"
-msgstr "O asunto � %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Activado"
 
-#: mail/mail-autofilter.c:231
-#, c-format
-msgid "Mail from %s"
-msgstr "Mensaxe de %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Nome da Cont_a:"
 
-#: mail/mail-autofilter.c:287
-#, c-format
-msgid "%s mailing list"
-msgstr "lista de correo %s"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Porto Rico"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8877,7 +11040,7 @@ msgstr ""
 "recibir ou compo�er correo.\n"
 "�Quere configuralo agora?"
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8885,7 +11048,7 @@ msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8893,23 +11056,19 @@ msgstr ""
 "Ten que configurar un transporte de correo\n"
 "antes de poder compo�elo."
 
-#: mail/mail-callbacks.c:230
-msgid "You have not set a mail transport method"
-msgstr "Non definiu ning�n m�todo de env�o de correo"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:265
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:280
+#: mail/mail-callbacks.c:209
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Enviar unha mensaxe"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8917,7 +11076,7 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "�Enviar realmente?"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8925,11 +11084,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:370
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8939,41 +11098,44 @@ msgstr ""
 "cabeceira Apparently-To.\n"
 "�Enviar de todas maneiras?"
 
-#: mail/mail-callbacks.c:469
-#, fuzzy
-msgid "This message contains invalid recipients:"
-msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 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:600
+#: mail/mail-callbacks.c:497
 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:838
+#: mail/mail-callbacks.c:623
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+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
 msgid "an unknown sender"
 msgstr "un remitente desco�ecido"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 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:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1283 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1753
+#: mail/mail-callbacks.c:2091
 #, 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:1778
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8981,7 +11143,7 @@ msgstr ""
 "S� pode editar mensaxes gardadas\n"
 "no cartafol de Borradores."
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8989,28 +11151,39 @@ msgstr ""
 "S� pode reenviar mensaxes\n"
 "do cartafol de Enviadas."
 
-#: mail/mail-callbacks.c:1831
+#: mail/mail-callbacks.c:2169
 #, 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:1857
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Ningunha Mensaxe Seleccionada"
 
-#: mail/mail-callbacks.c:1951
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "�Sobrescribir ficheiro?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:2122 widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Advertencia"
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Amosa-la seguinte mensaxe sen ler"
+
+#: mail/mail-callbacks.c:2373
+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:2129
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -9022,11 +11195,7 @@ msgstr ""
 "\n"
 "�Eliminar realmente estas mensaxes?"
 
-#: mail/mail-callbacks.c:2136
-msgid "Do not ask me again."
-msgstr "Non preguntar de novo"
-
-#: mail/mail-callbacks.c:2244
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -9035,19 +11204,28 @@ msgstr ""
 "Erro ao cargar a informaci�n do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2256
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2319
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Recibindo a mensaxe %d de %d"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2863
+msgid "US-Letter"
+msgstr ""
+
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "A impresi�n da mensaxe fallou"
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -9106,16 +11284,34 @@ msgstr ""
 "Este nome s� se emprega para amosalo."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
-#: mail/mail-config.c:326
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "Conta"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Traballando"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
 
-#: mail/mail-config.c:1859
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: mail/mail-config.c:78 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"
@@ -9123,94 +11319,158 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Inbox"
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Comprobando Servicio"
 
-#: mail/mail-config.c:2183 mail/mail-config.c:2187
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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 " _Check for supported types "
-msgstr "Dete_ctar tipos soportados "
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " cor"
+#, 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
+#, 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
 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:4
+#: mail/mail-config.glade.h:7
 #, 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:5
-msgid "Account"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Informaci�n de Contas"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Xesti�n de Contas"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "Contas"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Cancelar Operaci�n"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:12
+msgid "Afrikaans"
+msgstr ""
+
+#: mail/mail-config.glade.h:13
 #, fuzzy
-msgid "Always _encrypt to myself when sending encrypted mail"
+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:10
+#: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Always _sign outgoing messages when using this account"
+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:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Anexar un ficheiro � mensaxe"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autenticaci�n"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "Comprobar _automaticamente se hai correo novo cada"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Xogo de caracteres desco�ecido: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "P_echar"
+
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Comprobando o novo correo"
 
-#: mail/mail-config.glade.h:14
-msgid "Composer"
-msgstr "Compo�edor"
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Composing Messages"
+msgstr "Compo�er unha mensaxe"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:16
-#, fuzzy
-msgid "Confirm when Expunging a folder"
-msgstr "Limpando o cartafol"
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9226,236 +11486,375 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuraci�n."
 
-#: mail/mail-config.glade.h:23
+#: 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:24
-msgid "Default Forward style is: "
-msgstr "O estilo de Remitir por defecto �: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Codificaci�n de caracteres por defecto: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Recibindo Correo"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "IDs dixitais..."
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr "Amosar"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Borradores"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Cartafol de borradores:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Editar..."
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "E_nable advanced options"
+msgstr "Opci�ns do navegador de datas"
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
-msgstr "Activado"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Este"
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Enderezo cont�n"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "Enderezo de Correo:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "_Baleirar os cartafoles de lixo ao sair"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "Executar acci�ns"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "remata en"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Propiedades"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Mensaxes remitidas"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Obter ID Dixital..."
 
-#: mail/mail-config.glade.h:35
-msgid "HTML signature file:"
-msgstr "Ficheiro de sinatura HTML:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Resaltar as citas con "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Tuvalu"
+
+#: 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 "Identidade"
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr "En correo HTML"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Inline"
 
-#: 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 "Gardar e Pechar"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Cargar _Imaxes"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Localizaci�n da caixa do correo"
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
-msgstr "Facer esta a mi�a conta por _defecto"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Cabeceira da Mensaxe"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "Visualizaci�n das _Mensaxes"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Micronesia"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:46
-msgid "News"
-msgstr "Novas"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Fontes de _Novas"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Informaci�n Opcional"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:82
 #, fuzzy
-msgid "PGP _Key ID:"
+msgid "Or_ganization:"
+msgstr "Organi_zaci�n:"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "ID da Clave PGP:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Escoller unha cor"
 
-#: mail/mail-config.glade.h:54
-msgid "Pretty Good Privacy"
-msgstr "Pretty Good Privacy"
-
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:88
 #, fuzzy
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr "Avisar cando se env�en mensaxes cun asunto baleiro"
+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:56
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Avisar cando se env�en mensaxes cun asunto baleiro"
+#: mail/mail-config.glade.h:89
+#, 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 "Avisar cando se env�en mensaxes con s� destinatarios _Bcc definidos"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Imprimi-los contactos seleccionados"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Non se pode abrir a mensaxe"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
-msgid "Receiving Email"
-msgstr "Recepci�n de Correo"
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Responder-A:"
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+msgid "Receiving Email"
 msgstr "Recepci�n de Correo"
 
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Opci�ns de Recepci�n"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Lembrar este contrasinal"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Informaci�n Requirida"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+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:67
-msgid "Security"
-msgstr "Seguridade"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
-msgstr "Seleccionar un ficheiro de rexistro para o filtro..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "Seleccionar un binario PGP"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Enviando Correo"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
-msgstr "Enviando Correo"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Borrar todo ag�s a sinatura"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Enviada"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "O servidor require _autenticaci�n"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Configuraci�n do Servidor"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
-msgstr "Ficheiro de sinatura:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Atallos"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Gravar sinatura"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Fonte"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Informaci�n da Fonte"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "Fontes"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
-msgstr "Cartafoles Especiais"
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "mbox est�ndar de Unix"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:128
+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 s_ecure connection (SSL)"
-msgstr "Usar conexi�n segura (_SSL)"
+msgid "Use _HTML for this signature"
+msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Variable"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9465,133 +11864,220 @@ msgstr ""
 "\n"
 "Prema en \"Seguinte\" para comezar. "
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Este"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "Cargar _sempre as mensaxes da rede"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:141
 #, 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:93
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Tipo de Autenticaci�n: "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "Tipo de Autenticaci�n: "
+
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "ID do certificado:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
 #, fuzzy
-msgid "_Drafts folder:"
-msgstr "Cartafol de borradores:"
+msgid "_Confirm when expunging a folder"
+msgstr "Limpando o cartafol"
 
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
-msgstr "_Enderezo de Correo:"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Opci�ns por defecto"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
-msgstr "_Baleirar os cartafoles de lixo ao sair"
+#: mail/mail-config.glade.h:151
+msgid "_Do not notify me when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:153
+msgid "_Enable spell checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:154
+#, fuzzy
+msgid "_Filename:"
+msgstr "Nome do ficheiro:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Remitir Coma"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "_Nome Completo:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:159
+#, 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:103
-msgid "_Highlight citations with"
-msgstr "_Resaltar as citas con "
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Identidade"
 
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
-msgstr "_Servidor:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Idioma"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr "_Cargar imaxes se o autor est� no libro de enderezos"
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
-msgstr "_Rexistrar as acci�ns do filtro a:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Facer esta a mi�a conta por _defecto"
 
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_Marcar mensaxes como Lidas despois de"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_Nunca cargar as imaxes da rede"
 
-#: mail/mail-config.glade.h:110
-msgid "_Organization:"
-msgstr "_Organizaci�n:"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "Ruta do binario _PGP:"
 
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
-msgstr "_Ruta:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
-msgstr "_Lembrar este contrasinal"
+#: mail/mail-config.glade.h:172
+#, 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:114
-msgid "_Send mail in HTML format by default."
-msgstr "_Enviar as mensaxes en formato HTML por defecto."
+#: mail/mail-config.glade.h:173
+#, 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:115
+#: mail/mail-config.glade.h:174
 #, fuzzy
-msgid "_Server Type: "
-msgstr "Tipo de Servidor: "
+msgid "_Random"
+msgstr "Radio"
 
-#: mail/mail-config.glade.h:116
-msgid "_Signature file:"
-msgstr "Ficheiro de _Sinatura:"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Recepci�n de Correo"
 
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
-msgstr "Nome de _Usuario:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Responder a Todos"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Seguridade"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Seguridade"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Enviando Correo"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Amosa-lo Tempo Coma"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Variable"
+
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "_every"
 msgstr "Cada"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " cor"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "descrici�n"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "fiestranovas1"
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr "[gardasitio]"
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr "segundos."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Non foi posible crear un contexto de sinatura PGP."
@@ -9628,150 +12114,141 @@ msgstr "Non foi posible crear un contexto de sobre S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Non foi posible crear un contexto de descodificaci�n S/MIME."
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Gardar � Disco..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Ver Inline"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver Inline (mediante %s)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Cargado o contido da mensaxe"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Abrir Ligaz�n no Navegador"
 
-#: mail/mail-display.c:1594
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Copiar Localizaci�n da Ligaz�n"
 
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Gardar Ligaz�n coma (AM��AME)"
 
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Gardar Imaxe coma..."
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Enderezo Incorrecto"
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:915
 #, 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:1836
-#, fuzzy
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Non se reco�ece este tipo de compo�ente de axenda."
-
-#: mail/mail-format.c:1844
-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:1852
-msgid "This message is digitally signed but can not be proven to be authentic."
+msgid "Mailer"
 msgstr ""
-"Esta mensaxe est� asinada dixitalmente pero non se puido comprobar a s�a "
-"autenticidade"
+"\n"
+"Cliente de Correo: "
 
-#: mail/mail-format.c:2068
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2120
 #, 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:2087
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos desco�ecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2129
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9780,29 +12257,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:763
+#: mail/mail-local.c:762
 #, 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:815
+#: mail/mail-local.c:814
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando o cartafol \"%s\" � formato \"%s\""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9810,11 +12287,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:1407
+#: mail/mail-local.c:1405
 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:1416
+#: mail/mail-local.c:1414
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar %s"
@@ -9841,117 +12318,112 @@ msgstr ""
 msgid "Working"
 msgstr "Traballando"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtrando o Cartafol"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
-#: 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:557
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:677
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:696
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: 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 "Completado."
 
-#: mail/mail-ops.c:791
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Lixo"
-
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1518
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gardando %d mensaxe(s)"
 
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9960,7 +12432,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de sa�da: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9969,11 +12441,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9982,22 +12454,27 @@ msgstr ""
 "Non � posible crear ficheiro de sa�da: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2138
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -10037,67 +12514,93 @@ msgstr "Aparici�ns:"
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:246
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tipo:"
 
-#: mail/mail-send-recv.c:286
+#: mail/mail-send-recv.c:287
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:289
 #, fuzzy
 msgid "Cancel All"
 msgstr "Cancelar"
 
-#: mail/mail-send-recv.c:348
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: 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 "Agardando..."
 
-#: mail/mail-send-recv.c:533
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operaci�n."
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 #, fuzzy
 msgid "Enter Password"
 msgstr "Contrasinal"
 
-#: mail/mail-tools.c:255
+#: mail/mail-signature-editor.c:79
+#, 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
+msgid "Save signature"
+msgstr "Gravar sinatura"
+
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Esta sinatura cambiou, pero non se gravou.\n"
+"\n"
+"�Desexa gardar os cambios?"
+
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe remitida - %s"
 
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Mensaxe remitida"
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Mensaxe Remitida"
 
@@ -10120,105 +12623,164 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "CartafolesV"
+#: mail/mail-vfolder.c:785
+#, fuzzy
+msgid "vFolders"
+msgstr "Cartafoles"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:825
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editar CartafolesV"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:841
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:895
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Sen asunto)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensaxe"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "M�ltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "M�ltiples Mensaxes"
 
-#: mail/message-list.c:647
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "A m�is baixa"
 
-#: mail/message-list.c:648
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "M�is baixa"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "M�is alta"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "A m�is alta"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Hoxe �s %k:%M"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Onte �s %k:%M"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "O %A �s %k:%M"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "Pendente "
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Estado"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Marcada"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Recibido"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Tama�o"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "Resposta"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Adiante"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Informaci�n da Fonte"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Remitir"
+
+#: 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 "Responder"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Responder a Todos"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Previsualizar"
+
+#: 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\""
@@ -10240,7 +12802,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Desubscrib�ndose do cartafol \"%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 "Cartafol"
 
@@ -10285,89 +12847,11010 @@ msgid "_Unsubscribe"
 msgstr "_Desubscribir"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Compo�ente de Evolution para o resumo executivo"
-
-#: my-evolution/component-factory.c:44
-msgid "Folder containing the Evolution Summary"
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
 msgstr "Cartafol que cont�n o Resumo de Evolution"
 
-#: my-evolution/component-factory.c:153
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 #, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
+msgid "Evolution Summary component."
+msgstr "Compositor de correo de Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "F�brica para o compo�ente de correo de Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "F�brica para o compo�ente de Resume Executivo de Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Preferencias da Axenda"
+
+#: 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
+#, fuzzy
+msgid "Aarhus"
+msgstr "Alarmas"
+
+#: my-evolution/Locations.h:2
+#, fuzzy
+msgid "Abakan"
+msgstr "Acerbaix�n"
+
+#: my-evolution/Locations.h:3
+msgid "Abbotsford"
+msgstr ""
+
+#: my-evolution/Locations.h:4
+#, fuzzy
+msgid "Aberdeen"
+msgstr "Asistente"
+
+#: my-evolution/Locations.h:5
+#, fuzzy
+msgid "Abha"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:6
+#, fuzzy
+msgid "Abilene"
+msgstr "Tel�fono M�bil"
+
+#: 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 "Nicaragua"
+
+#: my-evolution/Locations.h:13
+msgid "Adak"
+msgstr ""
+
+#: my-evolution/Locations.h:14
+#, fuzzy
+msgid "Adana"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:15
+msgid "Adana/Incirlik"
+msgstr ""
+
+#: my-evolution/Locations.h:16
+msgid "Adelaide"
+msgstr ""
+
+#: my-evolution/Locations.h:17
+#, fuzzy
+msgid "Aden"
+msgstr "Suecia"
+
+#: my-evolution/Locations.h:18
+#, fuzzy
+msgid "Adrar"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:19
+#, fuzzy
+msgid "Aeroparque"
+msgstr "Opaco"
+
+#: my-evolution/Locations.h:20
+msgid "Aeropuerto del Norte"
+msgstr ""
+
+#: my-evolution/Locations.h:21
+#, fuzzy
+msgid "Afonsos"
+msgstr "An�nimo"
+
+#: my-evolution/Locations.h:22
+#, fuzzy
+msgid "Africa"
+msgstr "Sud�frica"
+
+#: my-evolution/Locations.h:23
+msgid "Afyon"
+msgstr ""
+
+#: my-evolution/Locations.h:24
+#, fuzzy
+msgid "Agen"
+msgstr "Arxentina"
+
+#: my-evolution/Locations.h:25
+#, fuzzy
+msgid "Aguascaliantes"
+msgstr "Australia"
+
+#: 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 "Albania"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:39
+#, fuzzy
+msgid "Alamosa"
+msgstr "Alarmas"
+
+#: my-evolution/Locations.h:40
+#, fuzzy
+msgid "Alaska"
+msgstr "Alarmas"
+
+#: my-evolution/Locations.h:41
+msgid "Al Baha"
+msgstr ""
+
+#: my-evolution/Locations.h:43
+#, fuzzy
+msgid "Albany"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:44
+#, fuzzy
+msgid "Albenga"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:45
+#, fuzzy
+msgid "Alberta"
+msgstr "Alxeria"
+
+#: my-evolution/Locations.h:46
+msgid "Alborg"
+msgstr ""
+
+#: my-evolution/Locations.h:47
+msgid "Albuquerque"
+msgstr ""
+
+#: my-evolution/Locations.h:48
+#, fuzzy
+msgid "Alderney"
+msgstr "Nome do cartafol:"
+
+#: my-evolution/Locations.h:49
+#, fuzzy
+msgid "Alesund"
+msgstr "Re-enviar"
+
+#: my-evolution/Locations.h:50
+#, fuzzy
+msgid "Alexandria"
+msgstr "Albania"
+
+#: 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 "Alxeria"
+
+#: my-evolution/Locations.h:56
+#, fuzzy
+msgid "Algona"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:57
+#, fuzzy
+msgid "Alicante"
+msgstr "Activar"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:62
+#, fuzzy
+msgid "Alliance"
+msgstr "Avanzado"
+
+#: my-evolution/Locations.h:63
+#, fuzzy
+msgid "Alma"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:64
+#, fuzzy
+msgid "Almeria"
+msgstr "Alxeria"
+
+#: my-evolution/Locations.h:65
+#, fuzzy
+msgid "Alpena"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:66
+msgid "Al Qaysumah"
+msgstr ""
+
+#: my-evolution/Locations.h:67
+#, fuzzy
+msgid "Alta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:68
+#, fuzzy
+msgid "Altamira"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:69
+#, fuzzy
+msgid "Alton"
+msgstr "_Acci�ns"
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr ""
+
+#: my-evolution/Locations.h:71
+#, fuzzy
+msgid "Alturas"
+msgstr "Alarmas"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:75
+#, fuzzy
+msgid "Amarillo"
+msgstr "Correo Electr�nico"
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr ""
+
+#: my-evolution/Locations.h:77
+#, fuzzy
+msgid "Ambler"
+msgstr "Membro"
+
+#: my-evolution/Locations.h:78
+#, fuzzy
+msgid "Amelia"
+msgstr "Armenia"
+
+#: my-evolution/Locations.h:79
+#, fuzzy
+msgid "Amendola"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:80
+#, fuzzy
+msgid "Ames"
+msgstr "millas"
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr ""
+
+#: my-evolution/Locations.h:82
+#, fuzzy
+msgid "Amsterdam"
+msgstr "Austria"
+
+#: my-evolution/Locations.h:83
+#, fuzzy
+msgid "Anadyr"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:84
+msgid "Anaktuvuk"
+msgstr ""
+
+#: my-evolution/Locations.h:85
+#, fuzzy
+msgid "Anapa"
+msgstr "Xap�n"
+
+#: my-evolution/Locations.h:86
+#, fuzzy
+msgid "Anchorage"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:87
+msgid "Anchorage - Elmendorf AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:88
+#, fuzzy
+msgid "Ancona"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:89
+msgid "Andahuayla"
+msgstr ""
+
+#: my-evolution/Locations.h:90
+#, fuzzy
+msgid "Anderson"
+msgstr "Treboada"
+
+#: my-evolution/Locations.h:91
+#, fuzzy
+msgid "Andoya"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:92
+#, fuzzy
+msgid "Andravida"
+msgstr "Individual"
+
+#: 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 "Albania"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:101
+#, fuzzy
+msgid "Anniston"
+msgstr "Afganist�n"
+
+#: my-evolution/Locations.h:102
+#, fuzzy
+msgid "Antalya"
+msgstr "Italia"
+
+#: my-evolution/Locations.h:103
+#, fuzzy
+msgid "Antartica"
+msgstr "Ant�rtida"
+
+#: my-evolution/Locations.h:104
+#, fuzzy
+msgid "Antigo"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:105
+#, fuzzy
+msgid "Antigua"
+msgstr "Anguila"
+
+#: my-evolution/Locations.h:106
+#, fuzzy
+msgid "Antigua and Barbuda"
+msgstr "Antiga e Barbuda"
+
+#: my-evolution/Locations.h:107
+#, fuzzy
+msgid "Antofagasta"
+msgstr "Afganist�n"
+
+#: my-evolution/Locations.h:108
+#, fuzzy
+msgid "Antwerpen/Deurne"
+msgstr "Modifica-las preferencias"
+
+#: my-evolution/Locations.h:109
+msgid "Aomori Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:110
+#, fuzzy
+msgid "Apalachicola"
+msgstr "[gardasitio]"
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr ""
+
+#: my-evolution/Locations.h:112
+#, fuzzy
+msgid "Aquadilla"
+msgstr "Anguila"
+
+#: my-evolution/Locations.h:113
+#, fuzzy
+msgid "Aracaju"
+msgstr "Macau"
+
+#: my-evolution/Locations.h:114
+#, fuzzy
+msgid "Arad"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:115
+#, fuzzy
+msgid "Arar"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:116
+#, fuzzy
+msgid "Araxos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:117
+#, fuzzy
+msgid "Arcata"
+msgstr "Ant�rtida"
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr ""
+
+#: my-evolution/Locations.h:119
+#, fuzzy
+msgid "Arequipa"
+msgstr "Armenia"
+
+#: my-evolution/Locations.h:121
+#, fuzzy
+msgid "Arica"
+msgstr "Alxeria"
+
+#: my-evolution/Locations.h:122
+#, fuzzy
+msgid "Arizona"
+msgstr "Arxentina"
+
+#: my-evolution/Locations.h:123
+msgid "Arkansas"
+msgstr ""
+
+#: my-evolution/Locations.h:124
+msgid "Arkhangelsk"
+msgstr ""
+
+#: my-evolution/Locations.h:125
+#, fuzzy
+msgid "Arlington"
+msgstr "Orientaci�n"
+
+#: my-evolution/Locations.h:126
+#, fuzzy
+msgid "Artigas"
+msgstr "Arxentina"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:131
+#, fuzzy
+msgid "Ashfield"
+msgstr "Asignada"
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:133
+#, fuzzy
+msgid "Ashland"
+msgstr "Tailandia"
+
+#: my-evolution/Locations.h:134
+#, fuzzy
+msgid "Asia"
+msgstr "Austria"
+
+#: my-evolution/Locations.h:135
+#, fuzzy
+msgid "Aspen"
+msgstr "Abrir"
+
+#: my-evolution/Locations.h:136
+#, fuzzy
+msgid "Asswan"
+msgstr "Asistente"
+
+#: my-evolution/Locations.h:137
+#, fuzzy
+msgid "Astoria"
+msgstr "Austria"
+
+#: my-evolution/Locations.h:138
+#, fuzzy
+msgid "Astrakhan"
+msgstr "Australia"
+
+#: my-evolution/Locations.h:139
+#, fuzzy
+msgid "Asturias"
+msgstr "Austria"
+
+#: my-evolution/Locations.h:140
+#, fuzzy
+msgid "Asuncion"
+msgstr "Xuntanza"
+
+#: my-evolution/Locations.h:141
+#, fuzzy
+msgid "Athens"
+msgstr "Anexos"
+
+#: my-evolution/Locations.h:142
+#, fuzzy
+msgid "Athinai"
+msgstr "China"
+
+#: my-evolution/Locations.h:143
+#, fuzzy
+msgid "Atlanta"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:144
+#, fuzzy
+msgid "Atlantic"
+msgstr "Autom�tico"
+
+#: 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 "Islandia"
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:150
+#, fuzzy
+msgid "Augusta"
+msgstr "agosto"
+
+#: my-evolution/Locations.h:151
+#, fuzzy
+msgid "Aurora"
+msgstr "Andorra"
+
+#: my-evolution/Locations.h:152
+#, fuzzy
+msgid "Austin"
+msgstr "Austria"
+
+#: my-evolution/Locations.h:153
+#, fuzzy
+msgid "Australasia"
+msgstr "Australia"
+
+#: my-evolution/Locations.h:156
+msgid "Avalon"
+msgstr ""
+
+#: my-evolution/Locations.h:157
+msgid "Aviano"
+msgstr ""
+
+#: my-evolution/Locations.h:158
+msgid "Ayacucho"
+msgstr ""
+
+#: my-evolution/Locations.h:159
+#, fuzzy
+msgid "Bage"
+msgstr "Base"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:170
+#, fuzzy
+msgid "Ball Mountain"
+msgstr "Enderezo cont�n"
+
+#: my-evolution/Locations.h:171
+#, fuzzy
+msgid "Baltimore"
+msgstr "B�ltico"
+
+#: my-evolution/Locations.h:172
+msgid "Baltimore-Glen Burnie"
+msgstr ""
+
+#: my-evolution/Locations.h:173
+#, fuzzy
+msgid "Banak"
+msgstr "Botsuana"
+
+#: my-evolution/Locations.h:174
+#, fuzzy
+msgid "Bandarabbass"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:175
+#, fuzzy
+msgid "Bangor"
+msgstr "atr�s"
+
+#: my-evolution/Locations.h:176
+#, fuzzy
+msgid "Baracoa"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:177
+msgid "Barbers Point"
+msgstr ""
+
+#: my-evolution/Locations.h:178
+#, fuzzy
+msgid "Barcelona"
+msgstr "Macedonia"
+
+#: my-evolution/Locations.h:179
+#, fuzzy
+msgid "Bardufoss"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:180
+msgid "Bar Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:181
+#, fuzzy
+msgid "Bari"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:182
+msgid "Bariloche"
+msgstr ""
+
+#: my-evolution/Locations.h:183
+#, fuzzy
+msgid "Barinas"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:184
+#, fuzzy
+msgid "Barking Sand"
+msgstr "Area con vento"
+
+#: my-evolution/Locations.h:185
+#, fuzzy
+msgid "Barksdale"
+msgstr "Base"
+
+#: my-evolution/Locations.h:186
+#, fuzzy
+msgid "Barnaul"
+msgstr "Brasil"
+
+#: 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 "Illas Feroe"
+
+#: 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 "B�sico"
+
+#: my-evolution/Locations.h:194
+msgid "Batesville"
+msgstr ""
+
+#: my-evolution/Locations.h:195
+#, fuzzy
+msgid "Batman"
+msgstr "But�n"
+
+#: my-evolution/Locations.h:196
+msgid "Baton Rouge"
+msgstr ""
+
+#: my-evolution/Locations.h:197
+msgid "Battle Creek"
+msgstr ""
+
+#: my-evolution/Locations.h:198
+#, fuzzy
+msgid "Battle Mountain"
+msgstr "O nome cont�n"
+
+#: my-evolution/Locations.h:199
+#, fuzzy
+msgid "Bauru"
+msgstr "Naur�"
+
+#: my-evolution/Locations.h:200
+#, fuzzy
+msgid "Bayamo"
+msgstr "Bahamas"
+
+#: my-evolution/Locations.h:201
+msgid "Bayreuth"
+msgstr ""
+
+#: my-evolution/Locations.h:202
+#, fuzzy
+msgid "Beatrice"
+msgstr "B�ltico"
+
+#: my-evolution/Locations.h:203
+msgid "Beaufort"
+msgstr ""
+
+#: my-evolution/Locations.h:204
+#, fuzzy
+msgid "Beaumont"
+msgstr "mes"
+
+#: 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 "Bahrain"
+
+#: my-evolution/Locations.h:208
+#, fuzzy
+msgid "Beckley"
+msgstr "Belice"
+
+#: my-evolution/Locations.h:209
+#, fuzzy
+msgid "Bedford"
+msgstr "antes"
+
+#: my-evolution/Locations.h:210
+#, fuzzy
+msgid "Beijing"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:211
+#, fuzzy
+msgid "Beirut"
+msgstr "Bielorrusia"
+
+#: my-evolution/Locations.h:212
+msgid "Beja"
+msgstr ""
+
+#: my-evolution/Locations.h:213
+#, fuzzy
+msgid "Belem"
+msgstr "Belice"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:219
+#, fuzzy
+msgid "Belleville"
+msgstr "Belice"
+
+#: my-evolution/Locations.h:220
+#, fuzzy
+msgid "Bellingham"
+msgstr "Pedrisco con vento"
+
+#: my-evolution/Locations.h:221
+msgid "Belmar-Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:222
+#, fuzzy
+msgid "Belo Horizonte"
+msgstr "Belice"
+
+#: 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 "Venezuela"
+
+#: my-evolution/Locations.h:226
+#, fuzzy
+msgid "Benina"
+msgstr "Benin"
+
+#: 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 "Recargar"
+
+#: my-evolution/Locations.h:230
+msgid "Bergamo"
+msgstr ""
+
+#: my-evolution/Locations.h:231
+#, fuzzy
+msgid "Bergen"
+msgstr "Vista"
+
+#: my-evolution/Locations.h:232
+msgid "Bergstrom AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:233
+msgid "Berlevag"
+msgstr ""
+
+#: my-evolution/Locations.h:234
+#, fuzzy
+msgid "Berlin"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:235
+msgid "Berlin-Tegel"
+msgstr ""
+
+#: my-evolution/Locations.h:236
+msgid "Berlin-Tempelhof"
+msgstr ""
+
+#: my-evolution/Locations.h:237
+#, fuzzy
+msgid "Bern"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:238
+#, fuzzy
+msgid "Bethel"
+msgstr "Tempo"
+
+#: my-evolution/Locations.h:239
+msgid "Bethlehem Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:240
+#, fuzzy
+msgid "Bettles"
+msgstr "Belice"
+
+#: my-evolution/Locations.h:241
+#, fuzzy
+msgid "Beverly"
+msgstr "Cada"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:245
+#, fuzzy
+msgid "Big Piney"
+msgstr "Imprimir"
+
+#: 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 "Lista de Correo"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:257
+#, fuzzy
+msgid "Blanding"
+msgstr "Sombreado"
+
+#: my-evolution/Locations.h:258
+#, fuzzy
+msgid "Block Island"
+msgstr "Illas Cook"
+
+#: my-evolution/Locations.h:259
+msgid "Bloemfontein J. B. M. Hertzog "
+msgstr ""
+
+#: my-evolution/Locations.h:260
+#, fuzzy
+msgid "Bloomington"
+msgstr "Area con vento"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:267
+#, fuzzy
+msgid "Bodo"
+msgstr "Corpo"
+
+#: my-evolution/Locations.h:268
+msgid "Bogota/Eldorado"
+msgstr ""
+
+#: my-evolution/Locations.h:269
+#, fuzzy
+msgid "Boise"
+msgstr "Base"
+
+#: my-evolution/Locations.h:271
+msgid "Bologna"
+msgstr ""
+
+#: my-evolution/Locations.h:272
+#, fuzzy
+msgid "Bolzano"
+msgstr "Polonia"
+
+#: my-evolution/Locations.h:273
+msgid "Bombay/Santacruz"
+msgstr ""
+
+#: my-evolution/Locations.h:274
+#, fuzzy
+msgid "Boone"
+msgstr "Nada"
+
+#: my-evolution/Locations.h:275
+msgid "Bordeaux"
+msgstr ""
+
+#: my-evolution/Locations.h:276
+#, fuzzy
+msgid "Borger"
+msgstr "para sempre"
+
+#: 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 "Bosnia e Hercegovina"
+
+#: my-evolution/Locations.h:280
+#, fuzzy
+msgid "Boston"
+msgstr "Estonia"
+
+#: my-evolution/Locations.h:281
+#, fuzzy
+msgid "Boulmer"
+msgstr "Cartafol"
+
+#: my-evolution/Locations.h:282
+#, fuzzy
+msgid "Bourges"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:283
+msgid "Bournemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:284
+#, fuzzy
+msgid "Bowling Green"
+msgstr "Area con vento"
+
+#: my-evolution/Locations.h:285
+#, fuzzy
+msgid "Bozeman"
+msgstr "Coreano"
+
+#: my-evolution/Locations.h:286
+#, fuzzy
+msgid "Bradford"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:287
+msgid "Bradshaw Field"
+msgstr ""
+
+#: my-evolution/Locations.h:288
+#, fuzzy
+msgid "Brainerd"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:289
+#, fuzzy
+msgid "Brasilia"
+msgstr "Brasil"
+
+#: my-evolution/Locations.h:290
+msgid "Brasschaat"
+msgstr ""
+
+#: my-evolution/Locations.h:291
+#, fuzzy
+msgid "Bratislava"
+msgstr "Brasil"
+
+#: my-evolution/Locations.h:292
+#, fuzzy
+msgid "Bratsk"
+msgstr "Borradores"
+
+#: my-evolution/Locations.h:293
+msgid "Braunschweig"
+msgstr ""
+
+#: my-evolution/Locations.h:295
+#, fuzzy
+msgid "Bremen"
+msgstr "Iemen"
+
+#: my-evolution/Locations.h:296
+msgid "Bremerton"
+msgstr ""
+
+#: my-evolution/Locations.h:297
+#, fuzzy
+msgid "Brest"
+msgstr "Proba"
+
+#: my-evolution/Locations.h:298
+msgid "Bridgeport"
+msgstr ""
+
+#: my-evolution/Locations.h:299
+#, fuzzy
+msgid "Brindisi"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:300
+msgid "Brisbane"
+msgstr ""
+
+#: my-evolution/Locations.h:301
+#, fuzzy
+msgid "Bristol"
+msgstr "Brasil"
+
+#: 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 "Barbados"
+
+#: my-evolution/Locations.h:305
+#, fuzzy
+msgid "Broken Bow"
+msgstr "Nubes escachadas"
+
+#: my-evolution/Locations.h:306
+msgid "Bronnoysund"
+msgstr ""
+
+#: my-evolution/Locations.h:307
+#, fuzzy
+msgid "Brookings"
+msgstr "Traballando"
+
+#: my-evolution/Locations.h:308
+msgid "Brooksville"
+msgstr ""
+
+#: my-evolution/Locations.h:309
+#, fuzzy
+msgid "Broome"
+msgstr "Inferior:"
+
+#: my-evolution/Locations.h:310
+msgid "Brownsville"
+msgstr ""
+
+#: my-evolution/Locations.h:311
+#, fuzzy
+msgid "Brunswick"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:312
+msgid "Brussels-National Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:313
+msgid "Bryansk"
+msgstr ""
+
+#: my-evolution/Locations.h:314
+#, fuzzy
+msgid "Bryce Canyon"
+msgstr "Por Compa��a"
+
+#: 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 "But�n"
+
+#: my-evolution/Locations.h:323
+#, fuzzy
+msgid "Burgas"
+msgstr "Ocupado"
+
+#: my-evolution/Locations.h:324
+#, fuzzy
+msgid "Burley"
+msgstr "Turqu�a"
+
+#: my-evolution/Locations.h:325
+msgid "Burlington"
+msgstr ""
+
+#: my-evolution/Locations.h:326
+#, fuzzy
+msgid "Burnet"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:327
+#, fuzzy
+msgid "Burns"
+msgstr "Ocupado"
+
+#: my-evolution/Locations.h:328
+#, fuzzy
+msgid "Bursa"
+msgstr "Ocupado"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:332
+#, fuzzy
+msgid "Cagliari"
+msgstr "Axenda"
+
+#: my-evolution/Locations.h:333
+#, fuzzy
+msgid "Cairns"
+msgstr "Presidencia"
+
+#: my-evolution/Locations.h:334
+#, fuzzy
+msgid "Cairo"
+msgstr "Presidencia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:338
+#, fuzzy
+msgid "Calgary"
+msgstr "Axenda"
+
+#: my-evolution/Locations.h:339
+msgid "Cali/Alfonso Bonillaaragon"
+msgstr ""
+
+#: my-evolution/Locations.h:340
+#, fuzzy
+msgid "Caliente"
+msgstr "Axenda"
+
+#: my-evolution/Locations.h:341
+#, fuzzy
+msgid "California"
+msgstr "Nova Caledonia"
+
+#: my-evolution/Locations.h:342
+msgid "Calvi-Ste-Catherine"
+msgstr ""
+
+#: my-evolution/Locations.h:343
+#, fuzzy
+msgid "Camaguey"
+msgstr "Paraguai"
+
+#: 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 "Camer�n"
+
+#: my-evolution/Locations.h:347
+#, fuzzy
+msgid "Camiri"
+msgstr "Presidencia"
+
+#: my-evolution/Locations.h:348
+#, fuzzy
+msgid "Campeche"
+msgstr "Completo"
+
+#: my-evolution/Locations.h:349
+#, fuzzy
+msgid "Campinas"
+msgstr "Camboia"
+
+#: my-evolution/Locations.h:350
+#, fuzzy
+msgid "Campo"
+msgstr "Copiar"
+
+#: my-evolution/Locations.h:351
+#, fuzzy
+msgid "Campo Grande"
+msgstr "Cabo Verde"
+
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr ""
+
+#: my-evolution/Locations.h:353
+#, fuzzy
+msgid "Canaan"
+msgstr "Canad�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:363
+#, fuzzy
+msgid "Cancun"
+msgstr "Cancelar"
+
+#: my-evolution/Locations.h:364
+msgid "Cannes-Mandelieu"
+msgstr ""
+
+#: my-evolution/Locations.h:365
+#, fuzzy
+msgid "Cantwell"
+msgstr "Cancelar"
+
+#: my-evolution/Locations.h:366
+#, fuzzy
+msgid "Cape Girardeau"
+msgstr "Cabo Verde"
+
+#: my-evolution/Locations.h:367
+#, fuzzy
+msgid "Cape Hatteras"
+msgstr "Cabo Verde"
+
+#: my-evolution/Locations.h:368
+#, fuzzy
+msgid "Cape Lisburne"
+msgstr "Orixe do papel:"
+
+#: my-evolution/Locations.h:369
+#, fuzzy
+msgid "Cape Newenham"
+msgstr "Cabo Verde"
+
+#: 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 "Cabo Verde"
+
+#: my-evolution/Locations.h:374
+msgid "Caracas La Carlota"
+msgstr ""
+
+#: my-evolution/Locations.h:375
+msgid "Caracas Maiquetia"
+msgstr ""
+
+#: my-evolution/Locations.h:376
+#, fuzzy
+msgid "Caravelas"
+msgstr "Cancelar Tarefa"
+
+#: my-evolution/Locations.h:377
+#, fuzzy
+msgid "Carbondale"
+msgstr "Camboia"
+
+#: my-evolution/Locations.h:378
+#, fuzzy
+msgid "Cardiff"
+msgstr "Vista de Tarxeta"
+
+#: my-evolution/Locations.h:379
+#, fuzzy
+msgid "Caribou"
+msgstr "Autom�bil"
+
+#: my-evolution/Locations.h:380
+#, fuzzy
+msgid "Carlisle"
+msgstr "Variable"
+
+#: my-evolution/Locations.h:381
+#, fuzzy
+msgid "Carlsbad"
+msgstr "Resposta"
+
+#: my-evolution/Locations.h:382
+#, fuzzy
+msgid "Carroll"
+msgstr "Autom�bil"
+
+#: my-evolution/Locations.h:383
+msgid "Cartagena/Rafael Nunez"
+msgstr ""
+
+#: my-evolution/Locations.h:384
+msgid "Casa Granda"
+msgstr ""
+
+#: my-evolution/Locations.h:385
+#, fuzzy
+msgid "Cascade"
+msgstr "Horizontal"
+
+#: my-evolution/Locations.h:386
+#, fuzzy
+msgid "Casper"
+msgstr "Papel"
+
+#: my-evolution/Locations.h:387
+#, fuzzy
+msgid "Catacamas"
+msgstr "Bahamas"
+
+#: my-evolution/Locations.h:388
+#, fuzzy
+msgid "Catania"
+msgstr "Croacia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:393
+#, fuzzy
+msgid "Cedar City"
+msgstr "Ceo limpo"
+
+#: 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 "Alxeria"
+
+#: my-evolution/Locations.h:397
+msgid "Chacarita"
+msgstr ""
+
+#: my-evolution/Locations.h:398
+#, fuzzy
+msgid "Chadron"
+msgstr "Chad"
+
+#: my-evolution/Locations.h:399
+#, fuzzy
+msgid "Challis"
+msgstr "Presidencia"
+
+#: my-evolution/Locations.h:400
+#, fuzzy
+msgid "Chamberlain"
+msgstr "Camer�n"
+
+#: my-evolution/Locations.h:401
+#, fuzzy
+msgid "Chambery"
+msgstr "Camer�n"
+
+#: my-evolution/Locations.h:402
+#, fuzzy
+msgid "Champaign"
+msgstr "Compa��a"
+
+#: my-evolution/Locations.h:403
+#, fuzzy
+msgid "Chandalar Lake"
+msgstr "Mensaxe da Axenda"
+
+#: my-evolution/Locations.h:404
+#, fuzzy
+msgid "Chandler"
+msgstr "Chad"
+
+#: my-evolution/Locations.h:405
+#, fuzzy
+msgid "Chania"
+msgstr "China"
+
+#: my-evolution/Locations.h:406
+#, fuzzy
+msgid "Chanute"
+msgstr "Cancelar"
+
+#: my-evolution/Locations.h:407
+#, fuzzy
+msgid "Chariton"
+msgstr "Camer�n"
+
+#: my-evolution/Locations.h:408
+msgid "Charleroi-Brussels South"
+msgstr ""
+
+#: my-evolution/Locations.h:409
+msgid "Charles City"
+msgstr ""
+
+#: my-evolution/Locations.h:410
+#, fuzzy
+msgid "Charleston"
+msgstr "Presidentes"
+
+#: my-evolution/Locations.h:411
+#, fuzzy
+msgid "Charlotte"
+msgstr "Maiote"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:416
+#, fuzzy
+msgid "Cheju"
+msgstr "Chile"
+
+#: 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 "Luxemburgo"
+
+#: my-evolution/Locations.h:420
+#, fuzzy
+msgid "Cherry Point"
+msgstr "Outro Tel�fono"
+
+#: 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 "China"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:431
+#, fuzzy
+msgid "Chiclayo"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:432
+#, fuzzy
+msgid "Chico"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:433
+msgid "Chicopee Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:434
+#, fuzzy
+msgid "Chievres"
+msgstr "Chin�s"
+
+#: my-evolution/Locations.h:435
+#, fuzzy
+msgid "Chihhang"
+msgstr "China"
+
+#: my-evolution/Locations.h:436
+msgid "Chihuahua"
+msgstr ""
+
+#: my-evolution/Locations.h:437
+#, fuzzy
+msgid "Childress"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:439
+#, fuzzy
+msgid "China Lake"
+msgstr "China"
+
+#: my-evolution/Locations.h:440
+#, fuzzy
+msgid "Chinandega"
+msgstr "China"
+
+#: my-evolution/Locations.h:441
+msgid "Chinmem/Shatou"
+msgstr ""
+
+#: my-evolution/Locations.h:442
+#, fuzzy
+msgid "Chino"
+msgstr "China"
+
+#: my-evolution/Locations.h:443
+msgid "Chippewa County"
+msgstr ""
+
+#: my-evolution/Locations.h:444
+#, fuzzy
+msgid "Chita"
+msgstr "China"
+
+#: 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 "China"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:462
+#, fuzzy
+msgid "Clarinda"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:463
+#, fuzzy
+msgid "Clarion"
+msgstr "Camer�n"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:468
+#, fuzzy
+msgid "Cleveland"
+msgstr "Grenlandia"
+
+#: 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 "Colombia"
+
+#: 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 "Illas Cook"
+
+#: my-evolution/Locations.h:477
+#, fuzzy
+msgid "Cody"
+msgstr "Corpo"
+
+#: my-evolution/Locations.h:478
+msgid "Coeur d'Alene"
+msgstr ""
+
+#: my-evolution/Locations.h:479
+#, fuzzy
+msgid "Cold Bay"
+msgstr "Barra de _Cartafoles"
+
+#: my-evolution/Locations.h:480
+#, fuzzy
+msgid "Colima"
+msgstr "Colombia"
+
+#: my-evolution/Locations.h:481
+#, fuzzy
+msgid "College Station"
+msgstr "T�da_las estaci�ns:"
+
+#: my-evolution/Locations.h:482
+msgid "Colmar-Meyenheim"
+msgstr ""
+
+#: my-evolution/Locations.h:484
+#, fuzzy
+msgid "Colonia"
+msgstr "Colombia"
+
+#: my-evolution/Locations.h:485
+#, fuzzy
+msgid "Colorado"
+msgstr "Comores"
+
+#: my-evolution/Locations.h:486
+msgid "Colorado Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:487
+#, fuzzy
+msgid "Columbia"
+msgstr "Colombia"
+
+#: my-evolution/Locations.h:488
+msgid "Columbia-McEntire"
+msgstr ""
+
+#: my-evolution/Locations.h:489
+#, fuzzy
+msgid "Columbus"
+msgstr "Colombia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:494
+#, fuzzy
+msgid "Colville"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:495
+msgid "Comodoro Rivadavia"
+msgstr ""
+
+#: my-evolution/Locations.h:496
+#, fuzzy
+msgid "Comox"
+msgstr "Copiar"
+
+#: my-evolution/Locations.h:497
+msgid "Conceicao Do Araguaia"
+msgstr ""
+
+#: my-evolution/Locations.h:498
+#, fuzzy
+msgid "Concepcion"
+msgstr "Cancelar Operaci�n"
+
+#: my-evolution/Locations.h:499
+#, fuzzy
+msgid "Concord"
+msgstr "Congo"
+
+#: my-evolution/Locations.h:500
+msgid "Concordia"
+msgstr ""
+
+#: my-evolution/Locations.h:501
+msgid "Connaught"
+msgstr ""
+
+#: my-evolution/Locations.h:502
+#, fuzzy
+msgid "Connecticut"
+msgstr "Contactos"
+
+#: my-evolution/Locations.h:503
+#, fuzzy
+msgid "Conroe"
+msgstr "Congo"
+
+#: my-evolution/Locations.h:504
+#, fuzzy
+msgid "Constantine"
+msgstr "C_ont�n:"
+
+#: my-evolution/Locations.h:505
+msgid "Copper Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:506
+#, fuzzy
+msgid "Cordoba"
+msgstr "Colombia"
+
+#: my-evolution/Locations.h:507
+#, fuzzy
+msgid "Cordova"
+msgstr "Xordania"
+
+#: my-evolution/Locations.h:508
+msgid "Cork"
+msgstr ""
+
+#: my-evolution/Locations.h:509
+#, fuzzy
+msgid "Coro"
+msgstr "Comores"
+
+#: my-evolution/Locations.h:510
+#, fuzzy
+msgid "Corona"
+msgstr "Comores"
+
+#: my-evolution/Locations.h:511
+msgid "Corpus Christi"
+msgstr ""
+
+#: my-evolution/Locations.h:512
+msgid "Corpus Christi NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:513
+#, fuzzy
+msgid "Corrientes"
+msgstr "ocorrencias"
+
+#: my-evolution/Locations.h:514
+#, fuzzy
+msgid "Corsicana"
+msgstr "Costa Rica"
+
+#: my-evolution/Locations.h:515
+#, fuzzy
+msgid "Cortez"
+msgstr "Nota"
+
+#: my-evolution/Locations.h:516
+#, fuzzy
+msgid "Corumba"
+msgstr "Cuba"
+
+#: my-evolution/Locations.h:518
+msgid "Cotulla"
+msgstr ""
+
+#: my-evolution/Locations.h:519
+msgid "Council Bluffs"
+msgstr ""
+
+#: my-evolution/Locations.h:520
+#, fuzzy
+msgid "Coventry"
+msgstr "_Pa�s:"
+
+#: my-evolution/Locations.h:521
+#, fuzzy
+msgid "Covington"
+msgstr "Congo"
+
+#: my-evolution/Locations.h:522
+msgid "Cozumel"
+msgstr ""
+
+#: my-evolution/Locations.h:523
+#, fuzzy
+msgid "Craig"
+msgstr "Croacia"
+
+#: my-evolution/Locations.h:524
+#, fuzzy
+msgid "Cranfield"
+msgstr "Cancelada"
+
+#: my-evolution/Locations.h:525
+msgid "Crescent City"
+msgstr ""
+
+#: my-evolution/Locations.h:526
+#, fuzzy
+msgid "Creston"
+msgstr "Pregunta"
+
+#: my-evolution/Locations.h:527
+#, fuzzy
+msgid "Crestview"
+msgstr "Previsualizar"
+
+#: 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 "Camer�n"
+
+#: my-evolution/Locations.h:533
+#, fuzzy
+msgid "Cuba Awrs"
+msgstr "Cuba"
+
+#: my-evolution/Locations.h:534
+msgid "Cuernavaca"
+msgstr ""
+
+#: my-evolution/Locations.h:535
+#, fuzzy
+msgid "Cuiaba"
+msgstr "Cuba"
 
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/Locations.h:536
+#, fuzzy
+msgid "Culdrose"
+msgstr "Pechar"
+
+#: my-evolution/Locations.h:537
+msgid "Culiacan"
+msgstr ""
+
+#: my-evolution/Locations.h:538
+#, fuzzy
+msgid "Cumana"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:539
+msgid "Cumberland"
+msgstr ""
+
+#: my-evolution/Locations.h:540
+#, fuzzy
+msgid "Curitiba"
+msgstr "Croacia"
+
+#: my-evolution/Locations.h:541
+msgid "Curitiba Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:542
+#, fuzzy
+msgid "Custer"
+msgstr "Cortar"
+
+#: my-evolution/Locations.h:543
+msgid "Cut Bank"
+msgstr ""
+
+#: my-evolution/Locations.h:544
+msgid "Cuzco"
+msgstr ""
+
+#: my-evolution/Locations.h:547
+#, fuzzy
+msgid "Dagali"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:548
+msgid "Daggett"
+msgstr ""
+
+#: my-evolution/Locations.h:549
+msgid "Dalhart"
+msgstr ""
+
+#: my-evolution/Locations.h:550
+#, fuzzy
+msgid "Dalian"
+msgstr "Taiw�n"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:556
+#, fuzzy
+msgid "Danbury"
+msgstr "xaneiro"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:562
+#, fuzzy
+msgid "Dayton"
+msgstr "D�a"
+
+#: my-evolution/Locations.h:563
+msgid "Daytona Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:564
+msgid "Dayton-Fairborn"
+msgstr ""
+
+#: my-evolution/Locations.h:565
+#, fuzzy
+msgid "Dayton-South Airport"
+msgstr "Non importar"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:571
+#, fuzzy
+msgid "Deelen"
+msgstr "Eliminar"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:576
+#, fuzzy
+msgid "Delta"
+msgstr "Eliminar"
+
+#: my-evolution/Locations.h:577
+#, fuzzy
+msgid "Deming"
+msgstr "Xuntanza"
+
+#: my-evolution/Locations.h:578
+msgid "Den Helder/De Kooy"
+msgstr ""
+
+#: my-evolution/Locations.h:579
+#, fuzzy
+msgid "Denison"
+msgstr "Xuntanza"
+
+#: my-evolution/Locations.h:581
+#, fuzzy
+msgid "Denton"
+msgstr "L�bano"
+
+#: my-evolution/Locations.h:582
+#, fuzzy
+msgid "Denver"
+msgstr "Autor"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:587
+#, fuzzy
+msgid "Des Moines"
+msgstr "Fusos Horarios"
+
+#: my-evolution/Locations.h:588
+#, fuzzy
+msgid "Destin"
+msgstr "Pregunta"
+
+#: 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 "Bahrain"
+
+#: my-evolution/Locations.h:596
+#, fuzzy
+msgid "Dickinson"
+msgstr "Dimensi�ns:"
+
+#: my-evolution/Locations.h:597
+#, fuzzy
+msgid "Dijon"
+msgstr "Feito"
+
+#: my-evolution/Locations.h:598
+#, fuzzy
+msgid "Dillingham"
+msgstr "Pedrisco cambiante"
+
+#: my-evolution/Locations.h:599
+#, fuzzy
+msgid "Dillon"
+msgstr "Feito"
+
+#: my-evolution/Locations.h:600
+#, fuzzy
+msgid "Dinard"
+msgstr "Imprimir tarxeta"
+
+#: 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 "Papel"
+
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "Feito"
+
+#: my-evolution/Locations.h:610
+#, fuzzy
+msgid "Dongsha"
+msgstr "Tonga"
+
+#: my-evolution/Locations.h:611
+msgid "Dongshi"
+msgstr ""
+
+#: my-evolution/Locations.h:612
+#, fuzzy
+msgid "Don Torcuato"
+msgstr "en ou despois"
+
+#: my-evolution/Locations.h:613
+msgid "Dortmund-Wickede"
+msgstr ""
+
+#: my-evolution/Locations.h:614
+#, fuzzy
+msgid "Dothan"
+msgstr "Feito"
+
+#: my-evolution/Locations.h:615
+msgid "Douglas"
+msgstr ""
+
+#: my-evolution/Locations.h:616
+#, fuzzy
+msgid "Dover"
+msgstr "para sempre"
+
+#: 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 "Cuba"
+
+#: my-evolution/Locations.h:620
+msgid "Dubbo"
+msgstr ""
+
+#: my-evolution/Locations.h:621
+#, fuzzy
+msgid "Dublin"
+msgstr "P�blico"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:625
+#, fuzzy
+msgid "Dugway"
+msgstr "D�a"
+
+#: my-evolution/Locations.h:626
+#, fuzzy
+msgid "Duluth"
+msgstr "Por de_fecto"
+
+#: my-evolution/Locations.h:627
+#, fuzzy
+msgid "Dundee"
+msgstr "Pendente "
+
+#: my-evolution/Locations.h:628
+#, fuzzy
+msgid "Durango"
+msgstr "atr�s"
+
+#: 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 "Treboada de po"
+
+#: my-evolution/Locations.h:633
+msgid "Dutch Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:634
+#, fuzzy
+msgid "Dyersburg"
+msgstr "_Depuraci�n"
+
+#: my-evolution/Locations.h:635
+#, fuzzy
+msgid "Eagle"
+msgstr "Activado"
+
+#: 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 "Este - Sureste"
+
+#: 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 "mes"
+
+#: 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 "Tornado"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:661
+#, fuzzy
+msgid "Elkins"
+msgstr "Br�tema"
+
+#: my-evolution/Locations.h:662
+msgid "Elko"
+msgstr ""
+
+#: my-evolution/Locations.h:663
+#, fuzzy
+msgid "Elmira"
+msgstr "Eritrea"
+
+#: my-evolution/Locations.h:664
+#, fuzzy
+msgid "El Monte"
+msgstr "Mes"
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr ""
+
+#: my-evolution/Locations.h:667
+#, fuzzy
+msgid "El Salvador Int."
+msgstr "O Salvador"
+
+#: 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 "Importante"
+
+#: my-evolution/Locations.h:672
+msgid "Enid"
+msgstr ""
+
+#: my-evolution/Locations.h:673
+#, fuzzy
+msgid "Enid/Woodring"
+msgstr "Traballando"
+
+#: 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 "Eritrea"
+
+#: 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
+#, fuzzy
+msgid "Estherville"
+msgstr "Comprobar servicio"
+
+#: my-evolution/Locations.h:685
+#, fuzzy
+msgid "Eugene"
+msgstr "Limpar"
+
+#: my-evolution/Locations.h:686
+#, fuzzy
+msgid "Eureka"
+msgstr "Eritrea"
+
+#: my-evolution/Locations.h:687
+msgid "Europe"
+msgstr ""
+
+#: my-evolution/Locations.h:688
+#, fuzzy
+msgid "Evanston"
+msgstr "Estonia"
+
+#: my-evolution/Locations.h:689
+msgid "Evansville"
+msgstr ""
+
+#: my-evolution/Locations.h:690
+#, fuzzy
+msgid "Everett"
+msgstr "Cada"
+
+#: my-evolution/Locations.h:691
+msgid "Evergreen"
+msgstr ""
+
+#: my-evolution/Locations.h:692
+msgid "Evreux-Fauville"
+msgstr ""
+
+#: my-evolution/Locations.h:693
+#, fuzzy
+msgid "Exeter"
+msgstr "Tempo"
+
+#: my-evolution/Locations.h:694
+msgid "Ezeiza"
+msgstr ""
+
+#: my-evolution/Locations.h:695
+#, fuzzy
+msgid "Fagernes"
+msgstr "Buscapersoas"
+
+#: my-evolution/Locations.h:696
+msgid "Fairbanks"
+msgstr ""
+
+#: my-evolution/Locations.h:697
+msgid "Fairchild"
+msgstr ""
+
+#: my-evolution/Locations.h:698
+#, fuzzy
+msgid "Fairfield"
+msgstr "Campo _Desde"
+
+#: my-evolution/Locations.h:699
+#, fuzzy
+msgid "Fairmont"
+msgstr "Fontes"
+
+#: 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 "atr�s"
+
+#: my-evolution/Locations.h:705
+#, fuzzy
+msgid "Farmingdale"
+msgstr "Variable"
+
+#: my-evolution/Locations.h:706
+#, fuzzy
+msgid "Farmington"
+msgstr "Tornado conxelante"
+
+#: my-evolution/Locations.h:707
+#, fuzzy
+msgid "Farmville"
+msgstr "Nome Completo:"
+
+#: my-evolution/Locations.h:708
+#, fuzzy
+msgid "Faro"
+msgstr "De"
+
+#: my-evolution/Locations.h:709
+msgid "Fayetteville"
+msgstr ""
+
+#: my-evolution/Locations.h:710
+#, fuzzy
+msgid "Feng Nin"
+msgstr "Chuvia conxelante"
+
+#: my-evolution/Locations.h:711
+msgid "Fergus Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:712
+msgid "Fernando De Noronha"
+msgstr ""
+
+#: my-evolution/Locations.h:713
+#, fuzzy
+msgid "Ferrara"
+msgstr "febreiro"
+
+#: my-evolution/Locations.h:714
+#, fuzzy
+msgid "Figari"
+msgstr "Nixeria"
+
+#: my-evolution/Locations.h:715
+#, fuzzy
+msgid "Findlay"
+msgstr "Venres"
+
+#: my-evolution/Locations.h:717
+#, fuzzy
+msgid "Firenze"
+msgstr "Libre"
+
+#: my-evolution/Locations.h:718
+msgid "Fitchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:719
+msgid "Flagstaff"
+msgstr ""
+
+#: my-evolution/Locations.h:720
+#, fuzzy
+msgid "Flint"
+msgstr "Br�tema"
+
+#: my-evolution/Locations.h:721
+#, fuzzy
+msgid "Flippin"
+msgstr "Filipinas"
+
+#: my-evolution/Locations.h:722
+#, fuzzy
+msgid "Florence"
+msgstr "Francia"
+
+#: my-evolution/Locations.h:723
+#, fuzzy
+msgid "Florennes"
+msgstr "Libre"
+
+#: my-evolution/Locations.h:724
+#, fuzzy
+msgid "Flores"
+msgstr "Arquivar coma"
+
+#: my-evolution/Locations.h:725
+msgid "Florianopolis"
+msgstr ""
+
+#: my-evolution/Locations.h:726
+#, fuzzy
+msgid "Florida"
+msgstr "Venres"
+
+#: my-evolution/Locations.h:727
+#, fuzzy
+msgid "Floro"
+msgstr "De"
+
+#: my-evolution/Locations.h:728
+msgid "Fond Du Lac"
+msgstr ""
+
+#: my-evolution/Locations.h:729
+#, fuzzy
+msgid "Forde/Bringeland"
+msgstr "Finlandia"
+
+#: my-evolution/Locations.h:730
+#, fuzzy
+msgid "Forli"
+msgstr "_Ven"
+
+#: my-evolution/Locations.h:731
+#, fuzzy
+msgid "Formosa"
+msgstr "Formato"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:742
+#, fuzzy
+msgid "Fort Eustis"
+msgstr "Atallos"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:748
+#, fuzzy
+msgid "Fort Leonard"
+msgstr "Remitir"
+
+#: my-evolution/Locations.h:749
+msgid "Fort Lewis"
+msgstr ""
+
+#: my-evolution/Locations.h:750
+msgid "Fort Madison"
+msgstr ""
+
+#: my-evolution/Locations.h:751
+#, fuzzy
+msgid "Fort Meade"
+msgstr "_Remitir Mensaxe"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:757
+#, fuzzy
+msgid "Fort Smith"
+msgstr "Formato"
+
+#: my-evolution/Locations.h:758
+#, fuzzy
+msgid "Fort Stewart"
+msgstr "Non Iniciada"
+
+#: my-evolution/Locations.h:759
+msgid "Fort Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:760
+#, fuzzy
+msgid "Fort Wayne"
+msgstr "Francia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:769
+#, fuzzy
+msgid "Franklin"
+msgstr "Remitir inline"
+
+#: my-evolution/Locations.h:770
+#, fuzzy
+msgid "Fredericton"
+msgstr "descrici�n"
+
+#: my-evolution/Locations.h:771
+#, fuzzy
+msgid "Freeport"
+msgstr "Libre"
+
+#: my-evolution/Locations.h:772
+msgid "Frenchville"
+msgstr ""
+
+#: my-evolution/Locations.h:773
+#, fuzzy
+msgid "Fresno"
+msgstr "Neve conxelante"
+
+#: my-evolution/Locations.h:774
+msgid "Fresno-Chandler"
+msgstr ""
+
+#: my-evolution/Locations.h:775
+#, fuzzy
+msgid "Friday Harbor"
+msgstr "Venres"
+
+#: my-evolution/Locations.h:776
+msgid "Friedrichshafen"
+msgstr ""
+
+#: my-evolution/Locations.h:777
+#, fuzzy
+msgid "Frigg"
+msgstr "_Ven"
+
+#: my-evolution/Locations.h:778
+#, fuzzy
+msgid "Frontone"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:779
+#, fuzzy
+msgid "Frosinone"
+msgstr "Profesi�n"
+
+#: my-evolution/Locations.h:780
+#, fuzzy
+msgid "Fryeburg"
+msgstr "febreiro"
+
+#: 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 "Macedonia"
+
+#: my-evolution/Locations.h:789
+msgid "Gadsden"
+msgstr ""
+
+#: my-evolution/Locations.h:790
+#, fuzzy
+msgid "Gage"
+msgstr "P�xina"
+
+#: my-evolution/Locations.h:791
+#, fuzzy
+msgid "Gainesville"
+msgstr "Cancelada"
+
+#: 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 "Gana"
+
+#: my-evolution/Locations.h:796
+msgid "Galesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:797
+#, fuzzy
+msgid "Gallup"
+msgstr "Guadalupe"
+
+#: my-evolution/Locations.h:798
+msgid "Galveston"
+msgstr ""
+
+#: my-evolution/Locations.h:799
+#, fuzzy
+msgid "Gambell"
+msgstr "Gambia"
+
+#: my-evolution/Locations.h:800
+#, fuzzy
+msgid "Gander"
+msgstr "Cabeceira"
+
+#: my-evolution/Locations.h:801
+#, fuzzy
+msgid "Garden City"
+msgstr "Identidade"
+
+#: my-evolution/Locations.h:802
+msgid "Gary"
+msgstr ""
+
+#: my-evolution/Locations.h:803
+#, fuzzy
+msgid "Gassim"
+msgstr "Guam"
+
+#: my-evolution/Locations.h:804
+#, fuzzy
+msgid "Gatineau"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:805
+msgid "Gaziantep"
+msgstr ""
+
+#: my-evolution/Locations.h:806
+#, fuzzy
+msgid "Gdansk"
+msgstr "d�as"
+
+#: my-evolution/Locations.h:807
+#, fuzzy
+msgid "Geneve"
+msgstr "Grecia"
+
+#: my-evolution/Locations.h:808
+#, fuzzy
+msgid "Genova"
+msgstr "Xeral"
+
+#: 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 "Gana"
+
+#: my-evolution/Locations.h:814
+msgid "Ghedi"
+msgstr ""
+
+#: my-evolution/Locations.h:816
+msgid "Gifu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:817
+#, fuzzy
+msgid "Gila Bend"
+msgstr "Finlandia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:821
+#, fuzzy
+msgid "Girona"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:822
+#, fuzzy
+msgid "Gizan"
+msgstr "Gab�n"
+
+#: my-evolution/Locations.h:823
+#, fuzzy
+msgid "Glasgow"
+msgstr "atr�s"
+
+#: my-evolution/Locations.h:824
+#, fuzzy
+msgid "Glendive"
+msgstr "Maldivas"
+
+#: my-evolution/Locations.h:825
+msgid "Glens Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:826
+#, fuzzy
+msgid "Goiania"
+msgstr "Roman�a"
+
+#: my-evolution/Locations.h:827
+msgid "Goldsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:828
+#, fuzzy
+msgid "Goodland"
+msgstr "Polonia"
+
+#: my-evolution/Locations.h:829
+#, fuzzy
+msgid "Goose Bay"
+msgstr "Ir a hoxe"
+
+#: my-evolution/Locations.h:830
+msgid "Goteborg (Landvetter)"
+msgstr ""
+
+#: my-evolution/Locations.h:831
+msgid "Goteborg (Save)"
+msgstr ""
+
+#: my-evolution/Locations.h:832
+#, fuzzy
+msgid "Granada"
+msgstr "Granada"
+
+#: 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 "Illas Falkland (Malvinas)"
+
+#: 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 "San Marino"
+
+#: my-evolution/Locations.h:840
+msgid "Grand Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:841
+#, fuzzy
+msgid "Grandview"
+msgstr "Previsualizar"
+
+#: my-evolution/Locations.h:842
+#, fuzzy
+msgid "Grangeville"
+msgstr "Cancelada"
+
+#: my-evolution/Locations.h:843
+#, fuzzy
+msgid "Grants"
+msgstr "Borradores"
+
+#: my-evolution/Locations.h:844
+#, fuzzy
+msgid "Graz"
+msgstr "Brasil"
+
+#: my-evolution/Locations.h:845
+msgid "Great Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:847
+#, fuzzy
+msgid "Greeley"
+msgstr "Grecia"
+
+#: my-evolution/Locations.h:848
+#, fuzzy
+msgid "Green Bay"
+msgstr "Grenlandia"
+
+#: my-evolution/Locations.h:849
+msgid "Green River"
+msgstr ""
+
+#: my-evolution/Locations.h:850
+msgid "Greensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:851
+#, fuzzy
+msgid "Greenville"
+msgstr "Grenlandia"
+
+#: my-evolution/Locations.h:852
+msgid "Greenville-Spartanburg"
+msgstr ""
+
+#: my-evolution/Locations.h:853
+#, fuzzy
+msgid "Greenwood"
+msgstr "Grenlandia"
+
+#: my-evolution/Locations.h:854
+msgid "Grenoble-Saint-Geoirs"
+msgstr ""
+
+#: my-evolution/Locations.h:855
+msgid "Griffiss AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:856
+#, fuzzy
+msgid "Groningen"
+msgstr "Advertencia"
+
+#: 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 "Guatemala"
+
+#: my-evolution/Locations.h:860
+#, fuzzy
+msgid "Guadalupe Pass"
+msgstr "Guadalupe"
+
+#: my-evolution/Locations.h:861
+#, fuzzy
+msgid "Guanare"
+msgstr "G�iana"
+
+#: my-evolution/Locations.h:862
+msgid "Guangzhou"
+msgstr ""
+
+#: my-evolution/Locations.h:863
+#, fuzzy
+msgid "Guantanamo"
+msgstr "Guatemala"
+
+#: my-evolution/Locations.h:864
+#, fuzzy
+msgid "Guarany"
+msgstr "Alema�a"
+
+#: my-evolution/Locations.h:865
+#, fuzzy
+msgid "Guaratingueta"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:866
+msgid "Guarulhos"
+msgstr ""
+
+#: my-evolution/Locations.h:868
+msgid "Guayaquil/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:869
+#, fuzzy
+msgid "Guaymas"
+msgstr "Guam"
+
+#: my-evolution/Locations.h:870
+#, fuzzy
+msgid "Guernsey"
+msgstr "Alema�a"
+
+#: my-evolution/Locations.h:871
+#, fuzzy
+msgid "Guidonia"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:872
+msgid "Gulfport"
+msgstr ""
+
+#: my-evolution/Locations.h:873
+#, fuzzy
+msgid "Gulkana"
+msgstr "G�iana"
+
+#: my-evolution/Locations.h:874
+msgid "Gullfax C"
+msgstr ""
+
+#: my-evolution/Locations.h:875
+#, fuzzy
+msgid "Gunnison"
+msgstr "Xuntanza"
+
+#: my-evolution/Locations.h:876
+msgid "Gunnison (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:877
+#, fuzzy
+msgid "Guriat"
+msgstr "Guinea"
+
+#: my-evolution/Locations.h:878
+msgid "Gustavus"
+msgstr ""
+
+#: my-evolution/Locations.h:879
+#, fuzzy
+msgid "Guymon"
+msgstr "G�iana"
+
+#: my-evolution/Locations.h:880
+#, fuzzy
+msgid "Habana"
+msgstr "Albania"
+
+#: 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 ""
+
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+msgid "Hail"
+msgstr "Pedrisco"
+
+#: my-evolution/Locations.h:886
+msgid "Hailey-Sun Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:887
+#, fuzzy
+msgid "Haines"
+msgstr "Encabezados"
+
+#: 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 "Treboada de pedrisco"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:902
+#, fuzzy
+msgid "Ha Noi"
+msgstr "Pedrisco"
+
+#: my-evolution/Locations.h:903
+msgid "Harbor Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:904
+#, fuzzy
+msgid "Harlingen"
+msgstr "Advertencia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:911
+#, fuzzy
+msgid "Hastings"
+msgstr "Encabezados"
+
+#: my-evolution/Locations.h:912
+msgid "Haugesund"
+msgstr ""
+
+#: my-evolution/Locations.h:913
+#, fuzzy
+msgid "Havre"
+msgstr "Calixe"
+
+#: my-evolution/Locations.h:914
+#, fuzzy
+msgid "Hawaii"
+msgstr "Hait�"
+
+#: my-evolution/Locations.h:915
+msgid "Hawthorne"
+msgstr ""
+
+#: my-evolution/Locations.h:916
+#, fuzzy
+msgid "Hayden"
+msgstr "Cabeceira"
+
+#: my-evolution/Locations.h:917
+msgid "Hayes River"
+msgstr ""
+
+#: my-evolution/Locations.h:918
+#, fuzzy
+msgid "Hays"
+msgstr "d�as"
+
+#: 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 "Santa Helena"
+
+#: my-evolution/Locations.h:922
+msgid "Helsinki"
+msgstr ""
+
+#: my-evolution/Locations.h:923
+#, fuzzy
+msgid "Henderson"
+msgstr "Cabeceira"
+
+#: 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 "Treboada de pedrisco"
+
+#: my-evolution/Locations.h:930
+#, fuzzy
+msgid "Hilo"
+msgstr "Pedrisco"
+
+#: my-evolution/Locations.h:931
+msgid "Hinesville"
+msgstr ""
+
+#: my-evolution/Locations.h:932
+msgid "Hiroshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:933
+#, fuzzy
+msgid "Hobart"
+msgstr "Servidor"
+
+#: my-evolution/Locations.h:934
+#, fuzzy
+msgid "Hobbs"
+msgstr "Servidor"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:941
+#, fuzzy
+msgid "Holguin"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:942
+#, fuzzy
+msgid "Homer"
+msgstr "Particular"
+
+#: my-evolution/Locations.h:943
+#, fuzzy
+msgid "Homestead AFB"
+msgstr "Completada "
+
+#: my-evolution/Locations.h:944
+#, fuzzy
+msgid "Hondo"
+msgstr "Tornado"
+
+#: 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 "sa�nte"
+
+#: my-evolution/Locations.h:954
+#, fuzzy
+msgid "Houma"
+msgstr "Particular"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:960
+#, fuzzy
+msgid "Howard AFB"
+msgstr "Remitir Coma"
+
+#: my-evolution/Locations.h:961
+msgid "Hsinchu"
+msgstr ""
+
+#: my-evolution/Locations.h:962
+msgid "Huanuco"
+msgstr ""
+
+#: my-evolution/Locations.h:963
+msgid "Huehuetenango"
+msgstr ""
+
+#: my-evolution/Locations.h:964
+#, fuzzy
+msgid "Hulien"
+msgstr "Agochar"
+
+#: my-evolution/Locations.h:965
+msgid "Humberside"
+msgstr ""
+
+#: my-evolution/Locations.h:967
+msgid "Huntington"
+msgstr ""
+
+#: my-evolution/Locations.h:968
+#, fuzzy
+msgid "Huntsville"
+msgstr "ata"
+
+#: my-evolution/Locations.h:969
+msgid "Hurlburt"
+msgstr ""
+
+#: my-evolution/Locations.h:970
+#, fuzzy
+msgid "Huron"
+msgstr "Horas"
+
+#: 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 "B�sico"
+
+#: my-evolution/Locations.h:977
+#, fuzzy
+msgid "Ibiza"
+msgstr "India"
+
+#: my-evolution/Locations.h:979
+msgid "Ichikawa"
+msgstr ""
+
+#: my-evolution/Locations.h:980
+#, fuzzy
+msgid "Idaho"
+msgstr "India"
+
+#: 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 "Islandia"
+
+#: my-evolution/Locations.h:985
+#, fuzzy
+msgid "Iliamna"
+msgstr "Inline"
+
+#: my-evolution/Locations.h:986
+msgid "Illinois"
+msgstr ""
+
+#: my-evolution/Locations.h:987
+#, fuzzy
+msgid "Imperial"
+msgstr "_imperiais"
+
+#: my-evolution/Locations.h:988
+#, fuzzy
+msgid "Imperial (2)"
+msgstr "_imperiais"
+
+#: my-evolution/Locations.h:989
+#, fuzzy
+msgid "Imperial Beach"
+msgstr "_imperiais"
+
+#: my-evolution/Locations.h:990
+#, fuzzy
+msgid "In Amenas"
+msgstr "Armenia"
+
+#: my-evolution/Locations.h:992
+#, fuzzy
+msgid "Indiana"
+msgstr "India"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:998
+#, fuzzy
+msgid "Inverness"
+msgstr "En Progreso"
+
+#: my-evolution/Locations.h:999
+msgid "Inyokern"
+msgstr ""
+
+#: my-evolution/Locations.h:1000
+#, fuzzy
+msgid "Iowa"
+msgstr "Noruega"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1005
+#, fuzzy
+msgid "Iraklion"
+msgstr "Informaci�n"
+
+#: my-evolution/Locations.h:1006
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1008
+#, fuzzy
+msgid "Iron Mountain"
+msgstr "O comentario cont�n"
+
+#: 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 "Italia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1025
+#, fuzzy
+msgid "Izumo Airport"
+msgstr "Importar"
+
+#: 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 "Xapon�s"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1044
+#, fuzzy
+msgid "Jonkoping"
+msgstr "Traballando"
+
+#: my-evolution/Locations.h:1045
+#, fuzzy
+msgid "Joplin"
+msgstr "Copiando"
+
+#: 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 "Xap�n"
+
+#: my-evolution/Locations.h:1050
+#, fuzzy
+msgid "Jujuy"
+msgstr "xullo"
+
+#: my-evolution/Locations.h:1051
+#, fuzzy
+msgid "Juliaca"
+msgstr "P�blico"
+
+#: my-evolution/Locations.h:1052
+#, fuzzy
+msgid "Junction"
+msgstr "Xuntanza"
+
+#: my-evolution/Locations.h:1053
+#, fuzzy
+msgid "Juneau"
+msgstr "xu�o"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1059
+#, fuzzy
+msgid "Kalamata"
+msgstr "Malta"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1071
+#, fuzzy
+msgid "Karachi"
+msgstr "marzo"
+
+#: my-evolution/Locations.h:1072
+#, fuzzy
+msgid "Karup"
+msgstr "Naur�"
+
+#: 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 "Kazakhst�n"
+
+#: my-evolution/Locations.h:1080
+#, fuzzy
+msgid "Kearney"
+msgstr "Quenia"
+
+#: my-evolution/Locations.h:1081
+#, fuzzy
+msgid "Keene"
+msgstr "Vista"
+
+#: 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 "Quenia"
+
+#: my-evolution/Locations.h:1085
+#, fuzzy
+msgid "Kenosha"
+msgstr "Quenia"
+
+#: my-evolution/Locations.h:1086
+#, fuzzy
+msgid "Kentucky"
+msgstr "Quenia"
+
+#: 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 "Alema�a"
+
+#: my-evolution/Locations.h:1090
+msgid "Ketchikan"
+msgstr ""
+
+#: my-evolution/Locations.h:1091
+#, fuzzy
+msgid "Key West"
+msgstr "Oeste"
+
+#: 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 "Illas Cook"
+
+#: 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 "Quenia"
+
+#: my-evolution/Locations.h:1132
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1133
+#, fuzzy
+msgid "Korea, Republic of"
+msgstr "Rep�blica Checa"
+
+#: 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 "Coreano"
+
+#: 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 "entrante"
+
+#: 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 "Macedonia"
+
+#: my-evolution/Locations.h:1151
+msgid "La Coruna"
+msgstr ""
+
+#: my-evolution/Locations.h:1152
+#, fuzzy
+msgid "La Crosse"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1153
+msgid "La Esperanza"
+msgstr ""
+
+#: my-evolution/Locations.h:1154
+#, fuzzy
+msgid "Lafayette"
+msgstr "Maiote"
+
+#: my-evolution/Locations.h:1155
+msgid "La Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1156
+#, fuzzy
+msgid "Lahaina"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:1157
+#, fuzzy
+msgid "Lahore"
+msgstr "Buscapersoas"
+
+#: my-evolution/Locations.h:1158
+#, fuzzy
+msgid "Lajes"
+msgstr "Laos"
+
+#: 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 "Islandia"
+
+#: my-evolution/Locations.h:1164
+msgid "Lake Tahoe"
+msgstr ""
+
+#: my-evolution/Locations.h:1165
+#, fuzzy
+msgid "Lakeview"
+msgstr "Previsualizar"
+
+#: my-evolution/Locations.h:1166
+#, fuzzy
+msgid "Lamar"
+msgstr "Myanmar"
+
+#: my-evolution/Locations.h:1167
+#, fuzzy
+msgid "La Mesa"
+msgstr "Enviar _Mensaxe"
+
+#: my-evolution/Locations.h:1168
+#, fuzzy
+msgid "Lamezia"
+msgstr "Gambia"
+
+#: my-evolution/Locations.h:1169
+#, fuzzy
+msgid "Lamoni"
+msgstr "L�bano"
+
+#: my-evolution/Locations.h:1170
+msgid "Lampedusa"
+msgstr ""
+
+#: my-evolution/Locations.h:1171
+#, fuzzy
+msgid "Lanai"
+msgstr "Idioma"
+
+#: my-evolution/Locations.h:1172
+#, fuzzy
+msgid "Lancaster"
+msgstr "Horizontal"
+
+#: my-evolution/Locations.h:1173
+#, fuzzy
+msgid "Lander"
+msgstr "Cabeceira"
+
+#: my-evolution/Locations.h:1174
+#, fuzzy
+msgid "Langebaanweg"
+msgstr "Idioma"
+
+#: my-evolution/Locations.h:1175
+msgid "Langley AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1176
+#, fuzzy
+msgid "Lannion"
+msgstr "L�bano"
+
+#: my-evolution/Locations.h:1177
+#, fuzzy
+msgid "Lansing"
+msgstr "Advertencia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1182
+#, fuzzy
+msgid "Laredo"
+msgstr "Buscapersoas"
+
+#: my-evolution/Locations.h:1183
+#, fuzzy
+msgid "Larnaka"
+msgstr "Sri Lanka"
+
+#: my-evolution/Locations.h:1184
+#, fuzzy
+msgid "La Romana"
+msgstr "Roman�a"
+
+#: 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 "Letonia"
+
+#: my-evolution/Locations.h:1189
+msgid "Latrobe"
+msgstr ""
+
+#: my-evolution/Locations.h:1191
+msgid "Laughlin"
+msgstr ""
+
+#: my-evolution/Locations.h:1192
+#, fuzzy
+msgid "Laurel"
+msgstr "Buscapersoas"
+
+#: my-evolution/Locations.h:1193
+#, fuzzy
+msgid "La Verne"
+msgstr "Cabo Verde"
+
+#: my-evolution/Locations.h:1194
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1195
+#, fuzzy
+msgid "Lawton"
+msgstr "L�bano"
+
+#: my-evolution/Locations.h:1196
+msgid "Leadville"
+msgstr ""
+
+#: my-evolution/Locations.h:1197
+#, fuzzy
+msgid "Learmouth"
+msgstr "Lesoto"
+
+#: my-evolution/Locations.h:1199
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1201
+#, fuzzy
+msgid "Leesburg"
+msgstr "Luxemburgo"
+
+#: my-evolution/Locations.h:1202
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1205
+msgid "Leknes"
+msgstr ""
+
+#: my-evolution/Locations.h:1206
+#, fuzzy
+msgid "Le Mans"
+msgstr "maio"
+
+#: my-evolution/Locations.h:1207
+#, fuzzy
+msgid "Le Marine"
+msgstr "Martinica"
+
+#: my-evolution/Locations.h:1208
+#, fuzzy
+msgid "Lemmon"
+msgstr "L�bano"
+
+#: my-evolution/Locations.h:1209
+#, fuzzy
+msgid "Lemoore"
+msgstr "Eliminar"
+
+#: my-evolution/Locations.h:1210
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1212
+#, fuzzy
+msgid "Leuchars"
+msgstr "anos"
+
+#: my-evolution/Locations.h:1213
+#, fuzzy
+msgid "Lewisburg"
+msgstr "Luxemburgo"
+
+#: my-evolution/Locations.h:1214
+#, fuzzy
+msgid "Lewiston"
+msgstr "Lesoto"
+
+#: my-evolution/Locations.h:1215
+#, fuzzy
+msgid "Lewistown"
+msgstr "Lesoto"
+
+#: my-evolution/Locations.h:1216
+#, fuzzy
+msgid "Lexington"
+msgstr "L�bano"
+
+#: my-evolution/Locations.h:1217
+#, fuzzy
+msgid "Liberal"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1219
+#, fuzzy
+msgid "Libya"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1220
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1221
+msgid "Lidgerwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1222
+#, fuzzy
+msgid "Liege"
+msgstr "N�xer"
+
+#: my-evolution/Locations.h:1223
+#, fuzzy
+msgid "Lihue"
+msgstr "Niue"
+
+#: my-evolution/Locations.h:1224
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1225
+msgid "Lima-Callao"
+msgstr ""
+
+#: my-evolution/Locations.h:1226
+#, fuzzy
+msgid "Limnos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1227
+#, fuzzy
+msgid "Limoges"
+msgstr "A m�is baixa"
+
+#: my-evolution/Locations.h:1228
+#, fuzzy
+msgid "Limon"
+msgstr "mes"
+
+#: my-evolution/Locations.h:1229
+#, fuzzy
+msgid "Lincoln"
+msgstr "entrante"
+
+#: my-evolution/Locations.h:1230
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1231
+#, fuzzy
+msgid "Lisboa"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1232
+#, fuzzy
+msgid "Lista"
+msgstr "Br�tema"
+
+#: my-evolution/Locations.h:1233
+#, fuzzy
+msgid "Litchfield"
+msgstr "Pedrisco lene"
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1240
+msgid "Ljubljana"
+msgstr ""
+
+#: my-evolution/Locations.h:1241
+#, fuzzy
+msgid "Logan"
+msgstr "Login de NT"
+
+#: my-evolution/Locations.h:1242
+msgid "Lolland Falster"
+msgstr ""
+
+#: my-evolution/Locations.h:1243
+#, fuzzy
+msgid "Lompoc"
+msgstr "Copiar"
+
+#: my-evolution/Locations.h:1244
+#, fuzzy
+msgid "London"
+msgstr "L�bano"
+
+#: my-evolution/Locations.h:1245
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1249
+#, fuzzy
+msgid "Londrina"
+msgstr "Honduras"
+
+#: my-evolution/Locations.h:1250
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1253
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+#: my-evolution/Locations.h:1254
+#, fuzzy
+msgid "Los Alamos"
+msgstr "Alarmas"
+
+#: my-evolution/Locations.h:1255
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1260
+#, fuzzy
+msgid "Lousiana"
+msgstr "Botsuana"
+
+#: my-evolution/Locations.h:1261
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1265
+#, fuzzy
+msgid "Lugano"
+msgstr "L�bano"
+
+#: my-evolution/Locations.h:1266
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1267
+#, fuzzy
+msgid "Luton"
+msgstr "sa�nte"
+
+#: my-evolution/Locations.h:1269
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1270
+#, fuzzy
+msgid "Luxor"
+msgstr "Luxemburgo"
+
+#: my-evolution/Locations.h:1271
+#, fuzzy
+msgid "Lviv"
+msgstr "Letonia"
+
+#: my-evolution/Locations.h:1272
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1275
+msgid "Lyon-Satolas"
+msgstr ""
+
+#: my-evolution/Locations.h:1276
+#, fuzzy
+msgid "Maastricht"
+msgstr "marzo"
+
+#: my-evolution/Locations.h:1277
+#, fuzzy
+msgid "Macae"
+msgstr "Macau"
+
+#: my-evolution/Locations.h:1278
+#, fuzzy
+msgid "Macapa"
+msgstr "Macau"
+
+#: my-evolution/Locations.h:1279
+#, fuzzy
+msgid "Maceio"
+msgstr "Macedonia"
+
+#: my-evolution/Locations.h:1280
+#, fuzzy
+msgid "Macon"
+msgstr "maio"
+
+#: my-evolution/Locations.h:1281
+#, fuzzy
+msgid "Madinah"
+msgstr "Macedonia"
+
+#: my-evolution/Locations.h:1282
+#, fuzzy
+msgid "Madison"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1283
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1285
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+#: my-evolution/Locations.h:1286
+#, fuzzy
+msgid "Magadan"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:1287
+msgid "Magdalena"
+msgstr ""
+
+#: my-evolution/Locations.h:1288
+#, fuzzy
+msgid "Maine"
+msgstr "maio"
+
+#: my-evolution/Locations.h:1289
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1290
+msgid "Makkah"
+msgstr ""
+
+#: my-evolution/Locations.h:1291
+#, fuzzy
+msgid "Makung"
+msgstr "maio"
+
+#: my-evolution/Locations.h:1292
+#, fuzzy
+msgid "Malad City"
+msgstr "Malaui"
+
+#: my-evolution/Locations.h:1293
+#, fuzzy
+msgid "Malaga"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1294
+#, fuzzy
+msgid "Malatya"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1295
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1296
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1298
+msgid "Mammoth Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1299
+#, fuzzy
+msgid "Managua"
+msgstr "Xestor"
+
+#: my-evolution/Locations.h:1300
+#, fuzzy
+msgid "Manassas"
+msgstr "Malaisia"
+
+#: my-evolution/Locations.h:1301
+#, fuzzy
+msgid "Manaus"
+msgstr "Macau"
+
+#: my-evolution/Locations.h:1302
+#, fuzzy
+msgid "Manchester"
+msgstr "Aparici�ns:"
+
+#: my-evolution/Locations.h:1303
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+msgid "Manhattan"
+msgstr ""
+
+#: my-evolution/Locations.h:1305
+#, fuzzy
+msgid "Manisa"
+msgstr "maio"
+
+#: my-evolution/Locations.h:1306
+#, fuzzy
+msgid "Manistee"
+msgstr "Br�tema"
+
+#: my-evolution/Locations.h:1307
+#, fuzzy
+msgid "Manitoba"
+msgstr "Barra de ferramentas principal"
+
+#: my-evolution/Locations.h:1308
+msgid "Manitowoc"
+msgstr ""
+
+#: my-evolution/Locations.h:1309
+#, fuzzy
+msgid "Mankato"
+msgstr "M�naco"
+
+#: my-evolution/Locations.h:1310
+#, fuzzy
+msgid "Mansfield"
+msgstr "Correo"
+
+#: my-evolution/Locations.h:1311
+#, fuzzy
+msgid "Manta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1312
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1313
+#, fuzzy
+msgid "Maraba"
+msgstr "Mauritania"
+
+#: my-evolution/Locations.h:1314
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1315
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1316
+#, fuzzy
+msgid "Marathon"
+msgstr "marzo"
+
+#: my-evolution/Locations.h:1317
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1318
+#, fuzzy
+msgid "Margarita"
+msgstr "Mauritania"
+
+#: my-evolution/Locations.h:1319
+#, fuzzy
+msgid "Marianna"
+msgstr "Mauritania"
+
+#: my-evolution/Locations.h:1320
+#, fuzzy
+msgid "Marib"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1321
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1322
+#, fuzzy
+msgid "Marietta"
+msgstr "Mauritania"
+
+#: my-evolution/Locations.h:1323
+msgid "Marino di Ravenna"
+msgstr ""
+
+#: my-evolution/Locations.h:1324
+#, fuzzy
+msgid "Marion"
+msgstr "Marxes"
+
+#: my-evolution/Locations.h:1325
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1326
+#, fuzzy
+msgid "Marquette"
+msgstr "Martinica"
+
+#: my-evolution/Locations.h:1327
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+msgid "Marseilles"
+msgstr ""
+
+#: my-evolution/Locations.h:1329
+#, fuzzy
+msgid "Marshall"
+msgstr "Illas Marshall"
+
+#: my-evolution/Locations.h:1330
+#, fuzzy
+msgid "Marshalltown"
+msgstr "Illas Marshall"
+
+#: my-evolution/Locations.h:1331
+msgid "Marshfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1332
+#, fuzzy
+msgid "Marte"
+msgstr "Martinica"
+
+#: my-evolution/Locations.h:1333
+#, fuzzy
+msgid "Marthas Vineyard"
+msgstr "Marcar como _Non Lida"
+
+#: my-evolution/Locations.h:1334
+#, fuzzy
+msgid "Martinsburg"
+msgstr "Martinica"
+
+#: my-evolution/Locations.h:1335
+#, fuzzy
+msgid "Martinsville"
+msgstr "Martinica"
+
+#: my-evolution/Locations.h:1336
+#, fuzzy
+msgid "Maryland"
+msgstr "Irlanda"
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1339
+msgid "Mashhad"
+msgstr ""
+
+#: my-evolution/Locations.h:1340
+#, fuzzy
+msgid "Masirah"
+msgstr "Malaisia"
+
+#: my-evolution/Locations.h:1341
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1343
+#, fuzzy
+msgid "Massena"
+msgstr "Macedonia"
+
+#: my-evolution/Locations.h:1344
+#, fuzzy
+msgid "Matamoros"
+msgstr "Comores"
+
+#: my-evolution/Locations.h:1345
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1347
+msgid "Matsuyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1348
+#, fuzzy
+msgid "Mattoon"
+msgstr "maio"
+
+#: my-evolution/Locations.h:1349
+#, fuzzy
+msgid "Mayaguez"
+msgstr "Xestor"
+
+#: my-evolution/Locations.h:1350
+#, fuzzy
+msgid "Mayport"
+msgstr "Maiote"
+
+#: my-evolution/Locations.h:1351
+#, fuzzy
+msgid "Mazatlan"
+msgstr "Kazakhst�n"
+
+#: my-evolution/Locations.h:1352
+#, fuzzy
+msgid "Mazu"
+msgstr "Macau"
+
+#: my-evolution/Locations.h:1353
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1354
+#, fuzzy
+msgid "McAllen"
+msgstr "Todas"
+
+#: my-evolution/Locations.h:1355
+#, fuzzy
+msgid "McCall"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1356
+#, fuzzy
+msgid "McCarthy"
+msgstr "marzo"
+
+#: my-evolution/Locations.h:1357
+#, fuzzy
+msgid "McClellan"
+msgstr "Islandia"
+
+#: my-evolution/Locations.h:1358
+#, fuzzy
+msgid "McComb"
+msgstr "Copiar"
+
+#: my-evolution/Locations.h:1359
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1361
+msgid "Mc Gregor"
+msgstr ""
+
+#: my-evolution/Locations.h:1362
+#, fuzzy
+msgid "Meacham"
+msgstr "Macau"
+
+#: my-evolution/Locations.h:1363
+#, fuzzy
+msgid "Medford"
+msgstr "antes"
+
+#: my-evolution/Locations.h:1364
+msgid "Medicine Lodge"
+msgstr ""
+
+#: my-evolution/Locations.h:1365
+#, fuzzy
+msgid "Mehamn"
+msgstr "maio"
+
+#: my-evolution/Locations.h:1366
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1367
+msgid "Melbourne"
+msgstr ""
+
+#: my-evolution/Locations.h:1368
+#, fuzzy
+msgid "Melfa"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1369
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1373
+#, fuzzy
+msgid "Mendoza"
+msgstr "Macedonia"
+
+#: my-evolution/Locations.h:1374
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1377
+#, fuzzy
+msgid "Merced"
+msgstr "m_�tricas"
+
+#: my-evolution/Locations.h:1378
+#, fuzzy
+msgid "Merida"
+msgstr "Venres"
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1380
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1381
+#, fuzzy
+msgid "Merril Field"
+msgstr "Campo _Desde"
+
+#: my-evolution/Locations.h:1382
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1386
+#, fuzzy
+msgid "Mexicali"
+msgstr "M�xico"
+
+#: my-evolution/Locations.h:1388
+#, fuzzy
+msgid "Miami"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1391
+msgid "Michigan"
+msgstr ""
+
+#: my-evolution/Locations.h:1392
+#, fuzzy
+msgid "Middle East"
+msgstr "_Outros nomes:"
+
+#: my-evolution/Locations.h:1393
+#, fuzzy
+msgid "Middleton Island"
+msgstr "Illas Salom�n"
+
+#: my-evolution/Locations.h:1394
+#, fuzzy
+msgid "Middletown"
+msgstr "_Outros nomes:"
+
+#: my-evolution/Locations.h:1395
+#, fuzzy
+msgid "Midland"
+msgstr "Finlandia"
+
+#: my-evolution/Locations.h:1396
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1398
+msgid "Milano/Malpensa"
+msgstr ""
+
+#: my-evolution/Locations.h:1399
+#, fuzzy
+msgid "Miles City"
+msgstr "Tipo de ficheiro:"
+
+#: my-evolution/Locations.h:1400
+#, fuzzy
+msgid "Milford"
+msgstr "para"
+
+#: my-evolution/Locations.h:1401
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1402
+msgid "Millville"
+msgstr ""
+
+#: my-evolution/Locations.h:1403
+#, fuzzy
+msgid "Milton"
+msgstr "Mensaxe para %s"
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1407
+#, fuzzy
+msgid "Minatitlan"
+msgstr "Mauritania"
+
+#: my-evolution/Locations.h:1408
+#, fuzzy
+msgid "Minchumina"
+msgstr "entrante"
+
+#: my-evolution/Locations.h:1409
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1414
+#, fuzzy
+msgid "Minnesota"
+msgstr "Micronesia"
+
+#: my-evolution/Locations.h:1415
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1416
+#, fuzzy
+msgid "Minot"
+msgstr "non �"
+
+#: my-evolution/Locations.h:1417
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1419
+msgid "Mississippi"
+msgstr ""
+
+#: my-evolution/Locations.h:1420
+#, fuzzy
+msgid "Missoula"
+msgstr "Sri�a."
+
+#: my-evolution/Locations.h:1421
+#, fuzzy
+msgid "Missouri"
+msgstr "Sri�a."
+
+#: my-evolution/Locations.h:1422
+#, fuzzy
+msgid "Mitchell"
+msgstr "Aparici�ns:"
+
+#: my-evolution/Locations.h:1423
+#, fuzzy
+msgid "Mitilini"
+msgstr "Lista de Correo"
+
+#: my-evolution/Locations.h:1424
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1425
+msgid "Miyazaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1426
+#, fuzzy
+msgid "Moa"
+msgstr "Lu"
+
+#: my-evolution/Locations.h:1427
+#, fuzzy
+msgid "Mobile Downtown"
+msgstr "Tel�fono M�bil"
+
+#: my-evolution/Locations.h:1428
+msgid "Mobile Regional Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1429
+#, fuzzy
+msgid "Mobridge"
+msgstr "M�bil"
+
+#: my-evolution/Locations.h:1430
+#, fuzzy
+msgid "Modesto"
+msgstr "N�boa moderada"
+
+#: my-evolution/Locations.h:1431
+msgid "Mo I Rana"
+msgstr ""
+
+#: my-evolution/Locations.h:1432
+#, fuzzy
+msgid "Mojave"
+msgstr "Mover"
+
+#: my-evolution/Locations.h:1433
+#, fuzzy
+msgid "Molde"
+msgstr "M�bil"
+
+#: my-evolution/Locations.h:1434
+#, fuzzy
+msgid "Moldova"
+msgstr "Luns"
+
+#: my-evolution/Locations.h:1435
+msgid "Moline-Quad Cities"
+msgstr ""
+
+#: my-evolution/Locations.h:1436
+#, fuzzy
+msgid "Molokai"
+msgstr "Malaui"
+
+#: my-evolution/Locations.h:1437
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1438
+msgid "Monchengladbach"
+msgstr ""
+
+#: my-evolution/Locations.h:1439
+#, fuzzy
+msgid "Monclova"
+msgstr "M�naco"
+
+#: my-evolution/Locations.h:1440
+#, fuzzy
+msgid "Moncton"
+msgstr "M�naco"
+
+#: my-evolution/Locations.h:1441
+#, fuzzy
+msgid "Monida"
+msgstr "Luns"
+
+#: my-evolution/Locations.h:1442
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+#: my-evolution/Locations.h:1443
+#, fuzzy
+msgid "Monroe"
+msgstr "M�naco"
+
+#: my-evolution/Locations.h:1444
+#, fuzzy
+msgid "Montague"
+msgstr "Xestor"
+
+#: my-evolution/Locations.h:1445
+#, fuzzy
+msgid "Montana"
+msgstr "Botsuana"
+
+#: my-evolution/Locations.h:1446
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1448
+#, fuzzy
+msgid "Monte Bisbino"
+msgstr "Neve moderada"
+
+#: my-evolution/Locations.h:1449
+msgid "Monte Calamita"
+msgstr ""
+
+#: my-evolution/Locations.h:1450
+#, fuzzy
+msgid "Monte Cimone"
+msgstr "Vista Mensual"
+
+#: my-evolution/Locations.h:1451
+#, fuzzy
+msgid "Montego Bay"
+msgstr "Mongolia"
+
+#: my-evolution/Locations.h:1452
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1453
+#, fuzzy
+msgid "Monterey"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1454
+#, fuzzy
+msgid "Monterrey"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1458
+#, fuzzy
+msgid "Montgomery"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1459
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1460
+#, fuzzy
+msgid "Monticello"
+msgstr "M�naco"
+
+#: my-evolution/Locations.h:1461
+#, fuzzy
+msgid "Montpelier"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1465
+#, fuzzy
+msgid "Montrose"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1466
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1467
+#, fuzzy
+msgid "Morelia"
+msgstr "Mongolia"
+
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Morgantown"
+msgstr "Organizaci�n"
+
+#: my-evolution/Locations.h:1469
+#, fuzzy
+msgid "Moriarty"
+msgstr "Principal"
+
+#: my-evolution/Locations.h:1471
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1474
+msgid "Moses Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1475
+#, fuzzy
+msgid "Mosinee"
+msgstr "M�bil"
+
+#: my-evolution/Locations.h:1476
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain Home"
+msgstr ""
+
+#: my-evolution/Locations.h:1479
+#, fuzzy
+msgid "Mountain View"
+msgstr "Vista Mensual"
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1482
+#, fuzzy
+msgid "Mount Shasta"
+msgstr "Sureste"
+
+#: my-evolution/Locations.h:1483
+#, fuzzy
+msgid "Mount Vernon"
+msgstr "Vista Mensual"
+
+#: my-evolution/Locations.h:1484
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1487
+msgid "Muir"
+msgstr ""
+
+#: my-evolution/Locations.h:1488
+#, fuzzy
+msgid "Mullan"
+msgstr "maio"
+
+#: my-evolution/Locations.h:1489
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1490
+msgid "Munchen"
+msgstr ""
+
+#: my-evolution/Locations.h:1491
+#, fuzzy
+msgid "Muncie"
+msgstr "xu�o"
+
+#: my-evolution/Locations.h:1492
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1493
+#, fuzzy
+msgid "Murcia"
+msgstr "Mauritania"
+
+#: my-evolution/Locations.h:1494
+msgid "Murmansk"
+msgstr ""
+
+#: my-evolution/Locations.h:1495
+#, fuzzy
+msgid "Mus"
+msgstr "Ocupado"
+
+#: my-evolution/Locations.h:1496
+#, fuzzy
+msgid "Muscatine"
+msgstr "Martinica"
+
+#: my-evolution/Locations.h:1497
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1498
+msgid "Muskegon"
+msgstr ""
+
+#: my-evolution/Locations.h:1499
+#, fuzzy
+msgid "Mykonos"
+msgstr "n�s"
+
+#: my-evolution/Locations.h:1500
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1507
+#, fuzzy
+msgid "Najran"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:1508
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1509
+msgid "Nalchik"
+msgstr ""
+
+#: my-evolution/Locations.h:1510
+#, fuzzy
+msgid "Namsos"
+msgstr "Nome:"
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1513
+msgid "Nankishirahama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1514
+#, fuzzy
+msgid "Nanning"
+msgstr "Advertencia"
+
+#: my-evolution/Locations.h:1515
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1516
+msgid "Nantucket"
+msgstr ""
+
+#: my-evolution/Locations.h:1517
+#, fuzzy
+msgid "Napa"
+msgstr "Xap�n"
+
+#: my-evolution/Locations.h:1518
+#, fuzzy
+msgid "Naples"
+msgstr "Nome:"
+
+#: my-evolution/Locations.h:1519
+#, fuzzy
+msgid "Napoli"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1520
+#, fuzzy
+msgid "Narvik"
+msgstr "Alcume"
+
+#: my-evolution/Locations.h:1521
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1524
+msgid "Nassau"
+msgstr ""
+
+#: my-evolution/Locations.h:1525
+#, fuzzy
+msgid "Natal"
+msgstr "Italia"
+
+#: my-evolution/Locations.h:1526
+#, fuzzy
+msgid "Natchez"
+msgstr "Aparici�ns:"
+
+#: my-evolution/Locations.h:1527
+msgid "Nawabshah"
+msgstr ""
+
+#: my-evolution/Locations.h:1528
+#, fuzzy
+msgid "Nebraska"
+msgstr "Nova Tarefa"
+
+#: my-evolution/Locations.h:1529
+msgid "Needles"
+msgstr ""
+
+#: my-evolution/Locations.h:1530
+#, fuzzy
+msgid "Nenana"
+msgstr "Granada"
+
+#: my-evolution/Locations.h:1532
+msgid "Neuquen"
+msgstr ""
+
+#: my-evolution/Locations.h:1533
+#, fuzzy
+msgid "Nevada"
+msgstr "Granada"
+
+#: my-evolution/Locations.h:1534
+#, fuzzy
+msgid "Newark"
+msgstr "Nova Tarefa"
+
+#: my-evolution/Locations.h:1535
+#, fuzzy
+msgid "New Bedford"
+msgstr "Fonte de Novas"
+
+#: my-evolution/Locations.h:1536
+#, fuzzy
+msgid "New Bern"
+msgstr "Novo _Evento"
+
+#: my-evolution/Locations.h:1537
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1539
+msgid "Newburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1540
+#, fuzzy
+msgid "Newcastle"
+msgstr "Novas"
+
+#: my-evolution/Locations.h:1541
+#, fuzzy
+msgid "New Delhi/Palam"
+msgstr "Nova Celandia"
+
+#: my-evolution/Locations.h:1542
+#, fuzzy
+msgid "Newfoundland"
+msgstr "Nova Celandia"
+
+#: my-evolution/Locations.h:1543
+msgid "New Hampshire"
+msgstr ""
+
+#: my-evolution/Locations.h:1544
+#, fuzzy
+msgid "New Haven"
+msgstr "Novo _Evento"
+
+#: my-evolution/Locations.h:1545
+#, fuzzy
+msgid "New Iberia"
+msgstr "Nova Caledonia"
+
+#: my-evolution/Locations.h:1546
+#, fuzzy
+msgid "New Jersey"
+msgstr "Nova Mensaxe"
+
+#: my-evolution/Locations.h:1547
+#, fuzzy
+msgid "New Mexico"
+msgstr "M�xico"
+
+#: my-evolution/Locations.h:1548
+#, fuzzy
+msgid "New Orleans"
+msgstr "Pa�ses Baixos"
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1550
+msgid "New Orleans NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1551
+#, fuzzy
+msgid "Newport"
+msgstr "Norte"
+
+#: my-evolution/Locations.h:1552
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1553
+msgid "New Port Richey"
+msgstr ""
+
+#: my-evolution/Locations.h:1554
+#, fuzzy
+msgid "New River"
+msgstr "Novo _Evento"
+
+#: my-evolution/Locations.h:1555
+msgid "New Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1556
+#, fuzzy
+msgid "Newton"
+msgstr "Novo"
+
+#: my-evolution/Locations.h:1557
+#, fuzzy
+msgid "New York"
+msgstr "Novo CartafolV"
+
+#: my-evolution/Locations.h:1558
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1559
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1561
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1564
+msgid "Niigata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1565
+#, fuzzy
+msgid "Nimes-Garons"
+msgstr "Dimensi�ns:"
+
+#: my-evolution/Locations.h:1566
+#, fuzzy
+msgid "Nipawin"
+msgstr "Espa�a"
+
+#: my-evolution/Locations.h:1567
+#, fuzzy
+msgid "Nis"
+msgstr "�"
+
+#: my-evolution/Locations.h:1568
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1570
+msgid "N Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1571
+#, fuzzy
+msgid "Nogales"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:1572
+#, fuzzy
+msgid "Nome"
+msgstr "Nome:"
+
+#: my-evolution/Locations.h:1573
+#, fuzzy
+msgid "Norfolk"
+msgstr "Illa Norfolk"
+
+#: my-evolution/Locations.h:1575
+#, fuzzy
+msgid "Norfolk NAS"
+msgstr "Illa Norfolk"
+
+#: my-evolution/Locations.h:1576
+#, fuzzy
+msgid "Norrkoping"
+msgstr "Traballando"
+
+#: my-evolution/Locations.h:1577
+#, fuzzy
+msgid "North Adams"
+msgstr "Nord�s"
+
+#: my-evolution/Locations.h:1578
+#, fuzzy
+msgid "North Bend"
+msgstr "Norte"
+
+#: my-evolution/Locations.h:1579
+msgid "North Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:1580
+#, fuzzy
+msgid "North Conway"
+msgstr "Noruega"
+
+#: my-evolution/Locations.h:1581
+#, fuzzy
+msgid "North Dakota"
+msgstr "Nord�s"
+
+#: my-evolution/Locations.h:1582
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1583
+msgid "North Kingstown"
+msgstr ""
+
+#: my-evolution/Locations.h:1584
+#, fuzzy
+msgid "North Platte"
+msgstr "Nord�s"
+
+#: my-evolution/Locations.h:1585
+#, fuzzy
+msgid "Northway"
+msgstr "Noruega"
+
+#: my-evolution/Locations.h:1586
+#, fuzzy
+msgid "Northwest Territories"
+msgstr "Territorios Franceses do Sul"
+
+#: my-evolution/Locations.h:1588
+#, fuzzy
+msgid "Norwich"
+msgstr "Norte"
+
+#: my-evolution/Locations.h:1589
+#, fuzzy
+msgid "Norwood"
+msgstr "Noruega"
+
+#: my-evolution/Locations.h:1590
+#, fuzzy
+msgid "Notodden"
+msgstr "Nota"
+
+#: my-evolution/Locations.h:1591
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1595
+msgid "Nueva Ocotepeque"
+msgstr ""
+
+#: my-evolution/Locations.h:1596
+#, fuzzy
+msgid "Nuevo Laredo"
+msgstr "Non Iniciada"
+
+#: my-evolution/Locations.h:1597
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+#, fuzzy
+msgid "Oahu"
+msgstr "Opaco"
+
+#: my-evolution/Locations.h:1600
+msgid "Oak Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:1601
+#, fuzzy
+msgid "Oakland"
+msgstr "Tailandia"
+
+#: my-evolution/Locations.h:1602
+#, fuzzy
+msgid "Oaxaca"
+msgstr "Xamaica"
+
+#: my-evolution/Locations.h:1603
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+msgid "Obihiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1605
+#, fuzzy
+msgid "Ocala"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1606
+#, fuzzy
+msgid "Oceanside"
+msgstr "Islandia"
+
+#: my-evolution/Locations.h:1607
+#, fuzzy
+msgid "Odense"
+msgstr "�nico"
+
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1609
+#, fuzzy
+msgid "Oelwen"
+msgstr "Abrir"
+
+#: my-evolution/Locations.h:1610
+#, fuzzy
+msgid "Ogden"
+msgstr "Abrir"
+
+#: my-evolution/Locations.h:1611
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1613
+msgid "Ohio"
+msgstr ""
+
+#: my-evolution/Locations.h:1614
+#, fuzzy
+msgid "Ohrid"
+msgstr "Outro"
+
+#: my-evolution/Locations.h:1615
+msgid "Oita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1616
+#, fuzzy
+msgid "Ojika Island"
+msgstr "Illas Cook"
+
+#: my-evolution/Locations.h:1617
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1624
+#, fuzzy
+msgid "Okushiri Island"
+msgstr "Illas Virxes Brit�nicas"
+
+#: my-evolution/Locations.h:1625
+#, fuzzy
+msgid "Olathe"
+msgstr "Outro"
+
+#: my-evolution/Locations.h:1626
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1627
+#, fuzzy
+msgid "Olbia"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:1628
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1629
+#, fuzzy
+msgid "Omaha"
+msgstr "Om�n"
+
+#: my-evolution/Locations.h:1630
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1631
+#, fuzzy
+msgid "Omak"
+msgstr "Om�n"
+
+#: my-evolution/Locations.h:1633
+msgid "Ominato Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1634
+#, fuzzy
+msgid "Omsk"
+msgstr "Aceptar"
+
+#: my-evolution/Locations.h:1635
+msgid "O'Neill"
+msgstr ""
+
+#: my-evolution/Locations.h:1636
+#, fuzzy
+msgid "Ontario"
+msgstr "Orientaci�n"
+
+#: my-evolution/Locations.h:1637
+#, fuzzy
+msgid "Oostende"
+msgstr "Asistente"
+
+#: my-evolution/Locations.h:1638
+#, fuzzy
+msgid "Oran"
+msgstr "Om�n"
+
+#: my-evolution/Locations.h:1639
+msgid "Oran/Es Senia"
+msgstr ""
+
+#: my-evolution/Locations.h:1640
+#, fuzzy
+msgid "Orange"
+msgstr ""
+"\n"
+"Org: "
+
+#: my-evolution/Locations.h:1641
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1642
+msgid "Ord-Sharp"
+msgstr ""
+
+#: my-evolution/Locations.h:1643
+#, fuzzy
+msgid "Oregon"
+msgstr ""
+"\n"
+"Org: "
+
+#: my-evolution/Locations.h:1644
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1645
+#, fuzzy
+msgid "Orland"
+msgstr "Irlanda"
+
+#: my-evolution/Locations.h:1646
+#, fuzzy
+msgid "Orlando"
+msgstr "Irlanda"
+
+#: my-evolution/Locations.h:1647
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1648
+msgid "Orsta-Volda"
+msgstr ""
+
+#: my-evolution/Locations.h:1649
+#, fuzzy
+msgid "Oruro"
+msgstr "Erro"
+
+#: my-evolution/Locations.h:1650
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1652
+#, fuzzy
+msgid "Oscoda"
+msgstr "segundo"
+
+#: my-evolution/Locations.h:1653
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1657
+#, fuzzy
+msgid "Ostrava"
+msgstr "Australia"
+
+#: my-evolution/Locations.h:1658
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1661
+#, fuzzy
+msgid "Owyhee"
+msgstr "semana"
+
+#: my-evolution/Locations.h:1662
+#, fuzzy
+msgid "Oxford"
+msgstr "para"
+
+#: my-evolution/Locations.h:1663
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1670
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1671
+#, fuzzy
+msgid "Paganella"
+msgstr "P�xina"
+
+#: my-evolution/Locations.h:1674
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1675
+#, fuzzy
+msgid "Palacios"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1676
+#, fuzzy
+msgid "Palermo"
+msgstr "Buscapersoas"
+
+#: my-evolution/Locations.h:1677
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1678
+#, fuzzy
+msgid "Palmdale"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1679
+#, fuzzy
+msgid "Palmer"
+msgstr "Buscapersoas"
+
+#: my-evolution/Locations.h:1680
+#, fuzzy
+msgid "Palm Springs"
+msgstr "Configuraci�n de Correo"
+
+#: my-evolution/Locations.h:1681
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1682
+#, fuzzy
+msgid "Pamplona"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1684
+#, fuzzy
+msgid "Panama City"
+msgstr "Panam�"
+
+#: my-evolution/Locations.h:1685
+#, fuzzy
+msgid "Pantelleria"
+msgstr "Cancelada"
+
+#: my-evolution/Locations.h:1686
+#, fuzzy
+msgid "Papa"
+msgstr "Xap�n"
+
+#: my-evolution/Locations.h:1687
+#, fuzzy
+msgid "Paphos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1689
+#, fuzzy
+msgid "Paris"
+msgstr "Principal"
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1692
+#, fuzzy
+msgid "Paris/Orly"
+msgstr "Orballo parcial"
+
+#: my-evolution/Locations.h:1693
+msgid "Parkersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1694
+#, fuzzy
+msgid "Pasco"
+msgstr "Contrasinal"
+
+#: my-evolution/Locations.h:1695
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1700
+msgid "Passo Rolle"
+msgstr ""
+
+#: my-evolution/Locations.h:1701
+#, fuzzy
+msgid "Patna"
+msgstr "Panam�"
+
+#: my-evolution/Locations.h:1702
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1706
+#, fuzzy
+msgid "Paysandu"
+msgstr "Area forte"
+
+#: my-evolution/Locations.h:1707
+#, fuzzy
+msgid "Payson"
+msgstr "Tocar un son:"
+
+#: my-evolution/Locations.h:1708
+#, fuzzy
+msgid "Pellston"
+msgstr "Pregunta"
+
+#: my-evolution/Locations.h:1709
+#, fuzzy
+msgid "Pelotas"
+msgstr "Recargar"
+
+#: my-evolution/Locations.h:1710
+#, fuzzy
+msgid "Pendleton"
+msgstr "Selecci�n:"
+
+#: my-evolution/Locations.h:1711
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1716
+#, fuzzy
+msgid "Peoria"
+msgstr "Xeorxia"
+
+#: my-evolution/Locations.h:1717
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1718
+msgid "Pereira/Matecana"
+msgstr ""
+
+#: my-evolution/Locations.h:1719
+#, fuzzy
+msgid "Perm"
+msgstr "Principal"
+
+#: my-evolution/Locations.h:1720
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1721
+msgid "Perry-Foley"
+msgstr ""
+
+#: my-evolution/Locations.h:1722
+#, fuzzy
+msgid "Perth"
+msgstr "Per�"
+
+#: my-evolution/Locations.h:1724
+#, fuzzy
+msgid "Perugia"
+msgstr "Per�"
+
+#: my-evolution/Locations.h:1725
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1730
+#, fuzzy
+msgid "Philip"
+msgstr "Filipinas"
+
+#: my-evolution/Locations.h:1731
+#, fuzzy
+msgid "Philipsburg"
+msgstr "Filipinas"
+
+#: my-evolution/Locations.h:1732
+#, fuzzy
+msgid "Phillips"
+msgstr "Filipinas"
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1739
+msgid "Piedras Negras"
+msgstr ""
+
+#: my-evolution/Locations.h:1740
+#, fuzzy
+msgid "Pierre"
+msgstr "Per�"
+
+#: my-evolution/Locations.h:1741
+msgid "Pietersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1742
+#, fuzzy
+msgid "Pikeville"
+msgstr "Previsualizar"
+
+#: my-evolution/Locations.h:1743
+#, fuzzy
+msgid "Pine Bluff"
+msgstr "Correo de Pine"
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+msgid "Pirassununga"
+msgstr ""
+
+#: my-evolution/Locations.h:1747
+#, fuzzy
+msgid "Pisa"
+msgstr "Paquist�n"
+
+#: my-evolution/Locations.h:1748
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1753
+#, fuzzy
+msgid "Plymouth"
+msgstr "mes"
+
+#: my-evolution/Locations.h:1754
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+msgid "Pocos De Caldas"
+msgstr ""
+
+#: my-evolution/Locations.h:1756
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1757
+#, fuzzy
+msgid "Podgorica Titograd"
+msgstr "Tornado parcial"
+
+#: my-evolution/Locations.h:1758
+msgid "Pohang Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1759
+#, fuzzy
+msgid "Point Hope"
+msgstr "Imprimir Sobre"
+
+#: my-evolution/Locations.h:1760
+#, fuzzy
+msgid "Point Lay"
+msgstr "Imprimir Resumo"
+
+#: my-evolution/Locations.h:1761
+#, fuzzy
+msgid "Point Mugu"
+msgstr "Imprimir Mensaxe"
+
+#: my-evolution/Locations.h:1762
+msgid "Point Piedras Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1763
+#, fuzzy
+msgid "Poitiers"
+msgstr "Propiedades"
+
+#: my-evolution/Locations.h:1765
+msgid "Pompano Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1766
+#, fuzzy
+msgid "Ponca City"
+msgstr "Lista de Tel�fonos"
+
+#: my-evolution/Locations.h:1767
+#, fuzzy
+msgid "Ponce"
+msgstr "Nada"
+
+#: my-evolution/Locations.h:1768
+msgid "Ponta Pora"
+msgstr ""
+
+#: my-evolution/Locations.h:1769
+#, fuzzy
+msgid "Pontiac"
+msgstr "Contactos"
+
+#: my-evolution/Locations.h:1770
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1771
+msgid "Poplar Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1772
+#, fuzzy
+msgid "Poprad"
+msgstr "Polonia"
+
+#: my-evolution/Locations.h:1773
+#, fuzzy
+msgid "Port Alexander"
+msgstr "Imprimir Axenda"
+
+#: my-evolution/Locations.h:1774
+msgid "Port Alsworth"
+msgstr ""
+
+#: my-evolution/Locations.h:1775
+#, fuzzy
+msgid "Port Angeles"
+msgstr "Imprimir Sobre"
+
+#: my-evolution/Locations.h:1776
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1777
+msgid "Port Elizabeth"
+msgstr ""
+
+#: my-evolution/Locations.h:1778
+#, fuzzy
+msgid "Porterville"
+msgstr "Previsualizar"
+
+#: my-evolution/Locations.h:1779
+#, fuzzy
+msgid "Port Hardy"
+msgstr "Imprimir tarxeta"
+
+#: my-evolution/Locations.h:1780
+#, fuzzy
+msgid "Port Hedland"
+msgstr "Polonia"
+
+#: my-evolution/Locations.h:1781
+msgid "Port Heiden"
+msgstr ""
+
+#: my-evolution/Locations.h:1782
+#, fuzzy
+msgid "Portland"
+msgstr "Polonia"
+
+#: my-evolution/Locations.h:1783
+#, fuzzy
+msgid "Porto"
+msgstr "_Porto:"
+
+#: my-evolution/Locations.h:1784
+#, fuzzy
+msgid "Porto Alegre"
+msgstr "En Progreso"
+
+#: my-evolution/Locations.h:1785
+msgid "Porto Alegre Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:1786
+#, fuzzy
+msgid "Portoroz"
+msgstr "Vertical"
+
+#: my-evolution/Locations.h:1787
+#, fuzzy
+msgid "Porto Santo"
+msgstr "Vertical"
+
+#: my-evolution/Locations.h:1788
+msgid "Porto Velho"
+msgstr ""
+
+#: my-evolution/Locations.h:1789
+#, fuzzy
+msgid "Port Said"
+msgstr "Vertical"
+
+#: my-evolution/Locations.h:1790
+msgid "Portsmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1792
+#, fuzzy
+msgid "Posadas"
+msgstr "Polonia"
+
+#: my-evolution/Locations.h:1793
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1796
+#, fuzzy
+msgid "Poza Rica"
+msgstr "Costa Rica"
+
+#: my-evolution/Locations.h:1797
+#, fuzzy
+msgid "Poznan"
+msgstr "Polonia"
+
+#: my-evolution/Locations.h:1798
+#, fuzzy
+msgid "Praha"
+msgstr "Paraguai"
+
+#: my-evolution/Locations.h:1799
+#, fuzzy
+msgid "Pratica di Mare"
+msgstr "Chuvisca parcial"
+
+#: my-evolution/Locations.h:1800
+msgid "Prescott"
+msgstr ""
+
+#: my-evolution/Locations.h:1801
+#, fuzzy
+msgid "Presidente Prudente"
+msgstr "Previsualizaci�n da Impresi�n"
+
+#: my-evolution/Locations.h:1802
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1804
+#, fuzzy
+msgid "Pretoria"
+msgstr "Xeorxia"
+
+#: my-evolution/Locations.h:1805
+#, fuzzy
+msgid "Preveza"
+msgstr "Ant"
+
+#: my-evolution/Locations.h:1806
+#, fuzzy
+msgid "Price-Carbon"
+msgstr "Pitcairn"
+
+#: my-evolution/Locations.h:1807
+#, fuzzy
+msgid "Pristina"
+msgstr "Tradicional"
+
+#: my-evolution/Locations.h:1808
+#, fuzzy
+msgid "Providence"
+msgstr "E_stado/Provincia:"
+
+#: my-evolution/Locations.h:1809
+#, fuzzy
+msgid "Provincetown"
+msgstr "Previsualizar"
+
+#: my-evolution/Locations.h:1810
+#, fuzzy
+msgid "Provo"
+msgstr "Ant"
+
+#: my-evolution/Locations.h:1811
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1812
+#, fuzzy
+msgid "Pucallpa"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1813
+msgid "Pudahuel"
+msgstr ""
+
+#: my-evolution/Locations.h:1814
+#, fuzzy
+msgid "Puebla"
+msgstr "P�blico"
+
+#: my-evolution/Locations.h:1815
+#, fuzzy
+msgid "Pueblo"
+msgstr "P�blico"
+
+#: my-evolution/Locations.h:1816
+#, fuzzy
+msgid "Puerto Barrios"
+msgstr "Porto Rico"
+
+#: my-evolution/Locations.h:1817
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1818
+#, fuzzy
+msgid "Puerto Escondido"
+msgstr "Porto Rico"
+
+#: my-evolution/Locations.h:1819
+#, fuzzy
+msgid "Puerto Lempira"
+msgstr "Porto Rico"
+
+#: my-evolution/Locations.h:1820
+#, fuzzy
+msgid "Puerto Limon"
+msgstr "Porto Rico"
+
+#: my-evolution/Locations.h:1821
+#, fuzzy
+msgid "Puerto Maldonado"
+msgstr "Tornado parcial"
+
+#: my-evolution/Locations.h:1822
+#, fuzzy
+msgid "Puerto Montt"
+msgstr "Porto Rico"
+
+#: my-evolution/Locations.h:1823
+#, fuzzy
+msgid "Puerto Plata"
+msgstr "Porto Rico"
+
+#: my-evolution/Locations.h:1825
+#, fuzzy
+msgid "Puerto Suarez"
+msgstr "Imprimir Resumo"
+
+#: my-evolution/Locations.h:1826
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1827
+#, fuzzy
+msgid "Pula"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1828
+#, fuzzy
+msgid "Pullman"
+msgstr "Polonia"
+
+#: my-evolution/Locations.h:1829
+msgid "Punta Arenas"
+msgstr ""
+
+#: my-evolution/Locations.h:1830
+#, fuzzy
+msgid "Punta Cana"
+msgstr "Imprimir Axenda"
+
+#: my-evolution/Locations.h:1831
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1835
+msgid "Pyongyang"
+msgstr ""
+
+#: my-evolution/Locations.h:1837
+#, fuzzy
+msgid "Quantico"
+msgstr "Pregunta"
+
+#: my-evolution/Locations.h:1838
+#, fuzzy
+msgid "Quebec"
+msgstr "Asunto"
+
+#: my-evolution/Locations.h:1839
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1842
+msgid "Quimper"
+msgstr ""
+
+#: my-evolution/Locations.h:1843
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1850
+#, fuzzy
+msgid "Rapid City"
+msgstr "Respondido a"
+
+#: my-evolution/Locations.h:1851
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1852
+msgid "Ras Al Khaimah"
+msgstr ""
+
+#: my-evolution/Locations.h:1853
+#, fuzzy
+msgid "Rawlins"
+msgstr "Choiva"
+
+#: my-evolution/Locations.h:1854
+#, fuzzy
+msgid "Reading"
+msgstr "Encabezados"
+
+#: my-evolution/Locations.h:1855
+#, fuzzy
+msgid "Rebun Island"
+msgstr "Illa Bouvet"
+
+#: my-evolution/Locations.h:1856
+#, fuzzy
+msgid "Recife"
+msgstr "Recibido"
+
+#: my-evolution/Locations.h:1857
+msgid "Red Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1858
+#, fuzzy
+msgid "Redding"
+msgstr "Encabezados"
+
+#: my-evolution/Locations.h:1859
+#, fuzzy
+msgid "Redig"
+msgstr "Ler"
+
+#: my-evolution/Locations.h:1860
+#, fuzzy
+msgid "Redmond"
+msgstr "Refacer"
+
+#: my-evolution/Locations.h:1861
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1863
+msgid "Reggio Calabria"
+msgstr ""
+
+#: my-evolution/Locations.h:1864
+#, fuzzy
+msgid "Regina"
+msgstr "Rexi�ns"
+
+#: my-evolution/Locations.h:1865
+msgid "Reims-Champagne"
+msgstr ""
+
+#: my-evolution/Locations.h:1866
+#, fuzzy
+msgid "Rennes"
+msgstr "Recordatorios"
+
+#: my-evolution/Locations.h:1867
+#, fuzzy
+msgid "Reno"
+msgstr "Refacer"
+
+#: my-evolution/Locations.h:1868
+#, fuzzy
+msgid "Renton"
+msgstr "Xuntanza"
+
+#: my-evolution/Locations.h:1869
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1870
+#, fuzzy
+msgid "Reus"
+msgstr "Regras"
+
+#: my-evolution/Locations.h:1871
+#, fuzzy
+msgid "Reyes"
+msgstr "anos"
+
+#: my-evolution/Locations.h:1872
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1873
+#, fuzzy
+msgid "Reynosa"
+msgstr "Recargar"
+
+#: my-evolution/Locations.h:1874
+#, fuzzy
+msgid "Rhinelander"
+msgstr "Finlandia"
+
+#: my-evolution/Locations.h:1875
+#, fuzzy
+msgid "Rhode Island"
+msgstr "Illa Bouvet"
+
+#: my-evolution/Locations.h:1876
+#, fuzzy
+msgid "Riberalta"
+msgstr "Xibraltar"
+
+#: my-evolution/Locations.h:1877
+msgid "Richmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1878
+#, fuzzy
+msgid "Rickenbacker"
+msgstr "Alcume"
+
+#: my-evolution/Locations.h:1879
+#, fuzzy
+msgid "Rieti"
+msgstr "Hait�"
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rifle"
+msgstr "Papel"
+
+#: my-evolution/Locations.h:1881
+#, fuzzy
+msgid "Riga"
+msgstr "Dereita:"
+
+#: my-evolution/Locations.h:1882
+#, fuzzy
+msgid "Rijeka"
+msgstr "Ler"
+
+#: my-evolution/Locations.h:1883
+#, fuzzy
+msgid "Rimini"
+msgstr "Roman�a"
+
+#: my-evolution/Locations.h:1884
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1885
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1886
+msgid "Rio Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1887
+#, fuzzy
+msgid "Rioja"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1888
+#, fuzzy
+msgid "Rio / Jacarepagua"
+msgstr "Nicaragua"
+
+#: my-evolution/Locations.h:1889
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+#, fuzzy
+msgid "Rishiri Island"
+msgstr "Illas Virxes Brit�nicas"
+
+#: my-evolution/Locations.h:1891
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+#, fuzzy
+msgid "Rivera"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1893
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1894
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1895
+msgid "Riverton"
+msgstr ""
+
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "Imprimir"
+
+#: my-evolution/Locations.h:1897
+#, fuzzy
+msgid "Rivolto"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:1898
+#, fuzzy
+msgid "Riyadh"
+msgstr "Ler"
+
+#: my-evolution/Locations.h:1899
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1900
+#, fuzzy
+msgid "Roatan"
+msgstr "Croacia"
+
+#: my-evolution/Locations.h:1901
+#, fuzzy
+msgid "Robore"
+msgstr "antes"
+
+#: my-evolution/Locations.h:1902
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1903
+msgid "Rockford"
+msgstr ""
+
+#: my-evolution/Locations.h:1904
+#, fuzzy
+msgid "Rockland"
+msgstr "Polonia"
+
+#: my-evolution/Locations.h:1905
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1907
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1908
+#, fuzzy
+msgid "Rodos"
+msgstr "Cuarto"
+
+#: my-evolution/Locations.h:1909
+#, fuzzy
+msgid "Rogers"
+msgstr "Cartafoles"
+
+#: my-evolution/Locations.h:1910
+#, fuzzy
+msgid "Roma/Ciampino"
+msgstr "Roman�a"
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1917
+msgid "Roosevelt"
+msgstr ""
+
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Roros"
+msgstr "Comores"
+
+#: my-evolution/Locations.h:1919
+msgid "Rorvik/Ryum"
+msgstr ""
+
+#: my-evolution/Locations.h:1920
+#, fuzzy
+msgid "Rosario"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1921
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1922
+#, fuzzy
+msgid "Roseglen"
+msgstr "Papel"
+
+#: my-evolution/Locations.h:1923
+#, fuzzy
+msgid "Rost"
+msgstr "Servidor"
+
+#: my-evolution/Locations.h:1924
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1927
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1928
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1929
+#, fuzzy
+msgid "Rurrenabaque"
+msgstr "Recorrencia"
+
+#: my-evolution/Locations.h:1930
+msgid "Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1931
+#, fuzzy
+msgid "Russia"
+msgstr "Austria"
+
+#: my-evolution/Locations.h:1932
+#, fuzzy
+msgid "Rutland"
+msgstr "But�n"
+
+#: my-evolution/Locations.h:1933
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1935
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1936
+msgid "Sabine Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:1937
+#, fuzzy
+msgid "Sacramento"
+msgstr "Departamento"
+
+#: my-evolution/Locations.h:1938
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1939
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1940
+#, fuzzy
+msgid "Saginaw"
+msgstr "Espa�a"
+
+#: my-evolution/Locations.h:1941
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1944
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1945
+#, fuzzy
+msgid "Saint Mary's"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1946
+#, fuzzy
+msgid "Saint Mawgan"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1947
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1948
+#, fuzzy
+msgid "Saint Paul"
+msgstr "Santa Luc�a"
+
+#: my-evolution/Locations.h:1949
+#, fuzzy
+msgid "Saiq"
+msgstr "Espa�a"
+
+#: my-evolution/Locations.h:1950
+#, fuzzy
+msgid "Salalah"
+msgstr "Refachos de vento"
+
+#: my-evolution/Locations.h:1951
+#, fuzzy
+msgid "Salem"
+msgstr "Gardar"
+
+#: my-evolution/Locations.h:1952
+#, fuzzy
+msgid "Salida"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:1953
+msgid "Salida-Harriet"
+msgstr ""
+
+#: my-evolution/Locations.h:1954
+#, fuzzy
+msgid "Salina"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:1955
+#, fuzzy
+msgid "Salinas"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:1956
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1957
+#, fuzzy
+msgid "Salmon"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1958
+msgid "Salmon (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1959
+#, fuzzy
+msgid "Salta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1960
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1961
+msgid "Salt Lake City"
+msgstr ""
+
+#: my-evolution/Locations.h:1962
+#, fuzzy
+msgid "Salto"
+msgstr "_S�b"
+
+#: my-evolution/Locations.h:1963
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+#, fuzzy
+msgid "Salvador"
+msgstr "O Salvador"
+
+#: my-evolution/Locations.h:1965
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1966
+#, fuzzy
+msgid "Samara"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1967
+#, fuzzy
+msgid "Samos"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1968
+#, fuzzy
+msgid "Samsun"
+msgstr "_Dom"
+
+#: my-evolution/Locations.h:1969
+#, fuzzy
+msgid "Sana'A"
+msgstr "Area"
+
+#: my-evolution/Locations.h:1970
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+#, fuzzy
+msgid "San Angelo"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1975
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1976
+#, fuzzy
+msgid "San Carlos"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1977
+#, fuzzy
+msgid "Sandane"
+msgstr "Area"
+
+#: my-evolution/Locations.h:1978
+#, fuzzy
+msgid "Sandberg"
+msgstr "Autor"
+
+#: my-evolution/Locations.h:1979
+#, fuzzy
+msgid "Sanderson"
+msgstr "Autor"
+
+#: my-evolution/Locations.h:1980
+#, fuzzy
+msgid "San Diego"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1986
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1987
+#, fuzzy
+msgid "Sand Point"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1988
+msgid "San Fernando De Apure"
+msgstr ""
+
+#: my-evolution/Locations.h:1989
+#, fuzzy
+msgid "Sanford"
+msgstr "Area"
+
+#: my-evolution/Locations.h:1990
+#, fuzzy
+msgid "San Francisco"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1991
+#, fuzzy
+msgid "Sangju"
+msgstr "Sombreado"
+
+#: my-evolution/Locations.h:1992
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1993
+#, fuzzy
+msgid "San Joaquin"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1994
+#, fuzzy
+msgid "San Jose"
+msgstr "Gardar e Pechar"
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1997
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1998
+#, fuzzy
+msgid "San Juan"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1999
+msgid "Sankt-Peterburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2000
+#, fuzzy
+msgid "Sanliurfa"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:2001
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2002
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2003
+#, fuzzy
+msgid "San Miguel"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2004
+#, fuzzy
+msgid "San Nicholas Island"
+msgstr "Illa Norfolk"
+
+#: my-evolution/Locations.h:2005
+#, fuzzy
+msgid "San Salvador"
+msgstr "O Salvador"
+
+#: my-evolution/Locations.h:2006
+#, fuzzy
+msgid "San Sebastian"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2007
+#, fuzzy
+msgid "Santa Ana"
+msgstr "Santa Luc�a"
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+#, fuzzy
+msgid "Santa Maria"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2012
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2013
+#, fuzzy
+msgid "Santa Monica"
+msgstr "Santa Luc�a"
+
+#: my-evolution/Locations.h:2014
+#, fuzzy
+msgid "Santander"
+msgstr "Autor"
+
+#: my-evolution/Locations.h:2015
+#, fuzzy
+msgid "Santarem"
+msgstr "Treboada de area"
+
+#: my-evolution/Locations.h:2016
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2017
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+#, fuzzy
+msgid "Santiago"
+msgstr "Santa Luc�a"
+
+#: my-evolution/Locations.h:2019
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2020
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2021
+#, fuzzy
+msgid "Santorini"
+msgstr "Treboada de area"
+
+#: my-evolution/Locations.h:2022
+#, fuzzy
+msgid "Santos"
+msgstr "Estado"
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+#, fuzzy
+msgid "Sao Luiz"
+msgstr "Santa Luc�a"
+
+#: my-evolution/Locations.h:2025
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2028
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+#, fuzzy
+msgid "Sarasota"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:2030
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+#, fuzzy
+msgid "Sarzana"
+msgstr "Sri Lanka"
+
+#: my-evolution/Locations.h:2032
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2033
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2038
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2039
+msgid "Sawyer AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2040
+#, fuzzy
+msgid "Sayun"
+msgstr "_Dom"
+
+#: my-evolution/Locations.h:2041
+#, fuzzy
+msgid "Scatsta"
+msgstr "Estado"
+
+#: my-evolution/Locations.h:2042
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2045
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2046
+msgid "Scottsdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Scranton"
+msgstr "Organizaci�n"
+
+#: my-evolution/Locations.h:2048
+msgid "Seattle"
+msgstr ""
+
+#: my-evolution/Locations.h:2049
+#, fuzzy
+msgid "Seattle-Boeing"
+msgstr "Opci�ns"
+
+#: my-evolution/Locations.h:2050
+#, fuzzy
+msgid "Sedalia"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:2051
+#, fuzzy
+msgid "Seeb"
+msgstr "Vista"
+
+#: my-evolution/Locations.h:2052
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+#, fuzzy
+msgid "Sendai Airport"
+msgstr "Comezando a importaci�n"
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2058
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2059
+msgid "Sevilla"
+msgstr ""
+
+#: my-evolution/Locations.h:2060
+#, fuzzy
+msgid "Seward"
+msgstr "Buscar"
+
+#: my-evolution/Locations.h:2061
+msgid "Sexton Summit"
+msgstr ""
+
+#: my-evolution/Locations.h:2062
+#, fuzzy
+msgid "Shanghai"
+msgstr "Sombreado"
+
+#: my-evolution/Locations.h:2063
+msgid "Shannon"
+msgstr ""
+
+#: my-evolution/Locations.h:2064
+#, fuzzy
+msgid "Sharjah"
+msgstr "Buscar"
+
+#: my-evolution/Locations.h:2065
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+#: my-evolution/Locations.h:2066
+#, fuzzy
+msgid "Sharurah"
+msgstr "S�bado"
+
+#: my-evolution/Locations.h:2067
+#, fuzzy
+msgid "Shawbury"
+msgstr "S�bado"
+
+#: my-evolution/Locations.h:2068
+#, fuzzy
+msgid "Shearwater"
+msgstr "Data de _Inicio:"
+
+#: my-evolution/Locations.h:2069
+msgid "Sheboygan"
+msgstr ""
+
+#: my-evolution/Locations.h:2070
+#, fuzzy
+msgid "Sheldon"
+msgstr "Suecia"
+
+#: my-evolution/Locations.h:2071
+msgid "Shelter Cove"
+msgstr ""
+
+#: my-evolution/Locations.h:2072
+#, fuzzy
+msgid "Shelton"
+msgstr "Selecci�n:"
+
+#: my-evolution/Locations.h:2073
+msgid "Shenandoah"
+msgstr ""
+
+#: my-evolution/Locations.h:2074
+#, fuzzy
+msgid "Sheridan"
+msgstr "Sud�n"
+
+#: my-evolution/Locations.h:2075
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2076
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2077
+msgid "Shingle Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2078
+#, fuzzy
+msgid "Shiraz"
+msgstr "Tama�o"
+
+#: my-evolution/Locations.h:2079
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2080
+msgid "Shizuhama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2081
+#, fuzzy
+msgid "Shoreham"
+msgstr "Puntuaci�n"
+
+#: my-evolution/Locations.h:2082
+#, fuzzy
+msgid "Show Low"
+msgstr "Neve superficial"
+
+#: my-evolution/Locations.h:2083
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2084
+msgid "Shreveport Regional"
+msgstr ""
+
+#: my-evolution/Locations.h:2085
+#, fuzzy
+msgid "Sidney"
+msgstr "Imprimir"
+
+#: my-evolution/Locations.h:2086
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2087
+msgid "Siloam Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2088
+#, fuzzy
+msgid "Silver City"
+msgstr "Seguridade"
+
+#: my-evolution/Locations.h:2089
+#, fuzzy
+msgid "Sindal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2091
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2097
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2098
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+#: my-evolution/Locations.h:2099
+#, fuzzy
+msgid "Skive"
+msgstr "Tama�o"
+
+#: my-evolution/Locations.h:2100
+#, fuzzy
+msgid "Skopje"
+msgstr "Parar"
+
+#: my-evolution/Locations.h:2101
+#, fuzzy
+msgid "Skwentna"
+msgstr "Enviada"
+
+#: my-evolution/Locations.h:2102
+#, fuzzy
+msgid "Slana"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:2105
+#, fuzzy
+msgid "Smithers"
+msgstr "minutos"
+
+#: my-evolution/Locations.h:2106
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2107
+#, fuzzy
+msgid "Snowshoe Lake"
+msgstr "Neve abundante"
+
+#: my-evolution/Locations.h:2108
+#, fuzzy
+msgid "Sochi"
+msgstr "Sur"
+
+#: my-evolution/Locations.h:2109
+#, fuzzy
+msgid "Socorro"
+msgstr "Puntuaci�n"
+
+#: my-evolution/Locations.h:2110
+#, fuzzy
+msgid "Socotra"
+msgstr "Puntuaci�n"
+
+#: my-evolution/Locations.h:2111
+#, fuzzy
+msgid "Soda Springs"
+msgstr "Folerpas de neve"
+
+#: my-evolution/Locations.h:2112
+#, fuzzy
+msgid "Sofia"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:2113
+#, fuzzy
+msgid "Sogndal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2114
+#, fuzzy
+msgid "Soldotna"
+msgstr "Eslovenia"
+
+#: my-evolution/Locations.h:2115
+#, fuzzy
+msgid "Somerset"
+msgstr "Chuvieira"
+
+#: my-evolution/Locations.h:2116
+#, fuzzy
+msgid "Sonderborg"
+msgstr "Autor"
+
+#: my-evolution/Locations.h:2117
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2120
+#, fuzzy
+msgid "Southampton"
+msgstr "Sureste"
+
+#: my-evolution/Locations.h:2121
+#, fuzzy
+msgid "South Bend"
+msgstr "Sur"
+
+#: my-evolution/Locations.h:2122
+#, fuzzy
+msgid "South Carolina"
+msgstr "Sud�frica"
+
+#: my-evolution/Locations.h:2123
+#, fuzzy
+msgid "South Dakota"
+msgstr "Sureste"
+
+#: my-evolution/Locations.h:2124
+#, fuzzy
+msgid "Southend"
+msgstr "Sur"
+
+#: my-evolution/Locations.h:2125
+#, fuzzy
+msgid "South Marsh Island"
+msgstr "Illas Marshall"
+
+#: my-evolution/Locations.h:2126
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2128
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2129
+#, fuzzy
+msgid "Spencer"
+msgstr "Autor"
+
+#: my-evolution/Locations.h:2130
+msgid "Spickard"
+msgstr ""
+
+#: my-evolution/Locations.h:2131
+#, fuzzy
+msgid "Split"
+msgstr "Br�tema"
+
+#: my-evolution/Locations.h:2132
+#, fuzzy
+msgid "Spokane"
+msgstr "Espa�a"
+
+#: my-evolution/Locations.h:2133
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2134
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "Springfield"
+msgstr "Simplificado"
+
+#: my-evolution/Locations.h:2136
+msgid "Stampede Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:2137
+#, fuzzy
+msgid "State College"
+msgstr "Data Completada:"
+
+#: my-evolution/Locations.h:2138
+#, fuzzy
+msgid "Stauning"
+msgstr "Opci�ns"
+
+#: my-evolution/Locations.h:2139
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2140
+msgid "Stavanger/Sola"
+msgstr ""
+
+#: my-evolution/Locations.h:2141
+#, fuzzy
+msgid "Staverton"
+msgstr "Opci�ns"
+
+#: my-evolution/Locations.h:2142
+#, fuzzy
+msgid "Stavropol"
+msgstr "Parar"
+
+#: my-evolution/Locations.h:2143
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2144
+msgid "Steamboat Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2145
+#, fuzzy
+msgid "Stephenville"
+msgstr "Seichelles"
+
+#: my-evolution/Locations.h:2146
+#, fuzzy
+msgid "St. George"
+msgstr "Santa Helena"
+
+#: my-evolution/Locations.h:2147
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2148
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2149
+msgid "St Johnsbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2150
+#, fuzzy
+msgid "St Joseph"
+msgstr "Parar"
+
+#: my-evolution/Locations.h:2151
+#, fuzzy
+msgid "St Louis"
+msgstr "Santa Luc�a"
+
+#: my-evolution/Locations.h:2152
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2157
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2158
+#, fuzzy
+msgid "Storm Lake"
+msgstr "Sri Lanka"
+
+#: my-evolution/Locations.h:2159
+#, fuzzy
+msgid "Stornoway"
+msgstr "Noruega"
+
+#: my-evolution/Locations.h:2160
+#, fuzzy
+msgid "St Paul"
+msgstr "Estado"
+
+#: my-evolution/Locations.h:2161
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2164
+#, fuzzy
+msgid "Strevell"
+msgstr "Sub�rbore"
+
+#: my-evolution/Locations.h:2165
+#, fuzzy
+msgid "St Simon's Island"
+msgstr "Illas Salom�n"
+
+#: my-evolution/Locations.h:2166
+msgid "Stumpy Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2167
+#, fuzzy
+msgid "Sturgeon Bay"
+msgstr "S�bado"
+
+#: my-evolution/Locations.h:2168
+msgid "Stuttgart"
+msgstr ""
+
+#: my-evolution/Locations.h:2169
+#, fuzzy
+msgid "Sucre"
+msgstr "Puntuaci�n"
+
+#: my-evolution/Locations.h:2170
+#, fuzzy
+msgid "Sumburgh"
+msgstr "Luxemburgo"
+
+#: my-evolution/Locations.h:2171
+#, fuzzy
+msgid "Sumter"
+msgstr "Resumo"
+
+#: my-evolution/Locations.h:2172
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2174
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2175
+msgid "Superior"
+msgstr ""
+
+#: my-evolution/Locations.h:2177
+#, fuzzy
+msgid "Sutton"
+msgstr "_Dom"
+
+#: my-evolution/Locations.h:2178
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2179
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2188
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2189
+msgid "Szombathely"
+msgstr ""
+
+#: my-evolution/Locations.h:2190
+#, fuzzy
+msgid "Tabatinga"
+msgstr "Tradicional"
+
+#: my-evolution/Locations.h:2191
+msgid "Tabriz"
+msgstr ""
+
+#: my-evolution/Locations.h:2192
+#, fuzzy
+msgid "Tabuk"
+msgstr "Tarefa"
+
+#: my-evolution/Locations.h:2193
+msgid "Tachikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+#, fuzzy
+msgid "Tacna"
+msgstr "Gana"
+
+#: my-evolution/Locations.h:2195
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2199
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+#, fuzzy
+msgid "Taejon"
+msgstr "Ent�n"
+
+#: my-evolution/Locations.h:2201
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2202
+msgid "Taichung"
+msgstr ""
+
+#: my-evolution/Locations.h:2203
+#, fuzzy
+msgid "Taif"
+msgstr "Taiw�n"
+
+#: my-evolution/Locations.h:2204
+#, fuzzy
+msgid "Tainan"
+msgstr "Taiw�n"
+
+#: my-evolution/Locations.h:2206
+#, fuzzy
+msgid "Taiyuan"
+msgstr "Taiw�n"
+
+#: my-evolution/Locations.h:2207
+#, fuzzy
+msgid "Taiz"
+msgstr "Taiw�n"
+
+#: my-evolution/Locations.h:2208
+#, fuzzy
+msgid "Tajima"
+msgstr "Taiw�n"
+
+#: my-evolution/Locations.h:2209
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Talara"
+msgstr ""
+
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Talinn"
+msgstr "Taiw�n"
+
+#: my-evolution/Locations.h:2212
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tallahassee"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2215
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2216
+#, fuzzy
+msgid "Tampa"
+msgstr "Xap�n"
+
+#: my-evolution/Locations.h:2217
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2218
+#, fuzzy
+msgid "Tampere"
+msgstr "Papel"
+
+#: my-evolution/Locations.h:2219
+msgid "Tampico"
+msgstr ""
+
+#: my-evolution/Locations.h:2220
+#, fuzzy
+msgid "Tanana"
+msgstr "Canad�"
+
+#: my-evolution/Locations.h:2221
+msgid "Tanegashima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2222
+#, fuzzy
+msgid "Taos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:2223
+#, fuzzy
+msgid "Taoyuan"
+msgstr "Taiw�n"
+
+#: my-evolution/Locations.h:2224
+msgid "Tapachula"
+msgstr ""
+
+#: my-evolution/Locations.h:2225
+#, fuzzy
+msgid "Taranto"
+msgstr "Taiw�n"
+
+#: my-evolution/Locations.h:2226
+#, fuzzy
+msgid "Tarbes"
+msgstr "Tarefa"
+
+#: my-evolution/Locations.h:2227
+#, fuzzy
+msgid "Tarija"
+msgstr "Taiw�n"
+
+#: my-evolution/Locations.h:2228
+msgid "Tarvisio"
+msgstr ""
+
+#: my-evolution/Locations.h:2229
+#, fuzzy
+msgid "Tatalina"
+msgstr "Tradicional"
+
+#: my-evolution/Locations.h:2230
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2235
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2236
+#, fuzzy
+msgid "Tela"
+msgstr "Toquelau"
+
+#: my-evolution/Locations.h:2237
+#, fuzzy
+msgid "Temple"
+msgstr "Telex"
+
+#: my-evolution/Locations.h:2238
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2244
+msgid "Texarkana"
+msgstr ""
+
+#: my-evolution/Locations.h:2245
+#, fuzzy
+msgid "Texas"
+msgstr "Tarefa"
+
+#: my-evolution/Locations.h:2246
+#, fuzzy
+msgid "The Dalles"
+msgstr "Seichelles"
+
+#: my-evolution/Locations.h:2247
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2248
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2249
+msgid "Thiruvananthapuram"
+msgstr ""
+
+#: my-evolution/Locations.h:2250
+#, fuzzy
+msgid "Thisted"
+msgstr "T�tulo"
+
+#: my-evolution/Locations.h:2251
+msgid "Thompson Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2252
+#, fuzzy
+msgid "Thumrait"
+msgstr "Xoves"
+
+#: my-evolution/Locations.h:2253
+#, fuzzy
+msgid "Tianjin"
+msgstr "Taiw�n"
+
+#: my-evolution/Locations.h:2254
+#, fuzzy
+msgid "Tijuana"
+msgstr "Lituania"
+
+#: my-evolution/Locations.h:2255
+msgid "Timisoara"
+msgstr ""
+
+#: my-evolution/Locations.h:2256
+msgid "Tin City"
+msgstr ""
+
+#: my-evolution/Locations.h:2257
+#, fuzzy
+msgid "Tirana"
+msgstr "Taiw�n"
+
+#: my-evolution/Locations.h:2258
+#, fuzzy
+msgid "Tiree"
+msgstr "Libre"
+
+#: my-evolution/Locations.h:2259
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2260
+msgid "Tiruchchirapalli"
+msgstr ""
+
+#: my-evolution/Locations.h:2261
+#, fuzzy
+msgid "Titusville"
+msgstr "T�tulo"
+
+#: my-evolution/Locations.h:2262
+#, fuzzy
+msgid "Tivat"
+msgstr "Privado"
+
+#: my-evolution/Locations.h:2263
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2267
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+#, fuzzy
+msgid "Tokunoshima Island"
+msgstr "Illa Christmas"
+
+#: my-evolution/Locations.h:2269
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2271
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2272
+msgid "Tokyo New International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2273
+#, fuzzy
+msgid "Toledo"
+msgstr "Trocar"
+
+#: my-evolution/Locations.h:2274
+#, fuzzy
+msgid "Toluca"
+msgstr "Toquelau"
+
+#: my-evolution/Locations.h:2275
+#, fuzzy
+msgid "Tonopah"
+msgstr "Tonga"
+
+#: my-evolution/Locations.h:2276
+#, fuzzy
+msgid "Topeka"
+msgstr "Toquelau"
+
+#: my-evolution/Locations.h:2277
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2279
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2280
+#, fuzzy
+msgid "Toronto"
+msgstr "Tornado"
+
+#: my-evolution/Locations.h:2281
+#, fuzzy
+msgid "Torp"
+msgstr "Superior:"
+
+#: my-evolution/Locations.h:2282
+#, fuzzy
+msgid "Torrance"
+msgstr "Francia"
+
+#: my-evolution/Locations.h:2283
+#, fuzzy
+msgid "Torreon"
+msgstr "Coreano"
+
+#: my-evolution/Locations.h:2284
+#, fuzzy
+msgid "Tottori Airport"
+msgstr "Comezando a importaci�n"
+
+#: my-evolution/Locations.h:2285
+#, fuzzy
+msgid "Toulouse"
+msgstr "Pechar"
+
+#: my-evolution/Locations.h:2286
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2290
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2291
+#, fuzzy
+msgid "Trabzon"
+msgstr "Gab�n"
+
+#: my-evolution/Locations.h:2292
+#, fuzzy
+msgid "Trapani"
+msgstr "Xap�n"
+
+#: my-evolution/Locations.h:2293
+msgid "Traverse City"
+msgstr ""
+
+#: my-evolution/Locations.h:2294
+#, fuzzy
+msgid "Trelew"
+msgstr "Telex"
+
+#: my-evolution/Locations.h:2295
+#, fuzzy
+msgid "Trenton"
+msgstr "Orientaci�n"
+
+#: my-evolution/Locations.h:2296
+#, fuzzy
+msgid "Trevico"
+msgstr "Anterior"
+
+#: my-evolution/Locations.h:2297
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2298
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2299
+#, fuzzy
+msgid "Trieste"
+msgstr "Proba"
+
+#: my-evolution/Locations.h:2300
+#, fuzzy
+msgid "Trinidad"
+msgstr "Tornado"
+
+#: my-evolution/Locations.h:2301
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2304
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2305
+msgid "Troyes/Barberey"
+msgstr ""
+
+#: my-evolution/Locations.h:2306
+#, fuzzy
+msgid "Truckee"
+msgstr "Turqu�a"
+
+#: my-evolution/Locations.h:2307
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2314
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2315
+msgid "Tulancingo"
+msgstr ""
+
+#: my-evolution/Locations.h:2316
+#, fuzzy
+msgid "Tulcea"
+msgstr "Martes"
+
+#: my-evolution/Locations.h:2317
+#, fuzzy
+msgid "Tulsa"
+msgstr "Tunicia"
+
+#: my-evolution/Locations.h:2318
+#, fuzzy
+msgid "Tupelo"
+msgstr "_Mar"
+
+#: my-evolution/Locations.h:2319
+#, fuzzy
+msgid "Turaif"
+msgstr "Turco"
+
+#: my-evolution/Locations.h:2320
+#, fuzzy
+msgid "Turin"
+msgstr "Turco"
+
+#: my-evolution/Locations.h:2322
+#, fuzzy
+msgid "Turku"
+msgstr "Turqu�a"
+
+#: my-evolution/Locations.h:2323
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2324
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+#: my-evolution/Locations.h:2325
+#, fuzzy
+msgid "Twenthe"
+msgstr "Tentativa"
+
+#: my-evolution/Locations.h:2326
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2327
+msgid "Twin Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2328
+#, fuzzy
+msgid "Tyler"
+msgstr "Tipo:"
+
+#: my-evolution/Locations.h:2329
+msgid "Tyndall AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2330
+#, fuzzy
+msgid "Tyumen"
+msgstr "_Mar"
+
+#: my-evolution/Locations.h:2331
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2332
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2340
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2341
+#, fuzzy
+msgid "United Arab Emirates "
+msgstr "Emiratos �rabes Unidos"
+
+#: my-evolution/Locations.h:2344
+#, fuzzy
+msgid "Unst"
+msgstr "Non vista"
+
+#: my-evolution/Locations.h:2345
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2346
+#, fuzzy
+msgid "Uruapan"
+msgstr "Xap�n"
+
+#: my-evolution/Locations.h:2347
+#, fuzzy
+msgid "Uruguaiana"
+msgstr "Uruguai"
+
+#: my-evolution/Locations.h:2349
+msgid "Urumqi"
+msgstr ""
+
+#: my-evolution/Locations.h:2350
+#, fuzzy
+msgid "Utah"
+msgstr " "
+
+#: my-evolution/Locations.h:2351
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2353
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:2355
+#, fuzzy
+msgid "Vadso"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:2356
+#, fuzzy
+msgid "Vaerlose"
+msgstr "Variable"
+
+#: my-evolution/Locations.h:2357
+#, fuzzy
+msgid "Vagar"
+msgstr "Buscapersoas"
+
+#: my-evolution/Locations.h:2358
+msgid "Valdez 2"
+msgstr ""
+
+#: my-evolution/Locations.h:2359
+#, fuzzy
+msgid "Valdosta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:2360
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2361
+#, fuzzy
+msgid "Valencia"
+msgstr "Eslovenia"
+
+#: my-evolution/Locations.h:2362
+#, fuzzy
+msgid "Valentine"
+msgstr "Ver Inline"
+
+#: my-evolution/Locations.h:2363
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2366
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2367
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2368
+#, fuzzy
+msgid "Van"
+msgstr "maio"
+
+#: my-evolution/Locations.h:2369
+msgid "Vancouver"
+msgstr ""
+
+#: my-evolution/Locations.h:2370
+#, fuzzy
+msgid "Vandel"
+msgstr "Cancelar"
+
+#: my-evolution/Locations.h:2371
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2373
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+#, fuzzy
+msgid "Varadero"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:2375
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2376
+#, fuzzy
+msgid "Varna"
+msgstr "Vanuatu"
+
+#: my-evolution/Locations.h:2377
+#, fuzzy
+msgid "Vasteras"
+msgstr "despois"
+
+#: my-evolution/Locations.h:2378
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2379
+#, fuzzy
+msgid "Venezia"
+msgstr "Venezuela"
+
+#: my-evolution/Locations.h:2381
+#, fuzzy
+msgid "Venice"
+msgstr "Unicode"
+
+#: my-evolution/Locations.h:2382
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2383
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2384
+#, fuzzy
+msgid "Vermont"
+msgstr "mes"
+
+#: my-evolution/Locations.h:2385
+#, fuzzy
+msgid "Vernal"
+msgstr "Xeral"
+
+#: my-evolution/Locations.h:2386
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+#, fuzzy
+msgid "Vicenza"
+msgstr "Venezuela"
+
+#: my-evolution/Locations.h:2388
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2390
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2393
+msgid "Vigo"
+msgstr ""
+
+#: my-evolution/Locations.h:2394
+#, fuzzy
+msgid "Vilhena"
+msgstr "Nome do ficheiro:"
+
+#: my-evolution/Locations.h:2395
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+#, fuzzy
+msgid "Villahermosa"
+msgstr "Alarmas Visuais"
+
+#: my-evolution/Locations.h:2398
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2404
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+#, fuzzy
+msgid "Visalia"
+msgstr "Australia"
+
+#: my-evolution/Locations.h:2406
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2410
+msgid "Vladivostok"
+msgstr ""
+
+#: my-evolution/Locations.h:2411
+#, fuzzy
+msgid "Vlieland"
+msgstr "Finlandia"
+
+#: my-evolution/Locations.h:2412
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2413
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2414
+#, fuzzy
+msgid "Volkel"
+msgstr "Toquelau"
+
+#: my-evolution/Locations.h:2415
+#, fuzzy
+msgid "Volk Field"
+msgstr "Campo _Desde"
+
+#: my-evolution/Locations.h:2416
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2417
+#, fuzzy
+msgid "Voslau"
+msgstr "Toquelau"
+
+#: my-evolution/Locations.h:2418
+#, fuzzy
+msgid "Waco"
+msgstr "M�naco"
+
+#: my-evolution/Locations.h:2419
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2423
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2424
+#, fuzzy
+msgid "Wallops Island"
+msgstr "Illas Falkland (Malvinas)"
+
+#: my-evolution/Locations.h:2425
+msgid "Walnut Ridge"
+msgstr ""
+
+#: my-evolution/Locations.h:2426
+#, fuzzy
+msgid "Warner Robins"
+msgstr "Advertencia"
+
+#: my-evolution/Locations.h:2427
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2429
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2430
+msgid "Washington/Dulles"
+msgstr ""
+
+#: my-evolution/Locations.h:2431
+#, fuzzy
+msgid "Waterbury"
+msgstr "Tempo"
+
+#: my-evolution/Locations.h:2432
+#, fuzzy
+msgid "Waterloo"
+msgstr "Tempo"
+
+#: my-evolution/Locations.h:2433
+#, fuzzy
+msgid "Watertown"
+msgstr "Tempo"
+
+#: my-evolution/Locations.h:2434
+#, fuzzy
+msgid "Waterville"
+msgstr "Categor�as"
+
+#: my-evolution/Locations.h:2435
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+#, fuzzy
+msgid "Wausau"
+msgstr "Vanuatu"
+
+#: my-evolution/Locations.h:2437
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2438
+msgid "Waynesboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2439
+#, fuzzy
+msgid "Webster City"
+msgstr "Sitio Web"
+
+#: my-evolution/Locations.h:2440
+#, fuzzy
+msgid "Wejh"
+msgstr "Me"
+
+#: my-evolution/Locations.h:2441
+msgid "Wellington"
+msgstr ""
+
+#: my-evolution/Locations.h:2442
+#, fuzzy
+msgid "Wenatchee"
+msgstr "Tempo"
+
+#: my-evolution/Locations.h:2443
+#, fuzzy
+msgid "Wendover"
+msgstr "Autor"
+
+#: my-evolution/Locations.h:2444
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2445
+#, fuzzy
+msgid "West Burke"
+msgstr "Europeo Occidental"
+
+#: my-evolution/Locations.h:2446
+#, fuzzy
+msgid "Westerland"
+msgstr "Pa�ses Baixos"
+
+#: my-evolution/Locations.h:2447
+#, fuzzy
+msgid "Westfield"
+msgstr "Oeste"
+
+#: my-evolution/Locations.h:2448
+msgid "Westhampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2449
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2451
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2452
+msgid "West Yellowstone (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2453
+#, fuzzy
+msgid "Wheeling"
+msgstr "_Programar Xuntanza"
+
+#: my-evolution/Locations.h:2454
+#, fuzzy
+msgid "Whidbey Island"
+msgstr "Illa Christmas"
+
+#: my-evolution/Locations.h:2455
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2461
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2462
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2463
+#, fuzzy
+msgid "Wick"
+msgstr "Alcume"
+
+#: my-evolution/Locations.h:2464
+#, fuzzy
+msgid "Wien"
+msgstr "Me"
+
+#: my-evolution/Locations.h:2465
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2467
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2468
+msgid "Williamsport"
+msgstr ""
+
+#: my-evolution/Locations.h:2469
+#, fuzzy
+msgid "Williston"
+msgstr "Br�tema"
+
+#: my-evolution/Locations.h:2470
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2472
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2473
+#, fuzzy
+msgid "Winchester"
+msgstr "Liechtenstein"
+
+#: my-evolution/Locations.h:2474
+#, fuzzy
+msgid "Windsor"
+msgstr "Treboada de area"
+
+#: my-evolution/Locations.h:2475
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2478
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+#, fuzzy
+msgid "Winslow"
+msgstr "agora"
+
+#: my-evolution/Locations.h:2480
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2481
+msgid "Winter Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:2482
+#, fuzzy
+msgid "Winter Park"
+msgstr "Contrasinal"
+
+#: my-evolution/Locations.h:2483
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+#, fuzzy
+msgid "Wisconsin"
+msgstr "Micronesia"
+
+#: my-evolution/Locations.h:2485
+msgid "Wisconsin Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:2486
+#, fuzzy
+msgid "Wise"
+msgstr "Me"
+
+#: my-evolution/Locations.h:2487
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2488
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2489
+#, fuzzy
+msgid "Woong Cheon"
+msgstr "Hong Kong"
+
+#: my-evolution/Locations.h:2490
+#, fuzzy
+msgid "Wooster"
+msgstr "Ao p�:"
+
+#: my-evolution/Locations.h:2491
+#, fuzzy
+msgid "Worcester"
+msgstr "para sempre"
+
+#: my-evolution/Locations.h:2492
+#, fuzzy
+msgid "Worland"
+msgstr "Polonia"
+
+#: my-evolution/Locations.h:2493
+#, fuzzy
+msgid "Worthington"
+msgstr "Traballando"
+
+#: my-evolution/Locations.h:2494
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2495
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2496
+msgid "Wuchia Observatory"
+msgstr ""
+
+#: my-evolution/Locations.h:2497
+#, fuzzy
+msgid "Wyoming"
+msgstr "Traballando"
+
+#: my-evolution/Locations.h:2498
+#, fuzzy
+msgid "Xiamen"
+msgstr "Nome:"
+
+#: my-evolution/Locations.h:2499
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2505
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2506
+msgid "Yankton"
+msgstr ""
+
+#: my-evolution/Locations.h:2507
+#, fuzzy
+msgid "Yao Airport"
+msgstr "Non importar"
+
+#: my-evolution/Locations.h:2508
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2510
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2511
+msgid "Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2513
+#, fuzzy
+msgid "Yenbo"
+msgstr "Iemen"
+
+#: my-evolution/Locations.h:2514
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2522
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2528
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2529
+msgid "Zacatecas"
+msgstr ""
+
+#: my-evolution/Locations.h:2530
+#, fuzzy
+msgid "Zadar"
+msgstr "Axenda"
+
+#: my-evolution/Locations.h:2531
+#, fuzzy
+msgid "Zagreb"
+msgstr "P�xina"
+
+#: my-evolution/Locations.h:2532
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2533
+msgid "Zama Airfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2534
+#, fuzzy
+msgid "Zanesville"
+msgstr "Cancelada"
+
+#: my-evolution/Locations.h:2535
+#, fuzzy
+msgid "Zaragoza"
+msgstr "Paraguai"
+
+#: my-evolution/Locations.h:2536
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2537
+msgid "Zuni Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:2538
+#, fuzzy
+msgid "Zurich"
+msgstr "Turco"
+
+#: my-evolution/component-factory.c:51
+msgid "Folder containing the Evolution Summary"
+msgstr "Cartafol que cont�n o Resumo de Evolution"
+
+#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "Citas"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "Non hai citas"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:400
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-calendar.c:379
+#: my-evolution/e-summary-calendar.c:402
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-calendar.c:420
+#, fuzzy
+msgid "No description"
+msgstr "descrici�n"
+
+#: my-evolution/e-summary-mail.c:151
 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
+msgid "Local Folders"
+msgstr "Cartafoles Locais"
+
 #. 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:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Palabra do D�a de Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Citas do D�a"
 
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Engadir fonte de novas"
 
-#: my-evolution/e-summary-preferences.c:953
+#: my-evolution/e-summary-preferences.c:728
 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:957
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Nome:"
 
-#: my-evolution/e-summary-preferences.c:1503
-msgid "Summary Settings"
-msgstr "Preferencias do Resumo"
-
-#: 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
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Erro descargando o RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:528
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr "Fonte de Novas"
 
-#: my-evolution/e-summary-tasks.c:248
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
+msgstr "Todas"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "_Engadir"
+
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr "_Eliminar"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Chuvieira"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Non hai tarefas"
 
-#: my-evolution/e-summary-tasks.c:287
+#: my-evolution/e-summary-tasks.c:291
 #, fuzzy
 msgid "(No Description)"
 msgstr "Descrici�n:"
@@ -10376,23 +23859,25 @@ msgstr "Descrici�n:"
 msgid "My Weather"
 msgstr "O Meu Tempo"
 
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr "<dd><b>Non se puido contactar co servidor de tempo</b></dd>"
+#: my-evolution/e-summary-weather.c:279
+#, fuzzy
+msgid "There was an error downloading data for"
+msgstr "Houbo un erro ao descarga-la fonte de novas"
 
-#: my-evolution/e-summary-weather.c:559
+#: my-evolution/e-summary-weather.c:501
 msgid "Weather"
 msgstr "Tempo"
 
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr "Rexi�ns"
-
 #: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e de %B de %Y"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:488
+#, fuzzy
+msgid "Please wait..."
+msgstr "Agarde, por favor"
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimir Resumo"
 
@@ -10400,42 +23885,10 @@ msgstr "Imprimir Resumo"
 msgid "Printing of Summary failed"
 msgstr "A impresi�n do Resumo fallou"
 
-#: my-evolution/main.c:66
+#: my-evolution/main.c:65
 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
-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 "polHg"
-
-#: 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 "quil�metros"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Ceo limpo"
@@ -10834,11 +24287,6 @@ msgstr "Boli�as de xeo cambiantes"
 msgid "Freezing ice pellets"
 msgstr "Boli�as de xeo conxelantes"
 
-#. HAIL
-#: my-evolution/metar.c:217
-msgid "Hail"
-msgstr "Pedrisco"
-
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "Pedrisco nas proximidades"
@@ -11598,153 +25046,126 @@ msgid "Drifting dust whirls"
 msgstr "Remu��os de po cambiantes"
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr "_Eliminar"
-
-#: my-evolution/my-evolution.glade.h:2
 #, fuzzy
 msgid "Add n_ews feed"
 msgstr "_Engadir nova fonte"
 
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "T�da_las estaci�ns:"
-
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "T�dolos carta_foles:"
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "T�dalas _fontes de novas:"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 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:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr "M�_ximo n�mero de elementos a amosar:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr "Configuraci�n da Fonte de Novas"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr "Un m_es"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr "Unha sema_na"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "R_efresh time (seconds):"
 msgstr "_Tempo de refresco (segundos):"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr "_Tempo de refresco (segundos):"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "Amo_sa-las rutas completas dos cartafoles"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr "_Amosar t�dalas tarefas"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _today's tasks"
 msgstr "Amosa-las _tarefas de hoxe"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "Tarefas "
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr "Configuraci�n do tempo"
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "_Amosar cartafoles:"
-
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "_Amosar estaci�ns:"
-
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
-msgstr "Fontes _amosadas:"
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr "_Cinco d�as"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr "_Correo"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 msgid "_News Feeds"
 msgstr "Fontes de _Novas"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr "_Un d�a"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr "_Programar"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr "_Tempo"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Cartafoles Especiais"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "O shell de Evolution."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Amosa-los Detalles"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Cancelar Operaci�n"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Entrada"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Sa�da"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Cartafoles Locais"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instalaci�n de 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"
@@ -11752,16 +25173,16 @@ msgstr ""
 "Esta nova versi�n de Evolution necesita instalar ficheiros\n"
 "adicionais no seu directorio persoal de Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Prema \"Aceptar\" para instalar os ficheiros, ou \"Cancelar\" para sa�r."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11772,7 +25193,7 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11781,7 +25202,33 @@ msgstr ""
 "Ocorreu un erro ao copiar ficheiros a\n"
 "`%s'."
 
-#: shell/e-setup.c:281
+#: shell/e-setup.c:282
+#, fuzzy, c-format
+msgid ""
+"Evolution could not create directory\n"
+"%s:\n"
+"%s"
+msgstr ""
+"Non foi posible crear o directorio %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:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11792,7 +25239,7 @@ msgstr ""
 "M�vao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:295
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11805,7 +25252,7 @@ msgstr ""
 "eliminar antes de executar Evolution.\n"
 "�Quere eliminar este directorio?"
 
-#: shell/e-setup.c:320
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11816,50 +25263,53 @@ msgstr ""
 "directorio de Evolution. M�vao para poder\n"
 "instalar os ficheiros de usuario de Evolution."
 
-#: shell/e-shell-about-box.c:40
-#, fuzzy
-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."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Non � posible obter o cartafol: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Non se pode mover un cartafol a si mesmo."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Non se pode copiar un cartafol a si mesmo."
 
-#: 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 "Non se pode mover un cartafol a un dos seus descendentes"
 
-#: 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 "Indique un cartafol no que copia-lo cartafol \"%s\":"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Copiar cartafol"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Mover cartafol"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11868,18 +25318,18 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Eliminar"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: shell/e-shell-folder-commands.c:425
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "�Est� seguro de que quere borrar o cartafol '%s'?"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:502
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11888,23 +25338,23 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:549
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:556
 #, fuzzy
 msgid "Rename folder"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:148
+#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "O nome de cartafol indicado non � v�lido: %s"
 
-#: 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"
@@ -11913,7 +25363,7 @@ msgstr ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:267
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear un novo cartafol"
 
@@ -11925,11 +25375,11 @@ msgstr ""
 "O tipo do cartafol seleccionado non � v�lido para\n"
 "a operaci�n solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:359
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nova..."
 
-#: 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 "(Sen_t�tulo)"
 
@@ -11951,7 +25401,7 @@ msgstr ""
 "Pode seleccionar \"Autom�tico\" se non o sabe, e Evolution tentar� "
 "averigualo."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
+#: 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 ""
 
@@ -11977,16 +25427,22 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:397
+#: shell/e-shell-importer.c:409
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "O cartafol `%s' non existe."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: shell/e-shell-importer.c:420
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:424
+#: shell/e-shell-importer.c:435
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11995,11 +25451,11 @@ msgstr ""
 "Non hai importador capaz de manexar\n"
 "%s"
 
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:445
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:453
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -12008,17 +25464,17 @@ msgstr ""
 "Importando %s.\n"
 "Comezando %s"
 
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:466
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:485
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao cargar %s"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:502
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12027,32 +25483,32 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:572
 msgid "Automatic"
 msgstr "Autom�tico"
 
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:623
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:617
+#: shell/e-shell-importer.c:628
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:638
 msgid "File type:"
 msgstr "Tipo de ficheiro:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:663
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:667
 #, fuzzy
 msgid "Import a single file"
 msgstr "Importar un formato de ficheiro externo"
 
-#: 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
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -12060,24 +25516,24 @@ msgstr ""
 "Agarde...\n"
 "Buscando configuraci�ns existentes"
 
-#: 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
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: 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
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1014
+#: shell/e-shell-importer.c:1027
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1028
 msgid "Select a destination folder for importing this data"
 msgstr "Escolla un cartafol de destino para importar estes datos"
 
-#: shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importar"
 
@@ -12101,6 +25557,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Novo"
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr "Non se especificou un nome de cartafol"
@@ -12118,93 +25580,92 @@ 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:165
+#: shell/e-shell-view-menu.c:168
 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:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Acerca de Evolution..."
 
-#: shell/e-shell-view-menu.c:409
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Ir � cartafol..."
 
-#: shell/e-shell-view-menu.c:410
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Seleccione o cartafol a abrir"
 
-#: shell/e-shell-view-menu.c:530
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Crear un novo atallo"
 
-#: shell/e-shell-view-menu.c:531
+#: shell/e-shell-view-menu.c:566
 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:562
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:570
-#, fuzzy, c-format
-msgid "Error executing %s."
-msgstr "Erro ao executar o filtro: %s: %s"
-
-#: shell/e-shell-view-menu.c:672
+#: shell/e-shell-view-menu.c:732
 #, fuzzy
 msgid "_Work Online"
 msgstr "Traballar Conectado"
 
-#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
-#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Ning�n cartafol visualizado)"
 
-#: shell/e-shell-view.c:1574
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1576
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(Nada)"
 
-#: shell/e-shell-view.c:1623
+#: shell/e-shell-view.c:1867
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Evolucion est� conectado. Prema neste bot�n para desconectar."
 
-#: shell/e-shell-view.c:1630
+#: shell/e-shell-view.c:1874
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution est� desconect�ndose"
 
-#: shell/e-shell-view.c:1636
+#: shell/e-shell-view.c:1880
 #, fuzzy
 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:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o armacenamento local -- %s"
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12212,19 +25673,23 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Aceptar"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Argumentos non v�lidos"
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Non se atopou a Base de Datos de configuraci�ns"
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Erro xen�rico"
 
@@ -12341,76 +25806,71 @@ msgstr "Eli_minar"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Erro ao gardar os atallos."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Atallos"
 
-#: shell/e-storage-set-view.c:658
-#, fuzzy, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Entrada"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Sen nome)"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Sen erros"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Xa existe un cartafol co mesmo nome"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "O tipo do cartafol indicado non � v�lido"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear o cartafol"
 
-#: 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:499
 msgid "The specified folder was not found"
 msgstr "Non se atopou o cartafol indicado"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funci�n non implementada neste medio de armacenamento"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Operaci�n non soportada"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non est� soportado neste almacenamento"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "O cartafol especificado non se pode modificar ou eliminar"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Non se pode converter un cartafol nun fillo dun dos seus descendentes"
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
@@ -12421,106 +25881,114 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<prema aqu� para seleccionar un cartafol>"
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "Erro desco�ecido"
+
+#: 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/evolution-shell-component.c:1045
 #, fuzzy
 msgid "CORBA error"
 msgstr "Erro de E/S"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 #, fuzzy
 msgid "Invalid argument"
 msgstr "Argumentos non v�lidos"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 #, fuzzy
 msgid "No owner"
 msgstr "Nada"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 #, fuzzy
 msgid "Not found"
 msgstr "Tarxeta non atopada"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Dete_ctar tipos soportados "
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "O usuario cancelou a operaci�n."
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 #, fuzzy
 msgid "Internal error"
 msgstr "Outro erro"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 #, fuzzy
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Non v�lido"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Non existe o cartafol %s"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 #, fuzzy
 msgid "No space left"
 msgstr "Ningunha Mensaxe Seleccionada"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:124
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr "Erro desco�ecido"
-
-#: 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/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "Tipo de ficheiro:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -12644,297 +26112,277 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar datos dos seguintes ficheiros:"
 
 #: shell/main.c:89
+msgid "Evolution"
+msgstr "Evolution"
+
+#: shell/main.c:95
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "_Fiestra de Evolution"
 
-#: shell/main.c:210
+#: shell/main.c:227
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Non se pode acceder ao shell de Evolution."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Non se pode inicializar o shell de Evolution: %s"
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Desactivar a pantalla inicial"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Comezando a importaci�n"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Iniciando os Importadores Intelixentes"
+
+#: shell/main.c:320
 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:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compo�entes de Bonobo."
 
+#: 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 "Erro ao cargar o ficheiro: %s"
 
-#: tools/evolution-addressbook-export.c:46
-#, fuzzy
-msgid "Output File"
-msgstr "Abrir ficheiro"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "Inserir Ficheiro"
 
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Abrir ficheiro"
+
 #: tools/evolution-addressbook-import.c:80
 #, fuzzy
 msgid "No filename provided."
 msgstr "Non se especificou un nome de cartafol"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Copiar"
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: 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 "Copiar a selecci�n"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "_Copiar a un Cartafol..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Crear un novo contacto"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Crear unha nova lista de contactos"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "Cortar"
-
-#: 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 "Cortar a selecci�n"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "Elimina-los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Nova Lista"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Pegar"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "_Mover � Cartafol.."
 
-#: 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 "Pegar o contido do portarretallos"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Previsualiza os contactos que se han imprimir"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Imprimi-los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Garda-los contactos seleccionados coma unha VCard."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Seleccionar Todo"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Seleccionar t�dolos contactos"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "Enviar unha _Mensaxe ao Contacto..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Enviar unha mensaxe aos contactos seleccionados."
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Enviar mensaxe a un contacto"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Envia-los contactos seleccionados a outra persoa."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Parar a Carga"
 
-#: 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 "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: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-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
 msgid "_Actions"
 msgstr "_Acci�ns"
 
-#: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr "_Fontes do Libro de Enderezos..."
-
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr "_Contacto"
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "Lista de _Contactos"
 
-#: 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 "_Remitir Contacto..."
 
-#: 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 "_Imprimir..."
-
 #: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "_Mover � Cartafol.."
+
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "_Gardar coma VCard"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_Buscar Contactos"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Seleccionar Todo"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Configura-la axenda"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "Enviar unha _Mensaxe ao Contacto..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Crear un Novo _Evento de Todo o D�a"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a New _Task"
-msgstr "Crear unha Nova _Tarefa"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Crear unha _Nova Cita"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "Crear un evento para todo o d�a"
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "D�a"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Borrar esta cita"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Ir A"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Atr�s"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Adiante"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Ir � _Data"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Ir � data especificada"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Ir � d�a de hoxe"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Nova Cita"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr "Nova Tarefa"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
-#: 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 "Pre_visualizaci�n da Impresi�n"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Imprimir esta axenda"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicar informaci�n de Libre/Ocupado para esta axenda"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Amosar un d�a"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Amosar un mes"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Amosar unha semana"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Amosar a semana laboral"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "_Cita..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Preferencias da Axenda..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "_Publicar Informaci�n de Libre/Ocupado"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "_Tarefa..."
-
 #: 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
@@ -12964,18 +26412,18 @@ msgstr "Previsualizar o elemento imprimido"
 msgid "Print this item"
 msgstr "Imprimir este elemento"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Imprimir..."
-
-#: 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 "Gardar"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Gardar Como..."
+
 #: 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 "Gardar e Pechar"
 
@@ -12991,8 +26439,8 @@ msgstr "Gravar este elemento no disco"
 #: 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:40
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -13001,7 +26449,7 @@ msgid "Print En_velope..."
 msgstr "Imprimir So_bre..."
 
 #: 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 "Gardar _Como..."
@@ -13010,10 +26458,14 @@ msgstr "Gardar _Como..."
 msgid "Save the contact and close the dialog box"
 msgstr "Gardar o contacto e pechar a caixa de di�logo"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "Enviar unha _Mensaxe ao Contacto..."
+
 #: 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 "_Gardar"
 
@@ -13073,6 +26525,10 @@ 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"
@@ -13082,83 +26538,55 @@ msgid "Compose _New Message"
 msgstr "Redactar unha _Nova Mensaxe"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Crear ou editar contas de correo e outras preferencias"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear ou editar regras para filtrar correo novo"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Crear ou editar as definici�ns de cartafoles virtuais"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Baleirar _Lixo"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Esquecer _Contrasinais"
 
-#: 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 "Esquecer t�dalas claves, de maneira que se lle volven pedir."
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Nova Mensaxe"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha fiestra para compo�er unha mensaxe de correo"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 "Eliminar t�dalas mensaxes borradas en t�dolos cartafoles de xeito permanente"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "Enviar / Recibir"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Enviar o correo na cola e recibir o correo novo"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Amosar a fiestra de previsualizaci�n da mensaxe"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subcribirse ou desuscribirse dos cartafoles en servidores remotos"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de Cartafoles Virtuais..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filtros..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "Enviar _Mensaxe"
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "_Preferencias de Correo..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Panel de Previsualizaci�n"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "_Enviar / Recibir"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "Subscribirse a Cartafoles..."
 
@@ -13253,11 +26681,11 @@ msgstr "Agochar temporalmente as mensaxes seleccionadas"
 msgid "Threaded Message list"
 msgstr "Lista de Mensaxes por F�os"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_Limpar"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Cartafol"
 
@@ -13274,213 +26702,230 @@ msgid "_Threaded Message List"
 msgstr "Lis_ta de Mensaxes por F�os"
 
 #: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Engadir o Autor ao Libro de Enderezos"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Aplicar Filtros"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Engadir o Autor ao Libro de Enderezos"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplica-las regras de filtrado �s mensaxes seleccionadas"
 
-#: 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 ""
 "Redactar unha resposta para t�dolos destinatarios da mensaxe seleccionada"
 
-#: 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 "Compo�er unha resposta � lista de correo da mensaxe seleccionada"
 
-#: 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 "Redactar unha resposta para o autor da mensaxe seleccionada"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Crear Cartafol _Virtual Dende Mensaxe"
 
-#: 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 "Crear unha regra para filtrar mensaxes deste autor"
 
-#: 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 "Crear unha regra para filtrar mensaxes a estes destinatarios"
 
-#: 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 "Crear unha regra para filtrar mensaxes a esta lista de correo"
 
-#: 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 "Crear unha regra para filtrar mensaxes con este asunto"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Crear un cartafol virtual para estes destinatarios"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Crear un cartafol virtual para esta lista de correo"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Crear un cartafol virtual para este autor"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Crear un cartafol virtual para este asunto"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Amosa-la seguinte mensaxe importante"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Amosa-la seguinte mensaxe"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Amosa-la seguinte mensaxe sen ler"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Amosar o seguinte f�o sen ler"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Amosar a anterior mensaxe importante"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Amosa-la mensaxe anterior"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Amosar a anterior mensaxe sen ler"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Remitir"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar pola _Lista de Correo..."
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filtrar polo A_utor..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filtrar polos _Destinatarios..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filtrar polo A_sunto..."
 
-#: ui/evolution-mail-message.xml.h:29
-msgid "Force images in HTML mail to be loaded"
-msgstr "Forzar a carga das imaxes nas mensaxes HTML"
-
-#: ui/evolution-mail-message.xml.h:30
-msgid "Forward"
-msgstr "Remitir"
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward As"
-msgstr "Remitir Coma"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward _Attached"
-msgstr "Remitir _Anexo"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Inline"
-msgstr "Remitir _Inline"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Marcar as mensaxes seleccionadas para borralas"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Quoted"
-msgstr "Remitir _Citado"
+msgid "Follow _Up..."
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr "Forzar a carga das imaxes nas mensaxes HTML"
+
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Remiti-lo correo seleccionado no corpo dunha nova mensaxe"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Remiti-lo correo seleccionado citado coma unha resposta"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Remiti-lo correo seleccionado a algu�n"
 
-#: 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 "Remiti-lo correo seleccionado a algu�n coma un anexo"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Increase the text size"
 msgstr "Inserir ficheiro de texto..."
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Cargar _Imaxes"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Marcar como I_mportante"
 
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Marcar como _Non Lida"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Marcar como Non Imp_ortante"
 
-#: 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 "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: 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 "Marcar as mensaxes seleccionadas coma importante"
 
-#: 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 "Marcar as mensaxes seleccionadas como se non foran lidas"
 
-#: 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 "Marcar as mensaxes seleccionadas coma non importantes"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para borralas"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Mover"
 
-#: 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 "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Seguinte"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "Seguinte Mensaxe Importante"
-
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
-msgstr "Seguinte Mensaxe"
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "Seguinte Mensaxe Importante"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Seguinte F�o"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Seguinte Mensaxe Sen Ler"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -13496,160 +26941,188 @@ msgid "Original Si_ze"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:61
-msgid "Preview the message to be printed"
-msgstr "Previsualizar a mensaxe que se vai imprimir"
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Anterior Mensaxe Sen Ler"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "Anterior"
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Anterior Mensaxe Importante"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "Anterior Mensaxe Importante"
+msgid "Preview the message to be printed"
+msgstr "Previsualizar a mensaxe que se vai imprimir"
 
 #: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "Anterior Mensaxe"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "Anterior Mensaxe Sen Ler"
+msgid "Previous"
+msgstr "Anterior"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "Responder"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Re_direct"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "Responder a Todos"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Remiti-lo correo seleccionado a algu�n"
 
-#: 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-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "Buscar M_ensaxe..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "Gardar a mensaxe coma un ficheiro de texto"
 
-#: 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 "Buscar texto no corpo da mensaxe amosada"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "Configurar as opci�ns de p�xina para a impresora actual"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "Amosar o C�digo _Fonte da Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "Amosa-las _Cabeceiras Completas"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "Amosa-la mensaxe no estilo normal"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "Amosa-la mensaxe con t�dalas cabeceiras"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "Amosa-lo c�digo fonte sen procesar da mensaxe"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "CartafolV pola _Lista de Correo"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "CartafolV polo Au_tor"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "CartafolV polos _Destinatarios"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "CartafolV polo A_sunto"
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
-msgstr "_Aplicar Filtros"
-
 #: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Attached"
+msgstr "Anexar"
+
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "_Copiar � Cartafol"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "_Crear Filtro Dende Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "_Remitir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Ir A"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "Inline"
+
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Larger"
 msgstr "Buscapersoas"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "Visualizaci�n das _Mensaxes"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Mover � Cartafol"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Seguinte Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "Visualizaci�n _Normal"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_Abrir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Anterior Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Citado"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_Ferramentas"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Recuperar"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Pechar esta fiestra"
 
 #: 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:36
 msgid "_Close"
 msgstr "_Pechar"
 
 #: 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:56
 msgid "_View"
 msgstr "_Vista"
 
@@ -13673,12 +27146,12 @@ msgstr "Cifrar esta mensaxe con PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Cifrar esta mensaxe co seu Certificado de Cifrado S/MIME"
 
-#: 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 "Formato"
 
-#: 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"
@@ -13695,6 +27168,10 @@ msgstr "Inserir un ficheiro como texto dentro da mensaxe"
 msgid "Insert text file..."
 msgstr "Inserir ficheiro de texto..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Abrir"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Abrir un ficheiro"
@@ -13728,7 +27205,7 @@ msgid "Save in folder..."
 msgstr "Gardar no cartafol..."
 
 #: 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 "Gardar o ficheiro actual"
 
@@ -13753,6 +27230,7 @@ msgid "Send _later"
 msgstr "Enviar m�is _tarde"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Enviar a mensaxe en formato HTML"
 
@@ -13821,7 +27299,7 @@ msgid "_From Field"
 msgstr "Campo _Desde"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -13833,11 +27311,7 @@ msgstr "_Abrir..."
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Seguridade"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -13893,33 +27367,41 @@ msgstr "Obte-la �ltima informaci�n sobre a tarefa"
 msgid "Re_fresh Task"
 msgstr "Re_frescar Tarefa"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Configura-la vista da tarefa"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Copia-la tarefa seleccionada"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Corta-la tarefa seleccionada"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "Borrar a tarefa seleccionada"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Borrar a tarefa seleccionada"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "_Marcar como Completa"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Pegar a tarefa dende o portarretallos"
 
-#: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings..."
-msgstr "Preferencias das Tarefas..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Previsualiza os contactos que se han imprimir"
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
-msgstr "_Tarefa"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Imprimir esta mensaxe"
 
 #: ui/evolution.xml.h:1
 #, fuzzy
@@ -13987,118 +27469,123 @@ msgid "Open this folder in an other window"
 msgstr "Abrir este cartafol noutra fiestra"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Enviar / Recibir"
+
+#: ui/evolution.xml.h:22
+#, 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
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Amosar informaci�n sobre Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Trocar"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Trocar a mostra da barra de cartafoles"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Trocar a mostra da barra de atallos"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Trocar entre traballo conectado e desconectado"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Ver o cartafol seleccionado"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ de Evolution"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Acerca de Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "Barra de _Cartafoles"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_Ir � Cartafol..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Import..."
 msgstr "Importando..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Novo Cartafol"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Enviar / Recibir"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Atallo"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Cambiar as propiedades do resumo"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Imprimir resumo"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Recargar"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Recargar a vista"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "Preferencias do Re_sumo..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Tarxetas de Enderezos"
@@ -14112,18 +27599,27 @@ msgid "Phone List"
 msgstr "Lista de Tel�fonos"
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "Seleccionar Cartafol"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Por Autor"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Por Estado"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Por Asunto"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Mensaxes"
 
@@ -14131,6 +27627,12 @@ msgstr "Mensaxes"
 msgid "With Category"
 msgstr "Coa Categor�a"
 
+#. Check for UTC.
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+msgid "UTC"
+msgstr ""
+
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "Select a Time Zone"
 msgstr "Seleccionar un Fuso Horario"
@@ -14153,11 +27655,22 @@ msgstr ""
 "escoller un fuso horario.\n"
 " Empregue o bot�n dereito para alonxarse."
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "_Vista Actual"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "Personalizar"
+
+#: widgets/menus/gal-view-menus.c:333
+#, fuzzy
+msgid "Save Custom View"
+msgstr "Personalizar"
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "Definir Vistas"
 
@@ -14189,76 +27702,81 @@ msgstr "A data ten que ser introducida no formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, inclusive"
 
-#: widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "B�ltico"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "Europeo Central"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "Chin�s"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr "Cir�lico"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "Grego"
 
-#: 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 "Xapon�s"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Korean"
 msgstr "Coreano"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turco"
 
-#: 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 "Europeo Occidental"
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: 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 "Simplificado"
 
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:92
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "Novo"
+#: widgets/misc/e-charset-picker.c:95
+#, fuzzy
+msgid "Visual"
+msgstr "Alarmas Visuais"
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Xogo de caracteres desco�ecido: %s"
 
-#: widgets/misc/e-charset-picker.c:201
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Introduza o conxunto de caracteres a usar"
 
-#: widgets/misc/e-charset-picker.c:276
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Outro..."
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Codificaci�n dos Caracteres"
 
@@ -14266,25 +27784,23 @@ msgstr "Codificaci�n dos Caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Editor de Buscas"
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Gardar Busca"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Engadir �s Buscas Gardadas"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Limpar"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Gardar Busca"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Ver Todos"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Engadir �s Buscas Gardadas"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -14307,11 +27823,21 @@ msgstr "Mensaxe"
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "Bus_car"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Buscar Agora"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Limpar"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Buscar Agora"
 
@@ -14337,6 +27863,927 @@ msgstr "init_corba(): non foi posible inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 
+#~ msgid "Card: "
+#~ msgstr "Tarxeta: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Nome: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Prefixo:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Entregado:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Adicional: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Familia:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Sufixo:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Data de Nacemento: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Enderezo:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Apdo. de Correos: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ext:         "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  R�a:         "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Cidade:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Rexi�n:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  C�digo Postal: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Pa�s:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Etiqueta de Entrega: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Tel�fonos:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Tel�fono:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Correo Electr�nico:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "Correo Electr�nico:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Fuso Horario: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "Posto Laboral: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "Org: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Nome:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Unidade:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Unidade2: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Unidade3: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Unidade4: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Categor�as: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Comentario: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Cadea Exclusiva: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Clave P�blica: "
+
+#, fuzzy
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Conectando ao servidor..."
+
+#, fuzzy
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Conectando ao servidor..."
+
+#~ msgid "New _Contact"
+#~ msgstr "Novo C_ontacto"
+
+#~ msgid "New Contact _List"
+#~ msgstr "Nova _Lista de Contactos"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Editar o Libro de Enderezos"
+
+#~ msgid "Account Name"
+#~ msgstr "Nome da Conta"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Engadir Libro de Enderezos"
+
+#~ msgid "Server Name"
+#~ msgstr "Nome do Servidor"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr ""
+#~ "A informaci�n de embaixo � necesaria para engadir un libro de enderezos.  "
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ 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."
+#~ 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."
+#~ 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."
+
+#~ 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."
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Este e o porto que usa o servidor ldap."
+
+#~ 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:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Amosar contactos que cumpran os seguintes criterios:"
+
+#~ msgid "_Message Recipients:"
+#~ msgstr "Destinatarios da _Mensaxe:"
+
+#~ msgid "B_usiness"
+#~ msgstr "T_raballo"
+
+#~ msgid "Business _Fax"
+#~ msgstr "_Fax do Traballo"
+
+#~ msgid "_Business"
+#~ msgstr "_Traballo"
+
+#~ msgid "_Home"
+#~ msgstr "_Particular"
+
+#~ 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"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Crear unha nova cita"
+
+#~ msgid "Create a new task"
+#~ msgstr "Crear unha nova tarefa"
+
+#~ msgid "New _Task"
+#~ msgstr "Nova T_arefa"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "_Crear novas citas cun recordatorio por defecto"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "_Primeiro d�a da semana:"
+
+#~ 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"
+
+#~ msgid ""
+#~ "EMail: %s\n"
+#~ "Common Name: %s\n"
+#~ "Organization Unit: %s\n"
+#~ "Organization: %s\n"
+#~ "Locality: %s\n"
+#~ "State: %s\n"
+#~ "Country: %s"
+#~ msgstr ""
+#~ "Enderezo de Correo: %s\n"
+#~ "Nome Com�n: %s\n"
+#~ "Unidade en Organizaci�n: %s\n"
+#~ "Organizaci�n: %s\n"
+#~ "Localidade: %s\n"
+#~ "Estado: %s\n"
+#~ "Pa�s: %s"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Introduza o contrasinal NNTP para %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "O servidor rexeitou o nome de usuario"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Non se puido enviar o nome de usuario ao servidor"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "O servidor rexeitou o nome de usuario/contrasinal"
+
+#~ msgid "Message %s not found."
+#~ msgstr "Mensaxe %s non atopada."
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Non foi posible recibir a lista de grupos do servidor."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Incapaz de cargar o ficheiro grouplist para %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Incapaz de gardar o ficheiro grouplist para %s: %s"
+
+#~ msgid "Could not open directory for news server: %s"
+#~ msgstr "Non foi posible abrir o directorio para o servidor de novas: %s"
+
+#~ msgid "Unable to open or create .newsrc file for %s: %s"
+#~ msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Non foi posible comprobar se hai mensaxes novas no servidor POP: %s"
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr ""
+#~ "Non foi posible abrir o cartafol: o listado de mensaxes era incompleto."
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Non foi posible recoller a mensaxe: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ 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."
+#~ msgstr ""
+#~ "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"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Non foi posible conectarse � servidor: %s."
+
+#~ 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"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "Non se pode enviar a mensaxe: enderezo do autor non definido."
+
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "Erro na resposta RCPT TO: %s: correo non enviado."
+
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "Erro na resposta DATA: %s: correo non enviado"
+
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr "Erro na resposta DATA: remate da mensaxe: %s: correo non enviado"
+
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "Erro na resposta QUIT: %s: non fatal"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Introduza o URI do cartafol"
+
+#~ msgid "Message was received"
+#~ msgstr "Recibiuse a mensaxe"
+
+#~ msgid "Message was sent"
+#~ msgstr "Enviouse a mensaxe"
+
+#~ msgid "on or before"
+#~ msgstr "en ou antes"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Cartafol de armacenamento de correo (interno)"
+
+#, fuzzy
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Non foi posible conectarse � servidor: %s."
+
+#~ msgid "New _Mail Message"
+#~ msgstr "Nova _Mensaxe"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Crear un CartafolV da Busca"
+
+#~ 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."
+
+#~ 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"
+
+#~ msgid "Composer"
+#~ msgstr "Compo�edor"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "O estilo de Remitir por defecto �: "
+
+#~ 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..."
+
+#~ msgid "_Email Address:"
+#~ msgstr "_Enderezo de Correo:"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "_Rexistrar as acci�ns do filtro a:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organizaci�n:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Lembrar este contrasinal"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "_Enviar as mensaxes en formato HTML por defecto."
+
+#, fuzzy
+#~ msgid "_Server Type: "
+#~ msgstr "Tipo de Servidor: "
+
+#~ msgid "_Signature file:"
+#~ msgstr "Ficheiro de _Sinatura:"
+
+#~ msgid "seconds."
+#~ 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"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
+
+#~ msgid "Summary Settings"
+#~ msgstr "Preferencias do Resumo"
+
+#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#~ msgstr "<dd><b>Non se puido contactar co servidor de tempo</b></dd>"
+
+#~ msgid "�F"
+#~ msgstr "�F"
+
+#~ 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)"
+
+#~ msgid "New List"
+#~ msgstr "Nova Lista"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Configura-la axenda"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Crear un Novo _Evento de Todo o D�a"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Crear unha Nova _Tarefa"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Crear unha _Nova Cita"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Crear un evento para todo o d�a"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Cita..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Preferencias da Axenda..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Tarefa..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Crear ou editar contas de correo e outras preferencias"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_Preferencias de Correo..."
+
+#~ msgid "Forward _Attached"
+#~ msgstr "Remitir _Anexo"
+
+#~ msgid "Forward _Inline"
+#~ msgstr "Remitir _Inline"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "Remitir _Citado"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Aplicar Filtros"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Configura-la vista da tarefa"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Preferencias das Tarefas..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Cambiar as propiedades do resumo"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "Preferencias do Re_sumo..."
+
+#~ msgid "Show All"
+#~ msgstr "Ver Todos"
+
+#~ msgid "Sear_ch"
+#~ msgstr "Bus_car"
+
 #~ msgid "I couldn't remove the item from your calendar file!\n"
 #~ msgstr "�Non se puido elimina-lo elemento do seu ficheiro de axenda!\n"
 
@@ -14460,17 +28907,9 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Volcanic ash w/ thunders"
 #~ msgstr "Cinza volc�nica con tronos"
 
-#, fuzzy
-#~ msgid "M_etric"
-#~ msgstr "m_�tricas"
-
 #~ msgid "Units: "
 #~ msgstr "Unidades: "
 
-#, fuzzy
-#~ msgid "_Imperial"
-#~ msgstr "_imperiais"
-
 #~ msgid "Folder cannot contain the directory separator."
 #~ msgstr "O nome do cartafol non pode conte-lo separador de directorios."
 
@@ -14478,10 +28917,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgstr "Non se pode inicializar a interface do Mago do Correo de Evolution."
 
 #, fuzzy
-#~ msgid "Ximian Evolution"
-#~ msgstr "Evolution"
-
-#, fuzzy
 #~ msgid ""
 #~ "Ximian Evolution is a suite of groupware applications\n"
 #~ "for mail, calendaring, and contact management\n"
@@ -14541,18 +28976,12 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "Introduza o seu enderezo de correo e contrasinal de acceso a %s"
 
-#~ msgid "LDAP Authentication"
-#~ msgstr "Autenticaci�n LDAP"
-
 #~ msgid "Password:"
 #~ msgstr "Contrasinal:"
 
 #~ msgid "Sent By:"
 #~ msgstr "Enviada Por:"
 
-#~ msgid "Couldn't create temporary mbox `%s': %s"
-#~ msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
-
 #~ msgid ""
 #~ "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 #~ "This probably means that the %s component has crashed."
@@ -14560,16 +28989,10 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ "Ooops!  As vistas de `%s' morreron inesperadamente.  :-(\n"
 #~ "Isto significa probablemente que o compo�ente %s se estragou."
 
-#~ msgid "Factory for the Evolution addressbook component."
-#~ msgstr "F�brica para o compo�ente Libro de Enderezos de Evolution."
-
 #~ msgid "Unable to get local storage.  This should never happen."
 #~ msgstr ""
 #~ "Non foi posible obter armacenamento local. Isto nunca debeu ter pasado."
 
-#~ msgid "123"
-#~ msgstr "123"
-
 #~ msgid "a"
 #~ msgstr "a"
 
@@ -14651,21 +29074,15 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Done."
 #~ msgstr "Feito."
 
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "F�brica para o compo�ente da axenda de Evolution."
-
 #~ msgid "Reminder of your appointment at "
 #~ msgstr "Recordatorio da cita en "
 
 #~ msgid "Snooze"
 #~ msgstr "Adiar"
 
-#~ msgid "Ok"
-#~ msgstr "Aceptar"
-
 #~ 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."
 
@@ -14735,9 +29152,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Elm mail"
 #~ msgstr "Correo de Elm"
 
-#~ msgid "Pine mail"
-#~ msgstr "Correo de Pine"
-
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Mensaxe remitida:\n"
 
@@ -14762,18 +29176,12 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Synchronizing '%s'"
 #~ msgstr "Sincronizando '%s'"
 
-#~ msgid "Factory for the Evolution executive summary component."
-#~ msgstr "F�brica para o compo�ente de Resume Executivo de Evolution."
-
 #~ msgid "%l:%M%p"
 #~ msgstr "%l:%M%p"
 
 #~ msgid "%a %l:%M%p"
 #~ msgstr "%a %k:%M"
 
-#~ msgid "There was an error downloading news feed"
-#~ msgstr "Houbo un erro ao descarga-la fonte de novas"
-
 #~ msgid "_Refresh time (seconds):"
 #~ msgstr "Tempo de _refresco (segundos):"
 
@@ -14783,9 +29191,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Rename"
 #~ msgstr "Renomear"
 
-#~ msgid "_Debug"
-#~ msgstr "_Depuraci�n"
-
 #~ msgid "_Import File..."
 #~ msgstr "_Importar Ficheiro..."
 
@@ -14802,9 +29207,8 @@ 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 "
@@ -14813,9 +29217,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "???"
 #~ msgstr "???"
 
-#~ msgid "C_ontacts..."
-#~ msgstr "C_ontactos..."
-
 #~ msgid "_Company:"
 #~ msgstr "_Compa��a:"
 
@@ -14859,9 +29260,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Unknown auth type"
 #~ msgstr "Tipo de autenticaci�n desco�ecido"
 
-#~ msgid "Subtree"
-#~ msgstr "Sub�rbore"
-
 #~ msgid "Unknown scope type"
 #~ msgstr "Tipo de �mbito desco�ecido"
 
@@ -14893,8 +29291,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."
@@ -14905,9 +29303,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "FIXME Description help text here"
 #~ msgstr "AM��AME Texto de axuda para Descrici�n aqu�"
 
-#~ msgid "Edit"
-#~ msgstr "Editar"
-
 #~ msgid "URI"
 #~ msgstr "URI"
 
@@ -14923,9 +29318,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Transparent"
 #~ msgstr "Transparente"
 
-#~ msgid "Opaque"
-#~ msgstr "Opaco"
-
 #~ msgid ""
 #~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 #~ msgstr ""
@@ -14944,15 +29336,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Beep when alarm windows appear."
 #~ msgstr "Chifrar cando aparece a fiestra de alarma."
 
-#~ msgid "Calendar Preferences"
-#~ msgstr "Preferencias da Axenda"
-
-#~ msgid "Date navigator options"
-#~ msgstr "Opci�ns do navegador de datas"
-
-#~ msgid "Defaults"
-#~ msgstr "Opci�ns por defecto"
-
 #~ msgid "Enable snoozing for"
 #~ msgstr "Activa-lo adiamento para"
 
@@ -14977,9 +29360,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Time Until Due"
 #~ msgstr "Tempo Ata o L�mite"
 
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarmas Visuais"
-
 #~ msgid "Work week"
 #~ msgstr "Semana laboral"
 
@@ -15041,9 +29421,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ "Publicar\n"
 #~ "Evento"
 
-#~ msgid "All"
-#~ msgstr "Todas"
-
 #~ msgid "Show a dialog"
 #~ msgstr "Amosar un di�logo"
 
@@ -15162,21 +29539,12 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Test bonobo service"
 #~ msgstr "Comprobar servicio bonobo"
 
-#~ msgid "Test service"
-#~ msgstr "Comprobar servicio"
-
 #~ msgid "Update automatically"
 #~ msgstr "Actualizar automaticamente"
 
 #~ msgid "Forward to Address"
 #~ msgstr "Reenviar � Enderezo"
 
-#~ msgid "Store search as vFolder"
-#~ msgstr "Armacenar busca como CartafolV"
-
-#~ msgid "Resend"
-#~ msgstr "Re-enviar"
-
 #~ msgid "Evolution Account Manager"
 #~ msgstr "Xestor de Contas de Evolution"
 
@@ -15217,11 +29585,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"
@@ -15242,15 +29610,9 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgstr ""
 #~ "Prema \"Aceptar\" para instalar os ficheiros de usuario de Evolution en"
 
-#~ msgid "Activate"
-#~ msgstr "Activar"
-
 #~ msgid "Activate this shortcut"
 #~ msgstr "Activar este atallo"
 
-#~ msgid "Find a contact"
-#~ msgstr "Buscar un contacto"
-
 #~ msgid "View All"
 #~ msgstr "Ver Todos"
 
@@ -15260,21 +29622,12 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "5 Days"
 #~ msgstr "5 D�as"
 
-#~ msgid "Alter preferences"
-#~ msgstr "Modifica-las preferencias"
-
 #~ msgid "Create a new calendar"
 #~ msgstr "Crear unha nova axenda"
 
 #~ msgid "Go to present time"
 #~ msgstr "Ir � hora actual"
 
-#~ msgid "New _Event"
-#~ msgstr "Novo _Evento"
-
-#~ msgid "Prev"
-#~ msgstr "Ant"
-
 #~ msgid "Save calendar as something else"
 #~ msgstr "Gardar axenda como outra cousa distinta"
 
@@ -15398,24 +29751,15 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Apply any new filters to the mail in this box"
 #~ msgstr "Aplicar calquera filtro novo ao correo desta caixa"
 
-#~ msgid "Configure Folder..."
-#~ msgstr "_Configurar Cartafol..."
-
 #~ msgid "Copy message to a new folder"
 #~ msgstr "Copiar a mensaxe a un novo cartafol"
 
 #~ msgid "Display all of the message headers"
 #~ msgstr "Amosar todas as cabeceiras da mensaxe"
 
-#~ msgid "Expunge"
-#~ msgstr "Limpar"
-
 #~ msgid "Finaly remove all mails tagged for deletion"
 #~ msgstr "Eliminar definitivamente todas as mensaxes etiquetadas para borrar"
 
-#~ msgid "Forward inline"
-#~ msgstr "Remitir inline"
-
 #~ msgid "Forward this message in-line with your mail, so you can edit it"
 #~ msgstr "Remitir esta mensaxe in-line coa s�a, para poder editala"
 
@@ -15489,9 +29833,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "_Insert text file... (FIXME)"
 #~ msgstr "_Inserir ficheiro de texto... (AM��AME)"
 
-#~ msgid "Redo"
-#~ msgstr "Refacer"
-
 #~ msgid "Redo the undone action"
 #~ msgstr "Refacer a acci�n desfeita"
 
@@ -15537,9 +29878,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Customi_ze Toolbars..."
 #~ msgstr "Personali_zar Barras de Tarefas..."
 
-#~ msgid "Customize"
-#~ msgstr "Personalizar"
-
 #~ msgid "Customize toolbars"
 #~ msgstr "Personaliza-las barras de tarefas"
 
diff --git a/po/hu.po b/po/hu.po
index 69d23f0041..e5267a2fdc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0.1\n"
-"POT-Creation-Date: 2002-01-28 14:39+0100\n"
+"POT-Creation-Date: 2002-05-07 15:46-0400\n"
 "PO-Revision-Date: 2002-01-28 14:43+0100\n"
 "Last-Translator: Andras Timar <timar@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -30,21 +30,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "VCard f�jlok import�l�sa az Evolutionbe."
 
 #: 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 "T�rol�s mint"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "N�v"
 
 #: 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 "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:1731
 msgid "Primary"
 msgstr "Els�dleges"
 
@@ -54,16 +55,16 @@ msgstr "Els�d"
 
 #: 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:994
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asszisztens"
 
 #: 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:1717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
 msgid "Business"
 msgstr "�zleti"
 
@@ -73,12 +74,12 @@ msgid "Bus"
 msgstr "Fogl"
 
 #: 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:1720
 msgid "Callback"
 msgstr "Visszah�v�s"
 
 #: 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:1722
 msgid "Company"
 msgstr "V�llalat"
 
@@ -89,13 +90,13 @@ msgstr "V�ll"
 #: 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:1723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
 msgid "Home"
 msgstr "Otthoni"
 
 #: 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 "Szervezet"
 
@@ -105,19 +106,19 @@ msgstr "Szerv"
 
 #: 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:1727
 msgid "Mobile"
 msgstr "Mobil"
 
 #: 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:1721
 msgid "Car"
 msgstr "Aut�"
 
 #: 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:974
+#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "�zleti fax"
 
@@ -126,13 +127,13 @@ msgid "Bus Fax"
 msgstr "�zl fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:975
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Otthoni fax"
 
 #: 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:1718
 msgid "Business 2"
 msgstr "2. �zleti"
 
@@ -141,69 +142,68 @@ msgid "Bus 2"
 msgstr "2. �zl"
 
 #: 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:1724
 msgid "Home 2"
 msgstr "2. Otthoni"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1654
-#: addressbook/gui/widgets/e-addressbook-view.c:978
+#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: 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:57
+#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "M�s"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Egy�b fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:981
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Szem�lyh�v�"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:982
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "R�di�"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:983
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: 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:984
+#: 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:986
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "2. email"
 
 #: 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:987
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "3. email"
 
 #: 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 "Webhely"
 
@@ -212,7 +212,7 @@ msgid "Url"
 msgstr "URL"
 
 #: 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 "Oszt�ly"
 
@@ -221,7 +221,7 @@ msgid "Dep"
 msgstr "Oszt"
 
 #: 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 "Hivatal"
 
@@ -230,12 +230,12 @@ msgid "Off"
 msgstr "Hiv"
 
 #: 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 "Beoszt�s"
 
 #: 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 "Foglalkoz�s"
 
@@ -244,7 +244,7 @@ msgid "Prof"
 msgstr "Beoszt"
 
 #: 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 "F�n�k"
 
@@ -257,7 +257,7 @@ msgid "Ass"
 msgstr "Assz"
 
 #: 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 "Becen�v"
 
@@ -266,12 +266,12 @@ msgid "Nick"
 msgstr "Bece"
 
 #: 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 "H�zast�rs"
 
 #: 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 "Megjegyz�s"
 
@@ -284,7 +284,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: 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 "Szabad-foglalt URL"
 
@@ -313,302 +313,16 @@ msgstr "Kateg�ri�k"
 msgid "Family Name"
 msgstr "Csal�di n�v"
 
-#: 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 "K�rtya:"
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"N�v:  "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-" El�tag:      "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Adott:      "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Egy�b:      "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Csal�di:    "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Ut�tag:     "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Sz�let�si d�tum: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"C�m:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Postafi�k:   "
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-" K�l:"
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  �t:          "
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  V�ros:       "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  R�gi�:       "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-" Ir�ny�t�sz�m: "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Orsz�g:      "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"K�zbes�t� c�mke: "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefonok:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-mail:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-mail:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Levelez�: "
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Id�z�na: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Hely: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"�zleti szab�ly:"
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"C�g:"
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-" N�v:"
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-" Egys�g:"
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-" 2. egys�g:"
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-" 3. egys�g:"
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-" 4. egys�g:"
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kateg�ri�k:"
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Megjegyz�s:"
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3879
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Egyedi sz�veg:"
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Nyilv�nos kulcs:"
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "T�bb VK�rtya"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VK�rty�ja"
@@ -616,86 +330,89 @@ msgstr "%s VK�rty�ja"
 #: 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:1721
+#: 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: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:171 calendar/gui/main.c:63
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2272
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Keres�s..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Bet�lt�s..."
 
 #. 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 "Hiba a keres�si kifejez�sben."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:486
-msgid "Connecting to LDAP server..."
-msgstr "Kapcsol�d�s az LDAP-kiszolg�l�hoz..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:496
-msgid "Unable to connect to LDAP server."
-msgstr "Nem siker�lt kapcsolatba l�pni az LDAP-kiszolg�l�val."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:512
-msgid "Waiting for connection to LDAP server..."
-msgstr "V�rakoz�s a kapcsol�d�sra az LDAP-kiszolg�l�hoz..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:915
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "N�vjegy hozz�ad�sa az LDAP-kiszolg�l�hoz..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1016
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 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:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 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:2217
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Keres�s �jraind�t�sa."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "LDAP keres�s eredm�nyeinek let�lt�se..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2222
-msgid "Restarting search."
-msgstr "Keres�s �jraind�t�sa."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Hiba a k�rtya t�rl�sekor"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Nem siker�lte �rtelmezni ezt azt URL-t: '%s'"
 
-#: addressbook/conduit/address-conduit.c:426
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "Emailc�m:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "A kurzort nem lehet bet�lteni\n"
 
-#: addressbook/conduit/address-conduit.c:439
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "Az EBook nincs bet�ltve\n"
 
-#: 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 "Nem siker�lt elind�tani a wombat kiszolg�l�t"
 
-#: 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 "Nem siker�lt a wombatot elind�tani"
 
-#: 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 "Nem siker�lt a pilot Address application blokkj�t olvasni"
 
@@ -708,402 +425,854 @@ msgid "A Bonobo control for displaying an address."
 msgstr "Bonobo vez�rl� a c�m megjelen�t�s�hez."
 
 #: 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 "Minta Bonobo vez�rl�, amely a c�mjegyz�ket jelen�ti meg."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Addressbook Settings"
+msgstr "C�mjegyz�k forr�sai"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Addressbook Storages."
+msgstr "Factory az Evolution c�mjegyz�k komponens�hez."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#, fuzzy
+msgid "Configuration control for the Evolution Addressbook."
+msgstr "Az Evolution tennival� csatorna be�ll�t� eszk�ze.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Evolution c�mjegyz�k minik�rty�j�t megjelen�t� control."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#, fuzzy
+msgid "Directory Servers"
+msgstr "H�rcsoport-szerverek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution c�mjegyz�k minik�rtya-n�z�ke"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Evolution komponens a n�vjegyek kezel�s�hez."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Factory a c�mjegyz�k minik�rtya kontrollj�hoz"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Factory a c�mjegyz�k c�mmegjelen�t�j�hez"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the Addressbook's address popup"
 msgstr "Factory a C�mjegyz�k el�ugr� c�meihez"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#, fuzzy
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr "Factory az Evolution c�mjegyz�k komponens�hez."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory a minta c�mjegyz�k kontrollhoz"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "N�vjegyek"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "N�vjegyeket tartalmaz� mappa"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP kiszolg�l�"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "N�vjegyeket tartalmaz� LDAP-kiszolg�l�"
 
-#: addressbook/gui/component/addressbook-component.c:527
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "�j n�vjegy"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New _Contact"
-msgstr "�_j n�vjegy"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_N�vjegyek"
 
-#: addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "�j c�mlista"
 
-#: addressbook/gui/component/addressbook-component.c:530
-msgid "New Contact _List"
-msgstr "�j _c�mlista"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "_C�mlista"
+
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+msgid "Could not initialize gnome-vfs"
+msgstr "A gnome-vfs inicializ�l�sa nem siker�lt"
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr "Nem siker�lt megnyitni a c�mjegyz�ket"
+
+#: 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 ""
+"Nem siker�lt megnyitni ezt a c�mjegyz�ket. Ez vagy azt \n"
+"jelenti, hogy helytelen URI-t adt�l meg, vagy az LDAP\n"
+"kiszolg�l� nem m�k�dik."
+
+#: 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"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Ez az Evolution-v�ltozat nem t�mogatja az LDAP-t, mert nem\n"
+"ford�tott�k bele. Ha szeretn�l LDAP-t haszn�lni az Evolutionben,\n"
+"a CVS forr�sb�l kell leford�tanod a programot, miut�n let�lt�tted\n"
+"az OpenLDAP-t az al�bbi helyr�l.\n"
+
+#: 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."
+msgstr ""
+"Nem siker�lt megnyitni a c�mjegyz�ket. Ellen�rizd, hogy az �tvonal\n"
+"l�tezik-e �s van-e jogod az el�r�s�hez."
+
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "�rd be %s jelszav�t (%s felhaszn�l�)"
+
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "v�gz�dik"
+
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "2. email"
+
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "Kateg�ria"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "B�rmely mez� tartalmazza"
+
+#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+msgid "Advanced..."
+msgstr "Halad�..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
+msgstr "B�rmelyik kateg�ria"
+
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
+msgstr "Az URI amit a Mappab�ng�sz� meg fog nyitni"
+
+#: 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
+msgid "Primary Email"
+msgstr "Els�dleges email"
+
+#: addressbook/gui/component/e-address-popup.c:587
+msgid "Select an Action"
+msgstr "V�lassz egy m�veletet"
+
+#: addressbook/gui/component/e-address-popup.c:593
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "�j n�vjegy k�sz�t�se: %s"
+
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "C�m hozz�ad�sa a l�tez� %s n�vjegyjez"
+
+#: addressbook/gui/component/e-address-popup.c:891
+msgid "Querying Addressbook..."
+msgstr "A c�mjegyz�k lek�rdez�se..."
+
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
+msgstr "N�vjegy adatainak szerkeszt�se"
+
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+msgid "Add to Contacts"
+msgstr "Hozz�ad�s a n�vjegyalbumhoz"
+
+#: addressbook/gui/component/e-address-popup.c:1046
+msgid "Merge E-Mail Address"
+msgstr "Email c�m �sszef�s�l�se"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
+msgstr "Lek�rdez�sek tilt�sa"
+
+#: addressbook/gui/component/e-address-widget.c:364
+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:215
+#, 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: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 ""
+"�rv�nytelen �tl�tszatlan nyomk�vet�si inform�ci�:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1169
+#, 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:1613
+#, 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-config.c:1689
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Befejez�s d�tuma"
+
+#: addressbook/gui/component/ldap-config.glade.h:1
+#, fuzzy
+msgid "  S_how Supported Bases "
+msgstr "_T�mogatott t�pusok lek�rdez�se"
+
+#: addressbook/gui/component/ldap-config.glade.h:2
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Be�ll�t�sok"
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "<- _Remove"
+msgstr " _T�rl�s"
 
-#: addressbook/gui/component/addressbook-config.c:223
-msgid "Edit Addressbook"
-msgstr "C�mjegyz�k szerkeszt�se"
+#: addressbook/gui/component/ldap-config.glade.h:4
+#, fuzzy
+msgid "1234"
+msgstr "123"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "100"
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#, fuzzy
-msgid "A_uthenticate with server using:"
-msgstr "Hiteles�t�s sz�ks�ges"
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Postafi�k neve"
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "C�mjegyz�k hozz�ad�sa"
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "C�mjegyz�k forr�sai"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Halad�"
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "�breszt�k"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Alap"
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonymous"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Egyszer�"
+#: 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/addressbook-config.glade.h:10
+#: 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 "Check this if the server requires you to authenticate."
-msgstr "A kiszolg�l� megk�veteli a _hiteles�t�st"
+msgid "Connecting"
+msgstr "Connecticut"
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: 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 "Nincs inform�ci�"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "De_lete"
 msgstr "_T�rl�s"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Listan�v:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "Emailc�m"
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "Emailc�m:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
+msgid "Evolution Attribute"
+msgstr "Evolution �breszt�"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Az Evolution ezt az emailc�met haszn�lja majd a hiteles�t�shez a kiszolg�l�n"
 
-#: 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 ""
 "Az Evolution ezt az emailc�met haszn�lja majd a hiteles�t�shez a kiszolg�l�n"
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "K_eres�s:"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Alap"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+#, fuzzy
+msgid "LDAP Attribute"
+msgstr "LDAP hiteles�t�s:"
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Be�ll�t�sok"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Marg�k"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_minden"
+
+#: 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 "_Objektum"
+
+#: 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 "Egy"
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "Keres�s _kiindul�pontja:"
+#: 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 "Alap�rtelmezett"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Alap�rtelmezett"
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
 msgstr "Keres�s _hat�k�re:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Kiszolg�l� neve:"
+#. 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 "Keres�s"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Mindet kijel�li"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "T�r�lt"
+
+#: 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 "Forr�sinform�ci�"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Kapcsol�d�s a kiszolg�l�hoz..."
+
+#: 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 "�breszt� ki�r�s�n�l csipogj"
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Sub"
 msgstr "Al"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Az al�bbi adatok sz�ks�gesek a c�mjegyz�k hozz�ad�s�hoz."
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Keres�s t�rol�sa VMappak�nt"
+
+#: 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/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "Ez az adat nem sz�ks�ges a legt�bb LDAP-kiszolg�l�hoz."
+#: 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/addressbook-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:81
 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 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 ""
-"Ezt az adatot az LDAP-kiszolg�l� haszn�lja arra, hogy meghat�rozza a keres�s "
-"sor�n felhaszn�land� csom�pontokat. Tov�bbi indform�ci��rt keresd fel a "
-"rendszergazd�t."
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"This is the full name of your ldap server. For example, "
+"\"ldap.mycompany.com\"."
 msgstr ""
-"Ez az alapcsom�pont, amelyb�l minden keres�s kiindul az LDAP-kiszolg�l�n. "
-"Tov�bbi inform�ci��rt keresd fel a rendszergazd�t."
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of cards to download.  Setting this number too "
-"large will slow down this addressbook."
+"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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Ez annak a kiszolg�l�nak a neve, ahol a c�mjegyz�ked elhelyezkedik."
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "Ez az a port, amelyet az LDAP-kiszolg�l�d haszn�l."
-
-#: addressbook/gui/component/addressbook-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:91
+#, fuzzy
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
+"It is for display purposes only. "
 msgstr ""
 "Ez a n�v a postafi�k azonos�t�s�ra szolg�l. Csak a megjelen�t�sben van "
 "szerepe."
 
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "_Postafi�k neve:"
+#: 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 "Emailc�m"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+msgid "Whenever Possible"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:31
+#: 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:99 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:139
 msgid "_Add"
 msgstr "Hozz�_ad�s"
 
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "Hozz�ad�s ->"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "M�velet hozz�ad�sa"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "M�velet hozz�ad�sa"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "�breszt�k"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Mindet t�rli"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Megjelen�t�s"
+
+#: 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/addressbook-config.glade.h:33
-msgid "_Download Limit"
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: 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
+#: 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:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "S_zerkeszt�s"
 
-#: addressbook/gui/component/addressbook-config.glade.h:35
-msgid "_Email address:"
-msgstr "_Emailc�m:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Port:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "_Kiszolg�l� neve:"
-
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-msgid "Could not initialize gnome-vfs"
-msgstr "A gnome-vfs inicializ�l�sa nem siker�lt"
-
-#: addressbook/gui/component/addressbook-storage.c:168
-msgid "Other Contacts"
-msgstr "Egy�b c�mt�rak"
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Tal�lkoz� szerkeszt�se"
 
-#: addressbook/gui/component/addressbook.c:499
-msgid "Unable to open addressbook"
-msgstr "Nem siker�lt megnyitni a c�mjegyz�ket"
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution �breszt�"
 
-#: addressbook/gui/component/addressbook.c:508
-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"
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
 msgstr ""
-"Nem siker�lt megnyitni ezt a c�mjegyz�ket. Ez vagy azt \n"
-"jelenti, hogy helytelen URI-t adt�l meg, vagy az LDAP\n"
-"kiszolg�l� nem m�k�dik."
 
-#: addressbook/gui/component/addressbook.c:513
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
 msgstr ""
-"Ez az Evolution-v�ltozat nem t�mogatja az LDAP-t, mert nem\n"
-"ford�tott�k bele. Ha szeretn�l LDAP-t haszn�lni az Evolutionben,\n"
-"a CVS forr�sb�l kell leford�tanod a programot, miut�n let�lt�tted\n"
-"az OpenLDAP-t az al�bbi helyr�l.\n"
 
-#: addressbook/gui/component/addressbook.c:521
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
 msgstr ""
-"Nem siker�lt megnyitni a c�mjegyz�ket. Ellen�rizd, hogy az �tvonal\n"
-"l�tezik-e �s van-e jogod az el�r�s�hez."
-
-#: addressbook/gui/component/addressbook.c:655
-#: addressbook/gui/component/addressbook.c:658
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "�rd be %s jelszav�t (%s felhaszn�l�)"
-
-#: addressbook/gui/component/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "B�rmely mez� tartalmazza"
 
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
-msgstr "A n�v tartalmazza"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
-msgstr "Az emailc�m tartalmazza"
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Be�ll�t�sok"
 
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:59
-msgid "Category is"
-msgstr "Kateg�ria"
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "Portsz�m:"
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Halad�..."
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Alap�rtelmezett"
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1067
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
-msgstr "B�rmelyik kateg�ria"
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "Keres�s _kiindul�pontja:"
 
-#: addressbook/gui/component/addressbook.c:1150
-msgid "The URI that the Folder Browser will display"
-msgstr "Az URI amit a Mappab�ng�sz� meg fog nyitni"
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Kiszolg�l� neve:"
 
-#.
-#. * 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 "(semmi)"
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Szundi id� (percek)"
 
-#: 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
-msgid "Primary Email"
-msgstr "Els�dleges email"
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "%d. postafi�k"
 
-#: addressbook/gui/component/e-address-popup.c:587
-msgid "Select an Action"
-msgstr "V�lassz egy m�veletet"
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "contact-list-editor"
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "�j n�vjegy k�sz�t�se: %s"
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "0 k�rtya"
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "C�m hozz�ad�sa a l�tez� %s n�vjegyjez"
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "�jrakapcsol�d�s %s kiszolg�l�hoz"
 
-#: addressbook/gui/component/e-address-popup.c:891
-msgid "Querying Addressbook..."
-msgstr "A c�mjegyz�k lek�rdez�se..."
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
-msgstr "N�vjegy adatainak szerkeszt�se"
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-msgid "Add to Contacts"
-msgstr "Hozz�ad�s a n�vjegyalbumhoz"
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "Alap"
 
-#: addressbook/gui/component/e-address-popup.c:1046
-msgid "Merge E-Mail Address"
-msgstr "Email c�m �sszef�s�l�se"
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
-msgstr "Lek�rdez�sek tilt�sa"
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
-msgstr "Lek�rdez�sek enged�lyez�se (Vesz�lyes!)"
+#: addressbook/gui/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "Keres�s"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
@@ -1114,9 +1283,9 @@ msgid "Factory for the Addressbook's name selection interface"
 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: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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "T�rl�s"
 
@@ -1145,7 +1314,12 @@ msgstr "(%d nincs mutatva)"
 msgid "Unnamed Contact"
 msgstr "N�vtelen n�vjegy"
 
-#: addressbook/gui/component/select-names/e-select-names.c:581
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "N�vjegy keres�se"
+
+#: 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"
@@ -1160,7 +1334,7 @@ msgstr ""
 "ezt a hib�t. �rj egy levelet Jon Trowbridge-nek <trow@ximian.com>\n"
 "a hiba k�r�lm�nyeinek r�szletes le�r�s�val. K�sz�nj�k."
 
-#: 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"
@@ -1172,32 +1346,40 @@ msgstr ""
 "A hiba elh�r�t�s�hoz ki kell l�pned az Evolutionb�l, \n"
 "�s �jra el kell ind�tanod."
 
-#: 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 "N�vjegyek kijel�l�se a c�mjegyz�kb�l"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "T_artalmazza:"
+msgid "Select Names"
+msgstr "V�lassz neveket"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "K_eres�s:"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "N�vjegy t�rl�se?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "V�lassz neveket"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Fontos kapcsolatok"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
+msgid ""
+"Type a name into the entry, or\n"
+"select one from the list below:"
 msgstr ""
-"Olyan n�vjegyek mutat�sa, amelyek eleget tesznek a k�vetkez� felt�teleknek:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "_Browse..."
+msgstr "�_thelyez�s..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kateg�ria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Mappa:"
 
@@ -1233,7 +1415,7 @@ msgstr "Egy�ttm�k�d�s"
 
 #. 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:1365
 msgid "Contact Editor"
 msgstr "N�vjegy szerkeszt�"
 
@@ -1258,10 +1440,6 @@ msgstr "T�_rol�s mint:"
 msgid "Full _Name..."
 msgstr "_Teljes n�v..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Alap"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1306,10 +1484,11 @@ 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:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1478 mail/mail-config.glade.h:105
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "_T�rl�s"
 
@@ -2360,34 +2539,26 @@ 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 ""
-"T�nyleg t�r�lni akarod \n"
-"ezt a n�vjegyet?"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "N�vjegy t�rl�se?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:757
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
 msgid "Category editor not available."
 msgstr "A kateg�riaszerkeszt� nem el�rhet�."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:764
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
 msgid "This contact belongs to these categories:"
 msgstr "Ez a n�vjegy az al�bbi kateg�ri�khoz tartozik:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:978
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
 msgid "Save Contact as VCard"
 msgstr "N�vjegy ment�se VCard-k�nt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2309
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nem tal�lhat� widget a mez�h�z: `%s'"
@@ -2401,7 +2572,7 @@ msgid "Edit Full"
 msgstr "R�szletes szerkeszt�s"
 
 #: 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 "Teljes n�v"
 
@@ -2607,7 +2778,7 @@ msgstr ""
 "c�mjegyz�kben. Mindenk�ppen hozz�adod?"
 
 #: 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 "Halad� keres�s"
 
@@ -2616,172 +2787,115 @@ msgstr "Halad� keres�s"
 msgid "Search"
 msgstr "Keres�s"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "0 k�rtya"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 k�rtya"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d k�rtya"
 
-#: 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 "Ment�s VCard-k�nt"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Megnyit�s"
-
-#: 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 "N�vjegy tov�bb�t�sa"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
-#: addressbook/gui/widgets/e-addressbook-view.c:836
-msgid "Send Message to Contact"
-msgstr "Lev�l k�ld�se ennek a szem�lynek"
-
-#: 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 "Nyomtat�s"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
-#: addressbook/gui/widgets/e-addressbook-view.c:839
-msgid "Print Envelope"
-msgstr "Bor�t�k nyomtat�sa"
-
-#: 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 "Kiv�g�s"
-
-#: 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 "M�sol�s"
-
-#: 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 "Beilleszt�s"
-
-#: 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
-msgid "Delete"
-msgstr "T�rl�s"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+msgid "Error getting book view"
+msgstr "Hiba %s ind�t�sakor"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Hiba a k�rtya m�dos�t�sakor"
 
-#: 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:1043
 msgid "Success"
 msgstr "Siker�lt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: 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:1895
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: 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
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Kapcsolat n�lk�li t�rol�"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "Jogosults�gi hiba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "A k�rtya nem tal�lhat�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "A k�rtyaazonos�t� m�r l�tezik"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "A protokoll nem t�mogatott"
 
-#: 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/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
 msgid "Cancelled"
 msgstr "Megszak�tva"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Egy�b hiba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Mented a v�ltoztat�sokat?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Hiba a lista hozz�ad�sakor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Hiba a k�rtya hozz�ad�sakor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Hiba a lista m�dos�t�sakor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Hiba a lista t�rl�sekor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1389
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Hiba a k�rtya t�rl�sekor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:202
+#: addressbook/gui/widgets/e-addressbook-util.c:204
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Megjelen�t�s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:203
+#: addressbook/gui/widgets/e-addressbook-util.c:205
 #, fuzzy
 msgid "Display Cards"
 msgstr "Megjelen�t�s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2789,85 +2903,207 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 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: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,cs,d,e�,f,g,gy,h,i�,j,k,l,m,n,ny,o�,��,p,q,r,s,sz,t,ty,u�,��,v,w,"
-"x,y,z,zs"
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Monte Scuro"
 
-#. 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,cs,d,e�,f,g,gy,h,i�,j,k,l,m,n,ny,o�,��,p,q,r,s,sz,t,ty,u�,��,v,w,x,"
-"y,z,zs"
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "0 k�rtya"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "0 k�rtya"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "0 k�rtya"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:959
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Kattints ide n�vjegy hozz�ad�s�hoz *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:963
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Els�dleges telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:964
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Asszisztens telefonja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:965
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Munkahelyi telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:966
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Visszah�v� telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:967
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "C�ges telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:968
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Otthoni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:970
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Munkahelyi c�m"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:971
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Otthoni c�m"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:972
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:973
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Aut�telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:976
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "2. munkahelyi telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:977
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "2. otthoni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:979
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Egy�b telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:985
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 msgid "Other Address"
 msgstr "Egy�b c�m"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Ment�s VCard-k�nt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "�j n�vjegy"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "�j c�mlista"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "Mapp�ra _ugr�s..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Import�l�s..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_N�vjegy keres�se"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_C�mjegyz�k forr�sai..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Pilot be�ll�t�sai"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "N�vjegy tov�bb�t�sa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Lev�l k�ld�se ennek a szem�lynek"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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 "Nyomtat�s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:893
+msgid "Print Envelope"
+msgstr "Bor�t�k nyomtat�sa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "Mapp�ba m�sol�s..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "Mapp�ba mozgat�s..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Kiv�g�s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "M�sol�s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+msgid "Paste"
+msgstr "Beilleszt�s"
+
+#: 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
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+msgid "Delete"
+msgstr "T�rl�s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Aktu�lis n�zet"
+
+#. 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:940
+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,cs,d,e�,f,g,gy,h,i�,j,k,l,m,n,ny,o�,��,p,q,r,s,sz,t,ty,u�,��,v,w,"
+"x,y,z,zs"
+
+#. 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
+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,cs,d,e�,f,g,gy,h,i�,j,k,l,m,n,ny,o�,��,p,q,r,s,sz,t,ty,u�,��,v,w,x,"
+"y,z,zs"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -2881,11 +3117,12 @@ msgstr "�s egy m�sik k�rtya"
 msgid "Save in addressbook"
 msgstr "Ment�s a c�mjegyz�kbe"
 
-#: 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 ""
@@ -2895,6 +3132,19 @@ msgstr ""
 "\n"
 "�j n�vjegy k�sz�t�s�hez kattints kett�t ide."
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Nincsenek elemek, amiket meg lehetne mutatni\n"
+"\n"
+"�j n�vjegy k�sz�t�s�hez kattints kett�t ide."
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "K�rtyan�zet"
@@ -2982,6 +3232,7 @@ msgid "Include:"
 msgstr "Bele�rtve:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Fekv�"
 
@@ -3006,6 +3257,7 @@ msgid "Options"
 msgstr "Be�ll�t�sok"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Elhelyezked�s"
 
@@ -3026,7 +3278,9 @@ msgstr "Pap�r"
 msgid "Paper source:"
 msgstr "Pap�r forr�s:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "�ll�"
 
@@ -3086,34 +3340,30 @@ msgstr "_Bet�k�szlet..."
 msgid "Untitled appointment"
 msgstr "N�vtelen tal�lkoz�"
 
-#: 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:500 calendar/cal-util/cal-util.c:522
+#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
 msgid "High"
 msgstr "Magas"
 
-#: 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/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Norm�lis"
 
-#: 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:504 calendar/cal-util/cal-util.c:526
+#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
 msgid "Low"
 msgstr "Alacsony"
 
 #. 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
 msgid "Undefined"
 msgstr "Nem megadott"
 
 #: 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 "Hib�s kommunik�ci� a napt�r kiszolg�l�val"
 
@@ -3122,8 +3372,13 @@ msgstr "Hib�s kommunik�ci� a napt�r kiszolg�l�val"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nem siker�lt a pilot Calendar application blokkj�t olvasni"
 
-#: calendar/conduits/todo/todo-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:889
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "_Priorit�s:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nem siker�lt a pilot Calendar ToDo blokkj�t olvasni"
 
@@ -3136,41 +3391,55 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Egy minta Bonono kontroll, amely napt�rat jelen�t meg."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Napt�r �s Feladatok be�ll�t�sai"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Calendar."
+msgstr "Az Evolution napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution calendar executive summary component."
 msgstr "Evolution napt�r vezet�i �sszefoglal� komponense."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution napt�r iTip/iMip n�z�ke"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution �sszetev� a napt�rkezel�shez."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the Calendar Summary component."
 msgstr "Factory a napt�r �sszefoglal� komponens�hez."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr "Factory az Evolution Task kontrollj�hoz"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "Factory a napt�r iTip n�z� kontrollj�hoz."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "Factory a mintanapt�r kontrollhoz."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Factory a napt�rkomponens komponensablakainak �sszefog�s�ra"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr "Factory a komponensszerkeszt� factory l�trehoz�s�ra"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 "Riaszt� szolg�ltat�s"
@@ -3179,22 +3448,10 @@ msgstr "Riaszt� szolg�ltat�s"
 msgid "Factory for the alarm notification service"
 msgstr "Factory a riaszt� szolg�ltat�shoz"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-msgid "Starting:"
-msgstr "Kezdet:"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-msgid "Ending:"
-msgstr "V�g:"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "�rv�nytelen id�pont"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-msgid "Evolution Alarm"
-msgstr "Evolution �breszt�"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3234,7 +3491,7 @@ msgstr ""
 "p�rbesz�dablakot fogja ehelyett megjelen�teni."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2235
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Figyelmeztet�s"
@@ -3261,7 +3518,7 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ne k�rdezze meg t�bbet."
 
-#: 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:58
 msgid "Could not initialize GNOME"
 msgstr "Nem siker�lt a GNOME inicializ�l�sa"
 
@@ -3273,52 +3530,52 @@ msgstr "Nem siker�lt l�trehozni az riaszt� szolg�ltat�st"
 msgid "Could not create the alarm notify service factory"
 msgstr "Nem siker�lt l�trehozni az riaszt� szolg�ltat�s factoryj�t"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "�sszefoglal� tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Le�r�s tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Megjegyz�s tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1081
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "Ki nem v�logatott"
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%Y %B %d, %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/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"
 
-#: 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"
 
-#: 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"
 
 #. 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:820
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3326,16 +3583,14 @@ msgstr ""
 "telep�t�sedet."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:385
 msgid "Private"
 msgstr "Szem�lyes"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
 msgid "Confidential"
 msgstr "Bizalmas"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Nyilv�nos"
 
@@ -3356,32 +3611,27 @@ msgid "W"
 msgstr "Ny"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
 msgid "Free"
 msgstr "Szabad"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 msgid "Busy"
 msgstr "Foglalt"
 
 #: 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
 msgid "Not Started"
 msgstr "Nem indult m�g el"
 
 #: 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
 msgid "In Progress"
 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:481 calendar/gui/e-meeting-model.c:329
-#: calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "K�sz"
 
@@ -3397,9 +3647,10 @@ 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/mail-account-gui.c:1496
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
-#: mail/mail-config.glade.h:55
+#: 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
 #: 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
@@ -3414,23 +3665,15 @@ msgstr "Ism�tl�d�"
 msgid "Assigned"
 msgstr "Kiosztva"
 
-#: 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:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
 msgid "Yes"
 msgstr "Igen"
 
-#: 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:310
 msgid "No"
 msgstr "Nem"
 
-#. 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 "Keres�s"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Napn�zet"
@@ -3447,47 +3690,80 @@ msgstr "H�tn�zet"
 msgid "Month View"
 msgstr "H�napn�zet"
 
-#: 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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Napt�r"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Tal�lkoz�kat �s esem�nyeket tartalmaz� mappa"
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Feladatok"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Teend�ket tartalmaz� mappa"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "�j tal�lkoz� l�trehoz�sa"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "H�rlet�lt�s be�ll�t�sai"
+
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "�rtekezlet"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "�j feladat"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "_Feladat"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "�j tal�lkoz�"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "�j _tal�lkoz�"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "�j feladat l�trehoz�sa"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "�j tal�lkoz�"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "�j _feladat"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "Tal�lkoz�"
+
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Nem siker�lt megnyitni a mapp�t '%s'-ben"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "Az URI amit a napt�r megjelen�t"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "Mappa nev�nek megv�ltoztat�sa"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Hangos riaszt�s be�ll�t�sai"
@@ -3553,9 +3829,7 @@ msgstr "-szer minden"
 msgid "hours"
 msgstr "�r�nk�nt"
 
-#: 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 "percenk�nt"
 
@@ -3683,7 +3957,7 @@ msgstr "Eml�keztet�k"
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "�sszefoglal�:"
 
@@ -3712,7 +3986,7 @@ msgstr "tal�lkoz� v�ge"
 msgid "hour(s)"
 msgstr "�ra"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "perc"
 
@@ -3753,170 +4027,168 @@ msgid "Color for tasks due today"
 msgstr "A mai hat�ridej� feladatok sz�ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "�j tal�lkoz� l�trehoz�sa az alap�rtelmezett _eml�keztet�vel"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Nap"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "A _h�t els� napja:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "P�ntek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "�ra m�lva"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "perc m�lva"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "H�tf�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "_Lej�rt hat�ridej� feladatok:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Szombat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
-msgstr "Tal�lkoz�k _v�gpontj�nak mutat�sa a heti �s a h�napn�zetben"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "H�t _sz�m�nak mutat�sa a d�tumnavig�torban"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Sta_rt of day:"
 msgstr "_A nap kezdete:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_V"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Vas�rnap"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "M_ai hat�ridej� feladatok:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "_Cs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "_K"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "M_ai hat�ridej� feladatok:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "_Feladatlista"
 
-#: 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 "Cs�t�rt�k"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Id�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Id�_z�na:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Id�o_szt�sok:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Id�form�tum:"
 
-#: 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 "Kedd"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Szerda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Munkah�t"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 �r�s (de/du)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 �r�s"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Meger�s�t�s k�r�se elemek t�rl�sekor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "A h�tv�g�k �ssze_nyom�sa a h�napn�zetben"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Megjelen�t�s"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_End of day:"
 msgstr "A nap _v�ge:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_P"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Alap"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "_Befejezett feladatok elrejt�se"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_H"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_M�s"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "_Lej�rt hat�ridej� feladatok:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "S_zo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "_Feladatlista"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "Tal�lkoz�k _v�gpontj�nak mutat�sa a heti �s a h�napn�zetben"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Id�o_szt�sok:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Sze"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "a tal�lkoz� kezdete el�tt"
 
@@ -3981,73 +4253,60 @@ msgstr "%s  V�ltoztatt�l. Elveted a v�ltoz�sokat �s friss�ted a szerkeszt�t?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Nem v�ltoztatt�l, friss�ted a szerkeszt�t?"
 
-#: 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:2212
 msgid " (Completed "
 msgstr " (K�sz "
 
-#: 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 "K�sz "
 
-#: 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 " (Esed�kes "
 
-#: 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 "Esed�kes "
 
-#: calendar/gui/dialogs/comp-editor.c:321
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "Nem siker�lt friss�teni az objektumot!"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Megbesz�l�s szerkeszt�se"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Id�pont - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Feladat - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Napl� bejegyz�s - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Nincs �sszegz�s"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2015
-#: mail/mail-display.c:101
-msgid "Overwrite file?"
-msgstr "Fel�l�rod a f�jlt?"
-
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2022
-#: mail/mail-display.c:105
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"A megadott n�ven m�r l�tezik f�jl.\n"
-"Fel�l�rod?"
-
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "Ment�s m�sk�nt..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Nem siker�lt megszerezni a legfrissebb v�ltozatot!"
 
@@ -4105,7 +4364,7 @@ msgstr "A feladat v�grehajt�ja:"
 msgid "Enter Delegate"
 msgstr "V�grehajt� megad�sa"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Tal�lkoz�"
 
@@ -4119,13 +4378,13 @@ msgstr "Ism�tl�d�s"
 
 #: 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:365
 msgid "Scheduling"
 msgstr "�temez�s"
 
 #: 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:368
 msgid "Meeting"
 msgstr "�rtekezlet"
 
@@ -4172,7 +4431,7 @@ msgid "Pu_blic"
 msgstr "Nyil_v�nos"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Id�form�tum"
 
@@ -4217,55 +4476,49 @@ msgstr "R�sztvev�"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Kattints ide r�sztvev� hozz�ad�s�hoz"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "K�z�ns�ges n�v"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "A feladatot kiadta"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "A feladat v�grehajt�ja"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Nyelv"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Tag"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:809
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Szerep"
 
-#: 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/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"
 msgstr "�llapot"
 
-#: 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:94
+#: 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
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "T�pus"
@@ -4280,7 +4533,7 @@ msgid "_Change Organizer"
 msgstr "_Szervez� megv�ltoztat�sa"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "_M�sok megh�v�sa..."
 
@@ -4288,29 +4541,99 @@ msgstr "_M�sok megh�v�sa..."
 msgid "_Other Organizer"
 msgstr "_M�sik szervez�"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Ez a tal�lkoz� olyan ism�tl�d�seket tartalmaz, amelyeket az Evolution nem "
 "tud szerkeszteni."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "ekkor:"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+msgid "first"
+msgstr "els�"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "m�sodperc"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "ez"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "�szak"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "lista"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Egy�b fax"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "nap"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "ezen:"
 
-#: 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 "el�fordul�sok"
 
@@ -4407,7 +4730,7 @@ msgid "Progress"
 msgstr "Folyamatban"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:966
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4419,15 +4742,19 @@ msgstr "_Priorit�s:"
 msgid "_Status:"
 msgstr "�ll_apot:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "Egyszer�"
+
 #: 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:324
 msgid "Assignment"
 msgstr "Kioszt�s"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Le�r�s:"
 
@@ -4439,116 +4766,80 @@ msgstr "Ke_zd�s d�tuma:"
 msgid "_Due Date:"
 msgstr "Le_j�rat:"
 
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:438
-#, 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:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Kijel�lt objektumok t�rl�se"
 
-#: 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: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
 msgid "_Open"
 msgstr "_Megnyit�s"
 
-#: 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:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Ment�s m�sk�nt..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "_Nyomtat�s..."
+
+#: calendar/gui/e-calendar-table.c:978 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_iv�g�s"
 
-#: 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:979 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 "_M�sol�s"
 
-#: 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:980 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 "_Beilleszt�s"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Feladat kioszt�sa"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Tov�bb�t�s i_Napt�rk�nt"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Megjel�l�s k�szk�nt"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "A _feladat t�rl�se"
-
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_Feladatok megjel�l�se k�szk�nt"
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_Kijel�lt feladatok t�rl�se"
 
-#: 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:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Objektumok friss�t�se"
 
-#: calendar/gui/e-calendar-table.c:1247
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Kattints ide �j feladat hozz�ad�s�hoz"
 
@@ -4556,48 +4847,47 @@ msgstr "Kattints ide �j feladat hozz�ad�s�hoz"
 msgid "Alarms"
 msgstr "�breszt�k"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "K�sz"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Befejez�s d�tuma"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Lej�rat"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Hat�rid�"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "F�ldrajzi hely"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Priorit�s"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Kezd�s d�tuma"
 
 #. 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
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "�sszefoglal�"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Feladatrendez�s"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4631,385 +4921,173 @@ msgstr "%02i perces oszt�s"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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"
 
 #. 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"
 
 #. 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
 msgid "am"
 msgstr "de"
 
 #. 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
 msgid "pm"
 msgstr "du"
 
-#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "�j _tal�lkoz�"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "�_j eg�sz napos esem�ny"
 
-#: 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:3553 calendar/gui/e-week-view.c:3440
+#, fuzzy
+msgid "New Meeting"
+msgstr "�rtekezlet"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "�j feladat"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Nyomtat�s..."
+
+#: 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 "Ugr�s a _mai napra"
 
-#: 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 "_Ugr�s d�tumra..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-msgid "_Delete this Appointment"
-msgstr "A _tal�lkoz� t�rl�se"
+#: 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 "Szabad/foglalt inform�ci� _k�zz�t�tele"
+
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
+#, fuzzy
+msgid "_Configure..."
+msgstr "Mappa be�ll�t�sai..."
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+msgid "_Configure Pilot..."
+msgstr "Mappa be�ll�t�sai..."
+
+#: 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
+msgid "_Save As..."
+msgstr "M_ent�s m�sk�nt..."
+
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "�rtekezlet _tervez�se"
+
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Tov�bb�t�s i_Napt�rk�nt"
 
-#: 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 "Az el�fordul�s _mozgathat�v� t�tele"
 
-#: 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 "Az _el�fordul�s t�rl�se"
 
-#: 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 "Az �_sszes el�fordul�s t�rl�se"
 
-#: calendar/gui/e-itip-control.c:535
-msgid "Meeting begins: <b>"
-msgstr "�rtekezlet kezdete: <b>"
-
-#: calendar/gui/e-itip-control.c:540
-msgid "Task begins: <b>"
-msgstr "Feladat kezdete: <b>"
-
-#: calendar/gui/e-itip-control.c:545
-msgid "Free/Busy info begins: <b>"
-msgstr "Szabad/foglalt inform�ci� kezdete: <b>"
-
-#: calendar/gui/e-itip-control.c:549
-msgid "Begins: <b>"
-msgstr "Kezd�dik: <b>"
-
-#: calendar/gui/e-itip-control.c:561
-msgid "Meeting ends: <b>"
-msgstr "Megbesz�l�s v�ge: <b>"
-
-#: calendar/gui/e-itip-control.c:564
-msgid "Free/Busy info ends: <b>"
-msgstr "Szabad/foglalt inform�ci� v�ge: <b>"
-
-#: calendar/gui/e-itip-control.c:568
-msgid "Ends: <b>"
-msgstr "V�ge: <b>"
-
-#: calendar/gui/e-itip-control.c:582
-msgid "Task Completed: <b>"
-msgstr "A feladat befejezve: <b> "
-
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Due: <b>"
-msgstr "A feladat hat�rideje: <b>"
-
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-msgid "iCalendar Information"
-msgstr "iCalendar inform�ci�"
-
-#. Title
-#: calendar/gui/e-itip-control.c:644
-msgid "iCalendar Error"
-msgstr "iCalendar hiba"
-
-#: calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-msgid "An unknown person"
-msgstr "Ismeretlen szem�ly"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:732
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> Olvasd el a k�vetkez�ket, �s v�lassz ki egy m�veletet az al�bbi men�b�l."
-
-#: calendar/gui/e-itip-control.c:748
-msgid "<i>None</i>"
-msgstr "<i>Nincs</i>"
-
-#: 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
-msgid "Choose an action:"
-msgstr "V�lassz egy m�veletet:"
-
-#: calendar/gui/e-itip-control.c:790
-msgid "Update"
-msgstr "Friss�t�s"
-
-#: calendar/gui/e-itip-control.c:791 calendar/gui/e-itip-control.c:810
-#: 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
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Elfogadva"
-
-#: calendar/gui/e-itip-control.c:807
-msgid "Tentatively accept"
-msgstr "K�s�rletileg elfogadva"
-
-#: calendar/gui/e-itip-control.c:808
-msgid "Decline"
-msgstr "Elutas�tva"
-
-#: calendar/gui/e-itip-control.c:822
-msgid "Send Free/Busy Information"
-msgstr "Szabad/foglalt inform�ci� k�ld�se"
-
-#: calendar/gui/e-itip-control.c:835
-msgid "Update respondent status"
-msgstr "V�laszol� �llapot�nak friss�t�se"
-
-#: calendar/gui/e-itip-control.c:848
-msgid "Send Latest Information"
-msgstr "Legut�bbi inform�ci� k�ld�se"
-
-#: calendar/gui/e-itip-control.c:861 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "M�gse"
-
-#: calendar/gui/e-itip-control.c:909
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> inform�ci�t tett k�zz� az �rtekezletr�l."
-
-#: calendar/gui/e-itip-control.c:910
-msgid "Meeting Information"
-msgstr "Inform�ci� az �rtekezletr�l"
-
-#: calendar/gui/e-itip-control.c:914
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> arra k�r, hogy vegy�l r�szt az �rtekezleten."
-
-#: calendar/gui/e-itip-control.c:915
-msgid "Meeting Proposal"
-msgstr "Javaslat �rtekezletre"
-
-#: calendar/gui/e-itip-control.c:919
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "<b>%s</b> szeretne hozz�tenni egy l�tez� �rtekezlethez."
-
-#: calendar/gui/e-itip-control.c:920
-msgid "Meeting Update"
-msgstr "�rtekezlet friss�t�se"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "�gy t�nik, hogy nincsenek telep�tve a rendszerre GNOME Pilot eszk�z�k."
 
-#: calendar/gui/e-itip-control.c:924
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> szeretn� megkapni a leg�jabb adatokat az �rtekezletr�l."
-
-#: calendar/gui/e-itip-control.c:925
-msgid "Meeting Update Request"
-msgstr "�rtekezletfriss�t�si k�r�s"
+msgid "Error executing %s."
+msgstr "Hiba a %s v�grehajt�sa k�zben."
 
-#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:1013
-#: 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: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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: calendar/gui/e-itip-control.c:948
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> v�laszolt egy �rtekezlet-�sszeh�v�si k�r�sre."
-
-#: calendar/gui/e-itip-control.c:949
-msgid "Meeting Reply"
-msgstr "V�lasz az �rtekezletre"
-
-#: calendar/gui/e-itip-control.c:953
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> lemondta az �rtekezletet."
-
-#: calendar/gui/e-itip-control.c:954
-msgid "Meeting Cancellation"
-msgstr "�rtekezlet lemond�sa"
-
-#: calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.c:1029
-#: calendar/gui/e-itip-control.c:1064
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> egy �rtelmetlen levelet k�ld�tt."
-
-#: calendar/gui/e-itip-control.c:959
-msgid "Bad Meeting Message"
-msgstr "Rossz �rtekezletfelh�v�s"
-
-#: calendar/gui/e-itip-control.c:979
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> feladatinform�ci�t tett k�zz�."
-
-#: calendar/gui/e-itip-control.c:980
-msgid "Task Information"
-msgstr "Feladatinform�ci�"
-
-#: calendar/gui/e-itip-control.c:984
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> arra k�r, hogy hajts v�gre egy feladatot."
-
-#: calendar/gui/e-itip-control.c:985
-msgid "Task Proposal"
-msgstr "Feladatjavaslat"
-
-#: calendar/gui/e-itip-control.c:989
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b>%s</b> szeretne hozz�tenni egy l�tez� feladathoz."
-
-#: calendar/gui/e-itip-control.c:990
-msgid "Task Update"
-msgstr "Feladat friss�t�se"
-
-#: calendar/gui/e-itip-control.c:994
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> szeretn� megkapni a leg�jabb adatokat a feladatr�l."
-
-#: calendar/gui/e-itip-control.c:995
-msgid "Task Update Request"
-msgstr "Feladatfriss�t�si felh�v�s"
-
-#: calendar/gui/e-itip-control.c:1019
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> v�laszolt egy feladatfelk�r�sre."
-
-#: calendar/gui/e-itip-control.c:1020
-msgid "Task Reply"
-msgstr "V�lasz feladatra"
-
-#: calendar/gui/e-itip-control.c:1024
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> t�r�lte a feladatot."
-
-#: calendar/gui/e-itip-control.c:1025
-msgid "Task Cancellation"
-msgstr "Feladat lemond�sa"
-
-#: calendar/gui/e-itip-control.c:1030
-msgid "Bad Task Message"
-msgstr "Rossz feladat�zenet"
-
-#: calendar/gui/e-itip-control.c:1049
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> szabad/foglalt inform�ci�t tett k�zz�."
-
-#: calendar/gui/e-itip-control.c:1050
-msgid "Free/Busy Information"
-msgstr "Szabad/foglalt inform�ci�"
-
-#: calendar/gui/e-itip-control.c:1054
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> k�ri a szabad/foglalt adataidat."
-
-#: calendar/gui/e-itip-control.c:1055
-msgid "Free/Busy Request"
-msgstr "Szabad/foglalt k�r�s"
-
-#: calendar/gui/e-itip-control.c:1059
-#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> v�laszolt egy szabad/foglalt k�r�sre."
-
-#: calendar/gui/e-itip-control.c:1060
-msgid "Free/Busy Reply"
-msgstr "Szabad/foglalt v�lasz"
-
-#: calendar/gui/e-itip-control.c:1065
-msgid "Bad Free/Busy Message"
-msgstr "Rossz szabad/foglalt �zenet"
-
-#: calendar/gui/e-itip-control.c:1138
-msgid "The message does not appear to be properly formed"
-msgstr "A lev�l �gy t�nik, nem megfelel�en form�zott"
-
-#: calendar/gui/e-itip-control.c:1157
-msgid "The message contains only unsupported requests."
-msgstr "A lev�l csak nem t�mogatott k�r�seket tartalmaz."
-
-#: calendar/gui/e-itip-control.c:1185 calendar/gui/e-itip-control.c:1191
-msgid "The attachment does not contain a valid calendar message"
-msgstr "A mell�klet nem tartalmaz �rv�nyes napt�r�zenetet"
-
-#: calendar/gui/e-itip-control.c:1216
-msgid "The attachment has no viewable calendar items"
-msgstr "A mell�klet nem tartalmaz megn�zhet� napt�relemet"
-
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1564
 msgid "Calendar file could not be updated!\n"
 msgstr "A napt�rf�jlt nem lehetett friss�teni!\n"
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Friss�t�s k�sz\n"
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"A r�sztvev� �llapot�t nem lehetett friss�teni, mert az elem nem l�tezik t�bb�"
+
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "A r�sztvev� �llapot�t nem lehetett friss�teni, mert az �llapot �rv�nytelen!\n"
 
-#: calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1638
 msgid "Attendee status could not be updated!\n"
 msgstr "A r�sztvev� �llapot�t nem lehetett friss�teni!\n"
 
-#: calendar/gui/e-itip-control.c:1372
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "A r�sztvev� �llapota friss�tve\n"
 
-#: calendar/gui/e-itip-control.c:1374
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"A r�sztvev� �llapot�t nem lehetett friss�teni, mert az elem nem l�tezik t�bb�"
-
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "T�rl�s befejezve"
 
-#: calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Elk�ldve!\n"
 
-#: calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Az elemet nem lehetett elk�ldeni!\n"
 
-#: calendar/gui/e-itip-control.c:1648
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr "Nem tal�lom egyik azonos�t�dat sem a r�sztvev�k list�j�n!\n"
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "V�lassz mapp�t"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "V�lassz mapp�t"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -5048,208 +5126,213 @@ msgstr "date-end"
 msgid "date-start"
 msgstr "date-start"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Eln�k"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Sz�ks�ges r�sztvev�k"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "Esetleges r�sztvev�k"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "Nem vesz r�szt"
 
-#: 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:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Egy�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:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Csoport"
 
-#: 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:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Er�forr�s"
 
-#: 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:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Szoba"
 
-#: 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:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "Levezet�"
 
-#: 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:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "Sz�ks�ges r�sztvev�k"
 
-#: 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:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "Esetleges r�sztvev�"
 
-#: 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:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Nem vesz r�szt"
 
-#: 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:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 msgid "Needs Action"
 msgstr "Beavatkoz�s sz�ks�ges"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:824
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr "Elfogadva"
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:825
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 msgid "Declined"
 msgstr "Elutas�tva"
 
-#: 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:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "K�s�rleti"
 
-#: 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:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "Deleg�lt"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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: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:2118 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"
 
 #. 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"
 
-#: calendar/gui/e-meeting-time-sel.c:433
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "Nincs bent"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Nincs inform�ci�"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Be�ll�t�sok"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Csak a _munka�r�k mutat�sa"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "_Nagy�tott mutat�sa"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "_Szabad/foglalt friss�t�se"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Automatikus kiszed�s"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "_Minden ember �s er�forr�s"
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "Minden _ember �s egy er�forr�s"
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "_A k�rt emberek"
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "A k�rt emberek �s egy e_r�forr�s"
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "Megbesz�l�s _kezd�dik:"
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Megbesz�l�s _v�ge:"
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Feladatok megnyit�sa %s-kor"
 
-#: 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 "Nem siker�lt bet�lteni a feladatot %s-be."
 
-#: 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' bet�lt�s�hez sz�ks�ges elj�r�s nem t�mogatott"
 
-#: calendar/gui/e-tasks.c:629
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Befejez�s d�tuma"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Kijel�lt objektumok t�rl�se"
+
+#: calendar/gui/e-tasks.c:659
 #, fuzzy
 msgid "Expunging"
 msgstr "Mappa tiszt�t�sa"
 
-#: 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 "�j _tal�lkoz�..."
 
-#: calendar/gui/gnome-cal.c:1493
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "A _tal�lkoz� t�rl�se"
+
+#: calendar/gui/gnome-cal.c:1538
 #, 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:1504
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1859
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Napt�r megnyit�sa %s-kor"
@@ -5310,284 +5393,223 @@ msgstr "okt�ber"
 msgid "September"
 msgstr "szeptember"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr "Legal�bb egy r�sztvev� sz�ks�ges"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "A szervez�t be kell �ll�tani."
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-msgid "Event information"
-msgstr "Esem�nyinform�ci�"
-
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-msgid "Task information"
-msgstr "Feladatinform�ci�"
-
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-msgid "Journal information"
-msgstr "Napl�inform�ci�"
-
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-msgid "Free/Busy information"
-msgstr "Szabad/foglalt inform�ci�"
-
-#: calendar/gui/itip-utils.c:321
-msgid "Calendar information"
-msgstr "Napt�rinform�ci�"
-
-#: calendar/gui/itip-utils.c:370
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Szabad/foglalt inform�ci� (%s - %s)"
-
-#: calendar/gui/itip-utils.c:382
-msgid "iCalendar information"
-msgstr "iCalendar inform�ci�"
-
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "R�szt kell venned az esem�nyen."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr "Nem siker�lt l�trehozni a komponensszerkeszt� factoryt"
 
-#: 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 "V"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "H"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "K"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Sze"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Cs"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "P"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Szo"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Kijel�lt nap (%Y %b %d, %a)"
 
-#: 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:1889
 msgid "%a %d %Y"
 msgstr "%Y %d, %a"
 
-#: 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:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Kijel�lt h�t (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Kijel�lt h�nap (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Kijel�lt �v (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Feladat"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "�llapot: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Priorit�s: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Sz�zal�kos k�szenl�t: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Kateg�ri�k: %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "N�vjegyek: "
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Napt�r nyomtat�sa"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2512 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Nyomtat�si k�p"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Elem nyomtat�sa"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Nyomtat�si be�ll�t�sok"
 
@@ -5598,11 +5620,11 @@ msgstr ""
 "Nem siker�lt l�trehozni a feladatn�zetet. Ellen�rizd az ORBit �s OAF "
 "telep�t�sedet."
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "A megjelen�tend� feladatmappa URI-ja"
 
-#: calendar/gui/tasks-control.c:434
+#: calendar/gui/tasks-control.c:456
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -5615,10 +5637,16 @@ msgstr ""
 "\n"
 "T�nyleg t�rl�d ezeket a leveleket?"
 
-#: calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2249
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "Ne k�rdezze meg t�bbet."
 
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "_Feladat nyomtat�sa..."
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5654,8 +5682,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' bet�lt�s�hez sz�ks�ges elj�r�s nem t�mogatott, egyetlen napt�rmappa-"
-"elemet sem lehet �tmozgatni a feladatok mapp�j�ba."
+"'%s' bet�lt�s�hez sz�ks�ges elj�r�s nem t�mogatott, egyetlen "
+"napt�rmappa-elemet sem lehet �tmozgatni a feladatok mapp�j�ba."
 
 #: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
@@ -5671,93 +5699,117 @@ msgstr "Factory a VCard f�jlok Evolutionbe import�l�s�hoz"
 msgid "Imports iCalendar files into Evolution"
 msgstr "VCard f�jlok import�l�sa az Evolutionbe."
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "VCard f�jlok import�l�sa az Evolutionbe."
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Napt�r�zenet"
+
+#: calendar/importers/icalendar-importer.c:663
+#, fuzzy
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Az Evolution Pine lev�lf�jlokat tal�lt.\n"
+"Szeretn�d ezeket az Evolutionbe import�lni?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Napt�r megnyit�sa"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "a time-now 0 argumentumot v�r"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "a make-time 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "a make-time els� argumentumak�nt karakterl�ncot v�r"
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "a make-time els� argumentum�nak ISO 8601 d�tum/id� karakterl�ncnak kell "
 "lennie"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "a time-add-day 2 argumentumot v�r"
 
-#: calendar/pcs/query.c:317
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "a time-day-add els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:324
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "a time-add-day m�sodik argumentumak�nt eg�sz sz�mot v�r"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "a time-day-begin 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:356
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "a time-day-begin els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "a time-day-end 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:388
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "a time-day-end els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "a get-vtype 0 argumentumot v�r"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "az occur-in-time-range? 2 argumentumot v�r"
 
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "az occur-in-time-range? els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "az occur-in-time-range? m�sodik argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "a contains? 2 argumentumot v�r"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "a contains? els� argumentumak�nt karakterl�ncot v�r"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "a contains? m�sodik argumentumak�nt karakterl�ncot v�r"
 
-#: calendar/pcs/query.c:691
+#: 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 ""
 "a contains? els� argumentumak�nt a k�vetkez�k egyik�t v�rja: \"any\", "
 "\"summary\", \"description\""
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "a has-categories? legal�bb egy argumentumot v�r"
 
-#: 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)"
@@ -5765,15 +5817,15 @@ msgstr ""
 "a has-categories? minden argumentumak�nt karakterl�ncot v�r, vagy csak "
 "egyetlen logikai hamis (#f) �rt�ket"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "az is-completed? 0 argumentumot v�r"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "a completed-before? 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "a completed-before? els� argumentumak�nt time_t-t v�r"
 
@@ -7314,14 +7366,14 @@ msgstr "Ez a titkos�t� nem t�mogatja a titkos�t�st"
 msgid "Decryption is not supported by this cipher"
 msgstr "Ez a titkos�t� nem t�mogatja a visszafejt�st"
 
-#: camel/camel-data-cache.c:159
+#: camel/camel-data-cache.c:169
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr ""
 "Nem siker�lt l�trehozni a kimeneti f�jlt: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:426
+#: camel/camel-data-cache.c:441
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nem siker�lt megnyitni a gyorst�r k�nyvt�r�t: %s"
@@ -7356,52 +7408,51 @@ msgstr "�jraszinkroniz�l�s a kiszolg�l�val"
 msgid "You must be working online to complete this operation"
 msgstr "A m�velet befejez�s�hez h�l�zati kapcsolattal kell rendelkezned"
 
-#: 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 "Mapp�k szinkroniz�l�sa"
 
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Hiba a sz�r� feldolgoz�sa k�zben: %s: %s"
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Hiba a sz�r� v�grehajt�sa k�zben: %s: %s"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Nem siker�lt megnyitni spool mapp�t"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Nem siker�lt feldolgozni a spool mapp�t"
 
-#: camel/camel-filter-driver.c:889
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "%d. lev�l let�lt�se (%d%%)"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Nem lehet megnyitni a levelet"
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d. lev�l rossz"
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Mappa szinkroniz�l�sa"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Levelek let�lt�se: %d/%d"
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Hiba a %d / %d �zenetn�l"
@@ -7416,7 +7467,7 @@ msgstr "A lev�l dek�dol�sa sikertelen."
 msgid "Error executing filter search: %s: %s"
 msgstr "Hiba a sz�rt keres�s v�grehajt�sa k�zben: %s: %s"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -7425,7 +7476,7 @@ msgstr ""
 "Nem siker�lt �rtelmezni a keres�kifejez�st:  %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -7434,35 +7485,31 @@ msgstr ""
 "Hiba a keres�si kifejez�s v�grehajt�sa k�zben: %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 "a (match-all) egy darab logikai eredm�nyt v�r"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Lek�rdez�s futtat�sa ismeretlen fejl�cen: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "�rv�nytelen t�pus a body-contains kifejez�sben, a v�rt karakterl�nc"
-
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nem t�mogatott m�velet: lev�l hozz�f�z�se: %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, 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:1080
+#: camel/camel-folder.c:1078
 #, 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:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Levelek �thelyz�se"
 
@@ -7571,177 +7618,129 @@ msgstr "Add meg %s jelszavadat %s sz�m�ra"
 msgid "Please enter your %s passphrase"
 msgstr "Add meg %s jelszavadat"
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
 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:582 camel/camel-pgp-context.c:762
+#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
 msgid "Cannot sign this message: no password provided"
 msgstr "Nem lehet al��rni a levelet: nincs jelsz� megadva"
 
-#: camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
+#: 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 ""
-"Nem lehet al��rni a levelet: nem siker�lt cs�vezet�ket l�trehozni a GPG/PGP-"
-"hez: %s"
+"Nem lehet al��rni a levelet: nem siker�lt cs�vezet�ket l�trehozni a "
+"GPG/PGP-hez: %s"
 
-#: camel/camel-pgp-context.c:755
+#: camel/camel-pgp-context.c:795
 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:953
+#: camel/camel-pgp-context.c:987
 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:959
+#: camel/camel-pgp-context.c:993
 #, c-format
 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"
+"Nem lehet ellen�rizni a levelet: nem siker�lt cs�vezet�ket l�trehozni a "
+"GPG/PGP-hez: %s"
 
-#: camel/camel-pgp-context.c:970
+#: camel/camel-pgp-context.c:1004
 #, 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:1143
+#: camel/camel-pgp-context.c:1177
 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:1153
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Nem lehet titkos�tani a levelet: nincs jelsz� megadva"
 
-#: camel/camel-pgp-context.c:1160
+#: camel/camel-pgp-context.c:1194
 #, 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"
+"Nem lehet titkos�tani a levelet: nem siker�lt cs�vezet�ket l�trehozni a "
+"GPG/PGP-hez: %s"
 
-#: camel/camel-pgp-context.c:1169
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Nem lehet titkos�tani a levelet: nincs c�mzett"
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1372
 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:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Nem lehet visszafejteni a levelet: nincs jelsz� megadva"
 
-#: camel/camel-pgp-context.c:1352
+#: camel/camel-pgp-context.c:1387
 #, 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:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "Ez az �zenetr�sz digit�lis al��r�ssal van ell�tva"
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Add meg %s jelszav�t!"
-
-#: camel/camel-pkcs7-context.c:213
-#, fuzzy
-msgid "Error hashing password."
-msgstr "Nem siker�l elmenteni az elemeket."
-
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr "�rv�nytelen jelsz�."
-
-#: camel/camel-pkcs7-context.c:329
-#, fuzzy, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Nem tal�lhat� \"%s\" tan�s�tv�nya."
-
-#: camel/camel-pkcs7-context.c:378
-#, fuzzy, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Nem tal�lhat� \"%s\" tan�s�tv�nya."
-
-#: camel/camel-pkcs7-context.c:567
-#, fuzzy
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "Nem tudom a dial�gust elk�sz�teni."
-
-#: camel/camel-pkcs7-context.c:590
-#, fuzzy
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "Nem siker�lt l�trehozni a PGP titkos�t�s r�szt."
-
-#: camel/camel-pkcs7-context.c:620
-#, fuzzy, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Nem siker�lt kapcsol�dni a kiszolg�l�hoz: %s"
-
-#: camel/camel-pkcs7-context.c:626
-#, fuzzy
-msgid "Could not encrypt: encoding failed."
-msgstr "Nem tudom a dial�gust elk�sz�teni."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr ""
-
-#: 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 bet�lt�se sikertelen: A modulbet�lt�s nem t�mogatott a rendszereden."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s bet�lt�se sikertelen: %s"
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s bet�lt�se sikertelen: Nincs inicializ�l� k�d a modulban."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s kiszolg�l� %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s %s szolg�ltat�s %s-n"
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Kapcsolat megszak�tva"
 
-#: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:274
+#: 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 "Nem siker�lt csatlakozni %s %d portj�hoz: %s"
 
-#: camel/camel-remote-store.c:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(ismeretlen kiszolg�l�)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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�velet megszak�tva"
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7854,13 +7853,14 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Rossz hiteles�t�si v�lasz a kiszolg�l�t�l"
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
-msgstr "NT bejelentkez�s"
+#, 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."
@@ -7870,9 +7870,20 @@ msgstr "Egyszer� jelsz� haszn�lat�val kapcsol�dik a kiszolg�l�hoz."
 msgid "Unknown authentication state."
 msgstr "Ismeretlen hiteles�t�si �llapot."
 
+#: 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 "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:149
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:60
+#: 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 "Jelsz�"
 
@@ -7917,26 +7928,41 @@ msgstr "'%s' URL-ben kell lennie g�pn�v �sszetev�nek"
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URL-ben kell lennie �tvonal �sszetev�nek"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "'%s' felold�sa"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Sikertelen n�vkikeres�s: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Sikertelen g�pkikeres�s: %s: a g�p nem tal�lhat�"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Sikertelen g�pkikeres�s: %s: ismeretlen ok"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "'%s' felold�sa"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Sikertelen g�pkikeres�s: %s: a g�p nem tal�lhat�"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Sikertelen g�pkikeres�s: %s: ismeretlen ok"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Virtu�lis mappa email szolg�ltat�"
@@ -7947,12 +7973,12 @@ msgstr ""
 "A leveleket m�s mapp�kon futtatott lek�rdez�s eredm�ny�t�l f�gg�en "
 "csoportos�thatod."
 
-#: 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' protokollhoz nincs t�mogat�s"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7961,6 +7987,11 @@ msgstr ""
 "Nem siker�lt l�trehozni %s k�nyvt�rat:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Add meg %s jelszav�t!"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Add meg a tan�s�tv�ny nev�t, amellyel al��rsz."
@@ -7993,17 +8024,17 @@ msgstr "A lev�l dek�dol�sa sikertelen."
 msgid "Failed to verify certificates."
 msgstr "Tan�s�tv�nyok ellen�rz�se sikertelen."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Nem siker�lt megnyitni a k�nyvt�rat: �rv�nytelen m�velet ezen a t�rol�n"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Nem siker�lt l�trehozni a k�nyvt�rat: �rv�nytelen m�velet ezen a t�rol�n"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -8012,7 +8043,7 @@ msgstr ""
 "Kibocs�t�: %s\n"
 "T�ma: %s"
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8030,7 +8061,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:438
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8039,16 +8070,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:500
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8074,27 +8105,27 @@ msgstr "Nem siker�lte �rtelmezni ezt azt URL-t: '%s'"
 msgid "No such message %s in %s"
 msgstr "Nincs %s lev�l %s-ben"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Nincs %s lev�l"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nem siker�lt t�r�lni a mapp�t: %s: �rv�nytelen m�velet"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nem siker�lt t�r�lni a mapp�t: %s: Nincs ilyen mappa"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nem siker�lt �tnevezni a mapp�t: %s: �rv�nytelen m�velet"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nem siker�lt �tnevezni a mapp�t: %s: Nincs ilyen mappa"
@@ -8127,52 +8158,52 @@ msgstr "Az IMAP kiszolg�l� v�lasza nem tartalmaz %s inform�ci�t"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "V�ratlan OK v�lasz az IMAP kiszolg�l�t�l: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nem siker�lt l�trehozni %s k�nyvt�rat: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nem siker�lt bet�lteni %s �sszefoglal�j�t"
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Megv�ltozott levelek keres�se"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2104
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Ez a lev�l jelenleg nem el�rhet�"
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "�sszefoglal� adatok let�lt�se az �j levelekhez."
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "�j levelek keres�se"
 
-#: camel/providers/imap/camel-imap-folder.c:2141
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "Nem tal�lhat� a lev�lt�rzs a FETCH v�laszban."
 
-#: 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 "Nem siker�lt megnyitni a gyorst�r k�nyvt�r�t: %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 "Nem siker�lt gyorst�razni %s �zenetet: %s"
@@ -8185,7 +8216,7 @@ msgstr "�j levelek keres�se"
 msgid "Check for new messages in all folders"
 msgstr "�j levelek keres�se az �sszes mapp�ban"
 
-#: 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 "Mapp�k"
 
@@ -8219,28 +8250,28 @@ msgstr ""
 "Ez a be�ll�t�s sima sz�veges jelsz�val l�tes�t kapcsolatot az IMAP "
 "kiszolg�l�val."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:390
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s hiteles�t�si t�pus nem t�mogatott"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sAdd meg %s@%s IMAP jelszav�t!"
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Nem adt�l meg jelsz�t."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8251,101 +8282,120 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Nincs %s mappa."
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 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:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "MH form�tum� lev�lk�nyvt�rak"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 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:52
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Helyi k�zbes�t�s"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:62
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Maildir form�tum� lev�lk�nyvt�rak"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 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:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr "Szabv�nyos Unix mbox t�rol�k"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:101
 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s t�rol�gy�k�r nem abszol�t �tvonal"
 
-#: 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 t�rol�gy�k�r nem k�z�ns�ges k�nyvt�r"
 
-#: 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 "Nem siker�lt bet�lteni a mapp�t: %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 "A helyi t�rol�k nem rendelkeznek Bej�v� mapp�val"
 
-#: 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 helyi lev�l f�jl"
 
-#: 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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nem siker�lt %s mapp�t %s n�vre �tnevezni: %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 "Nem siker�lt �tnevezni ezt a mapp�t: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nem siker�lt '%s' mappa�sszegz�f�jt t�r�lni: %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 "Nem siker�lt '%s' mappaindexf�jlt t�r�lni: %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, 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:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nem siker�lt hozz�adni a levelet az �sszefoglal�hoz: ismeretlen ok"
 
@@ -8365,7 +8415,7 @@ msgstr "Nem lehet a levelet a maildir mapp�hoz f�zni: %s: %s "
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8377,7 +8427,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "Nincs ilyen lev�l"
 
@@ -8386,7 +8436,7 @@ msgstr "Nincs ilyen lev�l"
 msgid "Invalid message contents"
 msgstr "A lev�l tartalma �rv�nytelen"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8396,14 +8446,14 @@ msgstr ""
 "Nem siker�lt megnyitni '%s' mapp�t:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "`%s' mappa nem l�tezik."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8413,41 +8463,64 @@ msgstr ""
 "Nem siker�lt l�trehozni '%s' mapp�t:\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' nem maildir k�nyvt�r."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nem siker�lt t�r�lni '%s' mapp�t: %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "nem maildir k�nyvt�r"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nem siker�lt p�szt�zni ezt a mapp�t: `%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 "Nem siker�lt megnyitni a maildir k�nyvt�r el�r�si �tj�t: %s: %s "
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "�j levelek keres�se"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "Mappa t�rol�sa"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nem siker�lt megnyitni a postal�d�t: %s: %s\n"
@@ -8464,9 +8537,9 @@ msgstr "Nem siker�lt a levelet az mbox f�jlhoz hozz�f�zni: %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-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8476,16 +8549,16 @@ msgstr ""
 "  %3$s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "A mappa jav�thatatlanul rossznak n�z ki."
 
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Lev�l�r�s sikertelen: rossz postafi�k?"
 
-#: 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"
@@ -8494,7 +8567,7 @@ msgstr ""
 "Nem siker�lt megnyitni '%s' f�jlt:\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"
@@ -8503,14 +8576,14 @@ msgstr ""
 "Nem siker�lt l�trehozni `%s' f�jlt:\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' nem k�z�ns�ges f�jl."
 
-#: 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"
@@ -8519,96 +8592,85 @@ msgstr ""
 "Nem siker�lt t�r�lni `%s' mapp�t:\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 "`%s' mappa nem �res. Nem t�r�lhet�."
 
-#. 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 "Mappa t�rol�sa"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, 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:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, 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:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:648
+#: camel/providers/local/camel-mbox-summary.c:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, 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:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, 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: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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "Nem siker�lt lez�rni a forr�smapp�t %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, 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:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, 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:873
-#: camel/providers/local/camel-spool-summary.c:544
-#: camel/providers/local/camel-spool-summary.c:1110
+#: camel/providers/local/camel-mbox-summary.c:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ismeretlen hiba: %s"
@@ -8627,12 +8689,12 @@ msgstr "Nem lehet a levelet az mh mapp�hoz f�zni: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' nem k�nyvt�r."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, c-format
 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:512
+#: camel/providers/local/camel-spool-folder.c:515
 #, 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"
@@ -8643,6 +8705,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "`%s/%s' mappa nem l�tezik."
@@ -8652,29 +8715,31 @@ msgstr "`%s/%s' mappa nem l�tezik."
 msgid "Spool mail file %s"
 msgstr "%s spool lev�lf�jl"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Spool mapp�t nem lehet �tnevezni"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Spool mapp�t nem lehet t�r�lni"
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8683,60 +8748,24 @@ 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:940
+#: 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/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Add meg %s@%s NNTP jelszav�t!"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "A kiszolg�l� a felhaszn�l�i nevet visszadobta"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Nem siker�lt a felhaszn�l�nevet elk�ldeni a kiszolg�l�nak"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "A kiszolg�l� visszautas�totta a felhaszn�l�n�v/jelsz� p�rost"
+#: 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/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:153
-#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/local/camel-spoold-store.c:173
 #, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr ""
-"Nem siker�lt bet�lteni a levelet: %s\n"
-"  %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#, fuzzy
-msgid "User cancelled"
-msgstr "M�velet megszak�tva"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Nem siker�lt megszerezni a csoportlist�t a kiszolg�l�r�l."
-
-#: 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 "Nem siker�lt bet�lteni %s csoportlistaf�jlj�t: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Nem siker�lt menteni %s csoportlistaf�jlj�t: %s"
+msgid "Mail tree %s"
+msgstr "Lev�l %s-nek"
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
@@ -8746,12 +8775,12 @@ msgstr "USENET news"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Ez egy seg�delem a USENET h�rcsoportok �r�s�hoz �s olvas�s�hoz."
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News %s-r�l"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8793,65 +8822,76 @@ msgstr "M�gse"
 msgid "Operation failed: %s"
 msgstr "M�velet megszak�tva"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "POP �sszefoglal� let�lt�se"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "Nem siker�lt az �j levelek ellen�rz�se a POP kiszolg�l�n: %s"
+#: 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 "M�velet megszak�tva"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Nem siker�lt megnyitni a mapp�t: az �zenetlista nem teljes."
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Nem siker�lt bet�lteni a mapp�t: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "A t�rl�sre kijel�lt levelek elt�vol�t�sa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "Nem siker�lt let�lteni a levelet: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Nem siker�lt let�lteni a levelet a %s POP kiszolg�l�r�l: %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 "Nincs %s azonos�t�j� lev�l"
 
-#: 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 "%d. POP lev�l let�lt�se"
 
-#: 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 ""
+"Nem siker�lt bet�lteni a levelet: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Ismeretlen csapad�k"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "Lev�lt�rol�"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Az �zenetek maradjanak meg a kiszolg�l�n is"
 
-#: 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 "T�rl�s a kiszolg�l�r�l %s nap m�lva"
 
-#: 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:84
 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 "Csatlakoz�s �s a levelek let�lt�se POP kiszolg�l�kr�l"
 
-#: 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."
@@ -8859,7 +8899,7 @@ msgstr ""
 "Ez a be�ll�t�s sima sz�veges jelsz�val kapcsol�dik a POP kiszolg�l�hoz. Sok "
 "POP kiszolg�l� csak ezt a m�dot t�mogatja."
 
-#: 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 "
@@ -8870,55 +8910,60 @@ msgstr ""
 "m�g azokon a kiszolg�l�kon sem, amelyek azt hirdetik magukr�l, hogy "
 "t�mogatj�k."
 
-#: camel/providers/pop3/camel-pop3-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
-"Ez a be�ll�t�s Kerberos 4 hiteles�t�ssel csatlakozik a POP kiszolg�l�val."
+"Nem siker�lt kapcsol�dni a POP kiszolg�l�hoz.\n"
+"Hiba a felhaszn�l�n�v k�ld�se k�zben: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Nem siker�lt a hiteles�t�s a KPOP kiszolg�l�hoz: %s"
+#: camel/providers/pop3/camel-pop3-store.c:210
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "A m�velet nem t�mogatott"
 
-#: camel/providers/pop3/camel-pop3-store.c:214
-#, c-format
-msgid "Could not connect to server: %s"
-msgstr "Nem siker�lt kapcsol�dni a kiszolg�l�hoz: %s"
+#: camel/providers/pop3/camel-pop3-store.c:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Hiteles�t�s sikertelen"
 
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
 msgstr "Nem siker�lt a POP kiszolg�l�hoz kapcsol�dni a %s g�pen."
 
-#: camel/providers/pop3/camel-pop3-store.c:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sAdd meg %s@%s POP3 jelszav�t!"
-
-#: camel/providers/pop3/camel-pop3-store.c:377
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
-"Error sending username: %s"
+"No support for requested authentication mechanism."
 msgstr ""
 "Nem siker�lt kapcsol�dni a POP kiszolg�l�hoz.\n"
-"Hiba a felhaszn�l�n�v k�ld�se k�zben: %s"
+"A k�rt hiteles�t�si mechanizmus nem t�mogatott."
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
-msgid "(Unknown)"
-msgstr "(Ismeretlen)"
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "Az IMAP parancs sikertelen: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+#: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
 msgstr ""
-"Nem siker�lt kapcsol�dni a POP kiszolg�l�hoz.\n"
-"A k�rt hiteles�t�si mechanizmus nem t�mogatott."
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "I/O hiba"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, fuzzy, c-format
+msgid "%sPlease enter the POP password for %s@%s"
+msgstr "%sAdd meg %s@%s POP3 jelszav�t!"
+
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8927,18 +8972,13 @@ msgstr ""
 "Nem siker�lt kapcsol�dni a POP kiszolg�l�hoz.\n"
 "Hiba a jelsz� k�ld�se k�zben: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nincs '%s' mappa."
 
-#: camel/providers/pop3/camel-pop3-store.c:563
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "V�ratlan v�lasz a POP kiszolg�l�t�l: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8948,55 +8988,51 @@ msgid ""
 "system."
 msgstr "Lev�l k�zbes�t�se a helyi rendszer \"sendmail\" programj�val."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "Nem siker�lte �rtelmezni ezt azt URL-t: '%s'"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Nem siker�lt cs�vezet�ket l�trehozni a sendmailhez: %s: a lev�l nem ment el"
 
-#: 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 "Nem siker�lt forkolni a sendmailt: %s: a lev�l nem ment el"
 
-#: 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 "Nem siker�lt elk�ldeni a levelet: %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 "A sendmail %s szign�llal kil�pett, a lev�l nem ment el."
 
-#: 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 "Nem siker�lt v�grehajtani %s-t, a lev�l nem ment el."
 
-#: 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 "A sendmail %d �llapottal l�pett ki: a lev�l nem ment el."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-msgid "Could not find 'From' address in message"
-msgstr "A felad� c�me nem tal�lhat� meg a lev�lben"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-#, fuzzy
-msgid "Could not parse recipient list"
-msgstr "Nem siker�lte �rtelmezni ezt azt URL-t: '%s'"
-
-#: 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:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 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:74
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9006,122 +9042,145 @@ msgstr ""
 "A lev�lk�zbes�t�s egy t�voli SMTP-t haszn�l� levelez�rendszer seg�ts�g�vel "
 "t�rt�nik.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Szintaktikai hiba, ismeretlen parancs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Szintaktikai hiba a param�terekben vagy argumentumokban"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "A parancs nincs megval�s�tva"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "A parancsparam�ter nincs megval�s�tva"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Rendszer�llapot, vagy rendszer-seg�d�zenet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Seg�d�zenet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Szolg�ltat�s rendelkez�sre �ll"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "A szolg�ltat�s lez�rja az �tviteli csatorn�t"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "A szolg�ltat�s nem el�rhet�, az �tviteli csatorna lez�r�dik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "A k�rt lev�lm�velet rendben, k�sz van"
 
-#: 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 "A felhaszn�l� nem helyi, tov�bb�t�s a <forward-path>-ra"
 
-#: 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 "A k�rt lev�lm�velet sikertelen: nem el�rhet� a postafi�k"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "A k�rt m�velet sikertelen: nem el�rhet� a postafi�k"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "A k�rt m�velet megszak�tva: hiba a feldolgoz�s k�zben"
 
-#: 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 "Nem helyi felhaszn�l�; pr�b�ld a <forward-path>-t"
 
-#: 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 "A k�rt m�velet sikertelen: el�gtelen rendszer-t�rol�hely"
 
-#: 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 "A k�rt m�velt sikertelen: t�rfoglal�s t�ll�p�se"
 
-#: 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 "A k�rt m�velet sikertelen: nem enged�lyezett postafi�kn�v"
 
-#: 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 "Kezd el �rni a levelet, fejezd be <CRLF>.<CRLF>-el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Sikertelen tranzakci�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Jelsz��tvitel sz�ks�ges"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "A hiteles�t�si mechanizmus t�l gyenge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "A k�rt hiteles�t�si mechanizmushoz titkos�t�s sz�ks�ges"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Ideiglenes hiteles�t�si hiba"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Hiteles�t�s sz�ks�ges"
 
-#: camel/providers/smtp/camel-smtp-transport.c:318
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "�dv�zl� v�lasz hiba: %s: tal�n nem v�gzetes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, fuzzy, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr ""
+"Nem siker�lt kapcsol�dni a POP kiszolg�l�hoz.\n"
+"Hiba a felhaszn�l�n�v k�ld�se k�zben: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:336
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "A lev�l �gy t�nik, nem megfelel�en form�zott"
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "Id�t�ll�p�s az AUTH k�r�sn�l: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, fuzzy
+msgid "STARTTLS response error"
+msgstr "Hib�s RSET v�lasz: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:458
 #, 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:418
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:439
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9132,134 +9191,133 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP kiszolg�l�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, 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:581
-msgid "Cannot send message: sender address not defined."
-msgstr "Nem lehet elk�ldeni a levelet: a felad� c�me nincs megadva."
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:593 mail/mail-ops.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Lev�l k�ld�se"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/providers/smtp/camel-smtp-transport.c:615
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, 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:674
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "SMTP �dv�zlet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:716
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, 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:748
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "SMTP hiteles�t�s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:754
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Hiba a SASL hiteles�t�si objektum l�trehoz�sakor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:769
-#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, 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:790
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "AUTH k�r�s sikertelen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 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:864
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:883
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1081
+#, 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:908
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:927
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Hib�s RCPT TO v�lasz: %s: a lev�l nem ment el"
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:961
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:980
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "Hib�s DATA v�lasz: %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:1171
+#, fuzzy
+msgid "DATA response error"
+msgstr "Hib�s RSET v�lasz: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1020
-#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1057
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "Hib�s DATA v�lasz: a lev�l v�get �rt: %s: a lev�l nem ment el"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#, 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:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, 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:1100
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "Hib�s RSET v�lasz: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1123
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1142
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "Hib�s QUIT v�lasz: %s: nem v�gzetes"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "Hib�s RSET v�lasz: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -9286,7 +9344,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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 "mell�klet"
 
@@ -9326,56 +9384,56 @@ msgid "MIME type:"
 msgstr "MIME-t�pus:"
 
 #: 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 "Javasolja a mell�klet automatikus megjelen�t�s�t"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "C�mjegyz�kben val� keres�shez kattints ide"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Felad�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "V�laszc�m:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "T�rgy:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "C�mzett:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "�rd be a lev�l c�mzettj�t"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "M�solat:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�rd be, kik kapjanak m�solatot a lev�lr�l"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Titkos m�solat:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9383,12 +9441,12 @@ msgstr ""
 "�rd be azokat a c�meket, akik rejtett m�solatot kapnak a lev�lr�l, azaz a "
 "c�mzettn�l nem jelenik meg a c�m�k."
 
-#: composer/e-msg-composer-select-file.c:291
+#: composer/e-msg-composer-select-file.c:267
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "F�jl csatol�sa"
 
-#: composer/e-msg-composer.c:688
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9397,38 +9455,34 @@ msgstr ""
 "F�jlbeolvas�si hiba: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:905
-msgid "Save as..."
-msgstr "Ment�s m�sk�nt..."
-
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Figyelem!"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "A f�jl l�tezik, fel�l�rod?"
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "F�jlment�si hiba: %s"
 
-#: composer/e-msg-composer.c:959
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "F�jlbet�lt�si hiba: %s"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "F�jlel�r�si hiba: %s"
 
-#: composer/e-msg-composer.c:998
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Nem siker�lt bet�lteni a levelet a szerkeszt�b�l"
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9437,7 +9491,7 @@ msgstr ""
 "Nem siker�lt keresni a f�jlban: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9446,7 +9500,7 @@ msgstr ""
 "Nem siker�lt csonkolni a  f�jlt: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9455,7 +9509,7 @@ msgstr ""
 "Hiba a levelek automatikus ment�se k�zben: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1123
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9464,7 +9518,7 @@ msgstr ""
 "f�jlokat.\n"
 "Szeretn�d megk�s�relni a vissza�ll�t�sukat?"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9474,23 +9528,23 @@ msgstr ""
 "\n"
 "Akarod menteni a v�ltoz�saidat?"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Figyelem: M�dos�tott lev�l"
 
-#: composer/e-msg-composer.c:1311
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "F�jl megnyit�s"
 
-#: composer/e-msg-composer.c:1460
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "F�jl beilleszt�se"
 
-#: composer/e-msg-composer.c:1846 composer/e-msg-composer.c:2322
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Lev�l �r�sa"
 
-#: composer/e-msg-composer.c:2339
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9498,7 +9552,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:2362 composer/e-msg-composer.c:2417
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9506,7 +9560,7 @@ msgstr ""
 "Nem siker�lt l�trehozni a szerkeszt�ablakot:\n"
 "A HTML-szerkeszt� komponens aktiv�l�sa sikertelen."
 
-#: 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."
@@ -9514,7 +9568,7 @@ msgstr ""
 "Nem siker�lt l�trehozni a szerkeszt�ablakot, mert m�g nem\n"
 "�ll�tott�l be egy azonos�t�t sem a levelez�komponensben."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Az Evolution levelez� komponens�t nem siker�lt inicializ�lni."
 
@@ -9566,12 +9620,21 @@ 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:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"A megadott n�ven m�r l�tezik f�jl.\n"
+"Fel�l�rod?"
+
 #. 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 "Jelsz� megjegyz�se"
 
-#: 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 "Jelsz� megjegyz�se a munkafolyamat h�tralev� r�sz�re"
 
@@ -9670,175 +9733,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 "Vezet�i �sszefoglal� Evolution komponens."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Factory a Vezet�i �sszefoglal� Evolution komponens sz�m�ra."
-
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Nem siker�lt az Evolution Vezet�i �sszefoglal� komponens�t elind�tani."
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "V�lassz egy f�jlt"
-
-#: 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 ""
-"V�laszthatsz egy m�sik HTML oldalt a Vezet�i �sszefoglal� h�tter��l.\n"
-"\n"
-"Az alap�rtelmezett h�tt�rhez hagyd �resen a mez�t."
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "%s megnyit�sa az alap�rtelmezett GNOME alkalmaz�ssal"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "%s megnyit�sa az alap�rtelmezett GNOME webb�ng�sz�vel"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Lev�l k�ld�se %s c�m�re"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Mappa nev�nek megv�ltoztat�sa"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "%s futtat�sa"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "%s bez�r�sa"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "%s balra mozgat�sa"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "%s jobbra mozgat�sa"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "%s �tmozgat�sa az el�z� sorba"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "%s �tmozgat�sa a k�vetkez� sorba"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "%s be�ll�t�sa"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Lap"
-
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nem siker�lt megnyitni a HTML f�jlt:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Adatbeolvas�si hiba:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: 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 ""
-"A Vezet�i �sszefoglal� komponens nem tudta inicializ�lni a Bonob�t.\n"
-"Ha voltak RootPOA-val kapcsolatos figyelmeztet� �zenetek, akkor\n"
-"val�sz�n�leg a GOAD-dal ford�tottad a Bonob�t �s nem az OAF-fal."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Factory az RDF �sszefoglal� komponens sz�m�ra."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF �sszefoglal�"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Factory a bonobo tesztkomponens sz�m�ra."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Factory a tesztkomponens sz�m�ra."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Teszt Bonobo-szolg�ltat�s"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-#, fuzzy
-msgid "Test service"
-msgstr "Teszt Bonobo-szolg�ltat�s"
-
-#: 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 "Hiba"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "Automatikus friss�t�s"
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Friss�t�s"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "_Szabad/foglalt friss�t�se"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "�v"
@@ -9871,11 +9765,7 @@ msgstr "�ra"
 msgid "minute"
 msgstr "perc"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "m�sodperc"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr " m�sodpercek"
 
@@ -9950,7 +9840,7 @@ msgstr " �ta"
 msgid "ago"
 msgstr "�ta"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:973
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
@@ -9963,15 +9853,15 @@ msgid "Filter Rules"
 msgstr "Sz�r� szab�lyok"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "Akkor"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "M�velet hozz�ad�sa"
 
-#: 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."
@@ -9979,19 +9869,11 @@ msgstr ""
 "Elfelejtett�l mapp�t v�lasztani.\n"
 "L�pj vissza, �s adj meg egy �rv�nyes mappanevet, ahov� a leveleket k�red."
 
-#: 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:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "V�lassz mapp�t"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "�rj be egy mappa URI-t"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<kattints ide a mappa kiv�laszt�s�hoz>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -10001,7 +9883,7 @@ msgstr ""
 "Hiba a '%s' regul�ris kifejez�sben:\n"
 "%s"
 
-#: filter/filter-part.c:488 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Teszt"
 
@@ -10009,39 +9891,40 @@ msgstr "Teszt"
 msgid "You must name this filter."
 msgstr "Meg kell adnod a sz�r� nev�t."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Szab�ly neve:"
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "N�vtelen"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Keres�si felt�telek"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "M�velet v�grehajt�sa,"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "ha minden felt�tel teljes�l"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "ha b�rmely felt�tel teljes�l"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Felt�tel hozz�ad�sa"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "bej�v�"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "kimen�"
 
@@ -10087,192 +9970,216 @@ msgstr "az �sszes helyi mapp�val"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Pontsz�m hozz�rendel�se"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Sz�n hozz�rendel�se"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Pontsz�m hozz�rendel�se"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Mell�kletek"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belem"
+
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "tartalmazza"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Mapp�ba m�sol�s"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Fogad�s d�tuma"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "K�ld�s d�tuma"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "T�r�lt"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "nem tartalmazza"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "nem v�gz�dik"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "nem l�tezik"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "nem �gy hangzik, mint"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "nincs az elej�n"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Nem l�tezik"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Piszkozat"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "v�gz�dik"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "L�tezik"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "l�tezik"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Kifejez�s"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Fontos"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "="
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "ut�n volt"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "el�tte volt"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Megjel�lt"
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "nagyobb mint"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "kisebb mint"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "nem"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Megjel�lt"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "Levelez�lista"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Lev�lt�rzs"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "Lev�l fejl�ce"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "�thelyez�s mapp�ba"
 
-#: filter/libfilter-i18n.h:34 mail/message-list.c:671
-#: mail/message-list.etspec.h:4
+#: filter/libfilter-i18n.h:39
 #, fuzzy
-msgid "Needs Reply"
-msgstr "Szabad/foglalt v�lasz"
+msgid "Play Sound"
+msgstr "Hangjelz�s:"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Olvasott"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "C�mzettek"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "Regex illeszked�s"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "V�lasz"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Pontsz�m"
 
-#: filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1486
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Felad�"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "�llapot be�ll�t�sa"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "M�ret (kB)"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "�gy hangzik, mint"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "Forr�spostafi�k"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Adott fejl�c"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "�gy kezd�dik:"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Feldolgoz�s le�ll�t�sa"
 
-#: filter/libfilter-i18n.h:49 mail/mail-format.c:932
-#: mail/message-list.etspec.h:10
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "T�rgy"
 
@@ -10280,11 +10187,11 @@ msgstr "T�rgy"
 msgid "Rules"
 msgstr "Szab�lyok"
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Szab�ly hozz�ad�sa"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Szab�ly szerkeszt�se"
 
@@ -10304,30 +10211,30 @@ msgstr "Legal�bb egy mapp�t meg kell adnod, mint forr�st."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Az Evolution import�lja a r�gi Elm leveleket."
 
-#: 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 "Import�l�s folyamatban..."
 
-#: 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 "V�rj"
 
-#: 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 "%s import�l�sa %s-k�nt"
 
-#: 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 "%s p�szt�z�sa"
 
-#: 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:101
 msgid "Mail"
 msgstr "Lev�l"
 
@@ -10355,23 +10262,74 @@ msgstr ""
 "Az Evolution GnomeCard f�jlokat tal�lt.\n"
 "Szeretn�d ezeket az Evolutionbe import�lni?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Priorit�s: %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 "Az Evolution import�lja a r�gi Netscape adatokat."
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Kuka"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "%s helyi lev�l f�jl"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Mappa p�szt�z�sa"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Import�l�s kezdete"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Be�ll�t�sok"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Sz�r�k szerkeszt�se"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10395,45 +10353,97 @@ msgstr ""
 msgid "Pine"
 msgstr "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 "Napt�r be�ll�t�sai"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Az Evolution napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Az Evolution napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Az Evolution napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Az Evolution napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Lev�lkezel� Evolution �sszetev�."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolution lev�lszerkeszt�."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Evolution vezet�i �sszefoglal� komponens a levelekr�l."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Evolution lev�lmappa-megjelen�t� komponens."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Evolution lev�lmappa-factory komponens."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Factory az Evolution lev�lszerkeszt� sz�m�ra."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Factory a levelez� �sszefoglal� komponens�hez."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Be�ll�t�sok"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Email tartalmaz"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Be�ll�t�sok"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "Levelez�st be�ll�t� fel�let"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Leveleket tartalmaz� mappa"
+#: 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:101
-msgid "Mail storage folder (internal)"
-msgstr "Lev�lt�rol� mappa (bels�)"
+msgid "Folder containing mail"
+msgstr "Leveleket tartalmaz� mappa"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -10443,24 +10453,19 @@ msgstr "Virtu�lis kuka"
 msgid "Virtual Trash folder"
 msgstr "Virtu�lis kukamappa"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Nem siker�lt kapcsol�dni a t�rol�hoz: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Ez a mappa nem tartalmazhat leveleket."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Tulajdons�gok..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Mappa tulajdons�gainak m�dos�t�sa"
 
-#: mail/component-factory.c:786
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10468,220 +10473,236 @@ msgstr ""
 "A levelez�d egyes be�ll�t�sai hib�snak t�nnek, ellen�rizd, hogy minden "
 "rendben van-e."
 
-#: mail/component-factory.c:955
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr "A lev�lk�ld�s m�dja nincs be�ll�tva"
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "�j lev�l"
 
-#: mail/component-factory.c:955
-msgid "New _Mail Message"
-msgstr "�_j lev�l"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "_Lev�l"
 
-#: mail/component-factory.c:980
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nem siker�lt az Evolution levelez� komponens�t inicializ�lni."
 
-#: mail/component-factory.c:989
+#: mail/component-factory.c:1003
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nem siker�lt az Evolution levelez�be�ll�t� komponens�t inicializ�lni."
 
-#: mail/component-factory.c:995
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nem siker�lt az Evolution mappainf� komponens�t inicializ�lni."
 
-#: mail/component-factory.c:1211
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Kapcsol�d�s a kiszolg�l�hoz..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Nem siker�lt regisztr�lni a t�rol�t a h�jban"
 
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" tulajdons�gai"
 
-#: mail/folder-browser-ui.c:274
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Tulajdons�gok"
 
-#: mail/folder-browser.c:298 mail/mail-display.c:298
+#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nem siker�lt l�trehozni az ideiglenes k�nyvt�rat: %s"
 
-#: mail/folder-browser.c:752
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d �j"
 
-#: mail/folder-browser.c:755 mail/folder-browser.c:763
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:757
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d rejtett"
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d kijel�lve"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d post�zand�"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d elk�ldve"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "�sszesen %d"
 
-#: mail/folder-browser.c:1055
-msgid "Create vFolder from Search"
-msgstr "VMappa gy�rt�sa keres�sb�l"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "_Virtu�lis mappa gy�rt�sa lev�lb�l"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "VMappa a _t�rgyra"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "VMappa a _felad�ra"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "VMappa a _c�mzettekre"
 
-#: mail/folder-browser.c:1441
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "VMappa a _levelez�list�ra"
 
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Sz�_r� a t�rgyra"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Sz�r� a f_elad�ra"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Sz�r� a _c�mzettekre"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Sz�r� a _levelez�list�ra"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "S_zerkeszt�s �j lev�lk�nt..."
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:105
-msgid "_Save As..."
-msgstr "M_ent�s m�sk�nt..."
-
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Nyomtat�s"
 
-#: mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_V�lasz a felad�nak"
 
-#: mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "V�lasz a _list�nak"
 
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "V�lasz _mindenkinek"
 
-#: mail/folder-browser.c:1465
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "Tov�bb�t�s"
 
-#: mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "K�sz"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "T�rl�s"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_Elolvasva"
 
-#: mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "_Olvasatlan"
 
-#: mail/folder-browser.c:1469
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "_Fontos"
 
-#: mail/folder-browser.c:1470
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "_Nem fontos"
 
-#: mail/folder-browser.c:1471
+#: mail/folder-browser.c:1636
 #, fuzzy
-msgid "Mark as Needing Reply"
-msgstr "V�lasz az �rtekezletre"
+msgid "U_ndelete"
+msgstr "_Vissza�ll�t�s"
 
-#: mail/folder-browser.c:1472
+#: mail/folder-browser.c:1640
 #, fuzzy
-msgid "Mark as Not Needing Reply"
-msgstr "V�lasz az �rtekezletre"
-
-#: mail/folder-browser.c:1476
-msgid "_Move to Folder..."
-msgstr "�_thelyez�s mapp�ba..."
+msgid "Mo_ve to Folder..."
+msgstr "Mapp�ba mozgat�s..."
 
-#: mail/folder-browser.c:1477
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_M�sol�s mapp�ba..."
 
-#: mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:107
-msgid "_Undelete"
-msgstr "_Vissza�ll�t�s"
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
 
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Felad� hozz�ad�sa a c�mjegyz�khez"
 
-#: mail/folder-browser.c:1486
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Sz�r�k alkalmaz�sa"
 
-#: mail/folder-browser.c:1488
-msgid "Create Ru_le From Message"
-msgstr "S_zab�ly gy�rt�sa lev�lb�l"
-
 #: mail/folder-browser.c:1657
-msgid "Filter on Mailing List"
-msgstr "Sz�r� a levelez�list�ra"
+#, fuzzy
+msgid "Crea_te Rule From Message"
+msgstr "S_zab�ly gy�rt�sa lev�lb�l"
 
-#: mail/folder-browser.c:1658
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "VMappa a levelez�list�ra"
 
-#: mail/folder-browser.c:1660
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Sz�r� a levelez�list�ra (%s)"
 
-#: mail/folder-browser.c:1661
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "VMappa a levelez�list�ra (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Alap�rtelmezett"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Mappaadatok �sszegy�jt�se"
@@ -10703,26 +10724,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Outlook Express 4 f�jlok import�l�sa az Evolutionbe"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "A sz�vegt�rzs tartalmazza"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Jelenlegi t�rol�si form�tum:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Indexel�s:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Postafi�k form�tuma"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "A sz�vegt�rzs tartalmazza"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "�j t�rol�si form�tum"
 
-#: 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"
@@ -10732,15 +10746,15 @@ msgstr ""
 "�talak�t�sokat, a sikertelen m�velet (pl. betelt a lemez)\n"
 "nem felt�tlen�l vonhat� vissza. L�gy �vatos."
 
-#: 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"
 
@@ -10758,86 +10772,79 @@ msgstr "Evolution News-szerkeszt�"
 msgid "Evolution Account Editor"
 msgstr "Evolution Postafi�k-szerkeszt�"
 
-#: mail/mail-account-gui.c:959
-msgid "Could not save signature file."
-msgstr "Nem siker�lt menteni az al��r�sf�jlt."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_G�p:"
 
-#: mail/mail-account-gui.c:1036
-msgid "Save signature"
-msgstr "Al��r�s ment�se"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "_Felhaszn�l�n�v:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "�_tvonal:"
 
-#: mail/mail-account-gui.c:1042
+#: 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�di�"
+
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Az al��r�s megv�ltozott, de nem lett mentve.\n"
-"\n"
-"Akarod menteni a v�ltoz�saidat?"
 
-#: mail/mail-account-gui.c:1665
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr "Nem hozhatsz l�tre k�t egyez� nev� postafi�kot."
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (alap�rtelmezett)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Tilt�s"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Enged�lyez�s"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "T�nyleg t�r�lni akarod ezt a postafi�kot?"
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Nem t�r�l"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "T�nyleg t�rl�d a postafi�kot?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-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:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Tilt�s"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:49
-msgid "Mail Settings"
-msgstr "Levelez� be�ll�t�sai"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Enged�lyez�s"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Lev�l %s-nek"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+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-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "A t�ma %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Akt�v"
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Lev�l %s-t�l"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "_Postafi�k neve:"
 
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "%s levelez�lista"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Puerto Rico"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Sz�r�szab�ly hozz�ad�sa"
 
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10849,7 +10856,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:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10857,7 +10864,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:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10865,12 +10872,8 @@ msgstr ""
 "Be kell �ll�tanod a lev�lk�ld�st,\n"
 "miel�tt levelet k�ldesz."
 
-#: mail/mail-callbacks.c:187
-msgid "You have not set a mail transport method"
-msgstr "A lev�lk�ld�s m�dja nincs be�ll�tva"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10878,11 +10881,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:237
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Mindenk�pp elk�ld�d?"
 
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10890,7 +10893,7 @@ msgstr ""
 "Nincs t�rgya a lev�lnek.\n"
 "T�nyleg elk�ldjem?"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10898,11 +10901,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:327
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "A lev�l csak titkos c�mzetteket tartalmaz."
 
-#: mail/mail-callbacks.c:331
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10912,19 +10915,15 @@ msgstr ""
 "fejl�c hozz�ad�s�val.\n"
 "M�gis elk�ld�d?"
 
-#: mail/mail-callbacks.c:461
-msgid "This message contains invalid recipients:"
-msgstr "A lev�l �rv�nytelen c�mzetteket tartalmaz:"
-
-#: mail/mail-callbacks.c:496
+#: mail/mail-callbacks.c:408
 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:584
+#: mail/mail-callbacks.c:497
 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:703
+#: mail/mail-callbacks.c:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10932,28 +10931,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:913
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "ismeretlen felad�"
 
-#: mail/mail-callbacks.c:918
+#: mail/mail-callbacks.c:981
 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:1363 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Lev�l(levelek) �thelyez�se m�s mapp�ba"
 
-#: mail/mail-callbacks.c:1365 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 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:1866
+#: mail/mail-callbacks.c:2091
 #, 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:1891
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10961,7 +10960,7 @@ msgstr ""
 "Csak a Piszkozatok mapp�ban l�v� \n"
 "leveleket lehet szerkeszteni."
 
-#: mail/mail-callbacks.c:1930
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10969,24 +10968,39 @@ msgstr ""
 "Csak az Elk�ld�tt mapp�ban l�v� \n"
 "leveleket lehet �jra elk�ldeni."
 
-#: mail/mail-callbacks.c:1944
+#: mail/mail-callbacks.c:2169
 #, 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:1970
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Nincs lev�l kijel�lve"
 
-#: mail/mail-callbacks.c:2069
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Fel�l�rod a f�jlt?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Lev�l ment�se m�sk�nt..."
 
-#: mail/mail-callbacks.c:2071
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Levelek ment�se m�sk�nt..."
 
-#: mail/mail-callbacks.c:2242
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "A k�vetkez� olvasatlan lev�l megjelen�t�se"
+
+#: mail/mail-callbacks.c:2373
+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
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10998,7 +11012,7 @@ msgstr ""
 "\n"
 "T�nyleg t�rl�d ezeket a leveleket?"
 
-#: mail/mail-callbacks.c:2357
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11007,23 +11021,28 @@ msgstr ""
 "Hiba a sz�r�inform�ci�k bet�lt�se k�zben:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2369
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Sz�r�k..."
 
-#: mail/mail-callbacks.c:2453
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Levelek let�lt�se: %d/%d"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Lev�l nyomtat�sa"
 
-#: mail/mail-callbacks.c:2480
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2519
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Lev�l nyomtat�sa sikertelen"
 
-#: mail/mail-callbacks.c:2685
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, 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?"
@@ -11078,16 +11097,35 @@ msgstr ""
 "csak az Evolution programban jelenik meg."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution Postafi�k var�zsl�"
 
-#: mail/mail-config.c:354
-#, c-format
-msgid "Account %d"
-msgstr "%d. postafi�k"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "ut�na"
 
-#: mail/mail-config.c:1995
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -11098,104 +11136,156 @@ msgstr ""
 "%s\n"
 "Nem j�n l�tre ind�t�ikon."
 
-#. 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: Bej�v� �zenetek"
-
-#: mail/mail-config.c:2248
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Szolg�ltat�s ellen�rz�se"
 
-#: mail/mail-config.c:2326 mail/mail-config.c:2330
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 msgstr "Kapcsol�d�s a kiszolg�l�hoz..."
 
+#: mail/mail-config.c:2999
+#, fuzzy
+msgid "Unnamed"
+msgstr "N�vtelen n�vjegy"
+
+#: mail/mail-config.c:3177
+msgid "Cannot execute signature script"
+msgstr ""
+
 #: mail/mail-config.glade.h:1
-msgid " _Check for supported types "
-msgstr "_T�mogatott t�pusok lek�rdez�se"
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " sz�n"
+#, fuzzy
+msgid " Edit "
+msgstr "Szerkeszt�s"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid " New "
+msgstr "�j"
+
+#: mail/mail-config.glade.h:4
+msgid " _Check for supported types "
+msgstr "_T�mogatott t�pusok lek�rdez�se"
+
+#: mail/mail-config.glade.h:5
+#, fuzzy
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr "(Ez az Evolution-v�ltozat nem t�mogatja az SSL-t)"
+
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Ez az Evolution-v�ltozat nem t�mogatja az SSL-t)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "_Mindig titkos�t nekem is, ha titkos�tott levelet k�ld�k"
 
-#: mail/mail-config.glade.h:5
-msgid "Account"
-msgstr "Postafi�k"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "%d. postafi�k"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Postafi�k-inform�ci�"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Postafi�k-kezel�s"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "Postafi�kok"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Halad� LDAP be�ll�t�sok"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Arkansas"
+
+#: mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Mindig titkos�t nekem is, ha titkos�tott levelet k�ld�k"
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: 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 "M_indig �rja al� az ebb�l a postafi�kb�l kimen� leveleket"
 
-#: mail/mail-config.glade.h:11
-msgid "Always blind carbon-copy to:"
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
-msgid "Always carbon-copy to:"
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:13 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "Arica"
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "F�jl csatol�sa a lev�lhez"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Mell�klet"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Hiteles�t�s:"
 
-#: mail/mail-config.glade.h:15
-msgid "Beep when new mail arrives"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "Az �j _levelek automatikus lek�rdez�se"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Ismeretlen karakterk�szlet: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_Bez�r�s"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "�j levelek keres�se"
 
-#: mail/mail-config.glade.h:17
-msgid "Composer"
-msgstr "Szerkeszt�"
-
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Lev�l �r�sa"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Be�ll�t�sok"
 
-#: mail/mail-config.glade.h:20
-msgid "Confirm when Expunging a folder"
-msgstr "Meger�s�t�s a mappa tiszt�t�sakor"
-
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11211,252 +11301,373 @@ msgstr ""
 "\n"
 "Kattints a \"Befejez�s\" gombra a be�ll�t�sok ment�s�hez."
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Dari"
+msgstr "Bari"
+
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Alap�rtelmezett"
 
-#: mail/mail-config.glade.h:28
-msgid "Default Forward style is: "
-msgstr "A \"Tov�bb�t�s\" alap�rtelmezett st�lusa: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:29
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Alap�rtelmezett karakterk�dol�s: "
 
-#: mail/mail-config.glade.h:30
-msgid "Defaults"
-msgstr "Alap�rtelmezett"
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Levelek fogad�sa"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digit�lis azonos�t�k..."
 
-#: mail/mail-config.glade.h:33
-msgid "Display"
-msgstr "Megjelen�t�s"
-
-#: mail/mail-config.glade.h:34
-msgid "Do not notify me when new mail arrives"
-msgstr ""
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Nem lehet megnyitni a levelet"
 
-#: mail/mail-config.glade.h:35 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "K�sz"
 
-#: mail/mail-config.glade.h:36 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Piszkozatok"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "_Piszkozatok mappa:"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "E_nged�lyez�s"
 
-#: mail/mail-config.glade.h:38 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Szerkeszt�s..."
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "E_nable advanced options"
+msgstr "Halad� LDAP be�ll�t�sok"
 
-#: mail/mail-config.glade.h:39
-msgid "Enabled"
-msgstr "Akt�v"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Kelet"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Email tartalmaz"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "_Emailc�m:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "_Kuka �r�t�se kil�p�skor"
+
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Execute Command..."
 msgstr "M�velet v�grehajt�sa,"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "v�gz�dik"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Csatol�s be�ll�t�sok"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Tov�bb�tott levelek"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Digit�lis azonos�t� szerz�se..."
 
-#: mail/mail-config.glade.h:42
-msgid "HTML signature file:"
-msgstr "HTML al��r�sf�jl:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Id�zetek kiemel�se"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Honolulu"
+
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:44 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:45
-msgid "In HTML mail"
-msgstr "HTML lev�lben"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Be�gyazott"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Ment�s �s bez�r�s"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "_K�pek bet�lt�se"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Levelez�s be�ll�t�sa"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Postafi�k helye"
 
-#: mail/mail-config.glade.h:51
-msgid "Make this my _default account"
-msgstr "L_egyen ez az alap�rtelmezett postafi�k"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Lev�l fejl�ce"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "Lev�l _megjelen�t�se"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikron�zia"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP kiszolg�l�:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Levelez�s be�ll�t�sa"
 
-#: mail/mail-config.glade.h:54
-msgid "News"
-msgstr "News"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "H�rcsoport-szerverek"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Egy�b inform�ci�"
 
-#: mail/mail-config.glade.h:58
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "S_zervezet:"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "PGP _kulcs azonos�t�ja:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "V�lassz egy sz�nt"
 
-#: mail/mail-config.glade.h:62
-msgid "Play sound file when new mail arrives"
-msgstr ""
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "K�rdez, ha csak _titkos m�solat szerepel a c�mzettek k�z�tt"
 
-#: mail/mail-config.glade.h:63
-msgid "Pretty Good Privacy"
+#: mail/mail-config.glade.h:89
+#, fuzzy
+msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:64
-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:65
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "K�rdez, ha �_res t�rggyal akarod elk�ldeni a levelet"
-
-#: mail/mail-config.glade.h:66
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "K�rdez, ha csak _titkos m�solat szerepel a c�mzettek k�z�tt"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Kijel�lt n�vjegyek nyomtat�sa"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Nem lehet megnyitni a levelet"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Id�zet"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Jelsz� megjegyz�se"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
-msgid "Receiving Email"
-msgstr "Levelek fogad�sa"
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "V�laszc�m:"
 
-#: mail/mail-config.glade.h:71
-msgid "Receiving Mail"
+#: 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:72
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Fogad�s be�ll�t�sai"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Jelsz� megjegyz�se"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Sz�ks�ges inform�ci�"
 
-#: mail/mail-config.glade.h:75
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+msgstr "Biztons�g"
+
+#: 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 "Biztons�gos MIME"
 
-#: mail/mail-config.glade.h:76
-msgid "Security"
-msgstr "Biztons�g"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:77
-msgid "Select Filter Log file..."
-msgstr "V�lassz egy sz�r�napl�f�jlt"
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:78
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "V�laszd ki a PGP programot"
 
-#: mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Lev�l k�ld�se"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Al��r�s f�jl:"
 
-#: mail/mail-config.glade.h:80
-msgid "Sending Mail"
-msgstr "Lev�l k�ld�se"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Al��r�s kiv�tel�vel mindent t�r�l"
 
-#: mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Elk�ldve"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "Lev�l k�ld�se"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "El_k�ld�tt levelek mapp�ja"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Elk�ld�tt levelek �s piszkozatok"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "A kiszolg�l� megk�veteli a _hiteles�t�st"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Kiszolg�l� be�ll�t�sa"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "Kiszolg�l� _t�pusa: "
 
-#: mail/mail-config.glade.h:88
-msgid "Signature file:"
-msgstr "Al��r�s f�jl:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Ind�t�ikonok"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Al��r�s ment�se"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Forr�s"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Forr�sinform�ci�"
 
-#: mail/mail-config.glade.h:91
-msgid "Sources"
-msgstr "Forr�sok"
-
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:124
 #, fuzzy
-msgid "Specify filename:"
+msgid "Specify _filename:"
 msgstr "St�lus neve:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Szabv�nyos Unix mbox"
 
-#: mail/mail-config.glade.h:95
-msgid "Use s_ecure connection (SSL)"
-msgstr "_Biztons�gos kapcsolat haszn�lata (SSL)"
+#: mail/mail-config.glade.h:128
+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:96
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "_HTML al��r�s:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "V�ltoz�"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11466,126 +11677,215 @@ msgstr ""
 "\n"
 "A folytat�shoz kattints a \"Tov�bb\" gombra."
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Kelet"
+
+#: mail/mail-config.glade.h:140
 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:101
+#: mail/mail-config.glade.h:141
 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:102
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Hiteles�t�si t�pus:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "_Hiteles�t�si t�pus:"
+
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "Az �j _levelek automatikus lek�rdez�se"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Tan�s�tv�nyazonos�t�:"
 
-#: mail/mail-config.glade.h:106
-msgid "_Drafts folder:"
-msgstr "_Piszkozatok mappa:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:108
-msgid "_Email Address:"
-msgstr "_Emailc�m:"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Meger�s�t�s a mappa tiszt�t�sakor"
 
-#: mail/mail-config.glade.h:109
-msgid "_Empty trash folders on exit"
-msgstr "_Kuka �r�t�se kil�p�skor"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Alap�rtelmezett"
 
-#: mail/mail-config.glade.h:110
-msgid "_Full Name:"
-msgstr "_Teljes n�v:"
+#: mail/mail-config.glade.h:151
+msgid "_Do not notify me when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:153
+msgid "_Enable spell checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:154
+#, fuzzy
+msgid "_Filename:"
+msgstr "F�jln�v:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Tov�bb�t�s mint"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
+msgstr "Teljes n�v:"
+
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "HTML lev�lben"
+
+#: mail/mail-config.glade.h:160
 msgid "_HTML Signature:"
 msgstr "_HTML al��r�s:"
 
-#: mail/mail-config.glade.h:112
-msgid "_Highlight citations with"
-msgstr "_Id�zetek kiemel�se"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Azonos�t�"
 
-#: mail/mail-config.glade.h:113
-msgid "_Host:"
-msgstr "_G�p:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Nyelv"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:164
 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:115
-msgid "_Log filter actions to:"
-msgstr "Sz�r�m�veletek _napl�z�sa ide:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "L_egyen ez az alap�rtelmezett postafi�k"
 
-#: mail/mail-config.glade.h:116
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+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:117
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_N�v:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:168
 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:119
-msgid "_Organization:"
-msgstr "_Szervezet:"
-
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "_PGP program el�r�si �tja:"
 
-#: mail/mail-config.glade.h:121
-msgid "_Path:"
-msgstr "�_tvonal:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:122
-msgid "_Remember this password"
-msgstr "_Jelsz� megjegyz�se"
+#: mail/mail-config.glade.h:172
+#, fuzzy
+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:123
-msgid "_Send mail in HTML format by default."
-msgstr "A levelet _HTML form�tumban k�ldi alap�rtelmez�sk�nt."
+#: mail/mail-config.glade.h:173
+#, fuzzy
+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:124
-msgid "_Server Type: "
-msgstr "_Kiszolg�l� t�pusa: "
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "R�di�"
 
-#: mail/mail-config.glade.h:125
-msgid "_Signature file:"
-msgstr "A_l��r�s f�jl:"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Levelek fogad�sa"
 
-#: mail/mail-config.glade.h:126
-msgid "_Username:"
-msgstr "_Felhaszn�l�n�v:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "V�lasz mindenkinek"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Biztons�g"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Biztons�g"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Lev�l k�ld�se"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Id�form�tum"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+msgstr "_HTML al��r�s:"
+
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Text Signature:"
+msgstr "_HTML al��r�s:"
+
+#: mail/mail-config.glade.h:184
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "_Biztons�gos kapcsolat haszn�lata (SSL)"
+
+#: mail/mail-config.glade.h:185
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "V�ltoz�"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_minden"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " sz�n"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "le�r�s"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:131
-msgid "placeholder"
-msgstr "helykit�lt�"
-
-#: mail/mail-config.glade.h:132
-msgid "seconds."
-msgstr "m�sodperc."
-
 #: 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."
@@ -11622,146 +11922,139 @@ msgstr "Nem siker�lt l�trehozni az S/MIME bor�t�k r�szt."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nem siker�lt l�trehozni az S/MIME dek�dol� r�szt."
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Mell�klet ment�se"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Nem siker�lt l�trehozni '%s' ideiglenes mbox-ot: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Ment�s a lemezre..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Megtekint�s be�gyazva"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Megnyit�s ezzel: %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Megtekint�s be�gyazva (%s seg�ts�g�vel)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Rejt�s"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "K�ls� n�z�ke"
 
-#: mail/mail-display.c:1162
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "�zenet tartalm�nak bet�lt�se"
 
-#: mail/mail-display.c:1657
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Hivatkoz�s megnyit�sa b�ng�sz�ben"
 
-#: mail/mail-display.c:1659
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Hivatkoz�s hely�nek m�sol�sa"
 
-#: mail/mail-display.c:1662
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Hivatkoz�s ment�se m�sk�nt (FIXME)"
 
-#: mail/mail-display.c:1665
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "K�p ment�se m�sk�nt..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s mell�klet"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nem siker�lt �rtelmezni a MIME-�zenetet. Megjelen�t�s forr�sk�nt."
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "D�tum"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Rossz c�m"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Felad�"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "V�laszc�m"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:11
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "C�mzett"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "M�solat"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Titkos m�solat"
 
-#: mail/mail-format.c:1768
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
 msgstr ""
-"Az �zenetet digit�lisan al��rt�k. Tov�bbi inform�ci��rt kattints a lakat "
-"ikonra."
-
-#: mail/mail-format.c:1791
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Az Evolution nem ismeri fel ezt a fajta al��rt �zenetet."
-
-#: mail/mail-format.c:1799
-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:1807
-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."
+"\n"
+"Levelez�: "
 
-#: mail/mail-format.c:2022
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Mutat� FTP-helyre (%s)"
 
-#: mail/mail-format.c:2036
+#: mail/mail-format.c:2120
 #, 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:2041
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Mutat� hely f�jlra (%s)"
 
-#: mail/mail-format.c:2070
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Mutat� t�voli adatra (%s)"
 
-#: mail/mail-format.c:2078
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Mutat� ismeretlen k�ls� adatra (\"%s\" t�pus)"
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Hib�s k�ls� t�rzsr�sz."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Mappa �jrabe�ll�t�sa"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11770,27 +12063,27 @@ msgstr ""
 "Nem siker�lt elmenteni a mappa metainf�j�t, val�sz�n�leg nem tudod t�bb� "
 "megnyitni ezt mapp�t: %s: %s"
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nem siker�lt menteni a mappa metainf�j�t %s-be: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nem siker�lt t�r�lni a mapp�t metaadatait: %s: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" mappa �talak�t�sa \"%s\" form�tumra"
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s-t be�ll�t�sait nem lehet megv�ltoztatni, mert az nem helyi mappa"
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11798,11 +12091,11 @@ msgstr ""
 "Ha nem tudod t�bb� megnyitni ezt a postafi�kot, \n"
 "akkor esetleg k�zzel kell megjav�tanod."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nem v�ltoztathatod meg nem helyi mapp�k form�tum�t."
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s �jrabe�ll�t�sa"
@@ -11829,117 +12122,112 @@ msgstr ""
 msgid "Working"
 msgstr "V�rj"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Mappa sz�r�se"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Levelek fogad�sa"
 
-#: mail/mail-ops.c:498 mail/mail-ops.c:527
+#: mail/mail-ops.c:538 mail/mail-ops.c:567
 msgid "However, the message was successfully sent."
 msgstr "A lev�l ennek ellen�re sikeresen elment."
 
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "'%s' k�ld�se"
 
-#: mail/mail-ops.c:683
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d �zenet k�ld�se"
 
-#: mail/mail-ops.c:702
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Hiba a %d / %d �zenetn�l"
 
-#: mail/mail-ops.c:704 mail/mail-send-recv.c:545
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "K�sz."
 
-#: mail/mail-ops.c:797
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Lev�l ment�se a mapp�ba"
 
-#: mail/mail-ops.c:877
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Levelek mozgat�sa %s-be"
 
-#: mail/mail-ops.c:877
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Levelek m�sol�sa %s-be"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Mozgat�s alatt"
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "M�sol�s alatt"
 
-#: mail/mail-ops.c:1017
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mapp�k p�szt�z�sa \"%s\"-ben"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1067 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Kuka"
-
-#: mail/mail-ops.c:1200
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Tov�bb�tott levelek"
 
-#: mail/mail-ops.c:1243
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s mappa megnyit�sa"
 
-#: mail/mail-ops.c:1315
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "%s t�rol� megnyit�sa"
 
-#: mail/mail-ops.c:1384
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s mappa elt�vol�t�sa"
 
-#: mail/mail-ops.c:1478
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s mappa t�rol�sa"
 
-#: mail/mail-ops.c:1529
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Mappa friss�t�se"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Mappa tiszt�t�sa"
 
-#: mail/mail-ops.c:1614
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s lev�l let�lt�se"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d lev�l let�lt�se"
 
-#: mail/mail-ops.c:1767
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d lev�l ment�se"
 
-#: mail/mail-ops.c:1879
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11948,7 +12236,7 @@ msgstr ""
 "Nem siker�lt l�trehozni a kimeneti f�jlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1907
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11957,11 +12245,11 @@ msgstr ""
 "Hiba a levelek ment�se k�zben: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1981
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Mell�klet ment�se"
 
-#: mail/mail-ops.c:1997
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11970,27 +12258,27 @@ msgstr ""
 "Nem lehet l�trehozni a kimeneti f�jlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2028
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nem siker�lt az adatok ki�r�sa: %s"
 
-#: mail/mail-ops.c:2097
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Sz�tkapcsol�d�s %s kiszolg�l�val"
 
-#: mail/mail-ops.c:2098
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "�jrakapcsol�d�s %s kiszolg�l�hoz"
 
-#: mail/mail-ops.c:2197
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Keres�s"
 
@@ -12026,42 +12314,42 @@ msgstr "Keres�s:"
 msgid "Matches:"
 msgstr "Tal�latok:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Megszak�t�s..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Kiszolg�l�: %s,  T�pus: %s "
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "�tvonal: %s, T�pus: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "T�pus: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Levelek k�ld�se �s fogad�sa"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Mindent megszak�t"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Friss�t�s folyamatban..."
 
-#: 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 "V�rakoz�s..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Megszak�tva"
 
@@ -12078,25 +12366,40 @@ msgstr "�rd be %s jelszav�t"
 msgid "Enter Password"
 msgstr "�rd be a jelsz�t"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "Nem teljes �zenet lett a cs�be �rva!"
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Nem siker�lt menteni az al��r�sf�jlt."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Al��r�s ment�se"
 
-#: mail/mail-summary.c:467
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Az al��r�s megv�ltozott, de nem lett mentve.\n"
+"\n"
+"Akarod menteni a v�ltoz�saidat?"
+
+#: mail/mail-signature-editor.c:357
 #, fuzzy
-msgid "Mail Summary"
-msgstr "�sszefoglal� a levelekr�l"
+msgid "Signature name:"
+msgstr "Al��r�s f�jl:"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Tov�bb�tott �zenet - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Tov�bb�tott lev�l"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Tov�bb�tott lev�l"
 
@@ -12123,10 +12426,6 @@ msgstr ""
 "    '%s'\n"
 "�s friss�tve lettek."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "VMapp�k"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "vMapp�k"
@@ -12144,87 +12443,146 @@ msgstr "A nem l�zet� '%s' vmapp�t pr�b�lod szerkeszteni."
 msgid "New VFolder"
 msgstr "�j VMappa"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Nincs t�rgy)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - �zenet"
 
-#: mail/message-list.c:662
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Nem n�zett"
 
-#: mail/message-list.c:663
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "N�zett"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Megv�laszolt"
 
-#: mail/message-list.c:665
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "T�bb l�thatatlan lev�l"
 
-#: mail/message-list.c:666
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "T�bb lev�l"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Legalacsonyabb"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Alacsonyabb"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Magasabb"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Legmagasabb"
 
-#: mail/message-list.c:937
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:944
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Ma %l:%M %p"
 
-#: mail/message-list.c:953
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Tegnap %l:%M %p"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:975
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%Y %d %b"
 
-#: mail/message-list.c:2387
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Lev�llista l�trehoz�sa"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "Esed�kes "
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "�llapot"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Megjel�lt"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "�rkezett"
 
-#: mail/message-list.etspec.h:8
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "M�ret"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "McCall"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Ugr�s el�re "
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Forr�sinform�ci�"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Tov�bb�t�s"
+
+#: 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 "V�lasz"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "V�lasz mindenkinek"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "El�n�zet"
+
+#: mail/message-tag-followup.c:315
+#, fuzzy
+msgid "Flag to Follow Up"
+msgstr "FIXME: _Z�szl� folytat�shoz..."
+
 #: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -12246,7 +12604,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Leiratkoz�s \"%s\" mapp�r�l"
 
 #: 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 "Mappa"
 
@@ -12290,6 +12648,35 @@ msgstr "_Feliratkoz�s"
 msgid "_Unsubscribe"
 msgstr "_Leiratkoz�s"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "Az Evolution tennival� csatorna be�ll�t� eszk�ze.\n"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolution lev�lszerkeszt�."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Factory az Evolution Task kontrollj�hoz"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Factory a Vezet�i �sszefoglal� Evolution komponens sz�m�ra."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Be�ll�t�sok"
+
+#: 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 "Aarhus"
@@ -22089,113 +22476,137 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Z�rich"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "Az Evolution �sszefoglal�j�t tartalmaz� mappa"
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Nem siker�lt az Evolution �sszefoglal� komponens�t inicializ�lni."
-
-#: 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 "Tal�lkoz�k"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "Nincsenek tal�lkoz�k"
 
-#: my-evolution/e-summary-calendar.c:375
+#: my-evolution/e-summary-calendar.c:400
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:395
+#: my-evolution/e-summary-calendar.c:420
 msgid "No description"
 msgstr "Nincs le�r�s"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-mail.c:151
 msgid "Mail summary"
 msgstr "�sszefoglal� a levelekr�l"
 
+#. 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 "VMapp�k"
+
+#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
+#: my-evolution/e-summary-mail.c:761
+msgid "Local Folders"
+msgstr "Helyi mapp�k"
+
 #. 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:606
+#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "LHBP:LHSY"
 
-#: my-evolution/e-summary-preferences.c:445
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com -- A nap mond�sa"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "A nap mond�sa"
 
-#: my-evolution/e-summary-preferences.c:946
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "�j h�rforr�s hozz�ad�sa"
 
-#: my-evolution/e-summary-preferences.c:954
+#: my-evolution/e-summary-preferences.c:728
 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-preferences.c:958
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "N�v:"
 
-#: my-evolution/e-summary-preferences.c:1504
-msgid "Summary Settings"
-msgstr "�sszefoglal� be�ll�t�sai"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "Hiba az RDF let�lt�se k�zben"
 
-#: my-evolution/e-summary-rdf.c:443
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr "H�rforr�s"
 
-#: my-evolution/e-summary-tasks.c:241
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "Mindenki"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+msgid "Add ->"
+msgstr "Hozz�ad�s ->"
+
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr " _T�rl�s"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Shannon"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Nincsenek feladatok"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(Nincs le�r�s)"
 
-#: my-evolution/e-summary-weather.c:70
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Id�j�r�s"
 
-#: my-evolution/e-summary-weather.c:504
+#: my-evolution/e-summary-weather.c:279
+#, fuzzy
+msgid "There was an error downloading data for"
+msgstr "Hiba t�rt�nt a h�rforr�s let�lt�se k�zben."
+
+#: my-evolution/e-summary-weather.c:501
 msgid "Weather"
 msgstr "Id�j�r�s"
 
-#: my-evolution/e-summary-weather.c:667
-msgid "Regions"
-msgstr "R�gi�k"
-
-#: my-evolution/e-summary.c:190
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%Y %B %e, %A"
 
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "V�rj..."
 
-#: 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 "�sszefoglal� nyomtat�sa"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Az �sszefoglal� nyomtat�sa sikertelen"
 
@@ -22203,38 +22614,6 @@ msgstr "Az �sszefoglal� nyomtat�sa sikertelen"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "A Vezet�i �sszefoglal� komponens nem tudta inicializ�lni a Bonob�t.\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 "csom�"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "km/h"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "Hgin"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "Hgmm"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "m�rf�ld"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilom�ter"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Der�lt �g"
@@ -23378,160 +23757,124 @@ msgid "Drifting dust whirls"
 msgstr "�tvonul� poros forg�sz�l"
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr " _T�rl�s"
-
-#: my-evolution/my-evolution.glade.h:2
 msgid "Add n_ews feed"
 msgstr "_H�rforr�s hozz�ad�sa"
 
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "M_inden �llom�s:"
-
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "Min_den mappa:"
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "Minden h�r_forr�s:"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr "C_elsius"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 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:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr "Mutatott elemek ma_xim�lis sz�ma:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr "H�rlet�lt�s be�ll�t�sai"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr "Egy h�n_ap"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr "Egy _h�t"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr "_Friss�t�si id� (m�sodperc):"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr "_Friss�t�si id� (m�sodperc):"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 msgid "S_how full path for folders"
 msgstr "Mapp�k _teljes el�r�si �tj�nak mutat�sa"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr "�sszes _feladat mutat�sa"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _today's tasks"
 msgstr "A _mai feladatok mutat�sa"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr "A h�m�rs�klet m�rt�kegys�ge:"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "Feladatok "
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr "Id�j�r�s be�ll�t�sa"
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "_Mapp�k megjelen�t�se:"
-
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "�_llom�sok megjelen�t�se:"
-
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
-msgstr "_Megjelen�tett h�rforr�sok:"
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr "�_t nap"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr "_Lev�l"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 msgid "_News Feeds"
 msgstr "H�rforr�sok"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr "Egy _nap"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr "�_temterv"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr "_Id�j�r�s"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
 #, fuzzy
-msgid "Factory for the Evolution notes component."
-msgstr "Factory az Evolution napt�r komponens�hez."
+msgid "Configuration control for Evolution default folders."
+msgstr "Az Evolution tennival� csatorna be�ll�t� eszk�ze.\n"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Factory for the Notes control"
-msgstr "Factory a tesztkomponens sz�m�ra."
+msgid "Default Folders"
+msgstr "K�l�nleges mapp�k"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Az Evolution h�j."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "R�szletek"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "M�velet megszak�t�sa"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Be�rkezett levelek"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Post�zand� levelek"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Helyi mapp�k"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution telep�t�s"
 
-#: 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"
@@ -23539,17 +23882,17 @@ msgstr ""
 "Az Evolutionbenak ez az �j verzi�ja tov�bbi f�jlokat fog telep�teni\n"
 "a szem�lyes Evolution k�nyvt�radba"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Nyomd meg az \"OK\" gombot a f�jlok telep�t�s�hez, vagy a \"M�gse\" gombot a "
 "kil�p�shez."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Nem siker�lt rendesen friss�teni a f�jlokat."
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -23560,7 +23903,7 @@ msgstr ""
 "%s\n"
 "Hiba: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -23569,7 +23912,7 @@ msgstr ""
 "Hiba t�rt�nt a f�jlok m�sol�sa k�zben ide: \n"
 "`%s'."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -23580,7 +23923,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -23591,7 +23934,7 @@ msgstr ""
 "jogosults�gai nem megfelel�ek. Tedd olvashat�v�\n"
 "�s v�grehajthat�v�, �s ind�tsd �jra az Evolutiont."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -23602,7 +23945,7 @@ msgstr ""
 "el kell t�vol�tani, hogy az Evolution helyesen m�k�dhessen.\n"
 "T�r�ld le a f�jlt �s ind�tsd �jra az Evolutiont."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -23613,7 +23956,7 @@ msgstr ""
 "K�rlek mozgasd el a f�jlt, hogy az Evolution\n"
 "telep�lni tudjon."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -23627,7 +23970,7 @@ msgstr ""
 "t�vol�tani, miel�tt a program futhatna.\n"
 "Szeretn�d elt�vol�tani ezt a k�nyvt�rat?"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -23638,49 +23981,53 @@ msgstr ""
 "K�rlek t�r�ld a f�jlt, hogy az Evolution\n"
 "telep�lni tudjon."
 
-#: 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."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "K�sz�tett�k:"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Nem siker�lt ellen�rizni a mapp�t: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Nem siker�lt �tnevezni a mapp�t:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Nem siker�lt a mapp�t �nmag�ra �thelyezni."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Nem siker�lt mapp�t �nmag�ra m�solni."
 
-#: 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 "Nem lehet a mapp�t a saj�t almapp�j�ba �thelyezni."
 
-#: 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 "Add meg a mapp�t, amelybe \"%s\" mapp�t m�solod:"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Mappa m�sol�sa"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Add meg a mapp�t, amelybe \"%s\" mapp�t mozgatod:"
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Mappa �thelyez�se"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23689,18 +24036,18 @@ msgstr ""
 "Nem siker�lt t�r�lni a mapp�t:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" t�rl�se"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: shell/e-shell-folder-commands.c:425
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "T�nyleg t�r�lni akarod ezt a mapp�t: '%s'?"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23709,16 +24056,16 @@ msgstr ""
 "Nem siker�lt �tnevezni a mapp�t:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" mappa �tnevez�se erre:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Mappa �tnevez�se"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23733,7 +24080,7 @@ msgstr ""
 "Nem siker�lt elk�sz�teni a megadott mapp�t:\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 - �j mappa k�sz�t�se"
 
@@ -23749,7 +24096,7 @@ msgstr ""
 msgid "New..."
 msgstr "�j..."
 
-#: 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 "(N�vtelen)"
 
@@ -23923,8 +24270,8 @@ msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "Nem siker�lt elind�tani az Evolution Levelez�be�ll�t� Var�zsl� fel�let�t\n"
 
-#: 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:506
+#: shell/e-shell-user-creatable-items-handler.c:551
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "�j"
@@ -23945,92 +24292,95 @@ msgstr "A mappa neve nem tartalmazhat '/' jelet."
 msgid "'.' and '..' are reserved folder names."
 msgstr "A '.' �s a '..' fenntartott mappanevek."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nem tal�lhat� a $PATH-odban."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Nem siker�lt futtatni a Bug buddy-t."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "A Ximian Evolution n�vjegye"
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Ugr�s mapp�ba..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "V�laszd ki a megnyitand� mapp�t"
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "�j ind�t�ikon l�trehoz�sa"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:566
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "V�laszd ki az ind�t�ikon c�lpontj�t k�pez� mapp�t:"
 
-#: shell/e-shell-view-menu.c:577
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "�gy t�nik, hogy nincsenek telep�tve a rendszerre GNOME Pilot eszk�z�k."
-
-#: shell/e-shell-view-menu.c:585
-#, c-format
-msgid "Error executing %s."
-msgstr "Hiba a %s v�grehajt�sa k�zben."
-
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "_Munka a h�l�zatban"
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "K_apcsolat n�lk�li munka"
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Kapcsolat n�lk�li munka"
 
-#: shell/e-shell-view.c:215
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Nem jelen�thet� meg a mappa)"
 
-#: shell/e-shell-view.c:1598
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1600
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(semmi)"
 
-#: 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 ""
 "A Ximian Evolution a h�l�zatban van. Kattints erre a gombra a kapcsolat "
 "n�lk�li munk�hoz."
 
-#: shell/e-shell-view.c:1654
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "A Ximian Evolution felk�sz�l a kapcsolat n�lk�li munk�ra."
 
-#: 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 ""
 "A Ximian Evolution kapcsolat n�lk�li m�dban van. Kattints erre a gombra a "
 "h�l�zatra csatlakoz�shoz."
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Az aktiv�l�rendszer �ltal adott hiba:\n"
+"%s"
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nem siker�lt be�ll�tani a helyi t�rter�letet -- %s"
 
-#: shell/e-shell.c:1660
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24041,19 +24391,23 @@ msgstr ""
 "v�ratlanul kil�pett. Ki kell l�pned az Evolutionb�l, �s �jra\n"
 "el kell ind�tanod, hogy ism�t el�rhesd az adataidat."
 
-#: shell/e-shell.c:1887
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "�rv�nytelen argumentumok"
 
-#: shell/e-shell.c:1889
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Nem siker�lt regisztr�lni az OAF-ban"
 
-#: shell/e-shell.c:1891
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "A be�ll�t�sok adatb�zisa nem tal�lhat�"
 
-#: shell/e-shell.c:1893 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "�ltal�nos hiba"
 
@@ -24170,76 +24524,72 @@ msgstr "_T�rl�s"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Vedd le ezt az elemet az ind�t�s�vr�l"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Nem siker�l elmenteni az elemeket."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Ind�t�ikonok"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Nem siker�lt �tvinni a mapp�t:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Be�rkezett levelek"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(n�vtelen)"
+#: 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 "Nincs hiba"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "A megadott n�ven m�r l�tezik mappa"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "A megadott mappat�pus nem j�"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "I/O hiba"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Nincs el�g hely a mappa elk�sz�t�s�hez"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "A mappa nem �res."
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "A megadott mappa nem tal�lhat�"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "A funkci� nincs m�g ebben a t�rol�ban meg�rva"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "A m�velet nem t�mogatott"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "A megadott t�pus nem t�mogatott ebben a t�rol�ban."
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "A megadott mappa nem m�dos�that� vagy t�r�lhet�"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nem lehet a mapp�t a saj�t almapp�j�ba �thelyezni."
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "Nem k�nyvt�rat l�trehozni ezen a n�ven"
 
@@ -24249,10 +24599,13 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% k�sz)"
 
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<kattints ide a mappa kiv�laszt�s�hoz>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -24290,67 +24643,67 @@ msgstr ""
 "Az aktiv�l�rendszer �ltal adott hiba:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "CORBA hiba"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Megszak�tva"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "�rv�nytelen argumentum"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "M�r van tulajdonos"
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Nincs tulajdonos"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Nem tal�lhat�"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Nem t�mogatott t�pus"
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Nem t�mogatott s�ma"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Nem t�mogatott m�velet"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Bels� hiba"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "L�tezik"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "�rv�nytelen URI"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Van almapp�ja."
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Nincs hely"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "A r�gi tulajdonos meghalt"
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
 #, fuzzy
 msgid "Test type"
 msgstr "F�jlt�pus:"
@@ -24479,32 +24832,49 @@ msgstr "Ne k�rdezze meg t�bbet."
 msgid "Evolution can import data from the following files:"
 msgstr "Az Evolution a k�vetkez� f�jlokb�l k�pes adatokat import�lni:"
 
-#: shell/main.c:83
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:89
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Az Evolution most kil�p..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "A Ximian Evolution h�j nem el�rhet�."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nem siker�lt inicializ�lni a Ximian Evolution h�jat: %s"
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Ind�t�k�perny� letilt�sa"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Import�l�s kezdete"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Az okos import�l�k ind�t�sa"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr "Minden �sszetev� hibakeres� �zeneteit f�jlba ir�ny�tja."
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nem siker�lt inicializ�lni a Bonobo komponens rendszert."
 
@@ -24527,242 +24897,205 @@ msgstr "Kimeneti f�jl"
 msgid "No filename provided."
 msgstr "Nincs f�jln�v megadva."
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Mapp�ba m�sol�s..."
+
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kijel�l�s m�sol�sa"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+msgid "Copy to Folder..."
+msgstr "Mapp�ba m�sol�s..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "�j n�vjegy k�sz�t�se"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "�j c�mlista k�sz�t�se"
 
-#: 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 "Kijel�l�s kiv�g�sa"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "Kijel�lt n�vjegyek t�rl�se"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "�j lista"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "N�vjegy k�ld�se m�snak..."
+
+#: ui/evolution-addressbook.xml.h:14
+msgid "Move to Folder..."
+msgstr "Mapp�ba mozgat�s..."
 
-#: 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 "V�g�lap beilleszt�se"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "A nyomtatand� n�vjegyek nyomtat�si k�pe"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Kijel�lt n�vjegyek nyomtat�sa"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Kijel�lt n�vjegyek ment�se VCard-k�nt."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Mindet kijel�li"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Az �sszes n�vjegy kijel�l�se"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "Lev�l _k�ld�se ennek a szem�lynek..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Lev�l k�ld�se a kijel�lt c�mekre."
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Lev�l k�ld�se ennek a szem�lynek"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "A kijel�lt n�vjegy elk�ld�se valakinek."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Le�ll�t�s"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Bet�lt�s le�ll�t�sa"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:30
 #, fuzzy
 msgid "View the current contact"
 msgstr "a pontos id� most"
 
-#: 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-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:16
+#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
+#: ui/evolution.xml.h:35
 msgid "_Actions"
 msgstr "_M�veletek"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Addressbook Sources..."
-msgstr "_C�mjegyz�k forr�sai..."
-
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_N�vjegyek"
-
 #: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "_C�mlista"
 
-#: 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 "N�vjegy _tov�bb�t�sa..."
 
-#: 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:103
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "_Nyomtat�s..."
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "�_thelyez�s mapp�ba..."
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "_Ment�s VCard-k�nt"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_N�vjegy keres�se"
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Mindet kijel�li"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "A napt�r be�ll�t�sai"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "Lev�l _k�ld�se ennek a szem�lynek..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "�j eg�sz _napos esem�my l�trehoz�sa"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "�j _feladat l�trehoz�sa"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "�j _tal�lkoz� l�trehoz�sa"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "Eg�sz napos esem�ny l�trehoz�sa"
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Nap"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "A tal�lkoz� t�rl�se"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Ugr�s"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Ugr�s visszafel�"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Ugr�s el�re "
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "_D�tumra ugr�s"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Ugr�s adott d�tumra"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Ugr�s a mai napra"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "H�nap"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "�j tal�lkoz�"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-msgid "New Task"
-msgstr "�j feladat"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "A nyomtatand� napt�r nyomtat�si k�pe"
 
-#: 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 "Nyomtat�si _k�p"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Napt�r nyomtat�sa"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Szabad/foglalt inform�ci� k�zz�t�tele ehhez a napt�rhoz"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Egy nap mutat�sa"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Egy h�nap mutat�sa"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Egy h�t mutat�sa"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "A munkah�t mutat�sa"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "H�t"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "_Tal�lkoz�..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Napt�r be�ll�t�sai"
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "Szabad/foglalt inform�ci� _k�zz�t�tele"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "_Feladat..."
-
 #: 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
@@ -24792,18 +25125,18 @@ msgstr "El�n�zeti k�pet ad a nyomtatand� elemr�l"
 msgid "Print this item"
 msgstr "Elem nyomtat�sa"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Nyomtat�s..."
-
 #: 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 "Ment�s"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Ment�s m�sk�nt..."
+
 #: 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 "Ment�s �s bez�r�s"
 
@@ -24819,8 +25152,8 @@ msgstr "Elem ment�se lemezre"
 #: 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:40
 msgid "_File"
 msgstr "_F�jl"
 
@@ -24838,10 +25171,14 @@ msgstr "M_ent�s m�sk�nt..."
 msgid "Save the contact and close the dialog box"
 msgstr "A n�vjegy ment�se �s a p�rbesz�dablak bez�r�sa "
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "Lev�l _k�ld�se ennek a szem�lynek..."
+
 #: 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 "_Ment�s"
 
@@ -24901,6 +25238,10 @@ msgstr "�rtekezlet tervez�se ehhez az elemhez"
 msgid "Customise My Evolution"
 msgstr "A Saj�t Evolution testreszab�sa"
 
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "M�gse"
+
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Megszak�tja az aktu�lis lev�lm�veletet"
@@ -24910,82 +25251,54 @@ msgid "Compose _New Message"
 msgstr "�_j lev�l �r�sa"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Postafi�kok l�trehoz�sa, szerkeszt�se �s egy�b be�ll�t�sok"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Szab�lyok alkot�sa vagy szerkeszt�se �j levelek sz�r�s�re"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Virtu�lis mapp�k l�trehoz�sa vagy szerkeszt�se"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "_Kuka �r�t�se"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "_Jelszavak elfelejt�se"
 
-#: 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 "Elfelejti a megjegyzett jelszavakat, �jra meg fogja k�rdezni"
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "�j lev�l"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Ablak megnyit�sa lev�l�r�shoz"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Minden t�r�lt lev�l v�gleges elt�vol�t�sa az �sszes mapp�b�l"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "K�ld�s / Fogad�s"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "V�rakoz� levelek elk�ld�se �s �j levelek let�lt�se"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Lev�lbetekint�-ablak mutat�sa"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Feliratkoz�s �s leiratkoz�s t�voli kiszolg�l�k mapp�ira"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "Virtu�lis mapp�k szerkeszt�je..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Sz�r�k..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "_Lev�l"
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "_Levelez� be�ll�t�sai"
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Betekint� ablakt�bla"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "_K�ld�s / Fogad�s"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "_Feliratkoz�s mapp�kra..."
 
@@ -25081,11 +25394,11 @@ msgstr "A kijel�lt levelek ideiglenes elrejt�se"
 msgid "Threaded Message list"
 msgstr "T�ma szerinti lev�llista"
 
-#: 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 "_Tiszt�t�s"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Mappa"
 
@@ -25101,149 +25414,159 @@ msgstr "_Tulajdons�gok..."
 msgid "_Threaded Message List"
 msgstr "_T�ma szerinti lev�llista"
 
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Felad� hozz�ad�sa a c�mjegyz�khez"
+
 #: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Sz�r�k alkalmaz�sa"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Felad� hozz�ad�sa a c�mjegyz�khez"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Sz�r�szab�lyok alkalmaz�sa a kijel�lt levelekre"
 
-#: 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 "V�lasz �r�sa a kijel�lt lev�l �sszes c�mzettj�nek"
 
-#: 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 "V�lasz �r�sa a levelez�list�ra kijel�lt lev�lhez"
 
-#: 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 "V�lasz �r�sa a kijel�lt lev�l felad�j�nak"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "A kijel�lt levelek m�sol�sa m�sik mapp�ba"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "_Virtu�lis mappa gy�rt�sa lev�lb�l"
 
-#: 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 "Szab�ly alkot�sa, amely sz�ri az ett�l felad�t�l �rkez� leveleket"
 
-#: 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 ""
 "Szab�ly alkot�sa, amely sz�ri az ezeknek a c�mzetteknek sz�l� leveleket"
 
-#: 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 ""
 "Szab�ly alkot�sa, amely sz�ri az erre a levelez�list�ra �rkez� leveleket"
 
-#: 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 "Szab�ly alkot�sa, amely sz�ri az ilyen t�rgy� leveleket"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Virtu�lis mappa l�trehoz�sa ezekre a c�mzettekre"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Virtu�lis mappa l�trehoz�sa erre a levelez�list�ra"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Virtu�lis mappa l�trehoz�sa erre a felad�ra"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Virtu�lis mappa l�trehoz�sa erre a t�rgyra"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Sz�veg bet�m�ret�nek cs�kkent�se"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "A k�vetkez� fontos lev�l megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "A k�vetkez� lev�l megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "A k�vetkez� olvasatlan lev�l megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "A k�vetkez� olvasatlan sz�l megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Az el�z� fontos lev�l megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Az el�z� lev�l megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Az el�z� olvasatlan lev�l megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Tov�bb�t�s"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Sz�r� a _levelez�list�ra..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "S_z�r� a felad�ra..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Sz�r� a _c�mzettekre..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Sz�r� a _t�rgyra..."
 
-#: ui/evolution-mail-message.xml.h:30
-msgid "Force images in HTML mail to be loaded"
-msgstr "K�pek bet�lt�s�nek k�nyszer�t�se HTML levelekben"
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward"
-msgstr "Tov�bb�t�s"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward As"
-msgstr "Tov�bb�t�s mint"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Attached"
-msgstr "Tov�bb�t�s _mell�kletk�nt"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "A kijel�lt leveleket t�rl�sre jel�li ki"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Inline"
-msgstr "Tov�bb�t�s _be�gyazottk�nt"
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "_Teljes n�v..."
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Forward _Quoted"
-msgstr "Tov�bb�t�s _id�zetk�nt"
+msgid "Force images in HTML mail to be loaded"
+msgstr "K�pek bet�lt�s�nek k�nyszer�t�se HTML levelekben"
 
-#: 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 "A kijel�lt lev�l tov�bb�t�sa az �j lev�l t�rzs�ben"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "A lev�l tov�bb�t�sa id�zetk�nt, ahogy a v�laszban szok�s"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "A kijel�lt lev�l tov�bb�t�sa valakinek"
 
-#: 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 "A kijel�lt lev�l tov�bb�t�sa valakinek mell�kletk�nt"
 
@@ -25259,24 +25582,32 @@ msgstr "_K�pek bet�lt�se"
 msgid "Mark as I_mportant"
 msgstr "_Fontos"
 
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "_Olvasatlan"
+
 #: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "_Nem fontos"
 
 #: 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 "A kijel�lt leveleket elolvasottnak jel�li meg"
 
 #: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as important"
+#, fuzzy
+msgid "Mark the selected message(s) as important"
 msgstr "A kijel�lt leveleket fontosnak jel�li meg"
 
 #: 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 "A kijel�lt leveleket olvasatlannak jel�li meg"
 
 #: ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as unimportant"
+#, fuzzy
+msgid "Mark the selected message(s) as unimportant"
 msgstr "A kijel�lt leveleket nem fontosnak jel�li meg"
 
 #: ui/evolution-mail-message.xml.h:51
@@ -25288,7 +25619,8 @@ msgid "Move"
 msgstr "�thelyez�s"
 
 #: ui/evolution-mail-message.xml.h:53
-msgid "Move selected messages to another folder"
+#, fuzzy
+msgid "Move selected message(s) to another folder"
 msgstr "A kijel�lt levelek �thelyez�se egy m�sik mapp�ba"
 
 #: ui/evolution-mail-message.xml.h:54
@@ -25296,64 +25628,63 @@ msgid "Next"
 msgstr "K�vetkez�"
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Important Message"
+#, fuzzy
+msgid "Next _Important Message"
 msgstr "K�vetkez� fontos lev�l"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Message"
-msgstr "K�vetkez� lev�l"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "K�vetkez� sz�l"
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Next Unread Message"
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "K�vetkez� olvasatlan lev�l"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Az kijel�lt lev�l megnyit�sa �j ablakban"
 
-#: 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 "A kijel�lt lev�l megnyit�sa a szerkeszt�ben �jrak�ld�s c�lj�b�l"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Eredeti _m�ret"
 
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "El�z� olvasatlan lev�l"
+
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "El�z� fontos lev�l"
+
+#: ui/evolution-mail-message.xml.h:63
 msgid "Preview the message to be printed"
 msgstr "El�n�zeti k�pet ad a nyomtatand� lev�lr�l"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous"
 msgstr "El�z�"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Important Message"
-msgstr "El�z� fontos lev�l"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Message"
-msgstr "El�z� lev�l"
-
-#: ui/evolution-mail-message.xml.h:66
-msgid "Previous Unread Message"
-msgstr "El�z� olvasatlan lev�l"
-
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Lev�l nyomtat�sa"
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply"
-msgstr "V�lasz"
+#: 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 "V�lasz mindenkinek"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "A kijel�lt lev�l tov�bb�t�sa valakinek"
 
 #: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
@@ -25424,8 +25755,9 @@ msgid "VFolder on _Subject..."
 msgstr "VMappa a _t�rgyra..."
 
 #: ui/evolution-mail-message.xml.h:92
-msgid "_Apply Filters"
-msgstr "_Sz�r�k alkalmaz�sa"
+#, fuzzy
+msgid "_Attached"
+msgstr "Csatol�s"
 
 #: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
@@ -25440,43 +25772,71 @@ msgid "_Forward Message"
 msgstr "Lev�l _tov�bb�t�sa"
 
 #: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Ugr�s"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "Be�gyazott"
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "N_agyobb"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "Lev�l _megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "�_thelyez�s mapp�ba"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "K�vetkez� lev�l"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Szok�sos megjelen�t�s"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "Lev�l _megnyit�sa"
 
-#: 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 "El�z� lev�l"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Id�zet"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_Eszk�z�k"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Vissza�ll�t�s"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Ablak bez�r�sa"
 
 #: 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:36
 msgid "_Close"
 msgstr "_Bez�r�s"
 
 #: 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:56
 msgid "_View"
 msgstr "_N�zet"
 
@@ -25500,11 +25860,11 @@ msgstr "Lev�l titkos�t�sa PGP-vel"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Lev�l titkos�t�sa S/MIME titkos�t�si tan�s�tv�nnyal"
 
-#: 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 "For_m�tum"
 
-#: 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"
 
@@ -25520,6 +25880,10 @@ msgstr "Egy f�jl beilleszt�se a lev�lbe sz�vegk�nt"
 msgid "Insert text file..."
 msgstr "Sz�vegf�jl beilleszt�se..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Megnyit�s"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "F�jlmegnyit�s"
@@ -25553,7 +25917,7 @@ msgid "Save in folder..."
 msgstr "Ment�s mapp�ba..."
 
 #: 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 "Az aktu�lis f�jl ment�se"
 
@@ -25578,6 +25942,7 @@ msgid "Send _later"
 msgstr "_K�ld�s k�s�bb"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Lev�l k�ld�se HTML form�tumban"
 
@@ -25646,7 +26011,7 @@ msgid "_From Field"
 msgstr "_Felad� mez�"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Beilleszt�s"
 
@@ -25658,11 +26023,7 @@ msgstr "_Megnyit�s..."
 msgid "_Reply-To Field"
 msgstr "_V�laszc�m mez�"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Biztons�g"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_S�g�"
 
@@ -25718,43 +26079,41 @@ msgstr "A leg�jabb inform�ci�k megszerz�se a feladatr�l"
 msgid "Re_fresh Task"
 msgstr "_Feladatok friss�t�se"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "A feladatn�zet be�ll�t�sai"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kijel�lt feladat m�sol�sa"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Kijel�lt feladat kiv�g�sa"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 #, fuzzy
 msgid "Delete completed tasks"
 msgstr "Kijel�lt feladatok t�rl�se"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Kijel�lt feladatok t�rl�se"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "Mar_k as Complete"
 msgstr "_Megjel�l�s k�szk�nt"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Feladat beilleszt�se a v�g�lapr�l"
 
-#: ui/evolution-tasks.xml.h:15
-msgid "Tasks Settings..."
-msgstr "Feladatok be�ll�t�sai..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "A nyomtatand� n�vjegyek nyomtat�si k�pe"
 
-#: ui/evolution-tasks.xml.h:22
-msgid "_Task"
-msgstr "_Feladat"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "A feladat szerkeszt�se"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25821,113 +26180,118 @@ msgid "Open this folder in an other window"
 msgstr "A mappa megnyit�sa egy m�sik ablakban"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "K�ld�s / Fogad�s"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "V�rakoz� levelek elk�ld�se �s �j levelek let�lt�se"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "A Ximian Evolutionnel kapcsolatos inform�ci�k megjelen�t�se"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Hibajelent�s bek�ld�se"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "_Hibajelent�s bek�ld�se"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Hibajelent�s bek�ld�se a Bug Buddy seg�ts�g�vel."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "V�lt�s"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Mutassa-e a mappas�vot"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mutassa-e ind�t�s�vot"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "V�lt�s kapcsolat n�lk�li munk�ra"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "A kijel�lt mapp�k megtekint�se"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _GYIK"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "A Ximian Evolution _n�vjegye..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_M�sol�s..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "_Mappas�v"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "Mapp�ra _ugr�s..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Import�l�s..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "�_thelyez�s..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "�_j"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "�j _mappa"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_Pilot be�ll�t�sai"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "�_tnevez�s..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_K�ld�s / Fogad�s"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Ind�t�ikon"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "_Ind�t�s�v"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Az �sszefoglal� be�ll�t�sainak megv�ltoztat�sa"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "�sszefoglal� nyomtat�sa"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "�jrabet�lt�s"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "N�zet �jrabet�lt�se"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "�ssze_foglal� be�ll�t�sai..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "C�mk�rty�k"
@@ -25941,18 +26305,27 @@ msgid "Phone List"
 msgstr "Telefonlista"
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "V�lassz mapp�t"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Felad� szerint"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "�llapot szerint"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "T�rgy szerint"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Levelek"
 
@@ -25988,11 +26361,22 @@ msgstr ""
 "id�z�n�t.\n"
 "A kicsiny�t�shez haszn�ld a jobb eg�rgombot."
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "_Aktu�lis n�zet"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "_Aktu�lis n�zet"
+
+#: widgets/menus/gal-view-menus.c:333
+#, fuzzy
+msgid "Save Custom View"
+msgstr "Kiemelt �gyf�l"
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "N�zet megad�sa"
 
@@ -26085,20 +26469,20 @@ msgstr "Ukr�n"
 msgid "Visual"
 msgstr "Visalia"
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ismeretlen karakterk�szlet: %s"
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Add meg a haszn�land� karakterk�szlet: "
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "M�s..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Karakterk�dol�s"
 
@@ -26106,30 +26490,32 @@ msgstr "Karakterk�dol�s"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Keres�sszerkeszt�"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Keres�s ment�se"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Hozz�ad�s a mentett keres�sekhez"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "T�rl�s"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Keres�s ment�se"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Mutasd mind"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Hozz�ad�s a mentett keres�sekhez"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Inform�ci�"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Hiba"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "K�rd�s"
@@ -26143,11 +26529,21 @@ msgstr "�zenet"
 msgid "Don't show this message again."
 msgstr "Ne jelenjen meg t�bb� ez az �zenet."
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "_Keres�s"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Keres�s most"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "T�rl�s"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "T�rl�s"
+
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Keres�s most"
 
@@ -26173,8 +26569,1135 @@ msgstr "init_corba(): nem siker�lt a GNOME inicializ�l�sa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 
-#~ msgid "Email Address:"
-#~ msgstr "Emailc�m:"
+#~ msgid "Card: "
+#~ msgstr "K�rtya:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "N�v:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ " El�tag:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Adott:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Egy�b:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Csal�di:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ut�tag:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Sz�let�si d�tum: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "C�m:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postafi�k:   "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ " K�l:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  �t:          "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  V�ros:       "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  R�gi�:       "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ " Ir�ny�t�sz�m: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Orsz�g:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "K�zbes�t� c�mke: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefonok:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefon:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "E-mail:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "E-mail:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Id�z�na: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Geo Location: "
+#~ msgstr ""
+#~ "\n"
+#~ "Hely: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "�zleti szab�ly:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "C�g:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ " N�v:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ " Egys�g:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ " 2. egys�g:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ " 3. egys�g:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ " 4. egys�g:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kateg�ri�k:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Megjegyz�s:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Egyedi sz�veg:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Nyilv�nos kulcs:"
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Kapcsol�d�s az LDAP-kiszolg�l�hoz..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "V�rakoz�s a kapcsol�d�sra az LDAP-kiszolg�l�hoz..."
+
+#~ msgid "New _Contact"
+#~ msgstr "�_j n�vjegy"
+
+#~ msgid "New Contact _List"
+#~ msgstr "�j _c�mlista"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "C�mjegyz�k szerkeszt�se"
+
+#, fuzzy
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "Hiteles�t�s sz�ks�ges"
+
+#~ msgid "Account Name"
+#~ msgstr "Postafi�k neve"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "C�mjegyz�k hozz�ad�sa"
+
+#~ msgid "Advanced"
+#~ msgstr "Halad�"
+
+#~ msgid "Base"
+#~ msgstr "Alap"
+
+#, fuzzy
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "A kiszolg�l� megk�veteli a _hiteles�t�st"
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
+#~ "server"
+#~ msgstr ""
+#~ "Az Evolution ezt az emailc�met haszn�lja majd a hiteles�t�shez a kiszolg�l�n"
+
+#~ msgid "Server Name"
+#~ msgstr "Kiszolg�l� neve:"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "Az al�bbi adatok sz�ks�gesek a c�mjegyz�k hozz�ad�s�hoz."
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "Ez az adat nem sz�ks�ges a legt�bb LDAP-kiszolg�l�hoz."
+
+#~ 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 ""
+#~ "Ezt az adatot az LDAP-kiszolg�l� haszn�lja arra, hogy meghat�rozza a keres�s "
+#~ "sor�n felhaszn�land� csom�pontokat. Tov�bbi indform�ci��rt keresd fel a "
+#~ "rendszergazd�t."
+
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact your "
+#~ "server administrator for more information."
+#~ msgstr ""
+#~ "Ez az alapcsom�pont, amelyb�l minden keres�s kiindul az LDAP-kiszolg�l�n. "
+#~ "Tov�bbi inform�ci��rt keresd fel a rendszergazd�t."
+
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Ez annak a kiszolg�l�nak a neve, ahol a c�mjegyz�ked elhelyezkedik."
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Ez az a port, amelyet az LDAP-kiszolg�l�d haszn�l."
+
+#~ msgid "_Port:"
+#~ msgstr "_Port:"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Egy�b c�mt�rak"
+
+#~ msgid "Name contains"
+#~ msgstr "A n�v tartalmazza"
+
+#~ msgid "Email contains"
+#~ msgstr "Az emailc�m tartalmazza"
+
+#~ msgid "(none)"
+#~ msgstr "(semmi)"
+
+#~ msgid "C_ontaining:"
+#~ msgstr "T_artalmazza:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr ""
+#~ "Olyan n�vjegyek mutat�sa, amelyek eleget tesznek a k�vetkez� felt�teleknek:"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "T�nyleg t�r�lni akarod \n"
+#~ "ezt a n�vjegyet?"
+
+#~ msgid "Starting:"
+#~ msgstr "Kezdet:"
+
+#~ msgid "Ending:"
+#~ msgstr "V�g:"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "�j tal�lkoz� l�trehoz�sa"
+
+#~ msgid "Create a new task"
+#~ msgstr "�j feladat l�trehoz�sa"
+
+#~ msgid "New _Task"
+#~ msgstr "�j _feladat"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "�j tal�lkoz� l�trehoz�sa az alap�rtelmezett _eml�keztet�vel"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "A _h�t els� napja:"
+
+#~ msgid "_Other"
+#~ msgstr "_M�s"
+
+#~ msgid "Click here to add an attendee"
+#~ msgstr "Kattints ide r�sztvev� hozz�ad�s�hoz"
+
+#~ 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 "A _feladat t�rl�se"
+
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "�rtekezlet kezdete: <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "Feladat kezdete: <b>"
+
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Szabad/foglalt inform�ci� kezdete: <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Kezd�dik: <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Megbesz�l�s v�ge: <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Szabad/foglalt inform�ci� v�ge: <b>"
+
+#~ msgid "Ends: <b>"
+#~ msgstr "V�ge: <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr "A feladat befejezve: <b> "
+
+#~ msgid "Task Due: <b>"
+#~ msgstr "A feladat hat�rideje: <b>"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "iCalendar inform�ci�"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "iCalendar hiba"
+
+#~ msgid "An unknown person"
+#~ msgstr "Ismeretlen szem�ly"
+
+#~ msgid ""
+#~ "<br> Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr ""
+#~ "<br> Olvasd el a k�vetkez�ket, �s v�lassz ki egy m�veletet az al�bbi men�b�l."
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Nincs</i>"
+
+#~ msgid "Choose an action:"
+#~ msgstr "V�lassz egy m�veletet:"
+
+#~ msgid "Update"
+#~ msgstr "Friss�t�s"
+
+#~ msgid "Accept"
+#~ msgstr "Elfogadva"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "K�s�rletileg elfogadva"
+
+#~ msgid "Decline"
+#~ msgstr "Elutas�tva"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Szabad/foglalt inform�ci� k�ld�se"
+
+#~ msgid "Update respondent status"
+#~ msgstr "V�laszol� �llapot�nak friss�t�se"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Legut�bbi inform�ci� k�ld�se"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> inform�ci�t tett k�zz� az �rtekezletr�l."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Inform�ci� az �rtekezletr�l"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> arra k�r, hogy vegy�l r�szt az �rtekezleten."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Javaslat �rtekezletre"
+
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ msgstr "<b>%s</b> szeretne hozz�tenni egy l�tez� �rtekezlethez."
+
+#~ msgid "Meeting Update"
+#~ msgstr "�rtekezlet friss�t�se"
+
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ msgstr "<b>%s</b> szeretn� megkapni a leg�jabb adatokat az �rtekezletr�l."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "�rtekezletfriss�t�si k�r�s"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b> v�laszolt egy �rtekezlet-�sszeh�v�si k�r�sre."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "V�lasz az �rtekezletre"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> lemondta az �rtekezletet."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "�rtekezlet lemond�sa"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> egy �rtelmetlen levelet k�ld�tt."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Rossz �rtekezletfelh�v�s"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> feladatinform�ci�t tett k�zz�."
+
+#~ msgid "Task Information"
+#~ msgstr "Feladatinform�ci�"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> arra k�r, hogy hajts v�gre egy feladatot."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Feladatjavaslat"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> szeretne hozz�tenni egy l�tez� feladathoz."
+
+#~ msgid "Task Update"
+#~ msgstr "Feladat friss�t�se"
+
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "<b>%s</b> szeretn� megkapni a leg�jabb adatokat a feladatr�l."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Feladatfriss�t�si felh�v�s"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b> v�laszolt egy feladatfelk�r�sre."
+
+#~ msgid "Task Reply"
+#~ msgstr "V�lasz feladatra"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> t�r�lte a feladatot."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Feladat lemond�sa"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Rossz feladat�zenet"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> szabad/foglalt inform�ci�t tett k�zz�."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Szabad/foglalt inform�ci�"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> k�ri a szabad/foglalt adataidat."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Szabad/foglalt k�r�s"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "<b>%s</b> v�laszolt egy szabad/foglalt k�r�sre."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Szabad/foglalt v�lasz"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Rossz szabad/foglalt �zenet"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "A lev�l csak nem t�mogatott k�r�seket tartalmaz."
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "A mell�klet nem tartalmaz �rv�nyes napt�r�zenetet"
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "A mell�klet nem tartalmaz megn�zhet� napt�relemet"
+
+#~ msgid "Unable to find any of your identities in the attendees list!\n"
+#~ msgstr "Nem tal�lom egyik azonos�t�dat sem a r�sztvev�k list�j�n!\n"
+
+#~ msgid "Event information"
+#~ msgstr "Esem�nyinform�ci�"
+
+#~ msgid "Task information"
+#~ msgstr "Feladatinform�ci�"
+
+#~ msgid "Journal information"
+#~ msgstr "Napl�inform�ci�"
+
+#~ msgid "Free/Busy information"
+#~ msgstr "Szabad/foglalt inform�ci�"
+
+#~ msgid "Calendar information"
+#~ msgstr "Napt�rinform�ci�"
+
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "Szabad/foglalt inform�ci� (%s - %s)"
+
+#~ msgid "iCalendar information"
+#~ msgstr "iCalendar inform�ci�"
+
+#~ msgid "Task"
+#~ msgstr "Feladat"
+
+#~ msgid "Status: %s"
+#~ msgstr "�llapot: %s"
+
+#~ msgid "Percent Complete: %i"
+#~ msgstr "Sz�zal�kos k�szenl�t: %i"
+
+#~ msgid "URL: %s"
+#~ msgstr "URL: %s"
+
+#~ msgid "Categories: %s"
+#~ msgstr "Kateg�ri�k: %s"
+
+#~ msgid "Contacts: "
+#~ msgstr "N�vjegyek: "
+
+#~ msgid "Invalid type in body-contains, expecting string"
+#~ msgstr "�rv�nytelen t�pus a body-contains kifejez�sben, a v�rt karakterl�nc"
+
+#, fuzzy
+#~ msgid "Error hashing password."
+#~ msgstr "Nem siker�l elmenteni az elemeket."
+
+#~ msgid "Invalid password."
+#~ msgstr "�rv�nytelen jelsz�."
+
+#, fuzzy
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Nem tal�lhat� \"%s\" tan�s�tv�nya."
+
+#, fuzzy
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Nem tal�lhat� \"%s\" tan�s�tv�nya."
+
+#, fuzzy
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ msgstr "Nem tudom a dial�gust elk�sz�teni."
+
+#, fuzzy
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "Nem siker�lt l�trehozni a PGP titkos�t�s r�szt."
+
+#, fuzzy
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Nem siker�lt kapcsol�dni a kiszolg�l�hoz: %s"
+
+#, fuzzy
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "Nem tudom a dial�gust elk�sz�teni."
+
+#~ msgid "NT Login"
+#~ msgstr "NT bejelentkez�s"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Add meg %s@%s NNTP jelszav�t!"
+
+#~ msgid "Server rejected username"
+#~ msgstr "A kiszolg�l� a felhaszn�l�i nevet visszadobta"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Nem siker�lt a felhaszn�l�nevet elk�ldeni a kiszolg�l�nak"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "A kiszolg�l� visszautas�totta a felhaszn�l�n�v/jelsz� p�rost"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Nem siker�lt megszerezni a csoportlist�t a kiszolg�l�r�l."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Nem siker�lt bet�lteni %s csoportlistaf�jlj�t: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Nem siker�lt menteni %s csoportlistaf�jlj�t: %s"
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Nem siker�lt az �j levelek ellen�rz�se a POP kiszolg�l�n: %s"
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr "Nem siker�lt megnyitni a mapp�t: az �zenetlista nem teljes."
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Nem siker�lt let�lteni a levelet: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ msgstr "Nem siker�lt let�lteni a levelet a %s POP kiszolg�l�r�l: %s"
+
+#~ msgid ""
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ msgstr ""
+#~ "Ez a be�ll�t�s Kerberos 4 hiteles�t�ssel csatlakozik a POP kiszolg�l�val."
+
+#~ msgid "Could not authenticate to KPOP server: %s"
+#~ msgstr "Nem siker�lt a hiteles�t�s a KPOP kiszolg�l�hoz: %s"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Nem siker�lt kapcsol�dni a kiszolg�l�hoz: %s"
+
+#~ 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"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "Nem lehet elk�ldeni a levelet: a felad� c�me nincs megadva."
+
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "Hib�s RCPT TO v�lasz: %s: a lev�l nem ment el"
+
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "Hib�s DATA v�lasz: %s: a lev�l nem ment el"
+
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr "Hib�s DATA v�lasz: a lev�l v�get �rt: %s: a lev�l nem ment el"
+
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "Hib�s QUIT v�lasz: %s: nem v�gzetes"
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "Vezet�i �sszefoglal� Evolution komponens."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr ""
+#~ "Nem siker�lt az Evolution Vezet�i �sszefoglal� komponens�t elind�tani."
+
+#, fuzzy
+#~ msgid "Select a service"
+#~ msgstr "V�lassz egy f�jlt"
+
+#~ 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 ""
+#~ "V�laszthatsz egy m�sik HTML oldalt a Vezet�i �sszefoglal� h�tter��l.\n"
+#~ "\n"
+#~ "Az alap�rtelmezett h�tt�rhez hagyd �resen a mez�t."
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "%s megnyit�sa az alap�rtelmezett GNOME alkalmaz�ssal"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "%s megnyit�sa az alap�rtelmezett GNOME webb�ng�sz�vel"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Lev�l k�ld�se %s c�m�re"
+
+#~ msgid "Run %s"
+#~ msgstr "%s futtat�sa"
+
+#~ msgid "Close %s"
+#~ msgstr "%s bez�r�sa"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "%s balra mozgat�sa"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "%s jobbra mozgat�sa"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "%s �tmozgat�sa az el�z� sorba"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "%s �tmozgat�sa a k�vetkez� sorba"
+
+#~ msgid "Configure %s"
+#~ msgstr "%s be�ll�t�sa"
+
+#, fuzzy
+#~ msgid "page"
+#~ msgstr "Lap"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nem siker�lt megnyitni a HTML f�jlt:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Adatbeolvas�si hiba:\n"
+#~ "%s"
+
+#~ 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 ""
+#~ "A Vezet�i �sszefoglal� komponens nem tudta inicializ�lni a Bonob�t.\n"
+#~ "Ha voltak RootPOA-val kapcsolatos figyelmeztet� �zenetek, akkor\n"
+#~ "val�sz�n�leg a GOAD-dal ford�tottad a Bonob�t �s nem az OAF-fal."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Factory az RDF �sszefoglal� komponens sz�m�ra."
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF �sszefoglal�"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Factory a bonobo tesztkomponens sz�m�ra."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Factory a tesztkomponens sz�m�ra."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Teszt Bonobo-szolg�ltat�s"
+
+#, fuzzy
+#~ msgid "Test service"
+#~ msgstr "Teszt Bonobo-szolg�ltat�s"
+
+#~ msgid "Update automatically"
+#~ msgstr "Automatikus friss�t�s"
+
+#, fuzzy
+#~ msgid "Update now"
+#~ msgstr "Friss�t�s"
+
+#, fuzzy
+#~ msgid "Update every "
+#~ msgstr "_Szabad/foglalt friss�t�se"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "�rj be egy mappa URI-t"
+
+#, fuzzy
+#~ msgid "Needs Reply"
+#~ msgstr "Szabad/foglalt v�lasz"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Lev�lt�rol� mappa (bels�)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Nem siker�lt kapcsol�dni a t�rol�hoz: %s"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "�_j lev�l"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "VMappa gy�rt�sa keres�sb�l"
+
+#, fuzzy
+#~ msgid "Mark as Needing Reply"
+#~ msgstr "V�lasz az �rtekezletre"
+
+#, fuzzy
+#~ msgid "Mark as Not Needing Reply"
+#~ msgstr "V�lasz az �rtekezletre"
+
+#~ msgid "Filter on Mailing List"
+#~ msgstr "Sz�r� a levelez�list�ra"
+
+#~ msgid "Default"
+#~ msgstr "Alap�rtelmezett"
+
+#~ msgid "Indexing:"
+#~ msgstr "Indexel�s:"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "Postafi�k form�tuma"
+
+#~ msgid " (default)"
+#~ msgstr " (alap�rtelmezett)"
+
+#~ msgid "Mail Settings"
+#~ msgstr "Levelez� be�ll�t�sai"
+
+#~ msgid "Subject is %s"
+#~ msgstr "A t�ma %s"
+
+#~ msgid "Mail from %s"
+#~ msgstr "Lev�l %s-t�l"
+
+#~ msgid "%s mailing list"
+#~ msgstr "%s levelez�lista"
+
+#~ msgid "This message contains invalid recipients:"
+#~ msgstr "A lev�l �rv�nytelen c�mzetteket tartalmaz:"
+
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: Bej�v� �zenetek"
+
+#~ msgid "Account"
+#~ msgstr "Postafi�k"
+
+#~ msgid "Accounts"
+#~ msgstr "Postafi�kok"
+
+#~ msgid "Always _encrypt to myself when sending encrypted mail"
+#~ msgstr "_Mindig titkos�t nekem is, ha titkos�tott levelet k�ld�k"
+
+#~ msgid "Composer"
+#~ msgstr "Szerkeszt�"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "A \"Tov�bb�t�s\" alap�rtelmezett st�lusa: "
+
+#~ msgid "Display"
+#~ msgstr "Megjelen�t�s"
+
+#~ msgid "Drafts"
+#~ msgstr "Piszkozatok"
+
+#~ msgid "Edit..."
+#~ msgstr "Szerkeszt�s..."
+
+#~ msgid "HTML signature file:"
+#~ msgstr "HTML al��r�sf�jl:"
+
+#~ msgid "News"
+#~ msgstr "News"
+
+#~ msgid "Select Filter Log file..."
+#~ msgstr "V�lassz egy sz�r�napl�f�jlt"
+
+#~ msgid "Sent"
+#~ msgstr "Elk�ldve"
+
+#~ msgid "Sources"
+#~ msgstr "Forr�sok"
+
+#~ msgid "_Email Address:"
+#~ msgstr "_Emailc�m:"
+
+#~ msgid "_Full Name:"
+#~ msgstr "_Teljes n�v:"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "Sz�r�m�veletek _napl�z�sa ide:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Szervezet:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Jelsz� megjegyz�se"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "A levelet _HTML form�tumban k�ldi alap�rtelmez�sk�nt."
+
+#~ msgid "_Server Type: "
+#~ msgstr "_Kiszolg�l� t�pusa: "
+
+#~ msgid "_Signature file:"
+#~ msgstr "A_l��r�s f�jl:"
+
+#~ msgid "placeholder"
+#~ msgstr "helykit�lt�"
+
+#~ msgid "seconds."
+#~ msgstr "m�sodperc."
+
+#~ 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."
+
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "Az Evolution nem ismeri fel ezt a fajta al��rt �zenetet."
+
+#~ 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."
+
+#~ 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."
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Nem teljes �zenet lett a cs�be �rva!"
+
+#, fuzzy
+#~ msgid "Mail Summary"
+#~ msgstr "�sszefoglal� a levelekr�l"
+
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Nem siker�lt az Evolution �sszefoglal� komponens�t inicializ�lni."
+
+#~ msgid "Summary Settings"
+#~ msgstr "�sszefoglal� be�ll�t�sai"
+
+#~ msgid "Regions"
+#~ msgstr "R�gi�k"
+
+#~ msgid " F"
+#~ msgstr "�F"
+
+#~ msgid " C"
+#~ msgstr "�C"
+
+#~ msgid "knots"
+#~ msgstr "csom�"
+
+#~ msgid "kph"
+#~ msgstr "km/h"
+
+#~ msgid "inHg"
+#~ msgstr "Hgin"
+
+#~ msgid "mmHg"
+#~ msgstr "Hgmm"
+
+#~ msgid "miles"
+#~ msgstr "m�rf�ld"
+
+#~ msgid "kilometers"
+#~ msgstr "kilom�ter"
+
+#~ msgid "Al_l stations:"
+#~ msgstr "M_inden �llom�s:"
+
+#~ 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:"
+
+#~ msgid "_Display stations:"
+#~ msgstr "�_llom�sok megjelen�t�se:"
+
+#~ msgid "_Displayed feeds:"
+#~ msgstr "_Megjelen�tett h�rforr�sok:"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution notes component."
+#~ msgstr "Factory az Evolution napt�r komponens�hez."
+
+#, fuzzy
+#~ msgid "Factory for the Notes control"
+#~ msgstr "Factory a tesztkomponens sz�m�ra."
+
+#~ msgid "Outbox"
+#~ msgstr "Post�zand� levelek"
+
+#~ 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 ""
+#~ "Nem siker�lt �tvinni a mapp�t:\n"
+#~ "%s"
+
+#~ msgid "(No name)"
+#~ msgstr "(n�vtelen)"
+
+#~ msgid "New List"
+#~ msgstr "�j lista"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "A napt�r be�ll�t�sai"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "�j eg�sz _napos esem�my l�trehoz�sa"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "�j _feladat l�trehoz�sa"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "�j _tal�lkoz� l�trehoz�sa"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Eg�sz napos esem�ny l�trehoz�sa"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Tal�lkoz�..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Napt�r be�ll�t�sai"
+
+#~ msgid "_Task..."
+#~ msgstr "_Feladat..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Postafi�kok l�trehoz�sa, szerkeszt�se �s egy�b be�ll�t�sok"
+
+#~ msgid "New Message"
+#~ msgstr "�j lev�l"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_Levelez� be�ll�t�sai"
+
+#~ msgid "Forward _Attached"
+#~ msgstr "Tov�bb�t�s _mell�kletk�nt"
+
+#~ msgid "Forward _Inline"
+#~ msgstr "Tov�bb�t�s _be�gyazottk�nt"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "Tov�bb�t�s _id�zetk�nt"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Sz�r�k alkalmaz�sa"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "A feladatn�zet be�ll�t�sai"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Feladatok be�ll�t�sai..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Az �sszefoglal� be�ll�t�sainak megv�ltoztat�sa"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "�ssze_foglal� be�ll�t�sai..."
+
+#~ msgid "Show All"
+#~ msgstr "Mutasd mind"
+
+#~ msgid "Sear_ch"
+#~ msgstr "_Keres�s"
 
 #~ msgid "British Virgin Islands"
 #~ msgstr "British Virgin Islands"
@@ -26235,9 +27758,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "on or before"
 #~ msgstr "akkor vagy el�bb"
 
-#~ msgid "Special Folders"
-#~ msgstr "K�l�nleges mapp�k"
-
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>Az id�j�r�s-kiszolg�l� nem el�rhet�</b></dd>"
 
@@ -26394,12 +27914,10 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ "We hope that you enjoy the results of our hard work, and we\n"
 #~ "eagerly await your contributions!\n"
 #~ msgstr ""
-#~ "Szia! K�sz�nj�k, hogy let�lt�tted az Ximian Evolution csoportmunka-"
-#~ "szoftver\n"
+#~ "Szia! K�sz�nj�k, hogy let�lt�tted az Ximian Evolution csoportmunka-szoftver\n"
 #~ "el�zetes verzi�j�t.\n"
 #~ "\n"
-#~ "A Ximian Evolution m�g nincs k�sz. M�r k�zel van a befejez�shez, de "
-#~ "vannak\n"
+#~ "A Ximian Evolution m�g nincs k�sz. M�r k�zel van a befejez�shez, de vannak\n"
 #~ "olyan r�szek, amelyek hi�nyoznak vagy csak f�lig m�k�dnek. \n"
 #~ "\n"
 #~ "A hib�t tal�lsz, jelentsd a bugzilla.ximian.com-on.\n"
@@ -26439,21 +27957,14 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 
 #~ msgid "Cannot initialize the Evolution Mailer Wizard interface"
 #~ msgstr ""
-#~ "Nem siker�lt inicializ�lni az Evolution Levelez�be�ll�t� Var�zsl� "
-#~ "fel�let�t"
+#~ "Nem siker�lt inicializ�lni az Evolution Levelez�be�ll�t� Var�zsl� fel�let�t"
 
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "Add meg %s el�r�s�hez sz�ks�ges emailc�met �s jelsz�t!"
 
-#~ msgid "LDAP Authentication"
-#~ msgstr "LDAP hiteles�t�s:"
-
 #~ msgid "Password:"
 #~ msgstr "Jelsz�:"
 
-#~ msgid "Couldn't create temporary mbox `%s': %s"
-#~ msgstr "Nem siker�lt l�trehozni '%s' ideiglenes mbox-ot: %s"
-
 #~ msgid ""
 #~ "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 #~ "This probably means that the %s component has crashed."
@@ -26504,8 +28015,8 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "A hely t�rol� nem el�rhet�. Ez nem k�vetkezhet be."
 
 #~ 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 van. A Unix id� pillanatnyilag %ld. Gondoltuk, j� ha tudod."
 
 #~ msgid "%d"
@@ -26548,15 +28059,9 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%Y/%m/%d"
 
-#~ msgid "There was an error downloading news feed"
-#~ msgstr "Hiba t�rt�nt a h�rforr�s let�lt�se k�zben."
-
 #~ msgid "All Attendees"
 #~ msgstr "Minden megh�vott"
 
-#~ msgid "Factory for the Evolution addressbook component."
-#~ msgstr "Factory az Evolution c�mjegyz�k komponens�hez."
-
 #~ msgid "Done."
 #~ msgstr "K�sz."
 
@@ -26608,9 +28113,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "_Refresh time (seconds):"
 #~ msgstr "_Friss�t�si id� (m�sodperc):"
 
-#~ msgid "123"
-#~ msgstr "123"
-
 #~ msgid "a"
 #~ msgstr "a"
 
@@ -26702,20 +28204,18 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "Unix mbox spool form�tum� lev�lf�jlok"
 
 #~ 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 ""
-#~ "Kapcsol�d�s POP kiszolg�l�khoz. A POP protokoll haszn�lhat� m�g egyes "
-#~ "webes �s z�rt forr�sk�d� levelez�rendszerekhez is."
+#~ "Kapcsol�d�s POP kiszolg�l�khoz. A POP protokoll haszn�lhat� m�g egyes webes "
+#~ "�s z�rt forr�sk�d� levelez�rendszerekhez is."
 
 #~ msgid "This seems to be the first time you are running Evolution."
 #~ msgstr "�gy l�tszik, els� alkalommal futtatod az Evol�ci�t."
 
 #~ msgid "Please click \"OK\" to install the Evolution user files under"
 #~ msgstr ""
-#~ "Nyomd meg az \"OK\" gombot az Evolution felhaszn�l�i f�jljainak "
-#~ "telep�t�s�hez"
+#~ "Nyomd meg az \"OK\" gombot az Evolution felhaszn�l�i f�jljainak telep�t�s�hez"
 
 #~ msgid "Show work week"
 #~ msgstr "Egy munkah�t mutat�sa"
@@ -26729,9 +28229,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Add"
 #~ msgstr "Hozz�ad�s"
 
-#~ msgid "Edit"
-#~ msgstr "Szerkeszt�s"
-
 #~ msgid "On %s, %s wrote:"
 #~ msgstr "%s keltez�ssel %s ezt �rta:"
 
@@ -26745,9 +28242,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Help"
 #~ msgstr "S�g�"
 
-#~ msgid "Se_nd contact to other..."
-#~ msgstr "N�vjegy k�ld�se m�snak..."
-
 #~ msgid "See online help"
 #~ msgstr "A be�p�tett s�g� megtekint�se"
 
@@ -26757,9 +28251,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Save task as something else"
 #~ msgstr "Feladat ment�se m�sk�nt"
 
-#~ msgid "_Print Task..."
-#~ msgstr "_Feladat nyomtat�sa..."
-
 #~ msgid "_12 hour (am/pm)"
 #~ msgstr "_12 �r�s (de/du)"
 
@@ -26793,9 +28284,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Using the _Mailer"
 #~ msgstr "A _Levelez� haszn�lata"
 
-#~ msgid "Calendar Preferences"
-#~ msgstr "Napt�r be�ll�t�sai"
-
 #~ msgid "Are you sure?"
 #~ msgstr "Biztos vagy benne?"
 
@@ -26930,9 +28418,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Authentication:"
 #~ msgstr "Hiteles�t�s:"
 
-#~ msgid "Advanced LDAP Options"
-#~ msgstr "Halad� LDAP be�ll�t�sok"
-
 #~ msgid "Path:"
 #~ msgstr "�tvonal:"
 
@@ -26943,8 +28428,8 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "L�trehozza az �tvonalat, ha nem l�tezik"
 
 #~ 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 ""
 #~ "V�laszd ki, milyen c�mjegyz�ked van, �s add meg a vele kapcsolatos "
 #~ "inform�ci�kat."
@@ -26982,12 +28467,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Goals/Objectives"
 #~ msgstr "C�lok"
 
-#~ msgid "Hot Contacts"
-#~ msgstr "Fontos kapcsolatok"
-
-#~ msgid "Key Customer"
-#~ msgstr "Kiemelt �gyf�l"
-
 #~ msgid "Strategies"
 #~ msgstr "Strat�gi�k"
 
@@ -27000,9 +28479,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "VIP"
 #~ msgstr "VIP"
 
-#~ msgid "Store search as vFolder"
-#~ msgstr "Keres�s t�rol�sa VMappak�nt"
-
 #~ msgid "_Appointment (FIXME)"
 #~ msgstr "_Tal�lkoz� (FIXME)"
 
@@ -27077,9 +28553,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "TasksPreferences"
 #~ msgstr "Feladatok be�ll�t�sai"
 
-#~ msgid "Edit this task"
-#~ msgstr "A feladat szerkeszt�se"
-
 #~ msgid "Delete all Occurrences"
 #~ msgstr "Az �sszes el�fordul�s t�rl�se"
 
@@ -27093,11 +28566,11 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "Tov�bb�tott �zenet (t�rgy n�lk�l)"
 
 #~ 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 ""
-#~ "-----Tov�bb�tott �zenet-----<br><b>Felad�:</b> %s<br><b>C�mzett:</b> %"
-#~ "s<br><b>T�rgy:</b> %s<br>"
+#~ "-----Tov�bb�tott �zenet-----<br><b>Felad�:</b> %s<br><b>C�mzett:</b> "
+#~ "%s<br><b>T�rgy:</b> %s<br>"
 
 #~ msgid "Wipe trackers"
 #~ msgstr "Nyomk�vet�k t�rl�se"
@@ -27117,9 +28590,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Create a new calendar"
 #~ msgstr "�j napt�r l�trehoz�sa"
 
-#~ msgid "Open Calendar"
-#~ msgstr "Napt�r megnyit�sa"
-
 #~ msgid "Save calendar as something else"
 #~ msgstr "Napt�s ment�se m�sk�nt"
 
@@ -27153,9 +28623,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "<b>Error downloading Metar</b>"
 #~ msgstr "<b>Hiba a Metar let�lt�se k�zben</b>"
 
-#~ msgid "Add ->"
-#~ msgstr "Hozz�ad�s ->"
-
 #~ msgid "Remove <-"
 #~ msgstr "T�rl�s <-"
 
@@ -27180,8 +28647,7 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid ""
 #~ "Notification about your journal entry starting on %s and ending on %s"
 #~ msgstr ""
-#~ "Figyelmeztet�s a napl�bejegyz�sre, amely %s-kor kezd�dik �s %s-kor "
-#~ "v�gz�dik"
+#~ "Figyelmeztet�s a napl�bejegyz�sre, amely %s-kor kezd�dik �s %s-kor v�gz�dik"
 
 #~ msgid "Notification about your journal entry starting on %s"
 #~ msgstr "Figyelmeztet�s a napl�bejegyz�sre, amely %s-kor kezd�dik"
@@ -27517,10 +28983,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "T�r�lt"
 
 #, fuzzy
-#~ msgid "_All"
-#~ msgstr "Mindenki"
-
-#, fuzzy
 #~ msgid "_Normal"
 #~ msgstr "Norm�lis"
 
@@ -27541,9 +29003,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "As _Table"
 #~ msgstr "_T�bl�zatk�nt"
 
-#~ msgid "Find a contact"
-#~ msgstr "N�vjegy keres�se"
-
 #~ msgid "Mark Complete"
 #~ msgstr "K�sznek jel�l"
 
@@ -27559,9 +29018,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "label55"
 #~ msgstr "label55"
 
-#~ msgid "Configure Folder..."
-#~ msgstr "Mappa be�ll�t�sai..."
-
 #~ msgid "Copy message to a new folder"
 #~ msgstr "A lev�l m�sol�sa �j mapp�ba"
 
@@ -27667,12 +29123,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Mark as Read"
 #~ msgstr "Elolvasva"
 
-#~ msgid "Move to Folder..."
-#~ msgstr "Mapp�ba mozgat�s..."
-
-#~ msgid "Copy to Folder..."
-#~ msgstr "Mapp�ba m�sol�s..."
-
 #~ msgid "Do you accept?"
 #~ msgstr "Elfogadod?"
 
@@ -27703,10 +29153,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "Kil�p�s a lev�lszerkeszt�b�l"
 
 #, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "Email tartalmaz"
-
-#, fuzzy
 #~ msgid "Remember my password"
 #~ msgstr "VCard-k�nt ment�s"
 
@@ -27820,15 +29266,9 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Evolution Calendar Conduit"
 #~ msgstr "Evolution napt�r csatorna"
 
-#~ msgid "Configuration utility for the evolution calendar conduit.\n"
-#~ msgstr "Az Evolution napt�r csatorna be�ll�t� eszk�ze.\n"
-
 #~ msgid "Evolution ToDo Conduit"
 #~ msgstr "Evolution tennival� csatorna"
 
-#~ msgid "Configuration utility for the evolution todo conduit.\n"
-#~ msgstr "Az Evolution tennival� csatorna be�ll�t� eszk�ze.\n"
-
 #~ msgid "The priority must be between 1 and 9, inclusive"
 #~ msgstr "A priorit�s 1 �s 9 k�z�tt lehet, bez�r�lag"
 
@@ -27931,9 +29371,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "FIXME: Mark as U_nread"
 #~ msgstr "FIXME: Ne_m olvasottnak jel�l"
 
-#~ msgid "_Object"
-#~ msgstr "_Objektum"
-
 #~ msgid "FIXME: _Item"
 #~ msgstr "FIXME: _Elem"
 
@@ -28008,9 +29445,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "FIXME: New _Journal Entry for Contact"
 #~ msgstr "FIXME: �j napl� bejegyz�s a n�vjegyhez"
 
-#~ msgid "FIXME: _Flag for Follow Up..."
-#~ msgstr "FIXME: _Z�szl� folytat�shoz..."
-
 #~ msgid "FIXME: _Display Map of Address"
 #~ msgstr "FIXME: _T�rk�p vagy c�m megjelen�t�se"
 
@@ -28055,10 +29489,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "Sz�r� a felad�n"
 
 #, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Csatol�s be�ll�t�sok"
-
-#, fuzzy
 #~ msgid "Reply-to:"
 #~ msgstr "Reply-To:"
 
@@ -28066,9 +29496,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Servers"
 #~ msgstr "Szerver:"
 
-#~ msgid "Full name:"
-#~ msgstr "Teljes n�v:"
-
 #~ msgid "Signature File"
 #~ msgstr "Al��r�s f�jl"
 
@@ -28091,10 +29518,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Edit Identity"
 #~ msgstr "Azonos�t�"
 
-#, fuzzy
-#~ msgid "Edit News Server"
-#~ msgstr "H�rcsoport-szerverek"
-
 #~ msgid "Identities"
 #~ msgstr "Azonos�t�k"
 
@@ -28162,9 +29585,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "External Directories"
 #~ msgstr "K�ls� k�nyvt�rak"
 
-#~ msgid "Port Number:"
-#~ msgstr "Portsz�m:"
-
 #~ msgid "Outline:"
 #~ msgstr "K�rvonal:"
 
@@ -28204,15 +29624,9 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "sec"
 #~ msgstr "mp"
 
-#~ msgid "this"
-#~ msgstr "ez"
-
 #~ msgid "next"
 #~ msgstr "k�vetkez�"
 
-#~ msgid "first"
-#~ msgstr "els�"
-
 #~ msgid "sixth"
 #~ msgstr "hatodik"
 
@@ -28269,10 +29683,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Save messages from folder \"%s\""
 #~ msgstr "Lev�l mozgat�sa m�s mapp�ba"
 
-#, fuzzy
-#~ msgid "N_ew Directory Server"
-#~ msgstr "H�rcsoport-szerverek"
-
 #~ msgid "Create to-do item"
 #~ msgstr "Tennival� k�sz�t�se"
 
@@ -28317,12 +29727,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "To Do List"
 #~ msgstr "Tennival� lista"
 
-#~ msgid "Preferences"
-#~ msgstr "Be�ll�t�sok"
-
-#~ msgid "Beep on display alarms"
-#~ msgstr "�breszt� ki�r�s�n�l csipogj"
-
 #~ msgid "Enable snoozing for "
 #~ msgstr "Szundi enged�se"
 
diff --git a/po/it.po b/po/it.po
index db7fdc57b8..a6536ea67d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2002-02-13 17:36+0100\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -30,16 +30,17 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importa i file VCard in Evolution."
 
 #: 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 "Memorizza Come"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nome"
 
 #: 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 "Email"
 
@@ -55,7 +56,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/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistente"
 
@@ -95,7 +96,7 @@ msgid "Home"
 msgstr "Casa"
 
 #: 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 "Organizzazione"
 
@@ -117,7 +118,7 @@ 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/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax Ufficio"
 
@@ -127,7 +128,7 @@ msgstr "Fax Uff"
 
 #: 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/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax Casa"
 
@@ -147,7 +148,7 @@ msgstr "Casa 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/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -155,55 +156,54 @@ msgstr "ISDN"
 #: 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
 msgid "Other"
 msgstr "Altro"
 
 #: 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/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/widgets/e-addressbook-view.c:353
+#: 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/widgets/e-addressbook-view.c:354
+#: 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/widgets/e-addressbook-view.c:355
+#: 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: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/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/widgets/e-addressbook-view.c:359
+#: 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:360
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Web Site"
 msgstr "Sito Internet"
 
@@ -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 "Dipartimento"
 
@@ -221,7 +221,7 @@ msgid "Dep"
 msgstr "Dip"
 
 #: 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 "Ufficio"
 
@@ -230,12 +230,12 @@ msgid "Off"
 msgstr "Uff"
 
 #: 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 "Posizione"
 
 #: 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 "Professione"
 
@@ -244,7 +244,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: 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 "Manager"
 
@@ -257,7 +257,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: 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 "Nickname"
 
@@ -266,12 +266,12 @@ msgid "Nick"
 msgstr "Nick"
 
 #: 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 "Coniuge"
 
 #: 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 "Note"
 
@@ -284,7 +284,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: 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 "Free-busy URL"
 
@@ -318,11 +318,11 @@ msgstr "Cognome"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "VCard  Multiple"
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard per %s"
@@ -335,58 +335,56 @@ 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:62
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
-#: 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:2732
 msgid "Searching..."
 msgstr "Ricerca in corso..."
 
-#: addressbook/backend/pas/pas-backend-file.c:262
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
 #. 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 "Errore nel criterio di ricerca."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:486
-msgid "Connecting to LDAP server..."
-msgstr "Connessione al server LDAP in corso..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:496
-msgid "Unable to connect to LDAP server."
-msgstr "Impossibile connettersi al server LDAP."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:512
-msgid "Waiting for connection to LDAP server..."
-msgstr "In attesa di connesione al server LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:915
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Aggiunta di una card al server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1016
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Rimozione di una card dal server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Modifica di una card nel server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2217
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Riavvio della ricerca in corso."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Ricezione dei risultati della ricerca LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2222
-msgid "Restarting search."
-msgstr "Riavvio della ricerca in corso."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Errore nella rimozione di una card"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Impossibile interpretare URL `%s'"
 
 #: addressbook/conduit/address-conduit.c:293
 msgid "Default Sync Address:"
@@ -426,277 +424,112 @@ msgid "A Bonobo control for displaying an address."
 msgstr "Un controllo di Bonobo che visualizza un indirizzo."
 
 #: 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 "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
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Visore di minicard per la rubrica di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Componente di Evolution per gestire i contatti."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabbrica per il controllo degli esempi della Rubrica"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Cartella contenente le informazioni dei contatti"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "Server LDAP contenente le informazioni dei contatti"
 
-#: addressbook/gui/component/addressbook-component.c:527
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Nuovo Contatto"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:562
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Nuova Lista di Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Contact _List"
 msgstr "Lista dei _Contatti"
 
-#: addressbook/gui/component/addressbook-config.c:223
-msgid "Edit Addressbook"
-msgstr "Modifica Rubrica"
-
-#: 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 "A_utenticare con il server usando:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Nome Account"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Aggiungi rubrica"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Addressbook Sources"
-msgstr "Sorgenti della Rubrica"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Avanzato"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Di base"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr "Controllare questo se il server vi richiede l'autenticazione."
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "De_lete"
-msgstr "E_limina"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr "Nome Distintivo (DN)"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "Indirizzo Email"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-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"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolution utilizzer� questo indirizzo di posta per autenticarsi con il server"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr "Uno"
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "_Base della Ricerca:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
-msgstr "_Scopo della Ricerca:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Nome del Server"
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
-msgstr ""
-"Le informazioni sottostanti sono richieste per aggiungere una rubrica.  "
-
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr ""
-"Queste informazioni non sono richieste dala maggior parte dei server 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."
-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."
-
-#: 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 ""
-"Questo � il nodo base per tutte le ricerche sul server ldap.  Contattare il "
-"vostro amministratore di sistema per ulteriori informazioni."
-
-#: 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 "Questo � il numero massimo di card da scaricare. L'impostazione di un valore troppo grande rallenter� questa rubrica."
-
-#: 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."
-msgstr "Questo �il metodo usato da Evolution per l'autenticazione. Notare che impostare questo come \"Indirizzo Email\" richiede accesso anonimo al server ldap."
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-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."
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "Questa � la porta che usa il server 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."
-msgstr ""
-"Questo nome viene usato per identificare il vostro account.  Serve solo allo "
-"scopo di visualizzarlo."
-
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "Nome dell' _Account:"
-
-#: 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
-msgid "_Add"
-msgstr "_Aggiungi"
-
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr "Nome _Distintivo:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr ""
-
-#: 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:41
-#: 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 "_Modifica"
-
-#: addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:110
-msgid "_Email address:"
-msgstr "Indirizzo _Email:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Porta:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "Nome del _Server:"
-
-#: 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:174 calendar/gui/main.c:135
 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:499
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubruca"
 
-#: 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"
@@ -706,7 +539,7 @@ msgstr ""
 "che � stata inserita una URI errata,\n"
 "oppure che il server LDAP non funziona"
 
-#: 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"
@@ -718,7 +551,7 @@ msgstr ""
 "bisogna compilare il programma dai sorgenti CVS dopo\n"
 "aver scaricato Open LDAP dal link sottostante.\n"
 
-#: 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."
@@ -726,55 +559,47 @@ msgstr ""
 "Impossibile aprire questa rubrica. Controllare che \n"
 "il percorso esista e che si abbia il permesso di accedervi."
 
-#: addressbook/gui/component/addressbook.c:655
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Digitare la password per %s (utente %s)"
 
-#: addressbook/gui/component/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Qualunque campo contiene"
-
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
-msgstr "Il nome contiene"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "finisce per"
 
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
-msgstr "Email contiene"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "Email 2"
 
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "La categoria �"
 
 #. 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:772
+#: 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
 msgid "Advanced..."
 msgstr "Avanzato..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1067
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Qualunque Categoria"
 
-#: addressbook/gui/component/addressbook.c:1150
+#: addressbook/gui/component/addressbook.c:1083
 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
@@ -823,6 +648,629 @@ 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
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "Sorgenti della Rubrica"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Avvisi Sonoro"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonimo"
+
+#: 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 "Connecticu"
+
+#: 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 "Nessuna informazione"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "E_limina"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Nome _Distintivo:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Email Address:"
+msgstr "Indirizzo _Email:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Avviso Evolution"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr ""
+"Evolution utilizzer� questo indirizzo di posta per autenticarsi con il server"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolution utilizzer� questo indirizzo di posta per autenticarsi con il server"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "_Trova"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Generale"
+
+#: 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 "Configurazione"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Margini"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_ogni"
+
+#: 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 "Uno"
+
+#: 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 "Predefiniti"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Predefiniti"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "_Scopo della Ricerca:"
+
+#. 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 "Ricerca in corso"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Seleziona Tutto"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Eliminato"
+
+#: 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 "Informazione Sorgenti"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Connessione al 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 "Sub"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Schema non supportato"
+
+#: 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 ""
+"Questo � il numero massimo di card da scaricare. L'impostazione di un valore "
+"troppo grande rallenter� questa rubrica."
+
+#: 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 ""
+"Questo �il metodo usato da Evolution per l'autenticazione. Notare che "
+"impostare questo come \"Indirizzo Email\" richiede accesso anonimo al server "
+"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 ""
+"Questo nome viene usato per identificare il vostro account.  Serve solo allo "
+"scopo di visualizzarlo."
+
+#: 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 "Nome Distintivo (DN)"
+
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+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
+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:139
+msgid "_Add"
+msgstr "_Aggiungi"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Aggiungi"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Aggiungi Azione"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Aggiungi Azione"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Avvisi Sonoro"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Elimina tutti"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Visualizzazione"
+
+#: addressbook/gui/component/ldap-config.glade.h:111
+#, fuzzy
+msgid "_Distinguished Name (DN):"
+msgstr "Nome Distintivo (DN)"
+
+#: 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:152 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 "_Modifica"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Modifica appuntamenti"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Avviso 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 "_Opzioni"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Porta:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Predefiniti"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "_Base della Ricerca:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "Nome del _Server:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Suoneria (minuti)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Account %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "Editor della lista dei Contatti"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Nessuna card"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Riconnessione a %s in corso"
+
+#: 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 "Generale"
+
+#: 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 "Ricerca in corso"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Interfaccia per la selezione dei nomi della rubrica di Evolution."
@@ -832,9 +1280,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fabbrica per l'interfaccia di selezione dei nomi della Rubrica"
 
 #: 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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Rimuovere"
 
@@ -863,7 +1311,12 @@ msgstr "(%d non mostrati)"
 msgid "Unnamed Contact"
 msgstr "Contatto senza nome"
 
-#: addressbook/gui/component/select-names/e-select-names.c:581
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Il mittente contiene"
+
+#: 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"
@@ -877,11 +1330,11 @@ 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: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"
@@ -893,31 +1346,40 @@ msgstr ""
 "Potrebbe essere necessario chiudere e riavviare Evolution per\n"
 "correggere il problema."
 
-#: 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 "Seleziona Contatti dalla Rubrica"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "_Contenente:"
+msgid "Select Names"
+msgstr "Seleziona Nomi"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "_Trova"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Cancellare il Contatto?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Seleziona Nomi"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Contatti"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Mostra i contatti che soddisfano i seguenti criteri:"
+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 "_Sposta..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Categoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Cartella"
 
@@ -978,10 +1440,6 @@ msgstr "Memorizza _Come:"
 msgid "Full _Name..."
 msgstr "_Nome e Cognome..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Generale"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1025,10 +1483,11 @@ 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:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1491 mail/mail-config.glade.h:107
-#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "_Elimina"
 
@@ -2079,14 +2538,6 @@ 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?"
 
@@ -2120,7 +2571,7 @@ msgid "Edit Full"
 msgstr "Modifica Interamente"
 
 #: 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 "Nome e cognome"
 
@@ -2327,7 +2778,7 @@ msgstr ""
 " gi� in questa cartella. Aggiungere comunque?"
 
 #: 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 "Ricerca Avanzata"
 
@@ -2336,243 +2787,309 @@ msgstr "Ricerca Avanzata"
 msgid "Search"
 msgstr "Cerca"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Nessuna 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:142
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
-#: addressbook/gui/widgets/e-addressbook-view.c:909
-#: addressbook/gui/widgets/e-addressbook-view.c:1009
-#: addressbook/gui/widgets/e-addressbook-view.c:1623
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr "Salva come VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:278
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Apri"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
-#: addressbook/gui/widgets/e-addressbook-view.c:1010
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Contatto Precedente"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
-#: addressbook/gui/widgets/e-addressbook-view.c:1011
-msgid "Send Message to Contact"
-msgstr "Invia un Messaggio al Contatto"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:282
-#: addressbook/gui/widgets/e-addressbook-view.c:1012
-#: 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 "Stampa"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:284
-#: addressbook/gui/widgets/e-addressbook-view.c:1014
-msgid "Print Envelope"
-msgstr "Stampa Busta"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
-#: addressbook/gui/widgets/e-addressbook-view.c:1016
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
-msgid "Cut"
-msgstr "Taglia"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
-#: addressbook/gui/widgets/e-addressbook-view.c:1017
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:7
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Copia"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:1018
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
-msgid "Paste"
-msgstr "Incolla"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:289
-#: addressbook/gui/widgets/e-addressbook-view.c:1019 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:19
-msgid "Delete"
-msgstr "Elimina"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Errore nella modifica della card"
 
-#: 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:1043
 msgid "Success"
 msgstr "Completato"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: 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:1895
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: 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
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Deposito non in linea"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Card non trovata"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "ID della card gi� esistente"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protocollo non supportato"
 
-#: 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/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
 msgid "Cancelled"
 msgstr "Annullato"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Altro errore"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Errore nell'aggiungere la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Errore nell'aggiungere una card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Errore nella modifica della lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Errore nella rimozione della lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1421
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Errore nella rimozione di una card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:202
+#: addressbook/gui/widgets/e-addressbook-util.c:204
 msgid "Display Cards?"
 msgstr "Mostra Card?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:203
+#: addressbook/gui/widgets/e-addressbook-util.c:205
 msgid "Display Cards"
 msgstr "Mostra Card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, 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-view.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Monte Scuro"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Nessuna card"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Nessuna card"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Nessuna card"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Cliccare qui per aggiungere un contatto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Telefono Principale"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Telefono Assistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Telefono Ufficio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Telefono a cui Richiamare"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Telefono Ditta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Telefono di Casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Indirizzo Ufficio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Indirizzo di Casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Cellulare"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Telefono auto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Telefono Ufficio 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Telefono Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:351
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Altro Telefono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Salva come VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Nuovo Contatto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Nuova Lista di Contatti"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Visualizza Cartella..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Importa..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Cerca Contatti"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Sorgenti della _Rubrica..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Impostazioni _Pilot..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Contatto Precedente"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Invia un Messaggio al Contatto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Stampa Busta"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "_Copia nella Cartella..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "_Sposta nella Cartella..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Taglia"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "Vista _Corrente"
+
+#. 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:579
+#: addressbook/gui/widgets/e-addressbook-view.c:940
 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"
 
@@ -2580,7 +3097,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:584
+#: addressbook/gui/widgets/e-addressbook-view.c:945
 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"
 
@@ -2597,7 +3114,7 @@ msgstr "e un'altro contatto."
 msgid "Save in addressbook"
 msgstr "Salva nella rubrica"
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
@@ -2611,12 +3128,15 @@ msgstr ""
 "\n"
 "Fare doppio click qui per creare un nuovo Contatto."
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
+#: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
-msgstr "\n\nNon c'� niente da mostrare in questa vista"
+msgstr ""
+"\n"
+"\n"
+"Non c'� niente da mostrare in questa vista"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
@@ -2705,6 +3225,7 @@ msgid "Include:"
 msgstr "Includi:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Orizzontale"
 
@@ -2729,6 +3250,7 @@ msgid "Options"
 msgstr "Opzioni"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Orientazione"
 
@@ -2749,7 +3271,9 @@ msgstr "Carta"
 msgid "Paper source:"
 msgstr "Alimentazione della carta:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Verticale"
 
@@ -2809,29 +3333,25 @@ msgstr "_Carattere..."
 msgid "Untitled appointment"
 msgstr "Appuntamento senza titolo"
 
-#: 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:650
+#: 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
 msgid "High"
 msgstr "Altezza"
 
-#: 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/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normale"
 
-#: 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:648
+#: 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
 msgid "Low"
 msgstr "Basso"
 
 #. 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
 msgid "Undefined"
 msgstr "Non definito"
 
@@ -2863,44 +3383,58 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Un semplice controllo di Bonobo che visualizza un calendario."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Impostazioni Calendario e Attivit�"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Componente di Evolution per gestire il calendario."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 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:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 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:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "Fabbrica per il controllo del Calendario di esempio"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 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:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 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
+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 "Servizio di notifica dell'avviso sonoro"
@@ -2909,22 +3443,10 @@ 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
-msgid "Evolution Alarm"
-msgstr "Avviso Evolution"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -2964,7 +3486,7 @@ msgstr ""
 "Evolution visualizzer� invece un messaggio a video."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2416
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Attenzine"
@@ -2979,7 +3501,8 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Un avvertimento nel calendario di Evolution sta per essere attivato. L'avvertimento � impostato per eseguire il programma seguente:\n"
+"Un avvertimento nel calendario di Evolution sta per essere attivato. "
+"L'avvertimento � impostato per eseguire il programma seguente:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -2989,7 +3512,7 @@ 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:57
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Impossibile inizializzare GNOME"
 
@@ -3002,52 +3525,52 @@ msgid "Could not create the alarm notify service factory"
 msgstr ""
 "Impossibile creare la babbrica per il servizio di notifica dell'avviso sonoro"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Il sommario contiene"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "La descrizione contiene"
 
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Il commento contiene"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "Non corrispondenti"
 
-#: 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: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:834
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3055,16 +3578,14 @@ msgstr ""
 "ORBit e di OAF"
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:385
 msgid "Private"
 msgstr "Privato"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
 msgid "Confidential"
 msgstr "Confidenziale"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Pubblico"
 
@@ -3085,32 +3606,27 @@ msgid "W"
 msgstr "O"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
 msgid "Free"
 msgstr "Libero"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:479 calendar/gui/print.c:2246
 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:480 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Completato"
 
@@ -3126,9 +3642,10 @@ 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/mail-account-gui.c:1497
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:404
-#: mail/mail-config.glade.h:56
+#: 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
 #: 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
@@ -3143,23 +3660,15 @@ msgstr "Ricorre"
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: 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:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
 msgid "Yes"
 msgstr "S�"
 
-#: 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:310
 msgid "No"
 msgstr "No"
 
-#. 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 "Ricerca in corso"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Vista Giornaliera"
@@ -3176,54 +3685,75 @@ msgstr "Vista Settimanale"
 msgid "Month View"
 msgstr "Vista Mensile"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Calendario"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Cartella contenente appuntamenti ed eventi"
 
-#: calendar/gui/component-factory.c:69 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Attivit�"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Cartella contente le cose da fare"
 
-#: calendar/gui/component-factory.c:653
-msgid "New appointment"
-msgstr "Nuovo appuntamento"
-
-#: calendar/gui/component-factory.c:654
-msgid "_Appointment"
-msgstr "_Appuntamento"
-
-#: calendar/gui/component-factory.c:659
+#: calendar/gui/component-factory.c:695
 msgid "New meeting"
 msgstr "Nuova riunione"
 
-#: calendar/gui/component-factory.c:660
+#: calendar/gui/component-factory.c:695
 msgid "_Meeting"
 msgstr "_Riunione"
 
-#: calendar/gui/component-factory.c:665
+#: calendar/gui/component-factory.c:699
 msgid "New task"
 msgstr "Nuova attivit�"
 
-#: calendar/gui/component-factory.c:666 ui/evolution-tasks.xml.h:22
+#: calendar/gui/component-factory.c:699
 msgid "_Task"
 msgstr "_Attivit�"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Nuovo appuntamento"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "_Appuntamento"
+
+#: calendar/gui/component-factory.c:707
+msgid "New appointment"
+msgstr "Nuovo appuntamento"
+
+#: calendar/gui/component-factory.c:707
+msgid "_Appointment"
+msgstr "_Appuntamento"
+
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Impossibile aprire la cartella in `%s'"
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "La URI che il calendario visualizzer�"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "Cambia la vista a %s"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Opzioni Avviso Sonoro"
@@ -3289,9 +3819,7 @@ msgstr "tempo in pi� ogni"
 msgid "hours"
 msgstr "Ore"
 
-#: 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 "minuti"
 
@@ -3419,7 +3947,7 @@ msgstr "Promemoria"
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "Indice:"
 
@@ -3448,7 +3976,7 @@ msgstr "termine dell'appuntamento"
 msgid "hour(s)"
 msgstr "Ora (e)"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "minuto(i)"
 
@@ -3489,170 +4017,168 @@ msgid "Color for tasks due today"
 msgstr "Colore attivit� di oggi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Crea un nuovo appuntamento con il promemoria predefinito"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Giorni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Primo giorno della _settimana:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Venerdi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Ore"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Lunedi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "_Attivit� scadute:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Sabato"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-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:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "Mostra i _numeri delle settimane"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "D_om"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domenica"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Scadenze per oggi:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "G_io"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "M_ar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Scadenze per oggi:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "_Lista Attivit�"
 
-#: 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 "Giovedi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Ora"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "F_uso orario: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Suddivisioni del tempo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Formato dell'ora:"
 
-#: 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 "Martedi"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Mercoledi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Settimana lavorativa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ore (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 ore"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Chiedi conferma prima di cancellare"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "_Comprimi fine settimana nella vista mensile"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Visualizzazione"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Generale"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "_Nascondi le attivit� completate dopo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Altro"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "_Attivit� scadute:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_Sab"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "_Lista Attivit�"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Suddivisioni del tempo:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Mer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "prima dell'inizio di un appuntamento"
 
@@ -3720,73 +4246,60 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s non sono state effettuate modifiche.  Aggiornare l'editor?"
 
-#: 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 " a"
 
-#: 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 " (Completato "
 
-#: 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 "Completato "
 
-#: 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 " (Scadenza "
 
-#: 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 "Scadenza "
 
-#: calendar/gui/dialogs/comp-editor.c:321
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "Impossibile aggiornare l'elemento!"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Modifica Appuntamenti"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appuntamento - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Attivit� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Voce nell'agenda - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Nessuna descrizione"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2216
-#: mail/mail-display.c:101
-msgid "Overwrite file?"
-msgstr "Sovrascrivere il file?"
-
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2223
-#: mail/mail-display.c:105
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Esiste gi� un file con questo nome.\n"
-"Sovrascriverlo?"
-
-#: 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 "Salva con nome..."
+#: 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
+msgid "Save as..."
+msgstr "Salva come..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Impossibile ottenere la versione corrente!"
 
@@ -3844,7 +4357,7 @@ msgstr "Delega a:"
 msgid "Enter Delegate"
 msgstr "Inserire Delegato"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Appuntamento"
 
@@ -3858,13 +4371,13 @@ msgstr "Ricorrenza"
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 msgid "Scheduling"
 msgstr "Pianificazione"
 
 #: calendar/gui/dialogs/event-editor.c:207
 #: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "Riunione"
 
@@ -3911,7 +4424,7 @@ msgid "Pu_blic"
 msgstr "Pub_blico"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Mostra ora come"
 
@@ -3956,55 +4469,49 @@ msgstr "Partecipante"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "Nome comune"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delega"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegato A"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Lingua"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Membro"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:843
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Ruolo"
 
-#: 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
+#: 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"
 msgstr "Stato"
 
-#: 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
@@ -4019,7 +4526,7 @@ msgid "_Change Organizer"
 msgstr "_Cambia Organizzatore"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "_Invita altri..."
 
@@ -4027,28 +4534,99 @@ msgstr "_Invita altri..."
 msgid "_Other Organizer"
 msgstr "_Altro Organizzatore"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Questo appuntamento contiene ricorrenze che Evolution non pu� modificare."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "il"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "lista"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "secondo"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Altro"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Nord"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "lista"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Altro fax"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "giorno"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "il"
 
-#: 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 "ricorrenze"
 
@@ -4147,7 +4725,7 @@ msgid "Progress"
 msgstr "In corso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:755
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4159,15 +4737,19 @@ msgstr "_Priorit�:"
 msgid "_Status:"
 msgstr "_Stato:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+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:322
+#: calendar/gui/dialogs/task-editor.c:324
 msgid "Assignment"
 msgstr "Assegnato"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Descrizione:"
 
@@ -4179,116 +4761,80 @@ msgstr "Data di _inizio:"
 msgid "_Due Date:"
 msgstr "Sca_denza:"
 
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:438
-#, 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:751 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:960 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1462
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Apri"
 
-#: 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:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Salva come..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "S_tampa..."
+
+#: calendar/gui/e-calendar-table.c:978 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: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:39 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:979 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: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:43 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:21
+#: calendar/gui/e-calendar-table.c:980 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 "_Incolla"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Assegna Attivit�"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Inoltra come i_Calendar"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Segna come Completato"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "_Elimina Questa Attivit�"
-
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marka Attivit� Come Complete"
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_Elimina le Attivit� Selezionate"
 
-#: calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
-#: calendar/gui/e-week-view.c:3929
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Aggiornamento elementi in corso"
 
-#: calendar/gui/e-calendar-table.c:1247
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Fare clic qui per aggiungere un'attivit�"
 
@@ -4296,48 +4842,47 @@ msgstr "Fare clic qui per aggiungere un'attivit�"
 msgid "Alarms"
 msgstr "Avvisi Sonoro"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Completato"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Ultimato il"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Scadenza"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Termine"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Posizione Geografica"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Priorit�"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Sommario"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Ordina attivit�"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4371,408 +4916,174 @@ msgstr "%02i divisioni per minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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
 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
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3525
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "Nuovo _Appuntamento"
 
-#: 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 "Nuovo _Evento del Giorno"
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
-#: 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 "Nuova riunione"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Nuova Attivit�"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Stampa..."
+
+#: 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 "Vai a _Oggi"
 
-#: 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 "_Vai alla data..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-msgid "_Delete this Appointment"
-msgstr "_Elimina questo Appuntamento"
+#: 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 "_Rende note le Informazioni sulla Disponibilit�"
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
+#, fuzzy
+msgid "_Configure..."
+msgstr "Configura %s"
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
+msgid "_Save As..."
+msgstr "_Salva con Nome..."
+
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Pianifica una _Riunione"
+
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Inoltra come i_Calendar"
+
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "_Rendi rimandabile questa Ricorrenza"
 
-#: 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 "_Elimina questa Ricorrenza"
 
-#: 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 "Elimina _Tutte le Ricorrenze"
 
-#: calendar/gui/e-itip-control.c:535
-msgid "Meeting begins: <b>"
-msgstr "Inizio Riunione: <b>"
-
-#: calendar/gui/e-itip-control.c:540
-msgid "Task begins: <b>"
-msgstr "Inizio attivit�: <b>"
-
-#: calendar/gui/e-itip-control.c:545
-msgid "Free/Busy info begins: <b>"
-msgstr "Inizio informazioni di disponibilit�: <b>"
-
-#: calendar/gui/e-itip-control.c:549
-msgid "Begins: <b>"
-msgstr "Inizio: <b>"
-
-#: calendar/gui/e-itip-control.c:561
-msgid "Meeting ends: <b>"
-msgstr "Fine riunione: <b>"
-
-#: calendar/gui/e-itip-control.c:564
-msgid "Free/Busy info ends: <b>"
-msgstr "Fine informazioni di disponibilit�:"
-
-#: calendar/gui/e-itip-control.c:568
-msgid "Ends: <b>"
-msgstr "Fine: <b>"
-
-#: calendar/gui/e-itip-control.c:582
-msgid "Task Completed: <b>"
-msgstr "Attivit� Completata: <b>"
-
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Due: <b>"
-msgstr "Attivit� Da Completare Entro: <b>"
-
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-msgid "iCalendar Information"
-msgstr "Informazioni iCalendar"
-
-#. Title
-#: calendar/gui/e-itip-control.c:644
-msgid "iCalendar Error"
-msgstr "Errore iCalendar"
-
-#: calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-msgid "An unknown person"
-msgstr "Partecipante sconosciuto"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:732
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
-"<br> Controllate queste informazioni, e poi selezionate un'azione dal menu."
-
-#: calendar/gui/e-itip-control.c:748
-msgid "<i>None</i>"
-msgstr "<i>Nessuno</i>"
-
-#: calendar/gui/e-itip-control.c:760
-msgid "Status:"
-msgstr "Stato:"
-
-#: 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
-msgid "Accepted"
-msgstr "Accettata"
-
-#: calendar/gui/e-itip-control.c:769
-msgid "Tentatively Accepted"
-msgstr "Accettato con tentativo"
+"I tool di GNOME Pilot non sembrano essere installati in questo sistema."
 
-#: 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
-msgid "Declined"
-msgstr "Annullato"
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
+#, c-format
+msgid "Error executing %s."
+msgstr "Errore nell'esecuzione di %s."
 
-#: 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: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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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: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
-msgid "Choose an action:"
-msgstr "Specificare un'operazione:"
-
-#: calendar/gui/e-itip-control.c:824
-msgid "Update"
-msgstr "Aggiornare"
-
-#: 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
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:840
-msgid "Accept"
-msgstr "Accettare"
-
-#: calendar/gui/e-itip-control.c:841
-msgid "Tentatively accept"
-msgstr "Accettare con tentativo"
-
-#: calendar/gui/e-itip-control.c:842
-msgid "Decline"
-msgstr "Rifiutare"
-
-#: calendar/gui/e-itip-control.c:856
-msgid "Send Free/Busy Information"
-msgstr "Invia Informazioni sulla Disponibilit�"
-
-#: calendar/gui/e-itip-control.c:869
-msgid "Update respondent status"
-msgstr "Aggiorna stato risposta"
-
-#: calendar/gui/e-itip-control.c:882
-msgid "Send Latest Information"
-msgstr "Invia Informazioni Correnti"
-
-#: calendar/gui/e-itip-control.c:895 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Annulla"
-
-#: calendar/gui/e-itip-control.c:943
-#, 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:944
-msgid "Meeting Information"
-msgstr "Dettagli della Riunione"
-
-#: calendar/gui/e-itip-control.c:948
-#, 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:949
-msgid "Meeting Proposal"
-msgstr "Proposta di Riunione"
-
-#: calendar/gui/e-itip-control.c:953
-#, 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:954
-msgid "Meeting Update"
-msgstr "Aggiornamento Riunione"
-
-#: calendar/gui/e-itip-control.c:958
-#, 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:959
-msgid "Meeting Update Request"
-msgstr "Richiesta di Aggiornamento sulla Riunione"
-
-#: calendar/gui/e-itip-control.c:982
-#, 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:983
-msgid "Meeting Reply"
-msgstr "Risposta ad una Riunione"
-
-#: calendar/gui/e-itip-control.c:987
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> ha annullato una riunione."
-
-#: calendar/gui/e-itip-control.c:988
-msgid "Meeting Cancellation"
-msgstr "Annullamento Riunione"
-
-#: calendar/gui/e-itip-control.c:992 calendar/gui/e-itip-control.c:1063
-#: calendar/gui/e-itip-control.c:1098
-#, 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:993
-msgid "Bad Meeting Message"
-msgstr "Messaggio di Richiesta Riunione Non Valido"
-
-#: calendar/gui/e-itip-control.c:1013
-#, 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:1014
-msgid "Task Information"
-msgstr "Informazioni sull'Attivit�"
-
-#: calendar/gui/e-itip-control.c:1018
-#, 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:1019
-msgid "Task Proposal"
-msgstr "Proposta di Attivit�"
-
-#: calendar/gui/e-itip-control.c:1023
-#, 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:1024
-msgid "Task Update"
-msgstr "Aggiornamento Attivit�"
-
-#: calendar/gui/e-itip-control.c:1028
-#, 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:1029
-msgid "Task Update Request"
-msgstr "Richiesta di Aggiornamento dell'Attivit�"
-
-#: calendar/gui/e-itip-control.c:1053
-#, 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:1054
-msgid "Task Reply"
-msgstr "Risposta all'Attivit�"
-
-#: calendar/gui/e-itip-control.c:1058
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> ha annullato un'attivit�."
-
-#: calendar/gui/e-itip-control.c:1059
-msgid "Task Cancellation"
-msgstr "Annullamento Attivit�"
-
-#: calendar/gui/e-itip-control.c:1064
-msgid "Bad Task Message"
-msgstr "Messaggio di Attivit� Indecifrabile"
-
-#: calendar/gui/e-itip-control.c:1083
-#, 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:1084
-msgid "Free/Busy Information"
-msgstr "Informazioni sulla Disponibilit�"
-
-#: calendar/gui/e-itip-control.c:1088
-#, 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:1089
-msgid "Free/Busy Request"
-msgstr "Richiesta Disponibilit�"
-
-#: calendar/gui/e-itip-control.c:1093
-#, 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:1094
-msgid "Free/Busy Reply"
-msgstr "Risposta Disponibilit�"
-
-#: calendar/gui/e-itip-control.c:1099
-msgid "Bad Free/Busy Message"
-msgstr "Messaggio di Disponibilit� Indecifrabile"
-
-#: calendar/gui/e-itip-control.c:1172
-msgid "The message does not appear to be properly formed"
-msgstr "Il messaggio non sembra avere un formato valido"
-
-#: calendar/gui/e-itip-control.c:1191
-msgid "The message contains only unsupported requests."
-msgstr "Il messaggio contiene solo richieste di tipo non supportato."
-
-#: calendar/gui/e-itip-control.c:1219 calendar/gui/e-itip-control.c:1225
-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:1250
-msgid "The attachment has no viewable calendar items"
-msgstr "L'allegato non ha nessun elemento di calendario visibile"
-
-#: calendar/gui/e-itip-control.c:1349
+#: 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:1351
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Aggiornamento completato\n"
 
-#: calendar/gui/e-itip-control.c:1396
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 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:1404
+#: 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:1406
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Stato del partecipante aggiornato\n"
 
-#: calendar/gui/e-itip-control.c:1408
-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:1436
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Rimozione Completata"
 
-#: calendar/gui/e-itip-control.c:1455 calendar/gui/e-itip-control.c:1505
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Elemento Spedito!\n"
 
-#: calendar/gui/e-itip-control.c:1457 calendar/gui/e-itip-control.c:1509
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "L'elemento non pu� essere spedito!\n"
 
-#: calendar/gui/e-itip-control.c:1682
-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"
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Scegli Cartella"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Scegli Cartella"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4811,197 +5122,212 @@ msgstr "termine"
 msgid "date-start"
 msgstr "inizio"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Moderatori"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Partecipanti Richiesti"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "Partecipanti Opzionali"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "Non Partecipanti"
 
-#: 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:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Individuale"
 
-#: 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:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Gruppo"
 
-#: 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:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Risorse"
 
-#: 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:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Stanza"
 
-#: 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:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "Moderatore"
 
-#: 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:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "Partecipante Richiesto"
 
-#: 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:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "Partecipante Opzionale"
 
-#: 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:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Non Partecipante"
 
-#: 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:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 msgid "Needs Action"
 msgstr "Richiede Azione"
 
-#: 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: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
 msgid "Tentative"
 msgstr "Tentativo"
 
-#: 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:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "Delegato"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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: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:2118 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"
 
 #. 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 "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:433
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "Assente"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Nessuna informazione"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Opzioni"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Mostra s_olo le ore lavorative"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "Vista _allargata"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "A_ggiorna Disponibilit�"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "_Tutto il Personale e le Risorse"
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "Tutto il _Personale e una Risorsa"
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "Personale _Richiesto"
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "Personale Richiesto e _una risorsa"
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "_Inizio appuntamento ore:"
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "T_ermine dell' appuntamento ore:"
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Apertura attivit� %s in corso"
 
-#: 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 "Impossibile caricare le attivit� in `%s'"
 
-#: 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 "Il metodo richiesto per caricare `%s' non � supportato"
 
-#: calendar/gui/e-tasks.c:629
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Ultimato il"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Rimozione degli elementi selezionati in corso"
+
+#: calendar/gui/e-tasks.c:659
 msgid "Expunging"
 msgstr "Eliminazione"
 
-#: 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 "Nuovo _Appuntamento..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "_Elimina questo Appuntamento"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Impossibile aprire la cartella in `%s'"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1865
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Apertura calendario %s"
@@ -5062,284 +5388,223 @@ msgstr "Ottobre"
 msgid "September"
 msgstr "Settembre"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr "� richiesto almeno un partecipante"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "� necessario impostare un organizer."
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-msgid "Event information"
-msgstr "Informazioni sul calendario"
-
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-msgid "Task information"
-msgstr "Informazioni sull'attivit�"
-
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-msgid "Journal information"
-msgstr "Informazioni di Diario"
-
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-msgid "Free/Busy information"
-msgstr "Informazioni sulla disponibilit�"
-
-#: calendar/gui/itip-utils.c:321
-msgid "Calendar information"
-msgstr "Informazioni di calendario"
-
-#: calendar/gui/itip-utils.c:370
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Informazioni sulla disponibilit� (da %s a %s)"
-
-#: calendar/gui/itip-utils.c:382
-msgid "iCalendar information"
-msgstr "Informazioni iCalendar"
-
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Devi essere un partecipante all'evento."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr "Impossibile creare la fabbrica per l'editor dei componenti"
 
-#: 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 "Do"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Gi"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Giorno selezionato (%a %b %d %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 %b %d"
 
-#: 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 %b %d %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Settimana selezionata (%s  - %s) "
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Mese  selezionato (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Anno selezionato (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Attivit�"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Stato: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Priorit�: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Percentuale Completata: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Categorie: %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "Contatti: "
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Stampa Calendario"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2725 my-evolution/e-summary.c:605
-#: 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Anteprima di Stampa"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Stampa Elemento"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Impostazione Pagina"
 
@@ -5350,25 +5615,33 @@ msgstr ""
 "Impossibile creare la vista delle attivit�.  Controllate le impostazioni di "
 "ORBit e OAF."
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "La URI della cartella delle attivit� da visualizzare"
 
-#: 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"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Questa operazione cancella definitivamente tutte le attivit� marcate come completate.  Se si continua, non sar� pi� possibile ripristinare questi messaggi.\n"
+"Questa operazione cancella definitivamente tutte le attivit� marcate come "
+"completate.  Se si continua, non sar� pi� possibile ripristinare questi "
+"messaggi.\n"
 "\n"
 "Cancellare comunque queste attivit�?"
 
-#: calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2430
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "Non chiedere pi� in futuro."
 
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Stampa card"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5423,91 +5696,110 @@ msgstr "Importa i file iCalendar in Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importa i file VCalendar in Evolution."
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Messaggio del Calendario"
+
+#: 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 ha trovato file di posta Pine.\n"
+"Si desidera importarli in Evolution"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Calendario"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now prevede 0 argomenti"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time prevede 1 argomento"
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time prevede che l'argomento 1 sia una stringa"
 
-#: 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 prevede che l'argomento 1 sia una stringa ISO 8601 data/ora"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day prevede 2 argomenti"
 
-#: 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 prevede che l'argomento 1 sia un 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 prevede che l'argomento 1 sia un intero"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin prevede 1 argomento"
 
-#: 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 prevede che l'argomento 1 sia un time_t"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end prevede 1 argomento"
 
-#: 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 prevede che l'argomento 1 sia un time_t"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype prevede 0 argomenti"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? prevede 2 argomenti"
 
-#: 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? prevede che l'argomento 1 sia un 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? prevede che l'argomento 2 sia un time_t"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contiene? prevede 2 argomenti"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contiene? prevede che l'argomento 1 sia una stringa"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contiene? prevede che l'argomento 2 sia una stringa"
 
-#: calendar/pcs/query.c:691
+#: 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\""
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "ha categorie? prevede almeno 1 argomento"
 
-#: 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)"
@@ -5515,15 +5807,15 @@ msgstr ""
 "has-categories? prevede che tutti gli argomenti siano stringhe e che uno "
 "solo sia falso (#f)"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? non vuole nessun argomento"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? vuole un solo argomento"
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? richiede che il primo argomento sia di tipo time_t"
 
@@ -7066,11 +7358,11 @@ msgstr "Questo numero non supporta la crittazione"
 msgid "Decryption is not supported by this cipher"
 msgstr "Questo numero non supporta la decrittazione"
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 msgid "Unable to create cache path"
 msgstr "Impossibile creare il percorso per la cache"
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:441
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Impossibile rimuovere la voce cache: %s: %s"
@@ -7105,52 +7397,51 @@ msgstr "Sincronizzazione con il server"
 msgid "You must be working online to complete this operation"
 msgstr "� necessario essere collegati per completare questa operazione"
 
-#: 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 "Sincronizzazione cartelle"
 
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errore nel filtro di smistamento: %s: %s"
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errore nell'esecuzione del filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Impossibile aprire la cartella per lo spool"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Impossibile operare sulla cartella per lo spool"
 
-#: camel/camel-filter-driver.c:889
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Ricezione del messaggio %d (%d%%)"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Impossibile aprire il messaggio"
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Errore al messaggio %d"
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Sincronizzazione cartella"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Ricezione messaggio %d di %d"
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Errore al messaggio %d di %d"
@@ -7164,7 +7455,7 @@ msgstr "Errore di ricazione del messaggio"
 msgid "Error executing filter search: %s: %s"
 msgstr "Errore nell'esecuzione della ricerca con filtro: %s: %s"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -7173,7 +7464,7 @@ msgstr ""
 "Impossibile filtrare l'espressione di ricerca: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -7182,37 +7473,33 @@ msgstr ""
 "Errore nell'esecuzione della ricerca: %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) richiede un singolo risultato booleano"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "� stata effettuata una ricerca su un header sconosciuto: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Tipo non valido in body-contains, ci si aspettava una stringa"
-
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Impossibile aggiungere un messaggio a %s (operazione non supportata)"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, 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:1080
+#: camel/camel-folder.c:1078
 #, 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:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Trasferimento dei messaggi in corso"
 
@@ -7323,176 +7610,132 @@ msgstr "Digitare la %s passphrase per %s"
 msgid "Please enter your %s passphrase"
 msgstr "Digitare la %s passphrase"
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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"
+"Impossibile firmare questo messaggio: impossibile creare una pipe verso "
+"GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:755
+#: 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:953
+#: 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:959
+#: 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:970
+#: 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:1143
+#: 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:1153
+#: 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:1160
+#: camel/camel-pgp-context.c:1194
 #, c-format
 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"
+"Impossibile cifrare questo messaggio: impossibile creare una pipe verso "
+"GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1169
+#: 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:1337
+#: 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:1345
+#: 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:1352
+#: 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-pgp-mime.c:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "Questa parte del messaggio � firmata"
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Digitare la password per %s"
-
-#: camel/camel-pkcs7-context.c:213
-msgid "Error hashing password."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr "Password  non valida"
-
-#: camel/camel-pkcs7-context.c:329
-#, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Impossibile firmare: certificato non trovato per \"%s\""
-
-#: camel/camel-pkcs7-context.c:378
-#, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Impossibile firmare chiaramente: certificato per \"%s\" non trovato"
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "Impossibile cifrare: creazione di dati imbustati non riuscita."
-
-#: camel/camel-pkcs7-context.c:590
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "Impossibile cifrare: impossibile creare un contesto per la crittazione."
-
-#: camel/camel-pkcs7-context.c:620
-#, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Impossibile cifrare i dati: chieve dell'utente non valida: \"%s\"."
-
-#: camel/camel-pkcs7-context.c:626
-msgid "Could not encrypt: encoding failed."
-msgstr "Impossibile cifrare: codifica non riuscita."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr "Impossibile decifrare: motivo sconosciuto"
-
-#: 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 ""
 "Impossibile caricare %s: Questo sistema non supporta il caricamento di un "
 "modulo."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Impossibile caricare %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 "Impossibile caricare %s: nessun codice di inizializzazione nel modulo."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:207
+#: 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:264
+#: 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:267
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(host sconosciuto)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7600,7 +7843,7 @@ msgstr ""
 " %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Cattiva risposta di autenticazione dal server."
 
@@ -7617,9 +7860,21 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Stato di Autenticazione sconosciuto."
 
+#: 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 ""
+"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:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:61
+#: 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"
 
@@ -7664,26 +7919,41 @@ msgstr "URL '%s' necessita di un componente per l'host"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necessita di un componente per il percorso"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Sto risolvendo: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Errore nella ricerca del nome: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Ricerca dell'Host fallita: %s: host non trovato"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Ricerca dell'Host fallita: %s: motivo sconosciuto"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Sto risolvendo: %s"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Ricerca dell'Host fallita: %s: host non trovato"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Ricerca dell'Host fallita: %s: motivo sconosciuto"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Fornitore di cartelle email virtuali "
@@ -7692,12 +7962,12 @@ msgstr "Fornitore di cartelle email virtuali "
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per leggere la posta come una ricerca di un altro insieme di cartelle"
 
-#: 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 "Nessun fornitore disponibile per il protocollo `%s'"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7706,6 +7976,11 @@ msgstr ""
 "Impossibile creare la directory %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Digitare la password per %s"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Inserire il soprannome del certificato con cui firmare."
@@ -7738,17 +8013,17 @@ msgstr "Decodifica messaggio non riuscita."
 msgid "Failed to verify certificates."
 msgstr "Verifica certificati non riuscita."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Impossibile ottenere la cartella: Operazione non supportata in questo store"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Impossibile creare una cartella: Operazione non supportata in questo store"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -7757,7 +8032,7 @@ msgstr ""
 "Mittente: %s\n"
 "Oggetto: %s"
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7773,7 +8048,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:438
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7786,16 +8061,16 @@ msgstr ""
 "Impronta digitale:    %s\n"
 "Firma:                %s"
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr "BENE"
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr "MALE"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:500
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7819,27 +8094,27 @@ msgstr "Impossibile interpretare URL `%s'"
 msgid "No such message %s in %s"
 msgstr "Non � presente il messaggio %s in %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Non � presente il messaggio: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossibile eliminare la cartella: %s: Operazione non valida"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossibile eliminare la cartella %s: Cartella inesistente"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Impossibile rinominare la cartella %s: Operazione non valida"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossibile rinominare la cartella %s: Cartella inesistente"
@@ -7872,52 +8147,52 @@ msgstr "La risposta del server IMAP non contiene informazione %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Risposta OK inattesa dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Impossibile creare la directory %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Impossibile caricare il sommario di %s"
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Ricerca messaggi modificati"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Questo messaggio non � al momento disponibile"
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "Ricezione delle informazioni sul sommario per i nuovi messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Ricerca nuovi messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:2145
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "Impossibile trovare il corpo del messaggio nella risposta di 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 "Impossibile aprire la directory 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 "Impossibile salvare messaggio %s nella cache: %s"
@@ -7930,7 +8205,7 @@ msgstr "Controllo nuova posta"
 msgid "Check for new messages in all folders"
 msgstr "Controlla se ci sono nuovi messaggio in tutte le cartelle"
 
-#: 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 "Cartelle"
 
@@ -7964,28 +8239,28 @@ msgstr ""
 "Con questa opzione ci si connette al server IMAP usando una password di "
 "testo semplice."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:393
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, 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:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:434
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Non � stata inserita la password."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -7996,56 +8271,57 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Non � presente la cartella %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 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:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "Directory in formato MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 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:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Consegne locali"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 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:63
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Directory in formato Maildir"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr "Per memorizzare la posta locale in directory maildir."
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr "Spool standard Unix"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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:91
+#: camel/providers/local/camel-local-provider.c:116
 msgid "Directory tree of mbox files"
 msgstr "Albero della directory dei file mbox"
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8054,58 +8330,65 @@ msgid ""
 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."
+"NOTA BENE: questo servizio � ancora sperimentale, prima � meglio assicurarsi "
+"di fare un backup delle cartelle di posta."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: 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
 #, 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 "Impossibile avere la cartella %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 ""
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "File di posta locale: %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossibile rinominare la cartella %s con %s: %s"
 
-#: camel/providers/local/camel-local-store.c:374
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Impossibile rinominare la cartella: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Impossibile cancellare il sommario della cartella `%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 "Impossibile cancellare il file indice della cartella `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Impossibile aggiornare il sommario: %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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 "Impossibile trovare messaggi da aggiungere al sommario: motivo sconosciuto"
@@ -8147,7 +8430,7 @@ msgstr "Messaggio assente"
 msgid "Invalid message contents"
 msgstr "Contenuto del messaggio non valido"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8157,14 +8440,14 @@ msgstr ""
 "Impossibile aprire la cartella `%s':\n"
 "%s "
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La cartella `%s' non esiste."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8174,33 +8457,56 @@ msgstr ""
 "Impossibile creare la cartella `%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' non � una directory maildir."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Impossibile cancellare la cartella `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "non � una directory maildir"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Impossibile esaminare la cartella `%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 "Impossibile aprire il percorso della directory maildir: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Controllo nuova posta"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+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
 #, c-format
@@ -8246,7 +8552,7 @@ msgstr "La cartella appare irrimediabilmente corrotta."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fallita la costruziono del messaggio: mailbox corrotta?"
 
-#: 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"
@@ -8255,7 +8561,7 @@ msgstr ""
 "Impossibile il file %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"
@@ -8264,14 +8570,14 @@ msgstr ""
 "Impossibile creare il file `%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' non � un file regolare."
 
-#: 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"
@@ -8280,99 +8586,88 @@ msgstr ""
 "Impossibile cancellare la cartella `%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 "La Cartella `%s' non � vuota.  Non cancellata."
 
-#. 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 "Salvataggio della cartella in corso"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Impossibile aprire la cartella %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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Impossibile controllare la cartella: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Impossibile aprire il file: %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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Impossibile creare una mbox temporanea: %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
+#: 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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "Impossibile chiudere la cartella sorgente %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossibile chiudere la cartella temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossibile rinominare la cartella: %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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore sconosciuto: %s"
@@ -8391,7 +8686,7 @@ msgstr "Impossibile accodare il messaggio alla cartella mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' non � una directory."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Impossibile aprire il percorso della directory MH: %s: %s"
@@ -8407,6 +8702,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La cartella `%s/%s' non esiste."
@@ -8416,29 +8712,31 @@ msgstr "La cartella `%s/%s' non esiste."
 msgid "Spool mail file %s"
 msgstr "File spool di posta %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Le cartelle spool non possono essere rinominate"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Le cartelle spool non possono essere cancellate"
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Impossibile sincronizzare cartella temporanea %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Impossibile sincronizzare cartella 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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8447,65 +8745,24 @@ msgstr ""
 "Impossibile sincronizzare cartella spool %s: %s\n"
 "La cartella potrebbe essere corrotta, copia salvata in `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:940
+#: 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/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Inserire la passwoed NNTP di %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Username rifiutato dal server"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Fallito l'invio dello username al server"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Il server ha rifiutato username/password"
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Errore interno: formato non valido della uid: %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 "Impossibile prendere il messaggio: %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 "Utente cancellato"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Impossibile prendere la lista dei gruppi dal server."
+#: 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/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 "Impossibile caricare il file con la lista dei gruppi di %s: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Impossibile salvare il file con la lista dei gruppi di %s: %s"
+#: 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"
@@ -8515,12 +8772,12 @@ 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:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8563,32 +8820,47 @@ msgstr "Usa annulla"
 msgid "Operation failed: %s"
 msgstr "Operazione non riuscita: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Ricezione indice 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 "Utente cancellato"
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Impossibile avere il sommario POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:316
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Rimozione messaggi sul server in corso"
 
-#: 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 "Nessun messaggio con 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 "Ricezione messaggio 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 "Impossibile prendere il messaggio: %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
 msgid "Unknown reason"
 msgstr "Motivo sconosciuto"
 
@@ -8605,7 +8877,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:60
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -8631,13 +8903,32 @@ 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:172
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, 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
+#, 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:213
-#: camel/providers/pop3/camel-pop3-store.c:316
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8645,26 +8936,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:229
+#: camel/providers/pop3/camel-pop3-store.c:405
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "SASL `%s' Login fallito: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:240
+#: camel/providers/pop3/camel-pop3-store.c:416
 msgid "SASL Protocol error"
 msgstr "Errore del protocollo SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:255
+#: camel/providers/pop3/camel-pop3-store.c:431
 #, c-format
 msgid "I/O Error: %s"
 msgstr "Errore I/O: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:276
+#: camel/providers/pop3/camel-pop3-store.c:452
 #, 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:327
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8673,13 +8965,13 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, 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:82
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8691,54 +8983,50 @@ msgstr ""
 "Per consegnare la posta passandola al programma \"sendmail\" sul sistema "
 "locale."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+msgid "Could not parse recipient list"
+msgstr "Impossibile smostare la lista dei destinatari"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Impossibile creare una ridirezione verso sendmail: %s: posta non inviata"
 
-#: 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 "Impossibile effettuare fork di sendmail: %s: posta non inviata"
 
-#: 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 "Impossibile inviare il messaggio: %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 "sendmail terminato con il segnale %s: posta non inviata."
 
-#: 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 "Impossibile eseguire %s: posta non inviata."
 
-#: 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 terminato con valore di ritorno %d: posta non inviata."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-msgid "Could not find 'From' address in message"
-msgstr "Impossibile trovare l'indirizzo 'Da' nel messaggio"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-msgid "Could not parse recipient list"
-msgstr "Impossibile smostare la lista dei destinatari"
-
-#: 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:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta consegnata attraverso il programma sendmail"
 
-#: 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"
 
@@ -8747,125 +9035,148 @@ msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Per consegnare la posta connettendosi a un mail hub remoto usando SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Errore di sintassi, comando non riconosciuto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Errore di sintassi nei parametri o negli argomenti"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Comando non implementato"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Parametro del comando non implementato"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Stato del sistema, o risposta di aiuto del sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Messaggio di Aiuto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Servizio pronto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Il servizio sta chiudendo il canale di trasmissione"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Servizio non disponibile, chiusura del canale di trasmissione"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "L'azione di posta richiesta � corretta, completata"
 
-#: 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 "Utente non locale; inoltrare a <percorso-a-cui-inoltrare> "
 
-#: 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 ""
 "L'azione di posta richiesta non � stata effettuata: casella non disponibile"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Azione richiesta non effettuata: casella non disponibile"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Azione richiesta interrotta: errore di processo"
 
-#: 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 "Utente non locale; tentare <forward-path>"
 
-#: 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 "Azione richiesta non effettuata: spazio non disponibile"
 
-#: 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 ""
 "L'operazione richiesta sulla posta � stata interrotta: spazio non disponibile"
 
-#: 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 "L'operazione richiesta non � stata effettuata: nome non valido"
 
-#: 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 "Inizio dell'input della posta, terminare con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Transazione fallita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "� necessaria una password di transizione."
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Il meccanismo di autenticazione � troppo debole"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "� richiesta la crittografia per il meccanismo di autenticazione richiesto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Autenticazione temporaneamente non riuscita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Autenticazione richiesta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, 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:383
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "Richiesta AUTH scaduta: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, 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"
 msgstr "Il server IMAP %s non supporta il tipo di autenticazione richiesto %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:421
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:442
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8876,95 +9187,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Posta SMTP consegnata attraverso il programma %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:591
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-"Impossibile inviare il messaggio: l'indirizzo del mittente non � stato "
-"definito."
-
-#: camel/providers/smtp/camel-smtp-transport.c:598
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:603 mail/mail-ops.c:603
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Invio messaggio"
 
-#: camel/providers/smtp/camel-smtp-transport.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/providers/smtp/camel-smtp-transport.c:624
+#: camel/providers/smtp/camel-smtp-transport.c:688
 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:798
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "Saluti SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:820
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:840
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, 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:884
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "Autenticazione SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:890
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Errore nel creare un oggetto di autenticazione SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:905
-#: camel/providers/smtp/camel-smtp-transport.c:917
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Richiesta AUTH scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:926
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "Richiesta AUTH non riuscita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:974
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Cattiva risposta di autenticazione dal server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1014
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "MAIL FROM response error"
 msgstr "Errore nella risposta MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> non riuscito"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "RIchiesta di DATA scaduta: %s: posta non inviata."
@@ -8972,37 +9277,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:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 msgid "DATA response error"
 msgstr "Errore nella risposta di DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
-#: camel/providers/smtp/camel-smtp-transport.c:1163
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1177
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 msgid "DATA termination response error"
 msgstr "Errore di risposta di DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1200
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Richiesta RSET scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 msgid "RSET response error"
 msgstr "Errore nella risposta di RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1237
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Richiesta QUIT scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 msgid "QUIT response error"
 msgstr "Errore nella risposta di QUIT"
 
@@ -9031,7 +9336,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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 "allegato"
 
@@ -9071,57 +9376,57 @@ msgid "MIME type:"
 msgstr "Tipo 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 "Consiglio visualizzazione automatica degli allegati"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Cliccare qui per la rubrica"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Da:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Rispondi-a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 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:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9129,12 +9434,12 @@ msgstr ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio "
 "senza apparire nell'elenco dei destinatari del messaggio."
 
-#: 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 "Allega un file"
 
-#: composer/e-msg-composer.c:697
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9143,38 +9448,34 @@ msgstr ""
 "Errore di lettura del file: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:914
-msgid "Save as..."
-msgstr "Salva come..."
-
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Attenzione!"
 
-#: composer/e-msg-composer.c:927
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Il file esiste, sovrascriverlo?"
 
-#: composer/e-msg-composer.c:949
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:999
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errore di accesso al file: %s"
 
-#: composer/e-msg-composer.c:1007
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Impossibile scaricare messaggi dall'editor"
 
-#: composer/e-msg-composer.c:1014
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9183,7 +9484,7 @@ msgstr ""
 "Impossibile cercare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9192,7 +9493,7 @@ msgstr ""
 "Impossibile troncare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9201,7 +9502,7 @@ msgstr ""
 "Errore nel salvataggio automatico del messaggio: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1132
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9210,7 +9511,7 @@ msgstr ""
 "precedente.\n"
 "Si desidera tentare di recuperarli?"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9220,23 +9521,23 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: composer/e-msg-composer.c:1297
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Attenzione: Messaggio Modificato"
 
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:1469
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Inserici File"
 
-#: composer/e-msg-composer.c:1855 composer/e-msg-composer.c:2447
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Componi un nuovo messaggio"
 
-#: composer/e-msg-composer.c:2464
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9244,7 +9545,7 @@ msgstr ""
 "Impossibile creare una finestra di composizione:\n"
 "impossibile attivare il controllo del selettore di indirizzi."
 
-#: composer/e-msg-composer.c:2487 composer/e-msg-composer.c:2542
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9252,7 +9553,7 @@ msgstr ""
 "Impossibile creare la finestra di composizione:\n"
 "Il componente HTML non � disponibile."
 
-#: 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."
@@ -9260,7 +9561,7 @@ msgstr ""
 "Impossibile creare una finestra di composizione, poich� non �\n"
 "stata ancora configurata nessuna identit� nel componente della posta."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Impossibile inizializzare il composer di Evolution."
 
@@ -9312,12 +9613,21 @@ 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
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Esiste gi� un file con questo nome.\n"
+"Sovrascriverlo?"
+
 #. 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 "Ricorda questa password"
 
-#: 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 "Ricorda questa password per il resto della sessione"
 
@@ -9415,167 +9725,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 "Componente di Evolution per il sommario esecutivo."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Fabbrica per il componente del sommario esecutivo di Evolution."
-
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Impossibile inizializzare il componente Sommario Esecutivodi Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:125
-msgid "Select a service"
-msgstr "Scegliere un servizio"
-
-#: 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 ""
-"� possibile selezionare una pagina HTML diversa per lo sfondo del Sommario Esecutivo.\n"
-"\n"
-"Lasciare in bianco per quella predefinita"
-
-#: 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 "Aprire %s con l'applicazione GNOME predefinita"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Apreire %s con il browser GNOME predefinito"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Invia un email a %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Cambia la vista a %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Esegui %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Chiudi %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Sposta %s a sinistra"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Sposta %s a destra"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Sposta %s nella riga precedente"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Sposta %s nella riga successiva"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Configura %s"
-
-#: executive-summary/component/e-summary-url.c:553
-msgid "page"
-msgstr "pagina"
-
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Impossibile aprire il file HTML:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Errore di lettura dati: %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr "Il file non ha posto per i servizi.\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 ""
-"IL sommario esecutivo non pu� inizializzare Bonobo.\n"
-"Se c'� stato un messaggio di errore riguardo a RootPOA, significa che probabilmente si � compilato Bonobo per GOAD invece che per OAF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Fabbrica per il sommario RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Sommario RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Fabbrica per il componente bonobo di test."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Fabbrica per il componente di test."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Servizio bonobo di test."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Servizio di test"
-
-#: 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 "Errore"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "Aggiorna automaticamente"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "Aggiornare ora"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "Aggiorna ogni"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "anno"
@@ -9608,11 +9757,7 @@ msgstr "Ora"
 msgid "minute"
 msgstr "Minuto"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "secondo"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr " secondi"
 
@@ -9687,7 +9832,7 @@ msgstr " fa"
 msgid "ago"
 msgstr "fa"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:993
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9700,15 +9845,15 @@ msgid "Filter Rules"
 msgstr "Regole dei Filtri"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "Di"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Aggiungi Azione"
 
-#: 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."
@@ -9717,19 +9862,11 @@ msgstr ""
 "� necessario specificare una cartella valida per la memorizzazione della "
 "posta."
 
-#: 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:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Scegli Cartella"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Inserire la URI della Cartella"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<clicca qui per selezionare una cartella>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9739,7 +9876,7 @@ msgstr ""
 "Errore nell'espressione regolare `%s':\n"
 "%s"
 
-#: filter/filter-part.c:488 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test"
 
@@ -9747,39 +9884,40 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "� necessario assegnare un nome a questo filtro."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Nome della Regola:"
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Senza nome"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "Esegui le azioni"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "se tutti i criteri sonon soddisfatti"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "se qualche criterio � soddisfatto"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Aggiungi criterio"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "in entrata"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "in uscita"
 
@@ -9825,195 +9963,211 @@ msgstr "tutte le cartelle locali"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Assegna un punteggio"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Assegna Colore"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Assegna un punteggio"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Allegati"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belem"
+
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "contiene"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copia nella Cartella"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data di Ricezione"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data di spedizione"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Eliminato"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "non contiene"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "non finisce con"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "non esiste"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "non assomiglia a"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "non comincia per"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Non Esiste"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Bozza"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "finisce per"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr "Esegui un comado della shell"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Esistente"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "esiste"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Espressione"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "�"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "� dopo"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "� prima"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr "� segnato"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "� maggiore di"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "� minore di"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "non �"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr "non � segnato"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "Mailing list"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Corpo del messaggio"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "Header del messaggio"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Sposta nella Cartella..."
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "Emetti un suono:"
+
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Leggi"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "Corrispindenza con l'espressione regolare"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "Risposto a"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:8
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Punteggio"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Mittente"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Imposta _Stato"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Dimensione (kB)"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "Assomiglia a"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "Account Sorgente"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Specifica header"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "comincia per"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
 #: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Oggetto"
@@ -10022,11 +10176,11 @@ msgstr "Oggetto"
 msgid "Rules"
 msgstr "Regole"
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Aggiungi Regola"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Modifica Regola"
 
@@ -10046,30 +10200,30 @@ msgstr "� necessario specificare almeno una cartella come sorgente."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sta importando posta da 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 "Importazione in Corso..."
 
-#: 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 "Attendere prego"
 
-#: 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 "Importazione di %s come %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 "Scansione di \"%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:101
 msgid "Mail"
 msgstr "Posta"
 
@@ -10097,23 +10251,74 @@ msgstr ""
 "Evolution ha trovato file GnomeCard.\n"
 "Si desidera importarli in Evolution?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Priorit�: %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 sta importando i vecchi dati di Netscape"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Cestino"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "File di posta locale: %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Scansione cartella"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Inizio importazione"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Modifica Filtri"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10137,45 +10342,96 @@ msgstr ""
 msgid "Pine"
 msgstr "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
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Fabbrica per il compositore di Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr ""
+"Fabbrica per il controllo di visualizzazione delle attivit� di Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Fabbrica per il compositore di Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Fabbrica per il compositore di Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Componente di Evolution per gestire la posta."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Compositore della posta di Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Componente dell'indice esecutivo della posta di Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Componente di Evolution per visualizzare le cartelle di posta."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Fabbrica per il componente delle cartelle di posta di Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Fabbrica per il compositore di Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Fabbrica per il componente del Sommario della Posta"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "_Nessuna Ricorrenza"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Account"
+
+#: 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 "Interfaccia di configurazione della posta"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Cartella contente la posta"
+#: 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:101
-msgid "Mail storage folder (internal)"
-msgstr "Cartella di archiviazione posta (interna)"
+msgid "Folder containing mail"
+msgstr "Cartella contente la posta"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -10185,24 +10441,19 @@ msgstr "Cestino Virtuale"
 msgid "Virtual Trash folder"
 msgstr "Cartella Cestino Virtuale"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Impossibile connettersi allo store: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Questa cartella non pu� contenere messaggi."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Propriet�..."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Modifica le propriet� dei questa cartella"
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10210,11 +10461,15 @@ msgstr ""
 "Alcune delle impostazioni della posta sembrano essere state corrotte, "
 "controllare che tutto sia a posto."
 
-#: mail/component-factory.c:969
+#: mail/component-factory.c:925
+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
 msgid "New Mail Message"
 msgstr "Nuovo Messaggio di Posta"
 
-#: mail/component-factory.c:969 ui/evolution-mail-global.xml.h:20
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "Invia _Messaggio"
 
@@ -10232,203 +10487,212 @@ msgstr ""
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Impossibile attivare il componente folder info di Evolution."
 
-#: mail/component-factory.c:1225
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Connessione al server..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Impossibile attivare lo storage nella shell"
 
-#: mail/folder-browser-ui.c:327
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriet� per \"%s\""
 
-#: mail/folder-browser-ui.c:329
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Propriet�"
 
-#: mail/folder-browser.c:299 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:753
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d nuovi"
 
-#: mail/folder-browser.c:756 mail/folder-browser.c:764
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:758
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d nascosti"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr "%d visibili"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d selezionati"
 
-#: mail/folder-browser.c:770
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr " %d non inviati"
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d inviato/i"
 
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d totali"
 
-#: mail/folder-browser.c:1061
-msgid "Create vFolder from Search"
-msgstr "Crea Cartella Virtuale da Questa Ricerca"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Crea una Cartella _Virtuale dal Messaggio"
 
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "Cartella Virtuale sull'_Oggetto"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "Cartella Virtuale sul _Mittente"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "Cartella Virtuale sui _Destinatari"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "Cartella Virtuale sulla Mailing _List"
 
-#: mail/folder-browser.c:1452
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtro sull'_Oggetto"
 
-#: mail/folder-browser.c:1453
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtro sul _Mittente"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filtro sui _Destinatari"
 
-#: mail/folder-browser.c:1455
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filtro sulla _Mailng List"
 
-#: mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Modifica come Nuovo Messaggio..."
 
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:109
-msgid "_Save As..."
-msgstr "_Salva con Nome..."
-
-#: mail/folder-browser.c:1465
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "S_tampa"
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:108
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Rispondi al Mittente"
 
-#: mail/folder-browser.c:1470 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Rispondi alla _Lista"
 
-#: mail/folder-browser.c:1471 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Rispondi a _Tutti"
 
-#: mail/folder-browser.c:1472
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:32
-msgid "Follow _Up..."
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1477
-msgid "Flag Com_pleted"
-msgstr ""
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Completato"
 
-#: mail/folder-browser.c:1478
-msgid "Clear Fla_g"
-msgstr ""
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Annulla"
 
 #. separator here?
-#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Segna come _Letto"
 
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Segna come _Non Letto"
 
-#: mail/folder-browser.c:1484
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Segna come _Importante"
 
-#: mail/folder-browser.c:1485
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Segna come _Nonimportante"
 
-#: mail/folder-browser.c:1489
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Ripristina"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "_Sposta nella Cartella..."
 
-#: mail/folder-browser.c:1490
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Copia nella Cartella..."
 
-#: mail/folder-browser.c:1492 ui/evolution-mail-message.xml.h:111
-msgid "_Undelete"
-msgstr "_Ripristina"
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
 
-#: mail/folder-browser.c:1496 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
-msgstr "Aggiungi Mittente alla Rubrica"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
+msgstr "Aggiungi Mittente alla _Rubrica"
 
-#: mail/folder-browser.c:1499
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Applica Filtri"
 
-#: mail/folder-browser.c:1501
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "Crea Rego_la dal Messaggio"
 
-#: mail/folder-browser.c:1692
-msgid "Filter on Mailing List"
-msgstr "Filtra sulla Mailng List"
-
-#: mail/folder-browser.c:1693
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "Cartella Virtuale sulla Mailng List"
 
-#: mail/folder-browser.c:1695
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filtra sulla Mailng List (%s)"
 
-#: mail/folder-browser.c:1696
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "Cartella Virtuale sulla Mailng List (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Predefinito"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Ricerca Informazioni Cartella"
@@ -10450,26 +10714,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importa i file Outlook Express 4 in Evolution"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Contenuto del corpo dei messaggi"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Formato corrente:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Indicizza:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Formato della Mailbox"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Contenuto del corpo dei messaggi"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nuovo formato:"
 
-#: 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"
@@ -10479,15 +10736,15 @@ msgstr ""
 "un errore (come una mancanza di spazio su disco) pu� non essere\n"
 "recuperabile automaticamente.  Usare con cautela."
 
-#: 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"
 
@@ -10505,86 +10762,79 @@ msgstr "Editor dlle News di Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor degli Account di Evolution"
 
-#: mail/mail-account-gui.c:959
-msgid "Could not save signature file."
-msgstr "Impossibile memorizzare la firma."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Host:"
 
-#: mail/mail-account-gui.c:1036
-msgid "Save signature"
-msgstr "Salva firma"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "_Username:"
 
-#: mail/mail-account-gui.c:1042
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+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 ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Questa firma � statamodificata, ma non � stata salvata\n"
-"\n"
-"Salvare le modifiche?"
 
-#: mail/mail-account-gui.c:1666
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr "� possibile creare due account con lo stesso nome."
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (predefinito)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Disabilita"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Abilita"
-
-#: mail/mail-accounts.c:292
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "Sicuro di voler cancellare questo account?"
 
-#: mail/mail-accounts.c:296
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Non cancellare"
 
-#: mail/mail-accounts.c:299
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Cancellare veramente questo account?"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.c:535
-msgid "Are you sure you want to delete this news account?"
-msgstr "Sicuro di voler cancellare questo aaccount delle news?"
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Disabilita"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:50
-msgid "Mail Settings"
-msgstr "Impostazioni Posta"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Abilita"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Mail a %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "Sicuro di voler cancellare questo aaccount delle news?"
 
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Oggetto � %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Abilitato"
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Mail da %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Nome dell' _Account:"
 
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "%s mailing list"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Porto Rico"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Aggiungi una regola di Filtro"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10596,7 +10846,7 @@ msgstr ""
 "ricevere o scrivere posta.\n"
 "Si desidera configurarlo subito?"
 
-#: mail/mail-callbacks.c:145
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10604,7 +10854,7 @@ msgstr ""
 "� necessario configurare un' identit�\n"
 "prima di poter comporre una email."
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10612,12 +10862,8 @@ msgstr ""
 "� necessario configurare un trasporto\n"
 "della posta prima di comporla."
 
-#: mail/mail-callbacks.c:189
-msgid "You have not set a mail transport method"
-msgstr "Non � stato impostato un sistema di trasporto per la posta"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10625,11 +10871,11 @@ msgstr ""
 "Il messaggio � in HTML, ma i seguenti destinatari non vogliono ricevere "
 "posta HTML:\n"
 
-#: mail/mail-callbacks.c:239
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Inviare comunque?"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10637,7 +10883,7 @@ msgstr ""
 "Questo messaggio non ha l'oggetto.\n"
 "Inviare lo stesso?"
 
-#: mail/mail-callbacks.c:325
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10646,11 +10892,11 @@ msgstr ""
 "per nascondere gli indirizzi della lista, questo messaggio contiene solo "
 "destinatari Bcc."
 
-#: mail/mail-callbacks.c:329
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "Questo messaggio contiene solo destinatari Bcc."
 
-#: mail/mail-callbacks.c:333
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10660,16 +10906,16 @@ msgstr ""
 "header simile ad A.\n"
 "Inviare lo stesso?"
 
-#: mail/mail-callbacks.c:438
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr "� necessario specificare dei destinatari per inviare questo messaggio."
 
-#: mail/mail-callbacks.c:527
+#: mail/mail-callbacks.c:497
 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:646
+#: mail/mail-callbacks.c:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10677,28 +10923,28 @@ msgstr ""
 "Impossibile apreire la cartella delle bozze per questo account.\n"
 "Usare la cartella delle bozze predefinita?"
 
-#: mail/mail-callbacks.c:972
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "un mittente sconosciuto"
 
-#: mail/mail-callbacks.c:976
+#: mail/mail-callbacks.c:981
 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:1429 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Sposta messaggio(i) in"
 
-#: mail/mail-callbacks.c:1431 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copia messaggio(i) in"
 
-#: mail/mail-callbacks.c:2067
+#: mail/mail-callbacks.c:2091
 #, 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:2092
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10706,7 +10952,7 @@ msgstr ""
 "� possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:2131
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10714,24 +10960,39 @@ msgstr ""
 "� possibile reinviare solo i messaggi\n"
 "salvati nella cartella Posta Inviata."
 
-#: mail/mail-callbacks.c:2145
+#: mail/mail-callbacks.c:2169
 #, 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:2171
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Nessun Messaggio Selezionato"
 
-#: mail/mail-callbacks.c:2270
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Sovrascrivere il file?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/mail-callbacks.c:2272
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Salva messaggi con nome..."
 
-#: mail/mail-callbacks.c:2423
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Mostra il prossimo messaggio non letto"
+
+#: mail/mail-callbacks.c:2373
+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
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10744,7 +11005,7 @@ msgstr ""
 "\n"
 "Cancellare comunque questi messaggi?"
 
-#: mail/mail-callbacks.c:2533
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10753,28 +11014,28 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2545
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:2618
+#: mail/mail-callbacks.c:2783
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d di %d"
 
-#: mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-callbacks.c:2697
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "Lettera-USA"
 
-#: mail/mail-callbacks.c:2732
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Stampa Messaggio non riuscita"
 
-#: mail/mail-callbacks.c:2898
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, 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?"
@@ -10832,16 +11093,35 @@ msgstr ""
 "Questo nome � usato solo allo scopo di visualizzare."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Guida agli Account di Evolution"
 
-#: mail/mail-config.c:354
-#, c-format
-msgid "Account %d"
-msgstr "Account %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
 
-#: mail/mail-config.c:1995
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: mail/mail-config.c:78 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"
@@ -10852,107 +11132,154 @@ msgstr ""
 "%s\n"
 "Non verr� creato alcun collegamento."
 
-#. 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: Posta in Arrivo"
-
-#: mail/mail-config.c:2256
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Verifica Servizi"
 
-#: mail/mail-config.c:2334 mail/mail-config.c:2338
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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
-msgid " _Check for supported types "
-msgstr "_Controlla tipi supportati"
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " colore"
+#, 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
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL non � supportato in questa compilazione di Evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL non � supportato in questa compilazione di Evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:7
 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:6
-msgid "Account"
-msgstr "Account"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Account %d"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Informazioni sull'Account"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gestione degli Account"
 
-#: mail/mail-config.glade.h:9
-msgid "Accounts"
-msgstr "Account"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Annulla Operazione"
+
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Arkansas"
+
+#: mail/mail-config.glade.h:13
+#, 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:10
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Sempre copia carbone _nascosta (Bcc) a:"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Sempre _copia carbone (Cc) a:"
 
-#: mail/mail-config.glade.h:12
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "_Cifra sempre con la mia chiave quando invio posta cifrata"
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "Arica"
 
-#: mail/mail-config.glade.h:13
-msgid "Always _sign outgoing messages when using this account"
-msgstr "Firmare sempre i messaggi in uscita quando si usa questo account"
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Allegare un file al messaggio"
 
-#: mail/mail-config.glade.h:14 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Allegato"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: mail/mail-config.glade.h:16
-msgid "Beep when new mail arrives"
-msgstr "Emetti un suono quando arriva nuova posta"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "Controlla la posta _automaticamente"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Set di caratteri sconosciuto: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "C_hiudi"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Controllo Nuova Posta"
 
-#: mail/mail-config.glade.h:18
-msgid "Composer"
-msgstr "Composizione"
-
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Composizione Messaggio"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: mail/mail-config.glade.h:21
-msgid "Confirm when Expunging a folder"
-msgstr "Chiedi conferma prima di eliminare definitivamente i messaggi"
-
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10968,251 +11295,367 @@ msgstr ""
 "\n"
 "Cliccare su \"Fine\" per salvare le impostazioni."
 
-#: mail/mail-config.glade.h:28
+#: 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:29
-msgid "Default Forward style is: "
-msgstr "Lo stile predefinito per inoltrare �:"
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Priorit� Predefinita:"
 
-#: mail/mail-config.glade.h:30
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Codice dei caratteri predefinito: "
 
-#: mail/mail-config.glade.h:31
-msgid "Defaults"
-msgstr "Predefiniti"
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Ricezione Posta"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "ID digitali..."
 
-#: mail/mail-config.glade.h:34
-msgid "Display"
-msgstr "Visualizzazione"
-
-#: mail/mail-config.glade.h:35
-msgid "Do not notify me when new mail arrives"
-msgstr "Non notificare l'arrivo di nuova posta"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Impossibile aprire il messaggio"
 
-#: mail/mail-config.glade.h:36 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Completato"
 
-#: mail/mail-config.glade.h:37 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Bozze"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Cartella delle _Bozze:"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "_Abilita"
 
-#: mail/mail-config.glade.h:39 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Modifica..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Enabled"
-msgstr "Abilitato"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Est"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Email contiene"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "Indirizzo _Email:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "_Svuota cestino all'uscita"
+
+#: mail/mail-config.glade.h:53
 msgid "Execute Command..."
 msgstr "Esegui comando..."
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "finisce per"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Propriet�"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Messaggio inoltrato"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Prendi ID digitale..."
 
-#: mail/mail-config.glade.h:43
-msgid "HTML signature file:"
-msgstr "File con la firma HTML:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Evidenzia citazioni con"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Honolulu"
+
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: 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 "Identit�"
 
-#: mail/mail-config.glade.h:46
-msgid "In HTML mail"
-msgstr "Posta HTML"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "In linea"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Salva ed Esci"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Carica _Immagini"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Configurazione della Posta"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Collocazione della Mailbox"
 
-#: mail/mail-config.glade.h:52
-msgid "Make this my _default account"
-msgstr "Imposta come mio account _predefinito"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Header del messaggio"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "Visualizzazione _Messaggio"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Micronesia"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP Server:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Notifica Nuova Posta"
 
-#: mail/mail-config.glade.h:55
-msgid "News"
-msgstr "News"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "_Notiziari"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Informazioni Opzionali"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organi_zzazione:"
+
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID della _chiave PGP/GPG:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Scegliere un colore"
 
-#: mail/mail-config.glade.h:63
-msgid "Play sound file when new mail arrives"
-msgstr "Suona un file sonoro quando arriva nuova posta"
+#: mail/mail-config.glade.h:88
+#, 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:64
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:65
-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:66
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Segnala l'invio di messaggi _senza oggetto."
-
-#: mail/mail-config.glade.h:67
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "Segnala l'invio di messaggi con solo destinatari _Bcc"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Stampa i contatti selezionati"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Impossibile aprire il messaggio"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citato"
 
-#: mail/mail-config.glade.h:70
+#: 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"
 
-#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Rispondi-a:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:72
-msgid "Receiving Mail"
-msgstr "Ricezione Posta"
-
-#: mail/mail-config.glade.h:73
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Opzioni di Ricezione"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Ricorda questa password"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Informazioni Richieste"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:103
+#, fuzzy
+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:77
-msgid "Security"
-msgstr "Sicurezza"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:78
-msgid "Select Filter Log file..."
-msgstr "Scegliere un Filtro per il file di Log..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "Scegliere un file binario PGP"
 
-#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Invio Email"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "File con la firma:"
 
-#: mail/mail-config.glade.h:81
-msgid "Sending Mail"
-msgstr "Invio Posta"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Cancella tutto tranne la firma"
 
-#: mail/mail-config.glade.h:83 mail/message-list.etspec.h:9
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Inviata"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Cartella _messaggi inviati:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Messaggi Inviati e Bozze"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Il ser_ver richiede autenticazione"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Configurazione del Server"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "_Tipo di Server:"
 
-#: mail/mail-config.glade.h:89
-msgid "Signature file:"
-msgstr "File con la firma:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Collegamenti"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Salva firma"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Sorgente"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Informazione Sorgenti"
 
-#: mail/mail-config.glade.h:92
-msgid "Sources"
-msgstr "Sorgenti"
-
-#: mail/mail-config.glade.h:93
-msgid "Specify filename:"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
 msgstr "Specifica nome del file:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Mbox standard per Unix"
 
-#: mail/mail-config.glade.h:96
-msgid "Use s_ecure connection (SSL)"
-msgstr "Usa conn_essione sicura (SSL)"
+#: mail/mail-config.glade.h:128
+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:97
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "Firma _HTML:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Variabile"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11222,126 +11665,219 @@ msgstr ""
 "\n"
 "Cliccare \"successivo\" per cominciare."
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Est"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "_Caricare sempre le immagini dalla rete"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:141
 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:103
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "Tipo di _Autenticazione: "
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:143
 msgid "_Authentication type: "
 msgstr "Tipo di _Autenticazione: "
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "Controlla la posta _automaticamente"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:145
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "Emetti un suono quando arriva nuova posta"
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "ID del _Certificato:"
 
-#: mail/mail-config.glade.h:108
-msgid "_Drafts folder:"
-msgstr "Cartella delle _Bozze:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:111
-msgid "_Empty trash folders on exit"
-msgstr "_Svuota cestino all'uscita"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Chiedi conferma prima di eliminare definitivamente i messaggi"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Predefiniti"
+
+#: mail/mail-config.glade.h:151
+#, 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
+#, fuzzy
+msgid "_Filename:"
+msgstr "Nome del file:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "_Inoltra Messaggio"
+
+#: mail/mail-config.glade.h:157
 msgid "_Full name:"
 msgstr "_Nome e cognome:"
 
-#: mail/mail-config.glade.h:113
-msgid "_HTML signature:"
+#: mail/mail-config.glade.h:159
+#, 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:114
-msgid "_Highlight citations with"
-msgstr "_Evidenzia citazioni con"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Identit�"
 
-#: mail/mail-config.glade.h:115
-msgid "_Host:"
-msgstr "_Host:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Lingua"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr "_Carica le immagini se il mittente � nella rubrica"
 
-#: mail/mail-config.glade.h:117
-msgid "_Log filter actions to:"
-msgstr "Salva il _Log dei filtri in:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Imposta come mio account _predefinito"
 
-#: mail/mail-config.glade.h:118
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "Segna i _messaggi come letti dopo"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_Non caricare mai le immagini dalla rete"
 
-#: mail/mail-config.glade.h:121
-msgid "_Organization:"
-msgstr "_Organizzazione:"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "Percorso binario di _PGP:"
 
-#: mail/mail-config.glade.h:123
-msgid "_Path:"
-msgstr "_Percorso:"
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Play sound file when new mail arrives"
+msgstr "Suona un file sonoro quando arriva nuova posta"
 
-#: mail/mail-config.glade.h:124
-msgid "_Remember this password"
-msgstr "_Ricorda questa password"
+#: mail/mail-config.glade.h:172
+#, 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:125
-msgid "_Send mail in HTML format by default."
-msgstr "_Invia la posta in formato HTML come predefinito."
+#: mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "Segnala l'invio di messaggi _senza oggetto."
 
-#: mail/mail-config.glade.h:126
-msgid "_Server type: "
-msgstr "Tipo di _Server: "
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Radio"
+
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Ricezione Posta"
 
-#: mail/mail-config.glade.h:127
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Rispondi a Tutti"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Sicurezza"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Sicurezza"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Invio Posta"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Mostra ora come"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
 msgstr "_File con la firma:"
 
-#: mail/mail-config.glade.h:128
-msgid "_Username:"
-msgstr "_Username:"
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Text Signature:"
+msgstr "Firma _HTML:"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:184
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "Usa conn_essione sicura (SSL)"
+
+#: mail/mail-config.glade.h:185
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Variabile"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_ogni"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " colore"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "descrizione"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:133
-msgid "placeholder"
-msgstr ""
-
-#: mail/mail-config.glade.h:134
-msgid "seconds."
-msgstr "secondi."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Impossibile creare un contesto per la firma PGP."
@@ -11378,149 +11914,138 @@ msgstr "Imposssibile creare un contesto per la busta S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Impossibile creare un contesto di codifica  S/MIME."
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Salva Allegati"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Impossibile creare una directory temporanea: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Salva su Disco..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Visualizza In linea"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Apri in %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "View Inline (via %s)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Nascondi"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Visualizzatore Esterno"
 
-#: mail/mail-display.c:1162
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Caricamento del contenuto del messaggio"
 
-#: mail/mail-display.c:1657
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Aprei il link nel Browser"
 
-#: mail/mail-display.c:1659
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Copia la collocazione del Link"
 
-#: mail/mail-display.c:1662
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Salva il Link come"
 
-#: mail/mail-display.c:1665
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Salva Immagine con nome..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Impossibile interpretare il messaggio MIME.  Viene visualizzato il sorgente."
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Indirizzo errato"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:6
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Da"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Rispondi-a"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:13
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1767
-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:1790
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution non riconosce questo tipo di firma digitale."
-
-#: mail/mail-format.c:1798
-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:1806
-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:915
+#, fuzzy
+msgid "Mailer"
+msgstr "Posta"
 
-#: mail/mail-format.c:2021
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/mail-format.c:2035
+#: mail/mail-format.c:2120
 #, 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:2040
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/mail-format.c:2069
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntatore a dati remoti (%s)"
 
-#: mail/mail-format.c:2077
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Parte esterna del messaggio malformata."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Riconfigurazione cartella"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11529,27 +12054,27 @@ msgstr ""
 "Impossibile salvare le metainfo della cartella; probabilmente non \n"
 "sar� pi� possibile riaprire questa cartella: %s: %s"
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Impossibile salvarele metainfo della cartella %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Impossibile cancellare imetadati della cartella %s: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiamento del formato della cartella da  \"%s\" a  \"%s\" "
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, 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:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11557,11 +12082,11 @@ msgstr ""
 "Se non si riesce pi� ad aprire questa mailbox, pu� essere necessario\n"
 "ripararla manualmente."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 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:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Riconfigura /%s"
@@ -11588,117 +12113,112 @@ msgstr ""
 msgid "Working"
 msgstr "Sto lavorando"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtraggio Cartella"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Ricezione Posta"
 
-#: 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 "Tuttavia, il messaggio � stato inviato correttamente."
 
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Invio di \"%s\" in corso"
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Invio del messaggio %d di %d"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Errore al messaggio %d di %d"
 
-#: 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 "Completato."
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sposta messaggii in %s"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copia messaggi in %s"
 
-#: mail/mail-ops.c:940
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Spostamento in corso"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Copia in corso"
 
-#: mail/mail-ops.c:1053
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1103 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Cestino"
-
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-ops.c:1279
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Lettura cartella %s in corso"
 
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Lettura store %s in corso"
 
-#: mail/mail-ops.c:1420
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Rimozione cartella %s"
 
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Archiviazione cartella '%s'"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Aggiornamento cartella"
 
-#: mail/mail-ops.c:1601
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Eliminazione cartella"
 
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Scaricamento del messaggio %s"
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Ricezione di %d messaggio(i)"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvataggiodi %d messaggio(i)"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11707,7 +12227,7 @@ msgstr ""
 "Impossibile creare il file di output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11716,11 +12236,11 @@ msgstr ""
 "Errore nel salvare i messaggi in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Salvataggio Allegati"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11729,27 +12249,27 @@ msgstr ""
 "Impossibile creare il file di output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossibile srivere i dati: %s"
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnessione da %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Riconnessione a %s in corso"
 
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Esecuzione di comando shell: %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Cerca"
 
@@ -11785,42 +12305,42 @@ msgstr "Trova:"
 msgid "Matches:"
 msgstr "Corrisponde:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Annullamento..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Percorso %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Invia e Ricevi Posta"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Annulla Tutto"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Aggiornamento in corso..."
 
-#: 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 "In Attesa..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Annullato."
 
@@ -11837,24 +12357,40 @@ msgstr "Inserire la Password per %s"
 msgid "Enter Password"
 msgstr "Inserire la Password"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "Messaggio incompleto scritto su una redirezione!"
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Impossibile memorizzare la firma."
 
-#: mail/mail-summary.c:467
-msgid "Mail Summary"
-msgstr "Sommario della Posta"
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Salva firma"
 
-#: mail/mail-tools.c:256
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Questa firma � statamodificata, ma non � stata salvata\n"
+"\n"
+"Salvare le modifiche?"
+
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "File con la firma:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Messaggio inoltrato - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Messaggio Inoltrato"
 
@@ -11881,10 +12417,6 @@ msgstr ""
 "    '%s'\n"
 "che ora � stata rimossa, e quindi sono state aggiornate."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "VFolder"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "vFolder"
@@ -11902,92 +12434,92 @@ msgstr "Si � cercato di editare una vfolder (%s) che non esiste."
 msgid "New VFolder"
 msgstr "Nuova Cartella Virtuale"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(nessun oggetto)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Messaggio"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Non visto"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Risposto"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Messaggi Multipli Non Visti"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Messaggi Multipli"
 
-#: mail/message-list.c:646
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Il pi� basso"
 
-#: mail/message-list.c:647
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Pi� basso"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Pi� alto"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Il pi� alto"
 
-#: mail/message-list.c:957
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:964
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Oggi %I:%M %p"
 
-#: mail/message-list.c:973
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l %M %p"
 
-#: mail/message-list.c:985
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:995
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2363
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Generazione lista messaggi"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Scadenza "
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr ""
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Con la bandierina"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr ""
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Ricevuta"
 
@@ -11995,6 +12527,50 @@ msgstr "Ricevuta"
 msgid "Size"
 msgstr "Dimensione"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "McCall"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Vai avanti"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Informazione Sorgenti"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Inoltra"
+
+#: 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 "Rispondi"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Rispondi a Tutti"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Anteprima"
+
+#: 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\""
@@ -12016,7 +12592,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Annullare sottoscrizione cartella \"%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 "Cartella"
 
@@ -12060,6 +12636,36 @@ msgstr "_Iscrizione"
 msgid "_Unsubscribe"
 msgstr "_Annulla iscrizione"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "Cartella contente il Sommario di Evolution"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Compositore della posta di Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr ""
+"Fabbrica per il controllo di visualizzazione delle attivit� di Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Fabbrica per il componente del sommario esecutivo di Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Impostazioni Sommario"
+
+#: 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 "Aarhus"
@@ -21853,14 +22459,10 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zurigo"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "Cartella contente il Sommario di Evolution"
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Impossibile inizializzare il componente Sommario di Evolution."
-
 #: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "Appuntamenti"
@@ -21881,44 +22483,50 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Nessuna descrizione disponibile"
 
-#: my-evolution/e-summary-mail.c:120
+#: my-evolution/e-summary-mail.c:151
 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
+msgid "Local Folders"
+msgstr "Cartelle Locali"
+
 #. 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:92
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "LIRU:LIML"
 
-#: my-evolution/e-summary-preferences.c:453
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Parola del Giorno"
 
-#: my-evolution/e-summary-preferences.c:474
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Citazione del Giorno"
 
-#: my-evolution/e-summary-preferences.c:735
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Aggiungere un notiziario"
 
-#: my-evolution/e-summary-preferences.c:743
+#: my-evolution/e-summary-preferences.c:728
 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:747
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Nome:"
 
-#: my-evolution/e-summary-preferences.c:1225
-msgid "Summary Settings"
-msgstr "Impostazioni Sommario"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "Errore scaricando il file RDF"
@@ -21927,11 +22535,33 @@ msgstr "Errore scaricando il file RDF"
 msgid "News Feed"
 msgstr "Notiziario"
 
-#: my-evolution/e-summary-tasks.c:241
+#: my-evolution/e-summary-shown.c:463
+#, 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
+#, fuzzy
+msgid "<- Remove"
+msgstr "Rimuovere"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Shannon"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Nessuna attivit�"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(Nessuna Descrizione Disponibile)"
 
@@ -21947,19 +22577,19 @@ msgstr "Si � verificato un errore nella ricezione dei dati da"
 msgid "Weather"
 msgstr "Meteo"
 
-#: my-evolution/e-summary.c:190
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "Attendere prego..."
 
-#: 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 "Stampa Sommario"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Stampa Sommario non riuscita"
 
@@ -21968,38 +22598,6 @@ 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"
@@ -23231,43 +23829,36 @@ msgstr "_Pianifica"
 msgid "_Weather"
 msgstr "_Meteo"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
-msgstr "Fabbrica per il componente delle note di Evolution."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr "Fabbrica per il controllo delle Note"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Scegli Cartella"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "La shell di Evolution."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Mostra Dettagli"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Annulla Operazione"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Posta in Arrivo"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Posta in Uscita"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Cartelle Locali"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Installazione di 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"
@@ -23275,15 +23866,15 @@ msgstr ""
 "Questa nuova versione di Evolution richiede l'installazione di file \n"
 "addizionali nella directory personale di Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "Cliccare \"OK\" per installare i files, o \"Annulla\" per uscire."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Impossibile aggiornare i file correttamente"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -23294,7 +23885,7 @@ msgstr ""
 "%s\n"
 "Errore: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -23303,7 +23894,7 @@ msgstr ""
 "Si � verificato un errore durante la copia del file in\n"
 "`%s'"
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -23314,7 +23905,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -23325,7 +23916,7 @@ msgstr ""
 "non ha i permessi necessari.  Cambiare i permessi in modo\n"
 "che sia leggibile ed eseguibile e riavviare Evolution."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -23336,7 +23927,7 @@ msgstr ""
 "perch� Evolution possa funzionare correttamente.\n"
 "Rimuovere questo file e riavviare Evolution."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -23347,7 +23938,7 @@ msgstr ""
 "Spostarla per permettere l'installazione\n"
 "dei file utente di Evolution."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -23361,7 +23952,7 @@ msgstr ""
 "avviare Evolution.\n"
 "Rimuovere questa directory?"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -23372,49 +23963,53 @@ msgstr ""
 "directorydi Evolution. Spostarla per permettere \n"
 "l'installazione dei file utente di Evolution."
 
-#: 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."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Sviluppato da"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Impossibile controllare la cartella: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Impossibile rinomincare la cartella:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Impossibile spostare la cartella su se stessa."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Impossibile copiare una cartella su se stessa."
 
-#: 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 "Impossibile spostare una cartella in una delle sue suttostanti."
 
-#: 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 "Specifica una cartella in cui copiare la cartella \"%s\":"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Copia cartella"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Sposta cartella"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23423,18 +24018,18 @@ msgstr ""
 "Impossibile cancellare la cartella:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Elimina \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23443,16 +24038,16 @@ msgstr ""
 "Impossibile rinomincare la cartella:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rinominare la cartella \\\"%s\\\" in:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Rinomina cartella"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23467,7 +24062,7 @@ msgstr ""
 "Impossibile creare la cartella specificata:\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 - Crea nuova cartella"
 
@@ -23483,7 +24078,7 @@ msgstr ""
 msgid "New..."
 msgstr "Nuovo..."
 
-#: 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 "(Senza nome)"
 
@@ -23656,8 +24251,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:495
-#: shell/e-shell-user-creatable-items-handler.c:540
+#: shell/e-shell-user-creatable-items-handler.c:506
+#: shell/e-shell-user-creatable-items-handler.c:551
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nuovo"
@@ -23678,93 +24273,95 @@ 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:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Impossibile trovare Bug Buddy nel tuo $PATH. "
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy non pu� essere eseguito."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Informazioni su Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Vai alla Cartella..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Selezionare la cartella che si desidera aprire"
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Crea un nuovo collegamento"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:566
 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:577
-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."
-
-#: shell/e-shell-view-menu.c:585
-#, c-format
-msgid "Error executing %s."
-msgstr "Errore nell'esecuzione di %s."
-
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "_Lavora Connesso"
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Lavora Disconnesso"
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Non connesso"
 
-#: shell/e-shell-view.c:215
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Nessuna cartella mostrata)"
 
-#: shell/e-shell-view.c:1598
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1600
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(Nessuno)"
 
-#: 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 � al momento connesso.  Cliccare questo bottone per "
 "disconnettersi."
 
-#: 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 si sta disconnettendo."
 
-#: 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 � al momento disconnesso.  Cliccare questo bottone per "
 "connettersi."
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"L'errore del sistema di attivazione �:\n"
+"%s"
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Impossibile impostare il local storage --%s"
 
-#: shell/e-shell.c:1660
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23775,19 +24372,23 @@ msgstr ""
 "� inaspettatamente terminato. Sar� necessario uscire e riavviare\n"
 "Evolution prima di poter accedere nuovamente a questi dati."
 
-#: shell/e-shell.c:1887
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Argomenti non validi"
 
-#: shell/e-shell.c:1889
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Impossibile registrare OAF"
 
-#: shell/e-shell.c:1891
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Database di Configurazione non trovato"
 
-#: shell/e-shell.c:1893 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Errore generico"
 
@@ -23905,76 +24506,72 @@ msgstr "Ri_muovere"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Errore di salvataggio dei collegamenti."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Collegamenti"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Impossibile trasferire la cartella:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Posta in Arrivo"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Senza nome)"
+#: 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 "Nessun errore"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Esiste gi� una cartella con questo nome"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Il tipo di cartella specificato non � valido"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "Errore I/O"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Spazio insufficiente per creare la cartella"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "La cartella non � vuota"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "la cartella specificata non � stata trovata"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funzione non implementata"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Operazione non supportata"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Il tipo specificatp non � supportato"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "La cartella specificata non pu� essere modificata o rimossa"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Impossibile rendere una cartella figlia di uno dei suoi discendenti"
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "Impossibile creare una cartella con quel nome"
 
@@ -23984,10 +24581,13 @@ 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
+msgid "<click here to select a folder>"
+msgstr "<clicca qui per selezionare una cartella>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -24025,67 +24625,67 @@ msgstr ""
 "L'errore del sistema di attivazione �:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "Errore CORBA"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Interrotto"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Argomento non valido"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Ha gi� una shell"
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Nessun proprietario"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Non trovato"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Tipo non supportato"
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Schema non supportato"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Opreazione non supportata"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Esiste"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "URI non valida"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Ha delle sottocartelle"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Spazio sul dispositivo esaurito"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "La shell precedente � scomparsa"
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
 msgid "Test type"
 msgstr "Tipo di test"
 
@@ -24214,32 +24814,49 @@ 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:83
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:89
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution sta ora terminando ..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Impossibile inizializzare la shell di  Ximian Evolution."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Impossibile inizializzare la shell di  Ximian Evolution: %s"
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Disabilita la schermata di avvio"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Inizio importazione"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Avvio degli Importatori Intelligenti"
+
+#: shell/main.c:320
 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:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
 
@@ -24262,257 +24879,206 @@ msgstr "File di Destinazione"
 msgid "No filename provided."
 msgstr "� necessario fornire un nome di file."
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Copia i messaggi selezionati in una nuova cartella"
+
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Copia selezionato"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "_Copia nella Cartella..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Crea un nuovo contatto"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Crea una nuova lista di contatti"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:12
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Taglia selezionato"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "Cancella il contatto selezionato"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Nuova Lista"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Sposta i messaggi in un'altra cartella"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "_Sposta nella Cartella..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Incolla agli appunti"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Anteprime dei contatti da stampare"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Stampa i contatti selezionati"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Salva i contatti selezionati come VCard."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Seleziona Tutto"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Seleziona tutti i contatti"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "Invia un _Messaggio al Contatto..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Invia un messaggio ai contatti selezionati"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Invia un messaggio al contatto"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Invia contatto ad un'altra persona."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Arresta caricamento"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:30
 msgid "View the current contact"
 msgstr "Mostra il contatto corrente"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: 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:92 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:16
+#: 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
 msgid "_Actions"
 msgstr "_Azioni"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Addressbook Sources..."
-msgstr "Sorgenti della _Rubrica..."
-
 #: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "Lista dei _Contatti"
 
-#: 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 "_Inoltra Contatto..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:44
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:106
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "S_tampa..."
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "_Sposta nella Cartella..."
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "_Salva come VCard"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_Cerca Contatti"
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Seleziona Tutto"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Configura le impostazioni del calendario"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "Invia un _Messaggio al Contatto..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Crea Nuovo _Evento del Giorno"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "Crea una Nuova _Attivit�"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Crea _Nuovo Appuntamento"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a _New Meeting"
-msgstr "Crea un _Nuovo Appuntamento"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
-msgstr "Crea un nuovo appuntamento"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new meeting request"
-msgstr "Crea una nuova richiesta di apppuntamento"
-
-#: ui/evolution-calendar.xml.h:10 ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "Crea una nuova attivit�"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create an event for the whole day"
-msgstr "Crea un evento per l'intera giornata"
-
-#: ui/evolution-calendar.xml.h:13
 msgid "Day"
 msgstr "Giorno"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Elimina appuntamento"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Vai al"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Torna indietro"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Vai avanti"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Vai alla _Data"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Vai ad una data specifica"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Vai a oggi"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Mese"
 
-#: ui/evolution-calendar.xml.h:23
-msgid "New Appointment"
-msgstr "Nuovo Appuntamento"
-
-#: ui/evolution-calendar.xml.h:24 ui/evolution-tasks.xml.h:12
-msgid "New Task"
-msgstr "Nuova Attivit�"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Anteprime del calendario da stampare"
 
-#: ui/evolution-calendar.xml.h:27 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 "_Anteprima di Stampa"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Stampa questo calendario"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Rende note le informazioni sulla Disponibilit� per questo calendario"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Mostra un giorno"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Mostra un mese"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Mostra una settimana"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Mostra la settimana lavorativa"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Settimana"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment..."
-msgstr "_Appuntamento..."
-
-#: ui/evolution-calendar.xml.h:38
-msgid "_Calendar Settings..."
-msgstr "Impostazioni _Calendario..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Meeting..."
-msgstr "_Riunione..."
-
-#: ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr "_Rende note le Informazioni sulla Disponibilit�"
-
-#: ui/evolution-calendar.xml.h:46
-msgid "_Task..."
-msgstr "_Attivit�..."
-
 #: 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
@@ -24542,18 +25108,18 @@ msgstr "Anteprima dell'oggetto da stampare"
 msgid "Print this item"
 msgstr "Stampa questo oggetto"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Stampa..."
-
 #: 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 "Salva"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Salva con nome..."
+
 #: 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 "Salva ed Esci"
 
@@ -24569,8 +25135,8 @@ msgstr "Salva l'ogetto sol disco"
 #: 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:40
 msgid "_File"
 msgstr "_File"
 
@@ -24588,10 +25154,14 @@ msgstr "Salva _Come..."
 msgid "Save the contact and close the dialog box"
 msgstr "Salva il contatto e chiudi la finestra di dialogo"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "Invia un _Messaggio al Contatto..."
+
 #: 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 "_Salva"
 
@@ -24651,6 +25221,10 @@ 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"
@@ -24660,79 +25234,55 @@ msgid "Compose _New Message"
 msgstr "Componi _Nuovo Messaggio"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Crea o modifica account si posta ed altre preferenze"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crea o modifica regole per selezionare la nuova posta"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Crea o modifica le definizioni delle cartelle virtuali"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Vuota _Cestino"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Dimentica _Password"
 
-#: 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 ""
 "Dimentica le password archiviate in modo che vengano di nuovo richieste"
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Nuovo Messaggio"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Aprire una finestra per comporre un messaggio di posta"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Rimuovi permanentemente i messaggi cancellati da tutte le cartelle"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "Invia / Ricevi"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Invia la posta in coda e ricevi quella nuova"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Mostra messaggio in una finestra di anteprima"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Sottoscrivi e annulla sottoscrizione a cartelle su server remoti"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor delle Cartelle Virtuali..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "Impostazioni _Posta..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Anteprima"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "_Invia / Ricevi"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "_Sottoscrizione Cartelle..."
 
@@ -24829,11 +25379,11 @@ msgstr "Nascondi temporaneamente i messaggi selezionati"
 msgid "Threaded Message list"
 msgstr "Lista per Discussioni"
 
-#: 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 "_Elimina per Sempre"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Cartelle"
 
@@ -24849,204 +25399,223 @@ msgstr "_Propriet�"
 msgid "_Threaded Message List"
 msgstr "Raggruppa per _Discussioni"
 
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Aggiungi Mittente alla Rubrica"
+
 #: ui/evolution-mail-message.xml.h:2
-msgid "Add Sender to Address _Book"
-msgstr "Aggiungi Mittente alla _Rubrica"
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Applica Filtri"
 
 #: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Aggiungi Mittente alla Rubrica"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Applica le regole del filtro ai messaggi selezionati"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Componi una risposta a tutti i destinatari del messaggio selezionato"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Componi una risposta alla mailing list del messaggio selezionato"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Componi una risposta al mittente del messaggio selezionato"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Copia i messaggi selezionati in una nuova cartella"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Crea una Cartella _Virtuale dal Messaggio"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crea una regola per filtrare i messaggi da questo mittente"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crea una regola per filtrare i messaggi verso questi destinatari"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crea una regola per filtrare i messaggi verso questa mailing list"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crea una regola per filtrare i messaggi con questo oggetto"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Crea una cartella virtuale per questi destinatari"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Crea una cartella virtuale per questa mailing list"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Crea una cartella virtuale per queato mittente"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Crea una cartella virtuale per questo oggetto"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Ridurre la dimensione del testo"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Mostra il prossimo messaggio importante"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Mostra il prossimo messaggio"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Mostra il prossimo messaggio non letto"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Mostra la prossima discussione non letta"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Mostra il messaggio importante precedente"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Mostra il messaggio precedente"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Mostra il messaggio non letto precedente"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Inoltra"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filtra sulla Mailng _List..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filtro sul _Mittente..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filtro sui _Destinatari..."
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filtra sull'_Oggetto..."
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:33
 msgid "Flag selected message(s) for follow-up"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:33
-msgid "Force images in HTML mail to be loaded"
-msgstr "Forza il caricamento delle immagini della posta HTML"
-
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward"
-msgstr "Inoltra"
+msgid "Follow _Up..."
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr "Forza il caricamento delle immagini della posta HTML"
+
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Inoltra il messaggio selezionato come corpo di un nuovo messaggio"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Inoltra il messaggio selezionato citato come in una risposta"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Inoltra il messaggio selezionato come"
 
-#: 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 "Inoltra il messaggio selezionato a qualcuno come un allegato"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Aumenta la dimensione del testo"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Carica _Immagini"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Segna come I_mportante"
 
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Segna come _Non Letto"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Segna come Non Im_portante"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected message(s) as having been read"
 msgstr "Segna i messaggi selezionati come se fossero stati letti"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as important"
 msgstr "Segna i messaggi selezionati come importanti"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Segna i messaggi selezionati come se non fossero stati letti"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Segna i messaggi selezionati come non important"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Segna i messaggi selezionati per cancellarli"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Sposta"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move selected message(s) to another folder"
 msgstr "Sposta i messaggi in un'altra cartella"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Successivo"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "Messaggio Importante Successivo"
-
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
-msgstr "Messaggio Successivo"
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "Messaggio Importante Successivo"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Discussione Successiva"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Messaggo Non Letto Successivo"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -25063,149 +25632,145 @@ msgid "Original Si_ze"
 msgstr "Dimensione _Predefinita"
 
 #: ui/evolution-mail-message.xml.h:61
-msgid "Preview the message to be printed"
-msgstr "Anteprima del messaggio da stampare"
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Messaggio Non Letto Precedente"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "Precedente"
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Messaggio Importante Precedente"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "Messaggio Importante Precedente"
+msgid "Preview the message to be printed"
+msgstr "Anteprima del messaggio da stampare"
 
 #: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "Messaggio Precedente"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "Messaggio Non Letto Precedente"
+msgid "Previous"
+msgstr "Precedente"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Stampa questo messaggio"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:68
 msgid "Re_direct"
 msgstr "Ri_dirigi"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:69
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Ridirige (rimbalza) il messaggio selezionato a qualcuno"
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "Reply"
-msgstr "Rispondi"
-
-#: ui/evolution-mail-message.xml.h:72
-msgid "Reply to All"
-msgstr "Rispondi a Tutti"
-
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr "Reimpostare il testo alla dimensione predefinita"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "C_erca Messaggio..."
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "Pi� _Piccolo"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "Salva il messaggio come un file di testo"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:78
 msgid "Search for text in the body of the displayed message"
 msgstr "Effettua una ricerca nel messaggio visualizzato"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "Imposta i parametri della pagina per la stampante corrente"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "Mostra _Sorgente dell'Email"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "Mostra_Headers completi"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "Mostra messaggio in stile normale"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "Mostra messaggio con tutti gli header di posta elettronica"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "Mostra il sorgente grezzo del messaggio"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "Dimensione del _Testo"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Annulla la cancellazione del messaggio selezionato"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "Cartella Virtuale sulla Mailing _List..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "Cartella Virtuale sul _Mittente..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "Cartella Virtuale sui _Destinatari..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "Cartella Virtuale per _Oggetto..."
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Apply Filters"
-msgstr "_Applica Filtri"
-
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Attached"
 msgstr "_Allegato"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "_Copia nella Cartella"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "_Crea Filtro dal Messaggio"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "_Inoltra Messaggio"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Vai al"
+
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Inline"
 msgstr "_In linea"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "Pi� _Grande"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "Visualizzazione _Messaggio"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Sposta nella Cartella"
 
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Messaggio Successivo"
+
 #: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "Visualizzazione _Normale"
@@ -25214,28 +25779,36 @@ msgstr "Visualizzazione _Normale"
 msgid "_Open Message"
 msgstr "_Apri Messaggio"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Messaggio Precedente"
+
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Quoted"
 msgstr "_Citato"
 
-#: ui/evolution-mail-message.xml.h:110 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "S_trumenti"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Ripristina"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
 #: 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:36
 msgid "_Close"
 msgstr "_Chiudi"
 
 #: 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:56
 msgid "_View"
 msgstr "_Visualizza"
 
@@ -25260,11 +25833,11 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 "Cifra questo messaggio con il proprio Certificato di Crittazione 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 "For_mato"
 
-#: 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"
 
@@ -25280,6 +25853,10 @@ msgstr "Inserici un file come testo nel messaggio"
 msgid "Insert text file..."
 msgstr "Inserici un file di testo..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Apri"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Apri un file"
@@ -25313,7 +25890,7 @@ msgid "Save in folder..."
 msgstr "Salva nella cartella..."
 
 #: 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 "Salva il file corrente"
 
@@ -25338,6 +25915,7 @@ msgid "Send _later"
 msgstr "Invia pi� _tardi"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Invia la posta in formato HTML"
 
@@ -25406,7 +25984,7 @@ msgid "_From Field"
 msgstr "Campo _Da"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -25418,11 +25996,7 @@ msgstr "_Apri..."
 msgid "_Reply-To Field"
 msgstr "Campo _Rispondi-a:"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Sicurezza"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Aiuto"
 
@@ -25478,37 +26052,39 @@ msgstr "Aggiorna informazioni sull'attivit�"
 msgid "Re_fresh Task"
 msgstr "A_ggiorna Attivit�"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Configura le impostazioni della vista delle attivit�"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Copia attivit� selezionata"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Taglia attivit� selezionata"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete completed tasks"
 msgstr "Elimina attivit� completate"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Elimina attivit� selezionate"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 msgid "Mar_k as Complete"
 msgstr "_Segna come Completato"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Incolla attivit� dagli appunti"
 
-#: ui/evolution-tasks.xml.h:15
-msgid "Tasks Settings..."
-msgstr "Impostazioni _Attivit�..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Anteprime dei contatti da stampare"
+
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Stampa questo messaggio"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25575,113 +26151,118 @@ msgid "Open this folder in an other window"
 msgstr "Apre questa cartella in una nuova finestra"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Invia / Ricevi"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Invia la posta in coda e ricevi quella nuova"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "Mostra informazioni su Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Invia un Bug Report"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Invia un _Bug Report"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Inoltra un Bug Report usando Bug Buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Mostra/nasconde"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostra/nascondi la barra delle cartelle"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostra/nascondi la barra dei collegamenti"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Modifica il modo di funzionamento (connesso o disconnesso)."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Mostra la cartella selezionata"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ di Ximian Evolution"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "_Informazioni su Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "Barra delle _Cartelle"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_Visualizza Cartella..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Importa..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Sposta..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Nuovo"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Nuova Cartella"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "Impostazioni _Pilot..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Rinomina..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Invia / Ricevi"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Collegamento"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "_Barra dei Collegamenti"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Modifica le impostazioni del sommario"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Stampa sommario"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Aggiorna"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Aggiorna questa vista"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "Impostazioni _Sommario..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Card con Indirizzo"
@@ -25855,20 +26436,20 @@ msgstr "Ucraino"
 msgid "Visual"
 msgstr "Visuale"
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Set di caratteri sconosciuto: %s"
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Inserire il set di caratteri da usare"
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Altro..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Codifica dei Caratteri"
 
@@ -25876,30 +26457,32 @@ msgstr "Codifica dei Caratteri"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Cerca Editor"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Salva Ricerca"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Aggiungi alle Ricerche Salvate"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Annulla"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Salva Ricerca"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Mostra Tutto"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Aggiungi alle Ricerche Salvate"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informazione"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Errore"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Domanda"
@@ -25913,11 +26496,21 @@ msgstr "Messaggio"
 msgid "Don't show this message again."
 msgstr "Non mostrare questo messagio in futuro."
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "_Cerca"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Trova Ora"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Annulla"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Annulla"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Trova Ora"
 
@@ -25942,3 +26535,783 @@ msgstr "init_corba(): impossibile inizializzare GNOME"
 #: wombat/wombat.c:225
 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"
+
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "A_utenticare con il server usando:"
+
+#~ msgid "Account Name"
+#~ msgstr "Nome Account"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Aggiungi rubrica"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzato"
+
+#~ msgid "Base"
+#~ msgstr "Base"
+
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Controllare questo se il server vi richiede l'autenticazione."
+
+#~ 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 "Server Name"
+#~ msgstr "Nome del Server"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr ""
+#~ "Le informazioni sottostanti sono richieste per aggiungere una rubrica.  "
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr ""
+#~ "Queste informazioni non sono richieste dala maggior parte dei server 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 ""
+#~ "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 ""
+#~ "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 "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."
+
+#~ msgid "Other Contacts"
+#~ msgstr "Altri Contatti"
+
+#~ 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 ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ 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%"
+
+#~ 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 "_Elimina Questa Attivit�"
+
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "Inizio Riunione: <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "Inizio attivit�: <b>"
+
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Inizio informazioni di disponibilit�: <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Inizio: <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Fine riunione: <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Fine informazioni di disponibilit�:"
+
+#~ msgid "Ends: <b>"
+#~ msgstr "Fine: <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Attivit� Completata: <b>"
+
+#~ msgid "Task Due: <b>"
+#~ msgstr "Attivit� Da Completare Entro: <b>"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "Informazioni iCalendar"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "Errore iCalendar"
+
+#~ msgid "An unknown person"
+#~ msgstr "Partecipante sconosciuto"
+
+#~ 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."
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Nessuno</i>"
+
+#~ msgid "Status:"
+#~ msgstr "Stato:"
+
+#~ msgid "Tentatively Accepted"
+#~ msgstr "Accettato con tentativo"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Specificare un'operazione:"
+
+#~ msgid "Update"
+#~ msgstr "Aggiornare"
+
+#~ msgid "Accept"
+#~ msgstr "Accettare"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Accettare con tentativo"
+
+#~ msgid "Decline"
+#~ msgstr "Rifiutare"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Invia Informazioni sulla Disponibilit�"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Aggiorna stato risposta"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Invia Informazioni Correnti"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> ha pubblicato informazioni riguardo una riunione."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Dettagli della Riunione"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> richiede la tua presenza ad una riunione."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Proposta di Riunione"
+
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ msgstr "<b>%s</b> vuole aggiungersi ad una riunione esistente."
+
+#~ msgid "Meeting Update"
+#~ msgstr "Aggiornamento Riunione"
+
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ msgstr "<b>%s</b> vuole ricevere informazioni aggiornate sulla riunione."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Richiesta di Aggiornamento sulla Riunione"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b> ha risposto ad una richiesta di riunione."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Risposta ad una Riunione"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> ha annullato una riunione."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Annullamento Riunione"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> ha mandato un messaggio indecifrabile."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Messaggio di Richiesta Riunione Non Valido"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> ha pubblicato informazioni sulle proprie attivit�."
+
+#~ msgid "Task Information"
+#~ msgstr "Informazioni sull'Attivit�"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> ha richiesto che venga eseguito un compito."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Proposta di Attivit�"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> vuole aggiungere informazioni ad una attivit� esistente."
+
+#~ msgid "Task Update"
+#~ msgstr "Aggiornamento Attivit�"
+
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "<b>%s</b> vuole ricevere informazioni aggiornate sull'attivit�."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Richiesta di Aggiornamento dell'Attivit�"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b> ha risposto all'assegnamento di un compito."
+
+#~ msgid "Task Reply"
+#~ msgstr "Risposta all'Attivit�"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> ha annullato un'attivit�."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Annullamento Attivit�"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Messaggio di Attivit� Indecifrabile"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> ha pubblicato informazioni sulla disponibilit�."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Informazioni sulla Disponibilit�"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> richiede informazioni sulla disponibilit�."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Richiesta Disponibilit�"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "<b>%s</b> ha risposto a una richiesta di disponibilit�."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Risposta Disponibilit�"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Messaggio di Disponibilit� Indecifrabile"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Il messaggio contiene solo richieste di tipo non supportato."
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "L'allegato non contiene un messaggio di calendario valido"
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "L'allegato non ha nessun elemento di calendario visibile"
+
+#~ 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"
+
+#~ msgid "Invalid password."
+#~ msgstr "Password  non valida"
+
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Impossibile firmare: certificato non trovato per \"%s\""
+
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Impossibile firmare chiaramente: certificato per \"%s\" non trovato"
+
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ msgstr "Impossibile cifrare: creazione di dati imbustati non riuscita."
+
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr ""
+#~ "Impossibile cifrare: impossibile creare un contesto per la crittazione."
+
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Impossibile cifrare i dati: chieve dell'utente non valida: \"%s\"."
+
+#~ 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"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Username rifiutato dal server"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Fallito l'invio dello username al server"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Il server ha rifiutato username/password"
+
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "Errore interno: formato non valido della uid: %s"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Impossibile prendere la lista dei gruppi dal server."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Impossibile caricare il file con la lista dei gruppi di %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Impossibile salvare il file con la lista dei gruppi di %s: %s"
+
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "Impossibile trovare l'indirizzo 'Da' nel messaggio"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr ""
+#~ "Impossibile inviare il messaggio: l'indirizzo del mittente non � stato "
+#~ "definito."
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "Componente di Evolution per il sommario esecutivo."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr ""
+#~ "Impossibile inizializzare il componente Sommario Esecutivodi Evolution."
+
+#~ msgid "Select a service"
+#~ msgstr "Scegliere un servizio"
+
+#~ 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 ""
+#~ "� possibile selezionare una pagina HTML diversa per lo sfondo del Sommario "
+#~ "Esecutivo.\n"
+#~ "\n"
+#~ "Lasciare in bianco per quella predefinita"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Aprire %s con l'applicazione GNOME predefinita"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Apreire %s con il browser GNOME predefinito"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Invia un email a %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Esegui %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Chiudi %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Sposta %s a sinistra"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Sposta %s a destra"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Sposta %s nella riga precedente"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Sposta %s nella riga successiva"
+
+#~ msgid "page"
+#~ msgstr "pagina"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile aprire il file HTML:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr "Errore di lettura dati: %s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Il file non ha posto per i servizi.\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 ""
+#~ "IL sommario esecutivo non pu� inizializzare Bonobo.\n"
+#~ "Se c'� stato un messaggio di errore riguardo a RootPOA, significa che "
+#~ "probabilmente si � compilato Bonobo per GOAD invece che per OAF."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Fabbrica per il sommario RDF."
+
+#~ msgid "RDF Summary"
+#~ msgstr "Sommario RDF"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Fabbrica per il componente bonobo di test."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Fabbrica per il componente di test."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Servizio bonobo di test."
+
+#~ msgid "Test service"
+#~ msgstr "Servizio di test"
+
+#~ msgid "Update automatically"
+#~ msgstr "Aggiorna automaticamente"
+
+#~ msgid "Update now"
+#~ msgstr "Aggiornare ora"
+
+#~ msgid "Update every "
+#~ msgstr "Aggiorna ogni"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Inserire la URI della Cartella"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Cartella di archiviazione posta (interna)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Impossibile connettersi allo store: %s"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Crea Cartella Virtuale da Questa Ricerca"
+
+#~ 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"
+
+#~ msgid "Composer"
+#~ msgstr "Composizione"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Lo stile predefinito per inoltrare �:"
+
+#~ 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"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "Salva il _Log dei filtri in:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organizzazione:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Ricorda questa password"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "_Invia la posta in formato HTML come predefinito."
+
+#~ msgid "_Server type: "
+#~ msgstr "Tipo di _Server: "
+
+#~ 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!"
+
+#~ msgid "Mail Summary"
+#~ msgstr "Sommario della Posta"
+
+#~ 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)"
+
+#~ msgid "New List"
+#~ msgstr "Nuova Lista"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Configura le impostazioni del calendario"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Crea Nuovo _Evento del Giorno"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Crea una Nuova _Attivit�"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Crea _Nuovo Appuntamento"
+
+#~ msgid "Create a _New Meeting"
+#~ msgstr "Crea un _Nuovo Appuntamento"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Crea un nuovo appuntamento"
+
+#~ msgid "Create a new meeting request"
+#~ msgstr "Crea una nuova richiesta di apppuntamento"
+
+#~ msgid "Create a new task"
+#~ msgstr "Crea una nuova attivit�"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Crea un evento per l'intera giornata"
+
+#~ msgid "New Appointment"
+#~ msgstr "Nuovo Appuntamento"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Appuntamento..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "Impostazioni _Calendario..."
+
+#~ msgid "_Meeting..."
+#~ msgstr "_Riunione..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Attivit�..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Crea o modifica account si posta ed altre preferenze"
+
+#~ msgid "New Message"
+#~ msgstr "Nuovo Messaggio"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "Impostazioni _Posta..."
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Applica Filtri"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Configura le impostazioni della vista delle attivit�"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Impostazioni _Attivit�..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Modifica le impostazioni del sommario"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "Impostazioni _Sommario..."
+
+#~ msgid "Show All"
+#~ msgstr "Mostra Tutto"
+
+#~ msgid "Sear_ch"
+#~ msgstr "_Cerca"
diff --git a/po/ja.po b/po/ja.po
index 4b48c4d170..008a52a054 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: 2001-11-14 19:26-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -34,21 +34,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
 
 #: 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/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "̾��"
 
 #: 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/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Primary"
 msgstr "�ץ饤�ޥ�"
 
@@ -58,15 +59,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:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "�����������"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: 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
 msgid "Business"
 msgstr "�Ż�"
 
@@ -76,12 +78,12 @@ msgid "Bus"
 msgstr "�Ż�"
 
 #: 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:1720
 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:1722
 msgid "Company"
 msgstr "���"
 
@@ -91,13 +93,14 @@ msgstr "���"
 
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: 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
 msgid "Home"
 msgstr "��"
 
 #: 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 "���"
 
@@ -106,18 +109,20 @@ msgid "Org"
 msgstr "���"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "�����"
 
 #: 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:1721
 msgid "Car"
 msgstr "��"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: 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:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "�Ż��� FAX"
 
@@ -126,13 +131,13 @@ msgid "Bus Fax"
 msgstr "�Ż��� FAX"
 
 #: 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:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "�Ż� 2"
 
@@ -141,69 +146,68 @@ msgid "Bus 2"
 msgstr "�Ż� 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:1724
 msgid "Home 2"
 msgstr "�� 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:1726
+#: 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:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 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/gui/contact-editor/e-contact-editor.c:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "�ƥ�å���"
 
 #: 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:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "�᡼��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 "�����֥�����"
 
@@ -212,7 +216,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 "����"
 
@@ -221,7 +225,7 @@ msgid "Dep"
 msgstr "����"
 
 #: 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 "��̳��"
 
@@ -230,12 +234,12 @@ msgid "Off"
 msgstr "��̳��"
 
 #: 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/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 "���翦"
 
@@ -244,7 +248,7 @@ msgid "Prof"
 msgstr "��"
 
 #: 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 "�ޥ͡�����"
 
@@ -257,7 +261,7 @@ msgid "Ass"
 msgstr "�������"
 
 #: 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 "�˥å��͡���"
 
@@ -266,12 +270,12 @@ msgid "Nick"
 msgstr "�˥å��͡���"
 
 #: 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/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 "����"
 
@@ -284,7 +288,7 @@ msgid "CALUri"
 msgstr "������URI"
 
 #: 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"
 
@@ -313,302 +317,16 @@ msgstr "���ƥ���"
 msgid "Family Name"
 msgstr "��"
 
-#: addressbook/backend/ebook/e-card-simple.c:788
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
-#: addressbook/backend/ebook/e-card.c:3712
-msgid "Card: "
-msgstr "̾��: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"̾��: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  �ɾ�(���Ĥ�):     "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  ��:      "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  ź��: "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  ��:     "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  �ɾ�(��Ĥ�):     "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"������: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"����:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"͹���ֹ�:  "
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  ����:         "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  �̤�:      "
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  ��:        "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  �ϰ�:      "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  ͹���ֹ�: "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  ��:       "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"��ã��٥�: "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"�����ֹ�:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"�����ֹ�:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"�Żҥ᡼��:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"�Żҥ᡼��:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"�᡼��: "
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"�����ॾ����: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"�а�: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"�Ż��ο�̳: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"�ȿ�: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  ��̾:  "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  ����:  "
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  ����2: "
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  ����3: "
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  ����4: "
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"��̳ʬ��: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"����: "
-
-#. 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:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"������: "
-
-#: 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:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "%s �� VCard"
@@ -616,85 +334,89 @@ 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:1130
-#: 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:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo �ν����������ޤ���Ǥ���"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2215
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "������..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "�ɤ߹�����..."
 
 #. 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 "����������ɽ���ǥ��顼"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:475
-msgid "Connecting to LDAP server..."
-msgstr "LDAP �����Ф���³��..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:485
-msgid "Unable to connect to LDAP server."
-msgstr "LDAP �����Ф�ǧ�ڽ���ޤ���"
-
-#: addressbook/backend/pas/pas-backend-ldap.c:501
-msgid "Waiting for connection to LDAP server..."
-msgstr "LDAP �����Фؤ���³���Ե���..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:870
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "LDAP �����Фإ����ɤ��ɲ���..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:971
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "LDAP �����Ф��饫���ɤ�����..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP �����Ф��饫���ɤ��ѹ���..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2160
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "������Ƽ¹���"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "LDAP �����η�̤������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2165
-msgid "Restarting search."
-msgstr "������Ƽ¹���"
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "�����ɤκ����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/conduit/address-conduit.c:294
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "URL `%s' ����Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
+
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "�Żҥ᡼�륢�ɥ쥹:"
+
+#: 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:549
 msgid "EBook not loaded\n"
 msgstr "EBook �ϥ����ɤ���Ƥ��ޤ���\n"
 
-#: addressbook/conduit/address-conduit.c:1089
-#: calendar/conduits/calendar/calendar-conduit.c:981
-#: calendar/conduits/todo/todo-conduit.c:694
+#: 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:1090
-#: calendar/conduits/calendar/calendar-conduit.c:982
-#: calendar/conduits/todo/todo-conduit.c:695
+#: 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: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 ""
 "�ѥ����åȤΥ��ɥ쥹���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
@@ -712,221 +434,109 @@ 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
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɤ�ɽ�����륳��ȥ�����"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 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:10
 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:11
 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:12
 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:13
 msgid "Factory for the Addressbook's address popup"
 msgstr "���ɥ쥹Ģ�Υ��ɥ쥹��ݥåץ��åפ��뤿��Υե����ȥ�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "����ץ륢�ɥ쥹Ģ����ȥ�����Τ���Υե����ȥ�"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Ϣ����"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Ϣ�������Τ���ե����"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP ������"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "Ϣ�������Τ���LDAP������"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "����Ϣ����"
 
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
-msgstr "����Ϣ����"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "Ϣ����(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "����Ϣ����ꥹ��"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
-msgstr "����Ϣ����ꥹ��(_L)"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
-msgstr "���ɥ쥹Ģ���Խ�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
-msgstr "���������̾"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "���ɥ쥹Ģ���ɲ�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
-msgstr "���ɥ쥹Ģ�Υ�����"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "���"
-
-#: 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-config.glade.h:8
-msgid "De_lete"
-msgstr "���(_L)"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "�Żҥ᡼�륢�ɥ쥹:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "One"
-msgstr "���֥���ȥ�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
-msgstr "�����١���(_B):"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search s_cope: "
-msgstr "�����ϰ�(_C): "
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Server Name"
-msgstr "������̾"
-
-#: 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."
-msgstr ""
-"���ξ����LDAP�����Ф������ǤɤΥΡ��ɤ򸡺�����Τ����ꤹ��Τ˻Ȥ��ޤ���"
-"�ܤ����ϥ����д����Ԥ�Ϣ�����ƤߤƤ���������"
-
-#: 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 ""
-"�����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 "����̾���ϥ�������Ȥ�ɽ���Ƥ��ޤ���ɽ�����뤿������Τ�ΤǤ���"
-
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "_Account name:"
-msgstr "���������̾(_A):"
-
-#: 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.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.glade.h:26
-msgid "_My server requires authentication"
-msgstr "�����Ф�ǧ�ڤ�ɬ��(_M)"
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
-msgstr "�ݡ����ֹ�(_P):"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
-msgstr "������̾(_S):"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "Ϣ����ꥹ��(_C)"
 
-#: 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs �ν����������ޤ���Ǥ���"
 
-#: addressbook/gui/component/addressbook-storage.c:167
-msgid "Other Contacts"
-msgstr "¾��Ϣ����"
-
-#: addressbook/gui/component/addressbook.c:468
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "���ɥ쥹Ģ�򳫤����Ȥ�����ޤ���"
 
-#: 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"
@@ -936,7 +546,7 @@ msgstr ""
 "�����Ϥ�����, ���뤤�� LDAP �����Ф�����Ƥ��뤫�Τɤ��餫\n"
 "���̣���ޤ�"
 
-#: 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"
@@ -948,7 +558,7 @@ msgstr ""
 "���� OpenLDAP ����������� CVS ����������ץ�������\n"
 "����ѥ��뤷�ʤ���Фʤ�ޤ���\n"
 
-#: 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."
@@ -956,57 +566,50 @@ msgstr ""
 "���Υ��ɥ쥹Ģ�򳫤����Ȥ�����ޤ���Ǥ���. �ѥ���¸�ߤ�, ����������\n"
 "����äƤ��뤫�ɤ��������å����Ƥ�������"
 
-#: addressbook/gui/component/addressbook.c:623
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (user %s) �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
 
-#: addressbook/gui/component/addressbook.c:786
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "�ե�����ɤ����Τ�Τ�ޤ�"
-
-#: addressbook/gui/component/addressbook.c:787
-msgid "Name contains"
-msgstr "̾�������Τ�Τ�ޤ�"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "�����Τ�Τǽ����"
 
-#: addressbook/gui/component/addressbook.c:788
-msgid "Email contains"
-msgstr "�Żҥ᡼�뤬���Τ�Τ�ޤ�"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "�᡼��2"
 
-#: addressbook/gui/component/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "���ƥ����"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:772
+#: 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
 msgid "Advanced..."
 msgstr "�ܺ�..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1031
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "���٤ƤΥ��ƥ���"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1083
 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:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1686
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 msgid "Primary Email"
 msgstr "���פʥ᡼��"
 
@@ -1052,6 +655,615 @@ 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
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "���ɥ쥹Ģ�Υ�����"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "���顼��"
+
+#: 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 ""
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "DN Customization"
+msgstr "����ʤ�"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "���(_L)"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "�ꥹ��̾(_N):"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "�Żҥ᡼�륢�ɥ쥹:"
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "����(_I)"
+
+#: 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
+#, fuzzy
+msgid "LDAP Attribute"
+msgstr "LDAPǧ��"
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "����"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "�ޡ�����"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, 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/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/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "�����ϰ�(_C): "
+
+#. 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 "������..."
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:65
+#, fuzzy
+msgid "Step 1: Server Information"
+msgstr "����������"
+
+#: 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/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/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:55 mail/mail-config.glade.h:136
+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:139
+msgid "_Add"
+msgstr "�ɲ�(_A)"
+
+#: 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 "ư����ɲ�"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "���顼��"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "���٤ƺ��(_D)"
+
+#: 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 ""
+
+#: 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
+#: 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)"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "���ݥ���Ȥ��Խ�(_E)"
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "���ץ����(_O)"
+
+#: 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/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "�����١���(_B):"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "������̾(_S):"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "���顼����߻��� (ʬ)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "��������� %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "Ϣ����ꥹ�ȥ��ǥ���"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "�����ɤʤ�"
+
+#: 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/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/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "������..."
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolution �Υ��ɥ쥹Ģ��̾�����򥤥󥿡��ե�����"
@@ -1061,9 +1273,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "���ɥ쥹Ģ��̾�����򥤥󥿡��ե������Τ���Υե����ȥ�"
 
 #: 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: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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "���"
 
@@ -1092,7 +1304,12 @@ msgstr "(%d ����ɽ��)"
 msgid "Unnamed Contact"
 msgstr "̾���Τʤ�Ϣ����"
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: 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
 #, fuzzy
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
@@ -1103,12 +1320,12 @@ 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: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"
@@ -1116,88 +1333,107 @@ 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:1
-msgid "C_ontaining:"
-msgstr "���Τ�Τ�ޤ�(_O):"
+msgid "Select Names"
+msgstr "̾��������"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Co_ntacts:"
-msgstr "Ϣ����(_N):"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Ϣ����������ޤ���?"
 
 #: 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:4
-msgid "Select Names"
-msgstr "̾��������"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
-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:6
+#, fuzzy
+msgid "_Browse..."
+msgstr "��ư(_M)..."
+
+#: 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:8
 msgid "_Folder:"
 msgstr "�ե����(_F)"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Message Recipients:"
-msgstr "��å������μ�����(_M):"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "Anni_versary:"
-msgstr "��ǰ��(_V):"
+#, fuzzy
+msgid "A_ssistant's name:"
+msgstr "����������Ȥ�̾��(_A):"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "B_usiness"
-msgstr "�Ż�(_U)"
+#, fuzzy
+msgid "Add_ress..."
+msgstr "����(_A)..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Business _Fax"
-msgstr "�Ż��� FAX(_F)"
+msgid "Anni_versary:"
+msgstr "��ǰ��(_V):"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#, fuzzy
+msgid "Birthda_y:"
+msgstr "������(_B):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#, fuzzy
+msgid "C_ontacts..."
+msgstr "Ϣ����(_C)..."
+
+#: 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 "���ϼ�"
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Ϣ���襨�ǥ���"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "D_epartment:"
+msgstr "����(_D):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "�ܺ�"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
 msgstr "����/¿˻ URL(_R):"
 
-#: 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/gui/contact-editor/contact-editor.glade.h:10
-msgid "General"
-msgstr "����"
+#: 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"
@@ -1206,1137 +1442,1192 @@ msgstr ""
 "���οͤ� ����/¿˻�����¾�Υ�����������򥤥󥿡��ͥåȤ˸���������,\n"
 " ���Υ��ɥ쥹����򤳤������Ϥ��ޤ���"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr "�������ü���"
 
-#: 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/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Organi_zation:"
 msgstr "���(_Z):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#, fuzzy
+msgid "P_rofession:"
+msgstr "���翦(_P):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Phone Types"
 msgstr "���ü���"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Wants to receive _HTML mail"
-msgstr "HTML �᡼����������(_H)"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Address..."
-msgstr "����(_A)..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Assistant's name:"
-msgstr "����������Ȥ�̾��(_A):"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Birthday:"
-msgstr "������(_B):"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+msgid "S_pouse:"
+msgstr "�۶���(_S):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Business"
-msgstr "�Ż�(_B)"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#, fuzzy
+msgid "This is the _mailing address"
+msgstr "�����͹��ʪ�ν���Ǥ�"
 
-#: 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/gui/contact-editor/contact-editor.glade.h:29
+msgid "Wants to receive _HTML mail"
+msgstr "HTML �᡼����������(_H)"
 
-#: 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: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:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "���(_D)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Department:"
-msgstr "����(_D):"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Full Name..."
-msgstr "�ե�͡���(_F)..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Home"
-msgstr "��(_H)"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Job title:"
 msgstr "����(_J):"
 
-#: 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/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Mobile"
-msgstr "�����(_M)"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
 msgstr "�˥å��͡���(_N):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
 msgstr "��̳��(_O):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Profession:"
-msgstr "���翦(_P):"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Public Calendar URL:"
 msgstr "���������� URI:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Spouse:"
-msgstr "�۶���(_S):"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr "�����͹��ʪ�ν���Ǥ�"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "�����֥ڡ�����URL(_W):"
 
-#: 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:756
-#, fuzzy
-msgid "Category editor not available."
-msgstr "�����Ϥ���ޤ���"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:763
-msgid "This contact belongs to these categories:"
-msgstr "����Ϣ����Ϥ����Υ��ƥ���˽�°���Ƥ��ޤ�:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "�ե������`%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 "���٤��Խ�"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr "�ե�͡���"
-
-#: 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/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/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "���� 2(_2):"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
+msgstr "����ꥫ�罰��"
 
-#: 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 "���󥮥�"
 
-#: 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 "���를�����"
 
-#: 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 "�������ȥ�ꥢ"
 
-#: 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/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 "�֡�����"
 
-#: 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 ""
 
-#: 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/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/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 "��������å�"
-
-#: 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 "������ӥ�"
 
-#: 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 "����"
 
-#: 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/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/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 "�ե������"
 
-#: 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 ""
 
-#: 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/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 "������"
 
-#: 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/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
+#: 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 "���"
 
-#: 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
+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 ""
 
-#: 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
+#: my-evolution/Locations.h:1190
 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:1198
 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
 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:1234
 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:1268
 msgid "Luxembourg"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
 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/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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1387
 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
+msgid "Moldova, Republic Of"
+msgstr ""
+
+#: 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:1470
 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 "�ߥ��ޡ�"
 
-#: 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 "�ͥѡ���"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
 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 "�������Υ���ƥ������"
 
-#: 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:1560
 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:1562
 msgid "Nicaragua"
 msgstr ""
 
-#: 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 "�ʥ������ꥢ"
 
-#: 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:1574
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
 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:1632
 msgid "Oman"
 msgstr "���ޡ���"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
 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/gui/contact-editor/fulladdr.glade.h:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
 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:1688
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
 msgid "Peru"
 msgstr "�ڥ롼"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr ""
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
 msgid "Poland"
 msgstr "�ݡ�����"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
 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:1824
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
 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/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:2035
 msgid "Saudi Arabia"
 msgstr "����������ӥ�"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2090
 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:2103
 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:2104
 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 "���������"
 
-#: 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:2119
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Sudan"
 msgstr "��������"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
 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/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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
 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:2183
 msgid "Switzerland"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
 msgid "Taiwan"
 msgstr " ����"
 
-#: 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
+msgid "Tanzania, United Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
 msgstr "����"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
 msgid "Turkey"
 msgstr "�ȥ륳"
 
-#: 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/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:2334
 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:2342
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr ""
-
-#: 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:2348
 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:2380
 msgid "Venezuela"
 msgstr "�٥ͥ�����"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
 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:2524
 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 "����Х֥�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Ϣ����������ޤ���?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#, fuzzy
+msgid "Category editor not available."
+msgstr "�����Ϥ���ޤ���"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+msgid "This contact belongs to these categories:"
+msgstr "����Ϣ����Ϥ����Υ��ƥ���˽�°���Ƥ��ޤ�:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#, fuzzy
+msgid "Save Contact as VCard"
+msgstr "VCard ����¸"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "�ե������`%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 "���٤��Խ�"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr "�ե�͡���"
+
+#: 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/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/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "���� 2(_2):"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "��������å�"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "��(_Y):"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "����(_A):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "��(_C):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "���Ȣ(_P):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "͹���ֹ�(_Z):"
 
@@ -2435,10 +2726,15 @@ msgid "contact-list-editor"
 msgstr "Ϣ����ꥹ�ȥ��ǥ���"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 msgid "Contact List Editor"
 msgstr "Ϣ����ꥹ�ȥ��ǥ���"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#, fuzzy
+msgid "Save List as VCard"
+msgstr "VCard ����¸"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "�Ȥˤ����ɲ�"
@@ -2485,7 +2781,7 @@ msgstr ""
 "���Υե�����ˤ��Ǥ�¸�ߤ��Ƥ��ޤ����ɲä��Ƥ��������Ǥ���?"
 
 #: 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 "��鸡��"
 
@@ -2494,217 +2790,319 @@ msgstr "��鸡��"
 msgid "Search"
 msgstr "����"
 
-#: 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:140
 msgid "1 card"
 msgstr "1������"
 
-#: 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
-msgid "Save as VCard"
-msgstr "VCard ����¸"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: 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
-msgid "Forward Contact"
-msgstr "Ϣ�����ž��"
-
-#: 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: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:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr "ɽ������"
-
-#: 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 "���"
+#: 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
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: 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:1043
 msgid "Success"
 msgstr "����"
 
-#: 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: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
 msgid "Unknown error"
 msgstr "�����ʥ��顼"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "��ݥ��ȥꥪ�ե饤��"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "���Ĥ�����ޤ���"
 
-#: 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�Ϥ��Ǥ�¸�ߤ��ޤ�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "�ץ��ȥ���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: 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:607 camel/camel-service.c:643
+#: 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
 msgid "Cancelled"
 msgstr "����󥻥뤷�ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "����¾�Υ��顼"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "�ѹ�����¸�������Ǥ���?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "�ꥹ�Ȥ��ɲäǥ��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "�����ɤ��ɲäǥ��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "�ꥹ�Ȥν�����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "�ꥹ�Ȥκ����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 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"
+#: addressbook/gui/widgets/e-addressbook-util.c:204
+#, 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"
+#: addressbook/gui/widgets/e-addressbook-util.c:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "ɽ��"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "�����ɤʤ�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "�����ɤʤ�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "�����ɤʤ�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "�����ɤʤ�"
+
+#: 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:338
 msgid "Primary Phone"
 msgstr "�������"
 
-#: 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:854
+#: 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:341
 msgid "Callback Phone"
 msgstr "�Ƥ��ᤷ������"
 
-#: 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:857
+#: 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:345
 msgid "Business Address"
 msgstr "�Ż��ν���"
 
-#: 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:861
+#: 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:348
 msgid "Car Phone"
 msgstr "�ֺ�����"
 
-#: 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:866
+#: 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:354
 msgid "Other Phone"
 msgstr "����¾������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "VCard ����¸"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "����Ϣ����"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "����Ϣ����ꥹ��"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "�ե�����ذ�ư(_G)..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "����ݡ���..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "Ϣ����θ���(_S)"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "���ɥ쥹Ģ�Υ�����(_A)..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Pilot ������(_M)..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Ϣ�����ž��"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Ϣ����إ�å�����������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "ɽ������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "�ե�����إ��ԡ�(_C)..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "�ե�����ذ�ư(_M)..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "�ڼ��"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: 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:940
+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:945
+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."
@@ -2718,11 +3116,12 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr "���ɥ쥹Ģ����¸"
 
-#: 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 ""
@@ -2732,10 +3131,37 @@ msgstr ""
 "\n"
 "���֥륯��å��򤷤ƿ���Ϣ�����������Ʋ�����"
 
+#: 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
 msgid "Card View"
 msgstr "̾��ɽ��"
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr "���������"
+
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr "�����ɤΰ���"
+
+#: 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
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -2805,6 +3231,7 @@ msgid "Include:"
 msgstr "�ޤ�:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "��Ĺ"
 
@@ -2829,10 +3256,12 @@ msgid "Options"
 msgstr "���ץ����"
 
 #: 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
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "�ڡ���"
 
@@ -2848,7 +3277,9 @@ msgstr "�ѻ�"
 msgid "Paper source:"
 msgstr "�楽����:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "��Ĺ"
 
@@ -2904,64 +3335,51 @@ msgstr "��:"
 msgid "_Font..."
 msgstr "�ե����(_F)..."
 
-#: addressbook/printing/e-contact-print.c:1111
-msgid "Print cards"
-msgstr "�����ɤΰ���"
-
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-msgid "Print card"
-msgstr "�����ɤΰ���"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr "���������"
-
-#: calendar/cal-util/cal-component.c:1202
+#: calendar/cal-util/cal-component.c:1207
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "���ݥ���Ȥ��Խ�(_E)"
 
-#: 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:405 mail/message-list.c:651
+#: 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
 msgid "High"
 msgstr "�⤤"
 
-#: 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:650
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 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:407 mail/message-list.c:649
+#: 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
 msgid "Low"
 msgstr "�㤤"
 
 #. 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
 msgid "Undefined"
 msgstr "̤���"
 
-#: calendar/conduits/calendar/calendar-conduit.c:937
-#: calendar/conduits/todo/todo-conduit.c:649
+#: 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: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 ""
 "�ѥ����åȤΥ��������ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 
-#: calendar/conduits/todo/todo-conduit.c:756
-#: calendar/conduits/todo/todo-conduit.c:759
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "ͥ����(_P):"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "�ѥ����åȤ� ToDo ���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
@@ -2976,42 +3394,56 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "��������ɽ������ Bonobo ����ȥ�����Υ���ץ�"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "�������ȥ�����������..."
+
+#: 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:5
 msgid "Evolution calendar executive summary component."
 msgstr "Evolution �������¹ԥ��ޥꥳ��ݡ��ͥ��"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 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:8
 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:9
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "������ iTip �ӥ塼����ȥ�����Τ���Υե����ȥ�"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "����ץ륫��������ȥ�����Υե����ȥ�"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr "Evolution ����ݡ��ͥ�ȥ��ǥ�����������뤿��Υե����ȥ�"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 "���顼�����Υ����ӥ�"
@@ -3020,25 +3452,11 @@ 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
-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"
@@ -3061,11 +3479,11 @@ msgstr "���顼����߻��� (ʬ)"
 msgid "_Edit appointment"
 msgstr "���ݥ���Ȥ��Խ�(_E)"
 
-#: 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"
@@ -3077,11 +3495,17 @@ msgstr ""
 "���ꤹ��С�������̾�Υ�ޥ���������������ܥå���\n"
 "�ˤ�ɽ�����ޤ���"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:781
-#, c-format
+#: calendar/gui/alarm-notify/alarm-queue.c:753
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "�ٹ�"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:758
+#, fuzzy, 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"
@@ -3094,7 +3518,12 @@ msgstr ""
 "\n"
 "�����ˤ��Υץ�������ư���Ƥ褤�Ǥ���?"
 
-#: 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 "���٤ȼ��䤷�ʤ�"
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "GNOME �ν����������ޤ���Ǥ���"
 
@@ -3107,52 +3536,66 @@ msgstr "���顼�����Υ����ӥ��ե����ȥ���������ޤ���Ǥ���"
 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 "���ޥ꤬���Τ�Τ�ޤ�"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "�������ޤ�"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "�����Ȥ����Τ�Τ�ޤ�"
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr "�԰���"
+
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%Yǯ%m��%d�� %A"
 
 #. 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 "%m/%d (%a)"
 
-#: 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/%m/%d (%a)"
 
-#: 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ǯ%m��%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 "%m��%d��"
 
-#: 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�����������å����Ƥ�������"
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "��Ū"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "��̩"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "����"
 
@@ -3173,32 +3616,27 @@ msgid "W"
 msgstr "��"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "����"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 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:479 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "��λ���ޤ���"
 
@@ -3214,12 +3652,13 @@ 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/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/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
+#: 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 "�ʤ�"
 
@@ -3231,24 +3670,15 @@ msgstr "�����֤�"
 msgid "Assigned"
 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:803
+#: 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
 msgid "Yes"
 msgstr "�Ϥ�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr "������"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1974 calendar/gui/e-day-view.c:1675
-#: calendar/gui/e-week-view.c:1182
-#, fuzzy
-msgid "Searching"
-msgstr "������..."
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "��"
@@ -3265,63 +3695,79 @@ msgstr "��"
 msgid "Month View"
 msgstr "��"
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
-msgstr "���ޥ꤬���Τ�Τ�ޤ�"
-
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
-msgstr "�������ޤ�"
-
-#: 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/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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "������"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "�ե�����ϥ��ݥ���Ȥȥ��٥�Ȥ�ޤ�Ǥޤ�"
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "������"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "�ե������ ToDo ���ܤ�ޤ�"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "�������ݥ���Ȥ�������ޤ�"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "�˥塼���ۿ�����"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "���"
+
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "����������"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "������(_T)"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "�������ݥ����"
+
+#: calendar/gui/component-factory.c:703
+#, 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
-msgid "Create a new task"
-msgstr "������������������ޤ�"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "�������ݥ����"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "����������(_T)"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "���ݥ����"
+
+#: 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: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/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "�����ǥ������顼�४�ץ����"
@@ -3367,8 +3813,9 @@ 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:"
@@ -3488,12 +3935,12 @@ msgstr "���ݥ���Ȥν�λ�� %s %s"
 msgid "%s at the end of the appointment"
 msgstr "���ݥ���Ȥν�λ�� %s"
 
-#: calendar/gui/dialogs/alarm-page.c:453
+#: calendar/gui/dialogs/alarm-page.c:452
 #, c-format
 msgid "%s at %s"
 msgstr "%s �� %s"
 
-#: calendar/gui/dialogs/alarm-page.c:459
+#: calendar/gui/dialogs/alarm-page.c:458
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s ��̤�Τ�ȯư������"
@@ -3514,7 +3961,7 @@ msgstr "��¥��"
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "���ޥ�:"
 
@@ -3522,12 +3969,11 @@ msgstr "���ޥ�:"
 msgid "_Options..."
 msgstr "���ץ����(_O)..."
 
-#. 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/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "��"
 
@@ -3544,7 +3990,7 @@ msgstr "���ݥ���Ȥν�λ"
 msgid "hour(s)"
 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:189
 msgid "minute(s)"
 msgstr "ʬ"
 
@@ -3585,170 +4031,168 @@ msgid "Color for tasks due today"
 msgstr "���������¤ο�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "ɸ��Υ�ޥ�����ǿ������ݥ���Ȥ�������ޤ�"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "����"
 
-#: 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:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 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:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "���¤�᤮�������ƥ�(_O)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
-msgstr "���ݥ���Ȥν�λ���֤򽵴֤ȷ�֤�ɽ��"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 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:17
 msgid "Sta_rt of day:"
 msgstr "�����λϤޤ�(_R):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 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:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "���������¤Υ�����(_K):"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "��(_H)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "��(_U)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "���������¤Υ�����(_K):"
+#: 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
+#: 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:25
 msgid "Time"
 msgstr "����"
 
-#: 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
-msgid "Time di_visions:"
-msgstr "��ʬ��(_V):"
-
-#: 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: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:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "ʿ��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ���� (����/���)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 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:34
 msgid "_Compress weekends in month view"
 msgstr "���ɽ���ǽ�����ɽ�����ʤ�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "ɽ��(_D)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_End of day:"
 msgstr "��������(_E):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "��(_F)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "����(_G)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "��λ�Ѥߥ������򱣤�(_H)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "��(_M)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "����¾(_O)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "���¤�᤮�������ƥ�(_O)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "��(_S)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "�������ꥹ��(_T)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "���ݥ���Ȥν�λ���֤򽵴֤ȷ�֤�ɽ��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "��ʬ��(_V):"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "��(_W)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "���ݥ���Ȥγ�����"
 
@@ -3812,74 +4256,61 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: 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: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: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/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:322
 #, fuzzy
 msgid "Could not update object!"
 msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "���ݥ���Ȥ��Խ�"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "���ݥ���� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "�������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "���ޥ�Ϥ���ޤ���"
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1897
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "�ե�������񤭤��ޤ���?"
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1904
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"����̾���Υե�����Ϥ��Ǥ�¸�ߤ��ޤ�\n"
-"��񤭤��ޤ���?"
-
-#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "��̾����¸..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -3937,7 +4368,7 @@ msgstr "��Ǥ��:"
 msgid "Enter Delegate"
 msgstr "��Ǥ�������"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "���ݥ����"
 
@@ -3951,13 +4382,13 @@ msgstr "�����֤�"
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 msgid "Scheduling"
 msgstr "�������塼��"
 
 #: calendar/gui/dialogs/event-editor.c:207
 #: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "���"
 
@@ -3990,30 +4421,42 @@ msgid "F_ree"
 msgstr "�ե꡼(_R)"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
+#, fuzzy
+msgid "L_ocation:"
+msgstr ""
+"\n"
+"�а�: "
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "��Ū(_V)"
 
-#: 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/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "���֤���ꤷ��ɽ��"
 
-#: 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/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "Ϣ����(_C)..."
+
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "�����(_E):"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "���ϻ���(_S):"
 
@@ -4041,55 +4484,49 @@ msgstr "���ʼ�"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "����Ū��̾��"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "��Ǥ��"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "��Ǥ��"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 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:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "����"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:798
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 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:49
-#: mail/message-list.etspec.h:8
+#: 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"
 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 mail/mail-config.glade.h:85
+#: 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
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "����"
@@ -4104,7 +4541,7 @@ msgid "_Change Organizer"
 msgstr "��żԤ��ѹ�(_C)"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:445
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "¾�ξ���(_I)..."
 
@@ -4112,27 +4549,98 @@ msgstr "¾�ξ���(_I)..."
 msgid "_Other Organizer"
 msgstr "¾�μ�ż�(_O)"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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: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:997
 msgid "on"
 msgstr "����"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: 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 " ��"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "����¾"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "��"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "̸"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "����¾�� FAX"
+
+#: 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:1260
 msgid "on the"
 msgstr "��"
 
-#: 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 "�����"
 
@@ -4196,16 +4704,21 @@ 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
+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?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
@@ -4223,7 +4736,7 @@ msgid "Progress"
 msgstr "������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4235,15 +4748,19 @@ msgstr "ͥ����(_P):"
 msgid "_Status:"
 msgstr "���ơ�����(_S):"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "����"
+
 #: 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:324
 msgid "Assignment"
 msgstr "������"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "����:"
 
@@ -4255,192 +4772,155 @@ msgstr "������(_R):"
 msgid "_Due Date:"
 msgstr "����(_D):"
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: 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:751 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:941 calendar/gui/e-day-view.c:3544
-#: calendar/gui/e-week-view.c:3422 mail/folder-browser.c:1447
-#: shell/e-shortcuts-view.c:384
+#: 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
 msgid "_Open"
 msgstr "����(_O)"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "��̾����¸..."
+
+#: calendar/gui/e-calendar-table.c:974 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:978 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:947 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3433 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:979 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:949 calendar/gui/e-day-view.c:3530
-#: calendar/gui/e-day-view.c:3557 calendar/gui/e-week-view.c:3409
-#: calendar/gui/e-week-view.c:3435 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:980 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/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "�����������"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "iCalender�Ȥ���ž��(_C)"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "��λ�Ȥ��ƥޡ���(_M)"
 
-#: calendar/gui/e-calendar-table.c:956
-msgid "_Delete this Task"
-msgstr "������������(_D)"
-
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "��������λ�Ȥ��ƥޡ���(_M)"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "���򤷤�����������(_D)"
 
-#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7115
-#: calendar/gui/e-week-view.c:3918
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "���������ɲä���ˤϤ����򥯥�å�"
 
-#. 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 "%Y/%m/%d (%a) %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 "%Y/%m/%d (%a) %p %I:%M:%S"
-
-#: 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.etspec.h:3
 msgid "Alarms"
 msgstr "���顼��"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "��λ���ޤ���"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "���"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "����"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "���"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "���ٷ���"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "ͥ����"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "���ޥ�"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "�������򥽡���"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 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 "%Y/%m/%d (%a) %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 "%Y/%m/%d (%a) %p %I:%M:%S"
+
+#: 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:518
 #, c-format
 msgid "%02i minute divisions"
@@ -4448,386 +4928,172 @@ msgstr "%02i ʬʬ��"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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 "%B %d %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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 "%b/%d"
 
 #. 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
 msgid "am"
 msgstr "����"
 
 #. 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
 msgid "pm"
 msgstr "���"
 
-#: calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "�������ݥ����(_A)"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "�����������٥��"
 
-#: calendar/gui/e-day-view.c:3535 calendar/gui/e-week-view.c:3414
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "�����ذ�ư(_T)"
-
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
-msgid "_Go to Date..."
-msgstr "�������ذ�ư(_G)..."
-
-#: calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-msgid "_Delete this Appointment"
-msgstr "���Υ��ݥ���Ȥ���(_D)"
-
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
-msgid "Make this Occurrence _Movable"
-msgstr "���ν�������ư�ˤ���(_M)"
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
-msgid "Delete this _Occurrence"
-msgstr "����������(_O)"
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
-msgid "Delete _All Occurrences"
-msgstr "���٤Ƥν��������(_A)"
-
-#: calendar/gui/e-itip-control.c:524
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Task begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:534
-msgid "Free/Busy info begins: <b>"
-msgstr "����/¿˻ ���󳫻�: <b>"
-
-#: calendar/gui/e-itip-control.c:538
-msgid "Begins: <b>"
-msgstr "����: <b>"
-
-#: calendar/gui/e-itip-control.c:550
-#, fuzzy
-msgid "Meeting ends: <b>"
-msgstr "��Ľ�λ����(_E):"
-
-#: calendar/gui/e-itip-control.c:553
-#, fuzzy
-msgid "Free/Busy info ends: <b>"
-msgstr "����/¿˻ ���󳫻�: <b>"
-
-#: calendar/gui/e-itip-control.c:557
-#, fuzzy
-msgid "Ends: <b>"
-msgstr "����: <b>"
-
-#: calendar/gui/e-itip-control.c:571
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 #, fuzzy
-msgid "Task Completed: <b>"
-msgstr " (��� "
-
-#: calendar/gui/e-itip-control.c:581
-msgid "Task Due: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
-#, fuzzy
-msgid "iCalendar Information"
-msgstr "����������(_C):"
-
-#. Title
-#: calendar/gui/e-itip-control.c:633
-#, fuzzy
-msgid "iCalendar Error"
-msgstr "������"
-
-#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
-#, fuzzy
-msgid "An unknown person"
-msgstr "������������"
+msgid "New Meeting"
+msgstr "���"
 
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "<i>None</i>"
-msgstr "<i>�ʤ�</i>"
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "����..."
 
-#: 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
-#, fuzzy
-msgid "Choose an action:"
-msgstr "��������������"
+#: 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-itip-control.c:779
-#, fuzzy
-msgid "Update"
-msgstr "�������򹹿�"
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+msgid "_Go to Date..."
+msgstr "�������ذ�ư(_G)..."
 
-#: 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
-msgid "OK"
-msgstr "OK"
+#: 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)"
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
 #, fuzzy
-msgid "Accept"
-msgstr "��������"
+msgid "_Configure..."
+msgstr "����"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
 #, fuzzy
-msgid "Tentatively accept"
-msgstr "����"
+msgid "_Configure Pilot..."
+msgstr "����"
 
-#: calendar/gui/e-itip-control.c:797
-#, fuzzy
-msgid "Decline"
-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
+msgid "_Save As..."
+msgstr "��̾����¸(_S)..."
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 #, fuzzy
-msgid "Send Free/Busy Information"
-msgstr "����/¿˻ ����"
-
-#: calendar/gui/e-itip-control.c:824
-msgid "Update respondent status"
-msgstr ""
+msgid "_Schedule Meeting..."
+msgstr "�ߡ��ƥ��󥰤Υ������塼��(_M)"
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 #, fuzzy
-msgid "Send Latest Information"
-msgstr "����������"
-
-#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "����󥻥�"
-
-#: calendar/gui/e-itip-control.c:867
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
-
-#: calendar/gui/e-itip-control.c:868
-msgid "Meeting Information"
-msgstr "��ľ���"
-
-#: calendar/gui/e-itip-control.c:872
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:873
-msgid "Meeting Proposal"
-msgstr "��Ĥ����"
-
-#: calendar/gui/e-itip-control.c:877
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:878
-msgid "Meeting Update"
-msgstr "�����"
-
-#: calendar/gui/e-itip-control.c:882
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:883
-msgid "Meeting Update Request"
-msgstr "��Ĥι����׵�"
-
-#: calendar/gui/e-itip-control.c:887
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
-
-#: calendar/gui/e-itip-control.c:888
-msgid "Meeting Reply"
-msgstr "��Ĥ˴ؤ�������"
-
-#: calendar/gui/e-itip-control.c:892
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> �ϲ�Ĥ򥭥�󥻥뤷�ޤ���"
-
-#: calendar/gui/e-itip-control.c:893
-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
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:898
-msgid "Bad Meeting Message"
-msgstr "�����ʲ�ĥ�å�����"
-
-#: calendar/gui/e-itip-control.c:917
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:918
-msgid "Task Information"
-msgstr "����������"
-
-#: calendar/gui/e-itip-control.c:922
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr ""
+msgid "_Forward as iCalendar..."
+msgstr "iCalender�Ȥ���ž��(_C)"
 
-#: calendar/gui/e-itip-control.c:923
-msgid "Task Proposal"
-msgstr "�����������"
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+msgid "Make this Occurrence _Movable"
+msgstr "���ν�������ư�ˤ���(_M)"
 
-#: calendar/gui/e-itip-control.c:927
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr ""
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+msgid "Delete this _Occurrence"
+msgstr "����������(_O)"
 
-#: calendar/gui/e-itip-control.c:928
-msgid "Task Update"
-msgstr "�������򹹿�"
+#: 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:932
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:933
-msgid "Task Update Request"
-msgstr "�������ι����׵�"
-
-#: calendar/gui/e-itip-control.c:937
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> �ϥ������γ�����Ƥ��������ޤ���"
-
-#: calendar/gui/e-itip-control.c:938
-msgid "Task Reply"
-msgstr "�������˴ؤ�������"
-
-#: calendar/gui/e-itip-control.c:942
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> �ϥ������򥭥�󥻥뤷�ޤ���"
-
-#: calendar/gui/e-itip-control.c:943
-msgid "Task Cancellation"
-msgstr "�������򥭥�󥻥�"
-
-#: calendar/gui/e-itip-control.c:948
-msgid "Bad Task Message"
-msgstr "�����ʥ�������å�����"
-
-#: calendar/gui/e-itip-control.c:967
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> �϶���/¿˻ �����������ޤ���"
-
-#: calendar/gui/e-itip-control.c:968
-msgid "Free/Busy Information"
-msgstr "����/¿˻ ����"
-
-#: calendar/gui/e-itip-control.c:972
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
-
-#: calendar/gui/e-itip-control.c:973
-msgid "Free/Busy Request"
-msgstr "����/¿˻ ���׵�"
-
-#: calendar/gui/e-itip-control.c:977
-#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ����˴ؤ����������ޤ���"
-
-#: calendar/gui/e-itip-control.c:978
-msgid "Free/Busy Reply"
-msgstr "����/¿˻ ���ֿ�"
-
-#: calendar/gui/e-itip-control.c:983
-msgid "Bad Free/Busy Message"
-msgstr "������ ����/¿˻ ��å�����"
-
-#: calendar/gui/e-itip-control.c:1052
-msgid "The message does not appear to be properly formed"
-msgstr "���Υ�å������������������ǤϤ���ޤ���"
-
-#: calendar/gui/e-itip-control.c:1071
-msgid "The message contains only unsupported requests."
-msgstr "���Υ�å�������̤�б����׵��ޤ�Ǥ��ޤ�"
-
-#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
-msgid "The attachment does not contain a valid calendar message"
-msgstr ""
+msgid "Error executing %s."
+msgstr "%s ��¹���˥��顼"
 
-#: calendar/gui/e-itip-control.c:1130
-msgid "The attachment has no viewable calendar items"
-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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1229
+#: calendar/gui/e-itip-control.c:1564
 msgid "Calendar file could not be updated!\n"
 msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1566
 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:1592 calendar/gui/e-itip-control.c:1642
+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:1613
+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:1625
+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:1638
+#, fuzzy
+msgid "Attendee status could not be updated!\n"
+msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
+
+#: calendar/gui/e-itip-control.c:1640
+msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "�����λ"
 
-#: calendar/gui/e-itip-control.c:1348 calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "�����ƥ������!\n"
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "�ե����������"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "�ե����������"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4866,211 +5132,213 @@ msgstr "���"
 msgid "date-start"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "��Ĺ"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1535
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "ɬ�׻��ü�"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "Ǥ�ջ��ü�"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "�Ի��ü�"
 
-#: 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:771
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "�Ŀ�"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "���롼��"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "�꥽����"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "����"
 
-#: 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:775
-#: calendar/gui/e-meeting-model.c:791
-#: 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 "̤��"
-
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "��Ĺ"
 
-#: 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:788
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "���üԤ�ɬ��"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "Ǥ�ջ��ü�"
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "�Ի��ü�"
 
-#: 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:816
+#: 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:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr "��������"
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 msgid "Declined"
 msgstr "���ष��"
 
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:819 calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "����"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "��Ǥ����"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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: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:2118 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)"
 
 #. 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 "%Y/%m/%d"
 
-#: calendar/gui/e-meeting-time-sel.c:428
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "���ե����γ�"
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "����ʤ�"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "���ץ����(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "�Ż���λ��֤���ɽ��(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "�̾�����ɽ��(_Z)"
 
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "�ե꡼/�ӥ��� �ι���(_U)"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "<<(_<)"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "��ư�ԥå����å�(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">>(_>)"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "���٤Ƥο͡��ȥ꥽����(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "���٤Ƥο͡��ȤҤȤĤΥ꥽����(_P)"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "�͡���ɬ��(_R)"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "�͡��ȤҤȤĤΥ꥽������ɬ��(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:641
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "��ij��ϻ���(_S):"
 
-#: calendar/gui/e-meeting-time-sel.c:660
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "��Ľ�λ����(_E):"
 
-#: 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: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:367
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' ���ɤ߹��ळ�Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "���"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "���򤷤�Ϣ����������ޤ�"
+
+#: calendar/gui/e-tasks.c:659
+#, fuzzy
+msgid "Expunging"
+msgstr "�ե����������"
+
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "�������ݥ����(_A)..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "���Υ��ݥ���Ȥ���(_D)"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' �򳫤����Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: calendar/gui/gnome-cal.c:1865
+#: calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "�ե���� %s �򥪡��ץ���"
@@ -5131,266 +5399,226 @@ msgstr "10 ��"
 msgid "September"
 msgstr "9 ��"
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:220
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "��żԤ�ɬ�ܤǤ�"
 
-#: calendar/gui/itip-utils.c:570
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 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 "��"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "��"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "��"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "��"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "���򤷤����� [%Y/%m/%d (%a)]"
 
-#: 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 "%m/%d (%a)"
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr "%Y/%d (%a)"
 
-#: 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:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "���򤷤��� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "���򤷤��� (%Y/%b)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "���򤷤�ǯ (%Y)"
 
-#: calendar/gui/print.c:2205
-#, fuzzy
-msgid "Task"
-msgstr "������(_T)"
-
-#: calendar/gui/print.c:2262
-#, fuzzy, c-format
-msgid "Status: %s"
-msgstr "���ơ�����(_S):"
-
-#: calendar/gui/print.c:2280
-#, fuzzy, c-format
-msgid "Priority: %s"
-msgstr "ͥ����(_P):"
-
-#: calendar/gui/print.c:2294
-#, fuzzy, c-format
-msgid "Percent Complete: %i"
-msgstr "���:"
-
-#: calendar/gui/print.c:2306
-#, fuzzy, c-format
-msgid "URL: %s"
-msgstr "URL:"
-
-#: calendar/gui/print.c:2320
-#, fuzzy, c-format
-msgid "Categories: %s"
-msgstr ""
-"\n"
-"��̳ʬ��: "
-
-#: calendar/gui/print.c:2331
-#, fuzzy
-msgid "Contacts: "
-msgstr "Ϣ����(_N):"
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "���������"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2358 my-evolution/e-summary.c:619
-#: 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:2894
+#: 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:2550
 msgid "Print Item"
 msgstr "�����ƥ�����"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "�ץ�󥿤�����"
 
-#: calendar/gui/tasks-control.c:126
-msgid "The URI of the tasks folder to display"
-msgstr "�������ե������ɽ������ URI"
-
 #: calendar/gui/tasks-control-factory.c:75
 #, fuzzy
 msgid ""
@@ -5398,13 +5626,40 @@ msgid ""
 msgstr ""
 "�������ӥ塼���������ޤ���Ǥ���. ORBit��OAF�����������å����Ƥ�������"
 
+#: 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"
+"�����ˤ����Υ�å�������õ�ޤ���?"
+
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+msgid "Do not ask me again."
+msgstr "���٤ȼ��䤷�ʤ�"
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "�����ɤΰ���"
+
 #: calendar/gui/tasks-migrate.c:105
 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 ""
@@ -5413,10 +5668,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
@@ -5424,8 +5679,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
@@ -5433,137 +5688,1774 @@ 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"
 msgstr "SMTWTFS"
 
-#: calendar/pcs/query.c:234
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "Evolution �� VCard �ե�����򥤥�ݡ��Ȥ���ե����ȥ�"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "������������"
+
+#: 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/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "������"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:258
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:263
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:300
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:305
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:339
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:344
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:371
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:376
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:412
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:508
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:513
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:650
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:655
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:679
+#: 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:721
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: 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)"
 msgstr ""
 
-#: calendar/pcs/query.c:821
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:866
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:871
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1159
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
-#: camel/camel-cipher-context.c:171
+#.
+#. * 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
+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
+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 ""
+
+#: 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
+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
+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
+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
+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
+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 ""
+
+#: calendar/zones.h:178
+msgid "Antarctica/Casey"
+msgstr ""
+
+#: calendar/zones.h:179
+msgid "Antarctica/Davis"
+msgstr ""
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: calendar/zones.h:181
+msgid "Antarctica/Mawson"
+msgstr ""
+
+#: calendar/zones.h:182
+msgid "Antarctica/McMurdo"
+msgstr ""
+
+#: calendar/zones.h:183
+msgid "Antarctica/Palmer"
+msgstr ""
+
+#: calendar/zones.h:184
+msgid "Antarctica/South_Pole"
+msgstr ""
+
+#: calendar/zones.h:185
+msgid "Antarctica/Syowa"
+msgstr ""
+
+#: calendar/zones.h:186
+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 ""
+
+#: 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/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr ""
+
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Muscat"
+msgstr "�����������"
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: calendar/zones.h:235
+#, fuzzy
+msgid "Asia/Omsk"
+msgstr "�����������"
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+#, fuzzy
+msgid "Asia/Qatar"
+msgstr "��������"
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:247
+msgid "Asia/Singapore"
+msgstr ""
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+#, fuzzy
+msgid "Atlantic/Bermuda"
+msgstr "�Хߥ塼��"
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+msgid "Atlantic/Cape_Verde"
+msgstr ""
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+#, fuzzy
+msgid "Australia/Adelaide"
+msgstr "�������ȥ�ꥢ"
+
+#: calendar/zones.h:274
+#, fuzzy
+msgid "Australia/Brisbane"
+msgstr "�������ȥ�ꥢ"
+
+#: calendar/zones.h:275
+#, fuzzy
+msgid "Australia/Broken_Hill"
+msgstr "�������ȥ�ꥢ"
+
+#: calendar/zones.h:276
+#, fuzzy
+msgid "Australia/Darwin"
+msgstr "�������ȥ�ꥢ"
+
+#: calendar/zones.h:277
+#, fuzzy
+msgid "Australia/Hobart"
+msgstr "�������ȥ�ꥢ"
+
+#: calendar/zones.h:278
+#, fuzzy
+msgid "Australia/Lindeman"
+msgstr "�������ȥ�ꥢ"
+
+#: calendar/zones.h:279
+#, fuzzy
+msgid "Australia/Lord_Howe"
+msgstr "�������ȥ�ꥢ"
+
+#: calendar/zones.h:280
+#, fuzzy
+msgid "Australia/Melbourne"
+msgstr "�������ȥ�ꥢ"
+
+#: calendar/zones.h:281
+#, fuzzy
+msgid "Australia/Perth"
+msgstr "�������ȥ�ꥢ"
+
+#: calendar/zones.h:282
+#, fuzzy
+msgid "Australia/Sydney"
+msgstr "�������ȥ�ꥢ"
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:284
+#, fuzzy
+msgid "Europe/Andorra"
+msgstr "����ɥ�"
+
+#: calendar/zones.h:285
+#, fuzzy
+msgid "Europe/Athens"
+msgstr "�ץ��ѥƥ�"
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:296
+msgid "Europe/Gibraltar"
+msgstr ""
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:304
+msgid "Europe/Luxembourg"
+msgstr ""
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr ""
+
+#: calendar/zones.h:308
+#, fuzzy
+msgid "Europe/Monaco"
+msgstr "��ʥ�"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr ""
+
+#: calendar/zones.h:312
+#, fuzzy
+msgid "Europe/Paris"
+msgstr "�ץ��ѥƥ�"
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:317
+msgid "Europe/San_Marino"
+msgstr ""
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "���������"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+#, fuzzy
+msgid "Indian/Mahe"
+msgstr "�����"
+
+#: calendar/zones.h:341
+msgid "Indian/Maldives"
+msgstr ""
+
+#: calendar/zones.h:342
+#, fuzzy
+msgid "Indian/Mauritius"
+msgstr "�⡼�ꥷ�㥹"
+
+#: calendar/zones.h:343
+msgid "Indian/Mayotte"
+msgstr ""
+
+#: calendar/zones.h:344
+msgid "Indian/Reunion"
+msgstr ""
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
+#: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
 msgstr "������Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/camel-cipher-context.c:211
+#: 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
 msgid "Verifying is not supported by this cipher"
 msgstr "�٥�ե����Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/camel-cipher-context.c:294
+#: camel/camel-cipher-context.c:292
 msgid "Encryption is not supported by this cipher"
 msgstr "��沽�Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/camel-cipher-context.c:336
+#: camel/camel-cipher-context.c:334
 msgid "Decryption is not supported by this cipher"
 msgstr "���沽�Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
+#: camel/camel-data-cache.c:169
+#, fuzzy
+msgid "Unable to create cache path"
+msgstr ""
+"���ϥե�������������ޤ���: %s\n"
+" %s"
+
+#: camel/camel-data-cache.c:441
+#, fuzzy, c-format
+msgid "Could not remove cache entry: %s: %s"
+msgstr "����å���ǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
+
 #: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
@@ -5588,81 +7480,66 @@ msgstr ""
 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:710 camel/camel-filter-driver.c:719
 msgid "Syncing folders"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "�ե��륿�ι�ʸ������˥��顼: %s: %s"
+
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "�ե��륿�¹���˥��顼: %s: %s"
+
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "���ס���ե�����򳫤����Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "���ס���ե������������뤳�Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "������ %d ������� (%d%%)"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "��å������򳫤����Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "��å����� %d �Ǽ��Ԥ��ޤ���"
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "������ %d / %d �������"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "�ե��륿�ι�ʸ������˥��顼: %s: %s"
-
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "�ե��륿�¹���˥��顼: %s: %s"
+#: camel/camel-filter-search.c:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "�ե��륿�����¹���˥��顼: %s: %s"
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1040
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "̤�б������: ����ɽ���Ǥθ���: %s ��"
-
-#: camel/camel-folder.c:1080
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "̤�б������: uid �Ǥθ���: %s ��"
-
-#: camel/camel-folder.c:1262
-msgid "Moving messages"
-msgstr "��å��������ư"
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5671,7 +7548,7 @@ msgstr ""
 "����ɽ���ι�ʸ����Ͻ���ޤ���: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5680,18 +7557,33 @@ msgstr ""
 "����ɽ���Ǥθ�����¹���˥��顼: %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 ""
 
-#: 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
-msgid "Invalid type in body-contains, expecting string"
-msgstr "̵���ʼ��̤���ʸ�˴ޤޤ�Ƥ��ޤ�, ʸ������Ԥ��Ƥ��ޤ�"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1038
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "̤�б������: ����ɽ���Ǥθ���: %s ��"
+
+#: camel/camel-folder.c:1078
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "̤�б������: uid �Ǥθ���: %s ��"
+
+#: camel/camel-folder.c:1260
+msgid "Moving messages"
+msgstr "��å��������ư"
 
 #: camel/camel-lock-client.c:111
 #, c-format
@@ -5799,121 +7691,126 @@ msgstr "���ʤ��� %s �ѥ��ե졼�� ( %s ��) �����Ϥ��Ƥ�������"
 msgid "Please enter your %s passphrase"
 msgstr "���ʤ��� %s �ѥ��ե졼�������Ϥ��Ƥ�������"
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
 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:628 camel/camel-pgp-context.c:802
 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: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:755
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "���Υ�å������˽�̾����ޤ���: ���ꥢ��̾����ʿʸ�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:953
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "��å�����������Ǥ��ޤ���: ��������ʿʸ�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:959
+#: 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:970
+#: 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:1143
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �Ź沽����ʿʸ�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:1153
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
 
-#: camel/camel-pgp-context.c:1160
+#: 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"
+"���Υ�å�������Ź沽�Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: "
+"%s"
 
-#: camel/camel-pgp-context.c:1169
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �����Ԥ����ꤵ��Ƥ��ޤ���"
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "���Υ�å�����������Ǥ��ޤ���: ���椹��Ź沽�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr "���Υ�å�����������Ǥ��ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
 
-#: camel/camel-pgp-context.c:1352
+#: 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-provider.c:130
+#: camel/camel-pgp-mime.c:354
+msgid "This is a digitally signed message part"
+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:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%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 "%s ������ɽ���ޤ���Ǥ���: �⥸�塼��Υ����ɤ����������Ƥ��ޤ���"
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s ������ %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s �����ӥ� (�桼��: %s �ۥ��� %s)"
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 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:270
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(̤�ΤΥۥ���)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "���ϥ���󥻥뤷�ޤ���"
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
+#: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "�����Ф�ͽ�����ʤ����Ǥ򤷤ޤ���: %s"
@@ -5966,8 +7863,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"
@@ -5978,8 +7875,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"
@@ -6023,12 +7920,13 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���"
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
+#, fuzzy
+msgid "Login"
 msgstr "NT ��������"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
@@ -6039,9 +7937,20 @@ msgstr "���Υ��ץ����ϴ�ñ�ʥѥ���ɤ�Ȥäƥ����Ф���³���ޤ�"
 msgid "Unknown authentication state."
 msgstr "̤�Τ�ǧ�ھ��֤Ǥ�"
 
+#: 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 "���Υ��ץ����� Kerberos 4 ǧ�ڤ�Ȥäƥ����Ф���³���ޤ�"
+
 #: 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
+#: 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 "�ѥ����"
 
@@ -6085,26 +7994,41 @@ msgstr "URL '%s' �ϥۥ��ȥ���ݡ��ͥ�Ȥ�ɬ�פǤ�"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' �ϥѥ�����ݡ��ͥ�Ȥ�ɬ�פǤ�"
 
-#: camel/camel-service.c:611
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "�����: %s"
 
-#: camel/camel-service.c:638
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "̾���θ����˼��Ԥ��ޤ���: %s"
 
-#: camel/camel-service.c:663
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: �ۥ��Ȥϸ��Ĥ���ޤ���"
 
-#: camel/camel-service.c:665
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: ̤�Τ���ͳ�Ǥ�"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "�����: %s"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: �ۥ��Ȥϸ��Ĥ���ޤ���"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: ̤�Τ���ͳ�Ǥ�"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "���ۥե�����᡼��ץ��Х���"
@@ -6113,12 +8037,12 @@ msgstr "���ۥե�����᡼��ץ��Х���"
 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 "�ץ��ȥ��� `%s' �����ѤǤ���ץ��Х����Ϥ���ޤ���"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6164,15 +8088,15 @@ msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
 msgid "Failed to verify certificates."
 msgstr "ǧ�ڤξ����˼��Ԥ��ޤ���"
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6181,8 +8105,7 @@ msgstr ""
 "ȯ��: %s\n"
 "�о�: %s"
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:428
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6197,24 +8120,40 @@ msgstr ""
 "\n"
 "������˾�ߤޤ���?"
 
-#: 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:491
 #, 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"
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
 msgstr ""
-"�᡼��: %s\n"
-"����̾: %s\n"
-"�ȿ���˥å�: %s\n"
-"�ȿ�: %s\n"
-"���: %s\n"
-"��: %s\n"
-"��: %s"
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, 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:288
 #, c-format
@@ -6226,27 +8165,27 @@ msgstr "URL `%s' ����Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 msgid "No such message %s in %s"
 msgstr "%s �� %s �Τ褦�ʥ�å������Ϥ���ޤ���"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "�ե���������Ǥ��ޤ���: %s: ���������Ǥ�"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "�ե���������Ǥ��ޤ���: %s: ���Τ褦�ʥե�����Ϥ���ޤ���"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���������Ǥ�"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���Τ褦�ʥե�����Ϥ���ޤ���"
@@ -6255,76 +8194,76 @@ msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���Τ褦�ʥե�����Ϥ���ޤ���"
 msgid "You cannot copy messages from this trash folder."
 msgstr "���Υ���Ȣ�ե���������å������򥳥ԡ����뤳�Ȥ�����ޤ���"
 
-#: camel/providers/imap/camel-imap-command.c:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP �����Ф���ͽ�����ʤ�����������ޤ���: %s"
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ���ޥ�ɤϼ��Ԥ��ޤ���: %s"
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr "�����Х쥹�ݥ󥹤Ϥ��ä��ʤ������ޤ���"
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-command.c:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP �����Ф���ͽ�����ʤ� OK ����������ޤ���: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "�ǥ��쥯�ȥ� %s ���������ޤ���Ǥ���: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, 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:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "�ѹ����줿��å�������������"
 
-#: camel/providers/imap/camel-imap-folder.c:1566
-#: camel/providers/imap/camel-imap-folder.c:1978
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "���Υ�å������ϸ������ѽ���ޤ���"
 
-#: camel/providers/imap/camel-imap-folder.c:1717
-#: camel/providers/imap/camel-imap-folder.c:1798
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1723
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "������������������"
 
-#: camel/providers/imap/camel-imap-folder.c:2015
+#: camel/providers/imap/camel-imap-folder.c:2151
 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:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "����å���ǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %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 "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
@@ -6337,7 +8276,7 @@ msgstr "����᡼��Υ����å�"
 msgid "Check for new messages in all folders"
 msgstr "���٤ƤΥե�����ο���᡼�������å����ޤ�"
 
-#: 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 "�ե����"
 
@@ -6370,28 +8309,28 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "���Υ��ץ����ϥץ쥤��ƥ����ȥѥ���ɤ�Ȥä� IMAP �����Ф���³���ޤ�"
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s �� IMAP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "�ѥ���ɤ����Ϥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6402,104 +8341,123 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "MH �����Υ᡼��ǥ��쥯�ȥ�"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 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:64
 msgid "Local delivery"
 msgstr "���������ۿ�"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "ɸ�� mbox �����ǥ�������᡼������"
 
-#: camel/providers/local/camel-local-provider.c:62
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "MH �����Υ᡼��ǥ��쥯�ȥ�"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 #, fuzzy
 msgid "For storing local mail in maildir directories."
 msgstr "qmail maildir �ǥ��쥯�ȥ�˥�������᡼�����¸"
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr "ɸ��Ū�� UNIX �� mbox ���ס���"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "��¸���줿�롼�� %s �����Хѥ��ǤϤ���ޤ���"
 
-#: 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: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:184
+#: camel/providers/local/camel-local-store.c:185
 msgid "Local stores do not have an inbox"
 msgstr "��������ؤ���¸�� 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 "��������᡼��ե����� %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�ե������ %s ���� %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 "�ե�������͡������ޤ���Ǥ���: %s"
+
+#: 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: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/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "���ޥ꡼�򥻡��ֽ���ޤ���Ǥ���: %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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "���ޥ�إ�å��������ɲä��뤳�Ȥ�����ޤ���: ̤�Τ���ͳ�Ǥ�"
 
@@ -6520,7 +8478,7 @@ msgstr "maildir �����Υե�����إ�å��������ɲý���ޤ���: %s: %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6532,7 +8490,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���"
 
@@ -6541,7 +8499,7 @@ msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���"
 msgid "Invalid message contents"
 msgstr "��å����������Ƥ�̵���Ǥ�"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -6551,14 +8509,14 @@ msgstr ""
 "�ե���� `%s' �򳫤����Ȥ�����ޤ���Ǥ���:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "�ե���� `%s' ��¸�ߤ��ޤ���"
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -6568,41 +8526,64 @@ msgstr ""
 "�ե���� `%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' �� maildir �����Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: 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:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, 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: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/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "����᡼��Υ����å�"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "�ե��������¸��"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "mailbox�򳫤����Ȥ�����ޤ���: %s: %s\n"
@@ -6620,9 +8601,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6632,16 +8613,16 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 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:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "��å������β��˼��Ԥ��ޤ���: �ְ�ä��᡼��ܥå����Ǥ���?"
 
-#: 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"
@@ -6650,7 +8631,7 @@ msgstr ""
 "�ե����� `%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"
@@ -6659,14 +8640,14 @@ msgstr ""
 "�ե����� `%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' ���̾�Υե�����ǤϤ���ޤ���"
 
-#: 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"
@@ -6675,96 +8656,85 @@ msgstr ""
 "�ե���� `%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 "�ե���� `%s' �϶��ǤϤ���ޤ���. ������ޤ���"
 
-#. 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:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "�ե�����򳫤����Ȥ�����ޤ���: %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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "�ݥ������ %ld �ն� �ե���� %s ����̿Ū�ʥ᡼�빽ʸ���ϥ��顼�Ǥ�"
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "�ե�����򳫤����Ȥ�����ޤ���: %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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�ƥ�ݥ�� mailbox �򳫤����Ȥ�����ޤ���: %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
+#: 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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "���Υե���� %s ���Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, 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:652
 #, 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "̤�ΤΥ��顼: %s"
@@ -6784,12 +8754,12 @@ msgstr "mh �ե�����إ�å��������ɲý���ޤ���: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' �ϥǥ��쥯�ȥ�ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, 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:515
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "���ס���ե�����˥�å��������ɲý���ޤ���: %s: %s"
@@ -6800,6 +8770,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "���ס���`%s' ��¸�ߤ��ʤ����̾�Υե�����ǤϤ���ޤ���"
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "�ե���� `%s/%s' ��¸�ߤ��ޤ���"
@@ -6809,76 +8780,55 @@ msgstr "�ե���� `%s/%s' ��¸�ߤ��ޤ���"
 msgid "Spool mail file %s"
 msgstr "���ס���᡼��ե����� %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "���ס���ե�����ϥ�͡���Ǥ��ޤ���"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "�ƥ�ݥ��ե������Ʊ������ޤ���Ǥ��� %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "�ե��������ޤ���Ǥ���: %s: %s"
 
-#: 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
-msgid "Server rejected username"
-msgstr "�����Фϥ桼��̾����ݤ��ޤ���"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "�����Фإ桼��̾�������˼��Ԥ��ޤ���"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "�����Фϥ桼��̾/�ѥ���ɤ���ݤ��ޤ���"
-
-#: 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
-msgid "Could not get group list from server."
-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' ��¸�ߤ��ʤ����̾�Υե�����ǤϤ���ޤ���"
 
-#: 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/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "%s �Υ��롼�ץꥹ�ȥե��������¸����ޤ���: %s"
+#: 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"
@@ -6888,88 +8838,124 @@ msgstr "USENET news"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "����� USENET �Υ˥塼�����롼�פ����������뤿��Υץ��Х����Ǥ�"
 
-#: camel/providers/nntp/camel-nntp-store.c:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "�˥塼�������ФΥǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s ��ͳ�� USENET News"
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "���Υ��ץ����ϥץ쥤��ƥ����ȥѥ���ɤ�Ȥä� NNTP �����Ф�ǧ�ڤ��ޤ�"
 
-#: 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 �� .newsrc �ե����������ޤ��ϳ������Ȥ�����ޤ���: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
+
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "�ѥ��פ������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "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 "������������������"
+
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "̤�ΤΥ��顼: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:566
+#, fuzzy
+msgid "Use cancel"
+msgstr "����󥻥�"
+
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "���ϥ���󥻥뤷�ޤ���"
+
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "POP ���ޥ�������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "POP �����Фǿ�����å�����������å����뤳�Ȥ�����ޤ���Ǥ���: %s"
+#: 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:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr "�ե�����򳫤��ޤ���Ǥ���: ��å������ꥹ�Ȥ�̤�����Ǥ�"
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "�ե�������������ޤ���: %s: %s"
 
-#: 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:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "��å��������������ޤ���Ǥ���: %s"
-
-#: 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: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: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/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 ""
+"��å��������������ޤ���: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "�����ʹ߿�"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "��å��������ȥ졼��"
 
-#: 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:43
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "%s ����˺������"
 
-#: 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:84
 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 "POP �����Ф���³���ƥ᡼������������ɤ��뤿��Τ�ΤǤ�"
 
-#: 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."
@@ -6977,56 +8963,42 @@ msgstr ""
 "���Υ��ץ����ϥץ쥤��ƥ����ȤΥѥ���ɤ�Ȥä� POP �����Ф���³���ޤ�. "
 "�����¿���� POP �����Фǥ��ݡ��Ȥ���륪�ץ����Ǥ�"
 
-#: 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 ""
-"���Υ��ץ����� APOP �ץ��ȥ����ͳ�ǰŹ沽���줿�ѥ���ɤ�Ȥä� POP ����"
-"�Ф���³���ޤ�. ����ϸ�ʿ�ʥ��ݡ��Ȥ��׵᤹�륵���Ф�, ���٤ƤΥ桼��������"
-"��ư���櫓�ǤϤ���ޤ���."
+"���Υ��ץ����� APOP �ץ��ȥ����ͳ�ǰŹ沽���줿�ѥ���ɤ�Ȥä� POP "
+"�����Ф���³���ޤ�. ����ϸ�ʿ�ʥ��ݡ��Ȥ��׵᤹�륵���Ф�, "
+"���٤ƤΥ桼���������ư���櫓�ǤϤ���ޤ���."
 
-#: 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 "����� POP �����Ф���³��, Kerberos 4 ǧ�ڤ�Ȥ��ޤ�."
-
-#: 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:214
-#, c-format
-msgid "Could not connect to server: %s"
-msgstr "�����Ф���³���뤳�Ȥ�����ޤ���Ǥ���: %s"
-
-#: 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:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%s %s@%s �� POP3 �ѥ���ɤ����Ϥ��Ƥ�������"
-
-#: 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:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, 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:381
-#: camel/providers/pop3/camel-pop3-store.c:418
-msgid "(Unknown)"
-msgstr "(̤��)"
+#: 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
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "%s �� POP �����Ф���³����ޤ���Ǥ���"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -7034,7 +9006,27 @@ msgstr ""
 "POP �����Ф���³����ޤ���\n"
 "�׵ᤷ��ǧ�ڼ��ʤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "IMAP ���ޥ�ɤϼ��Ԥ��ޤ���: %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "I/O ���顼"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7043,18 +9035,13 @@ msgstr ""
 "POP �����Ф���³�Ǥ��ޤ���\n"
 "�ѥ���ɤ�������˥��顼: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "���Τ褦�ʥե���� `%s' �Ϥ���ޤ���"
 
-#: camel/providers/pop3/camel-pop3-store.c:566
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "POP�����Ф���ͽ�����ʤ�����������ޤ���: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7065,50 +9052,50 @@ msgid ""
 msgstr ""
 "�᡼����������뤿��˥������륷���ƥ�� \"sendmail\" �ץ��������Ϥ��ޤ�"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: 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: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:123
+#: camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail �� fork ����ޤ���Ǥ���: %s: �᡼����������ޤ���Ǥ���"
 
-#: 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: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: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: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:193
-msgid "Could not find 'From' address in message"
-msgstr "��å������� 'From' ���ɥ쥹�򸫤Ĥ��뤳�Ȥ�����ޤ���Ǥ���"
-
-#: 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 "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"
 
@@ -7116,122 +9103,145 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTP��Ȥäƥ�⡼�ȥ᡼��ϥ֤���³���뤳�Ȥǥ᡼����ۿ����ޤ�\n"
 
-#: 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:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "�ѥ�᡼�����뤤�ϰ����˹�ʸ���ϥ��顼"
 
-#: 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "���ޥ�ɥѥ�᡼���ϼ�������Ƥ��ޤ���"
 
-#: 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:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "�إ�ץ�å�����"
 
-#: 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:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "�����ӥ������������ͥ���Ĥ��Ƥ��ޤ�"
 
-#: 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "�׵ᤵ�줿�᡼���ư���OK, ��λ���ޤ���"
 
-#: 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 "�桼���ϥ�������ǤϤ���ޤ���; <forward-path> ��ž�����ޤ�"
 
-#: 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:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "�׵ᤵ�줿ư��ϴ�λ���ޤ���: �᡼��ܥå��������ѤǤ��ޤ���"
 
-#: 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:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "�桼���ϥ�������ǤϤ���ޤ���; <forward-path> ���Ƥ�������"
 
-#: 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: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: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: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:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "�����ϼ��Ԥ��ޤ���"
 
-#: 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:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "ǧ�ڥᥫ�˥�����Խ�ʬ�᤮�ޤ�"
 
-#: 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:217
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "���Ū��ǧ�ڤ˼��Ԥ��ޤ���"
 
-#: 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:314
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "����������顼: %s: ���֤���̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:376
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "���Υ�å������������������ǤϤ���ޤ���"
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "AUTH �׵�Υ����ॢ����: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, 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"
 msgstr "SMTP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:415
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s %s@%s �� SMTP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7242,130 +9252,133 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s ��ͳ�� SMTP �᡼����ۿ����ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr "��å���������������ޤ���: �����ԤΥ��ɥ쥹���������Ƥ��ޤ���"
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr "��å���������������ޤ���: �����ԤΥ��ɥ쥹������������ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "��������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr "��å���������������ޤ���: �����Ԥ��������Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+#, fuzzy
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "��å���������������ޤ���: �����Ԥ��������Ƥ��ޤ���"
+
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO �쥹�ݥ󥹥��顼: %s: ��̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "SMTP ǧ��"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "SASL ǧ�ڥ��֥������Ȥ�������˥��顼��ȯ�����ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH �׵�Υ����ॢ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "AUTH �׵�˼��Ԥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 
-#: 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:1081
+#, fuzzy
+msgid "MAIL FROM response error"
 msgstr "MAIL FROM �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, 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:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-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
+#, fuzzy
+msgid "DATA response error"
+msgstr "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:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA �����Υ����ॢ����: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-"DATA �쥹�ݥ󥹥��顼: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET �׵�Υ����ॢ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "RSET �쥹�ݥ󥹥��顼: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
 
-#: 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:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "RSET �쥹�ݥ󥹥��顼: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -7392,19 +9405,19 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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: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:531
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "ź�դ��ɲ�..."
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "��å������إե������ź�դ��ޤ�"
 
@@ -7432,69 +9445,69 @@ 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:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "���ɥ쥹Ģ�Τ���ˤ����ǥ���å�"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "���п�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "�ֿ���:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "��̾:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "��å������μ����Ԥ����Ϥ��ޤ�"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 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:228
+#: 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:696
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7503,46 +9516,34 @@ msgstr ""
 "�ե�������ɤ߹�����˥��顼: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:894
-msgid "Save as..."
-msgstr "��̾����¸..."
-
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "�ٹ�!"
 
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "�ե������¸�ߤ��ޤ�����񤭤��ޤ���?"
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "�ե��������¸��˥��顼: %s"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "�ե�����Υ�������˥��顼: %s"
 
-#: composer/e-msg-composer.c:1019
-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:1069
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "�ե�����Υ���������˥��顼: %s"
 
-#: composer/e-msg-composer.c:1077
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "���ǥ��������å��������������ޤ���Ǥ���"
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7551,7 +9552,7 @@ msgstr ""
 "�ե�����������Ǥ��ޤ���: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1091
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7560,7 +9561,7 @@ msgstr ""
 "�ե�������ڤ�ͤ�뤳�Ȥ�����ޤ���: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1100
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7569,7 +9570,7 @@ msgstr ""
 "��å������μ�ư��¸��˥��顼: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1202
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7577,7 +9578,7 @@ msgstr ""
 "Evolution �� ����Υ��å�������¸����Ƥ��ʤ��ե������ȯ�����ޤ�����\n"
 "������ꥫ�Хꤷ�Ƥߤޤ���?"
 
-#: composer/e-msg-composer.c:1356
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7587,29 +9588,29 @@ msgstr ""
 "\n"
 "�ѹ�����¸���ޤ���?"
 
-#: composer/e-msg-composer.c:1363
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "�ٹ�: �ѹ����줿��å�����"
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "�ե�����򳫤�"
 
-#: composer/e-msg-composer.c:1535
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "�ե����������"
 
-#: composer/e-msg-composer.c:1910 composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "��å�������������ޤ�"
 
-#: composer/e-msg-composer.c:2368
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2391 composer/e-msg-composer.c:2446
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -7618,7 +9619,7 @@ msgstr ""
 "�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
 "��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: 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."
@@ -7626,18 +9627,18 @@ msgstr ""
 "�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
 "��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution �᡼������ν����������ޤ���"
 
-#: 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:1
 msgid "The Evolution groupware suite"
 msgstr "Evolution ���롼�ץ�������������"
 
+#: data/evolution.desktop.in.h:2
+msgid "Ximian Evolution"
+msgstr "Ximian Evolution"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "���ɥ쥹������"
@@ -7678,15 +9679,33 @@ msgstr "��̾�����Τ�Τ�ޤ�"
 msgid "Subject does not contain"
 msgstr "��̾�����Τ�Τ�ޤޤʤ�"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"����̾���Υե�����Ϥ��Ǥ�¸�ߤ��ޤ�\n"
+"��񤭤��ޤ���?"
+
 #. Remember the password?
-#: e-util/e-passwords.c:347 mail/mail-session.c:267
+#: 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:268
+#: 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 ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "���ƥ���"
+
 #. 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
@@ -7758,13 +9777,13 @@ 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 "%p %I:%M"
 
 #. 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"
 
@@ -7805,11 +9824,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:191
 msgid "seconds"
 msgstr " ��"
 
@@ -7884,7 +9899,7 @@ msgstr " ��"
 msgid "ago"
 msgstr "��"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%m�� %d�� %p %l:%M"
 
@@ -7897,15 +9912,15 @@ msgid "Filter Rules"
 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
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -7913,19 +9928,11 @@ msgstr ""
 "�ե�����������˺��Ƥ��ޤ�\n"
 "��äƥ᡼�����������ͭ���ʥե��������ꤷ�Ƥ�������"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:364
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 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 ""
@@ -7935,7 +9942,7 @@ msgstr ""
 "����ɽ�� '%s' �ǥ��顼�Ǥ�:\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "�ƥ���"
 
@@ -7944,39 +9951,40 @@ msgstr "�ƥ���"
 msgid "You must name this filter."
 msgstr "���Υե������̾�����ѹ����ޤ�"
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "�롼��̾: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "�����ȥ�ʤ�"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "�⤷"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "���ξ���ư���¹�:"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "���٤Ƥδ�ब��ä���"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "�����Ĥ��δ�ब��ä���"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "�����ɲ�"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "����"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "����"
 
@@ -8020,6 +10028,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 "����Ĥ���"
@@ -8032,6 +10046,11 @@ msgstr "��������Ĥ���"
 msgid "Attachments"
 msgstr "ź��"
 
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "�٥꡼��"
+
 #: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "�����Τ�Τ�ޤ�"
@@ -8085,144 +10104,154 @@ msgid "ends with"
 msgstr "�����Τ�Τǽ����"
 
 #: filter/libfilter-i18n.h:21
+msgid "Execute Shell Command"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "��¸�ߤ���"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "��¸�ߤ���"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "ɽ��"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "�����Τ�ΤȰ��פ���"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "���������"
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "����������"
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "�ե饰"
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "�����Τ�Τ���礭��"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "�����Τ�Τ�꾮����"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "�����Τ�ΤǤϤʤ�"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "�ե饰"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "�᡼��󥰥ꥹ��"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:37
 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:38
 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 "��������"
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "���ڤ����:"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "�����Ѥ�"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "����ɽ���Ȱ���"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "�ֿ���"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "��Ͽ"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1404
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "���ơ���������"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "�����Τ�ΤΤ褦�˸�����"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "���������������"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "����Υإå�"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "�����Τ�Τdz��Ϥ���"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 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 "�롼����Խ�"
 
@@ -8243,30 +10272,30 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution �� ���ʤ��θŤ� 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 "����ݡ�����..."
 
-#: 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 "���Ф餯���Ԥ���������"
 
-#: 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 "%s �� %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 "%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:101
 msgid "Mail"
 msgstr "�᡼��"
 
@@ -8294,23 +10323,74 @@ msgstr ""
 "Evolution �� GnomeCard �ե������ȯ�����ޤ���\n"
 "Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
 
-#: importers/netscape-importer.c:106
+#: 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 ""
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "����Ȣ"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "��������᡼��ե����� %s"
+
+#: 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:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "����"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "�ե��륿���Խ�"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8335,45 +10415,95 @@ msgid "Pine"
 msgstr "Pine"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: 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:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
+
+#: 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:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
+
+#: 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:7
 msgid "Evolution mail composer."
 msgstr "Evolution �᡼�륳��ݡ���"
 
-#: 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:9
 msgid "Evolution mail folder display component."
 msgstr "Evolution �᡼��ե�����ǥ����ץ쥤����ݡ��ͥ��"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Evolutgion �᡼��ե�����ե����ȥꥳ��ݡ��ͥ��"
 
-#: 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: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 "�����֤��ʤ�(_N)"
+
+#: 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:16
 msgid "Mail configuration interface"
 msgstr "�᡼������Υ��󥿡��ե�����"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "�᡼���ޤ�ե����"
+#: 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)"
+#: 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:101
+msgid "Folder containing mail"
+msgstr "�᡼���ޤ�ե����"
+
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "���ۤ���Ȣ"
@@ -8382,229 +10512,253 @@ msgstr "���ۤ���Ȣ"
 msgid "Virtual Trash folder"
 msgstr "���ۤ���Ȣ�ե����"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "���ȥ�����³���뤳�Ȥ�����ޤ���Ǥ���: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "���Υե�����ˤϥ�å������Ϥ���ޤ���"
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "�ץ��ѥƥ�..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "���Υե�����Υץ��ѥƥ����ѹ�"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr "�᡼��ž���᥽�åɤ����꤬����ޤ���"
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "�����᡼���å�����"
 
-#: mail/component-factory.c:951
-msgid "New _Mail Message"
-msgstr "�����᡼���å�����(_M)"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "��å�������᡼��(_M)"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolution �᡼�����ꥳ��ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution �ե�������󥳥�ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "�����Ф���³��..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "������ǥ��ȥ졼������Ͽ����ޤ���"
 
-#: mail/folder-browser-ui.c:271
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" �Υץ��ѥƥ�"
 
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "�ץ��ѥƥ�"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "����%d��"
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ","
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d �����"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d ̤����"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d ������"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "���%d��"
 
-#: mail/folder-browser.c:1049
-msgid "Create vFolder from Search"
-msgstr "�������鲾�ۥե��������"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "��å��������鲾�ۥե���������(_V)"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "��̾�β��ۥե����(_S)"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "�����Ԥβ��ۥե����(_N)"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "�����Ԥβ��ۥե����(_R)"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "��̾�Υե��륿(_J)"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "�����ԤΥե��륿(_D)"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "�����ԤΥե��륿(_C)"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿(_M)"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "������å������Ȥ����Խ�..."
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:104
-msgid "_Save As..."
-msgstr "��̾����¸(_S)..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "����(_P)"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "�����Ԥ��ֿ�(_R)"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "�ꥹ�Ȥ��ֿ�(_L)"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "�������ֿ�(_A)"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "ž��(_F)"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "��λ���ޤ���"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "���ꥢ"
+
+#. separator here?
+#: mail/folder-browser.c:1628 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:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "̤�ɤȤ��ƥޡ���(_N)"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "���פȤ��ƥޡ���(_I)"
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "����פȤ��ƥޡ���(_P)"
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "������(_U)"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "�ե�����ذ�ư(_M)..."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "�ե�����إ��ԡ�(_C)..."
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:106
-msgid "_Undelete"
-msgstr "������(_U)"
+#: mail/folder-browser.c:1645
+msgid "Label"
+msgstr ""
 
-#: mail/folder-browser.c:1473
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "�����Ԥ򥢥ɥ쥹Ģ���ɲ�"
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "�ե��륿Ŭ��"
 
-#: mail/folder-browser.c:1478
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "��å���������롼������(_L)"
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
-msgstr "�᡼��󥰥ꥹ�ȤΥե��륿"
-
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����"
 
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿 (%s)"
 
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե���� (%s)"
 
-#: mail/folder-browser.h:26
-#, fuzzy
-msgid "Default"
-msgstr "�ǥե����(_F)"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "�ե��������μ���"
@@ -8626,27 +10780,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Evolution �� Outlook Express 4 �ե�����򥤥�ݡ���"
 
 #: mail/local-config.glade.h:1
-#, fuzzy
-msgid "Body contents"
-msgstr "��ʸ�����Τ�Τ�ޤ�"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "���ߤ���¸����:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr ""
-
-#: 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:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "������¸����:"
 
-#: 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"
@@ -8656,15 +10802,15 @@ msgstr ""
 "�������ʤ����⤷��ޤ��� (�㤨�Хǥ��������ڡ�����­��ʤ�)\n"
 "���դ��Ƥ��ε�ǽ��ȤäƤ�������"
 
-#: 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"
 
@@ -8682,86 +10828,78 @@ msgstr "Evolution �˥塼�����ǥ���"
 msgid "Evolution Account Editor"
 msgstr "Evolution ��������ȥ��ǥ���"
 
-#: mail/mail-account-gui.c:962
-msgid "Could not save signature file."
-msgstr "��̾�ե��������¸����ޤ���Ǥ���"
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "�ۥ���(_H):"
 
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "��̾����¸"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "�桼��̾(_U):"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+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:1045
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"���ν�̾���ѹ�����Ƥ��ޤ�������¸����Ƥ��ޤ���\n"
-"\n"
-"�ѹ�����¸���ޤ���?"
 
-#: mail/mail-account-gui.c:1654
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr "Ʊ��̾���Υ�������Ȥ�2�ĺ����Ǥ��ޤ���"
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (�ǥե����)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "̵��"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "ͭ��"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "�����ˤ��Υ�������Ȥ������Ƥ��������Ǥ���?"
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "������ʤ�"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "�����˥�������Ȥ������ޤ���?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-msgid "Are you sure you want to delete this news account?"
-msgstr "������ news ��������Ȥ������Ƥ��������Ǥ���?"
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "̵��"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:783 mail/mail-config.glade.h:42
-msgid "Mail Settings"
-msgstr "�᡼������"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "ͭ��"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "%s �إ᡼��"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "������ news ��������Ȥ������Ƥ��������Ǥ���?"
 
-#: mail/mail-autofilter.c:215
-#, c-format
-msgid "Subject is %s"
-msgstr "��̾�� %s �Ǥ�"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "ͭ��"
 
-#: mail/mail-autofilter.c:231
-#, c-format
-msgid "Mail from %s"
-msgstr "%s ����᡼��"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "���������̾(_A):"
 
-#: mail/mail-autofilter.c:287
-#, c-format
-msgid "%s mailing list"
-msgstr "%s �᡼��󥰥ꥹ��"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+msgid "Protocol"
+msgstr ""
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "�ե��륿�롼����ɲ�"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8773,7 +10911,7 @@ msgstr ""
 "ɬ�פ�����ޤ�\n"
 "�����ꤷ�ޤ���?"
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8781,7 +10919,7 @@ msgstr ""
 "���ʤ��ϥ᡼�������������˥桼�������\n"
 "����򤹤�ɬ�פ�����ޤ�"
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8789,22 +10927,18 @@ msgstr ""
 "���ʤ��ϥ᡼�������������˥᡼��\n"
 "����������򤹤�ɬ�פ�����ޤ�"
 
-#: 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:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:280
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "�Ȥˤ�����������?"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8812,57 +10946,61 @@ msgstr ""
 "���Υ�å������Ϸ�̾������ޤ���\n"
 "�������������ޤ���?"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 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:299
 msgid "This message contains only Bcc recipients."
 msgstr "���Υ�å������� Bcc �������ꤵ��Ƥ��ޤ���"
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 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:469
-msgid "This message contains invalid recipients:"
-msgstr "���Υ�å���������Ŭ�ڤʼ����Ԥ�ޤ�Ǥ��ޤ�:"
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr "���Υ�å���������������Ŭ�ڤʼ����Ԥ���ꤷ�ʤ���Фʤ�ޤ���"
 
-#: mail/mail-callbacks.c:600
+#: mail/mail-callbacks.c:497
 msgid "You must configure an account before you can send this email."
 msgstr "���Υ᡼��������������˥�������Ȥ����ꤷ�ʤ���Фʤ�ޤ���"
 
-#: mail/mail-callbacks.c:838
+#: mail/mail-callbacks.c:623
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"���Υ�������Ȥ���ƥե�����򳫤����Ȥ�����ޤ���\n"
+"�ǥե���Ȥ���ƥե������ȤäƤ��������Ǥ���?"
+
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "������������"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 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:1433 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:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "��å������򥳥ԡ����ޤ�: "
 
-#: mail/mail-callbacks.c:1753
+#: mail/mail-callbacks.c:2091
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������ %d ��å��������Խ����Ƥ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:1778
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8870,7 +11008,7 @@ msgstr ""
 "�ɥ�եȥե���������¸���줿\n"
 "��å������������Խ����뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8878,44 +11016,51 @@ msgstr ""
 "�����ե�����Υ�å���������\n"
 "���������뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:1831
+#: mail/mail-callbacks.c:2169
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������ %d ��å�������������Ƥ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:1857
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "���򤵤줿��å������Ϥ���ޤ���"
 
-#: mail/mail-callbacks.c:1951
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "�ե�������񤭤��ޤ���?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "��å���������̾����¸..."
 
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "��å���������̾����¸..."
 
-#: mail/mail-callbacks.c:2122 widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "�ٹ�"
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "����̤�ɥ�å�������ɽ�����ޤ�"
+
+#: mail/mail-callbacks.c:2373
+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:2129
+#: mail/mail-callbacks.c:2615
 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:2136
-msgid "Do not ask me again."
-msgstr "���٤ȼ��䤷�ʤ�"
-
-#: mail/mail-callbacks.c:2244
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8924,19 +11069,28 @@ msgstr ""
 "�ե��륿����Υ�������˥��顼:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2256
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "�ե��륿"
 
-#: mail/mail-callbacks.c:2319
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "������ %d / %d �������"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "�����������"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2863
+msgid "US-Letter"
+msgstr ""
+
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "��å������ΰ����˼��Ԥ��ޤ���"
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "������ %d ��å��������̥�����ɥ��dz����Ƥ��������Ǥ���?"
@@ -8957,8 +11111,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"
@@ -8990,16 +11144,34 @@ msgstr ""
 "���Ѥ���ޤ���"
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution��������ȥ����������"
 
-#: mail/mail-config.c:326
-#, c-format
-msgid "Account %d"
-msgstr "��������� %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "�����"
 
-#: mail/mail-config.c:1859
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "�ȡ���"
+
+#. blue
+#: mail/mail-config.c:78 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"
@@ -9007,90 +11179,155 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: ����Ȣ"
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "�����ӥ�������å���"
 
-#: mail/mail-config.c:2183 mail/mail-config.c:2187
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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 " _Check for supported types "
-msgstr "���ѤǤ��륿���פ�����å�(_C)"
+#, fuzzy
+msgid " "
+msgstr ","
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " ���顼"
+#, 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
+#, fuzzy
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
+
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
 
-#: mail/mail-config.glade.h:5
-msgid "Account"
-msgstr "���������"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "��������� %d"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "��������Ⱦ���"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "��������ȴ���"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "���������"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "���򥭥�󥻥�"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:12
+msgid "Afrikaans"
+msgstr ""
+
+#: mail/mail-config.glade.h:13
 #, fuzzy
-msgid "Always _encrypt to myself when sending encrypted mail"
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: 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
+msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "��å������إե������ź�դ��ޤ�"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "ź��"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "ǧ��"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "������ʸ�������ɥ��å�: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "�Ĥ���(_L)"
+
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "����᡼��Υ����å�"
 
-#: mail/mail-config.glade.h:14
-msgid "Composer"
-msgstr "�᡼�����"
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Composing Messages"
+msgstr "��å�������������ޤ�"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "����"
 
-#: mail/mail-config.glade.h:16
-msgid "Confirm when Expunging a folder"
-msgstr "�ե�����Ǥκ����ǧ"
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9106,235 +11343,373 @@ msgstr ""
 "\n"
 "\"��λ\" �򥯥�å������������¸���Ƥ�������"
 
-#: mail/mail-config.glade.h:23
+#: 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:24
-msgid "Default Forward style is: "
-msgstr "�ǥե���Ȥ�ž����ˡ: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "�ǥե����(_F)"
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "�ǥե���ȤΥ���饯�����󥳡��ǥ���: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "�᡼��������"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "�ǥ����� ID..."
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr "ɽ��"
+#: mail/mail-config.glade.h:44
+#, 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:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "��λ"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "���"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "��ƥե����:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "ͭ��(_E)"
 
-#: 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:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
-msgstr "ͭ��"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "��"
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "�Żҥ᡼�뤬���Τ�Τ�ޤ�"
 
-#: mail/mail-config.glade.h:34
+#: 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:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "���ξ���ư���¹�:"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "�����Τ�Τǽ����"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "�ץ��ѥƥ�"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "��å�������ž��"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "�ǥ�����ID �����..."
 
-#: mail/mail-config.glade.h:35
-msgid "HTML signature file:"
-msgstr "HTML ��̾�ե�����:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "���Ѥ�Ĵ����(_H)"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:59
+msgid "Hulu"
+msgstr ""
+
+#: 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 "�桼������"
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr "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 "��¸�����Ĥ���"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "�������ɤ߹���(_I)"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "�᡼��ܥå����ξ��"
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
-msgstr "���Υ�������Ȥ��������ꤹ��(_D)"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "��å������إå�"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "��å�����ɽ��(_M)"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "�ߥ����ͥ���"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP ������:"
 
-#: mail/mail-config.glade.h:46
-msgid "News"
-msgstr "�˥塼��"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "�˥塼���ե�����(_N)"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "���ץ����"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:82
 #, fuzzy
-msgid "PGP _Key ID:"
+msgid "Or_ganization:"
+msgstr "���(_Z):"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "PGP���� ID:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "���顼������"
 
-#: mail/mail-config.glade.h:54
-msgid "Pretty Good Privacy"
-msgstr "�ץ�ƥ����åɥץ饤�Х���(PGP)"
-
-#: mail/mail-config.glade.h:55
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr "HTML �᡼���˾��Ǥ��ʤ������ HTML �᡼���������������Τ餻��"
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "�������� Bcc �������ꤵ��Ƥ��ʤ������Τ餻��(_B)"
 
-#: mail/mail-config.glade.h:56
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "�������˷�̾�����ξ����Τ餻��(_E)"
+#: mail/mail-config.glade.h:89
+#, fuzzy
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "�ץ�ƥ����åɥץ饤�Х���(PGP)"
 
-#: mail/mail-config.glade.h:57
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "�������� Bcc �������ꤵ��Ƥ��ʤ������Τ餻��(_B)"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "���򤷤�Ϣ�����������ޤ�"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "��å������򳫤����Ȥ�����ޤ���"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "����"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
 msgstr "���Υѥ���ɤ򵭲�"
 
-#: 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 "�ֿ���:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "�᡼��μ�����"
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
-msgstr "�᡼��μ���"
-
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "�������ץ����"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "���Υѥ���ɤ򵭲�"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "ɬ�ܾ���"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+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:67
-msgid "Security"
-msgstr "�������ƥ�"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
-msgstr "�ե��륿�������ե����������..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "PGP �ץ�����������"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "�᡼���������"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "��̾�ե�����:"
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
-msgstr "�᡼�������"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "��̾�ʳ�����"
 
-#: 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:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "�᡼���������"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "�����ѥ�å������ե����:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "�����Ѥ���ƥ�å�����"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "�����Ф�ǧ�ڤ�ɬ��(_A)"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Server _Type: "
 msgstr "�������:"
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
-msgstr "��̾�ե�����:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "���硼�ȥ��å�"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "��̾����¸"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "������"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "������"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "��������̾:"
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
-msgstr "���̤ʥե����"
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "ɸ��Ū�� UNIX �� mbox �ե�����"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:128
+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 s_ecure connection (SSL)"
-msgstr "�������ƥ����ݸ�줿��³ (_SSL) ��ɬ��"
+msgid "Use _HTML for this signature"
+msgstr "HTML��̾�ե�����(_H):"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "�ѿ�"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9344,132 +11719,219 @@ msgstr ""
 "\n"
 "\"��\" �򥯥�å����ƻϤ�Ƥ�������"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "��"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "��˲�����ͥåȤ����ɤ߹���"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "ǧ�ڼ���: "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "ǧ�ڼ���: "
+
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "ǧ�� ID"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
 #, fuzzy
-msgid "_Drafts folder:"
-msgstr "��ƥե����:"
+msgid "_Confirm when expunging a folder"
+msgstr "�ե�����Ǥκ����ǧ"
 
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
-msgstr "�᡼�륢�ɥ쥹(_E):"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "�ǥե����(_F)"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
-msgstr "��λ���˥���Ȣ����ˤ���(_E)"
+#: mail/mail-config.glade.h:151
+msgid "_Do not notify me when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:153
+msgid "_Enable spell checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:154
+#, fuzzy
+msgid "_Filename:"
+msgstr "�ե�����̾:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "ž��"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "�ե�͡���(_F):"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "HTML �᡼��"
+
+#: mail/mail-config.glade.h:160
 msgid "_HTML Signature:"
 msgstr "HTML��̾�ե�����(_H):"
 
-#: mail/mail-config.glade.h:103
-msgid "_Highlight citations with"
-msgstr "���Ѥ�Ĵ����(_H)"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "�桼������"
 
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
-msgstr "�ۥ���(_H):"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "����"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr "�����Ԥ����ɥ쥹Ģ�ˤ�����������ɤ߹���"
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
-msgstr ""
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "���Υ�������Ȥ��������ꤹ��(_D)"
 
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "���λ��֥ץ�ӥ塼����ȥ�å����������Ѥߤˤ���(_M):"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "̾��(_N):"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "������ͥåȤ����ɤ߹��ޤʤ�"
 
-#: mail/mail-config.glade.h:110
-msgid "_Organization:"
-msgstr "���(_O):"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "_PGP �ץ������Υѥ�:"
 
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
-msgstr "�ѥ�(_P):"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
-msgstr "���Υѥ���ɤ򵭲�(_R)"
+#: mail/mail-config.glade.h:172
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr "HTML �᡼���˾��Ǥ��ʤ������ HTML �᡼���������������Τ餻��"
 
-#: mail/mail-config.glade.h:114
-msgid "_Send mail in HTML format by default."
-msgstr "�ǥե���Ȥ� HTML �����Υ᡼�����������(_S)"
+#: mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "�������˷�̾�����ξ����Τ餻��(_E)"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:174
 #, fuzzy
-msgid "_Server Type: "
-msgstr "�������:"
+msgid "_Random"
+msgstr "�饸��"
 
-#: mail/mail-config.glade.h:116
-msgid "_Signature file:"
-msgstr "��̾�ե�����(_S):"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "�᡼��μ���"
 
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
-msgstr "�桼��̾(_U):"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "�������ֿ�"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "�������ƥ�(_S)"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "�������ƥ�(_S)"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "�᡼�������"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "���֤���ꤷ��ɽ��"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "�ѿ�"
+
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "_every"
 msgstr "��"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " ���顼"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "����"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr ""
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr " ��"
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "PGP ��̾����ƥ����Ȥ��������ޤ���Ǥ���"
@@ -9506,145 +11968,139 @@ msgstr "S/MIME ����٥����ץ���ƥ����Ȥ��������ޤ���Ǥ���"
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME �ǥ����ɥ���ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "ź�դ���¸"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "�ƥ�ݥ�� mbox '%s' ������Ǥ��ޤ���Ǥ���: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "�ǥ���������¸..."
 
-#: 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 "%s �˳���..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "����饤��ɽ�� (%s��ͳ)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "����"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "�����ӥ塼��"
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "��å����������Ƥ��ɤ߹�����"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "�֥饦���ǥ�󥯤򳫤�"
 
-#: mail/mail-display.c:1594
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "���򥳥ԡ�"
 
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "��󥯤���̾����¸"
 
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "��������¸..."
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s ��ź��"
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ��å���������Ͻ���ޤ���Ǥ���, ��������ɽ�����ޤ�"
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "�������ɥ쥹:"
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "���п�"
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "�ֿ���"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:915
 #, fuzzy
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
-
-#: mail/mail-format.c:1836
-msgid "Evolution does not recognize this type of signed message."
+msgid "Mailer"
 msgstr ""
+"\n"
+"�᡼��: "
 
-#: mail/mail-format.c:1844
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
-
-#: mail/mail-format.c:1852
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "���Υ�å������ϥǥ������̾���줿��ΤǤ���, ������������ޤ���"
-
-#: mail/mail-format.c:2068
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ������ (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2087
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "��������ե����� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "��⡼�ȥǡ��� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "̤�Τγ����ǡ��� (\"%s\" ������) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2129
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "�ե������ƹ�����"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9653,27 +12109,27 @@ msgstr ""
 "�ե�����Υ᥿�������¸����ޤ���; ��Ϥ䤳�Υե�����򳫤�\n"
 "���Ȥ�����ʤ��ȵ��Ť��Ǥ��礦: %s: %s"
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�ե�����Υ᥿����� %s ����¸�Ǥ��ޤ���: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "�ե�����Υ᥿�ǡ��� %s �������뤳�Ȥ�����ޤ���: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�ե���� \"%s\" �� \"%s\" �������ѹ����Ƥ��ޤ�"
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9681,11 +12137,11 @@ msgstr ""
 "�⤷���Υ᡼��ܥå����򳫤����ȤϤʤ��ʤ�\n"
 "��ư�Dz���������ɬ�פ����뤫�⤷��ޤ���"
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr "��������ե�����ʳ��η������ѹ��Ǥ��ޤ���"
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s �����"
@@ -9712,117 +12168,112 @@ msgstr ""
 msgid "Working"
 msgstr "�����"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "�ե������ե��륿��"
 
-#: 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:557
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ��������"
 
-#: mail/mail-ops.c:677
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "������ %d / %d ��������"
 
-#: mail/mail-ops.c:696
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
 
-#: 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:791
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "�ե�����إ�å���������¸��"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s �إ�å��������ư��"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s �إ�å������򥳥ԡ���"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "��ư��"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "���ԡ���"
 
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ����Υե������������"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "����Ȣ"
-
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "��å�������ž��"
 
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "�ե���� %s �򥪡��ץ���"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "��¸���줿 %s �򥪡��ץ���"
 
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "�ե���� %s ������"
 
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "�ե���� '%s' ����¸��"
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "�ե�����򹹿���"
 
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "�ե����������"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "������ %s �������"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d �̤Υ�å������������"
 
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d �̤Υ�å���������¸��"
 
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9831,7 +12282,7 @@ msgstr ""
 "���ϥե�������������ޤ���: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9840,11 +12291,11 @@ msgstr ""
 "�ե��������¸��˥��顼: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "ź�դ���¸��"
 
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9853,22 +12304,27 @@ msgstr ""
 "���ϥե�������������ޤ���: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�ǡ�����񤭽Ф����Ȥ�����ޤ���Ǥ���: %s"
 
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s �Ȥ���³���ڤäƤ��ޤ�"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s �˺���³��"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "����(_S)"
 
@@ -9908,64 +12364,88 @@ msgstr "����:"
 msgid "Cancelling..."
 msgstr "����󥻥���..."
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "������: %s, ����: %s"
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "����: %s"
 
-#: mail/mail-send-recv.c:286
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "�᡼���������"
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "���٤ƥ���󥻥�"
 
-#: mail/mail-send-recv.c:348
+#: 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:350 mail/mail-send-recv.c:403
 msgid "Waiting..."
 msgstr "�Ե���..."
 
-#: mail/mail-send-recv.c:533
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "����󥻥뤷�ޤ���"
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 msgid "Enter Password"
 msgstr "�ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: mail/mail-tools.c:255
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "��̾�ե��������¸����ޤ���Ǥ���"
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "��̾����¸"
+
+#: mail/mail-signature-editor.c:178
+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:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "��̾�ե�����:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "��å�������ž�����ޤ��� - %s"
 
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "ž�����줿��å�����"
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "ž�����줿��å�����"
 
@@ -9988,104 +12468,163 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "���ۥե����"
+#: mail/mail-vfolder.c:785
+#, fuzzy
+msgid "vFolders"
+msgstr "�ե����"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:825
 msgid "Edit VFolder"
 msgstr "���ۥե�������Խ�"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:841
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:895
 msgid "New VFolder"
 msgstr "�������ۥե����"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(��̾�ʤ�)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - ������"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "̤��"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "����"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "�����Ѥ�"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "ʣ����̤�ɥ�å�����"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "ʣ���Υ�å�����"
 
-#: mail/message-list.c:647
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "�Ǥ��㤤"
 
-#: mail/message-list.c:648
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "�㤤"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "�⤤"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "�Ǥ�⤤"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "������ %p %l:%M"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "������ %p %l:%M"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%Yǯ %m�� %d��"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "��å������ꥹ�Ȥ������"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "���� "
+
+#: 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:4
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "������"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "������"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "�Ƥ��ᤷ"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "��˰�ư"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "����������"
+
+#: 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-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr "�ֿ�"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "�������ֿ�"
+
+#: 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
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -10107,7 +12646,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "�ե���� \"%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 "�ե����"
 
@@ -10152,87 +12691,10893 @@ msgid "_Unsubscribe"
 msgstr "���ɲ��(_U)"
 
 #: 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���ޥ꡼��ޤ�ե����"
 
-#: my-evolution/component-factory.c:153
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 #, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
+msgid "Evolution Summary component."
+msgstr "Evolution �᡼�륳��ݡ���"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "�᡼�륵�ޥꥳ��ݡ��ͥ�ȤΤ���Υե����ȥ�"
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:4
+#, fuzzy
+msgid "Aberdeen"
+msgstr "���ʼ�"
+
+#: my-evolution/Locations.h:5
+#, fuzzy
+msgid "Abha"
+msgstr "�������"
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:39
+#, fuzzy
+msgid "Alamosa"
+msgstr "���顼��"
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:62
+#, fuzzy
+msgid "Alliance"
+msgstr "���"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:67
+#, fuzzy
+msgid "Alta"
+msgstr "�ޥ륿"
+
+#: my-evolution/Locations.h:68
+#, fuzzy
+msgid "Altamira"
+msgstr "����Х˥�"
+
+#: my-evolution/Locations.h:69
+#, fuzzy
+msgid "Alton"
+msgstr "ư��(_A)"
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:75
+#, fuzzy
+msgid "Amarillo"
+msgstr "�᡼��"
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr ""
+
+#: 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 "���󥴥�"
+
+#: my-evolution/Locations.h:80
+#, fuzzy
+msgid "Ames"
+msgstr "�ޥ���"
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:101
+#, fuzzy
+msgid "Anniston"
+msgstr "���ե��˥�����"
+
+#: my-evolution/Locations.h:102
+#, fuzzy
+msgid "Antalya"
+msgstr "�����ꥢ"
+
+#: 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 "����ƥ������С��֡���"
+
+#: 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
+msgid "Apalachicola"
+msgstr ""
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr ""
+
+#: my-evolution/Locations.h:112
+#, fuzzy
+msgid "Aquadilla"
+msgstr "���󥮥�"
+
+#: 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 "�������"
+
+#: my-evolution/Locations.h:116
+#, fuzzy
+msgid "Araxos"
+msgstr "�饪��"
+
+#: my-evolution/Locations.h:117
+msgid "Arcata"
+msgstr ""
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr ""
+
+#: my-evolution/Locations.h:119
+#, fuzzy
+msgid "Arequipa"
+msgstr "�����˥�"
+
+#: my-evolution/Locations.h:121
+#, fuzzy
+msgid "Arica"
+msgstr "���른���ꥢ"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:125
+#, fuzzy
+msgid "Arlington"
+msgstr "����"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:131
+#, fuzzy
+msgid "Ashfield"
+msgstr "�����ƺѤ�"
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:133
+#, fuzzy
+msgid "Ashland"
+msgstr "����"
+
+#: my-evolution/Locations.h:134
+#, fuzzy
+msgid "Asia"
+msgstr "�������ȥꥢ"
+
+#: my-evolution/Locations.h:135
+#, fuzzy
+msgid "Aspen"
+msgstr "����"
+
+#: my-evolution/Locations.h:136
+#, fuzzy
+msgid "Asswan"
+msgstr "�����������"
+
+#: my-evolution/Locations.h:137
+#, fuzzy
+msgid "Astoria"
+msgstr "�������ȥꥢ"
+
+#: my-evolution/Locations.h:138
+#, fuzzy
+msgid "Astrakhan"
+msgstr "�������ȥ�ꥢ"
+
+#: my-evolution/Locations.h:139
+#, fuzzy
+msgid "Asturias"
+msgstr "�������ȥꥢ"
+
+#: 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 "����Х˥�"
+
+#: 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
+msgid "Auckland"
+msgstr ""
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:150
+#, fuzzy
+msgid "Augusta"
+msgstr "8 ��"
+
+#: my-evolution/Locations.h:151
+#, fuzzy
+msgid "Aurora"
+msgstr "����ɥ�"
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:170
+#, fuzzy
+msgid "Ball Mountain"
+msgstr "�Żҥ᡼�뤬���Τ�Τ�ޤ�"
+
+#: my-evolution/Locations.h:171
+#, fuzzy
+msgid "Baltimore"
+msgstr "���3��"
+
+#: 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 "�᤭�Ĥ��뺽"
+
+#: my-evolution/Locations.h:185
+#, fuzzy
+msgid "Barksdale"
+msgstr "�١�������ȥ�"
+
+#: 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 ""
+
+#: 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 "���3��"
+
+#: 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 "�С��졼��"
+
+#: my-evolution/Locations.h:208
+#, fuzzy
+msgid "Beckley"
+msgstr "�٥꡼��"
+
+#: my-evolution/Locations.h:209
+#, fuzzy
+msgid "Bedford"
+msgstr "��"
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 "�٥ͥ�����"
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:237
+#, fuzzy
+msgid "Bern"
+msgstr "�٥˥�"
+
+#: my-evolution/Locations.h:238
+#, fuzzy
+msgid "Bethel"
+msgstr "��ŷ��"
+
+#: my-evolution/Locations.h:239
+msgid "Bethlehem Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:240
+#, fuzzy
+msgid "Bettles"
+msgstr "�٥꡼��"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:245
+#, fuzzy
+msgid "Big Piney"
+msgstr "Pine"
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:267
+#, fuzzy
+msgid "Bodo"
+msgstr "����"
+
+#: my-evolution/Locations.h:268
+msgid "Bogota/Eldorado"
+msgstr ""
+
+#: my-evolution/Locations.h:269
+#, fuzzy
+msgid "Boise"
+msgstr "�١�������ȥ�"
+
+#: my-evolution/Locations.h:271
+msgid "Bologna"
+msgstr ""
+
+#: my-evolution/Locations.h:272
+#, fuzzy
+msgid "Bolzano"
+msgstr "�ݡ�����"
+
+#: my-evolution/Locations.h:273
+msgid "Bombay/Santacruz"
+msgstr ""
+
+#: my-evolution/Locations.h:274
+#, fuzzy
+msgid "Boone"
+msgstr "�ʤ�"
+
+#: my-evolution/Locations.h:275
+msgid "Bordeaux"
+msgstr ""
+
+#: 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 "��:"
+
+#: my-evolution/Locations.h:281
+#, fuzzy
+msgid "Boulmer"
+msgstr "�ե����"
+
+#: 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 "�С��졼��"
+
+#: my-evolution/Locations.h:289
+#, fuzzy
+msgid "Brasilia"
+msgstr "�֥饸��"
+
+#: my-evolution/Locations.h:290
+msgid "Brasschaat"
+msgstr ""
+
+#: my-evolution/Locations.h:291
+#, fuzzy
+msgid "Bratislava"
+msgstr "�֥饸��"
+
+#: my-evolution/Locations.h:292
+#, fuzzy
+msgid "Bratsk"
+msgstr "���"
+
+#: my-evolution/Locations.h:293
+msgid "Braunschweig"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:307
+#, fuzzy
+msgid "Brookings"
+msgstr "�����"
+
+#: my-evolution/Locations.h:308
+msgid "Brooksville"
+msgstr ""
+
+#: 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 ""
+
+#: 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 "�֡�����"
+
+#: my-evolution/Locations.h:323
+#, fuzzy
+msgid "Burgas"
+msgstr "�Ż�"
+
+#: 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 "�֥��"
+
+#: my-evolution/Locations.h:327
+#, fuzzy
+msgid "Burns"
+msgstr "�Ż�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:332
+#, fuzzy
+msgid "Cagliari"
+msgstr "������"
+
+#: my-evolution/Locations.h:333
+#, fuzzy
+msgid "Cairns"
+msgstr "��Ĺ"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:338
+#, fuzzy
+msgid "Calgary"
+msgstr "������"
+
+#: my-evolution/Locations.h:339
+msgid "Cali/Alfonso Bonillaaragon"
+msgstr ""
+
+#: my-evolution/Locations.h:340
+#, fuzzy
+msgid "Caliente"
+msgstr "������"
+
+#: my-evolution/Locations.h:341
+#, fuzzy
+msgid "California"
+msgstr "�˥塼����ɥ˥�"
+
+#: my-evolution/Locations.h:342
+msgid "Calvi-Ste-Catherine"
+msgstr ""
+
+#: my-evolution/Locations.h:343
+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 "����롼��"
+
+#: my-evolution/Locations.h:347
+#, fuzzy
+msgid "Camiri"
+msgstr "��Ĺ"
+
+#: my-evolution/Locations.h:348
+#, fuzzy
+msgid "Campeche"
+msgstr "��λ���ޤ���"
+
+#: my-evolution/Locations.h:349
+#, fuzzy
+msgid "Campinas"
+msgstr "����ܥ���"
+
+#: my-evolution/Locations.h:350
+#, fuzzy
+msgid "Campo"
+msgstr "���"
+
+#: my-evolution/Locations.h:351
+msgid "Campo Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:363
+#, fuzzy
+msgid "Cancun"
+msgstr "����󥻥�"
+
+#: my-evolution/Locations.h:364
+msgid "Cannes-Mandelieu"
+msgstr ""
+
+#: my-evolution/Locations.h:365
+#, fuzzy
+msgid "Cantwell"
+msgstr "����󥻥�"
+
+#: my-evolution/Locations.h:366
+msgid "Cape Girardeau"
+msgstr ""
+
+#: my-evolution/Locations.h:367
+msgid "Cape Hatteras"
+msgstr ""
+
+#: my-evolution/Locations.h:368
+#, fuzzy
+msgid "Cape Lisburne"
+msgstr "�楽����:"
+
+#: my-evolution/Locations.h:369
+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
+msgid "Capo Mele"
+msgstr ""
+
+#: my-evolution/Locations.h:374
+msgid "Caracas La Carlota"
+msgstr ""
+
+#: my-evolution/Locations.h:375
+msgid "Caracas Maiquetia"
+msgstr ""
+
+#: my-evolution/Locations.h:376
+#, fuzzy
+msgid "Caravelas"
+msgstr "�������Υ���󥻥�"
+
+#: my-evolution/Locations.h:377
+#, fuzzy
+msgid "Carbondale"
+msgstr "����ܥ���"
+
+#: my-evolution/Locations.h:378
+#, fuzzy
+msgid "Cardiff"
+msgstr "̾��ɽ��"
+
+#: my-evolution/Locations.h:379
+#, fuzzy
+msgid "Caribou"
+msgstr "��"
+
+#: my-evolution/Locations.h:380
+#, fuzzy
+msgid "Carlisle"
+msgstr "�ѿ�"
+
+#: my-evolution/Locations.h:381
+#, fuzzy
+msgid "Carlsbad"
+msgstr "�Ƥ��ᤷ"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:385
+#, fuzzy
+msgid "Cascade"
+msgstr "��Ĺ"
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:398
+#, fuzzy
+msgid "Chadron"
+msgstr "�����"
+
+#: 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 "����롼��"
+
+#: my-evolution/Locations.h:402
+#, fuzzy
+msgid "Champaign"
+msgstr "���"
+
+#: my-evolution/Locations.h:403
+#, fuzzy
+msgid "Chandalar Lake"
+msgstr "������������"
+
+#: my-evolution/Locations.h:404
+#, fuzzy
+msgid "Chandler"
+msgstr "�����"
+
+#: my-evolution/Locations.h:405
+#, fuzzy
+msgid "Chania"
+msgstr "��Ĺ"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:410
+#, fuzzy
+msgid "Charleston"
+msgstr "��Ĺ"
+
+#: my-evolution/Locations.h:411
+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 ""
+
+#: 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 "��"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:431
+#, fuzzy
+msgid "Chiclayo"
+msgstr "����"
+
+#: 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
+msgid "Chihhang"
+msgstr ""
+
+#: my-evolution/Locations.h:436
+msgid "Chihuahua"
+msgstr ""
+
+#: 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
+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 ""
+
+#: my-evolution/Locations.h:462
+#, fuzzy
+msgid "Clarinda"
+msgstr "���ʥ�"
+
+#: my-evolution/Locations.h:463
+#, fuzzy
+msgid "Clarion"
+msgstr "���ϼ�"
+
+#: my-evolution/Locations.h:464
+msgid "Clarksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:465
+#, fuzzy
+msgid "Clayton"
+msgstr "���ϼ�"
+
+#: my-evolution/Locations.h:466
+msgid "Clayton Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:467
+msgid "Clermont-Ferrand"
+msgstr ""
+
+#: 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 "���������"
+
+#: my-evolution/Locations.h:477
+#, fuzzy
+msgid "Cody"
+msgstr "����"
+
+#: my-evolution/Locations.h:478
+msgid "Coeur d'Alene"
+msgstr ""
+
+#: my-evolution/Locations.h:479
+#, fuzzy
+msgid "Cold Bay"
+msgstr "�ե�����С�(_F)"
+
+#: my-evolution/Locations.h:480
+#, fuzzy
+msgid "Colima"
+msgstr "������ӥ�"
+
+#: my-evolution/Locations.h:481
+#, fuzzy
+msgid "College Station"
+msgstr "���ϼ�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:494
+#, fuzzy
+msgid "Colville"
+msgstr "����"
+
+#: my-evolution/Locations.h:495
+msgid "Comodoro Rivadavia"
+msgstr ""
+
+#: my-evolution/Locations.h:496
+#, fuzzy
+msgid "Comox"
+msgstr "���"
+
+#: my-evolution/Locations.h:497
+msgid "Conceicao Do Araguaia"
+msgstr ""
+
+#: my-evolution/Locations.h:498
+#, fuzzy
+msgid "Concepcion"
+msgstr "���򥭥�󥻥�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:502
+#, fuzzy
+msgid "Connecticut"
+msgstr "Ϣ����"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:509
+#, fuzzy
+msgid "Coro"
+msgstr "���������"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:513
+#, fuzzy
+msgid "Corrientes"
+msgstr "�����"
+
+#: my-evolution/Locations.h:514
+msgid "Corsicana"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:520
+#, fuzzy
+msgid "Coventry"
+msgstr "��(_Y):"
+
+#: 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 "��Ĺ"
+
+#: my-evolution/Locations.h:524
+#, fuzzy
+msgid "Cranfield"
+msgstr "����󥻥뤷�ޤ���"
+
+#: my-evolution/Locations.h:525
+msgid "Crescent City"
+msgstr ""
+
+#: my-evolution/Locations.h:526
+#, fuzzy
+msgid "Creston"
+msgstr "����"
+
+#: 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
+msgid "Cuba Awrs"
+msgstr ""
+
+#: my-evolution/Locations.h:534
+msgid "Cuernavaca"
+msgstr ""
+
+#: my-evolution/Locations.h:535
+msgid "Cuiaba"
+msgstr ""
+
+#: 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
+msgid "Curitiba"
+msgstr ""
+
+#: my-evolution/Locations.h:541
+msgid "Curitiba Apt"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:576
+#, fuzzy
+msgid "Delta"
+msgstr "���"
+
+#: my-evolution/Locations.h:577
+#, fuzzy
+msgid "Deming"
+msgstr "���"
+
+#: my-evolution/Locations.h:578
+msgid "Den Helder/De Kooy"
+msgstr ""
+
+#: my-evolution/Locations.h:579
+#, fuzzy
+msgid "Denison"
+msgstr "�٥˥�"
+
+#: my-evolution/Locations.h:581
+#, fuzzy
+msgid "Denton"
+msgstr "��λ"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:587
+#, fuzzy
+msgid "Des Moines"
+msgstr "�����ॾ����"
+
+#: 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 "�С��졼��"
+
+#: my-evolution/Locations.h:596
+#, fuzzy
+msgid "Dickinson"
+msgstr "��ˡ:"
+
+#: my-evolution/Locations.h:597
+#, fuzzy
+msgid "Dijon"
+msgstr "��λ"
+
+#: my-evolution/Locations.h:598
+#, fuzzy
+msgid "Dillingham"
+msgstr "�᤭�󤻤뤢���"
+
+#: my-evolution/Locations.h:599
+#, fuzzy
+msgid "Dillon"
+msgstr "��λ"
+
+#: 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 "���"
+
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "��λ"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:614
+#, fuzzy
+msgid "Dothan"
+msgstr "��λ"
+
+#: my-evolution/Locations.h:615
+msgid "Douglas"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:625
+#, fuzzy
+msgid "Dugway"
+msgstr "��"
+
+#: my-evolution/Locations.h:626
+#, fuzzy
+msgid "Duluth"
+msgstr "�ǥե����(_F)"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:634
+#, fuzzy
+msgid "Dyersburg"
+msgstr "�ǥХå�(_D)"
+
+#: 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
+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 ""
+
+#: my-evolution/Locations.h:661
+#, fuzzy
+msgid "Elkins"
+msgstr "̸"
+
+#: my-evolution/Locations.h:662
+msgid "Elko"
+msgstr ""
+
+#: my-evolution/Locations.h:663
+msgid "Elmira"
+msgstr ""
+
+#: my-evolution/Locations.h:664
+#, fuzzy
+msgid "El Monte"
+msgstr "��"
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr ""
+
+#: my-evolution/Locations.h:667
+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 ""
+
+#: 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
+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 ""
+
+#: my-evolution/Locations.h:685
+#, fuzzy
+msgid "Eugene"
+msgstr "6 ��"
+
+#: my-evolution/Locations.h:686
+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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:693
+#, fuzzy
+msgid "Exeter"
+msgstr "��ŷ��"
+
+#: my-evolution/Locations.h:694
+msgid "Ezeiza"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:698
+#, fuzzy
+msgid "Fairfield"
+msgstr "���пͥե������(_F)"
+
+#: 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 "��"
+
+#: my-evolution/Locations.h:705
+#, fuzzy
+msgid "Farmingdale"
+msgstr "�ѿ�"
+
+#: my-evolution/Locations.h:706
+msgid "Farmington"
+msgstr ""
+
+#: my-evolution/Locations.h:707
+#, fuzzy
+msgid "Farmville"
+msgstr "��"
+
+#: my-evolution/Locations.h:708
+#, fuzzy
+msgid "Faro"
+msgstr "���п�"
+
+#: my-evolution/Locations.h:709
+msgid "Fayetteville"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:713
+#, fuzzy
+msgid "Ferrara"
+msgstr "2 ��"
+
+#: my-evolution/Locations.h:714
+#, fuzzy
+msgid "Figari"
+msgstr "�ʥ������ꥢ"
+
+#: my-evolution/Locations.h:715
+#, fuzzy
+msgid "Findlay"
+msgstr "������"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:720
+#, fuzzy
+msgid "Flint"
+msgstr "̸"
+
+#: my-evolution/Locations.h:721
+msgid "Flippin"
+msgstr ""
+
+#: my-evolution/Locations.h:722
+#, fuzzy
+msgid "Florence"
+msgstr "�ե��"
+
+#: my-evolution/Locations.h:723
+#, fuzzy
+msgid "Florennes"
+msgstr "����"
+
+#: my-evolution/Locations.h:724
+#, fuzzy
+msgid "Flores"
+msgstr "��̾"
+
+#: my-evolution/Locations.h:725
+msgid "Florianopolis"
+msgstr ""
+
+#: my-evolution/Locations.h:726
+#, fuzzy
+msgid "Florida"
+msgstr "������"
+
+#: my-evolution/Locations.h:727
+#, fuzzy
+msgid "Floro"
+msgstr "���п�"
+
+#: my-evolution/Locations.h:728
+msgid "Fond Du Lac"
+msgstr ""
+
+#: my-evolution/Locations.h:729
+#, fuzzy
+msgid "Forde/Bringeland"
+msgstr "�ե������"
+
+#: my-evolution/Locations.h:730
+#, fuzzy
+msgid "Forli"
+msgstr "��(_F)"
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:757
+#, fuzzy
+msgid "Fort Smith"
+msgstr "��"
+
+#: my-evolution/Locations.h:758
+#, fuzzy
+msgid "Fort Stewart"
+msgstr "���Ϥ��Ƥ��ʤ�"
+
+#: my-evolution/Locations.h:759
+msgid "Fort Stockton"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:769
+#, fuzzy
+msgid "Franklin"
+msgstr "����饤���ž��(_I)"
+
+#: my-evolution/Locations.h:770
+#, fuzzy
+msgid "Fredericton"
+msgstr "����"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:775
+#, fuzzy
+msgid "Friday Harbor"
+msgstr "������"
+
+#: my-evolution/Locations.h:776
+msgid "Friedrichshafen"
+msgstr ""
+
+#: my-evolution/Locations.h:777
+#, fuzzy
+msgid "Frigg"
+msgstr "��(_F)"
+
+#: my-evolution/Locations.h:778
+#, fuzzy
+msgid "Frontone"
+msgstr "�ե����"
+
+#: my-evolution/Locations.h:779
+#, fuzzy
+msgid "Frosinone"
+msgstr "���翦"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:790
+#, fuzzy
+msgid "Gage"
+msgstr "�ڡ���"
+
+#: 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
+msgid "Gallup"
+msgstr ""
+
+#: my-evolution/Locations.h:798
+msgid "Galveston"
+msgstr ""
+
+#: my-evolution/Locations.h:799
+msgid "Gambell"
+msgstr ""
+
+#: my-evolution/Locations.h:800
+#, fuzzy
+msgid "Gander"
+msgstr "�إå�"
+
+#: my-evolution/Locations.h:801
+#, fuzzy
+msgid "Garden City"
+msgstr "�桼������"
+
+#: my-evolution/Locations.h:802
+msgid "Gary"
+msgstr ""
+
+#: my-evolution/Locations.h:803
+#, fuzzy
+msgid "Gassim"
+msgstr "������"
+
+#: my-evolution/Locations.h:804
+#, fuzzy
+msgid "Gatineau"
+msgstr "���˥����¹�"
+
+#: my-evolution/Locations.h:805
+msgid "Gaziantep"
+msgstr ""
+
+#: my-evolution/Locations.h:806
+#, fuzzy
+msgid "Gdansk"
+msgstr "��"
+
+#: my-evolution/Locations.h:807
+#, fuzzy
+msgid "Geneve"
+msgstr "���ꥷ��"
+
+#: 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
+msgid "Ghardaia"
+msgstr ""
+
+#: my-evolution/Locations.h:814
+msgid "Ghedi"
+msgstr ""
+
+#: my-evolution/Locations.h:816
+msgid "Gifu Ab"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:821
+#, fuzzy
+msgid "Girona"
+msgstr "���˥����¹�"
+
+#: my-evolution/Locations.h:822
+msgid "Gizan"
+msgstr ""
+
+#: my-evolution/Locations.h:823
+#, fuzzy
+msgid "Glasgow"
+msgstr "��"
+
+#: my-evolution/Locations.h:824
+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 ""
+
+#: my-evolution/Locations.h:828
+#, fuzzy
+msgid "Goodland"
+msgstr "�ݡ�����"
+
+#: 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 ""
+
+#: 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
+msgid "Grand Marais"
+msgstr ""
+
+#: my-evolution/Locations.h:840
+msgid "Grand Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:841
+#, fuzzy
+msgid "Grandview"
+msgstr "�ץ�ӥ塼"
+
+#: my-evolution/Locations.h:842
+#, fuzzy
+msgid "Grangeville"
+msgstr "����󥻥뤷�ޤ���"
+
+#: my-evolution/Locations.h:843
+#, fuzzy
+msgid "Grants"
+msgstr "���"
+
+#: my-evolution/Locations.h:844
+#, fuzzy
+msgid "Graz"
+msgstr "�֥饸��"
+
+#: my-evolution/Locations.h:845
+msgid "Great Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:847
+#, fuzzy
+msgid "Greeley"
+msgstr "���ꥷ��"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:851
+#, fuzzy
+msgid "Greenville"
+msgstr "���꡼�����"
+
+#: my-evolution/Locations.h:852
+msgid "Greenville-Spartanburg"
+msgstr ""
+
+#: 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 ""
+
+#: 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
+msgid "Guadalajara"
+msgstr ""
+
+#: my-evolution/Locations.h:860
+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
+msgid "Guantanamo"
+msgstr ""
+
+#: my-evolution/Locations.h:864
+msgid "Guarany"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:869
+#, fuzzy
+msgid "Guaymas"
+msgstr "������"
+
+#: my-evolution/Locations.h:870
+msgid "Guernsey"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:875
+msgid "Gunnison"
+msgstr ""
+
+#: my-evolution/Locations.h:876
+msgid "Gunnison (2)"
+msgstr ""
+
+#: 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 ""
+
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+msgid "Hail"
+msgstr "�����"
+
+#: my-evolution/Locations.h:886
+msgid "Hailey-Sun Valley"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:902
+#, fuzzy
+msgid "Ha Noi"
+msgstr "�����"
+
+#: my-evolution/Locations.h:903
+msgid "Harbor Beach"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:911
+#, fuzzy
+msgid "Hastings"
+msgstr "����"
+
+#: my-evolution/Locations.h:912
+msgid "Haugesund"
+msgstr ""
+
+#: my-evolution/Locations.h:913
+#, fuzzy
+msgid "Havre"
+msgstr "���"
+
+#: my-evolution/Locations.h:914
+#, fuzzy
+msgid "Hawaii"
+msgstr "�ϥ���"
+
+#: my-evolution/Locations.h:915
+msgid "Hawthorne"
+msgstr ""
+
+#: 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 "��������"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:933
+#, fuzzy
+msgid "Hobart"
+msgstr "�ۥ���"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:941
+#, fuzzy
+msgid "Holguin"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:942
+#, fuzzy
+msgid "Homer"
+msgstr "��"
+
+#: 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 "����"
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 "�ݡ�����"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:998
+#, fuzzy
+msgid "Inverness"
+msgstr "������"
+
+#: my-evolution/Locations.h:999
+msgid "Inyokern"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1005
+#, fuzzy
+msgid "Iraklion"
+msgstr "����"
+
+#: my-evolution/Locations.h:1006
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1044
+#, fuzzy
+msgid "Jonkoping"
+msgstr "�����"
+
+#: 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 "����"
+
+#: my-evolution/Locations.h:1050
+#, fuzzy
+msgid "Jujuy"
+msgstr "7 ��"
+
+#: my-evolution/Locations.h:1051
+#, fuzzy
+msgid "Juliaca"
+msgstr "����"
+
+#: my-evolution/Locations.h:1052
+#, fuzzy
+msgid "Junction"
+msgstr "ǧ��"
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1071
+#, fuzzy
+msgid "Karachi"
+msgstr "3 ��"
+
+#: 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 "���˥�"
+
+#: 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
+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 ""
+
+#: my-evolution/Locations.h:1152
+#, fuzzy
+msgid "La Crosse"
+msgstr "�饪��"
+
+#: my-evolution/Locations.h:1153
+msgid "La Esperanza"
+msgstr ""
+
+#: my-evolution/Locations.h:1154
+msgid "Lafayette"
+msgstr ""
+
+#: my-evolution/Locations.h:1155
+msgid "La Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1156
+#, fuzzy
+msgid "Lahaina"
+msgstr "�С��졼��"
+
+#: my-evolution/Locations.h:1157
+#, fuzzy
+msgid "Lahore"
+msgstr "�ݥ��٥�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1165
+#, fuzzy
+msgid "Lakeview"
+msgstr "�ץ�ӥ塼"
+
+#: my-evolution/Locations.h:1166
+#, fuzzy
+msgid "Lamar"
+msgstr "�ߥ��ޡ�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1171
+#, fuzzy
+msgid "Lanai"
+msgstr "����"
+
+#: my-evolution/Locations.h:1172
+#, fuzzy
+msgid "Lancaster"
+msgstr "��Ĺ"
+
+#: my-evolution/Locations.h:1173
+#, fuzzy
+msgid "Lander"
+msgstr "�إå�"
+
+#: my-evolution/Locations.h:1174
+#, fuzzy
+msgid "Langebaanweg"
+msgstr "����"
+
+#: my-evolution/Locations.h:1175
+msgid "Langley AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1176
+msgid "Lannion"
+msgstr ""
+
+#: 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 ""
+
+#: 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:1191
+msgid "Laughlin"
+msgstr ""
+
+#: my-evolution/Locations.h:1192
+#, fuzzy
+msgid "Laurel"
+msgstr "�ݥ��٥�"
+
+#: my-evolution/Locations.h:1193
+msgid "La Verne"
+msgstr ""
+
+#: my-evolution/Locations.h:1194
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1195
+#, fuzzy
+msgid "Lawton"
+msgstr "�饪��"
+
+#: my-evolution/Locations.h:1196
+msgid "Leadville"
+msgstr ""
+
+#: my-evolution/Locations.h:1197
+#, fuzzy
+msgid "Learmouth"
+msgstr "�쥽��"
+
+#: my-evolution/Locations.h:1199
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1201
+msgid "Leesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1202
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1205
+msgid "Leknes"
+msgstr ""
+
+#: my-evolution/Locations.h:1206
+#, fuzzy
+msgid "Le Mans"
+msgstr "�ޥ͡�����"
+
+#: my-evolution/Locations.h:1207
+#, fuzzy
+msgid "Le Marine"
+msgstr "�ޡ�����"
+
+#: my-evolution/Locations.h:1208
+msgid "Lemmon"
+msgstr ""
+
+#: my-evolution/Locations.h:1209
+#, fuzzy
+msgid "Lemoore"
+msgstr "���"
+
+#: my-evolution/Locations.h:1210
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1212
+#, fuzzy
+msgid "Leuchars"
+msgstr "ǯ"
+
+#: my-evolution/Locations.h:1213
+msgid "Lewisburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1214
+#, fuzzy
+msgid "Lewiston"
+msgstr "�쥽��"
+
+#: my-evolution/Locations.h:1215
+#, fuzzy
+msgid "Lewistown"
+msgstr "�쥽��"
+
+#: my-evolution/Locations.h:1216
+msgid "Lexington"
+msgstr ""
+
+#: my-evolution/Locations.h:1217
+#, fuzzy
+msgid "Liberal"
+msgstr "��٥ꥢ"
+
+#: my-evolution/Locations.h:1219
+#, fuzzy
+msgid "Libya"
+msgstr "��٥ꥢ"
+
+#: my-evolution/Locations.h:1220
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1221
+msgid "Lidgerwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1222
+#, fuzzy
+msgid "Liege"
+msgstr "�˥�������"
+
+#: my-evolution/Locations.h:1223
+#, fuzzy
+msgid "Lihue"
+msgstr "�˥���"
+
+#: my-evolution/Locations.h:1224
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1225
+msgid "Lima-Callao"
+msgstr ""
+
+#: my-evolution/Locations.h:1226
+#, fuzzy
+msgid "Limnos"
+msgstr "�饪��"
+
+#: my-evolution/Locations.h:1227
+#, fuzzy
+msgid "Limoges"
+msgstr "�Ǥ��㤤"
+
+#: my-evolution/Locations.h:1228
+#, fuzzy
+msgid "Limon"
+msgstr "��"
+
+#: my-evolution/Locations.h:1229
+#, fuzzy
+msgid "Lincoln"
+msgstr "����"
+
+#: my-evolution/Locations.h:1230
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1231
+#, fuzzy
+msgid "Lisboa"
+msgstr "��٥ꥢ"
+
+#: my-evolution/Locations.h:1232
+#, fuzzy
+msgid "Lista"
+msgstr "̸"
+
+#: my-evolution/Locations.h:1233
+#, fuzzy
+msgid "Litchfield"
+msgstr "�夤�����"
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1240
+msgid "Ljubljana"
+msgstr ""
+
+#: my-evolution/Locations.h:1241
+#, fuzzy
+msgid "Logan"
+msgstr "NT ��������"
+
+#: my-evolution/Locations.h:1242
+msgid "Lolland Falster"
+msgstr ""
+
+#: my-evolution/Locations.h:1243
+#, fuzzy
+msgid "Lompoc"
+msgstr "���"
+
+#: my-evolution/Locations.h:1244
+msgid "London"
+msgstr ""
+
+#: my-evolution/Locations.h:1245
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1249
+#, fuzzy
+msgid "Londrina"
+msgstr "�ۥ󥸥�饹"
+
+#: my-evolution/Locations.h:1250
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1253
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+#: my-evolution/Locations.h:1254
+#, fuzzy
+msgid "Los Alamos"
+msgstr "���顼��"
+
+#: my-evolution/Locations.h:1255
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1260
+#, fuzzy
+msgid "Lousiana"
+msgstr "�ܥĥ��"
+
+#: my-evolution/Locations.h:1261
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1265
+#, fuzzy
+msgid "Lugano"
+msgstr "�饪��"
+
+#: my-evolution/Locations.h:1266
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1267
+#, fuzzy
+msgid "Luton"
+msgstr "����"
+
+#: my-evolution/Locations.h:1269
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1270
+#, fuzzy
+msgid "Luxor"
+msgstr "�㤤"
+
+#: my-evolution/Locations.h:1271
+#, fuzzy
+msgid "Lviv"
+msgstr "��ȥӥ�"
+
+#: my-evolution/Locations.h:1272
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1275
+msgid "Lyon-Satolas"
+msgstr ""
+
+#: my-evolution/Locations.h:1276
+#, fuzzy
+msgid "Maastricht"
+msgstr "3 ��"
+
+#: my-evolution/Locations.h:1277
+#, fuzzy
+msgid "Macae"
+msgstr "�ޥ���"
+
+#: my-evolution/Locations.h:1278
+#, fuzzy
+msgid "Macapa"
+msgstr "�ޥ���"
+
+#: my-evolution/Locations.h:1279
+#, fuzzy
+msgid "Maceio"
+msgstr "�ޥ��ɥ˥�"
+
+#: my-evolution/Locations.h:1280
+#, fuzzy
+msgid "Macon"
+msgstr "�ޥ͡�����"
+
+#: my-evolution/Locations.h:1281
+#, fuzzy
+msgid "Madinah"
+msgstr "�ޥ��ɥ˥�"
+
+#: my-evolution/Locations.h:1282
+#, fuzzy
+msgid "Madison"
+msgstr "�饸��"
+
+#: my-evolution/Locations.h:1283
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1285
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+#: my-evolution/Locations.h:1286
+#, fuzzy
+msgid "Magadan"
+msgstr "���ʥ�"
+
+#: my-evolution/Locations.h:1287
+msgid "Magdalena"
+msgstr ""
+
+#: my-evolution/Locations.h:1288
+#, fuzzy
+msgid "Maine"
+msgstr "�ޥ͡�����"
+
+#: my-evolution/Locations.h:1289
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1290
+msgid "Makkah"
+msgstr ""
+
+#: my-evolution/Locations.h:1291
+#, fuzzy
+msgid "Makung"
+msgstr "�ޥ͡�����"
+
+#: my-evolution/Locations.h:1292
+#, fuzzy
+msgid "Malad City"
+msgstr "�ޥ饦��"
+
+#: my-evolution/Locations.h:1293
+#, fuzzy
+msgid "Malaga"
+msgstr "�ޥ륿"
+
+#: my-evolution/Locations.h:1294
+#, fuzzy
+msgid "Malatya"
+msgstr "�ޥ륿"
+
+#: my-evolution/Locations.h:1295
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1296
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1298
+msgid "Mammoth Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1299
+#, fuzzy
+msgid "Managua"
+msgstr "�ޥ͡�����"
+
+#: my-evolution/Locations.h:1300
+#, fuzzy
+msgid "Manassas"
+msgstr "�ޥ졼����"
+
+#: my-evolution/Locations.h:1301
+#, fuzzy
+msgid "Manaus"
+msgstr "�ޥ���"
+
+#: my-evolution/Locations.h:1302
+#, fuzzy
+msgid "Manchester"
+msgstr "����:"
+
+#: my-evolution/Locations.h:1303
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+msgid "Manhattan"
+msgstr ""
+
+#: my-evolution/Locations.h:1305
+#, fuzzy
+msgid "Manisa"
+msgstr "�ޥ͡�����"
+
+#: my-evolution/Locations.h:1306
+#, fuzzy
+msgid "Manistee"
+msgstr "̸"
+
+#: my-evolution/Locations.h:1307
+#, fuzzy
+msgid "Manitoba"
+msgstr "�ᥤ��ġ���С�"
+
+#: my-evolution/Locations.h:1308
+msgid "Manitowoc"
+msgstr ""
+
+#: my-evolution/Locations.h:1309
+#, fuzzy
+msgid "Mankato"
+msgstr "��ʥ�"
+
+#: my-evolution/Locations.h:1310
+#, fuzzy
+msgid "Mansfield"
+msgstr "�᡼��"
+
+#: my-evolution/Locations.h:1311
+#, fuzzy
+msgid "Manta"
+msgstr "�ޥ륿"
+
+#: my-evolution/Locations.h:1312
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1313
+msgid "Maraba"
+msgstr ""
+
+#: my-evolution/Locations.h:1314
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1315
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1316
+#, fuzzy
+msgid "Marathon"
+msgstr "3 ��"
+
+#: my-evolution/Locations.h:1317
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1318
+#, fuzzy
+msgid "Margarita"
+msgstr "�ޡ�����"
+
+#: my-evolution/Locations.h:1319
+#, fuzzy
+msgid "Marianna"
+msgstr "�ޡ�����"
+
+#: my-evolution/Locations.h:1320
+#, fuzzy
+msgid "Marib"
+msgstr "�ޥ�"
+
+#: my-evolution/Locations.h:1321
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1322
+#, fuzzy
+msgid "Marietta"
+msgstr "�ޥ륿"
+
+#: my-evolution/Locations.h:1323
+msgid "Marino di Ravenna"
+msgstr ""
+
+#: my-evolution/Locations.h:1324
+#, fuzzy
+msgid "Marion"
+msgstr "�ޡ�����"
+
+#: my-evolution/Locations.h:1325
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1326
+msgid "Marquette"
+msgstr ""
+
+#: my-evolution/Locations.h:1327
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+msgid "Marseilles"
+msgstr ""
+
+#: my-evolution/Locations.h:1329
+#, fuzzy
+msgid "Marshall"
+msgstr "3 ��"
+
+#: my-evolution/Locations.h:1330
+msgid "Marshalltown"
+msgstr ""
+
+#: my-evolution/Locations.h:1331
+msgid "Marshfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1332
+#, fuzzy
+msgid "Marte"
+msgstr "����"
+
+#: my-evolution/Locations.h:1333
+#, fuzzy
+msgid "Marthas Vineyard"
+msgstr "̤�ɤȤ��ƥޡ���(_N)"
+
+#: my-evolution/Locations.h:1334
+#, fuzzy
+msgid "Martinsburg"
+msgstr "�ޡ�����"
+
+#: my-evolution/Locations.h:1335
+#, fuzzy
+msgid "Martinsville"
+msgstr "�ޡ�����"
+
+#: my-evolution/Locations.h:1336
+#, fuzzy
+msgid "Maryland"
+msgstr "����"
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1339
+msgid "Mashhad"
+msgstr ""
+
+#: my-evolution/Locations.h:1340
+#, fuzzy
+msgid "Masirah"
+msgstr "�ޥ졼����"
+
+#: my-evolution/Locations.h:1341
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1343
+#, fuzzy
+msgid "Massena"
+msgstr "�ޥ��ɥ˥�"
+
+#: my-evolution/Locations.h:1344
+#, fuzzy
+msgid "Matamoros"
+msgstr "���������"
+
+#: my-evolution/Locations.h:1345
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1347
+msgid "Matsuyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1348
+#, fuzzy
+msgid "Mattoon"
+msgstr "�ޥ͡�����"
+
+#: my-evolution/Locations.h:1349
+#, fuzzy
+msgid "Mayaguez"
+msgstr "�ޥ͡�����"
+
+#: my-evolution/Locations.h:1350
+#, fuzzy
+msgid "Mayport"
+msgstr "����ݡ���"
+
+#: my-evolution/Locations.h:1351
+#, fuzzy
+msgid "Mazatlan"
+msgstr "�����ե�����"
+
+#: my-evolution/Locations.h:1352
+#, fuzzy
+msgid "Mazu"
+msgstr "�ޥ���"
+
+#: my-evolution/Locations.h:1353
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1354
+msgid "McAllen"
+msgstr ""
+
+#: my-evolution/Locations.h:1355
+#, fuzzy
+msgid "McCall"
+msgstr "�ޥ�"
+
+#: my-evolution/Locations.h:1356
+#, fuzzy
+msgid "McCarthy"
+msgstr "3 ��"
+
+#: my-evolution/Locations.h:1357
+msgid "McClellan"
+msgstr ""
+
+#: my-evolution/Locations.h:1358
+#, fuzzy
+msgid "McComb"
+msgstr "���"
+
+#: my-evolution/Locations.h:1359
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1361
+msgid "Mc Gregor"
+msgstr ""
+
+#: my-evolution/Locations.h:1362
+#, fuzzy
+msgid "Meacham"
+msgstr "�ޥ���"
+
+#: my-evolution/Locations.h:1363
+#, fuzzy
+msgid "Medford"
+msgstr "��"
+
+#: my-evolution/Locations.h:1364
+msgid "Medicine Lodge"
+msgstr ""
+
+#: my-evolution/Locations.h:1365
+#, fuzzy
+msgid "Mehamn"
+msgstr "�ޥ͡�����"
+
+#: my-evolution/Locations.h:1366
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1367
+msgid "Melbourne"
+msgstr ""
+
+#: my-evolution/Locations.h:1368
+#, fuzzy
+msgid "Melfa"
+msgstr "�ޥ륿"
+
+#: my-evolution/Locations.h:1369
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1373
+#, fuzzy
+msgid "Mendoza"
+msgstr "�ޥ��ɥ˥�"
+
+#: my-evolution/Locations.h:1374
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1377
+#, fuzzy
+msgid "Merced"
+msgstr "�᡼�ȥ�ˡ(_E)"
+
+#: my-evolution/Locations.h:1378
+#, fuzzy
+msgid "Merida"
+msgstr "������"
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1380
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1381
+#, fuzzy
+msgid "Merril Field"
+msgstr "���пͥե������(_F)"
+
+#: my-evolution/Locations.h:1382
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1386
+#, fuzzy
+msgid "Mexicali"
+msgstr "�ᥭ����"
+
+#: my-evolution/Locations.h:1388
+#, fuzzy
+msgid "Miami"
+msgstr "�ޥ�"
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1391
+msgid "Michigan"
+msgstr ""
+
+#: my-evolution/Locations.h:1392
+#, fuzzy
+msgid "Middle East"
+msgstr "�ߥɥ�͡���(_M):"
+
+#: my-evolution/Locations.h:1393
+#, fuzzy
+msgid "Middleton Island"
+msgstr "���������"
+
+#: my-evolution/Locations.h:1394
+#, fuzzy
+msgid "Middletown"
+msgstr "�ߥɥ�͡���(_M):"
+
+#: my-evolution/Locations.h:1395
+#, fuzzy
+msgid "Midland"
+msgstr "�ե������"
+
+#: my-evolution/Locations.h:1396
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1398
+msgid "Milano/Malpensa"
+msgstr ""
+
+#: my-evolution/Locations.h:1399
+#, fuzzy
+msgid "Miles City"
+msgstr "�ե��������:"
+
+#: my-evolution/Locations.h:1400
+#, fuzzy
+msgid "Milford"
+msgstr "����"
+
+#: my-evolution/Locations.h:1401
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1402
+msgid "Millville"
+msgstr ""
+
+#: my-evolution/Locations.h:1403
+#, fuzzy
+msgid "Milton"
+msgstr "%s �إ᡼��"
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1407
+msgid "Minatitlan"
+msgstr ""
+
+#: my-evolution/Locations.h:1408
+#, fuzzy
+msgid "Minchumina"
+msgstr "����"
+
+#: my-evolution/Locations.h:1409
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1414
+#, fuzzy
+msgid "Minnesota"
+msgstr "�ߥ����ͥ���"
+
+#: my-evolution/Locations.h:1415
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1416
+#, fuzzy
+msgid "Minot"
+msgstr "�����Τ�ΤǤϤʤ�"
+
+#: my-evolution/Locations.h:1417
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1419
+msgid "Mississippi"
+msgstr ""
+
+#: my-evolution/Locations.h:1420
+#, fuzzy
+msgid "Missoula"
+msgstr "Miss"
+
+#: my-evolution/Locations.h:1421
+#, fuzzy
+msgid "Missouri"
+msgstr "Miss"
+
+#: my-evolution/Locations.h:1422
+#, fuzzy
+msgid "Mitchell"
+msgstr "����:"
+
+#: my-evolution/Locations.h:1423
+#, fuzzy
+msgid "Mitilini"
+msgstr "�᡼��󥰥ꥹ��"
+
+#: my-evolution/Locations.h:1424
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1425
+msgid "Miyazaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1426
+#, fuzzy
+msgid "Moa"
+msgstr "��"
+
+#: my-evolution/Locations.h:1427
+#, fuzzy
+msgid "Mobile Downtown"
+msgstr "��������"
+
+#: my-evolution/Locations.h:1428
+msgid "Mobile Regional Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1429
+#, fuzzy
+msgid "Mobridge"
+msgstr "�����"
+
+#: my-evolution/Locations.h:1430
+#, fuzzy
+msgid "Modesto"
+msgstr "�¤α�̸"
+
+#: my-evolution/Locations.h:1431
+msgid "Mo I Rana"
+msgstr ""
+
+#: my-evolution/Locations.h:1432
+#, fuzzy
+msgid "Mojave"
+msgstr "��ư"
+
+#: my-evolution/Locations.h:1433
+#, fuzzy
+msgid "Molde"
+msgstr "�����"
+
+#: my-evolution/Locations.h:1434
+#, fuzzy
+msgid "Moldova"
+msgstr "������"
+
+#: my-evolution/Locations.h:1435
+msgid "Moline-Quad Cities"
+msgstr ""
+
+#: my-evolution/Locations.h:1436
+#, fuzzy
+msgid "Molokai"
+msgstr "�ޥ饦��"
+
+#: my-evolution/Locations.h:1437
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1438
+msgid "Monchengladbach"
+msgstr ""
+
+#: my-evolution/Locations.h:1439
+#, fuzzy
+msgid "Monclova"
+msgstr "��ʥ�"
+
+#: my-evolution/Locations.h:1440
+#, fuzzy
+msgid "Moncton"
+msgstr "��ʥ�"
+
+#: my-evolution/Locations.h:1441
+#, fuzzy
+msgid "Monida"
+msgstr "������"
+
+#: my-evolution/Locations.h:1442
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+#: my-evolution/Locations.h:1443
+#, fuzzy
+msgid "Monroe"
+msgstr "��ʥ�"
+
+#: my-evolution/Locations.h:1444
+#, fuzzy
+msgid "Montague"
+msgstr "�ޥ͡�����"
+
+#: my-evolution/Locations.h:1445
+#, fuzzy
+msgid "Montana"
+msgstr "�ܥĥ��"
+
+#: my-evolution/Locations.h:1446
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1448
+#, fuzzy
+msgid "Monte Bisbino"
+msgstr "�¤���"
+
+#: my-evolution/Locations.h:1449
+msgid "Monte Calamita"
+msgstr ""
+
+#: my-evolution/Locations.h:1450
+#, fuzzy
+msgid "Monte Cimone"
+msgstr "��"
+
+#: my-evolution/Locations.h:1451
+#, fuzzy
+msgid "Montego Bay"
+msgstr "��󥴥�"
+
+#: my-evolution/Locations.h:1452
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1453
+#, fuzzy
+msgid "Monterey"
+msgstr "��"
+
+#: my-evolution/Locations.h:1454
+msgid "Monterrey"
+msgstr ""
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1458
+msgid "Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1459
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1460
+#, fuzzy
+msgid "Monticello"
+msgstr "��ʥ�"
+
+#: my-evolution/Locations.h:1461
+#, fuzzy
+msgid "Montpelier"
+msgstr "��"
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1465
+#, fuzzy
+msgid "Montrose"
+msgstr "�ե����"
+
+#: my-evolution/Locations.h:1466
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1467
+#, fuzzy
+msgid "Morelia"
+msgstr "��󥴥�"
+
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Morgantown"
+msgstr "���"
+
+#: my-evolution/Locations.h:1469
+#, fuzzy
+msgid "Moriarty"
+msgstr "�ץ饤�ޥ�"
+
+#: my-evolution/Locations.h:1471
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1474
+msgid "Moses Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1475
+#, fuzzy
+msgid "Mosinee"
+msgstr "�����"
+
+#: my-evolution/Locations.h:1476
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain Home"
+msgstr ""
+
+#: my-evolution/Locations.h:1479
+#, fuzzy
+msgid "Mountain View"
+msgstr "��"
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1482
+#, fuzzy
+msgid "Mount Shasta"
+msgstr "����"
+
+#: my-evolution/Locations.h:1483
+#, fuzzy
+msgid "Mount Vernon"
+msgstr "��"
+
+#: my-evolution/Locations.h:1484
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1487
+msgid "Muir"
+msgstr ""
+
+#: my-evolution/Locations.h:1488
+#, fuzzy
+msgid "Mullan"
+msgstr "�ޥ͡�����"
+
+#: my-evolution/Locations.h:1489
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1490
+msgid "Munchen"
+msgstr ""
+
+#: my-evolution/Locations.h:1491
+#, fuzzy
+msgid "Muncie"
+msgstr "6 ��"
+
+#: my-evolution/Locations.h:1492
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1493
+#, fuzzy
+msgid "Murcia"
+msgstr "�������ȥꥢ"
+
+#: my-evolution/Locations.h:1494
+msgid "Murmansk"
+msgstr ""
+
+#: my-evolution/Locations.h:1495
+#, fuzzy
+msgid "Mus"
+msgstr "�Ż�"
+
+#: my-evolution/Locations.h:1496
+msgid "Muscatine"
+msgstr ""
+
+#: my-evolution/Locations.h:1497
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1498
+msgid "Muskegon"
+msgstr ""
+
+#: my-evolution/Locations.h:1499
+#, fuzzy
+msgid "Mykonos"
+msgstr "knots"
+
+#: my-evolution/Locations.h:1500
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1507
+#, fuzzy
+msgid "Najran"
+msgstr "�С��졼��"
+
+#: my-evolution/Locations.h:1508
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1509
+msgid "Nalchik"
+msgstr ""
+
+#: my-evolution/Locations.h:1510
+#, fuzzy
+msgid "Namsos"
+msgstr "̾��"
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1513
+msgid "Nankishirahama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1514
+#, fuzzy
+msgid "Nanning"
+msgstr "�ٹ�"
+
+#: my-evolution/Locations.h:1515
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1516
+msgid "Nantucket"
+msgstr ""
+
+#: my-evolution/Locations.h:1517
+#, fuzzy
+msgid "Napa"
+msgstr "����"
+
+#: my-evolution/Locations.h:1518
+#, fuzzy
+msgid "Naples"
+msgstr "̾��"
+
+#: my-evolution/Locations.h:1519
+#, fuzzy
+msgid "Napoli"
+msgstr "�ޥ�"
+
+#: my-evolution/Locations.h:1520
+#, fuzzy
+msgid "Narvik"
+msgstr "�˥å��͡���"
+
+#: my-evolution/Locations.h:1521
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1524
+msgid "Nassau"
+msgstr ""
+
+#: my-evolution/Locations.h:1525
+#, fuzzy
+msgid "Natal"
+msgstr "�����ꥢ"
+
+#: my-evolution/Locations.h:1526
+#, fuzzy
+msgid "Natchez"
+msgstr "����:"
+
+#: my-evolution/Locations.h:1527
+msgid "Nawabshah"
+msgstr ""
+
+#: my-evolution/Locations.h:1528
+#, fuzzy
+msgid "Nebraska"
+msgstr "����������"
+
+#: my-evolution/Locations.h:1529
+msgid "Needles"
+msgstr ""
+
+#: my-evolution/Locations.h:1530
+#, fuzzy
+msgid "Nenana"
+msgstr "����ʥ�"
+
+#: my-evolution/Locations.h:1532
+msgid "Neuquen"
+msgstr ""
+
+#: my-evolution/Locations.h:1533
+#, fuzzy
+msgid "Nevada"
+msgstr "����ʥ�"
+
+#: my-evolution/Locations.h:1534
+#, fuzzy
+msgid "Newark"
+msgstr "����������"
+
+#: my-evolution/Locations.h:1535
+#, fuzzy
+msgid "New Bedford"
+msgstr "�˥塼���ե�����"
+
+#: my-evolution/Locations.h:1536
+#, fuzzy
+msgid "New Bern"
+msgstr "�˥塼��������"
+
+#: my-evolution/Locations.h:1537
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1539
+msgid "Newburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1540
+#, fuzzy
+msgid "Newcastle"
+msgstr "�˥塼��"
+
+#: my-evolution/Locations.h:1541
+#, fuzzy
+msgid "New Delhi/Palam"
+msgstr "�˥塼��������"
+
+#: my-evolution/Locations.h:1542
+#, fuzzy
+msgid "Newfoundland"
+msgstr "�˥塼��������"
+
+#: my-evolution/Locations.h:1543
+msgid "New Hampshire"
+msgstr ""
+
+#: my-evolution/Locations.h:1544
+#, fuzzy
+msgid "New Haven"
+msgstr "�˥塼����ɥ˥�"
+
+#: my-evolution/Locations.h:1545
+#, fuzzy
+msgid "New Iberia"
+msgstr "�˥塼����ɥ˥�"
+
+#: my-evolution/Locations.h:1546
+#, fuzzy
+msgid "New Jersey"
+msgstr "����"
+
+#: my-evolution/Locations.h:1547
+#, fuzzy
+msgid "New Mexico"
+msgstr "�ᥭ����"
+
+#: my-evolution/Locations.h:1548
+#, fuzzy
+msgid "New Orleans"
+msgstr "������"
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1550
+msgid "New Orleans NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1551
+#, fuzzy
+msgid "Newport"
+msgstr "��"
+
+#: my-evolution/Locations.h:1552
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1553
+msgid "New Port Richey"
+msgstr ""
+
+#: my-evolution/Locations.h:1554
+#, fuzzy
+msgid "New River"
+msgstr "�������ۥե����"
+
+#: my-evolution/Locations.h:1555
+msgid "New Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1556
+#, fuzzy
+msgid "Newton"
+msgstr "�˥塼��"
+
+#: my-evolution/Locations.h:1557
+#, fuzzy
+msgid "New York"
+msgstr "�������ۥե����"
+
+#: my-evolution/Locations.h:1558
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1559
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1561
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1564
+msgid "Niigata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1565
+#, fuzzy
+msgid "Nimes-Garons"
+msgstr "��ˡ:"
+
+#: my-evolution/Locations.h:1566
+#, fuzzy
+msgid "Nipawin"
+msgstr "���ڥ���"
+
+#: my-evolution/Locations.h:1567
+#, fuzzy
+msgid "Nis"
+msgstr "�����Τ�ΤȰ��פ���"
+
+#: my-evolution/Locations.h:1568
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1570
+msgid "N Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1571
+#, fuzzy
+msgid "Nogales"
+msgstr "����"
+
+#: my-evolution/Locations.h:1572
+#, fuzzy
+msgid "Nome"
+msgstr "̾��"
+
+#: my-evolution/Locations.h:1573
+#, fuzzy
+msgid "Norfolk"
+msgstr "����"
+
+#: my-evolution/Locations.h:1575
+msgid "Norfolk NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1576
+#, fuzzy
+msgid "Norrkoping"
+msgstr "�����"
+
+#: my-evolution/Locations.h:1577
+#, fuzzy
+msgid "North Adams"
+msgstr "����"
+
+#: my-evolution/Locations.h:1578
+#, fuzzy
+msgid "North Bend"
+msgstr "��"
+
+#: my-evolution/Locations.h:1579
+msgid "North Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:1580
+#, fuzzy
+msgid "North Conway"
+msgstr "�Υ륦����"
+
+#: my-evolution/Locations.h:1581
+#, fuzzy
+msgid "North Dakota"
+msgstr "����"
+
+#: my-evolution/Locations.h:1582
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1583
+msgid "North Kingstown"
+msgstr ""
+
+#: my-evolution/Locations.h:1584
+#, fuzzy
+msgid "North Platte"
+msgstr "����"
+
+#: my-evolution/Locations.h:1585
+#, fuzzy
+msgid "Northway"
+msgstr "�Υ륦����"
+
+#: my-evolution/Locations.h:1586
+#, fuzzy
+msgid "Northwest Territories"
+msgstr "����"
+
+#: my-evolution/Locations.h:1588
+#, fuzzy
+msgid "Norwich"
+msgstr "��"
+
+#: my-evolution/Locations.h:1589
+#, fuzzy
+msgid "Norwood"
+msgstr "�Υ륦����"
+
+#: my-evolution/Locations.h:1590
+#, fuzzy
+msgid "Notodden"
+msgstr "����"
+
+#: my-evolution/Locations.h:1591
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1595
+msgid "Nueva Ocotepeque"
+msgstr ""
+
+#: my-evolution/Locations.h:1596
+#, fuzzy
+msgid "Nuevo Laredo"
+msgstr "���Ϥ��Ƥ��ʤ�"
+
+#: my-evolution/Locations.h:1597
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+msgid "Oahu"
+msgstr ""
+
+#: my-evolution/Locations.h:1600
+msgid "Oak Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:1601
+#, fuzzy
+msgid "Oakland"
+msgstr "����"
+
+#: my-evolution/Locations.h:1602
+msgid "Oaxaca"
+msgstr ""
+
+#: my-evolution/Locations.h:1603
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+msgid "Obihiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1605
+#, fuzzy
+msgid "Ocala"
+msgstr "�ޥ륿"
+
+#: my-evolution/Locations.h:1606
+msgid "Oceanside"
+msgstr ""
+
+#: my-evolution/Locations.h:1607
+#, fuzzy
+msgid "Odense"
+msgstr "���֥���ȥ�"
+
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1609
+#, fuzzy
+msgid "Oelwen"
+msgstr "����"
+
+#: my-evolution/Locations.h:1610
+#, fuzzy
+msgid "Ogden"
+msgstr "����"
+
+#: my-evolution/Locations.h:1611
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1613
+msgid "Ohio"
+msgstr ""
+
+#: my-evolution/Locations.h:1614
+#, fuzzy
+msgid "Ohrid"
+msgstr "����¾"
+
+#: my-evolution/Locations.h:1615
+msgid "Oita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1616
+msgid "Ojika Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1617
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1624
+#, fuzzy
+msgid "Okushiri Island"
+msgstr "�ѥС�������"
+
+#: my-evolution/Locations.h:1625
+#, fuzzy
+msgid "Olathe"
+msgstr "����¾"
+
+#: my-evolution/Locations.h:1626
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1627
+#, fuzzy
+msgid "Olbia"
+msgstr "����Х˥�"
+
+#: my-evolution/Locations.h:1628
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1629
+#, fuzzy
+msgid "Omaha"
+msgstr "���ޡ���"
+
+#: my-evolution/Locations.h:1630
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1631
+#, fuzzy
+msgid "Omak"
+msgstr "���ޡ���"
+
+#: my-evolution/Locations.h:1633
+msgid "Ominato Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1634
+#, fuzzy
+msgid "Omsk"
+msgstr "OK"
+
+#: my-evolution/Locations.h:1635
+msgid "O'Neill"
+msgstr ""
+
+#: my-evolution/Locations.h:1636
+#, fuzzy
+msgid "Ontario"
+msgstr "����"
+
+#: my-evolution/Locations.h:1637
+#, fuzzy
+msgid "Oostende"
+msgstr "���ʼ�"
+
+#: my-evolution/Locations.h:1638
+#, fuzzy
+msgid "Oran"
+msgstr "���ޡ���"
+
+#: my-evolution/Locations.h:1639
+msgid "Oran/Es Senia"
+msgstr ""
+
+#: my-evolution/Locations.h:1640
+#, fuzzy
+msgid "Orange"
+msgstr "���"
+
+#: my-evolution/Locations.h:1641
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1642
+msgid "Ord-Sharp"
+msgstr ""
+
+#: my-evolution/Locations.h:1643
+#, fuzzy
+msgid "Oregon"
+msgstr "���"
+
+#: my-evolution/Locations.h:1644
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1645
+#, fuzzy
+msgid "Orland"
+msgstr "���꡼�����"
+
+#: my-evolution/Locations.h:1646
+#, fuzzy
+msgid "Orlando"
+msgstr "���꡼�����"
+
+#: my-evolution/Locations.h:1647
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1648
+msgid "Orsta-Volda"
+msgstr ""
+
+#: my-evolution/Locations.h:1649
+#, fuzzy
+msgid "Oruro"
+msgstr "���顼"
+
+#: my-evolution/Locations.h:1650
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1652
+#, fuzzy
+msgid "Oscoda"
+msgstr " ��"
+
+#: my-evolution/Locations.h:1653
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1657
+#, fuzzy
+msgid "Ostrava"
+msgstr "�������ȥ�ꥢ"
+
+#: my-evolution/Locations.h:1658
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1661
+#, fuzzy
+msgid "Owyhee"
+msgstr "��"
+
+#: my-evolution/Locations.h:1662
+#, fuzzy
+msgid "Oxford"
+msgstr "����"
+
+#: my-evolution/Locations.h:1663
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1670
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1671
+#, fuzzy
+msgid "Paganella"
+msgstr "�ڡ���"
+
+#: my-evolution/Locations.h:1674
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1675
+msgid "Palacios"
+msgstr ""
+
+#: my-evolution/Locations.h:1676
+#, fuzzy
+msgid "Palermo"
+msgstr "�ݥ��٥�"
+
+#: my-evolution/Locations.h:1677
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1678
+msgid "Palmdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1679
+#, fuzzy
+msgid "Palmer"
+msgstr "�ݥ��٥�"
+
+#: my-evolution/Locations.h:1680
+#, fuzzy
+msgid "Palm Springs"
+msgstr "�᡼������"
+
+#: my-evolution/Locations.h:1681
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1682
+#, fuzzy
+msgid "Pamplona"
+msgstr "���⥢����"
+
+#: my-evolution/Locations.h:1684
+#, fuzzy
+msgid "Panama City"
+msgstr "�ѥʥ�"
+
+#: my-evolution/Locations.h:1685
+#, fuzzy
+msgid "Pantelleria"
+msgstr "����󥻥뤷�ޤ���"
+
+#: my-evolution/Locations.h:1686
+#, fuzzy
+msgid "Papa"
+msgstr "����"
+
+#: my-evolution/Locations.h:1687
+#, fuzzy
+msgid "Paphos"
+msgstr "�饪��"
+
+#: my-evolution/Locations.h:1689
+#, fuzzy
+msgid "Paris"
+msgstr "�ץ饤�ޥ�"
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1692
+#, fuzzy
+msgid "Paris/Orly"
+msgstr "�������"
+
+#: my-evolution/Locations.h:1693
+msgid "Parkersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1694
+#, fuzzy
+msgid "Pasco"
+msgstr "�ѥ����"
+
+#: my-evolution/Locations.h:1695
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1700
+msgid "Passo Rolle"
+msgstr ""
+
+#: my-evolution/Locations.h:1701
+#, fuzzy
+msgid "Patna"
+msgstr "�ѥʥ�"
+
+#: my-evolution/Locations.h:1702
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1706
+#, fuzzy
+msgid "Paysandu"
+msgstr "������"
+
+#: my-evolution/Locations.h:1707
+#, fuzzy
+msgid "Payson"
+msgstr "���ڤ����:"
+
+#: my-evolution/Locations.h:1708
+#, fuzzy
+msgid "Pellston"
+msgstr "����"
+
+#: my-evolution/Locations.h:1709
+#, fuzzy
+msgid "Pelotas"
+msgstr "���ɹ���"
+
+#: my-evolution/Locations.h:1710
+#, fuzzy
+msgid "Pendleton"
+msgstr "���������:"
+
+#: my-evolution/Locations.h:1711
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1716
+#, fuzzy
+msgid "Peoria"
+msgstr "�ץ饤�ޥ�"
+
+#: my-evolution/Locations.h:1717
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1718
+msgid "Pereira/Matecana"
+msgstr ""
+
+#: my-evolution/Locations.h:1719
+#, fuzzy
+msgid "Perm"
+msgstr "�ץ饤�ޥ�"
+
+#: my-evolution/Locations.h:1720
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1721
+msgid "Perry-Foley"
+msgstr ""
+
+#: my-evolution/Locations.h:1722
+#, fuzzy
+msgid "Perth"
+msgstr "�ڥ롼"
+
+#: my-evolution/Locations.h:1724
+#, fuzzy
+msgid "Perugia"
+msgstr "�ڥ롼"
+
+#: my-evolution/Locations.h:1725
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1730
+msgid "Philip"
+msgstr ""
+
+#: my-evolution/Locations.h:1731
+msgid "Philipsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1732
+msgid "Phillips"
+msgstr ""
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1739
+msgid "Piedras Negras"
+msgstr ""
+
+#: my-evolution/Locations.h:1740
+#, fuzzy
+msgid "Pierre"
+msgstr "�ڥ롼"
+
+#: my-evolution/Locations.h:1741
+msgid "Pietersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1742
+#, fuzzy
+msgid "Pikeville"
+msgstr "�ץ�ӥ塼"
+
+#: my-evolution/Locations.h:1743
+msgid "Pine Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+msgid "Pirassununga"
+msgstr ""
+
+#: my-evolution/Locations.h:1747
+#, fuzzy
+msgid "Pisa"
+msgstr "�ѥ�������"
+
+#: my-evolution/Locations.h:1748
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1753
+#, fuzzy
+msgid "Plymouth"
+msgstr "��"
+
+#: my-evolution/Locations.h:1754
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+msgid "Pocos De Caldas"
+msgstr ""
+
+#: my-evolution/Locations.h:1756
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1757
+msgid "Podgorica Titograd"
+msgstr ""
+
+#: my-evolution/Locations.h:1758
+msgid "Pohang Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1759
+#, fuzzy
+msgid "Point Hope"
+msgstr "ɽ������"
+
+#: my-evolution/Locations.h:1760
+#, fuzzy
+msgid "Point Lay"
+msgstr "���ޥ�����"
+
+#: my-evolution/Locations.h:1761
+#, fuzzy
+msgid "Point Mugu"
+msgstr "�����������"
+
+#: my-evolution/Locations.h:1762
+msgid "Point Piedras Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1763
+#, fuzzy
+msgid "Poitiers"
+msgstr "�ץ��ѥƥ�"
+
+#: my-evolution/Locations.h:1765
+msgid "Pompano Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1766
+#, fuzzy
+msgid "Ponca City"
+msgstr "���åꥹ��"
+
+#: my-evolution/Locations.h:1767
+#, fuzzy
+msgid "Ponce"
+msgstr "�ʤ�"
+
+#: my-evolution/Locations.h:1768
+msgid "Ponta Pora"
+msgstr ""
+
+#: my-evolution/Locations.h:1769
+#, fuzzy
+msgid "Pontiac"
+msgstr "Ϣ����"
+
+#: my-evolution/Locations.h:1770
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1771
+msgid "Poplar Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1772
+#, fuzzy
+msgid "Poprad"
+msgstr "�ݡ�����"
+
+#: my-evolution/Locations.h:1773
+#, fuzzy
+msgid "Port Alexander"
+msgstr "���������"
+
+#: my-evolution/Locations.h:1774
+msgid "Port Alsworth"
+msgstr ""
+
+#: my-evolution/Locations.h:1775
+#, fuzzy
+msgid "Port Angeles"
+msgstr "ɽ������"
+
+#: my-evolution/Locations.h:1776
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1777
+msgid "Port Elizabeth"
+msgstr ""
+
+#: my-evolution/Locations.h:1778
+#, fuzzy
+msgid "Porterville"
+msgstr "�ץ�ӥ塼"
+
+#: my-evolution/Locations.h:1779
+#, fuzzy
+msgid "Port Hardy"
+msgstr "�����ɤΰ���"
+
+#: my-evolution/Locations.h:1780
+#, fuzzy
+msgid "Port Hedland"
+msgstr "�ݡ�����"
+
+#: my-evolution/Locations.h:1781
+msgid "Port Heiden"
+msgstr ""
+
+#: my-evolution/Locations.h:1782
+#, fuzzy
+msgid "Portland"
+msgstr "�ݡ�����"
+
+#: my-evolution/Locations.h:1783
+#, fuzzy
+msgid "Porto"
+msgstr "�ݡ����ֹ�(_P):"
+
+#: my-evolution/Locations.h:1784
+#, fuzzy
+msgid "Porto Alegre"
+msgstr "������"
+
+#: my-evolution/Locations.h:1785
+msgid "Porto Alegre Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:1786
+#, fuzzy
+msgid "Portoroz"
+msgstr "��Ĺ"
+
+#: my-evolution/Locations.h:1787
+#, fuzzy
+msgid "Porto Santo"
+msgstr "��Ĺ"
+
+#: my-evolution/Locations.h:1788
+msgid "Porto Velho"
+msgstr ""
+
+#: my-evolution/Locations.h:1789
+#, fuzzy
+msgid "Port Said"
+msgstr "��Ĺ"
+
+#: my-evolution/Locations.h:1790
+msgid "Portsmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1792
+#, fuzzy
+msgid "Posadas"
+msgstr "�ݡ�����"
+
+#: my-evolution/Locations.h:1793
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1796
+msgid "Poza Rica"
+msgstr ""
+
+#: my-evolution/Locations.h:1797
+#, fuzzy
+msgid "Poznan"
+msgstr "�ݡ�����"
+
+#: my-evolution/Locations.h:1798
+#, fuzzy
+msgid "Praha"
+msgstr "����Ȣ"
+
+#: my-evolution/Locations.h:1799
+#, fuzzy
+msgid "Pratica di Mare"
+msgstr "����̸��"
+
+#: my-evolution/Locations.h:1800
+msgid "Prescott"
+msgstr ""
+
+#: my-evolution/Locations.h:1801
+#, fuzzy
+msgid "Presidente Prudente"
+msgstr "�����ץ�ӥ塼"
+
+#: my-evolution/Locations.h:1802
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1804
+#, fuzzy
+msgid "Pretoria"
+msgstr "��Ĺ"
+
+#: my-evolution/Locations.h:1805
+#, fuzzy
+msgid "Preveza"
+msgstr "�ץ�ӥ塼"
+
+#: my-evolution/Locations.h:1806
+msgid "Price-Carbon"
+msgstr ""
+
+#: my-evolution/Locations.h:1807
+#, fuzzy
+msgid "Pristina"
+msgstr "����"
+
+#: my-evolution/Locations.h:1808
+#, fuzzy
+msgid "Providence"
+msgstr "�ץ�ӥ塼�ڥ���(_P)"
+
+#: my-evolution/Locations.h:1809
+#, fuzzy
+msgid "Provincetown"
+msgstr "�ץ�ӥ塼"
+
+#: my-evolution/Locations.h:1810
+#, fuzzy
+msgid "Provo"
+msgstr "��"
+
+#: my-evolution/Locations.h:1811
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1812
+msgid "Pucallpa"
+msgstr ""
+
+#: my-evolution/Locations.h:1813
+msgid "Pudahuel"
+msgstr ""
+
+#: my-evolution/Locations.h:1814
+#, fuzzy
+msgid "Puebla"
+msgstr "����"
+
+#: my-evolution/Locations.h:1815
+#, fuzzy
+msgid "Pueblo"
+msgstr "����"
+
+#: my-evolution/Locations.h:1816
+msgid "Puerto Barrios"
+msgstr ""
+
+#: my-evolution/Locations.h:1817
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1818
+msgid "Puerto Escondido"
+msgstr ""
+
+#: my-evolution/Locations.h:1819
+msgid "Puerto Lempira"
+msgstr ""
+
+#: my-evolution/Locations.h:1820
+#, fuzzy
+msgid "Puerto Limon"
+msgstr "����"
+
+#: my-evolution/Locations.h:1821
+msgid "Puerto Maldonado"
+msgstr ""
+
+#: my-evolution/Locations.h:1822
+msgid "Puerto Montt"
+msgstr ""
+
+#: my-evolution/Locations.h:1823
+msgid "Puerto Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1825
+#, fuzzy
+msgid "Puerto Suarez"
+msgstr "���ޥ�����"
+
+#: my-evolution/Locations.h:1826
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1827
+#, fuzzy
+msgid "Pula"
+msgstr "�ݡ�����"
+
+#: my-evolution/Locations.h:1828
+#, fuzzy
+msgid "Pullman"
+msgstr "�ݡ�����"
+
+#: my-evolution/Locations.h:1829
+msgid "Punta Arenas"
+msgstr ""
+
+#: my-evolution/Locations.h:1830
+#, fuzzy
+msgid "Punta Cana"
+msgstr "���������"
+
+#: my-evolution/Locations.h:1831
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1835
+msgid "Pyongyang"
+msgstr ""
+
+#: my-evolution/Locations.h:1837
+#, fuzzy
+msgid "Quantico"
+msgstr "����"
+
+#: my-evolution/Locations.h:1838
+#, fuzzy
+msgid "Quebec"
+msgstr "��̾"
+
+#: my-evolution/Locations.h:1839
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1842
+msgid "Quimper"
+msgstr ""
+
+#: my-evolution/Locations.h:1843
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1850
+#, fuzzy
+msgid "Rapid City"
+msgstr "�ֿ���"
+
+#: my-evolution/Locations.h:1851
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1852
+msgid "Ras Al Khaimah"
+msgstr ""
+
+#: my-evolution/Locations.h:1853
+#, fuzzy
+msgid "Rawlins"
+msgstr "��"
+
+#: my-evolution/Locations.h:1854
+#, fuzzy
+msgid "Reading"
+msgstr "����"
+
+#: my-evolution/Locations.h:1855
+msgid "Rebun Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1856
+#, fuzzy
+msgid "Recife"
+msgstr "������"
+
+#: my-evolution/Locations.h:1857
+msgid "Red Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1858
+#, fuzzy
+msgid "Redding"
+msgstr "����"
+
+#: my-evolution/Locations.h:1859
+#, fuzzy
+msgid "Redig"
+msgstr "�����Ѥ�"
+
+#: my-evolution/Locations.h:1860
+#, fuzzy
+msgid "Redmond"
+msgstr "��¥��"
+
+#: my-evolution/Locations.h:1861
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1863
+msgid "Reggio Calabria"
+msgstr ""
+
+#: my-evolution/Locations.h:1864
+#, fuzzy
+msgid "Regina"
+msgstr "�ϰ�"
+
+#: my-evolution/Locations.h:1865
+msgid "Reims-Champagne"
+msgstr ""
+
+#: my-evolution/Locations.h:1866
+#, fuzzy
+msgid "Rennes"
+msgstr "��¥��"
+
+#: my-evolution/Locations.h:1867
+#, fuzzy
+msgid "Reno"
+msgstr "���"
+
+#: my-evolution/Locations.h:1868
+#, fuzzy
+msgid "Renton"
+msgstr "�ϰ�"
 
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/Locations.h:1869
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1870
+#, fuzzy
+msgid "Reus"
+msgstr "�롼��"
+
+#: my-evolution/Locations.h:1871
+#, fuzzy
+msgid "Reyes"
+msgstr "ǯ"
+
+#: my-evolution/Locations.h:1872
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1873
+#, fuzzy
+msgid "Reynosa"
+msgstr "���ɹ���"
+
+#: my-evolution/Locations.h:1874
+#, fuzzy
+msgid "Rhinelander"
+msgstr "�ե������"
+
+#: my-evolution/Locations.h:1875
+#, fuzzy
+msgid "Rhode Island"
+msgstr "�¤κ�"
+
+#: my-evolution/Locations.h:1876
+#, fuzzy
+msgid "Riberalta"
+msgstr "��٥ꥢ"
+
+#: my-evolution/Locations.h:1877
+msgid "Richmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1878
+#, fuzzy
+msgid "Rickenbacker"
+msgstr "�˥å��͡���"
+
+#: my-evolution/Locations.h:1879
+#, fuzzy
+msgid "Rieti"
+msgstr "�ϥ���"
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rifle"
+msgstr "���"
+
+#: my-evolution/Locations.h:1881
+#, fuzzy
+msgid "Riga"
+msgstr "��:"
+
+#: my-evolution/Locations.h:1882
+#, fuzzy
+msgid "Rijeka"
+msgstr "�����Ѥ�"
+
+#: my-evolution/Locations.h:1883
+#, fuzzy
+msgid "Rimini"
+msgstr "�롼�ޥ˥�"
+
+#: my-evolution/Locations.h:1884
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1885
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1886
+msgid "Rio Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1887
+#, fuzzy
+msgid "Rioja"
+msgstr "�饸��"
+
+#: my-evolution/Locations.h:1888
+msgid "Rio / Jacarepagua"
+msgstr ""
+
+#: my-evolution/Locations.h:1889
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+#, fuzzy
+msgid "Rishiri Island"
+msgstr "�ѥС�������"
+
+#: my-evolution/Locations.h:1891
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+#, fuzzy
+msgid "Rivera"
+msgstr "��٥ꥢ"
+
+#: my-evolution/Locations.h:1893
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1894
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1895
+msgid "Riverton"
+msgstr ""
+
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "Pine"
+
+#: my-evolution/Locations.h:1897
+#, fuzzy
+msgid "Rivolto"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:1898
+#, fuzzy
+msgid "Riyadh"
+msgstr "�����Ѥ�"
+
+#: my-evolution/Locations.h:1899
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1900
+#, fuzzy
+msgid "Roatan"
+msgstr "�롼�ޥ˥�"
+
+#: my-evolution/Locations.h:1901
+#, fuzzy
+msgid "Robore"
+msgstr "��"
+
+#: my-evolution/Locations.h:1902
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1903
+msgid "Rockford"
+msgstr ""
+
+#: my-evolution/Locations.h:1904
+#, fuzzy
+msgid "Rockland"
+msgstr "�ݡ�����"
+
+#: my-evolution/Locations.h:1905
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1907
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1908
+#, fuzzy
+msgid "Rodos"
+msgstr "����"
+
+#: my-evolution/Locations.h:1909
+#, fuzzy
+msgid "Rogers"
+msgstr "�ե����"
+
+#: my-evolution/Locations.h:1910
+#, fuzzy
+msgid "Roma/Ciampino"
+msgstr "�롼�ޥ˥�"
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1917
+msgid "Roosevelt"
+msgstr ""
+
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Roros"
+msgstr "���������"
+
+#: my-evolution/Locations.h:1919
+msgid "Rorvik/Ryum"
+msgstr ""
+
+#: my-evolution/Locations.h:1920
+#, fuzzy
+msgid "Rosario"
+msgstr "�饸��"
+
+#: my-evolution/Locations.h:1921
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1922
+#, fuzzy
+msgid "Roseglen"
+msgstr "���"
+
+#: my-evolution/Locations.h:1923
+#, fuzzy
+msgid "Rost"
+msgstr "�ۥ���"
+
+#: my-evolution/Locations.h:1924
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1927
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1928
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1929
+#, fuzzy
+msgid "Rurrenabaque"
+msgstr "�����֤�"
+
+#: my-evolution/Locations.h:1930
+msgid "Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1931
+#, fuzzy
+msgid "Russia"
+msgstr "�������ȥꥢ"
+
+#: my-evolution/Locations.h:1932
+#, fuzzy
+msgid "Rutland"
+msgstr "�֡�����"
+
+#: my-evolution/Locations.h:1933
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1935
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1936
+msgid "Sabine Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:1937
+#, fuzzy
+msgid "Sacramento"
+msgstr "����"
+
+#: my-evolution/Locations.h:1938
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1939
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1940
+#, fuzzy
+msgid "Saginaw"
+msgstr "���ڥ���"
+
+#: my-evolution/Locations.h:1941
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1944
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1945
+#, fuzzy
+msgid "Saint Mary's"
+msgstr "�����ɤΰ���"
+
+#: my-evolution/Locations.h:1946
+msgid "Saint Mawgan"
+msgstr ""
+
+#: my-evolution/Locations.h:1947
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1948
+msgid "Saint Paul"
+msgstr ""
+
+#: my-evolution/Locations.h:1949
+#, fuzzy
+msgid "Saiq"
+msgstr "���ڥ���"
+
+#: my-evolution/Locations.h:1950
+#, fuzzy
+msgid "Salalah"
+msgstr "��������"
+
+#: my-evolution/Locations.h:1951
+#, fuzzy
+msgid "Salem"
+msgstr "��¸"
+
+#: my-evolution/Locations.h:1952
+#, fuzzy
+msgid "Salida"
+msgstr "���ޥꥢ"
+
+#: my-evolution/Locations.h:1953
+msgid "Salida-Harriet"
+msgstr ""
+
+#: my-evolution/Locations.h:1954
+#, fuzzy
+msgid "Salina"
+msgstr "���ޥꥢ"
+
+#: my-evolution/Locations.h:1955
+#, fuzzy
+msgid "Salinas"
+msgstr "���ޥꥢ"
+
+#: my-evolution/Locations.h:1956
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1957
+#, fuzzy
+msgid "Salmon"
+msgstr "���⥢����"
+
+#: my-evolution/Locations.h:1958
+msgid "Salmon (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1959
+#, fuzzy
+msgid "Salta"
+msgstr "�ޥ륿"
+
+#: my-evolution/Locations.h:1960
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1961
+msgid "Salt Lake City"
+msgstr ""
+
+#: my-evolution/Locations.h:1962
+#, fuzzy
+msgid "Salto"
+msgstr "��(_S)"
+
+#: my-evolution/Locations.h:1963
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+msgid "Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:1965
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1966
+#, fuzzy
+msgid "Samara"
+msgstr "���⥢����"
+
+#: my-evolution/Locations.h:1967
+#, fuzzy
+msgid "Samos"
+msgstr "���⥢����"
+
+#: my-evolution/Locations.h:1968
+#, fuzzy
+msgid "Samsun"
+msgstr "��(_N)"
+
+#: my-evolution/Locations.h:1969
+#, fuzzy
+msgid "Sana'A"
+msgstr "��"
+
+#: my-evolution/Locations.h:1970
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+msgid "San Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1975
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1976
+#, fuzzy
+msgid "San Carlos"
+msgstr "��¸�����Ĥ���"
+
+#: my-evolution/Locations.h:1977
+#, fuzzy
+msgid "Sandane"
+msgstr "��"
+
+#: my-evolution/Locations.h:1978
+#, fuzzy
+msgid "Sandberg"
+msgstr "������"
+
+#: my-evolution/Locations.h:1979
+#, fuzzy
+msgid "Sanderson"
+msgstr "������"
+
+#: my-evolution/Locations.h:1980
+msgid "San Diego"
+msgstr ""
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1986
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1987
+msgid "Sand Point"
+msgstr ""
+
+#: my-evolution/Locations.h:1988
+msgid "San Fernando De Apure"
+msgstr ""
+
+#: my-evolution/Locations.h:1989
+#, fuzzy
+msgid "Sanford"
+msgstr "��"
+
+#: my-evolution/Locations.h:1990
+msgid "San Francisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1991
+#, fuzzy
+msgid "Sangju"
+msgstr "�������ǥ���"
+
+#: my-evolution/Locations.h:1992
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1993
+msgid "San Joaquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1994
+#, fuzzy
+msgid "San Jose"
+msgstr "��¸�����Ĥ���"
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1997
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1998
+#, fuzzy
+msgid "San Juan"
+msgstr "��������"
+
+#: my-evolution/Locations.h:1999
+msgid "Sankt-Peterburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2000
+#, fuzzy
+msgid "Sanliurfa"
+msgstr "���ޥꥢ"
+
+#: my-evolution/Locations.h:2001
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2002
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2003
+msgid "San Miguel"
+msgstr ""
+
+#: my-evolution/Locations.h:2004
+msgid "San Nicholas Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2005
+msgid "San Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:2006
+msgid "San Sebastian"
+msgstr ""
+
+#: my-evolution/Locations.h:2007
+msgid "Santa Ana"
+msgstr ""
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+msgid "Santa Maria"
+msgstr ""
+
+#: my-evolution/Locations.h:2012
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2013
+msgid "Santa Monica"
+msgstr ""
+
+#: my-evolution/Locations.h:2014
+#, fuzzy
+msgid "Santander"
+msgstr "������"
+
+#: my-evolution/Locations.h:2015
+#, fuzzy
+msgid "Santarem"
+msgstr "����"
+
+#: my-evolution/Locations.h:2016
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2017
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+msgid "Santiago"
+msgstr ""
+
+#: my-evolution/Locations.h:2019
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2020
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2021
+#, fuzzy
+msgid "Santorini"
+msgstr "����"
+
+#: my-evolution/Locations.h:2022
+#, fuzzy
+msgid "Santos"
+msgstr "���ơ�����"
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+msgid "Sao Luiz"
+msgstr ""
+
+#: my-evolution/Locations.h:2025
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2028
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+#, fuzzy
+msgid "Sarasota"
+msgstr "���⥢����"
+
+#: my-evolution/Locations.h:2030
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+#, fuzzy
+msgid "Sarzana"
+msgstr "������"
+
+#: my-evolution/Locations.h:2032
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2033
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2038
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2039
+msgid "Sawyer AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2040
+#, fuzzy
+msgid "Sayun"
+msgstr "��(_N)"
+
+#: my-evolution/Locations.h:2041
+#, fuzzy
+msgid "Scatsta"
+msgstr "���ơ�����"
+
+#: my-evolution/Locations.h:2042
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2045
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2046
+msgid "Scottsdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Scranton"
+msgstr "���"
+
+#: my-evolution/Locations.h:2048
+msgid "Seattle"
+msgstr ""
+
+#: my-evolution/Locations.h:2049
+#, fuzzy
+msgid "Seattle-Boeing"
+msgstr "����"
+
+#: my-evolution/Locations.h:2050
+#, fuzzy
+msgid "Sedalia"
+msgstr "���ޥꥢ"
+
+#: my-evolution/Locations.h:2051
+#, fuzzy
+msgid "Seeb"
+msgstr "����"
+
+#: my-evolution/Locations.h:2052
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+#, fuzzy
+msgid "Sendai Airport"
+msgstr "����ݡ��ȳ���"
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2058
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2059
+msgid "Sevilla"
+msgstr ""
+
+#: my-evolution/Locations.h:2060
+#, fuzzy
+msgid "Seward"
+msgstr "����"
+
+#: my-evolution/Locations.h:2061
+msgid "Sexton Summit"
+msgstr ""
+
+#: my-evolution/Locations.h:2062
+#, fuzzy
+msgid "Shanghai"
+msgstr "�������ǥ���"
+
+#: my-evolution/Locations.h:2063
+msgid "Shannon"
+msgstr ""
+
+#: my-evolution/Locations.h:2064
+#, fuzzy
+msgid "Sharjah"
+msgstr "����"
+
+#: my-evolution/Locations.h:2065
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+#: my-evolution/Locations.h:2066
+#, fuzzy
+msgid "Sharurah"
+msgstr "������"
+
+#: my-evolution/Locations.h:2067
+#, fuzzy
+msgid "Shawbury"
+msgstr "������"
+
+#: my-evolution/Locations.h:2068
+#, fuzzy
+msgid "Shearwater"
+msgstr "������"
+
+#: my-evolution/Locations.h:2069
+msgid "Sheboygan"
+msgstr ""
+
+#: my-evolution/Locations.h:2070
+#, fuzzy
+msgid "Sheldon"
+msgstr "���������ǥ�"
+
+#: my-evolution/Locations.h:2071
+msgid "Shelter Cove"
+msgstr ""
+
+#: my-evolution/Locations.h:2072
+#, fuzzy
+msgid "Shelton"
+msgstr "���������:"
+
+#: my-evolution/Locations.h:2073
+msgid "Shenandoah"
+msgstr ""
+
+#: my-evolution/Locations.h:2074
+#, fuzzy
+msgid "Sheridan"
+msgstr "��������"
+
+#: my-evolution/Locations.h:2075
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2076
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2077
+msgid "Shingle Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2078
+#, fuzzy
+msgid "Shiraz"
+msgstr "������"
+
+#: my-evolution/Locations.h:2079
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2080
+msgid "Shizuhama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2081
+#, fuzzy
+msgid "Shoreham"
+msgstr "��Ͽ"
+
+#: my-evolution/Locations.h:2082
+#, fuzzy
+msgid "Show Low"
+msgstr "������"
+
+#: my-evolution/Locations.h:2083
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2084
+msgid "Shreveport Regional"
+msgstr ""
+
+#: my-evolution/Locations.h:2085
+#, fuzzy
+msgid "Sidney"
+msgstr "Pine"
+
+#: my-evolution/Locations.h:2086
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2087
+msgid "Siloam Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2088
+#, fuzzy
+msgid "Silver City"
+msgstr "�������ƥ�"
+
+#: my-evolution/Locations.h:2089
+#, fuzzy
+msgid "Sindal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2091
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2097
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2098
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+#: my-evolution/Locations.h:2099
+#, fuzzy
+msgid "Skive"
+msgstr "������"
+
+#: my-evolution/Locations.h:2100
+#, fuzzy
+msgid "Skopje"
+msgstr "���"
+
+#: my-evolution/Locations.h:2101
+#, fuzzy
+msgid "Skwentna"
+msgstr "������"
+
+#: my-evolution/Locations.h:2102
+#, fuzzy
+msgid "Slana"
+msgstr "����Х˥�"
+
+#: my-evolution/Locations.h:2105
+#, fuzzy
+msgid "Smithers"
+msgstr "ʬ"
+
+#: my-evolution/Locations.h:2106
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2107
+#, fuzzy
+msgid "Snowshoe Lake"
+msgstr "�ˤ狼��"
+
+#: my-evolution/Locations.h:2108
+#, fuzzy
+msgid "Sochi"
+msgstr "��"
+
+#: my-evolution/Locations.h:2109
+#, fuzzy
+msgid "Socorro"
+msgstr "��Ͽ"
+
+#: my-evolution/Locations.h:2110
+#, fuzzy
+msgid "Socotra"
+msgstr "��Ͽ"
+
+#: my-evolution/Locations.h:2111
+#, fuzzy
+msgid "Soda Springs"
+msgstr "�����"
+
+#: my-evolution/Locations.h:2112
+#, fuzzy
+msgid "Sofia"
+msgstr "���ޥꥢ"
+
+#: my-evolution/Locations.h:2113
+#, fuzzy
+msgid "Sogndal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2114
+msgid "Soldotna"
+msgstr ""
+
+#: my-evolution/Locations.h:2115
+#, fuzzy
+msgid "Somerset"
+msgstr "�ˤ狼��"
+
+#: my-evolution/Locations.h:2116
+#, fuzzy
+msgid "Sonderborg"
+msgstr "������"
+
+#: my-evolution/Locations.h:2117
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2120
+#, fuzzy
+msgid "Southampton"
+msgstr "����"
+
+#: my-evolution/Locations.h:2121
+#, fuzzy
+msgid "South Bend"
+msgstr "��"
+
+#: my-evolution/Locations.h:2122
+#, fuzzy
+msgid "South Carolina"
+msgstr "��եꥫ"
+
+#: my-evolution/Locations.h:2123
+#, fuzzy
+msgid "South Dakota"
+msgstr "����"
+
+#: my-evolution/Locations.h:2124
+#, fuzzy
+msgid "Southend"
+msgstr "��"
+
+#: my-evolution/Locations.h:2125
+msgid "South Marsh Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2126
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2128
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2129
+#, fuzzy
+msgid "Spencer"
+msgstr "������"
+
+#: my-evolution/Locations.h:2130
+msgid "Spickard"
+msgstr ""
+
+#: my-evolution/Locations.h:2131
+#, fuzzy
+msgid "Split"
+msgstr "̸"
+
+#: my-evolution/Locations.h:2132
+#, fuzzy
+msgid "Spokane"
+msgstr "���ڥ���"
+
+#: my-evolution/Locations.h:2133
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2134
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "Springfield"
+msgstr "����"
+
+#: my-evolution/Locations.h:2136
+msgid "Stampede Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:2137
+#, fuzzy
+msgid "State College"
+msgstr "���:"
+
+#: my-evolution/Locations.h:2138
+#, fuzzy
+msgid "Stauning"
+msgstr "����"
+
+#: my-evolution/Locations.h:2139
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2140
+msgid "Stavanger/Sola"
+msgstr ""
+
+#: my-evolution/Locations.h:2141
+#, fuzzy
+msgid "Staverton"
+msgstr "����"
+
+#: my-evolution/Locations.h:2142
+#, fuzzy
+msgid "Stavropol"
+msgstr "���"
+
+#: my-evolution/Locations.h:2143
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2144
+msgid "Steamboat Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2145
+#, fuzzy
+msgid "Stephenville"
+msgstr "����������"
+
+#: my-evolution/Locations.h:2146
+#, fuzzy
+msgid "St. George"
+msgstr "����ȥإ����"
+
+#: my-evolution/Locations.h:2147
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2148
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2149
+msgid "St Johnsbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2150
+#, fuzzy
+msgid "St Joseph"
+msgstr "���"
+
+#: my-evolution/Locations.h:2151
+#, fuzzy
+msgid "St Louis"
+msgstr "�Ӥ߹��ߤ���ߤ��ޤ�"
+
+#: my-evolution/Locations.h:2152
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2157
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2158
+#, fuzzy
+msgid "Storm Lake"
+msgstr "������"
+
+#: my-evolution/Locations.h:2159
+#, fuzzy
+msgid "Stornoway"
+msgstr "�Υ륦����"
+
+#: my-evolution/Locations.h:2160
+#, fuzzy
+msgid "St Paul"
+msgstr "���ơ�����"
+
+#: my-evolution/Locations.h:2161
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2164
+msgid "Strevell"
+msgstr ""
+
+#: my-evolution/Locations.h:2165
+#, fuzzy
+msgid "St Simon's Island"
+msgstr "���������"
+
+#: my-evolution/Locations.h:2166
+msgid "Stumpy Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2167
+#, fuzzy
+msgid "Sturgeon Bay"
+msgstr "������"
+
+#: my-evolution/Locations.h:2168
+msgid "Stuttgart"
+msgstr ""
+
+#: my-evolution/Locations.h:2169
+#, fuzzy
+msgid "Sucre"
+msgstr "��Ͽ"
+
+#: my-evolution/Locations.h:2170
+msgid "Sumburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:2171
+#, fuzzy
+msgid "Sumter"
+msgstr "���ޥ�"
+
+#: my-evolution/Locations.h:2172
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2174
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2175
+msgid "Superior"
+msgstr ""
+
+#: my-evolution/Locations.h:2177
+#, fuzzy
+msgid "Sutton"
+msgstr "��(_N)"
+
+#: my-evolution/Locations.h:2178
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2179
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2188
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2189
+msgid "Szombathely"
+msgstr ""
+
+#: my-evolution/Locations.h:2190
+#, fuzzy
+msgid "Tabatinga"
+msgstr "����"
+
+#: my-evolution/Locations.h:2191
+msgid "Tabriz"
+msgstr ""
+
+#: my-evolution/Locations.h:2192
+#, fuzzy
+msgid "Tabuk"
+msgstr "������(_T)"
+
+#: my-evolution/Locations.h:2193
+msgid "Tachikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+#, fuzzy
+msgid "Tacna"
+msgstr "�ޥ���"
+
+#: my-evolution/Locations.h:2195
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2199
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+#, fuzzy
+msgid "Taejon"
+msgstr "����"
+
+#: my-evolution/Locations.h:2201
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2202
+msgid "Taichung"
+msgstr ""
+
+#: my-evolution/Locations.h:2203
+#, fuzzy
+msgid "Taif"
+msgstr " ����"
+
+#: my-evolution/Locations.h:2204
+#, fuzzy
+msgid "Tainan"
+msgstr " ����"
+
+#: my-evolution/Locations.h:2206
+#, fuzzy
+msgid "Taiyuan"
+msgstr " ����"
+
+#: my-evolution/Locations.h:2207
+#, fuzzy
+msgid "Taiz"
+msgstr " ����"
+
+#: my-evolution/Locations.h:2208
+#, fuzzy
+msgid "Tajima"
+msgstr " ����"
+
+#: my-evolution/Locations.h:2209
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Talara"
+msgstr ""
+
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Talinn"
+msgstr " ����"
+
+#: my-evolution/Locations.h:2212
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tallahassee"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2215
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2216
+#, fuzzy
+msgid "Tampa"
+msgstr "����"
+
+#: my-evolution/Locations.h:2217
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2218
+#, fuzzy
+msgid "Tampere"
+msgstr "�ѻ�"
+
+#: my-evolution/Locations.h:2219
+msgid "Tampico"
+msgstr ""
+
+#: my-evolution/Locations.h:2220
+#, fuzzy
+msgid "Tanana"
+msgstr "���ʥ�"
+
+#: my-evolution/Locations.h:2221
+msgid "Tanegashima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2222
+#, fuzzy
+msgid "Taos"
+msgstr "�饪��"
+
+#: my-evolution/Locations.h:2223
+#, fuzzy
+msgid "Taoyuan"
+msgstr " ����"
+
+#: my-evolution/Locations.h:2224
+msgid "Tapachula"
+msgstr ""
+
+#: my-evolution/Locations.h:2225
+#, fuzzy
+msgid "Taranto"
+msgstr " ����"
+
+#: my-evolution/Locations.h:2226
+#, fuzzy
+msgid "Tarbes"
+msgstr "������(_T)"
+
+#: my-evolution/Locations.h:2227
+#, fuzzy
+msgid "Tarija"
+msgstr " ����"
+
+#: my-evolution/Locations.h:2228
+msgid "Tarvisio"
+msgstr ""
+
+#: my-evolution/Locations.h:2229
+#, fuzzy
+msgid "Tatalina"
+msgstr "����"
+
+#: my-evolution/Locations.h:2230
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2235
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2236
+#, fuzzy
+msgid "Tela"
+msgstr "�ƥ�å���"
+
+#: my-evolution/Locations.h:2237
+#, fuzzy
+msgid "Temple"
+msgstr "�ƥ�å���"
+
+#: my-evolution/Locations.h:2238
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2244
+msgid "Texarkana"
+msgstr ""
+
+#: my-evolution/Locations.h:2245
+#, fuzzy
+msgid "Texas"
+msgstr "������(_T)"
+
+#: my-evolution/Locations.h:2246
+#, fuzzy
+msgid "The Dalles"
+msgstr "����������"
+
+#: my-evolution/Locations.h:2247
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2248
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2249
+msgid "Thiruvananthapuram"
+msgstr ""
+
+#: my-evolution/Locations.h:2250
+#, fuzzy
+msgid "Thisted"
+msgstr "�ɾ�(���Ĥ�)"
+
+#: my-evolution/Locations.h:2251
+msgid "Thompson Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2252
+#, fuzzy
+msgid "Thumrait"
+msgstr "������"
+
+#: my-evolution/Locations.h:2253
+#, fuzzy
+msgid "Tianjin"
+msgstr " ����"
+
+#: my-evolution/Locations.h:2254
+#, fuzzy
+msgid "Tijuana"
+msgstr " ����"
+
+#: my-evolution/Locations.h:2255
+msgid "Timisoara"
+msgstr ""
+
+#: my-evolution/Locations.h:2256
+msgid "Tin City"
+msgstr ""
+
+#: my-evolution/Locations.h:2257
+#, fuzzy
+msgid "Tirana"
+msgstr " ����"
+
+#: my-evolution/Locations.h:2258
+#, fuzzy
+msgid "Tiree"
+msgstr "����"
+
+#: my-evolution/Locations.h:2259
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2260
+msgid "Tiruchchirapalli"
+msgstr ""
+
+#: my-evolution/Locations.h:2261
+#, fuzzy
+msgid "Titusville"
+msgstr "�ɾ�(���Ĥ�)"
+
+#: my-evolution/Locations.h:2262
+#, fuzzy
+msgid "Tivat"
+msgstr "��Ū"
+
+#: my-evolution/Locations.h:2263
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2267
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+#, fuzzy
+msgid "Tokunoshima Island"
+msgstr "���������"
+
+#: my-evolution/Locations.h:2269
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2271
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2272
+msgid "Tokyo New International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2273
+#, fuzzy
+msgid "Toledo"
+msgstr "���ؤ�"
+
+#: my-evolution/Locations.h:2274
+msgid "Toluca"
+msgstr ""
+
+#: my-evolution/Locations.h:2275
+#, fuzzy
+msgid "Tonopah"
+msgstr "�ȥ�"
+
+#: my-evolution/Locations.h:2276
+#, fuzzy
+msgid "Topeka"
+msgstr "��:"
+
+#: my-evolution/Locations.h:2277
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2279
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2280
+msgid "Toronto"
+msgstr ""
+
+#: my-evolution/Locations.h:2281
+#, fuzzy
+msgid "Torp"
+msgstr "��:"
+
+#: my-evolution/Locations.h:2282
+#, fuzzy
+msgid "Torrance"
+msgstr "�ե��"
+
+#: my-evolution/Locations.h:2283
+#, fuzzy
+msgid "Torreon"
+msgstr "�ڹ��"
+
+#: my-evolution/Locations.h:2284
+#, fuzzy
+msgid "Tottori Airport"
+msgstr "����ݡ��ȳ���"
+
+#: my-evolution/Locations.h:2285
+#, fuzzy
+msgid "Toulouse"
+msgstr "�Ĥ���"
+
+#: my-evolution/Locations.h:2286
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2290
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2291
+msgid "Trabzon"
+msgstr ""
+
+#: my-evolution/Locations.h:2292
+#, fuzzy
+msgid "Trapani"
+msgstr "����"
+
+#: my-evolution/Locations.h:2293
+msgid "Traverse City"
+msgstr ""
+
+#: my-evolution/Locations.h:2294
+#, fuzzy
+msgid "Trelew"
+msgstr "�ƥ�å���"
+
+#: my-evolution/Locations.h:2295
+#, fuzzy
+msgid "Trenton"
+msgstr "����"
+
+#: my-evolution/Locations.h:2296
+#, fuzzy
+msgid "Trevico"
+msgstr "��"
+
+#: my-evolution/Locations.h:2297
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2298
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2299
+#, fuzzy
+msgid "Trieste"
+msgstr "�ƥ���"
+
+#: my-evolution/Locations.h:2300
+msgid "Trinidad"
+msgstr ""
+
+#: my-evolution/Locations.h:2301
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2304
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2305
+msgid "Troyes/Barberey"
+msgstr ""
+
+#: my-evolution/Locations.h:2306
+#, fuzzy
+msgid "Truckee"
+msgstr "�ȥ륳"
+
+#: my-evolution/Locations.h:2307
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2314
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2315
+msgid "Tulancingo"
+msgstr ""
+
+#: my-evolution/Locations.h:2316
+#, fuzzy
+msgid "Tulcea"
+msgstr "������"
+
+#: my-evolution/Locations.h:2317
+#, fuzzy
+msgid "Tulsa"
+msgstr "������"
+
+#: my-evolution/Locations.h:2318
+#, fuzzy
+msgid "Tupelo"
+msgstr "��(_U)"
+
+#: my-evolution/Locations.h:2319
+#, fuzzy
+msgid "Turaif"
+msgstr "�ȥ륳��"
+
+#: my-evolution/Locations.h:2320
+#, fuzzy
+msgid "Turin"
+msgstr "�ȥ륳��"
+
+#: my-evolution/Locations.h:2322
+#, fuzzy
+msgid "Turku"
+msgstr "�ȥ륳"
+
+#: my-evolution/Locations.h:2323
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2324
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+#: my-evolution/Locations.h:2325
+#, fuzzy
+msgid "Twenthe"
+msgstr "����"
+
+#: my-evolution/Locations.h:2326
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2327
+msgid "Twin Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2328
+#, fuzzy
+msgid "Tyler"
+msgstr "����"
+
+#: my-evolution/Locations.h:2329
+msgid "Tyndall AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2330
+#, fuzzy
+msgid "Tyumen"
+msgstr "��(_U)"
+
+#: my-evolution/Locations.h:2331
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2332
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2340
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2341
+#, fuzzy
+msgid "United Arab Emirates "
+msgstr "����ꥫ�罰��"
+
+#: my-evolution/Locations.h:2344
+#, fuzzy
+msgid "Unst"
+msgstr "̤��"
+
+#: my-evolution/Locations.h:2345
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2346
+#, fuzzy
+msgid "Uruapan"
+msgstr "����"
+
+#: my-evolution/Locations.h:2347
+#, fuzzy
+msgid "Uruguaiana"
+msgstr " ���륰����"
+
+#: my-evolution/Locations.h:2349
+msgid "Urumqi"
+msgstr ""
+
+#: my-evolution/Locations.h:2350
+#, fuzzy
+msgid "Utah"
+msgstr " "
+
+#: my-evolution/Locations.h:2351
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2353
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:2355
+#, fuzzy
+msgid "Vadso"
+msgstr "�饸��"
+
+#: my-evolution/Locations.h:2356
+#, fuzzy
+msgid "Vaerlose"
+msgstr "�ѿ�"
+
+#: my-evolution/Locations.h:2357
+#, fuzzy
+msgid "Vagar"
+msgstr "�ݥ��٥�"
+
+#: my-evolution/Locations.h:2358
+msgid "Valdez 2"
+msgstr ""
+
+#: my-evolution/Locations.h:2359
+#, fuzzy
+msgid "Valdosta"
+msgstr "�ޥ륿"
+
+#: my-evolution/Locations.h:2360
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2361
+#, fuzzy
+msgid "Valencia"
+msgstr "������"
+
+#: my-evolution/Locations.h:2362
+#, fuzzy
+msgid "Valentine"
+msgstr "����饤��ɽ��"
+
+#: my-evolution/Locations.h:2363
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2366
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2367
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2368
+#, fuzzy
+msgid "Van"
+msgstr "�ޥ͡�����"
+
+#: my-evolution/Locations.h:2369
+msgid "Vancouver"
+msgstr ""
+
+#: my-evolution/Locations.h:2370
+#, fuzzy
+msgid "Vandel"
+msgstr "����󥻥�"
+
+#: my-evolution/Locations.h:2371
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2373
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+#, fuzzy
+msgid "Varadero"
+msgstr "�Х�Хɥ�"
+
+#: my-evolution/Locations.h:2375
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2376
+#, fuzzy
+msgid "Varna"
+msgstr "�ѿ�"
+
+#: my-evolution/Locations.h:2377
+#, fuzzy
+msgid "Vasteras"
+msgstr "��"
+
+#: my-evolution/Locations.h:2378
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2379
+#, fuzzy
+msgid "Venezia"
+msgstr "�٥ͥ�����"
+
+#: my-evolution/Locations.h:2381
+#, fuzzy
+msgid "Venice"
+msgstr "Unicode"
+
+#: my-evolution/Locations.h:2382
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2383
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2384
+#, fuzzy
+msgid "Vermont"
+msgstr "��"
+
+#: my-evolution/Locations.h:2385
+#, fuzzy
+msgid "Vernal"
+msgstr "����"
+
+#: my-evolution/Locations.h:2386
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+#, fuzzy
+msgid "Vicenza"
+msgstr "�٥ͥ�����"
+
+#: my-evolution/Locations.h:2388
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2390
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2393
+msgid "Vigo"
+msgstr ""
+
+#: my-evolution/Locations.h:2394
+#, fuzzy
+msgid "Vilhena"
+msgstr "�ե�����̾:"
+
+#: my-evolution/Locations.h:2395
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+msgid "Villahermosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2398
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2404
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+#, fuzzy
+msgid "Visalia"
+msgstr "�������ȥ�ꥢ"
+
+#: my-evolution/Locations.h:2406
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2410
+msgid "Vladivostok"
+msgstr ""
+
+#: my-evolution/Locations.h:2411
+#, fuzzy
+msgid "Vlieland"
+msgstr "�ե������"
+
+#: my-evolution/Locations.h:2412
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2413
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2414
+#, fuzzy
+msgid "Volkel"
+msgstr "���"
+
+#: my-evolution/Locations.h:2415
+#, fuzzy
+msgid "Volk Field"
+msgstr "���пͥե������(_F)"
+
+#: my-evolution/Locations.h:2416
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2417
+msgid "Voslau"
+msgstr ""
+
+#: my-evolution/Locations.h:2418
+#, fuzzy
+msgid "Waco"
+msgstr "��ʥ�"
+
+#: my-evolution/Locations.h:2419
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2423
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2424
+#, fuzzy
+msgid "Wallops Island"
+msgstr "���������"
+
+#: my-evolution/Locations.h:2425
+msgid "Walnut Ridge"
+msgstr ""
+
+#: my-evolution/Locations.h:2426
+#, fuzzy
+msgid "Warner Robins"
+msgstr "�ٹ�"
+
+#: my-evolution/Locations.h:2427
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2429
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2430
+msgid "Washington/Dulles"
+msgstr ""
+
+#: my-evolution/Locations.h:2431
+#, fuzzy
+msgid "Waterbury"
+msgstr "��ŷ��"
+
+#: my-evolution/Locations.h:2432
+#, fuzzy
+msgid "Waterloo"
+msgstr "��ŷ��"
+
+#: my-evolution/Locations.h:2433
+#, fuzzy
+msgid "Watertown"
+msgstr "��ŷ��"
+
+#: my-evolution/Locations.h:2434
+#, fuzzy
+msgid "Waterville"
+msgstr "���ƥ���"
+
+#: my-evolution/Locations.h:2435
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+msgid "Wausau"
+msgstr ""
+
+#: my-evolution/Locations.h:2437
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2438
+msgid "Waynesboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2439
+#, fuzzy
+msgid "Webster City"
+msgstr "�����֥�����"
+
+#: my-evolution/Locations.h:2440
+#, fuzzy
+msgid "Wejh"
+msgstr "��"
+
+#: my-evolution/Locations.h:2441
+msgid "Wellington"
+msgstr ""
+
+#: my-evolution/Locations.h:2442
+#, fuzzy
+msgid "Wenatchee"
+msgstr "��ŷ��"
+
+#: my-evolution/Locations.h:2443
+#, fuzzy
+msgid "Wendover"
+msgstr "������"
+
+#: my-evolution/Locations.h:2444
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2445
+#, fuzzy
+msgid "West Burke"
+msgstr "����"
+
+#: my-evolution/Locations.h:2446
+#, fuzzy
+msgid "Westerland"
+msgstr "������"
+
+#: my-evolution/Locations.h:2447
+#, fuzzy
+msgid "Westfield"
+msgstr "��"
+
+#: my-evolution/Locations.h:2448
+msgid "Westhampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2449
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2451
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2452
+msgid "West Yellowstone (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2453
+#, fuzzy
+msgid "Wheeling"
+msgstr "�������塼��"
+
+#: my-evolution/Locations.h:2454
+msgid "Whidbey Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2455
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2461
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2462
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2463
+#, fuzzy
+msgid "Wick"
+msgstr "�˥å��͡���"
+
+#: my-evolution/Locations.h:2464
+#, fuzzy
+msgid "Wien"
+msgstr "��"
+
+#: my-evolution/Locations.h:2465
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2467
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2468
+msgid "Williamsport"
+msgstr ""
+
+#: my-evolution/Locations.h:2469
+#, fuzzy
+msgid "Williston"
+msgstr "̸"
+
+#: my-evolution/Locations.h:2470
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2472
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2473
+msgid "Winchester"
+msgstr ""
+
+#: my-evolution/Locations.h:2474
+#, fuzzy
+msgid "Windsor"
+msgstr "����"
+
+#: my-evolution/Locations.h:2475
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2478
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+#, fuzzy
+msgid "Winslow"
+msgstr "��"
+
+#: my-evolution/Locations.h:2480
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2481
+msgid "Winter Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:2482
+#, fuzzy
+msgid "Winter Park"
+msgstr "�ѥ���ɤ����Ϥ��Ƥ�������"
+
+#: my-evolution/Locations.h:2483
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+#, fuzzy
+msgid "Wisconsin"
+msgstr "�ߥ����ͥ���"
+
+#: my-evolution/Locations.h:2485
+msgid "Wisconsin Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:2486
+#, fuzzy
+msgid "Wise"
+msgstr "��"
+
+#: my-evolution/Locations.h:2487
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2488
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2489
+#, fuzzy
+msgid "Woong Cheon"
+msgstr "���"
+
+#: my-evolution/Locations.h:2490
+#, fuzzy
+msgid "Wooster"
+msgstr "�եå�:"
+
+#: my-evolution/Locations.h:2491
+#, fuzzy
+msgid "Worcester"
+msgstr "�ʱ�"
+
+#: my-evolution/Locations.h:2492
+#, fuzzy
+msgid "Worland"
+msgstr "�ݡ�����"
+
+#: my-evolution/Locations.h:2493
+#, fuzzy
+msgid "Worthington"
+msgstr "�����"
+
+#: my-evolution/Locations.h:2494
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2495
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2496
+msgid "Wuchia Observatory"
+msgstr ""
+
+#: my-evolution/Locations.h:2497
+#, fuzzy
+msgid "Wyoming"
+msgstr "�����"
+
+#: my-evolution/Locations.h:2498
+#, fuzzy
+msgid "Xiamen"
+msgstr "̾��"
+
+#: my-evolution/Locations.h:2499
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2505
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2506
+msgid "Yankton"
+msgstr ""
+
+#: my-evolution/Locations.h:2507
+#, fuzzy
+msgid "Yao Airport"
+msgstr "����ݡ��Ȥ��ޤ���"
+
+#: my-evolution/Locations.h:2508
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2510
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2511
+msgid "Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2513
+#, fuzzy
+msgid "Yenbo"
+msgstr "�������"
+
+#: my-evolution/Locations.h:2514
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2522
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2528
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2529
+msgid "Zacatecas"
+msgstr ""
+
+#: my-evolution/Locations.h:2530
+#, fuzzy
+msgid "Zadar"
+msgstr "������"
+
+#: my-evolution/Locations.h:2531
+#, fuzzy
+msgid "Zagreb"
+msgstr "�ڡ���"
+
+#: my-evolution/Locations.h:2532
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2533
+msgid "Zama Airfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2534
+#, fuzzy
+msgid "Zanesville"
+msgstr "����󥻥뤷�ޤ���"
+
+#: my-evolution/Locations.h:2535
+msgid "Zaragoza"
+msgstr ""
+
+#: my-evolution/Locations.h:2536
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2537
+msgid "Zuni Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:2538
+#, fuzzy
+msgid "Zurich"
+msgstr "�ȥ륳��"
+
+#: my-evolution/component-factory.c:51
+msgid "Folder containing the Evolution Summary"
+msgstr "Evolution���ޥ꡼��ޤ�ե����"
+
+#: 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:366
 msgid "No appointments"
 msgstr "���ݥ���ȤϤ���ޤ���"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:400
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%k%M %B%d��"
 
-#: my-evolution/e-summary-calendar.c:379
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr "%B%d��%l��%Mʬ"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-calendar.c:420
+#, fuzzy
+msgid "No description"
+msgstr "����"
+
+#: my-evolution/e-summary-mail.c:151
 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
+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:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com ����������"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "������"
 
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "�˥塼���ۿ����ɲ�"
 
-#: my-evolution/e-summary-preferences.c:953
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�ɲä������˥塼���ۿ��� URL ������"
 
-#: my-evolution/e-summary-preferences.c:957
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "̾��:"
 
-#: my-evolution/e-summary-preferences.c:1503
-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:300
 msgid "Error downloading RDF"
 msgstr "RDF �Υ������������˥��顼"
 
-#: my-evolution/e-summary-rdf.c:528
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr "�˥塼���ե�����"
 
-#: my-evolution/e-summary-tasks.c:248
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
+msgstr ""
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "�ɲ�(_A)"
+
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr "��� (_R)"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "�ˤ狼��"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "�������Ϥ���ޤ���"
 
-#: my-evolution/e-summary-tasks.c:287
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(�����ʤ�)"
 
@@ -10240,23 +23585,25 @@ 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 "�������ե�������ɤ߹�����˥��顼��ȯ�����ޤ���"
 
-#: my-evolution/e-summary-weather.c:559
+#: my-evolution/e-summary-weather.c:501
 msgid "Weather"
 msgstr "��ŷ��"
 
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr "�ϰ�"
-
 #: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%Yǯ%B%e�� %A"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:488
+#, fuzzy
+msgid "Please wait..."
+msgstr "���Ф餯���Ԥ���������"
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "���ޥ�����"
 
@@ -10264,44 +23611,10 @@ msgstr "���ޥ�����"
 msgid "Printing of Summary failed"
 msgstr "���ޥ�ΰ����˼��Ԥ��ޤ���"
 
-#: my-evolution/main.c:66
+#: my-evolution/main.c:65
 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
-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
-msgid "miles"
-msgstr "�ޥ���"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "�����᡼�ȥ�"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "����"
@@ -10700,11 +24013,6 @@ msgstr ""
 msgid "Freezing ice pellets"
 msgstr ""
 
-#. HAIL
-#: my-evolution/metar.c:217
-msgid "Hail"
-msgstr "�����"
-
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "���٤Ǥ����"
@@ -11464,151 +24772,124 @@ msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr "��� (_R)"
-
-#: my-evolution/my-evolution.glade.h:2
 #, fuzzy
 msgid "Add n_ews feed"
 msgstr "�����˥塼���ۿ����ɲ�(_E)"
 
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "���٤Ƥξ��(_L)"
-
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "���٤ƤΥե����(_F):"
-
-#: 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:2
 msgid "C_elsius"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 msgid "How many days should the calendar display at once?"
 msgstr "���٤˲���ʬ�Υ���������ɽ�����ޤ���?"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr "ɽ����������(_X):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr "�˥塼���ۿ�����"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr "���(_H)"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr "�콵��(_E)"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr "�����ֳ�(��)(_E)"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr "�����ֳ�(��)(_T)"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 msgid "S_how full path for folders"
 msgstr "�ե�����Υե�ѥ���ɽ��(_H)"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr "���٤ƤΥ�������ɽ��(_A)"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _today's tasks"
 msgstr "�����Υ�������ɽ��(_T)"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "������ "
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr "��ŷ��������"
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "ɽ������ե����(_D):"
-
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "ɽ��������(_D)"
-
-#: 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:17
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr "5����(_F)"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr "�᡼�� (_M)"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 msgid "_News Feeds"
 msgstr "�˥塼���ե�����(_N)"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr "����(_O)"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr "�������塼��(_S)"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr "��ŷ��(_W)"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "���̤ʥե����"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution ������"
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "�ܺ٤�ɽ��"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "���򥭥�󥻥�"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "����Ȣ"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "����Ȣ"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "��������ե����"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "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"
@@ -11616,15 +24897,15 @@ msgstr ""
 "���� Evolution �ο������С������Ϥ��ʤ��Υѡ����ʥ� Evolution\n"
 "�ǥ��쥯�ȥ������ղåե�����򥤥󥹥ȡ��뤹��ɬ�פ�����ޤ�"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "\"OK\" �ǥե�����򥤥󥹥ȡ���, �ޤ��� \"����󥻥�\" �ǽ�λ���ޤ�"
 
-#: 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:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11635,7 +24916,7 @@ msgstr ""
 "\n"
 "���顼: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11644,7 +24925,33 @@ msgstr ""
 "�ե������ `%s' �إ��ԡ����\n"
 "���顼��ȯ�����ޤ���"
 
-#: shell/e-setup.c:281
+#: 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:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11655,7 +24962,7 @@ msgstr ""
 "Evolution �桼���ե�����Υ��󥹥ȡ����\n"
 "���Ƥ��뤿��˰�ư���Ʋ�����"
 
-#: shell/e-setup.c:295
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11669,7 +24976,7 @@ msgstr ""
 "�������ɬ�פ�����ޤ�\n"
 "���Υǥ��쥯�ȥ�������ޤ���?"
 
-#: shell/e-setup.c:320
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11680,50 +24987,53 @@ msgstr ""
 "�ǥ��쥯�ȥ�ǤϤ���ޤ���Evolution �桼��\n"
 "�ե�����Υ��󥹥ȡ������Ƥ��뤿��˰�ư���Ʋ�����"
 
-#: shell/e-shell-about-box.c:40
-#, fuzzy
-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."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "�ե����������å�����ޤ���: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"�ե�������͡���Ǥ��ޤ���:\n"
+"%s"
+
+#: 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: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\" �򥳥ԡ�����ե��������ꤷ�ޤ�:"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "�ե�����Υ��ԡ�"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:373
 msgid "Move folder"
 msgstr "�ե�����ΰ�ư"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11732,18 +25042,18 @@ msgstr ""
 "�ե���������Ǥ��ޤ���:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" ����"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11752,22 +25062,22 @@ msgstr ""
 "�ե�������͡���Ǥ��ޤ���:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "�ե���� \"%s\" ���͡���"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "�ե�������͡���"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:148
+#: shell/e-shell-folder-commands.c:566
+#: 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:111
+#: shell/e-shell-folder-creation-dialog.c:125
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -11776,7 +25086,7 @@ msgstr ""
 "���ꤵ�줿�ե������������뤳�Ȥ�����ޤ���:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:267
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - �����ե�����κ���"
 
@@ -11788,11 +25098,11 @@ msgstr ""
 "���򤷤��ե�����μ��̤��׵ᤵ�줿���Τ����\n"
 "ͭ���ǤϤ���ޤ���"
 
-#: shell/e-shell-folder-selection-dialog.c:359
+#: shell/e-shell-folder-selection-dialog.c:376
 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:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr "(�����ȥ�ʤ�)"
 
@@ -11808,13 +25118,14 @@ 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:799
+#: 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 ""
 
@@ -11840,16 +25151,22 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "�����ƥ� %d �򥤥�ݡ�����"
 
-#: shell/e-shell-importer.c:397
+#: shell/e-shell-importer.c:409
 #, c-format
 msgid "File %s does not exist"
 msgstr "�ե���� %s ��¸�ߤ��ޤ���"
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: shell/e-shell-importer.c:420
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:424
+#: shell/e-shell-importer.c:435
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11858,11 +25175,11 @@ msgstr ""
 "�������Ȥ�����륤��ݡ��Ȥ�����ޤ���\n"
 "%s"
 
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:445
 msgid "Importing"
 msgstr "����ݡ�����"
 
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:453
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11871,17 +25188,17 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "%s �򳫻Ϥ��ޤ�"
 
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:466
 #, c-format
 msgid "Error starting %s"
 msgstr "%s �γ�����˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:485
 #, c-format
 msgid "Error loading %s"
 msgstr "%s �Υ�������˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:502
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11890,54 +25207,54 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "�����ƥ� 1 �򥤥�ݡ�����"
 
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:572
 msgid "Automatic"
 msgstr "��Ư"
 
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:623
 msgid "Filename:"
 msgstr "�ե�����̾:"
 
-#: shell/e-shell-importer.c:617
+#: shell/e-shell-importer.c:628
 msgid "Select a file"
 msgstr "�ե����������"
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:638
 msgid "File type:"
 msgstr "�ե��������:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:663
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:667
 msgid "Import a single file"
 msgstr "���󥰥�ե�����򥤥�ݡ��Ȥ��ޤ�"
 
-#: 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
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: 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
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: 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
 #, c-format
 msgid "From %s:"
 msgstr "%s ����:"
 
-#: shell/e-shell-importer.c:1014
+#: shell/e-shell-importer.c:1027
 msgid "Select folder"
 msgstr "�ե����������"
 
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1028
 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:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "����ݡ���"
 
@@ -11957,6 +25274,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "�˥塼��"
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr "���ꤵ�줿�ե�����Ϥ���ޤ���"
@@ -11974,94 +25297,93 @@ msgstr "���Υե�����ˤϥ�å������Ϥ���ޤ���"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy �Ϥ��ʤ��� $PATH �ˤϸ��Ĥ���ޤ���"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy �ϼ¹ԤǤ��ޤ���Ǥ���"
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution �ˤĤ���..."
 
-#: shell/e-shell-view-menu.c:409
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "�ե�����ذ�ư..."
 
-#: shell/e-shell-view-menu.c:410
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "���������ե���������򤷤ޤ�"
 
-#: shell/e-shell-view-menu.c:530
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "�������硼�ȥ��åȤ�������ޤ�"
 
-#: shell/e-shell-view-menu.c:531
+#: shell/e-shell-view-menu.c:566
 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 ""
-
-#: shell/e-shell-view-menu.c:570
-#, c-format
-msgid "Error executing %s."
-msgstr "%s ��¹���˥��顼"
-
-#: shell/e-shell-view-menu.c:672
+#: shell/e-shell-view-menu.c:732
 #, fuzzy
 msgid "_Work Online"
 msgstr "����饤����"
 
-#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "���ե饤����(_W)"
 
-#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "���ե饤����"
 
-#: 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-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 �ϸ��ߥ���饤��Ǥ������ե饤��ˤ���ˤϤ��Υܥ���򥯥��"
-"�����Ƥ�������"
+"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 �ϸ��ߥ��ե饤��Ǥ�������饤��ˤ���ˤϤ��Υܥ���򥯥��"
-"�����Ƥ�������"
+"Ximian Evolution "
+"�ϸ��ߥ��ե饤��Ǥ�������饤��ˤ���ˤϤ��Υܥ���򥯥�å����Ƥ�������"
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�����������֤Υ��åȥ��åפ�����ޤ��� -- %s"
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12069,19 +25391,23 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "�����ʰ����Ǥ�"
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "OAF ����Ͽ����ޤ���"
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "����ե����졼�����ǡ����١������ߤĤ���ޤ���"
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "����Ū�ʥ��顼"
 
@@ -12198,76 +25524,71 @@ msgstr "���(_M)"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "���硼�ȥ��åȥС����餳�Υ��硼�ȥ��åȤ������ޤ�"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "���硼�ȥ��åȤ���¸��˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "���硼�ȥ��å�"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"�ե����ž���Ǥ��ޤ���:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "����Ȣ"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(̾���ʤ�)"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "���顼�Ϥ���ޤ���"
 
-#: 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:491
 msgid "The specified folder type is not valid"
 msgstr "���ꤵ�줿�ե�������̤�ͭ���ǤϤ���ޤ���"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "I/O ���顼"
 
-#: 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:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "���ꤵ�줿�ե�����ϸ��դ���ޤ���Ǥ���"
 
-#: 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:505
 msgid "Operation not supported"
 msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: 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: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 ""
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "%s �Υե�������å���������뤳�Ȥ�����ޤ���: %s"
@@ -12278,106 +25599,114 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ��λ)"
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<�ե���������򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
+
+#: 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/evolution-shell-component.c:1045
 #, fuzzy
 msgid "CORBA error"
 msgstr "I/O ���顼"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 #, fuzzy
 msgid "Invalid argument"
 msgstr "�����ʰ����Ǥ�"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 #, fuzzy
 msgid "No owner"
 msgstr "����"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 #, fuzzy
 msgid "Not found"
 msgstr "�����ɤ����Ĥ���ޤ���"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 #, fuzzy
 msgid "Unsupported type"
 msgstr "���ݡ��Ȥ��줿���̤�����å�(_C)"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 #, fuzzy
 msgid "Internal error"
 msgstr "����¾�Υ��顼"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 #, fuzzy
 msgid "Exists"
 msgstr "��¸�ߤ���"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 #, fuzzy
 msgid "Invalid URI"
 msgstr "����"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 #, fuzzy
 msgid "Has subfolders"
 msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 #, fuzzy
 msgid "No space left"
 msgstr "���򤵤줿��å������Ϥ���ޤ���"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr ""
 
-#: 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/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "�ե��������:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -12445,8 +25774,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"
@@ -12499,295 +25828,275 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution �ϼ��Υǡ����򥤥�ݡ��ȤǤ��ޤ�:"
 
 #: shell/main.c:89
+msgid "Evolution"
+msgstr "Evolution"
+
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution �Ϥ������޽�λ��Ǥ�..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution ������˥��������Ǥ��ޤ���"
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution ������ν�������Ǥ��ޤ���: %s"
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "���ץ�å�����̤�̵���ˤ���"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "����ݡ��ȳ���"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "����ݡ��ȳ���"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr "���٤ƤΥ���ݡ��ͥ�ȤΥǥХå����Ϥ�ե����������"
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo ����ݡ��ͥ�ȥ����ƥ����������ޤ���"
 
+#: 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
-#, fuzzy
-msgid "Output File"
-msgstr "�ե�����򳫤�"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "�ե����������"
 
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "�ե�����򳫤�"
+
 #: tools/evolution-addressbook-import.c:80
 #, fuzzy
 msgid "No filename provided."
 msgstr "���ꤵ�줿�ե�����Ϥ���ޤ���"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "���ԡ�"
+#: 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:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "���򤵤줿��Τ򥳥ԡ����ޤ�"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "�ե�����إ��ԡ�(_C)..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "����Ϣ�����������ޤ�"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "����Ϣ��������"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "�ڼ��"
-
-#: 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:11
 msgid "Delete selected contacts"
 msgstr "���򤷤�Ϣ����������ޤ�"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "�����ꥹ��"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "�̤Υե���������򤵤줿��å��������ư���ޤ�"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Ž���դ�"
+#: 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:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "����åץܡ��ɤ�Ž���դ��ޤ�"
 
-#: 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:20
 msgid "Print selected contacts"
 msgstr "���򤷤�Ϣ�����������ޤ�"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "���򤷤�Ϣ����������ޤ�"
 
-#: 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:24
 msgid "Select all contacts"
 msgstr "���٤Ƥ�Ϣ���������"
 
-#: 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:25
 msgid "Send a mess to the selected contacts."
 msgstr "���򤷤�Ϣ����˥�å�����������"
 
-#: 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:27
 msgid "Send selected contacts to another person."
 msgstr "¾�οͤ�Ϣ���������"
 
-#: 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:29
 msgid "Stop Loading"
 msgstr "�Ӥ߹��ߤ���ߤ��ޤ�"
 
-#: 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 "���߻���"
+
+#: 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-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
 msgid "_Actions"
 msgstr "ư��(_A)"
 
-#: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr "���ɥ쥹Ģ�Υ�����(_A)..."
-
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr "Ϣ����(_C)"
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "Ϣ����ꥹ��(_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 "Ϣ�����ž��(_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:102
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "����(_P)..."
-
 #: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "�ե�����ذ�ư(_M)..."
+
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "VCard ����¸(_S)"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "Ϣ����θ���(_S)"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "���٤�����(_A)"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "��������������ѹ����ޤ�"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "Ϣ����إ�å�����������(_M)..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "�����������٥�Ȥ����(_E)"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a New _Task"
-msgstr "�������������(_T)"
-
-#: 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-calendar.xml.h:11
 msgid "Day"
 msgstr "��"
 
-#: 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:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "��ư"
 
-#: 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:8
 msgid "Go forward"
 msgstr "��˰�ư"
 
-#: 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:11
 msgid "Go to a specific date"
 msgstr "�������˰�ư���ޤ�"
 
-#: 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:13
 msgid "Month"
 msgstr "��"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "�������ݥ����"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr "����������"
-
-#: 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: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: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:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "1����ɽ�����ޤ�"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "1�����ɽ�����ޤ�"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "1���֤�ɽ�����ޤ�"
 
-#: 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:23
 msgid "Week"
 msgstr "��"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "���ݥ����(_A)..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "����������(_C)..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "����/¿˻ ����θ���(_P)"
-
-#: 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
@@ -12817,18 +26126,18 @@ msgstr "��������륢���ƥ�Υץ�ӥ塼"
 msgid "Print this item"
 msgstr "���Υ����ƥ�����"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "����..."
-
-#: 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 "��¸"
 
+#: 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-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 "��¸�����Ĥ���"
 
@@ -12844,8 +26153,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:40
 msgid "_File"
 msgstr "�ե�����(_F)"
 
@@ -12854,7 +26163,7 @@ msgid "Print En_velope..."
 msgstr "ɽ������(_V)..."
 
 #: 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)..."
@@ -12863,10 +26172,14 @@ msgstr "��̾����¸(_A)..."
 msgid "Save the contact and close the dialog box"
 msgstr "Ϣ�������¸���Ƥ��Υ����������ܥå������Ĥ��ޤ�"
 
+#: 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
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Save"
 msgstr "��¸(_S)"
 
@@ -12926,6 +26239,10 @@ 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 "���ߤΥ᡼�����򥭥�󥻥뤷�ޤ�"
@@ -12935,82 +26252,54 @@ msgid "Compose _New Message"
 msgstr "������å������κ���"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "�᡼�륢������Ȥ�¾����������/�Խ����ޤ�"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "�����᡼���ե��륿����롼��κ���/�Խ��򤷤ޤ�"
 
-#: 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:6
 msgid "Empty _Trash"
 msgstr "����Ȣ����ˤ���(_T)"
 
-#: 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:8
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "���������ѥ���ɤ�˺�줿���˺Ƥ�ɽ�����ޤ�"
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "����"
-
-#: 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:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "���٤ƤΥե�����������ޡ������줿��å�������ʵ�Ū�˺�����ޤ�"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "������"
-
-#: 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:11
 msgid "Show message preview window"
 msgstr "��å������ץ�ӥ塼������ɥ���ɽ�����ޤ�"
 
-#: 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:13
 msgid "Virtual Folder _Editor..."
 msgstr "���ۥե�������ǥ���(_E)..."
 
-#: 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
-msgid "_Mail Message"
-msgstr "��å�������᡼��(_M)"
-
-#: 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:17
 msgid "_Preview Pane"
 msgstr "�ץ�ӥ塼�ڥ���(_P)"
 
-#: 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:18
 msgid "_Subscribe to Folders..."
 msgstr "�ե���������..."
 
@@ -13103,11 +26392,11 @@ msgstr "���򤵤줿��å���������Ū�˱����ޤ�"
 msgid "Threaded Message list"
 msgstr "��å������ꥹ�Ȥ򥹥�åɲ����ޤ�"
 
-#: 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-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "�ե����(_F)"
 
@@ -13124,212 +26413,229 @@ msgid "_Threaded Message List"
 msgstr "��å������ꥹ�Ȥ򥹥�åɲ�(_T)"
 
 #: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "�����Ԥ򥢥ɥ쥹Ģ���ɲ�"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "�ե��륿Ŭ��"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "�����Ԥ򥢥ɥ쥹Ģ���ɲ�"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "���򤵤줿��å������إե��륿�롼���Ŭ�Ѥ��ޤ�"
 
-#: 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-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-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-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "�̤Υե���������򤵤줿��å������򥳥ԡ����ޤ�"
 
-#: 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-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-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-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-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-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "�����μ����ԤΤ���β��ۥե������������ޤ�"
 
-#: 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-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "���������ԤΤ���β��ۥե������������ޤ�"
 
-#: 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-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "���ν��פʥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "���Υ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "����̤�ɥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "����̤�ɥ���åɤ�ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "���ν��פʥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "���Υ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "����̤�ɥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "ž��"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿(_L)..."
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "�����ԤΥե��륿(_N)..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "�����ԤΥե��륿(_R)..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "��̾�Υե��륿(_S)..."
 
-#: ui/evolution-mail-message.xml.h:29
-msgid "Force images in HTML mail to be loaded"
-msgstr "����Ū�� HTML �᡼��β������ɤ߹���"
-
-#: ui/evolution-mail-message.xml.h:30
-msgid "Forward"
-msgstr "ž��"
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward As"
-msgstr "ž��"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward _Attached"
-msgstr "ź�դ���ž��(_A)"
-
 #: 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-message.xml.h:34
-msgid "Forward _Quoted"
-msgstr "���Ѥ���ž��(_Q)"
+msgid "Follow _Up..."
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr "����Ū�� HTML �᡼��β������ɤ߹���"
+
+#: 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:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "���Ѥ������򤵤줿��å�������ž�����ޤ�"
 
-#: 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-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ź�դȤ���ï�������򤵤줿��å�������ž�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Increase the text size"
 msgstr "�ƥ����ȥե����������..."
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "�������ɤ߹���(_I)"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "���פ˥ޡ���(_M)"
 
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "̤�ɤȤ��ƥޡ���(_N)"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "���פǤʤ��˥ޡ���(_O)"
 
-#: 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-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-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-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-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "���򤵤줿��å������˺���ޡ����򤷤ޤ�"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "��ư"
 
-#: 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 "�̤Υե���������򤵤줿��å��������ư���ޤ�"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "��"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "���ν��פʥ�å�����"
-
 #: 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 "���Υ���å�"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "����̤�ɥ�å�����"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -13345,160 +26651,188 @@ msgid "Original Si_ze"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:61
-msgid "Preview the message to be printed"
-msgstr "���������å������Υץ�ӥ塼"
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "����̤�ɥ�å�����"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "��"
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "���ν��פʥ�å�����"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "���ν��פʥ�å�����"
+msgid "Preview the message to be printed"
+msgstr "���������å������Υץ�ӥ塼"
 
 #: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "���Υ�å�����"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "����̤�ɥ�å�����"
+msgid "Previous"
+msgstr "��"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "���Υ�å����������"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "�ֿ�"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Re_direct"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "�������ֿ�"
+#: 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-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-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "�ƥ����ȥե�����إ�å���������¸���ޤ�"
 
-#: 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-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)"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "���٤ƤΥإå���ɽ��(_H)"
 
-#: 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-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "���٤ƤΥ᡼��إå���ޤ�ƥ�å�������ɽ�����ޤ�"
 
-#: 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-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "���򤵤줿��å������������ä��ޤ�"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)..."
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "�����Ԥβ��ۥե����(_N)..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "�����Ԥβ��ۥե����(_R)..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "��̾�β��ۥե����(_S)..."
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
-msgstr "�ե��륿Ŭ��(_A)"
-
 #: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Attached"
+msgstr "ź��"
+
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "�ե�����إ��ԡ�(_C)"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "��å���������ե��륿�����(_C)"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "��å�������ž��(_F)"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "��ư"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "����饤��"
+
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Larger"
 msgstr "�ݥ��٥�"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "��å�����ɽ��(_M)"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "�ե�����ذ�ư(_M)"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "���Υ�å�����"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "�̾�ɽ��(_N)"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "��å������򳫤�(_O)"
 
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "���Υ�å�����"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "����"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "�ġ���(_T)"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "������(_U)"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "���Υ�����ɥ����Ĥ��ޤ�"
 
 #: 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:36
 msgid "_Close"
 msgstr "�Ĥ���(_C)"
 
 #: 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:56
 msgid "_View"
 msgstr "ɽ��(_V)"
 
@@ -13522,12 +26856,12 @@ msgstr "PGP �Ǥ��Υ�å�������Ź沽���ޤ�"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "���Υ�å������� S/MIME �Ź�ǧ�ڤ��Ѥ��ưŹ沽���ޤ�"
 
-#: 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:9
+#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "H_TML"
 msgstr "HTML"
@@ -13544,6 +26878,10 @@ msgstr "��å������إƥ����ȤȤ��ƥե�������������ޤ�"
 msgid "Insert text file..."
 msgstr "�ƥ����ȥե����������..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "����"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "�ե�����򳫤�"
@@ -13577,7 +26915,7 @@ msgid "Save in folder..."
 msgstr "�ե��������¸..."
 
 #: 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 "���ߤΥե��������¸���ޤ�"
 
@@ -13602,6 +26940,7 @@ msgid "Send _later"
 msgstr "�������(_L)"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "HTML�����ǥ᡼����������ޤ�"
 
@@ -13670,7 +27009,7 @@ msgid "_From Field"
 msgstr "���пͥե������(_F)"
 
 #: 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)"
 
@@ -13682,11 +27021,7 @@ msgstr "����(_O)..."
 msgid "_Reply-To Field"
 msgstr "�ֿ���ե������(_R)"
 
-#: 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:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "�إ��(_H)"
 
@@ -13742,33 +27077,41 @@ msgstr "�ǿ��Υ�������������"
 msgid "Re_fresh Task"
 msgstr "�ꥹ�Ȥ򹹿�(_F)"
 
-#: 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:3
 msgid "Copy selected task"
 msgstr "���򤷤��������򥳥ԡ����ޤ�"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "���򤷤��������򥫥åȤ��ޤ�"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "���򤷤��������������ޤ�"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "���򤷤��������������ޤ�"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "��λ�Ȥ��ƥޡ���(_M)"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "����åץܡ��ɤ��饿������Ž���դ��ޤ�"
 
-#: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings..."
-msgstr "����������..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "���������Ϣ�����ץ�ӥ塼����"
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
-msgstr "������(_T)"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "���Υ�å����������"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -13835,113 +27178,118 @@ msgid "Open this folder in an other window"
 msgstr "�̤Υ�����ɥ��Ǥ��Υե�����򳫤��ޤ�"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "������"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "���塼�ˤ���᡼����������ƿ����᡼���������ޤ�"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution �ˤĤ��Ƥξ����ɽ�����ޤ�"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "�Զ���������"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "�Զ���������(_B)"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy��Ȥä��Զ���������"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "���ؤ�"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "�ե�����С���ɽ�����뤫�ɤ������ؤ��ޤ�"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "���硼�ȥ��åȥС���ɽ�����뤫�ɤ������ؤ��ޤ�"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "���ե饤���Ȥ��ɤ��������ؤ��ޤ�"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "���򤵤줿�ե������ɽ�����ޤ�"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution FAQ(_F)"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "Ximian Evolution �ˤĤ���(_A)..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "���ԡ�(_C)..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "�ե�����С�(_F)"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "�ե�����ذ�ư(_G)..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "����ݡ���..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "��ư(_M)..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "����(_N)"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "�����ե����(_N)"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "Pilot ������(_M)..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "��͡���(_R)..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "������(_S)"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "���硼�ȥ��å�(_S)"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "���硼�ȥ��åȥС�(_S)"
 
-#: 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: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/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "���ޥ�����(_S)..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "���ɥ쥹������"
@@ -13955,18 +27303,27 @@ msgid "Phone List"
 msgstr "���åꥹ��"
 
 #: 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:3
 msgid "By Sender"
 msgstr "������"
 
-#: 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:5
 msgid "By Subject"
 msgstr "��̾"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "������"
 
@@ -13974,6 +27331,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 ""
+
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "Select a Time Zone"
 msgstr "�����ॾ���������"
@@ -13992,15 +27355,25 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"�ޥ����κ��ܥ����Ȥä��ϿޤΥ��ꥢ����礷�ƥ����ॾ��������򤷤Ƥ�����"
-"����\n"
+"�ޥ����κ��ܥ����Ȥä��ϿޤΥ��ꥢ����礷�ƥ����ॾ��������򤷤Ƥ���������"
+"\n"
 "�ޥ����α��ܥ���ǽ̾����ޤ���"
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "���ߤ�ɽ��(_C)"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "���ߤ�ɽ��(_C)"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "ɽ�������"
 
@@ -14032,76 +27405,81 @@ 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 "���3��"
 
-#: 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 "������"
 
-#: 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 "�ڹ��"
 
-#: 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 "����"
 
-#: 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 "������˥�"
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "�˥塼��"
+#: widgets/misc/e-charset-picker.c:95
+#, fuzzy
+msgid "Visual"
+msgstr "̵��"
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "������ʸ�������ɥ��å�: %s"
 
-#: widgets/misc/e-charset-picker.c:201
+#: 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:281
 msgid "Other..."
 msgstr "����¾..."
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "���󥳡��ǥ���"
 
@@ -14109,25 +27487,23 @@ msgstr "���󥳡��ǥ���"
 msgid "..."
 msgstr "..."
 
-#: 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:162
 msgid "Save Search"
 msgstr "��������¸"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "��¸�����������ɲ�"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "���ꥢ"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "��������¸"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "���٤�ɽ��"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "��¸�����������ɲ�"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -14150,11 +27526,21 @@ msgstr "������"
 msgid "Don't show this message again."
 msgstr "���Υ�å����������٤�ɽ�����ʤ�"
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "����(_C)"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "����������"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "���ꥢ"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "���ꥢ"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "����������"
 
@@ -14180,6 +27566,867 @@ msgstr "init_corba(): GNOME ���������뤳�Ȥ�����ޤ���Ǥ���"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 
+#~ msgid "Card: "
+#~ msgstr "̾��: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "̾��: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  �ɾ�(���Ĥ�):     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  ��:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  ź��: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  ��:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  �ɾ�(��Ĥ�):     "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "������: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "����:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "͹���ֹ�:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  ����:         "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  �̤�:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  ��:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  �ϰ�:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  ͹���ֹ�: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  ��:       "
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "��ã��٥�: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "�����ֹ�:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "�����ֹ�:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "�Żҥ᡼��:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "�Żҥ᡼��:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "�����ॾ����: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "�Ż��ο�̳: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "�ȿ�: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  ��̾:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  ����:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "  ����2: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "  ����3: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "  ����4: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "��̳ʬ��: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "����: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Ǥ�դ�ʸ����: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "������: "
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "LDAP �����Ф���³��..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "LDAP �����Фؤ���³���Ե���..."
+
+#~ msgid "New _Contact"
+#~ msgstr "����Ϣ����"
+
+#~ msgid "New Contact _List"
+#~ msgstr "����Ϣ����ꥹ��(_L)"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "���ɥ쥹Ģ���Խ�"
+
+#~ msgid "Account Name"
+#~ msgstr "���������̾"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "���ɥ쥹Ģ���ɲ�"
+
+#~ 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�����Ф��ȤäƤ���ݡ����ֹ�Ǥ���"
+
+#~ msgid "_My server requires authentication"
+#~ msgstr "�����Ф�ǧ�ڤ�ɬ��(_M)"
+
+#~ msgid "Other Contacts"
+#~ msgstr "¾��Ϣ����"
+
+#~ msgid "(none)"
+#~ msgstr "(�ʤ�)"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "Ϣ����(_N):"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "���ξ��˰��פ���Ϣ�����ɽ��:"
+
+#~ msgid "_Message Recipients:"
+#~ msgstr "��å������μ�����(_M):"
+
+#~ msgid "B_usiness"
+#~ msgstr "�Ż�(_U)"
+
+#~ msgid "Business _Fax"
+#~ msgstr "�Ż��� FAX(_F)"
+
+#~ msgid "_Business"
+#~ msgstr "�Ż�(_B)"
+
+#~ msgid "_Home"
+#~ msgstr "��(_H)"
+
+#~ msgid "_Mobile"
+#~ msgstr "�����(_M)"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "�����ˤ���Ϣ�����\n"
+#~ "������Ƥ��������Ǥ���?"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "�������ݥ���Ȥ�������ޤ�"
+
+#~ msgid "Create a new task"
+#~ msgstr "������������������ޤ�"
+
+#~ msgid "New _Task"
+#~ msgstr "����������(_T)"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "ɸ��Υ�ޥ�����ǿ������ݥ���Ȥ�������ޤ�"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "���λϤ�(_K):"
+
+#~ 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 "̵���ʼ��̤���ʸ�˴ޤޤ�Ƥ��ޤ�, ʸ������Ԥ��Ƥ��ޤ�"
+
+#~ 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"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "%s@%s �� NNTP �ѥ���ɤ����Ϥ��Ƥ�������"
+
+#~ msgid "Server rejected username"
+#~ msgstr "�����Фϥ桼��̾����ݤ��ޤ���"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "�����Фإ桼��̾�������˼��Ԥ��ޤ���"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "�����Фϥ桼��̾/�ѥ���ɤ���ݤ��ޤ���"
+
+#~ msgid "Message %s not found."
+#~ msgstr "��å����� %s �ϸ��դ���ޤ���"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "�����Ф��饰�롼�ץꥹ�Ȥ��������ޤ���Ǥ���"
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "%s �Υ��롼�ץꥹ�ȥե����������ɽ���ޤ���: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "%s �Υ��롼�ץꥹ�ȥե��������¸����ޤ���: %s"
+
+#~ msgid "Could not open directory for news server: %s"
+#~ msgstr "�˥塼�������ФΥǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
+
+#~ msgid "Unable to open or create .newsrc file for %s: %s"
+#~ msgstr "%s �� .newsrc �ե����������ޤ��ϳ������Ȥ�����ޤ���: %s"
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "POP �����Фǿ�����å�����������å����뤳�Ȥ�����ޤ���Ǥ���: %s"
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr "�ե�����򳫤��ޤ���Ǥ���: ��å������ꥹ�Ȥ�̤�����Ǥ�"
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "��å��������������ޤ���Ǥ���: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ msgstr "POP ������ %s �����å��������������ޤ���Ǥ���: %s"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr "KPOP �����Ф�ǧ�ڽ���ޤ���Ǥ���: %s"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "�����Ф���³���뤳�Ȥ�����ޤ���Ǥ���: %s"
+
+#~ msgid "(Unknown)"
+#~ msgstr "(̤��)"
+
+#~ msgid "Unexpected response from POP server: %s"
+#~ msgstr "POP�����Ф���ͽ�����ʤ�����������ޤ���: %s"
+
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "��å������� 'From' ���ɥ쥹�򸫤Ĥ��뤳�Ȥ�����ޤ���Ǥ���"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "��å���������������ޤ���: �����ԤΥ��ɥ쥹���������Ƥ��ޤ���"
+
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "RCPT TO �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
+
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "DATA �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
+
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr ""
+#~ "DATA �쥹�ݥ󥹥��顼: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
+
+#~ 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 "Cannot connect to store: %s"
+#~ msgstr "���ȥ�����³���뤳�Ȥ�����ޤ���Ǥ���: %s"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "�����᡼���å�����(_M)"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "�������鲾�ۥե��������"
+
+#~ msgid "Filter on Mailing List"
+#~ msgstr "�᡼��󥰥ꥹ�ȤΥե��륿"
+
+#~ 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 "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
+
+#~ msgid "Composer"
+#~ msgstr "�᡼�����"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "�ǥե���Ȥ�ž����ˡ: "
+
+#~ msgid "Edit..."
+#~ msgstr "�Խ�..."
+
+#~ msgid "HTML signature file:"
+#~ msgstr "HTML ��̾�ե�����:"
+
+#~ msgid "Select Filter Log file..."
+#~ msgstr "�ե��륿�������ե����������..."
+
+#~ msgid "_Email Address:"
+#~ msgstr "�᡼�륢�ɥ쥹(_E):"
+
+#~ msgid "_Organization:"
+#~ msgstr "���(_O):"
+
+#~ msgid "_Remember this password"
+#~ msgstr "���Υѥ���ɤ򵭲�(_R)"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "�ǥե���Ȥ� HTML �����Υ᡼�����������(_S)"
+
+#, fuzzy
+#~ msgid "_Server Type: "
+#~ msgstr "�������:"
+
+#~ msgid "_Signature file:"
+#~ msgstr "��̾�ե�����(_S):"
+
+#~ 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 ����ݡ��ͥ��"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
+
+#~ 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 "(̾���ʤ�)"
+
+#~ msgid "New List"
+#~ msgstr "�����ꥹ��"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "��������������ѹ����ޤ�"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "�����������٥�Ȥ����(_E)"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "�������������(_T)"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "�������ݥ���Ȥκ���(_N)"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "�����Υ��٥�Ȥ�������ޤ�"
+
+#~ msgid "_Appointment..."
+#~ msgstr "���ݥ����(_A)..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "����������(_C)..."
+
+#~ msgid "_Task..."
+#~ msgstr "������(_T)..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "�᡼�륢������Ȥ�¾����������/�Խ����ޤ�"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "�᡼������(_M)..."
+
+#~ msgid "Forward _Attached"
+#~ msgstr "ź�դ���ž��(_A)"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "���Ѥ���ž��(_Q)"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "�ե��륿Ŭ��(_A)"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "�������ӥ塼������򹹿����ޤ�"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "����������..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "���Υե������������ѹ�"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "���ޥ�����(_S)..."
+
+#~ msgid "Show All"
+#~ msgstr "���٤�ɽ��"
+
+#~ msgid "Sear_ch"
+#~ msgstr "����(_C)"
+
 #~ msgid "I couldn't remove the item from your calendar file!\n"
 #~ msgstr ""
 #~ "��Ϥ��ʤ��Υ������ե����뤫�餽�Υ����ƥ�����Ǥ��ޤ���Ǥ���!\n"
@@ -14298,21 +28545,12 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "Volcanic ash w/ thunders"
 #~ msgstr "��Ȳл���"
 
-#~ msgid "M_etric"
-#~ msgstr "�᡼�ȥ�ˡ(_E)"
-
 #~ msgid "Units: "
 #~ msgstr "ñ��: "
 
-#~ msgid "_Imperial"
-#~ msgstr "����ڥꥢ��ˡ(_I)"
-
 #~ msgid "Folder cannot contain the directory separator."
 #~ msgstr "�ե����̾�ˤϥǥ��쥯�ȥ���ڤ�ʸ���ϻȤ��ޤ���"
 
-#~ msgid "Ximian Evolution"
-#~ msgstr "Ximian Evolution"
-
 #~ msgid ""
 #~ "Ximian Evolution is a suite of groupware applications\n"
 #~ "for mail, calendaring, and contact management\n"
@@ -14367,18 +28605,12 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgstr ""
 #~ "%s�˥����������뤿����Żҥ᡼�륢�ɥ쥹�ȥѥ���ɤ����Ϥ��Ƥ�������"
 
-#~ msgid "LDAP Authentication"
-#~ msgstr "LDAPǧ��"
-
 #~ msgid "Password:"
 #~ msgstr "�ѥ����:"
 
 #~ msgid "Sent By:"
 #~ msgstr "������:"
 
-#~ msgid "Couldn't create temporary mbox `%s': %s"
-#~ msgstr "�ƥ�ݥ�� mbox '%s' ������Ǥ��ޤ���Ǥ���: %s"
-
 #~ msgid ""
 #~ "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 #~ "This probably means that the %s component has crashed."
@@ -14388,8 +28620,7 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 
 #~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 #~ msgstr ""
-#~ "ͥ���٤� '�⤤', '����', '�㤤' ���뤤�� '̤���' �����򤷤ʤ���Фʤ�ޤ�"
-#~ "��"
+#~ "ͥ���٤� '�⤤', '����', '�㤤' ���뤤�� '̤���' �����򤷤ʤ���Фʤ�ޤ���"
 
 #~ msgid "before start of appointment"
 #~ msgstr "���ݥ���Ȥγ�����"
@@ -14421,9 +28652,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "Rename"
 #~ msgstr "��͡���"
 
-#~ msgid "_Debug"
-#~ msgstr "�ǥХå�(_D)"
-
 #~ msgid "_Import File..."
 #~ msgstr "�ե�����򥤥�ݡ���(_I)..."
 
@@ -14436,9 +28664,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "Snooze"
 #~ msgstr "���顼�����"
 
-#~ msgid "Ok"
-#~ msgstr "OK"
-
 #, fuzzy
 #~ msgid "%d"
 #~ msgstr "d"
@@ -14514,9 +28739,5 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "Synchronizing '%s'"
 #~ msgstr "�ե������Ʊ����"
 
-#, fuzzy
-#~ msgid "There was an error downloading news feed"
-#~ msgstr "�������ե�������ɤ߹�����˥��顼��ȯ�����ޤ���"
-
 #~ msgid "All Attendees"
 #~ msgstr "���٤Ƥ��դ�ź��"
diff --git a/po/ko.po b/po/ko.po
index 1fec6344e6..05aee6f9ee 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: 2001-11-14 19:26-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -37,22 +37,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "GnomeCard ������ 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
 #, fuzzy
 msgid "File As"
 msgstr "���Ϸ� ����:"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "�̸�"
 
 #: 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/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Primary"
 msgstr ""
 
@@ -63,15 +64,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:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: 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
 msgid "Business"
 msgstr "����"
 
@@ -82,12 +84,12 @@ msgid "Bus"
 msgstr "�ٻ�"
 
 #: 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:1720
 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:1722
 msgid "Company"
 msgstr "ȸ��"
 
@@ -98,13 +100,14 @@ msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: 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
 msgid "Home"
 msgstr "��"
 
 #: 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 "����"
 
@@ -116,18 +119,20 @@ msgstr ""
 "���: "
 
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "�޴���ȭ"
 
 #: 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:1721
 msgid "Car"
 msgstr "�ڵ���"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: 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:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "���� �ѽ�"
 
@@ -137,13 +142,13 @@ msgid "Bus Fax"
 msgstr "���� �ѽ�"
 
 #: 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:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "���� 2"
 
@@ -153,69 +158,68 @@ msgid "Bus 2"
 msgstr "�ٻ�"
 
 #: 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:1724
 msgid "Home 2"
 msgstr "�� 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:1726
+#: 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:1656
-#: addressbook/gui/contact-editor/e-contact-editor.c:1714
-#: mail/mail-config.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 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/gui/contact-editor/e-contact-editor.c:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr ""
 
 #: 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 ""
 
 #: 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:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "�̸��� 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 "�� ����Ʈ"
 
@@ -224,7 +228,7 @@ msgid "Url"
 msgstr ""
 
 #: 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 "�μ�"
 
@@ -233,7 +237,7 @@ msgid "Dep"
 msgstr ""
 
 #: 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 "�繫��"
 
@@ -243,12 +247,12 @@ msgid "Off"
 msgstr "�繫��"
 
 #: 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/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 "����"
 
@@ -257,7 +261,7 @@ msgid "Prof"
 msgstr ""
 
 #: 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 ""
 
@@ -271,7 +275,7 @@ msgid "Ass"
 msgstr ""
 
 #: 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 "����"
 
@@ -281,12 +285,12 @@ msgid "Nick"
 msgstr "����"
 
 #: 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/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 "��Ʈ"
 
@@ -300,7 +304,7 @@ msgid "CALUri"
 msgstr ""
 
 #: 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 ""
 
@@ -334,272 +338,16 @@ msgstr "���"
 msgid "Family Name"
 msgstr "���� �̸�"
 
-#: addressbook/backend/ebook/e-card-simple.c:788
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, c-format
 msgid "%x"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3712
-msgid "Card: "
-msgstr "ī��: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"�̸�: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"����: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"�ּ�:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  ��/��:          "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  ����:        "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  ���� ��ȣ:   "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  ����:        "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"��ȭ��ȣ:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"��ȭ��ȣ:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"���ڿ���:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"���ڿ���:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"��: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"������ ��ġ: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"���� ����: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"���: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  �̸�:  "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"���: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"�ּ�:    "
-
-#. 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 ""
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"���� Ű: "
-
-#: 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 ""
@@ -607,92 +355,97 @@ msgstr ""
 #: 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:1130
-#: 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:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2215
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 #, fuzzy
 msgid "Searching..."
 msgstr "�˻�"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 #, fuzzy
 msgid "Loading..."
 msgstr "��ٸ��� �� ..."
 
 #. 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 ""
 "ã�⸦ ���൵�� ����: %s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:475
-msgid "Connecting to LDAP server..."
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:485
-#, fuzzy
-msgid "Unable to connect to LDAP server."
-msgstr "KPOP �������� �����Ҽ� ����: %s"
-
-#: addressbook/backend/pas/pas-backend-ldap.c:501
-msgid "Waiting for connection to LDAP server..."
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:870
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:971
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "�޷� �ҷ�����..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2160
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2165
-msgid "Restarting search."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
 msgstr ""
+"�ڷ��� �д��� ���� �߻�:\n"
+"%s"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
+
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "���ڿ��� �ּ�:"
 
-#: addressbook/conduit/address-conduit.c:294
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:307
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1089
-#: calendar/conduits/calendar/calendar-conduit.c:981
-#: calendar/conduits/todo/todo-conduit.c:694
+#: 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:1090
-#: calendar/conduits/calendar/calendar-conduit.c:982
-#: calendar/conduits/todo/todo-conduit.c:695
+#: 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: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 ""
 
@@ -709,357 +462,827 @@ 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
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution �ּҷ� minicard ����"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 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:11
 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:12
 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:13
 #, fuzzy
 msgid "Factory for the Addressbook's address popup"
 msgstr "�ּҷ�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "�ּҷ�"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 #, fuzzy
 msgid "Contacts"
 msgstr "����ó(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP ����"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "New Contact"
 msgstr "�� ����ó"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#, fuzzy
-msgid "New _Contact"
-msgstr "�� ����ó"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "����ó(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "New Contact List"
 msgstr "�� ����ó"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
-msgid "New Contact _List"
-msgstr "�� ����ó"
+msgid "Contact _List"
+msgstr "����ó(_C)"
+
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr "�ּҷ��� ������ �����ϴ�"
+
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
+#: 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"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:769
+msgid "Name begins with"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "�̸��� 2"
+
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Category is"
+msgstr "���"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: 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
+msgid "Advanced..."
+msgstr "����..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+#, fuzzy
+msgid "Any Category"
+msgstr "���:"
+
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
+msgstr "���� Ž���Ⱑ ǥ���� URI"
+
+#: 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
+msgid "Primary Email"
+msgstr "�̸���"
+
+#: addressbook/gui/component/e-address-popup.c:587
+#, fuzzy
+msgid "Select an Action"
+msgstr "������ ��������"
+
+#: addressbook/gui/component/e-address-popup.c:593
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "���ο� ����ó�� �����"
+
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:891
+#, fuzzy
+msgid "Querying Addressbook..."
 msgstr "�ּҷ� ����"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
+msgstr "����ó ���� ����"
+
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+msgid "Add to Contacts"
+msgstr "����ó�� �߰�"
+
+#: addressbook/gui/component/e-address-popup.c:1046
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "���ڿ��� �ּ�:"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
-msgid "Account Name"
-msgstr "����"
+msgid "Failed to connect to LDAP server"
+msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "�ּҷ� �߰�"
+#: 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 "����"
+
+#: 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
+msgid "1:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:8
+msgid "380"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "�ּҷ� �ҽ�"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "����"
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "��"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
+#: addressbook/gui/component/ldap-config.glade.h:16
+msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
+#: 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/addressbook-config.glade.h:8
+#: 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 "�޾���"
+
+#: 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 "���� ����"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "De_lete"
 msgstr "����"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "ȣ��Ʈ:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Email Address:"
 msgstr "���ڿ��� �ּ�:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "�"
+
+#: 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
+#, fuzzy
+msgid "LDAP Attribute"
+msgstr "����:"
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "���� ����"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "����"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, 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/ldap-config.glade.h:44
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: 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 "Search _base:"
+msgid "S_earch scope: "
 msgstr "�˻� ����:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#. 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 "Search s_cope: "
-msgstr "�˻� ����:"
+msgid "Searching"
+msgstr "�˻�"
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
-msgid "Server Name"
-msgstr "���� ����::"
+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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:65
+#, fuzzy
+msgid "Step 1: Server Information"
+msgstr "���� ����"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "�޾���"
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#: 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
 #, fuzzy
 msgid "Sub"
 msgstr "��"
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "The information below is required in order to add an addressbook.  "
+#: 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/addressbook-config.glade.h:17
-msgid "This information is not required for most ldap servers. "
+#: 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/addressbook-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:87
 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 is the full name of your ldap server. For example, "
+"\"ldap.mycompany.com\"."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"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:20
-msgid "This is the name of the server where your addressbook is located."
+#: 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/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
+#: addressbook/gui/component/ldap-config.glade.h:91
+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/addressbook-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"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/addressbook-config.glade.h:23
+#: 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 "_Account name:"
-msgstr "���� ����"
+msgid "Using email address"
+msgstr "���ڿ��� �ּ�:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+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:90 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:139
 msgid "_Add"
 msgstr "�߰�(_A)"
 
-#: 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.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
-msgid "_My server requires authentication"
-msgstr "������ ������ �䱸�մϴ�"
+msgid "_Add ->"
+msgstr "�߰�(_A)"
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
-msgid "_Port:"
-msgstr "��Ʈ:"
+msgid "_Add Mapping"
+msgstr "���� �߰�"
 
-#: addressbook/gui/component/addressbook-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Server name:"
-msgstr "���� ����::"
+msgid "_Add to DN"
+msgstr "���� �߰�"
 
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-#, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
+#: addressbook/gui/component/ldap-config.glade.h:108
+msgid "_Always"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:167
-msgid "Other Contacts"
-msgstr "�ٸ� ����ó"
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "����(_D)"
 
-#: addressbook/gui/component/addressbook.c:468
-msgid "Unable to open addressbook"
-msgstr "�ּҷ��� ������ �����ϴ�"
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "ǥ��"
 
-#: addressbook/gui/component/addressbook.c:477
-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"
+#: addressbook/gui/component/ldap-config.glade.h:111
+msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:482
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:490
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:623
-#, c-format
-msgid "Enter password for %s (user %s)"
+#: 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
+#: 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)"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "����� �����ϱ�"
+
+#: 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/addressbook.c:786
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:787
-msgid "Name contains"
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:788
-msgid "Email contains"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/ldap-config.glade.h:121
 #, fuzzy
-msgid "Category is"
-msgstr "���"
-
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "����..."
+msgid "_More Options >>"
+msgstr "����(_O)"
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1031
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/ldap-config.glade.h:122
 #, fuzzy
-msgid "Any Category"
-msgstr "���:"
+msgid "_Port number:"
+msgstr "��Ʈ:"
 
-#: addressbook/gui/component/addressbook.c:1071
-msgid "The URI that the Folder Browser will display"
-msgstr "���� Ž���Ⱑ ǥ���� URI"
+#: addressbook/gui/component/ldap-config.glade.h:123
+msgid "_Restore Defaults"
+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
+#: addressbook/gui/component/ldap-config.glade.h:124
 #, fuzzy
-msgid "(none)"
-msgstr "(�̸� ����)"
+msgid "_Search base:"
+msgstr "�˻� ����:"
 
-#: 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:1686
-msgid "Primary Email"
-msgstr "�̸���"
+#: addressbook/gui/component/ldap-config.glade.h:125
+#, fuzzy
+msgid "_Server name:"
+msgstr "���� ����::"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/ldap-config.glade.h:126
+msgid "_Timeout (minutes):"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
-msgid "Select an Action"
-msgstr "������ ��������"
+msgid "account-druid"
+msgstr "����"
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, fuzzy, c-format
-msgid "Create a new contact \"%s\""
-msgstr "���ο� ����ó�� �����"
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "����ó ������"
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "���� ����"
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
-msgid "Querying Addressbook..."
-msgstr "�ּҷ� ����"
+msgid "connecting-tab"
+msgstr "�޾���"
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
-msgstr "����ó ���� ����"
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-msgid "Add to Contacts"
-msgstr "����ó�� �߰�"
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
-msgid "Merge E-Mail Address"
-msgstr "���ڿ��� �ּ�:"
+msgid "general-tab"
+msgstr "�Ϲ� ����"
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
+#: 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 "�˻�"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolution �ּҷ� �̸� ���� �������̽�"
@@ -1069,9 +1292,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "�ּҷ� �̸� ���� �������̽��� ���� ���丮"
 
 #: 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: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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "����"
 
@@ -1104,7 +1327,12 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "�ٸ� ����ó"
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: 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"
@@ -1114,7 +1342,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"
@@ -1122,1288 +1350,1356 @@ 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:1
-#, fuzzy
-msgid "C_ontaining:"
-msgstr "����"
+msgid "Select Names"
+msgstr "������ �̸�"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
-msgid "Co_ntacts:"
-msgstr "����ó(_C)"
+msgid "Selected Contacts:"
+msgstr "����ó�� �����ұ��?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "F_ind"
-msgstr "�"
+msgid "Show Contacts"
+msgstr "����ó(_C)"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "������ �̸�"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
+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 "_Category:"
-msgstr "���:"
+msgid "_Browse..."
+msgstr "�̵�"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
-msgid "_Folder:"
-msgstr "����(_F)"
+msgid "_Category:"
+msgstr "���:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:8
 #, fuzzy
-msgid "_Message Recipients:"
-msgstr "�޴»�� ���"
+msgid "_Folder:"
+msgstr "����(_F)"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "Anni_versary:"
-msgstr "�����(_v):"
+#, fuzzy
+msgid "A_ssistant's name:"
+msgstr "���� �̸�(_A):"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "B_usiness"
-msgstr "����(_u)"
+#, fuzzy
+msgid "Add_ress..."
+msgstr "�ּ�(_A)..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Business _Fax"
-msgstr "���� �ѽ�(_F)"
+msgid "Anni_versary:"
+msgstr "�����(_v):"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#, fuzzy
+msgid "Birthda_y:"
+msgstr "����(_B):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "C_ontacts..."
+msgstr "����ó(_C)..."
+
+#: 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 ""
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "����ó ������"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "D_epartment:"
+msgstr "�μ�(_D):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "�ڼ���"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "File A_s:"
 msgstr "���Ϸ� ����:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "General"
-msgstr "�Ϲ� ����"
+#: 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"
 "of that information here."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr "�� ��ȭ ����"
 
-#: 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/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "����:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#, fuzzy
+msgid "P_rofession:"
+msgstr "����(_P):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Phone Types"
 msgstr "��ȭ ����"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Wants to receive _HTML mail"
-msgstr "HTML���� ���� ���(_H)"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Address..."
-msgstr "�ּ�(_A)..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Assistant's name:"
-msgstr "���� �̸�(_A):"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Birthday:"
-msgstr "����(_B):"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+msgid "S_pouse:"
+msgstr "�����(_S):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Business"
-msgstr "����(_B)"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#, fuzzy
+msgid "This is the _mailing address"
+msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: 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/gui/contact-editor/contact-editor.glade.h:29
+msgid "Wants to receive _HTML mail"
+msgstr "HTML���� ���� ���(_H)"
 
-#: 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: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:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "����(_D)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Department:"
-msgstr "�μ�(_D):"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Full Name..."
-msgstr "��ü �̸�(_F)..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Home"
-msgstr "��(_H)"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Job title:"
 msgstr "����(_J):"
 
-#: 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/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Mobile"
-msgstr "�޴���ȭ(_M)"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
 msgstr "����(_N):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
 msgstr "�繫��(_O):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Profession:"
-msgstr "����(_P):"
-
-#: 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/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Spouse:"
-msgstr "�����(_S):"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Web page address:"
 msgstr "Ȩ������ �ּ�:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
 #, 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:756
-msgid "Category editor not available."
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:763
-msgid "This contact belongs to these categories:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
-#, fuzzy, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "`%s'���ִ� ������ ������ �����ϴ�"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
-msgstr "����ó Quick �߰�"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
-msgstr "���� �̸� ����"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr "���� �̸�"
-
-#: 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/gui/contact-editor/e-contact-save-as.c:170
-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 ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "�ּ� _2:"
+msgid "United States"
+msgstr "�޼��� �μ�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
 #, fuzzy
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 #, fuzzy
 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
 #, fuzzy
 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 ""
 
-#: 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
 #, fuzzy
 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/gui/contact-editor/fulladdr.glade.h:23
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: my-evolution/Locations.h:218
 #, fuzzy
 msgid "Belize"
 msgstr "ũ��"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #, fuzzy
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: my-evolution/Locations.h:294
 #, fuzzy
 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/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 "ij����"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:44
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #, fuzzy
 msgid "Chad"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-msgid "Check Address"
-msgstr "�ּ� Ȯ��"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: my-evolution/Locations.h:438
 #, fuzzy
 msgid "Chile"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 #, fuzzy
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 #, fuzzy
 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
 #, fuzzy
 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/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/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 "�ɶ���"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: my-evolution/Locations.h:766
 #, fuzzy
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: my-evolution/Locations.h:846
 #, fuzzy
 msgid "Greece"
 msgstr "��"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #, fuzzy
 msgid "Greenland"
 msgstr "�ɶ���"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #, fuzzy
 msgid "Grenada"
 msgstr "ij����"
 
-#: 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
 #, fuzzy
 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/gui/contact-editor/fulladdr.glade.h:93
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #, fuzzy
 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: my-evolution/Locations.h:888
 #, fuzzy
 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
 #, fuzzy
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: my-evolution/Locations.h:966
 #, fuzzy
 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
+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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #, fuzzy
 msgid "Laos"
 msgstr "�̸�(_L):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: my-evolution/Locations.h:1190
 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:1198
 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
 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:1234
 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:1268
 msgid "Luxembourg"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #, fuzzy
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #, fuzzy
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #, fuzzy
 msgid "Mali"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
 #, fuzzy
 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/gui/contact-editor/fulladdr.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 #, fuzzy
 msgid "Mauritius"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 #, fuzzy
 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:1387
 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
+msgid "Moldova, Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 #, fuzzy
 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:1470
 msgid "Morocco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 #, fuzzy
 msgid "Mozambique"
 msgstr "�޴���ȭ"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 #, fuzzy
 msgid "Nepal"
 msgstr "�� ����"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
 #, fuzzy
 msgid "Netherlands"
 msgstr "��Ÿ�� ����(_T)"
 
-#: 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
 #, fuzzy
 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:1560
 #, fuzzy
 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:1562
 msgid "Nicaragua"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #, fuzzy
 msgid "Niger"
 msgstr "�߻�"
 
-#: 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
 #, fuzzy
 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:1574
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
 #, fuzzy
 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:1632
 msgid "Oman"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
 #, fuzzy
 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
 msgid "Palestinian Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama"
 msgstr "ij����"
 
-#: 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:1688
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Peru"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr ""
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
 #, fuzzy
 msgid "Poland"
 msgstr "�ɶ���"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
 #, fuzzy
 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:1824
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
 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
 #, fuzzy
 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:1912
 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/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #, fuzzy
 msgid "Rwanda"
 msgstr "ij����"
 
-#: 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:2035
 msgid "Saudi Arabia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 #, fuzzy
 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2090
 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:2103
 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:2104
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #, fuzzy
 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:2119
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
 #, fuzzy
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 #, fuzzy
 msgid "Sudan"
 msgstr "��"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
 #, fuzzy
 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/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #, fuzzy
 msgid "Swaziland"
 msgstr "�ɶ���"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
 #, fuzzy
 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:2183
 msgid "Switzerland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
 msgid "Taiwan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #, fuzzy
 msgid "Tajikistan"
 msgstr "�۾�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+msgid "Tanzania, United Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 #, fuzzy
 msgid "Thailand"
 msgstr "�ɶ���"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 #, fuzzy
 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
 #, fuzzy
 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
 #, fuzzy
 msgid "Turkey"
 msgstr "ȭ"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 #, fuzzy
 msgid "Uganda"
 msgstr "ij����"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
 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:2342
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-#, fuzzy
-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:2348
 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:2380
 msgid "Venezuela"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Viet Nam"
 msgstr "������ �̸�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+msgid "Virgin Islands, British"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
 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:2524
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "����ó�� �����ұ��?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+msgid "Category editor not available."
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+msgid "This contact belongs to these categories:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#, fuzzy
+msgid "Save Contact as VCard"
+msgstr "VCard�� ����"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "`%s'���ִ� ������ ������ �����ϴ�"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+msgid "Contact Quick-Add"
+msgstr "����ó Quick �߰�"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+msgid "Edit Full"
+msgstr "���� �̸� ����"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr "���� �̸�"
+
+#: 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/gui/contact-editor/e-contact-save-as.c:170
+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 ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "�ּ� _2:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "�ּ� Ȯ��"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "����(_y):"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "�ּ�(_A):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "��(_C):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr ""
 
@@ -2505,11 +2801,16 @@ msgid "contact-list-editor"
 msgstr "����ó ������"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "����ó ������"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#, fuzzy
+msgid "Save List as VCard"
+msgstr "VCard�� ����"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
@@ -2556,7 +2857,7 @@ msgid ""
 msgstr ""
 
 #: 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 "���� �˻�"
 
@@ -2565,246 +2866,348 @@ msgstr "���� �˻�"
 msgid "Search"
 msgstr "�˻�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 #, fuzzy
 msgid "No cards"
 msgstr "���� ����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 #, fuzzy
 msgid "1 card"
 msgstr "�޷� �μ��ϱ�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, fuzzy, 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
-msgid "Save as VCard"
-msgstr "VCard�� ����"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: 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
-#, fuzzy
-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-model.c:370
 #, fuzzy
-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:66
-#: 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
-#, fuzzy
-msgid "Print Envelope"
-msgstr "���� �μ�(_v)..."
-
-#: 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 "����"
+msgid "Error getting book view"
+msgstr "%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:87
 #: addressbook/gui/widgets/e-minicard.c:475
 #, fuzzy
 msgid "Error modifying card"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: 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:1043
 msgid "Success"
 msgstr ""
 
-#: 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: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
 msgid "Unknown error"
 msgstr "�� ������ ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #, fuzzy
 msgid "Repository offline"
 msgstr "�������ο��� �۾�"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "�㰡�� �ź�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 #, fuzzy
 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 ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
 msgid "Protocol not supported"
 msgstr "�۵��� �������� ����"
 
-#: 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:607 camel/camel-service.c:643
+#: 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
 msgid "Cancelled"
 msgstr "��ҵ�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 #, fuzzy
 msgid "Other error"
 msgstr "����� ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "����Ȱ��� ���� �ϱ� ���Ͻʴϱ�?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 #, fuzzy
 msgid "Error adding list"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 #, fuzzy
 msgid "Error adding card"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #, fuzzy
 msgid "Error modifying list"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 #, fuzzy
 msgid "Error removing list"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
 "�ڷ��� �д��� ���� �߻�:\n"
 "%s"
 
-#. 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 ""
+#: addressbook/gui/widgets/e-addressbook-util.c:204
+#, 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"
+#: addressbook/gui/widgets/e-addressbook-util.c:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "ǥ��"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "���� ����"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "���� ����"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "���� ����"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "���� ����"
+
+#: 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:338
 #, fuzzy
 msgid "Primary Phone"
 msgstr "�̸���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 #, fuzzy
 msgid "Business Phone"
 msgstr "���� 2"
 
-#: 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:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 #, fuzzy
 msgid "Company Phone"
 msgstr "ȸ��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 #, fuzzy
 msgid "Home Phone"
 msgstr "�� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 #, fuzzy
 msgid "Business Address"
 msgstr "���� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 #, fuzzy
 msgid "Home Address"
 msgstr "�ּ� Ȯ��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "�޴���ȭ"
 
-#: 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:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "���� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "�� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 #, fuzzy
 msgid "Other Phone"
 msgstr "�ٸ� ����ó"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 #, fuzzy
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "VCard�� ����"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "�� ����ó"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "�� ����ó"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "������ ����(_G)..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "��������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "����ó ã��(_S)"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "�ּҷ� �ҽ�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "���� ����(_M)..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+#, fuzzy
+msgid "Forward Contact"
+msgstr "�ٸ� �ּҷ� ����"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#, fuzzy
+msgid "Send Message to Contact"
+msgstr "���߿� �޼����� �����ϴ�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+#, fuzzy
+msgid "Print Envelope"
+msgstr "���� �μ�(_v)..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "������ ����..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "������ �̵�..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "�ڸ���"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "ī��: "
+
+#. 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:940
+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 ""
+
+#. 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
+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 ""
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -2818,19 +3221,43 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr "�ּҷϿ� ����"
 
-#: 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 "ī��: "
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+#, fuzzy
+msgid "Print envelope"
+msgstr "���� �μ�(_v)..."
+
+#: addressbook/printing/e-contact-print.c:1115
+#, fuzzy
+msgid "Print cards"
+msgstr "�޷� �μ��ϱ�"
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+#, fuzzy
+msgid "Print card"
+msgstr "�޷� �μ��ϱ�"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 ����Ʈ Tahoma"
@@ -2901,6 +3328,7 @@ msgid "Include:"
 msgstr "����:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "����"
 
@@ -2925,10 +3353,12 @@ msgid "Options"
 msgstr "����"
 
 #: 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
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "��"
 
@@ -2944,7 +3374,9 @@ msgstr "����"
 msgid "Paper source:"
 msgstr "�������:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "����"
 
@@ -3001,66 +3433,50 @@ msgstr "��:"
 msgid "_Font..."
 msgstr "�۲�..."
 
-#: addressbook/printing/e-contact-print.c:1111
-#, fuzzy
-msgid "Print cards"
-msgstr "�޷� �μ��ϱ�"
-
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-#, fuzzy
-msgid "Print card"
-msgstr "�޷� �μ��ϱ�"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-#, fuzzy
-msgid "Print envelope"
-msgstr "���� �μ�(_v)..."
-
-#: calendar/cal-util/cal-component.c:1202
+#: calendar/cal-util/cal-component.c:1207
 #, fuzzy
 msgid "Untitled appointment"
 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:405 mail/message-list.c:651
+#: 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
 msgid "High"
 msgstr "����"
 
-#: 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:650
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 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:407 mail/message-list.c:649
+#: 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
 msgid "Low"
 msgstr "����"
 
 #. 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
 msgid "Undefined"
 msgstr "���Ǿȵ�"
 
-#: calendar/conduits/calendar/calendar-conduit.c:937
-#: calendar/conduits/todo/todo-conduit.c:649
+#: 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: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 ""
 
-#: calendar/conduits/todo/todo-conduit.c:756
-#: calendar/conduits/todo/todo-conduit.c:759
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "�켱����(_P):"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -3073,42 +3489,55 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "���� ����(_M)..."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+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:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "�ּҷ�"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 "�˶� ���"
@@ -3117,25 +3546,11 @@ 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
-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"
@@ -3160,11 +3575,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "����� �����ϱ�"
 
-#: 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"
@@ -3172,18 +3587,29 @@ 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:2608
+#: 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 ""
 
-#: 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 "�� �޼����� �ٽ� �� �� �����ϴ�"
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "�׳��� �ʱ�ȭ �Ҽ� �����ϴ�"
 
@@ -3196,24 +3622,43 @@ msgstr "�˶� ��� ���丮�� ������� �����ϴ�"
 msgid "Could not create the alarm notify service factory"
 msgstr "�˶� ��� ���丮�� ������� �����ϴ�"
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/cal-search-bar.c:50
+#, fuzzy
+msgid "Summary contains"
+msgstr "���"
+
+#: calendar/gui/cal-search-bar.c:51
+#, fuzzy
+msgid "Description contains"
+msgstr "����:"
+
+#: calendar/gui/cal-search-bar.c:52
+#, fuzzy
+msgid "Comment contains"
+msgstr "������������"
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. 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 ""
 
-#: 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 ""
 
-#: 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
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%Y/%m/%d"
@@ -3221,27 +3666,25 @@ msgstr "%Y/%m/%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 ""
 
-#: 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 ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr ""
 
@@ -3262,33 +3705,28 @@ msgid "W"
 msgstr "��"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "��"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 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:479 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "�Ϸ��"
 
@@ -3301,12 +3739,13 @@ 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/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/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
+#: 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 ""
 
@@ -3318,24 +3757,15 @@ msgstr "�ݺ���"
 msgid "Assigned"
 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:803
+#: 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
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr "�ƴϿ�"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1974 calendar/gui/e-day-view.c:1675
-#: calendar/gui/e-week-view.c:1182
-#, fuzzy
-msgid "Searching"
-msgstr "�˻�"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 #, fuzzy
 msgid "Day View"
@@ -3355,69 +3785,80 @@ msgstr "��"
 msgid "Month View"
 msgstr "��"
 
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Summary contains"
-msgstr "���"
-
-#: calendar/gui/cal-search-bar.c:57
-#, fuzzy
-msgid "Description contains"
-msgstr "����:"
-
-#: calendar/gui/cal-search-bar.c:58
-#, fuzzy
-msgid "Comment contains"
-msgstr "������������"
-
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
-msgid "Unmatched"
-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
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "�޷�"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "�۾�"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "���ο� ��Ӹ� �����"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "���� ���"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
+#: calendar/gui/component-factory.c:695
 #, fuzzy
-msgid "New _Appointment"
-msgstr "�� ���"
+msgid "_Meeting"
+msgstr "���� ���"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "�۾�"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:649
+#: calendar/gui/component-factory.c:703
 #, fuzzy
-msgid "New _Task"
-msgstr "�۾�"
+msgid "New All Day Appointment"
+msgstr "�� ���"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "�� ���"
+
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "�� ���"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "���"
+
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "`%s'���ִ� ������ ������ �����ϴ�"
+
+#: 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/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr ""
@@ -3595,12 +4036,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
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%s ���� ���� %s"
 
-#: calendar/gui/dialogs/alarm-page.c:459
+#: calendar/gui/dialogs/alarm-page.c:458
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3622,7 +4063,7 @@ msgstr ""
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "���"
 
@@ -3631,12 +4072,11 @@ msgstr "���"
 msgid "_Options..."
 msgstr "����(_O)"
 
-#. 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/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr ""
 
@@ -3653,7 +4093,7 @@ msgstr "��� ��"
 msgid "hour(s)"
 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:189
 msgid "minute(s)"
 msgstr "��"
 
@@ -3696,196 +4136,186 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
-msgid "Create new appointments with a default _reminder"
-msgstr "���ο� ��Ӹ� �����"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
 msgid "Days"
 msgstr "�����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#, fuzzy
-msgid "First day of wee_k:"
-msgstr "�������� ù°��:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "�ݿ���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "Hours"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
 msgid "Minutes"
 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:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "�����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, fuzzy
-msgid "Show appointment _end times in week and month views"
-msgstr "��� ���ð� ����"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #, fuzzy
 msgid "Su_n"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "�Ͽ���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "T_asks due today:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_hu"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "T_ue"
 msgstr "ȭ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "�۾�"
 
-#: 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:25
 #, fuzzy
 msgid "Time"
 msgstr "����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #, fuzzy
 msgid "Time _zone:"
 msgstr ""
 "\n"
 "��: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
-msgid "Time di_visions:"
-msgstr "ũ��:"
-
-#: 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: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:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Work Week"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #, fuzzy
 msgid "_24 hour"
 msgstr " �ѽð���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 #, fuzzy
 msgid "_Display"
 msgstr "ǥ��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "_End of day:"
 msgstr "�Ϸ��� ��:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
 msgid "_Fri"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_General"
 msgstr "�Ϲ� ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "������ �޼��� ����(_D)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Mon"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#, fuzzy
-msgid "_Other"
-msgstr "��Ÿ"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "_Overdue tasks:"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Sat"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "_Task List"
-msgstr "�۾�"
+msgid "_Show appointment end times in week and month views"
+msgstr "��� ���ð� ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "ũ��:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Wed"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "before the start of the appointment"
 msgstr "��ӽ�����"
@@ -3953,74 +4383,63 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: 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:2212
 #, fuzzy
 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:2214
 #, fuzzy
 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/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:322
 #, fuzzy
 msgid "Could not update object!"
 msgstr "����� ���ϵ��� ������ ���� �����ϴ�"
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "����� �����Ѵ�"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "��� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "���� ���� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1897
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1904
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4081,7 +4500,7 @@ msgstr "������"
 msgid "Enter Delegate"
 msgstr "������"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "���"
 
@@ -4095,14 +4514,14 @@ msgstr ""
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 #, fuzzy
 msgid "Scheduling"
 msgstr "����"
 
 #: calendar/gui/dialogs/event-editor.c:207
 #: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:368
 #, fuzzy
 msgid "Meeting"
 msgstr "���� ���"
@@ -4139,31 +4558,43 @@ msgid "F_ree"
 msgstr "��"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
+#, fuzzy
+msgid "L_ocation:"
+msgstr ""
+"\n"
+"������ ��ġ: "
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr ""
 
-#: 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/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 #, fuzzy
 msgid "Show Time As"
 msgstr "����"
 
-#: 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 "���(_u):"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "����ó(_C)..."
+
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "����ġ�� �ð�(_E):"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "���� �ð�(_S):"
 
@@ -4192,59 +4623,52 @@ msgstr "������"
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
 #, fuzzy
-msgid "Click here to add an attendee"
-msgstr "����ó�� �߰��ϱ�"
+msgid "Common Name"
+msgstr "�Ϸ� ��¥"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
 #, fuzzy
-msgid "Common Name"
-msgstr "�Ϸ� ��¥"
+msgid "Delegated From"
+msgstr "������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
-msgid "Delegated From"
+msgid "Delegated To"
 msgstr "������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-#, 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
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 #, fuzzy
 msgid "Member"
 msgstr "����"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:798
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 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:49
-#: mail/message-list.etspec.h:8
+#: 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"
 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 mail/mail-config.glade.h:85
+#: 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
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -4260,7 +4684,7 @@ msgid "_Change Organizer"
 msgstr "����:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:445
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "�ٸ� �̵��� �ʴ�(_I)..."
 
@@ -4269,27 +4693,97 @@ msgstr "�ٸ� �̵��� �ʴ�(_I)..."
 msgid "_Other Organizer"
 msgstr "����:"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "����"
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+msgid "rd"
+msgstr ""
+
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "��(_F):"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "��"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "��Ÿ"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "��Ʈ"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "���̱�"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "��Ÿ �ѽ�"
+
+#: 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:1260
 msgid "on the"
 msgstr ""
 
-#: 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 ""
 
@@ -4355,16 +4849,20 @@ msgstr "��"
 msgid "year(s)"
 msgstr "��"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:56
+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
+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?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
@@ -4382,7 +4880,7 @@ msgid "Progress"
 msgstr "������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr ""
 
@@ -4394,16 +4892,20 @@ msgstr "�켱����(_P):"
 msgid "_Status:"
 msgstr "����(_S):"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr ""
+
 #: 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:324
 #, fuzzy
 msgid "Assignment"
 msgstr "�����"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "����:"
 
@@ -4415,197 +4917,158 @@ msgstr "���� ��¥(_r):"
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "100%"
-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:751 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:941 calendar/gui/e-day-view.c:3544
-#: calendar/gui/e-week-view.c:3422 mail/folder-browser.c:1447
-#: shell/e-shortcuts-view.c:384
+#: 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
 #, fuzzy
 msgid "_Open"
 msgstr "����"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "�ٸ� �̸����� ����..."
+
+#: calendar/gui/e-calendar-table.c:974 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:978 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:947 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3433 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:979 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:949 calendar/gui/e-day-view.c:3530
-#: calendar/gui/e-day-view.c:3557 calendar/gui/e-week-view.c:3409
-#: calendar/gui/e-week-view.c:3435 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:980 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/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:984
 #, fuzzy
-msgid "_Mark as Complete"
-msgstr "�Ϸ� ǥ��"
+msgid "_Assign Task"
+msgstr "�����"
 
-#: calendar/gui/e-calendar-table.c:956
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
-msgid "_Delete this Task"
-msgstr "�� ������ �����մϴ�"
+msgid "_Forward as iCalendar"
+msgstr "�޷� �ҷ����̱�"
+
+#: calendar/gui/e-calendar-table.c:986
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "�Ϸ� ǥ��"
 
-#: calendar/gui/e-calendar-table.c:959
+#: calendar/gui/e-calendar-table.c:987
 #, fuzzy
-msgid "_Mark Tasks as Complete"
+msgid "_Mark Selected Tasks as Complete"
 msgstr "�Ϸ� ǥ��"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:992
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "�� ������ �����մϴ�"
 
-#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7115
-#: calendar/gui/e-week-view.c:3918
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 #, fuzzy
 msgid "Click to add a task"
 msgstr "�۾���Ͽ� �߰��ϱ�"
 
-#. 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 ""
-
-#. 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 ""
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 #, fuzzy
 msgid "Complete"
 msgstr "�Ϸ��"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "�Ϸ� ��¥"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "������ ��"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "�������� ��ġ"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "�켱����"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "���"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, fuzzy
 msgid "Task sort"
 msgstr "�۾�"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr ""
 
+#. 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 ""
+
+#. 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 ""
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -4613,409 +5076,181 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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 ""
 
 #. 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 ""
 
 #. 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
 msgid "am"
 msgstr "����"
 
 #. 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
 msgid "pm"
 msgstr "����"
 
-#: calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
-msgid "New All Day _Event"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3535 calendar/gui/e-week-view.c:3414
-#: ui/evolution-calendar.xml.h:17
-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:3549
 #, fuzzy
-msgid "_Go to Date..."
-msgstr "��¥�� �̵�..."
-
-#: calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-#, fuzzy
-msgid "_Delete this Appointment"
-msgstr "�� ����� �����մϴ�"
-
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
-#, fuzzy
-msgid "Make this Occurrence _Movable"
-msgstr "���� ������ ����"
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
-#, fuzzy
-msgid "Delete this _Occurrence"
-msgstr "�� �޼����� �����մϴ�"
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
-msgid "Delete _All Occurrences"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:524
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Task begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:534
-#, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "����� ����"
-
-#: calendar/gui/e-itip-control.c:538
-msgid "Begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:550
-#, fuzzy
-msgid "Meeting ends: <b>"
-msgstr "ȸ�� ���� �ð�(_e):"
-
-#: calendar/gui/e-itip-control.c:553
-#, fuzzy
-msgid "Free/Busy info ends: <b>"
-msgstr "����� ����"
-
-#: calendar/gui/e-itip-control.c:557
-msgid "Ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:571
-#, fuzzy
-msgid "Task Completed: <b>"
-msgstr "�Ϸ��"
+msgid "New _Appointment"
+msgstr "�� ���"
 
-#: calendar/gui/e-itip-control.c:581
-msgid "Task Due: <b>"
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 #, fuzzy
-msgid "iCalendar Information"
-msgstr "����� ����"
-
-#. Title
-#: calendar/gui/e-itip-control.c:633
-#, fuzzy
-msgid "iCalendar Error"
-msgstr "�޷�"
-
-#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
-#, fuzzy
-msgid "An unknown person"
-msgstr "�� ������ ����"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
+msgid "New Meeting"
+msgstr "���� ���"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "<i>None</i>"
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
 msgstr ""
 
-#: 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
-#, fuzzy
-msgid "Choose an action:"
-msgstr "������ ��������"
-
-#: calendar/gui/e-itip-control.c:779
-#, fuzzy
-msgid "Update"
-msgstr "�۾�"
-
-#: 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
-msgid "OK"
-msgstr "Ȯ��"
-
-#: calendar/gui/e-itip-control.c:795
-#, fuzzy
-msgid "Accept"
-msgstr "����"
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "�μ�..."
 
-#: calendar/gui/e-itip-control.c:796
-#, fuzzy
-msgid "Tentatively accept"
-msgstr "������"
+#: 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-itip-control.c:797
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 #, fuzzy
-msgid "Decline"
-msgstr "�ݴ�"
+msgid "_Go to Date..."
+msgstr "��¥�� �̵�..."
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: ui/evolution-calendar.xml.h:31
 #, fuzzy
-msgid "Send Free/Busy Information"
+msgid "_Publish Free/Busy Information"
 msgstr "����� ����"
 
-#: calendar/gui/e-itip-control.c:824
-msgid "Update respondent status"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:838
-#, fuzzy
-msgid "Send Latest Information"
-msgstr "����"
-
-#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
-#, fuzzy
-msgid "Cancel"
-msgstr "��ҵ�"
-
-#: calendar/gui/e-itip-control.c:867
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:868
-#, fuzzy
-msgid "Meeting Information"
-msgstr "���� ����"
-
-#: calendar/gui/e-itip-control.c:872
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:873
-#, fuzzy
-msgid "Meeting Proposal"
-msgstr "���� ���"
-
-#: calendar/gui/e-itip-control.c:877
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:878
-#, fuzzy
-msgid "Meeting Update"
-msgstr "ȸ�� ���� �ð�(_e):"
-
-#: calendar/gui/e-itip-control.c:882
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:883
-msgid "Meeting Update Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:887
-#, fuzzy, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
-
-#: calendar/gui/e-itip-control.c:888
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
 #, fuzzy
-msgid "Meeting Reply"
-msgstr "���� ���"
-
-#: calendar/gui/e-itip-control.c:892
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
+msgid "_Configure..."
+msgstr "���� ����"
 
-#: calendar/gui/e-itip-control.c:893
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
 #, fuzzy
-msgid "Meeting Cancellation"
-msgstr "������ ��������"
+msgid "_Configure Pilot..."
+msgstr "���� ����"
 
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
-#: calendar/gui/e-itip-control.c:982
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-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
+msgid "_Save As..."
+msgstr "�ٸ��̸����� ����(_S)..."
 
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 #, fuzzy
-msgid "Bad Meeting Message"
-msgstr "�޼����� ����"
-
-#: calendar/gui/e-itip-control.c:917
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr ""
+msgid "_Schedule Meeting..."
+msgstr "����"
 
-#: calendar/gui/e-itip-control.c:918
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 #, fuzzy
-msgid "Task Information"
-msgstr "����"
-
-#: calendar/gui/e-itip-control.c:922
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr ""
+msgid "_Forward as iCalendar..."
+msgstr "�޷� �ҷ����̱�"
 
-#: calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 #, fuzzy
-msgid "Task Proposal"
-msgstr "�۾��е�"
-
-#: calendar/gui/e-itip-control.c:927
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr ""
+msgid "Make this Occurrence _Movable"
+msgstr "���� ������ ����"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 #, fuzzy
-msgid "Task Update"
-msgstr "�۾�"
-
-#: calendar/gui/e-itip-control.c:932
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr ""
+msgid "Delete this _Occurrence"
+msgstr "�� �޼����� �����մϴ�"
 
-#: calendar/gui/e-itip-control.c:933
-msgid "Task Update Request"
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:937
-#, fuzzy, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
-
-#: calendar/gui/e-itip-control.c:938
-#, fuzzy
-msgid "Task Reply"
-msgstr "ȸ��"
-
-#: calendar/gui/e-itip-control.c:942
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:943
-#, fuzzy
-msgid "Task Cancellation"
-msgstr "���� ���"
-
-#: calendar/gui/e-itip-control.c:948
-#, fuzzy
-msgid "Bad Task Message"
-msgstr "�޼����� ����"
-
-#: calendar/gui/e-itip-control.c:967
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, fuzzy, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "����� ����"
-
-#: calendar/gui/e-itip-control.c:968
-#, fuzzy
-msgid "Free/Busy Information"
-msgstr "����� ����"
-
-#: calendar/gui/e-itip-control.c:972
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr ""
+msgid "Error executing %s."
+msgstr "���� ������ ����: %s: %s"
 
-#: calendar/gui/e-itip-control.c:973
-msgid "Free/Busy Request"
+#: 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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:977
-#, fuzzy, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
-
-#: calendar/gui/e-itip-control.c:978
-msgid "Free/Busy Reply"
+#: calendar/gui/e-itip-control.c:1564
+msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:1566
 #, fuzzy
-msgid "Bad Free/Busy Message"
-msgstr "�޼��� �μ�"
-
-#: calendar/gui/e-itip-control.c:1052
-msgid "The message does not appear to be properly formed"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1071
-msgid "The message contains only unsupported requests."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
-msgid "The attachment does not contain a valid calendar message"
-msgstr ""
+msgid "Update complete\n"
+msgstr "�Ϸ�� ��¥:"
 
-#: calendar/gui/e-itip-control.c:1130
-msgid "The attachment has no viewable calendar items"
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1231
-#, fuzzy
-msgid "Update complete\n"
-msgstr "�Ϸ�� ��¥:"
-
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1284
-msgid "Attendee status ould not be updated!\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1638
+#, fuzzy
+msgid "Attendee status could not be updated!\n"
+msgstr "������ �ּ�"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1640
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "������ �ּ�"
 
-#: calendar/gui/e-itip-control.c:1288
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% �Ϸ�(_p):"
 
-#: calendar/gui/e-itip-control.c:1348 calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "���� ��¥"
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "���� ����"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "���� ����"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -5055,222 +5290,225 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1535
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 #, fuzzy
 msgid "Required Participants"
 msgstr "�� ������"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Optional Participants"
 msgstr "�� ������"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 #, fuzzy
 msgid "Non-Participants"
 msgstr "�� ������"
 
-#: 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:771
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 #, fuzzy
 msgid "Group"
 msgstr "�׷� �̸�:"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 #, fuzzy
 msgid "Resource"
 msgstr "�������:"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr ""
 
-#: 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:775
-#: calendar/gui/e-meeting-model.c:791
-#: 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 ""
-
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "����"
 
-#: 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:788
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "�� ������"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr ""
 
-#: 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:816
+#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 #, fuzzy
 msgid "Needs Action"
 msgstr "���� ����"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 #, fuzzy
 msgid "Accepted"
 msgstr "����"
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 #, fuzzy
 msgid "Declined"
 msgstr "�ݴ�"
 
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:819 calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 #, fuzzy
 msgid "Delegated"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 #, fuzzy
 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: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:2088
 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: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:2118 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 ""
 
 #. 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 "%Y/%m/%d"
 
-#: calendar/gui/e-meeting-time-sel.c:428
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "�繫�� ����"
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "���� ����"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "����(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:641
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "ȸ�� ���� �ð�(_s):"
 
-#: calendar/gui/e-meeting-time-sel.c:660
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "ȸ�� ���� �ð�(_e):"
 
-#: 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:355
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "�Ϸ� ��¥"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "����ó�� �����"
+
+#: calendar/gui/e-tasks.c:659
+#, fuzzy
+msgid "Expunging"
+msgstr "���� ����"
+
+#: calendar/gui/e-week-view.c:3438
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "�� ���..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "�� ����� �����մϴ�"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'���ִ� ������ ������ �����ϴ�"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1865
+#: calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "�޷� ����"
@@ -5332,273 +5570,256 @@ msgstr "�ÿ�"
 msgid "September"
 msgstr "����"
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:220
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:570
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "�˶� ��� ���丮�� ������� �����ϴ�"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2205
-#, fuzzy
-msgid "Task"
-msgstr "�۾�"
-
-#: calendar/gui/print.c:2262
-#, fuzzy, c-format
-msgid "Status: %s"
-msgstr "����(_S):"
-
-#: calendar/gui/print.c:2280
-#, fuzzy, c-format
-msgid "Priority: %s"
-msgstr "�켱����(_P):"
-
-#: calendar/gui/print.c:2294
-#, fuzzy, c-format
-msgid "Percent Complete: %i"
-msgstr "�ۼ�Ʈ �Ϸ�"
-
-#: calendar/gui/print.c:2306
-#, fuzzy, c-format
-msgid "URL: %s"
-msgstr "%s ����"
-
-#: calendar/gui/print.c:2320
-#, fuzzy, c-format
-msgid "Categories: %s"
-msgstr ""
-"\n"
-"���: "
-
-#: calendar/gui/print.c:2331
-#, fuzzy
-msgid "Contacts: "
-msgstr "����ó(_C)"
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2358 my-evolution/e-summary.c:619
-#: 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:2894
+#: 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:2550
 #, fuzzy
 msgid "Print Item"
 msgstr "�� �׸��� �μ�"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "�μ� ����"
 
-#: 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 ""
+
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "ǥ���� �۾� ������ URI URI"
 
-#: calendar/gui/tasks-control-factory.c:75
+#: calendar/gui/tasks-control.c:456
 msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
+"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 ""
 
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "�޷� �μ��ϱ�"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5631,135 +5852,1714 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/pcs/query.c:234
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "�޷�"
+
+#: calendar/importers/icalendar-importer.c:663
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "�޷� ����"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:258
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:263
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:300
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:305
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:339
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:344
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:371
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:376
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:412
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:508
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:513
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:650
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:655
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:679
+#: 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:721
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: 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)"
 msgstr ""
 
-#: calendar/pcs/query.c:821
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:866
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:871
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1159
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
-#: camel/camel-cipher-context.c:171
+#.
+#. * 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
+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
+msgid "America/Adak"
+msgstr ""
+
+#: calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr ""
+
+#: calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr ""
+
+#: calendar/zones.h:62
+msgid "America/Antigua"
+msgstr ""
+
+#: calendar/zones.h:63
+msgid "America/Araguaina"
+msgstr ""
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr ""
+
+#: calendar/zones.h:66
+msgid "America/Barbados"
+msgstr ""
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: calendar/zones.h:68
+#, fuzzy
+msgid "America/Belize"
+msgstr "ũ��"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+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
+msgid "America/Caracas"
+msgstr ""
+
+#: calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr ""
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+msgid "America/Cayman"
+msgstr ""
+
+#: calendar/zones.h:79
+msgid "America/Chicago"
+msgstr ""
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr ""
+
+#: calendar/zones.h:82
+msgid "America/Costa_Rica"
+msgstr ""
+
+#: calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr ""
+
+#: calendar/zones.h:84
+msgid "America/Curacao"
+msgstr ""
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+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
+msgid "America/Dominica"
+msgstr ""
+
+#: calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr ""
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+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
+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 "ij����"
+
+#: calendar/zones.h:100
+msgid "America/Guadeloupe"
+msgstr ""
+
+#: calendar/zones.h:101
+msgid "America/Guatemala"
+msgstr ""
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+msgid "America/Guyana"
+msgstr ""
+
+#: calendar/zones.h:104
+msgid "America/Halifax"
+msgstr ""
+
+#: calendar/zones.h:105
+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
+msgid "America/Jamaica"
+msgstr ""
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+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
+msgid "America/La_Paz"
+msgstr ""
+
+#: calendar/zones.h:120
+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
+msgid "America/Maceio"
+msgstr ""
+
+#: calendar/zones.h:124
+msgid "America/Managua"
+msgstr ""
+
+#: calendar/zones.h:125
+msgid "America/Manaus"
+msgstr ""
+
+#: calendar/zones.h:126
+msgid "America/Martinique"
+msgstr ""
+
+#: calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr ""
+
+#: calendar/zones.h:128
+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
+msgid "America/Montreal"
+msgstr ""
+
+#: calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr ""
+
+#: calendar/zones.h:137
+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
+msgid "America/Nome"
+msgstr ""
+
+#: calendar/zones.h:141
+msgid "America/Noronha"
+msgstr ""
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+#, fuzzy
+msgid "America/Panama"
+msgstr "ij����"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+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
+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
+msgid "America/Regina"
+msgstr ""
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+msgid "America/Rosario"
+msgstr ""
+
+#: calendar/zones.h:157
+msgid "America/Santiago"
+msgstr ""
+
+#: calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr ""
+
+#: calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr ""
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr ""
+
+#: calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr ""
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr ""
+
+#: calendar/zones.h:165
+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
+msgid "America/Tijuana"
+msgstr ""
+
+#: calendar/zones.h:172
+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
+msgid "America/Yakutat"
+msgstr ""
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: calendar/zones.h:178
+#, fuzzy
+msgid "Antarctica/Casey"
+msgstr "�ڵ�"
+
+#: calendar/zones.h:179
+#, fuzzy
+msgid "Antarctica/Davis"
+msgstr "�ڵ�"
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: calendar/zones.h:181
+#, fuzzy
+msgid "Antarctica/Mawson"
+msgstr "�ڵ�"
+
+#: calendar/zones.h:182
+#, fuzzy
+msgid "Antarctica/McMurdo"
+msgstr "�ڵ�"
+
+#: calendar/zones.h:183
+#, fuzzy
+msgid "Antarctica/Palmer"
+msgstr "�ڵ�"
+
+#: calendar/zones.h:184
+#, fuzzy
+msgid "Antarctica/South_Pole"
+msgstr "�ڵ�"
+
+#: calendar/zones.h:185
+#, fuzzy
+msgid "Antarctica/Syowa"
+msgstr "�ڵ�"
+
+#: 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
+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
+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
+msgid "Asia/Hong_Kong"
+msgstr ""
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+#: 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
+msgid "Asia/Kuwait"
+msgstr ""
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr ""
+
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Muscat"
+msgstr "����"
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: calendar/zones.h:235
+#, fuzzy
+msgid "Asia/Omsk"
+msgstr "�����"
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+msgid "Asia/Qatar"
+msgstr ""
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:247
+msgid "Asia/Singapore"
+msgstr ""
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+msgid "Atlantic/Bermuda"
+msgstr ""
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+msgid "Atlantic/Cape_Verde"
+msgstr ""
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+msgid "Australia/Adelaide"
+msgstr ""
+
+#: calendar/zones.h:274
+msgid "Australia/Brisbane"
+msgstr ""
+
+#: calendar/zones.h:275
+msgid "Australia/Broken_Hill"
+msgstr ""
+
+#: calendar/zones.h:276
+msgid "Australia/Darwin"
+msgstr ""
+
+#: calendar/zones.h:277
+msgid "Australia/Hobart"
+msgstr ""
+
+#: calendar/zones.h:278
+msgid "Australia/Lindeman"
+msgstr ""
+
+#: calendar/zones.h:279
+msgid "Australia/Lord_Howe"
+msgstr ""
+
+#: calendar/zones.h:280
+msgid "Australia/Melbourne"
+msgstr ""
+
+#: calendar/zones.h:281
+msgid "Australia/Perth"
+msgstr ""
+
+#: calendar/zones.h:282
+msgid "Australia/Sydney"
+msgstr ""
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:284
+msgid "Europe/Andorra"
+msgstr ""
+
+#: calendar/zones.h:285
+#, fuzzy
+msgid "Europe/Athens"
+msgstr "����"
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:296
+msgid "Europe/Gibraltar"
+msgstr ""
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:304
+msgid "Europe/Luxembourg"
+msgstr ""
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr ""
+
+#: calendar/zones.h:308
+#, fuzzy
+msgid "Europe/Monaco"
+msgstr "������"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr ""
+
+#: calendar/zones.h:312
+#, fuzzy
+msgid "Europe/Paris"
+msgstr "����"
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:317
+msgid "Europe/San_Marino"
+msgstr ""
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "����"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+msgid "Indian/Mahe"
+msgstr ""
+
+#: calendar/zones.h:341
+msgid "Indian/Maldives"
+msgstr ""
+
+#: calendar/zones.h:342
+#, fuzzy
+msgid "Indian/Mauritius"
+msgstr "����"
+
+#: calendar/zones.h:343
+#, fuzzy
+msgid "Indian/Mayotte"
+msgstr "����"
+
+#: calendar/zones.h:344
+#, fuzzy
+msgid "Indian/Reunion"
+msgstr "����:"
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
+#: camel/camel-cipher-context.c:169
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 
-#: camel/camel-cipher-context.c:211
+#: camel/camel-cipher-context.c:209
 #, fuzzy
 msgid "Clearsigning is not supported by this cipher"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 
-#: camel/camel-cipher-context.c:251
+#: camel/camel-cipher-context.c:249
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 
-#: camel/camel-cipher-context.c:294
+#: camel/camel-cipher-context.c:292
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 
-#: camel/camel-cipher-context.c:336
+#: camel/camel-cipher-context.c:334
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 
+#: camel/camel-data-cache.c:169
+#, fuzzy
+msgid "Unable to create cache path"
+msgstr ""
+"��������� ������ ���� �����ϴ�: %s\n"
+" %s"
+
+#: camel/camel-data-cache.c:441
+#, fuzzy, c-format
+msgid "Could not remove cache entry: %s: %s"
+msgstr ""
+"%s ���丮�� ������ ���� �����ϴ�:\n"
+"%s"
+
 #: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
@@ -5784,100 +7584,81 @@ msgstr ""
 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:710 camel/camel-filter-driver.c:719
 #, fuzzy
 msgid "Syncing folders"
 msgstr "���� ����ȭ"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "���� ��� ����: %s: %s"
+
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "���� ������ ����: %s: %s"
+
+#: camel/camel-filter-driver.c:887
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "�ּҷ��� ������ �����ϴ�"
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "�ּҷ��� ������ �����ϴ�"
 
-#: camel/camel-filter-driver.c:688
-#, fuzzy, c-format
+#: camel/camel-filter-driver.c:911
+#, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "�޼��� %s�� ��������"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 #, fuzzy
 msgid "Cannot open message"
 msgstr ""
 "�޼����� ������ ����: %s\n"
 "  %s"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "���޵� �޽��� - %s"
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 #, fuzzy
 msgid "Syncing folder"
 msgstr "���� ����ȭ"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "���� ��� ����: %s: %s"
-
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "���� ������ ����: %s: %s"
+#: camel/camel-filter-search.c:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "�޼����� ������ ÷���մϴ�"
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "���� � ������ ����: %s: %s"
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1040
-#, fuzzy, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-"ã�⸦ ���൵�� ����: %s:\n"
-"%s"
-
-#: camel/camel-folder.c:1080
-#, fuzzy, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-"ã�⸦ ���൵�� ����: %s:\n"
-"%s"
-
-#: camel/camel-folder.c:1262
-#, fuzzy
-msgid "Moving messages"
-msgstr "�޼��� ����"
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5886,19 +7667,39 @@ msgstr ""
 "ã�⸦ ���൵�� ����: %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 ""
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
+#: camel/camel-folder.c:1038
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"ã�⸦ ���൵�� ����: %s:\n"
+"%s"
+
+#: camel/camel-folder.c:1078
+#, fuzzy, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+"ã�⸦ ���൵�� ����: %s:\n"
+"%s"
+
+#: camel/camel-folder.c:1260
+#, fuzzy
+msgid "Moving messages"
+msgstr "�޼��� ����"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -6004,117 +7805,122 @@ msgstr ""
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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:755
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:953
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:959
+#: 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:970
+#: 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:1143
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1153
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1160
+#: 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:1169
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1352
+#: camel/camel-pgp-context.c:1387
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-provider.c:130
+#: camel/camel-pgp-mime.c:354
+msgid "This is a digitally signed message part"
+msgstr ""
+
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s ���� ���� %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 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:270
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(�𸣴� ȣ��Ʈ)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "�۾� ���"
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
+#: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -6212,13 +8018,14 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
-msgstr ""
+#, fuzzy
+msgid "Login"
+msgstr "�����°�"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
@@ -6229,9 +8036,19 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "���� ����."
 
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+#: camel/camel-sasl-ntlm.c:33
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+
 #: 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
+#: 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 "��й�ȣ"
 
@@ -6275,26 +8092,39 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:611
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:638
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:663
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:665
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "ȸ�� �ּ�:"
+
+#: camel/camel-service.c:787
+msgid "Host lookup failed: host not found"
+msgstr ""
+
+#: camel/camel-service.c:790
+msgid "Host lookup failed: unknown reason"
+msgstr ""
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
@@ -6303,12 +8133,12 @@ msgstr ""
 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 ""
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6355,25 +8185,24 @@ msgstr "�޼����� ������ ÷���մϴ�"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
 msgstr ""
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:428
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6383,16 +8212,34 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: 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:491
 #, 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"
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
 msgstr ""
 
 #: camel/camel-url.c:288
@@ -6405,27 +8252,27 @@ msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
 msgid "No such message %s in %s"
 msgstr "�׷� �޼��� ����: %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "�׷� �޼��� ����: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: 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"
@@ -6437,80 +8284,80 @@ msgstr ""
 "�޼����� ������ ����: %2$s �������� %1$s\n"
 "  %3$s"
 
-#: camel/providers/imap/camel-imap-command.c:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP server�κ��� ����ġ���� �亯: %s"
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ������ ����: %s"
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr "������ �亯�� �ʹ� ���� �������ϴ�."
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
 
-#: camel/providers/imap/camel-imap-command.c:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP �����κ��� ����ġ���� OK�亯�� ��: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "�޽������� ����"
 
-#: camel/providers/imap/camel-imap-folder.c:1566
-#: camel/providers/imap/camel-imap-folder.c:1978
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "�� �޽����� ���� ������ ���� �����ϴ�"
 
-#: camel/providers/imap/camel-imap-folder.c:1717
-#: camel/providers/imap/camel-imap-folder.c:1798
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1723
+#: camel/providers/imap/camel-imap-folder.c:1799
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "�޽������� ����"
 
-#: camel/providers/imap/camel-imap-folder.c:2015
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, fuzzy, c-format
 msgid "Could not open cache directory: %s"
 msgstr ""
 "%s ���丮�� ������ ���� �����ϴ�:\n"
 "%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
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "�޼����� ������ ÷���մϴ�"
@@ -6525,7 +8372,7 @@ msgstr "�� ������ �ۼ��մϴ�"
 msgid "Check for new messages in all folders"
 msgstr "�޼����� �� ������ �����մϴ�"
 
-#: 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 "����"
 
@@ -6558,28 +8405,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s Ÿ�� ������ ���� ����"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6587,105 +8434,126 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "%s���� ������ ����"
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:64
 #, fuzzy
 msgid "Local delivery"
 msgstr "���� ����"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, 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 "������ ������ �����ϴ�: %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 ""
 
-#: 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:300 mail/mail-local.c:864
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: 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 ""
+"���� ���� %s�� �� ���� �����ϴ�:\n"
+"%s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%s"
 
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -6706,7 +8574,7 @@ msgstr "���������� �޼����� �����ϼ� �����ϴ�: %s: %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6718,7 +8586,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "�׷� �޼��� ����"
 
@@ -6727,7 +8595,7 @@ msgstr "�׷� �޼��� ����"
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -6735,14 +8603,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "���� `%s'�� �������� �ʽ��ϴ�."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -6752,43 +8620,67 @@ msgstr ""
 "���� `%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 ""
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: 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:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 "���� `%s'�� ����� ����:\n"
 "%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
 #, fuzzy, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "���������� �޼����� �����ϼ� �����ϴ�: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "�� ������ �ۼ��մϴ�"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+#, fuzzy
+msgid "Storing folder"
+msgstr "���� ����ȭ"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -6806,9 +8698,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6818,138 +8710,126 @@ msgstr ""
 "  %3$s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#. 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-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: 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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, 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:652
 #, c-format
 msgid "Could not rename folder: %s"
 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
@@ -6969,14 +8849,14 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, fuzzy, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 "%s ���丮��\n"
 "������ ���� �����ϴٿ���: %s"
 
-#: camel/providers/local/camel-spool-folder.c:512
+#: camel/providers/local/camel-spool-folder.c:515
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "���������� �޼����� �����ϼ� �����ϴ�: %s: %s"
@@ -6987,6 +8867,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "���� `%s'�� �������� �ʽ��ϴ�."
@@ -6996,77 +8877,56 @@ msgstr "���� `%s'�� �������� �ʽ��ϴ�."
 msgid "Spool mail file %s"
 msgstr "���� ���� ���� %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "�ӽ� ������ ������ ����: %s"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "�ӽ� ������ ������ ����: %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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
+#: camel/providers/local/camel-spoold-store.c:117
 #, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
+msgid "Store `%s' does not exist or is not a directory"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: 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
-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/local/camel-spoold-store.c:173
 #, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
+msgid "Mail tree %s"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
@@ -7077,164 +8937,201 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:495
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:175
-msgid "Retrieving POP summary"
-msgstr "POP ����� ������"
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "%s���� ������ ����"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, fuzzy, c-format
-msgid "Could not check POP server for new messages: %s"
+msgid "Could not get group: %s"
 msgstr "�޼����� ������ ����: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "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 "�޽������� ����"
+
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "�� ������ ����"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/nntp/camel-nntp-summary.c:566
 #, fuzzy
-msgid "Expunging deleted messages"
-msgstr "������ �޼����� �μ��մϴ�"
+msgid "Use cancel"
+msgstr "��ҵ�"
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, fuzzy, c-format
-msgid "Could not fetch message: %s"
-msgstr "�޼����� ������ ����: %s"
+msgid "Operation failed: %s"
+msgstr "�۾� ���"
 
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr ""
+#: camel/providers/pop3/camel-pop3-folder.c:272
+msgid "Retrieving POP summary"
+msgstr "POP ����� ������"
+
+#: 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:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "������ ������ �����ϴ�: %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:325
+#, fuzzy
+msgid "Expunging deleted messages"
+msgstr "������ �޼����� �μ��մϴ�"
 
-#: 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 ""
 
-#: 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/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 ""
+"�޼����� ������ ����: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "�� ������ ����"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 #, fuzzy
 msgid "Message storage"
 msgstr "�޼��� �Ӹ���"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 #, fuzzy
 msgid "Leave messages on server"
 msgstr "������ ���� �����"
 
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:43
 #, fuzzy, c-format
 msgid "Delete after %s day(s)"
 msgstr "�� ������ �����մϴ�"
 
-#: 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:84
 msgid "POP"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
-
-#: 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:214
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
 #, fuzzy, c-format
-msgid "Could not connect to server: %s"
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr ""
+#: camel/providers/pop3/camel-pop3-store.c:210
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "�۵��� �������� ����"
 
-#: camel/providers/pop3/camel-pop3-store.c:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr ""
+#: camel/providers/pop3/camel-pop3-store.c:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "���� ����."
 
-#: camel/providers/pop3/camel-pop3-store.c:378
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, 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
 msgid ""
 "Unable to connect to POP server.\n"
-"Error sending username: %s"
+"No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:381
-#: camel/providers/pop3/camel-pop3-store.c:418
-msgid "(Unknown)"
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "IMAP ������ ����: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "����� ����"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, c-format
+msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:566
-#, fuzzy, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "IMAP server�κ��� ����ġ���� �亯: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr ""
 
@@ -7244,49 +9141,50 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: 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 ""
 
-#: 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:162
+#: camel/providers/sendmail/camel-sendmail-transport.c:178
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr "�޼������� ���� ����� �˾Ƴ����� ����"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:204
 msgid "sendmail"
 msgstr ""
 
-#: 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:37 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr ""
 
@@ -7294,122 +9192,141 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: 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:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: 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:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "����"
 
-#: 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:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: 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: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:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: 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: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: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: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: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:205
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: 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:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr ""
 
-#: 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:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: 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:219
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "������ �ʿ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:376
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+msgid "server does not appear to support SSL"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+msgid "STARTTLS response error"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:458
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "%s Ÿ�� ������ ���� ����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:415
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7417,128 +9334,126 @@ msgid ""
 "\n"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ���� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "�޼����� ����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+msgid "Cannot send message: one or more invalid recipients"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "����:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: 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:1081
+msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
+#. 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
+msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1030
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+msgid "QUIT response error"
 msgstr ""
 
 #: composer/e-msg-composer-attachment-bar.c:101
@@ -7566,19 +9481,19 @@ msgid "%.1fG"
 msgstr ""
 
 #. 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: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:531
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "÷������ �߰�..."
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "�޼����� ������ ÷���մϴ�"
 
@@ -7606,112 +9521,102 @@ 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:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "�ּҷ�"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "���� ���:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "ȸ�� �ּ�:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "�޴� ���:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "�޼����� ���� ����� �Է��ϼ���"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:402
 msgid "Bcc:"
 msgstr "���� ����:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 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:228
+#: 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:696
+#: composer/e-msg-composer.c:718
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "������ �д��� ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:894
-msgid "Save as..."
-msgstr "�ٸ� �̸����� ����..."
-
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:967
 #, fuzzy
 msgid "Warning!"
 msgstr "���"
 
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "���� ������ ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ �д��� ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:1019
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "���� ������ ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:1077
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1058
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7720,7 +9625,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1091
+#: composer/e-msg-composer.c:1065
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7729,7 +9634,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1100
+#: composer/e-msg-composer.c:1074
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7738,13 +9643,13 @@ msgstr ""
 "%s�� �޽��� ������ ���� �߻�:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1202
+#: composer/e-msg-composer.c:1176
 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:1356
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7754,31 +9659,31 @@ msgstr ""
 "\n"
 "����� ������ �����Ͻðڽ��ϱ�?"
 
-#: composer/e-msg-composer.c:1363
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "���޵� �޽���"
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "���� ����"
 
-#: composer/e-msg-composer.c:1535
+#: composer/e-msg-composer.c:1513
 #, fuzzy
 msgid "Insert File"
 msgstr "�ؽ�Ʈ ���� ����"
 
-#: composer/e-msg-composer.c:1910 composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "���� �޼����� �ۼ��մϴ�"
 
-#: composer/e-msg-composer.c:2368
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2391 composer/e-msg-composer.c:2446
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -7787,7 +9692,7 @@ msgstr ""
 "���� �Ż� ������ �Է��� �Ǿ����� �ʾұ⶧����\n"
 "�޽��� �ۼ�â�� ���� ���� �����ϴ�."
 
-#: 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."
@@ -7795,19 +9700,20 @@ msgstr ""
 "���� �Ż� ������ �Է��� �Ǿ����� �ʾұ⶧����\n"
 "�޽��� �ۼ�â�� ���� ���� �����ϴ�."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:83
-msgid "Evolution"
-msgstr ""
-
-#: data/evolution.desktop.in.h:2
+#: data/evolution.desktop.in.h:1
 #, fuzzy
 msgid "The Evolution groupware suite"
 msgstr "Evolution ��."
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Evolution��..."
+
 #: data/evolution.keys.in.h:1
 #, fuzzy
 msgid "address card"
@@ -7858,15 +9764,31 @@ msgstr "����"
 msgid "Subject does not contain"
 msgstr "������������"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
 #. Remember the password?
-#: e-util/e-passwords.c:347 mail/mail-session.c:267
+#: 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:268
+#: 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 ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "���"
+
 #. 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
@@ -7946,13 +9868,13 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
@@ -7993,11 +9915,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:191
 msgid "seconds"
 msgstr "��"
 
@@ -8067,7 +9985,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr ""
 
@@ -8080,15 +9998,15 @@ msgid "Filter Rules"
 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"
@@ -8097,19 +10015,11 @@ msgstr ""
 "��, ���� ������ ���� �����̳׿�.\n"
 "�ڷ� ���ư� ������ ����� ������ �����ϼ���."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:364
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 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 ""
@@ -8119,7 +10029,7 @@ msgstr ""
 "���Խ� '%s'���� ����:\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "�׽�Ʈ"
 
@@ -8128,40 +10038,41 @@ msgstr "�׽�Ʈ"
 msgid "You must name this filter."
 msgstr "�並 %s�� ����"
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "��Ģ �̸�: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "�������"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "���� ����"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "���� ����"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "��� ������ �� ������ ��"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "� �����̶� ������ ��"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "���� �߰�"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 #, fuzzy
 msgid "incoming"
 msgstr "�����°�"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 #, fuzzy
 msgid "outgoing"
 msgstr "�����°�"
@@ -8206,6 +10117,11 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
 #: filter/libfilter-i18n.h:3
 #, fuzzy
 msgid "Assign Color"
@@ -8219,6 +10135,11 @@ msgstr ""
 msgid "Attachments"
 msgstr "÷��"
 
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "ũ��"
+
 #: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "����"
@@ -8272,147 +10193,153 @@ msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Exist"
+msgid "Execute Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "exists"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Expression"
-msgstr "ǥ��"
+msgid "exists"
+msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Important"
-msgstr "�߿�"
+msgid "Expression"
+msgstr "ǥ��"
 
 #: filter/libfilter-i18n.h:25
-msgid "is"
+msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr ""
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "�߿�"
 
 #: filter/libfilter-i18n.h:27
-msgid "is less than"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "is not"
+msgid "is after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "Mailing list"
+msgid "is before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "Message Body"
+msgid "is Flagged"
 msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "Message Header"
-msgstr "�޼��� �Ӹ���"
+msgid "is greater than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr "�޼����� �޾ҽ��ϴ�"
+msgid "is less than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "Message was sent"
-msgstr "�޼����� ���½��ϴ�"
+msgid "is not"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "Move to Folder"
-msgstr "������ �̵�"
+msgid "is not Flagged"
+msgstr ""
 
 #: filter/libfilter-i18n.h:35
-msgid "on or after"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "on or before"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
+msgid "Message Header"
+msgstr "�޼��� �Ӹ���"
+
+#: filter/libfilter-i18n.h:38
+msgid "Move to Folder"
+msgstr "������ �̵�"
+
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "�Ҹ� ����"
+
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "�޴� ���"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "ȸ��"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1404
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "���� ����"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 #, fuzzy
 msgid "Size (kB)"
 msgstr "ũ��"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 #, fuzzy
 msgid "Source Account"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 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
 #, fuzzy
 msgid "Add Rule"
 msgstr "�Ÿ��� ��Ģ�� �߰�"
 
-#: filter/rule-editor.c:344
+#: filter/rule-editor.c:361
 #, fuzzy
 msgid "Edit Rule"
 msgstr "���� �̸� ����"
@@ -8434,18 +10361,18 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: 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
 #, fuzzy
 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 ""
 
-#: 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
 #, fuzzy, c-format
 msgid "Importing %s as %s"
@@ -8453,14 +10380,14 @@ msgstr ""
 "%s�� ��������.\n"
 "%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
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "\"%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:101
 msgid "Mail"
 msgstr "����"
 
@@ -8485,26 +10412,77 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:106
+#: 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 ""
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr ""
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "���� ���� ���� %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "IMAP ������ ���캾�ϴ�"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 #, fuzzy
 msgid "Starting import"
 msgstr "���� ��¥(_S):"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 #, fuzzy
 msgid "Settings"
 msgstr "����..."
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "�Ÿ��� ����"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8526,47 +10504,97 @@ msgid "Pine"
 msgstr "�μ�"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "�޷� ����"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "�ּҷ�"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+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 ""
 
-#: 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:8
 msgid "Evolution mail executive summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr ""
 
-#: 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 "�޷� ����"
+
+#: 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
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "�޷� ����"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 #, fuzzy
 msgid "Mail configuration interface"
 msgstr "���� ����"
 
-#: mail/component-factory.c:100
+#: 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:101
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr ""
-
 #: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
@@ -8577,246 +10605,265 @@ msgstr "���� ����"
 msgid "Virtual Trash folder"
 msgstr "���� ����"
 
-#: mail/component-factory.c:129
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "KPOP �������� �����Ҽ� ����: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 #, fuzzy
 msgid "Properties..."
 msgstr "����(_P)..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/component-factory.c:967
 #, fuzzy
 msgid "New Mail Message"
 msgstr "���� �޼���(_M)"
 
-#: mail/component-factory.c:951
-#, fuzzy
-msgid "New _Mail Message"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
 msgstr "���� �޼���(_M)"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1009
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "����ϴ� ��..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:271
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"������ ����"
 
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "����"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "������"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d �ʸ���"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr " %d �ʸ���"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1049
+#: mail/folder-browser.c:1088
 #, fuzzy
-msgid "Create vFolder from Search"
-msgstr "�޽����κ��� �Ÿ��� ����(_C)"
+msgid "Create _Virtual Folder From Search..."
+msgstr "�޽����κ��� ���� ���� ����(_V)"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "���񿡵��� ��������(_S)"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "�߼��ڿ����� ��������(_n)"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "�����ڿ����� ��������(_R)"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "���񿡴��� �Ÿ���(_S)"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "�߼��ο����� �Ÿ���(_n)"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "�����ο����� �Ÿ���(_R)"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "�޼��� �μ�"
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:104
-msgid "_Save As..."
-msgstr "�ٸ��̸����� ����(_S)..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "�μ�(_P)"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "���� ������� ȸ��"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Reply to _List"
 msgstr "��ü ȸ��(_A)"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "��ü ȸ��(_A)"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "����(_F)"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "�Ϸ��"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "���(_l)"
+
+#. separator here?
+#: mail/folder-browser.c:1628 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:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "���� ���� ������ ǥ��(_n)"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "�߿�"
 
-#: mail/folder-browser.c:1462
+#: mail/folder-browser.c:1631
 #, fuzzy
-msgid "Mark as Unim_portant"
+msgid "_Mark as Unimportant"
 msgstr "���� ���� ������ ǥ��"
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
-msgstr "������ �̵�(_M)..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "�ǻ츲(_U)"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
+msgstr "������ �̵�..."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "������ ����(_C)..."
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:106
-msgid "_Undelete"
-msgstr "�ǻ츲(_U)"
+#: mail/folder-browser.c:1645
+msgid "Label"
+msgstr ""
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1649
 #, fuzzy
-msgid "Add Sender to Address Book"
+msgid "Add Sender to Address_book"
 msgstr "�ּҷ� �߰�"
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "�Ÿ��� ����"
 
-#: mail/folder-browser.c:1478
+#: mail/folder-browser.c:1657
 #, fuzzy
-msgid "Create Ru_le From Message"
+msgid "Crea_te Rule From Message"
 msgstr "�޽����κ��� �Ÿ��� ����(_C)"
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr ""
-
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
-msgstr ""
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.h:26
-#, fuzzy
-msgid "Default"
-msgstr "����"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "���ϸ� ����Ʈ������ ����"
 
 #: mail/folder-info.c:64
 #, fuzzy
@@ -8843,43 +10890,34 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
 
 #: mail/local-config.glade.h:1
-#, fuzzy
-msgid "Body contents"
-msgstr "����"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "���� ���� ����:"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:2
 #, fuzzy
-msgid "Indexing:"
-msgstr "����(_I)"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "���Ϲڽ� ����"
+msgid "Index body contents"
+msgstr "����"
 
-#: 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:4
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr ""
 
-#: 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:9
 msgid "mh"
 msgstr ""
 
@@ -8898,92 +10936,82 @@ msgstr "Evolution ��ġ"
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:962
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
 #, fuzzy
-msgid "Could not save signature file."
-msgstr "�ӽ� ������ ������ ����: %s"
+msgid "_Host:"
+msgstr "ȣ��Ʈ:"
 
-#: mail/mail-account-gui.c:1039
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
 #, fuzzy
-msgid "Save signature"
-msgstr "����:"
+msgid "User_name:"
+msgstr "������̸�:"
 
-#: mail/mail-account-gui.c:1045
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
 #, fuzzy
-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-account-gui.c:1654
-msgid "You may not create two accounts with the same name."
-msgstr ""
+msgid "_Path:"
+msgstr "���:"
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-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-accounts.c:194
-msgid "Disable"
+#: 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-accounts.c:196
-msgid "Enable"
+#: mail/mail-account-gui.c:1985
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "������ �� ������ ����⸦ ���Ͻʴϱ�?"
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:216
 #, fuzzy
 msgid "Don't delete"
 msgstr "�ǻ츲"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 #, fuzzy
 msgid "Really delete account?"
 msgstr "�⺻ �������� �ϱ�"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-msgid "Are you sure you want to delete this news account?"
-msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
-
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:783 mail/mail-config.glade.h:42
-#, fuzzy
-msgid "Mail Settings"
-msgstr "���� ����(_M)..."
-
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
 msgstr ""
 
-#: mail/mail-autofilter.c:215
-#, c-format
-msgid "Subject is %s"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
 msgstr ""
 
-#: mail/mail-autofilter.c:231
-#, c-format
-msgid "Mail from %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
+
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
 msgstr ""
 
-#: mail/mail-autofilter.c:287
-#, c-format
-msgid "%s mailing list"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "���� ����"
+
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "�Ÿ��� ��Ģ�� �߰�"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8991,126 +11019,135 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: 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:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:280
+#: mail/mail-callbacks.c:209
 #, fuzzy
 msgid "Send anyway?"
 msgstr "�̸��� ������"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 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:299
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 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:469
-msgid "This message contains invalid recipients:"
-msgstr ""
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:600
+#: mail/mail-callbacks.c:497
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:838
+#: mail/mail-callbacks.c:623
+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
 #, fuzzy
 msgid "an unknown sender"
 msgstr "�� ������ ����"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 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:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1753
+#: mail/mail-callbacks.c:2091
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: mail/mail-callbacks.c:1778
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1831
+#: mail/mail-callbacks.c:2169
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: mail/mail-callbacks.c:1857
+#: mail/mail-callbacks.c:2195
 #, fuzzy
 msgid "No Message Selected"
 msgstr "�޼����� �޾ҽ��ϴ�"
 
-#: mail/mail-callbacks.c:1951
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:2122 widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "���"
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "������ �޼����� �μ��մϴ�"
 
-#: mail/mail-callbacks.c:2129
+#: mail/mail-callbacks.c:2373
+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
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -9118,32 +11155,36 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2136
-#, fuzzy
-msgid "Do not ask me again."
-msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
-
-#: mail/mail-callbacks.c:2244
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2256
+#: mail/mail-callbacks.c:2740
 #, fuzzy
 msgid "Filters"
 msgstr "���� �Ÿ���(_F)..."
 
-#: mail/mail-callbacks.c:2319
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "�޼��� �μ�"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2863
+msgid "US-Letter"
+msgstr ""
+
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "�޼��� �μ��� ����"
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
@@ -9185,17 +11226,35 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Evolution ���� ������"
 
-#: mail/mail-config.c:326
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "����"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "��"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "�޴»��"
+
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "��¥"
 
-#: mail/mail-config.c:1859
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -9203,92 +11262,151 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, c-format
-msgid "%s: Inbox"
-msgstr ""
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2183 mail/mail-config.c:2187
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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 " _Check for supported types "
+msgid " "
 msgstr ""
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr "����"
+#, 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
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
-msgid "Account"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
 msgstr "����"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Accounts"
-msgstr "����"
+msgid "Advanced Options"
+msgstr "���� ���"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: 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:10
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "�޼����� ������ ÷���մϴ�"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "÷��"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "�� ������ �ۼ��մϴ�"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+msgid "C_haracter set:"
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "�ݱ�"
+
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "�� ������ �ۼ��մϴ�"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:29
 #, fuzzy
-msgid "Composer"
-msgstr "���� �ۼ�"
+msgid "Composing Messages"
+msgstr "���� �޼����� �ۼ��մϴ�"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:16
-#, fuzzy
-msgid "Confirm when Expunging a folder"
-msgstr "���� ����"
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9298,397 +11416,592 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:23
-msgid "De_fault"
+#: mail/mail-config.glade.h:37
+msgid "Dari"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
-msgid "Default Forward style is: "
+#: mail/mail-config.glade.h:38
+msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "����"
+
+#: mail/mail-config.glade.h:40
+msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "������ ����"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr "ǥ��"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr ""
+"�޼����� ������ ����: %s\n"
+"  %s"
 
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 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:46
 #, fuzzy
-msgid "Drafts"
-msgstr "�ʰ�"
+msgid "Drafts _folder:"
+msgstr "�� ������ ����"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr ""
 
-#: 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:48
+msgid "E_nable advanced options"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
 #, fuzzy
-msgid "Edit..."
-msgstr "����"
+msgid "Emacs"
+msgstr "���̱�"
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "����"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "���ڿ��� �ּ�:"
+
+#: mail/mail-config.glade.h:52
+msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
-msgid "Get Digital ID..."
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "���� ����"
+
+#: mail/mail-config.glade.h:54
+msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "HTML signature file:"
-msgstr "����:"
+msgid "Font Properties"
+msgstr "����"
 
-#: mail/mail-config.glade.h:36
-msgid "IMAPv4 "
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "���޵� �޽���"
+
+#: mail/mail-config.glade.h:57
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
+#: mail/mail-config.glade.h:58
+msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
+#: mail/mail-config.glade.h:59
+msgid "Hulu"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:60
+msgid "IMAPv4 "
+msgstr ""
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
+msgid "Identity"
+msgstr ""
+
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Inline"
 msgstr "�ݴ�"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "������ ��ħ"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "���޵� �޽���"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Mailbox location"
 msgstr "���Ϲڽ� ����"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:72
 #, fuzzy
-msgid "Make this my _default account"
-msgstr "�⺻ �������� �ϱ�"
+msgid "Message Composer"
+msgstr "�޼��� �Ӹ���"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "ǥ��"
+
+#: mail/mail-config.glade.h:74
+msgid "Microsoft"
+msgstr ""
+
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "LDAP ����"
 
-#: mail/mail-config.glade.h:46
-msgid "News"
-msgstr "����"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "���� ����"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "�� ��������(_N)"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Optional Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "����:"
+
+#: mail/mail-config.glade.h:83
+msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
-msgid "Pretty Good Privacy"
+#: mail/mail-config.glade.h:88
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
-msgid "Prompt when sending HTML messages to contacts that don't want them"
+#: mail/mail-config.glade.h:89
+msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Prompt when sending messages with an _empty subject"
-msgstr ""
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "����ó�� �μ��մϴ�"
 
-#: mail/mail-config.glade.h:57
-msgid "Prompt when sending messages with only _Bcc recipients defined"
+#: mail/mail-config.glade.h:91
+msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:58
-msgid "Qmail maildir "
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
 msgstr ""
+"�޼����� ������ ����: %s\n"
+"  %s"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quoted"
 msgstr "�ο�(_Q)"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
 msgstr "�� ��й�ȣ ���"
 
-#: 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 "ȸ�� �ּ�:"
+
+#: 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:99
 #, fuzzy
-msgid "Receiving Mail"
-msgstr "������ ����"
+msgid "Receiving _Options"
+msgstr "�޾���"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:100
 #, fuzzy
-msgid "Receiving Options"
-msgstr "�޾���"
+msgid "Remember this _password"
+msgstr "�� ��й�ȣ ���"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Required Information"
 msgstr "����� ����"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
-msgstr ""
-
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:103
 #, fuzzy
-msgid "Security"
+msgid "S_ecurity"
 msgstr "����(_S)"
 
-#: mail/mail-config.glade.h:68
-#, fuzzy
-msgid "Select Filter Log file..."
-msgstr "������ ��������"
+#: mail/mail-config.glade.h:104
+msgid "Same as text"
+msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
-msgstr "PGP ���α׷� ������ ����"
+#: mail/mail-config.glade.h:105
+msgid "Secure MIME (S/MIME)"
+msgstr ""
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "������ ����"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
 #, fuzzy
-msgid "Sending Mail"
-msgstr "������ ����"
+msgid "Select PGP program"
+msgstr "PGP ���α׷� ������ ����"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
+#: mail/mail-config.glade.h:111
 #, fuzzy
-msgid "Sent"
-msgstr "����"
+msgid "Select a signature file"
+msgstr "���� ����:"
 
-#: mail/mail-config.glade.h:74
+#: 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
+msgid "Sending Email"
+msgstr "������ ����"
+
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "�޼����� ������ ����"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "�޼������� �ٽ� ������(_R)"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "������ ������ �䱸�մϴ�"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Server _Type: "
 msgstr "���� ����: "
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
-msgstr "���� ����:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "���� ����(_S)"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "����:"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "Source Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr ""
-
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:124
 #, fuzzy
-msgid "Special Folders"
-msgstr "���� ����"
+msgid "Specify _filename:"
+msgstr "���� �̸�:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
-msgid "Use s_ecure connection (SSL)"
+#: mail/mail-config.glade.h:128
+#, 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
+msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "���̱�"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "���� ����:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "���� ����:"
+
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "�� ������ �ۼ��մϴ�"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
 #, fuzzy
-msgid "_Drafts folder:"
-msgstr "�� ������ ����"
+msgid "_Confirm when expunging a folder"
+msgstr "���� ����"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:149
 #, fuzzy
-msgid "_Email Address:"
-msgstr "���ڿ��� �ּ�:"
+msgid "_Defaults"
+msgstr "����"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
+#: mail/mail-config.glade.h:151
+msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:153
+msgid "_Enable spell checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:154
 #, fuzzy
-msgid "_Full Name:"
+msgid "_Filename:"
+msgstr "���� �̸�:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "�ٸ� �ּҷ� ����"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "��ü�̸�:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "�̸��� ������"
+
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:103
-msgid "_Highlight citations with"
+#: mail/mail-config.glade.h:162
+msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
-#, fuzzy
-msgid "_Host:"
-msgstr "ȣ��Ʈ:"
+#: mail/mail-config.glade.h:163
+msgid "_Language:"
+msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
-msgstr ""
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "�⺻ �������� �ϱ�"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:166
 #, fuzzy
-msgid "_Mark messages as Read after"
+msgid "_Mark messages as read after"
 msgstr "�޼��� �Ӹ���"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Name:"
 msgstr "�̸�:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
-#, fuzzy
-msgid "_Organization:"
-msgstr "����:"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP ���"
 
-#: mail/mail-config.glade.h:112
+#: 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"
+msgstr ""
+
+#: mail/mail-config.glade.h:173
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr ""
+
+#: mail/mail-config.glade.h:174
 #, fuzzy
-msgid "_Path:"
-msgstr "���:"
+msgid "_Random"
+msgstr "ij����"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:175
 #, fuzzy
-msgid "_Remember this password"
-msgstr "�� ��й�ȣ ���"
+msgid "_Receiving Mail"
+msgstr "������ ����"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Send mail in HTML format by default."
-msgstr "�⺻���� ������ HTML�������� ����"
+msgid "_Reply style:"
+msgstr "��ü ȸ��"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 #, fuzzy
-msgid "_Server Type: "
-msgstr "���� ����: "
+msgid "_Script:"
+msgstr "����(_S)"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "����(_S)"
+
+#: mail/mail-config.glade.h:180
 #, fuzzy
-msgid "_Signature file:"
-msgstr "���� ����:"
+msgid "_Sending Mail"
+msgstr "������ ����"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:181
 #, fuzzy
-msgid "_Username:"
-msgstr "������̸�:"
+msgid "_Show animated images"
+msgstr "����"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:182
+#, fuzzy
+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
+msgid "_Variable-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "_every"
 msgstr "����"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr "����"
+
+#: mail/mail-config.glade.h:188
 #, fuzzy
 msgid "description"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr ""
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr "��."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr ""
@@ -9731,189 +12044,182 @@ msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 msgid "Could not create a S/MIME decode context."
 msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "÷������ ����"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "�ӽ� mbox `%s'�� ������� �����ϴ�: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "��ũ�� ����..."
 
-#: 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 "%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 "����"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "�޽��� ������ �о�帲"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1594
+#: mail/mail-display.c:1833
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "�����Ѱ� ����"
 
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1835
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "������ ����(_f)... (��ĥ����)"
 
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1837
 #, fuzzy
 msgid "Save Image as..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s ÷��"
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "��¥"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 #, fuzzy
 msgid "Bad Address"
 msgstr "���ڿ��� �ּ�:"
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "������"
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 #, fuzzy
 msgid "Reply-To"
 msgstr "ȸ�� �ּ�:"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "�޴»��"
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 #, fuzzy
 msgid "Cc"
 msgstr "����:"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 #, fuzzy
 msgid "Bcc"
 msgstr "���� ����:"
 
-#: mail/mail-format.c:1813
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-
-#: mail/mail-format.c:1836
-msgid "Evolution does not recognize this type of signed message."
-msgstr ""
-
-#: mail/mail-format.c:1844
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1852
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
+msgstr "����"
 
-#: mail/mail-format.c:2068
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2087
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2129
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "���� �缳��"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, 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:762
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" ������ \"%s\" �������� �ٲٱ�"
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "%s ����"
@@ -9938,120 +12244,115 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "���� �缳��"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 #, fuzzy
 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:557
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ������ ��"
 
-#: mail/mail-ops.c:677
+#: mail/mail-ops.c:723
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "�޼����� ����"
 
-#: mail/mail-ops.c:696
+#: mail/mail-ops.c:742
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: 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:791
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "�޼����� ������ ����"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "�޽������� %s�� �̵�"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "�޽������� %s�� ����"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "�̵���"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "������"
 
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr ""
-
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "���޵� �޽���"
 
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s ������ ����"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1424
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "%s ������ ����"
 
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1518
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "%s ������ ����"
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1569
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "���� �缳��"
 
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "���� ����"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "�޼��� %s�� ��������"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1721
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "�޼������� ��������"
 
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1807
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "�޽������� ����"
 
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -10060,7 +12361,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -10069,11 +12370,11 @@ msgstr ""
 "%s�� �޽��� ������ ���� �߻�:\n"
 " %s"
 
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "÷�� ����"
 
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -10082,22 +12383,27 @@ msgstr ""
 "��� ������ ����� ����: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
 
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2138
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "�޾���"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "�˻�(_S)"
 
@@ -10145,71 +12451,97 @@ msgstr "���:"
 msgid "Cancelling..."
 msgstr "����ϴ� ��..."
 
-#: 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 ""
 
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "����:"
 
-#: mail/mail-send-recv.c:286
+#: mail/mail-send-recv.c:287
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "���� �ְ��ޱ�"
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:289
 #, fuzzy
 msgid "Cancel All"
 msgstr "��ҵ�"
 
-#: mail/mail-send-recv.c:348
+#: mail/mail-send-recv.c:349
 #, fuzzy
 msgid "Updating..."
 msgstr "������ ..."
 
-#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
+#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
 #, fuzzy
 msgid "Waiting..."
 msgstr "��ٸ��� �� ..."
 
-#: mail/mail-send-recv.c:533
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "��ҵ�."
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 #, fuzzy
 msgid "User canceled operation."
 msgstr "����� ����"
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 #, fuzzy
 msgid "Enter Password"
 msgstr "��й�ȣ"
 
-#: mail/mail-tools.c:255
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "�ӽ� ������ ������ ����: %s"
+
+#: mail/mail-signature-editor.c:172
+#, fuzzy
+msgid "Save signature"
+msgstr "����:"
+
+#: mail/mail-signature-editor.c:178
+#, fuzzy
+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:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "���� ����:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "���޵� �޽��� - %s"
 
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:261
 #, fuzzy
 msgid "Forwarded message"
 msgstr "���޵� �޽���"
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:399
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "���޵� �޽���"
@@ -10233,107 +12565,165 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "���� ����"
+#: mail/mail-vfolder.c:785
+#, fuzzy
+msgid "vFolders"
+msgstr "����"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:825
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "�������� ����"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:841
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:895
 msgid "New VFolder"
 msgstr "�� ��������"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 #, fuzzy
 msgid "(No subject)"
 msgstr "����: (���� ����)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "�޼���"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:640
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:641
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:642
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "�������� �������� �޼���"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:647
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:648
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:652
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:653
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:903
+#: mail/message-list.c:991
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:910
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:941
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2396
 #, fuzzy
 msgid "Generating message list"
 msgstr "�޽������� ����"
 
-#: mail/message-list.etspec.h:2
-msgid "Flagged"
+#: mail/message-list.etspec.h:3
+msgid "Due By"
 msgstr ""
 
 #: 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 ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "�޾���"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "ũ��"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "��ҵ�"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "������ ������ ����"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "���� ����"
+
+#: 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-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr "ȸ��"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "��ü ȸ��"
+
+#: 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
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -10355,7 +12745,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #: 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 "����"
 
@@ -10406,95 +12796,10696 @@ msgid "_Unsubscribe"
 msgstr "���� ����"
 
 #: 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"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolution ���� �ۼ���."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "�ּҷ�"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "�ּҷ�"
+
+#: 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 ""
 
-#: my-evolution/component-factory.c:153
+#: my-evolution/Locations.h:1
 #, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
+msgid "Aarhus"
+msgstr "����"
+
+#: my-evolution/Locations.h:2
+msgid "Abakan"
+msgstr ""
+
+#: my-evolution/Locations.h:3
+msgid "Abbotsford"
+msgstr ""
+
+#: my-evolution/Locations.h:4
+#, fuzzy
+msgid "Aberdeen"
+msgstr "������"
+
+#: my-evolution/Locations.h:5
+msgid "Abha"
+msgstr ""
+
+#: 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
+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 ""
+
+#: my-evolution/Locations.h:17
+#, fuzzy
+msgid "Aden"
+msgstr "������"
+
+#: my-evolution/Locations.h:18
+msgid "Adrar"
+msgstr ""
+
+#: my-evolution/Locations.h:19
+#, fuzzy
+msgid "Aeroparque"
+msgstr "������"
+
+#: my-evolution/Locations.h:20
+msgid "Aeropuerto del Norte"
+msgstr ""
+
+#: my-evolution/Locations.h:21
+msgid "Afonsos"
+msgstr ""
+
+#: my-evolution/Locations.h:22
+#, fuzzy
+msgid "Africa"
+msgstr "�ڵ�"
+
+#: my-evolution/Locations.h:23
+msgid "Afyon"
+msgstr ""
+
+#: my-evolution/Locations.h:24
+#, fuzzy
+msgid "Agen"
+msgstr "����"
+
+#: my-evolution/Locations.h:25
+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 "ij����"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:39
+#, fuzzy
+msgid "Alamosa"
+msgstr "���� �ɼ�"
+
+#: my-evolution/Locations.h:40
+#, fuzzy
+msgid "Alaska"
+msgstr "�۾�"
+
+#: my-evolution/Locations.h:41
+msgid "Al Baha"
+msgstr ""
+
+#: my-evolution/Locations.h:43
+msgid "Albany"
+msgstr ""
+
+#: my-evolution/Locations.h:44
+msgid "Albenga"
+msgstr ""
+
+#: my-evolution/Locations.h:45
+msgid "Alberta"
+msgstr ""
+
+#: my-evolution/Locations.h:46
+msgid "Alborg"
+msgstr ""
+
+#: my-evolution/Locations.h:47
+msgid "Albuquerque"
+msgstr ""
+
+#: my-evolution/Locations.h:48
+#, fuzzy
+msgid "Alderney"
+msgstr "���� �̸�:"
+
+#: my-evolution/Locations.h:49
+#, fuzzy
+msgid "Alesund"
+msgstr "�ٽ� ����"
+
+#: my-evolution/Locations.h:50
+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
+msgid "Alghero"
+msgstr ""
+
+#: my-evolution/Locations.h:56
+msgid "Algona"
+msgstr ""
+
+#: my-evolution/Locations.h:57
+#, fuzzy
+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 ""
+
+#: my-evolution/Locations.h:62
+#, fuzzy
+msgid "Alliance"
+msgstr "����"
+
+#: my-evolution/Locations.h:63
+msgid "Alma"
+msgstr ""
+
+#: my-evolution/Locations.h:64
+msgid "Almeria"
+msgstr ""
+
+#: my-evolution/Locations.h:65
+#, fuzzy
+msgid "Alpena"
+msgstr "����"
+
+#: my-evolution/Locations.h:66
+msgid "Al Qaysumah"
+msgstr ""
+
+#: my-evolution/Locations.h:67
+#, fuzzy
+msgid "Alta"
+msgstr "����"
+
+#: my-evolution/Locations.h:68
+msgid "Altamira"
+msgstr ""
+
+#: my-evolution/Locations.h:69
+#, fuzzy
+msgid "Alton"
+msgstr "�ൿ(_A)"
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr ""
+
+#: my-evolution/Locations.h:71
+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 ""
+
+#: my-evolution/Locations.h:75
+#, fuzzy
+msgid "Amarillo"
+msgstr "�̸���"
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr ""
+
+#: my-evolution/Locations.h:77
+#, fuzzy
+msgid "Ambler"
+msgstr "����"
+
+#: my-evolution/Locations.h:78
+#, fuzzy
+msgid "Amelia"
+msgstr "����"
+
+#: my-evolution/Locations.h:79
+msgid "Amendola"
+msgstr ""
+
+#: my-evolution/Locations.h:80
+#, fuzzy
+msgid "Ames"
+msgstr "���� �Ÿ���(_F)..."
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr ""
+
+#: my-evolution/Locations.h:82
+msgid "Amsterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:83
+msgid "Anadyr"
+msgstr ""
+
+#: my-evolution/Locations.h:84
+msgid "Anaktuvuk"
+msgstr ""
+
+#: my-evolution/Locations.h:85
+msgid "Anapa"
+msgstr ""
+
+#: my-evolution/Locations.h:86
+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
+msgid "Anderson"
+msgstr ""
+
+#: my-evolution/Locations.h:91
+#, fuzzy
+msgid "Andoya"
+msgstr "�������"
+
+#: my-evolution/Locations.h:92
+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
+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 ""
+
+#: my-evolution/Locations.h:101
+#, fuzzy
+msgid "Anniston"
+msgstr "����"
+
+#: my-evolution/Locations.h:102
+msgid "Antalya"
+msgstr ""
+
+#: my-evolution/Locations.h:103
+#, fuzzy
+msgid "Antartica"
+msgstr "�ڵ�"
+
+#: my-evolution/Locations.h:104
+#, fuzzy
+msgid "Antigo"
+msgstr "�ൿ(_A)"
+
+#: my-evolution/Locations.h:105
+#, fuzzy
+msgid "Antigua"
+msgstr "����"
+
+#: my-evolution/Locations.h:106
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: 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
+msgid "Apalachicola"
+msgstr ""
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr ""
+
+#: my-evolution/Locations.h:112
+msgid "Aquadilla"
+msgstr ""
+
+#: my-evolution/Locations.h:113
+#, fuzzy
+msgid "Aracaju"
+msgstr "���"
+
+#: my-evolution/Locations.h:114
+msgid "Arad"
+msgstr ""
+
+#: my-evolution/Locations.h:115
+msgid "Arar"
+msgstr ""
+
+#: my-evolution/Locations.h:116
+#, fuzzy
+msgid "Araxos"
+msgstr "�̸�(_L):"
+
+#: my-evolution/Locations.h:117
+#, fuzzy
+msgid "Arcata"
+msgstr "�ڵ�"
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr ""
+
+#: my-evolution/Locations.h:119
+msgid "Arequipa"
+msgstr ""
+
+#: my-evolution/Locations.h:121
+#, fuzzy
+msgid "Arica"
+msgstr "�ڵ�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:125
+#, fuzzy
+msgid "Arlington"
+msgstr "����"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:131
+#, fuzzy
+msgid "Ashfield"
+msgstr "�����"
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:133
+#, fuzzy
+msgid "Ashland"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:134
+#, fuzzy
+msgid "Asia"
+msgstr "����"
+
+#: my-evolution/Locations.h:135
+#, fuzzy
+msgid "Aspen"
+msgstr "����"
+
+#: my-evolution/Locations.h:136
+#, fuzzy
+msgid "Asswan"
+msgstr "����"
+
+#: my-evolution/Locations.h:137
+msgid "Astoria"
+msgstr ""
+
+#: my-evolution/Locations.h:138
+msgid "Astrakhan"
+msgstr ""
+
+#: my-evolution/Locations.h:139
+msgid "Asturias"
+msgstr ""
+
+#: 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 "����"
+
+#: 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
+msgid "Auckland"
+msgstr ""
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:150
+msgid "Augusta"
+msgstr ""
+
+#: my-evolution/Locations.h:151
+msgid "Aurora"
+msgstr ""
+
+#: my-evolution/Locations.h:152
+#, fuzzy
+msgid "Austin"
+msgstr "����"
+
+#: my-evolution/Locations.h:153
+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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:170
+#, fuzzy
+msgid "Ball Mountain"
+msgstr "����"
+
+#: my-evolution/Locations.h:171
+msgid "Baltimore"
+msgstr ""
+
+#: my-evolution/Locations.h:172
+msgid "Baltimore-Glen Burnie"
+msgstr ""
+
+#: my-evolution/Locations.h:173
+msgid "Banak"
+msgstr ""
+
+#: my-evolution/Locations.h:174
+msgid "Bandarabbass"
+msgstr ""
+
+#: my-evolution/Locations.h:175
+msgid "Bangor"
+msgstr ""
+
+#: my-evolution/Locations.h:176
+msgid "Baracoa"
+msgstr ""
+
+#: my-evolution/Locations.h:177
+msgid "Barbers Point"
+msgstr ""
+
+#: my-evolution/Locations.h:178
+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
+msgid "Barking Sand"
+msgstr ""
+
+#: my-evolution/Locations.h:185
+msgid "Barksdale"
+msgstr ""
+
+#: 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
+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
+msgid "Batman"
+msgstr ""
+
+#: my-evolution/Locations.h:196
+msgid "Baton Rouge"
+msgstr ""
+
+#: my-evolution/Locations.h:197
+msgid "Battle Creek"
+msgstr ""
+
+#: my-evolution/Locations.h:198
+msgid "Battle Mountain"
+msgstr ""
+
+#: my-evolution/Locations.h:199
+#, fuzzy
+msgid "Bauru"
+msgstr "����"
+
+#: my-evolution/Locations.h:200
+msgid "Bayamo"
+msgstr ""
+
+#: my-evolution/Locations.h:201
+msgid "Bayreuth"
+msgstr ""
+
+#: my-evolution/Locations.h:202
+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 "�˻�"
+
+#: my-evolution/Locations.h:208
+#, fuzzy
+msgid "Beckley"
+msgstr "ũ��"
+
+#: my-evolution/Locations.h:209
+msgid "Bedford"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:219
+#, fuzzy
+msgid "Belleville"
+msgstr "ũ��"
+
+#: my-evolution/Locations.h:220
+msgid "Bellingham"
+msgstr ""
+
+#: my-evolution/Locations.h:221
+msgid "Belmar-Farmingdale"
+msgstr ""
+
+#: 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
+msgid "Benbecula"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:231
+msgid "Bergen"
+msgstr ""
+
+#: my-evolution/Locations.h:232
+msgid "Bergstrom AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:233
+msgid "Berlevag"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:237
+#, fuzzy
+msgid "Bern"
+msgstr "������ ��"
+
+#: my-evolution/Locations.h:238
+#, fuzzy
+msgid "Bethel"
+msgstr "��Ÿ"
+
+#: my-evolution/Locations.h:239
+msgid "Bethlehem Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:240
+#, fuzzy
+msgid "Bettles"
+msgstr "ũ��"
+
+#: 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 ""
+
+#: 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
+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/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/Locations.h:254
+msgid "Bismark"
+msgstr ""
+
+#: my-evolution/Locations.h:255
+msgid "Blackpool"
+msgstr ""
+
+#: my-evolution/Locations.h:256
+msgid "Blagoveschensk"
+msgstr ""
+
+#: my-evolution/Locations.h:257
+#, fuzzy
+msgid "Blanding"
+msgstr "����"
+
+#: my-evolution/Locations.h:258
+msgid "Block Island"
+msgstr ""
+
+#: my-evolution/Locations.h:259
+msgid "Bloemfontein J. B. M. Hertzog "
+msgstr ""
+
+#: my-evolution/Locations.h:260
+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 ""
+
+#: my-evolution/Locations.h:267
+#, fuzzy
+msgid "Bodo"
+msgstr "����"
+
+#: my-evolution/Locations.h:268
+msgid "Bogota/Eldorado"
+msgstr ""
+
+#: my-evolution/Locations.h:269
+#, fuzzy
+msgid "Boise"
+msgstr "�ݱ�"
+
+#: my-evolution/Locations.h:271
+msgid "Bologna"
+msgstr ""
+
+#: my-evolution/Locations.h:272
+#, fuzzy
+msgid "Bolzano"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:273
+msgid "Bombay/Santacruz"
+msgstr ""
+
+#: my-evolution/Locations.h:274
+#, fuzzy
+msgid "Boone"
+msgstr "�Ϸ�"
+
+#: my-evolution/Locations.h:275
+msgid "Bordeaux"
+msgstr ""
+
+#: 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
+msgid "Bosnia-Herzegovina"
+msgstr ""
+
+#: my-evolution/Locations.h:280
+#, fuzzy
+msgid "Boston"
+msgstr "�Ʒ�:"
+
+#: my-evolution/Locations.h:281
+#, fuzzy
+msgid "Boulmer"
+msgstr "����"
+
+#: my-evolution/Locations.h:282
+#, fuzzy
+msgid "Bourges"
+msgstr "��"
+
+#: my-evolution/Locations.h:283
+msgid "Bournemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:284
+msgid "Bowling Green"
+msgstr ""
+
+#: my-evolution/Locations.h:285
+msgid "Bozeman"
+msgstr ""
+
+#: my-evolution/Locations.h:286
+msgid "Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:287
+msgid "Bradshaw Field"
+msgstr ""
+
+#: my-evolution/Locations.h:288
+msgid "Brainerd"
+msgstr ""
+
+#: my-evolution/Locations.h:289
+#, fuzzy
+msgid "Brasilia"
+msgstr "����"
+
+#: my-evolution/Locations.h:290
+msgid "Brasschaat"
+msgstr ""
+
+#: my-evolution/Locations.h:291
+#, fuzzy
+msgid "Bratislava"
+msgstr "����"
+
+#: my-evolution/Locations.h:292
+#, fuzzy
+msgid "Bratsk"
+msgstr "�ʰ�"
+
+#: my-evolution/Locations.h:293
+msgid "Braunschweig"
+msgstr ""
+
+#: 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
+msgid "Brindisi"
+msgstr ""
+
+#: my-evolution/Locations.h:300
+msgid "Brisbane"
+msgstr ""
+
+#: 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
+msgid "Broken Bow"
+msgstr ""
+
+#: my-evolution/Locations.h:306
+msgid "Bronnoysund"
+msgstr ""
+
+#: my-evolution/Locations.h:307
+msgid "Brookings"
+msgstr ""
+
+#: my-evolution/Locations.h:308
+msgid "Brooksville"
+msgstr ""
+
+#: my-evolution/Locations.h:309
+#, fuzzy
+msgid "Broome"
+msgstr "�Ʒ�:"
+
+#: my-evolution/Locations.h:310
+msgid "Brownsville"
+msgstr ""
+
+#: my-evolution/Locations.h:311
+msgid "Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:312
+msgid "Brussels-National Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:313
+msgid "Bryansk"
+msgstr ""
+
+#: 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
+msgid "Burbank"
+msgstr ""
+
+#: my-evolution/Locations.h:323
+#, fuzzy
+msgid "Burgas"
+msgstr "�ٻ�"
+
+#: my-evolution/Locations.h:324
+#, fuzzy
+msgid "Burley"
+msgstr "ȭ"
+
+#: my-evolution/Locations.h:325
+msgid "Burlington"
+msgstr ""
+
+#: my-evolution/Locations.h:326
+msgid "Burnet"
+msgstr ""
+
+#: my-evolution/Locations.h:327
+#, fuzzy
+msgid "Burns"
+msgstr "�ٻ�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:332
+#, fuzzy
+msgid "Cagliari"
+msgstr "�޷�"
+
+#: my-evolution/Locations.h:333
+#, fuzzy
+msgid "Cairns"
+msgstr "����"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:338
+#, fuzzy
+msgid "Calgary"
+msgstr "�޷�"
+
+#: my-evolution/Locations.h:339
+msgid "Cali/Alfonso Bonillaaragon"
+msgstr ""
+
+#: my-evolution/Locations.h:340
+#, fuzzy
+msgid "Caliente"
+msgstr "�޷�"
+
+#: my-evolution/Locations.h:341
+#, fuzzy
+msgid "California"
+msgstr "�� ����ó"
+
+#: my-evolution/Locations.h:342
+msgid "Calvi-Ste-Catherine"
+msgstr ""
+
+#: my-evolution/Locations.h:343
+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 "�ڵ���"
+
+#: my-evolution/Locations.h:347
+#, fuzzy
+msgid "Camiri"
+msgstr "����"
+
+#: my-evolution/Locations.h:348
+#, fuzzy
+msgid "Campeche"
+msgstr "�Ϸ��"
+
+#: my-evolution/Locations.h:349
+#, fuzzy
+msgid "Campinas"
+msgstr "����"
+
+#: my-evolution/Locations.h:350
+#, fuzzy
+msgid "Campo"
+msgstr "����"
+
+#: my-evolution/Locations.h:351
+msgid "Campo Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr ""
+
+#: my-evolution/Locations.h:353
+#, fuzzy
+msgid "Canaan"
+msgstr "ij����"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:363
+#, fuzzy
+msgid "Cancun"
+msgstr "��ҵ�"
+
+#: my-evolution/Locations.h:364
+msgid "Cannes-Mandelieu"
+msgstr ""
+
+#: my-evolution/Locations.h:365
+#, fuzzy
+msgid "Cantwell"
+msgstr "��ҵ�"
+
+#: my-evolution/Locations.h:366
+msgid "Cape Girardeau"
+msgstr ""
+
+#: my-evolution/Locations.h:367
+msgid "Cape Hatteras"
+msgstr ""
+
+#: my-evolution/Locations.h:368
+#, fuzzy
+msgid "Cape Lisburne"
+msgstr "�������:"
+
+#: my-evolution/Locations.h:369
+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
+msgid "Capo Mele"
+msgstr ""
+
+#: my-evolution/Locations.h:374
+msgid "Caracas La Carlota"
+msgstr ""
+
+#: my-evolution/Locations.h:375
+msgid "Caracas Maiquetia"
+msgstr ""
+
+#: my-evolution/Locations.h:376
+#, fuzzy
+msgid "Caravelas"
+msgstr "��ҵ�"
+
+#: my-evolution/Locations.h:377
+#, fuzzy
+msgid "Carbondale"
+msgstr "ij����"
+
+#: my-evolution/Locations.h:378
+#, fuzzy
+msgid "Cardiff"
+msgstr "ī��: "
+
+#: my-evolution/Locations.h:379
+#, fuzzy
+msgid "Caribou"
+msgstr "�ڵ���"
+
+#: my-evolution/Locations.h:380
+#, fuzzy
+msgid "Carlisle"
+msgstr "����"
+
+#: my-evolution/Locations.h:381
+msgid "Carlsbad"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:385
+#, fuzzy
+msgid "Cascade"
+msgstr "����"
+
+#: my-evolution/Locations.h:386
+#, fuzzy
+msgid "Casper"
+msgstr "����"
+
+#: my-evolution/Locations.h:387
+msgid "Catacamas"
+msgstr ""
+
+#: my-evolution/Locations.h:388
+#, fuzzy
+msgid "Catania"
+msgstr "ij����"
+
+#: 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 ""
+
+#: 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
+msgid "Cervia"
+msgstr ""
+
+#: my-evolution/Locations.h:397
+msgid "Chacarita"
+msgstr ""
+
+#: my-evolution/Locations.h:398
+#, fuzzy
+msgid "Chadron"
+msgstr "����"
+
+#: my-evolution/Locations.h:399
+#, fuzzy
+msgid "Challis"
+msgstr "����"
+
+#: my-evolution/Locations.h:400
+msgid "Chamberlain"
+msgstr ""
+
+#: my-evolution/Locations.h:401
+#, fuzzy
+msgid "Chambery"
+msgstr "����"
+
+#: my-evolution/Locations.h:402
+#, fuzzy
+msgid "Champaign"
+msgstr "ȸ��"
+
+#: my-evolution/Locations.h:403
+msgid "Chandalar Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:404
+#, fuzzy
+msgid "Chandler"
+msgstr "����"
+
+#: my-evolution/Locations.h:405
+#, fuzzy
+msgid "Chania"
+msgstr "����"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:410
+msgid "Charleston"
+msgstr ""
+
+#: 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 ""
+
+#: 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 "��"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:431
+#, fuzzy
+msgid "Chiclayo"
+msgstr "����"
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:462
+#, fuzzy
+msgid "Clarinda"
+msgstr "ij����"
+
+#: my-evolution/Locations.h:463
+#, fuzzy
+msgid "Clarion"
+msgstr "���(_l)"
+
+#: 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 ""
+
+#: 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
+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
+msgid "Cocos Island"
+msgstr ""
+
+#: my-evolution/Locations.h:477
+#, fuzzy
+msgid "Cody"
+msgstr "����"
+
+#: my-evolution/Locations.h:478
+msgid "Coeur d'Alene"
+msgstr ""
+
+#: my-evolution/Locations.h:479
+#, fuzzy
+msgid "Cold Bay"
+msgstr "����"
+
+#: my-evolution/Locations.h:480
+#, fuzzy
+msgid "Colima"
+msgstr "ȸ��"
+
+#: my-evolution/Locations.h:481
+#, fuzzy
+msgid "College Station"
+msgstr "��� ������"
+
+#: 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
+msgid "Columbia"
+msgstr ""
+
+#: my-evolution/Locations.h:488
+msgid "Columbia-McEntire"
+msgstr ""
+
+#: my-evolution/Locations.h:489
+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 ""
+
+#: my-evolution/Locations.h:494
+#, fuzzy
+msgid "Colville"
+msgstr "����"
+
+#: my-evolution/Locations.h:495
+msgid "Comodoro Rivadavia"
+msgstr ""
+
+#: my-evolution/Locations.h:496
+#, fuzzy
+msgid "Comox"
+msgstr "����"
+
+#: my-evolution/Locations.h:497
+msgid "Conceicao Do Araguaia"
+msgstr ""
+
+#: my-evolution/Locations.h:498
+#, fuzzy
+msgid "Concepcion"
+msgstr "���� ���"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:502
+#, fuzzy
+msgid "Connecticut"
+msgstr "����ó(_C)"
+
+#: my-evolution/Locations.h:503
+#, fuzzy
+msgid "Conroe"
+msgstr "������"
+
+#: my-evolution/Locations.h:504
+#, fuzzy
+msgid "Constantine"
+msgstr "����"
+
+#: my-evolution/Locations.h:505
+msgid "Copper Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:506
+msgid "Cordoba"
+msgstr ""
+
+#: my-evolution/Locations.h:507
+msgid "Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:508
+msgid "Cork"
+msgstr ""
+
+#: my-evolution/Locations.h:509
+#, fuzzy
+msgid "Coro"
+msgstr "����"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:513
+#, fuzzy
+msgid "Corrientes"
+msgstr "���"
+
+#: my-evolution/Locations.h:514
+msgid "Corsicana"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:520
+#, fuzzy
+msgid "Coventry"
+msgstr "����(_y):"
+
+#: 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 "����"
+
+#: my-evolution/Locations.h:524
+#, fuzzy
+msgid "Cranfield"
+msgstr "��ҵ�"
+
+#: my-evolution/Locations.h:525
+msgid "Crescent City"
+msgstr ""
+
+#: my-evolution/Locations.h:526
+#, fuzzy
+msgid "Creston"
+msgstr "����"
+
+#: 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
+msgid "Crotone"
+msgstr ""
+
+#: my-evolution/Locations.h:533
+msgid "Cuba Awrs"
+msgstr ""
+
+#: my-evolution/Locations.h:534
+msgid "Cuernavaca"
+msgstr ""
+
+#: my-evolution/Locations.h:535
+msgid "Cuiaba"
+msgstr ""
+
+#: 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 "ij����"
+
+#: my-evolution/Locations.h:539
+msgid "Cumberland"
+msgstr ""
+
+#: my-evolution/Locations.h:540
+msgid "Curitiba"
+msgstr ""
+
+#: my-evolution/Locations.h:541
+msgid "Curitiba Apt"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:556
+#, fuzzy
+msgid "Danbury"
+msgstr "�Ͽ�"
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:576
+#, fuzzy
+msgid "Delta"
+msgstr "����"
+
+#: my-evolution/Locations.h:577
+#, fuzzy
+msgid "Deming"
+msgstr "���� ���"
+
+#: my-evolution/Locations.h:578
+msgid "Den Helder/De Kooy"
+msgstr ""
+
+#: my-evolution/Locations.h:579
+#, fuzzy
+msgid "Denison"
+msgstr "����:"
+
+#: my-evolution/Locations.h:581
+#, fuzzy
+msgid "Denton"
+msgstr "����:"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:587
+#, fuzzy
+msgid "Des Moines"
+msgstr ""
+"\n"
+"��: "
+
+#: 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
+msgid "Dhahran"
+msgstr ""
+
+#: my-evolution/Locations.h:596
+#, fuzzy
+msgid "Dickinson"
+msgstr "ũ��:"
+
+#: my-evolution/Locations.h:597
+#, fuzzy
+msgid "Dijon"
+msgstr "�Ϸ�"
+
+#: my-evolution/Locations.h:598
+msgid "Dillingham"
+msgstr ""
+
+#: my-evolution/Locations.h:599
+#, fuzzy
+msgid "Dillon"
+msgstr "�Ϸ�"
+
+#: 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 "�Ϸ�"
+
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "�Ϸ�"
+
+#: my-evolution/Locations.h:610
+#, fuzzy
+msgid "Dongsha"
+msgstr "����"
+
+#: my-evolution/Locations.h:611
+msgid "Dongshi"
+msgstr ""
+
+#: my-evolution/Locations.h:612
+msgid "Don Torcuato"
+msgstr ""
+
+#: my-evolution/Locations.h:613
+msgid "Dortmund-Wickede"
+msgstr ""
+
+#: my-evolution/Locations.h:614
+#, fuzzy
+msgid "Dothan"
+msgstr "�Ϸ�"
+
+#: my-evolution/Locations.h:615
+msgid "Douglas"
+msgstr ""
+
+#: 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
+msgid "Dubai"
+msgstr ""
+
+#: my-evolution/Locations.h:620
+msgid "Dubbo"
+msgstr ""
+
+#: my-evolution/Locations.h:621
+#, fuzzy
+msgid "Dublin"
+msgstr "���� Ű(_b)"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:625
+#, fuzzy
+msgid "Dugway"
+msgstr "�����"
+
+#: my-evolution/Locations.h:626
+#, fuzzy
+msgid "Duluth"
+msgstr "����"
+
+#: my-evolution/Locations.h:627
+#, fuzzy
+msgid "Dundee"
+msgstr "�Ϸ�"
+
+#: my-evolution/Locations.h:628
+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
+msgid "Dusseldorf"
+msgstr ""
+
+#: my-evolution/Locations.h:633
+msgid "Dutch Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:634
+#, fuzzy
+msgid "Dyersburg"
+msgstr "�����(_D)"
+
+#: 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
+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
+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 ""
+
+#: my-evolution/Locations.h:661
+msgid "Elkins"
+msgstr ""
+
+#: my-evolution/Locations.h:662
+msgid "Elko"
+msgstr ""
+
+#: my-evolution/Locations.h:663
+msgid "Elmira"
+msgstr ""
+
+#: my-evolution/Locations.h:664
+#, fuzzy
+msgid "El Monte"
+msgstr "��(_M)"
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr ""
+
+#: my-evolution/Locations.h:667
+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 ""
+
+#: my-evolution/Locations.h:673
+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
+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 ""
+
+#: my-evolution/Locations.h:685
+msgid "Eugene"
+msgstr ""
+
+#: my-evolution/Locations.h:686
+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 ""
+
+#: my-evolution/Locations.h:690
+msgid "Everett"
+msgstr ""
+
+#: my-evolution/Locations.h:691
+msgid "Evergreen"
+msgstr ""
+
+#: my-evolution/Locations.h:692
+msgid "Evreux-Fauville"
+msgstr ""
+
+#: my-evolution/Locations.h:693
+#, fuzzy
+msgid "Exeter"
+msgstr "��Ÿ"
+
+#: my-evolution/Locations.h:694
+msgid "Ezeiza"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:698
+#, fuzzy
+msgid "Fairfield"
+msgstr "�߽� �׸�(_F)"
+
+#: 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 "������"
+
+#: my-evolution/Locations.h:705
+msgid "Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:706
+msgid "Farmington"
+msgstr ""
+
+#: my-evolution/Locations.h:707
+#, fuzzy
+msgid "Farmville"
+msgstr "���� �̸�"
+
+#: my-evolution/Locations.h:708
+#, fuzzy
+msgid "Faro"
+msgstr "������"
+
+#: my-evolution/Locations.h:709
+msgid "Fayetteville"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:713
+#, fuzzy
+msgid "Ferrara"
+msgstr "�̿�"
+
+#: my-evolution/Locations.h:714
+#, fuzzy
+msgid "Figari"
+msgstr "��"
+
+#: my-evolution/Locations.h:715
+#, fuzzy
+msgid "Findlay"
+msgstr "�ݿ���"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:720
+#, fuzzy
+msgid "Flint"
+msgstr "�"
+
+#: my-evolution/Locations.h:721
+msgid "Flippin"
+msgstr ""
+
+#: my-evolution/Locations.h:722
+#, fuzzy
+msgid "Florence"
+msgstr "��ҵ�"
+
+#: my-evolution/Locations.h:723
+#, fuzzy
+msgid "Florennes"
+msgstr "��"
+
+#: my-evolution/Locations.h:724
+#, fuzzy
+msgid "Flores"
+msgstr "���Ϸ� ����:"
+
+#: my-evolution/Locations.h:725
+msgid "Florianopolis"
+msgstr ""
+
+#: my-evolution/Locations.h:726
+#, fuzzy
+msgid "Florida"
+msgstr "�ݿ���"
+
+#: my-evolution/Locations.h:727
+#, fuzzy
+msgid "Floro"
+msgstr "������"
+
+#: my-evolution/Locations.h:728
+msgid "Fond Du Lac"
+msgstr ""
+
+#: my-evolution/Locations.h:729
+#, fuzzy
+msgid "Forde/Bringeland"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:730
+#, fuzzy
+msgid "Forli"
+msgstr "��"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:742
+#, fuzzy
+msgid "Fort Eustis"
+msgstr "���� ����(_S)"
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:751
+#, fuzzy
+msgid "Fort Meade"
+msgstr "���޵� �޽���"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:757
+#, fuzzy
+msgid "Fort Smith"
+msgstr "����"
+
+#: my-evolution/Locations.h:758
+#, fuzzy
+msgid "Fort Stewart"
+msgstr "���� ����"
+
+#: my-evolution/Locations.h:759
+msgid "Fort Stockton"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:769
+#, fuzzy
+msgid "Franklin"
+msgstr "�ٸ� �ּҷ� ����"
+
+#: my-evolution/Locations.h:770
+#, fuzzy
+msgid "Fredericton"
+msgstr "����:"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:775
+#, fuzzy
+msgid "Friday Harbor"
+msgstr "�ݿ���"
+
+#: my-evolution/Locations.h:776
+msgid "Friedrichshafen"
+msgstr ""
+
+#: my-evolution/Locations.h:777
+#, fuzzy
+msgid "Frigg"
+msgstr "��"
+
+#: my-evolution/Locations.h:778
+#, fuzzy
+msgid "Frontone"
+msgstr "�۲�"
+
+#: my-evolution/Locations.h:779
+#, fuzzy
+msgid "Frosinone"
+msgstr "����"
+
+#: my-evolution/Locations.h:780
+#, fuzzy
+msgid "Fryeburg"
+msgstr "�̿�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:790
+#, fuzzy
+msgid "Gage"
+msgstr "��"
+
+#: 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
+msgid "Gallup"
+msgstr ""
+
+#: my-evolution/Locations.h:798
+msgid "Galveston"
+msgstr ""
+
+#: my-evolution/Locations.h:799
+msgid "Gambell"
+msgstr ""
+
+#: my-evolution/Locations.h:800
+#, fuzzy
+msgid "Gander"
+msgstr "�Ӹ���:"
+
+#: my-evolution/Locations.h:801
+msgid "Garden City"
+msgstr ""
+
+#: my-evolution/Locations.h:802
+msgid "Gary"
+msgstr ""
+
+#: my-evolution/Locations.h:803
+#, fuzzy
+msgid "Gassim"
+msgstr "����"
+
+#: my-evolution/Locations.h:804
+#, fuzzy
+msgid "Gatineau"
+msgstr "�Ϲ� ����"
+
+#: my-evolution/Locations.h:805
+msgid "Gaziantep"
+msgstr ""
+
+#: my-evolution/Locations.h:806
+#, fuzzy
+msgid "Gdansk"
+msgstr "��"
+
+#: my-evolution/Locations.h:807
+#, fuzzy
+msgid "Geneve"
+msgstr "��"
+
+#: 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
+msgid "Ghardaia"
+msgstr ""
+
+#: my-evolution/Locations.h:814
+msgid "Ghedi"
+msgstr ""
+
+#: my-evolution/Locations.h:816
+msgid "Gifu Ab"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:821
+#, fuzzy
+msgid "Girona"
+msgstr "�Ϲ� ����"
+
+#: my-evolution/Locations.h:822
+msgid "Gizan"
+msgstr ""
+
+#: my-evolution/Locations.h:823
+msgid "Glasgow"
+msgstr ""
+
+#: my-evolution/Locations.h:824
+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 ""
+
+#: my-evolution/Locations.h:828
+#, fuzzy
+msgid "Goodland"
+msgstr "�ɶ���"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:832
+#, fuzzy
+msgid "Granada"
+msgstr "ij����"
+
+#: 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
+msgid "Grand Marais"
+msgstr ""
+
+#: my-evolution/Locations.h:840
+msgid "Grand Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:841
+#, fuzzy
+msgid "Grandview"
+msgstr "�̸�����"
+
+#: my-evolution/Locations.h:842
+#, fuzzy
+msgid "Grangeville"
+msgstr "��ҵ�"
+
+#: my-evolution/Locations.h:843
+#, fuzzy
+msgid "Grants"
+msgstr "�ʰ�"
+
+#: my-evolution/Locations.h:844
+#, fuzzy
+msgid "Graz"
+msgstr "����"
+
+#: my-evolution/Locations.h:845
+msgid "Great Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:847
+#, fuzzy
+msgid "Greeley"
+msgstr "��"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:851
+#, fuzzy
+msgid "Greenville"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:852
+msgid "Greenville-Spartanburg"
+msgstr ""
+
+#: 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 ""
+
+#: 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
+msgid "Guadalajara"
+msgstr ""
+
+#: my-evolution/Locations.h:860
+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
+msgid "Guantanamo"
+msgstr ""
+
+#: my-evolution/Locations.h:864
+msgid "Guarany"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:869
+#, fuzzy
+msgid "Guaymas"
+msgstr "����"
+
+#: my-evolution/Locations.h:870
+msgid "Guernsey"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:875
+#, fuzzy
+msgid "Gunnison"
+msgstr "����:"
+
+#: my-evolution/Locations.h:876
+msgid "Gunnison (2)"
+msgstr ""
+
+#: 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
+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 ""
+
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#, fuzzy
+msgid "Hail"
+msgstr "����"
+
+#: my-evolution/Locations.h:886
+msgid "Hailey-Sun Valley"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:902
+#, fuzzy
+msgid "Ha Noi"
+msgstr "����"
+
+#: my-evolution/Locations.h:903
+msgid "Harbor Beach"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:911
+#, fuzzy
+msgid "Hastings"
+msgstr "�Ӹ���"
+
+#: my-evolution/Locations.h:912
+msgid "Haugesund"
+msgstr ""
+
+#: my-evolution/Locations.h:913
+#, fuzzy
+msgid "Havre"
+msgstr "�Ӹ���:"
+
+#: my-evolution/Locations.h:914
+#, fuzzy
+msgid "Hawaii"
+msgstr "����"
+
+#: my-evolution/Locations.h:915
+msgid "Hawthorne"
+msgstr ""
+
+#: 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
+msgid "Hillsboro"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:933
+#, fuzzy
+msgid "Hobart"
+msgstr "ȣ��Ʈ:"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:941
+msgid "Holguin"
+msgstr ""
+
+#: my-evolution/Locations.h:942
+#, fuzzy
+msgid "Homer"
+msgstr "��"
+
+#: 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 "�����°�"
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:968
+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
+msgid "Iasi"
+msgstr ""
+
+#: my-evolution/Locations.h:977
+msgid "Ibiza"
+msgstr ""
+
+#: my-evolution/Locations.h:979
+msgid "Ichikawa"
+msgstr ""
+
+#: my-evolution/Locations.h:980
+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 "�ɶ���"
+
+#: my-evolution/Locations.h:985
+#, fuzzy
+msgid "Iliamna"
+msgstr "�ݴ�"
+
+#: my-evolution/Locations.h:986
+msgid "Illinois"
+msgstr ""
+
+#: my-evolution/Locations.h:987
+msgid "Imperial"
+msgstr ""
+
+#: my-evolution/Locations.h:988
+msgid "Imperial (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:989
+msgid "Imperial Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:990
+msgid "In Amenas"
+msgstr ""
+
+#: my-evolution/Locations.h:992
+#, fuzzy
+msgid "Indiana"
+msgstr "����(_I)"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:998
+#, fuzzy
+msgid "Inverness"
+msgstr "������"
+
+#: my-evolution/Locations.h:999
+msgid "Inyokern"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1005
+#, fuzzy
+msgid "Iraklion"
+msgstr "����"
+
+#: my-evolution/Locations.h:1006
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#: 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
+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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1044
+#, fuzzy
+msgid "Jonkoping"
+msgstr "������"
+
+#: 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
+msgid "Juigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:1050
+msgid "Jujuy"
+msgstr ""
+
+#: my-evolution/Locations.h:1051
+msgid "Juliaca"
+msgstr ""
+
+#: my-evolution/Locations.h:1052
+#, fuzzy
+msgid "Junction"
+msgstr "����:"
+
+#: my-evolution/Locations.h:1053
+#, fuzzy
+msgid "Juneau"
+msgstr "�Ϲ� ����"
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1071
+#, fuzzy
+msgid "Karachi"
+msgstr "���"
+
+#: 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
+msgid "Kazan"
+msgstr ""
+
+#: my-evolution/Locations.h:1080
+msgid "Kearney"
+msgstr ""
+
+#: my-evolution/Locations.h:1081
+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
+msgid "Kenosha"
+msgstr ""
+
+#: my-evolution/Locations.h:1086
+msgid "Kentucky"
+msgstr ""
+
+#: my-evolution/Locations.h:1087
+msgid "Keokuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1088
+msgid "Kerkira"
+msgstr ""
+
+#: my-evolution/Locations.h:1089
+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
+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
+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
+msgid "Laconia"
+msgstr ""
+
+#: my-evolution/Locations.h:1151
+msgid "La Coruna"
+msgstr ""
+
+#: my-evolution/Locations.h:1152
+#, fuzzy
+msgid "La Crosse"
+msgstr "�̸�(_L):"
+
+#: my-evolution/Locations.h:1153
+msgid "La Esperanza"
+msgstr ""
+
+#: 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 "����"
+
+#: my-evolution/Locations.h:1157
+#, fuzzy
+msgid "Lahore"
+msgstr "�߻�"
+
+#: my-evolution/Locations.h:1158
+#, fuzzy
+msgid "Lajes"
+msgstr "�̸�(_L):"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1165
+#, fuzzy
+msgid "Lakeview"
+msgstr "�̸�����"
+
+#: my-evolution/Locations.h:1166
+msgid "Lamar"
+msgstr ""
+
+#: my-evolution/Locations.h:1167
+#, fuzzy
+msgid "La Mesa"
+msgstr "���� �޼���(_M)"
+
+#: my-evolution/Locations.h:1168
+msgid "Lamezia"
+msgstr ""
+
+#: my-evolution/Locations.h:1169
+#, fuzzy
+msgid "Lamoni"
+msgstr "�̸�(_L):"
+
+#: my-evolution/Locations.h:1170
+msgid "Lampedusa"
+msgstr ""
+
+#: my-evolution/Locations.h:1171
+msgid "Lanai"
+msgstr ""
+
+#: my-evolution/Locations.h:1172
+#, fuzzy
+msgid "Lancaster"
+msgstr "����"
+
+#: my-evolution/Locations.h:1173
+#, fuzzy
+msgid "Lander"
+msgstr "�Ӹ���:"
+
+#: my-evolution/Locations.h:1174
+msgid "Langebaanweg"
+msgstr ""
+
+#: my-evolution/Locations.h:1175
+msgid "Langley AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1176
+msgid "Lannion"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1182
+#, fuzzy
+msgid "Laredo"
+msgstr "�߻�"
+
+#: my-evolution/Locations.h:1183
+#, fuzzy
+msgid "Larnaka"
+msgstr "ij����"
+
+#: my-evolution/Locations.h:1184
+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
+msgid "Latina"
+msgstr ""
+
+#: my-evolution/Locations.h:1189
+msgid "Latrobe"
+msgstr ""
+
+#: my-evolution/Locations.h:1191
+msgid "Laughlin"
+msgstr ""
+
+#: my-evolution/Locations.h:1192
+#, fuzzy
+msgid "Laurel"
+msgstr "�߻�"
+
+#: my-evolution/Locations.h:1193
+msgid "La Verne"
+msgstr ""
+
+#: my-evolution/Locations.h:1194
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1195
+#, fuzzy
+msgid "Lawton"
+msgstr "�̸�(_L):"
+
+#: my-evolution/Locations.h:1196
+msgid "Leadville"
+msgstr ""
+
+#: my-evolution/Locations.h:1197
+msgid "Learmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1199
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1201
+msgid "Leesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1202
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1205
+msgid "Leknes"
+msgstr ""
+
+#: my-evolution/Locations.h:1206
+#, fuzzy
+msgid "Le Mans"
+msgstr "����"
+
+#: my-evolution/Locations.h:1207
+#, fuzzy
+msgid "Le Marine"
+msgstr "����"
+
+#: my-evolution/Locations.h:1208
+msgid "Lemmon"
+msgstr ""
+
+#: my-evolution/Locations.h:1209
+#, fuzzy
+msgid "Lemoore"
+msgstr "����"
+
+#: my-evolution/Locations.h:1210
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1212
+#, fuzzy
+msgid "Leuchars"
+msgstr "����"
+
+#: my-evolution/Locations.h:1213
+msgid "Lewisburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1214
+#, fuzzy
+msgid "Lewiston"
+msgstr "����"
+
+#: my-evolution/Locations.h:1215
+msgid "Lewistown"
+msgstr ""
+
+#: my-evolution/Locations.h:1216
+msgid "Lexington"
+msgstr ""
+
+#: my-evolution/Locations.h:1217
+msgid "Liberal"
+msgstr ""
+
+#: my-evolution/Locations.h:1219
+msgid "Libya"
+msgstr ""
+
+#: my-evolution/Locations.h:1220
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1221
+msgid "Lidgerwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1222
+#, fuzzy
+msgid "Liege"
+msgstr "�߻�"
+
+#: my-evolution/Locations.h:1223
+#, fuzzy
+msgid "Lihue"
+msgstr "��"
+
+#: my-evolution/Locations.h:1224
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1225
+msgid "Lima-Callao"
+msgstr ""
+
+#: my-evolution/Locations.h:1226
+#, fuzzy
+msgid "Limnos"
+msgstr "�̸�(_L):"
+
+#: my-evolution/Locations.h:1227
+msgid "Limoges"
+msgstr ""
+
+#: my-evolution/Locations.h:1228
+#, fuzzy
+msgid "Limon"
+msgstr "��"
+
+#: my-evolution/Locations.h:1229
+#, fuzzy
+msgid "Lincoln"
+msgstr "�����°�"
+
+#: my-evolution/Locations.h:1230
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1231
+msgid "Lisboa"
+msgstr ""
+
+#: my-evolution/Locations.h:1232
+#, fuzzy
+msgid "Lista"
+msgstr "ȣ��Ʈ:"
+
+#: my-evolution/Locations.h:1233
+msgid "Litchfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1240
+msgid "Ljubljana"
+msgstr ""
+
+#: my-evolution/Locations.h:1241
+#, fuzzy
+msgid "Logan"
+msgstr "����"
+
+#: my-evolution/Locations.h:1242
+msgid "Lolland Falster"
+msgstr ""
+
+#: my-evolution/Locations.h:1243
+#, fuzzy
+msgid "Lompoc"
+msgstr "���� �ۼ�"
+
+#: my-evolution/Locations.h:1244
+#, fuzzy
+msgid "London"
+msgstr "�������"
+
+#: my-evolution/Locations.h:1245
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1249
+#, fuzzy
+msgid "Londrina"
+msgstr "��"
+
+#: my-evolution/Locations.h:1250
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1253
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+#: my-evolution/Locations.h:1254
+msgid "Los Alamos"
+msgstr ""
+
+#: my-evolution/Locations.h:1255
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1260
+msgid "Lousiana"
+msgstr ""
+
+#: my-evolution/Locations.h:1261
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1265
+#, fuzzy
+msgid "Lugano"
+msgstr "�̸�(_L):"
+
+#: my-evolution/Locations.h:1266
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1267
+#, fuzzy
+msgid "Luton"
+msgstr "�����°�"
+
+#: my-evolution/Locations.h:1269
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1270
+msgid "Luxor"
+msgstr ""
+
+#: my-evolution/Locations.h:1271
+msgid "Lviv"
+msgstr ""
+
+#: my-evolution/Locations.h:1272
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1275
+msgid "Lyon-Satolas"
+msgstr ""
+
+#: my-evolution/Locations.h:1276
+#, fuzzy
+msgid "Maastricht"
+msgstr "���"
+
+#: my-evolution/Locations.h:1277
+#, fuzzy
+msgid "Macae"
+msgstr "���"
+
+#: my-evolution/Locations.h:1278
+#, fuzzy
+msgid "Macapa"
+msgstr "���"
+
+#: my-evolution/Locations.h:1279
+#, fuzzy
+msgid "Maceio"
+msgstr "������"
+
+#: my-evolution/Locations.h:1280
+#, fuzzy
+msgid "Macon"
+msgstr "����"
+
+#: my-evolution/Locations.h:1281
+#, fuzzy
+msgid "Madinah"
+msgstr "����"
+
+#: my-evolution/Locations.h:1282
+#, fuzzy
+msgid "Madison"
+msgstr "����"
+
+#: my-evolution/Locations.h:1283
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1285
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+#: my-evolution/Locations.h:1286
+#, fuzzy
+msgid "Magadan"
+msgstr "ij����"
+
+#: my-evolution/Locations.h:1287
+msgid "Magdalena"
+msgstr ""
+
+#: my-evolution/Locations.h:1288
+#, fuzzy
+msgid "Maine"
+msgstr "����"
+
+#: my-evolution/Locations.h:1289
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1290
+msgid "Makkah"
+msgstr ""
+
+#: my-evolution/Locations.h:1291
+#, fuzzy
+msgid "Makung"
+msgstr "����"
+
+#: my-evolution/Locations.h:1292
+#, fuzzy
+msgid "Malad City"
+msgstr "����"
+
+#: my-evolution/Locations.h:1293
+#, fuzzy
+msgid "Malaga"
+msgstr "����"
+
+#: my-evolution/Locations.h:1294
+#, fuzzy
+msgid "Malatya"
+msgstr "����"
+
+#: my-evolution/Locations.h:1295
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1296
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1298
+msgid "Mammoth Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1299
+#, fuzzy
+msgid "Managua"
+msgstr "���"
+
+#: my-evolution/Locations.h:1300
+#, fuzzy
+msgid "Manassas"
+msgstr "�޼���"
+
+#: my-evolution/Locations.h:1301
+#, fuzzy
+msgid "Manaus"
+msgstr "���"
+
+#: my-evolution/Locations.h:1302
+#, fuzzy
+msgid "Manchester"
+msgstr "���:"
+
+#: my-evolution/Locations.h:1303
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+msgid "Manhattan"
+msgstr ""
+
+#: my-evolution/Locations.h:1305
+#, fuzzy
+msgid "Manisa"
+msgstr "����"
+
+#: my-evolution/Locations.h:1306
+#, fuzzy
+msgid "Manistee"
+msgstr "���̱�"
+
+#: my-evolution/Locations.h:1307
+#, fuzzy
+msgid "Manitoba"
+msgstr "����"
+
+#: my-evolution/Locations.h:1308
+msgid "Manitowoc"
+msgstr ""
+
+#: my-evolution/Locations.h:1309
+#, fuzzy
+msgid "Mankato"
+msgstr "������"
+
+#: my-evolution/Locations.h:1310
+#, fuzzy
+msgid "Mansfield"
+msgstr "����"
+
+#: my-evolution/Locations.h:1311
+#, fuzzy
+msgid "Manta"
+msgstr "����"
+
+#: my-evolution/Locations.h:1312
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1313
+msgid "Maraba"
+msgstr ""
+
+#: my-evolution/Locations.h:1314
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1315
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1316
+#, fuzzy
+msgid "Marathon"
+msgstr "���"
+
+#: my-evolution/Locations.h:1317
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1318
+#, fuzzy
+msgid "Margarita"
+msgstr "����"
+
+#: my-evolution/Locations.h:1319
+#, fuzzy
+msgid "Marianna"
+msgstr "����"
+
+#: my-evolution/Locations.h:1320
+#, fuzzy
+msgid "Marib"
+msgstr "����"
+
+#: my-evolution/Locations.h:1321
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1322
+#, fuzzy
+msgid "Marietta"
+msgstr "����"
+
+#: my-evolution/Locations.h:1323
+msgid "Marino di Ravenna"
+msgstr ""
+
+#: my-evolution/Locations.h:1324
+#, fuzzy
+msgid "Marion"
+msgstr "����"
+
+#: my-evolution/Locations.h:1325
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1326
+#, fuzzy
+msgid "Marquette"
+msgstr "����"
+
+#: my-evolution/Locations.h:1327
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+msgid "Marseilles"
+msgstr ""
+
+#: my-evolution/Locations.h:1329
+#, fuzzy
+msgid "Marshall"
+msgstr "���"
+
+#: my-evolution/Locations.h:1330
+msgid "Marshalltown"
+msgstr ""
+
+#: my-evolution/Locations.h:1331
+msgid "Marshfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1332
+#, fuzzy
+msgid "Marte"
+msgstr "����"
+
+#: my-evolution/Locations.h:1333
+#, fuzzy
+msgid "Marthas Vineyard"
+msgstr "���� ���� ������ ǥ��(_n)"
+
+#: my-evolution/Locations.h:1334
+#, fuzzy
+msgid "Martinsburg"
+msgstr "����"
+
+#: my-evolution/Locations.h:1335
+#, fuzzy
+msgid "Martinsville"
+msgstr "����"
+
+#: my-evolution/Locations.h:1336
+#, fuzzy
+msgid "Maryland"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1339
+msgid "Mashhad"
+msgstr ""
+
+#: my-evolution/Locations.h:1340
+#, fuzzy
+msgid "Masirah"
+msgstr "���"
+
+#: my-evolution/Locations.h:1341
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1343
+#, fuzzy
+msgid "Massena"
+msgstr "����"
+
+#: my-evolution/Locations.h:1344
+#, fuzzy
+msgid "Matamoros"
+msgstr "����"
+
+#: my-evolution/Locations.h:1345
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1347
+msgid "Matsuyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1348
+#, fuzzy
+msgid "Mattoon"
+msgstr "����"
+
+#: my-evolution/Locations.h:1349
+#, fuzzy
+msgid "Mayaguez"
+msgstr "���"
+
+#: my-evolution/Locations.h:1350
+#, fuzzy
+msgid "Mayport"
+msgstr "����"
+
+#: my-evolution/Locations.h:1351
+#, fuzzy
+msgid "Mazatlan"
+msgstr "����"
+
+#: my-evolution/Locations.h:1352
+#, fuzzy
+msgid "Mazu"
+msgstr "���"
+
+#: my-evolution/Locations.h:1353
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1354
+#, fuzzy
+msgid "McAllen"
+msgstr "���"
+
+#: my-evolution/Locations.h:1355
+#, fuzzy
+msgid "McCall"
+msgstr "����"
+
+#: my-evolution/Locations.h:1356
+#, fuzzy
+msgid "McCarthy"
+msgstr "���"
+
+#: my-evolution/Locations.h:1357
+msgid "McClellan"
+msgstr ""
+
+#: my-evolution/Locations.h:1358
+#, fuzzy
+msgid "McComb"
+msgstr "����"
+
+#: my-evolution/Locations.h:1359
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1361
+msgid "Mc Gregor"
+msgstr ""
+
+#: my-evolution/Locations.h:1362
+#, fuzzy
+msgid "Meacham"
+msgstr "���"
+
+#: my-evolution/Locations.h:1363
+msgid "Medford"
+msgstr ""
+
+#: my-evolution/Locations.h:1364
+msgid "Medicine Lodge"
+msgstr ""
+
+#: my-evolution/Locations.h:1365
+#, fuzzy
+msgid "Mehamn"
+msgstr "����"
+
+#: my-evolution/Locations.h:1366
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1367
+msgid "Melbourne"
+msgstr ""
+
+#: my-evolution/Locations.h:1368
+#, fuzzy
+msgid "Melfa"
+msgstr "����"
+
+#: my-evolution/Locations.h:1369
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1373
+#, fuzzy
+msgid "Mendoza"
+msgstr "������"
+
+#: my-evolution/Locations.h:1374
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1377
+msgid "Merced"
+msgstr ""
+
+#: my-evolution/Locations.h:1378
+#, fuzzy
+msgid "Merida"
+msgstr "�ݿ���"
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1380
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1381
+#, fuzzy
+msgid "Merril Field"
+msgstr "�߽� �׸�(_F)"
+
+#: my-evolution/Locations.h:1382
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1386
+#, fuzzy
+msgid "Mexicali"
+msgstr "����"
+
+#: my-evolution/Locations.h:1388
+#, fuzzy
+msgid "Miami"
+msgstr "����"
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1391
+msgid "Michigan"
+msgstr ""
+
+#: my-evolution/Locations.h:1392
+msgid "Middle East"
+msgstr ""
+
+#: my-evolution/Locations.h:1393
+msgid "Middleton Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1394
+msgid "Middletown"
+msgstr ""
+
+#: my-evolution/Locations.h:1395
+#, fuzzy
+msgid "Midland"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1396
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1398
+msgid "Milano/Malpensa"
+msgstr ""
+
+#: my-evolution/Locations.h:1399
+#, fuzzy
+msgid "Miles City"
+msgstr "���� ����:"
+
+#: my-evolution/Locations.h:1400
+msgid "Milford"
+msgstr ""
+
+#: my-evolution/Locations.h:1401
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1402
+msgid "Millville"
+msgstr ""
+
+#: my-evolution/Locations.h:1403
+#, fuzzy
+msgid "Milton"
+msgstr "��"
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1407
+msgid "Minatitlan"
+msgstr ""
+
+#: my-evolution/Locations.h:1408
+#, fuzzy
+msgid "Minchumina"
+msgstr "�����°�"
+
+#: my-evolution/Locations.h:1409
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1414
+#, fuzzy
+msgid "Minnesota"
+msgstr "��"
+
+#: my-evolution/Locations.h:1415
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1416
+#, fuzzy
+msgid "Minot"
+msgstr "��"
+
+#: my-evolution/Locations.h:1417
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1419
+msgid "Mississippi"
+msgstr ""
+
+#: my-evolution/Locations.h:1420
+msgid "Missoula"
+msgstr ""
+
+#: my-evolution/Locations.h:1421
+msgid "Missouri"
+msgstr ""
+
+#: my-evolution/Locations.h:1422
+#, fuzzy
+msgid "Mitchell"
+msgstr "���:"
+
+#: my-evolution/Locations.h:1423
+msgid "Mitilini"
+msgstr ""
+
+#: my-evolution/Locations.h:1424
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1425
+msgid "Miyazaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1426
+#, fuzzy
+msgid "Moa"
+msgstr "����"
+
+#: my-evolution/Locations.h:1427
+#, fuzzy
+msgid "Mobile Downtown"
+msgstr "�޴���ȭ"
+
+#: my-evolution/Locations.h:1428
+msgid "Mobile Regional Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1429
+#, fuzzy
+msgid "Mobridge"
+msgstr "�޴���ȭ"
+
+#: my-evolution/Locations.h:1430
+#, fuzzy
+msgid "Modesto"
+msgstr "���� ����"
+
+#: my-evolution/Locations.h:1431
+msgid "Mo I Rana"
+msgstr ""
+
+#: my-evolution/Locations.h:1432
+#, fuzzy
+msgid "Mojave"
+msgstr "�̵�"
+
+#: my-evolution/Locations.h:1433
+#, fuzzy
+msgid "Molde"
+msgstr "�޴���ȭ"
+
+#: my-evolution/Locations.h:1434
+#, fuzzy
+msgid "Moldova"
+msgstr "������"
+
+#: my-evolution/Locations.h:1435
+msgid "Moline-Quad Cities"
+msgstr ""
+
+#: my-evolution/Locations.h:1436
+#, fuzzy
+msgid "Molokai"
+msgstr "����"
+
+#: my-evolution/Locations.h:1437
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1438
+msgid "Monchengladbach"
+msgstr ""
+
+#: my-evolution/Locations.h:1439
+#, fuzzy
+msgid "Monclova"
+msgstr "������"
+
+#: my-evolution/Locations.h:1440
+#, fuzzy
+msgid "Moncton"
+msgstr "������"
+
+#: my-evolution/Locations.h:1441
+#, fuzzy
+msgid "Monida"
+msgstr "������"
+
+#: my-evolution/Locations.h:1442
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+#: my-evolution/Locations.h:1443
+#, fuzzy
+msgid "Monroe"
+msgstr "������"
+
+#: my-evolution/Locations.h:1444
+#, fuzzy
+msgid "Montague"
+msgstr "��(_M)"
+
+#: my-evolution/Locations.h:1445
+#, fuzzy
+msgid "Montana"
+msgstr "����"
+
+#: my-evolution/Locations.h:1446
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1448
+#, fuzzy
+msgid "Monte Bisbino"
+msgstr "���� ����"
+
+#: my-evolution/Locations.h:1449
+msgid "Monte Calamita"
+msgstr ""
+
+#: my-evolution/Locations.h:1450
+#, fuzzy
+msgid "Monte Cimone"
+msgstr "��"
+
+#: my-evolution/Locations.h:1451
+msgid "Montego Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:1452
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1453
+#, fuzzy
+msgid "Monterey"
+msgstr "��(_M)"
+
+#: my-evolution/Locations.h:1454
+msgid "Monterrey"
+msgstr ""
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1458
+msgid "Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1459
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1460
+#, fuzzy
+msgid "Monticello"
+msgstr "������"
+
+#: my-evolution/Locations.h:1461
+#, fuzzy
+msgid "Montpelier"
+msgstr "��"
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1465
+#, fuzzy
+msgid "Montrose"
+msgstr "�۲�"
+
+#: my-evolution/Locations.h:1466
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1467
+msgid "Morelia"
+msgstr ""
+
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Morgantown"
+msgstr "����"
+
+#: my-evolution/Locations.h:1469
+#, fuzzy
+msgid "Moriarty"
+msgstr "�켱����"
+
+#: my-evolution/Locations.h:1471
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1474
+msgid "Moses Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1475
+#, fuzzy
+msgid "Mosinee"
+msgstr "�޴���ȭ"
+
+#: my-evolution/Locations.h:1476
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain Home"
+msgstr ""
+
+#: my-evolution/Locations.h:1479
+#, fuzzy
+msgid "Mountain View"
+msgstr "��"
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1482
+msgid "Mount Shasta"
+msgstr ""
+
+#: my-evolution/Locations.h:1483
+#, fuzzy
+msgid "Mount Vernon"
+msgstr "��"
+
+#: my-evolution/Locations.h:1484
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1487
+msgid "Muir"
+msgstr ""
+
+#: my-evolution/Locations.h:1488
+#, fuzzy
+msgid "Mullan"
+msgstr "����"
+
+#: my-evolution/Locations.h:1489
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1490
+msgid "Munchen"
+msgstr ""
+
+#: my-evolution/Locations.h:1491
+msgid "Muncie"
+msgstr ""
+
+#: my-evolution/Locations.h:1492
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1493
+msgid "Murcia"
+msgstr ""
+
+#: my-evolution/Locations.h:1494
+msgid "Murmansk"
+msgstr ""
+
+#: my-evolution/Locations.h:1495
+#, fuzzy
+msgid "Mus"
+msgstr "�ٻ�"
+
+#: my-evolution/Locations.h:1496
+msgid "Muscatine"
+msgstr ""
+
+#: my-evolution/Locations.h:1497
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1498
+msgid "Muskegon"
+msgstr ""
+
+#: my-evolution/Locations.h:1499
+#, fuzzy
+msgid "Mykonos"
+msgstr "�۲�"
+
+#: my-evolution/Locations.h:1500
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1507
+msgid "Najran"
+msgstr ""
+
+#: my-evolution/Locations.h:1508
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1509
+msgid "Nalchik"
+msgstr ""
+
+#: my-evolution/Locations.h:1510
+#, fuzzy
+msgid "Namsos"
+msgstr "�̸�"
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1513
+msgid "Nankishirahama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1514
+#, fuzzy
+msgid "Nanning"
+msgstr "���"
+
+#: my-evolution/Locations.h:1515
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1516
+msgid "Nantucket"
+msgstr ""
+
+#: my-evolution/Locations.h:1517
+#, fuzzy
+msgid "Napa"
+msgstr "�� ����"
+
+#: my-evolution/Locations.h:1518
+#, fuzzy
+msgid "Naples"
+msgstr "�̸�"
+
+#: my-evolution/Locations.h:1519
+#, fuzzy
+msgid "Napoli"
+msgstr "����"
+
+#: my-evolution/Locations.h:1520
+#, fuzzy
+msgid "Narvik"
+msgstr "����"
+
+#: my-evolution/Locations.h:1521
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1524
+msgid "Nassau"
+msgstr ""
+
+#: my-evolution/Locations.h:1525
+#, fuzzy
+msgid "Natal"
+msgstr "����"
+
+#: my-evolution/Locations.h:1526
+#, fuzzy
+msgid "Natchez"
+msgstr "���:"
+
+#: my-evolution/Locations.h:1527
+msgid "Nawabshah"
+msgstr ""
+
+#: my-evolution/Locations.h:1528
+msgid "Nebraska"
+msgstr ""
+
+#: my-evolution/Locations.h:1529
+msgid "Needles"
+msgstr ""
+
+#: my-evolution/Locations.h:1530
+#, fuzzy
+msgid "Nenana"
+msgstr "ij����"
+
+#: my-evolution/Locations.h:1532
+msgid "Neuquen"
+msgstr ""
+
+#: my-evolution/Locations.h:1533
+#, fuzzy
+msgid "Nevada"
+msgstr "ij����"
+
+#: my-evolution/Locations.h:1534
+#, fuzzy
+msgid "Newark"
+msgstr "�۾�"
+
+#: my-evolution/Locations.h:1535
+#, fuzzy
+msgid "New Bedford"
+msgstr "�� ��������(_N)"
+
+#: my-evolution/Locations.h:1536
+#, fuzzy
+msgid "New Bern"
+msgstr "�� ����"
+
+#: my-evolution/Locations.h:1537
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1539
+msgid "Newburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1540
+#, fuzzy
+msgid "Newcastle"
+msgstr "����"
+
+#: my-evolution/Locations.h:1541
+#, fuzzy
+msgid "New Delhi/Palam"
+msgstr "�� ����"
+
+#: my-evolution/Locations.h:1542
+#, fuzzy
+msgid "Newfoundland"
+msgstr "�� ����"
+
+#: my-evolution/Locations.h:1543
+msgid "New Hampshire"
+msgstr ""
+
+#: my-evolution/Locations.h:1544
+#, fuzzy
+msgid "New Haven"
+msgstr "�� ����ó"
+
+#: my-evolution/Locations.h:1545
+#, fuzzy
+msgid "New Iberia"
+msgstr "�� ����ó"
+
+#: my-evolution/Locations.h:1546
+#, fuzzy
+msgid "New Jersey"
+msgstr "�޼���"
+
+#: my-evolution/Locations.h:1547
+msgid "New Mexico"
+msgstr ""
+
+#: my-evolution/Locations.h:1548
+#, fuzzy
+msgid "New Orleans"
+msgstr "��Ÿ�� ����(_T)"
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1550
+msgid "New Orleans NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1551
+#, fuzzy
+msgid "Newport"
+msgstr "��Ʈ"
+
+#: my-evolution/Locations.h:1552
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1553
+msgid "New Port Richey"
+msgstr ""
+
+#: my-evolution/Locations.h:1554
+#, fuzzy
+msgid "New River"
+msgstr "�� ��������"
+
+#: my-evolution/Locations.h:1555
+msgid "New Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1556
+#, fuzzy
+msgid "Newton"
+msgstr "����"
+
+#: my-evolution/Locations.h:1557
+#, fuzzy
+msgid "New York"
+msgstr "�� ��������"
+
+#: my-evolution/Locations.h:1558
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1559
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1561
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1564
+msgid "Niigata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1565
+#, fuzzy
+msgid "Nimes-Garons"
+msgstr "ũ��:"
+
+#: my-evolution/Locations.h:1566
+#, fuzzy
+msgid "Nipawin"
+msgstr "����"
+
+#: my-evolution/Locations.h:1567
+msgid "Nis"
+msgstr ""
+
+#: my-evolution/Locations.h:1568
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1570
+msgid "N Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1571
+#, fuzzy
+msgid "Nogales"
+msgstr "����"
+
+#: my-evolution/Locations.h:1572
+#, fuzzy
+msgid "Nome"
+msgstr "�̸�"
+
+#: my-evolution/Locations.h:1573
+#, fuzzy
+msgid "Norfolk"
+msgstr "����"
+
+#: my-evolution/Locations.h:1575
+msgid "Norfolk NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1576
+msgid "Norrkoping"
+msgstr ""
+
+#: my-evolution/Locations.h:1577
+#, fuzzy
+msgid "North Adams"
+msgstr "��Ʈ(_t):"
+
+#: my-evolution/Locations.h:1578
+#, fuzzy
+msgid "North Bend"
+msgstr "��Ʈ"
+
+#: my-evolution/Locations.h:1579
+msgid "North Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:1580
+#, fuzzy
+msgid "North Conway"
+msgstr "����"
+
+#: my-evolution/Locations.h:1581
+#, fuzzy
+msgid "North Dakota"
+msgstr "��Ʈ(_t):"
+
+#: my-evolution/Locations.h:1582
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1583
+msgid "North Kingstown"
+msgstr ""
+
+#: my-evolution/Locations.h:1584
+#, fuzzy
+msgid "North Platte"
+msgstr "��Ʈ(_t):"
+
+#: my-evolution/Locations.h:1585
+#, fuzzy
+msgid "Northway"
+msgstr "����"
+
+#: my-evolution/Locations.h:1586
+#, fuzzy
+msgid "Northwest Territories"
+msgstr "��Ʈ(_t):"
+
+#: my-evolution/Locations.h:1588
+#, fuzzy
+msgid "Norwich"
+msgstr "��Ʈ"
+
+#: my-evolution/Locations.h:1589
+#, fuzzy
+msgid "Norwood"
+msgstr "����"
+
+#: my-evolution/Locations.h:1590
+#, fuzzy
+msgid "Notodden"
+msgstr "��Ʈ"
+
+#: my-evolution/Locations.h:1591
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1595
+msgid "Nueva Ocotepeque"
+msgstr ""
+
+#: my-evolution/Locations.h:1596
+#, fuzzy
+msgid "Nuevo Laredo"
+msgstr "���� ����"
+
+#: my-evolution/Locations.h:1597
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+#, fuzzy
+msgid "Oahu"
+msgstr "������"
+
+#: my-evolution/Locations.h:1600
+msgid "Oak Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:1601
+#, fuzzy
+msgid "Oakland"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1602
+msgid "Oaxaca"
+msgstr ""
+
+#: my-evolution/Locations.h:1603
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+msgid "Obihiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1605
+#, fuzzy
+msgid "Ocala"
+msgstr "����"
+
+#: my-evolution/Locations.h:1606
+msgid "Oceanside"
+msgstr ""
+
+#: my-evolution/Locations.h:1607
+#, fuzzy
+msgid "Odense"
+msgstr "����"
+
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1609
+#, fuzzy
+msgid "Oelwen"
+msgstr "����"
+
+#: my-evolution/Locations.h:1610
+#, fuzzy
+msgid "Ogden"
+msgstr "����"
+
+#: my-evolution/Locations.h:1611
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1613
+msgid "Ohio"
+msgstr ""
+
+#: my-evolution/Locations.h:1614
+#, fuzzy
+msgid "Ohrid"
+msgstr "��Ÿ"
+
+#: my-evolution/Locations.h:1615
+msgid "Oita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1616
+msgid "Ojika Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1617
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1624
+msgid "Okushiri Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1625
+#, fuzzy
+msgid "Olathe"
+msgstr "��Ÿ"
+
+#: my-evolution/Locations.h:1626
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1627
+msgid "Olbia"
+msgstr ""
+
+#: my-evolution/Locations.h:1628
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1629
+msgid "Omaha"
+msgstr ""
+
+#: my-evolution/Locations.h:1630
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1631
+#, fuzzy
+msgid "Omak"
+msgstr "Ȯ��"
+
+#: my-evolution/Locations.h:1633
+msgid "Ominato Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1634
+#, fuzzy
+msgid "Omsk"
+msgstr "Ȯ��"
+
+#: my-evolution/Locations.h:1635
+msgid "O'Neill"
+msgstr ""
+
+#: my-evolution/Locations.h:1636
+#, fuzzy
+msgid "Ontario"
+msgstr "����"
+
+#: my-evolution/Locations.h:1637
+#, fuzzy
+msgid "Oostende"
+msgstr "������"
+
+#: my-evolution/Locations.h:1638
+#, fuzzy
+msgid "Oran"
+msgstr "��ҵ�"
+
+#: my-evolution/Locations.h:1639
+msgid "Oran/Es Senia"
+msgstr ""
+
+#: my-evolution/Locations.h:1640
+#, fuzzy
+msgid "Orange"
+msgstr ""
+"\n"
+"���: "
+
+#: my-evolution/Locations.h:1641
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1642
+msgid "Ord-Sharp"
+msgstr ""
+
+#: my-evolution/Locations.h:1643
+#, fuzzy
+msgid "Oregon"
+msgstr ""
+"\n"
+"���: "
+
+#: my-evolution/Locations.h:1644
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1645
+#, fuzzy
+msgid "Orland"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1646
+#, fuzzy
+msgid "Orlando"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1647
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1648
+msgid "Orsta-Volda"
+msgstr ""
+
+#: my-evolution/Locations.h:1649
+#, fuzzy
+msgid "Oruro"
+msgstr "����"
+
+#: my-evolution/Locations.h:1650
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1652
+#, fuzzy
+msgid "Oscoda"
+msgstr "��"
+
+#: my-evolution/Locations.h:1653
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1657
+msgid "Ostrava"
+msgstr ""
+
+#: my-evolution/Locations.h:1658
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1661
+#, fuzzy
+msgid "Owyhee"
+msgstr "��"
+
+#: my-evolution/Locations.h:1662
+msgid "Oxford"
+msgstr ""
+
+#: my-evolution/Locations.h:1663
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1670
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1671
+#, fuzzy
+msgid "Paganella"
+msgstr "��"
+
+#: my-evolution/Locations.h:1674
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1675
+msgid "Palacios"
+msgstr ""
+
+#: my-evolution/Locations.h:1676
+#, fuzzy
+msgid "Palermo"
+msgstr "�߻�"
+
+#: my-evolution/Locations.h:1677
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1678
+msgid "Palmdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1679
+#, fuzzy
+msgid "Palmer"
+msgstr "�߻�"
+
+#: my-evolution/Locations.h:1680
+#, fuzzy
+msgid "Palm Springs"
+msgstr "���� ����(_M)..."
+
+#: my-evolution/Locations.h:1681
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1682
+msgid "Pamplona"
+msgstr ""
+
+#: my-evolution/Locations.h:1684
+#, fuzzy
+msgid "Panama City"
+msgstr "ij����"
+
+#: my-evolution/Locations.h:1685
+#, fuzzy
+msgid "Pantelleria"
+msgstr "��ҵ�"
+
+#: my-evolution/Locations.h:1686
+#, fuzzy
+msgid "Papa"
+msgstr "����"
+
+#: my-evolution/Locations.h:1687
+#, fuzzy
+msgid "Paphos"
+msgstr "�̸�(_L):"
+
+#: my-evolution/Locations.h:1689
+#, fuzzy
+msgid "Paris"
+msgstr "�μ�"
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1692
+#, fuzzy
+msgid "Paris/Orly"
+msgstr "����"
+
+#: my-evolution/Locations.h:1693
+msgid "Parkersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1694
+#, fuzzy
+msgid "Pasco"
+msgstr "��й�ȣ"
+
+#: my-evolution/Locations.h:1695
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1700
+msgid "Passo Rolle"
+msgstr ""
+
+#: my-evolution/Locations.h:1701
+#, fuzzy
+msgid "Patna"
+msgstr "ij����"
+
+#: my-evolution/Locations.h:1702
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1706
+#, fuzzy
+msgid "Paysandu"
+msgstr "�Ҹ� ����"
+
+#: my-evolution/Locations.h:1707
+#, fuzzy
+msgid "Payson"
+msgstr "�Ҹ� ����"
+
+#: my-evolution/Locations.h:1708
+#, fuzzy
+msgid "Pellston"
+msgstr "����"
+
+#: my-evolution/Locations.h:1709
+#, fuzzy
+msgid "Pelotas"
+msgstr "����"
+
+#: my-evolution/Locations.h:1710
+#, fuzzy
+msgid "Pendleton"
+msgstr "����:"
+
+#: my-evolution/Locations.h:1711
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1716
+#, fuzzy
+msgid "Peoria"
+msgstr "�μ�"
+
+#: my-evolution/Locations.h:1717
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1718
+msgid "Pereira/Matecana"
+msgstr ""
+
+#: my-evolution/Locations.h:1719
+#, fuzzy
+msgid "Perm"
+msgstr "�μ�"
+
+#: my-evolution/Locations.h:1720
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1721
+msgid "Perry-Foley"
+msgstr ""
+
+#: my-evolution/Locations.h:1722
+#, fuzzy
+msgid "Perth"
+msgstr "����"
+
+#: my-evolution/Locations.h:1724
+#, fuzzy
+msgid "Perugia"
+msgstr "����"
+
+#: my-evolution/Locations.h:1725
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1730
+msgid "Philip"
+msgstr ""
+
+#: my-evolution/Locations.h:1731
+msgid "Philipsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1732
+msgid "Phillips"
+msgstr ""
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1739
+msgid "Piedras Negras"
+msgstr ""
+
+#: my-evolution/Locations.h:1740
+#, fuzzy
+msgid "Pierre"
+msgstr "����"
+
+#: my-evolution/Locations.h:1741
+msgid "Pietersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1742
+#, fuzzy
+msgid "Pikeville"
+msgstr "�̸�����"
+
+#: my-evolution/Locations.h:1743
+#, fuzzy
+msgid "Pine Bluff"
+msgstr "�̸���"
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+msgid "Pirassununga"
+msgstr ""
+
+#: my-evolution/Locations.h:1747
+#, fuzzy
+msgid "Pisa"
+msgstr "���̱�"
+
+#: my-evolution/Locations.h:1748
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1753
+#, fuzzy
+msgid "Plymouth"
+msgstr "��"
+
+#: my-evolution/Locations.h:1754
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+msgid "Pocos De Caldas"
+msgstr ""
+
+#: my-evolution/Locations.h:1756
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1757
+msgid "Podgorica Titograd"
+msgstr ""
+
+#: my-evolution/Locations.h:1758
+msgid "Pohang Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1759
+#, fuzzy
+msgid "Point Hope"
+msgstr "���� �μ�(_v)..."
+
+#: my-evolution/Locations.h:1760
+#, fuzzy
+msgid "Point Lay"
+msgstr "���"
+
+#: my-evolution/Locations.h:1761
+#, fuzzy
+msgid "Point Mugu"
+msgstr "�޼��� �μ�"
+
+#: my-evolution/Locations.h:1762
+msgid "Point Piedras Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1763
+#, fuzzy
+msgid "Poitiers"
+msgstr "����"
+
+#: my-evolution/Locations.h:1765
+msgid "Pompano Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1766
+#, fuzzy
+msgid "Ponca City"
+msgstr "��ȭ ����"
+
+#: my-evolution/Locations.h:1767
+#, fuzzy
+msgid "Ponce"
+msgstr "�μ�"
+
+#: my-evolution/Locations.h:1768
+msgid "Ponta Pora"
+msgstr ""
+
+#: my-evolution/Locations.h:1769
+#, fuzzy
+msgid "Pontiac"
+msgstr "����ó(_C)"
+
+#: my-evolution/Locations.h:1770
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1771
+msgid "Poplar Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1772
+#, fuzzy
+msgid "Poprad"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1773
+#, fuzzy
+msgid "Port Alexander"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1774
+msgid "Port Alsworth"
+msgstr ""
+
+#: my-evolution/Locations.h:1775
+#, fuzzy
+msgid "Port Angeles"
+msgstr "���� �μ�(_v)..."
+
+#: my-evolution/Locations.h:1776
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1777
+msgid "Port Elizabeth"
+msgstr ""
+
+#: my-evolution/Locations.h:1778
+#, fuzzy
+msgid "Porterville"
+msgstr "�̸�����"
+
+#: my-evolution/Locations.h:1779
+#, fuzzy
+msgid "Port Hardy"
+msgstr "�޷� �μ��ϱ�"
+
+#: my-evolution/Locations.h:1780
+#, fuzzy
+msgid "Port Hedland"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1781
+msgid "Port Heiden"
+msgstr ""
+
+#: my-evolution/Locations.h:1782
+#, fuzzy
+msgid "Portland"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1783
+#, fuzzy
+msgid "Porto"
+msgstr "��Ʈ:"
+
+#: my-evolution/Locations.h:1784
+#, fuzzy
+msgid "Porto Alegre"
+msgstr "������"
+
+#: my-evolution/Locations.h:1785
+msgid "Porto Alegre Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:1786
+#, fuzzy
+msgid "Portoroz"
+msgstr "����"
+
+#: my-evolution/Locations.h:1787
+#, fuzzy
+msgid "Porto Santo"
+msgstr "����"
+
+#: my-evolution/Locations.h:1788
+msgid "Porto Velho"
+msgstr ""
+
+#: my-evolution/Locations.h:1789
+#, fuzzy
+msgid "Port Said"
+msgstr "����"
+
+#: my-evolution/Locations.h:1790
+msgid "Portsmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1792
+#, fuzzy
+msgid "Posadas"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1793
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1796
+msgid "Poza Rica"
+msgstr ""
+
+#: my-evolution/Locations.h:1797
+#, fuzzy
+msgid "Poznan"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1798
+msgid "Praha"
+msgstr ""
+
+#: my-evolution/Locations.h:1799
+msgid "Pratica di Mare"
+msgstr ""
+
+#: my-evolution/Locations.h:1800
+msgid "Prescott"
+msgstr ""
+
+#: my-evolution/Locations.h:1801
+#, fuzzy
+msgid "Presidente Prudente"
+msgstr "�μ� �̸�����"
+
+#: my-evolution/Locations.h:1802
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1804
+#, fuzzy
+msgid "Pretoria"
+msgstr "����"
+
+#: my-evolution/Locations.h:1805
+#, fuzzy
+msgid "Preveza"
+msgstr "����"
+
+#: my-evolution/Locations.h:1806
+msgid "Price-Carbon"
+msgstr ""
+
+#: my-evolution/Locations.h:1807
+#, fuzzy
+msgid "Pristina"
+msgstr "����"
+
+#: my-evolution/Locations.h:1808
+#, fuzzy
+msgid "Providence"
+msgstr "�̸�����"
+
+#: my-evolution/Locations.h:1809
+#, fuzzy
+msgid "Provincetown"
+msgstr "�̸�����"
+
+#: my-evolution/Locations.h:1810
+#, fuzzy
+msgid "Provo"
+msgstr "����"
+
+#: my-evolution/Locations.h:1811
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1812
+msgid "Pucallpa"
+msgstr ""
+
+#: my-evolution/Locations.h:1813
+msgid "Pudahuel"
+msgstr ""
+
+#: my-evolution/Locations.h:1814
+#, fuzzy
+msgid "Puebla"
+msgstr "���� Ű(_b)"
+
+#: my-evolution/Locations.h:1815
+#, fuzzy
+msgid "Pueblo"
+msgstr "���� Ű(_b)"
+
+#: my-evolution/Locations.h:1816
+msgid "Puerto Barrios"
+msgstr ""
+
+#: my-evolution/Locations.h:1817
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1818
+msgid "Puerto Escondido"
+msgstr ""
+
+#: my-evolution/Locations.h:1819
+msgid "Puerto Lempira"
+msgstr ""
+
+#: my-evolution/Locations.h:1820
+#, fuzzy
+msgid "Puerto Limon"
+msgstr "����"
+
+#: my-evolution/Locations.h:1821
+msgid "Puerto Maldonado"
+msgstr ""
+
+#: my-evolution/Locations.h:1822
+msgid "Puerto Montt"
+msgstr ""
+
+#: my-evolution/Locations.h:1823
+msgid "Puerto Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1825
+#, fuzzy
+msgid "Puerto Suarez"
+msgstr "���"
+
+#: my-evolution/Locations.h:1826
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1827
+#, fuzzy
+msgid "Pula"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1828
+#, fuzzy
+msgid "Pullman"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1829
+msgid "Punta Arenas"
+msgstr ""
+
+#: my-evolution/Locations.h:1830
+msgid "Punta Cana"
+msgstr ""
+
+#: my-evolution/Locations.h:1831
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1835
+msgid "Pyongyang"
+msgstr ""
+
+#: my-evolution/Locations.h:1837
+#, fuzzy
+msgid "Quantico"
+msgstr "����"
+
+#: my-evolution/Locations.h:1838
+#, fuzzy
+msgid "Quebec"
+msgstr "����"
+
+#: my-evolution/Locations.h:1839
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1842
+msgid "Quimper"
+msgstr ""
+
+#: my-evolution/Locations.h:1843
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1850
+#, fuzzy
+msgid "Rapid City"
+msgstr "ȸ��"
+
+#: my-evolution/Locations.h:1851
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1852
+msgid "Ras Al Khaimah"
+msgstr ""
+
+#: my-evolution/Locations.h:1853
+msgid "Rawlins"
+msgstr ""
+
+#: my-evolution/Locations.h:1854
+#, fuzzy
+msgid "Reading"
+msgstr "�Ӹ���"
+
+#: my-evolution/Locations.h:1855
+msgid "Rebun Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1856
+#, fuzzy
+msgid "Recife"
+msgstr "�޾���"
+
+#: my-evolution/Locations.h:1857
+msgid "Red Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1858
+#, fuzzy
+msgid "Redding"
+msgstr "�Ӹ���"
+
+#: my-evolution/Locations.h:1859
+#, fuzzy
+msgid "Redig"
+msgstr "����"
+
+#: my-evolution/Locations.h:1860
+#, fuzzy
+msgid "Redmond"
+msgstr "�����"
+
+#: my-evolution/Locations.h:1861
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1863
+msgid "Reggio Calabria"
+msgstr ""
+
+#: my-evolution/Locations.h:1864
+#, fuzzy
+msgid "Regina"
+msgstr "����:"
+
+#: my-evolution/Locations.h:1865
+msgid "Reims-Champagne"
+msgstr ""
+
+#: my-evolution/Locations.h:1866
+#, fuzzy
+msgid "Rennes"
+msgstr "��Ģ �̸�: "
+
+#: my-evolution/Locations.h:1867
+#, fuzzy
+msgid "Reno"
+msgstr "�����"
+
+#: my-evolution/Locations.h:1868
+#, fuzzy
+msgid "Renton"
+msgstr "����:"
+
+#: my-evolution/Locations.h:1869
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1870
+#, fuzzy
+msgid "Reus"
+msgstr "�ٽ� ����"
+
+#: my-evolution/Locations.h:1871
+#, fuzzy
+msgid "Reyes"
+msgstr "����"
+
+#: my-evolution/Locations.h:1872
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1873
+#, fuzzy
+msgid "Reynosa"
+msgstr "����"
+
+#: my-evolution/Locations.h:1874
+#, fuzzy
+msgid "Rhinelander"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1875
+msgid "Rhode Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1876
+msgid "Riberalta"
+msgstr ""
+
+#: my-evolution/Locations.h:1877
+msgid "Richmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1878
+#, fuzzy
+msgid "Rickenbacker"
+msgstr "����"
+
+#: my-evolution/Locations.h:1879
+#, fuzzy
+msgid "Rieti"
+msgstr "����"
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rifle"
+msgstr "����"
+
+#: my-evolution/Locations.h:1881
+#, fuzzy
+msgid "Riga"
+msgstr "������:"
+
+#: my-evolution/Locations.h:1882
+#, fuzzy
+msgid "Rijeka"
+msgstr "����"
+
+#: my-evolution/Locations.h:1883
+msgid "Rimini"
+msgstr ""
+
+#: my-evolution/Locations.h:1884
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1885
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1886
+msgid "Rio Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1887
+msgid "Rioja"
+msgstr ""
+
+#: my-evolution/Locations.h:1888
+msgid "Rio / Jacarepagua"
+msgstr ""
+
+#: my-evolution/Locations.h:1889
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+msgid "Rishiri Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1891
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+#, fuzzy
+msgid "Rivera"
+msgstr "����"
+
+#: my-evolution/Locations.h:1893
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1894
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1895
+msgid "Riverton"
+msgstr ""
+
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "�μ�"
+
+#: my-evolution/Locations.h:1897
+msgid "Rivolto"
+msgstr ""
+
+#: my-evolution/Locations.h:1898
+#, fuzzy
+msgid "Riyadh"
+msgstr "����"
+
+#: my-evolution/Locations.h:1899
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1900
+msgid "Roatan"
+msgstr ""
+
+#: my-evolution/Locations.h:1901
+msgid "Robore"
+msgstr ""
+
+#: my-evolution/Locations.h:1902
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1903
+msgid "Rockford"
+msgstr ""
+
+#: my-evolution/Locations.h:1904
+#, fuzzy
+msgid "Rockland"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1905
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1907
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1908
+#, fuzzy
+msgid "Rodos"
+msgstr "�����"
+
+#: my-evolution/Locations.h:1909
+#, fuzzy
+msgid "Rogers"
+msgstr "����"
+
+#: my-evolution/Locations.h:1910
+msgid "Roma/Ciampino"
+msgstr ""
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1917
+msgid "Roosevelt"
+msgstr ""
+
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Roros"
+msgstr "����"
+
+#: my-evolution/Locations.h:1919
+msgid "Rorvik/Ryum"
+msgstr ""
+
+#: my-evolution/Locations.h:1920
+msgid "Rosario"
+msgstr ""
+
+#: my-evolution/Locations.h:1921
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1922
+msgid "Roseglen"
+msgstr ""
+
+#: my-evolution/Locations.h:1923
+#, fuzzy
+msgid "Rost"
+msgstr "ȣ��Ʈ:"
+
+#: my-evolution/Locations.h:1924
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1927
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1928
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1929
+msgid "Rurrenabaque"
+msgstr ""
+
+#: my-evolution/Locations.h:1930
+msgid "Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1931
+msgid "Russia"
+msgstr ""
+
+#: my-evolution/Locations.h:1932
+#, fuzzy
+msgid "Rutland"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:1933
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1935
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1936
+msgid "Sabine Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:1937
+#, fuzzy
+msgid "Sacramento"
+msgstr "�μ�"
+
+#: my-evolution/Locations.h:1938
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1939
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1940
+#, fuzzy
+msgid "Saginaw"
+msgstr "����"
+
+#: my-evolution/Locations.h:1941
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1944
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1945
+#, fuzzy
+msgid "Saint Mary's"
+msgstr "�޷� �μ��ϱ�"
+
+#: my-evolution/Locations.h:1946
+msgid "Saint Mawgan"
+msgstr ""
+
+#: my-evolution/Locations.h:1947
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1948
+msgid "Saint Paul"
+msgstr ""
+
+#: my-evolution/Locations.h:1949
+#, fuzzy
+msgid "Saiq"
+msgstr "����"
+
+#: my-evolution/Locations.h:1950
+msgid "Salalah"
+msgstr ""
+
+#: my-evolution/Locations.h:1951
+#, fuzzy
+msgid "Salem"
+msgstr "����"
+
+#: my-evolution/Locations.h:1952
+#, fuzzy
+msgid "Salida"
+msgstr "����"
+
+#: my-evolution/Locations.h:1953
+msgid "Salida-Harriet"
+msgstr ""
+
+#: my-evolution/Locations.h:1954
+#, fuzzy
+msgid "Salina"
+msgstr "����"
+
+#: my-evolution/Locations.h:1955
+#, fuzzy
+msgid "Salinas"
+msgstr "����"
+
+#: my-evolution/Locations.h:1956
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1957
+#, fuzzy
+msgid "Salmon"
+msgstr "����"
+
+#: my-evolution/Locations.h:1958
+msgid "Salmon (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1959
+#, fuzzy
+msgid "Salta"
+msgstr "����"
+
+#: my-evolution/Locations.h:1960
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1961
+msgid "Salt Lake City"
+msgstr ""
+
+#: my-evolution/Locations.h:1962
+#, fuzzy
+msgid "Salto"
+msgstr "��"
+
+#: my-evolution/Locations.h:1963
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+msgid "Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:1965
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1966
+#, fuzzy
+msgid "Samara"
+msgstr "����"
+
+#: my-evolution/Locations.h:1967
+#, fuzzy
+msgid "Samos"
+msgstr "�̸�(_L):"
+
+#: my-evolution/Locations.h:1968
+#, fuzzy
+msgid "Samsun"
+msgstr "��"
+
+#: my-evolution/Locations.h:1969
+#, fuzzy
+msgid "Sana'A"
+msgstr "����"
+
+#: my-evolution/Locations.h:1970
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+msgid "San Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1975
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1976
+#, fuzzy
+msgid "San Carlos"
+msgstr "������ ��ħ"
+
+#: my-evolution/Locations.h:1977
+#, fuzzy
+msgid "Sandane"
+msgstr "����"
+
+#: my-evolution/Locations.h:1978
+#, fuzzy
+msgid "Sandberg"
+msgstr "������"
+
+#: my-evolution/Locations.h:1979
+#, fuzzy
+msgid "Sanderson"
+msgstr "������"
+
+#: my-evolution/Locations.h:1980
+msgid "San Diego"
+msgstr ""
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1986
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1987
+msgid "Sand Point"
+msgstr ""
+
+#: my-evolution/Locations.h:1988
+msgid "San Fernando De Apure"
+msgstr ""
+
+#: my-evolution/Locations.h:1989
+#, fuzzy
+msgid "Sanford"
+msgstr "����"
+
+#: my-evolution/Locations.h:1990
+msgid "San Francisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1991
+#, fuzzy
+msgid "Sangju"
+msgstr "����"
+
+#: my-evolution/Locations.h:1992
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1993
+msgid "San Joaquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1994
+#, fuzzy
+msgid "San Jose"
+msgstr "������ ��ħ"
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1997
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1998
+#, fuzzy
+msgid "San Juan"
+msgstr "��"
+
+#: my-evolution/Locations.h:1999
+msgid "Sankt-Peterburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2000
+#, fuzzy
+msgid "Sanliurfa"
+msgstr "����"
+
+#: my-evolution/Locations.h:2001
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2002
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2003
+msgid "San Miguel"
+msgstr ""
+
+#: my-evolution/Locations.h:2004
+msgid "San Nicholas Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2005
+msgid "San Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:2006
+msgid "San Sebastian"
+msgstr ""
+
+#: my-evolution/Locations.h:2007
+msgid "Santa Ana"
+msgstr ""
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+msgid "Santa Maria"
+msgstr ""
+
+#: my-evolution/Locations.h:2012
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2013
+msgid "Santa Monica"
+msgstr ""
+
+#: my-evolution/Locations.h:2014
+#, fuzzy
+msgid "Santander"
+msgstr "������"
+
+#: my-evolution/Locations.h:2015
+msgid "Santarem"
+msgstr ""
+
+#: my-evolution/Locations.h:2016
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2017
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+msgid "Santiago"
+msgstr ""
+
+#: my-evolution/Locations.h:2019
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2020
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2021
+msgid "Santorini"
+msgstr ""
+
+#: my-evolution/Locations.h:2022
+#, fuzzy
+msgid "Santos"
+msgstr "����"
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+msgid "Sao Luiz"
+msgstr ""
+
+#: my-evolution/Locations.h:2025
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2028
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+msgid "Sarasota"
+msgstr ""
+
+#: my-evolution/Locations.h:2030
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+#, fuzzy
+msgid "Sarzana"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:2032
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2033
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2038
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2039
+msgid "Sawyer AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2040
+#, fuzzy
+msgid "Sayun"
+msgstr "��"
+
+#: my-evolution/Locations.h:2041
+#, fuzzy
+msgid "Scatsta"
+msgstr "����"
+
+#: my-evolution/Locations.h:2042
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2045
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2046
+msgid "Scottsdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Scranton"
+msgstr "����"
+
+#: my-evolution/Locations.h:2048
+msgid "Seattle"
+msgstr ""
+
+#: my-evolution/Locations.h:2049
+#, fuzzy
+msgid "Seattle-Boeing"
+msgstr "����..."
+
+#: my-evolution/Locations.h:2050
+#, fuzzy
+msgid "Sedalia"
+msgstr "����"
+
+#: my-evolution/Locations.h:2051
+#, fuzzy
+msgid "Seeb"
+msgstr "����"
+
+#: my-evolution/Locations.h:2052
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+#, fuzzy
+msgid "Sendai Airport"
+msgstr "���� ��¥(_S):"
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2058
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2059
+msgid "Sevilla"
+msgstr ""
+
+#: my-evolution/Locations.h:2060
+#, fuzzy
+msgid "Seward"
+msgstr "�˻�"
+
+#: my-evolution/Locations.h:2061
+msgid "Sexton Summit"
+msgstr ""
+
+#: my-evolution/Locations.h:2062
+#, fuzzy
+msgid "Shanghai"
+msgstr "����"
+
+#: my-evolution/Locations.h:2063
+msgid "Shannon"
+msgstr ""
+
+#: my-evolution/Locations.h:2064
+#, fuzzy
+msgid "Sharjah"
+msgstr "�˻�"
+
+#: my-evolution/Locations.h:2065
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+#: my-evolution/Locations.h:2066
+#, fuzzy
+msgid "Sharurah"
+msgstr "�����"
+
+#: my-evolution/Locations.h:2067
+#, fuzzy
+msgid "Shawbury"
+msgstr "�����"
+
+#: my-evolution/Locations.h:2068
+#, fuzzy
+msgid "Shearwater"
+msgstr "������ ��"
+
+#: my-evolution/Locations.h:2069
+msgid "Sheboygan"
+msgstr ""
+
+#: my-evolution/Locations.h:2070
+#, fuzzy
+msgid "Sheldon"
+msgstr "������"
+
+#: my-evolution/Locations.h:2071
+msgid "Shelter Cove"
+msgstr ""
+
+#: my-evolution/Locations.h:2072
+#, fuzzy
+msgid "Shelton"
+msgstr "����:"
+
+#: my-evolution/Locations.h:2073
+msgid "Shenandoah"
+msgstr ""
+
+#: my-evolution/Locations.h:2074
+#, fuzzy
+msgid "Sheridan"
+msgstr "��"
+
+#: my-evolution/Locations.h:2075
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2076
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2077
+msgid "Shingle Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2078
+#, fuzzy
+msgid "Shiraz"
+msgstr "ũ��"
+
+#: my-evolution/Locations.h:2079
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2080
+msgid "Shizuhama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2081
+msgid "Shoreham"
+msgstr ""
+
+#: my-evolution/Locations.h:2082
+#, fuzzy
+msgid "Show Low"
+msgstr "���־� ����"
+
+#: my-evolution/Locations.h:2083
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2084
+msgid "Shreveport Regional"
+msgstr ""
+
+#: my-evolution/Locations.h:2085
+#, fuzzy
+msgid "Sidney"
+msgstr "�μ�"
+
+#: my-evolution/Locations.h:2086
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2087
+msgid "Siloam Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2088
+#, fuzzy
+msgid "Silver City"
+msgstr "����(_S)"
+
+#: my-evolution/Locations.h:2089
+#, fuzzy
+msgid "Sindal"
+msgstr "�Ͽ���"
+
+#: my-evolution/Locations.h:2091
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2097
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2098
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+#: my-evolution/Locations.h:2099
+#, fuzzy
+msgid "Skive"
+msgstr "ũ��"
+
+#: my-evolution/Locations.h:2100
+#, fuzzy
+msgid "Skopje"
+msgstr "����"
+
+#: my-evolution/Locations.h:2101
+#, fuzzy
+msgid "Skwentna"
+msgstr "����"
+
+#: my-evolution/Locations.h:2102
+#, fuzzy
+msgid "Slana"
+msgstr "����"
+
+#: my-evolution/Locations.h:2105
+#, fuzzy
+msgid "Smithers"
+msgstr "��"
+
+#: my-evolution/Locations.h:2106
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2107
+msgid "Snowshoe Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2108
+#, fuzzy
+msgid "Sochi"
+msgstr "��"
+
+#: my-evolution/Locations.h:2109
+msgid "Socorro"
+msgstr ""
+
+#: my-evolution/Locations.h:2110
+msgid "Socotra"
+msgstr ""
+
+#: my-evolution/Locations.h:2111
+msgid "Soda Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2112
+#, fuzzy
+msgid "Sofia"
+msgstr "����"
+
+#: my-evolution/Locations.h:2113
+#, fuzzy
+msgid "Sogndal"
+msgstr "ij����"
+
+#: my-evolution/Locations.h:2114
+msgid "Soldotna"
+msgstr ""
+
+#: my-evolution/Locations.h:2115
+#, fuzzy
+msgid "Somerset"
+msgstr "����"
+
+#: my-evolution/Locations.h:2116
+#, fuzzy
+msgid "Sonderborg"
+msgstr "������"
+
+#: my-evolution/Locations.h:2117
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2120
+#, fuzzy
+msgid "Southampton"
+msgstr "��"
+
+#: my-evolution/Locations.h:2121
+#, fuzzy
+msgid "South Bend"
+msgstr "��"
+
+#: my-evolution/Locations.h:2122
+msgid "South Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:2123
+msgid "South Dakota"
+msgstr ""
+
+#: my-evolution/Locations.h:2124
+#, fuzzy
+msgid "Southend"
+msgstr "��"
+
+#: my-evolution/Locations.h:2125
+msgid "South Marsh Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2126
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2128
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2129
+#, fuzzy
+msgid "Spencer"
+msgstr "������"
+
+#: my-evolution/Locations.h:2130
+msgid "Spickard"
+msgstr ""
+
+#: my-evolution/Locations.h:2131
+#, fuzzy
+msgid "Split"
+msgstr "����"
+
+#: my-evolution/Locations.h:2132
+#, fuzzy
+msgid "Spokane"
+msgstr "����"
+
+#: my-evolution/Locations.h:2133
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2134
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "Springfield"
+msgstr "���� ����ȭ"
+
+#: my-evolution/Locations.h:2136
+msgid "Stampede Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:2137
+#, fuzzy
+msgid "State College"
+msgstr "�Ϸ�� ��¥:"
+
+#: my-evolution/Locations.h:2138
+#, fuzzy
+msgid "Stauning"
+msgstr "����..."
+
+#: my-evolution/Locations.h:2139
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2140
+msgid "Stavanger/Sola"
+msgstr ""
+
+#: my-evolution/Locations.h:2141
+#, fuzzy
+msgid "Staverton"
+msgstr "����..."
+
+#: my-evolution/Locations.h:2142
+#, fuzzy
+msgid "Stavropol"
+msgstr "����"
+
+#: my-evolution/Locations.h:2143
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2144
+msgid "Steamboat Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2145
+msgid "Stephenville"
+msgstr ""
+
+#: my-evolution/Locations.h:2146
+msgid "St. George"
+msgstr ""
+
+#: my-evolution/Locations.h:2147
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2148
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2149
+msgid "St Johnsbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2150
+#, fuzzy
+msgid "St Joseph"
+msgstr "����"
+
+#: my-evolution/Locations.h:2151
+#, fuzzy
+msgid "St Louis"
+msgstr "���"
+
+#: my-evolution/Locations.h:2152
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2157
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2158
+#, fuzzy
+msgid "Storm Lake"
+msgstr "������ ��"
+
+#: my-evolution/Locations.h:2159
+#, fuzzy
+msgid "Stornoway"
+msgstr "����"
+
+#: my-evolution/Locations.h:2160
+#, fuzzy
+msgid "St Paul"
+msgstr "����"
+
+#: my-evolution/Locations.h:2161
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2164
+msgid "Strevell"
+msgstr ""
+
+#: my-evolution/Locations.h:2165
+msgid "St Simon's Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2166
+msgid "Stumpy Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2167
+#, fuzzy
+msgid "Sturgeon Bay"
+msgstr "�����"
+
+#: my-evolution/Locations.h:2168
+msgid "Stuttgart"
+msgstr ""
+
+#: my-evolution/Locations.h:2169
+#, fuzzy
+msgid "Sucre"
+msgstr "����"
+
+#: my-evolution/Locations.h:2170
+msgid "Sumburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:2171
+#, fuzzy
+msgid "Sumter"
+msgstr "���"
+
+#: my-evolution/Locations.h:2172
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2174
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2175
+msgid "Superior"
+msgstr ""
+
+#: my-evolution/Locations.h:2177
+#, fuzzy
+msgid "Sutton"
+msgstr "��"
+
+#: my-evolution/Locations.h:2178
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2179
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2188
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2189
+msgid "Szombathely"
+msgstr ""
+
+#: my-evolution/Locations.h:2190
+#, fuzzy
+msgid "Tabatinga"
+msgstr "����"
+
+#: my-evolution/Locations.h:2191
+msgid "Tabriz"
+msgstr ""
+
+#: my-evolution/Locations.h:2192
+#, fuzzy
+msgid "Tabuk"
+msgstr "�۾�"
+
+#: my-evolution/Locations.h:2193
+msgid "Tachikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+#, fuzzy
+msgid "Tacna"
+msgstr "���"
+
+#: my-evolution/Locations.h:2195
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2199
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+#, fuzzy
+msgid "Taejon"
+msgstr "���� ����"
+
+#: my-evolution/Locations.h:2201
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2202
+msgid "Taichung"
+msgstr ""
+
+#: my-evolution/Locations.h:2203
+msgid "Taif"
+msgstr ""
+
+#: my-evolution/Locations.h:2204
+#, fuzzy
+msgid "Tainan"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:2206
+#, fuzzy
+msgid "Taiyuan"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:2207
+msgid "Taiz"
+msgstr ""
+
+#: my-evolution/Locations.h:2208
+#, fuzzy
+msgid "Tajima"
+msgstr "�۾�"
+
+#: my-evolution/Locations.h:2209
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Talara"
+msgstr ""
+
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Talinn"
+msgstr "����"
+
+#: my-evolution/Locations.h:2212
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tallahassee"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2215
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2216
+msgid "Tampa"
+msgstr ""
+
+#: my-evolution/Locations.h:2217
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2218
+#, fuzzy
+msgid "Tampere"
+msgstr "����"
+
+#: my-evolution/Locations.h:2219
+msgid "Tampico"
+msgstr ""
+
+#: my-evolution/Locations.h:2220
+#, fuzzy
+msgid "Tanana"
+msgstr "ij����"
+
+#: my-evolution/Locations.h:2221
+msgid "Tanegashima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2222
+#, fuzzy
+msgid "Taos"
+msgstr "�̸�(_L):"
+
+#: my-evolution/Locations.h:2223
+msgid "Taoyuan"
+msgstr ""
+
+#: my-evolution/Locations.h:2224
+msgid "Tapachula"
+msgstr ""
+
+#: my-evolution/Locations.h:2225
+msgid "Taranto"
+msgstr ""
+
+#: my-evolution/Locations.h:2226
+#, fuzzy
+msgid "Tarbes"
+msgstr "�۾�"
+
+#: my-evolution/Locations.h:2227
+msgid "Tarija"
+msgstr ""
+
+#: my-evolution/Locations.h:2228
+msgid "Tarvisio"
+msgstr ""
+
+#: my-evolution/Locations.h:2229
+#, fuzzy
+msgid "Tatalina"
+msgstr "����"
+
+#: my-evolution/Locations.h:2230
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2235
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2236
+#, fuzzy
+msgid "Tela"
+msgstr "����"
+
+#: my-evolution/Locations.h:2237
+#, fuzzy
+msgid "Temple"
+msgstr "����"
+
+#: my-evolution/Locations.h:2238
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2244
+msgid "Texarkana"
+msgstr ""
+
+#: my-evolution/Locations.h:2245
+#, fuzzy
+msgid "Texas"
+msgstr "�۾�"
+
+#: my-evolution/Locations.h:2246
+msgid "The Dalles"
+msgstr ""
+
+#: my-evolution/Locations.h:2247
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2248
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2249
+msgid "Thiruvananthapuram"
+msgstr ""
+
+#: my-evolution/Locations.h:2250
+#, fuzzy
+msgid "Thisted"
+msgstr "����"
+
+#: my-evolution/Locations.h:2251
+msgid "Thompson Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2252
+#, fuzzy
+msgid "Thumrait"
+msgstr "�����"
+
+#: my-evolution/Locations.h:2253
+msgid "Tianjin"
+msgstr ""
+
+#: my-evolution/Locations.h:2254
+msgid "Tijuana"
+msgstr ""
+
+#: my-evolution/Locations.h:2255
+msgid "Timisoara"
+msgstr ""
+
+#: my-evolution/Locations.h:2256
+msgid "Tin City"
+msgstr ""
+
+#: my-evolution/Locations.h:2257
+msgid "Tirana"
+msgstr ""
+
+#: my-evolution/Locations.h:2258
+#, fuzzy
+msgid "Tiree"
+msgstr "��"
+
+#: my-evolution/Locations.h:2259
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2260
+msgid "Tiruchchirapalli"
+msgstr ""
+
+#: my-evolution/Locations.h:2261
+#, fuzzy
+msgid "Titusville"
+msgstr "����"
+
+#: my-evolution/Locations.h:2262
+#, fuzzy
+msgid "Tivat"
+msgstr "Ȱ��"
+
+#: my-evolution/Locations.h:2263
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2267
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+msgid "Tokunoshima Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2269
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2271
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2272
+msgid "Tokyo New International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2273
+#, fuzzy
+msgid "Toledo"
+msgstr "�޴»��"
+
+#: my-evolution/Locations.h:2274
+msgid "Toluca"
+msgstr ""
+
+#: my-evolution/Locations.h:2275
+#, fuzzy
+msgid "Tonopah"
+msgstr "����"
+
+#: my-evolution/Locations.h:2276
+#, fuzzy
+msgid "Topeka"
+msgstr "��:"
+
+#: my-evolution/Locations.h:2277
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2279
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2280
+msgid "Toronto"
+msgstr ""
+
+#: my-evolution/Locations.h:2281
+#, fuzzy
+msgid "Torp"
+msgstr "��:"
+
+#: my-evolution/Locations.h:2282
+#, fuzzy
+msgid "Torrance"
+msgstr "��ҵ�"
+
+#: my-evolution/Locations.h:2283
+msgid "Torreon"
+msgstr ""
+
+#: my-evolution/Locations.h:2284
+#, fuzzy
+msgid "Tottori Airport"
+msgstr "���� ��¥(_S):"
+
+#: my-evolution/Locations.h:2285
+#, fuzzy
+msgid "Toulouse"
+msgstr "�ݱ�"
+
+#: my-evolution/Locations.h:2286
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2290
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2291
+msgid "Trabzon"
+msgstr ""
+
+#: my-evolution/Locations.h:2292
+#, fuzzy
+msgid "Trapani"
+msgstr "����"
+
+#: my-evolution/Locations.h:2293
+msgid "Traverse City"
+msgstr ""
+
+#: my-evolution/Locations.h:2294
+#, fuzzy
+msgid "Trelew"
+msgstr "�̸�����"
+
+#: my-evolution/Locations.h:2295
+#, fuzzy
+msgid "Trenton"
+msgstr "����"
+
+#: my-evolution/Locations.h:2296
+#, fuzzy
+msgid "Trevico"
+msgstr "����"
+
+#: my-evolution/Locations.h:2297
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2298
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2299
+#, fuzzy
+msgid "Trieste"
+msgstr "�׽�Ʈ"
+
+#: my-evolution/Locations.h:2300
+msgid "Trinidad"
+msgstr ""
+
+#: my-evolution/Locations.h:2301
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2304
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2305
+msgid "Troyes/Barberey"
+msgstr ""
+
+#: my-evolution/Locations.h:2306
+#, fuzzy
+msgid "Truckee"
+msgstr "ȭ"
+
+#: my-evolution/Locations.h:2307
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2314
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2315
+msgid "Tulancingo"
+msgstr ""
+
+#: my-evolution/Locations.h:2316
+#, fuzzy
+msgid "Tulcea"
+msgstr "ȭ����"
+
+#: my-evolution/Locations.h:2317
+#, fuzzy
+msgid "Tulsa"
+msgstr "ȭ����"
+
+#: my-evolution/Locations.h:2318
+#, fuzzy
+msgid "Tupelo"
+msgstr "ȭ"
+
+#: my-evolution/Locations.h:2319
+msgid "Turaif"
+msgstr ""
+
+#: my-evolution/Locations.h:2320
+#, fuzzy
+msgid "Turin"
+msgstr "����"
+
+#: my-evolution/Locations.h:2322
+#, fuzzy
+msgid "Turku"
+msgstr "ȭ"
+
+#: my-evolution/Locations.h:2323
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2324
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+#: my-evolution/Locations.h:2325
+#, fuzzy
+msgid "Twenthe"
+msgstr "������"
+
+#: my-evolution/Locations.h:2326
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2327
+msgid "Twin Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2328
+#, fuzzy
+msgid "Tyler"
+msgstr "����"
+
+#: my-evolution/Locations.h:2329
+msgid "Tyndall AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2330
+#, fuzzy
+msgid "Tyumen"
+msgstr "ȭ"
+
+#: my-evolution/Locations.h:2331
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2332
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2340
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2341
+#, fuzzy
+msgid "United Arab Emirates "
+msgstr "�޼��� �μ�"
+
+#: my-evolution/Locations.h:2344
+msgid "Unst"
+msgstr ""
+
+#: my-evolution/Locations.h:2345
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2346
+msgid "Uruapan"
+msgstr ""
+
+#: my-evolution/Locations.h:2347
+#, fuzzy
+msgid "Uruguaiana"
+msgstr "ij����"
+
+#: my-evolution/Locations.h:2349
+msgid "Urumqi"
+msgstr ""
+
+#: my-evolution/Locations.h:2350
+#, fuzzy
+msgid "Utah"
+msgstr "÷��"
+
+#: my-evolution/Locations.h:2351
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2353
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:2355
+msgid "Vadso"
+msgstr ""
+
+#: my-evolution/Locations.h:2356
+#, fuzzy
+msgid "Vaerlose"
+msgstr "�ݱ�"
+
+#: my-evolution/Locations.h:2357
+#, fuzzy
+msgid "Vagar"
+msgstr "�߻�"
+
+#: my-evolution/Locations.h:2358
+msgid "Valdez 2"
+msgstr ""
+
+#: my-evolution/Locations.h:2359
+#, fuzzy
+msgid "Valdosta"
+msgstr "����"
+
+#: my-evolution/Locations.h:2360
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2361
+#, fuzzy
+msgid "Valencia"
+msgstr "�޷�"
+
+#: my-evolution/Locations.h:2362
+msgid "Valentine"
+msgstr ""
+
+#: my-evolution/Locations.h:2363
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2366
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2367
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2368
+#, fuzzy
+msgid "Van"
+msgstr "����"
+
+#: my-evolution/Locations.h:2369
+msgid "Vancouver"
+msgstr ""
+
+#: my-evolution/Locations.h:2370
+#, fuzzy
+msgid "Vandel"
+msgstr "��ҵ�"
+
+#: my-evolution/Locations.h:2371
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2373
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+msgid "Varadero"
+msgstr ""
+
+#: my-evolution/Locations.h:2375
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2376
+msgid "Varna"
+msgstr ""
+
+#: my-evolution/Locations.h:2377
+#, fuzzy
+msgid "Vasteras"
+msgstr "���̱�"
+
+#: my-evolution/Locations.h:2378
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2379
+msgid "Venezia"
+msgstr ""
+
+#: my-evolution/Locations.h:2381
+msgid "Venice"
+msgstr ""
+
+#: my-evolution/Locations.h:2382
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2383
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2384
+#, fuzzy
+msgid "Vermont"
+msgstr "��"
+
+#: my-evolution/Locations.h:2385
+#, fuzzy
+msgid "Vernal"
+msgstr "�Ϲ� ����"
+
+#: my-evolution/Locations.h:2386
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+msgid "Vicenza"
+msgstr ""
+
+#: my-evolution/Locations.h:2388
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2390
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2393
+msgid "Vigo"
+msgstr ""
+
+#: my-evolution/Locations.h:2394
+#, fuzzy
+msgid "Vilhena"
+msgstr "���� �̸�:"
+
+#: my-evolution/Locations.h:2395
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+msgid "Villahermosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2398
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2404
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+msgid "Visalia"
+msgstr ""
+
+#: my-evolution/Locations.h:2406
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2410
+msgid "Vladivostok"
+msgstr ""
+
+#: my-evolution/Locations.h:2411
+#, fuzzy
+msgid "Vlieland"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:2412
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2413
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2414
+msgid "Volkel"
+msgstr ""
+
+#: my-evolution/Locations.h:2415
+#, fuzzy
+msgid "Volk Field"
+msgstr "�߽� �׸�(_F)"
+
+#: my-evolution/Locations.h:2416
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2417
+msgid "Voslau"
+msgstr ""
+
+#: my-evolution/Locations.h:2418
+#, fuzzy
+msgid "Waco"
+msgstr "������"
+
+#: my-evolution/Locations.h:2419
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2423
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2424
+msgid "Wallops Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2425
+msgid "Walnut Ridge"
+msgstr ""
+
+#: my-evolution/Locations.h:2426
+#, fuzzy
+msgid "Warner Robins"
+msgstr "���"
+
+#: my-evolution/Locations.h:2427
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2429
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2430
+msgid "Washington/Dulles"
+msgstr ""
+
+#: my-evolution/Locations.h:2431
+#, fuzzy
+msgid "Waterbury"
+msgstr "��Ÿ"
+
+#: my-evolution/Locations.h:2432
+#, fuzzy
+msgid "Waterloo"
+msgstr "��Ÿ"
+
+#: my-evolution/Locations.h:2433
+#, fuzzy
+msgid "Watertown"
+msgstr "��Ÿ"
+
+#: my-evolution/Locations.h:2434
+#, fuzzy
+msgid "Waterville"
+msgstr "���"
+
+#: my-evolution/Locations.h:2435
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+msgid "Wausau"
+msgstr ""
+
+#: my-evolution/Locations.h:2437
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2438
+msgid "Waynesboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2439
+#, fuzzy
+msgid "Webster City"
+msgstr "�� ����Ʈ"
+
+#: my-evolution/Locations.h:2440
+msgid "Wejh"
+msgstr ""
+
+#: my-evolution/Locations.h:2441
+msgid "Wellington"
+msgstr ""
+
+#: my-evolution/Locations.h:2442
+#, fuzzy
+msgid "Wenatchee"
+msgstr "��Ÿ"
+
+#: my-evolution/Locations.h:2443
+#, fuzzy
+msgid "Wendover"
+msgstr "������"
+
+#: my-evolution/Locations.h:2444
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2445
+msgid "West Burke"
+msgstr ""
+
+#: my-evolution/Locations.h:2446
+#, fuzzy
+msgid "Westerland"
+msgstr "��Ÿ�� ����(_T)"
+
+#: my-evolution/Locations.h:2447
+#, fuzzy
+msgid "Westfield"
+msgstr "�׽�Ʈ"
+
+#: my-evolution/Locations.h:2448
+msgid "Westhampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2449
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2451
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2452
+msgid "West Yellowstone (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2453
+#, fuzzy
+msgid "Wheeling"
+msgstr "����"
+
+#: my-evolution/Locations.h:2454
+msgid "Whidbey Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2455
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2461
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2462
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2463
+#, fuzzy
+msgid "Wick"
+msgstr "����"
+
+#: my-evolution/Locations.h:2464
+msgid "Wien"
+msgstr ""
+
+#: my-evolution/Locations.h:2465
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2467
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2468
+msgid "Williamsport"
+msgstr ""
+
+#: my-evolution/Locations.h:2469
+msgid "Williston"
+msgstr ""
+
+#: my-evolution/Locations.h:2470
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2472
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2473
+msgid "Winchester"
+msgstr ""
+
+#: my-evolution/Locations.h:2474
+msgid "Windsor"
+msgstr ""
+
+#: my-evolution/Locations.h:2475
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2478
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+#, fuzzy
+msgid "Winslow"
+msgstr "����"
+
+#: my-evolution/Locations.h:2480
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2481
+msgid "Winter Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:2482
+#, fuzzy
+msgid "Winter Park"
+msgstr "��й�ȣ"
+
+#: my-evolution/Locations.h:2483
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+#, fuzzy
+msgid "Wisconsin"
+msgstr "��"
+
+#: my-evolution/Locations.h:2485
+msgid "Wisconsin Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:2486
+msgid "Wise"
+msgstr ""
+
+#: my-evolution/Locations.h:2487
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2488
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2489
+msgid "Woong Cheon"
+msgstr ""
+
+#: my-evolution/Locations.h:2490
+#, fuzzy
+msgid "Wooster"
+msgstr "������:"
+
+#: my-evolution/Locations.h:2491
+#, fuzzy
+msgid "Worcester"
+msgstr "��Ÿ"
+
+#: my-evolution/Locations.h:2492
+#, fuzzy
+msgid "Worland"
+msgstr "�ɶ���"
+
+#: my-evolution/Locations.h:2493
+#, fuzzy
+msgid "Worthington"
+msgstr "��������"
+
+#: my-evolution/Locations.h:2494
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2495
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2496
+msgid "Wuchia Observatory"
+msgstr ""
+
+#: my-evolution/Locations.h:2497
+#, fuzzy
+msgid "Wyoming"
+msgstr "�����°�"
+
+#: my-evolution/Locations.h:2498
+#, fuzzy
+msgid "Xiamen"
+msgstr "�̸�"
+
+#: my-evolution/Locations.h:2499
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2505
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2506
+msgid "Yankton"
+msgstr ""
+
+#: my-evolution/Locations.h:2507
+#, fuzzy
+msgid "Yao Airport"
+msgstr "������������"
+
+#: my-evolution/Locations.h:2508
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2510
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2511
+msgid "Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2513
+msgid "Yenbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2514
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2522
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2528
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2529
+msgid "Zacatecas"
+msgstr ""
+
+#: my-evolution/Locations.h:2530
+#, fuzzy
+msgid "Zadar"
+msgstr "�޷�"
+
+#: my-evolution/Locations.h:2531
+#, fuzzy
+msgid "Zagreb"
+msgstr "��"
+
+#: my-evolution/Locations.h:2532
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2533
+msgid "Zama Airfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2534
+#, fuzzy
+msgid "Zanesville"
+msgstr "��ҵ�"
+
+#: my-evolution/Locations.h:2535
+msgid "Zaragoza"
+msgstr ""
+
+#: my-evolution/Locations.h:2536
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2537
+msgid "Zuni Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:2538
+msgid "Zurich"
+msgstr ""
+
+#: 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
 #, fuzzy
 msgid "Appointments"
 msgstr "���"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 #, fuzzy
 msgid "No appointments"
 msgstr "��� ����"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:400
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "���� %l:%M %p"
 
-#: my-evolution/e-summary-calendar.c:379
+#: my-evolution/e-summary-calendar.c:402
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "���� %l:%M %p"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-calendar.c:420
+#, fuzzy
+msgid "No description"
+msgstr "����:"
+
+#: my-evolution/e-summary-mail.c:151
 #, 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
+#, 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:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:953
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:957
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "�̸�:"
 
-#: my-evolution/e-summary-preferences.c:1503
-#, fuzzy
-msgid "Summary Settings"
-msgstr "���� ����(_M)..."
-
-#: 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
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>�޷¸� �д��� ����</b>"
 
-#: my-evolution/e-summary-rdf.c:528
+#: my-evolution/e-summary-rdf.c:444
 #, fuzzy
 msgid "News Feed"
 msgstr "�� ��������(_N)"
 
-#: my-evolution/e-summary-tasks.c:248
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
+msgstr "���"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "�߰�(_A)"
+
+#. 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
+#, fuzzy
+msgid "Shown"
+msgstr "����"
+
+#: my-evolution/e-summary-tasks.c:251
 #, fuzzy
 msgid "No tasks"
 msgstr "����"
 
-#: my-evolution/e-summary-tasks.c:287
+#: my-evolution/e-summary-tasks.c:291
 #, fuzzy
 msgid "(No Description)"
 msgstr "����:"
@@ -10503,25 +23494,24 @@ msgstr "����:"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#: 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:501
 #, fuzzy
 msgid "Weather"
 msgstr "��Ÿ"
 
-#: my-evolution/e-summary-weather.c:722
-#, fuzzy
-msgid "Regions"
-msgstr "����:"
-
 #: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:488
+msgid "Please wait..."
+msgstr ""
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
 msgstr "���"
@@ -10531,47 +23521,11 @@ msgstr "���"
 msgid "Printing of Summary failed"
 msgstr "�޼��� �μ��� ����"
 
-#: my-evolution/main.c:66
+#: my-evolution/main.c:65
 #, 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"
@@ -10981,12 +23935,6 @@ msgstr ""
 msgid "Freezing ice pellets"
 msgstr ""
 
-#. HAIL
-#: my-evolution/metar.c:217
-#, fuzzy
-msgid "Hail"
-msgstr "����"
-
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
@@ -11749,185 +24697,151 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid " _Remove"
-msgstr "����"
-
-#: my-evolution/my-evolution.glade.h:2
-#, fuzzy
 msgid "Add n_ews feed"
 msgstr "�� ��������(_N)"
 
-#: my-evolution/my-evolution.glade.h:3
-#, fuzzy
-msgid "Al_l stations:"
-msgstr "��� ������"
-
-#: my-evolution/my-evolution.glade.h:4
-#, fuzzy
-msgid "All _folders:"
-msgstr "����"
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 #, fuzzy
 msgid "One mont_h"
 msgstr "��"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "One w_eek"
 msgstr " ���־�"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "��� ��� ����(_H)"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "Show _all tasks"
 msgstr "����"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "����"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 #, fuzzy
 msgid "Tasks "
 msgstr "�۾�"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 #, fuzzy
 msgid "Weather settings"
 msgstr "������ �κ� ���"
 
-#: my-evolution/my-evolution.glade.h:22
-#, fuzzy
-msgid "_Display folders:"
-msgstr "�ٸ� ������ ǥ��"
-
-#: my-evolution/my-evolution.glade.h:23
-#, fuzzy
-msgid "_Display stations:"
-msgstr "���� �ɼ�"
-
-#: my-evolution/my-evolution.glade.h:24
-#, fuzzy
-msgid "_Displayed feeds:"
-msgstr "ǥ��"
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 #, fuzzy
 msgid "_Five days"
 msgstr "�ݿ���"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "_Mail"
 msgstr "����"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "_News Feeds"
 msgstr "�� ��������(_N)"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "_One day"
 msgstr "������"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 #, fuzzy
 msgid "_Weather"
 msgstr "��Ÿ"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "���� ����"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution ��."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 #, fuzzy
 msgid "Show Details"
 msgstr "�ڼ���"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 #, fuzzy
 msgid "Cancel Operation"
 msgstr "���� ���"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr ""
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr ""
-
-#: shell/e-local-storage.c:636
-#, fuzzy
-msgid "Local Folders"
-msgstr "���� ����"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "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 "������ ��ġ�ҷ��� \"Ȯ��\", �������� \"���\"�� ��������."
 
-#: 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:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11937,14 +24851,40 @@ msgstr ""
 "%s ���丮��\n"
 "������ ���� �����ϴٿ���: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "������ �д� ���� ���� �߻�"
 
-#: shell/e-setup.c:281
+#: 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:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11952,7 +24892,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:295
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11961,7 +24901,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:320
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11969,97 +24909,98 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-about-box.c:40
-#, fuzzy
-msgid "Evolution "
-msgstr "Evolution ��ġ"
-
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr ""
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "������ ������ �����ϴ�: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr "������ ������ �����ϴ�: %s: %s"
+
+#: shell/e-shell-folder-commands.c:190
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "`%s'�� ������\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 ""
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 #, fuzzy
 msgid "Copy folder"
 msgstr "������ ����"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 #, fuzzy
 msgid "Move folder"
 msgstr "������ �̵�"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "����"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: shell/e-shell-folder-commands.c:425
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:502
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:549
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "%s ������ ����"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:556
 #, fuzzy
 msgid "Rename folder"
 msgstr "%s ������ ����"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:148
+#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-creation-dialog.c:168
 #, fuzzy, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "�����Ͻ� ������ �̸��� ���������ʽ��ϴ�"
 
-#: 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"
@@ -12068,7 +25009,7 @@ msgstr ""
 "���õ� ������ ������ �� �����ϴ�:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:267
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - �� ���� ����"
 
@@ -12078,11 +25019,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:359
+#: shell/e-shell-folder-selection-dialog.c:376
 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:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr "(�������)"
 
@@ -12099,7 +25040,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
+#: 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 ""
 
@@ -12122,16 +25063,22 @@ msgstr ""
 "%s�� �������� ��\n"
 "������ %d�� ������."
 
-#: shell/e-shell-importer.c:397
+#: shell/e-shell-importer.c:409
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "���� `%s'�� �������� �ʽ��ϴ�."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution ��ġ"
+
+#: shell/e-shell-importer.c:420
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:424
+#: shell/e-shell-importer.c:435
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -12140,11 +25087,11 @@ msgstr ""
 "������ ������ ���ִ� ������ �����ϴ�\n"
 "%s"
 
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:445
 msgid "Importing"
 msgstr "��������"
 
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:453
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -12153,17 +25100,17 @@ msgstr ""
 "%s�� ��������.\n"
 "%s�� �����մϴ�"
 
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:466
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:485
 #, c-format
 msgid "Error loading %s"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:502
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12172,56 +25119,56 @@ msgstr ""
 "%s�� �������� ��\n"
 "������ 1�� ������."
 
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:572
 msgid "Automatic"
 msgstr "�ڵ�"
 
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:623
 msgid "Filename:"
 msgstr "���� �̸�:"
 
-#: shell/e-shell-importer.c:617
+#: shell/e-shell-importer.c:628
 msgid "Select a file"
 msgstr "������ ��������"
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:638
 msgid "File type:"
 msgstr "���� ����:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:663
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:667
 #, fuzzy
 msgid "Import a single file"
 msgstr "��������"
 
-#: 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
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: 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
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: 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
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "���� ���:"
 
-#: shell/e-shell-importer.c:1014
+#: shell/e-shell-importer.c:1027
 #, fuzzy
 msgid "Select folder"
 msgstr "���� ����"
 
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1028
 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:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "��������"
 
@@ -12241,6 +25188,13 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+#, fuzzy
+msgid "New"
+msgstr "����"
+
 #: shell/e-shell-utils.c:114
 #, fuzzy
 msgid "No folder name specified."
@@ -12261,93 +25215,92 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "�ý����� ��ο� Bug buddy�� ã���� �����ϴ�."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy�� �����Ҽ� �����ϴ�."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Evolution��..."
 
-#: shell/e-shell-view-menu.c:409
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "���� �̵�..."
 
-#: shell/e-shell-view-menu.c:410
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:530
+#: shell/e-shell-view-menu.c:565
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shell-view-menu.c:531
+#: shell/e-shell-view-menu.c:566
 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 ""
-
-#: shell/e-shell-view-menu.c:570
-#, fuzzy, c-format
-msgid "Error executing %s."
-msgstr "���� ������ ����: %s: %s"
-
-#: shell/e-shell-view-menu.c:672
+#: shell/e-shell-view-menu.c:732
 #, fuzzy
 msgid "_Work Online"
 msgstr "�������ο��� �۾�"
 
-#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Work Offline"
 msgstr "�������ο��� �۾�"
 
-#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "�������ο��� �۾�"
 
-#: 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 ""
 
-#: shell/e-shell-view.c:1576
+#: shell/e-shell-view.c:1820
 #, fuzzy
 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 ""
 
-#: shell/e-shell-view.c:1630
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: 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 ""
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�ý��� ������ġ�� �����Ҽ� �����ϴ� -- %s"
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12355,20 +25308,24 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Ȯ��"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "���� ���� Druid"
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "�Ϲ� ����"
 
@@ -12495,76 +25452,73 @@ msgstr "����"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 #, fuzzy
 msgid "Shortcuts"
 msgstr "���� ����(_S)"
 
-#: shell/e-storage-set-view.c:658
-#, fuzzy, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr "������ ������ �����ϴ�: %s: %s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr ""
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(�̸� ����)"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "���� ����"
 
-#: 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:491
 msgid "The specified folder type is not valid"
 msgstr "������ ���� ������ �ùٸ��� �ʽ��ϴ�"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "����� ����"
 
-#: 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:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "������ ������ ã���� �����ϴ�"
 
-#: 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:505
 msgid "Operation not supported"
 msgstr "�۵��� �������� ����"
 
-#: 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:509
 #, fuzzy
 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 ""
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "������ ������ �����ϴ�: %s: %s"
@@ -12575,105 +25529,114 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:196
-#, fuzzy, c-format
+#, fuzzy
 msgid "%s (%d%% complete)"
 msgstr "% �Ϸ�(_p):"
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<������ �������� ���� ��������>"
+
+#: 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/evolution-shell-component.c:1045
 #, fuzzy
 msgid "CORBA error"
 msgstr "����� ����"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 #, fuzzy
 msgid "Invalid argument"
 msgstr "÷��"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 #, fuzzy
 msgid "No owner"
 msgstr "(�̸� ����)"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 #, fuzzy
 msgid "Not found"
 msgstr "������ �߰ߵ��� �ʾҽ��ϴ�"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "����� ����"
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 #, fuzzy
 msgid "Internal error"
 msgstr "����� ����"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 #, fuzzy
 msgid "Exists"
 msgstr "����(_x)"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 #, fuzzy
 msgid "Invalid URI"
 msgstr "�޷�"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 #, fuzzy
 msgid "Has subfolders"
 msgstr "%s���� ������ ����"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 #, fuzzy
 msgid "No space left"
 msgstr "�޼����� �޾ҽ��ϴ�"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr ""
 
-#: 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/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "���� ����:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
@@ -12803,331 +25766,300 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #: shell/main.c:89
+msgid "Evolution"
+msgstr ""
+
+#: shell/main.c:95
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "���� ����(_M)..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Evolution ���� �ʱ�ȭ �Ҽ� �����ϴ�."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Evolution ���� �ʱ�ȭ �Ҽ� �����ϴ�."
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "���� ��¥(_S):"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "���� ��¥(_S):"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "���뺸 ������Ʈ �ý����� �ʱ�ȭ �Ҽ� �����ϴ�."
 
+#: 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
-#, fuzzy
-msgid "Output File"
-msgstr "���� ����"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "�ؽ�Ʈ ���� ����"
 
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "���� ����"
+
 #: tools/evolution-addressbook-import.c:80
 #, fuzzy
 msgid "No filename provided."
 msgstr "�����ڰ� ������������"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "����"
+#: 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:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "�����Ѱ� ����"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+msgid "Copy to Folder..."
+msgstr "������ ����..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "���ο� ����ó�� �����"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 #, fuzzy
 msgid "Create new contact list"
 msgstr "���ο� ����ó�� �����"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "�ڸ���"
-
-#: 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:11
 #, fuzzy
 msgid "Delete selected contacts"
 msgstr "����ó�� �����"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:13
 #, fuzzy
-msgid "New List"
-msgstr "����"
+msgid "Move Contact(s) to Another Folder..."
+msgstr "������ �̵�..."
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "���̱�"
+#: ui/evolution-addressbook.xml.h:14
+msgid "Move to Folder..."
+msgstr "������ �̵�..."
 
-#: 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:17
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "�μ�� �޽����� �̸����ϴ�"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "����ó�� �μ��մϴ�"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "����ó�� �����"
 
-#: 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:24
 #, fuzzy
 msgid "Select all contacts"
 msgstr "����ó�� �����"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#, fuzzy
-msgid "Send _Message to Contact..."
-msgstr "���߿� �޼����� �����ϴ�"
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "����ó�� �����"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 #, fuzzy
 msgid "Send message to contact"
 msgstr "���߿� �޼����� �����ϴ�"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "�޼����� �� ������ �̵��մϴ�"
 
-#: 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:29
 msgid "Stop Loading"
 msgstr "���"
 
-#: 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 "���� �ð�"
+
+#: 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-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
 msgid "_Actions"
 msgstr "�ൿ(_A)"
 
-#: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr "����ó(_C)"
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 #, fuzzy
 msgid "_Contact List"
 msgstr "����ó(_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
 #, fuzzy
 msgid "_Forward Contact..."
 msgstr "����ó(_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:102
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "�μ�(_P)..."
-
 #: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "������ �̵�(_M)..."
+
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Save as VCard"
 msgstr "VCard�� ����"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "����ó ã��(_S)"
 
-#: 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
-#, fuzzy
-msgid "Create a New All Day _Event"
-msgstr "���ο� ��Ӹ� �����"
-
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-addressbook.xml.h:45
 #, fuzzy
-msgid "Create a New _Task"
-msgstr "�� �޷��� ����ϴ�"
-
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a _New Appointment"
-msgstr "���ο� ��Ӹ� �����"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr ""
+msgid "_Send Message to Contact..."
+msgstr "���߿� �޼����� �����ϴ�"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:4
 #, fuzzy
 msgid "Day"
 msgstr "�����"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
 msgid "Delete the appointment"
 msgstr "�� ����� �����մϴ�"
 
-#: 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:14
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Go back"
 msgstr "�ð������� �ڷ� ����"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Go forward"
 msgstr "������ ������ ����"
 
-#: 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:11
 msgid "Go to a specific date"
 msgstr "������ ���� ����"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to today"
 msgstr "���÷� �̵�"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
 msgid "Month"
 msgstr "��(_M)"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "�� ���"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 #, fuzzy
 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: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:17
 #, fuzzy
 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:28
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "Show one day"
 msgstr "�Ϸ羿 ����"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Show one month"
 msgstr "�Ѵ޾� ����"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Show one week"
 msgstr "���־� ����"
 
-#: 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:23
 #, fuzzy
 msgid "Week"
 msgstr "��(_W)"
 
-#: ui/evolution-calendar.xml.h:35
-#, fuzzy
-msgid "_Appointment..."
-msgstr "���(_A)"
-
-#: ui/evolution-calendar.xml.h:36
-#, fuzzy
-msgid "_Calendar Settings..."
-msgstr "���� ����(_M)..."
-
-#: ui/evolution-calendar.xml.h:42
-#, fuzzy
-msgid "_Publish Free/Busy Information"
-msgstr "����� ����"
-
-#: ui/evolution-calendar.xml.h:43
-#, fuzzy
-msgid "_Task..."
-msgstr "�۾�"
-
 #: 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
@@ -13159,18 +26091,18 @@ msgstr "�μ�� �޽����� �̸����ϴ�"
 msgid "Print this item"
 msgstr "�� �׸��� �μ�"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "�μ�..."
-
-#: 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 "����"
 
+#: 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-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 "������ ��ħ"
 
@@ -13188,8 +26120,8 @@ msgstr "�並 %s�� ����"
 #: 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:40
 msgid "_File"
 msgstr "����(_F)"
 
@@ -13198,7 +26130,7 @@ msgid "Print En_velope..."
 msgstr "���� �μ�(_v)..."
 
 #: 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)..."
@@ -13207,10 +26139,15 @@ msgstr "�ٸ��̸����� ����(_A)..."
 msgid "Save the contact and close the dialog box"
 msgstr "����� �������� ���̾�α׸� �ݴ´�"
 
+#: ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+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)"
 
@@ -13279,6 +26216,11 @@ 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"
@@ -13290,84 +26232,55 @@ msgid "Compose _New Message"
 msgstr "�� �޼����� �ۼ��մϴ�"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: 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:6
 msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "���� ��ȣ ������"
 
-#: 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
-#, fuzzy
-msgid "New Message"
-msgstr "�޼���"
-
-#: 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:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "������ �ޱ�"
-
-#: 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:11
 msgid "Show message preview window"
 msgstr ""
 
-#: 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:13
 msgid "Virtual Folder _Editor..."
 msgstr "���� ���� ������(_E)..."
 
-#: 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
-msgid "_Mail Message"
-msgstr "���� �޼���(_M)"
-
-#: 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:17
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "�̸�����"
 
-#: 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:18
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "������ �̵�(_M)..."
@@ -13469,11 +26382,11 @@ msgstr "������ �޼����� �μ��մϴ�"
 msgid "Threaded Message list"
 msgstr "������ �޼��� ���"
 
-#: 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-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "����(_F)"
 
@@ -13492,243 +26405,249 @@ msgstr "������ �޼��� ���"
 
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "�ּҷ� �߰�"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "�Ÿ��� ����"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "�ּҷ� �߰�"
+
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
 msgid "Apply filter rules to the selected messages"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
 #, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "�� �޼����� ���� ��� ������� ȸ���� �մϴ�"
 
-#: 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-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:7
 #, fuzzy
 msgid "Compose a reply to the sender of the selected message"
 msgstr "�� �޼����� ����������� ȸ���� �մϴ�"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:9
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "�޼����� �� ������ �����մϴ�"
 
-#: 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-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-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-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-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-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create a virtual folder for these recipients"
 msgstr "�޽����κ��� ���� ���� ����(_V)"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:16
 #, fuzzy
 msgid "Create a virtual folder for this mailing list"
 msgstr "�޽����κ��� ���� ���� ����(_V)"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:17
 #, fuzzy
 msgid "Create a virtual folder for this sender"
 msgstr "�޽����κ��� ���� ���� ����(_V)"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Create a virtual folder for this subject"
 msgstr "�޽����κ��� ���� ���� ����(_V)"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
 #, fuzzy
 msgid "Display the next important message"
 msgstr "�� �޼����� ����������� ȸ���� �մϴ�"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Display the next message"
 msgstr "��� �޽��� ��� ���̱�"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Display the previous message"
 msgstr "�� �޼����� �����մϴ�"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "����"
+
+#: ui/evolution-mail-message.xml.h:29
 #, fuzzy
 msgid "Filter on Mailing _List..."
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "�߼��ο����� �Ÿ���(_n)"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "�����ο����� �Ÿ���(_R)"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "���񿡴��� �Ÿ���(_S)"
 
-#: ui/evolution-mail-message.xml.h:29
-msgid "Force images in HTML mail to be loaded"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:30
-msgid "Forward"
-msgstr "����"
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward As"
-msgstr "�ٸ� �ּҷ� ����"
-
-#: ui/evolution-mail-message.xml.h:32
-#, fuzzy
-msgid "Forward _Attached"
-msgstr "�ٸ� �ּҷ� ����"
-
 #: ui/evolution-mail-message.xml.h:33
 #, fuzzy
-msgid "Forward _Inline"
-msgstr "�ٸ� �ּҷ� ����"
+msgid "Flag selected message(s) for follow-up"
+msgstr "������ �޼����� �μ��մϴ�"
 
 #: ui/evolution-mail-message.xml.h:34
-#, fuzzy
-msgid "Forward _Quoted"
-msgstr "�ٸ� �ּҷ� ����"
+msgid "Follow _Up..."
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: 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:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: 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-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Increase the text size"
 msgstr "�ؽ�Ʈ ���� ����"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Load _Images"
 msgstr "���޵� �޽���"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark as I_mportant"
 msgstr "�߿�"
 
 #: ui/evolution-mail-message.xml.h:45
-#, fuzzy
-msgid "Mark as Unimp_ortant"
-msgstr "���� ���� ������ ǥ��"
+msgid "Mark as U_nread"
+msgstr "���� ���� ������ ǥ��(_n)"
 
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
-msgid "Mark the selected messages as having been read"
-msgstr "������ �޼����� �μ��մϴ�"
+msgid "Mark as Unimp_ortant"
+msgstr "���� ���� ������ ǥ��"
 
 #: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-msgid "Mark the selected messages as important"
+msgid "Mark the selected message(s) as having been read"
 msgstr "������ �޼����� �μ��մϴ�"
 
 #: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as not having been read"
-msgstr ""
+#, fuzzy
+msgid "Mark the selected message(s) as important"
+msgstr "������ �޼����� �μ��մϴ�"
 
 #: ui/evolution-mail-message.xml.h:49
 #, fuzzy
-msgid "Mark the selected messages as unimportant"
+msgid "Mark the selected message(s) as not having been read"
 msgstr "������ �޼����� �μ��մϴ�"
 
 #: ui/evolution-mail-message.xml.h:50
 #, fuzzy
-msgid "Mark the selected messages for deletion"
+msgid "Mark the selected message(s) as unimportant"
 msgstr "������ �޼����� �μ��մϴ�"
 
 #: ui/evolution-mail-message.xml.h:51
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "������ �޼����� �μ��մϴ�"
+
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "�̵�"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
-msgid "Move selected messages to another folder"
+msgid "Move selected message(s) to another folder"
 msgstr "�޼����� �� ������ �̵��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "����"
 
-#: ui/evolution-mail-message.xml.h:54
-#, fuzzy
-msgid "Next Important Message"
-msgstr "�� �޼����� ����������� ȸ���� �մϴ�"
-
 #: ui/evolution-mail-message.xml.h:55
 #, fuzzy
-msgid "Next Message"
-msgstr "�޼���"
+msgid "Next _Important Message"
+msgstr "�� �޼����� ����������� ȸ���� �մϴ�"
 
 #: ui/evolution-mail-message.xml.h:56
 #, fuzzy
-msgid "Next Thread"
+msgid "Next _Thread"
 msgstr "��Ÿ�� ����(_T)"
 
 #: ui/evolution-mail-message.xml.h:57
 #, fuzzy
-msgid "Next Unread Message"
+msgid "Next _Unread Message"
 msgstr "�޼��� �μ�"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -13746,180 +26665,205 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-msgid "Preview the message to be printed"
-msgstr "�μ�� �޽����� �̸����ϴ�"
+msgid "P_revious Unread Message"
+msgstr "�޼��� �μ�"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "����"
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "�޼��� �μ�"
 
 #: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Previous Important Message"
-msgstr "�޼��� �μ�"
+msgid "Preview the message to be printed"
+msgstr "�μ�� �޽����� �̸����ϴ�"
 
 #: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Previous Message"
-msgstr "�޼��� �μ�"
+msgid "Previous"
+msgstr "����"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 #, fuzzy
-msgid "Previous Unread Message"
+msgid "Print this message"
 msgstr "�޼��� �μ�"
 
 #: ui/evolution-mail-message.xml.h:68
-#, fuzzy
-msgid "Print this message"
-msgstr "�޼��� �μ�"
+msgid "Re_direct"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "ȸ��"
-
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "��ü ȸ��"
+#, 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-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "���� �޼���(_M)"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "�޼����� ������ ������ �����մϴ�"
 
-#: 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-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 ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "��� ��� ����(_H)"
 
-#: 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-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "�޼����� �� ������ �����մϴ�"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 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-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "�߼��ڿ����� ��������(_n)"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "�����ڿ����� ��������(_R)"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "���񿡵��� ��������(_S)"
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
-msgstr "�Ÿ��� ����(_A)"
-
 #: ui/evolution-mail-message.xml.h:92
 #, fuzzy
+msgid "_Attached"
+msgstr "÷��"
+
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
 msgid "_Copy to Folder"
 msgstr "������ ����"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "�޽����κ��� �Ÿ��� ����(_C)"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "_Forward Message"
 msgstr "���޵� �޽���"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "����"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "�ݴ�"
+
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Larger"
 msgstr "�߻�"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Message Display"
 msgstr "ǥ��"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "������ �̵�"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "�޼���"
+
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Normal Display"
 msgstr "ǥ��"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:105
 #, fuzzy
 msgid "_Open Message"
 msgstr "�޼������� �ٽ� ������(_R)"
 
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "�޼��� �μ�"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "�ο�(_Q)"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "����(_T)"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "�ǻ츲(_U)"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "�� â�� �ݽ��ϴ�"
 
 #: 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:36
 msgid "_Close"
 msgstr "�ݱ�(_C)"
 
 #: 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:56
 msgid "_View"
 msgstr "����(_V)"
 
@@ -13944,12 +26888,12 @@ msgstr "�� �޼����� PGP�� ��ȣȭ�մϴ�"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
-#: 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:9
+#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr ""
 
@@ -13966,6 +26910,10 @@ msgstr "�޼����� �ؽ�Ʈ�� ������ �����մϴ�"
 msgid "Insert text file..."
 msgstr "�ؽ�Ʈ ���� ����"
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "����"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "������ ���ϴ�"
@@ -14000,7 +26948,7 @@ msgid "Save in folder..."
 msgstr "������ ����..."
 
 #: 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 "���� ������ ����"
 
@@ -14025,6 +26973,7 @@ msgid "Send _later"
 msgstr "���߿� ����(_L)"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "������ HTML�������� ����"
 
@@ -14096,7 +27045,7 @@ msgid "_From Field"
 msgstr "�߽� �׸�(_F)"
 
 #: 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)"
 
@@ -14108,11 +27057,7 @@ msgstr "����(_O)..."
 msgid "_Reply-To Field"
 msgstr "ȸ�� �ּ� �׸�(_R)"
 
-#: 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:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "����(_H)"
 
@@ -14171,38 +27116,45 @@ msgstr ""
 msgid "Re_fresh Task"
 msgstr ""
 
-#: 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:3
 #, fuzzy
 msgid "Copy selected task"
 msgstr "���õ� �޼��� ����(_S)"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Cut selected task"
 msgstr "�� ������ �����մϴ�"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "�� ������ �����մϴ�"
+
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Delete selected tasks"
 msgstr "�� ������ �����մϴ�"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "�Ϸ� ǥ��"
+
+#: ui/evolution-tasks.xml.h:10
 #, fuzzy
 msgid "Paste task from the clipboard"
 msgstr "Ŭ�����忡�� �ٿ��ֱ�"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:11
 #, fuzzy
-msgid "Tasks Settings..."
-msgstr "���� ����(_M)..."
+msgid "Previews the list of tasks to be printed"
+msgstr "�μ�� �޽����� �̸����ϴ�"
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
-msgstr ""
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "�޼��� �μ�"
 
 #: ui/evolution.xml.h:1
 #, fuzzy
@@ -14278,128 +27230,131 @@ msgid "Open this folder in an other window"
 msgstr ""
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "������ �ޱ�"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "�и� ������ ������ �� ������ �����´�"
+
+#: ui/evolution.xml.h:23
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Evolution�� ���� ����"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "���� ����"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "���� ����(_B)"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy�� ���������� �մϴ�"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Toggle whether we are working offline."
 msgstr "�߽� �׸��� ������ �������� ����"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "���õ� ���� ����"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution��..."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "Evolution��(_A)..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Copy..."
 msgstr "����(_C)"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "������ ����(_G)..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Import..."
 msgstr "��������"
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Move..."
 msgstr "�̵�"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "���ο�(_N)"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "�� ��������(_N)"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "���� ����(_M)..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Rename..."
 msgstr "����(_O)..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "������ �ޱ�(_S)"
+
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Shortcut"
 msgstr "���� ����(_S)"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "���� ����(_S)"
 
-#: ui/my-evolution.xml.h:1
-#, fuzzy
-msgid "Change the settings for the summary"
-msgstr "�並 %s�� ����"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print summary"
 msgstr "���"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 #, fuzzy
 msgid "Reload"
 msgstr "����"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr ""
 
-#: ui/my-evolution.xml.h:8
-#, fuzzy
-msgid "_Summary Settings..."
-msgstr "���� ����(_M)..."
-
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "Address Cards"
@@ -14417,20 +27372,29 @@ msgstr "��ȭ ����"
 
 #: 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:3
+#, fuzzy
 msgid "By Sender"
 msgstr "������"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 #, fuzzy
 msgid "By Status"
 msgstr "����"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 #, fuzzy
 msgid "By Subject"
 msgstr "����"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 #, fuzzy
 msgid "Messages"
 msgstr "�޼���"
@@ -14440,6 +27404,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 ""
+
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 #, fuzzy
 msgid "Select a Time Zone"
@@ -14464,11 +27434,21 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "ī��: "
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr ""
 
@@ -14500,80 +27480,83 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: 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 ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 #, fuzzy
 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 ""
 
-#: 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 ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 #, fuzzy
 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 ""
 
-#: widgets/misc/e-charset-picker.c:101
-#, fuzzy
-msgid "New"
-msgstr "����"
+#: widgets/misc/e-charset-picker.c:95
+msgid "Visual"
+msgstr ""
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:201
+#: 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:281
 #, fuzzy
 msgid "Other..."
 msgstr "��Ÿ"
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr ""
 
@@ -14581,28 +27564,24 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:146
 #, fuzzy
 msgid "Search Editor"
 msgstr "����ó ������"
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:97
 #, fuzzy
-msgid "Add to Saved Searches"
-msgstr "�޷¿� �߰�"
+msgid "_Save Search..."
+msgstr "�ٸ� �̸����� ����..."
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:98
 #, fuzzy
-msgid "Clear"
-msgstr "���(_l)"
-
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "��� ����"
+msgid "_Edit Saved Searches..."
+msgstr "�޷¿� �߰�"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -14625,11 +27604,22 @@ msgstr "�޼���"
 msgid "Don't show this message again."
 msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "�˻�(_c)"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "�"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "���(_l)"
+
+#: widgets/misc/e-search-bar.c:835
+#, fuzzy
+msgid "Clear"
+msgstr "���(_l)"
+
+#: widgets/misc/e-search-bar.c:837
 #, fuzzy
 msgid "Find Now"
 msgstr "�"
@@ -14656,6 +27646,557 @@ msgstr "init_corba(): �׳��� �ʱ�ȭ �� �� �����ϴ�"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 
+#~ msgid "Card: "
+#~ msgstr "ī��: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "�̸�: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "����: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "�ּ�:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  ��/��:          "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  ����:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  ���� ��ȣ:   "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  ����:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "��ȭ��ȣ:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "��ȭ��ȣ:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "���ڿ���:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "���ڿ���:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "��: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "���� ����: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "���: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  �̸�:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "���: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "�ּ�:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "���� Ű: "
+
+#, fuzzy
+#~ msgid "New _Contact"
+#~ msgstr "�� ����ó"
+
+#, fuzzy
+#~ msgid "New Contact _List"
+#~ msgstr "�� ����ó"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "�ּҷ� ����"
+
+#, fuzzy
+#~ msgid "Account Name"
+#~ msgstr "����"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "�ּҷ� �߰�"
+
+#, fuzzy
+#~ msgid "Server Name"
+#~ msgstr "���� ����::"
+
+#, fuzzy
+#~ msgid "_My server requires authentication"
+#~ msgstr "������ ������ �䱸�մϴ�"
+
+#~ msgid "Other Contacts"
+#~ msgstr "�ٸ� ����ó"
+
+#, fuzzy
+#~ msgid "(none)"
+#~ msgstr "(�̸� ����)"
+
+#, fuzzy
+#~ msgid "Co_ntacts:"
+#~ msgstr "����ó(_C)"
+
+#, fuzzy
+#~ msgid "_Message Recipients:"
+#~ msgstr "�޴»�� ���"
+
+#~ msgid "B_usiness"
+#~ msgstr "����(_u)"
+
+#~ msgid "Business _Fax"
+#~ msgstr "���� �ѽ�(_F)"
+
+#~ msgid "_Business"
+#~ msgstr "����(_B)"
+
+#~ msgid "_Home"
+#~ msgstr "��(_H)"
+
+#~ msgid "_Mobile"
+#~ msgstr "�޴���ȭ(_M)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr "������ �� ������ ����⸦ ���Ͻʴϱ�?"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "���ο� ��Ӹ� �����"
+
+#, fuzzy
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "���ο� ��Ӹ� �����"
+
+#, fuzzy
+#~ msgid "First day of wee_k:"
+#~ msgstr "�������� ù°��:"
+
+#, fuzzy
+#~ msgid "_Other"
+#~ 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�� ã���� ����."
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "�������� �׷����� ������ ����."
+
+#, fuzzy
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "�޼����� ������ ����: %s"
+
+#~ 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 "�޼������� ���� ����� �˾Ƴ����� ����"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "���� URI�� �����ϼ���"
+
+#~ msgid "Message was received"
+#~ msgstr "�޼����� �޾ҽ��ϴ�"
+
+#~ msgid "Message was sent"
+#~ msgstr "�޼����� ���½��ϴ�"
+
+#, fuzzy
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "KPOP �������� �����Ҽ� ����: %s"
+
+#, fuzzy
+#~ msgid "New _Mail Message"
+#~ msgstr "���� �޼���(_M)"
+
+#, fuzzy
+#~ msgid "Create vFolder from Search"
+#~ msgstr "�޽����κ��� �Ÿ��� ����(_C)"
+
+#~ msgid "Filter on Mailing List"
+#~ msgstr "���ϸ� ����Ʈ������ ����"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "���Ϲڽ� ����"
+
+#, fuzzy
+#~ msgid "Composer"
+#~ msgstr "���� �ۼ�"
+
+#, fuzzy
+#~ msgid "Edit..."
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "HTML signature file:"
+#~ msgstr "����:"
+
+#, fuzzy
+#~ msgid "Select Filter Log file..."
+#~ msgstr "������ ��������"
+
+#, fuzzy
+#~ msgid "_Email Address:"
+#~ msgstr "���ڿ��� �ּ�:"
+
+#, fuzzy
+#~ msgid "_Organization:"
+#~ msgstr "����:"
+
+#, fuzzy
+#~ msgid "_Remember this password"
+#~ msgstr "�� ��й�ȣ ���"
+
+#, fuzzy
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "�⺻���� ������ HTML�������� ����"
+
+#, fuzzy
+#~ msgid "_Server Type: "
+#~ msgstr "���� ����: "
+
+#, fuzzy
+#~ msgid "_Signature file:"
+#~ msgstr "���� ����:"
+
+#~ msgid "seconds."
+#~ msgstr "��."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
+
+#, fuzzy
+#~ msgid "Summary Settings"
+#~ msgstr "���� ����(_M)..."
+
+#, fuzzy
+#~ msgid "inHg"
+#~ msgstr "�̵���"
+
+#, fuzzy
+#~ msgid "kilometers"
+#~ msgstr "���� �Ÿ���(_F)..."
+
+#, fuzzy
+#~ msgid "All _folders:"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "_Display folders:"
+#~ 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 "(�̸� ����)"
+
+#, fuzzy
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "���ο� ��Ӹ� �����"
+
+#, fuzzy
+#~ msgid "Create a New _Task"
+#~ msgstr "�� �޷��� ����ϴ�"
+
+#, fuzzy
+#~ msgid "Create a _New Appointment"
+#~ msgstr "���ο� ��Ӹ� �����"
+
+#, fuzzy
+#~ msgid "_Appointment..."
+#~ msgstr "���(_A)"
+
+#, fuzzy
+#~ msgid "_Calendar Settings..."
+#~ msgstr "���� ����(_M)..."
+
+#, fuzzy
+#~ msgid "_Task..."
+#~ msgstr "�۾�"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "���� ����(_M)..."
+
+#, fuzzy
+#~ msgid "Forward _Attached"
+#~ msgstr "�ٸ� �ּҷ� ����"
+
+#, fuzzy
+#~ msgid "Forward _Quoted"
+#~ msgstr "�ٸ� �ּҷ� ����"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "�Ÿ��� ����(_A)"
+
+#, fuzzy
+#~ msgid "Tasks Settings..."
+#~ msgstr "���� ����(_M)..."
+
+#, fuzzy
+#~ msgid "Change the settings for the summary"
+#~ msgstr "�並 %s�� ����"
+
+#, fuzzy
+#~ msgid "_Summary Settings..."
+#~ msgstr "���� ����(_M)..."
+
+#~ msgid "Show All"
+#~ msgstr "��� ����"
+
+#~ msgid "Sear_ch"
+#~ msgstr "�˻�(_c)"
+
 #, fuzzy
 #~ msgid "Importing Data"
 #~ msgstr "��������"
@@ -14749,10 +28290,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ "������ ���� �����ϴ�."
 
 #, fuzzy
-#~ msgid "Ximian Evolution"
-#~ msgstr "Evolution��..."
-
-#, fuzzy
 #~ msgid ""
 #~ "Ximian Evolution is a suite of groupware applications\n"
 #~ "for mail, calendaring, and contact management\n"
@@ -14773,16 +28310,9 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "F_ormat"
 #~ msgstr "����(_o)"
 
-#, fuzzy
-#~ msgid "LDAP Authentication"
-#~ msgstr "����:"
-
 #~ msgid "Password:"
 #~ msgstr "��й�ȣ:"
 
-#~ msgid "Couldn't create temporary mbox `%s': %s"
-#~ msgstr "�ӽ� mbox `%s'�� ������� �����ϴ�: %s"
-
 #, fuzzy
 #~ msgid ""
 #~ "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -14816,13 +28346,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgstr "���� ����"
 
 #, fuzzy
-#~ msgid "Rename"
-#~ msgstr "��Ģ �̸�: "
-
-#~ msgid "_Debug"
-#~ msgstr "�����(_D)"
-
-#, fuzzy
 #~ msgid "_Import File..."
 #~ msgstr "������ ����(_G)..."
 
@@ -14833,9 +28356,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "Reminder of your appointment at "
 #~ msgstr "����� �˷��� �ð�"
 
-#~ msgid "Ok"
-#~ msgstr "Ȯ��"
-
 #~ msgid "No password provided."
 #~ msgstr "��ȣ�� ���������ʾҽ��ϴ�."
 
@@ -14859,10 +28379,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "Elm mail"
 #~ msgstr "�̸���"
 
-#, fuzzy
-#~ msgid "Pine mail"
-#~ msgstr "�̸���"
-
 #~ msgid "Forwarded message:\n"
 #~ msgstr "���޵� �޽���:\n"
 
@@ -14913,19 +28429,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "USA"
 #~ msgstr "�̱�"
 
-#, fuzzy
-#~ msgid "Canceled"
-#~ msgstr "��ҵ�"
-
-#~ msgid "Transparent"
-#~ msgstr "����"
-
-#~ msgid "Opaque"
-#~ msgstr "������"
-
-#~ msgid "Calendar Preferences"
-#~ msgstr "�޷� ����"
-
 #~ msgid "Remind me of all appointments"
 #~ msgstr "��� ����� ������"
 
@@ -14940,18 +28443,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "The message is not understandable."
 #~ msgstr "�� �޽����� ���� ������ ���� �����ϴ�"
 
-#~ msgid "All"
-#~ msgstr "���"
-
-#~ msgid "Edit"
-#~ msgstr "����"
-
-#~ msgid "Store search as vFolder"
-#~ msgstr "���� ������ ã�⸦ ����"
-
-#~ msgid "Resend"
-#~ msgstr "�ٽ� ����"
-
 #~ msgid "Receiving"
 #~ msgstr "�޾���"
 
@@ -14983,19 +28474,9 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "Save the appointment and close the dialog box"
 #~ msgstr "����� �������� ���̾�α׸� �ݴ´�"
 
-#, fuzzy
-#~ msgid "_Action"
-#~ msgstr "�ൿ(_A)"
-
-#~ msgid "Help"
-#~ msgstr "����"
-
 #~ msgid "See online help"
 #~ msgstr "�¶��� ������ �����ش�"
 
-#~ msgid "Compose"
-#~ msgstr "���� �ۼ�"
-
 #~ msgid "Manage _Subscriptions..."
 #~ msgstr "���� ����(_S)..."
 
@@ -15040,9 +28521,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "TasksPreferences"
 #~ msgstr "�޷� ����"
 
-#~ msgid "C_ontacts..."
-#~ msgstr "����ó(_C)..."
-
 #~ msgid "_Company:"
 #~ msgstr "ȸ��(_C):"
 
@@ -15138,32 +28616,15 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "Mark as Read"
 #~ msgstr "���� ������ ǥ��"
 
-#~ msgid "Move to Folder..."
-#~ msgstr "������ �̵�..."
-
-#~ msgid "Copy to Folder..."
-#~ msgstr "������ ����..."
-
-#~ msgid "Email address:"
-#~ msgstr "���ڿ��� �ּ�:"
-
 #~ msgid "Evolution Mail Configuration"
 #~ msgstr "���� ����"
 
 #~ msgid "Remember my password"
 #~ msgstr "�� ��й�ȣ ���"
 
-#~ msgid "Reply address:"
-#~ msgstr "ȸ�� �ּ�:"
-
 #~ msgid "Save password"
 #~ msgstr "��ȣ ����"
 
-#~ msgid ""
-#~ "Type the name by which you would like to refer to these servers. For "
-#~ "example: \"Work\" or \"Home\"."
-#~ msgstr "�� ������ ����ų �̸��� �����ϼ���.���� \"����\"�̳� �Ǵ� \"��\"."
-
 #~ msgid "minutes."
 #~ msgstr "��"
 
@@ -15186,33 +28647,21 @@ 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 ���ϵ��� ����� ��ġ�Ǿ��Ǿ����ϴ�."
 
-#~ msgid "Activate"
-#~ msgstr "Ȱ��"
-
-#~ msgid "Find a contact"
-#~ msgstr "����ó ã�ƺ���"
-
 #~ msgid "View All"
 #~ msgstr "��� ����"
 
 #~ msgid "View all contacts"
 #~ msgstr "��� ����ó ����"
 
-#~ msgid "Open Calendar"
-#~ msgstr "�޷� ����"
-
-#~ msgid "Prev"
-#~ msgstr "����"
-
 #~ msgid "Save calendar as something else"
 #~ msgstr "�޷��� �ٸ� ������ �����մϴ�"
 
@@ -15298,18 +28747,12 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "_Insert text file... (FIXME)"
 #~ msgstr "�ؽ�Ʈ ���� ����(_I)... (��ĥ ����)"
 
-#~ msgid "Redo"
-#~ msgstr "�����"
-
 #~ msgid "Replace a string"
 #~ msgstr "�ٲٱ�"
 
 #~ msgid "Reply to A_ll (FIXME)"
 #~ msgstr "��ü ȸ��(_l) (��ĥ ����)"
 
-#~ msgid "Undo"
-#~ msgstr "�������"
-
 #~ msgid "Undo the last action"
 #~ msgstr "������ ���� ���"
 
diff --git a/po/lt.po b/po/lt.po
index 55459c307f..d667d75e37 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: 2001-11-14 19:26-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -32,21 +32,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importuoja VCard bylas � 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 "Saugoti kaip"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Vardas"
 
 #: 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 "El. pa�tas"
 
 #: 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:1731
 msgid "Primary"
 msgstr "Pagrindinis"
 
@@ -56,15 +57,16 @@ 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:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asistento"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: 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
 msgid "Business"
 msgstr "Darbo"
 
@@ -74,12 +76,12 @@ msgid "Bus"
 msgstr "Darb"
 
 #: 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:1720
 msgid "Callback"
 msgstr "Atsakiklis"
 
 #: 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:1722
 msgid "Company"
 msgstr "Kompanijos"
 
@@ -89,13 +91,14 @@ msgstr "Komp"
 
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: 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
 msgid "Home"
 msgstr "Nam�"
 
 #: 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 "Organizacija"
 
@@ -104,18 +107,20 @@ msgid "Org"
 msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "Mobilus"
 
 #: 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:1721
 msgid "Car"
 msgstr "Automobilinis"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: 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:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Darbo faksas"
 
@@ -124,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:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "Darbo 2"
 
@@ -139,69 +144,68 @@ msgid "Bus 2"
 msgstr "Darb 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:1724
 msgid "Home 2"
 msgstr "Nam� 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:1726
+#: 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:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "Kitas"
 
 #: 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:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Teleksas"
 
 #: 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:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "El. pa�tas 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 "Tinklapis"
 
@@ -210,7 +214,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 "Departamentas"
 
@@ -219,7 +223,7 @@ msgid "Dep"
 msgstr "Dep"
 
 #: 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 "Ofisas"
 
@@ -228,12 +232,12 @@ msgid "Off"
 msgstr "Ofis"
 
 #: 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 "Titulas"
 
 #: 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 "Profesija"
 
@@ -242,7 +246,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: 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 "Vadybininkas"
 
@@ -255,7 +259,7 @@ msgid "Ass"
 msgstr "Asist"
 
 #: 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 "Pravard�"
 
@@ -264,12 +268,12 @@ msgid "Nick"
 msgstr "Prav"
 
 #: 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 "Sutuoktinis"
 
 #: 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 "Pastaba"
 
@@ -282,7 +286,7 @@ msgid "CALUri"
 msgstr "KalURI"
 
 #: 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 "Laisvas-u�si�m�s URL"
 
@@ -311,294 +315,16 @@ msgstr "Kategorijos"
 msgid "Family Name"
 msgstr "Pavard�"
 
-#: addressbook/backend/ebook/e-card-simple.c:788
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, c-format
 msgid "%x"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3712
-msgid "Card: "
-msgstr "Kortel�: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Vardas: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Prie�d�lis: "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Vardas:     "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Papildomas: "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Pavard�:    "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Gal�n�:     "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Gimimo data:"
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adresas:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Pa�to d���:  "
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Ext:         "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Gatv�:       "
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Miestas:     "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Regionas:    "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Pa�to kodas: "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Valstyb�:    "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Siunt� tarnyba: "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefonai:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefonas:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"El. pa�tas:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"El. pa�tas:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Pa�to programa: "
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Laiko juosta: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geogr. vietov�: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Darbo pad�tis: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Vardas: "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategorijos: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Komentaras: "
-
-#. 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"
-"Unikali eilut�: "
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Vie�as raktas: "
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Keletas VCard korteli�"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VCard"
@@ -606,85 +332,89 @@ 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:1130
-#: 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:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Negal�jau inicializuoti Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2215
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Ie�koma..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "�keliama..."
 
 #. 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 "Klaida paie�kos i�rai�koje."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:475
-msgid "Connecting to LDAP server..."
-msgstr "Jungiamasi prie LDAP serverio..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:485
-msgid "Unable to connect to LDAP server."
-msgstr "Negal�jau prisijungti prie LDAP serverio."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:501
-msgid "Waiting for connection to LDAP server..."
-msgstr "Laukiama prisijungimo prie LDAP serverio..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:870
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Pridedama kortel� � LDAP server�..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:971
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Pa�alinama kortel� i� LDAP serverio..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Taisoma kortel� LDAP serveryje..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2160
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Paie�ka pradedama i� naujo."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Gaunami LDAP paie�kos rezultatai..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2165
-msgid "Restarting search."
-msgstr "Paie�ka pradedama i� naujo."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Klaida pa�alinant kortel�"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Negal�jau i�nagrin�ti URL �%s�"
 
-#: addressbook/conduit/address-conduit.c:294
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "El. pa�to adresas:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Nepavyko �kelti �ymeklio\n"
 
-#: addressbook/conduit/address-conduit.c:307
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "EBook ne�kelta\n"
 
-#: addressbook/conduit/address-conduit.c:1089
-#: calendar/conduits/calendar/calendar-conduit.c:981
-#: calendar/conduits/todo/todo-conduit.c:694
+#: 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 "Negal�jau paleisti wombat serverio"
 
-#: addressbook/conduit/address-conduit.c:1090
-#: calendar/conduits/calendar/calendar-conduit.c:982
-#: calendar/conduits/todo/todo-conduit.c:695
+#: 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 "Negal�jau paleisti wombat"
 
-#: 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 "Nepavyko perskaityti piloto Address programos bloko"
 
@@ -702,223 +432,113 @@ 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
+#, 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution adres� knygel�s ma�� korteli� vaizduokl�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Evolution kontakt� tvarkymo komponentas."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 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:12
 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:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 #, fuzzy
 msgid "Factory for the Addressbook's address popup"
 msgstr "Adres� knygel�s adreso ???? gamykla"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#, 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
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontaktai"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Aplankas, kuriame laikoma kontakt� informacija"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "LDAP serveris, kuriame laikoma kontakt� informacija"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Naujas kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
-msgstr "Naujas _kontaktas"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_Kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Naujas kontakt� s�ra�as"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
-msgstr "Naujas kontakt� _s�ra�as"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
-msgstr "Redaguoti adres� knygel�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
-msgstr "S�skaitos vardas"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "Prid�ti adres� knygel�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
-msgstr "Adres� knygel�s �altinis"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "I�samiai"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Esm�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "De_lete"
-msgstr "Pa�a_linti"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "El. pa�to adresas:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution naudos �� el. pa�to adres� autentikuotis � pa�to server�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "One"
-msgstr "One"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
-msgstr "Paie�kos _pagrindas:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search s_cope: "
-msgstr "Paie�kos _sritis: "
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Server Name"
-msgstr "Serverio vardas"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "�emiau esanti informacija b�tina, kad prid�tum adres� knygel�."
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "This information is not required for most ldap servers. "
-msgstr "�i informacija neb�tina daugumai LDAP serveri�."
-
-#: 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 ""
-"�i informacija naudojama LDAP serveriui nurodant, kurios �akos naudojamos "
-"paie�kai. Paklausk savo serverio administratoriaus d�l platesn�s "
-"informacijos."
-
-#: 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 ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Tai vardas serverio, kuriame yra tavo adres� knygel�."
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
-msgstr "Tai yra prievadas, kur� naudoja tavo LDAP serveris."
-
-#: 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 ""
-"�is vardas bus naudojamas nurodyti tavo s�skaitai. Jis skirtas tiktai "
-"vaizdavimui."
-
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "_Account name:"
-msgstr "_S�skaitos vardas:"
-
-#: 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 "_Prid�ti"
-
-#: 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 "K_eisti"
-
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
-msgstr "_Mano serveris reikalauja autentikacijos"
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
-msgstr "_Prievadas:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
-msgstr "_Serverio vardas:"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "Kontakt� _s�ra�as"
 
-#: 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "Negal�jau inicializuoti gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:167
-msgid "Other Contacts"
-msgstr "Kiti kontaktai"
-
-#: addressbook/gui/component/addressbook.c:468
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Negaliu atidaryti adres� knygel�s"
 
-#: 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"
@@ -928,7 +548,7 @@ msgstr ""
 "kad arba tu �vedei neteising� URI, arba tavo LDAP serveris\n"
 "neveikia"
 
-#: 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"
@@ -940,7 +560,7 @@ msgstr ""
 "tu turi sukompiliuoti program� i� CVS �altinio, prie� tai\n"
 "parsisiunt�s OpenLDAP i� �emiau esan�io adreso.\n"
 
-#: 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."
@@ -948,57 +568,50 @@ 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:623
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "�vesk %s slapta�od� (vartotojas %s)"
 
-#: addressbook/gui/component/addressbook.c:786
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Bet kuris laukas turi savyje"
-
-#: addressbook/gui/component/addressbook.c:787
-msgid "Name contains"
-msgstr "Vardas turi savyje"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "baigiasi su"
 
-#: addressbook/gui/component/addressbook.c:788
-msgid "Email contains"
-msgstr "El. pa�tas turi savyje"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "El. pa�tas 2"
 
-#: addressbook/gui/component/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija yra"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:772
+#: 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
 msgid "Advanced..."
 msgstr "I�sami..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1031
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Bet kuri kategorija"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1083
 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:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1686
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 msgid "Primary Email"
 msgstr "Pagrindinis el. pa�tas"
 
@@ -1044,6 +657,616 @@ 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
+msgid "1:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "Adres� knygel�s �altinis"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Persp�jimai"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anoniminis"
+
+#: 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 "V�l jungiamasi prie %s"
+
+#: 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 "Prisitaikyti"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "Pa�a_linti"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "S�ra�o _vardas:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "El. pa�to adresas:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Evolution"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr "Evolution naudos �� el. pa�to adres� autentikuotis � pa�to server�"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr "Evolution naudos �� el. pa�to adres� autentikuotis � pa�to server�"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "Rast_i"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Esm�"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+#, fuzzy
+msgid "LDAP Attribute"
+msgstr "LDAP autentikacija"
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Konfig�ravimas"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+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
+#, fuzzy
+msgid "Never"
+msgstr "_kas"
+
+#: 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 "One"
+
+#: 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 "Paie�kos _sritis: "
+
+#. 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 "Ie�koma"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Pa�ym�ti visus"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "I�trintas"
+
+#: 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 "�altinio informacija"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Jungiamasi prie serverio..."
+
+#: 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 "Sub"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Nepalaikoma schema"
+
+#: 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 ""
+"�is vardas bus naudojamas nurodyti tavo s�skaitai. Jis skirtas tiktai "
+"vaizdavimui."
+
+#: 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 "El. pa�to adresas:"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+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:139
+msgid "_Add"
+msgstr "_Prid�ti"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Prid�ti"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Prid�ti veiksm�"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Prid�ti veiksm�"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Persp�jimai"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_I�trinti visk�"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "Vaiz_davimas"
+
+#: 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:152 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 "K_eisti"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "K_eisti �vyk�"
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Parinktys"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Prievadas:"
+
+#: 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 "Paie�kos _pagrindas:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Serverio vardas:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "U�tildymo laikas (minut�mis)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "S�skaita"
+
+#: 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 "N�ra korteli�"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "V�l jungiamasi prie %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 "Esm�"
+
+#: 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 "Ie�koma"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolution adres� knygel�s vard� pasirinkimo s�saja."
@@ -1053,9 +1276,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Adres� knygel�s vard� pasirinkimo s�sajos gamykla"
 
 #: 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: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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Pa�alinti"
 
@@ -1084,7 +1307,12 @@ msgstr "(%d nerodom�)"
 msgid "Unnamed Contact"
 msgstr "Bevardis kontaktas"
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Rasti kontakt�"
+
+#: 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"
@@ -1094,7 +1322,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"
@@ -1102,88 +1330,106 @@ 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 "Pasirinkti kontaktus i� adres� knygel�s"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "T_urintys savyje:"
+msgid "Select Names"
+msgstr "Pasirink vardus"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Co_ntacts:"
-msgstr "Ko_ntaktai:"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "I�trinti kontakt�?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "F_ind"
-msgstr "Rast_i"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Kontaktai"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "Pasirink vardus"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
-msgstr "Rodyti kontaktus, tenkinan�ius tokias s�lygas:"
+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 "_Perkelti..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategorija:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Aplankas:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Message Recipients:"
-msgstr "_Lai�ko gav�jai:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "Anni_versary:"
-msgstr "_Jubiliejus:"
+#, fuzzy
+msgid "A_ssistant's name:"
+msgstr "_Asistento vardas:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "B_usiness"
-msgstr "_Darbo"
+#, fuzzy
+msgid "Add_ress..."
+msgstr "_Adresas..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Business _Fax"
-msgstr "Darbo _faksas"
+msgid "Anni_versary:"
+msgstr "_Jubiliejus:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#, fuzzy
+msgid "Birthda_y:"
+msgstr "_Gimtadienis:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "C_ontacts..."
+msgstr "K_ontaktai..."
+
+#: 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 "Ka_tegorijos..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr "Bendradarbiavimas"
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Kontakt� redaktorius"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "D_epartment:"
+msgstr "_Departamentas:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Detal�s"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
 msgstr "_Laisvas-u�si�m�s URL"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "File A_s:"
 msgstr "Saugoti _kaip:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "General"
-msgstr "Esm�"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#, fuzzy
+msgid "Full _Name..."
+msgstr "_Pilnas vardas..."
 
-#: 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"
@@ -1193,1135 +1439,1189 @@ msgstr ""
 "internete, �vesk\n"
 "tos informacijos adres� �ia."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr "Naujas telefono tipas"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "No_tes:"
 msgstr "Pas_tabos:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Organi_zation:"
 msgstr "Organi_zacija:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#, fuzzy
+msgid "P_rofession:"
+msgstr "_Profesija:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Phone Types"
 msgstr "Telefon� tipai"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Wants to receive _HTML mail"
-msgstr "Nori gauti _HTML lai�kus"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Address..."
-msgstr "_Adresas..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Assistant's name:"
-msgstr "_Asistento vardas:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Birthday:"
-msgstr "_Gimtadienis:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+msgid "S_pouse:"
+msgstr "S_utuoktinis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Business"
-msgstr "_Darbo"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#, fuzzy
+msgid "This is the _mailing address"
+msgstr "_Tai yra pa�to siuntimo adresas"
 
-#: 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 "_Kontaktai..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "Wants to receive _HTML mail"
+msgstr "Nori gauti _HTML lai�kus"
 
-#: 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: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:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "_I�trinti"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Department:"
-msgstr "_Departamentas:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Full Name..."
-msgstr "_Pilnas vardas..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Home"
-msgstr "_Nam�"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Job title:"
 msgstr "_Pareigos:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager's Name:"
 msgstr "_Vadybininko vardas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Mobile"
-msgstr "_Mobilus"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
 msgstr "_Slapyvardis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
 msgstr "_Ofisas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Profession:"
-msgstr "_Profesija:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Public Calendar URL:"
 msgstr "_Vie�o kalendoriaus URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Spouse:"
-msgstr "S_utuoktinis:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr "_Tai yra pa�to siuntimo adresas"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "_Tinklapio adresas:"
 
-#: 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:756
-#, fuzzy
-msgid "Category editor not available."
-msgstr "N�ra jokios apra�ymo."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:763
-msgid "This contact belongs to these categories:"
-msgstr "�is kontaktas priklauso �ioms kategorijoms:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
-msgstr "Kontakto greitas prid�jimas"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
-msgstr "Redaguoti vis�"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr "Pilnas vardas"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
-msgid "E-mail"
-msgstr "El. pa�tas"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
-msgid "card.vcf"
-msgstr "kortele.vcf"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
-msgid "list"
-msgstr "s�ra�as"
-
-#: 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 jau egzistuoja.\n"
-"Ar nori �ra�yti vietoj jo?"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresas _2:"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
+msgstr "Jungtin�s Valstijos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
 msgid "Afghanistan"
 msgstr "Afganistanas"
 
-#: 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 "Albanija"
 
-#: 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 "Al�yras"
 
-#: 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 "Andora"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Angola"
 msgstr "Angola"
 
-#: 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 "Antarktika"
 
-#: 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 "Argentina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Armenia"
 msgstr "Arm�nija"
 
-#: 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 "Australija"
 
-#: 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 "Austrija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Azerbaijan"
 msgstr "Azerbaid�anas"
 
-#: 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 "Bahamai"
 
-#: 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 "Bahreinas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Bangladesh"
 msgstr "Banglade�as"
 
-#: 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 "Gudija"
 
-#: 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 "Belgija"
 
-#: 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 "Belizas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Benin"
 msgstr "Beninas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bermuda"
 msgstr "Bermudai"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bhutan"
 msgstr "Butanas"
 
-#: 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 "Bolivija"
 
-#: 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 "Botsvana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bouvet Island"
 msgstr ""
 
-#: 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 "Brazilija"
 
-#: 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 "Bulgarija"
 
-#: 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 "Burundis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Cambodia"
 msgstr "Kambod�a"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Cameroon"
 msgstr "Kamer�nas"
 
-#: 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 "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cape Verde"
 msgstr "�aliasis ky�ulys"
 
-#: 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 "Centrin� Afrikos respublika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Chad"
 msgstr "�adas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-msgid "Check Address"
-msgstr "Patikrinti adres�"
-
-#: 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 "�il�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "China"
 msgstr "Kinija"
 
-#: 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 "Kal�d� sala"
 
-#: 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 "Kolumbija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Comoros"
 msgstr "Komorai"
 
-#: 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 "Kongas"
 
-#: 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 "Kosta Rika"
 
-#: 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 "Valst_yb�:"
-
-#: 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 "Kroatija"
 
-#: 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 "Kuba"
 
-#: 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 "Kipras"
 
-#: 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 "�ekija"
 
-#: 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 "Danija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Djibouti"
 msgstr "D�ibutis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Dominica"
 msgstr "Dominika"
 
-#: 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 "Dominikon� respublika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "East Timor"
 msgstr "Ryt� Timoras"
 
-#: 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 "Ekvadoras"
 
-#: 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 "Egiptas"
 
-#: 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 "Pusiaujo Gvin�ja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Eritrea"
 msgstr "Eritr�ja"
 
-#: 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 "Estija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Falkland Islands"
 msgstr "Folklendo salos"
 
-#: 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 "Fid�is"
 
-#: 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 "Suomija"
 
-#: 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 "Pranc�zija"
 
-#: 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 "Gabonas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Gambia"
 msgstr "Gambija"
 
-#: 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 "Gruzija"
 
-#: 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 "Vokietija"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltaras"
 
-#: 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 "Graikija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Greenland"
 msgstr "Grenlandija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Guadeloupe"
 msgstr "Gvadelup�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Guam"
 msgstr "Guamas"
 
-#: 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 "Gvatemala"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guinea"
 msgstr "Gvin�ja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guinea-bissau"
 msgstr "Bisau Gvin�ja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guyana"
 msgstr "Gajana"
 
-#: 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 "Haitis"
 
-#: 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 "�ventoji j�ra"
 
-#: 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 "Hond�ras"
 
-#: 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 "Honkongas"
 
-#: 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 "Vengrija"
 
-#: 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 "Islandija"
 
-#: 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 "Indija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: 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 "Airija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Israel"
 msgstr "Izraelis"
 
-#: 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 "Italija"
 
-#: 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 "Jamaika"
 
-#: 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 "Japonija"
 
-#: 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 "Jordanas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Kazakhstan"
 msgstr "Kazachstanas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Kenya"
 msgstr "Kenija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kiribati"
 msgstr "Kiribatis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#, fuzzy
+msgid "Korea, Republic Of"
+msgstr "Kor�jos respublika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuveitas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Kyrgyzstan"
 msgstr "Kirgistanas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Laos"
 msgstr "Laosas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Latvija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: my-evolution/Locations.h:1198
 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
 msgid "Liberia"
 msgstr "Liberija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Liechtenstein"
 msgstr "Lichten�teinas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: my-evolution/Locations.h:1234
 msgid "Lithuania"
 msgstr "Lietuva"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: my-evolution/Locations.h:1268
 msgid "Luxembourg"
 msgstr "Liuksemburgas"
 
-#: 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 "Makedonija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Madagascar"
 msgstr "Madagaskaras"
 
-#: 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 "Malaizija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Maldives"
 msgstr "Maldyvai"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Mali"
 msgstr "Malis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Marshall Islands"
 msgstr "Mar�alo salos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Martinique"
 msgstr "Martinika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Mauritania"
 msgstr "Mauritanija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Mauritius"
 msgstr "Mauricijus"
 
-#: 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:1387
 msgid "Mexico"
 msgstr "Meksika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Micronesia"
 msgstr "Mikronezija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+msgid "Moldova, Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Monaco"
 msgstr "Monakas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mongolia"
 msgstr "Mongolija"
 
-#: 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:1470
 msgid "Morocco"
 msgstr "Marokas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mozambique"
 msgstr "Mozambikas"
 
-#: 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 "Namibija"
 
-#: 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 "Nepalas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
 msgid "Netherlands"
 msgstr "Olandija"
 
-#: 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 "Naujoji Kaledonija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1560
 msgid "New Zealand"
 msgstr "Naujoji Zelandija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: my-evolution/Locations.h:1562
 msgid "Nicaragua"
 msgstr "Nikaragva"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Niger"
 msgstr "Nigeris"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nigeria"
 msgstr "Nigerija"
 
-#: 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:1574
 msgid "Norfolk Island"
 msgstr "Norfolko sala"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Northern Mariana Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
 msgid "Norway"
 msgstr "Norvegija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1632
 msgid "Oman"
 msgstr "Omanas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
 msgid "Pakistan"
 msgstr "Pakistanas"
 
-#: 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 "Palestinos teritorija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
 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 "Papua Naujoji Gvin�ja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1688
 msgid "Paraguay"
 msgstr "Paragvajus"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr "Filipinai"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
 msgid "Poland"
 msgstr "Lenkija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
 msgid "Portugal"
 msgstr "Portugalija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1824
 msgid "Puerto Rico"
 msgstr "Puerto Rikas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
 msgid "Qatar"
 msgstr "Kvataras"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:173
-msgid "Republic Of Korea"
-msgstr "Kor�jos respublika"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:174
-msgid "Republic Of Moldova"
-msgstr "Moldovos respublika"
-
-#: 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:1912
 msgid "Romania"
 msgstr "Rumunija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Russian Federation"
 msgstr "Rusijos Federacija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: 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 "Samoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "San Marino"
 msgstr "San Marinas"
 
-#: 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:2035
 msgid "Saudi Arabia"
 msgstr "Saudo Arabija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Senegal"
 msgstr "Senegalas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Seychelles"
 msgstr "Sei�eliai"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Sierra Leone"
 msgstr "Siera Leon�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2090
 msgid "Singapore"
 msgstr "Singap�ras"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: my-evolution/Locations.h:2103
 msgid "Slovakia"
 msgstr "Slovakija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: my-evolution/Locations.h:2104
 msgid "Slovenia"
 msgstr "Slov�nija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Solomon Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Somalia"
 msgstr "Somalis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2119
 msgid "South Africa"
 msgstr "Piet� Afrikos respublika"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
 msgid "Spain"
 msgstr "Ispanija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Sri Lanka"
 msgstr "�ri Lanka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "St. Helena"
 msgstr "�v .Elena"
 
-#: 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 "Sudanas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
 msgid "Suriname"
 msgstr "Surinamas"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Swaziland"
 msgstr "Svazilendas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
 msgid "Sweden"
 msgstr "�vedija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2183
 msgid "Switzerland"
 msgstr "�veicarija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
 msgid "Taiwan"
 msgstr "Taivanas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Tajikistan"
 msgstr "Tad�ikistanas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+msgid "Tanzania, United Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
 msgstr "Tailandas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Togo"
 msgstr "Togas"
 
-#: 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 "Tonga"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Trinidad And Tobago"
 msgstr "Trinidadas ir Tobagas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tunisia"
 msgstr "Tunisas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
 msgid "Turkey"
 msgstr "Turkija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Turkmenistan"
 msgstr "Turkm�nistanas"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "United Arab Emirates"
 msgstr "Jungtiniai Arab� Emyratai"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2342
 msgid "United Kingdom"
 msgstr "Jungtin� Karalyst�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-msgid "United States"
-msgstr "Jungtin�s Valstijos"
-
-#: 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:2348
 msgid "Uruguay"
 msgstr "Urugvajus"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Uzbekistan"
 msgstr "Uzbekistanas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2380
 msgid "Venezuela"
 msgstr "Venesuela"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
 msgid "Viet Nam"
 msgstr "Vietnamas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+msgid "Virgin Islands, British"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+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 "Vakar� Sachara"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
 msgid "Yemen"
 msgstr "Jemenas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2524
 msgid "Yugoslavia"
 msgstr "Jugoslavija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Zambia"
 msgstr "Zambija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Zimbabwe"
 msgstr "Zimbabv�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "I�trinti kontakt�?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#, fuzzy
+msgid "Category editor not available."
+msgstr "N�ra jokios apra�ymo."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+msgid "This contact belongs to these categories:"
+msgstr "�is kontaktas priklauso �ioms kategorijoms:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#, fuzzy
+msgid "Save Contact as VCard"
+msgstr "I�saugoti kaip VCard"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+msgid "Contact Quick-Add"
+msgstr "Kontakto greitas prid�jimas"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+msgid "Edit Full"
+msgstr "Redaguoti vis�"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr "Pilnas vardas"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+msgid "E-mail"
+msgstr "El. pa�tas"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr "kortele.vcf"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+msgid "list"
+msgstr "s�ra�as"
+
+#: 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 jau egzistuoja.\n"
+"Ar nori �ra�yti vietoj jo?"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Adresas _2:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "Patikrinti adres�"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "Valst_yb�:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "_Adresas:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "_Miestas:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Valstija/Provincija:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "_ZIP kodas:"
 
@@ -2419,10 +2719,15 @@ msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 msgid "Contact List Editor"
 msgstr "Kontakt� s�ra�o redaktorius"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#, fuzzy
+msgid "Save List as VCard"
+msgstr "I�saugoti kaip VCard"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Vis tiek prid�ti"
@@ -2469,7 +2774,7 @@ msgstr ""
 "�iame aplanke. Ar nor�tum j� vis tiek prid�ti?"
 
 #: 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 "I�sami paie�ka"
 
@@ -2478,219 +2783,321 @@ msgstr "I�sami paie�ka"
 msgid "Search"
 msgstr "Paie�ka"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 kortel�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d korteli�"
 
-#: 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 "I�saugoti kaip VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Atidaryti"
-
-#: 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 "Persi�sti kontakt�"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-msgid "Send Message to Contact"
-msgstr "Si�sti lai�k� kontaktui"
-
-#: 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 "Spausdinti"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr "Spausdinti vok�"
-
-#: 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 "I�trinti"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Klaida modifikuojant kortel�"
 
-#: 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:1043
 msgid "Success"
 msgstr "S�km�"
 
-#: 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: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
 msgid "Unknown error"
 msgstr "Ne�inoma klaida"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Saugykla atsijungta"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "Pri�jimas u�draustas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Kortel� nerasta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "Kortel�s ID jau egzistuoja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protokolas nepalaikomas"
 
-#: 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:607 camel/camel-service.c:643
+#: 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
 msgid "Cancelled"
 msgstr "Nutraukta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Kita klaida"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Klaida pridedant s�ra��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Klaida pridedant kortel�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Klaida modifikuojant s�ra��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Klaida pa�alinant s�ra��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Klaida pa�alinant kortel�"
 
-#. 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:204
+#, fuzzy
+msgid "Display Cards?"
+msgstr "Vaizdavimas"
 
-#. 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"
+#: addressbook/gui/widgets/e-addressbook-util.c:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "Vaizdavimas"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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 ""
-",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-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "N�ra korteli�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "N�ra korteli�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "N�ra korteli�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "N�ra korteli�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Spausk �ia, kad prid�tum kontakt� *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Pagrindinis telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Asistento telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Darbo telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Atsakiklio telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Kompanijos telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Nam� telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Darbo adresas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Nam� adresas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Mobilus telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Automobilio telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Darbo telefonas 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Nam� telefonas 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Kitas telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "I�saugoti kaip VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Naujas kontaktas"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Naujas kontakt� s�ra�as"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Eiti � aplank�..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Importuoti..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Ie�koti kontakt�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Adres� knygel�s �altiniai..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Pilot nuostatos..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Persi�sti kontakt�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Si�sti lai�k� kontaktui"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Spausdinti vok�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "Kopijuoti � aplank�..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "Perkelti � aplank�..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: 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
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Esamas vaizdas"
+
+#. 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:940
+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:945
+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."
@@ -2704,11 +3111,12 @@ msgstr "ir viena kitokia kortel�."
 msgid "Save in addressbook"
 msgstr "I�saugoti adres� knygel�je"
 
-#: 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 ""
@@ -2718,10 +3126,37 @@ msgstr ""
 "\n"
 "Dukart spragtel�k, kad sukurtum nauj� Kontakt�."
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"�iame vaizde n�ra nieko, k� b�t� galima parodyti.\n"
+"\n"
+"Dukart spragtel�k, kad sukurtum nauj� Kontakt�."
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Korteli� rodinys"
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr "Spausdinti vok�"
+
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr "Spausdinti korteles"
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+msgid "Print card"
+msgstr "Spausdinti kortel�"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -2792,6 +3227,7 @@ msgid "Include:"
 msgstr "�traukti:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Guls�ias lapas"
 
@@ -2816,10 +3252,12 @@ msgid "Options"
 msgstr "Parinktys"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Orientacija"
 
 #: addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "Puslapis"
 
@@ -2835,7 +3273,9 @@ msgstr "Popierius"
 msgid "Paper source:"
 msgstr "Popieriaus �altinis:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Sta�ias lapas"
 
@@ -2891,63 +3331,50 @@ msgstr "Plotis:"
 msgid "_Font..."
 msgstr "�_riftas..."
 
-#: addressbook/printing/e-contact-print.c:1111
-msgid "Print cards"
-msgstr "Spausdinti korteles"
-
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-msgid "Print card"
-msgstr "Spausdinti kortel�"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr "Spausdinti vok�"
-
-#: calendar/cal-util/cal-component.c:1202
+#: calendar/cal-util/cal-component.c:1207
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "K_eisti �vyk�"
 
-#: 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:405 mail/message-list.c:651
+#: 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
 msgid "High"
 msgstr "Auk�tas"
 
-#: 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:650
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normalus"
 
-#: 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:407 mail/message-list.c:649
+#: 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
 msgid "Low"
 msgstr "�emas"
 
 #. 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
 msgid "Undefined"
 msgstr "Neapibr��tas"
 
-#: calendar/conduits/calendar/calendar-conduit.c:937
-#: calendar/conduits/todo/todo-conduit.c:649
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "�vyko klaida, bendraujant su kalendoriaus serveriu"
 
-#: 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 "Nepavyko perskaityti piloto Calendar programos bloko"
 
-#: calendar/conduits/todo/todo-conduit.c:756
-#: calendar/conduits/todo/todo-conduit.c:759
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "_Svarbumas:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "Negal�jau perskaityti piloto ToDo programos bloko"
 
@@ -2961,43 +3388,57 @@ msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Kalendoriaus ir u�duo�i� nuostatos"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution komponentas tvarkyti kalendoriui."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "Testinio komponento gamykla."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Evolution kalendoriaus komponento gamykla."
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 "Aliarmo prane�imo tarnyba"
@@ -3006,25 +3447,10 @@ 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"
@@ -3047,11 +3473,11 @@ msgstr "U�tildymo laikas (minut�mis)"
 msgid "_Edit appointment"
 msgstr "K_eisti �vyk�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:670
+#: calendar/gui/alarm-notify/alarm-queue.c:675
 msgid "No description available."
 msgstr "N�ra jokios apra�ymo."
 
-#: 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"
@@ -3063,18 +3489,29 @@ msgstr ""
 "si�st� lai�k�.  Evolution vietoj to parodys normal�\n"
 "u�uominos dialog�."
 
-#: 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:2608
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "�sp�jimas"
+
+#: 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 "Kit� kart� nebeklausti."
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Negal�jau inicializuoti GNOME"
 
@@ -3088,36 +3525,52 @@ msgstr "Negal�jau sukurti laikino katalogo: %s"
 msgid "Could not create the alarm notify service factory"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Santrauka turi savyje"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Apra�ymas turi savyje"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Komentaras turi savyje"
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr "Netinkantys"
+
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%A, %Y m. %B %d d."
 
 #. 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, %b %d"
 
-#: 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, %Y %b %d"
 
-#: 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 m. %B %d 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:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3125,16 +3578,14 @@ msgstr ""
 "OAF."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Asmeni�kas"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Slaptas"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Vie�as"
 
@@ -3155,32 +3606,27 @@ msgid "W"
 msgstr "V"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Laisvas"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 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:479 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "U�baigta"
 
@@ -3196,12 +3642,13 @@ 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/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/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
+#: 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 "Joks"
 
@@ -3213,23 +3660,15 @@ msgstr "Pasikartojantis"
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: 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:803
+#: 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
 msgid "Yes"
 msgstr "Taip"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr "Ne"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1974 calendar/gui/e-day-view.c:1675
-#: calendar/gui/e-week-view.c:1182
-msgid "Searching"
-msgstr "Ie�koma"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Dien� rodinys"
@@ -3246,63 +3685,79 @@ msgstr "Savait�s rodinys"
 msgid "Month View"
 msgstr "M�nesio rodinys"
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
-msgstr "Santrauka turi savyje"
-
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
-msgstr "Apra�ymas turi savyje"
-
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "Komentaras turi savyje"
-
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
-msgid "Unmatched"
-msgstr "Netinkantys"
-
-#: 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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Aplankas, kuriame saugomi �vykiai ir susitikimai"
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "U�duotys"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Aplankas, kuriame yra u�duotys"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "Sukurti nauj� �vyk�"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "Naujien� �altini� nuostatos"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "Susitikimas"
+
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "Nauja u�duotis"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "_U�duotis"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Naujas �vykis"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "Naujas �_vykis"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
-msgstr "Sukurti nauj� u�duot�"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Naujas �vykis"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "Nauja _u�duotis"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "�vykis"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Negal�jau atidaryti aplanko su �%s�"
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URI, kur� rodys kalendorius"
 
+#: 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 "Persp�jim� garsu parinktys"
@@ -3467,12 +3922,12 @@ msgstr "%s %s po �vykio pabaigos"
 msgid "%s at the end of the appointment"
 msgstr "%s �vykio pabaigos metu"
 
-#: 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 ""
@@ -3493,7 +3948,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.c:737 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Ap�valga:"
 
@@ -3501,12 +3956,11 @@ msgstr "Ap�valga:"
 msgid "_Options..."
 msgstr "_Parinktys..."
 
-#. 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 "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "prie�"
 
@@ -3523,7 +3977,7 @@ msgstr "�vykio pabaig�"
 msgid "hour(s)"
 msgstr "valand�(as)"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "minut�(es)"
 
@@ -3564,170 +4018,168 @@ msgid "Color for tasks due today"
 msgstr "Spalva v�luojamoms u�duotims"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Kurti naujus �vykius su �prasta _u�uomina"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Dien�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Pirma sa_vait�s diena:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Valand�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minu�i�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "_V�luojamos u�duotys:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "�e�tadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-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:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "Rodyti savai�i� _numerius datos navigatoriuje"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_Sek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "�ia_ndienos u�duotys:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "_Ket"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "_Ant"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "�ia_ndienos u�duotys:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "_U�duo�i� s�ra�as"
 
-#: 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 "Ketvirtadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Laikas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Laiko _juosta:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Laiko _dalijimas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Laiko formatas:"
 
-#: 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 "Antradienis"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Tre�iadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Darbo savait�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 valand� (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 valand�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "P_apra�yti patvirtinimo trinant elementus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "_Suspausti savaitgalius m�nesio rodinyje"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "Vaiz_davimas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "Pe_n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Esm�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "_Pasl�pti u�baigtas u�duotis po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Pir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "Kit_a"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "_V�luojamos u�duotys:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "�_e�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "_U�duo�i� s�ra�as"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Laiko _dalijimas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Tre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "prie� �vykio prad�i�"
 
@@ -3793,74 +4245,61 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Tu nieko nepakeitei, atnaujinti redaktori�?"
 
-#: 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 " iki "
 
-#: 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 " (U�baigta "
 
-#: 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 "U�baigta "
 
-#: 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:2221
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:303
+#: calendar/gui/dialogs/comp-editor.c:322
 #, fuzzy
 msgid "Could not update object!"
 msgstr "Negal�jau tvarkingai atnaujinti byl�"
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Keisti �vyk�"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "�vykis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "U�duotis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "�urnalo �ra�as -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "N�ra ap�valgos"
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1897
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "U�ra�yti byl�?"
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1904
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Byla tokiu vardu jau yra.\n"
-"U�ra�yti j�?"
-
-#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "I�saugoti kaip..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Nepavyko gauti esamos versijos!"
 
@@ -3918,7 +4357,7 @@ msgstr "Pavesti kam:"
 msgid "Enter Delegate"
 msgstr "�vesti, kam pavedama"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "�vykis"
 
@@ -3932,13 +4371,13 @@ msgstr "Pasikartojimas"
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 msgid "Scheduling"
 msgstr "Dienotvark�"
 
 #: calendar/gui/dialogs/event-editor.c:207
 #: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "Susitikimas"
 
@@ -3971,30 +4410,42 @@ msgid "F_ree"
 msgstr "_Laisvas"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
+#, fuzzy
+msgid "L_ocation:"
+msgstr ""
+"\n"
+"Geogr. vietov�: "
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "As_meni�kas"
 
-#: 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 "_Vie�as"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Rodyti laik� kaip"
 
-#: 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 "Sa_ntrauka:"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Kontaktai..."
+
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "P_abaigos laikas:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "_Prad�ios laikas:"
 
@@ -4022,55 +4473,49 @@ msgstr "Dalyvis"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "Bendras vardas"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Pavesta kieno"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Pavesta kam"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Kalba"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Narys"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:798
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Rol�"
 
-#: 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/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"
 msgstr "B�sena"
 
-#: 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipas"
@@ -4085,7 +4530,7 @@ msgid "_Change Organizer"
 msgstr "_Keisti organizatori�:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:445
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "Pakv_iesti kitus..."
 
@@ -4093,27 +4538,98 @@ msgstr "Pakv_iesti kitus..."
 msgid "_Other Organizer"
 msgstr "_Kitas organizatorius"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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-a"
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "2-a"
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "3-a"
+
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "�iame �vykyje yra pasikartojim�, kuri� Evolution negali keisti."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "lygiai"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "s�ra�as"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "sekund�"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Kitas"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "�iaur�s"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "s�ra�as"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Kitas faksas"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "diena"
 
-#: 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
-msgid "th"
-msgstr "-�"
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr "kart�(us) pasitaikys"
 
@@ -4177,17 +4693,23 @@ msgstr "savait�(es)"
 msgid "year(s)"
 msgstr "metus"
 
-#: 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 "Susitikimo informacija buvo pakeista. Si�sti atnaujint� informacij�?"
+
+#: calendar/gui/dialogs/send-comp.c:59
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Susitikimo informacija buvo pakeista. Si�sti atnaujint� informacij�?"
 
-#: 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 "U�duoties informacija buvo pakeista. Si�sti atnaujint� informacij�?"
 
-#: calendar/gui/dialogs/send-comp.c:65
-msgid "The journal entry has changed. Send an updated version?"
-msgstr "�urnalo �ra�as buvo pakeistas. Si�sti atnaujint� informacij�?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
+msgstr "U�duoties informacija buvo pakeista. Si�sti atnaujint� informacij�?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
@@ -4204,7 +4726,7 @@ msgid "Progress"
 msgstr "Pa�anga"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4216,15 +4738,19 @@ msgstr "_Svarbumas:"
 msgid "_Status:"
 msgstr "_B�sena:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "Esm�"
+
 #: 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:324
 msgid "Assignment"
 msgstr "Priskyrimas"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Apra�ymas:"
 
@@ -4236,192 +4762,155 @@ msgstr "P_rad�ios data:"
 msgid "_Due Date:"
 msgstr "_Kada reikia:"
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "100%"
-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:751 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:941 calendar/gui/e-day-view.c:3544
-#: calendar/gui/e-week-view.c:3422 mail/folder-browser.c:1447
-#: shell/e-shortcuts-view.c:384
+#: 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
 msgid "_Open"
 msgstr "Ati_daryti"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:973
+#, 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-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 "S_pausdinti..."
+
+#: calendar/gui/e-calendar-table.c:978 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:947 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3433 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:979 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:949 calendar/gui/e-day-view.c:3530
-#: calendar/gui/e-day-view.c:3557 calendar/gui/e-week-view.c:3409
-#: calendar/gui/e-week-view.c:3435 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:980 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�ti"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Priskirti u�duot�"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Persi�sti kaip i_Calendar"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Pa�ym�ti u�baigta"
 
-#: calendar/gui/e-calendar-table.c:956
-msgid "_Delete this Task"
-msgstr "_I�trinti �i� u�duot�"
-
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_Pa�ym�ti u�duotis u�baigtomis"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_I�trinti pa�ym�tas u�duotis"
 
-#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7115
-#: calendar/gui/e-week-view.c:3918
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Spausk �ia, kad prid�tum u�duot�"
 
-#. 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 %Y-%m-%d %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 %Y-%m-%d %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 ""
-"Data turi b�ti �vesta formatu:\n"
-"\n"
-"%s"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Persp�jimai"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "U�baigta"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "U�baigimo data"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Kada reikia"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Pabaigos data"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Geografin� vietov�"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Svarbumas"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Ap�valga"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "U�duo�i� rikiavimas"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 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 %Y-%m-%d %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 %Y-%m-%d %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 ""
+"Data turi b�ti �vesta formatu:\n"
+"\n"
+"%s"
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -4429,400 +4918,172 @@ msgstr "%02i minu�i� padalos"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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, %B %e"
 
 #. 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 "%b %d"
 
 #. 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
 msgid "am"
 msgstr " "
 
 #. 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
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "Naujas �_vykis"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Naujas visos _dienos �vykis"
 
-#: calendar/gui/e-day-view.c:3535 calendar/gui/e-week-view.c:3414
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "Eiti � �ia_ndien�"
-
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
-msgid "_Go to Date..."
-msgstr "_Eiti � dat�..."
-
-#: calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-msgid "_Delete this Appointment"
-msgstr "_I�trinti �� �vyk�"
-
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
-msgid "Make this Occurrence _Movable"
-msgstr "Leisti per_kelti �� pasitaikym�"
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
-msgid "Delete this _Occurrence"
-msgstr "I�trinti �� _pasitaikym�"
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
-msgid "Delete _All Occurrences"
-msgstr "I�trinti _visus pasitaikymus"
-
-#: calendar/gui/e-itip-control.c:524
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Task begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:534
-msgid "Free/Busy info begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:538
-msgid "Begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:550
-#, fuzzy
-msgid "Meeting ends: <b>"
-msgstr "Susitikimo pa_baigos laikas:"
-
-#: calendar/gui/e-itip-control.c:553
-msgid "Free/Busy info ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:557
-msgid "Ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:571
-#, fuzzy
-msgid "Task Completed: <b>"
-msgstr " (U�baigta "
-
-#: calendar/gui/e-itip-control.c:581
-msgid "Task Due: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
-#, fuzzy
-msgid "iCalendar Information"
-msgstr "kalendoriaus informacija"
-
-#. Title
-#: calendar/gui/e-itip-control.c:633
-#, fuzzy
-msgid "iCalendar Error"
-msgstr "Kalendorius"
-
-#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
-#, fuzzy
-msgid "An unknown person"
-msgstr "ne�inomas siunt�jas"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:737
-msgid "<i>None</i>"
-msgstr ""
-
-#: 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
-#, fuzzy
-msgid "Choose an action:"
-msgstr "Pasirink veiksm�"
-
-#: calendar/gui/e-itip-control.c:779
-#, fuzzy
-msgid "Update"
-msgstr "Data"
-
-#: 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
-msgid "OK"
-msgstr "Gerai"
-
-#: calendar/gui/e-itip-control.c:795
-#, fuzzy
-msgid "Accept"
-msgstr "Priimtas"
-
-#: calendar/gui/e-itip-control.c:796
-#, fuzzy
-msgid "Tentatively accept"
-msgstr "Negalutinis"
-
-#: calendar/gui/e-itip-control.c:797
-#, fuzzy
-msgid "Decline"
-msgstr "Atmestas"
-
-#: calendar/gui/e-itip-control.c:811
-#, fuzzy
-msgid "Send Free/Busy Information"
-msgstr "_Skelbti laisvas/u�imtas informacij�"
-
-#: calendar/gui/e-itip-control.c:824
-msgid "Update respondent status"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 #, fuzzy
-msgid "Send Latest Information"
-msgstr "Susitikimo informacija"
-
-#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Nutraukti"
-
-#: calendar/gui/e-itip-control.c:867
-#, fuzzy, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "Su�inoti naujausi� susitikimo informacij�"
-
-#: calendar/gui/e-itip-control.c:868
-msgid "Meeting Information"
-msgstr "Susitikimo informacija"
-
-#: calendar/gui/e-itip-control.c:872
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:873
-#, fuzzy
-msgid "Meeting Proposal"
+msgid "New Meeting"
 msgstr "Susitikimas"
 
-#: calendar/gui/e-itip-control.c:877
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:878
-#, fuzzy
-msgid "Meeting Update"
-msgstr "Susitikimo pa_baigos laikas:"
-
-#: calendar/gui/e-itip-control.c:882
-#, 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:883
-msgid "Meeting Update Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:887
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:888
-#, fuzzy
-msgid "Meeting Reply"
-msgstr "Susitikimas"
-
-#: calendar/gui/e-itip-control.c:892
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:893
-#, fuzzy
-msgid "Meeting Cancellation"
-msgstr "Susitikimo informacija"
-
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
-#: calendar/gui/e-itip-control.c:982
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:898
-#, fuzzy
-msgid "Bad Meeting Message"
-msgstr "Ie�koti lai�ke"
-
-#: calendar/gui/e-itip-control.c:917
-#, fuzzy, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "Gauti naujausi� informacij� apie u�duot�"
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Nauja u�duotis"
 
-#: calendar/gui/e-itip-control.c:918
-#, fuzzy
-msgid "Task Information"
-msgstr "Informacija"
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Spausdinti..."
 
-#: calendar/gui/e-itip-control.c:922
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr ""
+#: 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 "Eiti � �ia_ndien�"
 
-#: calendar/gui/e-itip-control.c:923
-msgid "Task Proposal"
-msgstr ""
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+msgid "_Go to Date..."
+msgstr "_Eiti � dat�..."
 
-#: calendar/gui/e-itip-control.c:927
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-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 "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
 #, fuzzy
-msgid "Task Update"
-msgstr "buvo po"
+msgid "_Configure..."
+msgstr "Konfig�ruoti aplank�..."
 
-#: calendar/gui/e-itip-control.c:932
-#, 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:933
-msgid "Task Update Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:937
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:938
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
 #, fuzzy
-msgid "Task Reply"
-msgstr "Atsakyti"
+msgid "_Configure Pilot..."
+msgstr "Konfig�ruoti aplank�..."
 
-#: calendar/gui/e-itip-control.c:942
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-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
+msgid "_Save As..."
+msgstr "I�_saugoti kaip..."
 
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 #, fuzzy
-msgid "Task Cancellation"
-msgstr "Nutraukti veiksm�"
+msgid "_Schedule Meeting..."
+msgstr "�traukti s_usitikim� � dienotvark�"
 
-#: calendar/gui/e-itip-control.c:948
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 #, fuzzy
-msgid "Bad Task Message"
-msgstr "Kalendoriaus �inut�"
+msgid "_Forward as iCalendar..."
+msgstr "Persi�sti kaip i_Calendar"
 
-#: calendar/gui/e-itip-control.c:967
-#, fuzzy, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "_Skelbti laisvas/u�imtas informacij�"
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+msgid "Make this Occurrence _Movable"
+msgstr "Leisti per_kelti �� pasitaikym�"
 
-#: calendar/gui/e-itip-control.c:968
-#, fuzzy
-msgid "Free/Busy Information"
-msgstr "_Skelbti laisvas/u�imtas informacij�"
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+msgid "Delete this _Occurrence"
+msgstr "I�trinti �� _pasitaikym�"
 
-#: calendar/gui/e-itip-control.c:972
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr ""
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+msgid "Delete _All Occurrences"
+msgstr "I�trinti _visus pasitaikymus"
 
-#: calendar/gui/e-itip-control.c:973
-#, fuzzy
-msgid "Free/Busy Request"
-msgstr "_Laisvas-u�si�m�s URL"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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-itip-control.c:977
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:978
-#, fuzzy
-msgid "Free/Busy Reply"
-msgstr "_Laisvas-u�si�m�s URL"
-
-#: calendar/gui/e-itip-control.c:983
-#, fuzzy
-msgid "Bad Free/Busy Message"
-msgstr "Praeit� lai�k�"
-
-#: calendar/gui/e-itip-control.c:1052
-#, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
-
-#: calendar/gui/e-itip-control.c:1071
-#, fuzzy
-msgid "The message contains only unsupported requests."
-msgstr "�iame lai�ke yra tik Bcc gav�jai."
-
-#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
-msgid "The attachment does not contain a valid calendar message"
-msgstr ""
+msgid "Error executing %s."
+msgstr "Klaida vykdant %s."
 
-#: calendar/gui/e-itip-control.c:1130
-msgid "The attachment has no viewable calendar items"
-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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1229
+#: 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:1231
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Atnaujinimas u�baigtas\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:1592 calendar/gui/e-itip-control.c:1642
+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:1613
+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:1625
+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:1288
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1640
+msgid "Attendee status updated\n"
+msgstr "Dalyvio b�sena atnaujinta\n"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Pa�alinimas u�baigtas"
 
-#: calendar/gui/e-itip-control.c:1348 calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Elementas i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Elementas negal�jo b�ti i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1566
-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"
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Pasirink aplank�"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Pasirink aplank�"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
@@ -4861,211 +5122,213 @@ msgstr "pabaigos-data"
 msgid "date-start"
 msgstr "prad�ios-data"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Pirmininkaujantys asmenys"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1535
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "B�tini dalyviai"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "Neb�tini dalyviai"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "Ne dalyviai"
 
-#: 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:771
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Individas"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Grup�"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Resursas"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Kambarys"
 
-#: 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:775
-#: calendar/gui/e-meeting-model.c:791
-#: 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 "Ne�inomas"
-
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "Pirmininkas"
 
-#: 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:788
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "B�tinas dalyvis"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "Neb�tinas dalyvis"
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Ne dalyvis"
 
-#: 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:816
+#: 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 "Reikalauja veiksmo"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr "Priimtas"
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 msgid "Declined"
 msgstr "Atmestas"
 
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:819 calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Negalutinis"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "Pavestas"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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: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:2118 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"
 
 #. 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 "%Y-%m-%d"
 
-#: calendar/gui/e-meeting-time-sel.c:428
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "Nesu darbe"
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "N�ra informacijos"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Parinktys"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Rodyti tik _darbo valandas"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "Rodyti _atitraukt�"
 
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "_Atnaujinti Laisvas/U�imtas"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Automati�kai parinkti"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "_Visi �mon�s ir resursai"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "Visi �_mon�s ir vienas resursas"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "_B�tini �mon�s"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "B�tini �mon�s ir _vienas resursas"
 
-#: calendar/gui/e-meeting-time-sel.c:641
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "Susitikimo _prad�ios laikas:"
 
-#: calendar/gui/e-meeting-time-sel.c:660
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atidaromos u�duotys 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 "Negal�jau �kelti u�duo�i� � �%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 "Metodas, reikalingas �kelti �%s�, nepalaikomas"
 
-#: calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "U�baigimo data"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "I�trinti pa�ym�tus kontaktus"
+
+#: calendar/gui/e-tasks.c:659
+#, fuzzy
+msgid "Expunging"
+msgstr "I�valyti"
+
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Naujas �_vykis..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "_I�trinti �� �vyk�"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Negal�jau atidaryti aplanko su �%s�"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metodas, reikalingas atidaryti �%s�, nepalaikomas"
 
-#: calendar/gui/gnome-cal.c:1865
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Atidaromas kalendorius i� %s"
@@ -5126,266 +5389,228 @@ msgstr "Spalis"
 msgid "September"
 msgstr "Rugs�jis"
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:220
+#, fuzzy
+msgid "At least one attendee is necessary"
 msgstr "Reikalingas bent vienas dalyvis"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "Turi b�ti nurodytas organizatorius."
 
-#: calendar/gui/itip-utils.c:570
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Tu turi b�ti �vykio dalyvis."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr "1-a"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr "2-a"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr "3-a"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr "4-a"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr "5-a"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr "6-ta"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr "7-ta"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr "8-ta"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr "9-ta"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr "10-ta"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr "11-ta"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr "12-ta"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr "13-ta"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr "14-ta"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr "15-ta"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr "16-ta"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr "17-ta"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr "18-ta"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr "19-ta"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr "20-ta"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr "21-a"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr "22-a"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr "23-a"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr "24-ta"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr "25-ta"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr "26-ta"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr "27-ta"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr "28-ta"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr "29-ta"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr "30-ta"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr "31-a"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr "Sk"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Pr"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "An"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Tr"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Kt"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Pn"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "�t"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Pasirinkta diena (%a, %Y %d %b)"
 
-#: 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: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, %Y %b %d"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Pasirinkta savait� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Pasirinktas m�nuo (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Pasirinkti metai (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "U�duotis"
-
-#: calendar/gui/print.c:2262
-#, fuzzy, c-format
-msgid "Status: %s"
-msgstr "_B�sena:"
-
-#: calendar/gui/print.c:2280
-#, fuzzy, c-format
-msgid "Priority: %s"
-msgstr "_Svarbumas:"
-
-#: calendar/gui/print.c:2294
-#, fuzzy, c-format
-msgid "Percent Complete: %i"
-msgstr "Procent� u�baigta"
-
-#: calendar/gui/print.c:2306
-#, fuzzy, c-format
-msgid "URL: %s"
-msgstr "URL:"
-
-#: calendar/gui/print.c:2320
-#, fuzzy, c-format
-msgid "Categories: %s"
-msgstr ""
-"\n"
-"Kategorijos: "
-
-#: calendar/gui/print.c:2331
-#, fuzzy
-msgid "Contacts: "
-msgstr "Ko_ntaktai:"
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Spausdinti kalendori�"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2358 my-evolution/e-summary.c:619
-#: 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Spaudinio per�i�ra"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Spausdinti element�"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Spausdinimo nuostatos"
 
-#: calendar/gui/tasks-control.c:126
-msgid "The URI of the tasks folder to display"
-msgstr "Vaizduojamo u�duo�i� aplanko URI"
-
 #: calendar/gui/tasks-control-factory.c:75
 #, fuzzy
 msgid ""
@@ -5394,6 +5619,33 @@ msgstr ""
 "Negal�jau sukurti kalendoriaus rodinio. Patikrink, ar gerai �diegti ORBit ir "
 "OAF."
 
+#: calendar/gui/tasks-control.c:147
+msgid "The URI of the tasks folder to display"
+msgstr "Vaizduojamo u�duo�i� aplanko 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 ""
+"�is veiksmas am�inai sunaikins visus lai�kus, pa�ym�tus i�trintais. Jei tu "
+"t�si toliau, nebegal�si atkurti t� lai�k�.\n"
+"\n"
+"Tikrai i�trinti tuos lai�kus?"
+
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+msgid "Do not ask me again."
+msgstr "Kit� kart� nebeklausti."
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Spausdinti korteles"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5432,135 +5684,1748 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SPATKP�"
 
-#: calendar/pcs/query.c:234
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "Gamykla importuoti VCard byloms � Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "Importuoja VCard bylas � Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "Importuoja VCard bylas � Evolution."
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Kalendoriaus �inut�"
+
+#: 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 rado Pine pa�to byl�.\n"
+"Ar nor�tum jas importuoti � Evolution?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Atidaryti kalendori�"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now tikisi 0 argument�"
 
-#: calendar/pcs/query.c:258
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:263
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:300
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:305
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:339
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:344
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:371
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:376
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:412
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:508
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:513
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:650
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:655
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:679
+#: 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:721
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: 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)"
 msgstr ""
 
-#: calendar/pcs/query.c:821
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? tikisi 0 argument�"
 
-#: calendar/pcs/query.c:866
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? tikisi 1 argumento"
 
-#: calendar/pcs/query.c:871
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? tikisi, kad pirmas argumentas bus 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 "Paie�kos i�rai�kos �vertinimas nedav� login�s reik�m�s"
 
-#: camel/camel-cipher-context.c:171
+#.
+#. * 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 "D�ibutis"
+
+#: 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
+msgid "America/Adak"
+msgstr ""
+
+#: calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr ""
+
+#: calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr ""
+
+#: calendar/zones.h:62
+msgid "America/Antigua"
+msgstr ""
+
+#: calendar/zones.h:63
+#, fuzzy
+msgid "America/Araguaina"
+msgstr "Nikaragva"
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr ""
+
+#: calendar/zones.h:66
+msgid "America/Barbados"
+msgstr ""
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: calendar/zones.h:68
+#, fuzzy
+msgid "America/Belize"
+msgstr "Belizas"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+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
+msgid "America/Caracas"
+msgstr ""
+
+#: calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr ""
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+msgid "America/Cayman"
+msgstr ""
+
+#: calendar/zones.h:79
+msgid "America/Chicago"
+msgstr ""
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr ""
+
+#: calendar/zones.h:82
+#, fuzzy
+msgid "America/Costa_Rica"
+msgstr "Kosta Rika"
+
+#: calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr ""
+
+#: calendar/zones.h:84
+msgid "America/Curacao"
+msgstr ""
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+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 "Dominika"
+
+#: calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr ""
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+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
+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 "Grenada"
+
+#: calendar/zones.h:100
+#, fuzzy
+msgid "America/Guadeloupe"
+msgstr "Gvadelup�"
+
+#: calendar/zones.h:101
+#, fuzzy
+msgid "America/Guatemala"
+msgstr "Gvatemala"
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+#, fuzzy
+msgid "America/Guyana"
+msgstr "Gajana"
+
+#: calendar/zones.h:104
+msgid "America/Halifax"
+msgstr ""
+
+#: calendar/zones.h:105
+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 "Jamaika"
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+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
+msgid "America/La_Paz"
+msgstr ""
+
+#: calendar/zones.h:120
+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
+msgid "America/Maceio"
+msgstr ""
+
+#: calendar/zones.h:124
+msgid "America/Managua"
+msgstr ""
+
+#: calendar/zones.h:125
+msgid "America/Manaus"
+msgstr ""
+
+#: calendar/zones.h:126
+#, fuzzy
+msgid "America/Martinique"
+msgstr "Martinika"
+
+#: calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr ""
+
+#: calendar/zones.h:128
+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
+msgid "America/Montreal"
+msgstr ""
+
+#: calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr ""
+
+#: calendar/zones.h:137
+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
+msgid "America/Nome"
+msgstr ""
+
+#: calendar/zones.h:141
+msgid "America/Noronha"
+msgstr ""
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+#, fuzzy
+msgid "America/Panama"
+msgstr "Panama"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+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 "Puerto Rikas"
+
+#: 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
+msgid "America/Regina"
+msgstr ""
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+msgid "America/Rosario"
+msgstr ""
+
+#: calendar/zones.h:157
+msgid "America/Santiago"
+msgstr ""
+
+#: calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr ""
+
+#: calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr ""
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr ""
+
+#: calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr ""
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr ""
+
+#: calendar/zones.h:165
+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 "Azerbaid�anas"
+
+#: calendar/zones.h:172
+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
+msgid "America/Yakutat"
+msgstr ""
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: calendar/zones.h:178
+#, fuzzy
+msgid "Antarctica/Casey"
+msgstr "Antarktika"
+
+#: calendar/zones.h:179
+#, fuzzy
+msgid "Antarctica/Davis"
+msgstr "Antarktika"
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: calendar/zones.h:181
+#, fuzzy
+msgid "Antarctica/Mawson"
+msgstr "Antarktika"
+
+#: calendar/zones.h:182
+#, fuzzy
+msgid "Antarctica/McMurdo"
+msgstr "Antarktika"
+
+#: calendar/zones.h:183
+#, fuzzy
+msgid "Antarctica/Palmer"
+msgstr "Antarktika"
+
+#: calendar/zones.h:184
+#, fuzzy
+msgid "Antarctica/South_Pole"
+msgstr "Antarktika"
+
+#: calendar/zones.h:185
+#, fuzzy
+msgid "Antarctica/Syowa"
+msgstr "Antarktika"
+
+#: calendar/zones.h:186
+#, fuzzy
+msgid "Antarctica/Vostok"
+msgstr "Antarktika"
+
+#: 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 "Bahreinas"
+
+#: 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 "Kolumbija"
+
+#: 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 "Honkongas"
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+#: calendar/zones.h:216
+#, fuzzy
+msgid "Asia/Istanbul"
+msgstr "Asistento"
+
+#: 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 "Kuveitas"
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr ""
+
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Muscat"
+msgstr "Asistento"
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: calendar/zones.h:235
+#, fuzzy
+msgid "Asia/Omsk"
+msgstr "Priskirti u�duot�"
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+#, fuzzy
+msgid "Asia/Qatar"
+msgstr "Kvataras"
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:247
+#, fuzzy
+msgid "Asia/Singapore"
+msgstr "Singap�ras"
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+#, fuzzy
+msgid "Atlantic/Bermuda"
+msgstr "Bermudai"
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+#, fuzzy
+msgid "Atlantic/Cape_Verde"
+msgstr "�aliasis ky�ulys"
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+#, fuzzy
+msgid "Australia/Adelaide"
+msgstr "Australija"
+
+#: calendar/zones.h:274
+#, fuzzy
+msgid "Australia/Brisbane"
+msgstr "Australija"
+
+#: calendar/zones.h:275
+#, fuzzy
+msgid "Australia/Broken_Hill"
+msgstr "Australija"
+
+#: calendar/zones.h:276
+#, fuzzy
+msgid "Australia/Darwin"
+msgstr "Australija"
+
+#: calendar/zones.h:277
+#, fuzzy
+msgid "Australia/Hobart"
+msgstr "Australija"
+
+#: calendar/zones.h:278
+#, fuzzy
+msgid "Australia/Lindeman"
+msgstr "Australija"
+
+#: calendar/zones.h:279
+#, fuzzy
+msgid "Australia/Lord_Howe"
+msgstr "Australija"
+
+#: calendar/zones.h:280
+#, fuzzy
+msgid "Australia/Melbourne"
+msgstr "Australija"
+
+#: calendar/zones.h:281
+#, fuzzy
+msgid "Australia/Perth"
+msgstr "Australija"
+
+#: calendar/zones.h:282
+#, fuzzy
+msgid "Australia/Sydney"
+msgstr "Australija"
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:284
+#, fuzzy
+msgid "Europe/Andorra"
+msgstr "Andora"
+
+#: calendar/zones.h:285
+#, fuzzy
+msgid "Europe/Athens"
+msgstr "Savyb�s"
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:296
+#, fuzzy
+msgid "Europe/Gibraltar"
+msgstr "Gibraltaras"
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:304
+#, fuzzy
+msgid "Europe/Luxembourg"
+msgstr "Liuksemburgas"
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr ""
+
+#: calendar/zones.h:308
+#, fuzzy
+msgid "Europe/Monaco"
+msgstr "Monakas"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr ""
+
+#: calendar/zones.h:312
+#, fuzzy
+msgid "Europe/Paris"
+msgstr "Savyb�s"
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:317
+#, fuzzy
+msgid "Europe/San_Marino"
+msgstr "San Marinas"
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "Komorai"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+#, fuzzy
+msgid "Indian/Mahe"
+msgstr "Indija"
+
+#: calendar/zones.h:341
+#, fuzzy
+msgid "Indian/Maldives"
+msgstr "Maldyvai"
+
+#: calendar/zones.h:342
+#, fuzzy
+msgid "Indian/Mauritius"
+msgstr "Mauricijus"
+
+#: calendar/zones.h:343
+msgid "Indian/Mayotte"
+msgstr ""
+
+#: calendar/zones.h:344
+msgid "Indian/Reunion"
+msgstr ""
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
+#: camel/camel-cipher-context.c:169
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:211
+#: 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:251
+#: camel/camel-cipher-context.c:249
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:294
+#: camel/camel-cipher-context.c:292
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:336
+#: camel/camel-cipher-context.c:334
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
+#: camel/camel-data-cache.c:169
+#, fuzzy
+msgid "Unable to create cache path"
+msgstr ""
+"Negaliu sukurti i�vesties bylos: %s\n"
+" %s"
+
+#: camel/camel-data-cache.c:441
+#, 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
 #, c-format
 msgid ""
@@ -5591,85 +7456,66 @@ msgstr "V�l sinchronizuojama su serveriu"
 msgid "You must be working online to complete this operation"
 msgstr "Tu turi dirbti prisijung�s, kad u�baigtum �� veiksm�"
 
-#: 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 "Sinchronizuojami aplankai"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, 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
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Klaida vykdant filtr�: %s: %s"
+
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Negaliu atidaryti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Negaliu apdoroti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Gaunamas lai�kas %d (%d%%)"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Negaliu atidaryti lai�ko"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nes�km� ties lai�ku %d"
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Sinchronizuojamas aplankas"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Gaunamas lai�kas %d i� %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %d"
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Klaida nagrin�jant filtr�: %s: %s"
-
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Klaida vykdant filtr�: %s: %s"
+#: camel/camel-filter-search.c:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Klaida vykdant filtro paie�k�: %s: %s"
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1040
-#, 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:1080
-#, 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:1262
-msgid "Moving messages"
-msgstr "Perkeliami lai�kai"
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5678,7 +7524,7 @@ msgstr ""
 "Negaliu i�nagrin�ti paie�kos i�rai�kos: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5687,18 +7533,37 @@ msgstr ""
 "Klaida vykdant paie�kos i�rai�k� �%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) reikalauja vienintelio loginio rezultato"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Vykdoma u�klausa ne�inomai antra�tei: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1038
+#, 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
+#, 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
+msgid "Moving messages"
+msgstr "Perkeliami lai�kai"
 
 #: camel/camel-lock-client.c:111
 #, fuzzy, c-format
@@ -5805,120 +7670,125 @@ 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�"
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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:755
+#: 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:953
+#: 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:959
+#: 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:970
+#: 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:1143
+#: 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:1153
+#: 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:1160
+#: 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:1169
+#: 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:1337
+#: 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:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1352
+#: camel/camel-pgp-context.c:1387
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-provider.c:130
+#: camel/camel-pgp-mime.c:354
+msgid "This is a digitally signed message part"
+msgstr ""
+
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Negal�jau �kelti %s: Moduli� �k�limas �ioje sistemoje nepalaikomas."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Negal�jau �kelti %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 "Negal�jau �kelti %s: Modulyje n�ra inicializacijos kodo."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s serveris %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:264
+#: 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:267
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(ne�inomas hostas)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "Veiksmas nutrauktas"
 
-#: camel/camel-remote-store.c:484
+#: 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"
@@ -6024,13 +7894,14 @@ msgid ""
 msgstr "Negal�jau sukurti pipe: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Blogas autentikacijos atsakymas i� serverio."
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
-msgstr ""
+#, fuzzy
+msgid "Login"
+msgstr "siun�iamas"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
@@ -6042,9 +7913,22 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Ne�inoma autentikacijos b�sena."
 
+#: 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 ""
+"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:301
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: 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"
 
@@ -6088,26 +7972,39 @@ msgstr "URL �%s� turi b�ti su hostu"
 msgid "URL '%s' needs a path component"
 msgstr "URL �%s� turi b�ti su keliu"
 
-#: camel/camel-service.c:611
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:638
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:663
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:665
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Atsakymo adresas:"
+
+#: camel/camel-service.c:787
+msgid "Host lookup failed: host not found"
+msgstr ""
+
+#: camel/camel-service.c:790
+msgid "Host lookup failed: unknown reason"
+msgstr ""
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Virtuali� aplank� pa�to tiek�jas."
@@ -6116,12 +8013,12 @@ msgstr "Virtuali� aplank� pa�to tiek�jas."
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pa�to skaitymui naudojant u�klaus� i� kit� aplank� aib�s"
 
-#: 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 "Protokolui �%s� n�ra tiek�jo."
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6167,25 +8064,24 @@ msgstr "Nepavyko i�koduoti lai�ko."
 msgid "Failed to verify certificates."
 msgstr "Nepavyko patikrinti sertifikat�."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
 msgstr ""
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:428
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6200,24 +8096,40 @@ msgstr ""
 "\n"
 "Ar nori priimti vis tiek?"
 
-#: 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:491
 #, 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"
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
 msgstr ""
-"El. pa�tas: %s\n"
-"Bendras vardas: %s\n"
-"Organizacinis vienetas: %s\n"
-"Organizacija: %s\n"
-"Lokalumas: %s\n"
-"Valstija: %s\n"
-"Valstyb�: %s"
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, fuzzy, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
+msgstr ""
+"Blogas sertifikatas i� %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Ar nori priimti vis tiek?"
 
 #: camel/camel-url.c:288
 #, c-format
@@ -6229,27 +8141,27 @@ msgstr "Negal�jau i�nagrin�ti URL �%s�"
 msgid "No such message %s in %s"
 msgstr "N�ra tokio lai�ko %s aplanke %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "N�ra tokio lai�ko: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Negaliu i�trinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Negaliu i�trinti aplanko: %s: N�ra tokio aplanko"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Negaliu pervadinti aplanko: %s: N�ra tokio aplanko"
@@ -6258,76 +8170,76 @@ msgstr "Negaliu pervadinti aplanko: %s: N�ra tokio aplanko"
 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:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Netik�tas atsakymas i� IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr "Serverio atsakymas baig�si per anksti."
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, 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:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, 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:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Negal�jau sukurti katalogo %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nepavyko �kelti %s santraukos"
 
-#: camel/providers/imap/camel-imap-folder.c:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Ie�koma pakeist� lai�k�"
 
-#: camel/providers/imap/camel-imap-folder.c:1566
-#: camel/providers/imap/camel-imap-folder.c:1978
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "�is lai�kas �iuo metu nepasiekiamas"
 
-#: camel/providers/imap/camel-imap-folder.c:1717
-#: camel/providers/imap/camel-imap-folder.c:1798
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1723
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Ie�koma nauj� lai�k�"
 
-#: camel/providers/imap/camel-imap-folder.c:2015
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "Negal�jau rasti lai�ko teksto FETCH atsakyme"
 
-#: 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 "Negal�jau atidaryti ke�o katalogo: %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
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nepavyko i�koduoti lai�ko."
@@ -6340,7 +8252,7 @@ msgstr "Tikrinama, ar yra nauj� lai�k�"
 msgid "Check for new messages in all folders"
 msgstr "Patikrinti, ar yra nauj� lai�k� visuose aplankuose"
 
-#: 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 "Aplankai"
 
@@ -6374,28 +8286,28 @@ msgstr ""
 "Su �ia parinktimi jungiantis prie IMAP serverio bus naudojamas paprasto "
 "teksto slapta�odis."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nepalaikoma %s tipo autentikacija"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Tu ne�vedei slapta�od�io."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6405,101 +8317,120 @@ msgstr ""
 "Negal�jau autentikuotis � IMAP server�.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "N�ra tokio aplanko %s"
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 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:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "MH formato pa�to katalogai"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 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:52
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Vietinis pristatymas"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:62
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Maildir formato pa�to katalogai"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr "Vietinio pa�to laikymui maildir kataloguose."
 
-#: camel/providers/local/camel-local-provider.c:80
+#: 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:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Saugyklos �aknis %s n�ra absoliutus kelias"
 
-#: 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 "Saugyklos �aknis %s n�ra n�ra paprastas katalogas"
 
-#: 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 "Negal�jau gauti aplanko �%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 "Vietin�se saugyklose n�ra 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 "Vietin� pa�to byla %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Negal�jau pervadinti aplanko �%s� � %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 "Negal�jau pervadinti aplanko: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Negal�jau i�trinti aplanko santraukos bylos �%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 "Negal�jau i�trinti aplanko indekso bylos �%s�: %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Negal�jau i�saugoti santraukos: %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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nepavyko prid�ti lai�ko � santrauk�: ne�inoma prie�astis"
 
@@ -6520,7 +8451,7 @@ msgstr "Negal�jau pridurti lai�ko prie maildir aplanko: %s: %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6532,7 +8463,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "N�ra tokio lai�ko"
 
@@ -6541,7 +8472,7 @@ msgstr "N�ra tokio lai�ko"
 msgid "Invalid message contents"
 msgstr "Blogas lai�ko turinys"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -6551,14 +8482,14 @@ msgstr ""
 "Negal�jau atidaryti aplanko �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "N�ra tokio aplanko �%s�."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -6568,43 +8499,66 @@ msgstr ""
 "Negal�jau sukurti aplanko: �%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� n�ra maildir katalogas."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Negal�jau i�trinti aplanko �%s�: %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "ne maildir katalogas"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 "Negal�jau sukurti aplanko: �%s�:\n"
 "%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 "Negaliu atidaryti maildir katalogo kelio: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Tikrinama, ar yra nauj� lai�k�"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "�ra�omas aplankas"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Negaliu atidaryti pa�to d��ut�s: %s: %s\n"
@@ -6622,9 +8576,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6634,16 +8588,16 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 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:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nepavyko sukurti lai�ko: Sugadinta pa�to d��ut�?"
 
-#: 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"
@@ -6652,7 +8606,7 @@ msgstr ""
 "Negal�jau atidaryti bylos �%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"
@@ -6661,14 +8615,14 @@ msgstr ""
 "Negal�jau sukurti bylos �%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� n�ra paprasta byla."
 
-#: 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"
@@ -6677,96 +8631,85 @@ msgstr ""
 "Negal�jau i�trinti aplanko �%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 "Aplankas �%s� n�ra tu��ias. Nei�tryniau."
 
-#. 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 "�ra�omas aplankas"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Negal�jau atidaryti aplanko: %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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Negal�jau patikrinti aplanko: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Negal�jau atidaryti bylos: %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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Negal�jau atidaryti laikinos pa�to bylos: %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
+#: 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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "Negal�jau u�daryti �altinio aplanko %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Negal�jau u�daryti laikino aplanko:  %s"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Negal�jau pervadinti aplanko: %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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ne�inoma klaida: %s"
@@ -6786,12 +8729,12 @@ msgstr "Negal�jau pridurti lai�ko prie mh aplanko: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "�%s� n�ra katalogas."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, 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:512
+#: 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"
@@ -6802,6 +8745,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "N�ra tokio aplanko �%s/%s�."
@@ -6811,76 +8755,55 @@ msgstr "N�ra tokio aplanko �%s/%s�."
 msgid "Spool mail file %s"
 msgstr "Spool pa�to byla %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Spool aplank� negalima pervadinti"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Spool aplank� negalima i�trinti"
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "Nepavyko �kelti %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Pra�om �vesti NNTP slapta�od� vartotojui %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Serveris atmet� vartotojo vard�"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Nepavyko serveriui nusi�sti vartotojo vardo"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Serveris atmet� vartotojo vard�/slapta�od�"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Lai�kas %s nerastas."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Negal�jau gauti grupi� s�ra�o i� serverio."
+#: 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/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 "Negaliu �kelti grupi� s�ra�o bylos d�l %s: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Negaliu i�saugoti grupi� s�ra�o bylos d�l %s: %s"
+#: 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"
@@ -6890,17 +8813,12 @@ 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:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Negal�jau atidaryti katalogo naujien� serveriui: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET naujienos per %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6908,71 +8826,112 @@ msgstr ""
 "Su �ia parinktimi NNTP serveryje bus autentikuojamasi paprasto teksto "
 "slapta�od�iu."
 
-#: 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 "Negal�jau atidaryti ar sukurti .newsrc bylos d�l %s: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "N�ra tokio aplanko %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "Negal�jau sukurti pipe: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: 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 "Ie�koma nauj� lai�k�"
+
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "Ne�inoma klaida: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:566
+#, fuzzy
+msgid "Use cancel"
+msgstr "Nutraukti"
+
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "Veiksmas nutrauktas"
+
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Parsiun�iama POP santrauka"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "Negal�jau patikrinti, ar POP serveryje yra nauj� lai�k�: %s"
+#: 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 "Veiksmas nutrauktas"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Negal�jau atidaryti aplanko: lai�k� s�ra�as buvo nepilnas."
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Negal�jau gauti aplanko �%s�: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Sunaikinami i�trinti lai�kai"
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "Negal�jau parsi�sti lai�ko: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Negal�jau parsi�sti lai�ko i� POP serverio %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 "N�ra lai�ko su 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 "Parsiun�iamas POP lai�kas %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 ""
+"Negaliu gauti lai�ko: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Ne�inoma klaida"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "Lai�k� saugojimas"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Palikti lai�kus serveryje"
 
-#: 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 "I�trinti po %s dienos(�)"
 
-#: 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:84
 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 "Jungimuisi ir pa�to parsiuntimui i� POP serveri�."
 
-#: 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."
@@ -6981,7 +8940,7 @@ msgstr ""
 "teksto slapta�odis. Tai vienintel� parinktis, palaikoma daugelio POP "
 "serveri�."
 
-#: 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 "
@@ -6991,48 +8950,32 @@ msgstr ""
 "slapta�odis per APOP protokol�. Tai gali veikti ne visiems vartotojams netgi "
 "serveriuose, kurie teigia, jog j� palaiko."
 
-#: camel/providers/pop3/camel-pop3-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
-"Tai prisijungs prie POP serverio ir naudos Kerberos 4, kad autentikuot�si � "
-"j�."
+"Negal�jau prisijungti prie POP serverio.\n"
+"Klaida siun�iant vartotojo vard�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Negal�jau autentikuotis � KPOP server�: %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:214
-#, c-format
-msgid "Could not connect to server: %s"
-msgstr "Negal�jau prisijungti prie serverio: %s"
+#: camel/providers/pop3/camel-pop3-store.c:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Autentikacija nepavyko."
 
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, 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:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sPra�om �vesti POP3 slapta�od� d�l %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:378
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Negal�jau prisijungti prie POP serverio.\n"
-"Klaida siun�iant vartotojo vard�: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:381
-#: camel/providers/pop3/camel-pop3-store.c:418
-msgid "(Unknown)"
-msgstr "(Ne�inoma)"
-
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -7040,7 +8983,27 @@ msgstr ""
 "Negaliu prisijungti prie POP serverio.\n"
 "Jis nepalaiko pra�yto autentikacijos mechanizmo."
 
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "Nepavyko IMAP komanda: %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "I/O klaida"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7049,18 +9012,13 @@ msgstr ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant slapta�od�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "N�ra tokio aplanko �%s�."
 
-#: camel/providers/pop3/camel-pop3-store.c:566
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "Netik�tas atsakymas i� POP serverio: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7071,49 +9029,50 @@ msgid ""
 msgstr ""
 "Pa�to siuntimui, perleid�iant j� vietin�s sistemos �sendmail� programai."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "Negal�jau i�nagrin�ti URL �%s�"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Negal�jau sukurti pipe � sendmail: %s: pa�tas nei�si�stas"
 
-#: 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 ""
 
-#: 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 "Negal�jau i�si�sti lai�ko: %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'as baig� darb� signalu %s: pa�tas nei�si�stas."
 
-#: 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 "Negal�jau paleisti %s: pa�tas nei�si�stas."
 
-#: 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'as baig� darb� b�sena %d: pa�tas nei�si�stas."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr "Negal�jau rasti �Nuo� adreso lai�ke"
-
-#: 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 "Pa�to siuntimas per sendmail program�"
 
-#: 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"
 
@@ -7123,123 +9082,146 @@ msgstr ""
 "Pa�to siuntimui, prisijungiant prie nutolusio pa�to serverio naudojant "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaks�s klaida, komanda neatpa�inta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintakses klaida parametruose arba argumentuose"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Komanda ne�gyvendinta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Komandos parametras ne�gyvendintas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Sistemos b�sena, arba sistemos pagalbos atsakymas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Pagalbos �inut�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Paslauga pasiruo�usi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Paslauga u�daro transmisijos kanal�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Paslauga neprieinama, u�daromas transmisijos kanalas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Pra�ytas pa�to veiksmas pavyko, u�baigtas"
 
-#: 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:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Pra�ytas pa�to veiksmas ne�vykdytas: pa�to d��ut� neprieinama"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Pra�ytas veiksmas ne�vykdytas: pa�to d��ut� neprieinama"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Pra�ytas veiksmas nutrauktas: klaida vykdant"
 
-#: 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:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Pra�ytas veiksmas ne�vykdytas: tr�ksta vietos sistemoje"
 
-#: 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 "Pra�ytas veiksmas ne�vykdytas: per�engta vietos saugykloje riba"
 
-#: 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 "Pra�ytas veiksmas ne�vykdytas: pa�to d��ut�s vardas neleistinas"
 
-#: 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 ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Tranzakcija nepavyko"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Nepateiktas slapta�odis."
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Autentikacijos mechanizmas per silpnas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Pra�ytam autentikacijos mechanizmui b�tinas �ifravimas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Laikina autentikacijos nes�km�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Autentikacija b�tina"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, 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:376
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, 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
+#, 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"
 msgstr "SMTP serveris %s nepalaiko pra�yto autentikacijos tipo %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:415
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7249,129 +9231,133 @@ msgstr ""
 "Negal�jau autentikuotis � SMTP server�.\n"
 "%s\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP serveris %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP pa�to siuntimas per %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr "Negaliu si�sti lai�ko: siunt�jo adresas neapibr��tas."
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:593 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Siun�iamas lai�kas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+#, 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
 msgid "SMTP Greeting"
 msgstr "SMTP pasveikinimas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO atsakymo klaida: %s: nelemtinga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "SMTP autentikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Klaida sukuriant SASL autentikacijos objekt�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Baig�si AUTH u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "AUTH u�klausa nepavyko."
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Blogas autentikacijos atsakymas i� serverio.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:893
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1081
+#, fuzzy
+msgid "MAIL FROM response error"
 msgstr "MAIL FROM atsakymo klaida: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "RCPT TO atsakymo klaida: %s: pa�tas nei�si�stas"
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "DATA atsakymo klaida: %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
+#, fuzzy
+msgid "DATA response error"
+msgstr "RSET atsakymo klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1030
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "DATA atsakymo klaida: lai�ko nutraukimas: %s: pa�tas nei�si�stas"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "Blogas autentikacijos atsakymas i� serverio."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Baig�si RSET u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "RSET atsakymo klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "QUIT atsakymo klaida: %s: nelemtinga"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "RSET atsakymo klaida: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -7398,19 +9384,19 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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 "priedas"
 
-#: 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 "Pa�alinti pa�ym�tus elementus i� pried� s�ra�o"
 
-#: composer/e-msg-composer-attachment-bar.c:531
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "Prisegti pried�..."
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "Prisegti byl� prie �io lai�ko"
 
@@ -7438,56 +9424,56 @@ msgid "MIME type:"
 msgstr "MIME tipas:"
 
 #: 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 "Pasi�lyti automatin� priedo parodym�"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Paspausk �ia, jei reikia adres� knygel�s"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Nuo:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Atsakyti-kam:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "�vesk lai�ko gav�jus"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:397
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7495,12 +9481,12 @@ msgstr ""
 "�vesk adresus, kurie gaus �io lai�ko carbon copy, bet j� nesimatys lai�ko "
 "gav�j� s�ra�e."
 
-#: 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 "Prisegti byl�"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7509,46 +9495,34 @@ msgstr ""
 "Klaida skaitant byl� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:894
-msgid "Save as..."
-msgstr "I�saugoti kaip..."
-
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "�sp�jimas!"
 
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Byla egzistuoja, u�ra�yti?"
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Klaida i�saugant byl�: %s"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Klaida �keliant byl�: %s"
 
-#: composer/e-msg-composer.c:1019
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Nepavyko atidaryti �ios s�skaitos juodra��i� aplanko.\n"
-"Ar nor�tum naudoti �prastin� juodra��i� aplank�?"
-
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Klaida prieinant prie bylos: %s"
 
-#: composer/e-msg-composer.c:1077
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Nepavyko gauti lai�ko i� redaktoriaus"
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1058
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7557,7 +9531,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1091
+#: composer/e-msg-composer.c:1065
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7566,7 +9540,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1100
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7575,7 +9549,7 @@ msgstr ""
 "Klaida automati�kai i�saugant lai�k�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1202
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7583,7 +9557,7 @@ msgstr ""
 "Ximian Evolution rado nei�saugot� byl� i� praeitos sesijos.\n"
 "Ar nor�tum pabandyti jas atkurti?"
 
-#: composer/e-msg-composer.c:1356
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7593,29 +9567,29 @@ msgstr ""
 "\n"
 "Ar nor�tum i�saugoti jo pakeitimus?"
 
-#: composer/e-msg-composer.c:1363
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "�sp�jimas: Pakeistas lai�kas"
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Atidaryti byl�"
 
-#: composer/e-msg-composer.c:1535
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "�terpti byl�"
 
-#: composer/e-msg-composer.c:1910 composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Sukurti lai�k�"
 
-#: composer/e-msg-composer.c:2368
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2391 composer/e-msg-composer.c:2446
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7623,7 +9597,7 @@ msgstr ""
 "Negal�jau sukurti ra�ykl�s lango:\n"
 "Nepavyko aktyvuoti HTML redaktoriaus komponento."
 
-#: 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."
@@ -7631,18 +9605,19 @@ msgstr ""
 "Negal�jau sukurti ra�ykl�s lango, nes tu dar nenurodei\n"
 "jokios asmenyb�s pa�to komponente."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Negal�jau inicializuoti Evolution ra�ykl�s."
 
-#: 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:1
 msgid "The Evolution groupware suite"
 msgstr ""
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Ximian Evolution _FAQ"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "adreso kortel�"
@@ -7683,15 +9658,33 @@ 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
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Byla tokiu vardu jau yra.\n"
+"U�ra�yti j�?"
+
 #. Remember the password?
-#: e-util/e-passwords.c:347 mail/mail-session.c:267
+#: e-util/e-passwords.c:363 mail/mail-session.c:269
 msgid "Remember this password"
 msgstr "Prisiminti �� slapta�od�"
 
-#: e-util/e-passwords.c:349 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 "Prisiminti �� slapta�od� iki �ios sesijos galo"
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "Kategorijos"
+
 #. 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
@@ -7763,13 +9756,13 @@ 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"
 
 #. 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"
 
@@ -7810,11 +9803,7 @@ msgstr "valanda"
 msgid "minute"
 msgstr "minut�"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "sekund�"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "sekund�i�"
 
@@ -7888,7 +9877,7 @@ msgstr " "
 msgid "ago"
 msgstr " "
 
-#: filter/filter-datespec.c:711 mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %H:%M"
 
@@ -7901,15 +9890,15 @@ msgid "Filter Rules"
 msgstr "Filtravimo taisykl�s"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "Tada"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Prid�ti veiksm�"
 
-#: 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."
@@ -7917,19 +9906,11 @@ msgstr ""
 "Tu pamir�ai pasirinkti aplank�.\n"
 "Pra�au, gr��k atgal ir nurodyk tikr� aplank�, � kur� perkelti lai�kus."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:364
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Pasirink aplank�"
 
-#: filter/filter-folder.c:267
-msgid "Enter folder URI"
-msgstr "�vesk aplanko URI"
-
-#: filter/filter-folder.c:314
-msgid "<click here to select a folder>"
-msgstr "<spausk �ia, kad pasirinktum aplank�>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -7939,7 +9920,7 @@ msgstr ""
 "Klaida reguliarioje i�rai�koje �%s�:\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Bandyti"
 
@@ -7948,39 +9929,40 @@ msgstr "Bandyti"
 msgid "You must name this filter."
 msgstr "Keisti �io aplanko pavadinim�"
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Taisykl�s pavadinimas:"
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Bevard�"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Jeigu"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "�vykdyti veiksmus"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "jei visos s�lygos tenkinamos"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "jei kuri nors s�lyga tenkinama"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Prid�ti s�lyg�"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "gaunamas"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "siun�iamas"
 
@@ -8024,6 +10006,12 @@ msgstr "su visais vietiniais ir aktyviais nutolusiais aplankais"
 msgid "with all local folders"
 msgstr "su visais vietiniais aplankais"
 
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Priskirti �vert�"
+
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Priskirti spalv�"
@@ -8036,6 +10024,11 @@ msgstr "Priskirti �vert�"
 msgid "Attachments"
 msgstr "Priedai"
 
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belizas"
+
 #: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "turi savyje"
@@ -8089,144 +10082,153 @@ msgid "ends with"
 msgstr "baigiasi su"
 
 #: filter/libfilter-i18n.h:21
+msgid "Execute Shell Command"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Egzistuoja"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "egzistuoja"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "I�rai�ka"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Svarbus"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "yra"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "buvo po"
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "buvo prie�"
+
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "yra didesnis u�"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "yra ma�esnis u�"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "n�ra"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "n�ra"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "Konferencija"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Lai�ko tekstas"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "Lai�ko antra�t�"
 
-#: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr "Lai�kas buvo gautas"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message was sent"
-msgstr "Lai�kas buvo i�si�stas"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Perkelti � aplank�"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "tuo metu arba po"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "tuo metu ar prie�"
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "Groti gars�:"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Skaitytas"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Gav�jai"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "Regex tenkina"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "Atsakytas"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "�vertis"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1404
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Siunt�jas"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Priskirti b�sen�"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Dydis (kB)"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "skamba pana�iai �"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "�altinio s�skaita"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Savita antra�t�"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "prasideda su"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdym�"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Tema"
 
-#: filter/libfilter-i18n.h:52
-msgid "was after"
-msgstr "buvo po"
-
-#: filter/libfilter-i18n.h:53
-msgid "was before"
-msgstr "buvo prie�"
-
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Taisykl�s"
 
-#: filter/rule-editor.c:278
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Prid�ti taisykl�"
 
-#: filter/rule-editor.c:344
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Keisti taisykl�"
 
@@ -8247,30 +10249,30 @@ msgstr "Tu turi nurodyti bent vien� aplank� kaip �altin�"
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuoja tavo sen� Elm pa�t�"
 
-#: 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 "Importuojama..."
 
-#: 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 "Pra�ome palaukti"
 
-#: 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 "Importuojama %s kaip %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 "Skanuojama %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:101
 msgid "Mail"
 msgstr "Pa�tas"
 
@@ -8298,23 +10300,74 @@ msgstr ""
 "Evolution rado GnomeCard byl�.\n"
 "Ar nor�tum jas importuoti � Evolution?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "_Svarbumas:"
+
+#: 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 importuoja tavo senus Netscape duomenis"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "�iuk�l�s"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Vietin� pa�to byla %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Skanuojamas katalogas"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Pradedama importuoti"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Nuostatos"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Keisti filtrus"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8339,46 +10392,98 @@ msgid "Pine"
 msgstr "Pine"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Kalendoriaus nuostatos"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Evolution pa�to komponento gamykla."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Evolution pa�to komponento gamykla."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Evolution pa�to komponento gamykla."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Evolution ra�ykl�s komponento gamykla."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Evolution komponentas pa�tui tvarkyti."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolution pa�to ra�ykl�."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 #, fuzzy
 msgid "Evolution mail executive summary component."
 msgstr "Evolution pa�to komponento."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Evolution pa�to aplanko vaizdavimo komponentas."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Evolution pa�to aplanko gamyklos komponentas."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Evolution ra�ykl�s komponento gamykla."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Pa�to ap�valgos komponento gamykla."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Kalendoriaus nuostatos"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Pa�to s�skaita"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Kalendoriaus nuostatos"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "Pa�to nustatymo s�saja"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Aplankas, kuriame yra lai�kai"
+#: 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)"
+#: 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:101
+msgid "Folder containing mail"
+msgstr "Aplankas, kuriame yra lai�kai"
+
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtuali �iuk�lin�"
@@ -8387,231 +10492,255 @@ msgstr "Virtuali �iuk�lin�"
 msgid "Virtual Trash folder"
 msgstr "Virtualus �iuk�lin�s aplankas"
 
-#: mail/component-factory.c:129
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Negal�jau prisijungti prie serverio: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "�iame aplanke negali b�ti lai�k�."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Savyb�s..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Pakeisti �io aplanko savybes"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr "Tu nenustatei pa�to siuntimo metodo"
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Naujas pa�to lai�kas"
 
-#: mail/component-factory.c:951
-msgid "New _Mail Message"
-msgstr "Naujas _pa�to lai�kas"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "_Pa�to lai�kas"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1009
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Jungiamasi prie serverio..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Negaliu u�registruoti saugyklos apvalkale"
 
-#: mail/folder-browser-ui.c:271
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "�%s� savyb�s"
 
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Savyb�s"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d nauji"
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d pasl�pti"
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d pa�ym�ti"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d nei�si�sti"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d i�si�sti"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d i� viso"
 
-#: mail/folder-browser.c:1049
-msgid "Create vFolder from Search"
-msgstr "Sukurti vAplank� i� paie�kos"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Sukurti _virtual� aplank� i� lai�ko"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _Tem�"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_nt�j�"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _Gav�jus"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _Konferencij�"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_em�"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_unt�j�"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_v�jus"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filtras pagal K_onferencij�"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Taisyti kaip nauj� lai�k�..."
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:104
-msgid "_Save As..."
-msgstr "I�_saugoti kaip..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siunt�jui"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Atsakyti � _konferencij�"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "P_ersi�sti"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "U�baigta"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "I�valyti"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Pa�ym�ti s_kaitytu"
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Pa�ym�ti _neskaitytu"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Pa�ym�ti svarb_iu"
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Pa�ym�ti nesva_rbiu"
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
-msgstr "Pe_rkelti � aplank�..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "S_ugr��inti"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
+msgstr "Perkelti � aplank�..."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti � aplank�..."
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:106
-msgid "_Undelete"
-msgstr "S_ugr��inti"
+#: mail/folder-browser.c:1645
+msgid "Label"
+msgstr ""
 
-#: mail/folder-browser.c:1473
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Prid�ti siunt�j� � adres� knygel�"
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Pritaikyti filtrus"
 
-#: mail/folder-browser.c:1478
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "Sukurti _taisykl� i� lai�ko"
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
-msgstr "Filtras pagal Konferencij�"
-
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "vAplankas pagal Konferencij�"
 
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filtras pagal Konferencij� (%s)"
 
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "vAplankas pagal Konferencij� (%s)"
 
-#: mail/folder-browser.h:26
-#, fuzzy
-msgid "Default"
-msgstr "�p_rastas"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Gaunama informacija apie aplank�"
@@ -8633,26 +10762,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importuoja Outlook Express 4 bylas � Evolution"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Teksto turinys"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Esamas saugyklos formatas:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Indeksuojama:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Pa�to d��ut�s formatas"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Teksto turinys"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Naujas saugyklos formatas:"
 
-#: 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"
@@ -8662,15 +10784,15 @@ msgstr ""
 "(tokia kaip vietos diske tr�kumas) negali b�ti savaime\n"
 "atstatoma. Naudok �i� priemon� atsargiai."
 
-#: 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"
 
@@ -8688,86 +10810,79 @@ msgstr "Evolution naujien� tvarkykl�"
 msgid "Evolution Account Editor"
 msgstr "Evolution s�skait� tvarkykl�"
 
-#: mail/mail-account-gui.c:962
-msgid "Could not save signature file."
-msgstr "Negal�jau i�saugoti para�o bylos."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Hostas:"
 
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "I�saugoti para��"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "_Vartotojo vardas:"
 
-#: mail/mail-account-gui.c:1045
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+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 ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"�is para�as buvo pakeistas, ta�iau nei�saugotas.\n"
-"\n"
-"Ar nor�tum i�saugoti pakeitimus?"
 
-#: mail/mail-account-gui.c:1654
+#: mail/mail-account-gui.c:1985
 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:149
-msgid " (default)"
-msgstr " (�prasta)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "I�jungti"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "�jungti"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "Ar tu tikrai nori i�trinti �i� s�skait�?"
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Nei�trinti"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Ar tikrai i�trinti s�skait�?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-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:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "I�jungti"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:783 mail/mail-config.glade.h:42
-msgid "Mail Settings"
-msgstr "Pa�to nuostatos"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "�jungti"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Lai�kai � %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "Ar tu tikrai nori i�trinti �i� naujien� s�skait�?"
 
-#: mail/mail-autofilter.c:215
-#, c-format
-msgid "Subject is %s"
-msgstr "Tema yra %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "�jungta"
 
-#: mail/mail-autofilter.c:231
-#, c-format
-msgid "Mail from %s"
-msgstr "Lai�kai nuo %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "_S�skaitos vardas:"
 
-#: mail/mail-autofilter.c:287
-#, c-format
-msgid "%s mailing list"
-msgstr "%s konferencija"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Puerto Rikas"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Prid�ti filtro taisykl�"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8779,7 +10894,7 @@ msgstr ""
 "gauti ir ra�yti lai�kus.\n"
 "Ar nor�tum sutvarkyti j� dabar?"
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8787,7 +10902,7 @@ msgstr ""
 "Tu turi susitvarkyti asmenyb�,\n"
 "tik tada gal�si kurti lai�kus."
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8795,12 +10910,8 @@ msgstr ""
 "Tu turi sutvarkyti pa�to siuntim�,\n"
 "tik tada gal�si kurti lai�kus."
 
-#: mail/mail-callbacks.c:230
-msgid "You have not set a mail transport method"
-msgstr "Tu nenustatei pa�to siuntimo metodo"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:265
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -8808,11 +10919,11 @@ msgstr ""
 "Tu siunti HTML formatuot� lai�k�, bet sekantys gav�jai nem�gsta HTML "
 "formatuoto pa�to:\n"
 
-#: mail/mail-callbacks.c:280
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Si�sti vistiek?"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8820,7 +10931,7 @@ msgstr ""
 "�is lai�kas neturi temos.\n"
 "Tikrai si�sti?"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8828,11 +10939,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:370
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "�iame lai�ke yra tik Bcc gav�jai."
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -8840,40 +10951,44 @@ msgid ""
 "Send anyway?"
 msgstr "Gali b�ti, kad pa�to serveris"
 
-#: mail/mail-callbacks.c:469
-msgid "This message contains invalid recipients:"
-msgstr "�iame lai�ke yra neteising� gav�j�"
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 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:600
+#: mail/mail-callbacks.c:497
 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:838
+#: mail/mail-callbacks.c:623
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Nepavyko atidaryti �ios s�skaitos juodra��i� aplanko.\n"
+"Ar nor�tum naudoti �prastin� juodra��i� aplank�?"
+
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "ne�inomas siunt�jas"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d %H:%M, %%s ra��:"
 
-#: mail/mail-callbacks.c:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Perkelti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:1283 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopijuoti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:1753
+#: mail/mail-callbacks.c:2091
 #, 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:1778
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8881,7 +10996,7 @@ msgstr ""
 "Tu gali taisyti tik lai�kus, esan�ius \n"
 "Juodra��i� aplanke."
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8889,28 +11004,39 @@ msgstr ""
 "Tu gali i� naujo pasi�sti lai�kus\n"
 "tik i� Sent aplanko."
 
-#: mail/mail-callbacks.c:1831
+#: mail/mail-callbacks.c:2169
 #, 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:1857
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Joks lai�kas nepa�ym�tas"
 
-#: mail/mail-callbacks.c:1951
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "U�ra�yti byl�?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "I�saugoti lai�k� kaip..."
 
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "I�saugoti lai�kus kaip..."
 
-#: mail/mail-callbacks.c:2122 widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "�sp�jimas"
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Parodyti kit� neskaityt� lai�k�"
+
+#: mail/mail-callbacks.c:2373
+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:2129
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8922,11 +11048,7 @@ msgstr ""
 "\n"
 "Tikrai i�trinti tuos lai�kus?"
 
-#: mail/mail-callbacks.c:2136
-msgid "Do not ask me again."
-msgstr "Kit� kart� nebeklausti."
-
-#: mail/mail-callbacks.c:2244
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8935,19 +11057,28 @@ msgstr ""
 "Klaida, �keliant filtro informacij�:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2256
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtrai"
 
-#: mail/mail-callbacks.c:2319
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Gaunamas lai�kas %d i� %d"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Spausdinti lai�k�"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2863
+msgid "US-Letter"
+msgstr ""
+
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Nepavyko atspausdinti lai�ko"
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, 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?"
@@ -9002,16 +11133,34 @@ msgstr ""
 "�emiau esan�iame laukelyje. �is pavadinimas bus naudojamas tik vaizdavimui."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution s�skait� pad�j�jas"
 
-#: mail/mail-config.c:326
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "S�skaita"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Dirbama"
 
-#: mail/mail-config.c:1859
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togas"
+
+#. blue
+#: mail/mail-config.c:78 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"
@@ -9019,88 +11168,154 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, fuzzy, c-format
-msgid "%s: Inbox"
-msgstr "Gauti lai�kai"
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Tikrinama paslauga"
 
-#: mail/mail-config.c:2183 mail/mail-config.c:2187
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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
-msgid " _Check for supported types "
-msgstr " _Patikrinti, kokie tipai palaikomi"
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " spalva"
+#, 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
+#, fuzzy
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
-msgid "Account"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
 msgstr "S�skaita"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "S�skaitos informacija"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "S�skaitos tvarkymas"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "S�skaitos"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Nutraukti veiksm�"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:12
+msgid "Afrikaans"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: 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:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Prisegti byl� prie �io lai�ko"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priedas"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentikacija"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "_Automati�kai tikrinti pa�t� kas"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Ne�inoma koduot�: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_U�daryti"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Tikrinama, ar yra nauj� lai�k�"
 
-#: mail/mail-config.glade.h:14
-msgid "Composer"
-msgstr "Ra�ykl�"
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Composing Messages"
+msgstr "Sukurti lai�k�"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfig�ravimas"
 
-#: mail/mail-config.glade.h:16
-msgid "Confirm when Expunging a folder"
-msgstr "Patvirtinti aplank� i�valym�"
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9115,230 +11330,370 @@ msgstr ""
 "\n"
 "Paspausk �Baigti�, kad i�saugotum nuostatas."
 
-#: mail/mail-config.glade.h:23
+#: 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:24
-msgid "Default Forward style is: "
-msgstr "�prastas persiuntimo b�das yra: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "�p_rastas"
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "�prasta koduot�: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Gaunamas pa�tas"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr "Vaizdavimas"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Negaliu atidaryti lai�ko"
 
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Baigta"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Juodra��iai"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "_Juodra��i� aplankas:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "�ju_ngti"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Taisyti..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
-msgstr "�jungta"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Ryt�"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Pa�to s�skaita"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "El. pa�to adresas:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "_I�tu�tinti �iuk�li� aplankus i�einant"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "�vykdyti veiksmus"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "baigiasi su"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "S�skaitos savyb�s"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Persi�sti lai�kai"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
-msgid "HTML signature file:"
-msgstr "HTML para�o byla:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Pary�kinti citatas su"
+
+#: mail/mail-config.glade.h:59
+msgid "Hulu"
+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 "Asmenyb�"
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr "HTML lai�kuose"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Viduje"
 
-#: 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 "I�saugoti ir u�daryti"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "�kelt_i paveiksl�lius"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Pa�to nustatymas"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Pa�to d��ut�s vieta"
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
-msgstr "Pa_daryti �i� s�skait� �prastine"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Lai�ko antra�t�"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_Lai�ko rodymas"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikronezija"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP serveris:"
 
-#: mail/mail-config.glade.h:46
-msgid "News"
-msgstr "Naujienos"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "Pa�to nustatymas"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Serveriai"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Neb�tina informacija"
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organi_zacija:"
+
+#: mail/mail-config.glade.h:83
+msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Pasirink spalv�"
 
-#: 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 "Paklausti, kai siun�iamas HTML lai�kas kontaktams, kurie j� nenori"
+#: mail/mail-config.glade.h:88
+#, 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:56
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Paklausti prie� siun�iant lai�kus su _tu��ia tema"
+#: mail/mail-config.glade.h:89
+#, 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 "Paklausti prie� siun�iant lai�kus vien tik su _Bcc gav�jais"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Spausdinti pa�ym�tus kontaktus"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Negaliu atidaryti lai�ko"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Cituojant"
 
-#: mail/mail-config.glade.h:60
+#: 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�"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
-msgid "Receiving Email"
-msgstr "Pa�to gavimas"
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Atsakyti-kam:"
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+msgid "Receiving Email"
 msgstr "Pa�to gavimas"
 
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Gavimo nuostatos"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Prisiminti �� slapta�od�"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "B�tina informacija"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+msgstr "Saugumas"
+
+#: mail/mail-config.glade.h:104
+msgid "Same as text"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
-msgid "Security"
-msgstr "Saugumas"
+#: mail/mail-config.glade.h:105
+msgid "Secure MIME (S/MIME)"
+msgstr ""
+
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
-msgstr "Pasirink Filtro log'o byl�..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
 #, fuzzy
-msgid "Select PGP binary"
+msgid "Select PGP program"
 msgstr "Pasirink PGP"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Pa�to siuntimas"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Para�o byla:"
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
-msgstr "Pa�to siuntimas"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "I�trinti visk�, i�skyrus para��"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Si�sti lai�kai"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "Pa�to siuntimas"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "I�si�st� _lai�k� aplankas:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "I�si�sti lai�kai ir juodra��iai"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris reikalauja autentikacijos"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Serverio nustatymas"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "Serverio _tipas:"
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
-msgstr "Para�o byla:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Trump�s"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "I�saugoti para��"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "�altinis"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "�altinio informacija"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "�altiniai"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "Stiliaus vardas:"
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
-msgstr "Ypatingi aplankai"
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Standartin� Unix mbox"
 
-#: mail/mail-config.glade.h:86
-msgid "Use s_ecure connection (SSL)"
-msgstr "Naudoti s_augi� jungt� (SSL)"
+#: mail/mail-config.glade.h:128
+#, fuzzy
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+"Pasirink pavadinim�, kuriuo nor�tum vadinti �iuos serverius. Pavyzd�iui, "
+"�Namai� ar �Darbas�."
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "_HTML para�as:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Kintamos krypties"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9348,127 +11703,216 @@ msgstr ""
 "\n"
 "Spausk �Pirmyn�, kad prad�tum."
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Ryt�"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "Vis_ada �kelti paveiksl�lius i� tinklo"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:141
 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:93
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Autentikacijos tipas: "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "_Autentikacijos tipas: "
+
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "_Automati�kai tikrinti pa�t� kas"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
-msgid "_Drafts folder:"
-msgstr "_Juodra��i� aplankas:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
-msgstr "_El. pa�to adresas:"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Patvirtinti aplank� i�valym�"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
-msgstr "_I�tu�tinti �iuk�li� aplankus i�einant"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "�p_rastas"
 
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:151
+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
+#, fuzzy
+msgid "_Filename:"
+msgstr "Bylos vardas:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Persi�sti kaip"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "_Pilnas vardas:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:159
+#, 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:103
-msgid "_Highlight citations with"
-msgstr "_Pary�kinti citatas su"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Asmenyb�"
 
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
-msgstr "_Hostas:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Kalba"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 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:106
-msgid "_Log filter actions to:"
-msgstr "_Log'inti filtro veiksmus �:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Pa_daryti �i� s�skait� �prastine"
 
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_Pa�ym�ti lai�kus skaitytais po"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Vardas:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_Niekada ne�kelti paveiksl�li� i� tinklo"
 
-#: mail/mail-config.glade.h:110
-msgid "_Organization:"
-msgstr "_Organizacija:"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP u��ifruoti"
 
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
-msgstr "_Kelias:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
-msgstr "_Prisiminti �� slapta�od�"
+#: mail/mail-config.glade.h:172
+#, 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:114
-msgid "_Send mail in HTML format by default."
-msgstr "�prastai si�sti lai�kus _HTML formatu."
+#: mail/mail-config.glade.h:173
+#, 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:115
-msgid "_Server Type: "
-msgstr "_Serverio tipas:"
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Radio"
 
-#: mail/mail-config.glade.h:116
-msgid "_Signature file:"
-msgstr "_Para�o byla:"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Pa�to gavimas"
 
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
-msgstr "_Vartotojo vardas:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Atsakyti visiems"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Saugumas"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Saugumas"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Pa�to siuntimas"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Rodyti laik� kaip"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Kintamos krypties"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_kas"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " spalva"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "apra�ymas"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr "placeholder"
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr "sekund�i�."
-
 #: mail/mail-crypto.c:59
 #, fuzzy
 msgid "Could not create a PGP signature context."
@@ -9513,152 +11957,140 @@ msgstr "Negal�jau sukurti ra�ykl�s lango."
 msgid "Could not create a S/MIME decode context."
 msgstr "Negal�jau sukurti ra�ykl�s lango."
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "I�saugoti pried�"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Negal�jau sukurti laikino katalogo: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "I�saugoti � disk�..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "�i�r�ti viduje"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Atidaryti su %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "�i�r�ti viduje (per %s)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Sl�pti"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "I�orin� �i�rykl�"
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "�keliamas lai�ko turinys"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Nuorod� atidaryti nar�ykl�je"
 
-#: mail/mail-display.c:1594
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Kopijuoti nuorodos adres�"
 
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "I�saugoti nuorod� kaip (FIXME)"
 
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "I�saugoti paveiksl�l� kaip..."
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s priedas"
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Negal�jau i�nagrin�ti MIME lai�ko. Rodomas �altinis."
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Blogas adresas"
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Nuo"
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Atsakyti-kam"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Kam"
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:915
 #, 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:1836
-msgid "Evolution does not recognize this type of signed message."
+msgid "Mailer"
 msgstr ""
+"\n"
+"Pa�to programa: "
 
-#: mail/mail-format.c:1844
-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:1852
-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:2068
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Rodykl� � FTP svetain� (%s)"
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2120
 #, 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:2087
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Rodykl� � vietin� byl� (%s)"
 
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Rodykl� � nutolusius duomenis (%s)"
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Rodykl� � ne�inomus i�orinius duomenis (�%s� tipo)"
 
-#: mail/mail-format.c:2129
+#: mail/mail-format.c:2167
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota i�orinio k�no dalis."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "I� naujo konfig�ruojamas aplankas"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9667,29 +12099,29 @@ msgstr ""
 "Negaliu i�saugoti metainfo. Tikriausiai tau daugiau\n"
 "nebepavyks atidaryti �io aplanko: %s"
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Negal�jau i�trinti aplanko:\n"
 "%s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Kei�iamas aplanko �%s� formatas � �%s�"
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, 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:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9697,11 +12129,11 @@ msgstr ""
 "Jei tu nebegali daugiau atidaryti �ios pa�to\n"
 "d��ut�s, tau teks sutaisyti j� rankut�mis."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr "Tu negali pakeisti nevietinio aplanko formato."
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "V�l konfig�ruoti %s"
@@ -9728,117 +12160,112 @@ msgstr ""
 msgid "Working"
 msgstr "Dirbama"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtruojamas aplankas"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Gaunamas pa�tas"
 
-#: 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 "Ta�iau lai�kas buvo s�kmingai i�si�stas."
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Siun�iamas �%s�"
 
-#: mail/mail-ops.c:677
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Siun�iamas lai�kas %d i� %d"
 
-#: mail/mail-ops.c:696
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %d"
 
-#: 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 "U�baigta."
 
-#: mail/mail-ops.c:791
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Lai�kas i�saugomas � aplank�"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Lai�kai perkeliami � %s"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Lai�kai kopijuojami � %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Perkeliama"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopijuojama"
 
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "�iuk�l�s"
-
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Persi�sti lai�kai"
 
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Atidaroma saugykla %s"
 
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "�ra�omas aplankas '%s'"
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Atnaujinamas aplankas"
 
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "I�valomas aplankas"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Gaunamas lai�kas %s"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Gaunami %d lai�kai"
 
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "I�saugomi %d lai�kai"
 
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9847,7 +12274,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9856,11 +12283,11 @@ msgstr ""
 "Klaida i�saugant lai�kus �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "I�saugomas priedas"
 
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9869,22 +12296,27 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Negal�jau �ra�yti duomen�: %s"
 
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atsijungiama nuo %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "V�l jungiamasi prie %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Ie�koti"
 
@@ -9924,64 +12356,88 @@ msgstr "Tinka:"
 msgid "Cancelling..."
 msgstr "Nutraukiama..."
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveris: %s, tipas: %s"
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kelias: %s, tipas: %s"
 
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Tipas: %s"
 
-#: mail/mail-send-recv.c:286
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Siun�iamas ir gaunamas pa�tas"
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Nutraukti visus"
 
-#: mail/mail-send-recv.c:348
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Atnaujinama..."
 
-#: 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 "Laukiama..."
 
-#: mail/mail-send-recv.c:533
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Nutraukta."
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Vartotojas nutrauk� veiksm�."
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr "�vesk %s slapta�od�"
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 msgid "Enter Password"
 msgstr "�vesk slapta�od�"
 
-#: mail/mail-tools.c:255
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Negal�jau i�saugoti para�o bylos."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "I�saugoti para��"
+
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"�is para�as buvo pakeistas, ta�iau nei�saugotas.\n"
+"\n"
+"Ar nor�tum i�saugoti pakeitimus?"
+
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "Para�o byla:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Persi�stas lai�kas - %s"
 
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Persi�stas lai�kas"
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Persi�stas lai�kas"
 
@@ -10008,104 +12464,162 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "vAplankai"
+#: mail/mail-vfolder.c:785
+#, fuzzy
+msgid "vFolders"
+msgstr "Aplankai"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:825
 msgid "Edit VFolder"
 msgstr "Keisti vAplank�"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:841
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Bandoma keisti neegzistuojant� vAplank� '%s'."
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:895
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(N�ra temos)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Lai�kas"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Matytas"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Atsakytas"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Keletas nematyt� lai�k�"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Keletas lai�k�"
 
-#: mail/message-list.c:647
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "�emiausias"
 
-#: mail/message-list.c:648
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "�emesnis"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Auk�tesnis"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Auk��iausias"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "�iandien %H:%M"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %H:%M"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Generuojamas lai�k� s�ra�as"
 
-#: mail/message-list.etspec.h:2
-msgid "Flagged"
+#: mail/message-list.etspec.h:3
+msgid "Due By"
 msgstr ""
 
 #: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "B�sena"
+
+#: mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Gautas"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Dydis"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "Atsakiklis"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Eiti pirmyn"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "�altinio informacija"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Persi�sti"
+
+#: 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 "Atsakyti"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Atsakyti visiems"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Per�i�ra"
+
+#: mail/message-tag-followup.c:315
+msgid "Flag to Follow Up"
+msgstr ""
+
 #: mail/subscribe-dialog.c:219
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -10127,7 +12641,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Atsisakoma aplanko �%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 "Aplankas"
 
@@ -10172,86 +12686,10943 @@ msgid "_Unsubscribe"
 msgstr "_Atsisakyti"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "Aplankas, kuriame yra Evolution ap�valga"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolution pa�to ra�ykl�."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Testinio komponento gamykla."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Evolution pa�to komponento gamykla."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Kalendoriaus nuostatos"
+
+#: 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/component-factory.c:44
-msgid "Folder containing the Evolution Summary"
-msgstr "Aplankas, kuriame yra Evolution ap�valga"
+#: my-evolution/Locations.h:1
+#, fuzzy
+msgid "Aarhus"
+msgstr "Persp�jimai"
 
-#: my-evolution/component-factory.c:153
+#: my-evolution/Locations.h:2
 #, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Negaliu inicializuoti Evolution pa�to komponento."
+msgid "Abakan"
+msgstr "Azerbaid�anas"
+
+#: my-evolution/Locations.h:3
+msgid "Abbotsford"
+msgstr ""
+
+#: my-evolution/Locations.h:4
+#, fuzzy
+msgid "Aberdeen"
+msgstr "Dalyvis"
+
+#: my-evolution/Locations.h:5
+msgid "Abha"
+msgstr ""
+
+#: my-evolution/Locations.h:6
+#, fuzzy
+msgid "Abilene"
+msgstr "Mobilus telefonas"
+
+#: 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 "Nikaragva"
+
+#: my-evolution/Locations.h:13
+msgid "Adak"
+msgstr ""
+
+#: my-evolution/Locations.h:14
+#, fuzzy
+msgid "Adana"
+msgstr "Albanija"
+
+#: my-evolution/Locations.h:15
+msgid "Adana/Incirlik"
+msgstr ""
+
+#: my-evolution/Locations.h:16
+msgid "Adelaide"
+msgstr ""
+
+#: my-evolution/Locations.h:17
+#, fuzzy
+msgid "Aden"
+msgstr "�vedija"
+
+#: my-evolution/Locations.h:18
+#, fuzzy
+msgid "Adrar"
+msgstr "Andora"
+
+#: my-evolution/Locations.h:19
+msgid "Aeroparque"
+msgstr ""
+
+#: my-evolution/Locations.h:20
+msgid "Aeropuerto del Norte"
+msgstr ""
+
+#: my-evolution/Locations.h:21
+#, fuzzy
+msgid "Afonsos"
+msgstr "Anoniminis"
+
+#: my-evolution/Locations.h:22
+#, fuzzy
+msgid "Africa"
+msgstr "Piet� Afrikos respublika"
+
+#: my-evolution/Locations.h:23
+msgid "Afyon"
+msgstr ""
+
+#: my-evolution/Locations.h:24
+#, fuzzy
+msgid "Agen"
+msgstr "Argentina"
+
+#: my-evolution/Locations.h:25
+#, fuzzy
+msgid "Aguascaliantes"
+msgstr "Australija"
+
+#: 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 "Albanija"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:39
+#, fuzzy
+msgid "Alamosa"
+msgstr "Persp�jimai"
+
+#: my-evolution/Locations.h:40
+#, fuzzy
+msgid "Alaska"
+msgstr "Persp�jimai"
+
+#: my-evolution/Locations.h:41
+msgid "Al Baha"
+msgstr ""
+
+#: my-evolution/Locations.h:43
+#, fuzzy
+msgid "Albany"
+msgstr "Albanija"
+
+#: my-evolution/Locations.h:44
+#, fuzzy
+msgid "Albenga"
+msgstr "Albanija"
+
+#: my-evolution/Locations.h:45
+#, fuzzy
+msgid "Alberta"
+msgstr "Al�yras"
+
+#: my-evolution/Locations.h:46
+msgid "Alborg"
+msgstr ""
+
+#: my-evolution/Locations.h:47
+msgid "Albuquerque"
+msgstr ""
+
+#: my-evolution/Locations.h:48
+#, fuzzy
+msgid "Alderney"
+msgstr "Aplanko pavadinimas:"
+
+#: my-evolution/Locations.h:49
+#, fuzzy
+msgid "Alesund"
+msgstr "Dar kart� si�sti"
+
+#: my-evolution/Locations.h:50
+#, fuzzy
+msgid "Alexandria"
+msgstr "Albanija"
+
+#: 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 "Al�yras"
+
+#: my-evolution/Locations.h:56
+#, fuzzy
+msgid "Algona"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:57
+#, fuzzy
+msgid "Alicante"
+msgstr "Su�adinti"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:62
+#, fuzzy
+msgid "Alliance"
+msgstr "I�samiai"
+
+#: my-evolution/Locations.h:63
+#, fuzzy
+msgid "Alma"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:64
+#, fuzzy
+msgid "Almeria"
+msgstr "Al�yras"
+
+#: my-evolution/Locations.h:65
+#, fuzzy
+msgid "Alpena"
+msgstr "Albanija"
+
+#: my-evolution/Locations.h:66
+msgid "Al Qaysumah"
+msgstr ""
+
+#: my-evolution/Locations.h:67
+#, fuzzy
+msgid "Alta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:68
+#, fuzzy
+msgid "Altamira"
+msgstr "Albanija"
+
+#: my-evolution/Locations.h:69
+#, fuzzy
+msgid "Alton"
+msgstr "_Veiksmai"
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr ""
+
+#: my-evolution/Locations.h:71
+#, fuzzy
+msgid "Alturas"
+msgstr "Persp�jimai"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:75
+#, fuzzy
+msgid "Amarillo"
+msgstr "El. pa�tas"
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr ""
+
+#: my-evolution/Locations.h:77
+#, fuzzy
+msgid "Ambler"
+msgstr "Narys"
+
+#: my-evolution/Locations.h:78
+#, fuzzy
+msgid "Amelia"
+msgstr "Arm�nija"
+
+#: my-evolution/Locations.h:79
+#, fuzzy
+msgid "Amendola"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:80
+#, fuzzy
+msgid "Ames"
+msgstr "mylios"
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr ""
+
+#: my-evolution/Locations.h:82
+#, fuzzy
+msgid "Amsterdam"
+msgstr "Austrija"
+
+#: my-evolution/Locations.h:83
+#, fuzzy
+msgid "Anadyr"
+msgstr "Andora"
+
+#: my-evolution/Locations.h:84
+msgid "Anaktuvuk"
+msgstr ""
+
+#: my-evolution/Locations.h:85
+#, fuzzy
+msgid "Anapa"
+msgstr "Japonija"
+
+#: my-evolution/Locations.h:86
+#, fuzzy
+msgid "Anchorage"
+msgstr "Andora"
+
+#: my-evolution/Locations.h:87
+msgid "Anchorage - Elmendorf AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:88
+#, fuzzy
+msgid "Ancona"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:89
+msgid "Andahuayla"
+msgstr ""
+
+#: my-evolution/Locations.h:90
+#, fuzzy
+msgid "Anderson"
+msgstr "Perk�nija"
+
+#: my-evolution/Locations.h:91
+#, fuzzy
+msgid "Andoya"
+msgstr "Andora"
+
+#: my-evolution/Locations.h:92
+#, fuzzy
+msgid "Andravida"
+msgstr "Individas"
+
+#: 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 "Albanija"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:101
+#, fuzzy
+msgid "Anniston"
+msgstr "Afganistanas"
+
+#: my-evolution/Locations.h:102
+#, fuzzy
+msgid "Antalya"
+msgstr "Italija"
+
+#: my-evolution/Locations.h:103
+#, fuzzy
+msgid "Antartica"
+msgstr "Antarktika"
+
+#: my-evolution/Locations.h:104
+#, fuzzy
+msgid "Antigo"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:105
+#, fuzzy
+msgid "Antigua"
+msgstr "Argentina"
+
+#: my-evolution/Locations.h:106
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: my-evolution/Locations.h:107
+#, fuzzy
+msgid "Antofagasta"
+msgstr "Afganistanas"
+
+#: 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 "placeholder"
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr ""
+
+#: my-evolution/Locations.h:112
+msgid "Aquadilla"
+msgstr ""
+
+#: my-evolution/Locations.h:113
+msgid "Aracaju"
+msgstr ""
+
+#: my-evolution/Locations.h:114
+msgid "Arad"
+msgstr ""
+
+#: my-evolution/Locations.h:115
+#, fuzzy
+msgid "Arar"
+msgstr "Persp�jimai"
+
+#: my-evolution/Locations.h:116
+#, fuzzy
+msgid "Araxos"
+msgstr "Laosas"
+
+#: my-evolution/Locations.h:117
+#, fuzzy
+msgid "Arcata"
+msgstr "Antarktika"
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr ""
+
+#: my-evolution/Locations.h:119
+#, fuzzy
+msgid "Arequipa"
+msgstr "Arm�nija"
+
+#: my-evolution/Locations.h:121
+#, fuzzy
+msgid "Arica"
+msgstr "Al�yras"
+
+#: my-evolution/Locations.h:122
+#, fuzzy
+msgid "Arizona"
+msgstr "Argentina"
+
+#: my-evolution/Locations.h:123
+msgid "Arkansas"
+msgstr ""
+
+#: my-evolution/Locations.h:124
+msgid "Arkhangelsk"
+msgstr ""
+
+#: my-evolution/Locations.h:125
+#, fuzzy
+msgid "Arlington"
+msgstr "Orientacija"
+
+#: my-evolution/Locations.h:126
+#, fuzzy
+msgid "Artigas"
+msgstr "Argentina"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:131
+#, fuzzy
+msgid "Ashfield"
+msgstr "Priskirtas"
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:133
+#, fuzzy
+msgid "Ashland"
+msgstr "Tailandas"
+
+#: my-evolution/Locations.h:134
+#, fuzzy
+msgid "Asia"
+msgstr "Austrija"
+
+#: my-evolution/Locations.h:135
+#, fuzzy
+msgid "Aspen"
+msgstr "Atidaryti"
+
+#: my-evolution/Locations.h:136
+#, fuzzy
+msgid "Asswan"
+msgstr "Asistento"
+
+#: my-evolution/Locations.h:137
+#, fuzzy
+msgid "Astoria"
+msgstr "Austrija"
+
+#: my-evolution/Locations.h:138
+#, fuzzy
+msgid "Astrakhan"
+msgstr "Australija"
+
+#: my-evolution/Locations.h:139
+#, fuzzy
+msgid "Asturias"
+msgstr "Austrija"
+
+#: my-evolution/Locations.h:140
+#, fuzzy
+msgid "Asuncion"
+msgstr "Autentikacija"
+
+#: my-evolution/Locations.h:141
+#, fuzzy
+msgid "Athens"
+msgstr "Priedai"
+
+#: my-evolution/Locations.h:142
+#, fuzzy
+msgid "Athinai"
+msgstr "Kinija"
+
+#: my-evolution/Locations.h:143
+#, fuzzy
+msgid "Atlanta"
+msgstr "Albanija"
+
+#: my-evolution/Locations.h:144
+#, fuzzy
+msgid "Atlantic"
+msgstr "Automati�kas"
+
+#: 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 "Islandija"
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:150
+#, fuzzy
+msgid "Augusta"
+msgstr "Rugpj�tis"
+
+#: my-evolution/Locations.h:151
+#, fuzzy
+msgid "Aurora"
+msgstr "Andora"
+
+#: my-evolution/Locations.h:152
+#, fuzzy
+msgid "Austin"
+msgstr "Austrija"
+
+#: my-evolution/Locations.h:153
+#, fuzzy
+msgid "Australasia"
+msgstr "Australija"
+
+#: my-evolution/Locations.h:156
+msgid "Avalon"
+msgstr ""
+
+#: my-evolution/Locations.h:157
+msgid "Aviano"
+msgstr ""
+
+#: my-evolution/Locations.h:158
+msgid "Ayacucho"
+msgstr ""
+
+#: my-evolution/Locations.h:159
+#, fuzzy
+msgid "Bage"
+msgstr "Base"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:170
+#, fuzzy
+msgid "Ball Mountain"
+msgstr "El. pa�tas turi savyje"
+
+#: my-evolution/Locations.h:171
+#, fuzzy
+msgid "Baltimore"
+msgstr "Balt�"
+
+#: my-evolution/Locations.h:172
+msgid "Baltimore-Glen Burnie"
+msgstr ""
+
+#: my-evolution/Locations.h:173
+#, fuzzy
+msgid "Banak"
+msgstr "Botsvana"
+
+#: my-evolution/Locations.h:174
+msgid "Bandarabbass"
+msgstr ""
+
+#: my-evolution/Locations.h:175
+#, fuzzy
+msgid "Bangor"
+msgstr " "
+
+#: my-evolution/Locations.h:176
+msgid "Baracoa"
+msgstr ""
+
+#: my-evolution/Locations.h:177
+msgid "Barbers Point"
+msgstr ""
+
+#: my-evolution/Locations.h:178
+#, fuzzy
+msgid "Barcelona"
+msgstr "Makedonija"
+
+#: my-evolution/Locations.h:179
+#, fuzzy
+msgid "Bardufoss"
+msgstr "Gudija"
+
+#: my-evolution/Locations.h:180
+msgid "Bar Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:181
+#, fuzzy
+msgid "Bari"
+msgstr "Bahreinas"
+
+#: my-evolution/Locations.h:182
+msgid "Bariloche"
+msgstr ""
+
+#: my-evolution/Locations.h:183
+#, fuzzy
+msgid "Barinas"
+msgstr "Bahreinas"
+
+#: my-evolution/Locations.h:184
+msgid "Barking Sand"
+msgstr ""
+
+#: my-evolution/Locations.h:185
+#, fuzzy
+msgid "Barksdale"
+msgstr "Base"
+
+#: my-evolution/Locations.h:186
+#, fuzzy
+msgid "Barnaul"
+msgstr "Brazilija"
+
+#: 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 "Kal�d� sala"
+
+#: 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 "Esm�"
+
+#: my-evolution/Locations.h:194
+msgid "Batesville"
+msgstr ""
+
+#: my-evolution/Locations.h:195
+#, fuzzy
+msgid "Batman"
+msgstr "Butanas"
+
+#: my-evolution/Locations.h:196
+msgid "Baton Rouge"
+msgstr ""
+
+#: my-evolution/Locations.h:197
+msgid "Battle Creek"
+msgstr ""
+
+#: my-evolution/Locations.h:198
+#, fuzzy
+msgid "Battle Mountain"
+msgstr "Vardas turi savyje"
+
+#: my-evolution/Locations.h:199
+#, fuzzy
+msgid "Bauru"
+msgstr "Gudija"
+
+#: my-evolution/Locations.h:200
+#, fuzzy
+msgid "Bayamo"
+msgstr "Bahamai"
+
+#: my-evolution/Locations.h:201
+msgid "Bayreuth"
+msgstr ""
+
+#: my-evolution/Locations.h:202
+#, fuzzy
+msgid "Beatrice"
+msgstr "Balt�"
+
+#: my-evolution/Locations.h:203
+msgid "Beaufort"
+msgstr ""
+
+#: my-evolution/Locations.h:204
+#, fuzzy
+msgid "Beaumont"
+msgstr "m�nesis"
+
+#: 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 "Bahreinas"
+
+#: my-evolution/Locations.h:208
+#, fuzzy
+msgid "Beckley"
+msgstr "Belizas"
+
+#: my-evolution/Locations.h:209
+#, fuzzy
+msgid "Bedford"
+msgstr "prie�"
+
+#: my-evolution/Locations.h:210
+#, fuzzy
+msgid "Beijing"
+msgstr "Beninas"
+
+#: my-evolution/Locations.h:211
+#, fuzzy
+msgid "Beirut"
+msgstr "Gudija"
+
+#: my-evolution/Locations.h:212
+msgid "Beja"
+msgstr ""
+
+#: my-evolution/Locations.h:213
+#, fuzzy
+msgid "Belem"
+msgstr "Belizas"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:219
+#, fuzzy
+msgid "Belleville"
+msgstr "Belizas"
+
+#: my-evolution/Locations.h:220
+msgid "Bellingham"
+msgstr ""
+
+#: my-evolution/Locations.h:221
+msgid "Belmar-Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:222
+#, fuzzy
+msgid "Belo Horizonte"
+msgstr "Belizas"
+
+#: 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 "Venesuela"
+
+#: my-evolution/Locations.h:226
+#, fuzzy
+msgid "Benina"
+msgstr "Beninas"
+
+#: 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 "I� naujo �kelti"
+
+#: my-evolution/Locations.h:230
+msgid "Bergamo"
+msgstr ""
+
+#: my-evolution/Locations.h:231
+#, fuzzy
+msgid "Bergen"
+msgstr "Matytas"
+
+#: my-evolution/Locations.h:232
+msgid "Bergstrom AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:233
+msgid "Berlevag"
+msgstr ""
+
+#: my-evolution/Locations.h:234
+#, fuzzy
+msgid "Berlin"
+msgstr "Beninas"
+
+#: my-evolution/Locations.h:235
+msgid "Berlin-Tegel"
+msgstr ""
+
+#: my-evolution/Locations.h:236
+msgid "Berlin-Tempelhof"
+msgstr ""
+
+#: my-evolution/Locations.h:237
+#, fuzzy
+msgid "Bern"
+msgstr "Beninas"
+
+#: my-evolution/Locations.h:238
+#, fuzzy
+msgid "Bethel"
+msgstr "Orai"
+
+#: my-evolution/Locations.h:239
+msgid "Bethlehem Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:240
+#, fuzzy
+msgid "Bettles"
+msgstr "Belizas"
+
+#: my-evolution/Locations.h:241
+#, fuzzy
+msgid "Beverly"
+msgstr "_kas"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:245
+#, fuzzy
+msgid "Big Piney"
+msgstr "Pine"
+
+#: 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 "Konferencija"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:257
+#, fuzzy
+msgid "Blanding"
+msgstr "Pustoniai"
+
+#: my-evolution/Locations.h:258
+#, fuzzy
+msgid "Block Island"
+msgstr "Norfolko sala"
+
+#: my-evolution/Locations.h:259
+msgid "Bloemfontein J. B. M. Hertzog "
+msgstr ""
+
+#: my-evolution/Locations.h:260
+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 ""
+
+#: my-evolution/Locations.h:267
+#, fuzzy
+msgid "Bodo"
+msgstr "Tekstas"
+
+#: my-evolution/Locations.h:268
+msgid "Bogota/Eldorado"
+msgstr ""
+
+#: my-evolution/Locations.h:269
+#, fuzzy
+msgid "Boise"
+msgstr "Base"
+
+#: my-evolution/Locations.h:271
+msgid "Bologna"
+msgstr ""
+
+#: my-evolution/Locations.h:272
+#, fuzzy
+msgid "Bolzano"
+msgstr "Lenkija"
+
+#: my-evolution/Locations.h:273
+msgid "Bombay/Santacruz"
+msgstr ""
+
+#: my-evolution/Locations.h:274
+#, fuzzy
+msgid "Boone"
+msgstr "Joks"
+
+#: my-evolution/Locations.h:275
+msgid "Bordeaux"
+msgstr ""
+
+#: my-evolution/Locations.h:276
+#, fuzzy
+msgid "Borger"
+msgstr "am�inai"
+
+#: my-evolution/Locations.h:277
+msgid "Bornholm"
+msgstr ""
+
+#: my-evolution/Locations.h:278
+msgid "Boscombe Down"
+msgstr ""
+
+#: my-evolution/Locations.h:279
+msgid "Bosnia-Herzegovina"
+msgstr ""
+
+#: my-evolution/Locations.h:280
+#, fuzzy
+msgid "Boston"
+msgstr "Estija"
+
+#: my-evolution/Locations.h:281
+#, fuzzy
+msgid "Boulmer"
+msgstr "Aplankas"
+
+#: my-evolution/Locations.h:282
+#, fuzzy
+msgid "Bourges"
+msgstr "�altiniai"
+
+#: my-evolution/Locations.h:283
+msgid "Bournemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:284
+msgid "Bowling Green"
+msgstr ""
+
+#: my-evolution/Locations.h:285
+#, fuzzy
+msgid "Bozeman"
+msgstr "Kor�jie�i�"
+
+#: my-evolution/Locations.h:286
+msgid "Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:287
+msgid "Bradshaw Field"
+msgstr ""
+
+#: my-evolution/Locations.h:288
+#, fuzzy
+msgid "Brainerd"
+msgstr "Bahreinas"
+
+#: my-evolution/Locations.h:289
+#, fuzzy
+msgid "Brasilia"
+msgstr "Brazilija"
+
+#: my-evolution/Locations.h:290
+msgid "Brasschaat"
+msgstr ""
+
+#: my-evolution/Locations.h:291
+#, fuzzy
+msgid "Bratislava"
+msgstr "Brazilija"
+
+#: my-evolution/Locations.h:292
+#, fuzzy
+msgid "Bratsk"
+msgstr "Juodra��iai"
+
+#: my-evolution/Locations.h:293
+msgid "Braunschweig"
+msgstr ""
+
+#: my-evolution/Locations.h:295
+#, fuzzy
+msgid "Bremen"
+msgstr "Jemenas"
+
+#: my-evolution/Locations.h:296
+msgid "Bremerton"
+msgstr ""
+
+#: my-evolution/Locations.h:297
+#, fuzzy
+msgid "Brest"
+msgstr "Bandyti"
+
+#: my-evolution/Locations.h:298
+msgid "Bridgeport"
+msgstr ""
+
+#: my-evolution/Locations.h:299
+#, fuzzy
+msgid "Brindisi"
+msgstr "Burundis"
+
+#: my-evolution/Locations.h:300
+msgid "Brisbane"
+msgstr ""
+
+#: my-evolution/Locations.h:301
+#, fuzzy
+msgid "Bristol"
+msgstr "Brazilija"
+
+#: 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 "Darb"
+
+#: my-evolution/Locations.h:305
+msgid "Broken Bow"
+msgstr ""
+
+#: my-evolution/Locations.h:306
+msgid "Bronnoysund"
+msgstr ""
+
+#: my-evolution/Locations.h:307
+#, fuzzy
+msgid "Brookings"
+msgstr "Dirbama"
+
+#: my-evolution/Locations.h:308
+msgid "Brooksville"
+msgstr ""
+
+#: my-evolution/Locations.h:309
+#, fuzzy
+msgid "Broome"
+msgstr "Apa�ioje:"
+
+#: my-evolution/Locations.h:310
+msgid "Brownsville"
+msgstr ""
+
+#: my-evolution/Locations.h:311
+#, fuzzy
+msgid "Brunswick"
+msgstr "Burundis"
+
+#: my-evolution/Locations.h:312
+msgid "Brussels-National Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:313
+msgid "Bryansk"
+msgstr ""
+
+#: my-evolution/Locations.h:314
+#, fuzzy
+msgid "Bryce Canyon"
+msgstr "Pagal kompanij�"
+
+#: 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 "Butanas"
+
+#: my-evolution/Locations.h:323
+#, fuzzy
+msgid "Burgas"
+msgstr "Darb"
+
+#: my-evolution/Locations.h:324
+#, fuzzy
+msgid "Burley"
+msgstr "Turkija"
+
+#: my-evolution/Locations.h:325
+msgid "Burlington"
+msgstr ""
+
+#: my-evolution/Locations.h:326
+#, fuzzy
+msgid "Burnet"
+msgstr "Burundis"
+
+#: my-evolution/Locations.h:327
+#, fuzzy
+msgid "Burns"
+msgstr "Darb"
+
+#: my-evolution/Locations.h:328
+#, fuzzy
+msgid "Bursa"
+msgstr "Darb"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:332
+#, fuzzy
+msgid "Cagliari"
+msgstr "Kalendorius"
+
+#: my-evolution/Locations.h:333
+#, fuzzy
+msgid "Cairns"
+msgstr "Pirmininkas"
+
+#: my-evolution/Locations.h:334
+#, fuzzy
+msgid "Cairo"
+msgstr "Pirmininkas"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:338
+#, fuzzy
+msgid "Calgary"
+msgstr "Kalendorius"
+
+#: my-evolution/Locations.h:339
+msgid "Cali/Alfonso Bonillaaragon"
+msgstr ""
+
+#: my-evolution/Locations.h:340
+#, fuzzy
+msgid "Caliente"
+msgstr "Kalendorius"
+
+#: my-evolution/Locations.h:341
+#, fuzzy
+msgid "California"
+msgstr "Naujoji Kaledonija"
+
+#: my-evolution/Locations.h:342
+msgid "Calvi-Ste-Catherine"
+msgstr ""
+
+#: my-evolution/Locations.h:343
+#, fuzzy
+msgid "Camaguey"
+msgstr "Paragvajus"
+
+#: 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 "Kamer�nas"
+
+#: my-evolution/Locations.h:347
+#, fuzzy
+msgid "Camiri"
+msgstr "Pirmininkas"
+
+#: my-evolution/Locations.h:348
+#, fuzzy
+msgid "Campeche"
+msgstr "U�baigta"
+
+#: my-evolution/Locations.h:349
+#, fuzzy
+msgid "Campinas"
+msgstr "Kambod�a"
+
+#: my-evolution/Locations.h:350
+#, fuzzy
+msgid "Campo"
+msgstr "Komp"
+
+#: my-evolution/Locations.h:351
+#, fuzzy
+msgid "Campo Grande"
+msgstr "�aliasis ky�ulys"
+
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr ""
+
+#: my-evolution/Locations.h:353
+#, fuzzy
+msgid "Canaan"
+msgstr "Kanada"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:363
+#, fuzzy
+msgid "Cancun"
+msgstr "Nutraukti"
+
+#: my-evolution/Locations.h:364
+msgid "Cannes-Mandelieu"
+msgstr ""
+
+#: my-evolution/Locations.h:365
+#, fuzzy
+msgid "Cantwell"
+msgstr "Nutraukti"
+
+#: my-evolution/Locations.h:366
+#, fuzzy
+msgid "Cape Girardeau"
+msgstr "�aliasis ky�ulys"
+
+#: my-evolution/Locations.h:367
+#, fuzzy
+msgid "Cape Hatteras"
+msgstr "�aliasis ky�ulys"
+
+#: my-evolution/Locations.h:368
+#, fuzzy
+msgid "Cape Lisburne"
+msgstr "Popieriaus �altinis:"
+
+#: my-evolution/Locations.h:369
+#, fuzzy
+msgid "Cape Newenham"
+msgstr "�aliasis ky�ulys"
+
+#: 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 "�aliasis ky�ulys"
+
+#: my-evolution/Locations.h:374
+msgid "Caracas La Carlota"
+msgstr ""
+
+#: my-evolution/Locations.h:375
+msgid "Caracas Maiquetia"
+msgstr ""
+
+#: my-evolution/Locations.h:376
+#, fuzzy
+msgid "Caravelas"
+msgstr "At�aukti u�duot�"
+
+#: my-evolution/Locations.h:377
+#, fuzzy
+msgid "Carbondale"
+msgstr "Kambod�a"
+
+#: my-evolution/Locations.h:378
+#, fuzzy
+msgid "Cardiff"
+msgstr "Korteli� rodinys"
+
+#: my-evolution/Locations.h:379
+#, fuzzy
+msgid "Caribou"
+msgstr "Automobilinis"
+
+#: my-evolution/Locations.h:380
+#, fuzzy
+msgid "Carlisle"
+msgstr "Kintamos krypties"
+
+#: my-evolution/Locations.h:381
+#, fuzzy
+msgid "Carlsbad"
+msgstr "Atsakiklis"
+
+#: my-evolution/Locations.h:382
+#, fuzzy
+msgid "Carroll"
+msgstr "Automobilinis"
+
+#: my-evolution/Locations.h:383
+msgid "Cartagena/Rafael Nunez"
+msgstr ""
+
+#: my-evolution/Locations.h:384
+msgid "Casa Granda"
+msgstr ""
+
+#: my-evolution/Locations.h:385
+#, fuzzy
+msgid "Cascade"
+msgstr "Guls�ias lapas"
+
+#: my-evolution/Locations.h:386
+#, fuzzy
+msgid "Casper"
+msgstr "Popierius"
+
+#: my-evolution/Locations.h:387
+#, fuzzy
+msgid "Catacamas"
+msgstr "Bahamai"
+
+#: my-evolution/Locations.h:388
+#, fuzzy
+msgid "Catania"
+msgstr "Kroatija"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:393
+#, fuzzy
+msgid "Cedar City"
+msgstr "Giedras dangus"
+
+#: 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 "Al�yras"
+
+#: my-evolution/Locations.h:397
+msgid "Chacarita"
+msgstr ""
+
+#: my-evolution/Locations.h:398
+#, fuzzy
+msgid "Chadron"
+msgstr "�adas"
+
+#: my-evolution/Locations.h:399
+#, fuzzy
+msgid "Challis"
+msgstr "Pirmininkas"
+
+#: my-evolution/Locations.h:400
+#, fuzzy
+msgid "Chamberlain"
+msgstr "Kamer�nas"
+
+#: my-evolution/Locations.h:401
+#, fuzzy
+msgid "Chambery"
+msgstr "Kamer�nas"
+
+#: my-evolution/Locations.h:402
+#, fuzzy
+msgid "Champaign"
+msgstr "Kompanijos"
+
+#: my-evolution/Locations.h:403
+#, fuzzy
+msgid "Chandalar Lake"
+msgstr "Kalendoriaus �inut�"
+
+#: my-evolution/Locations.h:404
+#, fuzzy
+msgid "Chandler"
+msgstr "�adas"
+
+#: my-evolution/Locations.h:405
+#, fuzzy
+msgid "Chania"
+msgstr "Kinija"
+
+#: my-evolution/Locations.h:406
+#, fuzzy
+msgid "Chanute"
+msgstr "Nutraukti"
+
+#: my-evolution/Locations.h:407
+#, fuzzy
+msgid "Chariton"
+msgstr "Kamer�nas"
+
+#: my-evolution/Locations.h:408
+msgid "Charleroi-Brussels South"
+msgstr ""
+
+#: my-evolution/Locations.h:409
+msgid "Charles City"
+msgstr ""
+
+#: my-evolution/Locations.h:410
+#, fuzzy
+msgid "Charleston"
+msgstr "Pirmininkaujantys asmenys"
+
+#: my-evolution/Locations.h:411
+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 ""
+
+#: my-evolution/Locations.h:416
+#, fuzzy
+msgid "Cheju"
+msgstr "�il�"
+
+#: 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 "Liuksemburgas"
+
+#: my-evolution/Locations.h:420
+#, fuzzy
+msgid "Cherry Point"
+msgstr "Kitas telefonas"
+
+#: 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 "Kinija"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:431
+#, fuzzy
+msgid "Chiclayo"
+msgstr "�il�"
+
+#: my-evolution/Locations.h:432
+#, fuzzy
+msgid "Chico"
+msgstr "�il�"
+
+#: my-evolution/Locations.h:433
+msgid "Chicopee Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:434
+#, fuzzy
+msgid "Chievres"
+msgstr "Kin�"
+
+#: my-evolution/Locations.h:435
+#, fuzzy
+msgid "Chihhang"
+msgstr "Kinija"
+
+#: my-evolution/Locations.h:436
+msgid "Chihuahua"
+msgstr ""
+
+#: my-evolution/Locations.h:437
+#, fuzzy
+msgid "Childress"
+msgstr "�il�"
+
+#: my-evolution/Locations.h:439
+#, fuzzy
+msgid "China Lake"
+msgstr "Kinija"
+
+#: my-evolution/Locations.h:440
+#, fuzzy
+msgid "Chinandega"
+msgstr "Kinija"
+
+#: my-evolution/Locations.h:441
+msgid "Chinmem/Shatou"
+msgstr ""
+
+#: my-evolution/Locations.h:442
+#, fuzzy
+msgid "Chino"
+msgstr "Kinija"
+
+#: my-evolution/Locations.h:443
+msgid "Chippewa County"
+msgstr ""
+
+#: my-evolution/Locations.h:444
+#, fuzzy
+msgid "Chita"
+msgstr "Kinija"
+
+#: 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 "Kinija"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:462
+#, fuzzy
+msgid "Clarinda"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:463
+#, fuzzy
+msgid "Clarion"
+msgstr "Bendradarbiavimas"
+
+#: my-evolution/Locations.h:464
+msgid "Clarksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:465
+#, fuzzy
+msgid "Clayton"
+msgstr "Bendradarbiavimas"
+
+#: my-evolution/Locations.h:466
+msgid "Clayton Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:467
+msgid "Clermont-Ferrand"
+msgstr ""
+
+#: my-evolution/Locations.h:468
+#, fuzzy
+msgid "Cleveland"
+msgstr "Grenlandija"
+
+#: 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 "Kolumbija"
+
+#: 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 "Norfolko sala"
+
+#: my-evolution/Locations.h:477
+#, fuzzy
+msgid "Cody"
+msgstr "Tekstas"
+
+#: my-evolution/Locations.h:478
+msgid "Coeur d'Alene"
+msgstr ""
+
+#: my-evolution/Locations.h:479
+#, fuzzy
+msgid "Cold Bay"
+msgstr "_Aplank� juosta"
+
+#: my-evolution/Locations.h:480
+#, fuzzy
+msgid "Colima"
+msgstr "Kolumbija"
+
+#: my-evolution/Locations.h:481
+#, fuzzy
+msgid "College Station"
+msgstr "Bendradarbiavimas"
+
+#: my-evolution/Locations.h:482
+msgid "Colmar-Meyenheim"
+msgstr ""
+
+#: my-evolution/Locations.h:484
+#, fuzzy
+msgid "Colonia"
+msgstr "Kolumbija"
+
+#: my-evolution/Locations.h:485
+#, fuzzy
+msgid "Colorado"
+msgstr "Bendradarbiavimas"
+
+#: my-evolution/Locations.h:486
+msgid "Colorado Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:487
+#, fuzzy
+msgid "Columbia"
+msgstr "Kolumbija"
+
+#: my-evolution/Locations.h:488
+msgid "Columbia-McEntire"
+msgstr ""
+
+#: my-evolution/Locations.h:489
+#, fuzzy
+msgid "Columbus"
+msgstr "Kolumbija"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:494
+#, fuzzy
+msgid "Colville"
+msgstr "�il�"
+
+#: my-evolution/Locations.h:495
+msgid "Comodoro Rivadavia"
+msgstr ""
+
+#: my-evolution/Locations.h:496
+#, fuzzy
+msgid "Comox"
+msgstr "Komp"
+
+#: my-evolution/Locations.h:497
+msgid "Conceicao Do Araguaia"
+msgstr ""
+
+#: my-evolution/Locations.h:498
+#, fuzzy
+msgid "Concepcion"
+msgstr "Nutraukti veiksm�"
+
+#: my-evolution/Locations.h:499
+#, fuzzy
+msgid "Concord"
+msgstr "Kongas"
+
+#: my-evolution/Locations.h:500
+msgid "Concordia"
+msgstr ""
+
+#: my-evolution/Locations.h:501
+msgid "Connaught"
+msgstr ""
+
+#: my-evolution/Locations.h:502
+#, fuzzy
+msgid "Connecticut"
+msgstr "Kontaktai"
+
+#: my-evolution/Locations.h:503
+#, fuzzy
+msgid "Conroe"
+msgstr "Kongas"
+
+#: my-evolution/Locations.h:504
+#, fuzzy
+msgid "Constantine"
+msgstr "T_urintys savyje:"
+
+#: my-evolution/Locations.h:505
+msgid "Copper Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:506
+#, fuzzy
+msgid "Cordoba"
+msgstr "Kolumbija"
+
+#: my-evolution/Locations.h:507
+#, fuzzy
+msgid "Cordova"
+msgstr "Jordanas"
+
+#: my-evolution/Locations.h:508
+msgid "Cork"
+msgstr ""
+
+#: my-evolution/Locations.h:509
+#, fuzzy
+msgid "Coro"
+msgstr "Komorai"
+
+#: my-evolution/Locations.h:510
+#, fuzzy
+msgid "Corona"
+msgstr "Komorai"
+
+#: my-evolution/Locations.h:511
+msgid "Corpus Christi"
+msgstr ""
+
+#: my-evolution/Locations.h:512
+msgid "Corpus Christi NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:513
+#, fuzzy
+msgid "Corrientes"
+msgstr "kart�(us) pasitaikys"
+
+#: my-evolution/Locations.h:514
+#, fuzzy
+msgid "Corsicana"
+msgstr "Kosta Rika"
+
+#: my-evolution/Locations.h:515
+#, fuzzy
+msgid "Cortez"
+msgstr "Pastaba"
+
+#: my-evolution/Locations.h:516
+#, fuzzy
+msgid "Corumba"
+msgstr "Kuba"
+
+#: my-evolution/Locations.h:518
+msgid "Cotulla"
+msgstr ""
+
+#: my-evolution/Locations.h:519
+msgid "Council Bluffs"
+msgstr ""
+
+#: my-evolution/Locations.h:520
+#, fuzzy
+msgid "Coventry"
+msgstr "Valst_yb�:"
+
+#: my-evolution/Locations.h:521
+#, fuzzy
+msgid "Covington"
+msgstr "Kongas"
+
+#: my-evolution/Locations.h:522
+msgid "Cozumel"
+msgstr ""
+
+#: my-evolution/Locations.h:523
+#, fuzzy
+msgid "Craig"
+msgstr "Kroatija"
+
+#: my-evolution/Locations.h:524
+#, fuzzy
+msgid "Cranfield"
+msgstr "Nutraukta"
+
+#: my-evolution/Locations.h:525
+msgid "Crescent City"
+msgstr ""
+
+#: my-evolution/Locations.h:526
+#, fuzzy
+msgid "Creston"
+msgstr "Klausimas"
+
+#: my-evolution/Locations.h:527
+#, fuzzy
+msgid "Crestview"
+msgstr "Per�i�ra"
+
+#: 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 "Kamer�nas"
+
+#: my-evolution/Locations.h:533
+#, fuzzy
+msgid "Cuba Awrs"
+msgstr "Kuba"
+
+#: my-evolution/Locations.h:534
+msgid "Cuernavaca"
+msgstr ""
+
+#: my-evolution/Locations.h:535
+#, fuzzy
+msgid "Cuiaba"
+msgstr "Kuba"
+
+#: my-evolution/Locations.h:536
+#, fuzzy
+msgid "Culdrose"
+msgstr "U�daryti"
+
+#: my-evolution/Locations.h:537
+msgid "Culiacan"
+msgstr ""
+
+#: my-evolution/Locations.h:538
+#, fuzzy
+msgid "Cumana"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:539
+msgid "Cumberland"
+msgstr ""
+
+#: my-evolution/Locations.h:540
+#, fuzzy
+msgid "Curitiba"
+msgstr "Kroatija"
+
+#: my-evolution/Locations.h:541
+msgid "Curitiba Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:542
+#, fuzzy
+msgid "Custer"
+msgstr "I�kirpti"
+
+#: my-evolution/Locations.h:543
+msgid "Cut Bank"
+msgstr ""
+
+#: my-evolution/Locations.h:544
+msgid "Cuzco"
+msgstr ""
+
+#: my-evolution/Locations.h:547
+#, fuzzy
+msgid "Dagali"
+msgstr "Malis"
+
+#: my-evolution/Locations.h:548
+msgid "Daggett"
+msgstr ""
+
+#: my-evolution/Locations.h:549
+msgid "Dalhart"
+msgstr ""
+
+#: my-evolution/Locations.h:550
+#, fuzzy
+msgid "Dalian"
+msgstr "Taivanas"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:556
+#, fuzzy
+msgid "Danbury"
+msgstr "Sausis"
+
+#: my-evolution/Locations.h:557
+msgid "Danville"
+msgstr ""
+
+#: my-evolution/Locations.h:558
+msgid "Dar-El-Beida"
+msgstr ""
+
+#: my-evolution/Locations.h:559
+#, fuzzy
+msgid "Davenport"
+msgstr "Siuntimas"
+
+#: my-evolution/Locations.h:560
+msgid "David"
+msgstr ""
+
+#: my-evolution/Locations.h:561
+msgid "Dawadmi"
+msgstr ""
+
+#: my-evolution/Locations.h:562
+#, fuzzy
+msgid "Dayton"
+msgstr "Diena"
+
+#: my-evolution/Locations.h:563
+msgid "Daytona Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:564
+msgid "Dayton-Fairborn"
+msgstr ""
+
+#: my-evolution/Locations.h:565
+#, fuzzy
+msgid "Dayton-South Airport"
+msgstr "Neimportuoti"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:571
+#, fuzzy
+msgid "Deelen"
+msgstr "I�trinti"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:576
+#, fuzzy
+msgid "Delta"
+msgstr "I�trinti"
+
+#: my-evolution/Locations.h:577
+#, fuzzy
+msgid "Deming"
+msgstr "Susitikimas"
+
+#: my-evolution/Locations.h:578
+msgid "Den Helder/De Kooy"
+msgstr ""
+
+#: my-evolution/Locations.h:579
+#, fuzzy
+msgid "Denison"
+msgstr "Beninas"
+
+#: my-evolution/Locations.h:581
+#, fuzzy
+msgid "Denton"
+msgstr "Baigta"
+
+#: my-evolution/Locations.h:582
+#, fuzzy
+msgid "Denver"
+msgstr "Siunt�jas"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:587
+#, fuzzy
+msgid "Des Moines"
+msgstr "Laiko juostos"
+
+#: my-evolution/Locations.h:588
+#, fuzzy
+msgid "Destin"
+msgstr "Klausimas"
+
+#: 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 "Bahreinas"
+
+#: my-evolution/Locations.h:596
+#, fuzzy
+msgid "Dickinson"
+msgstr "I�matavimai:"
+
+#: my-evolution/Locations.h:597
+#, fuzzy
+msgid "Dijon"
+msgstr "Baigta"
+
+#: my-evolution/Locations.h:598
+msgid "Dillingham"
+msgstr ""
+
+#: my-evolution/Locations.h:599
+#, fuzzy
+msgid "Dillon"
+msgstr "Baigta"
+
+#: my-evolution/Locations.h:600
+#, fuzzy
+msgid "Dinard"
+msgstr "Spausdinti kortel�"
+
+#: 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 "Rol�"
+
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "Baigta"
+
+#: my-evolution/Locations.h:610
+#, fuzzy
+msgid "Dongsha"
+msgstr "Tonga"
+
+#: my-evolution/Locations.h:611
+msgid "Dongshi"
+msgstr ""
+
+#: my-evolution/Locations.h:612
+#, fuzzy
+msgid "Don Torcuato"
+msgstr "tuo metu arba po"
+
+#: my-evolution/Locations.h:613
+msgid "Dortmund-Wickede"
+msgstr ""
+
+#: my-evolution/Locations.h:614
+#, fuzzy
+msgid "Dothan"
+msgstr "Baigta"
+
+#: my-evolution/Locations.h:615
+msgid "Douglas"
+msgstr ""
+
+#: my-evolution/Locations.h:616
+#, fuzzy
+msgid "Dover"
+msgstr "am�inai"
+
+#: 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 "Kuba"
+
+#: my-evolution/Locations.h:620
+msgid "Dubbo"
+msgstr ""
+
+#: my-evolution/Locations.h:621
+#, fuzzy
+msgid "Dublin"
+msgstr "Vie�as"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:625
+#, fuzzy
+msgid "Dugway"
+msgstr "Diena"
+
+#: my-evolution/Locations.h:626
+#, fuzzy
+msgid "Duluth"
+msgstr "�p_rastas"
+
+#: my-evolution/Locations.h:627
+#, fuzzy
+msgid "Dundee"
+msgstr "Bir�elis"
+
+#: 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 "Dulki� audra"
+
+#: my-evolution/Locations.h:633
+msgid "Dutch Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:634
+msgid "Dyersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:635
+#, fuzzy
+msgid "Eagle"
+msgstr "�jungti"
+
+#: 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 "Ryt� - Pietry�i�"
+
+#: my-evolution/Locations.h:640
+msgid "Eau Claire"
+msgstr ""
+
+#: my-evolution/Locations.h:642
+#, fuzzy
+msgid "Edinburgh"
+msgstr "Indeksuojama:"
+
+#: my-evolution/Locations.h:643
+#, fuzzy
+msgid "Edmonton"
+msgstr "m�nesis"
+
+#: 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 "Tornado"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:661
+#, fuzzy
+msgid "Elkins"
+msgstr "s�ra�as"
+
+#: my-evolution/Locations.h:662
+msgid "Elko"
+msgstr ""
+
+#: my-evolution/Locations.h:663
+#, fuzzy
+msgid "Elmira"
+msgstr "Elm"
+
+#: my-evolution/Locations.h:664
+#, fuzzy
+msgid "El Monte"
+msgstr "M�nesis"
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr ""
+
+#: my-evolution/Locations.h:667
+msgid "El Salvador Int."
+msgstr ""
+
+#: my-evolution/Locations.h:668
+msgid "Elsenborn"
+msgstr ""
+
+#: my-evolution/Locations.h:669
+#, fuzzy
+msgid "Ely"
+msgstr "Elm"
+
+#: my-evolution/Locations.h:670
+msgid "Emmonak"
+msgstr ""
+
+#: my-evolution/Locations.h:671
+#, fuzzy
+msgid "Emporia"
+msgstr "Svarbus"
+
+#: my-evolution/Locations.h:672
+msgid "Enid"
+msgstr ""
+
+#: my-evolution/Locations.h:673
+#, fuzzy
+msgid "Enid/Woodring"
+msgstr "Indeksuojama:"
+
+#: 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 "Eritr�ja"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:685
+#, fuzzy
+msgid "Eugene"
+msgstr "I�valyti"
+
+#: my-evolution/Locations.h:686
+#, fuzzy
+msgid "Eureka"
+msgstr "Eritr�ja"
+
+#: my-evolution/Locations.h:687
+msgid "Europe"
+msgstr ""
+
+#: my-evolution/Locations.h:688
+#, fuzzy
+msgid "Evanston"
+msgstr "Estija"
+
+#: my-evolution/Locations.h:689
+msgid "Evansville"
+msgstr ""
+
+#: my-evolution/Locations.h:690
+#, fuzzy
+msgid "Everett"
+msgstr "Kas"
+
+#: my-evolution/Locations.h:691
+msgid "Evergreen"
+msgstr ""
+
+#: my-evolution/Locations.h:692
+msgid "Evreux-Fauville"
+msgstr ""
+
+#: my-evolution/Locations.h:693
+#, fuzzy
+msgid "Exeter"
+msgstr "Orai"
+
+#: my-evolution/Locations.h:694
+msgid "Ezeiza"
+msgstr ""
+
+#: my-evolution/Locations.h:695
+#, fuzzy
+msgid "Fagernes"
+msgstr "Ie�kas"
+
+#: my-evolution/Locations.h:696
+msgid "Fairbanks"
+msgstr ""
+
+#: my-evolution/Locations.h:697
+msgid "Fairchild"
+msgstr ""
+
+#: my-evolution/Locations.h:698
+#, fuzzy
+msgid "Fairfield"
+msgstr "_Nuo laukas"
+
+#: my-evolution/Locations.h:699
+#, fuzzy
+msgid "Fairmont"
+msgstr "�riftai"
+
+#: my-evolution/Locations.h:700
+msgid "Fallon"
+msgstr ""
 
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: 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 " "
+
+#: my-evolution/Locations.h:705
+#, fuzzy
+msgid "Farmingdale"
+msgstr "Kintamos krypties"
+
+#: my-evolution/Locations.h:706
+msgid "Farmington"
+msgstr ""
+
+#: my-evolution/Locations.h:707
+#, fuzzy
+msgid "Farmville"
+msgstr "Pavard�"
+
+#: my-evolution/Locations.h:708
+#, fuzzy
+msgid "Faro"
+msgstr "Nuo"
+
+#: my-evolution/Locations.h:709
+msgid "Fayetteville"
+msgstr ""
+
+#: my-evolution/Locations.h:710
+#, fuzzy
+msgid "Feng Nin"
+msgstr "Beninas"
+
+#: my-evolution/Locations.h:711
+msgid "Fergus Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:712
+msgid "Fernando De Noronha"
+msgstr ""
+
+#: my-evolution/Locations.h:713
+#, fuzzy
+msgid "Ferrara"
+msgstr "Vasaris"
+
+#: my-evolution/Locations.h:714
+#, fuzzy
+msgid "Figari"
+msgstr "Nigerija"
+
+#: my-evolution/Locations.h:715
+#, fuzzy
+msgid "Findlay"
+msgstr "Penktadienis"
+
+#: my-evolution/Locations.h:717
+#, fuzzy
+msgid "Firenze"
+msgstr "Laisvas"
+
+#: my-evolution/Locations.h:718
+msgid "Fitchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:719
+msgid "Flagstaff"
+msgstr ""
+
+#: my-evolution/Locations.h:720
+#, fuzzy
+msgid "Flint"
+msgstr "s�ra�as"
+
+#: my-evolution/Locations.h:721
+#, fuzzy
+msgid "Flippin"
+msgstr "Filipinai"
+
+#: my-evolution/Locations.h:722
+#, fuzzy
+msgid "Florence"
+msgstr "Pranc�zija"
+
+#: my-evolution/Locations.h:723
+#, fuzzy
+msgid "Florennes"
+msgstr "Laisvas"
+
+#: my-evolution/Locations.h:724
+#, fuzzy
+msgid "Flores"
+msgstr "Saugoti kaip"
+
+#: my-evolution/Locations.h:725
+msgid "Florianopolis"
+msgstr ""
+
+#: my-evolution/Locations.h:726
+#, fuzzy
+msgid "Florida"
+msgstr "Penktadienis"
+
+#: my-evolution/Locations.h:727
+#, fuzzy
+msgid "Floro"
+msgstr "Nuo"
+
+#: my-evolution/Locations.h:728
+msgid "Fond Du Lac"
+msgstr ""
+
+#: my-evolution/Locations.h:729
+#, fuzzy
+msgid "Forde/Bringeland"
+msgstr "Suomija"
+
+#: my-evolution/Locations.h:730
+#, fuzzy
+msgid "Forli"
+msgstr "Pe_n"
+
+#: my-evolution/Locations.h:731
+#, fuzzy
+msgid "Formosa"
+msgstr "Formatas"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:742
+#, fuzzy
+msgid "Fort Eustis"
+msgstr "Trump�s"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:748
+#, fuzzy
+msgid "Fort Leonard"
+msgstr "Persi�sti"
+
+#: my-evolution/Locations.h:749
+msgid "Fort Lewis"
+msgstr ""
+
+#: my-evolution/Locations.h:750
+msgid "Fort Madison"
+msgstr ""
+
+#: my-evolution/Locations.h:751
+#, fuzzy
+msgid "Fort Meade"
+msgstr "P_ersi�sti lai�k�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:757
+#, fuzzy
+msgid "Fort Smith"
+msgstr "Formatas"
+
+#: my-evolution/Locations.h:758
+#, fuzzy
+msgid "Fort Stewart"
+msgstr "Neprad�ta"
+
+#: my-evolution/Locations.h:759
+msgid "Fort Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:760
+#, fuzzy
+msgid "Fort Wayne"
+msgstr "Pranc�zija"
+
+#: 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
+#, fuzzy
+msgid "Frankfort"
+msgstr "Siuntimas"
+
+#: my-evolution/Locations.h:768
+msgid "Frankfurt/Main"
+msgstr ""
+
+#: my-evolution/Locations.h:769
+#, fuzzy
+msgid "Franklin"
+msgstr "Persi�sti viduje"
+
+#: my-evolution/Locations.h:770
+#, fuzzy
+msgid "Fredericton"
+msgstr "apra�ymas"
+
+#: my-evolution/Locations.h:771
+#, fuzzy
+msgid "Freeport"
+msgstr "Laisvas"
+
+#: my-evolution/Locations.h:772
+msgid "Frenchville"
+msgstr ""
+
+#: my-evolution/Locations.h:773
+#, fuzzy
+msgid "Fresno"
+msgstr "Laisvas"
+
+#: my-evolution/Locations.h:774
+msgid "Fresno-Chandler"
+msgstr ""
+
+#: my-evolution/Locations.h:775
+#, fuzzy
+msgid "Friday Harbor"
+msgstr "Penktadienis"
+
+#: my-evolution/Locations.h:776
+msgid "Friedrichshafen"
+msgstr ""
+
+#: my-evolution/Locations.h:777
+#, fuzzy
+msgid "Frigg"
+msgstr "Pe_n"
+
+#: my-evolution/Locations.h:778
+#, fuzzy
+msgid "Frontone"
+msgstr "�riftai"
+
+#: my-evolution/Locations.h:779
+#, fuzzy
+msgid "Frosinone"
+msgstr "Profesija"
+
+#: my-evolution/Locations.h:780
+#, fuzzy
+msgid "Fryeburg"
+msgstr "Vasaris"
+
+#: 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 "Makedonija"
+
+#: my-evolution/Locations.h:789
+msgid "Gadsden"
+msgstr ""
+
+#: my-evolution/Locations.h:790
+#, fuzzy
+msgid "Gage"
+msgstr "Puslapis"
+
+#: my-evolution/Locations.h:791
+#, fuzzy
+msgid "Gainesville"
+msgstr "Nutraukta"
+
+#: 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 "Gana"
+
+#: my-evolution/Locations.h:796
+msgid "Galesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:797
+#, fuzzy
+msgid "Gallup"
+msgstr "Gvadelup�"
+
+#: my-evolution/Locations.h:798
+msgid "Galveston"
+msgstr ""
+
+#: my-evolution/Locations.h:799
+#, fuzzy
+msgid "Gambell"
+msgstr "Gambija"
+
+#: my-evolution/Locations.h:800
+#, fuzzy
+msgid "Gander"
+msgstr "Antra�t�"
+
+#: my-evolution/Locations.h:801
+#, fuzzy
+msgid "Garden City"
+msgstr "Asmenyb�"
+
+#: my-evolution/Locations.h:802
+msgid "Gary"
+msgstr ""
+
+#: my-evolution/Locations.h:803
+#, fuzzy
+msgid "Gassim"
+msgstr "Guamas"
+
+#: my-evolution/Locations.h:804
+#, fuzzy
+msgid "Gatineau"
+msgstr "Gvin�ja"
+
+#: my-evolution/Locations.h:805
+msgid "Gaziantep"
+msgstr ""
+
+#: my-evolution/Locations.h:806
+#, fuzzy
+msgid "Gdansk"
+msgstr "dien�"
+
+#: my-evolution/Locations.h:807
+#, fuzzy
+msgid "Geneve"
+msgstr "Graikija"
+
+#: my-evolution/Locations.h:808
+#, fuzzy
+msgid "Genova"
+msgstr "Esm�"
+
+#: 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 "Gana"
+
+#: my-evolution/Locations.h:814
+msgid "Ghedi"
+msgstr ""
+
+#: my-evolution/Locations.h:816
+msgid "Gifu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:817
+#, fuzzy
+msgid "Gila Bend"
+msgstr "Suomija"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:821
+#, fuzzy
+msgid "Girona"
+msgstr "Gvin�ja"
+
+#: my-evolution/Locations.h:822
+#, fuzzy
+msgid "Gizan"
+msgstr "Gabonas"
+
+#: my-evolution/Locations.h:823
+#, fuzzy
+msgid "Glasgow"
+msgstr " "
+
+#: my-evolution/Locations.h:824
+#, fuzzy
+msgid "Glendive"
+msgstr "Maldyvai"
+
+#: my-evolution/Locations.h:825
+msgid "Glens Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:826
+#, fuzzy
+msgid "Goiania"
+msgstr "Rumunija"
+
+#: my-evolution/Locations.h:827
+msgid "Goldsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:828
+#, fuzzy
+msgid "Goodland"
+msgstr "Lenkija"
+
+#: my-evolution/Locations.h:829
+#, fuzzy
+msgid "Goose Bay"
+msgstr "Eiti � �iandien�"
+
+#: my-evolution/Locations.h:830
+msgid "Goteborg (Landvetter)"
+msgstr ""
+
+#: my-evolution/Locations.h:831
+msgid "Goteborg (Save)"
+msgstr ""
+
+#: my-evolution/Locations.h:832
+#, fuzzy
+msgid "Granada"
+msgstr "Grenada"
+
+#: 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 "Folklendo salos"
+
+#: 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 "San Marinas"
+
+#: my-evolution/Locations.h:840
+msgid "Grand Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:841
+#, fuzzy
+msgid "Grandview"
+msgstr "Per�i�ra"
+
+#: my-evolution/Locations.h:842
+#, fuzzy
+msgid "Grangeville"
+msgstr "Nutraukta"
+
+#: my-evolution/Locations.h:843
+#, fuzzy
+msgid "Grants"
+msgstr "Juodra��iai"
+
+#: my-evolution/Locations.h:844
+#, fuzzy
+msgid "Graz"
+msgstr "Brazilija"
+
+#: my-evolution/Locations.h:845
+#, fuzzy
+msgid "Great Falls"
+msgstr "Gauti pa�t�"
+
+#: my-evolution/Locations.h:847
+#, fuzzy
+msgid "Greeley"
+msgstr "Graikija"
+
+#: my-evolution/Locations.h:848
+#, fuzzy
+msgid "Green Bay"
+msgstr "Grenlandija"
+
+#: my-evolution/Locations.h:849
+msgid "Green River"
+msgstr ""
+
+#: my-evolution/Locations.h:850
+msgid "Greensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:851
+#, fuzzy
+msgid "Greenville"
+msgstr "Grenlandija"
+
+#: my-evolution/Locations.h:852
+msgid "Greenville-Spartanburg"
+msgstr ""
+
+#: my-evolution/Locations.h:853
+#, fuzzy
+msgid "Greenwood"
+msgstr "Grenlandija"
+
+#: my-evolution/Locations.h:854
+msgid "Grenoble-Saint-Geoirs"
+msgstr ""
+
+#: my-evolution/Locations.h:855
+msgid "Griffiss AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:856
+#, fuzzy
+msgid "Groningen"
+msgstr "�sp�jimas"
+
+#: 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 "Gvatemala"
+
+#: my-evolution/Locations.h:860
+#, fuzzy
+msgid "Guadalupe Pass"
+msgstr "Gvadelup�"
+
+#: my-evolution/Locations.h:861
+#, fuzzy
+msgid "Guanare"
+msgstr "Gajana"
+
+#: my-evolution/Locations.h:862
+msgid "Guangzhou"
+msgstr ""
+
+#: my-evolution/Locations.h:863
+#, fuzzy
+msgid "Guantanamo"
+msgstr "Gvatemala"
+
+#: my-evolution/Locations.h:864
+#, fuzzy
+msgid "Guarany"
+msgstr "Vokietija"
+
+#: my-evolution/Locations.h:865
+#, fuzzy
+msgid "Guaratingueta"
+msgstr "Gvin�ja"
+
+#: my-evolution/Locations.h:866
+msgid "Guarulhos"
+msgstr ""
+
+#: my-evolution/Locations.h:868
+msgid "Guayaquil/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:869
+#, fuzzy
+msgid "Guaymas"
+msgstr "Guamas"
+
+#: my-evolution/Locations.h:870
+#, fuzzy
+msgid "Guernsey"
+msgstr "Vokietija"
+
+#: my-evolution/Locations.h:871
+#, fuzzy
+msgid "Guidonia"
+msgstr "Gvin�ja"
+
+#: my-evolution/Locations.h:872
+msgid "Gulfport"
+msgstr ""
+
+#: my-evolution/Locations.h:873
+#, fuzzy
+msgid "Gulkana"
+msgstr "Gajana"
+
+#: my-evolution/Locations.h:874
+msgid "Gullfax C"
+msgstr ""
+
+#: my-evolution/Locations.h:875
+msgid "Gunnison"
+msgstr ""
+
+#: my-evolution/Locations.h:876
+msgid "Gunnison (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:877
+#, fuzzy
+msgid "Guriat"
+msgstr "Gvin�ja"
+
+#: my-evolution/Locations.h:878
+msgid "Gustavus"
+msgstr ""
+
+#: my-evolution/Locations.h:879
+#, fuzzy
+msgid "Guymon"
+msgstr "Gajana"
+
+#: my-evolution/Locations.h:880
+#, fuzzy
+msgid "Habana"
+msgstr "Albanija"
+
+#: 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 ""
+
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+msgid "Hail"
+msgstr ""
+
+#: my-evolution/Locations.h:886
+msgid "Hailey-Sun Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:887
+#, fuzzy
+msgid "Haines"
+msgstr "Antra�t�s"
+
+#: 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 "Haitis"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:902
+msgid "Ha Noi"
+msgstr ""
+
+#: my-evolution/Locations.h:903
+msgid "Harbor Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:904
+#, fuzzy
+msgid "Harlingen"
+msgstr "�sp�jimas"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:911
+#, fuzzy
+msgid "Hastings"
+msgstr "Antra�t�s"
+
+#: my-evolution/Locations.h:912
+msgid "Haugesund"
+msgstr ""
+
+#: my-evolution/Locations.h:913
+#, fuzzy
+msgid "Havre"
+msgstr "I�saugoti"
+
+#: my-evolution/Locations.h:914
+#, fuzzy
+msgid "Hawaii"
+msgstr "Haitis"
+
+#: my-evolution/Locations.h:915
+msgid "Hawthorne"
+msgstr ""
+
+#: my-evolution/Locations.h:916
+#, fuzzy
+msgid "Hayden"
+msgstr "Antra�t�"
+
+#: my-evolution/Locations.h:917
+msgid "Hayes River"
+msgstr ""
+
+#: my-evolution/Locations.h:918
+#, fuzzy
+msgid "Hays"
+msgstr "dien�"
+
+#: 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 "�v .Elena"
+
+#: my-evolution/Locations.h:922
+msgid "Helsinki"
+msgstr ""
+
+#: my-evolution/Locations.h:923
+#, fuzzy
+msgid "Henderson"
+msgstr "Antra�t�"
+
+#: 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
+msgid "Hillsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:930
+msgid "Hilo"
+msgstr ""
+
+#: my-evolution/Locations.h:931
+msgid "Hinesville"
+msgstr ""
+
+#: my-evolution/Locations.h:932
+msgid "Hiroshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:933
+#, fuzzy
+msgid "Hobart"
+msgstr "Hostas"
+
+#: my-evolution/Locations.h:934
+#, fuzzy
+msgid "Hobbs"
+msgstr "Hostas"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:941
+#, fuzzy
+msgid "Holguin"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:942
+#, fuzzy
+msgid "Homer"
+msgstr "Nam�"
+
+#: my-evolution/Locations.h:943
+#, fuzzy
+msgid "Homestead AFB"
+msgstr "U�baigta "
+
+#: my-evolution/Locations.h:944
+#, fuzzy
+msgid "Hondo"
+msgstr "Tornado"
+
+#: 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 "siun�iamas"
+
+#: my-evolution/Locations.h:954
+#, fuzzy
+msgid "Houma"
+msgstr "Nam�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:960
+#, fuzzy
+msgid "Howard AFB"
+msgstr "Persi�sti kaip"
+
+#: my-evolution/Locations.h:961
+msgid "Hsinchu"
+msgstr ""
+
+#: my-evolution/Locations.h:962
+msgid "Huanuco"
+msgstr ""
+
+#: my-evolution/Locations.h:963
+msgid "Huehuetenango"
+msgstr ""
+
+#: my-evolution/Locations.h:964
+#, fuzzy
+msgid "Hulien"
+msgstr "Sl�pti"
+
+#: my-evolution/Locations.h:965
+msgid "Humberside"
+msgstr ""
+
+#: my-evolution/Locations.h:967
+msgid "Huntington"
+msgstr ""
+
+#: my-evolution/Locations.h:968
+#, fuzzy
+msgid "Huntsville"
+msgstr "iki"
+
+#: my-evolution/Locations.h:969
+msgid "Hurlburt"
+msgstr ""
+
+#: my-evolution/Locations.h:970
+#, fuzzy
+msgid "Huron"
+msgstr "Valand�"
+
+#: 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 "Esm�"
+
+#: my-evolution/Locations.h:977
+#, fuzzy
+msgid "Ibiza"
+msgstr "Indija"
+
+#: my-evolution/Locations.h:979
+msgid "Ichikawa"
+msgstr ""
+
+#: my-evolution/Locations.h:980
+#, fuzzy
+msgid "Idaho"
+msgstr "Indija"
+
+#: 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 "Islandija"
+
+#: my-evolution/Locations.h:985
+#, fuzzy
+msgid "Iliamna"
+msgstr "Viduje"
+
+#: my-evolution/Locations.h:986
+msgid "Illinois"
+msgstr ""
+
+#: my-evolution/Locations.h:987
+#, fuzzy
+msgid "Imperial"
+msgstr "Balandis"
+
+#: my-evolution/Locations.h:988
+msgid "Imperial (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:989
+msgid "Imperial Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:990
+#, fuzzy
+msgid "In Amenas"
+msgstr "Arm�nija"
+
+#: my-evolution/Locations.h:992
+#, fuzzy
+msgid "Indiana"
+msgstr "Indija"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:998
+#, fuzzy
+msgid "Inverness"
+msgstr "Vykdomas"
+
+#: my-evolution/Locations.h:999
+msgid "Inyokern"
+msgstr ""
+
+#: my-evolution/Locations.h:1000
+#, fuzzy
+msgid "Iowa"
+msgstr "Norvegija"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1005
+#, fuzzy
+msgid "Iraklion"
+msgstr "Informacija"
+
+#: my-evolution/Locations.h:1006
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1008
+#, fuzzy
+msgid "Iron Mountain"
+msgstr "Komentaras turi savyje"
+
+#: 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 "Italija"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1025
+#, fuzzy
+msgid "Izumo Airport"
+msgstr "Importuoti"
+
+#: 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 "Japon�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1044
+#, fuzzy
+msgid "Jonkoping"
+msgstr "Dirbama"
+
+#: my-evolution/Locations.h:1045
+#, fuzzy
+msgid "Joplin"
+msgstr "Kopijuojama"
+
+#: 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 "Japonija"
+
+#: my-evolution/Locations.h:1050
+#, fuzzy
+msgid "Jujuy"
+msgstr "Liepa"
+
+#: my-evolution/Locations.h:1051
+#, fuzzy
+msgid "Juliaca"
+msgstr "Vie�as"
+
+#: my-evolution/Locations.h:1052
+#, fuzzy
+msgid "Junction"
+msgstr "Autentikacija"
+
+#: my-evolution/Locations.h:1053
+#, fuzzy
+msgid "Juneau"
+msgstr "Bir�elis"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1059
+#, fuzzy
+msgid "Kalamata"
+msgstr "Malta"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1071
+#, fuzzy
+msgid "Karachi"
+msgstr "Kovas"
+
+#: my-evolution/Locations.h:1072
+#, fuzzy
+msgid "Karup"
+msgstr "Grup�"
+
+#: 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 "Kazachstanas"
+
+#: my-evolution/Locations.h:1080
+#, fuzzy
+msgid "Kearney"
+msgstr "Kenija"
+
+#: my-evolution/Locations.h:1081
+#, fuzzy
+msgid "Keene"
+msgstr "Matytas"
+
+#: 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 "Kenija"
+
+#: my-evolution/Locations.h:1085
+#, fuzzy
+msgid "Kenosha"
+msgstr "Kenija"
+
+#: my-evolution/Locations.h:1086
+#, fuzzy
+msgid "Kentucky"
+msgstr "Kenija"
+
+#: 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 "Vokietija"
+
+#: my-evolution/Locations.h:1090
+msgid "Ketchikan"
+msgstr ""
+
+#: my-evolution/Locations.h:1091
+#, fuzzy
+msgid "Key West"
+msgstr "Vakar�"
+
+#: 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 "Kal�d� sala"
+
+#: 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 "Kenija"
+
+#: my-evolution/Locations.h:1132
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1133
+#, fuzzy
+msgid "Korea, Republic of"
+msgstr "�ekija"
+
+#: 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 "Kor�jie�i�"
+
+#: 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 "gaunamas"
+
+#: 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 "Makedonija"
+
+#: my-evolution/Locations.h:1151
+msgid "La Coruna"
+msgstr ""
+
+#: my-evolution/Locations.h:1152
+#, fuzzy
+msgid "La Crosse"
+msgstr "Laosas"
+
+#: my-evolution/Locations.h:1153
+msgid "La Esperanza"
+msgstr ""
+
+#: my-evolution/Locations.h:1154
+msgid "Lafayette"
+msgstr ""
+
+#: my-evolution/Locations.h:1155
+msgid "La Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1156
+#, fuzzy
+msgid "Lahaina"
+msgstr "Bahreinas"
+
+#: my-evolution/Locations.h:1157
+#, fuzzy
+msgid "Lahore"
+msgstr "_Didesnis"
+
+#: my-evolution/Locations.h:1158
+#, fuzzy
+msgid "Lajes"
+msgstr "Laosas"
+
+#: 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 "Islandija"
+
+#: my-evolution/Locations.h:1164
+msgid "Lake Tahoe"
+msgstr ""
+
+#: my-evolution/Locations.h:1165
+#, fuzzy
+msgid "Lakeview"
+msgstr "Per�i�ra"
+
+#: my-evolution/Locations.h:1166
+#, fuzzy
+msgid "Lamar"
+msgstr "Kvataras"
+
+#: my-evolution/Locations.h:1167
+#, fuzzy
+msgid "La Mesa"
+msgstr "_Pa�to lai�kas"
+
+#: my-evolution/Locations.h:1168
+#, fuzzy
+msgid "Lamezia"
+msgstr "Gambija"
+
+#: my-evolution/Locations.h:1169
+#, fuzzy
+msgid "Lamoni"
+msgstr "Laosas"
+
+#: my-evolution/Locations.h:1170
+msgid "Lampedusa"
+msgstr ""
+
+#: my-evolution/Locations.h:1171
+#, fuzzy
+msgid "Lanai"
+msgstr "Kalba"
+
+#: my-evolution/Locations.h:1172
+#, fuzzy
+msgid "Lancaster"
+msgstr "Guls�ias lapas"
+
+#: my-evolution/Locations.h:1173
+#, fuzzy
+msgid "Lander"
+msgstr "Antra�t�"
+
+#: my-evolution/Locations.h:1174
+#, fuzzy
+msgid "Langebaanweg"
+msgstr "Kalba"
+
+#: my-evolution/Locations.h:1175
+msgid "Langley AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1176
+msgid "Lannion"
+msgstr ""
+
+#: my-evolution/Locations.h:1177
+#, fuzzy
+msgid "Lansing"
+msgstr "�sp�jimas"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1182
+#, fuzzy
+msgid "Laredo"
+msgstr "_Didesnis"
+
+#: my-evolution/Locations.h:1183
+#, fuzzy
+msgid "Larnaka"
+msgstr "�ri Lanka"
+
+#: my-evolution/Locations.h:1184
+#, fuzzy
+msgid "La Romana"
+msgstr "Rumunija"
+
+#: 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 "Latvija"
+
+#: my-evolution/Locations.h:1189
+msgid "Latrobe"
+msgstr ""
+
+#: my-evolution/Locations.h:1191
+msgid "Laughlin"
+msgstr ""
+
+#: my-evolution/Locations.h:1192
+#, fuzzy
+msgid "Laurel"
+msgstr "_Didesnis"
+
+#: my-evolution/Locations.h:1193
+#, fuzzy
+msgid "La Verne"
+msgstr "�aliasis ky�ulys"
+
+#: my-evolution/Locations.h:1194
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1195
+#, fuzzy
+msgid "Lawton"
+msgstr "Laosas"
+
+#: my-evolution/Locations.h:1196
+msgid "Leadville"
+msgstr ""
+
+#: my-evolution/Locations.h:1197
+msgid "Learmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1199
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1201
+#, fuzzy
+msgid "Leesburg"
+msgstr "Liuksemburgas"
+
+#: my-evolution/Locations.h:1202
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1205
+msgid "Leknes"
+msgstr ""
+
+#: my-evolution/Locations.h:1206
+#, fuzzy
+msgid "Le Mans"
+msgstr "Vad"
+
+#: my-evolution/Locations.h:1207
+#, fuzzy
+msgid "Le Marine"
+msgstr "Martinika"
+
+#: my-evolution/Locations.h:1208
+msgid "Lemmon"
+msgstr ""
+
+#: my-evolution/Locations.h:1209
+#, fuzzy
+msgid "Lemoore"
+msgstr "Pa�alinti"
+
+#: my-evolution/Locations.h:1210
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1212
+#, fuzzy
+msgid "Leuchars"
+msgstr "met�"
+
+#: my-evolution/Locations.h:1213
+#, fuzzy
+msgid "Lewisburg"
+msgstr "Liuksemburgas"
+
+#: my-evolution/Locations.h:1214
+#, fuzzy
+msgid "Lewiston"
+msgstr "Naujas s�ra�as"
+
+#: my-evolution/Locations.h:1215
+msgid "Lewistown"
+msgstr ""
+
+#: my-evolution/Locations.h:1216
+msgid "Lexington"
+msgstr ""
+
+#: my-evolution/Locations.h:1217
+#, fuzzy
+msgid "Liberal"
+msgstr "Liberija"
+
+#: my-evolution/Locations.h:1219
+#, fuzzy
+msgid "Libya"
+msgstr "Liberija"
+
+#: my-evolution/Locations.h:1220
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1221
+msgid "Lidgerwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1222
+#, fuzzy
+msgid "Liege"
+msgstr "Nigeris"
+
+#: my-evolution/Locations.h:1223
+msgid "Lihue"
+msgstr ""
+
+#: my-evolution/Locations.h:1224
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1225
+msgid "Lima-Callao"
+msgstr ""
+
+#: my-evolution/Locations.h:1226
+#, fuzzy
+msgid "Limnos"
+msgstr "Laosas"
+
+#: my-evolution/Locations.h:1227
+#, fuzzy
+msgid "Limoges"
+msgstr "�emiausias"
+
+#: my-evolution/Locations.h:1228
+#, fuzzy
+msgid "Limon"
+msgstr "m�nesis"
+
+#: my-evolution/Locations.h:1229
+#, fuzzy
+msgid "Lincoln"
+msgstr "gaunamas"
+
+#: my-evolution/Locations.h:1230
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1231
+#, fuzzy
+msgid "Lisboa"
+msgstr "Liberija"
+
+#: my-evolution/Locations.h:1232
+#, fuzzy
+msgid "Lista"
+msgstr "s�ra�as"
+
+#: my-evolution/Locations.h:1233
+msgid "Litchfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1240
+msgid "Ljubljana"
+msgstr ""
+
+#: my-evolution/Locations.h:1241
+#, fuzzy
+msgid "Logan"
+msgstr "Tonga"
+
+#: my-evolution/Locations.h:1242
+msgid "Lolland Falster"
+msgstr ""
+
+#: my-evolution/Locations.h:1243
+#, fuzzy
+msgid "Lompoc"
+msgstr "Sukurti"
+
+#: my-evolution/Locations.h:1244
+#, fuzzy
+msgid "London"
+msgstr "Tornado"
+
+#: my-evolution/Locations.h:1245
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1249
+#, fuzzy
+msgid "Londrina"
+msgstr "Hond�ras"
+
+#: my-evolution/Locations.h:1250
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1253
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+#: my-evolution/Locations.h:1254
+#, fuzzy
+msgid "Los Alamos"
+msgstr "Persp�jimai"
+
+#: my-evolution/Locations.h:1255
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1260
+#, fuzzy
+msgid "Lousiana"
+msgstr "Botsvana"
+
+#: my-evolution/Locations.h:1261
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1265
+#, fuzzy
+msgid "Lugano"
+msgstr "Laosas"
+
+#: my-evolution/Locations.h:1266
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1267
+#, fuzzy
+msgid "Luton"
+msgstr "siun�iamas"
+
+#: my-evolution/Locations.h:1269
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1270
+#, fuzzy
+msgid "Luxor"
+msgstr "Liuksemburgas"
+
+#: my-evolution/Locations.h:1271
+#, fuzzy
+msgid "Lviv"
+msgstr "Latvija"
+
+#: my-evolution/Locations.h:1272
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1275
+msgid "Lyon-Satolas"
+msgstr ""
+
+#: my-evolution/Locations.h:1276
+#, fuzzy
+msgid "Maastricht"
+msgstr "Kovas"
+
+#: my-evolution/Locations.h:1277
+#, fuzzy
+msgid "Macae"
+msgstr "Vadybininkas"
+
+#: my-evolution/Locations.h:1278
+msgid "Macapa"
+msgstr ""
+
+#: my-evolution/Locations.h:1279
+#, fuzzy
+msgid "Maceio"
+msgstr "Makedonija"
+
+#: my-evolution/Locations.h:1280
+#, fuzzy
+msgid "Macon"
+msgstr "Vad"
+
+#: my-evolution/Locations.h:1281
+#, fuzzy
+msgid "Madinah"
+msgstr "Makedonija"
+
+#: my-evolution/Locations.h:1282
+#, fuzzy
+msgid "Madison"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1283
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1285
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+#: my-evolution/Locations.h:1286
+#, fuzzy
+msgid "Magadan"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:1287
+msgid "Magdalena"
+msgstr ""
+
+#: my-evolution/Locations.h:1288
+#, fuzzy
+msgid "Maine"
+msgstr "Vad"
+
+#: my-evolution/Locations.h:1289
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1290
+msgid "Makkah"
+msgstr ""
+
+#: my-evolution/Locations.h:1291
+#, fuzzy
+msgid "Makung"
+msgstr "Vad"
+
+#: my-evolution/Locations.h:1292
+msgid "Malad City"
+msgstr ""
+
+#: my-evolution/Locations.h:1293
+#, fuzzy
+msgid "Malaga"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1294
+#, fuzzy
+msgid "Malatya"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1295
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1296
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1298
+msgid "Mammoth Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1299
+#, fuzzy
+msgid "Managua"
+msgstr "Vadybininkas"
+
+#: my-evolution/Locations.h:1300
+#, fuzzy
+msgid "Manassas"
+msgstr "Malaizija"
+
+#: my-evolution/Locations.h:1301
+#, fuzzy
+msgid "Manaus"
+msgstr "Vad"
+
+#: my-evolution/Locations.h:1302
+#, fuzzy
+msgid "Manchester"
+msgstr "Tinka:"
+
+#: my-evolution/Locations.h:1303
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+msgid "Manhattan"
+msgstr ""
+
+#: my-evolution/Locations.h:1305
+#, fuzzy
+msgid "Manisa"
+msgstr "Vad"
+
+#: my-evolution/Locations.h:1306
+#, fuzzy
+msgid "Manistee"
+msgstr "Migla"
+
+#: my-evolution/Locations.h:1307
+#, fuzzy
+msgid "Manitoba"
+msgstr "Pagrindin� �rankin�"
+
+#: my-evolution/Locations.h:1308
+msgid "Manitowoc"
+msgstr ""
+
+#: my-evolution/Locations.h:1309
+#, fuzzy
+msgid "Mankato"
+msgstr "Monakas"
+
+#: my-evolution/Locations.h:1310
+#, fuzzy
+msgid "Mansfield"
+msgstr "Pa�tas"
+
+#: my-evolution/Locations.h:1311
+#, fuzzy
+msgid "Manta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1312
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1313
+#, fuzzy
+msgid "Maraba"
+msgstr "Mauritanija"
+
+#: my-evolution/Locations.h:1314
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1315
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1316
+#, fuzzy
+msgid "Marathon"
+msgstr "Kovas"
+
+#: my-evolution/Locations.h:1317
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1318
+#, fuzzy
+msgid "Margarita"
+msgstr "Mauritanija"
+
+#: my-evolution/Locations.h:1319
+#, fuzzy
+msgid "Marianna"
+msgstr "Mauritanija"
+
+#: my-evolution/Locations.h:1320
+#, fuzzy
+msgid "Marib"
+msgstr "Malis"
+
+#: my-evolution/Locations.h:1321
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1322
+#, fuzzy
+msgid "Marietta"
+msgstr "Mauritanija"
+
+#: my-evolution/Locations.h:1323
+msgid "Marino di Ravenna"
+msgstr ""
+
+#: my-evolution/Locations.h:1324
+#, fuzzy
+msgid "Marion"
+msgstr "Para�t�s"
+
+#: my-evolution/Locations.h:1325
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1326
+#, fuzzy
+msgid "Marquette"
+msgstr "Martinika"
+
+#: my-evolution/Locations.h:1327
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+#, fuzzy
+msgid "Marseilles"
+msgstr "�vair�s"
+
+#: my-evolution/Locations.h:1329
+#, fuzzy
+msgid "Marshall"
+msgstr "Mar�alo salos"
+
+#: my-evolution/Locations.h:1330
+#, fuzzy
+msgid "Marshalltown"
+msgstr "Mar�alo salos"
+
+#: my-evolution/Locations.h:1331
+msgid "Marshfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1332
+#, fuzzy
+msgid "Marte"
+msgstr "Martinika"
+
+#: my-evolution/Locations.h:1333
+#, fuzzy
+msgid "Marthas Vineyard"
+msgstr "Pa�ym�ti _neskaitytu"
+
+#: my-evolution/Locations.h:1334
+#, fuzzy
+msgid "Martinsburg"
+msgstr "Martinika"
+
+#: my-evolution/Locations.h:1335
+#, fuzzy
+msgid "Martinsville"
+msgstr "Martinika"
+
+#: my-evolution/Locations.h:1336
+#, fuzzy
+msgid "Maryland"
+msgstr "Airija"
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1339
+msgid "Mashhad"
+msgstr ""
+
+#: my-evolution/Locations.h:1340
+#, fuzzy
+msgid "Masirah"
+msgstr "Malaizija"
+
+#: my-evolution/Locations.h:1341
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1343
+#, fuzzy
+msgid "Massena"
+msgstr "Makedonija"
+
+#: my-evolution/Locations.h:1344
+#, fuzzy
+msgid "Matamoros"
+msgstr "Komorai"
+
+#: my-evolution/Locations.h:1345
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1347
+msgid "Matsuyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1348
+#, fuzzy
+msgid "Mattoon"
+msgstr "Vad"
+
+#: my-evolution/Locations.h:1349
+#, fuzzy
+msgid "Mayaguez"
+msgstr "Vadybininkas"
+
+#: my-evolution/Locations.h:1350
+#, fuzzy
+msgid "Mayport"
+msgstr "Siuntimas"
+
+#: my-evolution/Locations.h:1351
+#, fuzzy
+msgid "Mazatlan"
+msgstr "Kazachstanas"
+
+#: my-evolution/Locations.h:1352
+msgid "Mazu"
+msgstr ""
+
+#: my-evolution/Locations.h:1353
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1354
+#, fuzzy
+msgid "McAllen"
+msgstr "Visi"
+
+#: my-evolution/Locations.h:1355
+#, fuzzy
+msgid "McCall"
+msgstr "Malis"
+
+#: my-evolution/Locations.h:1356
+#, fuzzy
+msgid "McCarthy"
+msgstr "Kovas"
+
+#: my-evolution/Locations.h:1357
+#, fuzzy
+msgid "McClellan"
+msgstr "�vair�s"
+
+#: my-evolution/Locations.h:1358
+#, fuzzy
+msgid "McComb"
+msgstr "Komp"
+
+#: my-evolution/Locations.h:1359
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1361
+msgid "Mc Gregor"
+msgstr ""
+
+#: my-evolution/Locations.h:1362
+#, fuzzy
+msgid "Meacham"
+msgstr "Kovas"
+
+#: my-evolution/Locations.h:1363
+#, fuzzy
+msgid "Medford"
+msgstr "prie�"
+
+#: my-evolution/Locations.h:1364
+msgid "Medicine Lodge"
+msgstr ""
+
+#: my-evolution/Locations.h:1365
+#, fuzzy
+msgid "Mehamn"
+msgstr "Vad"
+
+#: my-evolution/Locations.h:1366
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1367
+msgid "Melbourne"
+msgstr ""
+
+#: my-evolution/Locations.h:1368
+#, fuzzy
+msgid "Melfa"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1369
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1373
+#, fuzzy
+msgid "Mendoza"
+msgstr "Makedonija"
+
+#: my-evolution/Locations.h:1374
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1377
+msgid "Merced"
+msgstr ""
+
+#: my-evolution/Locations.h:1378
+#, fuzzy
+msgid "Merida"
+msgstr "Penktadienis"
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1380
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1381
+#, fuzzy
+msgid "Merril Field"
+msgstr "_Nuo laukas"
+
+#: my-evolution/Locations.h:1382
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1386
+#, fuzzy
+msgid "Mexicali"
+msgstr "Meksika"
+
+#: my-evolution/Locations.h:1388
+#, fuzzy
+msgid "Miami"
+msgstr "Malis"
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1391
+msgid "Michigan"
+msgstr ""
+
+#: my-evolution/Locations.h:1392
+#, fuzzy
+msgid "Middle East"
+msgstr "Vi_durinis:"
+
+#: my-evolution/Locations.h:1393
+msgid "Middleton Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1394
+#, fuzzy
+msgid "Middletown"
+msgstr "Vi_durinis:"
+
+#: my-evolution/Locations.h:1395
+#, fuzzy
+msgid "Midland"
+msgstr "Suomija"
+
+#: my-evolution/Locations.h:1396
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1398
+msgid "Milano/Malpensa"
+msgstr ""
+
+#: my-evolution/Locations.h:1399
+#, fuzzy
+msgid "Miles City"
+msgstr "Bylos tipas:"
+
+#: my-evolution/Locations.h:1400
+#, fuzzy
+msgid "Milford"
+msgstr "kol"
+
+#: my-evolution/Locations.h:1401
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1402
+msgid "Millville"
+msgstr ""
+
+#: my-evolution/Locations.h:1403
+#, fuzzy
+msgid "Milton"
+msgstr "Lai�kai � %s"
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1407
+#, fuzzy
+msgid "Minatitlan"
+msgstr "Mauritanija"
+
+#: my-evolution/Locations.h:1408
+#, fuzzy
+msgid "Minchumina"
+msgstr "gaunamas"
+
+#: my-evolution/Locations.h:1409
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1414
+#, fuzzy
+msgid "Minnesota"
+msgstr "Mikronezija"
+
+#: my-evolution/Locations.h:1415
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1416
+#, fuzzy
+msgid "Minot"
+msgstr "n�ra"
+
+#: my-evolution/Locations.h:1417
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1419
+msgid "Mississippi"
+msgstr ""
+
+#: my-evolution/Locations.h:1420
+#, fuzzy
+msgid "Missoula"
+msgstr "Miss"
+
+#: my-evolution/Locations.h:1421
+#, fuzzy
+msgid "Missouri"
+msgstr "Miss"
+
+#: my-evolution/Locations.h:1422
+#, fuzzy
+msgid "Mitchell"
+msgstr "Tinka:"
+
+#: my-evolution/Locations.h:1423
+#, fuzzy
+msgid "Mitilini"
+msgstr "Konferencija"
+
+#: my-evolution/Locations.h:1424
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1425
+msgid "Miyazaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1426
+#, fuzzy
+msgid "Moa"
+msgstr "Pr"
+
+#: my-evolution/Locations.h:1427
+#, fuzzy
+msgid "Mobile Downtown"
+msgstr "Mobilus telefonas"
+
+#: my-evolution/Locations.h:1428
+msgid "Mobile Regional Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1429
+#, fuzzy
+msgid "Mobridge"
+msgstr "Mobilus"
+
+#: my-evolution/Locations.h:1430
+#, fuzzy
+msgid "Modesto"
+msgstr "�emiausias"
+
+#: my-evolution/Locations.h:1431
+msgid "Mo I Rana"
+msgstr ""
+
+#: my-evolution/Locations.h:1432
+#, fuzzy
+msgid "Mojave"
+msgstr "Perkelti"
+
+#: my-evolution/Locations.h:1433
+#, fuzzy
+msgid "Molde"
+msgstr "Mobilus"
+
+#: my-evolution/Locations.h:1434
+#, fuzzy
+msgid "Moldova"
+msgstr "Pirmadienis"
+
+#: my-evolution/Locations.h:1435
+msgid "Moline-Quad Cities"
+msgstr ""
+
+#: my-evolution/Locations.h:1436
+msgid "Molokai"
+msgstr ""
+
+#: my-evolution/Locations.h:1437
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1438
+msgid "Monchengladbach"
+msgstr ""
+
+#: my-evolution/Locations.h:1439
+#, fuzzy
+msgid "Monclova"
+msgstr "Monakas"
+
+#: my-evolution/Locations.h:1440
+#, fuzzy
+msgid "Moncton"
+msgstr "Monakas"
+
+#: my-evolution/Locations.h:1441
+#, fuzzy
+msgid "Monida"
+msgstr "Pirmadienis"
+
+#: my-evolution/Locations.h:1442
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+#: my-evolution/Locations.h:1443
+#, fuzzy
+msgid "Monroe"
+msgstr "Monakas"
+
+#: my-evolution/Locations.h:1444
+#, fuzzy
+msgid "Montague"
+msgstr "Vadybininkas"
+
+#: my-evolution/Locations.h:1445
+#, fuzzy
+msgid "Montana"
+msgstr "Botsvana"
+
+#: my-evolution/Locations.h:1446
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1448
+msgid "Monte Bisbino"
+msgstr ""
+
+#: my-evolution/Locations.h:1449
+msgid "Monte Calamita"
+msgstr ""
+
+#: my-evolution/Locations.h:1450
+#, fuzzy
+msgid "Monte Cimone"
+msgstr "M�nesio rodinys"
+
+#: my-evolution/Locations.h:1451
+#, fuzzy
+msgid "Montego Bay"
+msgstr "Mongolija"
+
+#: my-evolution/Locations.h:1452
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1453
+#, fuzzy
+msgid "Monterey"
+msgstr "M�nesis"
+
+#: my-evolution/Locations.h:1454
+#, fuzzy
+msgid "Monterrey"
+msgstr "Pertraukta"
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1458
+msgid "Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1459
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1460
+#, fuzzy
+msgid "Monticello"
+msgstr "Monakas"
+
+#: my-evolution/Locations.h:1461
+#, fuzzy
+msgid "Montpelier"
+msgstr "M�nesio rodinys"
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1465
+#, fuzzy
+msgid "Montrose"
+msgstr "�riftai"
+
+#: my-evolution/Locations.h:1466
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1467
+#, fuzzy
+msgid "Morelia"
+msgstr "Mongolija"
+
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Morgantown"
+msgstr "Organizacija"
+
+#: my-evolution/Locations.h:1469
+#, fuzzy
+msgid "Moriarty"
+msgstr "Pagrindinis"
+
+#: my-evolution/Locations.h:1471
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1474
+msgid "Moses Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1475
+#, fuzzy
+msgid "Mosinee"
+msgstr "Mobilus"
+
+#: my-evolution/Locations.h:1476
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain Home"
+msgstr ""
+
+#: my-evolution/Locations.h:1479
+#, fuzzy
+msgid "Mountain View"
+msgstr "M�nesio rodinys"
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1482
+#, fuzzy
+msgid "Mount Shasta"
+msgstr "Pietry�i�"
+
+#: my-evolution/Locations.h:1483
+#, fuzzy
+msgid "Mount Vernon"
+msgstr "M�nesio rodinys"
+
+#: my-evolution/Locations.h:1484
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1487
+msgid "Muir"
+msgstr ""
+
+#: my-evolution/Locations.h:1488
+#, fuzzy
+msgid "Mullan"
+msgstr "Vad"
+
+#: my-evolution/Locations.h:1489
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1490
+msgid "Munchen"
+msgstr ""
+
+#: my-evolution/Locations.h:1491
+#, fuzzy
+msgid "Muncie"
+msgstr "Bir�elis"
+
+#: my-evolution/Locations.h:1492
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1493
+#, fuzzy
+msgid "Murcia"
+msgstr "Mauritanija"
+
+#: my-evolution/Locations.h:1494
+msgid "Murmansk"
+msgstr ""
+
+#: my-evolution/Locations.h:1495
+#, fuzzy
+msgid "Mus"
+msgstr "Darb"
+
+#: my-evolution/Locations.h:1496
+#, fuzzy
+msgid "Muscatine"
+msgstr "Martinika"
+
+#: my-evolution/Locations.h:1497
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1498
+msgid "Muskegon"
+msgstr ""
+
+#: my-evolution/Locations.h:1499
+#, fuzzy
+msgid "Mykonos"
+msgstr "mazgai"
+
+#: my-evolution/Locations.h:1500
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1507
+#, fuzzy
+msgid "Najran"
+msgstr "Bahreinas"
+
+#: my-evolution/Locations.h:1508
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1509
+msgid "Nalchik"
+msgstr ""
+
+#: my-evolution/Locations.h:1510
+#, fuzzy
+msgid "Namsos"
+msgstr "Vardas"
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1513
+msgid "Nankishirahama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1514
+#, fuzzy
+msgid "Nanning"
+msgstr "�sp�jimas"
+
+#: my-evolution/Locations.h:1515
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1516
+msgid "Nantucket"
+msgstr ""
+
+#: my-evolution/Locations.h:1517
+#, fuzzy
+msgid "Napa"
+msgstr "Japonija"
+
+#: my-evolution/Locations.h:1518
+#, fuzzy
+msgid "Naples"
+msgstr "Vardas"
+
+#: my-evolution/Locations.h:1519
+#, fuzzy
+msgid "Napoli"
+msgstr "Malis"
+
+#: my-evolution/Locations.h:1520
+#, fuzzy
+msgid "Narvik"
+msgstr "Prav"
+
+#: my-evolution/Locations.h:1521
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1524
+msgid "Nassau"
+msgstr ""
+
+#: my-evolution/Locations.h:1525
+#, fuzzy
+msgid "Natal"
+msgstr "Italija"
+
+#: my-evolution/Locations.h:1526
+#, fuzzy
+msgid "Natchez"
+msgstr "Tinka:"
+
+#: my-evolution/Locations.h:1527
+msgid "Nawabshah"
+msgstr ""
+
+#: my-evolution/Locations.h:1528
+#, fuzzy
+msgid "Nebraska"
+msgstr "Nauja u�duotis"
+
+#: my-evolution/Locations.h:1529
+msgid "Needles"
+msgstr ""
+
+#: my-evolution/Locations.h:1530
+#, fuzzy
+msgid "Nenana"
+msgstr "Grenada"
+
+#: my-evolution/Locations.h:1532
+msgid "Neuquen"
+msgstr ""
+
+#: my-evolution/Locations.h:1533
+#, fuzzy
+msgid "Nevada"
+msgstr "Grenada"
+
+#: my-evolution/Locations.h:1534
+#, fuzzy
+msgid "Newark"
+msgstr "Nauja u�duotis"
+
+#: my-evolution/Locations.h:1535
+#, fuzzy
+msgid "New Bedford"
+msgstr "Naujien� �altinis"
+
+#: my-evolution/Locations.h:1536
+#, fuzzy
+msgid "New Bern"
+msgstr "Naujas �_vykis"
+
+#: my-evolution/Locations.h:1537
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1539
+msgid "Newburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1540
+#, fuzzy
+msgid "Newcastle"
+msgstr "Naujienos"
+
+#: my-evolution/Locations.h:1541
+#, fuzzy
+msgid "New Delhi/Palam"
+msgstr "Naujoji Zelandija"
+
+#: my-evolution/Locations.h:1542
+#, fuzzy
+msgid "Newfoundland"
+msgstr "Naujoji Zelandija"
+
+#: my-evolution/Locations.h:1543
+msgid "New Hampshire"
+msgstr ""
+
+#: my-evolution/Locations.h:1544
+#, fuzzy
+msgid "New Haven"
+msgstr "Naujas �_vykis"
+
+#: my-evolution/Locations.h:1545
+#, fuzzy
+msgid "New Iberia"
+msgstr "Naujoji Kaledonija"
+
+#: my-evolution/Locations.h:1546
+#, fuzzy
+msgid "New Jersey"
+msgstr "Naujas lai�kas"
+
+#: my-evolution/Locations.h:1547
+#, fuzzy
+msgid "New Mexico"
+msgstr "Meksika"
+
+#: my-evolution/Locations.h:1548
+#, fuzzy
+msgid "New Orleans"
+msgstr "Olandija"
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1550
+msgid "New Orleans NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1551
+#, fuzzy
+msgid "Newport"
+msgstr "�iaur�s"
+
+#: my-evolution/Locations.h:1552
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1553
+msgid "New Port Richey"
+msgstr ""
+
+#: my-evolution/Locations.h:1554
+#, fuzzy
+msgid "New River"
+msgstr "Naujas �_vykis"
+
+#: my-evolution/Locations.h:1555
+msgid "New Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1556
+#, fuzzy
+msgid "Newton"
+msgstr "Nauja"
+
+#: my-evolution/Locations.h:1557
+#, fuzzy
+msgid "New York"
+msgstr "Naujas vAplankas"
+
+#: my-evolution/Locations.h:1558
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1559
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1561
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1564
+msgid "Niigata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1565
+#, fuzzy
+msgid "Nimes-Garons"
+msgstr "I�matavimai:"
+
+#: my-evolution/Locations.h:1566
+#, fuzzy
+msgid "Nipawin"
+msgstr "Ispanija"
+
+#: my-evolution/Locations.h:1567
+#, fuzzy
+msgid "Nis"
+msgstr "yra"
+
+#: my-evolution/Locations.h:1568
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1570
+msgid "N Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1571
+#, fuzzy
+msgid "Nogales"
+msgstr "Normalus"
+
+#: my-evolution/Locations.h:1572
+#, fuzzy
+msgid "Nome"
+msgstr "Vardas"
+
+#: my-evolution/Locations.h:1573
+#, fuzzy
+msgid "Norfolk"
+msgstr "Norfolko sala"
+
+#: my-evolution/Locations.h:1575
+#, fuzzy
+msgid "Norfolk NAS"
+msgstr "Norfolko sala"
+
+#: my-evolution/Locations.h:1576
+#, fuzzy
+msgid "Norrkoping"
+msgstr "Dirbama"
+
+#: my-evolution/Locations.h:1577
+#, fuzzy
+msgid "North Adams"
+msgstr "�iaur�s ryt�"
+
+#: my-evolution/Locations.h:1578
+#, fuzzy
+msgid "North Bend"
+msgstr "�iaur�s"
+
+#: my-evolution/Locations.h:1579
+msgid "North Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:1580
+#, fuzzy
+msgid "North Conway"
+msgstr "Norvegija"
+
+#: my-evolution/Locations.h:1581
+#, fuzzy
+msgid "North Dakota"
+msgstr "�iaur�s ryt�"
+
+#: my-evolution/Locations.h:1582
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1583
+msgid "North Kingstown"
+msgstr ""
+
+#: my-evolution/Locations.h:1584
+#, fuzzy
+msgid "North Platte"
+msgstr "�iaur�s ryt�"
+
+#: my-evolution/Locations.h:1585
+#, fuzzy
+msgid "Northway"
+msgstr "Norvegija"
+
+#: my-evolution/Locations.h:1586
+#, fuzzy
+msgid "Northwest Territories"
+msgstr "�iaur�s vakar�"
+
+#: my-evolution/Locations.h:1588
+#, fuzzy
+msgid "Norwich"
+msgstr "�iaur�s"
+
+#: my-evolution/Locations.h:1589
+#, fuzzy
+msgid "Norwood"
+msgstr "Norvegija"
+
+#: my-evolution/Locations.h:1590
+#, fuzzy
+msgid "Notodden"
+msgstr "Pastaba"
+
+#: my-evolution/Locations.h:1591
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1595
+msgid "Nueva Ocotepeque"
+msgstr ""
+
+#: my-evolution/Locations.h:1596
+#, fuzzy
+msgid "Nuevo Laredo"
+msgstr "Neprad�ta"
+
+#: my-evolution/Locations.h:1597
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+msgid "Oahu"
+msgstr ""
+
+#: my-evolution/Locations.h:1600
+msgid "Oak Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:1601
+#, fuzzy
+msgid "Oakland"
+msgstr "Tailandas"
+
+#: my-evolution/Locations.h:1602
+#, fuzzy
+msgid "Oaxaca"
+msgstr "Jamaika"
+
+#: my-evolution/Locations.h:1603
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+msgid "Obihiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1605
+#, fuzzy
+msgid "Ocala"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1606
+#, fuzzy
+msgid "Oceanside"
+msgstr "Islandija"
+
+#: my-evolution/Locations.h:1607
+#, fuzzy
+msgid "Odense"
+msgstr "One"
+
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1609
+#, fuzzy
+msgid "Oelwen"
+msgstr "Atidaryti"
+
+#: my-evolution/Locations.h:1610
+#, fuzzy
+msgid "Ogden"
+msgstr "Atidaryti"
+
+#: my-evolution/Locations.h:1611
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1613
+msgid "Ohio"
+msgstr ""
+
+#: my-evolution/Locations.h:1614
+#, fuzzy
+msgid "Ohrid"
+msgstr "Kitas"
+
+#: my-evolution/Locations.h:1615
+msgid "Oita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1616
+#, fuzzy
+msgid "Ojika Island"
+msgstr "Kal�d� sala"
+
+#: my-evolution/Locations.h:1617
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1624
+#, fuzzy
+msgid "Okushiri Island"
+msgstr "Kal�d� sala"
+
+#: my-evolution/Locations.h:1625
+#, fuzzy
+msgid "Olathe"
+msgstr "Kitas"
+
+#: my-evolution/Locations.h:1626
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1627
+#, fuzzy
+msgid "Olbia"
+msgstr "Albanija"
+
+#: my-evolution/Locations.h:1628
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1629
+#, fuzzy
+msgid "Omaha"
+msgstr "Omanas"
+
+#: my-evolution/Locations.h:1630
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1631
+#, fuzzy
+msgid "Omak"
+msgstr "Omanas"
+
+#: my-evolution/Locations.h:1633
+msgid "Ominato Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1634
+msgid "Omsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1635
+msgid "O'Neill"
+msgstr ""
+
+#: my-evolution/Locations.h:1636
+#, fuzzy
+msgid "Ontario"
+msgstr "Orientacija"
+
+#: my-evolution/Locations.h:1637
+#, fuzzy
+msgid "Oostende"
+msgstr "Dalyvis"
+
+#: my-evolution/Locations.h:1638
+#, fuzzy
+msgid "Oran"
+msgstr "Omanas"
+
+#: my-evolution/Locations.h:1639
+msgid "Oran/Es Senia"
+msgstr ""
+
+#: my-evolution/Locations.h:1640
+#, fuzzy
+msgid "Orange"
+msgstr "Org"
+
+#: my-evolution/Locations.h:1641
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1642
+msgid "Ord-Sharp"
+msgstr ""
+
+#: my-evolution/Locations.h:1643
+#, fuzzy
+msgid "Oregon"
+msgstr "Org"
+
+#: my-evolution/Locations.h:1644
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1645
+#, fuzzy
+msgid "Orland"
+msgstr "Airija"
+
+#: my-evolution/Locations.h:1646
+#, fuzzy
+msgid "Orlando"
+msgstr "Airija"
+
+#: my-evolution/Locations.h:1647
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1648
+msgid "Orsta-Volda"
+msgstr ""
+
+#: my-evolution/Locations.h:1649
+#, fuzzy
+msgid "Oruro"
+msgstr "Klaida"
+
+#: my-evolution/Locations.h:1650
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1652
+#, fuzzy
+msgid "Oscoda"
+msgstr "sekund�"
+
+#: my-evolution/Locations.h:1653
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1657
+#, fuzzy
+msgid "Ostrava"
+msgstr "Australija"
+
+#: my-evolution/Locations.h:1658
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1661
+#, fuzzy
+msgid "Owyhee"
+msgstr "savait�"
+
+#: my-evolution/Locations.h:1662
+#, fuzzy
+msgid "Oxford"
+msgstr "kol"
+
+#: my-evolution/Locations.h:1663
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1670
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1671
+#, fuzzy
+msgid "Paganella"
+msgstr "Puslapis"
+
+#: my-evolution/Locations.h:1674
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1675
+msgid "Palacios"
+msgstr ""
+
+#: my-evolution/Locations.h:1676
+#, fuzzy
+msgid "Palermo"
+msgstr "Ie�kas"
+
+#: my-evolution/Locations.h:1677
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1678
+msgid "Palmdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1679
+#, fuzzy
+msgid "Palmer"
+msgstr "Ie�kas"
+
+#: my-evolution/Locations.h:1680
+#, fuzzy
+msgid "Palm Springs"
+msgstr "Pa�to nuostatos"
+
+#: my-evolution/Locations.h:1681
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1682
+#, fuzzy
+msgid "Pamplona"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1684
+#, fuzzy
+msgid "Panama City"
+msgstr "Panama"
+
+#: my-evolution/Locations.h:1685
+#, fuzzy
+msgid "Pantelleria"
+msgstr "Nutraukta"
+
+#: my-evolution/Locations.h:1686
+#, fuzzy
+msgid "Papa"
+msgstr "Japonija"
+
+#: my-evolution/Locations.h:1687
+#, fuzzy
+msgid "Paphos"
+msgstr "Laosas"
+
+#: my-evolution/Locations.h:1689
+#, fuzzy
+msgid "Paris"
+msgstr "Pagr"
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1692
+msgid "Paris/Orly"
+msgstr ""
+
+#: my-evolution/Locations.h:1693
+msgid "Parkersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1694
+#, fuzzy
+msgid "Pasco"
+msgstr "Slapta�odis"
+
+#: my-evolution/Locations.h:1695
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1700
+msgid "Passo Rolle"
+msgstr ""
+
+#: my-evolution/Locations.h:1701
+#, fuzzy
+msgid "Patna"
+msgstr "Panama"
+
+#: my-evolution/Locations.h:1702
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1706
+#, fuzzy
+msgid "Paysandu"
+msgstr "Groti gars�:"
+
+#: my-evolution/Locations.h:1707
+#, fuzzy
+msgid "Payson"
+msgstr "Groti gars�:"
+
+#: my-evolution/Locations.h:1708
+#, fuzzy
+msgid "Pellston"
+msgstr "Klausimas"
+
+#: my-evolution/Locations.h:1709
+#, fuzzy
+msgid "Pelotas"
+msgstr "I� naujo �kelti"
+
+#: my-evolution/Locations.h:1710
+#, fuzzy
+msgid "Pendleton"
+msgstr "Pasirinkimas:"
+
+#: my-evolution/Locations.h:1711
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1716
+#, fuzzy
+msgid "Peoria"
+msgstr "Gruzija"
+
+#: my-evolution/Locations.h:1717
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1718
+msgid "Pereira/Matecana"
+msgstr ""
+
+#: my-evolution/Locations.h:1719
+#, fuzzy
+msgid "Perm"
+msgstr "Pagr"
+
+#: my-evolution/Locations.h:1720
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1721
+msgid "Perry-Foley"
+msgstr ""
+
+#: my-evolution/Locations.h:1722
+#, fuzzy
+msgid "Perth"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1724
+#, fuzzy
+msgid "Perugia"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1725
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1730
+#, fuzzy
+msgid "Philip"
+msgstr "Filipinai"
+
+#: my-evolution/Locations.h:1731
+#, fuzzy
+msgid "Philipsburg"
+msgstr "Filipinai"
+
+#: my-evolution/Locations.h:1732
+#, fuzzy
+msgid "Phillips"
+msgstr "Filipinai"
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1739
+msgid "Piedras Negras"
+msgstr ""
+
+#: my-evolution/Locations.h:1740
+#, fuzzy
+msgid "Pierre"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1741
+msgid "Pietersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1742
+#, fuzzy
+msgid "Pikeville"
+msgstr "Per�i�ra"
+
+#: my-evolution/Locations.h:1743
+#, fuzzy
+msgid "Pine Bluff"
+msgstr "Pine pa�tas"
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+msgid "Pirassununga"
+msgstr ""
+
+#: my-evolution/Locations.h:1747
+#, fuzzy
+msgid "Pisa"
+msgstr "Pakistanas"
+
+#: my-evolution/Locations.h:1748
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1753
+#, fuzzy
+msgid "Plymouth"
+msgstr "m�nesis"
+
+#: my-evolution/Locations.h:1754
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+msgid "Pocos De Caldas"
+msgstr ""
+
+#: my-evolution/Locations.h:1756
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1757
+msgid "Podgorica Titograd"
+msgstr ""
+
+#: my-evolution/Locations.h:1758
+msgid "Pohang Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1759
+#, fuzzy
+msgid "Point Hope"
+msgstr "Spausdinti vok�"
+
+#: my-evolution/Locations.h:1760
+#, fuzzy
+msgid "Point Lay"
+msgstr "Spausdinti ap�valg�"
+
+#: my-evolution/Locations.h:1761
+#, fuzzy
+msgid "Point Mugu"
+msgstr "Spausdinti lai�k�"
+
+#: my-evolution/Locations.h:1762
+msgid "Point Piedras Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1763
+#, fuzzy
+msgid "Poitiers"
+msgstr "Savyb�s"
+
+#: my-evolution/Locations.h:1765
+msgid "Pompano Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1766
+#, fuzzy
+msgid "Ponca City"
+msgstr "Telefon� s�ra�as"
+
+#: my-evolution/Locations.h:1767
+#, fuzzy
+msgid "Ponce"
+msgstr "Joks"
+
+#: my-evolution/Locations.h:1768
+msgid "Ponta Pora"
+msgstr ""
+
+#: my-evolution/Locations.h:1769
+#, fuzzy
+msgid "Pontiac"
+msgstr "Kontaktai"
+
+#: my-evolution/Locations.h:1770
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1771
+msgid "Poplar Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1772
+#, fuzzy
+msgid "Poprad"
+msgstr "Lenkija"
+
+#: my-evolution/Locations.h:1773
+#, fuzzy
+msgid "Port Alexander"
+msgstr "Spausdinti kalendori�"
+
+#: my-evolution/Locations.h:1774
+msgid "Port Alsworth"
+msgstr ""
+
+#: my-evolution/Locations.h:1775
+#, fuzzy
+msgid "Port Angeles"
+msgstr "Spausdinti vok�"
+
+#: my-evolution/Locations.h:1776
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1777
+msgid "Port Elizabeth"
+msgstr ""
+
+#: my-evolution/Locations.h:1778
+#, fuzzy
+msgid "Porterville"
+msgstr "Per�i�ra"
+
+#: my-evolution/Locations.h:1779
+#, fuzzy
+msgid "Port Hardy"
+msgstr "Spausdinti kortel�"
+
+#: my-evolution/Locations.h:1780
+#, fuzzy
+msgid "Port Hedland"
+msgstr "Lenkija"
+
+#: my-evolution/Locations.h:1781
+msgid "Port Heiden"
+msgstr ""
+
+#: my-evolution/Locations.h:1782
+#, fuzzy
+msgid "Portland"
+msgstr "Lenkija"
+
+#: my-evolution/Locations.h:1783
+#, fuzzy
+msgid "Porto"
+msgstr "_Prievadas:"
+
+#: my-evolution/Locations.h:1784
+#, fuzzy
+msgid "Porto Alegre"
+msgstr "Pa�anga"
+
+#: my-evolution/Locations.h:1785
+msgid "Porto Alegre Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:1786
+#, fuzzy
+msgid "Portoroz"
+msgstr "Sta�ias lapas"
+
+#: my-evolution/Locations.h:1787
+#, fuzzy
+msgid "Porto Santo"
+msgstr "Sta�ias lapas"
+
+#: my-evolution/Locations.h:1788
+msgid "Porto Velho"
+msgstr ""
+
+#: my-evolution/Locations.h:1789
+#, fuzzy
+msgid "Port Said"
+msgstr "Sta�ias lapas"
+
+#: my-evolution/Locations.h:1790
+msgid "Portsmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1792
+#, fuzzy
+msgid "Posadas"
+msgstr "Lenkija"
+
+#: my-evolution/Locations.h:1793
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1796
+#, fuzzy
+msgid "Poza Rica"
+msgstr "Kosta Rika"
+
+#: my-evolution/Locations.h:1797
+#, fuzzy
+msgid "Poznan"
+msgstr "Lenkija"
+
+#: my-evolution/Locations.h:1798
+#, fuzzy
+msgid "Praha"
+msgstr "Paragvajus"
+
+#: my-evolution/Locations.h:1799
+msgid "Pratica di Mare"
+msgstr ""
+
+#: my-evolution/Locations.h:1800
+msgid "Prescott"
+msgstr ""
+
+#: my-evolution/Locations.h:1801
+#, fuzzy
+msgid "Presidente Prudente"
+msgstr "Spaudinio per�i�ra"
+
+#: my-evolution/Locations.h:1802
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1804
+#, fuzzy
+msgid "Pretoria"
+msgstr "Gruzija"
+
+#: my-evolution/Locations.h:1805
+#, fuzzy
+msgid "Preveza"
+msgstr "Praeitas"
+
+#: my-evolution/Locations.h:1806
+msgid "Price-Carbon"
+msgstr ""
+
+#: my-evolution/Locations.h:1807
+#, fuzzy
+msgid "Pristina"
+msgstr "Tradicinis"
+
+#: my-evolution/Locations.h:1808
+#, fuzzy
+msgid "Providence"
+msgstr "_Valstija/Provincija:"
+
+#: my-evolution/Locations.h:1809
+#, fuzzy
+msgid "Provincetown"
+msgstr "Per�i�ra"
+
+#: my-evolution/Locations.h:1810
+#, fuzzy
+msgid "Provo"
+msgstr "Prof"
+
+#: my-evolution/Locations.h:1811
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1812
+msgid "Pucallpa"
+msgstr ""
+
+#: my-evolution/Locations.h:1813
+msgid "Pudahuel"
+msgstr ""
+
+#: my-evolution/Locations.h:1814
+#, fuzzy
+msgid "Puebla"
+msgstr "Vie�as"
+
+#: my-evolution/Locations.h:1815
+#, fuzzy
+msgid "Pueblo"
+msgstr "Vie�as"
+
+#: my-evolution/Locations.h:1816
+#, fuzzy
+msgid "Puerto Barrios"
+msgstr "Puerto Rikas"
+
+#: my-evolution/Locations.h:1817
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1818
+#, fuzzy
+msgid "Puerto Escondido"
+msgstr "Puerto Rikas"
+
+#: my-evolution/Locations.h:1819
+#, fuzzy
+msgid "Puerto Lempira"
+msgstr "Puerto Rikas"
+
+#: my-evolution/Locations.h:1820
+#, fuzzy
+msgid "Puerto Limon"
+msgstr "Puerto Rikas"
+
+#: my-evolution/Locations.h:1821
+msgid "Puerto Maldonado"
+msgstr ""
+
+#: my-evolution/Locations.h:1822
+#, fuzzy
+msgid "Puerto Montt"
+msgstr "Puerto Rikas"
+
+#: my-evolution/Locations.h:1823
+#, fuzzy
+msgid "Puerto Plata"
+msgstr "Puerto Rikas"
+
+#: my-evolution/Locations.h:1825
+#, fuzzy
+msgid "Puerto Suarez"
+msgstr "Spausdinti ap�valg�"
+
+#: my-evolution/Locations.h:1826
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1827
+#, fuzzy
+msgid "Pula"
+msgstr "Lenkija"
+
+#: my-evolution/Locations.h:1828
+#, fuzzy
+msgid "Pullman"
+msgstr "Lenkija"
+
+#: my-evolution/Locations.h:1829
+msgid "Punta Arenas"
+msgstr ""
+
+#: my-evolution/Locations.h:1830
+#, fuzzy
+msgid "Punta Cana"
+msgstr "Spausdinti kalendori�"
+
+#: my-evolution/Locations.h:1831
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1835
+msgid "Pyongyang"
+msgstr ""
+
+#: my-evolution/Locations.h:1837
+#, fuzzy
+msgid "Quantico"
+msgstr "Klausimas"
+
+#: my-evolution/Locations.h:1838
+#, fuzzy
+msgid "Quebec"
+msgstr "Tema"
+
+#: my-evolution/Locations.h:1839
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1842
+msgid "Quimper"
+msgstr ""
+
+#: my-evolution/Locations.h:1843
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1850
+#, fuzzy
+msgid "Rapid City"
+msgstr "Atsakytas"
+
+#: my-evolution/Locations.h:1851
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1852
+msgid "Ras Al Khaimah"
+msgstr ""
+
+#: my-evolution/Locations.h:1853
+#, fuzzy
+msgid "Rawlins"
+msgstr "Lietus"
+
+#: my-evolution/Locations.h:1854
+#, fuzzy
+msgid "Reading"
+msgstr "Antra�t�s"
+
+#: my-evolution/Locations.h:1855
+msgid "Rebun Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1856
+#, fuzzy
+msgid "Recife"
+msgstr "Gautas"
+
+#: my-evolution/Locations.h:1857
+msgid "Red Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1858
+#, fuzzy
+msgid "Redding"
+msgstr "Antra�t�s"
+
+#: my-evolution/Locations.h:1859
+#, fuzzy
+msgid "Redig"
+msgstr "Skaitytas"
+
+#: my-evolution/Locations.h:1860
+#, fuzzy
+msgid "Redmond"
+msgstr "U�uomina"
+
+#: my-evolution/Locations.h:1861
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1863
+msgid "Reggio Calabria"
+msgstr ""
+
+#: my-evolution/Locations.h:1864
+#, fuzzy
+msgid "Regina"
+msgstr "Regionai"
+
+#: my-evolution/Locations.h:1865
+msgid "Reims-Champagne"
+msgstr ""
+
+#: my-evolution/Locations.h:1866
+#, fuzzy
+msgid "Rennes"
+msgstr "U�uominos"
+
+#: my-evolution/Locations.h:1867
+#, fuzzy
+msgid "Reno"
+msgstr "Pa�alinti"
+
+#: my-evolution/Locations.h:1868
+#, fuzzy
+msgid "Renton"
+msgstr "Regionai"
+
+#: my-evolution/Locations.h:1869
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1870
+#, fuzzy
+msgid "Reus"
+msgstr "Taisykl�s"
+
+#: my-evolution/Locations.h:1871
+#, fuzzy
+msgid "Reyes"
+msgstr "met�"
+
+#: my-evolution/Locations.h:1872
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1873
+#, fuzzy
+msgid "Reynosa"
+msgstr "I� naujo �kelti"
+
+#: my-evolution/Locations.h:1874
+#, fuzzy
+msgid "Rhinelander"
+msgstr "Suomija"
+
+#: my-evolution/Locations.h:1875
+#, fuzzy
+msgid "Rhode Island"
+msgstr "Norfolko sala"
+
+#: my-evolution/Locations.h:1876
+#, fuzzy
+msgid "Riberalta"
+msgstr "Gibraltaras"
+
+#: my-evolution/Locations.h:1877
+msgid "Richmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1878
+#, fuzzy
+msgid "Rickenbacker"
+msgstr "Pravard�"
+
+#: my-evolution/Locations.h:1879
+#, fuzzy
+msgid "Rieti"
+msgstr "Haitis"
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rifle"
+msgstr "Rol�"
+
+#: my-evolution/Locations.h:1881
+#, fuzzy
+msgid "Riga"
+msgstr "De�in�je:"
+
+#: my-evolution/Locations.h:1882
+#, fuzzy
+msgid "Rijeka"
+msgstr "Skaitytas"
+
+#: my-evolution/Locations.h:1883
+#, fuzzy
+msgid "Rimini"
+msgstr "Rumunija"
+
+#: my-evolution/Locations.h:1884
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1885
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1886
+msgid "Rio Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1887
+#, fuzzy
+msgid "Rioja"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1888
+#, fuzzy
+msgid "Rio / Jacarepagua"
+msgstr "Nikaragva"
+
+#: my-evolution/Locations.h:1889
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+#, fuzzy
+msgid "Rishiri Island"
+msgstr "Kal�d� sala"
+
+#: my-evolution/Locations.h:1891
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+#, fuzzy
+msgid "Rivera"
+msgstr "Liberija"
+
+#: my-evolution/Locations.h:1893
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1894
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1895
+msgid "Riverton"
+msgstr ""
+
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "Pine"
+
+#: my-evolution/Locations.h:1897
+#, fuzzy
+msgid "Rivolto"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:1898
+#, fuzzy
+msgid "Riyadh"
+msgstr "Skaitytas"
+
+#: my-evolution/Locations.h:1899
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1900
+#, fuzzy
+msgid "Roatan"
+msgstr "Kroatija"
+
+#: my-evolution/Locations.h:1901
+#, fuzzy
+msgid "Robore"
+msgstr "prie�"
+
+#: my-evolution/Locations.h:1902
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1903
+msgid "Rockford"
+msgstr ""
+
+#: my-evolution/Locations.h:1904
+#, fuzzy
+msgid "Rockland"
+msgstr "Lenkija"
+
+#: my-evolution/Locations.h:1905
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1907
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1908
+#, fuzzy
+msgid "Rodos"
+msgstr "Kambarys"
+
+#: my-evolution/Locations.h:1909
+#, fuzzy
+msgid "Rogers"
+msgstr "Aplankai"
+
+#: my-evolution/Locations.h:1910
+#, fuzzy
+msgid "Roma/Ciampino"
+msgstr "Rumunija"
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1917
+msgid "Roosevelt"
+msgstr ""
+
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Roros"
+msgstr "Komorai"
+
+#: my-evolution/Locations.h:1919
+msgid "Rorvik/Ryum"
+msgstr ""
+
+#: my-evolution/Locations.h:1920
+#, fuzzy
+msgid "Rosario"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1921
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1922
+#, fuzzy
+msgid "Roseglen"
+msgstr "Rol�"
+
+#: my-evolution/Locations.h:1923
+#, fuzzy
+msgid "Rost"
+msgstr "Hostas"
+
+#: my-evolution/Locations.h:1924
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1927
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1928
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1929
+#, fuzzy
+msgid "Rurrenabaque"
+msgstr "Pasikartojimas"
+
+#: my-evolution/Locations.h:1930
+msgid "Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1931
+#, fuzzy
+msgid "Russia"
+msgstr "Austrija"
+
+#: my-evolution/Locations.h:1932
+#, fuzzy
+msgid "Rutland"
+msgstr "Butanas"
+
+#: my-evolution/Locations.h:1933
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1935
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1936
+msgid "Sabine Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:1937
+#, fuzzy
+msgid "Sacramento"
+msgstr "Departamentas"
+
+#: my-evolution/Locations.h:1938
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1939
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1940
+#, fuzzy
+msgid "Saginaw"
+msgstr "Ispanija"
+
+#: my-evolution/Locations.h:1941
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1944
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1945
+#, fuzzy
+msgid "Saint Mary's"
+msgstr "San Marinas"
+
+#: my-evolution/Locations.h:1946
+#, fuzzy
+msgid "Saint Mawgan"
+msgstr "San Marinas"
+
+#: my-evolution/Locations.h:1947
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1948
+msgid "Saint Paul"
+msgstr ""
+
+#: my-evolution/Locations.h:1949
+#, fuzzy
+msgid "Saiq"
+msgstr "Ispanija"
+
+#: my-evolution/Locations.h:1950
+msgid "Salalah"
+msgstr ""
+
+#: my-evolution/Locations.h:1951
+#, fuzzy
+msgid "Salem"
+msgstr "I�saugoti"
+
+#: my-evolution/Locations.h:1952
+#, fuzzy
+msgid "Salida"
+msgstr "Somalis"
+
+#: my-evolution/Locations.h:1953
+msgid "Salida-Harriet"
+msgstr ""
+
+#: my-evolution/Locations.h:1954
+#, fuzzy
+msgid "Salina"
+msgstr "Somalis"
+
+#: my-evolution/Locations.h:1955
+#, fuzzy
+msgid "Salinas"
+msgstr "Somalis"
+
+#: my-evolution/Locations.h:1956
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1957
+#, fuzzy
+msgid "Salmon"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1958
+msgid "Salmon (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1959
+#, fuzzy
+msgid "Salta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1960
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1961
+msgid "Salt Lake City"
+msgstr ""
+
+#: my-evolution/Locations.h:1962
+#, fuzzy
+msgid "Salto"
+msgstr "�_e�"
+
+#: my-evolution/Locations.h:1963
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+msgid "Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:1965
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1966
+#, fuzzy
+msgid "Samara"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1967
+#, fuzzy
+msgid "Samos"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1968
+#, fuzzy
+msgid "Samsun"
+msgstr "_Sek"
+
+#: my-evolution/Locations.h:1969
+#, fuzzy
+msgid "Sana'A"
+msgstr "Sm�lis"
+
+#: my-evolution/Locations.h:1970
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+#, fuzzy
+msgid "San Angelo"
+msgstr "San Marinas"
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1975
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1976
+#, fuzzy
+msgid "San Carlos"
+msgstr "San Marinas"
+
+#: my-evolution/Locations.h:1977
+#, fuzzy
+msgid "Sandane"
+msgstr "Sm�lis"
+
+#: my-evolution/Locations.h:1978
+#, fuzzy
+msgid "Sandberg"
+msgstr "Siunt�jas"
+
+#: my-evolution/Locations.h:1979
+#, fuzzy
+msgid "Sanderson"
+msgstr "Siunt�jas"
+
+#: my-evolution/Locations.h:1980
+#, fuzzy
+msgid "San Diego"
+msgstr "San Marinas"
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1986
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1987
+#, fuzzy
+msgid "Sand Point"
+msgstr "San Marinas"
+
+#: my-evolution/Locations.h:1988
+msgid "San Fernando De Apure"
+msgstr ""
+
+#: my-evolution/Locations.h:1989
+#, fuzzy
+msgid "Sanford"
+msgstr "Sm�lis"
+
+#: my-evolution/Locations.h:1990
+#, fuzzy
+msgid "San Francisco"
+msgstr "San Marinas"
+
+#: my-evolution/Locations.h:1991
+#, fuzzy
+msgid "Sangju"
+msgstr "Pustoniai"
+
+#: my-evolution/Locations.h:1992
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1993
+#, fuzzy
+msgid "San Joaquin"
+msgstr "San Marinas"
+
+#: my-evolution/Locations.h:1994
+#, fuzzy
+msgid "San Jose"
+msgstr "I�saugoti ir u�daryti"
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1997
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1998
+#, fuzzy
+msgid "San Juan"
+msgstr "San Marinas"
+
+#: my-evolution/Locations.h:1999
+msgid "Sankt-Peterburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2000
+#, fuzzy
+msgid "Sanliurfa"
+msgstr "Somalis"
+
+#: my-evolution/Locations.h:2001
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2002
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2003
+#, fuzzy
+msgid "San Miguel"
+msgstr "San Marinas"
+
+#: my-evolution/Locations.h:2004
+#, fuzzy
+msgid "San Nicholas Island"
+msgstr "Norfolko sala"
+
+#: my-evolution/Locations.h:2005
+msgid "San Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:2006
+#, fuzzy
+msgid "San Sebastian"
+msgstr "San Marinas"
+
+#: my-evolution/Locations.h:2007
+msgid "Santa Ana"
+msgstr ""
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+#, fuzzy
+msgid "Santa Maria"
+msgstr "San Marinas"
+
+#: my-evolution/Locations.h:2012
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2013
+msgid "Santa Monica"
+msgstr ""
+
+#: my-evolution/Locations.h:2014
+#, fuzzy
+msgid "Santander"
+msgstr "Siunt�jas"
+
+#: my-evolution/Locations.h:2015
+#, fuzzy
+msgid "Santarem"
+msgstr "Sm�lio audra"
+
+#: my-evolution/Locations.h:2016
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2017
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+msgid "Santiago"
+msgstr ""
+
+#: my-evolution/Locations.h:2019
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2020
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2021
+#, fuzzy
+msgid "Santorini"
+msgstr "Sm�lio audra"
+
+#: my-evolution/Locations.h:2022
+#, fuzzy
+msgid "Santos"
+msgstr "B�sena"
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+msgid "Sao Luiz"
+msgstr ""
+
+#: my-evolution/Locations.h:2025
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2028
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+#, fuzzy
+msgid "Sarasota"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:2030
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+#, fuzzy
+msgid "Sarzana"
+msgstr "�ri Lanka"
+
+#: my-evolution/Locations.h:2032
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2033
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2038
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2039
+msgid "Sawyer AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2040
+#, fuzzy
+msgid "Sayun"
+msgstr "_Sek"
+
+#: my-evolution/Locations.h:2041
+#, fuzzy
+msgid "Scatsta"
+msgstr "B�sena"
+
+#: my-evolution/Locations.h:2042
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2045
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2046
+msgid "Scottsdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Scranton"
+msgstr "Organizacija"
+
+#: my-evolution/Locations.h:2048
+msgid "Seattle"
+msgstr ""
+
+#: my-evolution/Locations.h:2049
+#, fuzzy
+msgid "Seattle-Boeing"
+msgstr "Nuostatos"
+
+#: my-evolution/Locations.h:2050
+#, fuzzy
+msgid "Sedalia"
+msgstr "Somalis"
+
+#: my-evolution/Locations.h:2051
+#, fuzzy
+msgid "Seeb"
+msgstr "Matytas"
+
+#: my-evolution/Locations.h:2052
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+#, fuzzy
+msgid "Sendai Airport"
+msgstr "Pradedama importuoti"
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2058
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2059
+msgid "Sevilla"
+msgstr ""
+
+#: my-evolution/Locations.h:2060
+#, fuzzy
+msgid "Seward"
+msgstr "Paie�ka"
+
+#: my-evolution/Locations.h:2061
+msgid "Sexton Summit"
+msgstr ""
+
+#: my-evolution/Locations.h:2062
+#, fuzzy
+msgid "Shanghai"
+msgstr "Pustoniai"
+
+#: my-evolution/Locations.h:2063
+msgid "Shannon"
+msgstr ""
+
+#: my-evolution/Locations.h:2064
+#, fuzzy
+msgid "Sharjah"
+msgstr "Paie�ka"
+
+#: my-evolution/Locations.h:2065
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+#: my-evolution/Locations.h:2066
+#, fuzzy
+msgid "Sharurah"
+msgstr "�e�tadienis"
+
+#: my-evolution/Locations.h:2067
+#, fuzzy
+msgid "Shawbury"
+msgstr "�e�tadienis"
+
+#: my-evolution/Locations.h:2068
+#, fuzzy
+msgid "Shearwater"
+msgstr "Prad�ios data"
+
+#: my-evolution/Locations.h:2069
+msgid "Sheboygan"
+msgstr ""
+
+#: my-evolution/Locations.h:2070
+#, fuzzy
+msgid "Sheldon"
+msgstr "�vedija"
+
+#: my-evolution/Locations.h:2071
+msgid "Shelter Cove"
+msgstr ""
+
+#: my-evolution/Locations.h:2072
+#, fuzzy
+msgid "Shelton"
+msgstr "Pasirinkimas:"
+
+#: my-evolution/Locations.h:2073
+msgid "Shenandoah"
+msgstr ""
+
+#: my-evolution/Locations.h:2074
+#, fuzzy
+msgid "Sheridan"
+msgstr "Sudanas"
+
+#: my-evolution/Locations.h:2075
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2076
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2077
+msgid "Shingle Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2078
+#, fuzzy
+msgid "Shiraz"
+msgstr "Dydis"
+
+#: my-evolution/Locations.h:2079
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2080
+msgid "Shizuhama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2081
+#, fuzzy
+msgid "Shoreham"
+msgstr "�vertis"
+
+#: my-evolution/Locations.h:2082
+#, fuzzy
+msgid "Show Low"
+msgstr "Rodyti vien� savait�"
+
+#: my-evolution/Locations.h:2083
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2084
+msgid "Shreveport Regional"
+msgstr ""
+
+#: my-evolution/Locations.h:2085
+#, fuzzy
+msgid "Sidney"
+msgstr "Pine"
+
+#: my-evolution/Locations.h:2086
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2087
+msgid "Siloam Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2088
+#, fuzzy
+msgid "Silver City"
+msgstr "Saugumas"
+
+#: my-evolution/Locations.h:2089
+#, fuzzy
+msgid "Sindal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2091
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2097
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2098
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+#: my-evolution/Locations.h:2099
+#, fuzzy
+msgid "Skive"
+msgstr "Dydis"
+
+#: my-evolution/Locations.h:2100
+#, fuzzy
+msgid "Skopje"
+msgstr "Stop"
+
+#: my-evolution/Locations.h:2101
+#, fuzzy
+msgid "Skwentna"
+msgstr "Si�sti lai�kai"
+
+#: my-evolution/Locations.h:2102
+#, fuzzy
+msgid "Slana"
+msgstr "Albanija"
+
+#: my-evolution/Locations.h:2105
+#, fuzzy
+msgid "Smithers"
+msgstr "minu�i�"
+
+#: my-evolution/Locations.h:2106
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2107
+msgid "Snowshoe Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2108
+#, fuzzy
+msgid "Sochi"
+msgstr "Piet�"
+
+#: my-evolution/Locations.h:2109
+#, fuzzy
+msgid "Socorro"
+msgstr "�vertis"
+
+#: my-evolution/Locations.h:2110
+#, fuzzy
+msgid "Socotra"
+msgstr "�vertis"
+
+#: my-evolution/Locations.h:2111
+msgid "Soda Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2112
+#, fuzzy
+msgid "Sofia"
+msgstr "Somalis"
+
+#: my-evolution/Locations.h:2113
+#, fuzzy
+msgid "Sogndal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2114
+#, fuzzy
+msgid "Soldotna"
+msgstr "Slov�nija"
+
+#: my-evolution/Locations.h:2115
+#, fuzzy
+msgid "Somerset"
+msgstr "�vertis"
+
+#: my-evolution/Locations.h:2116
+#, fuzzy
+msgid "Sonderborg"
+msgstr "Siunt�jas"
+
+#: my-evolution/Locations.h:2117
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2120
+#, fuzzy
+msgid "Southampton"
+msgstr "Pietry�i�"
+
+#: my-evolution/Locations.h:2121
+#, fuzzy
+msgid "South Bend"
+msgstr "Piet�"
+
+#: my-evolution/Locations.h:2122
+#, fuzzy
+msgid "South Carolina"
+msgstr "Piet� Afrikos respublika"
+
+#: my-evolution/Locations.h:2123
+#, fuzzy
+msgid "South Dakota"
+msgstr "Pietry�i�"
+
+#: my-evolution/Locations.h:2124
+#, fuzzy
+msgid "Southend"
+msgstr "Piet�"
+
+#: my-evolution/Locations.h:2125
+#, fuzzy
+msgid "South Marsh Island"
+msgstr "Mar�alo salos"
+
+#: my-evolution/Locations.h:2126
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2128
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2129
+#, fuzzy
+msgid "Spencer"
+msgstr "Siunt�jas"
+
+#: my-evolution/Locations.h:2130
+msgid "Spickard"
+msgstr ""
+
+#: my-evolution/Locations.h:2131
+#, fuzzy
+msgid "Split"
+msgstr "s�ra�as"
+
+#: my-evolution/Locations.h:2132
+#, fuzzy
+msgid "Spokane"
+msgstr "Ispanija"
+
+#: my-evolution/Locations.h:2133
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2134
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "Springfield"
+msgstr "Supaprastintas"
+
+#: my-evolution/Locations.h:2136
+msgid "Stampede Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:2137
+#, fuzzy
+msgid "State College"
+msgstr "U�baigimo data:"
+
+#: my-evolution/Locations.h:2138
+#, fuzzy
+msgid "Stauning"
+msgstr "Nuostatos"
+
+#: my-evolution/Locations.h:2139
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2140
+msgid "Stavanger/Sola"
+msgstr ""
+
+#: my-evolution/Locations.h:2141
+#, fuzzy
+msgid "Staverton"
+msgstr "Nuostatos"
+
+#: my-evolution/Locations.h:2142
+#, fuzzy
+msgid "Stavropol"
+msgstr "Stop"
+
+#: my-evolution/Locations.h:2143
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2144
+msgid "Steamboat Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2145
+#, fuzzy
+msgid "Stephenville"
+msgstr "Sei�eliai"
+
+#: my-evolution/Locations.h:2146
+#, fuzzy
+msgid "St. George"
+msgstr "Saugykla"
+
+#: my-evolution/Locations.h:2147
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2148
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2149
+msgid "St Johnsbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2150
+#, fuzzy
+msgid "St Joseph"
+msgstr "Stop"
+
+#: my-evolution/Locations.h:2151
+#, fuzzy
+msgid "St Louis"
+msgstr "Sustabdyti �k�lim�"
+
+#: my-evolution/Locations.h:2152
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2157
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2158
+#, fuzzy
+msgid "Storm Lake"
+msgstr "Saugykla"
+
+#: my-evolution/Locations.h:2159
+#, fuzzy
+msgid "Stornoway"
+msgstr "Norvegija"
+
+#: my-evolution/Locations.h:2160
+#, fuzzy
+msgid "St Paul"
+msgstr "B�sena"
+
+#: my-evolution/Locations.h:2161
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2164
+#, fuzzy
+msgid "Strevell"
+msgstr "Saugykla"
+
+#: my-evolution/Locations.h:2165
+#, fuzzy
+msgid "St Simon's Island"
+msgstr "Kal�d� sala"
+
+#: my-evolution/Locations.h:2166
+msgid "Stumpy Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2167
+#, fuzzy
+msgid "Sturgeon Bay"
+msgstr "�e�tadienis"
+
+#: my-evolution/Locations.h:2168
+msgid "Stuttgart"
+msgstr ""
+
+#: my-evolution/Locations.h:2169
+#, fuzzy
+msgid "Sucre"
+msgstr "�vertis"
+
+#: my-evolution/Locations.h:2170
+#, fuzzy
+msgid "Sumburgh"
+msgstr "Liuksemburgas"
+
+#: my-evolution/Locations.h:2171
+#, fuzzy
+msgid "Sumter"
+msgstr "Ap�valga"
+
+#: my-evolution/Locations.h:2172
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2174
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2175
+msgid "Superior"
+msgstr ""
+
+#: my-evolution/Locations.h:2177
+#, fuzzy
+msgid "Sutton"
+msgstr "_Sek"
+
+#: my-evolution/Locations.h:2178
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2179
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2188
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2189
+msgid "Szombathely"
+msgstr ""
+
+#: my-evolution/Locations.h:2190
+#, fuzzy
+msgid "Tabatinga"
+msgstr "Tradicinis"
+
+#: my-evolution/Locations.h:2191
+msgid "Tabriz"
+msgstr ""
+
+#: my-evolution/Locations.h:2192
+#, fuzzy
+msgid "Tabuk"
+msgstr "U�duotis"
+
+#: my-evolution/Locations.h:2193
+msgid "Tachikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+#, fuzzy
+msgid "Tacna"
+msgstr "Gana"
+
+#: my-evolution/Locations.h:2195
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2199
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+#, fuzzy
+msgid "Taejon"
+msgstr "Tada"
+
+#: my-evolution/Locations.h:2201
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2202
+msgid "Taichung"
+msgstr ""
+
+#: my-evolution/Locations.h:2203
+#, fuzzy
+msgid "Taif"
+msgstr "Taivanas"
+
+#: my-evolution/Locations.h:2204
+#, fuzzy
+msgid "Tainan"
+msgstr "Taivanas"
+
+#: my-evolution/Locations.h:2206
+#, fuzzy
+msgid "Taiyuan"
+msgstr "Taivanas"
+
+#: my-evolution/Locations.h:2207
+#, fuzzy
+msgid "Taiz"
+msgstr "Taivanas"
+
+#: my-evolution/Locations.h:2208
+#, fuzzy
+msgid "Tajima"
+msgstr "Taivanas"
+
+#: my-evolution/Locations.h:2209
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Talara"
+msgstr ""
+
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Talinn"
+msgstr "Taivanas"
+
+#: my-evolution/Locations.h:2212
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tallahassee"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2215
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2216
+#, fuzzy
+msgid "Tampa"
+msgstr "Japonija"
+
+#: my-evolution/Locations.h:2217
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2218
+#, fuzzy
+msgid "Tampere"
+msgstr "Popierius"
+
+#: my-evolution/Locations.h:2219
+msgid "Tampico"
+msgstr ""
+
+#: my-evolution/Locations.h:2220
+#, fuzzy
+msgid "Tanana"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:2221
+msgid "Tanegashima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2222
+#, fuzzy
+msgid "Taos"
+msgstr "Laosas"
+
+#: my-evolution/Locations.h:2223
+#, fuzzy
+msgid "Taoyuan"
+msgstr "Taivanas"
+
+#: my-evolution/Locations.h:2224
+msgid "Tapachula"
+msgstr ""
+
+#: my-evolution/Locations.h:2225
+#, fuzzy
+msgid "Taranto"
+msgstr "Siuntimas"
+
+#: my-evolution/Locations.h:2226
+#, fuzzy
+msgid "Tarbes"
+msgstr "U�duotis"
+
+#: my-evolution/Locations.h:2227
+#, fuzzy
+msgid "Tarija"
+msgstr "Taivanas"
+
+#: my-evolution/Locations.h:2228
+msgid "Tarvisio"
+msgstr ""
+
+#: my-evolution/Locations.h:2229
+#, fuzzy
+msgid "Tatalina"
+msgstr "Tradicinis"
+
+#: my-evolution/Locations.h:2230
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2235
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2236
+#, fuzzy
+msgid "Tela"
+msgstr "Teleksas"
+
+#: my-evolution/Locations.h:2237
+#, fuzzy
+msgid "Temple"
+msgstr "Teleksas"
+
+#: my-evolution/Locations.h:2238
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2244
+msgid "Texarkana"
+msgstr ""
+
+#: my-evolution/Locations.h:2245
+#, fuzzy
+msgid "Texas"
+msgstr "U�duotis"
+
+#: my-evolution/Locations.h:2246
+#, fuzzy
+msgid "The Dalles"
+msgstr "Sei�eliai"
+
+#: my-evolution/Locations.h:2247
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2248
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2249
+msgid "Thiruvananthapuram"
+msgstr ""
+
+#: my-evolution/Locations.h:2250
+#, fuzzy
+msgid "Thisted"
+msgstr "Titulas"
+
+#: my-evolution/Locations.h:2251
+msgid "Thompson Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2252
+#, fuzzy
+msgid "Thumrait"
+msgstr "Ketvirtadienis"
+
+#: my-evolution/Locations.h:2253
+#, fuzzy
+msgid "Tianjin"
+msgstr "Taivanas"
+
+#: my-evolution/Locations.h:2254
+#, fuzzy
+msgid "Tijuana"
+msgstr "Lietuva"
+
+#: my-evolution/Locations.h:2255
+msgid "Timisoara"
+msgstr ""
+
+#: my-evolution/Locations.h:2256
+msgid "Tin City"
+msgstr ""
+
+#: my-evolution/Locations.h:2257
+#, fuzzy
+msgid "Tirana"
+msgstr "Taivanas"
+
+#: my-evolution/Locations.h:2258
+#, fuzzy
+msgid "Tiree"
+msgstr "Laisvas"
+
+#: my-evolution/Locations.h:2259
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2260
+msgid "Tiruchchirapalli"
+msgstr ""
+
+#: my-evolution/Locations.h:2261
+#, fuzzy
+msgid "Titusville"
+msgstr "Titulas"
+
+#: my-evolution/Locations.h:2262
+#, fuzzy
+msgid "Tivat"
+msgstr "Asmeni�kas"
+
+#: my-evolution/Locations.h:2263
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2267
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+#, fuzzy
+msgid "Tokunoshima Island"
+msgstr "Kal�d� sala"
+
+#: my-evolution/Locations.h:2269
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2271
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2272
+msgid "Tokyo New International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2273
+#, fuzzy
+msgid "Toledo"
+msgstr "Perjungti"
+
+#: my-evolution/Locations.h:2274
+msgid "Toluca"
+msgstr ""
+
+#: my-evolution/Locations.h:2275
+#, fuzzy
+msgid "Tonopah"
+msgstr "Tonga"
+
+#: my-evolution/Locations.h:2276
+#, fuzzy
+msgid "Topeka"
+msgstr "Vir�uje:"
+
+#: my-evolution/Locations.h:2277
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2279
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2280
+#, fuzzy
+msgid "Toronto"
+msgstr "Tornado"
+
+#: my-evolution/Locations.h:2281
+#, fuzzy
+msgid "Torp"
+msgstr "Vir�uje:"
+
+#: my-evolution/Locations.h:2282
+#, fuzzy
+msgid "Torrance"
+msgstr "Pranc�zija"
+
+#: my-evolution/Locations.h:2283
+#, fuzzy
+msgid "Torreon"
+msgstr "Kor�jie�i�"
+
+#: my-evolution/Locations.h:2284
+#, fuzzy
+msgid "Tottori Airport"
+msgstr "Pradedama importuoti"
+
+#: my-evolution/Locations.h:2285
+#, fuzzy
+msgid "Toulouse"
+msgstr "U�daryti"
+
+#: my-evolution/Locations.h:2286
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2290
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2291
+#, fuzzy
+msgid "Trabzon"
+msgstr "Gabonas"
+
+#: my-evolution/Locations.h:2292
+#, fuzzy
+msgid "Trapani"
+msgstr "Japonija"
+
+#: my-evolution/Locations.h:2293
+msgid "Traverse City"
+msgstr ""
+
+#: my-evolution/Locations.h:2294
+#, fuzzy
+msgid "Trelew"
+msgstr "Teleksas"
+
+#: my-evolution/Locations.h:2295
+#, fuzzy
+msgid "Trenton"
+msgstr "Orientacija"
+
+#: my-evolution/Locations.h:2296
+#, fuzzy
+msgid "Trevico"
+msgstr "Praeitas"
+
+#: my-evolution/Locations.h:2297
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2298
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2299
+#, fuzzy
+msgid "Trieste"
+msgstr "Bandyti"
+
+#: my-evolution/Locations.h:2300
+#, fuzzy
+msgid "Trinidad"
+msgstr "Tornado"
+
+#: my-evolution/Locations.h:2301
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2304
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2305
+msgid "Troyes/Barberey"
+msgstr ""
+
+#: my-evolution/Locations.h:2306
+#, fuzzy
+msgid "Truckee"
+msgstr "Turkija"
+
+#: my-evolution/Locations.h:2307
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2314
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2315
+msgid "Tulancingo"
+msgstr ""
+
+#: my-evolution/Locations.h:2316
+#, fuzzy
+msgid "Tulcea"
+msgstr "Antradienis"
+
+#: my-evolution/Locations.h:2317
+#, fuzzy
+msgid "Tulsa"
+msgstr "Tunisas"
+
+#: my-evolution/Locations.h:2318
+#, fuzzy
+msgid "Tupelo"
+msgstr "_Ant"
+
+#: my-evolution/Locations.h:2319
+#, fuzzy
+msgid "Turaif"
+msgstr "Turk�"
+
+#: my-evolution/Locations.h:2320
+#, fuzzy
+msgid "Turin"
+msgstr "Turk�"
+
+#: my-evolution/Locations.h:2322
+#, fuzzy
+msgid "Turku"
+msgstr "Turkija"
+
+#: my-evolution/Locations.h:2323
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2324
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+#: my-evolution/Locations.h:2325
+#, fuzzy
+msgid "Twenthe"
+msgstr "Negalutinis"
+
+#: my-evolution/Locations.h:2326
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2327
+msgid "Twin Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2328
+#, fuzzy
+msgid "Tyler"
+msgstr "Tipas"
+
+#: my-evolution/Locations.h:2329
+msgid "Tyndall AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2330
+#, fuzzy
+msgid "Tyumen"
+msgstr "_Ant"
+
+#: my-evolution/Locations.h:2331
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2332
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2340
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2341
+#, fuzzy
+msgid "United Arab Emirates "
+msgstr "Jungtiniai Arab� Emyratai"
+
+#: my-evolution/Locations.h:2344
+#, fuzzy
+msgid "Unst"
+msgstr "Nematytas"
+
+#: my-evolution/Locations.h:2345
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2346
+#, fuzzy
+msgid "Uruapan"
+msgstr "Japonija"
+
+#: my-evolution/Locations.h:2347
+#, fuzzy
+msgid "Uruguaiana"
+msgstr "Urugvajus"
+
+#: my-evolution/Locations.h:2349
+msgid "Urumqi"
+msgstr ""
+
+#: my-evolution/Locations.h:2350
+#, fuzzy
+msgid "Utah"
+msgstr "-�"
+
+#: my-evolution/Locations.h:2351
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2353
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:2355
+#, fuzzy
+msgid "Vadso"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:2356
+#, fuzzy
+msgid "Vaerlose"
+msgstr "Kintamos krypties"
+
+#: my-evolution/Locations.h:2357
+#, fuzzy
+msgid "Vagar"
+msgstr "Ie�kas"
+
+#: my-evolution/Locations.h:2358
+msgid "Valdez 2"
+msgstr ""
+
+#: my-evolution/Locations.h:2359
+#, fuzzy
+msgid "Valdosta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:2360
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2361
+#, fuzzy
+msgid "Valencia"
+msgstr "Slov�nija"
+
+#: my-evolution/Locations.h:2362
+#, fuzzy
+msgid "Valentine"
+msgstr "�i�r�ti viduje"
+
+#: my-evolution/Locations.h:2363
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2366
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2367
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2368
+#, fuzzy
+msgid "Van"
+msgstr "Vad"
+
+#: my-evolution/Locations.h:2369
+msgid "Vancouver"
+msgstr ""
+
+#: my-evolution/Locations.h:2370
+#, fuzzy
+msgid "Vandel"
+msgstr "Nutraukti"
+
+#: my-evolution/Locations.h:2371
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2373
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+#, fuzzy
+msgid "Varadero"
+msgstr "Kintamos krypties"
+
+#: my-evolution/Locations.h:2375
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2376
+#, fuzzy
+msgid "Varna"
+msgstr "Vanuatu"
+
+#: my-evolution/Locations.h:2377
+#, fuzzy
+msgid "Vasteras"
+msgstr "po"
+
+#: my-evolution/Locations.h:2378
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2379
+#, fuzzy
+msgid "Venezia"
+msgstr "Venesuela"
+
+#: my-evolution/Locations.h:2381
+#, fuzzy
+msgid "Venice"
+msgstr "Unikodas"
+
+#: my-evolution/Locations.h:2382
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2383
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2384
+#, fuzzy
+msgid "Vermont"
+msgstr "m�nesis"
+
+#: my-evolution/Locations.h:2385
+#, fuzzy
+msgid "Vernal"
+msgstr "Esm�"
+
+#: my-evolution/Locations.h:2386
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+#, fuzzy
+msgid "Vicenza"
+msgstr "Venesuela"
+
+#: my-evolution/Locations.h:2388
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2390
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2393
+msgid "Vigo"
+msgstr ""
+
+#: my-evolution/Locations.h:2394
+#, fuzzy
+msgid "Vilhena"
+msgstr "Bylos vardas:"
+
+#: my-evolution/Locations.h:2395
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+msgid "Villahermosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2398
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2404
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+#, fuzzy
+msgid "Visalia"
+msgstr "Australija"
+
+#: my-evolution/Locations.h:2406
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2410
+msgid "Vladivostok"
+msgstr ""
+
+#: my-evolution/Locations.h:2411
+#, fuzzy
+msgid "Vlieland"
+msgstr "Suomija"
+
+#: my-evolution/Locations.h:2412
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2413
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2414
+#, fuzzy
+msgid "Volkel"
+msgstr "Rol�"
+
+#: my-evolution/Locations.h:2415
+#, fuzzy
+msgid "Volk Field"
+msgstr "_Nuo laukas"
+
+#: my-evolution/Locations.h:2416
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2417
+msgid "Voslau"
+msgstr ""
+
+#: my-evolution/Locations.h:2418
+#, fuzzy
+msgid "Waco"
+msgstr "Monakas"
+
+#: my-evolution/Locations.h:2419
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2423
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2424
+#, fuzzy
+msgid "Wallops Island"
+msgstr "Folklendo salos"
+
+#: my-evolution/Locations.h:2425
+msgid "Walnut Ridge"
+msgstr ""
+
+#: my-evolution/Locations.h:2426
+#, fuzzy
+msgid "Warner Robins"
+msgstr "�sp�jimas"
+
+#: my-evolution/Locations.h:2427
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2429
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2430
+msgid "Washington/Dulles"
+msgstr ""
+
+#: my-evolution/Locations.h:2431
+#, fuzzy
+msgid "Waterbury"
+msgstr "Orai"
+
+#: my-evolution/Locations.h:2432
+#, fuzzy
+msgid "Waterloo"
+msgstr "Orai"
+
+#: my-evolution/Locations.h:2433
+#, fuzzy
+msgid "Watertown"
+msgstr "Orai"
+
+#: my-evolution/Locations.h:2434
+#, fuzzy
+msgid "Waterville"
+msgstr "Kategorijos"
+
+#: my-evolution/Locations.h:2435
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+#, fuzzy
+msgid "Wausau"
+msgstr "Vanuatu"
+
+#: my-evolution/Locations.h:2437
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2438
+msgid "Waynesboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2439
+#, fuzzy
+msgid "Webster City"
+msgstr "Tinklapis"
+
+#: my-evolution/Locations.h:2440
+#, fuzzy
+msgid "Wejh"
+msgstr "Tr"
+
+#: my-evolution/Locations.h:2441
+msgid "Wellington"
+msgstr ""
+
+#: my-evolution/Locations.h:2442
+#, fuzzy
+msgid "Wenatchee"
+msgstr "Orai"
+
+#: my-evolution/Locations.h:2443
+#, fuzzy
+msgid "Wendover"
+msgstr "Siunt�jas"
+
+#: my-evolution/Locations.h:2444
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2445
+#, fuzzy
+msgid "West Burke"
+msgstr "Vakar� Europos"
+
+#: my-evolution/Locations.h:2446
+#, fuzzy
+msgid "Westerland"
+msgstr "Olandija"
+
+#: my-evolution/Locations.h:2447
+#, fuzzy
+msgid "Westfield"
+msgstr "Vakar�"
+
+#: my-evolution/Locations.h:2448
+msgid "Westhampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2449
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2451
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2452
+msgid "West Yellowstone (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2453
+#, fuzzy
+msgid "Wheeling"
+msgstr "Dienotvark�"
+
+#: my-evolution/Locations.h:2454
+#, fuzzy
+msgid "Whidbey Island"
+msgstr "Kal�d� sala"
+
+#: my-evolution/Locations.h:2455
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2461
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2462
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2463
+#, fuzzy
+msgid "Wick"
+msgstr "Prav"
+
+#: my-evolution/Locations.h:2464
+#, fuzzy
+msgid "Wien"
+msgstr "Tr"
+
+#: my-evolution/Locations.h:2465
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2467
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2468
+msgid "Williamsport"
+msgstr ""
+
+#: my-evolution/Locations.h:2469
+#, fuzzy
+msgid "Williston"
+msgstr "s�ra�as"
+
+#: my-evolution/Locations.h:2470
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2472
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2473
+#, fuzzy
+msgid "Winchester"
+msgstr "Lichten�teinas"
+
+#: my-evolution/Locations.h:2474
+#, fuzzy
+msgid "Windsor"
+msgstr "Sm�lio audra"
+
+#: my-evolution/Locations.h:2475
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2478
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+#, fuzzy
+msgid "Winslow"
+msgstr "dabar"
+
+#: my-evolution/Locations.h:2480
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2481
+msgid "Winter Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:2482
+#, fuzzy
+msgid "Winter Park"
+msgstr "�vesk slapta�od�"
+
+#: my-evolution/Locations.h:2483
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+#, fuzzy
+msgid "Wisconsin"
+msgstr "Mikronezija"
+
+#: my-evolution/Locations.h:2485
+msgid "Wisconsin Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:2486
+#, fuzzy
+msgid "Wise"
+msgstr "Tr"
+
+#: my-evolution/Locations.h:2487
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2488
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2489
+#, fuzzy
+msgid "Woong Cheon"
+msgstr "Honkongas"
+
+#: my-evolution/Locations.h:2490
+#, fuzzy
+msgid "Wooster"
+msgstr "Pora�t�:"
+
+#: my-evolution/Locations.h:2491
+#, fuzzy
+msgid "Worcester"
+msgstr "am�inai"
+
+#: my-evolution/Locations.h:2492
+#, fuzzy
+msgid "Worland"
+msgstr "Lenkija"
+
+#: my-evolution/Locations.h:2493
+#, fuzzy
+msgid "Worthington"
+msgstr "Dirbama"
+
+#: my-evolution/Locations.h:2494
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2495
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2496
+msgid "Wuchia Observatory"
+msgstr ""
+
+#: my-evolution/Locations.h:2497
+#, fuzzy
+msgid "Wyoming"
+msgstr "Dirbama"
+
+#: my-evolution/Locations.h:2498
+#, fuzzy
+msgid "Xiamen"
+msgstr "Vardas"
+
+#: my-evolution/Locations.h:2499
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2505
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2506
+msgid "Yankton"
+msgstr ""
+
+#: my-evolution/Locations.h:2507
+#, fuzzy
+msgid "Yao Airport"
+msgstr "Neimportuoti"
+
+#: my-evolution/Locations.h:2508
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2510
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2511
+msgid "Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2513
+#, fuzzy
+msgid "Yenbo"
+msgstr "Jemenas"
+
+#: my-evolution/Locations.h:2514
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2522
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2528
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2529
+msgid "Zacatecas"
+msgstr ""
+
+#: my-evolution/Locations.h:2530
+#, fuzzy
+msgid "Zadar"
+msgstr "Kalendorius"
+
+#: my-evolution/Locations.h:2531
+#, fuzzy
+msgid "Zagreb"
+msgstr "Puslapis"
+
+#: my-evolution/Locations.h:2532
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2533
+msgid "Zama Airfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2534
+#, fuzzy
+msgid "Zanesville"
+msgstr "Nutraukta"
+
+#: my-evolution/Locations.h:2535
+#, fuzzy
+msgid "Zaragoza"
+msgstr "Paragvajus"
+
+#: my-evolution/Locations.h:2536
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2537
+msgid "Zuni Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:2538
+#, fuzzy
+msgid "Zurich"
+msgstr "Turk�"
+
+#: my-evolution/component-factory.c:51
+msgid "Folder containing the Evolution Summary"
+msgstr "Aplankas, kuriame yra Evolution ap�valga"
+
+#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "�vykiai"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "N�ra �vyki�"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:400
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:379
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-calendar.c:420
+#, fuzzy
+msgid "No description"
+msgstr "apra�ymas"
+
+#: my-evolution/e-summary-mail.c:151
 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
+#, fuzzy
+msgid "Local Folders"
+msgstr "Ypatingi aplankai"
+
 #. 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:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Dienos �odis"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Dienos citatos"
 
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Prid�ti naujien� �altin�"
 
-#: my-evolution/e-summary-preferences.c:953
+#: my-evolution/e-summary-preferences.c:728
 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:957
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Vardas:"
 
-#: my-evolution/e-summary-preferences.c:1503
-msgid "Summary Settings"
-msgstr "Santraukos nuostatos"
-
-#: 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
 msgid "Error downloading RDF"
 msgstr "Klaida parsiun�iant RDF"
 
-#: my-evolution/e-summary-rdf.c:528
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr "Naujien� �altinis"
 
-#: my-evolution/e-summary-tasks.c:248
+#: my-evolution/e-summary-shown.c:463
+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
+#, fuzzy
+msgid "<- Remove"
+msgstr " _Pa�alinti"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Sniegas"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "N�ra u�duo�i�"
 
-#: my-evolution/e-summary-tasks.c:287
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(N�ra apra�ymo)"
 
@@ -10259,23 +23630,25 @@ msgstr "(N�ra apra�ymo)"
 msgid "My Weather"
 msgstr "Mano orai"
 
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr "<dd><b>Nepavyko susisiekti su or� serveriu</b></dd>"
+#: my-evolution/e-summary-weather.c:279
+#, fuzzy
+msgid "There was an error downloading data for"
+msgstr "�vyko klaida parsiun�iant naujien� �altin�"
 
-#: my-evolution/e-summary-weather.c:559
+#: my-evolution/e-summary-weather.c:501
 msgid "Weather"
 msgstr "Orai"
 
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr "Regionai"
-
 #: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %Y m. %B %e"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:488
+#, fuzzy
+msgid "Please wait..."
+msgstr "Pra�ome palaukti"
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Spausdinti ap�valg�"
 
@@ -10283,43 +23656,11 @@ msgstr "Spausdinti ap�valg�"
 msgid "Printing of Summary failed"
 msgstr "Nepavyko atspausdinti ap�valgos"
 
-#: my-evolution/main.c:66
+#: my-evolution/main.c:65
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): negal�jau inicializuoti 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 "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
-msgid "miles"
-msgstr "mylios"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilometrai"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Giedras dangus"
@@ -10718,11 +24059,6 @@ msgstr ""
 msgid "Freezing ice pellets"
 msgstr ""
 
-#. HAIL
-#: my-evolution/metar.c:217
-msgid "Hail"
-msgstr ""
-
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
@@ -11470,152 +24806,124 @@ msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr " _Pa�alinti"
-
-#: my-evolution/my-evolution.glade.h:2
 msgid "Add n_ews feed"
 msgstr "Prid�ti nauji_en� �altin�"
 
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "_Visos stotys:"
-
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "Visi _aplankai:"
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "_Visi naujien� �altiniai:"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 #, fuzzy
 msgid "C_elsius"
 msgstr "C_elsijaus"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 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:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr "Ma_ksimalus rodom� element� skai�ius:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr "Naujien� �altini� nuostatos"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr "Vienas _m�nuo"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr "Viena _savait�"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr "_Atnaujinimo laikas (sekund�mis):"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr "Atnaujinimo _laikas (sekund�mis):"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 msgid "S_how full path for folders"
 msgstr "_Rodyti piln� aplank� keli�"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr "Rodyti _visas u�duotis"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _today's tasks"
 msgstr "Rodyti �ian_dienos u�duotis"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr "Rodyti temperat�ras laipsniais:"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "U�duotys "
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr "Or� nuostatos"
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "_Rodyti aplankus:"
-
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "_Rodyti stotis:"
-
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
-msgstr "Ro_domi �altiniai:"
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr "_Farenheito"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr "_Penkias dienas"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr "_Pa�tas"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 msgid "_News Feeds"
 msgstr "_Naujien� �altiniai"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr "_Vien� dien�"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr "_Dienotvark�"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr "_Orai"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Ypatingi aplankai"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution apvalkalas."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Rodyti detales"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Nutraukti veiksm�"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Gauti lai�kai"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Siun�iami lai�kai"
-
-#: shell/e-local-storage.c:636
-#, fuzzy
-msgid "Local Folders"
-msgstr "Ypatingi aplankai"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution �diegimas"
 
-#: 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"
@@ -11623,16 +24931,16 @@ msgstr ""
 "�iai naujai Evolution versijai reikia �diegti papildom� byl�\n"
 "� tavo asmenin� Evolution katalog�"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Pra�au, paspausk �Gerai�, kad �diegtum bylas, arba �At�aukti�, kad i�eitum."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Negal�jau tvarkingai atnaujinti byl�"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11643,7 +24951,7 @@ msgstr ""
 "%s\n"
 "Klaida: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11652,7 +24960,33 @@ msgstr ""
 "�vyko klaida kopijuojant bylas �\n"
 "'%s'."
 
-#: shell/e-setup.c:281
+#: shell/e-setup.c:282
+#, fuzzy, c-format
+msgid ""
+"Evolution could not create directory\n"
+"%s:\n"
+"%s"
+msgstr ""
+"Negal�jau sukurti katalogo %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:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11663,7 +24997,7 @@ msgstr ""
 "Pra�au, perkelk j�, kad gal��iau �diegti\n"
 "Evolution vartotojo bylas."
 
-#: shell/e-setup.c:295
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11672,7 +25006,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:320
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11683,50 +25017,53 @@ msgstr ""
 "Evolution katalogas. Pra�au, perkelk j�, kad \n"
 "gal��iau �diegti Evolution vartotojo bylas."
 
-#: shell/e-shell-about-box.c:40
-#, fuzzy
-msgid "Evolution "
-msgstr "Evolution"
-
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr ""
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Negal�jau patikrinti aplanko: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Negal�jau pervadinti aplanko:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Negalima aplanko perkelti � j� pat�."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Negalima aplanko kopijuoti � j� pat�."
 
-#: 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 "Negalima perkelti aplanko � vien� i� jo palikuoni�."
 
-#: 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 "Nurodyk aplank�, � kur� kopijuoti aplank� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Kopijuoti aplank�"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Nurodyk aplank�, � kur� perkelti aplank� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Perkelti aplank�"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11735,18 +25072,18 @@ msgstr ""
 "Negal�jau i�trinti aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "I�trinti \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11755,22 +25092,22 @@ msgstr ""
 "Negal�jau pervadinti aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pervadinti aplank� �%s� �:"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Pervadinti aplank�"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:148
+#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Nurodytas aplanko vardas yra negalimas: %s"
 
-#: 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"
@@ -11779,7 +25116,7 @@ msgstr ""
 "Negaliu sukurti nurodyto aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:267
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution -- Sukurti nauj� aplank�"
 
@@ -11791,11 +25128,11 @@ msgstr ""
 "Pasirinkto aplanko tipas yra netinkamas\n"
 "pra�yt�jam veiksmui."
 
-#: shell/e-shell-folder-selection-dialog.c:359
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Naujas..."
 
-#: 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 "(Bevardis)"
 
@@ -11818,7 +25155,7 @@ msgstr ""
 "Gali pasirinkti �Automati�kas� jei tu ne�inai, ir Evolution bandys "
 "susigaudyti pati."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
 #, fuzzy
 msgid "Please select the information that you would like to import:"
 msgstr "Pra�om pasirinkti informacij�, kuri� nor�tum importuoti"
@@ -11845,16 +25182,22 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas %d."
 
-#: shell/e-shell-importer.c:397
+#: shell/e-shell-importer.c:409
 #, c-format
 msgid "File %s does not exist"
 msgstr "N�ra tokios bylos %s"
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: shell/e-shell-importer.c:420
 msgid "You may only import to local folders"
 msgstr "Tu gali importuoti tiktai � lokalius aplankus"
 
-#: shell/e-shell-importer.c:424
+#: shell/e-shell-importer.c:435
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11863,11 +25206,11 @@ msgstr ""
 "N�ra importerio, kuris gal�t� suprasti\n"
 "%s"
 
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:445
 msgid "Importing"
 msgstr "Importuojama"
 
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:453
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11876,17 +25219,17 @@ msgstr ""
 "Importuojama %s.\n"
 "Pradedama %s"
 
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:466
 #, c-format
 msgid "Error starting %s"
 msgstr "Klaida pradedant %s"
 
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:485
 #, c-format
 msgid "Error loading %s"
 msgstr "Klaida �keliant %s"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:502
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11895,31 +25238,31 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas 1."
 
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:572
 msgid "Automatic"
 msgstr "Automati�kas"
 
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:623
 msgid "Filename:"
 msgstr "Bylos vardas:"
 
-#: shell/e-shell-importer.c:617
+#: shell/e-shell-importer.c:628
 msgid "Select a file"
 msgstr "Pasirink byl�"
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:638
 msgid "File type:"
 msgstr "Bylos tipas:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:663
 msgid "Import data and settings from older programs"
 msgstr "Importuoti duomenis ir nuostatas i� kit� program�"
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:667
 msgid "Import a single file"
 msgstr "Importuoti vien� byl�"
 
-#: 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
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11927,24 +25270,24 @@ msgstr ""
 "Pra�ome palaukti...\n"
 "Ie�koma esam� nustatym�"
 
-#: 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
 msgid "Starting Intelligent Importers"
 msgstr "Paleid�iami inteligenti�ki importeriai"
 
-#: 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
 #, c-format
 msgid "From %s:"
 msgstr "Nuo %s:"
 
-#: shell/e-shell-importer.c:1014
+#: shell/e-shell-importer.c:1027
 msgid "Select folder"
 msgstr "Pasirink aplank�"
 
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1028
 msgid "Select a destination folder for importing this data"
 msgstr "Pasirink aplank�, � kur� importuoti �iuos duomenis"
 
-#: shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importuoti"
 
@@ -11964,6 +25307,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Nauja"
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr "Nenurodytas aplanko vardas."
@@ -11981,93 +25330,96 @@ 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:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nerastas tavo kelyje ($PATH)."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy negal�jo b�ti paleistas."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Apie Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:409
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Eiti � aplank�..."
 
-#: shell/e-shell-view-menu.c:410
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Pasirink aplank�, kur� nor�tum atidaryti"
 
-#: shell/e-shell-view-menu.c:530
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Sukurti nauj� trump�"
 
-#: shell/e-shell-view-menu.c:531
+#: shell/e-shell-view-menu.c:566
 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:562
-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�"
-
-#: shell/e-shell-view-menu.c:570
-#, c-format
-msgid "Error executing %s."
-msgstr "Klaida vykdant %s."
-
-#: shell/e-shell-view-menu.c:672
+#: shell/e-shell-view-menu.c:732
 #, fuzzy
 msgid "_Work Online"
 msgstr "Dirbti atsijungus"
 
-#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Dirbti atsijungus"
 
-#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Dirbti atsijungus"
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Joks aplankas nerodomas)"
 
-#: shell/e-shell-view.c:1574
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1576
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(Jokio)"
 
-#: 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 dabar yra prisijungusi.  Paspausk �� mygtuk�, kad dirbtum "
 "atsijungus."
 
-#: 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 dabar yra atsijungimo procese."
 
-#: 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 dabar yra atsijungusi.  Paspausk �� mygtuk�, kad dirbtum "
 "prisijungus."
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Klaida i� aktyvavimo sistemos yra:\n"
+"%s"
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12075,19 +25427,23 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Gerai"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Blogi argumentai"
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Negaliu u�siregistruoti OAF"
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Konfig�racijos duombaz� nerasta"
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
@@ -12205,76 +25561,71 @@ msgstr "I�_trinti"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Pa�alinti �i� trump� i� trumpi� juostos"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Klaida i�saugant trumpes."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Trump�s"
 
-#: shell/e-storage-set-view.c:658
-#, fuzzy, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Negal�jau i�trinti aplanko:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Gauti lai�kai"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Be pavadinimo)"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "N�ra klaid�"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Jau yra aplankas su tokiu pat pavadinimu"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Nurodytas aplanko tipas yra blogas"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "I/O klaida"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Neu�tenka vietos aplankui sukurti"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Aplankas n�ra tu��ias"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Nurodytas aplankas nerastas"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ne�gyvendinta �ioje saugykloje"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Veiksmas nepalaikomas"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nurodytas aplankas negali b�ti pakeistas ar i�trintas"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Negalima padaryti aplanko vaiku vienu i� savo palikuoni�"
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "Negaliu sukurti aplanko su tokiu vardu"
 
@@ -12284,107 +25635,115 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% u�baigta)"
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<spausk �ia, kad pasirinktum aplank�>"
+
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Ne�inoma klaida."
+
+#: 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"
+"Klaida i� komponent� sistemos yra:\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"
+"Klaida i� aktyvavimo sistemos yra:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "CORBA klaida"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Pertraukta"
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Blogas argumentas"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Jau turi savinink�"
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "N�ra savininko"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Nerastas"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Nepalaikomas tipas"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Nepalaikoma schema"
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Nepalaikomas veiksmas"
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Vidin� klaida"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Egzistuoja"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Blogas URI"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 #, fuzzy
 msgid "Has subfolders"
 msgstr "N�ra tokio aplanko %s"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Nebeliko vietos"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Senesnysis savininkas numir�"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Ne�inoma klaida."
-
-#: 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"
-"Klaida i� komponent� sistemos yra:\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"
-"Klaida i� aktyvavimo sistemos yra:\n"
-"%s"
+#: shell/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "Bylos tipas:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -12504,296 +25863,274 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution gali importuoti duomenis i� �emiau nurodyt� byl�:"
 
 #: shell/main.c:89
+msgid "Evolution"
+msgstr "Evolution"
+
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution baigia darb�..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Negal�jau prieiti prie Ximian Evolution apvalkalo."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Negal�jau inicializuoti Ximian Evolution apvalkalo: %s"
 
-#: shell/main.c:289
+#: shell/main.c:317
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "U�drausti "
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Pradedama importuoti"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Paleid�iami inteligenti�ki importeriai"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr "Si�sti vis� komponent� derinimo i�vest� � byl�."
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Negaliu inicializuoti Bonobo komponent� sistemos."
 
+#: 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 "Klaida �keliant byl�: %s"
 
-#: tools/evolution-addressbook-export.c:46
-#, fuzzy
-msgid "Output File"
-msgstr "Atidaryti byl�"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "�terpti byl�"
 
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Atidaryti byl�"
+
 #: tools/evolution-addressbook-import.c:80
 #, fuzzy
 msgid "No filename provided."
 msgstr "Nenurodytas aplanko vardas."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Kopijuoti"
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Kopijuoti � aplank�..."
 
-#: 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 "Kopijuoti pa�ym�jim�"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+msgid "Copy to Folder..."
+msgstr "Kopijuoti � aplank�..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Sukurti nauj� kontakt�"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Sukurti nauj� kontakt� s�ra��"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "I�kirpti"
-
-#: 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 "I�kirpti pa�ym�jim�"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "I�trinti pa�ym�tus kontaktus"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Naujas s�ra�as"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Si�sti ko_ntakt� kitam..."
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "�d�ti"
+#: ui/evolution-addressbook.xml.h:14
+msgid "Move to Folder..."
+msgstr "Perkelti � aplank�..."
 
-#: 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�ti i� krep�io"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Per�i�r�ti kontaktus prie� spausdinant"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Spausdinti pa�ym�tus kontaktus"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "I�saugoti pa�ym�tus kontaktus kaip VCard."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Pa�ym�ti visus"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Pa�ym�ti visus kontaktus"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "Si�sti _lai�k� kontaktui..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Si�sti lai�k� pa�ym�tiems kontaktams."
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Si�sti lai�k� kontaktui"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Si�sti pa�ym�tus kontaktus kitam asmeniui."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Sustabdyti �k�lim�"
 
-#: 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 "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: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-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
 msgid "_Actions"
 msgstr "_Veiksmai"
 
-#: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr "_Adres� knygel�s �altiniai..."
-
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr "_Kontaktas"
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "Kontakt� _s�ra�as"
 
-#: 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 "_Persi�sti kontakt�..."
 
-#: 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 "S_pausdinti..."
-
 #: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "Pe_rkelti � aplank�..."
+
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "I�_saugoti kaip VCard"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_Ie�koti kontakt�"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "Pa�ym�ti _visk�"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Konfig�ruoti kalendoriaus nuostatas"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "Si�sti _lai�k� kontaktui..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Sukurti nauj� _visos dienos �vyk�"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a New _Task"
-msgstr "Sukurti nauj� _u�duot�"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Sukurti _nauj� �vyk�"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "Sukurti �vyk� visai dienai"
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Diena"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "I�trinti �vyk�"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Eiti �"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Eiti atgal"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Eiti pirmyn"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Eiti � _dat�"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Eiti � nurodyt� dat�"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Eiti � �iandien�"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "M�nesis"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Naujas �vykis"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr "Nauja u�duotis"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Per�i�r�ti kalendori� prie� spausdinant"
 
-#: 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 "Spa_udinio per�i�ra"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Spausdinti �� kalendori�"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Skelbti Laisvumo/U�imtumo informacij� �iam kalendoriui"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Rodyti vien� dien�"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Rodyti vien� m�nes�"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Rodyti vien� savait�"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Rodyti darbo savait�"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Savait�"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "�_vykis..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Kalendoriaus nuostatos..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "_Skelbti laisvas/u�imtas informacij�"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "_U�duotis..."
-
 #: 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
@@ -12824,18 +26161,18 @@ msgstr "Per�i�r�ti lai�k� prie� spausdinant"
 msgid "Print this item"
 msgstr "Spausdinti �� element�"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Spausdinti..."
-
-#: 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 "I�saugoti"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "I�saugoti kaip..."
+
 #: 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 "I�saugoti ir u�daryti"
 
@@ -12851,8 +26188,8 @@ msgstr "I�saugoti �� element� � disk�"
 #: 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:40
 msgid "_File"
 msgstr "_Byla"
 
@@ -12861,7 +26198,7 @@ msgid "Print En_velope..."
 msgstr "Spausdinti _vok�..."
 
 #: 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 "I�saugoti _kaip..."
@@ -12870,10 +26207,14 @@ msgstr "I�saugoti _kaip..."
 msgid "Save the contact and close the dialog box"
 msgstr "I�saugoti kontakt� ir u�daryti dialogo lang�"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "Si�sti _lai�k� kontaktui..."
+
 #: 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 "I�_saugoti"
 
@@ -12936,6 +26277,10 @@ 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�"
@@ -12945,82 +26290,54 @@ msgid "Compose _New Message"
 msgstr "Sukurti _nauj� lai�k�"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Sukurti ir keisti pa�to s�skaitas ir kitas nuostatas"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Sukurti ar keisti pa�to filtravimo taisykles"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Sukurti ar keisti virtuali� aplank� apibr��imus"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "I�tu�tinti _�iuk�lin�"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Pa_mir�ti slapta�od�ius"
 
-#: 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 "Pamir�ti �simintus slapta�od�ius tam, kad j� v�l b�t� paklausta"
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Naujas lai�kas"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Atidaryti lang� naujam lai�kui ra�yti"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Visam laikui sunaikinti visus i�trintus lai�kus i� vis� aplank�"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "Si�sti / Gauti"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "I�si�sti laukiant� pa�t� ir parsi�sti nauj� pa�t�"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Rodyti lai�ko per�i�ros lang�"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "U�sisakyti ar atsisakyti aplank� nutolusiuose serveriuose"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "_Virtuali� aplank� taisymas..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filtrai..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "_Pa�to lai�kas"
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "_Pa�to nuostatos..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Per�i�ros sritis"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "_Si�sti / Gauti"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "_U�sisakyti aplankus..."
 
@@ -13113,11 +26430,11 @@ msgstr "Laikinai pasl�pti pa�ym�tus lai�kus"
 msgid "Threaded Message list"
 msgstr "Gijomis suskirstytas lai�k� s�ra�as"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "I�_valyti"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Aplankas"
 
@@ -13134,211 +26451,228 @@ msgid "_Threaded Message List"
 msgstr "_Gijomis suskirstytas lai�k� s�ra�as"
 
 #: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Prid�ti siunt�j� � adres� knygel�"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Pritaikyti filtrus"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Prid�ti siunt�j� � adres� knygel�"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Pritaikyti filtr� taisykles pa�ym�tiems lai�kams"
 
-#: 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 "Sukurti atsakym� visiems pasirinkto lai�ko gav�jams"
 
-#: 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 "Sukurti atsakym� pasirinkto lai�ko konferencijai"
 
-#: 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 "Sukurti atsakym� pasirinkto lai�ko siunt�jui"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopijuoti pa�ym�tus lai�kus � kit� aplank�"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Sukurti _virtual� aplank� i� lai�ko"
 
-#: 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 "Sukurti taisykl� filtruoti lai�kams nuo �io siunt�jo"
 
-#: 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 "Sukurti taisykl� filtruoti lai�kams �iems gav�jams"
 
-#: 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 "Sukurti taisykl� filtruoti lai�kams �iai konferencijai"
 
-#: 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 "Sukurti taisykl� filtruoti lai�kams su �ia tema"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Sukurti virtual� aplank� �iems gav�jams"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Sukurti virtual� aplank� �iai konferencijai"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Sukurti virtual� aplank� �iam siunt�jui"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Sukurti virtual� aplank� �iai temai"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Suma�inti teksto dyd�"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Parodyti kit� svarb� lai�k�"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Parodyti kit� lai�k�"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Parodyti kit� neskaityt� lai�k�"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Parodyti kit� neskaityt� gij�"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Parodyti praeit� svarb� lai�k�"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Parodyti praeit� lai�k�"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Parodyti praeit� neskaityt� lai�k�"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Persi�sti"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filtras pagal _Konferencij�..."
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filtras pagal Siu_nt�j�..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filtras pagal _Gav�jus..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filtras pagal _Tem�..."
 
-#: ui/evolution-mail-message.xml.h:29
-msgid "Force images in HTML mail to be loaded"
-msgstr "Priverstinai �kelti HTML lai�kuose esan�ius paveiksliukus"
-
-#: ui/evolution-mail-message.xml.h:30
-msgid "Forward"
-msgstr "Persi�sti"
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward As"
-msgstr "Persi�sti kaip"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward _Attached"
-msgstr "Persi�sti _prikabinus"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Inline"
-msgstr "Persi�sti v_iduje"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Pasirinktus lai�kus pa�ym�ti i�trynimui"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Quoted"
-msgstr "Persi�sti _cituojant"
+msgid "Follow _Up..."
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr "Priverstinai �kelti HTML lai�kuose esan�ius paveiksliukus"
+
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Persi�sti pasirinkt� lai�k� naujo lai�ko tekste"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Persi�sti pasirinkt� lai�k� cituojam� kaip atsakymas"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Persi�sti pasirinkt� lai�k� ka�kam"
 
-#: 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 "Persi�sti pasirinkt� lai�k� prisegt� kaip priedas"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Padidinti teksto dyd�"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "�kelt_i paveiksl�lius"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Padaryti _svarbiu"
 
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Pa�ym�ti _neskaitytu"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Padaryti n_esvarbiu"
 
-#: 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 "Pasirinktus lai�kus pa�ym�ti lyg jie buvo perskaityti"
 
-#: 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 "Pasirinktus lai�kus pa�ym�ti svarbiais"
 
-#: 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 "Pasirinktus lai�kus pa�ym�ti lyg jie nebuvo perskaityti"
 
-#: 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 "Pasirinktus lai�kus pa�ym�ti nesvarbiais"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Pasirinktus lai�kus pa�ym�ti i�trynimui"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Perkelti"
 
-#: 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 "Perkelti pa�ym�tus lai�kus � kit� aplank�"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Kitas"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "Kit� svarb� lai�k�"
-
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
-msgstr "Kit� lai�k�"
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "Kit� svarb� lai�k�"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Kit� gij�"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Kit� neskaityt� lai�k�"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -13354,159 +26688,187 @@ msgid "Original Si_ze"
 msgstr "Originalus _dydis"
 
 #: ui/evolution-mail-message.xml.h:61
-msgid "Preview the message to be printed"
-msgstr "Per�i�r�ti lai�k� prie� spausdinant"
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Praeit� neskaityt� lai�k�"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "Praeitas"
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Praeit� svarb� lai�k�"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "Praeit� svarb� lai�k�"
+msgid "Preview the message to be printed"
+msgstr "Per�i�r�ti lai�k� prie� spausdinant"
 
 #: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "Praeit� lai�k�"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "Praeit� neskaityt� lai�k�"
+msgid "Previous"
+msgstr "Praeitas"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Spausdinti �� lai�k�"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "Atsakyti"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Re_direct"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "Atsakyti visiems"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Persi�sti pasirinkt� lai�k� ka�kam"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr "Atstatyti teksto original� dyd�"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "I_e�koti lai�ke..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "_Ma�esnis"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "I�saugoti lai�k� � tekstin� byl�"
 
-#: 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 "Ie�koti eilut�s rodomo lai�ko tekste"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "Nustatyti puslapio parinktis tavo esamam spausdintuvui"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "_Rodyti lai�ko �altin�"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "Rodyti pilnas _antra�tes"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "Rodyti lai�k� normaliu stiliumi"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "Rodyti lai�k� su visomis pa�to antra�t�mis"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "Rodyti neapdorot� lai�ko �altin�"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "Teksto _dydis"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Sugr��inti pa�ym�tus lai�kus"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "vAplankas pagal _Konferencij�..."
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "vAplankas pagal Siu_nt�j�..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "vAplankas pagal _Gav�jus..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "vAplankas pagal _Tem�..."
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
-msgstr "Pritaikyti _filtrus"
-
 #: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Attached"
+msgstr "Prisegti"
+
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "_Kopijuoti � aplank�"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "_Sukurti filtr� i� lai�ko"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "P_ersi�sti lai�k�"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Eiti �"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "Viduje"
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Didesnis"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "_Lai�ko rodymas"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Perkelti � aplank�"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Kit� lai�k�"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Normalus rodymas"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_Atidaryti lai�k�"
 
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Praeit� lai�k�"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Cituojant"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "�ran_kiai"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "S_ugr��inti"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "U�daryti �� lang�"
 
 #: 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:36
 msgid "_Close"
 msgstr "_U�daryti"
 
 #: 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:56
 msgid "_View"
 msgstr "_Rodyti"
 
@@ -13531,12 +26893,12 @@ msgstr "U��ifruoti �� lai�k� su PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "U��ifruoti �� lai�k� tavo S/MIME �ifravimo sertifikatu"
 
-#: 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 "Formatas"
 
-#: 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"
 
@@ -13552,6 +26914,10 @@ msgstr "�terpti byl� � lai�k� kaip tekst�"
 msgid "Insert text file..."
 msgstr "�terpti tekstin� byl�..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Atidaryti"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Atidaryti byl�"
@@ -13585,7 +26951,7 @@ msgid "Save in folder..."
 msgstr "I�saugoti � aplank�..."
 
 #: 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 "I�saugoti esam� byl�"
 
@@ -13610,6 +26976,7 @@ msgid "Send _later"
 msgstr "Si�sti v�_liau"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Si�sti lai�k� HTML formatu"
 
@@ -13678,7 +27045,7 @@ msgid "_From Field"
 msgstr "_Nuo laukas"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "�terpt_i"
 
@@ -13690,11 +27057,7 @@ msgstr "_Atidaryti..."
 msgid "_Reply-To Field"
 msgstr "_Atsakyti-kam laukas"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Saugumas"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Pagalba"
 
@@ -13750,33 +27113,41 @@ msgstr "Gauti naujausi� informacij� apie u�duot�"
 msgid "Re_fresh Task"
 msgstr "At_naujinti u�duot�"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Konfig�ruoti u�duo�i� rodinio nuostatas"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopijuoti pasirinkt� u�duot�"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "I�kirpti pasirinkt� u�duot�"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "I�trinti pa�ym�tas u�duotis"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "I�trinti pa�ym�tas u�duotis"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "_Pa�ym�ti u�baigta"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "�d�ti u�duot� i� krep�io"
 
-#: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings..."
-msgstr "U�duo�i� nuostatos..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Per�i�r�ti kontaktus prie� spausdinant"
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
-msgstr "_U�duotis"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Spausdinti �� lai�k�"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -13843,113 +27214,118 @@ msgid "Open this folder in an other window"
 msgstr "Atidaryti �� aplank� naujame lange"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Si�sti / Gauti"
+
+#: ui/evolution.xml.h:22
+#, 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
 msgid "Show information about Ximian Evolution"
 msgstr "Rodyti informacij� apie Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "I�si�sti klaidos prane�im�"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "I�_si�sti klaidos prane�im�"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Prane�ti apie klaid�, naudojant Bug Buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Perjungti"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Perjungti, ar rodyti aplank� juost�"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Perjungti, ar rodyti trumpi� juost�"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Perjungti, ar dirbama atsijungus."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Rodyti parinkt� aplank�"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "_Apie Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Kopijuoti..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "_Aplank� juosta"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_Eiti � aplank�..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Importuoti..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Perkelti..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Naujas"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Naujas aplankas"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_Pilot nuostatos..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "Pe_rvadinti..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Si�sti / Gauti"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Trump�"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "_Trumpi� juosta"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Keisti ap�valgos savybes"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Spausdinti ap�valg�"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "I� naujo �kelti"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "I� naujo �kelti rodin�"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "_Ap�valgos nuostatos..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Adres� kortel�s"
@@ -13963,18 +27339,27 @@ msgid "Phone List"
 msgstr "Telefon� s�ra�as"
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "Pasirink aplank�"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Pagal siunt�j�"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Pagal b�sen�"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Pagal tem�"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Lai�kai"
 
@@ -13982,6 +27367,12 @@ msgstr "Lai�kai"
 msgid "With Category"
 msgstr "Su kategorija"
 
+#. Check for UTC.
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+msgid "UTC"
+msgstr ""
+
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "Select a Time Zone"
 msgstr "Pasirink laiko juost�"
@@ -14001,11 +27392,22 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "_Esamas vaizdas"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "Prisitaikyti"
+
+#: widgets/menus/gal-view-menus.c:333
+#, fuzzy
+msgid "Save Custom View"
+msgstr "Prisitaikyti"
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "Apibr��ti vaizdus"
 
@@ -14037,76 +27439,81 @@ msgstr "Data turi b�ti �vesta formatu: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentin� reik�m� turi b�ti tarp 0 ir 100 imtinai"
 
-#: widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "Balt�"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "Centrin�s Europos"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "Kin�"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr "Kirilica"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "Graik�"
 
-#: 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 "Japon�"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Korean"
 msgstr "Kor�jie�i�"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turk�"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Unikodas"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Vakar� Europos"
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 msgid "Traditional"
 msgstr "Tradicinis"
 
-#: 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 "Supaprastintas"
 
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:92
 msgid "Ukrainian"
 msgstr "Ukrainie�i�"
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "Nauja"
+#: widgets/misc/e-charset-picker.c:95
+#, fuzzy
+msgid "Visual"
+msgstr "I�jungti"
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ne�inoma koduot�: %s"
 
-#: widgets/misc/e-charset-picker.c:201
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "�vesk, koki� koduot� naudoti"
 
-#: widgets/misc/e-charset-picker.c:276
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Kita..."
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Koduot�"
 
@@ -14114,25 +27521,23 @@ msgstr "Koduot�"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Paie�kos redaktorius"
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "I�saugoti paie�k�"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Prid�ti prie i�saugot� paie�k�"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "I�valyti"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "I�saugoti paie�k�"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Rodyti visus"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Prid�ti prie i�saugot� paie�k�"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -14155,11 +27560,21 @@ msgstr "�inut�"
 msgid "Don't show this message again."
 msgstr "Kit� kart� neberodyti �ios �inut�s."
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "Pai_e�ka"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Ie�koti"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "I�valyti"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "I�valyti"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Ie�koti"
 
@@ -14185,6 +27600,803 @@ msgstr "init_corba(): negal�jau inicializuoti GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 
+#~ msgid "Card: "
+#~ msgstr "Kortel�: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Vardas: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Prie�d�lis: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Vardas:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Papildomas: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Pavard�:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Gal�n�:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Gimimo data:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Adresas:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Pa�to d���:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ext:         "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Gatv�:       "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Miestas:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Regionas:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Pa�to kodas: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Valstyb�:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Siunt� tarnyba: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefonai:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefonas:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "El. pa�tas:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "El. pa�tas:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Laiko juosta: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "Darbo pad�tis: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "Org: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Vardas: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kategorijos: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Komentaras: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Unikali eilut�: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Vie�as raktas: "
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Jungiamasi prie LDAP serverio..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Laukiama prisijungimo prie LDAP serverio..."
+
+#~ msgid "New _Contact"
+#~ msgstr "Naujas _kontaktas"
+
+#~ msgid "New Contact _List"
+#~ msgstr "Naujas kontakt� _s�ra�as"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Redaguoti adres� knygel�"
+
+#~ msgid "Account Name"
+#~ msgstr "S�skaitos vardas"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Prid�ti adres� knygel�"
+
+#~ msgid "Server Name"
+#~ msgstr "Serverio vardas"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "�emiau esanti informacija b�tina, kad prid�tum adres� knygel�."
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ 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."
+#~ msgstr ""
+#~ "�i informacija naudojama LDAP serveriui nurodant, kurios �akos naudojamos "
+#~ "paie�kai. Paklausk savo serverio administratoriaus d�l platesn�s "
+#~ "informacijos."
+
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Tai vardas serverio, kuriame yra tavo adres� knygel�."
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Tai yra prievadas, kur� naudoja tavo LDAP serveris."
+
+#~ 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:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Rodyti kontaktus, tenkinan�ius tokias s�lygas:"
+
+#~ msgid "_Message Recipients:"
+#~ msgstr "_Lai�ko gav�jai:"
+
+#~ msgid "B_usiness"
+#~ msgstr "_Darbo"
+
+#~ msgid "Business _Fax"
+#~ msgstr "Darbo _faksas"
+
+#~ msgid "_Business"
+#~ msgstr "_Darbo"
+
+#~ msgid "_Home"
+#~ msgstr "_Nam�"
+
+#~ 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"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Sukurti nauj� �vyk�"
+
+#~ msgid "Create a new task"
+#~ msgstr "Sukurti nauj� u�duot�"
+
+#~ msgid "New _Task"
+#~ msgstr "Nauja _u�duotis"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Kurti naujus �vykius su �prasta _u�uomina"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "Pirma sa_vait�s diena:"
+
+#~ 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"
+#~ "Organization Unit: %s\n"
+#~ "Organization: %s\n"
+#~ "Locality: %s\n"
+#~ "State: %s\n"
+#~ "Country: %s"
+#~ msgstr ""
+#~ "El. pa�tas: %s\n"
+#~ "Bendras vardas: %s\n"
+#~ "Organizacinis vienetas: %s\n"
+#~ "Organizacija: %s\n"
+#~ "Lokalumas: %s\n"
+#~ "Valstija: %s\n"
+#~ "Valstyb�: %s"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Pra�om �vesti NNTP slapta�od� vartotojui %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Serveris atmet� vartotojo vard�"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Nepavyko serveriui nusi�sti vartotojo vardo"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Serveris atmet� vartotojo vard�/slapta�od�"
+
+#~ msgid "Message %s not found."
+#~ msgstr "Lai�kas %s nerastas."
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Negal�jau gauti grupi� s�ra�o i� serverio."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Negaliu �kelti grupi� s�ra�o bylos d�l %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Negaliu i�saugoti grupi� s�ra�o bylos d�l %s: %s"
+
+#~ msgid "Could not open directory for news server: %s"
+#~ msgstr "Negal�jau atidaryti katalogo naujien� serveriui: %s"
+
+#~ msgid "Unable to open or create .newsrc file for %s: %s"
+#~ msgstr "Negal�jau atidaryti ar sukurti .newsrc bylos d�l %s: %s"
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Negal�jau patikrinti, ar POP serveryje yra nauj� lai�k�: %s"
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr "Negal�jau atidaryti aplanko: lai�k� s�ra�as buvo nepilnas."
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Negal�jau parsi�sti lai�ko: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ 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."
+#~ msgstr ""
+#~ "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"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Negal�jau prisijungti prie serverio: %s"
+
+#~ 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"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "Negaliu si�sti lai�ko: siunt�jo adresas neapibr��tas."
+
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "RCPT TO atsakymo klaida: %s: pa�tas nei�si�stas"
+
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "DATA atsakymo klaida: %s: pa�tas nei�si�stas"
+
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr "DATA atsakymo klaida: lai�ko nutraukimas: %s: pa�tas nei�si�stas"
+
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "QUIT atsakymo klaida: %s: nelemtinga"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "�vesk aplanko URI"
+
+#~ msgid "Message was received"
+#~ msgstr "Lai�kas buvo gautas"
+
+#~ msgid "Message was sent"
+#~ msgstr "Lai�kas buvo i�si�stas"
+
+#~ msgid "on or before"
+#~ msgstr "tuo metu ar prie�"
+
+#, fuzzy
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Negal�jau prisijungti prie serverio: %s"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "Naujas _pa�to lai�kas"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Sukurti vAplank� i� paie�kos"
+
+#~ 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�"
+
+#, fuzzy
+#~ msgid "%s: Inbox"
+#~ msgstr "Gauti lai�kai"
+
+#~ msgid "Account"
+#~ msgstr "S�skaita"
+
+#~ msgid "Accounts"
+#~ msgstr "S�skaitos"
+
+#~ msgid "Composer"
+#~ msgstr "Ra�ykl�"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "�prastas persiuntimo b�das yra: "
+
+#~ msgid "Edit..."
+#~ msgstr "Taisyti..."
+
+#~ msgid "HTML signature file:"
+#~ msgstr "HTML para�o byla:"
+
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Pasirink Filtro log'o byl�..."
+
+#~ msgid "_Email Address:"
+#~ msgstr "_El. pa�to adresas:"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "_Log'inti filtro veiksmus �:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organizacija:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Prisiminti �� slapta�od�"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "�prastai si�sti lai�kus _HTML formatu."
+
+#~ msgid "_Server Type: "
+#~ msgstr "_Serverio tipas:"
+
+#~ msgid "_Signature file:"
+#~ msgstr "_Para�o byla:"
+
+#~ msgid "seconds."
+#~ 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."
+
+#~ msgid "Summary Settings"
+#~ msgstr "Santraukos nuostatos"
+
+#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#~ msgstr "<dd><b>Nepavyko susisiekti su or� serveriu</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 "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)"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Konfig�ruoti kalendoriaus nuostatas"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Sukurti nauj� _visos dienos �vyk�"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Sukurti nauj� _u�duot�"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Sukurti _nauj� �vyk�"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Sukurti �vyk� visai dienai"
+
+#~ msgid "_Appointment..."
+#~ msgstr "�_vykis..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Kalendoriaus nuostatos..."
+
+#~ msgid "_Task..."
+#~ msgstr "_U�duotis..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Sukurti ir keisti pa�to s�skaitas ir kitas nuostatas"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_Pa�to nuostatos..."
+
+#~ msgid "Forward _Attached"
+#~ msgstr "Persi�sti _prikabinus"
+
+#~ msgid "Forward _Inline"
+#~ msgstr "Persi�sti v_iduje"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "Persi�sti _cituojant"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "Pritaikyti _filtrus"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Konfig�ruoti u�duo�i� rodinio nuostatas"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "U�duo�i� nuostatos..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Keisti ap�valgos savybes"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "_Ap�valgos nuostatos..."
+
+#~ msgid "Show All"
+#~ msgstr "Rodyti visus"
+
+#~ msgid "Sear_ch"
+#~ msgstr "Pai_e�ka"
+
 #~ msgid "I couldn't remove the item from your calendar file!\n"
 #~ msgstr "A� negal�jau i�trinti elemento i� tavo kalendoriaus bylos!\n"
 
@@ -14306,9 +28518,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Click icon to decrypt."
 #~ msgstr "Paspausk ant ikonos, kad i��ifruotum."
 
-#~ msgid "LDAP Authentication"
-#~ msgstr "LDAP autentikacija"
-
 #~ msgid "Password:"
 #~ msgstr "Slapta�odis:"
 
@@ -14318,9 +28527,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Summarizing folder"
 #~ msgstr "Daroma aplanko santrauka"
 
-#~ msgid "There was an error downloading news feed"
-#~ msgstr "�vyko klaida parsiun�iant naujien� �altin�"
-
 #~ msgid "Delete folder '%s'"
 #~ msgstr "I�trinti aplank� '%s'"
 
@@ -14333,9 +28539,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "All Attendees"
 #~ msgstr "Visi dalyviai"
 
-#~ msgid "Factory for the Evolution addressbook component."
-#~ msgstr "Evolution adres� knygel�s komponento gamykla."
-
 #~ msgid "Done."
 #~ msgstr "Atlikta."
 
@@ -14358,22 +28561,15 @@ 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"
 
-#~ msgid "Pine mail"
-#~ msgstr "Pine pa�tas"
-
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr "Evolution pa�to komponento gamykla."
-
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Persi�stas lai�kas:\n"
 
@@ -14389,21 +28585,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Send contact to other"
 #~ msgstr "Si�sti kontakt� kitam"
 
-#~ msgid "Canceled"
-#~ msgstr "Nutraukta"
-
-#~ msgid "All"
-#~ msgstr "Visi"
-
-#~ msgid "Calendar Preferences"
-#~ msgstr "Kalendoriaus nuostatos"
-
-#~ msgid "Add"
-#~ msgstr "Prid�ti"
-
-#~ msgid "Edit"
-#~ msgstr "Keisti"
-
 #~ msgid "Evolution Account Wizard"
 #~ msgstr "Evolution s�skait� meistras"
 
@@ -14446,30 +28627,18 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Help"
 #~ msgstr "Pagalba"
 
-#~ msgid "Se_nd contact to other..."
-#~ msgstr "Si�sti ko_ntakt� kitam..."
-
 #~ msgid "See online help"
 #~ msgstr "Rodyti �inyn�"
 
-#~ msgid "Compose"
-#~ msgstr "Sukurti"
-
 #~ msgid "% Comp_lete:"
 #~ msgstr "% u�_baigta:"
 
-#~ msgid "Resend"
-#~ msgstr "Dar kart� si�sti"
-
 #~ msgid "Evolution Account Manager"
 #~ msgstr "Evolution s�skait� tvarkykl�"
 
 #~ msgid "Receiving"
 #~ msgstr "Gaunamas"
 
-#~ msgid "Store"
-#~ msgstr "Saugykla"
-
 #~ msgid "Display folders starting with:"
 #~ msgstr "Rodyti aplankus, prasidedan�ius:"
 
@@ -14482,15 +28651,9 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Customi_ze Toolbars..."
 #~ msgstr "Prisitai_kyti �rankines..."
 
-#~ msgid "Customize"
-#~ msgstr "Prisitaikyti"
-
 #~ msgid "Customize toolbars"
 #~ msgstr "Prisitaikyti �rankines"
 
-#~ msgid "C_ontacts..."
-#~ msgstr "K_ontaktai..."
-
 #~ msgid "_Company:"
 #~ msgstr "_Kompanija:"
 
@@ -14635,15 +28798,9 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Evolution files successfully installed."
 #~ msgstr "Evolution bylos s�kmingai �diegtos."
 
-#~ msgid "Activate"
-#~ msgstr "Su�adinti"
-
 #~ msgid "Activate this shortcut"
 #~ msgstr "Su�adinti �i� trump�"
 
-#~ msgid "Find a contact"
-#~ msgstr "Rasti kontakt�"
-
 #~ msgid "View All"
 #~ msgstr "Rodyti visus"
 
@@ -14656,15 +28813,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Create a new calendar"
 #~ msgstr "Sukurti nauj� kalendori�"
 
-#~ msgid "New _Event"
-#~ msgstr "Naujas �_vykis"
-
-#~ msgid "Open Calendar"
-#~ msgstr "Atidaryti kalendori�"
-
-#~ msgid "Prev"
-#~ msgstr "Praeitas"
-
 #~ msgid "Save calendar as something else"
 #~ msgstr "I�saugoti kalendori� kaip ka�k� kit�"
 
@@ -14701,24 +28849,15 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Apply any new filters to the mail in this box"
 #~ msgstr "Pritaikyti visus naujus filtrus lai�kams �ioje d��ut�je"
 
-#~ msgid "Configure Folder..."
-#~ msgstr "Konfig�ruoti aplank�..."
-
 #~ msgid "Copy message to a new folder"
 #~ msgstr "Kopijuoti lai�k� � nauj� aplank�"
 
 #~ msgid "Edit the current message"
 #~ msgstr "Taisyti esam� lai�k�"
 
-#~ msgid "Expunge"
-#~ msgstr "I�valyti"
-
 #~ msgid "Finaly remove all mails tagged for deletion"
 #~ msgstr "Visi�kai i�trinti visus lai�kus, pa�ym�tus i�trintais"
 
-#~ msgid "Forward inline"
-#~ msgstr "Persi�sti viduje"
-
 #~ msgid "Forward this message in-line with your mail, so you can edit it"
 #~ msgstr ""
 #~ "Persi�sti pa�ym�t� lai�k� viduje tavo lai�ko, taip kad tu j� gali pakeisti"
@@ -14781,12 +28920,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Mark as Read"
 #~ msgstr "Pa�ym�ti skaitytu"
 
-#~ msgid "Move to Folder..."
-#~ msgstr "Perkelti � aplank�..."
-
-#~ msgid "Copy to Folder..."
-#~ msgstr "Kopijuoti � aplank�..."
-
 #~ msgid "Do you accept?"
 #~ msgstr "Ar tu pritari?"
 
@@ -14797,8 +28930,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."
@@ -14822,43 +28955,24 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Unspecified"
 #~ msgstr "Nenurodyta"
 
-#~ msgid "Email address:"
-#~ msgstr "El. pa�to adresas:"
-
 #~ msgid "Evolution Mail Configuration"
 #~ msgstr "Evolution pa�to nustatymas"
 
 #~ msgid "Include this account when receiving mail"
 #~ msgstr "�traukti �i� s�skait� parsiun�iant pa�t�"
 
-#~ msgid "Mail Account"
-#~ msgstr "Pa�to s�skaita"
-
 #~ msgid "Remember my password"
 #~ msgstr "Prisiminti mano slapta�od�"
 
-#~ msgid "Reply address:"
-#~ msgstr "Atsakymo adresas:"
-
 #~ msgid "Required"
 #~ msgstr "Reikalingas"
 
 #~ msgid "Save password"
 #~ msgstr "I�saugoti slapta�od�"
 
-#~ msgid "Transport"
-#~ msgstr "Siuntimas"
-
 #~ msgid "Transport Authentication"
 #~ msgstr "Siuntimo autentikacija"
 
-#~ msgid ""
-#~ "Type the name by which you would like to refer to these servers. For "
-#~ "example: \"Work\" or \"Home\"."
-#~ msgstr ""
-#~ "Pasirink pavadinim�, kuriuo nor�tum vadinti �iuos serverius. Pavyzd�iui, "
-#~ "�Namai� ar �Darbas�."
-
 #~ msgid "minutes."
 #~ msgstr "minutes."
 
@@ -14886,21 +29000,12 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Enter the subject of the mail"
 #~ msgstr "�vesk lai�ko tem�"
 
-#~ msgid "Account Properties"
-#~ msgstr "S�skaitos savyb�s"
-
 #~ msgid "Incoming Mail Server"
 #~ msgstr "Gaunamo pa�to serveris"
 
-#~ msgid "Miscellaneous"
-#~ msgstr "�vair�s"
-
 #~ msgid "Outgoing Mail Server"
 #~ msgstr "Siun�iamo pa�to serveris"
 
-#~ msgid "Servers"
-#~ msgstr "Serveriai"
-
 #~ msgid "_Addressbook Configuration..."
 #~ msgstr "_Adres� knygel�s konfig�ravimas..."
 
@@ -14919,9 +29024,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Filter on Rec_ipients"
 #~ msgstr "Filtras pagal _Gav�jus"
 
-#~ msgid "Get Mail"
-#~ msgstr "Gauti pa�t�"
-
 #~ msgid "Reply to _Sender"
 #~ msgstr "Atsakyti _siunt�jui"
 
diff --git a/po/lv.po b/po/lv.po
index 768a26246d..abb097828f 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-01-10 11:44-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -31,21 +31,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importē VKartes failus 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 "Glabāt Kā"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nosaukums"
 
 #: 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 "Epasts"
 
 #: 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:1731
 msgid "Primary"
 msgstr "Primārais"
 
@@ -55,16 +56,16 @@ 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:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 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:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
 msgid "Business"
 msgstr "Bizness"
 
@@ -74,12 +75,12 @@ msgid "Bus"
 msgstr "Kopne"
 
 #: 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:1720
 msgid "Callback"
 msgstr "Atzvanīšana"
 
 #: 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:1722
 msgid "Company"
 msgstr "Kompānija"
 
@@ -90,13 +91,13 @@ 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:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
 msgid "Home"
 msgstr "Mājas"
 
 #: 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 "Organizācija"
 
@@ -106,19 +107,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:1727
 msgid "Mobile"
 msgstr "Mobīlais tel."
 
 #: 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:1721
 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:1647
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fakss Darījumiem"
 
@@ -127,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:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "Bizness 2"
 
@@ -142,69 +143,68 @@ msgid "Bus 2"
 msgstr "Biz. 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:1724
 msgid "Home 2"
 msgstr "Mājas 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:1726
+#: 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:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "Citi"
 
 #: 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:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telekss"
 
 #: 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:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Epasts 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 "Tīmekļa lappaspuse"
 
@@ -213,7 +213,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 "Departaments"
 
@@ -222,7 +222,7 @@ msgid "Dep"
 msgstr "Dep"
 
 #: 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 "Birojs"
 
@@ -231,12 +231,12 @@ msgid "Off"
 msgstr "Bir"
 
 #: 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 "Amats"
 
 #: 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 "Profesija"
 
@@ -245,7 +245,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: 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 "Menedžeris"
 
@@ -258,7 +258,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: 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 "Iesauka"
 
@@ -267,12 +267,12 @@ msgid "Nick"
 msgstr "Iesauka"
 
 #: 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 "Spouse"
 
 #: 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 "Piezīme"
 
@@ -285,7 +285,7 @@ msgid "CALUri"
 msgstr "KalUri"
 
 #: 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 "Brīvs-aizņemts URL"
 
@@ -314,302 +314,16 @@ msgstr "Kategorijas"
 msgid "Family Name"
 msgstr "Uzvārds"
 
-#: 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 "Karte:"
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Vārds: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Priekšvārds:     "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Dotais:      "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Pieliktais: "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Uzvārds:     "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Sufikss:     "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Dzimšanas Datums: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adrese:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Pasta Kastīte:  "
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Paplašinājums:         "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Iela:      "
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Pilsēta:        "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Reģions:      "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Pasta indekss: "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Valsts:     "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Nosūtijuma Nosaukums: "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefoni:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefons:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-pasts:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-pasts:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Pastnieks: "
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Laika Zona: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Ģeolokācija: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Loma Darijumos: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Nosaukums:  "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Vieniba:  "
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Vienība2: "
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Vienība3: "
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Vienība4: "
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategorijas: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Komentāri: "
-
-#. 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"
-"Unikālā Virkne: "
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Publiskā Atslēga: "
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Vairākas VKartes"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VKarte"
@@ -617,86 +331,89 @@ msgstr "%s VKarte"
 #: 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:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Nevar inizializēt 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:2732
 msgid "Searching..."
 msgstr "Meklējam..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Ielādējam..."
 
 #. 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 "Kļūda meklēšanas izteiksmē."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:483
-msgid "Connecting to LDAP server..."
-msgstr "Savienojamies ar LDAP serveri..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:493
-msgid "Unable to connect to LDAP server."
-msgstr "Nevar savienoties ar LDAP serveri."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:509
-msgid "Waiting for connection to LDAP server..."
-msgstr "Gaidam savienojumu ar LDAP serveri..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:912
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Pievienojam karti LDAP serverim..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1013
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Izņemam karti no LDAP servera..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Mainām karti no LDAP servera..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2214
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Parstartējam meklēšanu."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Saņemam LDAP meklēšanas rezultātus..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2219
-msgid "Restarting search."
-msgstr "Parstartējam meklēšanu."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Kļūda izņemot vizītkarti"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Nevarēja noparsēt URL `%s'"
+
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "Epasta adrese:"
 
-#: addressbook/conduit/address-conduit.c:296
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Kursors nevar tikt ieladēts\n"
 
-#: addressbook/conduit/address-conduit.c:309
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "EGramata nav ielādēta\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 "Nevar sāknēt wombat serveri"
 
-#: 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 "Nevar sāknēt 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 "Nevar nolasīt pilota Adrešu aplikāciju bloku"
 
@@ -713,218 +430,109 @@ 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
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 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:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Evolution komponente kontaktu vadīšanai."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Ražotne vienkāršai Adrešu grāmatas kontrolei"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Mape, kas satur informāciju par kontaktiem"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP Serveris"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "LDAP serveris, kas satur informāciju par kontaktiem"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Jauns Kontakts"
 
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
-msgstr "Jauns _Kontakts"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_Kontaktēties"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Jauns Kontaktu Saraksts"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
-msgstr "Jauns Kontaktu _Saraksts"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
-msgstr "Rediģēt Adrešu Grāmatu"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
-msgstr "Konta Vārds"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "Pievienot Adrešu Grāmatu"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
-msgstr "Adrešu Grāmatas Resursi"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "Paplašināts"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
-msgstr "Bāze"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Pamata"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "De_lete"
-msgstr "D_zēst"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "Epasta adrese:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution lietos šo epasta adresi lai autentificētu jūs ar serveri"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "One"
-msgstr "Viens"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
-msgstr "Meklēšanas _bāze:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search s_cope: "
-msgstr "Meklēšanas apmēri: "
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Server Name"
-msgstr "Servera Vārds"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid "Sub"
-msgstr "Apakš"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Zemāk pieprasītā informācija ir nepieciešama, lai pievienotu adrešu grāmatu."
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "This information is not required for most ldap servers. "
-msgstr "Šī informācija netiek prasīta no vairākuma ldap serveru."
-
-#: 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 "Š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."
-
-#: 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 "Šis ir pamatmezgls visiem jūsu meklējumiem uz ldap servera. Kontaktējaties ar sava servera administrātoru, lai iegūtu vairāk informācijas."
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Šis ir nosaukums serverim kur jūsu adrešu grāmata atrodas."
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
-msgstr "Šis ir ports ko lieto jūsu norādītais ldap serveris."
-
-#: 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 "Šis vārds tiks lietots lai identificētu jūsu kontu. Tas ir tikai rādīšanas dēļ."
-
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "_Account name:"
-msgstr "Kont_a vārds:"
-
-#: 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 "_Pievienot"
-
-#: 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 "R_ediģēt"
-
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
-msgstr "_Mans serveris pieprasa autentifikāciju"
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
-msgstr "_Ports:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
-msgstr "_Servera nosaukums:"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Kontaktu Saraksts"
 
-#: 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "Nevar initicializēt gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:167
-msgid "Other Contacts"
-msgstr "Citi Kontakti"
-
-#: addressbook/gui/component/addressbook.c:485
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Nevar atvērt adrešu gramatu"
 
-#: 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"
@@ -934,7 +542,7 @@ msgstr ""
 "ka esat ievadijuši nepareizu URI, vai arī LDAP serveris\n"
 "ir izslēgts"
 
-#: 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"
@@ -946,7 +554,7 @@ msgstr ""
 "jums ir jākompilē programma no CVS avota pēc OpenLDAP\n"
 "dabūšanas no saites lejup.\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."
@@ -954,58 +562,50 @@ 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:640
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ievadiet %s paroli (lietotājs %s)"
 
-#: addressbook/gui/component/addressbook.c:808
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Jebkuršs lauks satur"
-
-#: addressbook/gui/component/addressbook.c:809
-msgid "Name contains"
-msgstr "Vārds satur"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "beidzas ar"
 
-#: addressbook/gui/component/addressbook.c:810
-msgid "Email contains"
-msgstr "Epasts satur"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "Epasts 2"
 
-#: addressbook/gui/component/addressbook.c:811
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija ir"
 
 #. 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:772
+#: 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
 msgid "Advanced..."
 msgstr "Paplašināts..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1030
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Jebkura Kategorija"
 
-#: addressbook/gui/component/addressbook.c:1112
+#: addressbook/gui/component/addressbook.c:1083
 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:1686
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 msgid "Primary Email"
 msgstr "Primārais Epasts"
 
@@ -1051,6 +651,617 @@ 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
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "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
+#, fuzzy
+msgid "Always"
+msgstr "Brīdinājumi"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonymous lietotājs"
+
+#: 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 "_Kontaktēties"
+
+#: 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 "Nav Informācijas"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "D_zēst"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Saraksta vā_rds:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "Epasta adrese:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Evolution Brīdinājums"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr "Evolution lietos šo epasta adresi lai autentificētu jūs ar serveri"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr "Evolution lietos šo epasta adresi lai autentificētu jūs ar serveri"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "Meklēt:"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Galvenais"
+
+#: 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 "Konfigurācija"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+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
+#, fuzzy
+msgid "Never"
+msgstr "_katru"
+
+#: 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 "Viens"
+
+#: 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 "Meklēšanas apmēri: "
+
+#. 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 "Meklēšana"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Izvēlēties Visus"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Dzēsts"
+
+#: 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 "Avota Informācija:"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Savienojamies ar serveri..."
+
+#: 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 "Apakš"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Neatbalstīta shēma"
+
+#: 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 ""
+"Š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"
+"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 "Šī ir pas_ta adrese"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+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:139
+msgid "_Add"
+msgstr "_Pievienot"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Pievienot"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Pievienot darbību"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Pievienot darbību"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Brīdinājumi"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Dzēst visu"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Attēlot"
+
+#: 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:152 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 "R_ediģēt"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "R_ediģēt satikšanos"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution Brīdinājums"
+
+#: 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 "_Opcijas"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Ports:"
+
+#: 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 "Meklēšanas _bāze:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Servera nosaukums:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Snaust kādu laiku (minūtes)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Konts %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "konaktu-saraksta-redaktors"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Nav vizītkaršu"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Pārvienojamies ar %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 "Galvenais"
+
+#: 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 "Meklēšana"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolution adrešu grāmatas vārda izvēles interfeiss."
@@ -1060,11 +1271,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Ražotne Adrešu grāmatas vārda izvēles interfeisam"
 
 #: 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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Izņemt"
 
@@ -1093,7 +1302,12 @@ msgstr "(%d nav parādīts)"
 msgid "Unnamed Contact"
 msgstr "Nenosaukts Kontakts"
 
-#: 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 "Sūtītājs satur"
+
+#: 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"
@@ -1109,7 +1323,7 @@ msgstr ""
 "detalizētu apstākļu aprakstu, pie kuriem kļūda\n"
 "parādijās. Paldies."
 
-#: 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"
@@ -1121,42 +1335,43 @@ msgstr ""
 "Jums vajag iziet un pārstartēt Evolution lai atrisinātu\n"
 "šo problēmu."
 
-#: 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 "Izvēlieties Kontaktus no Adrešu Grāmatas"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "Satur_ošs:"
+msgid "Select Names"
+msgstr "Izvēleties Vārdu"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Co_ntacts:"
-msgstr "Ko_ntakti:"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Dzēst Kontaktu?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "F_ind"
-msgstr "Meklēt:"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Kontakti"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "Izvēleties Vārdu"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
-msgstr "Parādīt kontaktus sekojot šādiem kritērijiem:"
+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 "_Pārvietot..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategorija:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "M_ape:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Message Recipients:"
-msgstr "_Vēstules Saturs:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "A_ssistant's name:"
 msgstr "A_sistenta vārds:"
@@ -1189,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:1293
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Kontaktu Redaktors"
 
@@ -1214,16 +1429,14 @@ msgstr "Fail_s Kā:"
 msgid "Full _Name..."
 msgstr "Pil_ns Vārds..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Galvenais"
-
 #: 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"
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
 "of that information here."
 msgstr ""
-"Ja šī persona publicē brīvs/aizņemts vai citu kalendāra informāciju Internetā, ievadi doto\n"
+"Ja šī persona publicē brīvs/aizņemts vai citu kalendāra informāciju "
+"Internetā, ievadi doto\n"
 "adresi šeit."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
@@ -1260,14 +1473,11 @@ 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: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: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
 msgid "_Delete"
 msgstr "_Dzēst"
 
@@ -1295,1123 +1505,1122 @@ msgstr "_Publiskā Kalendāra URL:"
 msgid "_Web page address:"
 msgstr "_Tīmekļa lapaspuses adrese:"
 
-#: 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:757
-msgid "Category editor not available."
-msgstr "Kategoriju redaktors nav pieejams."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:764
-msgid "This contact belongs to these categories:"
-msgstr "Šis kontakts pieder šādām kategorijām:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:978
-msgid "Save Contact as VCard"
-msgstr "Saglabāt Konaktu kā VKarti"
-
-#: 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 "Nevar atrast vidžetu laukā: `%s'"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
-msgstr "Kontakta Ātrā pievienošana"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
-msgstr "Rediģēt Pilnīgi"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr "Pilns Vārds"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
-msgid "E-mail"
-msgstr "E-pasts"
-
-#. 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 "saraksts"
-
-#: 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 jau eksistē\n"
-"Vai tu vēlies to pārrakstīt?"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adrese _2:"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
+msgstr "Amerikas Savienotās Valstis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
 msgid "Afghanistan"
 msgstr "Afganistāna"
 
-#: 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 "Albānija"
 
-#: 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 "Aldžīrija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "American Samoa"
 msgstr "Amerikāņu Samoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Andorra"
 msgstr "Andora"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Anguilla"
 msgstr "Anguila"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Antigua And Barbuda"
 msgstr "Antikua un Barbuda"
 
-#: 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 "Argentīna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Armenia"
 msgstr "Armēnija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Aruba"
 msgstr "Aurba"
 
-#: 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 "Austrālija"
 
-#: 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 "Austrija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Azerbaijan"
 msgstr "Azerbaidžāna"
 
-#: 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 "Bahamas"
 
-#: 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 "Bahrēna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Bangladesh"
 msgstr "Bangladeša"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Barbados"
 msgstr "Barbadosa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Belarus"
 msgstr "Baltkrievija"
 
-#: 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 "Belģija"
 
-#: 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 "Belize"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Benin"
 msgstr "Benina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bhutan"
 msgstr "Butāna"
 
-#: 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 "Bolīvija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnija-Hercogovina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Botswana"
 msgstr "Botsvana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bouvet Island"
 msgstr "Bouveta Sala"
 
-#: 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 "Brazīlija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "British Indian Ocean Territory"
 msgstr "Britu Indijas Okeāna Teritorija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:33
-msgid "British Virgin Islands"
-msgstr "Britu Virdžīnu Salas"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Brunei Darussalam"
 msgstr "Brunejas Karaliste"
 
-#: 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 "Būlgārija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Burundi"
 msgstr "Burundī"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Cambodia"
 msgstr "Kambodžija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Cameroon"
 msgstr "Kamerūna"
 
-#: 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 "Kanāda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cape Verde"
 msgstr "Kapoverde"
 
-#: 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 "Kaimanu Salas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Central African Republic"
 msgstr "Centrālāfrikas Republika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Chad"
 msgstr "Čada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-msgid "Check Address"
-msgstr "Pārbaudīt Adresi"
-
-#: 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 "Čīle"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "China"
 msgstr "Ķīna"
 
-#: 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 "Ziemassvētku Sala"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokosu (Kīlinga) Salas"
 
-#: 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 "Kolumbija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Comoros"
 msgstr "Komoros salas"
 
-#: 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 "Kongo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Cook Islands"
 msgstr "Kuka Salas"
 
-#: 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 "Kostarika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:56
-msgid "Countr_y:"
-msgstr "Va_lsts:"
-
-#: 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 "Horvātija"
 
-#: 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 "Kuba"
 
-#: 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 "Kipra"
 
-#: 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 "Čehija"
 
-#: 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 "Dānija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Djibouti"
 msgstr "Džibutī"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Dominica"
 msgstr "Dominika"
 
-#: 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 "Dominikāņu Republika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "East Timor"
 msgstr "Austrumtimora"
 
-#: 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 "Ekvadora"
 
-#: 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 "Ēģipte"
 
-#: 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 "Elsalvadora"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Equatorial Guinea"
 msgstr "Ekvatoriālā Gvineja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Eritrea"
 msgstr "Eriteja"
 
-#: 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 "Igaunija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Falkland Islands"
 msgstr "Faiklandes Salas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Faroe Islands"
 msgstr "Faroe Salas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Fiji"
 msgstr "Fidžī"
 
-#: 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 "Somija"
 
-#: 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 "Francija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "French Guiana"
 msgstr "Franču Gviāna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "French Polynesia"
 msgstr "Franču Polinēzija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Southern Territories"
 msgstr "Franču Dienvidu Teritorijas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Gabon"
 msgstr "Gabona"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Gambia"
 msgstr "Gambija"
 
-#: 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 "Armēnija"
 
-#: 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 "Vācija"
 
-#: 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 "Gibraltārs"
 
-#: 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 "Grieķija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Greenland"
 msgstr "Grinlande"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Guadeloupe"
 msgstr "Gvadelupa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Guam"
 msgstr "Guama"
 
-#: 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 "Guatemala"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guinea"
 msgstr "Gvineja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guinea-bissau"
 msgstr "Gvineja-bisau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guyana"
 msgstr "Gajāna"
 
-#: 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 "Hērdas un Makdonalda Salas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Holy See"
 msgstr "Vatikāns"
 
-#: 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 "Hondura"
 
-#: 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 "Honkonga"
 
-#: 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 "Ungārija"
 
-#: 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 "Islande"
 
-#: 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 "Indija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Indonesia"
 msgstr "Indonēzija"
 
-#: 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 "Īrija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Israel"
 msgstr "Izarēla"
 
-#: 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 "Itālija"
 
-#: 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 "Jamaika"
 
-#: 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 "Japāna"
 
-#: 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 "Jordāna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Kazakhstan"
 msgstr "Kazahstāna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Kenya"
 msgstr "Keinja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: 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 "Korejas Republika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuvēta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Kyrgyzstan"
 msgstr "Kirgiztāna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Laos"
 msgstr "Laosa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:117
-#: my-evolution/Locations.h:1183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Latvija"
 
-#: 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:1198
 msgid "Lebanon"
 msgstr "Lebanona"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: 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:1218
 msgid "Liberia"
 msgstr "Libērija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Liechtenstein"
 msgstr "Lihenšteina"
 
-#: 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:1234
 msgid "Lithuania"
 msgstr "Lietuva"
 
-#: 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:1268
 msgid "Luxembourg"
 msgstr "Luksemburga"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Macau"
 msgstr "Makau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Macedonia"
 msgstr "Maķedonija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Madagascar"
 msgstr "Madagaskāra"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Malawi"
 msgstr "Malavī"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Malaysia"
 msgstr "Malaizija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Maldives"
 msgstr "Maldivu salas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Mali"
 msgstr "Mali"
 
-#: 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:1297
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Marshall Islands"
 msgstr "Maršala Salas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Martinique"
 msgstr "Martinika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Mauritania"
 msgstr "Mauritānija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Mauritius"
 msgstr "Mauritānija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mayotte"
 msgstr "Majota"
 
-#: 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:1387
 msgid "Mexico"
 msgstr "Meksika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Micronesia"
 msgstr "Mikronēzija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#, fuzzy
+msgid "Moldova, Republic Of"
+msgstr "Korejas Republika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Monaco"
 msgstr "Monāko"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mongolia"
 msgstr "Mongolija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Montserrat"
 msgstr "Montserata"
 
-#: 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:1470
 msgid "Morocco"
 msgstr "Moroko"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mozambique"
 msgstr "Mozambika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Myanmar"
 msgstr "Mjanma"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Namibia"
 msgstr "Namībija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Nepal"
 msgstr "Nepāla"
 
-#: 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:1531
 msgid "Netherlands"
 msgstr "Nīderlande"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Netherlands Antilles"
 msgstr "Nīderlandes Antilas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "New Caledonia"
 msgstr "Jaunkaledonija"
 
-#: 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:1560
 msgid "New Zealand"
 msgstr "Jaunzēlande"
 
-#: 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:1562
 msgid "Nicaragua"
 msgstr "Nikaragva"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Niger"
 msgstr "Nigērija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nigeria"
 msgstr "Nigērija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niue"
 msgstr "Niue"
 
-#: 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:1574
 msgid "Norfolk Island"
 msgstr "Norfolkas salas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Northern Mariana Islands"
 msgstr "Ziemeļmarina"
 
-#: 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:1587
 msgid "Norway"
 msgstr "Norvēģija"
 
-#: 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:1632
 msgid "Oman"
 msgstr "Omāna"
 
-#: 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:1673
 msgid "Pakistan"
 msgstr "Pakistāna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Palestinian Territory"
 msgstr "Palestīniešu Teritorija"
 
-#: 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:1683
 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 "Papua-Jaungvineja"
 
-#: 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:1688
 msgid "Paraguay"
 msgstr "Paragvaja"
 
-#: 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:1723
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr "Filipīnas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Pitcairn"
 msgstr "Pitkērna"
 
-#: 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:1764
 msgid "Poland"
 msgstr "Polija"
 
-#: 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:1791
 msgid "Portugal"
 msgstr "Portugāle"
 
-#: 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:1824
 msgid "Puerto Rico"
 msgstr "Puerto Riko"
 
-#: 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:1836
 msgid "Qatar"
 msgstr "Katara"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:173
-msgid "Republic Of Korea"
-msgstr "Korejas Republika"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:174
-msgid "Republic Of Moldova"
-msgstr "Moldovas Republika"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Reunion"
 msgstr "Reinjona"
 
-#: 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:1912
 msgid "Romania"
 msgstr "Rumānija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Russian Federation"
 msgstr "Krievijas Federācija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Saint Kitts And Nevis"
 msgstr "Santkikta un Nevisa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Saint Lucia"
 msgstr "Sentlūsija"
 
-#: 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 "Sanvincenta Un Grenadaina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "San Marino"
 msgstr "San Marīno"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome Un Principa"
 
-#: 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:2035
 msgid "Saudi Arabia"
 msgstr "Saudi Arābija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Senegal"
 msgstr "Senegāla"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Seychelles"
 msgstr "Seišelas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Sierra Leone"
 msgstr "Sjerra Leone"
 
-#: 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:2090
 msgid "Singapore"
 msgstr "Singapūra"
 
-#: 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:2103
 msgid "Slovakia"
 msgstr "Slovākija"
 
-#: 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:2104
 msgid "Slovenia"
 msgstr "Slovēnija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Solomon Islands"
 msgstr "Slomona Salas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Somalia"
 msgstr "Somālija"
 
-#: 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:2119
 msgid "South Africa"
 msgstr "Dienvidāfrika"
 
-#: 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 "Armēnija"
 
-#: 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:2127
 msgid "Spain"
 msgstr "Spānija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Sri Lanka"
 msgstr "Šri Lanka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "St. Pierre And Miquelon"
 msgstr "Santpijerra Un Mikuelona"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Sudan"
 msgstr "Sudāna"
 
-#: 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:2176
 msgid "Suriname"
 msgstr "Surinama"
 
-#: 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 "Svalbarda Un Jana Majena Salas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Swaziland"
 msgstr "Šveice"
 
-#: 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:2181
 msgid "Sweden"
 msgstr "Zviedrija"
 
-#: 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:2183
 msgid "Switzerland"
 msgstr "Šveice"
 
-#: 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:2205
 msgid "Taiwan"
 msgstr "Taivāna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Tajikistan"
 msgstr "Tadžikistāna"
 
-#: 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 "Tanzānijas Apvienotā Republika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
 msgstr "Taizeme"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Trinidad And Tobago"
 msgstr "Trinidada Un Tobago"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tunisia"
 msgstr "Tunisija"
 
-#: 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:2321
 msgid "Turkey"
 msgstr "Turcija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Turkmenistan"
 msgstr "Turkmenistāna"
 
-#: 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 "Tuvalu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:218
-msgid "U.S. Virgin Islands"
-msgstr "ASV Virdžinu Salas"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "United Arab Emirates"
 msgstr "Apvienotie Arābu Erimāti"
 
-#: 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:2342
 msgid "United Kingdom"
 msgstr "Apvienotā Karaliste"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr "Tanzānijas Apvienotā Republika"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-#: my-evolution/Locations.h:2331
-msgid "United States"
-msgstr "Amerikas Savienotās Valstis"
-
-#: 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:2348
 msgid "Uruguay"
 msgstr "Urugvaja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Uzbekistan"
 msgstr "Uzbekistāna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Vanuatu"
 msgstr "Vanatu"
 
-#: 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:2380
 msgid "Venezuela"
 msgstr "Venēcija"
 
-#: 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:2392
 msgid "Viet Nam"
 msgstr "Vjetnama"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#, fuzzy
+msgid "Virgin Islands, British"
+msgstr "ASV Virdžinu Salas"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#, fuzzy
+msgid "Virgin Islands, U.S."
+msgstr "ASV Virdžinu Salas"
+
+#: 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 "Rietumu Sahāra"
 
-#: 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:2512
 msgid "Yemen"
 msgstr "Jemena"
 
-#: 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:2524
 msgid "Yugoslavia"
 msgstr "Dienvidslāvija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Zambia"
 msgstr "Zambija"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Zimbabwe"
 msgstr "ZImbabve"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Dzēst Kontaktu?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+msgid "Category editor not available."
+msgstr "Kategoriju redaktors nav pieejams."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+msgid "This contact belongs to these categories:"
+msgstr "Šis kontakts pieder šādām kategorijām:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+msgid "Save Contact as VCard"
+msgstr "Saglabāt Konaktu kā VKarti"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Nevar atrast vidžetu laukā: `%s'"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+msgid "Contact Quick-Add"
+msgstr "Kontakta Ātrā pievienošana"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+msgid "Edit Full"
+msgstr "Rediģēt Pilnīgi"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr "Pilns Vārds"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+msgid "E-mail"
+msgstr "E-pasts"
+
+#. 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 "saraksts"
+
+#: 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 jau eksistē\n"
+"Vai tu vēlies to pārrakstīt?"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Adrese _2:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "Pārbaudīt Adresi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "Va_lsts:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "_Adrese:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "_Pilsēta:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Pasta Kastīte:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Rajons/Štats/Province:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "_Pasta Kods:"
 
@@ -2493,15 +2702,15 @@ 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"
 msgstr "_Slēpt adreses kad sūtam šo uz sarakstu"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 msgid "_Remove"
 msgstr "_Izņemt"
 
@@ -2564,7 +2773,7 @@ msgstr ""
 "eksistē šajā mapē. Vai jūs to vēlaties pievienot jebkurā gadījumā?"
 
 #: 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 "Paplašinātā Meklēšana"
 
@@ -2573,229 +2782,319 @@ msgstr "Paplašinātā Meklēšana"
 msgid "Search"
 msgstr "Meklēšana"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Nav vizītkaršu"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 vizītkarte"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d vizītkartes"
 
-#: 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 "Saglabāt kā VKarti"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Atvērt"
-
-#: 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 "Pārsūtīt Kontaktu"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-msgid "Send Message to Contact"
-msgstr "Sūtīt Vēstuli Kontaktam"
-
-#: 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 "Drukāt"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr "Drukāt Aploksni"
-
-#: 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 "Dzēst"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Kļūda mainot vizītkarti"
 
-#: 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:1043
 msgid "Success"
 msgstr "Veiksmīgi"
 
-#: 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: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
 msgid "Unknown error"
 msgstr "Nezināma kļūda"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Repozitorijs nesaistes režīmā"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "Atļauja liegta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Vizītkarte nav atrasta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "Vizītkartes ID jau eksistē"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protokols nav atbalstīts"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
-#: 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
+#: 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
 msgid "Cancelled"
 msgstr "Atsaukts"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Cita kļūda"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Kļūda pievienojot sarakstu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Kļūda pievienojot vizītkarti"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Kļūda mainot sarakstu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Kļūda izņemot sarakstu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Kļūda izņemot vizītkarti"
 
-#. 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:204
+#, fuzzy
+msgid "Display Cards?"
+msgstr "Attēlot"
 
-#. 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:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "Attēlot"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Nav vizītkaršu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Nav vizītkaršu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Nav vizītkaršu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Nav vizītkaršu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Klikšķini šeit lai pievienotu kontaktu *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Primārais Telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Asistenta Telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Biznesa Telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Atzvanīšanas Telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Kompānijas Telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Mājas Telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Biznesa Adrese"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Mājas Adrese"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Mobilais Telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Automašīnas Telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Biznesa Telefons 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Mājas Telefons 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Cits Telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Saglabāt kā VKarti"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Jauns Kontakts"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Jauns Kontaktu Saraksts"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Iet Uz Mapi..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "I_mportēt..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Meklēt Kontaktus"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Adrešu Grāmatas Avoti..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Pilot Uzstādījumi..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Pārsūtīt Kontaktu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Sūtīt Vēstuli Kontaktam"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Drukāt Aploksni"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "_Kopēt uz Mapi..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "Pārvietot uz _Mapi..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Izgriezt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Pašreizējais Skats"
+
+#. 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:940
+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:945
+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."
@@ -2809,11 +3108,12 @@ msgstr "un vēl viena vizītkarte."
 msgid "Save in addressbook"
 msgstr "Saglabāt adrešu grāmatā"
 
-#: 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 ""
@@ -2823,10 +3123,37 @@ msgstr ""
 "\n"
 "Dubultklikšķiniet šeit lai izveidotu jaunu Kontaktu."
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Šeit nav priekšmetu ko rādīt šajā skatā\n"
+"\n"
+"Dubultklikšķiniet šeit lai izveidotu jaunu Kontaktu."
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Vizītkaršu Skats"
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr "Drukāt aploksni"
+
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr "Drukāt vizītkartes"
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+msgid "Print card"
+msgstr "Drukāt vizītkarti"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -2896,6 +3223,7 @@ msgid "Include:"
 msgstr "Iekļaut:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Ainavveida"
 
@@ -2920,11 +3248,12 @@ msgid "Options"
 msgstr "Opcijas"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Orientācija"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "Lapa"
 
@@ -2940,7 +3269,9 @@ msgstr "Papīrs"
 msgid "Paper source:"
 msgstr "Papīra avots:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Portrets"
 
@@ -2996,1607 +3327,49 @@ msgstr "Platums:"
 msgid "_Font..."
 msgstr "_Fonts..."
 
-#: addressbook/printing/e-contact-print.c:1111
-msgid "Print cards"
-msgstr "Drukāt vizītkartes"
-
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-msgid "Print card"
-msgstr "Drukāt vizītkarti"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr "Drukāt aploksni"
-
-#.
-#. * 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 "Āfrika/Abidjaņu"
-
-#: calendar/zones.h:8
-msgid "Africa/Accra"
-msgstr "Āfrika/Akra"
-
-#: 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 "Āfrika/Kaira"
-
-#: calendar/zones.h:20
-msgid "Africa/Casablanca"
-msgstr "Āfrika/Kasablanka"
-
-#: calendar/zones.h:21
-msgid "Africa/Ceuta"
-msgstr ""
-
-#: calendar/zones.h:22
-msgid "Africa/Conakry"
-msgstr ""
-
-#: calendar/zones.h:23
-msgid "Africa/Dakar"
-msgstr "Āfrika/Dakāra"
-
-#: calendar/zones.h:24
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
-
-#: calendar/zones.h:25
-msgid "Africa/Djibouti"
-msgstr "Āfrika/Džibutī"
-
-#: calendar/zones.h:26
-msgid "Africa/Douala"
-msgstr "Āfrika/Douala"
-
-#: calendar/zones.h:27
-msgid "Africa/El_Aaiun"
-msgstr ""
-
-#: calendar/zones.h:28
-msgid "Africa/Freetown"
-msgstr "Āfrika/Frītauna"
-
-#: calendar/zones.h:29
-msgid "Africa/Gaborone"
-msgstr "Āfrika/Gaborone"
-
-#: calendar/zones.h:30
-msgid "Africa/Harare"
-msgstr "Africa/Harare"
-
-#: calendar/zones.h:31
-msgid "Africa/Johannesburg"
-msgstr "Āfrika/Johanesburga"
-
-#: calendar/zones.h:32
-msgid "Africa/Kampala"
-msgstr "Āfrika/Kampala"
-
-#: calendar/zones.h:33
-msgid "Africa/Khartoum"
-msgstr ""
-
-#: calendar/zones.h:34
-msgid "Africa/Kigali"
-msgstr "Āfrika/Kigalī"
-
-#: calendar/zones.h:35
-msgid "Africa/Kinshasa"
-msgstr ""
-
-#: calendar/zones.h:36
-msgid "Africa/Lagos"
-msgstr "Āfrika/Lagosa"
-
-#: calendar/zones.h:37
-msgid "Africa/Libreville"
-msgstr "Āfrika/Libervilla"
-
-#: calendar/zones.h:38
-msgid "Africa/Lome"
-msgstr "Āfrika/Lome"
-
-#: calendar/zones.h:39
-msgid "Africa/Luanda"
-msgstr "Āfrika/Luanda"
-
-#: calendar/zones.h:40
-msgid "Africa/Lubumbashi"
-msgstr "Āfrika/Lubumbašī"
-
-#: calendar/zones.h:41
-msgid "Africa/Lusaka"
-msgstr "Āfrika/Lusaka"
-
-#: calendar/zones.h:42
-msgid "Africa/Malabo"
-msgstr "Āfrika/Malabo"
-
-#: calendar/zones.h:43
-msgid "Africa/Maputo"
-msgstr "Āfrika/Maputo"
-
-#: calendar/zones.h:44
-msgid "Africa/Maseru"
-msgstr "Āfrika/Maseru"
-
-#: 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 "Āfrika/Nairobi"
-
-#: 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
-msgid "America/Adak"
-msgstr ""
-
-#: calendar/zones.h:60
-msgid "America/Anchorage"
-msgstr ""
-
-#: calendar/zones.h:61
-msgid "America/Anguilla"
-msgstr "Amerika/Anguila"
-
-#: calendar/zones.h:62
-msgid "America/Antigua"
-msgstr ""
-
-#: calendar/zones.h:63
-msgid "America/Araguaina"
-msgstr "Amerika/Nikaragva"
-
-#: calendar/zones.h:64
-msgid "America/Aruba"
-msgstr ""
-
-#: calendar/zones.h:65
-msgid "America/Asuncion"
-msgstr ""
-
-#: calendar/zones.h:66
-msgid "America/Barbados"
-msgstr "Amerika/Barbadosa"
-
-#: calendar/zones.h:67
-msgid "America/Belem"
-msgstr ""
-
-#: calendar/zones.h:68
-msgid "America/Belize"
-msgstr "Amerika/Belize"
-
-#: calendar/zones.h:69
-msgid "America/Boa_Vista"
-msgstr ""
-
-#: calendar/zones.h:70
-msgid "America/Bogota"
-msgstr ""
-
-#: calendar/zones.h:71
-msgid "America/Boise"
-msgstr ""
-
-#: calendar/zones.h:72
-msgid "America/Buenos_Aires"
-msgstr "Amerika/Buenosairesa"
-
-#: calendar/zones.h:73
-msgid "America/Cambridge_Bay"
-msgstr ""
-
-#: calendar/zones.h:74
-msgid "America/Cancun"
-msgstr ""
-
-#: calendar/zones.h:75
-msgid "America/Caracas"
-msgstr ""
-
-#: calendar/zones.h:76
-msgid "America/Catamarca"
-msgstr ""
-
-#: calendar/zones.h:77
-msgid "America/Cayenne"
-msgstr ""
-
-#: calendar/zones.h:78
-msgid "America/Cayman"
-msgstr ""
-
-#: calendar/zones.h:79
-msgid "America/Chicago"
-msgstr "Amerika/Čikāga"
-
-#: calendar/zones.h:80
-msgid "America/Chihuahua"
-msgstr ""
-
-#: calendar/zones.h:81
-msgid "America/Cordoba"
-msgstr ""
-
-#: calendar/zones.h:82
-msgid "America/Costa_Rica"
-msgstr "Amerika/Kostarika"
-
-#: calendar/zones.h:83
-msgid "America/Cuiaba"
-msgstr ""
-
-#: calendar/zones.h:84
-msgid "America/Curacao"
-msgstr ""
-
-#: calendar/zones.h:85
-msgid "America/Danmarkshavn"
-msgstr ""
-
-#: calendar/zones.h:86
-msgid "America/Dawson"
-msgstr ""
-
-#: calendar/zones.h:87
-msgid "America/Dawson_Creek"
-msgstr ""
-
-#: calendar/zones.h:88
-msgid "America/Denver"
-msgstr "Amerika/Denvera"
-
-#: calendar/zones.h:89
-msgid "America/Detroit"
-msgstr "Amerika/Detroita"
-
-#: calendar/zones.h:90
-msgid "America/Dominica"
-msgstr "Amerika/Dominika"
-
-#: calendar/zones.h:91
-msgid "America/Edmonton"
-msgstr "Amerika/Edmontona"
-
-#: calendar/zones.h:92
-msgid "America/Eirunepe"
-msgstr ""
-
-#: calendar/zones.h:93
-msgid "America/El_Salvador"
-msgstr "Amerika/Elsalvadora"
-
-#: calendar/zones.h:94
-msgid "America/Fortaleza"
-msgstr ""
-
-#: calendar/zones.h:95
-msgid "America/Glace_Bay"
-msgstr ""
-
-#: calendar/zones.h:96
-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
-msgid "America/Grenada"
-msgstr "Amerika/Grenada"
-
-#: calendar/zones.h:100
-msgid "America/Guadeloupe"
-msgstr "Amerika/Gvadelupa"
-
-#: calendar/zones.h:101
-msgid "America/Guatemala"
-msgstr "Amerika/Guatemala"
-
-#: calendar/zones.h:102
-msgid "America/Guayaquil"
-msgstr ""
-
-#: calendar/zones.h:103
-msgid "America/Guyana"
-msgstr ""
-
-#: calendar/zones.h:104
-msgid "America/Halifax"
-msgstr ""
-
-#: calendar/zones.h:105
-msgid "America/Havana"
-msgstr "Amerika/Havana"
-
-#: calendar/zones.h:106
-msgid "America/Hermosillo"
-msgstr ""
-
-#: calendar/zones.h:107
-msgid "America/Indiana/Indianapolis"
-msgstr "Amerika/Indiāna/Indianpolisa"
-
-#: 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 "Amerika/Indiānpolisa"
-
-#: calendar/zones.h:112
-msgid "America/Inuvik"
-msgstr ""
-
-#: calendar/zones.h:113
-msgid "America/Iqaluit"
-msgstr ""
-
-#: calendar/zones.h:114
-msgid "America/Jamaica"
-msgstr "Amerika/Jamaika"
-
-#: calendar/zones.h:115
-msgid "America/Jujuy"
-msgstr ""
-
-#: calendar/zones.h:116
-msgid "America/Juneau"
-msgstr ""
-
-#: calendar/zones.h:117
-msgid "America/Kentucky/Louisville"
-msgstr "Amerika/Kentukī/Louisvilla"
-
-#: calendar/zones.h:118
-msgid "America/Kentucky/Monticello"
-msgstr ""
-
-#: calendar/zones.h:119
-#, fuzzy
-msgid "America/La_Paz"
-msgstr "Amerikāņu Samoa"
-
-#: calendar/zones.h:120
-msgid "America/Lima"
-msgstr "Amerika/Lima"
-
-#: calendar/zones.h:121
-msgid "America/Los_Angeles"
-msgstr "Amerika/Losandželosa"
-
-#: calendar/zones.h:122
-msgid "America/Louisville"
-msgstr "Amerika/Louisvila"
-
-#: calendar/zones.h:123
-msgid "America/Maceio"
-msgstr "Amerika/Maceijo"
-
-#: calendar/zones.h:124
-#, fuzzy
-msgid "America/Managua"
-msgstr "Amerikāņu Samoa"
-
-#: calendar/zones.h:125
-#, fuzzy
-msgid "America/Manaus"
-msgstr "Amerikāņu Samoa"
-
-#: calendar/zones.h:126
-msgid "America/Martinique"
-msgstr "Amerika/Martinika"
-
-#: calendar/zones.h:127
-#, fuzzy
-msgid "America/Mazatlan"
-msgstr "Amerikāņu Samoa"
-
-#: calendar/zones.h:128
-msgid "America/Mendoza"
-msgstr "Amerika/Mendoza"
-
-#: calendar/zones.h:129
-msgid "America/Menominee"
-msgstr ""
-
-#: calendar/zones.h:130
-msgid "America/Merida"
-msgstr "Amerika/Merida"
-
-#: calendar/zones.h:131
-msgid "America/Mexico_City"
-msgstr "Amerika/Mehiko"
-
-#: 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
-msgid "America/Montreal"
-msgstr "Amerika/Montreāla"
-
-#: calendar/zones.h:136
-msgid "America/Montserrat"
-msgstr "Amerika/Montserata"
-
-#: calendar/zones.h:137
-#, fuzzy
-msgid "America/Nassau"
-msgstr "Amerikāņu Samoa"
-
-#: calendar/zones.h:138
-msgid "America/New_York"
-msgstr "Amerika/Ņujorka"
-
-#: calendar/zones.h:139
-msgid "America/Nipigon"
-msgstr ""
-
-#: calendar/zones.h:140
-msgid "America/Nome"
-msgstr "Amerika/Nome"
-
-#: calendar/zones.h:141
-#, fuzzy
-msgid "America/Noronha"
-msgstr "Amerikāņu Samoa"
-
-#: calendar/zones.h:142
-msgid "America/North_Dakota/Center"
-msgstr ""
-
-#: calendar/zones.h:143
-msgid "America/Panama"
-msgstr "Amerika/Panama"
-
-#: calendar/zones.h:144
-msgid "America/Pangnirtung"
-msgstr ""
-
-#: calendar/zones.h:145
-#, fuzzy
-msgid "America/Paramaribo"
-msgstr "Amerikāņu Samoa"
-
-#: calendar/zones.h:146
-msgid "America/Phoenix"
-msgstr "Amerika/Fēniksa"
-
-#: calendar/zones.h:147
-#, fuzzy
-msgid "America/Port-au-Prince"
-msgstr "Ports"
-
-#: calendar/zones.h:148
-#, fuzzy
-msgid "America/Port_of_Spain"
-msgstr "Ports"
-
-#: calendar/zones.h:149
-msgid "America/Porto_Velho"
-msgstr ""
-
-#: calendar/zones.h:150
-msgid "America/Puerto_Rico"
-msgstr "Amerika/Puerto Riko"
-
-#: 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
-msgid "America/Regina"
-msgstr "Amerika/Regina"
-
-#: calendar/zones.h:155
-msgid "America/Rio_Branco"
-msgstr ""
-
-#: calendar/zones.h:156
-msgid "America/Rosario"
-msgstr "Amerika/Rosario"
-
-#: calendar/zones.h:157
-msgid "America/Santiago"
-msgstr "Amerika/Santjago"
-
-#: calendar/zones.h:158
-msgid "America/Santo_Domingo"
-msgstr "Amerika/Santo_Domingo"
-
-#: calendar/zones.h:159
-msgid "America/Sao_Paulo"
-msgstr "Amerika/Sao_Paulo"
-
-#: calendar/zones.h:160
-msgid "America/Scoresbysund"
-msgstr ""
-
-#: calendar/zones.h:161
-msgid "America/Shiprock"
-msgstr "Amerika/Šiproka"
-
-#: calendar/zones.h:162
-#, fuzzy
-msgid "America/St_Johns"
-msgstr "Amerikāņu Samoa"
-
-#: calendar/zones.h:163
-msgid "America/St_Kitts"
-msgstr ""
-
-#: calendar/zones.h:164
-#, fuzzy
-msgid "America/St_Lucia"
-msgstr "Amerikāņu Samoa"
-
-#: calendar/zones.h:165
-#, fuzzy
-msgid "America/St_Thomas"
-msgstr "Amerikāņu Samoa"
-
-#: 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 "Azerbaidžāna"
-
-#: calendar/zones.h:172
-msgid "America/Tortola"
-msgstr "Amerika/Tortola"
-
-#: calendar/zones.h:173
-msgid "America/Vancouver"
-msgstr "Amerika/Vankūvera"
-
-#: calendar/zones.h:174
-msgid "America/Whitehorse"
-msgstr ""
-
-#: calendar/zones.h:175
-msgid "America/Winnipeg"
-msgstr "Amerika/Vinipega"
-
-#: calendar/zones.h:176
-msgid "America/Yakutat"
-msgstr ""
-
-#: calendar/zones.h:177
-msgid "America/Yellowknife"
-msgstr ""
-
-#: calendar/zones.h:178
-msgid "Antarctica/Casey"
-msgstr "Antarktika/Keisija"
-
-#: calendar/zones.h:179
-msgid "Antarctica/Davis"
-msgstr "Antarktika/Davis"
-
-#: calendar/zones.h:180
-msgid "Antarctica/DumontDUrville"
-msgstr "Antarktika/DumontDUrville"
-
-#: calendar/zones.h:181
-msgid "Antarctica/Mawson"
-msgstr "Antarktika/Mavsona"
-
-#: calendar/zones.h:182
-#, fuzzy
-msgid "Antarctica/McMurdo"
-msgstr "Antarktika"
-
-#: calendar/zones.h:183
-msgid "Antarctica/Palmer"
-msgstr "Antarktika/Palmera"
-
-#: calendar/zones.h:184
-msgid "Antarctica/South_Pole"
-msgstr "Antarktika/Dienvidpols"
-
-#: calendar/zones.h:185
-#, fuzzy
-msgid "Antarctica/Syowa"
-msgstr "Antarktika"
-
-#: calendar/zones.h:186
-msgid "Antarctica/Vostok"
-msgstr "Antarktika/Vostoka"
-
-#: calendar/zones.h:187
-msgid "Arctic/Longyearbyen"
-msgstr ""
-
-#: calendar/zones.h:188
-msgid "Asia/Aden"
-msgstr "Āzija/Adena"
-
-#: 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 "Āzija/Bagdāde"
-
-#: calendar/zones.h:196
-msgid "Asia/Bahrain"
-msgstr "Āzija/Bahrēna"
-
-#: calendar/zones.h:197
-msgid "Asia/Baku"
-msgstr "Āzija/Baku"
-
-#: calendar/zones.h:198
-msgid "Asia/Bangkok"
-msgstr "Āzija/Bagkoka"
-
-#: calendar/zones.h:199
-msgid "Asia/Beirut"
-msgstr ""
-
-#: calendar/zones.h:200
-msgid "Asia/Bishkek"
-msgstr ""
-
-#: calendar/zones.h:201
-msgid "Asia/Brunei"
-msgstr "Āzija/Bruneja"
-
-#: 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
-msgid "Asia/Colombo"
-msgstr "Āzija/Kolombo"
-
-#: calendar/zones.h:206
-msgid "Asia/Damascus"
-msgstr ""
-
-#: calendar/zones.h:207
-msgid "Asia/Dhaka"
-msgstr ""
-
-#: calendar/zones.h:208
-msgid "Asia/Dili"
-msgstr "Āzija/Dilī"
-
-#: calendar/zones.h:209
-msgid "Asia/Dubai"
-msgstr "Āzija/Dubaja"
-
-#: calendar/zones.h:210
-msgid "Asia/Dushanbe"
-msgstr "Āzija/Dušambē"
-
-#: calendar/zones.h:211
-msgid "Asia/Gaza"
-msgstr "Āzija/Gaza"
-
-#: calendar/zones.h:212
-msgid "Asia/Harbin"
-msgstr "Āzija/Harbīna"
-
-#: calendar/zones.h:213
-msgid "Asia/Hong_Kong"
-msgstr "Āzija/Honkonga"
-
-#: calendar/zones.h:214
-msgid "Asia/Hovd"
-msgstr ""
-
-#: calendar/zones.h:215
-msgid "Asia/Irkutsk"
-msgstr "Āzija/Irkutska"
-
-#: calendar/zones.h:216
-msgid "Asia/Istanbul"
-msgstr "Āzija/Istanbula"
-
-#: calendar/zones.h:217
-msgid "Asia/Jakarta"
-msgstr "Āzija/Jakarta"
-
-#: calendar/zones.h:218
-msgid "Asia/Jayapura"
-msgstr ""
-
-#: calendar/zones.h:219
-msgid "Asia/Jerusalem"
-msgstr "Āzija/Jeruzāleme"
-
-#: calendar/zones.h:220
-msgid "Asia/Kabul"
-msgstr "Āzija/Kabula"
-
-#: calendar/zones.h:221
-msgid "Asia/Kamchatka"
-msgstr "Āzija/Kamčatka"
-
-#: calendar/zones.h:222
-msgid "Asia/Karachi"
-msgstr "Āzija/Karačī"
-
-#: calendar/zones.h:223
-msgid "Asia/Kashgar"
-msgstr ""
-
-#: calendar/zones.h:224
-msgid "Asia/Katmandu"
-msgstr ""
-
-#: calendar/zones.h:225
-msgid "Asia/Krasnoyarsk"
-msgstr "Āzija/Krasnojarska"
-
-#: calendar/zones.h:226
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
-
-#: calendar/zones.h:227
-msgid "Asia/Kuching"
-msgstr ""
-
-#: calendar/zones.h:228
-msgid "Asia/Kuwait"
-msgstr "Āzija/Kuvēta"
-
-#: calendar/zones.h:229
-msgid "Asia/Macao"
-msgstr "Āzija/Makao"
-
-#: calendar/zones.h:230
-msgid "Asia/Magadan"
-msgstr "Āzija/Magadana"
-
-#: calendar/zones.h:231
-msgid "Asia/Manila"
-msgstr "Āzija/Manila"
-
-#: calendar/zones.h:232
-msgid "Asia/Muscat"
-msgstr "Āzija/Muskats"
-
-#: calendar/zones.h:233
-msgid "Asia/Nicosia"
-msgstr ""
-
-#: calendar/zones.h:234
-msgid "Asia/Novosibirsk"
-msgstr "Āzija/Novosibirska"
-
-#: calendar/zones.h:235
-msgid "Asia/Omsk"
-msgstr "Āzija/Omska"
-
-#: calendar/zones.h:236
-msgid "Asia/Phnom_Penh"
-msgstr ""
-
-#: calendar/zones.h:237
-msgid "Asia/Pontianak"
-msgstr ""
-
-#: calendar/zones.h:238
-msgid "Asia/Pyongyang"
-msgstr ""
-
-#: calendar/zones.h:239
-msgid "Asia/Qatar"
-msgstr "Āzija/Katara"
-
-#: calendar/zones.h:240
-msgid "Asia/Rangoon"
-msgstr ""
-
-#: calendar/zones.h:241
-msgid "Asia/Riyadh"
-msgstr ""
-
-#: calendar/zones.h:242
-msgid "Asia/Saigon"
-msgstr "Āzija/Saigona"
-
-#: calendar/zones.h:243
-msgid "Asia/Sakhalin"
-msgstr "Āzija/Sahalīna"
-
-#: calendar/zones.h:244
-msgid "Asia/Samarkand"
-msgstr "Āzija/Samarkanda"
-
-#: calendar/zones.h:245
-msgid "Asia/Seoul"
-msgstr "Āzija/Seula"
-
-#: calendar/zones.h:246
-msgid "Asia/Shanghai"
-msgstr "Āzija/Šanhai"
-
-#: calendar/zones.h:247
-msgid "Asia/Singapore"
-msgstr "Āzija/Singapūra"
-
-#: calendar/zones.h:248
-msgid "Asia/Taipei"
-msgstr "Āzija/Taipei"
-
-#: calendar/zones.h:249
-msgid "Asia/Tashkent"
-msgstr "Āzija/Taškenta"
-
-#: calendar/zones.h:250
-msgid "Asia/Tbilisi"
-msgstr "Āzija/Tbilisi"
-
-#: calendar/zones.h:251
-msgid "Asia/Tehran"
-msgstr "Āzija/Teherāna"
-
-#: calendar/zones.h:252
-msgid "Asia/Thimphu"
-msgstr ""
-
-#: calendar/zones.h:253
-msgid "Asia/Tokyo"
-msgstr "Āzija/Tokijo"
-
-#: calendar/zones.h:254
-msgid "Asia/Ujung_Pandang"
-msgstr ""
-
-#: calendar/zones.h:255
-msgid "Asia/Ulaanbaatar"
-msgstr ""
-
-#: calendar/zones.h:256
-msgid "Asia/Urumqi"
-msgstr ""
-
-#: calendar/zones.h:257
-msgid "Asia/Vientiane"
-msgstr ""
-
-#: calendar/zones.h:258
-msgid "Asia/Vladivostok"
-msgstr "Āzija/Vladivostoka"
-
-#: calendar/zones.h:259
-msgid "Asia/Yakutsk"
-msgstr ""
-
-#: calendar/zones.h:260
-msgid "Asia/Yekaterinburg"
-msgstr ""
-
-#: calendar/zones.h:261
-msgid "Asia/Yerevan"
-msgstr ""
-
-#: calendar/zones.h:262
-msgid "Atlantic/Azores"
-msgstr ""
-
-#: calendar/zones.h:263
-msgid "Atlantic/Bermuda"
-msgstr "Atlantija/Bermuda"
-
-#: calendar/zones.h:264
-msgid "Atlantic/Canary"
-msgstr ""
-
-#: calendar/zones.h:265
-msgid "Atlantic/Cape_Verde"
-msgstr "Atlantija/Kapoverde"
-
-#: calendar/zones.h:266
-msgid "Atlantic/Faeroe"
-msgstr ""
-
-#: calendar/zones.h:267
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
-
-#: calendar/zones.h:268
-msgid "Atlantic/Madeira"
-msgstr ""
-
-#: calendar/zones.h:269
-msgid "Atlantic/Reykjavik"
-msgstr ""
-
-#: calendar/zones.h:270
-msgid "Atlantic/South_Georgia"
-msgstr ""
-
-#: calendar/zones.h:271
-msgid "Atlantic/St_Helena"
-msgstr ""
-
-#: calendar/zones.h:272
-msgid "Atlantic/Stanley"
-msgstr ""
-
-#: calendar/zones.h:273
-msgid "Australia/Adelaide"
-msgstr "Austrālija/Adelaide"
-
-#: calendar/zones.h:274
-msgid "Australia/Brisbane"
-msgstr "Austrālija/Brisbāna"
-
-#: calendar/zones.h:275
-#, fuzzy
-msgid "Australia/Broken_Hill"
-msgstr "Austrālija"
-
-#: calendar/zones.h:276
-msgid "Australia/Darwin"
-msgstr "Austrālija/Darvina"
-
-#: calendar/zones.h:277
-msgid "Australia/Hobart"
-msgstr "Austrālija/Hobarta"
-
-#: calendar/zones.h:278
-#, fuzzy
-msgid "Australia/Lindeman"
-msgstr "Austrālija"
-
-#: calendar/zones.h:279
-#, fuzzy
-msgid "Australia/Lord_Howe"
-msgstr "Austrālija"
-
-#: calendar/zones.h:280
-msgid "Australia/Melbourne"
-msgstr "Austrālija/Melnburna"
-
-#: calendar/zones.h:281
-msgid "Australia/Perth"
-msgstr "Austrālija/Perta"
-
-#: calendar/zones.h:282
-msgid "Australia/Sydney"
-msgstr "Austrālija/Sidneja"
-
-#: calendar/zones.h:283
-msgid "Europe/Amsterdam"
-msgstr "Europa/Amsterdama"
-
-#: calendar/zones.h:284
-msgid "Europe/Andorra"
-msgstr "Europa/Andora"
-
-#: calendar/zones.h:285
-msgid "Europe/Athens"
-msgstr "Europa/Atēnas"
-
-#: calendar/zones.h:286
-msgid "Europe/Belfast"
-msgstr "Europa/Belfāsta"
-
-#: calendar/zones.h:287
-msgid "Europe/Belgrade"
-msgstr "Europa/Belgrada"
-
-#: calendar/zones.h:288
-msgid "Europe/Berlin"
-msgstr "Europa/Berlīne"
-
-#: calendar/zones.h:289
-msgid "Europe/Bratislava"
-msgstr "Europa/Bratislava"
-
-#: calendar/zones.h:290
-msgid "Europe/Brussels"
-msgstr "Europa/Brisele"
-
-#: calendar/zones.h:291
-msgid "Europe/Bucharest"
-msgstr "Europa/Bukareste"
-
-#: calendar/zones.h:292
-msgid "Europe/Budapest"
-msgstr "Europa/Budapešta"
-
-#: calendar/zones.h:293
-msgid "Europe/Chisinau"
-msgstr ""
-
-#: calendar/zones.h:294
-msgid "Europe/Copenhagen"
-msgstr "Europa/Kopenhāgena"
-
-#: calendar/zones.h:295
-msgid "Europe/Dublin"
-msgstr "Europa/Dublina"
-
-#: calendar/zones.h:296
-msgid "Europe/Gibraltar"
-msgstr "Europa/Gibraltārs"
-
-#: calendar/zones.h:297
-msgid "Europe/Helsinki"
-msgstr "Europa/Helsinki"
-
-#: calendar/zones.h:298
-msgid "Europe/Istanbul"
-msgstr "Europa/Istanbula"
-
-#: calendar/zones.h:299
-msgid "Europe/Kaliningrad"
-msgstr "Europa/Kaļingrada"
-
-#: calendar/zones.h:300
-msgid "Europe/Kiev"
-msgstr "Europa/Kijeva"
-
-#: calendar/zones.h:301
-msgid "Europe/Lisbon"
-msgstr "Europa/Lisabona"
-
-#: calendar/zones.h:302
-msgid "Europe/Ljubljana"
-msgstr "Europa/Ļubļana"
-
-#: calendar/zones.h:303
-msgid "Europe/London"
-msgstr "Europa/Londona"
-
-#: calendar/zones.h:304
-msgid "Europe/Luxembourg"
-msgstr "Europa/Luksemburga"
-
-#: calendar/zones.h:305
-msgid "Europe/Madrid"
-msgstr "Europa/Madride"
-
-#: calendar/zones.h:306
-msgid "Europe/Malta"
-msgstr "Euopa/Malta"
-
-#: calendar/zones.h:307
-msgid "Europe/Minsk"
-msgstr "Europa/Minska"
-
-#: calendar/zones.h:308
-msgid "Europe/Monaco"
-msgstr "Europa/Monāko"
-
-#: calendar/zones.h:309
-msgid "Europe/Moscow"
-msgstr "Europa/Maskava"
-
-#: calendar/zones.h:310
-msgid "Europe/Nicosia"
-msgstr ""
-
-#: calendar/zones.h:311
-msgid "Europe/Oslo"
-msgstr "Europa/Oslo"
-
-#: calendar/zones.h:312
-msgid "Europe/Paris"
-msgstr "Europa/Parīze"
-
-#: calendar/zones.h:313
-msgid "Europe/Prague"
-msgstr "Europa/Prāga"
-
-#: calendar/zones.h:314
-msgid "Europe/Riga"
-msgstr "Europa/Rīga"
-
-#: calendar/zones.h:315
-msgid "Europe/Rome"
-msgstr "Europa/Roma"
-
-#: calendar/zones.h:316
-msgid "Europe/Samara"
-msgstr "Europa/Samara"
-
-#: calendar/zones.h:317
-msgid "Europe/San_Marino"
-msgstr "Europa/San_Marīno"
-
-#: calendar/zones.h:318
-msgid "Europe/Sarajevo"
-msgstr "Europa/Sarājeva"
-
-#: calendar/zones.h:319
-msgid "Europe/Simferopol"
-msgstr ""
-
-#: calendar/zones.h:320
-msgid "Europe/Skopje"
-msgstr "Europa/Skopje"
-
-#: calendar/zones.h:321
-msgid "Europe/Sofia"
-msgstr "Europa/Sofija"
-
-#: calendar/zones.h:322
-msgid "Europe/Stockholm"
-msgstr "Europa/Stoholma"
-
-#: calendar/zones.h:323
-msgid "Europe/Tallinn"
-msgstr "Europa/Tallina"
-
-#: calendar/zones.h:324
-msgid "Europe/Tirane"
-msgstr ""
-
-#: calendar/zones.h:325
-msgid "Europe/Uzhgorod"
-msgstr ""
-
-#: calendar/zones.h:326
-msgid "Europe/Vaduz"
-msgstr ""
-
-#: calendar/zones.h:327
-msgid "Europe/Vatican"
-msgstr "Europa/Vatikāns"
-
-#: calendar/zones.h:328
-msgid "Europe/Vienna"
-msgstr "Europa/Vīnw"
-
-#: calendar/zones.h:329
-msgid "Europe/Vilnius"
-msgstr "Europa/Viļņa"
-
-#: calendar/zones.h:330
-msgid "Europe/Warsaw"
-msgstr "Europa/Varšava"
-
-#: calendar/zones.h:331
-msgid "Europe/Zagreb"
-msgstr "Europa/Zagreba"
-
-#: calendar/zones.h:332
-msgid "Europe/Zaporozhye"
-msgstr ""
-
-#: calendar/zones.h:333
-msgid "Europe/Zurich"
-msgstr "Europa/Cīrihe"
-
-#: calendar/zones.h:334
-msgid "Indian/Antananarivo"
-msgstr ""
-
-#: calendar/zones.h:335
-msgid "Indian/Chagos"
-msgstr ""
-
-#: calendar/zones.h:336
-msgid "Indian/Christmas"
-msgstr ""
-
-#: calendar/zones.h:337
-msgid "Indian/Cocos"
-msgstr ""
-
-#: calendar/zones.h:338
-#, fuzzy
-msgid "Indian/Comoro"
-msgstr "Komoros salas"
-
-#: calendar/zones.h:339
-msgid "Indian/Kerguelen"
-msgstr ""
-
-#: calendar/zones.h:340
-#, fuzzy
-msgid "Indian/Mahe"
-msgstr "Indija"
-
-#: calendar/zones.h:341
-#, fuzzy
-msgid "Indian/Maldives"
-msgstr "Maldivu salas"
-
-#: calendar/zones.h:342
-#, fuzzy
-msgid "Indian/Mauritius"
-msgstr "Mauritānija"
-
-#: calendar/zones.h:343
-#, fuzzy
-msgid "Indian/Mayotte"
-msgstr "Majota"
-
-#: calendar/zones.h:344
-#, fuzzy
-msgid "Indian/Reunion"
-msgstr "Reinjona"
-
-#: calendar/zones.h:345
-msgid "Pacific/Apia"
-msgstr ""
-
-#: calendar/zones.h:346
-msgid "Pacific/Auckland"
-msgstr ""
-
-#: calendar/zones.h:347
-msgid "Pacific/Chatham"
-msgstr ""
-
-#: calendar/zones.h:348
-msgid "Pacific/Easter"
-msgstr ""
-
-#: calendar/zones.h:349
-msgid "Pacific/Efate"
-msgstr ""
-
-#: calendar/zones.h:350
-msgid "Pacific/Enderbury"
-msgstr ""
-
-#: calendar/zones.h:351
-msgid "Pacific/Fakaofo"
-msgstr ""
-
-#: calendar/zones.h:352
-msgid "Pacific/Fiji"
-msgstr ""
-
-#: calendar/zones.h:353
-msgid "Pacific/Funafuti"
-msgstr ""
-
-#: calendar/zones.h:354
-msgid "Pacific/Galapagos"
-msgstr ""
-
-#: calendar/zones.h:355
-msgid "Pacific/Gambier"
-msgstr ""
-
-#: calendar/zones.h:356
-msgid "Pacific/Guadalcanal"
-msgstr ""
-
-#: calendar/zones.h:357
-msgid "Pacific/Guam"
-msgstr ""
-
-#: calendar/zones.h:358
-msgid "Pacific/Honolulu"
-msgstr ""
-
-#: calendar/zones.h:359
-msgid "Pacific/Johnston"
-msgstr ""
-
-#: calendar/zones.h:360
-msgid "Pacific/Kiritimati"
-msgstr ""
-
-#: calendar/zones.h:361
-msgid "Pacific/Kosrae"
-msgstr ""
-
-#: calendar/zones.h:362
-msgid "Pacific/Kwajalein"
-msgstr ""
-
-#: calendar/zones.h:363
-msgid "Pacific/Majuro"
-msgstr ""
-
-#: calendar/zones.h:364
-msgid "Pacific/Marquesas"
-msgstr ""
-
-#: calendar/zones.h:365
-msgid "Pacific/Midway"
-msgstr ""
-
-#: calendar/zones.h:366
-msgid "Pacific/Nauru"
-msgstr ""
-
-#: calendar/zones.h:367
-msgid "Pacific/Niue"
-msgstr ""
-
-#: calendar/zones.h:368
-msgid "Pacific/Norfolk"
-msgstr ""
-
-#: calendar/zones.h:369
-msgid "Pacific/Noumea"
-msgstr ""
-
-#: calendar/zones.h:370
-msgid "Pacific/Pago_Pago"
-msgstr ""
-
-#: calendar/zones.h:371
-msgid "Pacific/Palau"
-msgstr ""
-
-#: calendar/zones.h:372
-#, fuzzy
-msgid "Pacific/Pitcairn"
-msgstr "Pitkērna"
-
-#: calendar/zones.h:373
-msgid "Pacific/Ponape"
-msgstr ""
-
-#: calendar/zones.h:374
-#, fuzzy
-msgid "Pacific/Port_Moresby"
-msgstr "Ports"
-
-#: calendar/zones.h:375
-msgid "Pacific/Rarotonga"
-msgstr ""
-
-#: calendar/zones.h:376
-msgid "Pacific/Saipan"
-msgstr ""
-
-#: calendar/zones.h:377
-msgid "Pacific/Tahiti"
-msgstr ""
-
-#: calendar/zones.h:378
-msgid "Pacific/Tarawa"
-msgstr ""
-
-#: calendar/zones.h:379
-msgid "Pacific/Tongatapu"
-msgstr ""
-
-#: calendar/zones.h:380
-msgid "Pacific/Truk"
-msgstr ""
-
-#: calendar/zones.h:381
-msgid "Pacific/Wake"
-msgstr ""
-
-#: calendar/zones.h:382
-msgid "Pacific/Wallis"
-msgstr ""
-
-#: calendar/zones.h:383
-msgid "Pacific/Yap"
-msgstr ""
-
 #: calendar/cal-util/cal-component.c:1207
 msgid "Untitled appointment"
 msgstr "Nenosaukta tikšanās"
 
-#: 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:405
-#: mail/message-list.c:651
+#: 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
 msgid "High"
 msgstr "Augsts"
 
-#: 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:650
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normāls"
 
-#: 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:407
-#: mail/message-list.c:649
+#: 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
 msgid "Low"
 msgstr "Zems"
 
 #. 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
 msgid "Undefined"
 msgstr "Nedefinēts"
 
-#: 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 "Kļūda savienojoties ar kalendāra serveri"
 
-#: 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 "Nevar nolasīt pilota Kalendāra aplikācijas bloku"
 
-#: 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 "_Prioritāte:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nevar nolasīt pilota ToDo aplikācijas bloku"
 
@@ -4609,42 +3382,56 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Vienkārša Bonobo kontrole kura attēlo kalendāru."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Kalendāra un Uzdevumu Uzstādījumi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution komponente kalendāra vadīšanai."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr "Ražotne Evolution Uzdevumu kontrolei"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "Ražotne vienkāršai Kalendāra kontrolei."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 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:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "komponents"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 "Brīdinājuma notifikācijas serviss"
@@ -4653,22 +3440,10 @@ 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
-msgid "Evolution Alarm"
-msgstr "Evolution Brīdinājums"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -4691,11 +3466,11 @@ msgstr "Snaust kādu laiku (minūtes)"
 msgid "_Edit appointment"
 msgstr "R_ediģēt satikšanos"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:670
+#: calendar/gui/alarm-notify/alarm-queue.c:675
 msgid "No description available."
 msgstr "Apraksts nav pieejams."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:730
+#: calendar/gui/alarm-notify/alarm-queue.c:735
 #, fuzzy
 msgid ""
 "Evolution does not support calendar reminders with\n"
@@ -4708,11 +3483,17 @@ msgstr ""
 "\n"
 " normāls kaste."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:781
-#, c-format
+#: calendar/gui/alarm-notify/alarm-queue.c:753
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Brīdinājums"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:758
+#, fuzzy, 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"
@@ -4725,8 +3506,12 @@ msgstr ""
 "\n"
 "Vai jūs patiešām vēlaties laist šo programmu?"
 
-#: 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 "Neprasiet man vēlreiz."
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Nevar initializēt GNOME"
 
@@ -4738,59 +3523,65 @@ msgstr ""
 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 "Kopsavilkums satur"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Apraksts satur"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Komentāri satur"
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr "Nesakrītoši"
+
+#: 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
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:800
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418
-#: calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
 msgid "Private"
 msgstr "Privāts"
 
-#: calendar/gui/calendar-model.c:421
-#: calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
 msgid "Confidential"
 msgstr "Konfidenciāls"
 
 #: calendar/gui/calendar-model.c:424
-#: calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "Publisks"
 
@@ -4810,42 +3601,28 @@ msgstr "A"
 msgid "W"
 msgstr "R"
 
-#: calendar/gui/calendar-model.c:603
-#: calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
 msgid "Free"
 msgstr "Brīvs"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 msgid "Busy"
 msgstr "Aizņemts"
 
-#: calendar/gui/calendar-model.c:754
-#: calendar/gui/calendar-model.c:1191
+#: 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
 msgid "Not Started"
 msgstr "Nav iesākts"
 
-#: calendar/gui/calendar-model.c:757
-#: calendar/gui/calendar-model.c:1193
+#: 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
 msgid "In Progress"
 msgstr "Progresā"
 
-#: calendar/gui/calendar-model.c:760
-#: calendar/gui/calendar-model.c:1195
+#: 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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Pabeigts"
 
@@ -4855,23 +3632,20 @@ 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/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
-#: 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
+#: 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
+#: 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
 msgid "None"
 msgstr "Nekas"
 
@@ -4883,113 +3657,104 @@ msgstr "Periodisks"
 msgid "Assigned"
 msgstr "Asignēts"
 
-#: 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:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
 msgid "Yes"
 msgstr "Jā"
 
-#: 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:310
 msgid "No"
 msgstr "Nē"
 
-#. 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 "Meklēšana"
-
-#: 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
 msgid "Day View"
 msgstr "Dienas Skats"
 
-#: calendar/gui/calendar-view-factory.c:151
-#: views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Darba Nedēļas Skats"
 
-#: calendar/gui/calendar-view-factory.c:154
-#: views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Nedēļas Skats"
 
-#: 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
 msgid "Month View"
 msgstr "Mēneša Skats"
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
-msgstr "Kopsavilkums satur"
-
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
-msgstr "Apraksts satur"
-
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "Komentāri satur"
-
-#: calendar/gui/cal-search-bar.c:416
-#: mail/mail-ops.c:1072
-msgid "Unmatched"
-msgstr "Nesakrītoši"
-
-#: 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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalendārs"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Mape, kur atrodas informācija par satikšanām un notikumiem"
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Uzdevumi"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Uzdevumu mape"
 
-#: calendar/gui/component-factory.c:642
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "Ievietot jaunu ierakstu par satikšanos"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "Ziņas"
 
-#: calendar/gui/component-factory.c:643
-#: calendar/gui/e-day-view.c:3525
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "Satikšanās"
+
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "Jauns Uzdevums"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "_Uzdevums"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Jauna Tikšanās"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "Jauna _Satikšanās"
 
-#: calendar/gui/component-factory.c:648
-#: ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
-msgstr "Ievietot jaunu uzdevumu"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Jauna Tikšanās"
+
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "Satikšanās"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "Jauns _Uzdevums"
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Nevar atvērt mapi uz `%s'"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URI ko kalendārs parādīs"
 
+#: 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 "Skaņas Brīdinājuma Opcijas"
@@ -5031,15 +3796,19 @@ msgid "Run program:"
 msgstr "Palaist programmu:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:6
-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 "Š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."
+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 ""
+"Š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."
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Ar šiem argumentiem:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-#: filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 msgid "days"
 msgstr "dienas"
 
@@ -5047,13 +3816,11 @@ msgstr "dienas"
 msgid "extra times every"
 msgstr "papildus laiks katras"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 msgid "hours"
 msgstr "stundas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11
-#: filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "minūtes"
 
@@ -5155,12 +3922,12 @@ msgstr "%s %s pēc tikšanās beigām"
 msgid "%s at the end of the appointment"
 msgstr "%s tikšanās beigās"
 
-#: calendar/gui/dialogs/alarm-page.c:453
+#: calendar/gui/dialogs/alarm-page.c:452
 #, c-format
 msgid "%s at %s"
 msgstr "%s iekš %s"
 
-#: calendar/gui/dialogs/alarm-page.c:459
+#: calendar/gui/dialogs/alarm-page.c:458
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -5181,7 +3948,6 @@ 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.c:738
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kopsavilkums:"
@@ -5191,12 +3957,10 @@ msgid "_Options..."
 msgstr "_Opcijas:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:11
-#: filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "pēc"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:12
-#: filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "pirms"
 
@@ -5213,8 +3977,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:120
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr "minūte(s)"
 
@@ -5255,170 +4018,168 @@ msgid "Color for tasks due today"
 msgstr "Krāsas šodienas uzdevumiem"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Ievietot jaunu informāciju par satikšanos, izmantojot noklusētajiem atgādinājumus"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Dienas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Pirmā diena _nedēļā:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Piekdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Stundas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minūtes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Pirmdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "N_okavētie uzdevumi:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Sesdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-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:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 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:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "Sv"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Svēdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Šodien izpildāmie uzdevumi:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "Ce_t"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "Ot_r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Šodien izpildāmie uzdevumi:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "_Uzdevumu Saraksts"
 
-#: 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 "Ceturdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Laiks"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Laika _zona:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Laika _vienības:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Laika formāts:"
 
-#: 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 "Otradiena"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Trešdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Darba Nedēļa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 stundu (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 stundu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 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:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "_Saspiest nedēļas mēneša skatā"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Attēlot"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Piek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Galvenais"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "_Slēpt izpildītos uzdevumus pēc"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Pir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Cita"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "N_okavētie uzdevumi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_Ses"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "_Uzdevumu Saraksts"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Laika _vienības:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Tre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "pirms tikšanās sākuma"
 
@@ -5428,15 +4189,20 @@ 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?"
+msgstr ""
+"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?"
-msgstr "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo žurnāla ierakstu?"
+msgstr ""
+"Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo žurnāla "
+"ierakstu?"
 
 #: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
@@ -5453,7 +4219,9 @@ msgstr "Šis žurnāla ieraksts ir izdzēsts."
 #: calendar/gui/dialogs/changed-comp.c:76
 #, 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?"
+msgstr ""
+"%s  Jūs esat veicis izmaiņas. Aizmirst šīs izmaiņas un aizvērt "
+"redaktoru?"
 
 #: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
@@ -5475,99 +4243,82 @@ msgstr "Žurnāla ieraksts tika izmainīts."
 #: calendar/gui/dialogs/changed-comp.c:100
 #, 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?"
+msgstr ""
+"%s  Jūs esat veicat izmaiņas. Aizmirst šīs izmaiņas un atjaunināt "
+"redaktoru?"
 
 #: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Jūs neesat veicis izmaiņas, atjaunināt redaktoru?"
 
-#: 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 " uz "
 
-#: 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 " (Izpildīts "
 
-#: 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 "Izpildīts"
 
-#: 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 " (Līdz "
 
-#: 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 "Līdz"
 
-#: calendar/gui/dialogs/comp-editor.c:303
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "Nevar atjaunināt objektu!"
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Rediģēt Satikšanos"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "satikšanās - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Uzdevums - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnāla ieraksts - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Nav kopsavilkuma"
 
-#: calendar/gui/dialogs/comp-editor.c:1061
-#: mail/mail-callbacks.c:1908
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "Pārrakstīt failu?"
-
-#: calendar/gui/dialogs/comp-editor.c:1065
-#: mail/mail-callbacks.c:1915
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Fails ar šadu nosaukumu jau eksistē.\n"
-"Pārrakstīt to?"
-
-#: 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 "Saglabāt Kā..."
+#: 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
+msgid "Save as..."
+msgstr "Saglabāt kā..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 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
@@ -5576,16 +4327,21 @@ 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?"
+msgstr ""
+"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
@@ -5600,7 +4356,8 @@ 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..."
@@ -5615,7 +4372,6 @@ msgid "Enter Delegate"
 msgstr "Ievadīt Delegātu"
 
 #: calendar/gui/dialogs/event-editor.c:185
-#: calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Satikšanās"
 
@@ -5629,13 +4385,13 @@ 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:363
+#: calendar/gui/dialogs/event-editor.c:365
 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:366
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "Satikšanās"
 
@@ -5682,7 +4438,7 @@ msgid "Pu_blic"
 msgstr "Pu_blisks"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Parādī Laiku Kā"
 
@@ -5727,57 +4483,49 @@ msgstr "Apmeklētājs"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "Parastais Vārds"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Deleģēts No"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Deleģēts Uz"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Valoda"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Loceklis"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:799
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Loma"
 
-#: 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: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"
 msgstr "Status"
 
-#: 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tips"
@@ -5792,7 +4540,7 @@ msgid "_Change Organizer"
 msgstr "_Mainīt Organizētāju"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "_Ielūgt Citus..."
 
@@ -5800,28 +4548,98 @@ msgstr "_Ielūgt Citus..."
 msgid "_Other Organizer"
 msgstr "_Cits Organizētajs"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Šī tikšanās satur atkārtošanās ko Evolution nevar rediģēt."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "uz"
 
-#: calendar/gui/dialogs/recurrence-page.c:958
-#: filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "saraksts"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "sekunde"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Citi"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Ziemeļu"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "saraksts"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Cits Fakss"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dienā"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "uz"
 
-#: 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 "gadījumi"
 
@@ -5885,17 +4703,27 @@ msgstr "nedēļa(s)"
 msgid "year(s)"
 msgstr "gads(-i)"
 
-#: 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 ""
+"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:60
-msgid "The task information has changed. Send an updated version?"
-msgstr "Informācija par uzdevumu 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?"
 
-#: calendar/gui/dialogs/send-comp.c:65
-msgid "The journal entry has changed. Send an updated version?"
-msgstr "Žurnāla ieraksts ir izmainīts. 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?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
@@ -5912,7 +4740,7 @@ msgid "Progress"
 msgstr "Progress"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -5924,17 +4752,19 @@ msgstr "_Prioritāte:"
 msgid "_Status:"
 msgstr "_Statuss:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "Pamata"
+
 #: 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:324
 msgid "Assignment"
 msgstr "Uzticējums"
 
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-itip-control.c:747
 #: 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:42
 msgid "Description:"
 msgstr "Apraksts:"
 
@@ -5946,210 +4776,154 @@ msgstr "Sākum_a Datums:"
 msgid "_Due Date:"
 msgstr "_Datuma laikā:"
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, 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:751 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: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: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
 msgid "_Open"
 msgstr "_Atvērt"
 
-#: 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
-#: ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:973
+#, 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-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 "_Drukāt..."
+
+#: calendar/gui/e-calendar-table.c:978 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: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:979 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: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:980 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 "_Ievietot"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Nozīmēt Uzdevumu"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Pārsūtīt kā iKalendāru"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "A_tzīmēt kā Izpildītus"
 
-#: calendar/gui/e-calendar-table.c:956
-msgid "_Delete this Task"
-msgstr "_Dzēst šo Uzdevumu"
-
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "A_tzīmēt Uzdevumus kā Izpildītus"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_Dzēst Izvēlētos Uzdevumus"
 
-#: 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:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Atjaunināt objektus"
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Klikšķināt lai pievienotu uzdevumu"
 
-#. 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"
-
-#. 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/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Datumam ir jābūt ievadītam šādā formātā: \n"
-"\n"
-"%s"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Brīdinājumi"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Izpildīts"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Izpildes Datums"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Datuma Laikā"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Beigu Datums"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Ģeogrāfiskā Pozīcija"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioritāte"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Kopsavilkums"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Uzdevumu kārtošana"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 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 %m/%d/%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 %m/%d/%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 ""
+"Datumam ir jābūt ievadītam šādā formātā: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -6157,410 +4931,174 @@ msgstr "%02i minūšu sadaļas"
 
 #. 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
 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
 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 "Jauna _Satikšanās"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Jauns Visas Di_enas Notikums"
 
-#: 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 "Satikšanās"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Jauns Uzdevums"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Drukāt..."
+
+#: 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 "Ej Uz _Dienu"
 
-#: 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 "_Ej uz Datumu..."
 
-#: calendar/gui/e-day-view.c:3548
-#: calendar/gui/e-week-view.c:3430
-msgid "_Delete this Appointment"
-msgstr "_Dzēst šo Tikšanos"
+#: 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 "_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
+#, fuzzy
+msgid "_Configure..."
+msgstr "Konfigurācija"
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
+msgid "_Save As..."
+msgstr "_Saglabāt Kā..."
 
-#: calendar/gui/e-day-view.c:3567
-#: calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Plānot _Tikšanos"
+
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Pārsūtīt kā iKalendāru"
+
+#: 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 "Dzēst šo _Gadījumu"
 
-#: 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 "Dzēst Visus G_adījumus"
 
-#: calendar/gui/e-itip-control.c:525
-msgid "Meeting begins: <b>"
-msgstr "Satikšanās sākas: <b>"
-
-#: calendar/gui/e-itip-control.c:530
-msgid "Task begins: <b>"
-msgstr "Uzdevums sākas: <b>"
-
-#: calendar/gui/e-itip-control.c:535
-msgid "Free/Busy info begins: <b>"
-msgstr "Brīvs/Aizņemts informācija sākas: <b>"
-
-#: calendar/gui/e-itip-control.c:539
-msgid "Begins: <b>"
-msgstr "Sākas: <b>"
-
-#: calendar/gui/e-itip-control.c:551
-msgid "Meeting ends: <b>"
-msgstr "Satikšanās beidzas: <b>"
-
-#: calendar/gui/e-itip-control.c:554
-msgid "Free/Busy info ends: <b>"
-msgstr "Brīvs/Aizņemts informācija beidzas: <b>"
-
-#: calendar/gui/e-itip-control.c:558
-msgid "Ends: <b>"
-msgstr "Beidzas: <b>"
-
-#: calendar/gui/e-itip-control.c:572
-msgid "Task Completed: <b>"
-msgstr "Uzdevums Pabeigts: <b>"
-
-#: calendar/gui/e-itip-control.c:582
-msgid "Task Due: <b>"
-msgstr "Uzdevums Līdz: <b>"
-
-#: calendar/gui/e-itip-control.c:619
-#: calendar/gui/e-itip-control.c:668
-msgid "iCalendar Information"
-msgstr "iCalendar informācija"
-
-#. Title
-#: calendar/gui/e-itip-control.c:634
-msgid "iCalendar Error"
-msgstr "iCalendar Kļūda"
-
-#: calendar/gui/e-itip-control.c:699
-#: calendar/gui/e-itip-control.c:715
-msgid "An unknown person"
-msgstr "Nezināma persona"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:722
-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:738
-msgid "<i>None</i>"
-msgstr "<i>Nekas</i>"
-
-#: calendar/gui/e-itip-control.c:779
-#: calendar/gui/e-itip-control.c:795
-#: 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
-msgid "Choose an action:"
-msgstr "Izvēlieties darbību:"
-
-#: calendar/gui/e-itip-control.c:780
-msgid "Update"
-msgstr "Atjaunot"
-
-#: calendar/gui/e-itip-control.c:781
-#: calendar/gui/e-itip-control.c:800
-#: calendar/gui/e-itip-control.c:813
-#: calendar/gui/e-itip-control.c:826
-#: calendar/gui/e-itip-control.c:839
-#: calendar/gui/e-itip-control.c:852
-#: shell/e-shell.c:1884
-#: widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:796
-msgid "Accept"
-msgstr "Apstiprināt"
-
-#: calendar/gui/e-itip-control.c:797
-msgid "Tentatively accept"
-msgstr "Paigaidām akceptēt"
-
-#: calendar/gui/e-itip-control.c:798
-msgid "Decline"
-msgstr "Noliegt"
-
-#: calendar/gui/e-itip-control.c:812
-msgid "Send Free/Busy Information"
-msgstr "Nosūtīt Brīvs/Aizņemts Informāciju"
-
-#: calendar/gui/e-itip-control.c:825
-msgid "Update respondent status"
-msgstr "Atjaunināt respondenta statusu"
-
-#: calendar/gui/e-itip-control.c:838
-msgid "Send Latest Information"
-msgstr "Sūtīt Pēdīgo Informāciju"
-
-#: calendar/gui/e-itip-control.c:851
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Atsaukt"
-
-#: calendar/gui/e-itip-control.c:899
-#, 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:900
-msgid "Meeting Information"
-msgstr "Informācija par Satikšanos"
-
-#: calendar/gui/e-itip-control.c:904
-#, 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:905
-msgid "Meeting Proposal"
-msgstr "Satikšanās Iemesls"
-
-#: calendar/gui/e-itip-control.c:909
-#, 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:910
-msgid "Meeting Update"
-msgstr "Atjaunināta Informācija Par Satikšanos"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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-itip-control.c:914
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, 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:915
-msgid "Meeting Update Request"
-msgstr "Informācijas Par Satikšanos Atjaunināšanas Pieprasīšana"
+msgid "Error executing %s."
+msgstr "Kļūda sāknējot %s."
 
-#: calendar/gui/e-itip-control.c:932
-#: calendar/gui/e-itip-control.c:1003
-#: 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
+#: 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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:938
-#, 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:939
-msgid "Meeting Reply"
-msgstr "Atbilde Par Satikšanos"
-
-#: calendar/gui/e-itip-control.c:943
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> ir atsaucis tikšanos."
-
-#: calendar/gui/e-itip-control.c:944
-msgid "Meeting Cancellation"
-msgstr "Satikšanās Atcelšana"
-
-#: calendar/gui/e-itip-control.c:948
-#: calendar/gui/e-itip-control.c:1019
-#: calendar/gui/e-itip-control.c:1054
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:949
-msgid "Bad Meeting Message"
-msgstr "Slikta Satikšanās Ziņa"
-
-#: calendar/gui/e-itip-control.c:969
-#, 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:970
-msgid "Task Information"
-msgstr "Uzdevuma Informācija"
-
-#: calendar/gui/e-itip-control.c:974
-#, 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:975
-msgid "Task Proposal"
-msgstr "Uzdevuma Priešlikums"
-
-#: calendar/gui/e-itip-control.c:979
-#, 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:980
-msgid "Task Update"
-msgstr "Uzdevuma Atjaunināšana"
-
-#: calendar/gui/e-itip-control.c:984
-#, 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:985
-msgid "Task Update Request"
-msgstr "Uzdevuma Atjaunināšanas Pieprasījums"
-
-#: calendar/gui/e-itip-control.c:1009
-#, 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:1010
-msgid "Task Reply"
-msgstr "Uzdevuma Atbilde"
-
-#: calendar/gui/e-itip-control.c:1014
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> ir atcēlis uzdevumu."
-
-#: calendar/gui/e-itip-control.c:1015
-msgid "Task Cancellation"
-msgstr "Uzdevuma Atsaukums"
-
-#: calendar/gui/e-itip-control.c:1020
-msgid "Bad Task Message"
-msgstr "Slikts Uzdevuma Ziņojums"
-
-#: calendar/gui/e-itip-control.c:1039
-#, 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:1040
-msgid "Free/Busy Information"
-msgstr "Brīvs/Aizņemts Informācija"
-
-#: calendar/gui/e-itip-control.c:1044
-#, 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:1045
-msgid "Free/Busy Request"
-msgstr "Brīvs/Aizņemts Pieprasījums"
-
-#: calendar/gui/e-itip-control.c:1049
-#, 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:1050
-msgid "Free/Busy Reply"
-msgstr "Brīvs/Aizņemts Atbilde"
-
-#: calendar/gui/e-itip-control.c:1055
-msgid "Bad Free/Busy Message"
-msgstr "Slikta Brīvs/Aizņemts Ziņa"
-
-#: calendar/gui/e-itip-control.c:1128
-msgid "The message does not appear to be properly formed"
-msgstr "Ziņa varētu būt pareizi noformēta"
-
-#: calendar/gui/e-itip-control.c:1147
-msgid "The message contains only unsupported requests."
-msgstr "Ziņa satur tikai neatbalstītus pieprasījumus."
-
-#: calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-itip-control.c:1181
-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:1206
-msgid "The attachment has no viewable calendar items"
-msgstr "Pievienojumam nav skatāmu kalendāra priekšmetu"
-
-#: calendar/gui/e-itip-control.c:1305
+#: 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:1307
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Atjaunināšana izpildīta\n"
 
-#: calendar/gui/e-itip-control.c:1352
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 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"
+msgstr ""
+"Apmeklētāja statuss nevar tikt atjaunināts sakarā ar nepareizo statusu!\n"
 
-#: calendar/gui/e-itip-control.c:1360
+#: 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:1362
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Apmeklētāja status atjaunināts\n"
 
-#: calendar/gui/e-itip-control.c:1364
-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:1392
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Izņemšana Pabeigta"
 
-#: calendar/gui/e-itip-control.c:1411
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Priekšmets nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1413
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-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"
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Izvēlēties Mapi"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Izvēlēties Mapi"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -6599,227 +5137,213 @@ msgstr "datums-sākums"
 msgid "date-start"
 msgstr "datums-beigas"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Vadošās Personas"
 
-#: calendar/gui/e-meeting-model.c:96
-#: calendar/gui/e-meeting-model.c:1570
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Pieprasītie Dalībnieki"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "Iespējamie Dalībnieki"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "Nepiedalās"
 
-#: 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:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Individuāli"
 
-#: 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:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Grupa"
 
-#: 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:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Resurss"
 
-#: 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:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Istaba"
 
-#: 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:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "Krēsls"
 
-#: 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:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "Pieprasītais Dalībnieks"
 
-#: 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:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "Iespējamais Dalībnieks"
 
-#: 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:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Nepiedalās"
 
-#: 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:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 msgid "Needs Action"
 msgstr "Pieprasa Darbību"
 
-#: calendar/gui/e-meeting-model.c:321
-#: calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:824
+#: 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:323
-#: calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:825
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 msgid "Declined"
 msgstr "Noliegts"
 
-#: 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:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Pagaidu"
 
-#: 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:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "Deleģēts"
 
-#: calendar/gui/e-meeting-model.c:331
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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:475
-#: calendar/gui/e-meeting-time-sel.c:2132
-#: e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:276
-#: e-util/e-time-utils.c:348
+#: calendar/gui/e-meeting-time-sel-item.c:479
+#: calendar/gui/e-meeting-time-sel.c:2118 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"
 
 #. 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:1612
+#: 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"
 
-#: calendar/gui/e-meeting-time-sel.c:433
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "Neatrodas Birojā"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Nav Informācijas"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Opcijas"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Parādīt Tikai _Darba Stundas"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "Parādīt Sama_zinātu"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "_Atjaunināt Brīvs/Aizņemts Informāciju"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Autoizvēle"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "_Visi Cilvēki un Resursi"
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "Visi _Cilvēki un Viens Resurss"
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "_Pieprasītie Cilvēki"
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "Pieprasītie Cilvēki un _Viens Resurss"
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "Satikšanās _sākuma laiks:"
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Satikšanās _beigu laiks:"
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atvērt uzdevumus uz %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 "Nevar ielādēt uzdevumus uz `%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 "Metode lai ielādētu `%s' nav atbalstīta"
 
-#: calendar/gui/e-week-view.c:3408
-#: calendar/gui/e-week-view.c:3446
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Izpildes Datums"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Dzēšam "
+
+#: calendar/gui/e-tasks.c:659
+#, fuzzy
+msgid "Expunging"
+msgstr "Dzēšam mapi"
+
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Jauna _Tikšanās...."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "_Dzēst šo Tikšanos"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nevar atvērt mapi uz `%s'"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1865
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Atvērt kalendāru uz %s"
@@ -6880,438 +5404,440 @@ msgstr "Oktobris"
 msgid "September"
 msgstr "Septembris"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr "Vismaz viens apmeklētajs ir vajadzīgs"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "Jābūt norādītam organizētājam."
 
-#: calendar/gui/itip-utils.c:313
-#: calendar/gui/itip-utils.c:355
-msgid "Event information"
-msgstr "Notikuma informācija"
-
-#: calendar/gui/itip-utils.c:315
-#: calendar/gui/itip-utils.c:357
-msgid "Task information"
-msgstr "Uzdevuma Informācija"
-
-#: calendar/gui/itip-utils.c:317
-#: calendar/gui/itip-utils.c:359
-msgid "Journal information"
-msgstr "Žurnāla informācija"
-
-#: calendar/gui/itip-utils.c:319
-#: calendar/gui/itip-utils.c:376
-msgid "Free/Busy information"
-msgstr "Brīvs/Aizņemts informācija"
-
-#: calendar/gui/itip-utils.c:321
-msgid "Calendar information"
-msgstr "Kalendāra informācija"
-
-#: calendar/gui/itip-utils.c:370
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Brīvs/Aizņemts informācija (%s uz %s)"
-
-#: calendar/gui/itip-utils.c:382
-msgid "iCalendar information"
-msgstr "iCalendar informācija"
-
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Jums jābūt notikuma apmeklētājam."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "komponents"
 
-#: 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 "Sv"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Pr"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Ot"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Tr"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Ct"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Pk"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Sd"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Izvēlēta diena (%a %b %d %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 %b %d"
 
-#: 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 %b %d %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Izvēlētā nedēļa (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Izvēlētais mēnesis (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Izvēlētais gads (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Uzdevums"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Prioritāte: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Procenti Izpidildīti: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Kategorijas: %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "Kontakti:"
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Drukāt Kalendāru"
 
-#: 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Drukāšanas Pirmsapskats"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Drukāt Priekšmetu"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Drukāšanas Uzstādijumi"
 
-#: 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 ""
+"Nevar izveidot uzdevumu skatu. Lūdzu pārbaudiet jūsu ORBit un OAF "
+"uzstādījumu."
+
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid "Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr "Nevar izveidot uzdevumu skatu. Lūdzu pārbaudiet jūsu ORBit un OAF uzstādījumu."
+#: 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 ""
+"visi Ja\n"
+"\n"
+"?"
+
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+msgid "Do not ask me again."
+msgstr "Neprasiet man vēlreiz."
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Drukāt vizītkartes"
 
 #: calendar/gui/tasks-migrate.c:105
-msgid "Evolution has taken the tasks that were in your calendar folder and automatically migrated them to the new tasks folder."
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
 msgstr ""
 
 #: calendar/gui/tasks-migrate.c:108
 msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted again in the future."
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
 msgstr ""
 
 #: calendar/gui/tasks-migrate.c:120
 #, c-format
-msgid "Could not open `%s'; no items from the calendar folder will be migrated to the tasks folder."
-msgstr "Nevar atvērt `%s'; priekšmeti no kalendāra mapes uz uzdevumu mapi netiks pārnesti."
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+"Nevar atvērt `%s'; priekšmeti no kalendāra mapes uz uzdevumu mapi netiks "
+"pārnesti."
 
 #: calendar/gui/tasks-migrate.c:133
 #, c-format
-msgid "The method required to load `%s' is not supported; no items from the calendar folder will be migrated to the tasks folder."
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:314
-#: calendar/gui/weekday-picker.c:409
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
-#: 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 "Ražotne, lai importētu VKartes failus Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "Importē VKartes failus Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "Importē VKartes failus Evolution."
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Kalendāra Ziņojums"
+
+#: 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 ir atradis Pine pasta failus.\n"
+"Vai jūs vēlaties, lai tie tiktu importēti Evolution?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Kalendārs"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now pieprasa 0 argumentus"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time pieprasa 1 argumentu"
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time pieprasa argumentu nr.1 kā virkni"
 
-#: 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 argumentam nr. 1 jābūt ISO 8601 datuma/laika virknei"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 #, fuzzy
 msgid "time-add-day expects 2 arguments"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:317
+#: calendar/pcs/query.c:319
 #, fuzzy
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:324
+#: calendar/pcs/query.c:326
 #, fuzzy
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 #, fuzzy
 msgid "time-day-begin expects 1 argument"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:356
+#: calendar/pcs/query.c:358
 #, fuzzy
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 #, fuzzy
 msgid "time-day-end expects 1 argument"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:388
+#: calendar/pcs/query.c:390
 #, fuzzy
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 #, fuzzy
 msgid "get-vtype expects 0 arguments"
 msgstr "dabūt"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 #, fuzzy
 msgid "contains? expects 2 arguments"
 msgstr "satur"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 #, fuzzy
 msgid "contains? expects argument 1 to be a string"
 msgstr "satur"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 #, fuzzy
 msgid "contains? expects argument 2 to be a string"
 msgstr "satur"
 
-#: calendar/pcs/query.c:691
+#: calendar/pcs/query.c:693
 #, fuzzy
-msgid "contains? expects argument 1 to be one of \"any\", \"summary\", \"description\""
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
 msgstr "satur apraksts"
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:745
+#: calendar/pcs/query.c:747
 #, fuzzy
-msgid "has-categories? expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
 msgstr "visi"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 #, fuzzy
 msgid "is-completed? expects 0 arguments"
 msgstr "ir"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "pirms"
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "pirms"
@@ -7320,6 +5846,1545 @@ msgstr "pirms"
 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 "Āfrika/Abidjaņu"
+
+#: calendar/zones.h:8
+msgid "Africa/Accra"
+msgstr "Āfrika/Akra"
+
+#: 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 "Āfrika/Kaira"
+
+#: calendar/zones.h:20
+msgid "Africa/Casablanca"
+msgstr "Āfrika/Kasablanka"
+
+#: calendar/zones.h:21
+msgid "Africa/Ceuta"
+msgstr ""
+
+#: calendar/zones.h:22
+msgid "Africa/Conakry"
+msgstr ""
+
+#: calendar/zones.h:23
+msgid "Africa/Dakar"
+msgstr "Āfrika/Dakāra"
+
+#: calendar/zones.h:24
+msgid "Africa/Dar_es_Salaam"
+msgstr ""
+
+#: calendar/zones.h:25
+msgid "Africa/Djibouti"
+msgstr "Āfrika/Džibutī"
+
+#: calendar/zones.h:26
+msgid "Africa/Douala"
+msgstr "Āfrika/Douala"
+
+#: calendar/zones.h:27
+msgid "Africa/El_Aaiun"
+msgstr ""
+
+#: calendar/zones.h:28
+msgid "Africa/Freetown"
+msgstr "Āfrika/Frītauna"
+
+#: calendar/zones.h:29
+msgid "Africa/Gaborone"
+msgstr "Āfrika/Gaborone"
+
+#: calendar/zones.h:30
+msgid "Africa/Harare"
+msgstr "Africa/Harare"
+
+#: calendar/zones.h:31
+msgid "Africa/Johannesburg"
+msgstr "Āfrika/Johanesburga"
+
+#: calendar/zones.h:32
+msgid "Africa/Kampala"
+msgstr "Āfrika/Kampala"
+
+#: calendar/zones.h:33
+msgid "Africa/Khartoum"
+msgstr ""
+
+#: calendar/zones.h:34
+msgid "Africa/Kigali"
+msgstr "Āfrika/Kigalī"
+
+#: calendar/zones.h:35
+msgid "Africa/Kinshasa"
+msgstr ""
+
+#: calendar/zones.h:36
+msgid "Africa/Lagos"
+msgstr "Āfrika/Lagosa"
+
+#: calendar/zones.h:37
+msgid "Africa/Libreville"
+msgstr "Āfrika/Libervilla"
+
+#: calendar/zones.h:38
+msgid "Africa/Lome"
+msgstr "Āfrika/Lome"
+
+#: calendar/zones.h:39
+msgid "Africa/Luanda"
+msgstr "Āfrika/Luanda"
+
+#: calendar/zones.h:40
+msgid "Africa/Lubumbashi"
+msgstr "Āfrika/Lubumbašī"
+
+#: calendar/zones.h:41
+msgid "Africa/Lusaka"
+msgstr "Āfrika/Lusaka"
+
+#: calendar/zones.h:42
+msgid "Africa/Malabo"
+msgstr "Āfrika/Malabo"
+
+#: calendar/zones.h:43
+msgid "Africa/Maputo"
+msgstr "Āfrika/Maputo"
+
+#: calendar/zones.h:44
+msgid "Africa/Maseru"
+msgstr "Āfrika/Maseru"
+
+#: 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 "Āfrika/Nairobi"
+
+#: 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
+msgid "America/Adak"
+msgstr ""
+
+#: calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr ""
+
+#: calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr "Amerika/Anguila"
+
+#: calendar/zones.h:62
+msgid "America/Antigua"
+msgstr ""
+
+#: calendar/zones.h:63
+msgid "America/Araguaina"
+msgstr "Amerika/Nikaragva"
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr ""
+
+#: calendar/zones.h:66
+msgid "America/Barbados"
+msgstr "Amerika/Barbadosa"
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: calendar/zones.h:68
+msgid "America/Belize"
+msgstr "Amerika/Belize"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+msgid "America/Bogota"
+msgstr ""
+
+#: calendar/zones.h:71
+msgid "America/Boise"
+msgstr ""
+
+#: calendar/zones.h:72
+msgid "America/Buenos_Aires"
+msgstr "Amerika/Buenosairesa"
+
+#: calendar/zones.h:73
+msgid "America/Cambridge_Bay"
+msgstr ""
+
+#: calendar/zones.h:74
+msgid "America/Cancun"
+msgstr ""
+
+#: calendar/zones.h:75
+msgid "America/Caracas"
+msgstr ""
+
+#: calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr ""
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+msgid "America/Cayman"
+msgstr ""
+
+#: calendar/zones.h:79
+msgid "America/Chicago"
+msgstr "Amerika/Čikāga"
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr ""
+
+#: calendar/zones.h:82
+msgid "America/Costa_Rica"
+msgstr "Amerika/Kostarika"
+
+#: calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr ""
+
+#: calendar/zones.h:84
+msgid "America/Curacao"
+msgstr ""
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+msgid "America/Dawson"
+msgstr ""
+
+#: calendar/zones.h:87
+msgid "America/Dawson_Creek"
+msgstr ""
+
+#: calendar/zones.h:88
+msgid "America/Denver"
+msgstr "Amerika/Denvera"
+
+#: calendar/zones.h:89
+msgid "America/Detroit"
+msgstr "Amerika/Detroita"
+
+#: calendar/zones.h:90
+msgid "America/Dominica"
+msgstr "Amerika/Dominika"
+
+#: calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr "Amerika/Edmontona"
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+msgid "America/El_Salvador"
+msgstr "Amerika/Elsalvadora"
+
+#: calendar/zones.h:94
+msgid "America/Fortaleza"
+msgstr ""
+
+#: calendar/zones.h:95
+msgid "America/Glace_Bay"
+msgstr ""
+
+#: calendar/zones.h:96
+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
+msgid "America/Grenada"
+msgstr "Amerika/Grenada"
+
+#: calendar/zones.h:100
+msgid "America/Guadeloupe"
+msgstr "Amerika/Gvadelupa"
+
+#: calendar/zones.h:101
+msgid "America/Guatemala"
+msgstr "Amerika/Guatemala"
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+msgid "America/Guyana"
+msgstr ""
+
+#: calendar/zones.h:104
+msgid "America/Halifax"
+msgstr ""
+
+#: calendar/zones.h:105
+msgid "America/Havana"
+msgstr "Amerika/Havana"
+
+#: calendar/zones.h:106
+msgid "America/Hermosillo"
+msgstr ""
+
+#: calendar/zones.h:107
+msgid "America/Indiana/Indianapolis"
+msgstr "Amerika/Indiāna/Indianpolisa"
+
+#: 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 "Amerika/Indiānpolisa"
+
+#: calendar/zones.h:112
+msgid "America/Inuvik"
+msgstr ""
+
+#: calendar/zones.h:113
+msgid "America/Iqaluit"
+msgstr ""
+
+#: calendar/zones.h:114
+msgid "America/Jamaica"
+msgstr "Amerika/Jamaika"
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+msgid "America/Juneau"
+msgstr ""
+
+#: calendar/zones.h:117
+msgid "America/Kentucky/Louisville"
+msgstr "Amerika/Kentukī/Louisvilla"
+
+#: calendar/zones.h:118
+msgid "America/Kentucky/Monticello"
+msgstr ""
+
+#: calendar/zones.h:119
+#, fuzzy
+msgid "America/La_Paz"
+msgstr "Amerikāņu Samoa"
+
+#: calendar/zones.h:120
+msgid "America/Lima"
+msgstr "Amerika/Lima"
+
+#: calendar/zones.h:121
+msgid "America/Los_Angeles"
+msgstr "Amerika/Losandželosa"
+
+#: calendar/zones.h:122
+msgid "America/Louisville"
+msgstr "Amerika/Louisvila"
+
+#: calendar/zones.h:123
+msgid "America/Maceio"
+msgstr "Amerika/Maceijo"
+
+#: calendar/zones.h:124
+#, fuzzy
+msgid "America/Managua"
+msgstr "Amerikāņu Samoa"
+
+#: calendar/zones.h:125
+#, fuzzy
+msgid "America/Manaus"
+msgstr "Amerikāņu Samoa"
+
+#: calendar/zones.h:126
+msgid "America/Martinique"
+msgstr "Amerika/Martinika"
+
+#: calendar/zones.h:127
+#, fuzzy
+msgid "America/Mazatlan"
+msgstr "Amerikāņu Samoa"
+
+#: calendar/zones.h:128
+msgid "America/Mendoza"
+msgstr "Amerika/Mendoza"
+
+#: calendar/zones.h:129
+msgid "America/Menominee"
+msgstr ""
+
+#: calendar/zones.h:130
+msgid "America/Merida"
+msgstr "Amerika/Merida"
+
+#: calendar/zones.h:131
+msgid "America/Mexico_City"
+msgstr "Amerika/Mehiko"
+
+#: 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
+msgid "America/Montreal"
+msgstr "Amerika/Montreāla"
+
+#: calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr "Amerika/Montserata"
+
+#: calendar/zones.h:137
+#, fuzzy
+msgid "America/Nassau"
+msgstr "Amerikāņu Samoa"
+
+#: calendar/zones.h:138
+msgid "America/New_York"
+msgstr "Amerika/Ņujorka"
+
+#: calendar/zones.h:139
+msgid "America/Nipigon"
+msgstr ""
+
+#: calendar/zones.h:140
+msgid "America/Nome"
+msgstr "Amerika/Nome"
+
+#: calendar/zones.h:141
+#, fuzzy
+msgid "America/Noronha"
+msgstr "Amerikāņu Samoa"
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+msgid "America/Panama"
+msgstr "Amerika/Panama"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+#, fuzzy
+msgid "America/Paramaribo"
+msgstr "Amerikāņu Samoa"
+
+#: calendar/zones.h:146
+msgid "America/Phoenix"
+msgstr "Amerika/Fēniksa"
+
+#: calendar/zones.h:147
+#, fuzzy
+msgid "America/Port-au-Prince"
+msgstr "Ports"
+
+#: calendar/zones.h:148
+#, fuzzy
+msgid "America/Port_of_Spain"
+msgstr "Ports"
+
+#: calendar/zones.h:149
+msgid "America/Porto_Velho"
+msgstr ""
+
+#: calendar/zones.h:150
+msgid "America/Puerto_Rico"
+msgstr "Amerika/Puerto Riko"
+
+#: 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
+msgid "America/Regina"
+msgstr "Amerika/Regina"
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+msgid "America/Rosario"
+msgstr "Amerika/Rosario"
+
+#: calendar/zones.h:157
+msgid "America/Santiago"
+msgstr "Amerika/Santjago"
+
+#: calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr "Amerika/Santo_Domingo"
+
+#: calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr "Amerika/Sao_Paulo"
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr "Amerika/Šiproka"
+
+#: calendar/zones.h:162
+#, fuzzy
+msgid "America/St_Johns"
+msgstr "Amerikāņu Samoa"
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+#, fuzzy
+msgid "America/St_Lucia"
+msgstr "Amerikāņu Samoa"
+
+#: calendar/zones.h:165
+#, fuzzy
+msgid "America/St_Thomas"
+msgstr "Amerikāņu Samoa"
+
+#: 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 "Azerbaidžāna"
+
+#: calendar/zones.h:172
+msgid "America/Tortola"
+msgstr "Amerika/Tortola"
+
+#: calendar/zones.h:173
+msgid "America/Vancouver"
+msgstr "Amerika/Vankūvera"
+
+#: calendar/zones.h:174
+msgid "America/Whitehorse"
+msgstr ""
+
+#: calendar/zones.h:175
+msgid "America/Winnipeg"
+msgstr "Amerika/Vinipega"
+
+#: calendar/zones.h:176
+msgid "America/Yakutat"
+msgstr ""
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: calendar/zones.h:178
+msgid "Antarctica/Casey"
+msgstr "Antarktika/Keisija"
+
+#: calendar/zones.h:179
+msgid "Antarctica/Davis"
+msgstr "Antarktika/Davis"
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr "Antarktika/DumontDUrville"
+
+#: calendar/zones.h:181
+msgid "Antarctica/Mawson"
+msgstr "Antarktika/Mavsona"
+
+#: calendar/zones.h:182
+#, fuzzy
+msgid "Antarctica/McMurdo"
+msgstr "Antarktika"
+
+#: calendar/zones.h:183
+msgid "Antarctica/Palmer"
+msgstr "Antarktika/Palmera"
+
+#: calendar/zones.h:184
+msgid "Antarctica/South_Pole"
+msgstr "Antarktika/Dienvidpols"
+
+#: calendar/zones.h:185
+#, fuzzy
+msgid "Antarctica/Syowa"
+msgstr "Antarktika"
+
+#: calendar/zones.h:186
+msgid "Antarctica/Vostok"
+msgstr "Antarktika/Vostoka"
+
+#: calendar/zones.h:187
+msgid "Arctic/Longyearbyen"
+msgstr ""
+
+#: calendar/zones.h:188
+msgid "Asia/Aden"
+msgstr "Āzija/Adena"
+
+#: 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 "Āzija/Bagdāde"
+
+#: calendar/zones.h:196
+msgid "Asia/Bahrain"
+msgstr "Āzija/Bahrēna"
+
+#: calendar/zones.h:197
+msgid "Asia/Baku"
+msgstr "Āzija/Baku"
+
+#: calendar/zones.h:198
+msgid "Asia/Bangkok"
+msgstr "Āzija/Bagkoka"
+
+#: calendar/zones.h:199
+msgid "Asia/Beirut"
+msgstr ""
+
+#: calendar/zones.h:200
+msgid "Asia/Bishkek"
+msgstr ""
+
+#: calendar/zones.h:201
+msgid "Asia/Brunei"
+msgstr "Āzija/Bruneja"
+
+#: 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
+msgid "Asia/Colombo"
+msgstr "Āzija/Kolombo"
+
+#: calendar/zones.h:206
+msgid "Asia/Damascus"
+msgstr ""
+
+#: calendar/zones.h:207
+msgid "Asia/Dhaka"
+msgstr ""
+
+#: calendar/zones.h:208
+msgid "Asia/Dili"
+msgstr "Āzija/Dilī"
+
+#: calendar/zones.h:209
+msgid "Asia/Dubai"
+msgstr "Āzija/Dubaja"
+
+#: calendar/zones.h:210
+msgid "Asia/Dushanbe"
+msgstr "Āzija/Dušambē"
+
+#: calendar/zones.h:211
+msgid "Asia/Gaza"
+msgstr "Āzija/Gaza"
+
+#: calendar/zones.h:212
+msgid "Asia/Harbin"
+msgstr "Āzija/Harbīna"
+
+#: calendar/zones.h:213
+msgid "Asia/Hong_Kong"
+msgstr "Āzija/Honkonga"
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr "Āzija/Irkutska"
+
+#: calendar/zones.h:216
+msgid "Asia/Istanbul"
+msgstr "Āzija/Istanbula"
+
+#: calendar/zones.h:217
+msgid "Asia/Jakarta"
+msgstr "Āzija/Jakarta"
+
+#: calendar/zones.h:218
+msgid "Asia/Jayapura"
+msgstr ""
+
+#: calendar/zones.h:219
+msgid "Asia/Jerusalem"
+msgstr "Āzija/Jeruzāleme"
+
+#: calendar/zones.h:220
+msgid "Asia/Kabul"
+msgstr "Āzija/Kabula"
+
+#: calendar/zones.h:221
+msgid "Asia/Kamchatka"
+msgstr "Āzija/Kamčatka"
+
+#: calendar/zones.h:222
+msgid "Asia/Karachi"
+msgstr "Āzija/Karačī"
+
+#: calendar/zones.h:223
+msgid "Asia/Kashgar"
+msgstr ""
+
+#: calendar/zones.h:224
+msgid "Asia/Katmandu"
+msgstr ""
+
+#: calendar/zones.h:225
+msgid "Asia/Krasnoyarsk"
+msgstr "Āzija/Krasnojarska"
+
+#: calendar/zones.h:226
+msgid "Asia/Kuala_Lumpur"
+msgstr ""
+
+#: calendar/zones.h:227
+msgid "Asia/Kuching"
+msgstr ""
+
+#: calendar/zones.h:228
+msgid "Asia/Kuwait"
+msgstr "Āzija/Kuvēta"
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr "Āzija/Makao"
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr "Āzija/Magadana"
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr "Āzija/Manila"
+
+#: calendar/zones.h:232
+msgid "Asia/Muscat"
+msgstr "Āzija/Muskats"
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr "Āzija/Novosibirska"
+
+#: calendar/zones.h:235
+msgid "Asia/Omsk"
+msgstr "Āzija/Omska"
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+msgid "Asia/Qatar"
+msgstr "Āzija/Katara"
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr "Āzija/Saigona"
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr "Āzija/Sahalīna"
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr "Āzija/Samarkanda"
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr "Āzija/Seula"
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr "Āzija/Šanhai"
+
+#: calendar/zones.h:247
+msgid "Asia/Singapore"
+msgstr "Āzija/Singapūra"
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr "Āzija/Taipei"
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr "Āzija/Taškenta"
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr "Āzija/Tbilisi"
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr "Āzija/Teherāna"
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr "Āzija/Tokijo"
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr "Āzija/Vladivostoka"
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+msgid "Atlantic/Bermuda"
+msgstr "Atlantija/Bermuda"
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+msgid "Atlantic/Cape_Verde"
+msgstr "Atlantija/Kapoverde"
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+msgid "Australia/Adelaide"
+msgstr "Austrālija/Adelaide"
+
+#: calendar/zones.h:274
+msgid "Australia/Brisbane"
+msgstr "Austrālija/Brisbāna"
+
+#: calendar/zones.h:275
+#, fuzzy
+msgid "Australia/Broken_Hill"
+msgstr "Austrālija"
+
+#: calendar/zones.h:276
+msgid "Australia/Darwin"
+msgstr "Austrālija/Darvina"
+
+#: calendar/zones.h:277
+msgid "Australia/Hobart"
+msgstr "Austrālija/Hobarta"
+
+#: calendar/zones.h:278
+#, fuzzy
+msgid "Australia/Lindeman"
+msgstr "Austrālija"
+
+#: calendar/zones.h:279
+#, fuzzy
+msgid "Australia/Lord_Howe"
+msgstr "Austrālija"
+
+#: calendar/zones.h:280
+msgid "Australia/Melbourne"
+msgstr "Austrālija/Melnburna"
+
+#: calendar/zones.h:281
+msgid "Australia/Perth"
+msgstr "Austrālija/Perta"
+
+#: calendar/zones.h:282
+msgid "Australia/Sydney"
+msgstr "Austrālija/Sidneja"
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr "Europa/Amsterdama"
+
+#: calendar/zones.h:284
+msgid "Europe/Andorra"
+msgstr "Europa/Andora"
+
+#: calendar/zones.h:285
+msgid "Europe/Athens"
+msgstr "Europa/Atēnas"
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr "Europa/Belfāsta"
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr "Europa/Belgrada"
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr "Europa/Berlīne"
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr "Europa/Bratislava"
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr "Europa/Brisele"
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr "Europa/Bukareste"
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr "Europa/Budapešta"
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr "Europa/Kopenhāgena"
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr "Europa/Dublina"
+
+#: calendar/zones.h:296
+msgid "Europe/Gibraltar"
+msgstr "Europa/Gibraltārs"
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr "Europa/Helsinki"
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr "Europa/Istanbula"
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr "Europa/Kaļingrada"
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr "Europa/Kijeva"
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr "Europa/Lisabona"
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr "Europa/Ļubļana"
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr "Europa/Londona"
+
+#: calendar/zones.h:304
+msgid "Europe/Luxembourg"
+msgstr "Europa/Luksemburga"
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr "Europa/Madride"
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr "Euopa/Malta"
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr "Europa/Minska"
+
+#: calendar/zones.h:308
+msgid "Europe/Monaco"
+msgstr "Europa/Monāko"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr "Europa/Maskava"
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr "Europa/Oslo"
+
+#: calendar/zones.h:312
+msgid "Europe/Paris"
+msgstr "Europa/Parīze"
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr "Europa/Prāga"
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr "Europa/Rīga"
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr "Europa/Roma"
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr "Europa/Samara"
+
+#: calendar/zones.h:317
+msgid "Europe/San_Marino"
+msgstr "Europa/San_Marīno"
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr "Europa/Sarājeva"
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr "Europa/Skopje"
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr "Europa/Sofija"
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr "Europa/Stoholma"
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr "Europa/Tallina"
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr "Europa/Vatikāns"
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr "Europa/Vīnw"
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr "Europa/Viļņa"
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr "Europa/Varšava"
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr "Europa/Zagreba"
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr "Europa/Cīrihe"
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "Komoros salas"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+#, fuzzy
+msgid "Indian/Mahe"
+msgstr "Indija"
+
+#: calendar/zones.h:341
+#, fuzzy
+msgid "Indian/Maldives"
+msgstr "Maldivu salas"
+
+#: calendar/zones.h:342
+#, fuzzy
+msgid "Indian/Mauritius"
+msgstr "Mauritānija"
+
+#: calendar/zones.h:343
+#, fuzzy
+msgid "Indian/Mayotte"
+msgstr "Majota"
+
+#: calendar/zones.h:344
+#, fuzzy
+msgid "Indian/Reunion"
+msgstr "Reinjona"
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+#, fuzzy
+msgid "Pacific/Pitcairn"
+msgstr "Pitkērna"
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+#, fuzzy
+msgid "Pacific/Port_Moresby"
+msgstr "Ports"
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
 #: camel/camel-cipher-context.c:169
 #, fuzzy
 msgid "Signing is not supported by this cipher"
@@ -7345,6 +7410,18 @@ msgstr "ir"
 msgid "Decryption is not supported by this cipher"
 msgstr "ir"
 
+#: camel/camel-data-cache.c:169
+#, fuzzy
+msgid "Unable to create cache path"
+msgstr ""
+"Nevar izveidot izejas failu: %s\n"
+" %s"
+
+#: camel/camel-data-cache.c:441
+#, 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
 #, c-format
 msgid ""
@@ -7372,93 +7449,73 @@ msgstr "Pārsinhronizējamies ar serveri"
 msgid "You must be working online to complete this operation"
 msgstr "Jums ir jāstrādā tiešsaistē lai izpildītu šo operāciju"
 
-#: 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 "Sinhronizējam mapes"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, 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
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Kļūda palaižot filtru: %s: %s"
+
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Nespēj atvērt spool mapi"
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Nespēj procesēt spool mapi"
 
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Dabūjam vēstuli %d (%d%%)"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Nevar atvērt vēstuli"
 
-#: camel/camel-filter-driver.c:693
-#: camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Problēma ar vēstuli %d"
 
-#: camel/camel-filter-driver.c:719
-#: camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "SInhronizējam mapi"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dabūjam vēstuli %d no %d"
 
-#: camel/camel-filter-driver.c:794
-#: camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Kļūda pie vēstules %d no %d"
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Kļūda parsējot filtru: %s: %s"
-
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Kļūda palaižot filtru: %s: %s"
+#: camel/camel-filter-search.c:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "Neizdevās atkodēt vēstuli"
 
-#: camel/camel-filter-search.c:502
-#: camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Kļūda sāknējot filtra meklēšanu: %s: %s"
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1040
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1080
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1262
-msgid "Moving messages"
-msgstr "Pārvietojam vēstules"
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -7467,22 +7524,34 @@ msgstr ""
 "Kļūda sāknējot meklēšanas izteiksmi: %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
 #, fuzzy
 msgid "(match-all) requires a single bool result"
 msgstr "visi"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:750
-#: camel/camel-folder-search.c:794
-#, fuzzy
-msgid "Invalid type in body-contains, expecting string"
-msgstr "satur"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1038
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1078
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1260
+msgid "Moving messages"
+msgstr "Pārvietojam vēstules"
 
 #: camel/camel-lock-client.c:111
 #, c-format
@@ -7494,8 +7563,7 @@ msgstr ""
 msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:202
-#: camel/camel-lock-client.c:225
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
@@ -7506,8 +7574,7 @@ msgid "Could not lock '%s'"
 msgstr "Nevarēja noslēgt '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91
-#: camel/camel-lock.c:110
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
@@ -7576,8 +7643,7 @@ msgstr "Kļūda lasot pasta failu: %s"
 msgid "Error writing mail temp file: %s"
 msgstr "Kļūda rakstot pasta pagaidu failu: %s"
 
-#: camel/camel-movemail.c:466
-#: camel/camel-movemail.c:533
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Kļūda kopējot pasta pagaidu failu: %s"
@@ -7592,125 +7658,122 @@ 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"
 
-#: camel/camel-pgp-context.c:575
+#: 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:582
-#: camel/camel-pgp-context.c:762
+#: 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:588
-#: camel/camel-pgp-context.c:768
+#: 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 "Nevar parakstīt šo vēstuli: nevarēja izveidot kanālu ar GPG/PGP: %s"
+msgstr ""
+"Nevar parakstīt šo vēstuli: nevarēja izveidot kanālu ar GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:755
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:953
+#: 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:959
+#: 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"
+msgstr ""
+"Nevar pārbaudīt šo vēstuli: nevarēja izveidot kanālu uz GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:970
+#: 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:1143
+#: 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:1153
+#: 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:1160
+#: 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:1169
+#: 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:1337
+#: 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:1345
+#: 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:1352
+#: 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:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "Šī ir digitāli parakstītā vēstules daļa"
 
-#: camel/camel-pgp-mime.c:485
-msgid "This is an encrypted message part"
-msgstr "Šī ir kodētā daļa"
-
-#: 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 "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:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nevar ielādēt %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 "Nevar ielādēt %s: Nav initicializācijas koda modulī."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s serveris %s"
 
-#: camel/camel-remote-store.c:207
+#: 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:264
+#: 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:267
-#: camel/providers/smtp/camel-smtp-transport.c:273
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(nezināms resursdators)"
 
-#: camel/camel-remote-store.c:358
-#: camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "Operācija atsaukta"
 
-#: camel/camel-remote-store.c:484
+#: 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"
@@ -7721,10 +7784,10 @@ 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
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Autentifikācija izjukusi."
 
@@ -7760,16 +7823,24 @@ msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 #: camel/camel-sasl-cram-md5.c:37
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "Šī opcija ļaus savienoties ar serveri lietojot drošo CRAM-MD5 paroli, ja serveris atbalsta to."
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Šī opcija ļaus savienoties ar serveri lietojot drošo CRAM-MD5 paroli, ja "
+"serveris atbalsta to."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 #: camel/camel-sasl-digest-md5.c:45
-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."
+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."
 
 #: camel/camel-sasl-digest-md5.c:810
 #, fuzzy
@@ -7816,28 +7887,38 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Slikta autentifikācijas atbilde no servera."
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
+#, fuzzy
+msgid "Login"
 msgstr "NT Pieteikšanās"
 
-#: camel/camel-sasl-login.c:34
-#: camel/camel-sasl-plain.c:34
+#: 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."
 msgstr "Nezināms autentifikācijas stāvoklis."
 
-#: 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
+#: 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 "Šī 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"
 
@@ -7881,26 +7962,39 @@ msgstr "URL '%s' nepieciešams resursdatora komponents"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' nepieciešams ceļa komponents"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Sameklējam: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Nevar atrast nosaukumu: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Sameklējam: %s"
+
+#: camel/camel-service.c:787
+msgid "Host lookup failed: host not found"
+msgstr ""
+
+#: camel/camel-service.c:790
+msgid "Host lookup failed: unknown reason"
+msgstr ""
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
@@ -7910,13 +8004,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr "uzstādīt"
 
-#: 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 ""
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7945,10 +8038,8 @@ msgstr "Paraksta sertifikāts \"%s\" neeksistē."
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Kodēšanas sertifikāts \"%s\" neeksistē."
 
-#: 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
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "Neizdevās atrast sertifikātu \"%s\"."
@@ -7965,35 +8056,22 @@ msgstr "Neizdevās atkodēt vēstuli"
 msgid "Failed to verify certificates."
 msgstr "Neizdevās pārbaudīt sertifikātu"
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nevar dabūt mapi: Nepareiza operācija šajā glabātuvē"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nevar izveidot mapi: Nepareiza operācija šajā glabātuvē"
 
-#: 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 ""
-"EPasts: %s\n"
-"Vienkārš Vārds: %s\n"
-"Organizācijas Vienība: %s\n"
-"Organizācija: %s\n"
-"Atr. Vieta: %s\n"
-"Rajons, Štats: %s\n"
-"Valsts: %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"
@@ -8003,6 +8081,36 @@ msgid ""
 "Do you wish to accept anyway?"
 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
+#, c-format
+msgid ""
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
+msgstr ""
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8013,27 +8121,27 @@ msgstr "Nevarēja noparsēt URL `%s'"
 msgid "No such message %s in %s"
 msgstr "Nav tādas vēstules %s iekš %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Nav tādas vēstules: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
@@ -8042,76 +8150,76 @@ msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
 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:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Negaidīta atbilde no IMAP servera: %s"
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr "Servera atbilde beidzās pārāk ātri."
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, 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:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, 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:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nevar izveidot direktoriju %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nevar ielādēt %s kopsavilkumu"
 
-#: camel/providers/imap/camel-imap-folder.c:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Meklējam izmainītās vēstules"
 
-#: camel/providers/imap/camel-imap-folder.c:1585
-#: camel/providers/imap/camel-imap-folder.c:2001
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Šī vēstule šobrīd nav pieejama"
 
-#: camel/providers/imap/camel-imap-folder.c:1740
-#: camel/providers/imap/camel-imap-folder.c:1821
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1746
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Meklējam jaunās vēstules"
 
-#: camel/providers/imap/camel-imap-folder.c:2038
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: 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 "Nevarēja atvērt keišdirektoriju: %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 "Neizdevās keišot vēstuli %s: %s"
@@ -8124,8 +8232,7 @@ msgstr "Pārbaudam jauno pastu"
 msgid "Check for new messages in all folders"
 msgstr "Pārbaudam jaunas vēstules visās mapēs"
 
-#: 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 "Mapes"
 
@@ -8157,28 +8264,28 @@ msgstr "Lai lasītu un glabātu pastu uz IMAP serveriem."
 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:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:389
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Neatbalstīts autentifikācijas tips %s"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Jūs neievadījāt paroli."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8189,107 +8296,125 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Nav tādas mapes %s"
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 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:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 #, fuzzy
 msgid "For storing local mail in MH-like mail directories."
 msgstr "direktoriji."
 
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Lokāla piegāde"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 #, fuzzy
 msgid "For storing local mail in maildir directories."
 msgstr "direktoriji."
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "Standarts"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Glabātuves sakne %s nav absolūtais ceļš"
 
-#: 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 "Glabātuves sakne %s nav regulāra direktorija"
 
-#: 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 "Nevar dabūt mapi: %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 ""
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokālā pasta fails %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: 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 "Nevar ielādēt %s: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nevarēja izdzēst mapes kopsavilkuma failu `%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 "Nevarēja izdzēst mapes indeksa failu `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 #, fuzzy
 msgid "Unable to add message to summary: unknown reason"
 msgstr "nezināms"
@@ -8310,7 +8435,7 @@ msgstr ""
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8322,7 +8447,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "Nav tādas vēstules"
 
@@ -8331,7 +8456,7 @@ msgstr "Nav tādas vēstules"
 msgid "Invalid message contents"
 msgstr "Nepareizs vēstules saturs"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8341,14 +8466,14 @@ msgstr ""
 "Nevarēja atvērt mapi `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mape '%s' neeksistē."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8358,41 +8483,64 @@ msgstr ""
 "Nevarēja izveidot mapi `%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 nav maildir direktorija."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nevarēja izdzēst mapi `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "nav maildir direktorija"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nevarēja skanēt mapi `%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 "Nevar atvērt maildir direktorijas ceļu: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Pārbaudam jauno pastu"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "Glabājam mapi"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -8410,9 +8558,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8422,16 +8570,16 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 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:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vēstules konstrukcija neveiksmīga: Sabojāta pastkaste?"
 
-#: 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"
@@ -8440,7 +8588,7 @@ msgstr ""
 "Nevar atvērt failu '%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"
@@ -8449,14 +8597,14 @@ msgstr ""
 "Nevar izveidot failu '%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' nav pareizs fails."
 
-#: 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"
@@ -8465,96 +8613,85 @@ msgstr ""
 "Nevarēja izdzēst mapi `%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 "Mape `%s' nav tukša. Netika izdzēsta."
 
-#. 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 "Glabājam mapi"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nevarēja atvērt mapi: %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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nevarēja pārbaudīt mapi: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nevar atvērt failu: %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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: 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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nezināma kļūda: %s"
@@ -8573,12 +8710,12 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr "`%s' nav direktorija."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, 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:512
+#: camel/providers/local/camel-spool-folder.c:515
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr ""
@@ -8589,6 +8726,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mape `%s/%s' neekistē."
@@ -8598,76 +8736,55 @@ msgstr "Mape `%s/%s' neekistē."
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: 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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: 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/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Lūdzu ievadiet %s@%s NNTP paroli"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Serveris noraidīja lietotājvārdu"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Neizdevās nosūtīt lietotājvārdu serverim"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Serveris noraidīja lietotājvārdu/paroli"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Vēstule %s nav atrasta."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Nevarēja dabūt grupas sarakstu no servera."
+#: 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/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 "Nevar ielādēt grupas saraksta failu %s: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Nevar saglabāt grupas saraksta failu %s: %s"
+#: 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"
@@ -8678,134 +8795,165 @@ 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:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Nevarēja atvērt direktoriju ziņu serverim: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET Ziņas caur %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:303
-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."
+#: camel/providers/nntp/camel-nntp-store.c:155
+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."
 
-#: 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 "Nevar atvērt vai izveidot .newsrc failu %s: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Nav tādas mapes %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "Nevar izveidot kanālu: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "IMAP komandas kļūda: %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 "Meklējam jaunās vēstules"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "Nezināma kļūda: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:566
+#, fuzzy
+msgid "Use cancel"
+msgstr "Atsaukt"
+
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "Operācija atsaukta"
+
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Saņemam POP kopsavilkumu"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "Nevarēja pārbaudīt POP serveri jaunām ziņām: %s"
+#: 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 "Operācija atsaukta"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Nevarēja atvērt mapi: vēstuļu saraksts bija nepilnīgs"
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Nevar dabūt mapi: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Iznīcināt dzēstās vēstules"
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "Nevar inest vēstuli: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Nevarēja saņemt vēstuli no POP servera %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 "Nav vēstules ar 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 "Saņemam POP vēstuli %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 ""
+"Nevar dabūt vēstuli: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Nezināmi nokrišņi"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "Vēstuļu glabātuve"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Atstāt vēstules uz servera"
 
-#: 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 "Dzēst pēc %s dienas (ām)"
 
-#: 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:84
 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 ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:69
+#: camel/providers/pop3/camel-pop3-provider.c:71
 #, fuzzy
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
 msgstr "ir."
 
-#: camel/providers/pop3/camel-pop3-provider.c:79
+#: camel/providers/pop3/camel-pop3-provider.c:81
 #, fuzzy
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
 msgstr "visi."
 
-#: camel/providers/pop3/camel-pop3-provider.c:91
-msgid "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, 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:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr ""
+#: 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:214
-#, c-format
-msgid "Could not connect to server: %s"
-msgstr "Nevarēja savienoties ar serveri: %s"
+#: camel/providers/pop3/camel-pop3-store.c:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Autentifikācija izjukusi."
 
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, 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:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sLūdzu ievadiet %s@%s POP3 paroli"
-
-#: camel/providers/pop3/camel-pop3-store.c:377
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Nevar savienoties ar POP serveri.\n"
-"Kļūda sūtot lietotajvārdu: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
-msgid "(Unknown)"
-msgstr "(Nezināms)"
-
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 #, fuzzy
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8814,7 +8962,27 @@ msgstr ""
 "\n"
 " Nē."
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "IMAP komandas kļūda: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "I/O kļūda"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8823,70 +8991,67 @@ msgstr ""
 "Kļūda savienojoties ar POP serveri.\n"
 "Kļūda sūtot paroli: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nav tādas mapes `%s'."
 
-#: camel/providers/pop3/camel-pop3-store.c:563
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "Negaidīta atbilde no POP servera: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:38
 #, fuzzy
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
 msgstr "sistēma."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "Nevarēja noparsēt URL `%s'"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: 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 "Nevarēja sazarot sendmail: %s: pasts nav nosūtīts"
 
-#: 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 "Nevarēja nosūtit vēstuli: %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 iziet ar signālu %s: pasts nav nosūtīts."
 
-#: 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 "Nevarēja palaist %s: pasts nav nosūtīts."
 
-#: 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 izgāja ar statusu %d: pasts nav nosūtīts."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr "Nevarēja atrast 'No' ('From') adresi vēstulē"
-
-#: 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 "Pasta nosūtīšana ar sendmail programmu"
 
-#: 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"
 
@@ -8894,127 +9059,150 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:174
 #, fuzzy
 msgid "Syntax error, command unrecognized"
 msgstr "kļūda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:176
 #, fuzzy
 msgid "Syntax error in parameters or arguments"
 msgstr "kļūda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Komanda nav ievietota"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Komandas parametri nav ievietoti"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Sistēmas statuss, vai sistēmas palīdzības atbilde"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Palīdzības ziņojums"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Serviss kārtībā"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Serviss aizver pārraides kanālu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Serviss nav pieejams, aizveram pārraides kanālu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Pieprasītā pasta darbība atļauta, izpildīta."
 
-#: 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 "Lietotājs nav lokāls; tiks pārsūtīts uz <pārsūtītājceļš>"
 
-#: 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 ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: 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:200
 #, fuzzy
 msgid "Requested action aborted: error in processing"
 msgstr "kļūda"
 
-#: 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 "Lietotājs nav lokāls; lūdzu izmēģiniet <pārsūtītājceļš>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:204
 #, fuzzy
 msgid "Requested action not taken: insufficient system storage"
 msgstr "sistēma"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Sākt pasta ievadi; beigt ar <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: 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:216
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "ir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Autentifikācijas mehanisms ir par vāju"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: 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:222
 msgid "Temporary authentication failure"
 msgstr "Pagaidu autentifikācijas problēma"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Pieprasīta autentifikācija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:317
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, 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:379
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "AUTH pieprasījums iztecējis: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, 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"
 msgstr "SMTP serveris %s neatbalsta pieprasīto autentifikācijas tipu %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9025,131 +9213,135 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP serveris %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP pasta nosūtīšana caur  %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr "Nevar nosūtīt vēstuli: nav norādīta sūtītāja adrese."
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:593
-#: mail/mail-ops.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Sūtam vēstuli"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 #, fuzzy
 msgid "Cannot send message: no recipients defined."
 msgstr "nē."
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+#, fuzzy
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "nē."
+
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "SMTP Apsveikums"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, 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:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikācija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 #, fuzzy
 msgid "Error creating SASL authentication object."
 msgstr "Kļūda."
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "AUTH neveiksmīgs pieprasījums."
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Slikta autentifikācijas atbilde no servera.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:893
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1081
+#, 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:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "RCPT TO atbildes kļūda: %s: pasts nav nosūtīt"
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA pieprasījums iztecējis: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "DATA atbildes kļūda: %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
+#, fuzzy
+msgid "DATA response error"
+msgstr "RSET atbildes kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1030
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1067
-#, c-format
-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"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "Slikta autentifikācijas atbilde no servera."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "RSET atbildes kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "QUIT atbildes kļūda: %s: ne fatāli"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "RSET atbildes kļūda: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -9176,20 +9368,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 "pievienojums"
 
-#: 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 "Izņemt izvēlētos priekšmetus no pievienojumu saraksta"
 
-#: composer/e-msg-composer-attachment-bar.c:533
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "Pievienot pievienojumu..."
 
-#: composer/e-msg-composer-attachment-bar.c:534
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "Pievienot failu vēstulei"
 
@@ -9217,66 +9408,68 @@ msgid "MIME type:"
 msgstr "MIME tips:"
 
 #: 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 "Ieteikt automātisku pievienojuma attēlošanu"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Uz adrešu grāmatu"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "No:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Atbildēt Kam:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Subjekts:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Ievadiet vēstules saņēmējus"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:397
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 #, fuzzy
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
 msgstr "saraksts."
 
-#: 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 "Pievienot failu"
 
-#: composer/e-msg-composer.c:698
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9285,46 +9478,34 @@ msgstr ""
 "Kļūda kāmēr lasot failu %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:896
-msgid "Save as..."
-msgstr "Saglabāt kā..."
-
-#: composer/e-msg-composer.c:905
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Brīdinājums!"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Fails eksistē, pārrakstīt?"
 
-#: composer/e-msg-composer.c:931
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Kļūda saglabājot failu: %s"
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Kļūda ielādējot failu: %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 ""
-"Nevar atvērt melnraksta mapi šim kontam.\n"
-"Vai jūs vēlaties lietot noklusēto melnrakstu mapi?"
-
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Kļūda atverot failu: %s"
 
-#: composer/e-msg-composer.c:1079
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Nespēju saņemt vēstuli no redaktora"
 
-#: composer/e-msg-composer.c:1086
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9333,7 +9514,7 @@ msgstr ""
 "Nevar meklēt failā: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1093
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9342,7 +9523,7 @@ msgstr ""
 "Nevar samazināt failu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9351,15 +9532,16 @@ msgstr ""
 "Kļūda automātiski glabājot vēstuli: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1176
 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:1358
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9369,31 +9551,29 @@ msgstr ""
 "\n"
 "Vai tu vēlies saglabāt izmaiņas?"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Brīdinājums: Mainīta Vēstule"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Atvērt failu"
 
-#: composer/e-msg-composer.c:1537
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Ievietot failu"
 
-#: composer/e-msg-composer.c:1923
-#: composer/e-msg-composer.c:2366
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Uzrakstīt vēstuli"
 
-#: composer/e-msg-composer.c:2383
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2406
-#: composer/e-msg-composer.c:2461
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -9402,7 +9582,7 @@ msgstr ""
 "\n"
 " HTML komponents."
 
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:376
 #, fuzzy
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9411,7 +9591,7 @@ msgstr ""
 "\n"
 " komponents."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nevar initializēt Evolution komponistu."
 
@@ -9463,28 +9643,42 @@ msgstr "Subjekts satur"
 msgid "Subject does not contain"
 msgstr "Subjekts nesatur"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Fails ar šadu nosaukumu jau eksistē.\n"
+"Pārrakstīt to?"
+
 #. 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 "Atceries šo paroli"
 
-#: 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 "Atceries šo paroli uz atlikušo sesiju"
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "Kategorijas"
+
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173
-#: e-util/e-time-utils.c:353
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
@@ -9535,31 +9729,25 @@ msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:303
-#: e-util/e-time-utils.c:402
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:307
-#: e-util/e-time-utils.c:394
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1420
-#: widgets/misc/e-dateedit.c:1647
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1647
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. 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:1417
-#: widgets/misc/e-dateedit.c:1644
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1644
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -9600,11 +9788,7 @@ msgstr "stunda"
 msgid "minute"
 msgstr "stundas"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "sekunde"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "sekundes"
 
@@ -9667,8 +9851,7 @@ msgstr "Izvēlieties laiku ar ko salīdzināt"
 msgid "Compare against"
 msgstr "Salīdzināt ar"
 
-#: filter/filter-datespec.c:546
-#: filter/filter-datespec.c:725
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "tagad"
 
@@ -9680,8 +9863,7 @@ msgstr " atpakaļ"
 msgid "ago"
 msgstr "atpakaļ"
 
-#: filter/filter-datespec.c:711
-#: mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9689,21 +9871,20 @@ msgstr "%b %d %l:%M %p"
 msgid "<click here to select a date>"
 msgstr "<klikšķini šeit lai izvēlētos datumu>"
 
-#: filter/filter-editor.c:132
-#: filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "Filtra Noteikumi"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "Tad"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Pievienot darbību"
 
-#: 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."
@@ -9711,20 +9892,11 @@ msgstr ""
 "Jūs aizmirsāt izvēlēties mapi.\n"
 "Dodaties atpakaļ un izvēlieties pareizu mapi uz kurieni nosūtīt pastu."
 
-#: 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:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Izvēlēties Mapi"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Ievadiet mapes URI"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9734,7 +9906,7 @@ msgstr ""
 "Kļūda neregulārajā izteiksmē '%s':\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Tests"
 
@@ -9742,39 +9914,40 @@ msgstr "Tests"
 msgid "You must name this filter."
 msgstr "Jums jānosauc šis filtrs."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Noteikuma nosaukums:"
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Nenosaukts"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Ja"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "Aktivizēt darbības"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "ja visi kritēriji sakrīt"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "ja jebkuršs kritērijs sakrīt"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Pievienot kritēriju"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "ienākošais"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "izejošais"
 
@@ -9794,8 +9967,7 @@ msgstr "Ienākošais"
 msgid "Outgoing"
 msgstr "Izejošais"
 
-#: filter/filter.glade.h:6
-#: filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuālās Mapes"
 
@@ -9821,212 +9993,228 @@ msgstr "ar visām lokālām mapēm"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Uzstādīt Avotu"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Uzstādīt Krāsu"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Uzstādīt Avotu"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Pievienojumi"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belema"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "satur"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopēt uz Mapi"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Saņemšanas datums"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Nosūtīšanas Datums"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Dzēsts"
 
-#: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr "Neeksistē"
-
-#: filter/libfilter-i18n.h:11
-msgid "Draft"
-msgstr "Melnraksts"
-
-#: filter/libfilter-i18n.h:12
-msgid "Exist"
-msgstr "Eksistē"
-
 #: filter/libfilter-i18n.h:13
-msgid "Expression"
-msgstr "Izteiksme"
+msgid "does not contain"
+msgstr "nesatur"
 
 #: filter/libfilter-i18n.h:14
-msgid "Important"
-msgstr "Svarīgs"
+msgid "does not end with"
+msgstr "nebeidzas ar"
 
 #: filter/libfilter-i18n.h:15
-msgid "Mailing list"
-msgstr "Adresātu saraksts"
+msgid "does not exist"
+msgstr "neeksistē"
 
 #: filter/libfilter-i18n.h:16
-msgid "Message Body"
-msgstr "Ziņojuma Rumpis"
+msgid "does not sound like"
+msgstr "neskan kā"
 
 #: filter/libfilter-i18n.h:17
-msgid "Message Header"
-msgstr "Ziņojuma Iesākums"
+msgid "does not start with"
+msgstr "nesākas ar"
 
 #: filter/libfilter-i18n.h:18
-msgid "Message was received"
-msgstr "Ziņa tika saņemta"
+msgid "Do Not Exist"
+msgstr "Neeksistē"
 
 #: filter/libfilter-i18n.h:19
-msgid "Message was sent"
-msgstr "Ziņa tika nosūtīta"
+msgid "Draft"
+msgstr "Melnraksts"
 
 #: filter/libfilter-i18n.h:20
-msgid "Move to Folder"
-msgstr "Pārvietot uz Mapi"
+msgid "ends with"
+msgstr "beidzas ar"
 
 #: filter/libfilter-i18n.h:21
-msgid "Read"
-msgstr "Lasīt"
+msgid "Execute Shell Command"
+msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Recipients"
-msgstr "Saņēmēji"
+msgid "Exist"
+msgstr "Eksistē"
 
 #: filter/libfilter-i18n.h:23
-msgid "Regex Match"
-msgstr ""
+msgid "exists"
+msgstr "eksistē"
 
 #: filter/libfilter-i18n.h:24
-msgid "Replied to"
-msgstr "Atbildēts uz"
+msgid "Expression"
+msgstr "Izteiksme"
 
 #: filter/libfilter-i18n.h:25
-#: filter/score-rule.c:204
-#: filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
-msgid "Score"
-msgstr "Rezultāts"
+msgid "Follow Up"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26
-#: mail/mail-callbacks.c:1404
-msgid "Sender"
-msgstr "Sūtītajs"
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Svarīgs"
 
 #: filter/libfilter-i18n.h:27
-msgid "Set Status"
-msgstr "Uzstādīt Statusu"
+msgid "is"
+msgstr "ir"
 
 #: filter/libfilter-i18n.h:28
-msgid "Size (kB)"
-msgstr "Izmērs (kB)"
+#, fuzzy
+msgid "is after"
+msgstr "bija pēc"
 
 #: filter/libfilter-i18n.h:29
-msgid "Source Account"
-msgstr "Avota Konts"
+#, fuzzy
+msgid "is before"
+msgstr "bija pirms"
 
 #: filter/libfilter-i18n.h:30
-msgid "Specific header"
-msgstr "Specifisks iesākums"
+#, fuzzy
+msgid "is Flagged"
+msgstr "Karogots"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "ir lielāks par"
 
 #: filter/libfilter-i18n.h:32
-msgid "Stop Processing"
-msgstr "Apturēt Procesēšanu"
+msgid "is less than"
+msgstr "ir mazāks par"
 
 #: filter/libfilter-i18n.h:33
-#: mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
-msgid "Subject"
-msgstr "Subjekts"
+msgid "is not"
+msgstr "nav"
+
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Karogots"
+
+#: filter/libfilter-i18n.h:35
+msgid "Mailing list"
+msgstr "Adresātu saraksts"
 
 #: filter/libfilter-i18n.h:36
-msgid "contains"
-msgstr "satur"
+msgid "Message Body"
+msgstr "Ziņojuma Rumpis"
 
 #: filter/libfilter-i18n.h:37
-msgid "does not contain"
-msgstr "nesatur"
+msgid "Message Header"
+msgstr "Ziņojuma Iesākums"
 
 #: filter/libfilter-i18n.h:38
-msgid "does not end with"
-msgstr "nebeidzas ar"
+msgid "Move to Folder"
+msgstr "Pārvietot uz Mapi"
 
 #: filter/libfilter-i18n.h:39
-msgid "does not exist"
-msgstr "neeksistē"
+#, fuzzy
+msgid "Play Sound"
+msgstr "Spēlēt Skaņu:"
 
-#: filter/libfilter-i18n.h:40
-msgid "does not sound like"
-msgstr "neskan kā"
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+msgid "Read"
+msgstr "Lasīt"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not start with"
-msgstr "nesākas ar"
+msgid "Recipients"
+msgstr "Saņēmēji"
 
 #: filter/libfilter-i18n.h:42
-msgid "ends with"
-msgstr "beidzas ar"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "exists"
-msgstr "eksistē"
+msgid "Replied to"
+msgstr "Atbildēts uz"
 
-#: filter/libfilter-i18n.h:44
-msgid "is greater than"
-msgstr "ir lielāks par"
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
+msgid "Score"
+msgstr "Rezultāts"
 
-#: filter/libfilter-i18n.h:45
-msgid "is less than"
-msgstr "ir mazāks par"
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+msgid "Sender"
+msgstr "Sūtītajs"
 
 #: filter/libfilter-i18n.h:46
-msgid "is not"
-msgstr "nav"
+msgid "Set Status"
+msgstr "Uzstādīt Statusu"
 
 #: filter/libfilter-i18n.h:47
-msgid "is"
-msgstr "ir"
+msgid "Size (kB)"
+msgstr "Izmērs (kB)"
 
 #: filter/libfilter-i18n.h:48
-msgid "on or after"
-msgstr "uz vai pēc"
+msgid "sounds like"
+msgstr "skan kā"
 
 #: filter/libfilter-i18n.h:49
-msgid "on or before"
-msgstr "uz vai pirms"
+msgid "Source Account"
+msgstr "Avota Konts"
 
 #: filter/libfilter-i18n.h:50
-msgid "sounds like"
-msgstr "skan kā"
+msgid "Specific header"
+msgstr "Specifisks iesākums"
 
 #: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "sākas ar"
 
-#: filter/libfilter-i18n.h:52
-msgid "was after"
-msgstr "bija pēc"
-
 #: filter/libfilter-i18n.h:53
-msgid "was before"
-msgstr "bija pirms"
+msgid "Stop Processing"
+msgstr "Apturēt Procesēšanu"
+
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
+msgid "Subject"
+msgstr "Subjekts"
 
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Noteikumi"
 
-#: filter/rule-editor.c:284
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Pievienot Noteikumu"
 
-#: filter/rule-editor.c:357
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Rediģēt Noteikumu"
 
@@ -10046,36 +10234,30 @@ msgstr "Jums jānorāda vismaz viena mape kā avots."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importē jūsu veco Eim pastu"
 
-#: 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 "Importējam..."
 
-#: 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 "Lūdzu uzgaidiet"
 
-#: 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 "Importējam %s kā %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 "Skanējam %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:101
 msgid "Mail"
 msgstr "Pasts"
 
@@ -10091,8 +10273,7 @@ msgstr ""
 msgid "Elm"
 msgstr "Eim"
 
-#: 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 "Adrešu grāmata"
 
@@ -10104,24 +10285,74 @@ msgstr ""
 "Evolution ir atradusi GnomeCard failus.\n"
 "Vai jūs vēlaties, lai tie tiktu importēti Evolution? "
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Prioritāte: %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 importē jūsu vecos Netscape datus"
 
-#: importers/netscape-importer.c:888
-#: importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Atkritumkaste"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Lokālā pasta fails %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Skanējam direktoriju"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Sākam importu"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Uzstādījumi"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Rediģēt Filtrus"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10146,45 +10377,95 @@ msgid "Pine"
 msgstr "Pine"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Evolution komponista ražotne."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Ražotne Evolution Uzdevumu kontrolei"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Evolution komponista ražotne."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Evolution komponista ražotne."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Evolution komponente pasta parvāldīšanai."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolution pasta sacerētājs."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 #, fuzzy
 msgid "Evolution mail executive summary component."
 msgstr "komponents."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Evolution pasta mapes attēlošanas komponents."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Evolution pasta mapes ražotnes komponents."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Evolution komponista ražotne."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Pasta Kopsavilkuma komponentes ražotne."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Bez A_tkārtošanās"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Konti"
+
+#: 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 "Pasta konfigurēšanas saskarne"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Mape, kura satur pastu"
+#: 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:101
-msgid "Mail storage folder (internal)"
-msgstr "Pasta glabāšanas mape (iekšējā)"
+msgid "Folder containing mail"
+msgstr "Mape, kura satur pastu"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -10194,238 +10475,257 @@ msgstr "Virtuālā Atkritumkaste"
 msgid "Virtual Trash folder"
 msgstr "Virtuālās Atkritumkastes mape"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Nevar savienoties ar glabātuvi: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Šī mape nevar saturēt ziņojumus."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Rekvizīti..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Izmainīt šīs mapes rekvizītus"
 
-#: mail/component-factory.c:783
-msgid "Some of your mail settings seem corrupt, please check that everything is in order."
-msgstr "Kādi no pasta uzstādījumiem ir nepareizi, lūdzu pārbaudiet vai viss ir kārtībā."
+#: mail/component-factory.c:766
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+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
+#, fuzzy
+msgid "You have not set a mail transport method"
+msgstr "uzstādīt"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Jauna Pasta Ziņojums"
 
-#: mail/component-factory.c:951
-msgid "New _Mail Message"
-msgstr "Jauns Pasta Ziņoju_ms"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "_Pasta Vēstule"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nevar initializēt Evolution pasta komponenti."
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nevar initializēt Evolution pasta konfigurācijas komponentu."
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nevar initializēt Evolution mapes informatīvo komponentu."
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Savienojamies ar serveri..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Nevar reģistrēt glabātuvi ar čaulu"
 
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr " \"%s\" Rekvizīti"
 
-#: mail/folder-browser-ui.c:274
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Rekvizīti"
 
-#: mail/folder-browser.c:297
-#: mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d jauni"
 
-#: mail/folder-browser.c:734
-#: mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d slēpti"
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d izvēlēti"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d nenosūtīti"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d nosūtīti"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d kopā"
 
-#: mail/folder-browser.c:1049
-msgid "Create vFolder from Search"
-msgstr "Izveidot vMapi no Meklējuma"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Izveidot _Virtuālu Mapi No Vēstules"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "VMape ar Subjektu"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "VMape ar Sūtītāju"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "Vmape a_r Saņēmējiem"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "VMape ar Adresātu sarakstu"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtrs uz Subjektu"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtrs uz Sūtītāju"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filtrs uz Saņēmējiem"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filtrs uz Adresātu Sarakstu"
 
-#: mail/folder-browser.c:1448
-#: ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "R_ediģēt kā Jaunu Ziņojumu..."
 
-#: mail/folder-browser.c:1449
-#: ui/evolution-mail-message.xml.h:105
-msgid "_Save As..."
-msgstr "_Saglabāt Kā..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Drukāt"
 
-#: mail/folder-browser.c:1454
-#: ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Atbildēt Sūtītājam"
 
-#: mail/folder-browser.c:1455
-#: ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Atbildēt uz _Sarakstu"
 
-#: mail/folder-browser.c:1456
-#: ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Atbildēt _Visiem"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Pārsūtīt"
 
-#: mail/folder-browser.c:1459
-#: ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Pabeigts"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Tīrs"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "A_tzīmēt kā Lasītu"
 
-#: mail/folder-browser.c:1460
-#: ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Atzīmēt kā _Neizlasītu"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Atzīmēt kā _Svarīgu"
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Atzīmēt _kā Nesvarīgu"
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Atdzēst"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "Pārvietot uz _Mapi..."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Kopēt uz Mapi..."
 
-#: mail/folder-browser.c:1469
-#: ui/evolution-mail-message.xml.h:107
-msgid "_Undelete"
-msgstr "_Atdzēst"
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "_Lielāks"
 
-#: mail/folder-browser.c:1473
-#: ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Pievienot Sūtītāju Adrešu Grāmatai"
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Attiecināt Filtrus"
 
-#: mail/folder-browser.c:1478
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "Izveidot Noteikumu No Vēstules"
 
-#: mail/folder-browser.c:1628
+#: mail/folder-browser.c:1936
 #, fuzzy
-msgid "Filter on Mailing List"
-msgstr "Filtrs"
-
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
+msgid "VFolder on M_ailing List"
 msgstr "VMape Pasta Sarakstei"
 
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrs Pasta Sarakstei (%s)"
 
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "VMape Pasta Sarakstam (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Noklusētais"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Dabūjam Informāciju par Mapi"
@@ -10447,27 +10747,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importē Outlook Express 4 failus Evolution"
 
 #: mail/local-config.glade.h:1
-#, fuzzy
-msgid "Body contents"
-msgstr "Ķermenis"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Pašreizējais glabātuves formāts:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Indeksēšana:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Pastkastītes formāts"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Ķermenis"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Jauns glabātuves formāts:"
 
-#: mail/local-config.glade.h:6
+#: mail/local-config.glade.h:4
 #, fuzzy
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
@@ -10478,20 +10770,19 @@ msgstr ""
 "\n"
 " ar."
 
-#: 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:107
 #, fuzzy
 msgid "You have not filled in all of the required information."
 msgstr "visi."
@@ -10506,90 +10797,80 @@ msgstr "Evolution Ziņu Redaktors"
 msgid "Evolution Account Editor"
 msgstr "Evolution Kontu Redaktors"
 
-#: mail/mail-account-gui.c:962
-msgid "Could not save signature file."
-msgstr "Nevarēju noglabāt paraksta failu."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Resursdators:"
 
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "Saglabāt parakstu"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "_Lietotājvārds:"
 
-#: mail/mail-account-gui.c:1045
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+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 ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Šis paraksts ir izmainīts, bet nav saglabāts.\n"
-"\n"
-"Vai saglabāt jūsu izmaiņas?"
 
-#: mail/mail-account-gui.c:1654
+#: mail/mail-account-gui.c:1985
 #, fuzzy
 msgid "You may not create two accounts with the same name."
 msgstr "ar."
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr "(noklusētais)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Izslēgt"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Aktivizēt"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 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:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Nedzēst"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Tiešām dzēst kontu?"
 
-#: mail/mail-accounts.c:532
-#: mail/mail-accounts.c:536
-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:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Izslēgt"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:798
-#: mail/mail-config.glade.h:42
-msgid "Mail Settings"
-msgstr "Pasta Uzstādījumi"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Aktivizēt"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Pasts uz %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+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-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Subjekts ir %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Aktivizēts"
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Pasts no %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Kont_a vārds:"
 
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "%s epasta sarakste"
+#: mail/mail-accounts.c:733 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:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Pievienot Filtra Noteikumus"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 #, fuzzy
 msgid ""
 "You have not configured the mail client.\n"
@@ -10602,7 +10883,7 @@ msgstr ""
 "\n"
 " tagad?"
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 #, fuzzy
 msgid ""
 "You need to configure an identity\n"
@@ -10611,7 +10892,7 @@ msgstr ""
 "\n"
 " pirms."
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 #, fuzzy
 msgid ""
 "You need to configure a mail transport\n"
@@ -10620,22 +10901,19 @@ msgstr ""
 "\n"
 " pirms."
 
-#: mail/mail-callbacks.c:230
-#, fuzzy
-msgid "You have not set a mail transport method"
-msgstr "uzstādīt"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:265
+#: mail/mail-callbacks.c:194
 #, fuzzy
-msgid "You are sending an HTML-formatted message, but the following recipients do not want HTML-formatted mail:\n"
+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:280
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Sūtīt jebkurā gadījumā?"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10643,61 +10921,67 @@ msgstr ""
 "Šai vēstulei nav virsraksta\n"
 "Patiešām nosūtīt?"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 #, 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."
+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:370
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "Šī vēstule satur tikai Bcc adresātus."
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 #, fuzzy
 msgid ""
-"It is possible that the mail server may reveal the recipients by adding an Apparently-To header.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 "ir Kam\n"
 " Sūtīt?"
 
-#: mail/mail-callbacks.c:469
-msgid "This message contains invalid recipients:"
-msgstr "Šī vēstule satur nepareizus saņēmējus:"
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 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:600
+#: mail/mail-callbacks.c:497
 #, fuzzy
 msgid "You must configure an account before you can send this email."
 msgstr "pirms."
 
-#: mail/mail-callbacks.c:838
+#: mail/mail-callbacks.c:623
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Nevar atvērt melnraksta mapi šim kontam.\n"
+"Vai jūs vēlaties lietot noklusēto melnrakstu mapi?"
+
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "nezināms nosūtītājs"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 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:1281
-#: mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Pārvietot vēstule(s) uz"
 
-#: mail/mail-callbacks.c:1283
-#: mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopēt vēstule(s) uz"
 
-#: mail/mail-callbacks.c:1759
+#: mail/mail-callbacks.c:2091
 #, 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:1784
+#: mail/mail-callbacks.c:2116
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
@@ -10706,7 +10990,7 @@ msgstr ""
 "\n"
 " Melnraksti."
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10714,32 +10998,43 @@ 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:1837
+#: mail/mail-callbacks.c:2169
 #, 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:1863
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Nav Izvēlēta Vēstule"
 
-#: mail/mail-callbacks.c:1962
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Pārrakstīt failu?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Saglabāt Vēstuli Kā..."
 
-#: mail/mail-callbacks.c:1964
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Saglabāt Vēstules Kā..."
 
-#: mail/mail-callbacks.c:2128
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Brīdinājums"
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Parādīt nākošo neizlasīto vēstuli"
 
-#: mail/mail-callbacks.c:2135
+#: mail/mail-callbacks.c:2373
+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
 #, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as deleted. If you continue, you will not be able to recover these messages.\n"
+"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 ""
@@ -10747,11 +11042,7 @@ msgstr ""
 "\n"
 "?"
 
-#: mail/mail-callbacks.c:2142
-msgid "Do not ask me again."
-msgstr "Neprasiet man vēlreiz."
-
-#: mail/mail-callbacks.c:2250
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10760,39 +11051,49 @@ msgstr ""
 "Kļūda ielādējot filtra informāciju:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2262
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:2325
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Dabūjam vēstuli %d no %d"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Drukāt Vēstuli"
 
-#: mail/mail-callbacks.c:2352
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-Vēstule"
 
-#: mail/mail-callbacks.c:2371
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Vēstules drukāšana neizdevās"
 
-#: mail/mail-callbacks.c:2473
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, 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?"
+msgstr ""
+"Vai jūs esat pārliecināts, ka vēlaties atvērt visas %d vēstules "
+"atsevišķos logos?"
 
 #: 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"
+"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ū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
 #, fuzzy
 msgid ""
-"Please enter information about your incoming mail server below. If you are not sure, ask your system\n"
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
 "ienākošais Ja sistēma\n"
@@ -10805,7 +11106,8 @@ msgstr "Lūdzu izvēlieties starp sekojošām iespējām"
 #: mail/mail-config-druid.c:152
 #, fuzzy
 msgid ""
-"Please enter information about the way you will send mail. If you are not sure, ask your system\n"
+"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 ""
 "Ja sistēma\n"
@@ -10814,27 +11116,50 @@ msgstr ""
 #: mail/mail-config-druid.c:154
 #, fuzzy
 msgid ""
-"You are almost done with the mail configuration process. The identity, incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together to\n"
-"make an Evolution mail account. Please enter a name for this account in the space below.\n"
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"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:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution Kontu Asistents"
 
-#: mail/mail-config.c:326
-#, c-format
-msgid "Account %d"
-msgstr "Konts %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Korka"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Galvenais"
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "pēc"
 
-#: mail/mail-config.c:1859
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -10842,90 +11167,155 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Inbox"
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Pārbaudam Servisu"
 
-#: mail/mail-config.c:2190
-#: mail/mail-config.c:2194
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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
-msgid " _Check for supported types "
-msgstr "_Pārbaudīt atbalstītos paņēmienus"
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr "krāsa"
+#, 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
+#, 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
 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:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
-msgid "Account"
-msgstr "Konts"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Konts %d"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Kontu Informācija"
 
-#: mail/mail-config.glade.h:7
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Kontu Pārvaldība"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "Konti"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Atsaukt Operāciju"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Āfrika/Lagosa"
+
+#: mail/mail-config.glade.h:13
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: 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:11
-#: mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "Austrija"
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Pievienot failu vēstulei"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Pievienojums"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentifikācija"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "_Automātiski parbaudīt jauno pastu"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Nezināma rakstzīmju kopa: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "Aiz_vērt"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Pārbaudīt Jauno Pastu"
 
-#: mail/mail-config.glade.h:14
-msgid "Composer"
-msgstr "Komponētājs"
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Composing Messages"
+msgstr "Uzrakstīt vēstuli"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfigurācija"
 
-#: mail/mail-config.glade.h:16
-msgid "Confirm when Expunging a folder"
-msgstr "Apstiprināt, kad Izdzēš mapi"
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10941,236 +11331,373 @@ msgstr ""
 "\n"
 "Klikšķināt \"Beigt\" lai saglabātu jūsu uzstādījumus."
 
-#: mail/mail-config.glade.h:23
+#: 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:24
-msgid "Default Forward style is: "
-msgstr "Noklusētais pārsūtīšanas stils ir:"
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Noklusētais"
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Noklusētais simbolu kodējums:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Pasta Ienešana"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitālie IDs..."
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr "Attēlot"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Nevar atvērt vēstuli"
 
-#: mail/mail-config.glade.h:29
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Izdarīs"
 
-#: mail/mail-config.glade.h:30
-#: shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Melnraksti"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "_Melnrakstu mape:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "A_ktivizēt"
 
-#: mail/mail-config.glade.h:32
-#: widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Rediģēt..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
-msgstr "Aktivizēts"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Austrumu"
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Epasts satur"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "Epasta adrese:"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "_Iztukšot atkritumkastes izejot"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "Aktivizēt darbības"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "beidzas ar"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Rekvizīti"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Pārsūtītās vēstules"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Dabūt Digitālo ID..."
 
-#: mail/mail-config.glade.h:35
-msgid "HTML signature file:"
-msgstr "HTML paraksta fails:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Izcelt citātus ar"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Tuvalu"
+
+#: 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 "Identitāte"
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr "HTML pastā"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Iekļauts"
 
-#: 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 "Saglabāt un Aizvērt"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "_Ielādēt Attēlus"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Pasta Konfigurācija"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Pasta kastes atrašanās vieta:"
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
-msgstr "Uzstādīt šo kā manu noklusēto kontu"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Ziņojuma Iesākums"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_Vēstules Attēlošana"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikronēzija"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP Serveris:"
 
-#: mail/mail-config.glade.h:46
-msgid "News"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "Pasta Konfigurācija"
+
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
 msgstr "Ziņas"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Optionāla Informācija"
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Orani_zācija:"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "PGP _Atslēgas ID:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Izvēlies krāsu"
 
-#: 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 "Norādīt, kad sūta HTML vēstules kontaktiem, kuri to nevēlas"
+#: mail/mail-config.glade.h:88
+#, 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"
 
-#: mail/mail-config.glade.h:56
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Norādīt, kad sūta vēstules ar tukšu subj_ektu."
+#: mail/mail-config.glade.h:89
+#, 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 "Norādīt,  kad sūta vēstuleas tikai ar norādītiem _Bcc saņēmējiem"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Drukāt izvēlētos kontaktus"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Nevar atvērt vēstuli"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citēts"
 
-#: mail/mail-config.glade.h:60
+#: 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"
 
-#: 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 "Atbildēt Kam:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Saņemam Epastu"
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
-msgstr "Saņemam Pastu"
-
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Saņemam Opcijas"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Atceries šo paroli"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Pieprasītā Informācija"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+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:67
-msgid "Security"
-msgstr "Drošība"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
-msgstr "Izvēlieties Filtra loga failu..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "Izvēlieties PGP bināri"
 
-#: mail/mail-config.glade.h:70
-#: shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Sūtam Epastu"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Paraksta fails:"
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
-msgstr "Sūtam Pastu"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Izdzēst visu, bet ne parakstu"
 
-#: mail/mail-config.glade.h:73
-#: mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Nosūtīts"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "Sūtam Epastu"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Nosūtīto _ziņu mape:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Nosūtītās ziņas un Ziņu Paraugi"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris pieprasa autentikāciju"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Servera Konfigurācija"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "Servera _Tips:"
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
-msgstr "Paraksta fails:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Saīsinājumi"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Saglabāt parakstu"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Avots"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Avota Informācija:"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "Avoti"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "Stila nosaukums:"
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
-msgstr "Speciālas Mapes"
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Standarta Unix mbox"
 
-#: mail/mail-config.glade.h:86
-msgid "Use s_ecure connection (SSL)"
-msgstr "Lietot dr_ošu savienojumu (SSL)"
+#: mail/mail-config.glade.h:128
+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:87
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "_HTML Paraksts:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Mainīgs"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11180,126 +11707,215 @@ msgstr ""
 "\n"
 "Klikšķiniet \"Nākošais\" lai sāktu."
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Austrumu"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "_Vienmēr ielādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:141
 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:93
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Autentifikācijas Tips:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "_Autentifikācijas Tips:"
+
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Sertifikāta ID:"
 
-#: mail/mail-config.glade.h:97
-msgid "_Drafts folder:"
-msgstr "_Melnrakstu mape:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
-msgstr "_Epasta Adrese:"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Apstiprināt, kad Izdzēš mapi"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
-msgstr "_Iztukšot atkritumkastes izejot"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Noklusētais"
 
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:151
+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
+#, fuzzy
+msgid "_Filename:"
+msgstr "Faila nosaukums:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Pārsūtīt Kā"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "_Pilns Vārds:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "HTML pastā"
+
+#: mail/mail-config.glade.h:160
 msgid "_HTML Signature:"
 msgstr "_HTML Paraksts:"
 
-#: mail/mail-config.glade.h:103
-msgid "_Highlight citations with"
-msgstr "_Izcelt citātus ar"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Identitāte"
 
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
-msgstr "_Resursdators:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Valoda"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 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:106
-msgid "_Log filter actions to:"
-msgstr "Reģistrēt filtra darbības:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Uzstādīt šo kā manu noklusēto kontu"
 
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_Atzīmēt vēstules kā Lasītas pēc"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "Vārds:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_Nekad nelādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:110
-msgid "_Organization:"
-msgstr "_Organizācija:"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "_PGP programmas ceļš:"
 
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
-msgstr "_Ceļš:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
-msgstr "_Atceries šo paroli"
+#: mail/mail-config.glade.h:172
+#, 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:114
-msgid "_Send mail in HTML format by default."
-msgstr "_Sūtīt pastu HTML formātā pēc noklusējuma"
+#: mail/mail-config.glade.h:173
+#, 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:115
-msgid "_Server Type: "
-msgstr "_Servera Tips:"
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Radio"
 
-#: mail/mail-config.glade.h:116
-msgid "_Signature file:"
-msgstr "Parak_sta fails:"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Saņemam Pastu"
 
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
-msgstr "_Lietotājvārds:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Atbildēt Visiem"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Drošība"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Drošība"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Sūtam Pastu"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Parādī Laiku Kā"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Mainīgs"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_katru"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr "krāsa"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "apraksts"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "zinulogs1"
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr "vietmape"
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr "sekundes."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Nevarēja izveidot PGP paraksta kontekstu."
@@ -11336,172 +11952,166 @@ msgstr "Nevarēja izveidot S/MIME aploksnes kontekstu."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nevarēja izveidot S/MIME atkodēšanas kontekstu."
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Saglabāt Pievienojumu"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Nevar izveidot pagaidu direktoriju: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Saglabāt uz Diska..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Skatīt Iekšēji"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Atvērt ar %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Skatīt Iekšēji (via %s)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Slēpt"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Ārējais Skatītājs"
 
-#: mail/mail-display.c:1136
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Ielādējam vēstules saturu"
 
-#: mail/mail-display.c:1605
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Kopēt Saiti Pārlūkprogrammā"
 
-#: mail/mail-display.c:1607
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Kopēt Saites Lokāciju"
 
-#: mail/mail-display.c:1610
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Saglabāt Saiti kā (FIXME)"
 
-#: mail/mail-display.c:1613
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Saglabāt attēlu kā..."
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s pievienojums"
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nevar noparsēt MIME vēstuli. Attēlojam kā avotu."
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datums"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Nepareiza Adrese"
 
-#: mail/mail-format.c:886
-#: mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "No"
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Atbildēt-Uz"
 
-#: mail/mail-format.c:893
-#: mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Kam"
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1814
-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:1837
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution neatpazīst ar šāda tipa parakstu parakstītu vēstuli."
-
-#: mail/mail-format.c:1845
-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:1853
-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:915
+#, fuzzy
+msgid "Mailer"
+msgstr ""
+"\n"
+"Pastnieks: "
 
-#: mail/mail-format.c:2069
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Norāde uz FTP saiti (%s)"
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2088
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Norāde uz lokālu failu (%s)"
 
-#: mail/mail-format.c:2117
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2162
 #, 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:2130
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Pārkonfigurēt mapi"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, 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:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, 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:1318
+#: mail/mail-local.c:1316
 #, fuzzy
 msgid ""
 "If you can no longer open this mailbox, then\n"
@@ -11510,11 +12120,11 @@ msgstr ""
 "Ja nē\n"
 "."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Pārkonfigurēt /%s"
@@ -11541,120 +12151,112 @@ msgstr ""
 msgid "Working"
 msgstr "Strādā"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtrējam Mapi"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Pasta Ienešana"
 
-#: 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 "Kaut arī, vēstule tika veiksmīgi nosūtīta."
 
-#: mail/mail-ops.c:554
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sūtam \"%s\""
 
-#: mail/mail-ops.c:674
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sūtam vēstuli %d no %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Kļūda pie %d vēstules no %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 "Izpildīts."
 
-#: mail/mail-ops.c:788
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Saglabājam vēstuli mapē"
 
-#: mail/mail-ops.c:868
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Pārvietojam vēstules uz %s"
 
-#: mail/mail-ops.c:868
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopējam vēstules uz %s"
 
-#: mail/mail-ops.c:895
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Pārvietojam"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopējam"
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanējam mapes \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1058
-#: shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Atkritumkaste"
-
-#: mail/mail-ops.c:1191
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Pārsūtītās vēstules"
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atveram mapi %s"
 
-#: mail/mail-ops.c:1306
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Atveram glabātuvi %s"
 
-#: mail/mail-ops.c:1375
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Izņemam mapi %s"
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Glabājam mapi '%s'"
 
-#: mail/mail-ops.c:1520
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Atjauninām mapi"
 
-#: mail/mail-ops.c:1556
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Dzēšam mapi"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Saņemam vēstuli %s"
 
-#: mail/mail-ops.c:1672
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Saņemam %d vēstule(s)"
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Saglabājam %d vēstuli(es)"
 
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11663,7 +12265,7 @@ msgstr ""
 "Nevar izveidot izejas failu: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11672,11 +12274,11 @@ msgstr ""
 "Kļūda glabājot vēstules uz: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Saglabājam pievienojumu"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11685,22 +12287,27 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nevarēja ierakstīt datus: %s"
 
-#: mail/mail-ops.c:2088
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atvienojamies no %s"
 
-#: mail/mail-ops.c:2089
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Pārvienojamies ar %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Meklēt"
 
@@ -11736,69 +12343,92 @@ msgstr "Atrast:"
 msgid "Matches:"
 msgstr ""
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Atsaucam..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveris: %s, Tips: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Ceļš: %s, Tips: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Tips: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Sūtīt & Saņemt Pastu"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Atcelt Visu"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Atjauninām..."
 
-#: 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 "Gaidām..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Atsaukts."
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Lietotājs atsauca operāciju."
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ievadiet %s Paroli"
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 msgid "Enter Password"
 msgstr "Ievadiet Paroli"
 
-#: mail/mail-tools.c:256
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Nevarēju noglabāt paraksta failu."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Saglabāt parakstu"
+
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Šis paraksts ir izmainīts, bet nav saglabāts.\n"
+"\n"
+"Vai saglabāt jūsu izmaiņas?"
+
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "Paraksta fails:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Pārsūtītā vēstule - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Pārsūtīta vēstule"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Pārsūtīta Vēstule"
 
@@ -11821,10 +12451,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "VMapes"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "vMapes"
@@ -11842,87 +12468,145 @@ msgstr ""
 msgid "New VFolder"
 msgstr "Jauna VMape"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Nav subjekta)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Vēstule"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Neredzēta"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Redzēta"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Atbildēta"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Vairākas Neredzētas Ziņas"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Vairākas Ziņas"
 
-#: mail/message-list.c:647
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Zemākais"
 
-#: mail/message-list.c:648
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Zemāk"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Augstāk"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Augstākais"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Šodien %l:%M %p"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Vakardiena %I:%M %p"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2341
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Izveidojam vēstuļu sarakstu"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "Līdz"
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Status"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Karogots"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Saņemts"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Izmērs"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "Pasts"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Ej uz priekšu"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Avota Informācija:"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Pārsūtīt"
+
+#: 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 "Atbildēt"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Atbildēt Visiem"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Pirmsapskats"
+
+#: 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\""
@@ -11943,9 +12627,8 @@ msgstr "Parakstīties uz mapi \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Atrakstīties no mapes \"%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:2
 msgid "Folder"
 msgstr "Mape"
 
@@ -11991,1445 +12674,33 @@ msgstr "_Atrakstīties"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 #, fuzzy
-msgid "Evolution component for the executive summary."
-msgstr "komponents."
-
-#: my-evolution/component-factory.c:44
-#, fuzzy
-msgid "Folder containing the Evolution Summary"
+msgid "Configuration control for the Evolution Summary."
 msgstr "Mape"
 
-#: my-evolution/component-factory.c:153
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 #, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Kopsavilkums komponents."
-
-#: my-evolution/e-summary-calendar.c:340
-#: my-evolution/e-summary-calendar.c:358
-msgid "Appointments"
-msgstr "Satikšanās"
-
-#: my-evolution/e-summary-calendar.c:341
-msgid "No appointments"
-msgstr "Nav satikšanos"
-
-#: 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 "Nav apraksta"
-
-#: my-evolution/e-summary-mail.c:129
-msgid "Mail summary"
-msgstr "Pasta kopsavilkums"
-
-#. 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 "Dictionary.com Dienas Vārds"
-
-#: my-evolution/e-summary-preferences.c:466
-msgid "Quotes of the Day"
-msgstr "Dienas Citāti"
-
-#: my-evolution/e-summary-preferences.c:945
-#, fuzzy
-msgid "Add a news feed"
-msgstr "Pievienot"
-
-#: my-evolution/e-summary-preferences.c:953
-#, fuzzy
-msgid "Enter the URL of the news feed you wish to add"
-msgstr "URL"
-
-#: my-evolution/e-summary-preferences.c:957
-msgid "Name:"
-msgstr "Nosaukums:"
-
-#: my-evolution/e-summary-preferences.c:1503
-msgid "Summary Settings"
-msgstr "Kopsavilkuma Uzstādījumi"
-
-#: 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 "Kļūda lejuplādējot RDF"
-
-#: my-evolution/e-summary-rdf.c:528
-#, fuzzy
-msgid "News Feed"
-msgstr "Ziņas"
-
-#: my-evolution/e-summary-tasks.c:248
-msgid "No tasks"
-msgstr "Nav uzdevumu"
-
-#: my-evolution/e-summary-tasks.c:287
-msgid "(No Description)"
-msgstr "(Nav Apraksta)"
-
-#: my-evolution/e-summary-weather.c:71
-msgid "My Weather"
-msgstr "Mani Laikapstākļi"
-
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr "<dd><b>Nevar savienoties ar laika ziņu serveri</b></dd>"
-
-#: my-evolution/e-summary-weather.c:559
-msgid "Weather"
-msgstr "Laikapstākļi"
-
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr "Reģioni"
-
-#: 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 "Lūdzu uzgaidiet..."
-
-#: my-evolution/e-summary.c:584
-#: ui/my-evolution.xml.h:3
-msgid "Print Summary"
-msgstr "Drukāt Kopsavilkumu"
-
-#: my-evolution/e-summary.c:630
-msgid "Printing of Summary failed"
-msgstr "Kopsavilkuma Drukāšana neveiksmīga"
-
-#: my-evolution/main.c:66
-#, 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"
-
-#: my-evolution/metar.c:45
-msgid "Broken clouds"
-msgstr "Lauzti mākoņi"
-
-#: my-evolution/metar.c:46
-msgid "Scattered clouds"
-msgstr "Izkliedēti mākoņi"
-
-#: my-evolution/metar.c:47
-msgid "Few clouds"
-msgstr "Daži mākoņi"
-
-#: my-evolution/metar.c:48
-msgid "Overcast"
-msgstr "Apmācies"
-
-#: my-evolution/metar.c:56
-#: my-evolution/metar.c:74
-#: my-evolution/metar.c:485
-msgid "Invalid"
-msgstr "Nepareizs"
-
-#: my-evolution/metar.c:63
-msgid "Variable"
-msgstr "Mainīgs"
-
-#: my-evolution/metar.c:64
-msgid "North"
-msgstr "Ziemeļu"
-
-#: my-evolution/metar.c:64
-msgid "North - NorthEast"
-msgstr "Ziemeļu - Ziemeļaustrumu"
-
-#: my-evolution/metar.c:64
-msgid "Northeast"
-msgstr "Ziemeļaustrumu"
-
-#: my-evolution/metar.c:64
-msgid "East - NorthEast"
-msgstr "Austrumu - Ziemeļaustrumu"
-
-#: my-evolution/metar.c:65
-msgid "East"
-msgstr "Austrumu"
-
-#: my-evolution/metar.c:65
-msgid "East - Southeast"
-msgstr "Austrumu - Dienvidaustrumu"
-
-#: my-evolution/metar.c:65
-msgid "Southeast"
-msgstr "Dienvidaustrumu"
-
-#: my-evolution/metar.c:65
-msgid "South - Southeast"
-msgstr "Dienvidu - Dienvidaustrumu"
-
-#: my-evolution/metar.c:66
-msgid "South"
-msgstr "Dienvidu"
-
-#: my-evolution/metar.c:66
-msgid "South - Southwest"
-msgstr "Dienvidu - Dienvidrietumu"
-
-#: my-evolution/metar.c:66
-msgid "Southwest"
-msgstr "Dienvidrietumu"
-
-#: my-evolution/metar.c:66
-msgid "West - Southwest"
-msgstr "Rietumu - Dienvidrietumu"
-
-#: my-evolution/metar.c:67
-msgid "West"
-msgstr "Rietumu"
-
-#: my-evolution/metar.c:67
-msgid "West - Northwest"
-msgstr "Rietumu - Ziemeļrietumu"
-
-#: my-evolution/metar.c:67
-msgid "Northwest"
-msgstr "Ziemeļrietumu"
-
-#: my-evolution/metar.c:67
-msgid "North - Northwest"
-msgstr "Ziemeļu - Ziemeļrietumu"
-
-#. DRIZZLE
-#: my-evolution/metar.c:127
-msgid "Drizzle"
-msgstr "Smalks lietus"
-
-#: my-evolution/metar.c:128
-msgid "Drizzle in the vicinity"
-msgstr "Gaidāms smalks lietus"
-
-#: my-evolution/metar.c:129
-msgid "Light drizzle"
-msgstr "Viegls smalks lietus"
-
-#: my-evolution/metar.c:130
-msgid "Moderate drizzle"
-msgstr "Regulārs smalks lietus"
-
-#: my-evolution/metar.c:131
-msgid "Heavy drizzle"
-msgstr "Spēcīgs smalks lietus"
-
-#: my-evolution/metar.c:132
-msgid "Shallow drizzle"
-msgstr "Mazs smalks lietus"
-
-#: my-evolution/metar.c:133
-msgid "Patches of drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:134
-msgid "Partial drizzle"
-msgstr "Daļēji smalks lietus"
-
-#: my-evolution/metar.c:135
-#: my-evolution/metar.c:150
-msgid "Thunderstorm"
-msgstr "Pērkona negaiss"
-
-#: my-evolution/metar.c:136
-msgid "Windy drizzle"
-msgstr "Smalks lietus ar vēju"
-
-#: my-evolution/metar.c:137
-msgid "Showers"
-msgstr "Lietavas"
-
-#: my-evolution/metar.c:138
-msgid "Drifting drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:139
-msgid "Freezing drizzle"
-msgstr ""
-
-#. RAIN
-#: my-evolution/metar.c:142
-msgid "Rain"
-msgstr "Lietus"
-
-#: my-evolution/metar.c:143
-msgid "Rain in the vicinity"
-msgstr "Gaidāms lietus"
-
-#: my-evolution/metar.c:144
-msgid "Light rain"
-msgstr "Viegls lietus"
-
-#: my-evolution/metar.c:145
-msgid "Moderate rain"
-msgstr "Regulārs lietus"
-
-#: my-evolution/metar.c:146
-msgid "Heavy rain"
-msgstr "Spēcīgs lietus"
-
-#: my-evolution/metar.c:147
-msgid "Shallow rain"
-msgstr ""
-
-#: my-evolution/metar.c:148
-msgid "Patches of rain"
-msgstr ""
-
-#: my-evolution/metar.c:149
-msgid "Partial rainfall"
-msgstr ""
-
-#: my-evolution/metar.c:151
-msgid "Blowing rainfall"
-msgstr ""
-
-#: my-evolution/metar.c:152
-msgid "Rain showers"
-msgstr ""
-
-#: my-evolution/metar.c:153
-msgid "Drifting rain"
-msgstr ""
-
-#: my-evolution/metar.c:154
-msgid "Freezing rain"
-msgstr ""
-
-#. SNOW
-#: my-evolution/metar.c:157
-msgid "Snow"
-msgstr "Sniegs"
-
-#: my-evolution/metar.c:158
-msgid "Snow in the vicinity"
-msgstr "Gaidāms sniegs"
-
-#: my-evolution/metar.c:159
-msgid "Light snow"
-msgstr "Viegls sniegs"
-
-#: my-evolution/metar.c:160
-msgid "Moderate snow"
-msgstr "Regulārs sniegs"
-
-#: my-evolution/metar.c:161
-msgid "Heavy snow"
-msgstr "Spēcīgs sniegs"
-
-#: my-evolution/metar.c:162
-msgid "Shallow snow"
-msgstr ""
-
-#: my-evolution/metar.c:163
-msgid "Patches of snow"
-msgstr ""
-
-#: my-evolution/metar.c:164
-msgid "Partial snowfall"
-msgstr ""
-
-#: my-evolution/metar.c:165
-#: my-evolution/metar.c:180
-msgid "Snowstorm"
-msgstr "Sniega vētra"
-
-#: my-evolution/metar.c:166
-msgid "Blowing snowfall"
-msgstr ""
-
-#: my-evolution/metar.c:167
-msgid "Snow showers"
-msgstr ""
-
-#: my-evolution/metar.c:168
-msgid "Drifting snow"
-msgstr ""
-
-#: my-evolution/metar.c:169
-msgid "Freezing snow"
-msgstr ""
-
-#. SNOW_GRAINS
-#: my-evolution/metar.c:172
-msgid "Snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:173
-msgid "Snow grains in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:174
-msgid "Light snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:175
-msgid "Moderate snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:176
-msgid "Heavy snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:177
-msgid "Shallow snow grains"
-msgstr ""
-
-#: 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/Locations.h:883
-#: my-evolution/metar.c:217
-msgid "Hail"
-msgstr ""
-
-#: my-evolution/metar.c:218
-msgid "Hail in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:219
-#: my-evolution/metar.c:234
-msgid "Light hail"
-msgstr ""
-
-#: my-evolution/metar.c:220
-msgid "Moderate hail"
-msgstr ""
-
-#: my-evolution/metar.c:221
-msgid "Heavy hail"
-msgstr ""
-
-#: my-evolution/metar.c:222
-msgid "Shallow hail"
-msgstr ""
-
-#: my-evolution/metar.c:223
-msgid "Patches of hail"
-msgstr ""
-
-#: my-evolution/metar.c:224
-msgid "Partial hail"
-msgstr ""
-
-#: my-evolution/metar.c:225
-msgid "Hailstorm"
-msgstr ""
-
-#: my-evolution/metar.c:226
-msgid "Blowing hail"
-msgstr ""
-
-#: my-evolution/metar.c:227
-msgid "Hail showers"
-msgstr ""
-
-#: my-evolution/metar.c:228
-msgid "Drifting hail"
-msgstr ""
-
-#: my-evolution/metar.c:229
-msgid "Freezing hail"
-msgstr ""
-
-#. SMALL_HAIL
-#: my-evolution/metar.c:232
-msgid "Small hail"
-msgstr "Maza Krusa"
-
-#: my-evolution/metar.c:233
-msgid "Small hail in the vicinity"
-msgstr "Gaidāma maza krusa"
-
-#: my-evolution/metar.c:235
-msgid "Moderate small hail"
-msgstr ""
-
-#: my-evolution/metar.c:236
-msgid "Heavy small hail"
-msgstr ""
-
-#: my-evolution/metar.c:237
-msgid "Shallow small hail"
-msgstr ""
-
-#: my-evolution/metar.c:238
-msgid "Patches of small hail"
-msgstr ""
-
-#: my-evolution/metar.c:239
-msgid "Partial small hail"
-msgstr ""
-
-#: my-evolution/metar.c:240
-msgid "Small hailstorm"
-msgstr "Maza vētra ar krusu"
-
-#: my-evolution/metar.c:241
-msgid "Blowing small hail"
-msgstr ""
-
-#: my-evolution/metar.c:242
-msgid "Showers of small hail"
-msgstr ""
-
-#: my-evolution/metar.c:243
-msgid "Drifting small hail"
-msgstr ""
-
-#: my-evolution/metar.c:244
-msgid "Freezing small hail"
-msgstr ""
-
-#. PRECIPITATION
-#: my-evolution/metar.c:247
-msgid "Unknown precipitation"
-msgstr "Nezināmi nokrišņi"
-
-#: 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 "Nezināms pērkona negaiss"
-
-#: 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 ""
-
-#: my-evolution/metar.c:263
-msgid "Mist in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:264
-msgid "Light mist"
-msgstr ""
-
-#: my-evolution/metar.c:265
-msgid "Moderate mist"
-msgstr ""
-
-#: my-evolution/metar.c:266
-msgid "Thick mist"
-msgstr ""
-
-#: 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 "Smidzināšana ar vēju"
-
-#: my-evolution/metar.c:273
-msgid "Drifting mist"
-msgstr ""
-
-#: my-evolution/metar.c:274
-msgid "Freezing mist"
-msgstr ""
-
-#. FOG
-#: my-evolution/metar.c:277
-msgid "Fog"
-msgstr "Migla"
-
-#: my-evolution/metar.c:278
-msgid "Fog in the vicinity"
-msgstr "Gaidāma migla"
-
-#: my-evolution/metar.c:279
-msgid "Light fog"
-msgstr "Viegla migla"
-
-#: my-evolution/metar.c:280
-msgid "Moderate fog"
-msgstr "Regulāra migla"
-
-#: my-evolution/metar.c:281
-msgid "Thick fog"
-msgstr "Bieza migla"
-
-#: my-evolution/metar.c:282
-msgid "Shallow fog"
-msgstr ""
-
-#: my-evolution/metar.c:283
-msgid "Patches of fog"
-msgstr ""
-
-#: my-evolution/metar.c:284
-msgid "Partial fog"
-msgstr "Daļēji migla"
-
-#: my-evolution/metar.c:286
-msgid "Fog with wind"
-msgstr "Migla ar vēju"
-
-#: my-evolution/metar.c:288
-msgid "Drifting fog"
-msgstr ""
-
-#: my-evolution/metar.c:289
-msgid "Freezing fog"
-msgstr ""
-
-#. SMOKE
-#: my-evolution/metar.c:292
-msgid "Smoke"
-msgstr ""
-
-#: my-evolution/metar.c:293
-msgid "Smoke in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:294
-msgid "Thin smoke"
-msgstr ""
-
-#: my-evolution/metar.c:295
-msgid "Moderate smoke"
-msgstr ""
-
-#: my-evolution/metar.c:296
-msgid "Thick smoke"
-msgstr ""
-
-#: my-evolution/metar.c:297
-msgid "Shallow smoke"
-msgstr ""
-
-#: my-evolution/metar.c:298
-msgid "Patches of smoke"
-msgstr ""
-
-#: my-evolution/metar.c:299
-msgid "Partial smoke"
-msgstr ""
-
-#: my-evolution/metar.c:300
-msgid "Thunderous smoke"
-msgstr ""
-
-#: my-evolution/metar.c:301
-msgid "Smoke with wind"
-msgstr "Dūmaka ar vēju"
-
-#: my-evolution/metar.c:303
-msgid "Drifting smoke"
-msgstr ""
-
-#. VOLCANIC_ASH
-#: my-evolution/metar.c:307
-msgid "Volcanic ash"
-msgstr ""
-
-#: my-evolution/metar.c:308
-msgid "Volcanic ash in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:310
-msgid "Moderate volcanic ash"
-msgstr ""
-
-#: my-evolution/metar.c:311
-msgid "Thick volcanic ash"
-msgstr ""
-
-#: 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 ""
-
-#: my-evolution/metar.c:323
-msgid "Sand in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:324
-msgid "Light sand"
-msgstr ""
-
-#: my-evolution/metar.c:325
-msgid "Moderate sand"
-msgstr ""
-
-#: my-evolution/metar.c:326
-msgid "Heavy sand"
-msgstr ""
-
-#: 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 ""
-
-#: my-evolution/metar.c:368
-msgid "Dust in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:369
-msgid "Light dust"
-msgstr ""
-
-#: my-evolution/metar.c:370
-msgid "Moderate dust"
-msgstr ""
-
-#: my-evolution/metar.c:371
-msgid "Heavy dust"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: my-evolution/metar.c:398
-msgid "Sandstorm in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:399
-msgid "Light standstorm"
-msgstr ""
-
-#: my-evolution/metar.c:400
-msgid "Moderate sandstorm"
-msgstr ""
-
-#: my-evolution/metar.c:401
-msgid "Heavy sandstorm"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: my-evolution/metar.c:443
-msgid "Tornado in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:445
-msgid "Moderate tornado"
-msgstr ""
-
-#: my-evolution/metar.c:446
-msgid "Raging tornado"
-msgstr ""
-
-#: 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 ""
-
-#: 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 "_Izņemt"
-
-#: my-evolution/my-evolution.glade.h:2
-#, fuzzy
-msgid "Add n_ews feed"
-msgstr "Pievienot n"
-
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "Visas _laika stacijas:"
-
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "Visas _mapes:"
-
-#: my-evolution/my-evolution.glade.h:5
-#, fuzzy
-msgid "All news _feeds:"
-msgstr "Visi:"
-
-#: my-evolution/my-evolution.glade.h:6
-msgid "C_elsius"
-msgstr "C_elsijs"
-
-#: my-evolution/my-evolution.glade.h:8
-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:9
-msgid "Ma_x number of items shown:"
-msgstr "Parādītais maksimums priekšmetu skaits:"
+msgid "Evolution Summary component."
+msgstr "Evolution pasta sacerētājs."
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
 #, fuzzy
-msgid "News Feed Settings"
-msgstr "Ziņas"
-
-#: my-evolution/my-evolution.glade.h:11
-msgid "One mont_h"
-msgstr "Viens _mēnesis"
-
-#: my-evolution/my-evolution.glade.h:12
-msgid "One w_eek"
-msgstr "Viena n_edēļa"
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Ražotne Evolution Uzdevumu kontrolei"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
 #, fuzzy
-msgid "R_efresh time (seconds):"
-msgstr "sekundes:"
+msgid "Factory for the Evolution Summary component."
+msgstr "Pasta Kopsavilkuma komponentes ražotne."
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
 #, fuzzy
-msgid "Refresh _time (seconds):"
-msgstr "Atjaunināt sekundes:"
-
-#: my-evolution/my-evolution.glade.h:15
-msgid "S_how full path for folders"
-msgstr "Parādīt pilnu ceļu mapēm"
-
-#: my-evolution/my-evolution.glade.h:16
-msgid "Show _all tasks"
-msgstr "Parādīt _visus uzdevumus"
-
-#: my-evolution/my-evolution.glade.h:17
-msgid "Show _today's tasks"
-msgstr "Parādī_t šodienas uzdevumus"
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Show temperatures in:"
-msgstr "Parādīt temeratūras:"
-
-#: my-evolution/my-evolution.glade.h:19
-msgid "Tasks "
-msgstr "Uzdevumi"
-
-#: my-evolution/my-evolution.glade.h:20
-msgid "Weather settings"
-msgstr "Laikapstākļu uztādījumi"
-
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "_Parādīt mapes:"
-
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "_Parādīt stacijas:"
+msgid "Summary Preferences"
+msgstr "Kopsavilkuma Uzstādījumi"
 
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
+#: 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/my-evolution.glade.h:25
-msgid "_Fahrenheit"
-msgstr "_Fārenheits"
-
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Five days"
-msgstr "_Piecas dienas"
-
-#: my-evolution/my-evolution.glade.h:27
-msgid "_Mail"
-msgstr "_Pasts"
-
-#: my-evolution/my-evolution.glade.h:28
-#, fuzzy
-msgid "_News Feeds"
-msgstr "Ziņas"
-
-#: my-evolution/my-evolution.glade.h:29
-msgid "_One day"
-msgstr "_Viena diena"
-
-#: my-evolution/my-evolution.glade.h:30
-msgid "_Schedule"
-msgstr "_Saraksts"
-
-#: my-evolution/my-evolution.glade.h:31
-msgid "_Weather"
-msgstr "_Laikapstākļi"
-
 #: my-evolution/Locations.h:1
 #, fuzzy
 msgid "Aarhus"
@@ -15970,8125 +15241,9560 @@ msgid "Diyarbakir"
 msgstr ""
 
 #: my-evolution/Locations.h:603
-msgid "Dobbiaco"
+msgid "Dnipropetrovsk"
 msgstr ""
 
 #: my-evolution/Locations.h:604
-msgid "Dodge City"
+msgid "Dobbiaco"
 msgstr ""
 
 #: my-evolution/Locations.h:605
-msgid "Doha"
+msgid "Dodge City"
 msgstr ""
 
 #: my-evolution/Locations.h:606
+msgid "Doha"
+msgstr ""
+
+#: my-evolution/Locations.h:607
 #, fuzzy
 msgid "Dole"
 msgstr "Loma"
 
-#: my-evolution/Locations.h:608
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "Izdarīs"
+
+#: my-evolution/Locations.h:610
 #, fuzzy
 msgid "Dongsha"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:609
+#: my-evolution/Locations.h:611
 msgid "Dongshi"
 msgstr ""
 
-#: my-evolution/Locations.h:610
+#: my-evolution/Locations.h:612
 #, fuzzy
 msgid "Don Torcuato"
 msgstr "uz vai pēc"
 
-#: my-evolution/Locations.h:611
+#: my-evolution/Locations.h:613
 msgid "Dortmund-Wickede"
 msgstr ""
 
-#: my-evolution/Locations.h:612
+#: my-evolution/Locations.h:614
 #, fuzzy
 msgid "Dothan"
 msgstr "Izdarīs"
 
-#: my-evolution/Locations.h:613
+#: my-evolution/Locations.h:615
 msgid "Douglas"
 msgstr ""
 
-#: my-evolution/Locations.h:614
+#: my-evolution/Locations.h:616
 msgid "Dover"
 msgstr "Dovera"
 
-#: my-evolution/Locations.h:615
+#: my-evolution/Locations.h:617
 msgid "Dresden-Klotzsche"
 msgstr ""
 
-#: my-evolution/Locations.h:616
+#: my-evolution/Locations.h:618
 msgid "Drummond"
 msgstr ""
 
-#: my-evolution/Locations.h:617
+#: my-evolution/Locations.h:619
 msgid "Dubai"
 msgstr "Dubaja"
 
-#: my-evolution/Locations.h:618
+#: my-evolution/Locations.h:620
 msgid "Dubbo"
 msgstr ""
 
-#: my-evolution/Locations.h:619
+#: my-evolution/Locations.h:621
 msgid "Dublin"
 msgstr "Dublana"
 
-#: my-evolution/Locations.h:620
+#: my-evolution/Locations.h:622
 msgid "Du Bois"
 msgstr ""
 
-#: my-evolution/Locations.h:621
+#: my-evolution/Locations.h:623
 msgid "Dubrovnik"
 msgstr ""
 
-#: my-evolution/Locations.h:622
+#: my-evolution/Locations.h:624
 msgid "Dubuque"
 msgstr ""
 
-#: my-evolution/Locations.h:623
+#: my-evolution/Locations.h:625
 #, fuzzy
 msgid "Dugway"
 msgstr "Diena"
 
-#: my-evolution/Locations.h:624
+#: my-evolution/Locations.h:626
 #, fuzzy
 msgid "Duluth"
 msgstr "Noklusētais"
 
-#: my-evolution/Locations.h:625
+#: my-evolution/Locations.h:627
 #, fuzzy
 msgid "Dundee"
 msgstr "Izdarīs"
 
-#: my-evolution/Locations.h:626
+#: my-evolution/Locations.h:628
 #, fuzzy
 msgid "Durango"
 msgstr "atpakaļ"
 
-#: my-evolution/Locations.h:627
+#: my-evolution/Locations.h:629
 msgid "Durango Awrs"
 msgstr ""
 
-#: my-evolution/Locations.h:628
+#: my-evolution/Locations.h:630
 msgid "Durazno"
 msgstr ""
 
-#: my-evolution/Locations.h:629
+#: my-evolution/Locations.h:631
 msgid "Durban Louis Botha "
 msgstr ""
 
-#: my-evolution/Locations.h:630
+#: my-evolution/Locations.h:632
 msgid "Dusseldorf"
 msgstr ""
 
-#: my-evolution/Locations.h:631
+#: my-evolution/Locations.h:633
 msgid "Dutch Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:632
+#: my-evolution/Locations.h:634
 msgid "Dyersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:633
+#: my-evolution/Locations.h:635
 #, fuzzy
 msgid "Eagle"
 msgstr "Aktivizēt"
 
-#: my-evolution/Locations.h:634
+#: my-evolution/Locations.h:636
 msgid "Eagle Range"
 msgstr ""
 
-#: my-evolution/Locations.h:635
+#: my-evolution/Locations.h:637
 msgid "East London"
 msgstr ""
 
-#: my-evolution/Locations.h:636
+#: my-evolution/Locations.h:638
 msgid "East Midlands"
 msgstr ""
 
-#: my-evolution/Locations.h:637
+#: my-evolution/Locations.h:639
 #, fuzzy
 msgid "East St Louis"
 msgstr "Austrumu - Dienvidaustrumu"
 
-#: my-evolution/Locations.h:638
+#: my-evolution/Locations.h:640
 msgid "Eau Claire"
 msgstr ""
 
-#: my-evolution/Locations.h:640
+#: my-evolution/Locations.h:642
 msgid "Edinburgh"
 msgstr "Edinburga"
 
-#: my-evolution/Locations.h:641
+#: my-evolution/Locations.h:643
 msgid "Edmonton"
 msgstr "Edmontona"
 
-#: my-evolution/Locations.h:642
+#: my-evolution/Locations.h:644
 msgid "Edmonton/Villeneuve"
 msgstr ""
 
-#: my-evolution/Locations.h:643
+#: my-evolution/Locations.h:645
 msgid "Eduardo Gomes International"
 msgstr ""
 
-#: my-evolution/Locations.h:644
+#: my-evolution/Locations.h:646
 msgid "Edwards AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:645
+#: my-evolution/Locations.h:647
 msgid "Egilsstadir"
 msgstr ""
 
-#: my-evolution/Locations.h:646
+#: my-evolution/Locations.h:648
 msgid "Eglin"
 msgstr ""
 
-#: my-evolution/Locations.h:647
+#: my-evolution/Locations.h:649
 msgid "Eglington/Londonderry"
 msgstr ""
 
-#: my-evolution/Locations.h:649
+#: my-evolution/Locations.h:651
 msgid "Eindhoven"
 msgstr ""
 
-#: my-evolution/Locations.h:650
+#: my-evolution/Locations.h:652
 msgid "Ekofisk"
 msgstr ""
 
-#: my-evolution/Locations.h:651
+#: my-evolution/Locations.h:653
 msgid "Elazig"
 msgstr ""
 
-#: my-evolution/Locations.h:652
+#: my-evolution/Locations.h:654
 msgid "El Centro"
 msgstr ""
 
-#: my-evolution/Locations.h:653
+#: my-evolution/Locations.h:655
 msgid "El Dorado"
 msgstr "Eldora"
 
-#: my-evolution/Locations.h:654
+#: my-evolution/Locations.h:656
 msgid "Elefsis"
 msgstr ""
 
-#: my-evolution/Locations.h:655
+#: my-evolution/Locations.h:657
 msgid "Elfin Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:656
+#: my-evolution/Locations.h:658
 msgid "Elizabeth City"
 msgstr ""
 
-#: my-evolution/Locations.h:657
+#: my-evolution/Locations.h:659
 msgid "Elk City"
 msgstr "Elksitija"
 
-#: my-evolution/Locations.h:658
+#: my-evolution/Locations.h:660
 msgid "Elkhart"
 msgstr ""
 
-#: my-evolution/Locations.h:659
+#: my-evolution/Locations.h:661
 #, fuzzy
 msgid "Elkins"
 msgstr "saraksts"
 
-#: my-evolution/Locations.h:660
+#: my-evolution/Locations.h:662
 msgid "Elko"
 msgstr "Elko"
 
-#: my-evolution/Locations.h:661
+#: my-evolution/Locations.h:663
 #, fuzzy
 msgid "Elmira"
 msgstr "Eim"
 
-#: my-evolution/Locations.h:662
+#: my-evolution/Locations.h:664
 #, fuzzy
 msgid "El Monte"
 msgstr "Mēnesis"
 
-#: my-evolution/Locations.h:663
+#: my-evolution/Locations.h:665
 msgid "El Paso"
 msgstr "Elpaso"
 
-#: my-evolution/Locations.h:665
+#: my-evolution/Locations.h:667
 #, fuzzy
 msgid "El Salvador Int."
 msgstr "Elsalvadora"
 
-#: my-evolution/Locations.h:666
+#: my-evolution/Locations.h:668
 msgid "Elsenborn"
 msgstr ""
 
-#: my-evolution/Locations.h:667
+#: my-evolution/Locations.h:669
 #, fuzzy
 msgid "Ely"
 msgstr "Eim"
 
-#: my-evolution/Locations.h:668
+#: my-evolution/Locations.h:670
 msgid "Emmonak"
 msgstr ""
 
-#: my-evolution/Locations.h:669
+#: my-evolution/Locations.h:671
 #, fuzzy
 msgid "Emporia"
 msgstr "Svarīgs"
 
-#: my-evolution/Locations.h:670
+#: my-evolution/Locations.h:672
 msgid "Enid"
 msgstr "Enida"
 
-#: my-evolution/Locations.h:671
+#: my-evolution/Locations.h:673
 #, fuzzy
 msgid "Enid/Woodring"
 msgstr "Strādā"
 
-#: my-evolution/Locations.h:672
+#: my-evolution/Locations.h:674
 msgid "Enosburg Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:673
+#: my-evolution/Locations.h:675
 msgid "Ephrata"
 msgstr ""
 
-#: my-evolution/Locations.h:674
+#: my-evolution/Locations.h:676
 msgid "Ercan"
 msgstr ""
 
-#: my-evolution/Locations.h:675
+#: my-evolution/Locations.h:677
 #, fuzzy
 msgid "Erie"
 msgstr "Eriteja"
 
-#: my-evolution/Locations.h:676
+#: my-evolution/Locations.h:678
 msgid "Erzurum"
 msgstr ""
 
-#: my-evolution/Locations.h:677
+#: my-evolution/Locations.h:679
 msgid "Esbjerg"
 msgstr ""
 
-#: my-evolution/Locations.h:678
+#: my-evolution/Locations.h:680
 msgid "Escanaba"
 msgstr ""
 
-#: my-evolution/Locations.h:679
+#: my-evolution/Locations.h:681
 msgid "Esfahan"
 msgstr ""
 
-#: my-evolution/Locations.h:680
+#: my-evolution/Locations.h:682
 msgid "Eskisehir"
 msgstr ""
 
-#: my-evolution/Locations.h:681
+#: my-evolution/Locations.h:683
 msgid "Estherville"
 msgstr ""
 
-#: my-evolution/Locations.h:683
+#: my-evolution/Locations.h:685
 #, fuzzy
 msgid "Eugene"
 msgstr "Jūnijs"
 
-#: my-evolution/Locations.h:684
+#: my-evolution/Locations.h:686
 #, fuzzy
 msgid "Eureka"
 msgstr "Eriteja"
 
-#: my-evolution/Locations.h:685
+#: my-evolution/Locations.h:687
 msgid "Europe"
 msgstr "Europa"
 
-#: my-evolution/Locations.h:686
+#: my-evolution/Locations.h:688
 #, fuzzy
 msgid "Evanston"
 msgstr "Austrumu"
 
-#: my-evolution/Locations.h:687
+#: my-evolution/Locations.h:689
 msgid "Evansville"
 msgstr ""
 
-#: my-evolution/Locations.h:688
+#: my-evolution/Locations.h:690
 #, fuzzy
 msgid "Everett"
 msgstr "Katru"
 
-#: my-evolution/Locations.h:689
+#: my-evolution/Locations.h:691
 msgid "Evergreen"
 msgstr ""
 
-#: my-evolution/Locations.h:690
+#: my-evolution/Locations.h:692
 msgid "Evreux-Fauville"
 msgstr ""
 
-#: my-evolution/Locations.h:691
+#: my-evolution/Locations.h:693
 #, fuzzy
 msgid "Exeter"
 msgstr "Laikapstākļi"
 
-#: my-evolution/Locations.h:692
+#: my-evolution/Locations.h:694
 msgid "Ezeiza"
 msgstr ""
 
-#: my-evolution/Locations.h:693
+#: my-evolution/Locations.h:695
 #, fuzzy
 msgid "Fagernes"
 msgstr "Peidžers"
 
-#: my-evolution/Locations.h:694
+#: my-evolution/Locations.h:696
 msgid "Fairbanks"
 msgstr ""
 
-#: my-evolution/Locations.h:695
+#: my-evolution/Locations.h:697
 msgid "Fairchild"
 msgstr ""
 
-#: my-evolution/Locations.h:696
+#: my-evolution/Locations.h:698
 #, fuzzy
 msgid "Fairfield"
 msgstr "_No Lauka"
 
-#: my-evolution/Locations.h:697
+#: my-evolution/Locations.h:699
 #, fuzzy
 msgid "Fairmont"
 msgstr "Fonti"
 
-#: my-evolution/Locations.h:698
+#: my-evolution/Locations.h:700
 msgid "Fallon"
 msgstr ""
 
-#: my-evolution/Locations.h:699
+#: my-evolution/Locations.h:701
 msgid "Falls City"
 msgstr ""
 
-#: my-evolution/Locations.h:700
+#: my-evolution/Locations.h:702
 msgid "Falmouth-Otis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:701
+#: my-evolution/Locations.h:703
 msgid "Farbanks/Eielson AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:702
+#: my-evolution/Locations.h:704
 msgid "Fargo"
 msgstr "Fargo"
 
-#: my-evolution/Locations.h:703
+#: my-evolution/Locations.h:705
 #, fuzzy
 msgid "Farmingdale"
 msgstr "Mainīgs"
 
-#: my-evolution/Locations.h:704
+#: my-evolution/Locations.h:706
 msgid "Farmington"
 msgstr ""
 
-#: my-evolution/Locations.h:705
+#: my-evolution/Locations.h:707
 #, fuzzy
 msgid "Farmville"
 msgstr "Uzvārds"
 
-#: 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 ""
 
-#: my-evolution/Locations.h:708
+#: my-evolution/Locations.h:710
 #, fuzzy
 msgid "Feng Nin"
 msgstr "Benina"
 
-#: my-evolution/Locations.h:709
+#: my-evolution/Locations.h:711
 msgid "Fergus Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:710
+#: my-evolution/Locations.h:712
 msgid "Fernando De Noronha"
 msgstr ""
 
-#: my-evolution/Locations.h:711
+#: my-evolution/Locations.h:713
 #, fuzzy
 msgid "Ferrara"
 msgstr "Februāris"
 
-#: my-evolution/Locations.h:712
+#: my-evolution/Locations.h:714
 #, fuzzy
 msgid "Figari"
 msgstr "Nigērija"
 
-#: my-evolution/Locations.h:713
+#: my-evolution/Locations.h:715
 #, fuzzy
 msgid "Findlay"
 msgstr "Piekdiena"
 
-#: my-evolution/Locations.h:715
+#: my-evolution/Locations.h:717
 #, fuzzy
 msgid "Firenze"
 msgstr "Brīvs"
 
-#: my-evolution/Locations.h:716
+#: my-evolution/Locations.h:718
 msgid "Fitchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:717
+#: my-evolution/Locations.h:719
 msgid "Flagstaff"
 msgstr ""
 
-#: my-evolution/Locations.h:718
+#: my-evolution/Locations.h:720
 #, fuzzy
 msgid "Flint"
 msgstr "saraksts"
 
-#: my-evolution/Locations.h:719
+#: my-evolution/Locations.h:721
 #, fuzzy
 msgid "Flippin"
 msgstr "Filipīnas"
 
-#: my-evolution/Locations.h:720
+#: my-evolution/Locations.h:722
 #, fuzzy
 msgid "Florence"
 msgstr "Francija"
 
-#: my-evolution/Locations.h:721
+#: my-evolution/Locations.h:723
 #, fuzzy
 msgid "Florennes"
 msgstr "Brīvs"
 
-#: my-evolution/Locations.h:722
+#: my-evolution/Locations.h:724
 #, fuzzy
 msgid "Flores"
 msgstr "Glabāt Kā"
 
-#: my-evolution/Locations.h:723
+#: my-evolution/Locations.h:725
 msgid "Florianopolis"
 msgstr ""
 
-#: 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 ""
 
-#: my-evolution/Locations.h:727
+#: my-evolution/Locations.h:729
 #, fuzzy
 msgid "Forde/Bringeland"
 msgstr "Somija"
 
-#: my-evolution/Locations.h:728
+#: my-evolution/Locations.h:730
 msgid "Forli"
 msgstr "Forlī"
 
-#: 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 ""
 
-#: my-evolution/Locations.h:731
+#: my-evolution/Locations.h:733
 msgid "Fort Belvoir"
 msgstr ""
 
-#: my-evolution/Locations.h:732
+#: my-evolution/Locations.h:734
 msgid "Fort Benning"
 msgstr ""
 
-#: my-evolution/Locations.h:733
+#: my-evolution/Locations.h:735
 msgid "Fort Bragg"
 msgstr ""
 
-#: my-evolution/Locations.h:734
+#: my-evolution/Locations.h:736
 msgid "Fort Campbell"
 msgstr ""
 
-#: my-evolution/Locations.h:735
+#: my-evolution/Locations.h:737
 msgid "Fort Carson"
 msgstr ""
 
-#: my-evolution/Locations.h:736
+#: my-evolution/Locations.h:738
 msgid "Fort Collins"
 msgstr ""
 
-#: my-evolution/Locations.h:737
+#: my-evolution/Locations.h:739
 msgid "Fort Collins/Lovel"
 msgstr ""
 
-#: my-evolution/Locations.h:738
+#: my-evolution/Locations.h:740
 msgid "Fort Dodge"
 msgstr ""
 
-#: my-evolution/Locations.h:739
+#: my-evolution/Locations.h:741
 msgid "Fort Drum"
 msgstr ""
 
-#: my-evolution/Locations.h:740
+#: my-evolution/Locations.h:742
 msgid "Fort Eustis"
 msgstr ""
 
-#: my-evolution/Locations.h:741
+#: my-evolution/Locations.h:743
 msgid "Fort Greely/Allen AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:742
+#: my-evolution/Locations.h:744
 msgid "Fort Huachuca"
 msgstr ""
 
-#: my-evolution/Locations.h:743
+#: my-evolution/Locations.h:745
 msgid "Fort Knox"
 msgstr ""
 
-#: my-evolution/Locations.h:744
+#: my-evolution/Locations.h:746
 msgid "Fort Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:745
+#: my-evolution/Locations.h:747
 #, fuzzy
 msgid "Fort Lauderdale (International)"
 msgstr "Starptautisks"
 
-#: my-evolution/Locations.h:746
+#: my-evolution/Locations.h:748
 #, fuzzy
 msgid "Fort Leonard"
 msgstr "Pārsūtīt"
 
-#: my-evolution/Locations.h:747
+#: my-evolution/Locations.h:749
 msgid "Fort Lewis"
 msgstr ""
 
-#: my-evolution/Locations.h:748
+#: my-evolution/Locations.h:750
 msgid "Fort Madison"
 msgstr ""
 
-#: my-evolution/Locations.h:749
+#: my-evolution/Locations.h:751
 #, fuzzy
 msgid "Fort Meade"
 msgstr "Pārsūtīt"
 
-#: my-evolution/Locations.h:750
+#: my-evolution/Locations.h:752
 #, fuzzy
 msgid "Fort Myers (Page Field)"
 msgstr "Lapa"
 
-#: my-evolution/Locations.h:751
+#: my-evolution/Locations.h:753
 #, fuzzy
 msgid "Fort Myers (Southwest Florida International)"
 msgstr "Starptautisks"
 
-#: my-evolution/Locations.h:752
+#: my-evolution/Locations.h:754
 msgid "Fort Polk-Leesville"
 msgstr ""
 
-#: my-evolution/Locations.h:753
+#: my-evolution/Locations.h:755
 msgid "Fort Riley"
 msgstr ""
 
-#: my-evolution/Locations.h:754
+#: my-evolution/Locations.h:756
 msgid "Fort Sill"
 msgstr ""
 
-#: my-evolution/Locations.h:755
+#: my-evolution/Locations.h:757
 #, fuzzy
 msgid "Fort Smith"
 msgstr "Formāts"
 
-#: my-evolution/Locations.h:756
+#: my-evolution/Locations.h:758
 #, fuzzy
 msgid "Fort Stewart"
 msgstr "Nav iesākts"
 
-#: my-evolution/Locations.h:757
+#: my-evolution/Locations.h:759
 msgid "Fort Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:758
+#: my-evolution/Locations.h:760
 #, fuzzy
 msgid "Fort Wayne"
 msgstr "Francija"
 
-#: my-evolution/Locations.h:759
+#: my-evolution/Locations.h:761
 msgid "Fort Worth-Alliance"
 msgstr ""
 
-#: my-evolution/Locations.h:760
+#: my-evolution/Locations.h:762
 msgid "Fort Worth-Meacham"
 msgstr ""
 
-#: my-evolution/Locations.h:761
+#: my-evolution/Locations.h:763
 msgid "Fort Worth NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:762
+#: my-evolution/Locations.h:764
 msgid "Fourchon"
 msgstr ""
 
-#: my-evolution/Locations.h:763
+#: my-evolution/Locations.h:765
 msgid "Foz Do Iguacu"
 msgstr ""
 
-#: my-evolution/Locations.h:765
+#: my-evolution/Locations.h:767
 msgid "Frankfort"
 msgstr ""
 
-#: my-evolution/Locations.h:766
+#: my-evolution/Locations.h:768
 msgid "Frankfurt/Main"
 msgstr ""
 
-#: my-evolution/Locations.h:767
+#: my-evolution/Locations.h:769
 #, fuzzy
 msgid "Franklin"
 msgstr "Pārsūtīt Iekštekstā"
 
-#: my-evolution/Locations.h:768
+#: my-evolution/Locations.h:770
 #, fuzzy
 msgid "Fredericton"
 msgstr "apraksts"
 
-#: my-evolution/Locations.h:769
+#: my-evolution/Locations.h:771
 #, fuzzy
 msgid "Freeport"
 msgstr "Brīvs"
 
-#: my-evolution/Locations.h:770
+#: my-evolution/Locations.h:772
 msgid "Frenchville"
 msgstr ""
 
-#: 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 ""
 
-#: my-evolution/Locations.h:773
+#: my-evolution/Locations.h:775
 #, fuzzy
 msgid "Friday Harbor"
 msgstr "Piekdiena"
 
-#: my-evolution/Locations.h:774
+#: my-evolution/Locations.h:776
 msgid "Friedrichshafen"
 msgstr ""
 
-#: my-evolution/Locations.h:775
+#: my-evolution/Locations.h:777
 #, fuzzy
 msgid "Frigg"
 msgstr "_Piek"
 
-#: my-evolution/Locations.h:776
+#: my-evolution/Locations.h:778
 #, fuzzy
 msgid "Frontone"
 msgstr "Fonti"
 
-#: my-evolution/Locations.h:777
+#: my-evolution/Locations.h:779
 #, fuzzy
 msgid "Frosinone"
 msgstr "Profesija"
 
-#: my-evolution/Locations.h:778
+#: my-evolution/Locations.h:780
 #, fuzzy
 msgid "Fryeburg"
 msgstr "Februāris"
 
-#: my-evolution/Locations.h:779
+#: my-evolution/Locations.h:781
 msgid "Fujairah"
 msgstr ""
 
-#: my-evolution/Locations.h:780
+#: my-evolution/Locations.h:782
 msgid "Fuji Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:781
+#: my-evolution/Locations.h:783
 msgid "Fukue Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:782
+#: my-evolution/Locations.h:784
 msgid "Fukui Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:783
+#: my-evolution/Locations.h:785
 msgid "Fukuoka Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:784
+#: my-evolution/Locations.h:786
 msgid "Fullerton"
 msgstr ""
 
-#: my-evolution/Locations.h:785
+#: my-evolution/Locations.h:787
 msgid "Funchal"
 msgstr ""
 
-#: my-evolution/Locations.h:786
+#: my-evolution/Locations.h:788
 #, fuzzy
 msgid "FYR Macedonia"
 msgstr "Maķedonija"
 
-#: my-evolution/Locations.h:787
+#: my-evolution/Locations.h:789
 msgid "Gadsden"
 msgstr ""
 
-#: my-evolution/Locations.h:788
+#: my-evolution/Locations.h:790
 #, fuzzy
 msgid "Gage"
 msgstr "Lapa"
 
-#: my-evolution/Locations.h:789
+#: my-evolution/Locations.h:791
 #, fuzzy
 msgid "Gainesville"
 msgstr "Atsaukts"
 
-#: my-evolution/Locations.h:790
+#: my-evolution/Locations.h:792
 msgid "Galax-Hillsville"
 msgstr ""
 
-#: my-evolution/Locations.h:791
+#: my-evolution/Locations.h:793
 msgid "Galbraith Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:792
+#: my-evolution/Locations.h:794
 msgid "Galeao"
 msgstr ""
 
-#: 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 ""
 
-#: my-evolution/Locations.h:795
+#: my-evolution/Locations.h:797
 #, fuzzy
 msgid "Gallup"
 msgstr "Gvadelupa"
 
-#: my-evolution/Locations.h:796
+#: my-evolution/Locations.h:798
 msgid "Galveston"
 msgstr ""
 
-#: my-evolution/Locations.h:797
+#: my-evolution/Locations.h:799
 #, fuzzy
 msgid "Gambell"
 msgstr "Gambija"
 
-#: my-evolution/Locations.h:798
+#: my-evolution/Locations.h:800
 #, fuzzy
 msgid "Gander"
 msgstr "Sūtītajs"
 
-#: my-evolution/Locations.h:799
+#: my-evolution/Locations.h:801
 #, fuzzy
 msgid "Garden City"
 msgstr "Identitāte"
 
-#: my-evolution/Locations.h:800
+#: my-evolution/Locations.h:802
 msgid "Gary"
 msgstr ""
 
-#: my-evolution/Locations.h:801
+#: my-evolution/Locations.h:803
 #, fuzzy
 msgid "Gassim"
 msgstr "Guama"
 
-#: my-evolution/Locations.h:802
+#: my-evolution/Locations.h:804
 #, fuzzy
 msgid "Gatineau"
 msgstr "Gvineja"
 
-#: my-evolution/Locations.h:803
+#: my-evolution/Locations.h:805
 msgid "Gaziantep"
 msgstr ""
 
-#: my-evolution/Locations.h:804
+#: my-evolution/Locations.h:806
 #, fuzzy
 msgid "Gdansk"
 msgstr "Uzdevums"
 
-#: my-evolution/Locations.h:805
+#: my-evolution/Locations.h:807
 msgid "Geneve"
 msgstr "Ženēva"
 
-#: 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 ""
 
-#: my-evolution/Locations.h:808
+#: my-evolution/Locations.h:810
 msgid "Georgetown"
 msgstr ""
 
-#: my-evolution/Locations.h:811
+#: my-evolution/Locations.h:813
 #, fuzzy
 msgid "Ghardaia"
 msgstr "Gana"
 
-#: my-evolution/Locations.h:812
+#: my-evolution/Locations.h:814
 msgid "Ghedi"
 msgstr ""
 
-#: my-evolution/Locations.h:814
+#: my-evolution/Locations.h:816
 msgid "Gifu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:815
+#: my-evolution/Locations.h:817
 #, fuzzy
 msgid "Gila Bend"
 msgstr "Somija"
 
-#: my-evolution/Locations.h:816
+#: my-evolution/Locations.h:818
 msgid "Gillette"
 msgstr ""
 
-#: my-evolution/Locations.h:817
+#: my-evolution/Locations.h:819
 msgid "Gilze-Rijen"
 msgstr ""
 
-#: my-evolution/Locations.h:818
+#: my-evolution/Locations.h:820
 #, fuzzy
 msgid "Gioia del Colle"
 msgstr "del"
 
-#: my-evolution/Locations.h:819
+#: my-evolution/Locations.h:821
 #, fuzzy
 msgid "Girona"
 msgstr "Gvineja"
 
-#: my-evolution/Locations.h:820
+#: my-evolution/Locations.h:822
 #, fuzzy
 msgid "Gizan"
 msgstr "Gana"
 
-#: my-evolution/Locations.h:821
+#: my-evolution/Locations.h:823
 #, fuzzy
 msgid "Glasgow"
 msgstr "atpakaļ"
 
-#: my-evolution/Locations.h:822
+#: my-evolution/Locations.h:824
 #, fuzzy
 msgid "Glendive"
 msgstr "Maldivu salas"
 
-#: my-evolution/Locations.h:823
+#: my-evolution/Locations.h:825
 msgid "Glens Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:824
+#: my-evolution/Locations.h:826
 #, fuzzy
 msgid "Goiania"
 msgstr "Rumānija"
 
-#: my-evolution/Locations.h:825
+#: my-evolution/Locations.h:827
 msgid "Goldsboro"
 msgstr ""
 
-#: my-evolution/Locations.h:826
+#: my-evolution/Locations.h:828
 #, fuzzy
 msgid "Goodland"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:827
+#: my-evolution/Locations.h:829
 #, fuzzy
 msgid "Goose Bay"
 msgstr "Aiziet"
 
-#: my-evolution/Locations.h:828
+#: my-evolution/Locations.h:830
 msgid "Goteborg (Landvetter)"
 msgstr ""
 
-#: my-evolution/Locations.h:829
+#: my-evolution/Locations.h:831
 #, fuzzy
 msgid "Goteborg (Save)"
 msgstr "Saglabāt"
 
-#: 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 ""
 
-#: my-evolution/Locations.h:832
+#: my-evolution/Locations.h:834
 msgid "Grand Cayman"
 msgstr ""
 
-#: my-evolution/Locations.h:833
+#: my-evolution/Locations.h:835
 msgid "Grand Forks"
 msgstr ""
 
-#: my-evolution/Locations.h:834
+#: my-evolution/Locations.h:836
 #, fuzzy
 msgid "Grand Island"
 msgstr "Faiklandes Salas"
 
-#: my-evolution/Locations.h:835
+#: my-evolution/Locations.h:837
 msgid "Grand Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:836
+#: my-evolution/Locations.h:838
 msgid "Grand Junction"
 msgstr ""
 
-#: my-evolution/Locations.h:837
+#: my-evolution/Locations.h:839
 #, fuzzy
 msgid "Grand Marais"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:838
+#: my-evolution/Locations.h:840
 msgid "Grand Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:839
+#: my-evolution/Locations.h:841
 #, fuzzy
 msgid "Grandview"
 msgstr "Pirmsapskats"
 
-#: my-evolution/Locations.h:840
+#: my-evolution/Locations.h:842
 #, fuzzy
 msgid "Grangeville"
 msgstr "Atsaukts"
 
-#: my-evolution/Locations.h:841
+#: my-evolution/Locations.h:843
 #, fuzzy
 msgid "Grants"
 msgstr "Melnraksti"
 
-#: my-evolution/Locations.h:842
+#: my-evolution/Locations.h:844
 #, fuzzy
 msgid "Graz"
 msgstr "Brazīlija"
 
-#: my-evolution/Locations.h:843
+#: my-evolution/Locations.h:845
 msgid "Great Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:845
+#: my-evolution/Locations.h:847
 #, fuzzy
 msgid "Greeley"
 msgstr "Grieķija"
 
-#: my-evolution/Locations.h:846
+#: my-evolution/Locations.h:848
 #, fuzzy
 msgid "Green Bay"
 msgstr "Grinlande"
 
-#: my-evolution/Locations.h:847
+#: my-evolution/Locations.h:849
 msgid "Green River"
 msgstr ""
 
-#: my-evolution/Locations.h:848
+#: my-evolution/Locations.h:850
 msgid "Greensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:849
+#: my-evolution/Locations.h:851
 #, fuzzy
 msgid "Greenville"
 msgstr "Grinlande"
 
-#: my-evolution/Locations.h:850
+#: my-evolution/Locations.h:852
 msgid "Greenville-Spartanburg"
 msgstr ""
 
-#: my-evolution/Locations.h:851
+#: my-evolution/Locations.h:853
 #, fuzzy
 msgid "Greenwood"
 msgstr "Grinlande"
 
-#: my-evolution/Locations.h:852
+#: my-evolution/Locations.h:854
 msgid "Grenoble-Saint-Geoirs"
 msgstr ""
 
-#: my-evolution/Locations.h:853
+#: my-evolution/Locations.h:855
 msgid "Griffiss AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:854
+#: my-evolution/Locations.h:856
 #, fuzzy
 msgid "Groningen"
 msgstr "Brīdinājums"
 
-#: my-evolution/Locations.h:855
+#: my-evolution/Locations.h:857
 msgid "Grosseto"
 msgstr ""
 
-#: my-evolution/Locations.h:856
+#: my-evolution/Locations.h:858
 msgid "Groton"
 msgstr "Grotona"
 
-#: my-evolution/Locations.h:857
+#: my-evolution/Locations.h:859
 #, fuzzy
 msgid "Guadalajara"
 msgstr "Guatemala"
 
-#: my-evolution/Locations.h:858
+#: my-evolution/Locations.h:860
 #, fuzzy
 msgid "Guadalupe Pass"
 msgstr "Gvadelupa"
 
-#: my-evolution/Locations.h:859
+#: my-evolution/Locations.h:861
 #, fuzzy
 msgid "Guanare"
 msgstr "Gajāna"
 
-#: my-evolution/Locations.h:860
+#: my-evolution/Locations.h:862
 msgid "Guangzhou"
 msgstr ""
 
-#: my-evolution/Locations.h:861
+#: my-evolution/Locations.h:863
 #, fuzzy
 msgid "Guantanamo"
 msgstr "Guatemala"
 
-#: my-evolution/Locations.h:862
+#: my-evolution/Locations.h:864
 #, fuzzy
 msgid "Guarany"
 msgstr "Vācija"
 
-#: my-evolution/Locations.h:863
+#: my-evolution/Locations.h:865
 #, fuzzy
 msgid "Guaratingueta"
 msgstr "Gvineja"
 
-#: my-evolution/Locations.h:864
+#: my-evolution/Locations.h:866
 msgid "Guarulhos"
 msgstr ""
 
-#: my-evolution/Locations.h:866
+#: my-evolution/Locations.h:868
 msgid "Guayaquil/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:867
+#: my-evolution/Locations.h:869
 #, fuzzy
 msgid "Guaymas"
 msgstr "Guama"
 
-#: my-evolution/Locations.h:868
+#: my-evolution/Locations.h:870
 #, fuzzy
 msgid "Guernsey"
 msgstr "Vācija"
 
-#: my-evolution/Locations.h:869
+#: my-evolution/Locations.h:871
 #, fuzzy
 msgid "Guidonia"
 msgstr "Gvineja"
 
-#: my-evolution/Locations.h:870
+#: my-evolution/Locations.h:872
 msgid "Gulfport"
 msgstr ""
 
-#: my-evolution/Locations.h:871
+#: my-evolution/Locations.h:873
 #, fuzzy
 msgid "Gulkana"
 msgstr "Gajāna"
 
-#: my-evolution/Locations.h:872
+#: my-evolution/Locations.h:874
 msgid "Gullfax C"
 msgstr ""
 
-#: my-evolution/Locations.h:873
+#: my-evolution/Locations.h:875
 #, fuzzy
 msgid "Gunnison"
 msgstr "Reinjona"
 
-#: my-evolution/Locations.h:874
+#: my-evolution/Locations.h:876
 msgid "Gunnison (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:875
+#: my-evolution/Locations.h:877
 #, fuzzy
 msgid "Guriat"
 msgstr "Gvineja"
 
-#: my-evolution/Locations.h:876
+#: my-evolution/Locations.h:878
 msgid "Gustavus"
 msgstr ""
 
-#: my-evolution/Locations.h:877
+#: my-evolution/Locations.h:879
 #, fuzzy
 msgid "Guymon"
 msgstr "Gajāna"
 
-#: my-evolution/Locations.h:878
+#: my-evolution/Locations.h:880
 #, fuzzy
 msgid "Habana"
 msgstr "Albānija"
 
-#: my-evolution/Locations.h:879
+#: my-evolution/Locations.h:881
 msgid "Hachijojima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:880
+#: my-evolution/Locations.h:882
 msgid "Hachinohe Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:881
+#: my-evolution/Locations.h:883
 msgid "Hafr Al-Batin"
 msgstr ""
 
-#: my-evolution/Locations.h:882
+#: my-evolution/Locations.h:884
 msgid "Hagerstown"
 msgstr ""
 
-#: my-evolution/Locations.h:884
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+msgid "Hail"
+msgstr ""
+
+#: my-evolution/Locations.h:886
 msgid "Hailey-Sun Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:885
+#: my-evolution/Locations.h:887
 #, fuzzy
 msgid "Haines"
 msgstr "Pozīcijas"
 
-#: my-evolution/Locations.h:887
+#: my-evolution/Locations.h:889
 msgid "Hakodate Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:888
+#: my-evolution/Locations.h:890
 msgid "Halifax"
 msgstr ""
 
-#: my-evolution/Locations.h:889
+#: my-evolution/Locations.h:891
 msgid "Hamamatsu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:890
+#: my-evolution/Locations.h:892
 msgid "Hamburg"
 msgstr ""
 
-#: my-evolution/Locations.h:891
+#: my-evolution/Locations.h:893
 msgid "Hamburg-Finkenwerder"
 msgstr ""
 
-#: my-evolution/Locations.h:892
+#: my-evolution/Locations.h:894
 msgid "Hamilton"
 msgstr "Hamiltona"
 
-#: my-evolution/Locations.h:893
+#: my-evolution/Locations.h:895
 msgid "Hammerfest"
 msgstr ""
 
-#: my-evolution/Locations.h:894
+#: my-evolution/Locations.h:896
 msgid "Hampton"
 msgstr ""
 
-#: my-evolution/Locations.h:895
+#: my-evolution/Locations.h:897
 msgid "Hanamaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:896
+#: my-evolution/Locations.h:898
 msgid "Hancock"
 msgstr ""
 
-#: my-evolution/Locations.h:897
+#: my-evolution/Locations.h:899
 msgid "Hangzhou"
 msgstr ""
 
-#: my-evolution/Locations.h:898
+#: my-evolution/Locations.h:900
 msgid "Hanksville"
 msgstr ""
 
-#: my-evolution/Locations.h:899
+#: my-evolution/Locations.h:901
 msgid "Hannover"
 msgstr ""
 
-#: my-evolution/Locations.h:900
+#: my-evolution/Locations.h:902
 msgid "Ha Noi"
 msgstr ""
 
-#: my-evolution/Locations.h:901
+#: my-evolution/Locations.h:903
 msgid "Harbor Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:902
+#: my-evolution/Locations.h:904
 #, fuzzy
 msgid "Harlingen"
 msgstr "Brīdinājums"
 
-#: my-evolution/Locations.h:903
+#: my-evolution/Locations.h:905
 msgid "Harlowton"
 msgstr ""
 
-#: my-evolution/Locations.h:904
+#: my-evolution/Locations.h:906
 msgid "Harrisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:905
+#: my-evolution/Locations.h:907
 msgid "Harrison"
 msgstr ""
 
-#: my-evolution/Locations.h:906
+#: my-evolution/Locations.h:908
 msgid "Harstad/Narvik/Evenes"
 msgstr ""
 
-#: my-evolution/Locations.h:907
+#: my-evolution/Locations.h:909
 msgid "Hartford"
 msgstr ""
 
-#: my-evolution/Locations.h:908
+#: my-evolution/Locations.h:910
 msgid "Hassi-Messaoud"
 msgstr ""
 
-#: my-evolution/Locations.h:909
+#: my-evolution/Locations.h:911
 #, fuzzy
 msgid "Hastings"
 msgstr "Pozīcijas"
 
-#: my-evolution/Locations.h:910
+#: my-evolution/Locations.h:912
 msgid "Haugesund"
 msgstr ""
 
-#: my-evolution/Locations.h:911
+#: my-evolution/Locations.h:913
 #, fuzzy
 msgid "Havre"
 msgstr "Saglabāt"
 
-#: my-evolution/Locations.h:912
+#: my-evolution/Locations.h:914
 #, fuzzy
 msgid "Hawaii"
 msgstr "Haiti"
 
-#: my-evolution/Locations.h:913
+#: my-evolution/Locations.h:915
 msgid "Hawthorne"
 msgstr ""
 
-#: my-evolution/Locations.h:914
+#: my-evolution/Locations.h:916
 #, fuzzy
 msgid "Hayden"
 msgstr "Galviņa"
 
-#: my-evolution/Locations.h:915
+#: my-evolution/Locations.h:917
 msgid "Hayes River"
 msgstr ""
 
-#: my-evolution/Locations.h:916
+#: my-evolution/Locations.h:918
 #, fuzzy
 msgid "Hays"
 msgstr "dienas"
 
-#: my-evolution/Locations.h:917
+#: my-evolution/Locations.h:919
 msgid "Hayward"
 msgstr ""
 
-#: my-evolution/Locations.h:918
+#: my-evolution/Locations.h:920
 msgid "Healy River"
 msgstr ""
 
-#: my-evolution/Locations.h:919
+#: my-evolution/Locations.h:921
 msgid "Helena"
 msgstr "Helēna"
 
-#: my-evolution/Locations.h:920
+#: my-evolution/Locations.h:922
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: my-evolution/Locations.h:921
+#: my-evolution/Locations.h:923
 #, fuzzy
 msgid "Henderson"
 msgstr "Sūtītajs"
 
-#: my-evolution/Locations.h:922
+#: my-evolution/Locations.h:924
 msgid "Hengchun"
 msgstr ""
 
-#: my-evolution/Locations.h:923
+#: my-evolution/Locations.h:925
 msgid "Hermosillo"
 msgstr ""
 
-#: my-evolution/Locations.h:924
+#: my-evolution/Locations.h:926
 msgid "Hibbing"
 msgstr ""
 
-#: my-evolution/Locations.h:925
+#: my-evolution/Locations.h:927
 msgid "Hickory"
 msgstr ""
 
-#: my-evolution/Locations.h:926
+#: my-evolution/Locations.h:928
 msgid "Hill City"
 msgstr ""
 
-#: my-evolution/Locations.h:927
+#: my-evolution/Locations.h:929
 msgid "Hillsboro"
 msgstr ""
 
-#: 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 ""
 
-#: my-evolution/Locations.h:930
+#: my-evolution/Locations.h:932
 msgid "Hiroshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:931
+#: my-evolution/Locations.h:933
 #, fuzzy
 msgid "Hobart"
 msgstr "Resursdators"
 
-#: my-evolution/Locations.h:932
+#: my-evolution/Locations.h:934
 #, fuzzy
 msgid "Hobbs"
 msgstr "Resursdators"
 
-#: my-evolution/Locations.h:933
+#: my-evolution/Locations.h:935
 msgid "Ho Chi Minh"
 msgstr ""
 
-#: my-evolution/Locations.h:934
+#: my-evolution/Locations.h:936
 msgid "Hodeidah"
 msgstr ""
 
-#: my-evolution/Locations.h:935
+#: my-evolution/Locations.h:937
 msgid "Hof"
 msgstr ""
 
-#: my-evolution/Locations.h:936
+#: my-evolution/Locations.h:938
 msgid "Hoffman"
 msgstr ""
 
-#: my-evolution/Locations.h:937
+#: my-evolution/Locations.h:939
 msgid "Hofu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:938
+#: my-evolution/Locations.h:940
 msgid "Hohenems"
 msgstr ""
 
-#: my-evolution/Locations.h:939
+#: my-evolution/Locations.h:941
 #, fuzzy
 msgid "Holguin"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:940
+#: my-evolution/Locations.h:942
 #, fuzzy
 msgid "Homer"
 msgstr "Mājas"
 
-#: my-evolution/Locations.h:941
+#: my-evolution/Locations.h:943
 #, fuzzy
 msgid "Homestead AFB"
 msgstr "Izpildīts"
 
-#: my-evolution/Locations.h:942
+#: my-evolution/Locations.h:944
 #, fuzzy
 msgid "Hondo"
 msgstr "Hondura"
 
-#: my-evolution/Locations.h:945
+#: my-evolution/Locations.h:947
 msgid "Honningsvag"
 msgstr ""
 
-#: my-evolution/Locations.h:946
+#: my-evolution/Locations.h:948
 msgid "Honolulu"
 msgstr ""
 
-#: my-evolution/Locations.h:947
+#: my-evolution/Locations.h:949
 msgid "Hoonah"
 msgstr ""
 
-#: my-evolution/Locations.h:948
+#: my-evolution/Locations.h:950
 msgid "Hoquiam"
 msgstr ""
 
-#: my-evolution/Locations.h:949
+#: my-evolution/Locations.h:951
 msgid "Hot Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:950
+#: my-evolution/Locations.h:952
 msgid "Houghton Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:951
+#: my-evolution/Locations.h:953
 #, fuzzy
 msgid "Houlton"
 msgstr "izejošais"
 
-#: my-evolution/Locations.h:952
+#: my-evolution/Locations.h:954
 #, fuzzy
 msgid "Houma"
 msgstr "Mājas"
 
-#: my-evolution/Locations.h:953
+#: my-evolution/Locations.h:955
 msgid "Houston-Bush"
 msgstr ""
 
-#: my-evolution/Locations.h:954
+#: my-evolution/Locations.h:956
 msgid "Houston-Clover"
 msgstr ""
 
-#: my-evolution/Locations.h:955
+#: my-evolution/Locations.h:957
 msgid "Houston-Ellington Field"
 msgstr ""
 
-#: my-evolution/Locations.h:956
+#: my-evolution/Locations.h:958
 msgid "Houston-Hobby"
 msgstr ""
 
-#: my-evolution/Locations.h:957
+#: my-evolution/Locations.h:959
 msgid "Houston-Hooks"
 msgstr ""
 
-#: my-evolution/Locations.h:958
+#: my-evolution/Locations.h:960
 #, fuzzy
 msgid "Howard AFB"
 msgstr "Pārsūtīt Kā"
 
-#: my-evolution/Locations.h:959
+#: my-evolution/Locations.h:961
 msgid "Hsinchu"
 msgstr ""
 
-#: my-evolution/Locations.h:960
+#: my-evolution/Locations.h:962
 msgid "Huanuco"
 msgstr ""
 
-#: my-evolution/Locations.h:961
+#: my-evolution/Locations.h:963
 msgid "Huehuetenango"
 msgstr ""
 
-#: my-evolution/Locations.h:962
+#: my-evolution/Locations.h:964
 #, fuzzy
 msgid "Hulien"
 msgstr "Slēpt"
 
-#: my-evolution/Locations.h:963
+#: my-evolution/Locations.h:965
 msgid "Humberside"
 msgstr ""
 
-#: my-evolution/Locations.h:965
+#: my-evolution/Locations.h:967
 msgid "Huntington"
 msgstr ""
 
-#: my-evolution/Locations.h:966
+#: my-evolution/Locations.h:968
 #, fuzzy
 msgid "Huntsville"
 msgstr "līdz"
 
-#: my-evolution/Locations.h:967
+#: my-evolution/Locations.h:969
 msgid "Hurlburt"
 msgstr ""
 
-#: my-evolution/Locations.h:968
+#: my-evolution/Locations.h:970
 #, fuzzy
 msgid "Huron"
 msgstr "Stundas"
 
-#: my-evolution/Locations.h:969
+#: my-evolution/Locations.h:971
 msgid "Hutchinson"
 msgstr ""
 
-#: my-evolution/Locations.h:970
+#: my-evolution/Locations.h:972
 msgid "Hyakuri Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:971
+#: my-evolution/Locations.h:973
 msgid "Hyannis"
 msgstr ""
 
-#: my-evolution/Locations.h:972
+#: my-evolution/Locations.h:974
 msgid "Hyderabad"
 msgstr ""
 
-#: my-evolution/Locations.h:973
+#: my-evolution/Locations.h:975
 msgid "Hyeres-Le Palyvestre"
 msgstr ""
 
-#: my-evolution/Locations.h:974
+#: my-evolution/Locations.h:976
 #, fuzzy
 msgid "Iasi"
 msgstr "Pamata"
 
-#: my-evolution/Locations.h:975
+#: my-evolution/Locations.h:977
 #, fuzzy
 msgid "Ibiza"
 msgstr "Indija"
 
-#: my-evolution/Locations.h:977
+#: my-evolution/Locations.h:979
 msgid "Ichikawa"
 msgstr ""
 
-#: my-evolution/Locations.h:978
+#: my-evolution/Locations.h:980
 #, fuzzy
 msgid "Idaho"
 msgstr "Indija"
 
-#: my-evolution/Locations.h:979
+#: my-evolution/Locations.h:981
 msgid "Idaho Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:980
+#: my-evolution/Locations.h:982
 msgid "Iguazu"
 msgstr ""
 
-#: my-evolution/Locations.h:981
+#: my-evolution/Locations.h:983
 msgid "Iki Airport"
 msgstr "Iki Lidosta"
 
-#: my-evolution/Locations.h:982
+#: my-evolution/Locations.h:984
 #, fuzzy
 msgid "Ilan"
 msgstr "Islande"
 
-#: my-evolution/Locations.h:983
+#: my-evolution/Locations.h:985
 msgid "Iliamna"
 msgstr ""
 
-#: my-evolution/Locations.h:984
+#: my-evolution/Locations.h:986
 msgid "Illinois"
 msgstr ""
 
-#: my-evolution/Locations.h:985
+#: my-evolution/Locations.h:987
 #, fuzzy
 msgid "Imperial"
 msgstr "Aprīlis"
 
-#: my-evolution/Locations.h:986
+#: my-evolution/Locations.h:988
 msgid "Imperial (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:987
+#: my-evolution/Locations.h:989
 msgid "Imperial Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:988
+#: my-evolution/Locations.h:990
 #, fuzzy
 msgid "In Amenas"
 msgstr "Armēnija"
 
-#: my-evolution/Locations.h:990
+#: my-evolution/Locations.h:992
 #, fuzzy
 msgid "Indiana"
 msgstr "Indija"
 
-#: my-evolution/Locations.h:991
+#: my-evolution/Locations.h:993
 msgid "Indianapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:992
+#: my-evolution/Locations.h:994
 msgid "Indian Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:993
+#: my-evolution/Locations.h:995
 msgid "Innsbruck"
 msgstr ""
 
-#: my-evolution/Locations.h:994
+#: my-evolution/Locations.h:996
 #, fuzzy
 msgid "International Falls"
 msgstr "Starptautisks"
 
-#: my-evolution/Locations.h:995
+#: my-evolution/Locations.h:997
 msgid "Intracoastal"
 msgstr ""
 
-#: my-evolution/Locations.h:996
+#: my-evolution/Locations.h:998
 #, fuzzy
 msgid "Inverness"
 msgstr "Procesā"
 
-#: my-evolution/Locations.h:997
+#: my-evolution/Locations.h:999
 msgid "Inyokern"
 msgstr ""
 
-#: my-evolution/Locations.h:998
+#: my-evolution/Locations.h:1000
 #, fuzzy
 msgid "Iowa"
 msgstr "Norvēģija"
 
-#: my-evolution/Locations.h:999
+#: my-evolution/Locations.h:1001
 msgid "Iowa City"
 msgstr ""
 
-#: my-evolution/Locations.h:1000
+#: my-evolution/Locations.h:1002
 msgid "Iqaluit"
 msgstr ""
 
-#: my-evolution/Locations.h:1001
+#: my-evolution/Locations.h:1003
 msgid "Iquique/Diego Arac"
 msgstr ""
 
-#: my-evolution/Locations.h:1002
+#: my-evolution/Locations.h:1004
 msgid "Iquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1003
+#: my-evolution/Locations.h:1005
 #, fuzzy
 msgid "Iraklion"
 msgstr "Informācija"
 
-#: my-evolution/Locations.h:1004
+#: my-evolution/Locations.h:1006
 msgid "Iran, Islamic Republic of"
 msgstr "Irānas Islamiskā Republika"
 
-#: my-evolution/Locations.h:1006
+#: my-evolution/Locations.h:1008
 #, fuzzy
 msgid "Iron Mountain"
 msgstr "Komentāri satur"
 
-#: my-evolution/Locations.h:1007
+#: my-evolution/Locations.h:1009
 msgid "Ironwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1008
+#: my-evolution/Locations.h:1010
 msgid "Iruma Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1009
+#: my-evolution/Locations.h:1011
 msgid "Islamabad"
 msgstr ""
 
-#: my-evolution/Locations.h:1010
+#: my-evolution/Locations.h:1012
 msgid "Isle of Man"
 msgstr ""
 
-#: my-evolution/Locations.h:1011
+#: my-evolution/Locations.h:1013
 msgid "Islip"
 msgstr ""
 
-#: my-evolution/Locations.h:1012
+#: my-evolution/Locations.h:1014
 msgid "Istanbul"
 msgstr "Istanbula"
 
-#: my-evolution/Locations.h:1013
+#: my-evolution/Locations.h:1015
 msgid "Itaituba"
 msgstr ""
 
-#: my-evolution/Locations.h:1015
+#: my-evolution/Locations.h:1017
 msgid "Ithaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1016
+#: my-evolution/Locations.h:1018
+msgid "Ivano-Frankivsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1019
 msgid "Iwakuni MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1017
+#: my-evolution/Locations.h:1020
 msgid "Iwojima"
 msgstr ""
 
-#: my-evolution/Locations.h:1018
+#: my-evolution/Locations.h:1021
 msgid "Ixtapa"
 msgstr ""
 
-#: my-evolution/Locations.h:1019
+#: my-evolution/Locations.h:1022
 msgid "Izmir/Adnan Menderes"
 msgstr ""
 
-#: my-evolution/Locations.h:1020
+#: my-evolution/Locations.h:1023
 msgid "Izmir/Cigli"
 msgstr ""
 
-#: my-evolution/Locations.h:1021
+#: my-evolution/Locations.h:1024
 msgid "Izmit"
 msgstr ""
 
-#: my-evolution/Locations.h:1022
+#: my-evolution/Locations.h:1025
 #, fuzzy
 msgid "Izumo Airport"
 msgstr "Importēt"
 
-#: my-evolution/Locations.h:1023
+#: my-evolution/Locations.h:1026
 msgid "Jackson"
 msgstr ""
 
-#: my-evolution/Locations.h:1024
+#: my-evolution/Locations.h:1027
 msgid "Jacksonville"
 msgstr ""
 
-#: my-evolution/Locations.h:1025
+#: my-evolution/Locations.h:1028
 msgid "Jacksonville-Craig Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1026
+#: my-evolution/Locations.h:1029
 msgid "Jacksonville NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1027
+#: my-evolution/Locations.h:1030
 msgid "Jaffrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1029
+#: my-evolution/Locations.h:1032
 msgid "Jamestown"
 msgstr ""
 
-#: my-evolution/Locations.h:1030
+#: my-evolution/Locations.h:1033
 #, fuzzy
 msgid "Janesville"
 msgstr "Japāņu"
 
-#: my-evolution/Locations.h:1031
+#: my-evolution/Locations.h:1034
 msgid "Jan Smuts"
 msgstr ""
 
-#: my-evolution/Locations.h:1033
+#: my-evolution/Locations.h:1036
 #, fuzzy
 msgid "Jeddah King Abdul Aziz International Airport"
 msgstr "Starptautisks"
 
-#: my-evolution/Locations.h:1034
+#: my-evolution/Locations.h:1037
 msgid "Jefferson City"
 msgstr ""
 
-#: my-evolution/Locations.h:1035
+#: my-evolution/Locations.h:1038
 msgid "Jerez"
 msgstr ""
 
-#: my-evolution/Locations.h:1036
+#: my-evolution/Locations.h:1039
 msgid "Jersey"
 msgstr ""
 
-#: my-evolution/Locations.h:1037
+#: my-evolution/Locations.h:1040
 msgid "Jinotega"
 msgstr ""
 
-#: my-evolution/Locations.h:1038
+#: my-evolution/Locations.h:1041
 msgid "Johan A. Pengel"
 msgstr ""
 
-#: my-evolution/Locations.h:1039
+#: my-evolution/Locations.h:1042
 msgid "Johnstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1040
+#: my-evolution/Locations.h:1043
 msgid "Jonesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1041
+#: my-evolution/Locations.h:1044
 #, fuzzy
 msgid "Jonkoping"
 msgstr "Strādā"
 
-#: my-evolution/Locations.h:1042
+#: my-evolution/Locations.h:1045
 #, fuzzy
 msgid "Joplin"
 msgstr "Kopējam"
 
-#: my-evolution/Locations.h:1044
+#: my-evolution/Locations.h:1047
 msgid "Juanjui"
 msgstr ""
 
-#: my-evolution/Locations.h:1045
+#: my-evolution/Locations.h:1048
 msgid "Juan Santamaria"
 msgstr ""
 
-#: my-evolution/Locations.h:1046
+#: my-evolution/Locations.h:1049
 #, fuzzy
 msgid "Juigalpa"
 msgstr "Japāna"
 
-#: my-evolution/Locations.h:1047
+#: my-evolution/Locations.h:1050
 #, fuzzy
 msgid "Jujuy"
 msgstr "Jūlijs"
 
-#: my-evolution/Locations.h:1048
+#: my-evolution/Locations.h:1051
 #, fuzzy
 msgid "Juliaca"
 msgstr "Publisks"
 
-#: my-evolution/Locations.h:1049
+#: my-evolution/Locations.h:1052
 #, fuzzy
 msgid "Junction"
 msgstr "Reinjona"
 
-#: my-evolution/Locations.h:1050
+#: my-evolution/Locations.h:1053
 #, fuzzy
 msgid "Juneau"
 msgstr "Jūnijs"
 
-#: my-evolution/Locations.h:1051
+#: my-evolution/Locations.h:1054
 msgid "Kadena Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1052
+#: my-evolution/Locations.h:1055
 msgid "Kagoshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1053
+#: my-evolution/Locations.h:1056
 msgid "Kahului"
 msgstr ""
 
-#: my-evolution/Locations.h:1054
+#: my-evolution/Locations.h:1057
 msgid "Kailua-Kona"
 msgstr ""
 
-#: my-evolution/Locations.h:1055
+#: my-evolution/Locations.h:1058
 msgid "Kake"
 msgstr ""
 
-#: my-evolution/Locations.h:1056
+#: my-evolution/Locations.h:1059
 #, fuzzy
 msgid "Kalamata"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1057
+#: my-evolution/Locations.h:1060
 msgid "Kalamazoo"
 msgstr ""
 
-#: my-evolution/Locations.h:1058
+#: my-evolution/Locations.h:1061
 msgid "Kalispell"
 msgstr ""
 
-#: my-evolution/Locations.h:1059
+#: my-evolution/Locations.h:1062
 msgid "Kamigoto"
 msgstr ""
 
-#: my-evolution/Locations.h:1060
+#: my-evolution/Locations.h:1063
 msgid "Kaneohe"
 msgstr ""
 
-#: my-evolution/Locations.h:1061
+#: my-evolution/Locations.h:1064
 msgid "Kangshan"
 msgstr ""
 
-#: my-evolution/Locations.h:1062
+#: my-evolution/Locations.h:1065
 msgid "Kanoya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1063
+#: my-evolution/Locations.h:1066
 #, fuzzy
 msgid "Kansai International Airport"
 msgstr "Starptautisks"
 
-#: my-evolution/Locations.h:1064
+#: my-evolution/Locations.h:1067
 msgid "Kansas"
 msgstr "Kanzasa"
 
-#: my-evolution/Locations.h:1065
+#: my-evolution/Locations.h:1068
 msgid "Kansas City"
 msgstr "Kanzassitija"
 
-#: my-evolution/Locations.h:1066
+#: my-evolution/Locations.h:1069
 msgid "Kansas City-Gladstone"
 msgstr ""
 
-#: my-evolution/Locations.h:1067
+#: my-evolution/Locations.h:1070
 msgid "Kaohsiung"
 msgstr ""
 
-#: my-evolution/Locations.h:1068
+#: my-evolution/Locations.h:1071
 msgid "Karachi"
 msgstr "Karačī"
 
-#: my-evolution/Locations.h:1069
+#: my-evolution/Locations.h:1072
 msgid "Karup"
 msgstr "Karupa"
 
-#: my-evolution/Locations.h:1070
+#: my-evolution/Locations.h:1073
 msgid "Kassel-Calden"
 msgstr ""
 
-#: my-evolution/Locations.h:1071
+#: my-evolution/Locations.h:1074
 msgid "Kasumigaura Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1072
+#: my-evolution/Locations.h:1075
 msgid "Kasuminome Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1073
+#: my-evolution/Locations.h:1076
 msgid "Katowice"
 msgstr ""
 
-#: my-evolution/Locations.h:1074
+#: my-evolution/Locations.h:1077
 msgid "Kavala"
 msgstr ""
 
-#: my-evolution/Locations.h:1075
+#: my-evolution/Locations.h:1078
 msgid "Kayseri"
 msgstr ""
 
-#: my-evolution/Locations.h:1076
+#: my-evolution/Locations.h:1079
 #, fuzzy
 msgid "Kazan"
 msgstr "Kazahstāna"
 
-#: my-evolution/Locations.h:1077
+#: my-evolution/Locations.h:1080
 #, fuzzy
 msgid "Kearney"
 msgstr "Keinja"
 
-#: my-evolution/Locations.h:1078
+#: my-evolution/Locations.h:1081
 msgid "Keene"
 msgstr "Kazaņa"
 
-#: my-evolution/Locations.h:1079
+#: my-evolution/Locations.h:1082
 msgid "Kefallinia"
 msgstr ""
 
-#: my-evolution/Locations.h:1080
+#: my-evolution/Locations.h:1083
 msgid "Keflavik"
 msgstr ""
 
-#: 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 "Kenoša"
 
-#: my-evolution/Locations.h:1083
+#: my-evolution/Locations.h:1086
 msgid "Kentucky"
 msgstr "Kentukī"
 
-#: my-evolution/Locations.h:1084
+#: my-evolution/Locations.h:1087
 msgid "Keokuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1085
+#: my-evolution/Locations.h:1088
 msgid "Kerkira"
 msgstr ""
 
-#: my-evolution/Locations.h:1086
+#: my-evolution/Locations.h:1089
 msgid "Kerman"
 msgstr "Kermana"
 
-#: my-evolution/Locations.h:1087
+#: my-evolution/Locations.h:1090
 msgid "Ketchikan"
 msgstr ""
 
-#: my-evolution/Locations.h:1088
+#: my-evolution/Locations.h:1091
 #, fuzzy
 msgid "Key West"
 msgstr "Rietumu"
 
-#: my-evolution/Locations.h:1089
+#: my-evolution/Locations.h:1092
 #, fuzzy
 msgid "Key West NAS"
 msgstr "Taustiņš"
 
-#: my-evolution/Locations.h:1090
+#: my-evolution/Locations.h:1093
 msgid "Khabarovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1091
+#: my-evolution/Locations.h:1094
 msgid "Khamis Mushait"
 msgstr ""
 
-#: my-evolution/Locations.h:1092
+#: my-evolution/Locations.h:1095
+msgid "Kharkiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1096
 #, fuzzy
 msgid "Kikai Island"
 msgstr "Kuka Salas"
 
-#: my-evolution/Locations.h:1093
+#: my-evolution/Locations.h:1097
 msgid "Killeen"
 msgstr ""
 
-#: my-evolution/Locations.h:1094
+#: my-evolution/Locations.h:1098
 msgid "Killeen-Ft Hood"
 msgstr ""
 
-#: my-evolution/Locations.h:1095
+#: my-evolution/Locations.h:1099
 msgid "Killeen-Gray AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:1096
+#: my-evolution/Locations.h:1100
 #, fuzzy
 msgid "King Khaled International Airport"
 msgstr "Starptautisks"
 
-#: my-evolution/Locations.h:1097
+#: my-evolution/Locations.h:1101
 msgid "Kingman"
 msgstr ""
 
-#: my-evolution/Locations.h:1098
+#: my-evolution/Locations.h:1102
 msgid "King Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1099
+#: my-evolution/Locations.h:1103
 msgid "Kingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1100
+#: my-evolution/Locations.h:1104
 msgid "Kingsville"
 msgstr ""
 
-#: my-evolution/Locations.h:1101
+#: my-evolution/Locations.h:1105
 msgid "Kinloss"
 msgstr ""
 
-#: my-evolution/Locations.h:1102
+#: my-evolution/Locations.h:1106
 msgid "Kinston"
 msgstr ""
 
-#: my-evolution/Locations.h:1103
+#: my-evolution/Locations.h:1107
 msgid "Kirkenes"
 msgstr ""
 
-#: my-evolution/Locations.h:1104
+#: my-evolution/Locations.h:1108
 msgid "Kirksville"
 msgstr ""
 
-#: my-evolution/Locations.h:1105
+#: my-evolution/Locations.h:1109
 msgid "Kiruna"
 msgstr ""
 
-#: my-evolution/Locations.h:1106
+#: my-evolution/Locations.h:1110
 msgid "Kisarazu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1107
+#: my-evolution/Locations.h:1111
 msgid "Kishineu"
 msgstr ""
 
-#: my-evolution/Locations.h:1108
+#: my-evolution/Locations.h:1112
 msgid "Kitakyushu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1109
+#: my-evolution/Locations.h:1113
 msgid "Klagenfurt"
 msgstr ""
 
-#: my-evolution/Locations.h:1110
+#: my-evolution/Locations.h:1114
 msgid "Klamath Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1111
+#: my-evolution/Locations.h:1115
 msgid "Klawock"
 msgstr ""
 
-#: my-evolution/Locations.h:1112
+#: my-evolution/Locations.h:1116
 msgid "Kleine Brogel"
 msgstr ""
 
-#: my-evolution/Locations.h:1113
+#: my-evolution/Locations.h:1117
 msgid "Kliningrad"
 msgstr ""
 
-#: my-evolution/Locations.h:1114
+#: my-evolution/Locations.h:1118
 msgid "Knoxville"
 msgstr ""
 
-#: my-evolution/Locations.h:1115
+#: my-evolution/Locations.h:1119
 msgid "Knoxville-Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:1116
+#: my-evolution/Locations.h:1120
 msgid "Kobenhavn/Kastrup"
 msgstr ""
 
-#: my-evolution/Locations.h:1117
+#: my-evolution/Locations.h:1121
 msgid "Kobenhavn/Roskilde"
 msgstr ""
 
-#: my-evolution/Locations.h:1118
+#: my-evolution/Locations.h:1122
 msgid "Kochi Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1119
+#: my-evolution/Locations.h:1123
 msgid "Kodiak"
 msgstr ""
 
-#: my-evolution/Locations.h:1120
+#: my-evolution/Locations.h:1124
 msgid "Kogalniceanu"
 msgstr ""
 
-#: my-evolution/Locations.h:1121
+#: my-evolution/Locations.h:1125
 msgid "Kogalym"
 msgstr ""
 
-#: my-evolution/Locations.h:1122
+#: my-evolution/Locations.h:1126
 msgid "Koksijde"
 msgstr ""
 
-#: my-evolution/Locations.h:1123
+#: my-evolution/Locations.h:1127
 msgid "Kolding/Vandrup"
 msgstr ""
 
-#: my-evolution/Locations.h:1124
+#: my-evolution/Locations.h:1128
 msgid "Koln/Bonn"
 msgstr ""
 
-#: my-evolution/Locations.h:1125
+#: my-evolution/Locations.h:1129
 msgid "Komatsu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1126
+#: my-evolution/Locations.h:1130
 msgid "Komatsujima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1127
+#: my-evolution/Locations.h:1131
 #, fuzzy
 msgid "Konya"
 msgstr "Keinja"
 
-#: my-evolution/Locations.h:1128
+#: my-evolution/Locations.h:1132
 msgid "Korea, Democratic People's Republic of"
 msgstr ""
 
-#: my-evolution/Locations.h:1129
+#: my-evolution/Locations.h:1133
 msgid "Korea, Republic of"
 msgstr "Korejas Republika"
 
-#: my-evolution/Locations.h:1130
+#: my-evolution/Locations.h:1134
 msgid "Kos"
 msgstr "Kosa"
 
-#: my-evolution/Locations.h:1131
+#: my-evolution/Locations.h:1135
 msgid "Kotzebue"
 msgstr ""
 
-#: my-evolution/Locations.h:1132
+#: my-evolution/Locations.h:1136
 #, fuzzy
 msgid "Kozani"
 msgstr "Korejiešu"
 
-#: my-evolution/Locations.h:1133
+#: my-evolution/Locations.h:1137
 msgid "Krakow"
 msgstr "Krakova"
 
-#: my-evolution/Locations.h:1134
+#: my-evolution/Locations.h:1138
 msgid "Krasnodar"
 msgstr ""
 
-#: my-evolution/Locations.h:1135
+#: my-evolution/Locations.h:1139
 msgid "Krasnoyarsk"
 msgstr "Krasnojarska"
 
-#: my-evolution/Locations.h:1136
+#: my-evolution/Locations.h:1140
 msgid "Kristiansand/Kjevik"
 msgstr ""
 
-#: my-evolution/Locations.h:1137
+#: my-evolution/Locations.h:1141
 msgid "Kristiansund/Kvernberget"
 msgstr ""
 
-#: my-evolution/Locations.h:1138
+#: my-evolution/Locations.h:1142
+msgid "Kryviy Rig/Lozovatka"
+msgstr ""
+
+#: my-evolution/Locations.h:1143
 msgid "Kumamoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1139
+#: my-evolution/Locations.h:1144
 #, fuzzy
 msgid "Kunming"
 msgstr "Ienākošais"
 
-#: my-evolution/Locations.h:1140
+#: my-evolution/Locations.h:1145
 msgid "Kushiro Airport"
 msgstr ""
 
-#: 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 ""
 
-#: my-evolution/Locations.h:1143
+#: my-evolution/Locations.h:1150
 #, fuzzy
 msgid "Laconia"
 msgstr "Maķedonija"
 
-#: my-evolution/Locations.h:1144
+#: my-evolution/Locations.h:1151
 msgid "La Coruna"
 msgstr ""
 
-#: my-evolution/Locations.h:1145
+#: my-evolution/Locations.h:1152
 #, fuzzy
 msgid "La Crosse"
 msgstr "Laosa"
 
-#: my-evolution/Locations.h:1146
+#: my-evolution/Locations.h:1153
 msgid "La Esperanza"
 msgstr ""
 
-#: my-evolution/Locations.h:1147
+#: my-evolution/Locations.h:1154
 #, fuzzy
 msgid "Lafayette"
 msgstr "Majota"
 
-#: my-evolution/Locations.h:1148
+#: my-evolution/Locations.h:1155
 msgid "La Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1149
+#: my-evolution/Locations.h:1156
 #, fuzzy
 msgid "Lahaina"
 msgstr "Bahrēna"
 
-#: my-evolution/Locations.h:1150
+#: my-evolution/Locations.h:1157
 #, fuzzy
 msgid "Lahore"
 msgstr "_Lielāks"
 
-#: my-evolution/Locations.h:1151
+#: my-evolution/Locations.h:1158
 #, fuzzy
 msgid "Lajes"
 msgstr "Laosa"
 
-#: my-evolution/Locations.h:1152
+#: my-evolution/Locations.h:1159
 msgid "La Junta"
 msgstr ""
 
-#: my-evolution/Locations.h:1153
+#: my-evolution/Locations.h:1160
 msgid "Lake Charles"
 msgstr ""
 
-#: my-evolution/Locations.h:1154
+#: my-evolution/Locations.h:1161
 msgid "Lake Hood"
 msgstr ""
 
-#: my-evolution/Locations.h:1155
+#: my-evolution/Locations.h:1162
 msgid "Lakehurst"
 msgstr ""
 
-#: my-evolution/Locations.h:1156
+#: my-evolution/Locations.h:1163
 #, fuzzy
 msgid "Lakeland"
 msgstr "Īrija"
 
-#: my-evolution/Locations.h:1157
+#: my-evolution/Locations.h:1164
 msgid "Lake Tahoe"
 msgstr ""
 
-#: my-evolution/Locations.h:1158
+#: my-evolution/Locations.h:1165
 #, fuzzy
 msgid "Lakeview"
 msgstr "Pirmsapskats"
 
-#: my-evolution/Locations.h:1159
+#: my-evolution/Locations.h:1166
 msgid "Lamar"
 msgstr "Lamāra"
 
-#: my-evolution/Locations.h:1160
+#: my-evolution/Locations.h:1167
 #, fuzzy
 msgid "La Mesa"
 msgstr "_Pasta Vēstule"
 
-#: my-evolution/Locations.h:1161
+#: my-evolution/Locations.h:1168
 #, fuzzy
 msgid "Lamezia"
 msgstr "Gambija"
 
-#: my-evolution/Locations.h:1162
+#: my-evolution/Locations.h:1169
 #, fuzzy
 msgid "Lamoni"
 msgstr "Lebanona"
 
-#: my-evolution/Locations.h:1163
+#: my-evolution/Locations.h:1170
 msgid "Lampedusa"
 msgstr ""
 
-#: my-evolution/Locations.h:1164
+#: my-evolution/Locations.h:1171
 #, fuzzy
 msgid "Lanai"
 msgstr "Valoda"
 
-#: my-evolution/Locations.h:1165
+#: my-evolution/Locations.h:1172
 #, fuzzy
 msgid "Lancaster"
 msgstr "Menedžeris"
 
-#: my-evolution/Locations.h:1166
+#: my-evolution/Locations.h:1173
 #, fuzzy
 msgid "Lander"
 msgstr "Sūtītajs"
 
-#: my-evolution/Locations.h:1167
+#: my-evolution/Locations.h:1174
 #, fuzzy
 msgid "Langebaanweg"
 msgstr "Valoda"
 
-#: my-evolution/Locations.h:1168
+#: my-evolution/Locations.h:1175
 msgid "Langley AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1169
+#: my-evolution/Locations.h:1176
 #, fuzzy
 msgid "Lannion"
 msgstr "Lebanona"
 
-#: my-evolution/Locations.h:1170
+#: my-evolution/Locations.h:1177
 #, fuzzy
 msgid "Lansing"
 msgstr "Brīdinājums"
 
-#: my-evolution/Locations.h:1171
+#: my-evolution/Locations.h:1178
 msgid "Lanzhou"
 msgstr ""
 
-#: my-evolution/Locations.h:1172
+#: my-evolution/Locations.h:1179
 msgid "La Paz"
 msgstr ""
 
-#: my-evolution/Locations.h:1173
+#: my-evolution/Locations.h:1180
 msgid "La Paz/Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1174
+#: my-evolution/Locations.h:1181
 msgid "Laramie"
 msgstr ""
 
-#: my-evolution/Locations.h:1175
+#: my-evolution/Locations.h:1182
 #, fuzzy
 msgid "Laredo"
 msgstr "_Lielāks"
 
-#: my-evolution/Locations.h:1176
+#: my-evolution/Locations.h:1183
 #, fuzzy
 msgid "Larnaka"
 msgstr "Šri Lanka"
 
-#: my-evolution/Locations.h:1177
+#: my-evolution/Locations.h:1184
 #, fuzzy
 msgid "La Romana"
 msgstr "Rumānija"
 
-#: my-evolution/Locations.h:1178
+#: my-evolution/Locations.h:1185
 msgid "Las Americas"
 msgstr ""
 
-#: my-evolution/Locations.h:1179
+#: my-evolution/Locations.h:1186
 msgid "Las Tunas"
 msgstr ""
 
-#: my-evolution/Locations.h:1180
+#: my-evolution/Locations.h:1187
 msgid "Las Vegas"
 msgstr "Lasvegasa"
 
-#: my-evolution/Locations.h:1181
+#: my-evolution/Locations.h:1188
 #, fuzzy
 msgid "Latina"
 msgstr "Latvija"
 
-#: my-evolution/Locations.h:1182
+#: my-evolution/Locations.h:1189
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1184
+#: my-evolution/Locations.h:1191
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1185
+#: my-evolution/Locations.h:1192
 #, fuzzy
 msgid "Laurel"
 msgstr "_Lielāks"
 
-#: my-evolution/Locations.h:1186
+#: my-evolution/Locations.h:1193
 #, fuzzy
 msgid "La Verne"
 msgstr "Kapoverde"
 
-#: my-evolution/Locations.h:1187
+#: my-evolution/Locations.h:1194
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1188
+#: my-evolution/Locations.h:1195
 #, fuzzy
 msgid "Lawton"
 msgstr "Lebanona"
 
-#: my-evolution/Locations.h:1189
+#: my-evolution/Locations.h:1196
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1190
+#: my-evolution/Locations.h:1197
 #, fuzzy
 msgid "Learmouth"
 msgstr "Lesoto"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1199
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1200
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1201
 #, fuzzy
 msgid "Leesburg"
 msgstr "Luksemburga"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1202
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1203
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1204
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1205
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Mans"
 msgstr "Men."
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1207
 #, fuzzy
 msgid "Le Marine"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemmon"
 msgstr "Lebanona"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1209
 #, fuzzy
 msgid "Lemoore"
 msgstr "Izņemt"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1210
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1211
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1212
 #, fuzzy
 msgid "Leuchars"
 msgstr "gadi"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewisburg"
 msgstr "Luksemburga"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1214
 #, fuzzy
 msgid "Lewiston"
 msgstr "Lesoto"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1215
 #, fuzzy
 msgid "Lewistown"
 msgstr "Lesoto"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Lexington"
 msgstr "Lebanona"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1217
 #, fuzzy
 msgid "Liberal"
 msgstr "Libērija"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1219
 #, fuzzy
 msgid "Libya"
 msgstr "Libērija"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1220
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1221
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Liege"
 msgstr "Nigērija"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1223
 #, fuzzy
 msgid "Lihue"
 msgstr "Niue"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1224
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1225
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limnos"
 msgstr "Laosa"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limoges"
 msgstr "Zemākais"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Limon"
 msgstr "mēnesis"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1229
 #, fuzzy
 msgid "Lincoln"
 msgstr "ienākošais"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1230
 msgid "Linz"
 msgstr "Linca"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lisboa"
 msgstr "Libērija"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1232
 #, fuzzy
 msgid "Lista"
 msgstr "saraksts"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1233
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1235
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1236
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1237
 msgid "Livermore"
 msgstr "Livermora"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1238
 msgid "Liverpool"
 msgstr "Liverpūle"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1239
 msgid "Livingston"
 msgstr "Livingstona"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1240
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1241
 #, fuzzy
 msgid "Logan"
 msgstr "NT Pieteikšanās"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1242
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "Lompoc"
 msgstr "Komp"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1244
 msgid "London"
 msgstr "Londona"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1245
 msgid "London/City"
 msgstr "Lodona/Sitija"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1246
 msgid "London/Gatwick"
 msgstr "Londona/Gatvika"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1247
 msgid "London/Heathrow"
 msgstr "Londona/Herthrova"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1248
 msgid "London/Stansted"
 msgstr "London/Stansteda"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1249
 #, fuzzy
 msgid "Londrina"
 msgstr "Hondura"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1250
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1251
 #, fuzzy
 msgid "Long Beach"
 msgstr "Garš"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1252
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1253
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1254
 #, fuzzy
 msgid "Los Alamos"
 msgstr "Brīdinājumi"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1255
 msgid "Los Angeles"
 msgstr "Losandželosa"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1256
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1257
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1258
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1259
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1260
 #, fuzzy
 msgid "Lousiana"
 msgstr "Botsvana"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1261
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1262
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1263
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1264
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1265
 #, fuzzy
 msgid "Lugano"
 msgstr "Lebanona"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1266
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1267
 msgid "Luton"
 msgstr "Lutona"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1269
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Luxor"
 msgstr "Luksemburga"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1271
+#, fuzzy
+msgid "Lviv"
+msgstr "Latvija"
+
+#: my-evolution/Locations.h:1272
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1273
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1275
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Maastricht"
 msgstr "Marts"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macae"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Macapa"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Maceio"
 msgstr "Monāko"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Macon"
 msgstr "Men."
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madinah"
 msgstr "Maķedonija"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1282
 #, fuzzy
 msgid "Madison"
 msgstr "Maldivu salas"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1283
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Barajas)"
 msgstr "Madride (Barajas)"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1285
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madride (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1286
 #, fuzzy
 msgid "Magadan"
 msgstr "Kanāda"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1287
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1288
 #, fuzzy
 msgid "Maine"
 msgstr "Men."
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1289
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1290
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Makung"
 msgstr "Men."
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malad City"
 msgstr "Malavī"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malaga"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1294
 #, fuzzy
 msgid "Malatya"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1295
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1296
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1298
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Managua"
 msgstr "Menedžeris"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manassas"
 msgstr "Malaizija"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manaus"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1302
 msgid "Manchester"
 msgstr "Mančestera"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1303
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1304
 msgid "Manhattan"
 msgstr "Manhatana"
 
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manisa"
 msgstr "Maķedonija"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manistee"
 msgstr "Ievietot"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1307
 #, fuzzy
 msgid "Manitoba"
 msgstr "Galvenā rīkjosla"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1308
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mankato"
 msgstr "Monāko"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Mansfield"
 msgstr "Pasts"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1311
 #, fuzzy
 msgid "Manta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1312
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1313
 #, fuzzy
 msgid "Maraba"
 msgstr "Mauritānija"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1314
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1315
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1316
 #, fuzzy
 msgid "Marathon"
 msgstr "Marts"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1317
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Margarita"
 msgstr "Mauritānija"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marianna"
 msgstr "Mauritānija"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1320
 #, fuzzy
 msgid "Marib"
 msgstr "Pasts"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1321
 msgid "Maribor"
 msgstr "Maribora"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1322
 #, fuzzy
 msgid "Marietta"
 msgstr "Mauritānija"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1323
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1324
 #, fuzzy
 msgid "Marion"
 msgstr "Robežas"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1325
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1326
 #, fuzzy
 msgid "Marquette"
 msgstr "Martinika"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1327
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1328
 msgid "Marseilles"
 msgstr "Marseļa"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1329
 #, fuzzy
 msgid "Marshall"
 msgstr "Maršala Salas"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1330
 #, fuzzy
 msgid "Marshalltown"
 msgstr "Maršala Salas"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1331
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marte"
 msgstr "Datums"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Atzīmēt kā _Neizlasītu"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Robežas"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Martinsville"
 msgstr "Martinika"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1336
 #, fuzzy
 msgid "Maryland"
 msgstr "Īrija"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1337
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1338
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1339
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1340
 #, fuzzy
 msgid "Masirah"
 msgstr "Marts"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1341
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1342
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Massena"
 msgstr "Maķedonija"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1344
 #, fuzzy
 msgid "Matamoros"
 msgstr "Komoros salas"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1345
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1346
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1347
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mattoon"
 msgstr "Men."
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Menedžeris"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mayport"
 msgstr "Majota"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1351
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Kazahstāna"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1352
 #, fuzzy
 msgid "Mazu"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1353
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1354
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCall"
 msgstr "Pasts"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McCarthy"
 msgstr "Marts"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McClellan"
 msgstr "Islande"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1358
 #, fuzzy
 msgid "McComb"
 msgstr "Komp"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1359
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1360
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1361
 msgid "Mc Gregor"
 msgstr "Makgregora"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Meacham"
 msgstr "Marts"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1363
 #, fuzzy
 msgid "Medford"
 msgstr "pirms"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1364
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1365
 #, fuzzy
 msgid "Mehamn"
 msgstr "Men."
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1366
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1367
 msgid "Melbourne"
 msgstr "Melnburna"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1368
 #, fuzzy
 msgid "Melfa"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1369
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1370
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1371
 msgid "Memphis"
 msgstr "Memfisa"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1372
 msgid "Memphis-NAS"
 msgstr "Memfisa-NAS"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1373
 #, fuzzy
 msgid "Mendoza"
 msgstr "Maķedonija"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1374
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1375
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1376
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1377
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1378
 #, fuzzy
 msgid "Merida"
 msgstr "Piekdiena"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1379
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1380
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1381
 #, fuzzy
 msgid "Merril Field"
 msgstr "_No Lauka"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1382
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1383
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1384
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1385
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1386
 #, fuzzy
 msgid "Mexicali"
 msgstr "Meksika"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1388
 msgid "Miami"
 msgstr "Majamī"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1389
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1390
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1391
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1392
 msgid "Middle East"
 msgstr "Tuvie Austrumi"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middleton Island"
 msgstr "Slomona Salas"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Middletown"
 msgstr "_Vidusvārds:"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1395
 #, fuzzy
 msgid "Midland"
 msgstr "Somija"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1396
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1397
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1398
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1399
 #, fuzzy
 msgid "Miles City"
 msgstr "Faila tips:"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1400
 #, fuzzy
 msgid "Milford"
 msgstr "priekš"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1401
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1402
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1403
 msgid "Milton"
 msgstr "Miltona"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1405
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1406
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minatitlan"
 msgstr "Mauritānija"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1408
 #, fuzzy
 msgid "Minchumina"
 msgstr "ienākošais"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1409
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1410
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis"
 msgstr "Miniapolisa"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [2]"
 msgstr "Miniapolisa [2]"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1413
 msgid "Minneapolis [3]"
 msgstr "Miniapolisa [3]"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1414
 #, fuzzy
 msgid "Minnesota"
 msgstr "Mikronēzija"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1415
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1416
 #, fuzzy
 msgid "Minot"
 msgstr "nav"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1417
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1418
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1419
 msgid "Mississippi"
 msgstr "Misissipī"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Missoula"
 msgstr "Miss"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1421
 msgid "Missouri"
 msgstr "Missūrī"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1422
 msgid "Mitchell"
 msgstr ""
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1423
 #, fuzzy
 msgid "Mitilini"
 msgstr "Adresātu saraksts"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1424
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1425
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Moa"
 msgstr "Pr"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1427
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "Mobilais Telefons"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobile Regional Airport"
 msgstr "Mobīlais tel."
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Mobridge"
 msgstr "Mobīlais tel."
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1430
 #, fuzzy
 msgid "Modesto"
 msgstr "Regulāra migla"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mo I Rana"
 msgstr "Pr I"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Mojave"
 msgstr "Pārvietot"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Molde"
 msgstr "Mobīlais tel."
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1434
 #, fuzzy
 msgid "Moldova"
 msgstr "Pirmdiena"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1435
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1436
 #, fuzzy
 msgid "Molokai"
 msgstr "Malavī"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1437
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1438
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Monclova"
 msgstr "Monāko"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Moncton"
 msgstr "Monāko"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1441
 #, fuzzy
 msgid "Monida"
 msgstr "Pirmdiena"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1442
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Monroe"
 msgstr "Monāko"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montague"
 msgstr "Menedžeris"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1445
 #, fuzzy
 msgid "Montana"
 msgstr "Mēnesis"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1446
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1447
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1448
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "Regulārs sniegs"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1449
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1450
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Mēneša Skats"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1451
 #, fuzzy
 msgid "Montego Bay"
 msgstr "Mongolija"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1452
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1453
 #, fuzzy
 msgid "Monterey"
 msgstr "Montserata"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1454
 #, fuzzy
 msgid "Monterrey"
 msgstr "Montserata"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1455
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1456
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1457
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1458
 #, fuzzy
 msgid "Montgomery"
 msgstr "Montserata"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1459
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Monticello"
 msgstr "Monāko"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1461
 #, fuzzy
 msgid "Montpelier"
 msgstr "Mēneša Skats"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1462
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1463
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1464
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1465
 #, fuzzy
 msgid "Montrose"
 msgstr "Montserata"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1466
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morelia"
 msgstr "Mongolija"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organizācija"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1469
 #, fuzzy
 msgid "Moriarty"
 msgstr "Primārais"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1471
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1472
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1473
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1474
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1475
 #, fuzzy
 msgid "Mosinee"
 msgstr "Mobīlais tel."
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1476
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1477
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1478
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1479
 #, fuzzy
 msgid "Mountain View"
 msgstr "Mēneša Skats"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1480
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1481
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "Dienvidaustrumu"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1483
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Mēneša Skats"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1484
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1485
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1486
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1487
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1488
 #, fuzzy
 msgid "Mullan"
 msgstr "Men."
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1489
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1490
 msgid "Munchen"
 msgstr "Minhene"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1491
 #, fuzzy
 msgid "Muncie"
 msgstr "Jūnijs"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1492
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1493
 #, fuzzy
 msgid "Murcia"
 msgstr "Mauritānija"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1494
 msgid "Murmansk"
 msgstr "Murmanska"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1495
 #, fuzzy
 msgid "Mus"
 msgstr "Ms."
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1496
 #, fuzzy
 msgid "Muscatine"
 msgstr "Martinika"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1497
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1498
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1499
 #, fuzzy
 msgid "Mykonos"
 msgstr "pēdas"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1500
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1501
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1502
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1503
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1504
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1505
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1506
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1507
 #, fuzzy
 msgid "Najran"
 msgstr "Bahrēna"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1508
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1509
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1510
 #, fuzzy
 msgid "Namsos"
 msgstr "Laosa"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1512
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1513
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1514
 #, fuzzy
 msgid "Nanning"
 msgstr "Brīdinājums"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1515
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1516
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Napa"
 msgstr "Nepāla"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Naples"
 msgstr "Ziņas"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1519
 msgid "Napoli"
 msgstr "Napolī"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1520
 #, fuzzy
 msgid "Narvik"
 msgstr "Iesauka"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1521
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1522
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1523
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1524
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natal"
 msgstr "Katara"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1526
 #, fuzzy
 msgid "Natchez"
 msgstr "Nesakrītoši"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1527
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1528
 #, fuzzy
 msgid "Nebraska"
 msgstr "Jauns Uzdevums"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1529
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1530
 #, fuzzy
 msgid "Nenana"
 msgstr "Grenada"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1532
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1533
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "Newark"
 msgstr "Jauns Uzdevums"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bedford"
 msgstr "Ziņas"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1536
 #, fuzzy
 msgid "New Bern"
 msgstr "_Jauna Mape"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1537
 #, fuzzy
 msgid "New Braunfels"
 msgstr "Jauns"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1538
 #, fuzzy
 msgid "New Brunswick"
 msgstr "Jauns"
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1539
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1540
 msgid "Newcastle"
 msgstr "Ņūkāsla"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Jaunzēlande"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1542
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Jaunzēlande"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Hampshire"
 msgstr "Jauns"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Haven"
 msgstr "Jaunkaledonija"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Iberia"
 msgstr "Jaunkaledonija"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Jersey"
 msgstr "Jauna Vēstule"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Mexico"
 msgstr "Meksika"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1548
 #, fuzzy
 msgid "New Orleans"
 msgstr "Jaunzēlande"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1549
 #, fuzzy
 msgid "New Orleans-Lakefront"
 msgstr "Jauns"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "New Orleans NAS"
 msgstr "Jauns"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1551
 #, fuzzy
 msgid "Newport"
 msgstr "Ziemeļu"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1552
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New Port Richey"
 msgstr "Jauns Ports"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1554
 #, fuzzy
 msgid "New River"
 msgstr "_Jauna Mape"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "New Tokyo International Airport"
 msgstr "Jauns Starptautisks"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "Newton"
 msgstr "Jauna"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1557
 msgid "New York"
 msgstr "Ņujorka"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1558
 #, fuzzy
 msgid "New York-JFK Arpt"
 msgstr "Jauns"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1559
 #, fuzzy
 msgid "New York-La Guardia"
 msgstr "Jauns"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1561
 msgid "Niagara Falls"
 msgstr "Niagāras Ūdenskritums"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1563
 #, fuzzy
 msgid "Nice-Cote d'Azur"
 msgstr "Jauks"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1564
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "Dimensijas:"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nipawin"
 msgstr "Spānija"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1567
 #, fuzzy
 msgid "Nis"
 msgstr "ir"
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1568
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1569
 #, fuzzy
 msgid "N Las Vegas"
 msgstr "Z"
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "N Myrtle Beach"
 msgstr "Z"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nogales"
 msgstr "Normāls"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Nome"
 msgstr "Nosaukums"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1573
 #, fuzzy
 msgid "Norfolk"
 msgstr "Norfolkas salas"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norfolk NAS"
 msgstr "Norfolkas salas"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "Norrkoping"
 msgstr "Strādā"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Adams"
 msgstr "Ziemeļaustrumu"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1578
 #, fuzzy
 msgid "North Bend"
 msgstr "Ziemeļu"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1579
 msgid "North Carolina"
 msgstr "Ziemeļkarolīna"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Conway"
 msgstr "Norvēģija"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1581
 #, fuzzy
 msgid "North Dakota"
 msgstr "Ziemeļaustrumu"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1582
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1583
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "North Platte"
 msgstr "Ziemeļaustrumu"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northway"
 msgstr "Norvēģija"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "Franču Dienvidu Teritorijas"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwich"
 msgstr "Ziemeļu"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Norwood"
 msgstr "Norvēģija"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1590
 #, fuzzy
 msgid "Notodden"
 msgstr "Piezīme"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1591
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1592
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1593
 msgid "Novosibirsk"
 msgstr "Novosibirska"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1594
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1595
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1596
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "Nav iesākts"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1597
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1598
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1599
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1600
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1601
 #, fuzzy
 msgid "Oakland"
 msgstr "Taizeme"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1602
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Jamaika"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1603
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1604
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Ocala"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Oceanside"
 msgstr "Islande"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Odense"
 msgstr "Viens"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1608
+#, fuzzy
+msgid "Odesa"
+msgstr "Viens"
+
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Oelwen"
 msgstr "Redzēta"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1610
 #, fuzzy
 msgid "Ogden"
 msgstr "Atvērt"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1611
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1612
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1613
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1614
 #, fuzzy
 msgid "Ohrid"
 msgstr "Citi"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1615
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1616
 #, fuzzy
 msgid "Ojika Island"
 msgstr "Kuka Salas"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1617
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1618
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1619
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City"
 msgstr "Oklahomsitija"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1623
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "Britu Virdžīnu Salas"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1625
 #, fuzzy
 msgid "Olathe"
 msgstr "Citi"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1626
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1627
 #, fuzzy
 msgid "Olbia"
 msgstr "Albānija"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1628
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1629
 #, fuzzy
 msgid "Omaha"
 msgstr "Omāna"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1630
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1631
 #, fuzzy
 msgid "Omak"
 msgstr "Omāna"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1633
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1634
 msgid "Omsk"
 msgstr "Omska"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1635
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Ontario"
 msgstr "Orientācija"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oostende"
 msgstr "Apmeklētājs"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1638
 #, fuzzy
 msgid "Oran"
 msgstr "Omāna"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1639
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1640
 #, fuzzy
 msgid "Orange"
 msgstr "Francija"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1641
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1642
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1643
 #, fuzzy
 msgid "Oregon"
 msgstr "Org"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1644
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orland"
 msgstr "Īrija"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1646
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1647
 #, fuzzy
 msgid "Orlando (Orlando International)"
 msgstr "Starptautisks"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1648
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1649
 #, fuzzy
 msgid "Oruro"
 msgstr "Kļūda"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1650
 #, fuzzy
 msgid "Osaka International Airport"
 msgstr "Starptautisks"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1651
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1652
 #, fuzzy
 msgid "Oscoda"
 msgstr "sekunde"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1653
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1654
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1655
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1656
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1657
 #, fuzzy
 msgid "Ostrava"
 msgstr "Austrālija"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1658
 msgid "Ottawa"
 msgstr "Otava"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1659
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1660
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1661
 #, fuzzy
 msgid "Owyhee"
 msgstr "nedēļa"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1662
 msgid "Oxford"
 msgstr "Oksforda"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1663
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1664
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1665
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1666
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1667
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1668
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1669
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1670
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1671
 #, fuzzy
 msgid "Paganella"
 msgstr "Lapa"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1674
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palacios"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1676
 #, fuzzy
 msgid "Palermo"
 msgstr "Papīrs"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1677
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmdale"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palmer"
 msgstr "Peidžers"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1680
 #, fuzzy
 msgid "Palm Springs"
 msgstr "Pasta Uzstādījumi"
 
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1681
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1682
 #, fuzzy
 msgid "Pamplona"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Panama City"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Atsaukts"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Papa"
 msgstr "Papīrs"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1687
 #, fuzzy
 msgid "Paphos"
 msgstr "Laosa"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1689
 msgid "Paris"
 msgstr "Parīze"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1690
 msgid "Paris/Charles De Gaulle"
 msgstr "Parīze/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1691
 msgid "Paris/Le Bourget"
 msgstr "Parīze/Le Bourget"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1692
 msgid "Paris/Orly"
 msgstr "Parīze/Orlī"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1693
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1694
 msgid "Pasco"
 msgstr "Pasko"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1695
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1696
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1697
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1698
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1699
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1700
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1701
 #, fuzzy
 msgid "Patna"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1702
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1703
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1704
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1705
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Paysandu"
 msgstr "Spēlēt Skaņu:"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Payson"
 msgstr "Spēlēt Skaņu:"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pellston"
 msgstr "Jautājums"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pelotas"
 msgstr "Pārlādēt"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1710
 #, fuzzy
 msgid "Pendleton"
 msgstr "Izvēle:"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1711
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1712
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1713
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1714
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1715
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1716
 #, fuzzy
 msgid "Peoria"
 msgstr "Armēnija"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1717
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1718
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1719
 #, fuzzy
 msgid "Perm"
 msgstr "Prim"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1720
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1721
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1722
 #, fuzzy
 msgid "Perth"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1724
 #, fuzzy
 msgid "Perugia"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1725
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1726
 msgid "Petersburg"
 msgstr "Petersburga"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1727
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1728
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1729
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Philip"
 msgstr "Filipīnas"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1731
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Filipīnas"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1732
 #, fuzzy
 msgid "Phillips"
 msgstr "Filipīnas"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1733
 msgid "Phoenix"
 msgstr "Fēniksa"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1736
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1737
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1738
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1739
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1740
 #, fuzzy
 msgid "Pierre"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1741
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1742
 #, fuzzy
 msgid "Pikeville"
 msgstr "Pirmsapskats"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1743
 #, fuzzy
 msgid "Pine Bluff"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1744
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1745
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1746
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1747
 #, fuzzy
 msgid "Pisa"
 msgstr "ir"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1748
 msgid "Pisco"
 msgstr "Pisko"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh"
 msgstr "Pitsburga"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1750
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1751
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1752
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1753
 #, fuzzy
 msgid "Plymouth"
 msgstr "mēnesis"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1754
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1755
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1756
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1757
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1758
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Hope"
 msgstr "Drukāt aploksni"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Lay"
 msgstr "Drukāt Kopsavilkumu"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1761
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Drukāt Vēstuli"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Point Piedras Blanca"
 msgstr "Punkts"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1763
 #, fuzzy
 msgid "Poitiers"
 msgstr "Filtri"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1765
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponca City"
 msgstr "Telefonu Saraksts"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1767
 #, fuzzy
 msgid "Ponce"
 msgstr "Izdarīs"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1768
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1769
 #, fuzzy
 msgid "Pontiac"
 msgstr "_Kontaktēties"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1770
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1771
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Poprad"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1773
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Drukāt Kalendāru"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Alsworth"
 msgstr "Ports"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1775
 #, fuzzy
 msgid "Port Angeles"
 msgstr "Drukāt Aploksni"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1776
 #, fuzzy
 msgid "Port-Au-Prince"
 msgstr "Ports"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Port Elizabeth"
 msgstr "Ports"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Porterville"
 msgstr "Pirmsapskats"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Drukāt vizītkarti"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1780
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Port Heiden"
 msgstr "Ports"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Portland"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1783
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1784
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "Progress"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1785
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Portoroz"
 msgstr "Portrets"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1787
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Portrets"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1788
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1789
 #, fuzzy
 msgid "Port Said"
 msgstr "Portrets"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1790
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1792
 #, fuzzy
 msgid "Posadas"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1793
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1794
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1795
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poza Rica"
 msgstr "Kostarika"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Poznan"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1798
 #, fuzzy
 msgid "Praha"
 msgstr "Paragvaja"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1799
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "Daļēji smalks lietus"
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1800
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1801
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Drukāšanas Pirmsapskats"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1802
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1803
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Pretoria"
 msgstr "Armēnija"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Preveza"
 msgstr "Pirmsapskats"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Price-Carbon"
 msgstr "Pitkērna"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Pristina"
 msgstr "Tradicionālā"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Providence"
 msgstr "_Rajons/Štats/Province:"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provincetown"
 msgstr "Pirmsapskats"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1810
 #, fuzzy
 msgid "Provo"
 msgstr "Prof"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1811
 msgid "Pskov"
 msgstr "Pskova"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1812
 #, fuzzy
 msgid "Pucallpa"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1813
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Puebla"
 msgstr "Publisks"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1815
 #, fuzzy
 msgid "Pueblo"
 msgstr "Publisks"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1816
 #, fuzzy
 msgid "Puerto Barrios"
 msgstr "Puerto Riko"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1817
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Escondido"
 msgstr "Puerto Riko"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "Puerto Riko"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1820
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Puerto Riko"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1821
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1822
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "Puerto Riko"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1823
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "Puerto Riko"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1825
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "Drukāt Kopsavilkumu"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1826
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pula"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1828
 #, fuzzy
 msgid "Pullman"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1829
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1830
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Drukāt Kalendāru"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1831
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1832
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1833
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1834
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1835
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quantico"
 msgstr "Jautājums"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1838
 msgid "Quebec"
 msgstr "Kvebeka"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1839
 msgid "Quebec City"
 msgstr "Kvebeksitija"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1840
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1841
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1842
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1843
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1844
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1845
 msgid "Rabat"
 msgstr "Rabata"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1846
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1847
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1848
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1849
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1850
 #, fuzzy
 msgid "Rapid City"
 msgstr "Atbildēts uz"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1851
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1852
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Rawlins"
 msgstr "Lietus"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Reading"
 msgstr "Pozīcijas"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Rebun Island"
 msgstr "Bouveta Sala"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1856
 #, fuzzy
 msgid "Recife"
 msgstr "Saņemts"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1857
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redding"
 msgstr "Pozīcijas"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redig"
 msgstr "Lasīt"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1860
 #, fuzzy
 msgid "Redmond"
 msgstr "Atgādinājums"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1861
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1862
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1863
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1864
 #, fuzzy
 msgid "Regina"
 msgstr "Reģioni"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1865
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Rennes"
 msgstr "Atgādinājumi"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Reno"
 msgstr "Reinjona"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1868
 #, fuzzy
 msgid "Renton"
 msgstr "Reinjona"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1869
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reus"
 msgstr "Noteikumi"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1871
 #, fuzzy
 msgid "Reyes"
 msgstr "Atbildēt"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1872
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Reynosa"
 msgstr "Pārlādēt"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Somija"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1875
 #, fuzzy
 msgid "Rhode Island"
 msgstr "Faroe Salas"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1876
 #, fuzzy
 msgid "Riberalta"
 msgstr "Gibraltārs"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1877
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "Iesauka"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rieti"
 msgstr "Haiti"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rifle"
 msgstr "Loma"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1881
 msgid "Riga"
 msgstr "Rīga"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1882
 #, fuzzy
 msgid "Rijeka"
 msgstr "Lasīt"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1883
 #, fuzzy
 msgid "Rimini"
 msgstr "Rumānija"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1884
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1885
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1886
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1887
 #, fuzzy
 msgid "Rioja"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1888
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "Nikaragva"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1889
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "Britu Virdžīnu Salas"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1891
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1892
 #, fuzzy
 msgid "Rivera"
 msgstr "Libērija"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1893
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Riverside/March AFB"
 msgstr "Marts"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1895
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "Libērija"
+
+#: my-evolution/Locations.h:1897
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Riyadh"
 msgstr "Lasīt"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1899
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1900
 #, fuzzy
 msgid "Roatan"
 msgstr "Horvātija"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1901
 #, fuzzy
 msgid "Robore"
 msgstr "pirms"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1902
 msgid "Rochester"
 msgstr "Rokčestera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1903
 msgid "Rockford"
 msgstr "Rokforda"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1904
 #, fuzzy
 msgid "Rockland"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1905
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1906
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1907
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1908
 #, fuzzy
 msgid "Rodos"
 msgstr "Istaba"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1909
 #, fuzzy
 msgid "Rogers"
 msgstr "Mapes"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1910
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "Rumānija"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1911
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1913
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1914
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1915
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1916
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1917
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1918
 #, fuzzy
 msgid "Roros"
 msgstr "Istaba"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1919
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Rosario"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1921
 msgid "Roseburg"
 msgstr "Rizenburga"
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1922
 #, fuzzy
 msgid "Roseglen"
 msgstr "Loma"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1923
 #, fuzzy
 msgid "Rost"
 msgstr "Resursdators"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1924
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1925
 msgid "Roswell"
 msgstr "Rozvela"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1926
 msgid "Rotterdam"
 msgstr "Roterdama"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1927
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1928
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1929
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1930
 msgid "Russell"
 msgstr "Rusella"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1931
 msgid "Russia"
 msgstr "Krievija"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1932
 #, fuzzy
 msgid "Rutland"
 msgstr "Butāna"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1933
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1934
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1935
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1936
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1937
 #, fuzzy
 msgid "Sacramento"
 msgstr "Pievienojums"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1938
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1939
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1940
 #, fuzzy
 msgid "Saginaw"
 msgstr "Spānija"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1941
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1942
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1943
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1944
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1945
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1947
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Saint Paul"
 msgstr "Sentlūsija"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Saiq"
 msgstr "Sd"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1950
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1951
 #, fuzzy
 msgid "Salem"
 msgstr "Saglabāt"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salida"
 msgstr "Somālija"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1953
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1954
 #, fuzzy
 msgid "Salina"
 msgstr "Somālija"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salinas"
 msgstr "Somālija"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1956
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salmon"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1958
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1959
 #, fuzzy
 msgid "Salta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1960
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1961
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1962
 #, fuzzy
 msgid "Salto"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1963
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Salvador"
 msgstr "Elsalvadora"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1965
 msgid "Salzburg"
 msgstr "Zalcburga"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samara"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1967
 #, fuzzy
 msgid "Samos"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1968
 #, fuzzy
 msgid "Samsun"
 msgstr "Sv"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1969
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1970
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1971
 #, fuzzy
 msgid "San Angelo"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1972
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1973
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1974
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1975
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "San Carlos"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sandane"
 msgstr "Sudāna"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1978
 #, fuzzy
 msgid "Sandberg"
 msgstr "Sūtītajs"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1979
 #, fuzzy
 msgid "Sanderson"
 msgstr "Sūtītajs"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1980
 msgid "San Diego"
 msgstr "San Diēgo"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1984
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1985
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1986
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sand Point"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1988
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sanford"
 msgstr "priekš"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1990
 msgid "San Francisco"
 msgstr "Sanfrancisko"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "Sangju"
 msgstr "Ēnojums"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1992
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1993
 #, fuzzy
 msgid "San Joaquin"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1994
 #, fuzzy
 msgid "San Jose"
 msgstr "Saglabāt"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1995
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Jose del Cabo"
 msgstr "del"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1997
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "San Juan"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1999
 msgid "Sankt-Peterburg"
 msgstr "Sanktpētersburga"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:2000
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "Somālija"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:2001
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:2002
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:2003
 #, fuzzy
 msgid "San Miguel"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:2004
 #, fuzzy
 msgid "San Nicholas Island"
 msgstr "Norfolkas salas"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:2005
 #, fuzzy
 msgid "San Salvador"
 msgstr "Elsalvadora"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:2006
 #, fuzzy
 msgid "San Sebastian"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:2007
 #, fuzzy
 msgid "Santa Ana"
 msgstr "Sentlūsija"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:2008
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:2009
 msgid "Santa Cruz"
 msgstr "Santa Krūza"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:2010
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santa Maria"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2012
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santa Monica"
 msgstr "Sentlūsija"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2014
 #, fuzzy
 msgid "Santander"
 msgstr "Sūtītajs"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2015
 #, fuzzy
 msgid "Santarem"
 msgstr "Katara"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2016
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2017
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2018
 #, fuzzy
 msgid "Santiago"
 msgstr "Sentlūsija"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2019
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2020
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2021
 #, fuzzy
 msgid "Santorini"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2022
 #, fuzzy
 msgid "Santos"
 msgstr "Status"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2023
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2024
 #, fuzzy
 msgid "Sao Luiz"
 msgstr "Sentlūsija"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2025
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2026
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2027
 msgid "Sarajevo"
 msgstr "Sarājeva"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2028
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarasota"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2030
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2031
 #, fuzzy
 msgid "Sarzana"
 msgstr "Šri Lanka"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2032
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2033
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2034
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2036
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2037
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2038
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2039
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2040
 #, fuzzy
 msgid "Sayun"
 msgstr "Sv"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2041
 #, fuzzy
 msgid "Scatsta"
 msgstr "Status"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2042
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2043
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2044
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2045
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2046
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Scranton"
 msgstr "Organizācija"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2048
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "Uzstādījumi"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2050
 #, fuzzy
 msgid "Sedalia"
 msgstr "Somālija"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2051
 #, fuzzy
 msgid "Seeb"
 msgstr "Redzēta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2052
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2053
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "Sākam importu"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2054
 #, fuzzy
 msgid "Seoul E Ab"
 msgstr "A"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2055
 #, fuzzy
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Starptautisks"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2056
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2057
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2058
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2059
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Seward"
 msgstr "Meklēšana"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2061
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Shanghai"
 msgstr "Ēnojums"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2063
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharjah"
 msgstr "Meklēšana"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2065
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Sharurah"
 msgstr "Sesdiena"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2067
 #, fuzzy
 msgid "Shawbury"
 msgstr "Sesdiena"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Shearwater"
 msgstr "Sākuma Datums"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2069
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Sheldon"
 msgstr "Zviedrija"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2071
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Shelton"
 msgstr "Izvēle:"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2073
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2074
 #, fuzzy
 msgid "Sheridan"
 msgstr "Sudāna"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2075
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2076
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2077
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2078
 #, fuzzy
 msgid "Shiraz"
 msgstr "Izmērs"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2079
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2080
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2081
 #, fuzzy
 msgid "Shoreham"
 msgstr "Rezultāts"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2082
 #, fuzzy
 msgid "Show Low"
 msgstr "Parādīt"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2083
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2084
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2085
 #, fuzzy
 msgid "Sidney"
 msgstr "Izmērs"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2086
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2087
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2088
 msgid "Silver City"
 msgstr "Silversitija"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2089
 msgid "Sindal"
 msgstr "Sindala"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2091
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2092
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2093
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2094
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2095
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2096
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2097
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2098
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2099
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2100
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2101
 #, fuzzy
 msgid "Skwentna"
 msgstr "Nosūtīts"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2102
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Smithers"
 msgstr "Filtri"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2106
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2107
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2108
 msgid "Sochi"
 msgstr "Soči"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2109
 #, fuzzy
 msgid "Socorro"
 msgstr "Rezultāts"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Socotra"
 msgstr "Rezultāts"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2111
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2112
 msgid "Sofia"
 msgstr "Sofija"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2113
 msgid "Sogndal"
 msgstr "Sogndala"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2114
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2115
 msgid "Somerset"
 msgstr "Somerseta"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2116
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Sūtītajs"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2117
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2118
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2120
 msgid "Southampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "South Bend"
 msgstr "Dienvidu"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2122
 msgid "South Carolina"
 msgstr "Dienvidkarolīna"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2123
 #, fuzzy
 msgid "South Dakota"
 msgstr "Dienvidaustrumu"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2124
 #, fuzzy
 msgid "Southend"
 msgstr "Dienvidu"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2125
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "Maršala Salas"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2126
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2128
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Spencer"
 msgstr "Sūtītajs"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2130
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2131
 #, fuzzy
 msgid "Split"
 msgstr "saraksts"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2132
 #, fuzzy
 msgid "Spokane"
 msgstr "Spānija"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2133
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2134
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "Springfield"
 msgstr "Vienkāršā"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2136
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2137
 #, fuzzy
 msgid "State College"
 msgstr "Izpildes Datums:"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2138
 #, fuzzy
 msgid "Stauning"
 msgstr "Sākums:"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2139
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2140
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2141
 #, fuzzy
 msgid "Staverton"
 msgstr "Sākums:"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2142
 #, fuzzy
 msgid "Stavropol"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2143
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2144
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2145
 #, fuzzy
 msgid "Stephenville"
 msgstr "Seišelas"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2146
 #, fuzzy
 msgid "St. George"
 msgstr "St. Helena"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2147
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2148
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2149
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2150
 #, fuzzy
 msgid "St Joseph"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2151
 #, fuzzy
 msgid "St Louis"
 msgstr "Sentlūsija"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2152
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2153
 msgid "Stockholm (Arlanda)"
 msgstr "Stoholma (Arlanda)"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2154
 msgid "Stockholm (Bromma)"
 msgstr "Stoholma (Broma)"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2155
 msgid "Stockton"
 msgstr "Stoktona"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2156
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2157
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Šri Lanka"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2159
 #, fuzzy
 msgid "Stornoway"
 msgstr "Norvēģija"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2160
 msgid "St Paul"
 msgstr "Santpaula"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2161
 msgid "St Petersburg"
 msgstr "Santpētersburga"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2162
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2163
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2164
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "Slomona Salas"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2166
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "Sesdiena"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2168
 msgid "Stuttgart"
 msgstr "Štutgarte"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sucre"
 msgstr "Rezultāts"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2170
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Luksemburga"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2171
 #, fuzzy
 msgid "Sumter"
 msgstr "Kopsavilkums"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2172
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2173
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2174
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2175
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2177
 msgid "Sutton"
 msgstr "Sutona"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2178
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2179
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2180
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2182
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2184
 msgid "Sydney"
 msgstr "Sidneja"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2185
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2186
+#, fuzzy
+msgid "Sympheropol"
+msgstr "Stop"
+
+#: my-evolution/Locations.h:2187
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2188
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2189
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Tradicionālā"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2191
 msgid "Tabriz"
 msgstr "Tabriza"
 
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2192
 msgid "Tabuk"
 msgstr "Tabuka"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2193
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2194
 #, fuzzy
 msgid "Tacna"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2195
 msgid "Tacoma"
 msgstr "Takoma"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2196
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2197
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2198
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2199
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2200
 #, fuzzy
 msgid "Taejon"
 msgstr "Tad"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2201
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2202
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2203
 msgid "Taif"
 msgstr "Taifa"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2204
 msgid "Tainan"
 msgstr "Tainana"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Taivāna"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2207
 msgid "Taiz"
 msgstr "Taiza"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2208
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2209
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Lidosta"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2210
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2211
 msgid "Talinn"
 msgstr "Talina"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2212
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2213
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2214
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2215
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampa"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2217
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tampere"
 msgstr "Papīrs"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2219
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Tanana"
 msgstr "Taivāna"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2221
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2222
 msgid "Taos"
 msgstr "Taosa"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Taivāna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2224
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Taranto"
 msgstr "Taivāna"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2226
 #, fuzzy
 msgid "Tarbes"
 msgstr "Tests"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tarija"
 msgstr "Taivāna"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2228
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2229
 #, fuzzy
 msgid "Tatalina"
 msgstr "Tradicionālā"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2230
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2231
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2232
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2233
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2234
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2235
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2236
 #, fuzzy
 msgid "Tela"
 msgstr "Tokelau"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2237
 #, fuzzy
 msgid "Temple"
 msgstr "Telekss"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2238
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2239
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2240
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2241
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2242
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2243
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2244
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2245
 msgid "Texas"
 msgstr "Teksasa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2246
 #, fuzzy
 msgid "The Dalles"
 msgstr "Seišelas"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2247
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2248
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2249
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thisted"
 msgstr "Amats"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2251
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Thumrait"
 msgstr "Ceturdiena"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2253
 #, fuzzy
 msgid "Tianjin"
 msgstr "Taivāna"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2254
 #, fuzzy
 msgid "Tijuana"
 msgstr "Lietuva"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2255
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2256
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2257
 msgid "Tirana"
 msgstr "Tirāna"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2258
 #, fuzzy
 msgid "Tiree"
 msgstr "Laiks"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2259
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2260
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2261
 #, fuzzy
 msgid "Titusville"
 msgstr "Amats"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2262
 #, fuzzy
 msgid "Tivat"
 msgstr "Privāts"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2263
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2264
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2265
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2266
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2267
 msgid "Tokachi GSDF"
 msgstr "Tokačī GSDF"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2268
 msgid "Tokunoshima Island"
 msgstr "Tokunošimas Sala"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2269
 msgid "Tokushima Ab"
 msgstr "Tokušima Ab"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2270
 msgid "Tokyo Heliport"
 msgstr "Tokijo Heliosta"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2271
 msgid "Tokyo International Airport"
 msgstr "Tokijo Internacionālā Lidosta"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2272
 msgid "Tokyo New International Airport"
 msgstr "Tokijas Jaunā Internacionālā Lidosta"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2273
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2274
 msgid "Toluca"
 msgstr "Toluka"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2275
 #, fuzzy
 msgid "Tonopah"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2276
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2277
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2278
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2279
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2280
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2281
 msgid "Torp"
 msgstr "Torpa"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2282
 msgid "Torrance"
 msgstr "Torance"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2283
 msgid "Torreon"
 msgstr "Toreona"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2284
 msgid "Tottori Airport"
 msgstr "Totori Lidosta"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2285
 msgid "Toulouse"
 msgstr "Tulūza"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2286
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2287
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2288
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2289
 msgid "Townsville"
 msgstr "Tovnsvila"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2290
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2291
 #, fuzzy
 msgid "Trabzon"
 msgstr "Gabona"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2292
 msgid "Trapani"
 msgstr "Trapānī"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2293
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2294
 msgid "Trelew"
 msgstr "Treleva"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2295
 msgid "Trenton"
 msgstr "Trentona"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2296
 msgid "Trevico"
 msgstr "Treviko"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2297
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2298
 #, fuzzy
 msgid "Treviso/S.Angelo"
 msgstr "D"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2299
 msgid "Trieste"
 msgstr "Triesta"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2300
 msgid "Trinidad"
 msgstr "Trinidada"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2301
 msgid "Tripoli"
 msgstr "Tripolī"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2302
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2303
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2304
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2305
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2306
 #, fuzzy
 msgid "Truckee"
 msgstr "Turcija"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2307
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2308
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2309
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2310
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2311
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2312
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2313
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2314
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2315
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tulcea"
 msgstr "Otradiena"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Tulsa"
 msgstr "Otradiena"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Tupelo"
 msgstr "Tips"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2319
 #, fuzzy
 msgid "Turaif"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turin"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2322
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2323
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2324
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2325
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2326
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2327
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyler"
 msgstr "gads"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2329
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2330
 #, fuzzy
 msgid "Tyumen"
 msgstr "Tad"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2331
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2332
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2333
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2335
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2336
 msgid "Ulsan"
 msgstr "Ulsana"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2337
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2338
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2339
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2340
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2341
 msgid "United Arab Emirates "
 msgstr "Apvienotie Arābu Erimāti"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2344
 msgid "Unst"
 msgstr "Unsta"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2345
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2346
 #, fuzzy
 msgid "Uruapan"
 msgstr "Japāna"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2347
 msgid "Uruguaiana"
 msgstr "Urugāna"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2349
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2350
 msgid "Utah"
 msgstr "Jūta"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2351
 msgid "Utica"
 msgstr "Utika"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2352
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2353
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vadso"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2356
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Mainīgs"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2357
 msgid "Vagar"
 msgstr "Vagara"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2358
 msgid "Valdez 2"
 msgstr "Valdeza 2"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2359
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2360
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2361
 msgid "Valencia"
 msgstr "Valencija"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2362
 msgid "Valentine"
 msgstr "Valentīna"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2363
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2364
 msgid "Valkenburg"
 msgstr "Valkenburga"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2365
 msgid "Valley"
 msgstr "Valeja"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2366
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2367
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2368
 msgid "Van"
 msgstr "Vana"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2369
 msgid "Vancouver"
 msgstr "Vankuvera"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2370
 msgid "Vandel"
 msgstr "Vandela"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2371
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2372
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2373
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2374
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2375
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2376
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2377
 msgid "Vasteras"
 msgstr "Vastertas"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2378
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2379
 msgid "Venezia"
 msgstr "Venēcija"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2381
 msgid "Venice"
 msgstr "Venēcija"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2382
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2383
 msgid "Vermillion"
 msgstr "Vermiliona"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2384
 msgid "Vermont"
 msgstr "Vermonta"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2385
 #, fuzzy
 msgid "Vernal"
 msgstr "Galvenais"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2386
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2387
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2388
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2389
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2390
 msgid "Vicksburg"
 msgstr "Viksburga"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2391
 msgid "Victoria"
 msgstr "Viktorija"
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2393
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2394
 msgid "Vilhena"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2395
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2396
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2397
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2398
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2399
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2400
 msgid "Vilnius"
 msgstr "Viļņa"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2401
 msgid "Virginia"
 msgstr "Virdžīnija"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2402
 msgid "Virginia Beach"
 msgstr "Virdžīnijas Pludmale"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2403
 msgid "Virginia Tech Airport"
 msgstr "Virdžīnijas Tehniskā Lidosta"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2404
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2405
 #, fuzzy
 msgid "Visalia"
 msgstr "Austrālija"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2406
 msgid "Visby"
 msgstr "Visbija"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2407
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2408
 msgid "Vitoria"
 msgstr "Vitorija"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2409
 msgid "Vladikavkaz"
 msgstr "Vladikavkāzs"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2410
 msgid "Vladivostok"
 msgstr "Vladivostoka"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2411
 #, fuzzy
 msgid "Vlieland"
 msgstr "Īrija"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2412
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2413
 msgid "Volgograd"
 msgstr "Volgograda"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2414
 msgid "Volkel"
 msgstr "Volkela"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2415
 #, fuzzy
 msgid "Volk Field"
 msgstr "_No Lauka"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2416
 msgid "Voronezh"
 msgstr "Voroneža"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2417
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2418
 msgid "Waco"
 msgstr "Vako"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2419
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2420
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2421
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2422
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2423
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Wallops Island"
 msgstr "Maršala Salas"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2425
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2426
 #, fuzzy
 msgid "Warner Robins"
 msgstr "Brīdinājums"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2427
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2428
 msgid "Warszawa"
 msgstr "Varšava"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2429
 msgid "Washington"
 msgstr "Vašigtona"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2430
 msgid "Washington/Dulles"
 msgstr "Vašingtona/Dulles"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Waterbury"
 msgstr "Laikapstākļi"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2432
 msgid "Waterloo"
 msgstr "Vaterlo"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2433
 #, fuzzy
 msgid "Watertown"
 msgstr "Laikapstākļi"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2434
 msgid "Waterville"
 msgstr "Vatervilla"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2435
 msgid "Waukesha"
 msgstr "Vakeša"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2436
 msgid "Wausau"
 msgstr "Vausau"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2437
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2438
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2439
 msgid "Webster City"
 msgstr "Vebstersitija"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wejh"
 msgstr "Tr"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2441
 msgid "Wellington"
 msgstr "Velingtona"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2442
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Laikapstākļi"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2443
 msgid "Wendover"
 msgstr "Vendovera"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2444
 msgid "West Atlanta"
 msgstr "Rietumu Atlanta"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "West Burke"
 msgstr "Rietumeuropas"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2446
 msgid "Westerland"
 msgstr "Vesterlande"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2447
 msgid "Westfield"
 msgstr "Vestfilda"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2448
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2449
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2450
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2451
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2452
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2453
 #, fuzzy
 msgid "Wheeling"
 msgstr "Satikšanās"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2454
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "Ziemassvētku Sala"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2455
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2456
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2457
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2458
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2459
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2460
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2461
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2462
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2463
 #, fuzzy
 msgid "Wick"
 msgstr "Iesauka"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2464
 #, fuzzy
 msgid "Wien"
 msgstr "Tr"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2465
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2466
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2467
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2468
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2469
 msgid "Williston"
 msgstr "Vilingstona"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2470
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2471
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2472
 msgid "Wilmington"
 msgstr "Vilmingtona"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2473
 msgid "Winchester"
 msgstr "Vinčestera"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2474
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2475
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2476
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2477
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2478
 msgid "Winnipeg"
 msgstr "Vinipega"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2479
 msgid "Winslow"
 msgstr "Vinslova"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2480
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2481
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2482
 msgid "Winter Park"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2483
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2484
 msgid "Wisconsin"
 msgstr "Viskonsīna"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2485
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2486
 #, fuzzy
 msgid "Wise"
 msgstr "ir"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2487
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2488
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "Honkonga"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Wooster"
 msgstr "Kājene:"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worcester"
 msgstr "visu laiku"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2492
 #, fuzzy
 msgid "Worland"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2493
 #, fuzzy
 msgid "Worthington"
 msgstr "Strādā"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2494
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2495
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2496
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2497
 #, fuzzy
 msgid "Wyoming"
 msgstr "Strādā"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2498
 msgid "Xiamen"
 msgstr "Ksiamena"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2499
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2500
 msgid "Yakima"
 msgstr "Jakima"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2501
 msgid "Yakushima"
 msgstr "Jukašima"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2502
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2503
 msgid "Yakutsk"
 msgstr "Jakutska"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2504
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2505
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2506
 msgid "Yankton"
 msgstr "Janktona"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2507
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2508
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2509
 msgid "Yekaterinburg"
 msgstr "Jekaterinburga"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2510
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2511
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2513
 msgid "Yenbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2514
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2515
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2516
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2517
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2518
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2519
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2520
 msgid "Yoro"
 msgstr "Joro"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2521
 msgid "Yosu"
 msgstr "Josu"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2522
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2523
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2525
 msgid "Yukon"
 msgstr "Jukona"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2526
 msgid "Yuma MCAS"
 msgstr "Juma MCAS"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2527
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2528
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2529
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2530
 msgid "Zadar"
 msgstr "Zadara"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2531
 msgid "Zagreb"
 msgstr "Zagreba"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2532
 msgid "Zakinthos"
 msgstr "Zakintos"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2533
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2534
 msgid "Zanesville"
 msgstr "Zanesvila"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2535
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2536
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2537
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2538
 msgid "Zurich"
 msgstr "Cīriha"
 
+#: my-evolution/component-factory.c:51
+#, fuzzy
+msgid "Folder containing the Evolution Summary"
+msgstr "Mape"
+
+#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
+msgid "Appointments"
+msgstr "Satikšanās"
+
+#: my-evolution/e-summary-calendar.c:366
+msgid "No appointments"
+msgstr "Nav satikšanos"
+
+#: 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 "Nav apraksta"
+
+#: my-evolution/e-summary-mail.c:151
+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
+msgid "Local Folders"
+msgstr "Lokālās Mapes"
+
+#. 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:92
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary-preferences.c:471
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Dienas Vārds"
+
+#: my-evolution/e-summary-preferences.c:492
+msgid "Quotes of the Day"
+msgstr "Dienas Citāti"
+
+#: my-evolution/e-summary-preferences.c:720
+#, fuzzy
+msgid "Add a news feed"
+msgstr "Pievienot"
+
+#: my-evolution/e-summary-preferences.c:728
+#, 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
+msgid "Error downloading RDF"
+msgstr "Kļūda lejuplādējot RDF"
+
+#: my-evolution/e-summary-rdf.c:444
+#, fuzzy
+msgid "News Feed"
+msgstr "Ziņas"
+
+#: my-evolution/e-summary-shown.c:463
+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
+#, fuzzy
+msgid "<- Remove"
+msgstr "_Izņemt"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Lietavas"
+
+#: my-evolution/e-summary-tasks.c:251
+msgid "No tasks"
+msgstr "Nav uzdevumu"
+
+#: my-evolution/e-summary-tasks.c:291
+msgid "(No Description)"
+msgstr "(Nav Apraksta)"
+
+#: my-evolution/e-summary-weather.c:71
+msgid "My Weather"
+msgstr "Mani Laikapstākļ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 "Laikapstākļi"
+
+#: 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 "Lūdzu uzgaidiet..."
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Drukāt Kopsavilkumu"
+
+#: my-evolution/e-summary.c:626
+msgid "Printing of Summary failed"
+msgstr "Kopsavilkuma Drukāšana neveiksmīga"
+
+#: my-evolution/main.c:65
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "komponents"
+
+#: my-evolution/metar.c:44
+msgid "Clear sky"
+msgstr "Tīras debesis"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr "Lauzti mākoņi"
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr "Izkliedēti mākoņi"
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr "Daži mākoņi"
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr "Apmācies"
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+msgid "Invalid"
+msgstr "Nepareizs"
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr "Mainīgs"
+
+#: my-evolution/metar.c:64
+msgid "North"
+msgstr "Ziemeļu"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr "Ziemeļu - Ziemeļaustrumu"
+
+#: my-evolution/metar.c:64
+msgid "Northeast"
+msgstr "Ziemeļaustrumu"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr "Austrumu - Ziemeļaustrumu"
+
+#: my-evolution/metar.c:65
+msgid "East"
+msgstr "Austrumu"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr "Austrumu - Dienvidaustrumu"
+
+#: my-evolution/metar.c:65
+msgid "Southeast"
+msgstr "Dienvidaustrumu"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr "Dienvidu - Dienvidaustrumu"
+
+#: my-evolution/metar.c:66
+msgid "South"
+msgstr "Dienvidu"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr "Dienvidu - Dienvidrietumu"
+
+#: my-evolution/metar.c:66
+msgid "Southwest"
+msgstr "Dienvidrietumu"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr "Rietumu - Dienvidrietumu"
+
+#: my-evolution/metar.c:67
+msgid "West"
+msgstr "Rietumu"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr "Rietumu - Ziemeļrietumu"
+
+#: my-evolution/metar.c:67
+msgid "Northwest"
+msgstr "Ziemeļrietumu"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr "Ziemeļu - Ziemeļrietumu"
+
+#. DRIZZLE
+#: my-evolution/metar.c:127
+msgid "Drizzle"
+msgstr "Smalks lietus"
+
+#: my-evolution/metar.c:128
+msgid "Drizzle in the vicinity"
+msgstr "Gaidāms smalks lietus"
+
+#: my-evolution/metar.c:129
+msgid "Light drizzle"
+msgstr "Viegls smalks lietus"
+
+#: my-evolution/metar.c:130
+msgid "Moderate drizzle"
+msgstr "Regulārs smalks lietus"
+
+#: my-evolution/metar.c:131
+msgid "Heavy drizzle"
+msgstr "Spēcīgs smalks lietus"
+
+#: my-evolution/metar.c:132
+msgid "Shallow drizzle"
+msgstr "Mazs smalks lietus"
+
+#: my-evolution/metar.c:133
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:134
+msgid "Partial drizzle"
+msgstr "Daļēji smalks lietus"
+
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
+msgid "Thunderstorm"
+msgstr "Pērkona negaiss"
+
+#: my-evolution/metar.c:136
+msgid "Windy drizzle"
+msgstr "Smalks lietus ar vēju"
+
+#: my-evolution/metar.c:137
+msgid "Showers"
+msgstr "Lietavas"
+
+#: my-evolution/metar.c:138
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:139
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:142
+msgid "Rain"
+msgstr "Lietus"
+
+#: my-evolution/metar.c:143
+msgid "Rain in the vicinity"
+msgstr "Gaidāms lietus"
+
+#: my-evolution/metar.c:144
+msgid "Light rain"
+msgstr "Viegls lietus"
+
+#: my-evolution/metar.c:145
+msgid "Moderate rain"
+msgstr "Regulārs lietus"
+
+#: my-evolution/metar.c:146
+msgid "Heavy rain"
+msgstr "Spēcīgs lietus"
+
+#: my-evolution/metar.c:147
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:148
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:149
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:151
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:152
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:153
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:154
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:157
+msgid "Snow"
+msgstr "Sniegs"
+
+#: my-evolution/metar.c:158
+msgid "Snow in the vicinity"
+msgstr "Gaidāms sniegs"
+
+#: my-evolution/metar.c:159
+msgid "Light snow"
+msgstr "Viegls sniegs"
+
+#: my-evolution/metar.c:160
+msgid "Moderate snow"
+msgstr "Regulārs sniegs"
+
+#: my-evolution/metar.c:161
+msgid "Heavy snow"
+msgstr "Spēcīgs sniegs"
+
+#: my-evolution/metar.c:162
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:163
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:164
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
+msgid "Snowstorm"
+msgstr "Sniega vētra"
+
+#: my-evolution/metar.c:166
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:167
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:168
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:169
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:172
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:173
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:174
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:175
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:176
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:177
+msgid "Shallow snow grains"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:220
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:221
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:222
+msgid "Shallow hail"
+msgstr ""
+
+#: my-evolution/metar.c:223
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:224
+msgid "Partial hail"
+msgstr ""
+
+#: my-evolution/metar.c:225
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:226
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:227
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:228
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:229
+msgid "Freezing hail"
+msgstr ""
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:232
+msgid "Small hail"
+msgstr "Maza Krusa"
+
+#: my-evolution/metar.c:233
+msgid "Small hail in the vicinity"
+msgstr "Gaidāma maza krusa"
+
+#: my-evolution/metar.c:235
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:236
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:237
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:238
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:239
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:240
+msgid "Small hailstorm"
+msgstr "Maza vētra ar krusu"
+
+#: my-evolution/metar.c:241
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:242
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:243
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:244
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:247
+msgid "Unknown precipitation"
+msgstr "Nezināmi nokrišņi"
+
+#: 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 "Nezināms pērkona negaiss"
+
+#: 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 ""
+
+#: my-evolution/metar.c:263
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:264
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:265
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:266
+msgid "Thick mist"
+msgstr ""
+
+#: 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 "Smidzināšana ar vēju"
+
+#: my-evolution/metar.c:273
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:274
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:277
+msgid "Fog"
+msgstr "Migla"
+
+#: my-evolution/metar.c:278
+msgid "Fog in the vicinity"
+msgstr "Gaidāma migla"
+
+#: my-evolution/metar.c:279
+msgid "Light fog"
+msgstr "Viegla migla"
+
+#: my-evolution/metar.c:280
+msgid "Moderate fog"
+msgstr "Regulāra migla"
+
+#: my-evolution/metar.c:281
+msgid "Thick fog"
+msgstr "Bieza migla"
+
+#: my-evolution/metar.c:282
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:283
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:284
+msgid "Partial fog"
+msgstr "Daļēji migla"
+
+#: my-evolution/metar.c:286
+msgid "Fog with wind"
+msgstr "Migla ar vēju"
+
+#: my-evolution/metar.c:288
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:289
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:292
+msgid "Smoke"
+msgstr ""
+
+#: my-evolution/metar.c:293
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:294
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:295
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:296
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:297
+msgid "Shallow smoke"
+msgstr ""
+
+#: my-evolution/metar.c:298
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:299
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
+msgstr ""
+
+#: my-evolution/metar.c:301
+msgid "Smoke with wind"
+msgstr "Dūmaka ar vēju"
+
+#: my-evolution/metar.c:303
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:307
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:308
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:310
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:311
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/metar.c:323
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:324
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:325
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:326
+msgid "Heavy sand"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/metar.c:368
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:369
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:370
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:371
+msgid "Heavy dust"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/metar.c:398
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:399
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:400
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:401
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/metar.c:443
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:445
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:446
+msgid "Raging tornado"
+msgstr ""
+
+#: 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 ""
+
+#: 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
+#, fuzzy
+msgid "Add n_ews feed"
+msgstr "Pievienot n"
+
+#: my-evolution/my-evolution.glade.h:2
+msgid "C_elsius"
+msgstr "C_elsijs"
+
+#: my-evolution/my-evolution.glade.h:4
+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
+msgid "Ma_x number of items shown:"
+msgstr "Parādītais maksimums priekšmetu skaits:"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "Ziņas"
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "One mont_h"
+msgstr "Viens _mēnesis"
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "One w_eek"
+msgstr "Viena n_edēļa"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "R_efresh time (seconds):"
+msgstr "sekundes:"
+
+#: my-evolution/my-evolution.glade.h:10
+#, fuzzy
+msgid "Refresh _time (seconds):"
+msgstr "Atjaunināt sekundes:"
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "S_how full path for folders"
+msgstr "Parādīt pilnu ceļu mapēm"
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Show _all tasks"
+msgstr "Parādīt _visus uzdevumus"
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "Show _today's tasks"
+msgstr "Parādī_t šodienas uzdevumus"
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "Show temperatures in:"
+msgstr "Parādīt temeratūras:"
+
+#: my-evolution/my-evolution.glade.h:15
+msgid "Tasks "
+msgstr "Uzdevumi"
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "Weather settings"
+msgstr "Laikapstākļu uztādījumi"
+
+#: my-evolution/my-evolution.glade.h:17
+msgid "_Fahrenheit"
+msgstr "_Fārenheits"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "_Five days"
+msgstr "_Piecas dienas"
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "_Mail"
+msgstr "_Pasts"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "_News Feeds"
+msgstr "Ziņas"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "_One day"
+msgstr "_Viena diena"
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "_Schedule"
+msgstr "_Saraksts"
+
+#: my-evolution/my-evolution.glade.h:23
+msgid "_Weather"
+msgstr "_Laikapstākļi"
+
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Speciālas Mapes"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution kommandrinda."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Parādīt Detaļas"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Atsaukt Operāciju"
 
-#: shell/e-local-storage.c:174
-#: shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Inbox"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Outbox"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Lokālās Mapes"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution installācija"
 
-#: 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"
@@ -24096,15 +24802,17 @@ msgstr ""
 "Šī jaunā Evolution versija pieprasa uzinstalētus jaunus failus\n"
 "jūsu personālajā direktorijā"
 
-#: shell/e-setup.c:129
+#: 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."
+msgstr ""
+"Lūdzu spiežiet uz \"Labi\" lai instalētu failus, vai \"Atcelt\" lai "
+"izietu."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Nevar korekti atjaunināt failus"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24115,7 +24823,7 @@ msgstr ""
 "%s\n"
 "Kļūda: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -24124,7 +24832,7 @@ msgstr ""
 "Kļūda kopējot failu\n"
 "`%s'."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -24135,7 +24843,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -24146,7 +24854,7 @@ msgstr ""
 "nav pareizas atļaujas. Lūdzu padariet\n"
 "to nolasāmu un sāknējamu un pārstartējiet Evolution."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -24157,7 +24865,7 @@ msgstr ""
 "jābūt izdzēstam lai at atļautu Evolution strādāt pareizi.\n"
 "Lūdzu izdzēsiet šo failu un pārstartējiet Evolution."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -24168,7 +24876,7 @@ msgstr ""
 "Lūdzu pārvietojiet to lai atļautu Evolution\n"
 "instalēt lietotāja failus."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -24182,7 +24890,7 @@ msgstr ""
 "tiek palaista Evolution.\n"
 "Vai jūs vēlaties izdzēst šo direktoriju?"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -24193,49 +24901,53 @@ msgstr ""
 "Evolution direktorija. Lūdzu pārvietojiet to lai\n"
 "atļautu Evolution lietotāja failu instalāciju."
 
-#: 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 "Autortiesības 1999, 2000, 2001 Ximian, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Piedāvā jums"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Nevarēja pārbaudīt mapi: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Nevar pārsaukt mapi:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Nevar pārvietot mapi uz sevi pašu."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Nevar nokopēt mapi uz sevi pašu."
 
-#: 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 "Norādiet mapi uz kurieni kopēt mapi \"%s\":"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Kopēt mapi"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Pārvietot mapi"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24244,18 +24956,18 @@ msgstr ""
 "Nevar izdzēst mapi:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Dzēst \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24264,16 +24976,16 @@ msgstr ""
 "Nevar pārsaukt mapi:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pārdēvēt \"%s\" mapi par:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Pārdēvēt mapi"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24288,7 +25000,7 @@ msgstr ""
 "Nevar izveidot norādīto mapi:\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 - Izveidot jaunu mapi"
 
@@ -24304,8 +25016,7 @@ msgstr ""
 msgid "New..."
 msgstr "Jauns..."
 
-#: 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 "(Nenosaukts)"
 
@@ -24315,17 +25026,20 @@ msgstr "Izvēlieties importētāja tipu:"
 
 #: shell/e-shell-importer.c:145
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
+"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:799
+#: 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 "Lūdzu izvēlieties informāciju, ko jūs vēlētos importēt:"
 
@@ -24342,8 +25056,7 @@ msgstr ""
 "Importētājs nav gatavs.\n"
 "Gaidām 5 minutes, lai mēģinātu velreiz."
 
-#: shell/e-shell-importer.c:263
-#: shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24357,10 +25070,8 @@ msgstr ""
 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:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
 msgid "Evolution Error"
 msgstr "Evolution Kļūda "
 
@@ -24433,8 +25144,7 @@ msgstr "Importēt datus un uzstādijumus no vecākām programmām"
 msgid "Import a single file"
 msgstr "Importēt vienu failu"
 
-#: shell/e-shell-importer.c:732
-#: shell/e-shell-startup-wizard.c:628
+#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24442,13 +25152,11 @@ 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:631
+#: shell/e-shell-importer.c:735 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:754
+#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "No %s:"
@@ -24461,8 +25169,7 @@ msgstr "Izvēlieties mapi"
 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:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importēt"
 
@@ -24483,6 +25190,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Jauna"
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr "Nav norādīts mapes nosaukums."
@@ -24499,88 +25212,95 @@ 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:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy netika atrasts jūsu $PATH"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nevar tikt palaists"
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Par Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Ej uz mapi..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:445
 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:545
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Izveidot jaunu saīsinājumu"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:566
 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:577
-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ā."
-
-#: shell/e-shell-view-menu.c:585
-#, c-format
-msgid "Error executing %s."
-msgstr "Kļūda sāknējot %s."
-
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "_Strādāt Tiešsaistē"
 
-#: shell/e-shell-view-menu.c:701
-#: ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Strādāt Nesaistē"
 
-#: shell/e-shell-view-menu.c:714
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Strādāt Nesaistē"
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Nav atēlota mape)"
 
-#: 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 "(Nekas)"
 
-#: shell/e-shell-view.c:1634
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr "Ximian Evolution pašreiz ir tiešaistē. Klikšķiniet pogu lai strādātu netiešsaistē."
+#: shell/e-shell-view.c:1867
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution pašreiz ir tiešaistē. Klikšķiniet pogu lai strādātu "
+"netiešsaistē."
 
-#: shell/e-shell-view.c:1641
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution ir nesaistes režīmā iešanas procesā."
 
-#: shell/e-shell-view.c:1647
-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ē."
+#: shell/e-shell-view.c:1880
+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ē."
+
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Kļūda no aktivizēšanas sistēmas ir:\n"
+"%s"
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nevar uzstādīt vietējo glabātuvi -- %s"
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24591,20 +25311,23 @@ 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:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Nepareizi argrumenti"
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Nevar reģistrēties uz OAF"
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Konfigurāciju Datubāze nav atrasta"
 
-#: shell/e-shell.c:1892
-#: shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Vispārēja kļūda"
 
@@ -24697,8 +25420,7 @@ msgstr "Pārdēvēt izvēlēto saīsinājumu par:"
 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:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Atvērt _Jaunā Logā"
 
@@ -24722,77 +25444,72 @@ msgstr "_Izņemt"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Izņemt šo saīsinājumu no saīsinājumu joslas"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Kļūda glabājot saīsinājumus."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Saīsinājumi"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Nevar pārsūtīt mapi:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Inbox"
 
-#: shell/e-storage.c:181
-#: shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Nav nosaukuma)"
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Krēsls"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Nav kļūdas"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Mape ar šadu nosaukumu jau eksistē"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Norādītais mapes tips nav pareizs"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "I/O kļūda"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Nav pietiekami vietas, lai izveidotu mapi"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Mape nav tukša"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Norādītā mape netika atrasta"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funkcija nav implementēta šajā glabātuvē"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Operācija nav atbalstīta"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Norādītais tips nav atbalstīts šajā glabātuvē"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "Norādītā mape nevar tikt mainīta vai izņemta"
 
-#: 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:513
 msgid "Cannot create a folder with that name"
 msgstr "Nevar izveidot mapi ar šādu nosaukumu"
 
@@ -24802,106 +25519,114 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% izpildīts)"
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
+
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+" Nezināma kļūda."
+
+#: 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"
+"Kļūda no komponentu sistēmas ir:\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"
+"Kļūda no aktivizēšanas sistēmas ir:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "COBRA kļūda"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Pārtraukts"
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Nepareizs arguments"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Jau ir īpašnieks"
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Nav īpašnieka"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Nav atrasts"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Neatbalstīts tips"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Neatbalstīta shēma"
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Neatbalstīta operācija"
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Iekšēja kļūda"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Izejam"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Nepareizs URI"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Ir apakšmapes"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Nav brīvas vietas"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Vecais īpašnieks ir 'miris'"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-" Nezināma kļūda."
-
-#: 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"
-"Kļūda no komponentu sistēmas ir:\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"
-"Kļūda no aktivizēšanas sistēmas ir:\n"
-"%s"
+#: shell/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "Faila tips:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -24909,7 +25634,9 @@ 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ā"
+msgstr ""
+"Klikšķiniet Labi lai aizvērtu šos savienojumus un ietu nesaistes "
+"režīmā"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "Host"
@@ -25027,320 +25754,277 @@ 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:83
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:89
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution tagad iziet ..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nevar atvērt Ximian Evolution čaulu."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nevar initializēt Ximian Evolution čaulu: %s"
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Deaktivizēt splash ekrānu"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Sākam importu"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Startējam Inteliģentos Importētājus"
+
+#: shell/main.c:320
 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:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nevar initializēt Bonobo komponentu sistēmu."
 
+#: tools/evolution-addressbook-abuse.c:80
 #: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Kļūda ielādējot noklusēto adrešu grāmatu."
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Izejas Fails"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Ievada Fails"
 
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr "Izejas Fails"
+
 #: tools/evolution-addressbook-import.c:80
 msgid "No filename provided."
 msgstr "Nav dots faila nosaukums."
 
-#: ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:6
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Kopēt"
-
 #: ui/evolution-addressbook.xml.h:3
-#: ui/evolution-calendar.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Kopēt izvēlētās vēstules uz citu mapi"
+
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopēt izvēlēto"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "_Kopēt uz Mapi..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Izveidot jaunu kontaktu"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Izveidot jaunu kontaktu sarakstu"
 
-#: ui/evolution-addressbook.xml.h:6
-#: ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "Izgriezt"
-
-#: 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 "Izgriezt izvēlēto"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "Dzēst izvēlētos kontaktus"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Jauns Saraksts"
-
 #: ui/evolution-addressbook.xml.h:13
-#: ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Ievietot"
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Pārvietot izvēlētās vēstules uz citu mapi"
 
 #: ui/evolution-addressbook.xml.h:14
-#: ui/evolution-calendar.xml.h:23
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Pārvietot uz _Mapi..."
+
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Ievietot starpliktuves saturu"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Apskatīt drukājamos kontaktus"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Drukāt izvēlētos kontaktus"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Saglabāt izvēlētos kontaktus kā VCard."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Izvēlēties Visus"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Izvēlēties visus kontaktus"
 
-#: ui/evolution-addressbook.xml.h:23
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "Sūtīt _Vēstuli Kontaktam..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Sūtīt mesi izvēlētajiem kontaktiem."
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Sūtīt vēstuli kontaktam"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Sūtīt izvēlētos kontaktus citai personai."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Apstādināt Ielādi"
 
-#: ui/evolution-addressbook.xml.h:29
-#: ui/evolution-calendar.xml.h:34
-#: 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
-msgid "_Actions"
-msgstr "_Darbības"
-
 #: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr "_Adrešu Grāmatas Avoti..."
+#, fuzzy
+msgid "View the current contact"
+msgstr "pašreizējais laiks"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr "_Kontaktēties"
+#: 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
+msgid "_Actions"
+msgstr "_Darbības"
 
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "_Kontaktu Saraksts"
 
-#: 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 "_Pārsūtīt Kontaktu..."
 
-#: 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 "_Drukāt..."
-
 #: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "Pārvietot uz _Mapi..."
+
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "_Saglabāt kā VCard"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_Meklēt Kontaktus"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Izvēlēties Visu"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Konfigurēt kalendāra uzstādījumus"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "Sūtīt _Vēstuli Kontaktam..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Izveidot Jaunu Visas Dienas _Notikumu"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a New _Task"
-msgstr "Izveidot Jaunu _Uzdevumu"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Izveidot _Jaunu Tikšanos"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "Izveidot notikumu visai dienai"
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Diena"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Dzēst šo tikšanos"
 
-#: ui/evolution-calendar.xml.h:13
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Ej Uz "
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Iet atpakaļ"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Ej uz priekšu"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Ej uz _Datumu"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Ej uz norādīto datumu"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Ej uz šodienu"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Mēnesis"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Jauna Tikšanās"
-
-#: ui/evolution-calendar.xml.h:22
-#: ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr "Jauns Uzdevums"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Parāda kalendāru, kāds tas tiks drukāts"
 
-#: 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 "Drukāšanas _Pirmsapskats"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Drukāt šo kalendāru"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicēt Brīvs/Aizņemts informāciju šim kalendāram"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Parādīt vienu dienu"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Parādīt vienu mēnesi"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Parādīt vienu nedēļu"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Parādīt darba nedēļu"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Nedēļa"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "_Satikšanās..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Kalendāra Uzstādījumi..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "_Publicēt Brīvs/Aizņemts Informāciju"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "_Uzdevums..."
-
-#: ui/evolution-comp-editor.xml.h:2
-#: ui/evolution-contact-editor.xml.h:1
+#: 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-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Aizvērt"
@@ -25349,13 +26033,11 @@ msgstr "Aizvērt"
 msgid "Close this item"
 msgstr "Aizvērt šo priekšmetu"
 
-#: ui/evolution-comp-editor.xml.h:5
-#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 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-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
 #: ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Galvenā rīkjosla"
@@ -25364,26 +26046,22 @@ msgstr "Galvenā rīkjosla"
 msgid "Preview the printed item"
 msgstr "Apskatīt drukāto priekšmetu"
 
-#: ui/evolution-comp-editor.xml.h:10
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Drukāt šo priekšmetu"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Drukāt..."
-
-#: 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:5 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Saglabāt"
 
-#: ui/evolution-comp-editor.xml.h:14
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Saglabāt Kā..."
+
+#: 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 "Saglabāt un Aizvērt"
 
@@ -25395,14 +26073,12 @@ msgstr "Saglabāt šo priekšmetu un aizvērt dialoga logu"
 msgid "Save this item to disk"
 msgstr "Saglabāt šo priekšmetu uz diska"
 
-#: ui/evolution-comp-editor.xml.h:18
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: 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:40
 msgid "_File"
 msgstr "_Fails"
 
@@ -25420,10 +26096,14 @@ msgstr "Nogl_abāt Kā..."
 msgid "Save the contact and close the dialog box"
 msgstr "Saglabāt kontaktu un aizvērt dialoga logu"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "Sūtīt _Vēstuli Kontaktam..."
+
 #: 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 "N_oglabāt"
 
@@ -25455,13 +26135,11 @@ msgstr "Atcelt _Tikšanos"
 msgid "Cancel the meeting for this item"
 msgstr "Atcelt tikšanos šim priekšmetam"
 
-#: 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
 msgid "Forward as i_Calendar"
 msgstr "Pārsūtīt kā iKalendāru"
 
-#: ui/evolution-event-editor.xml.h:4
-#: ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Pārsūtīt šo priekšmetu caur epastu"
 
@@ -25485,6 +26163,10 @@ 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"
@@ -25494,82 +26176,55 @@ msgid "Compose _New Message"
 msgstr "Sastādīt _Jaunu Vēstuli"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Izveidot vai rediģēt pasta kontus un citas preferences"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Izveidot vai rediģēt noteikumus lai filtrētu jauno pastu"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Izveidot vai redīģēt virtuālas mapes definīcijas"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Iztukšot _Atkritumkasti"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Aizmirst _Paroles"
 
-#: 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 "Aizmirst atcerētās paroles, tā ka tās tiks vēlreiz pieprasītas"
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Jauna Vēstule"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Atvērt logu, lai sacerētu pasta vēstuli"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Nekavējoties izņemt visas izdzēstās vēstules no visām mapēm"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "Sūtīt / Saņemt"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Sūtīt sarindoto pastu un saņemt jaunu pastu"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Parādīt vēstules pirmsapskata logu"
 
-#: ui/evolution-mail-global.xml.h:16
+#: 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:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "Virtuālās Mapes R_edaktors..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "_Pasta Vēstule"
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "_Pasta uzstādījumi"
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Apskata Lauks"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "_Sūtīt / Saņemt"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "_"
 
@@ -25602,7 +26257,8 @@ msgid "Hide _Read Messages"
 msgstr "Slēpt Lasītās Vēstules"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Slēpt dzēstās vēstules, nevis attēlot kā pārsvītrotus "
 
 #: ui/evolution-mail-list.xml.h:9
@@ -25621,8 +26277,7 @@ msgstr "Ielikt vēstules tekstu starpliktuvē"
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Pilnīgi izdzēst visas izdzēstās vēstules"
 
-#: ui/evolution-mail-list.xml.h:13
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Izvēlēties _Visu"
 
@@ -25632,11 +26287,15 @@ 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"
+msgstr ""
+"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"
+msgstr ""
+"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"
@@ -25662,17 +26321,15 @@ msgstr "Uz laiku slēpt izvēlētās vēstules"
 msgid "Threaded Message list"
 msgstr "Sasaistīts Vēstuļu saraksts"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_Izdzēst"
 
-#: ui/evolution-mail-list.xml.h:27
-#: ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Mape"
 
-#: ui/evolution-mail-list.xml.h:28
-#: ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Invertēt Izvēlējumu"
 
@@ -25684,147 +26341,157 @@ msgstr "_Rekvizīti..."
 msgid "_Threaded Message List"
 msgstr "_Sasaistīts Vēstuļu saraksts"
 
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Pievienot Sūtītāju Adrešu Grāmatai"
+
 #: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Attiecināt Filtrus"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Pievienot Sūtītāju Adrešu Grāmatai"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Attiecināt fltru noteikumus uz izvēlētajām ziņām"
 
-#: 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 "Sacerēt atbildi visiem izvēlētās vēstules saņēmējiem"
 
-#: 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 "Sacerēt atbildi uz izvēlētās vēstules pasta saraksti"
 
-#: 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 "Sacerēt atbildi izvēlētās vēstules sūtītājam"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopēt izvēlētās vēstules uz citu mapi"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Izveidot _Virtuālu Mapi No Vēstules"
 
-#: 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 "Izveidot noteikumu, lai filtrētu vēstules no šī saņēmēja"
 
-#: 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 "Izveidot noteikumu, lai filtrētu vēstules šiem saņēmējiem"
 
-#: 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 "Izveidot noteikumu, lai filtrētu vēstules šai pasta sarastei"
 
-#: 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 "Izveidot filtra noteikumu vēstulēm ar šādu subjektu"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Izveidot virtuālu mapi šiem saņēmējiem"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Izveidot virtuālu mapi šai pasta sarakstei"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Izveidot virtuālu mapi šim sūtītājam"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Izveidot virtuālu mapi šim subjektam"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Samazināt teksta izmēru"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Parādīt nākošo svarīgo vēstuli"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Parādīt Nakošo vēstuli"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Parādīt nākošo neizlasīto vēstuli"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Parādīt nākošo neizlasīto pavedienu"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Parādīt iepriekšējo svarīgo vēstuli"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Parādīt iepriekšējo vēstuli"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Parādīt iepriekšējo neizlasīto vēstuli"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Pārsūtīt"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filtrs uz Pasta Sarakstes..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filtrs _uz Sūtītāju..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filtrs uz Saņēmējiem..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filtrs uz _Subjektu..."
 
-#: ui/evolution-mail-message.xml.h:30
-msgid "Force images in HTML mail to be loaded"
-msgstr "Ielādēt attēlus HTML pastā "
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward"
-msgstr "Pārsūtīt"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward As"
-msgstr "Pārsūtīt Kā"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Attached"
-msgstr "Pārsūtīt _Pievienotu"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Atzīmēt izvēlētās vēstules dzēšanai"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Inline"
-msgstr "Pārsūtīt Iekštekstā"
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "Pil_ns Vārds..."
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Forward _Quoted"
-msgstr "Pārsūtīt _Citētu"
+msgid "Force images in HTML mail to be loaded"
+msgstr "Ielādēt attēlus HTML pastā "
 
-#: 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 "Pārsūtīt izvēlēto vēstuli jaunas vēstules rumpī"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Pārsūtīt izvēlēto vēstuli citētu kā atbildi"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Pārsūtīt izvēlēto vēstuli kādam"
 
-#: 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 "Pārsūtīt izvēlēto vēstuli kādam kā pievienojumu"
 
@@ -25840,24 +26507,32 @@ msgstr "_Ielādēt Attēlus"
 msgid "Mark as I_mportant"
 msgstr "Iezīmēt kā Svarīgas"
 
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Atzīmēt kā _Neizlasītu"
+
 #: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Iezīmēt _kā Nesvarīgas"
 
 #: 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 "Atzīmēt izvēlētās vēstules kā tikušas izlasītas"
 
 #: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as important"
+#, fuzzy
+msgid "Mark the selected message(s) as important"
 msgstr "Atzīmēt izvēlētās vēstules kā svarīgas"
 
 #: 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 "Atzīmēt izvēlētās vēstules kā neizlasītas"
 
 #: ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as unimportant"
+#, fuzzy
+msgid "Mark the selected message(s) as unimportant"
 msgstr "Atzīmēt izvēlētās vēstules kā nesvarīgas"
 
 #: ui/evolution-mail-message.xml.h:51
@@ -25869,7 +26544,8 @@ msgid "Move"
 msgstr "Pārvietot"
 
 #: ui/evolution-mail-message.xml.h:53
-msgid "Move selected messages to another folder"
+#, fuzzy
+msgid "Move selected message(s) to another folder"
 msgstr "Pārvietot izvēlētās vēstules uz citu mapi"
 
 #: ui/evolution-mail-message.xml.h:54
@@ -25877,64 +26553,62 @@ msgid "Next"
 msgstr "Nākošā"
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Important Message"
+#, fuzzy
+msgid "Next _Important Message"
 msgstr "Nākošā svarīgā vēstule"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Message"
-msgstr "Nākošā Vēstule"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Nākošais Pavediens"
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Next Unread Message"
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Nākošā Neizlasītā Vēstule"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Atvērt izvēlēto vēstuli jaunā logā"
 
-#: 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 "Atvērt norādīto vēstuli komponētājā lai to pārsūtītu"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Oriģinālais Izmērs"
 
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Iepriekšējā Neizlasītā Vēstule"
+
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Iepriekšējā Svarīgā Vēstule"
+
+#: ui/evolution-mail-message.xml.h:63
 msgid "Preview the message to be printed"
 msgstr "Apskatīt vēstuli pirms drukāšanas"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous"
 msgstr "Iepriekšējā"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Important Message"
-msgstr "Iepriekšējā Svarīgā Vēstule"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Message"
-msgstr "Iepriekšējā Vēstule"
-
-#: ui/evolution-mail-message.xml.h:66
-msgid "Previous Unread Message"
-msgstr "Iepriekšējā Neizlasītā Vēstule"
-
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Drukāt šo vēstuli"
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply"
-msgstr "Atbildēt"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Re_direct"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "Reply to All"
-msgstr "Atbildēt Visiem"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Pārsūtīt izvēlēto vēstuli kādam"
 
 #: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
@@ -26005,8 +26679,9 @@ msgid "VFolder on _Subject..."
 msgstr "VMape pēc Subjekta..."
 
 #: ui/evolution-mail-message.xml.h:92
-msgid "_Apply Filters"
-msgstr "_Attiecināt Filtrus"
+#, fuzzy
+msgid "_Attached"
+msgstr "Pievienot"
 
 #: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
@@ -26021,47 +26696,71 @@ msgid "_Forward Message"
 msgstr "_Pārsūtīt Vēstuli"
 
 #: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Ej Uz "
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "Iekļauts"
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Lielāks"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "_Vēstules Attēlošana"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Pārvietot uz Mapi"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Nākošā Vēstule"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Normāla Attēlošana"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_Atvērt Vēstuli"
 
 #: ui/evolution-mail-message.xml.h:106
-#: ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Iepriekšējā Vēstule"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Citēts"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_Rīki"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2
-#: ui/evolution.xml.h:5
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Atdzēst"
+
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 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: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:36
 msgid "_Close"
 msgstr "_Aizvērt"
 
 #: 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:56
 msgid "_View"
 msgstr "_Skatīt"
 
@@ -26069,8 +26768,7 @@ msgstr "_Skatīt"
 msgid "Attach"
 msgstr "Pievienot"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Aizvērt pašreizējo failu"
 
@@ -26086,11 +26784,11 @@ msgstr "Kodēt šo vēstuli ar PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Kodēt šo vēstuli ar tavu S/MIME Kodēšanas Sertifikātu"
 
-#: 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 "For_māts"
 
-#: 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"
 
@@ -26106,6 +26804,10 @@ msgstr "Ievietot failu kā tekstu vēstulē"
 msgid "Insert text file..."
 msgstr "Ievietot teksta failu..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Atvērt"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Atvērt failu"
@@ -26139,7 +26841,7 @@ msgid "Save in folder..."
 msgstr "Saglabāt mapē..."
 
 #: 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 "Saglabāt pašreizējo failu"
 
@@ -26164,6 +26866,7 @@ msgid "Send _later"
 msgstr "Sūtīt _vēlāk"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Sūtīt pastu HTML formātā"
 
@@ -26232,7 +26935,7 @@ msgid "_From Field"
 msgstr "_No Lauka"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Ievietot"
 
@@ -26244,12 +26947,7 @@ msgstr "_Atvērt"
 msgid "_Reply-To Field"
 msgstr "_tbildēt-_Uz Lauks"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Drošība"
-
-#: ui/evolution-signature-editor.xml.h:9
-#: ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Palīdzība"
 
@@ -26305,33 +27003,41 @@ msgstr "Dabūt pēdīgo informāciju par uzdevumu"
 msgid "Re_fresh Task"
 msgstr "Atjau_nināt Uzdevumu"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Konfigurēt uzdevumu skata uzstādījumus"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopēt izvēlēto uzdevumu"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Izgriezt izvēlēto uzdevumu"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "Dzēst izvēlētos uzdevumus"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Dzēst izvēlētos uzdevumus"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "A_tzīmēt kā Izpildītus"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Ievietot uzdevumu no starpliktuves"
 
-#: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings..."
-msgstr "Uzdevumu Uzstādījumi..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Apskatīt drukājamos kontaktus"
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
-msgstr "_Uzdevums"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Drukāt šo vēstuli"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -26398,113 +27104,118 @@ msgid "Open this folder in an other window"
 msgstr "Atvērt šo mapi citā logā"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Sūtīt / Saņemt"
+
+#: ui/evolution.xml.h:22
+#, 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
 msgid "Show information about Ximian Evolution"
 msgstr "Parādīt informāciju par Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Nosūtīt Kļūdu Ziņojumu"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Nosūtīt _Kļūdu Ziņojumu"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Nosūtīt kļūdu ziņojumu izmantojot Bug Buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Norādīt"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Norādīt, vai tiek rādīta mapes josla"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 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:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Norādīt, vai mēs strādājam nesaistes režīmā."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Parādīt izvēlēto mapi"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution VUJ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "_Par Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Kopēt"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "_Mapes Josla"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_Iet Uz Mapi..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "I_mportēt..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Pārvietot..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Jauns"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Jauna Mape"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_Pilot Uzstādījumi..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "Pā_rsaukt..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Sūtīt / Saņemt"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "Ī_sinājumikona"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "Ī_sinājumikonas Josla"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Izmainīt uzstādījumus Kopsavilkumam"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Drukāt Kopsavilkumu"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Pārlādēt"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Pārlādēt skatu"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "_Kopsavilkuma Uzstādījumi..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Adrešu Kartes"
@@ -26518,18 +27229,27 @@ msgid "Phone List"
 msgstr "Telefonu Saraksts"
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "Izvēlēties Mapi"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Pēc Sūtītāja"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Pēc Statusa"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Pēc Subjekta"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Vēstules"
 
@@ -26537,6 +27257,12 @@ msgstr "Vēstules"
 msgid "With Category"
 msgstr "Ar Kategoriju"
 
+#. Check for UTC.
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+msgid "UTC"
+msgstr ""
+
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "Select a Time Zone"
 msgstr "Izvēlieties Laika Zonu"
@@ -26551,17 +27277,29 @@ msgstr "Laika Zonas"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"Lietojiet kreiso peles taustiņu uz kartes lai palielinātu un izvēlietos laika zonu.\n"
+"Lietojiet kreiso peles taustiņu uz kartes lai palielinātu un izvēlietos "
+"laika zonu.\n"
 " Lietojiet labo peles taustiņu lai samazinātu."
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "_Pašreizējais Skats"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "_Pašreizējais Skats"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "_Definēt Skatus"
 
@@ -26576,13 +27314,11 @@ msgstr "MTWTFSS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:234
-#: widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Tagad"
 
-#: widgets/misc/e-cell-date-edit.c:242
-#: widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Šodien"
 
@@ -26595,77 +27331,81 @@ msgstr "Laikam jābūt šādā formātā: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentu vērtībai jābūt starp 0 un 100, ieskaitot"
 
-#: widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "Baltijas"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "Centrāleuropas"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "Ķīniešu"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr "Kirlicas"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "Grieķu"
 
-#: 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 "Japāņu"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Korean"
 msgstr "Korejiešu"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turku"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Unikodes"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Rietumeuropas"
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 msgid "Traditional"
 msgstr "Tradicionālā"
 
-#: 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 "Vienkāršā"
 
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:92
 msgid "Ukrainian"
 msgstr "Ukraiņu"
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "Jauna"
+#: widgets/misc/e-charset-picker.c:95
+#, fuzzy
+msgid "Visual"
+msgstr "Austrālija"
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Nezināma rakstzīmju kopa: %s"
 
-#: widgets/misc/e-charset-picker.c:201
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Ievadiet kādu rakstzīmju kopu lietot"
 
-#: widgets/misc/e-charset-picker.c:276
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Cita..."
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Rakstzīmju Šifrēšana"
 
@@ -26673,25 +27413,23 @@ msgstr "Rakstzīmju Šifrēšana"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Meklēšanas Redaktors"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Saglabāt Meklēšanu"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Pievienot Saglabātajiem Meklējumiem"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Tīrs"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Saglabāt Meklēšanu"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Parādīt Visu"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Pievienot Saglabātajiem Meklējumiem"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -26714,11 +27452,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:334
-msgid "Sear_ch"
-msgstr "M_eklēt"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Atrast Tagad"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Tīrs"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Tīrs"
+
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Atrast Tagad"
 
@@ -26744,3 +27492,990 @@ msgstr "init_corba(): nevar initializēt GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nevar initializēt Bonobo"
 
+#~ msgid "Card: "
+#~ msgstr "Karte:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Vārds: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Priekšvārds:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Dotais:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Pieliktais: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Uzvārds:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Sufikss:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Dzimšanas Datums: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Adrese:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Pasta Kastīte:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  Paplašinājums:         "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Iela:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Pilsēta:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Reģions:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Pasta indekss: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Valsts:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Nosūtijuma Nosaukums: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefoni:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefons:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "E-pasts:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "E-pasts:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Laika Zona: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Geo Location: "
+#~ msgstr ""
+#~ "\n"
+#~ "Ģeolokācija: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "Loma Darijumos: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "Org: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Nosaukums:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Vieniba:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Vienība2: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Vienība3: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Vienība4: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kategorijas: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Komentāri: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Unikālā Virkne: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Publiskā Atslēga: "
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Savienojamies ar LDAP serveri..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Gaidam savienojumu ar LDAP serveri..."
+
+#~ msgid "New _Contact"
+#~ msgstr "Jauns _Kontakts"
+
+#~ msgid "New Contact _List"
+#~ msgstr "Jauns Kontaktu _Saraksts"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Rediģēt Adrešu Grāmatu"
+
+#~ msgid "Account Name"
+#~ msgstr "Konta Vārds"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Pievienot Adrešu Grāmatu"
+
+#~ msgid "Advanced"
+#~ msgstr "Paplašināts"
+
+#~ msgid "Base"
+#~ msgstr "Bāze"
+
+#~ msgid "Server Name"
+#~ msgstr "Servera Vārds"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr ""
+#~ "Zemāk pieprasītā informācija ir nepieciešama, lai pievienotu adrešu "
+#~ "grāmatu."
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ 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."
+#~ 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."
+
+#~ msgid ""
+#~ "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 "
+#~ "informācijas."
+
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Šis ir nosaukums serverim kur jūsu adrešu grāmata atrodas."
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Šis ir ports ko lieto jūsu norādītais ldap serveris."
+
+#~ 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:"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "Ko_ntakti:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Parādīt kontaktus sekojot šādiem kritērijiem:"
+
+#~ 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"
+
+#~ msgid "Republic Of Korea"
+#~ msgstr "Korejas Republika"
+
+#~ 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"
+
+#~ msgid "Create a new task"
+#~ msgstr "Ievietot jaunu uzdevumu"
+
+#~ msgid "New _Task"
+#~ msgstr "Jauns _Uzdevums"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr ""
+#~ "Ievietot jaunu informāciju par satikšanos, izmantojot noklusētajiem "
+#~ "atgādinājumus"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "Pirmā diena _nedēļā:"
+
+#~ 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"
+
+#~ msgid "This is an encrypted message part"
+#~ msgstr "Šī ir kodētā daļa"
+
+#~ msgid "NT Login"
+#~ msgstr "NT Pieteikšanās"
+
+#~ msgid ""
+#~ "EMail: %s\n"
+#~ "Common Name: %s\n"
+#~ "Organization Unit: %s\n"
+#~ "Organization: %s\n"
+#~ "Locality: %s\n"
+#~ "State: %s\n"
+#~ "Country: %s"
+#~ msgstr ""
+#~ "EPasts: %s\n"
+#~ "Vienkārš Vārds: %s\n"
+#~ "Organizācijas Vienība: %s\n"
+#~ "Organizācija: %s\n"
+#~ "Atr. Vieta: %s\n"
+#~ "Rajons, Štats: %s\n"
+#~ "Valsts: %s"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Lūdzu ievadiet %s@%s NNTP paroli"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Serveris noraidīja lietotājvārdu"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Neizdevās nosūtīt lietotājvārdu serverim"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Serveris noraidīja lietotājvārdu/paroli"
+
+#~ msgid "Message %s not found."
+#~ msgstr "Vēstule %s nav atrasta."
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Nevarēja dabūt grupas sarakstu no servera."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Nevar ielādēt grupas saraksta failu %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Nevar saglabāt grupas saraksta failu %s: %s"
+
+#~ msgid "Could not open directory for news server: %s"
+#~ msgstr "Nevarēja atvērt direktoriju ziņu serverim: %s"
+
+#~ msgid "Unable to open or create .newsrc file for %s: %s"
+#~ msgstr "Nevar atvērt vai izveidot .newsrc failu %s: %s"
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Nevarēja pārbaudīt POP serveri jaunām ziņām: %s"
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr "Nevarēja atvērt mapi: vēstuļu saraksts bija nepilnīgs"
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Nevar inest vēstuli: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ msgstr "Nevarēja saņemt vēstuli no POP servera %s: %s"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Nevarēja savienoties ar serveri: %s"
+
+#~ 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ē"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "Nevar nosūtīt vēstuli: nav norādīta sūtītāja adrese."
+
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "RCPT TO atbildes kļūda: %s: pasts nav nosūtīt"
+
+#~ msgid "DATA response error: %s: mail not sent"
+#~ 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"
+
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "QUIT atbildes kļūda: %s: ne fatāli"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Ievadiet mapes URI"
+
+#~ msgid "Message was received"
+#~ msgstr "Ziņa tika saņemta"
+
+#~ msgid "Message was sent"
+#~ msgstr "Ziņa tika nosūtīta"
+
+#~ msgid "on or after"
+#~ msgstr "uz vai pēc"
+
+#~ msgid "on or before"
+#~ msgstr "uz vai pirms"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Pasta glabāšanas mape (iekšējā)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Nevar savienoties ar glabātuvi: %s"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "Jauns Pasta Ziņoju_ms"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Izveidot vMapi no Meklējuma"
+
+#, fuzzy
+#~ msgid "Filter on Mailing List"
+#~ msgstr "Filtrs"
+
+#~ msgid "Indexing:"
+#~ msgstr "Indeksēšana:"
+
+#~ 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"
+
+#~ msgid "_Email Address:"
+#~ msgstr "_Epasta Adrese:"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "Reģistrēt filtra darbības:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organizācija:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Atceries šo paroli"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "_Sūtīt pastu HTML formātā pēc noklusējuma"
+
+#~ msgid "_Server Type: "
+#~ msgstr "_Servera Tips:"
+
+#~ msgid "_Signature file:"
+#~ msgstr "Parak_sta fails:"
+
+#~ msgid "placeholder"
+#~ msgstr "vietmape"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Kopsavilkums komponents."
+
+#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#~ msgstr "<dd><b>Nevar savienoties ar laika ziņu serveri</b></dd>"
+
+#~ 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)"
+
+#~ msgid "New List"
+#~ msgstr "Jauns Saraksts"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Konfigurēt kalendāra uzstādījumus"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Izveidot Jaunu Visas Dienas _Notikumu"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Izveidot Jaunu _Uzdevumu"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Izveidot _Jaunu Tikšanos"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Izveidot notikumu visai dienai"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Satikšanās..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Kalendāra Uzstādījumi..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Uzdevums..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Izveidot vai rediģēt pasta kontus un citas preferences"
+
+#~ msgid "New Message"
+#~ msgstr "Jauna Vēstule"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_Pasta uzstādījumi"
+
+#~ msgid "Forward _Attached"
+#~ msgstr "Pārsūtīt _Pievienotu"
+
+#~ msgid "Forward _Inline"
+#~ msgstr "Pārsūtīt Iekštekstā"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "Pārsūtīt _Citētu"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Attiecināt Filtrus"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Konfigurēt uzdevumu skata uzstādījumus"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Uzdevumu Uzstādījumi..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Izmainīt uzstādījumus Kopsavilkumam"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "_Kopsavilkuma Uzstādījumi..."
+
+#~ msgid "Show All"
+#~ msgstr "Parādīt Visu"
+
+#~ msgid "Sear_ch"
+#~ msgstr "M_eklēt"
diff --git a/po/nl.po b/po/nl.po
index 310971155c..422a9d93e7 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-04-03 22:58+0200\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -39,7 +39,7 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importeert GnomeCard bestanden in Evolution."
 
 #: 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 "Opslaan Als:"
 
@@ -49,7 +49,7 @@ msgid "Name"
 msgstr "Naam"
 
 #: 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 "Email"
 
@@ -65,7 +65,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/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -105,7 +105,7 @@ msgid "Home"
 msgstr "Thuis"
 
 #: 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 "Organisatie"
 
@@ -127,7 +127,7 @@ 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/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Bedrijfsfax"
 
@@ -137,7 +137,7 @@ msgstr "Bedr 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/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax Thuis"
 
@@ -157,7 +157,7 @@ msgstr "Thuis 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/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN Nummer"
 
@@ -165,55 +165,54 @@ msgstr "ISDN Nummer"
 #: 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:112
 msgid "Other"
 msgstr "Overige"
 
 #: 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/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/widgets/e-addressbook-view.c:353
+#: 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/widgets/e-addressbook-view.c:354
+#: 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/widgets/e-addressbook-view.c:355
+#: 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: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/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/widgets/e-addressbook-view.c:359
+#: 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:360
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Web Site"
 msgstr "Website"
 
@@ -222,7 +221,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 "Afdeling:"
 
@@ -231,7 +230,7 @@ msgid "Dep"
 msgstr "Afd"
 
 #: 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 "Kantoor:"
 
@@ -240,12 +239,12 @@ msgid "Off"
 msgstr "Knt"
 
 #: 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 "Functie"
 
 #: 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 "Beroep"
 
@@ -254,7 +253,7 @@ msgid "Prof"
 msgstr "Ber"
 
 #: 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 "Manager"
 
@@ -267,7 +266,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: 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 "Bijnaam"
 
@@ -276,12 +275,12 @@ msgid "Nick"
 msgstr "Bijnaam"
 
 #: 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 "Echtgenoot/Echtgenote"
 
 #: 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 "Opmerkingen"
 
@@ -294,7 +293,7 @@ msgid "CALUri"
 msgstr "KALuri"
 
 #: 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 "Vrij/Bezet URL"
 
@@ -328,11 +327,11 @@ msgstr "Achternaam"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Meerdere Vkaarten"
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "Vkaart voor %s"
@@ -353,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:2738
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Bezig met zoeken..."
 
@@ -366,32 +365,32 @@ msgstr "Bezig met laden..."
 msgid "Error in search expression."
 msgstr "Fout in zoekopdracht."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1129
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Kaart wordt toegevoegd aan LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1232
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Kaart wordt verwijderd van LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1468
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Kaart van LDAP server wordt aangepast..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2592
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
 msgid "Restarting search."
 msgstr "Zoeken wordt herstart."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2684
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "LDAP zoekresultaten komen binnen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2765
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
 #, fuzzy
 msgid "Error performing search"
 msgstr "Fout bij verwijderen kaart"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2789
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "kon URL %s niet verwerken"
@@ -434,300 +433,114 @@ msgid "A Bonobo control for displaying an address."
 msgstr "Een Bonobo control dat een adresboek weergeeft."
 
 #: 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 "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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 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:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution Adresboek minikaartbekijker"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Een component voor het afhandelen van contacten."
 
-#: 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 Minicard control"
 msgstr "Fabriek voor het Adresboek Minikaart control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 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:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 #, fuzzy
-msgid "Factory for the configuration control for the Evolution Addressbook."
+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:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabriek voor het voorbeeld Adresboekcontrol"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid ""
-"This page can be used to configure access to directory servers using the "
-"LDAP protocol"
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Adresboek"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Map met contactinformatie"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "LDAP server met contactinformatie"
 
-#: addressbook/gui/component/addressbook-component.c:560
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Nieuw Contact"
 
-#: addressbook/gui/component/addressbook-component.c:560
-#: ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "C_ontacten...."
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Nieuwe Contactenlijst"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Contact _List"
 msgstr "Contacten _Lijst"
 
-#: addressbook/gui/component/addressbook-config.c:238
-msgid "Edit Addressbook"
-msgstr "Bewerk Adresboek"
-
-#: 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 "Aanmelding bij server middels:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Accountnaam"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Adresboek Toevoegen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Addressbook Sources"
-msgstr "Adresboekbronnen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Uitgebreid"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Basis"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Basis"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr "Controleer dit als de server aanmelding vereist."
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "De_lete"
-msgstr "_Verwijderen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr "Distinguished name (DN)"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "Emailadres"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-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"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolution zal dit emailadres gebruiken om u te identificeren bij de server"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr "Een"
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "Zoek_basis:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
-msgstr "Zoek_gebied: "
-
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Servernaam"
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-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. "
-
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "Deze informatie is niet noodzakelijk voor de meeste LDAP-servers. "
-
-#: 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 ""
-"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."
-
-#: 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 ""
-"Dit is de basisnode voor al uw zoekopdrachten op de LDAP-server. Neem "
-"contact op met uw systeembeheerder voor meer informatie."
-
-#: 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 ""
-"Dit is het maximum aantal kaarten wat zal worden binnengehaald. Als u het te "
-"hoog zet wordt dit adresboek erg langzaam."
-
-#: 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."
-msgstr ""
-"Dit is de methode die evolution zal gebruiken om je aan te melden. Als het "
-"op \"Email adres\" wordt gezet, is anonieme toegang tot de ldap server "
-"vereist."
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-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."
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "Dit is de poort die uw LDAP-server gebruikt."
-
-#: 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 ""
-"Deze naam wordt gebruikt om uw account weer te geven. De naam is alleen voor "
-"weergave-doeleinden."
-
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "_Accountnaam:"
-
-#: 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:179
-msgid "_Add"
-msgstr "_Toevoegen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr "_Distinguished Name:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr "_Downloadlimiet"
-
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:189
-#: ui/evolution-addressbook.xml.h:37 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 "B_ewerken..."
-
-#: addressbook/gui/component/addressbook-config.glade.h:35
-msgid "_Email address:"
-msgstr "_Emailadres:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Poort:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "_Servernaam:"
-
-#: addressbook/gui/component/addressbook-factory.c:70
+#: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
 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:519
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Kan het adresboek niet openen"
 
-#: addressbook/gui/component/addressbook.c:528
+#: 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"
@@ -737,7 +550,7 @@ msgstr ""
 "u een ongeldige URI heeft opgegeven of de LDAPserver\n"
 "down is."
 
-#: addressbook/gui/component/addressbook.c:533
+#: 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"
@@ -749,7 +562,7 @@ msgstr ""
 "moet u het programma vanuit de CVS sources meecompileren\n"
 "nadat u OpenLDAP van de link hierbeneden heeft opgehaald.\n"
 
-#: addressbook/gui/component/addressbook.c:541
+#: 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."
@@ -757,56 +570,47 @@ msgstr ""
 "Kan het adressenboek niet openen.  Controleer of het pad bestaat\n"
 "en of u het mag benaderen."
 
-#: addressbook/gui/component/addressbook.c:649
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Voer uw wachtwoord in voor %s (gebruiker %s)"
 
-#: addressbook/gui/component/addressbook.c:825
+#: addressbook/gui/component/addressbook.c:769
 #, fuzzy
 msgid "Name begins with"
 msgstr "eindigt op"
 
-#: addressbook/gui/component/addressbook.c:826
+#: addressbook/gui/component/addressbook.c:770
 #, fuzzy
 msgid "Email is"
 msgstr "Email 2"
 
-#: addressbook/gui/component/addressbook.c:827
+#: addressbook/gui/component/addressbook.c:771
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categorie is"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:828
+#: addressbook/gui/component/addressbook.c:772
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Elk veld bevat"
 
-#: addressbook/gui/component/addressbook.c:829 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
 msgid "Advanced..."
 msgstr "Uitgebreid..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1057
+#: addressbook/gui/component/addressbook.c:1001
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Elke Categorie"
 
-#: addressbook/gui/component/addressbook.c:1139
+#: addressbook/gui/component/addressbook.c:1083
 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
@@ -855,6 +659,633 @@ 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
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "Adresboekbronnen"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Albany"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anoniem"
+
+#: 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 "Verbinden met server..."
+
+#: 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 "Geen informatie"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "_Verwijderen"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "_Distinguished Name:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Email Address:"
+msgstr "_Emailadres:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+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 zal dit emailadres gebruiken om u te identificeren bij de server"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolution zal dit emailadres gebruiken om u te identificeren bij de server"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "_Zoek"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Algemeen"
+
+#: 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 "Configuratie"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Marges"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_elke"
+
+#: 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 "Een"
+
+#: 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 " (standaard)"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr " (standaard)"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "Zoek_gebied: "
+
+#. 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 "Zoeken"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Alles Selecteren"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Verwijderd"
+
+#: 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 "Bron Informatie"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Verbinden met 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 "Sub"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Niet ondersteund schema"
+
+#: 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 ""
+"Dit is het maximum aantal kaarten wat zal worden binnengehaald. Als u het te "
+"hoog zet wordt dit adresboek erg langzaam."
+
+#: 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 ""
+"Dit is de methode die evolution zal gebruiken om je aan te melden. Als het "
+"op \"Email adres\" wordt gezet, is anonieme toegang tot de ldap server "
+"vereist."
+
+#: 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 ""
+"Deze naam wordt gebruikt om uw account weer te geven. De naam is alleen voor "
+"weergave-doeleinden."
+
+#: 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 "Distinguished name (DN)"
+
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+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
+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:139
+msgid "_Add"
+msgstr "_Toevoegen"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Toevoegen"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Actie Toevoegen"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Actie Toevoegen"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Albany"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "Verwijder Alles"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Weergave"
+
+#: addressbook/gui/component/ldap-config.glade.h:111
+#, fuzzy
+msgid "_Distinguished Name (DN):"
+msgstr "Distinguished name (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 "_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
+#: 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 "B_ewerken..."
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Afspraak bewerken"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution alarm"
+
+#: 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 "_Opties"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Poort:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr " (standaard)"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "Zoek_basis:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Servernaam:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Sluimertijd (minuten)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Account %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "Contactlijstbewerker"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Geen kaarten"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Bezig met opnieuw verbinden met %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 "Algemeen"
+
+#: 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 "Zoeken"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "De adresboeknaam-selectie-interface van Evolution."
@@ -864,7 +1295,7 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factory voor de naamselectie-interface van het Adresboek"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:852
+#: 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
 msgid "Remove"
@@ -895,7 +1326,12 @@ msgstr "(%d niet weergegeven)"
 msgid "Unnamed Contact"
 msgstr "Ander contact"
 
-#: addressbook/gui/component/select-names/e-select-names.c:603
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Verzender bevat"
+
+#: 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"
@@ -911,7 +1347,7 @@ msgstr ""
 "met een gedetailleerde beschrijving van de omstandigheden waaronder\n"
 "deze fout zich voordeed. Heel erg bedankt."
 
-#: addressbook/gui/component/select-names/e-select-names.c:611
+#: 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"
@@ -923,31 +1359,40 @@ msgstr ""
 "U zult waarschijnlijk Evolution moeten sluiten en weer starten\n"
 "om het probleem te verhelpen."
 
-#: addressbook/gui/component/select-names/e-select-names.c:693
+#: addressbook/gui/component/select-names/e-select-names.c:806
 msgid "Select Contacts from Addressbook"
 msgstr "Selecteer Contacten uit het Adresboek"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "be_vat:"
+msgid "Select Names"
+msgstr "Selecteer namen"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "_Zoek"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Contact verwijderen?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Selecteer namen"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Adresboek"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Toon contacten die aan de volgende criteria voldoen:"
+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 "Verplaatsen..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Categorie:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Map:"
 
@@ -1008,11 +1453,6 @@ msgstr "Bewaar Al_s:"
 msgid "Full _Name..."
 msgstr "Volledige _Naam..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: mail/mail-config.glade.h:74
-msgid "General"
-msgstr "Algemeen"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1056,12 +1496,11 @@ 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:707
-#: calendar/gui/e-calendar-table.c:1001 calendar/gui/e-day-view.c:3609
-#: filter/filter.glade.h:8 mail/folder-browser.c:1629
-#: mail/mail-config.glade.h:187 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: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
 msgid "_Delete"
 msgstr "_Verwijderen"
 
@@ -2112,14 +2551,6 @@ 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?"
 
@@ -2153,7 +2584,7 @@ msgid "Edit Full"
 msgstr "Volledig bewerken"
 
 #: 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 "Volledige Naam:"
 
@@ -2368,99 +2799,23 @@ msgstr "Uitgebreid zoeken"
 msgid "Search"
 msgstr "Zoeken"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:136
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Geen kaarten"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:139
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 kaart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d kaarten"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:369
+#: addressbook/gui/widgets/e-addressbook-model.c:370
 msgid "Error getting book view"
 msgstr "Fout bij weergave boekvorm"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: 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 "Opslaan als VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:313
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Openen"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:1017
-#: ui/evolution-addressbook.xml.h:13
-msgid "Forward Contact"
-msgstr "Stuur Contact Door"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1018
-msgid "Send Message to Contact"
-msgstr "Stuur Bericht aan Contact..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:317
-#: 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:65
-#: ui/my-evolution.xml.h:1
-msgid "Print"
-msgstr "Afdrukken"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:319
-#: addressbook/gui/widgets/e-addressbook-view.c:1021
-msgid "Print Envelope"
-msgstr "Envelop Afdrukken..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-msgid "Copy to folder..."
-msgstr "Kopi�ren naar Map..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:324
-#: addressbook/gui/widgets/e-addressbook-view.c:1026
-msgid "Move to folder..."
-msgstr "Verplaatsen naar Map..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
-#: addressbook/gui/widgets/e-addressbook-view.c:1029
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Knippen"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: 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:2
-msgid "Copy"
-msgstr "Kopi�ren"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1031
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:9
-msgid "Paste"
-msgstr "Plakken"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:330
-#: addressbook/gui/widgets/e-addressbook-view.c:1032
-#: filter/libfilter-i18n.h:10 mail/mail-accounts.c:213
-#: 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-table-adapter.c:140
 #: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
@@ -2468,14 +2823,15 @@ msgid "Error modifying card"
 msgstr "Fout bij aanpassen van kaart"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1042
+#: shell/evolution-shell-component.c:1043
 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 shell/e-shell.c:1990
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1079
+#: 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
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -2484,7 +2840,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:1070
+#: shell/evolution-shell-component.c:1071
 msgid "Permission denied"
 msgstr "Operatie niet toegestaan"
 
@@ -2502,9 +2858,9 @@ 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
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2276
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: 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
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
@@ -2536,7 +2892,7 @@ 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:1436
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Fout bij verwijderen kaart"
 
@@ -2555,90 +2911,190 @@ msgid ""
 "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:342
+#: addressbook/gui/widgets/e-addressbook-util.c:344
 msgid "Move card to"
 msgstr "Verplaats kaart naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:346
 msgid "Copy card to"
 msgstr "Kopieer kaart naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Move cards to"
 msgstr "Verplaats kaarten naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:351
 msgid "Copy cards to"
 msgstr "Kopieer kaarten naar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:331
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Klik hier om een contact toe te voegen *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Eerste Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Assistent Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Bedrijfstelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "TerugbelTelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "BedrijfsTelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Thuis Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Bedrijfs Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Huis Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Mobiele Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Autotelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Bedrijf Telefoon-2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Thuis Telefoon-2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:351
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Andere Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Opslaan als VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Nieuw Contact"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Nieuwe Contactenlijst"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Ga naar Map..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Importeer..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Zoek naar Contacten"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Adresboekbronnen"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Pilot Instellingen..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Stuur Contact Door"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Stuur Bericht aan Contact..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Envelop Afdrukken..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Copy to folder..."
+msgstr "Kopi�ren naar Map..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Move to folder..."
+msgstr "Verplaatsen naar Map..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Knippen"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Huidige Weergave"
+
+#. 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:940
 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"
 
@@ -2646,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:585
+#: addressbook/gui/widgets/e-addressbook-view.c:945
 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"
 
@@ -2663,7 +3119,7 @@ msgstr "en ��n andere kaart."
 msgid "Save in addressbook"
 msgstr "Opslaan in het adresboek"
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
@@ -2677,7 +3133,7 @@ msgstr ""
 "\n"
 "Dubbelklik hier om een nieuw Contact te maken."
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
+#: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
 "\n"
 "\n"
@@ -2882,29 +3338,25 @@ msgstr "_Lettertype..."
 msgid "Untitled appointment"
 msgstr "Afspraak zonder titel"
 
-#: 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:416 mail/message-list.c:684
+#: 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
 msgid "High"
 msgstr "Hoog"
 
-#: 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:417 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normaal"
 
-#: 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:418 mail/message-list.c:682
+#: 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
 msgid "Low"
 msgstr "Laag"
 
 #. 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:419
 msgid "Undefined"
 msgstr "Ongedefinieerd"
 
@@ -2994,22 +3446,10 @@ 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
-msgid "Evolution Alarm"
-msgstr "Evolution alarm"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3049,7 +3489,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:2600
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -3099,7 +3539,7 @@ msgstr "Omschrijving bevat"
 msgid "Comment contains"
 msgstr "Commentaar bevat"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1118
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "Niet passend"
 
@@ -3110,7 +3550,7 @@ 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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1421 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3128,26 +3568,24 @@ msgstr "%d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1468
+#: 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:775
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 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:395
 msgid "Private"
 msgstr "Priv�"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:396
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:394
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Openbaar"
 
@@ -3168,32 +3606,27 @@ msgid "W"
 msgstr "W"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:468
 msgid "Free"
 msgstr "Vrij"
 
-#: 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:1064
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:489 calendar/gui/print.c:2267
 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:490 calendar/gui/print.c:2270
 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-calendar-table.c:491 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2273
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -3209,11 +3642,10 @@ 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:1591
-#: mail/mail-account-gui.c:1076 mail/mail-account-gui.c:1077
-#: mail/mail-account-gui.c:1673 mail/mail-accounts.c:426
-#: mail/mail-accounts.c:435 mail/mail-config.glade.h:110
-#: mail/message-tag-followup.c:62
+#: 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
 #: 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
@@ -3230,21 +3662,13 @@ 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/e-meeting-model.c:821
 msgid "Yes"
 msgstr "Ja"
 
 #: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
 msgid "No"
 msgstr "Nee"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1695
-#: calendar/gui/e-week-view.c:1206
-msgid "Searching"
-msgstr "Zoeken"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Dag Weergave"
@@ -3261,8 +3685,8 @@ msgstr "Week Weergave"
 msgid "Month View"
 msgstr "Maand Weergave"
 
-#: calendar/gui/component-factory.c:67 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3270,11 +3694,10 @@ msgstr "Kalender"
 msgid "Folder containing appointments and events"
 msgstr "Folder met afspraken en gebeurtenissen"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/print.c:1754
-#: calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
-#: 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
+#: 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
 msgid "Tasks"
 msgstr "Taken"
@@ -3283,49 +3706,54 @@ msgstr "Taken"
 msgid "Folder containing to-do items"
 msgstr "Map met to-do items"
 
-#: calendar/gui/component-factory.c:690
+#: calendar/gui/component-factory.c:695
 msgid "New meeting"
 msgstr "Nieuwe vergadering"
 
-#: calendar/gui/component-factory.c:690
+#: calendar/gui/component-factory.c:695
 msgid "_Meeting"
 msgstr "_Vergadering"
 
-#: calendar/gui/component-factory.c:694
+#: calendar/gui/component-factory.c:699
 msgid "New task"
 msgstr "Nieuwe Taak"
 
-#: calendar/gui/component-factory.c:694
+#: calendar/gui/component-factory.c:699
 msgid "_Task"
 msgstr "_Taak"
 
-#: calendar/gui/component-factory.c:698
+#: calendar/gui/component-factory.c:703
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/component-factory.c:698
+#: calendar/gui/component-factory.c:703
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Afspraak"
 
-#: calendar/gui/component-factory.c:702
+#: calendar/gui/component-factory.c:707
 msgid "New appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/component-factory.c:702
+#: calendar/gui/component-factory.c:707
 msgid "_Appointment"
 msgstr "_Afspraak"
 
-#: calendar/gui/control-factory.c:103
+#: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/control-factory.c:130
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "De URI die de kalender zal tonen"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "Verander de weergave naar %s"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Geluid Alarm Opties"
@@ -3391,9 +3819,7 @@ msgstr "nogmaals"
 msgid "hours"
 msgstr "uren"
 
-#: 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 "minuten"
 
@@ -3521,7 +3947,7 @@ msgstr "Herinneringen"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samenvatting:"
 
@@ -3550,7 +3976,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:221
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr "minuten"
 
@@ -3591,170 +4017,168 @@ msgid "Color for tasks due today"
 msgstr "Kleur voor taken voor vandaag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Maak een nieuwe afspraken met een standaard _herinnering"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Dagen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Eerste dag van de we_ek:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Uren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Maandag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Verlopen taken:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-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:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "Toon weeknummers in datum navigator"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "Z_on"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Zondag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Taken die vandaag verlopen"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "D_on"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "_Din"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Taken die vandaag verlopen"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "_Taken Lijst"
 
-#: 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 "Donderdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Tijd"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Tijd_zone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Tijd onder_verdeling:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Tijdsformaat:"
 
-#: 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 "Dinsdag"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Werkweek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12-uurs (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24-uurs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "Vraag om bevestiging bij het wissen van items"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "Weekeinden comprimeren in maand weergave"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Weergave"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Vrij"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Algemeen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "Verberg voltooide _taken na"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Maa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Overige"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Verlopen taken:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_Zat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "_Taken Lijst"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Tijd onder_verdeling:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Woe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "voor het begin van de afspraak"
 
@@ -3823,23 +4247,23 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s U heeft niet veranderd, de editor verversen?"
 
-#: 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 " tot "
 
-#: 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 " (Voltooid"
 
-#: 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 "Voltooid"
 
-#: 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 " (Verloopt "
 
-#: 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 "Verloopdatum "
 
@@ -3871,8 +4295,8 @@ msgid "No summary"
 msgstr "Geen samenvatting"
 
 #: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3801
-#: calendar/gui/e-week-view.c:3707 composer/e-msg-composer.c:956
+#: 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
 msgid "Save as..."
 msgstr "Opslaan als..."
 
@@ -3934,7 +4358,7 @@ msgstr "Overdragen Aan:"
 msgid "Enter Delegate"
 msgstr "Voer Gemachtigde in"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2224
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Afspraak"
 
@@ -4001,7 +4425,7 @@ msgid "Pu_blic"
 msgstr "Open_baar"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Toon Tijd Als"
 
@@ -4046,55 +4470,49 @@ msgstr "Aanwezige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "Algemene naam"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Overgedragen Van"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Overgedragen Aan"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Taal"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Lid"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:864
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Rol"
 
-#: 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
+#: 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"
 msgstr "Status"
 
-#: 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:168
+#: 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
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
@@ -4117,27 +4535,98 @@ msgstr "Nod_ig Anderen Uit..."
 msgid "_Other Organizer"
 msgstr "Andere Organisator"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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 "1e"
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "2e"
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "3e"
+
+#: 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 "e"
+
+#: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Deze afspraak bevat herhalingen die Evolution niet kan bewerken."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "op"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "lijst"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "seconde"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Overige"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Noord"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "lijst"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Andere Fax"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "op de"
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr "e"
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr "gebeurtenissen"
 
@@ -4232,7 +4721,7 @@ msgid "Progress"
 msgstr "Voortgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:766
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4244,15 +4733,19 @@ msgstr "_Prioriteit:"
 msgid "_Status:"
 msgstr "_Status:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+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
 msgid "Assignment"
 msgstr "Opdracht"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:812
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:55
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Omschrijving:"
 
@@ -4264,136 +4757,80 @@ msgstr "Be_gindatum:"
 msgid "_Due Date:"
 msgstr "_Verloopdatum:"
 
-#: calendar/gui/e-calendar-table.c:438
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:439
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:440
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:441
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:442
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:443
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:444
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:445
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:446
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:447
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:448
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2744
-#: calendar/gui/e-week-view.c:1846
+#: calendar/gui/e-calendar-table.c:751 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:3583
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1602
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:40
+#: 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
 msgid "_Open"
 msgstr "_Openen"
 
-#: calendar/gui/e-calendar-table.c:974
+#: calendar/gui/e-calendar-table.c:973
 #, fuzzy
 msgid "_Save as..."
 msgstr "Opslaan als..."
 
-#: calendar/gui/e-calendar-table.c:976 calendar/gui/e-day-view.c:3587
-#: calendar/gui/e-week-view.c:3442 calendar/gui/e-week-view.c:3475
-#: ui/evolution-addressbook.xml.h:42 ui/evolution-calendar.xml.h:30
+#: calendar/gui/e-calendar-table.c:974 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 "_Afdrukken..."
 
-#: calendar/gui/e-calendar-table.c:981 calendar/gui/e-day-view.c:3593
-#: calendar/gui/e-week-view.c:3481 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:978 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:983 calendar/gui/e-day-view.c:3595
-#: calendar/gui/e-week-view.c:3483 ui/evolution-addressbook.xml.h:35
+#: calendar/gui/e-calendar-table.c:979 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:985 calendar/gui/e-day-view.c:3559
-#: calendar/gui/e-day-view.c:3597 calendar/gui/e-week-view.c:3447
-#: calendar/gui/e-week-view.c:3485 ui/evolution-addressbook.xml.h:41
+#: calendar/gui/e-calendar-table.c:980 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 "_Plakken"
 
-#: calendar/gui/e-calendar-table.c:990
+#: calendar/gui/e-calendar-table.c:984
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Taak Toewijzen"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Doorsturen als i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:994
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "Markeren als Voltooid"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:987
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markeer de Taken als Voltooid"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_Verwijder de Geselecteerde Taken"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7366
-#: calendar/gui/e-week-view.c:4155
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Objecten worden ververst"
 
-#: calendar/gui/e-calendar-table.c:1354
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Klik hier om een taak toe te voegen"
 
@@ -4401,48 +4838,47 @@ msgstr "Klik hier om een taak toe te voegen"
 msgid "Alarms"
 msgstr "Alarmen"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1055
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Voltooid"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Voltooiingsdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Verloop Datum"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Einddatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Geografische Positie"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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:16
-#: my-evolution/component-factory.c:48 shell/e-shell.c:661
-#: shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Taken Sorteren"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4476,449 +4912,175 @@ msgstr "%02i minuten delingen"
 
 #. 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:1407
-#: 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:1434
+#: 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:632 calendar/gui/e-week-view.c:368
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:371
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3543
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "Nieuwe _Afspraak"
 
-#: calendar/gui/e-day-view.c:3545 calendar/gui/e-week-view.c:3433
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Gebeurtenis voor de hele dag"
 
-#: calendar/gui/e-day-view.c:3547 calendar/gui/e-week-view.c:3435
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nieuwe vergadering"
 
-#: calendar/gui/e-day-view.c:3549 calendar/gui/e-week-view.c:3437
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
 #, fuzzy
 msgid "New Task"
 msgstr "Nieuwe Taak"
 
-#: calendar/gui/e-day-view.c:3554 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Afdrukken..."
 
-#: calendar/gui/e-day-view.c:3564 calendar/gui/e-week-view.c:3452
+#: 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 "Ga Naar _Vandaag"
 
-#: calendar/gui/e-day-view.c:3566 calendar/gui/e-week-view.c:3454
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 msgid "_Go to Date..."
 msgstr "_Ga Naar Datum..."
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
+#: 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 "_Publiceer Beschikbaarheidsinformatie"
 
-#: calendar/gui/e-day-view.c:3576 calendar/gui/e-week-view.c:3464
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
 #: ui/evolution.xml.h:37
 #, fuzzy
 msgid "_Configure..."
 msgstr "Configureer %s"
 
-#: calendar/gui/e-day-view.c:3585 calendar/gui/e-week-view.c:3473
-#: mail/folder-browser.c:1604 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
 msgid "_Save As..."
 msgstr "_Opslaan Als..."
 
-#: calendar/gui/e-day-view.c:3602 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Bijeenkomst Plannen"
 
-#: calendar/gui/e-day-view.c:3604 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Doorsturen als i_Calendar"
 
-#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3499
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "Maak deze Gebeurtenis Verplaatsbaar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3501
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "Verwijder deze Gebeurtenis"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3503
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 msgid "Delete _All Occurrences"
 msgstr "Verwijder alle Gebeurtenissen"
 
-#: calendar/gui/e-itip-control.c:556
-msgid "Meeting begins: <b>"
-msgstr "Vergadering begint: <b>"
-
-#: calendar/gui/e-itip-control.c:561
-msgid "Task begins: <b>"
-msgstr "Taak begint: <b>"
-
-#: calendar/gui/e-itip-control.c:566
-msgid "Free/Busy info begins: <b>"
-msgstr "Vrij/Bezet informatie begint <b>"
-
-#: calendar/gui/e-itip-control.c:570
-msgid "Begins: <b>"
-msgstr "Begint: <b>"
-
-#: calendar/gui/e-itip-control.c:582
-msgid "Meeting ends: <b>"
-msgstr "Einde bijeenkomst: <b>"
-
-#: calendar/gui/e-itip-control.c:585
-msgid "Free/Busy info ends: <b>"
-msgstr "Vrij/Bezet informatie eindigt: <b>"
-
-#: calendar/gui/e-itip-control.c:589
-msgid "Ends: <b>"
-msgstr "Eindigt: <b>"
-
-#: calendar/gui/e-itip-control.c:603
-msgid "Task Completed: <b>"
-msgstr " (Taak Voltooid: <b>"
-
-#: calendar/gui/e-itip-control.c:613
-msgid "Task Due: <b>"
-msgstr "Taak klaar: <b>"
-
-#: calendar/gui/e-itip-control.c:650 calendar/gui/e-itip-control.c:699
-msgid "iCalendar Information"
-msgstr "iCalendar Informatie"
-
-#. Title
-#: calendar/gui/e-itip-control.c:665
-msgid "iCalendar Error"
-msgstr "iCalendar Fout"
-
-#: calendar/gui/e-itip-control.c:730 calendar/gui/e-itip-control.c:746
-msgid "An unknown person"
-msgstr "Een onbekende persoon"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:753
-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:769
-msgid "<i>None</i>"
-msgstr "<i>Geen</i>"
-
-#: calendar/gui/e-itip-control.c:781
-msgid "Status:"
-msgstr "Status:"
-
-#: calendar/gui/e-itip-control.c:786 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
-msgid "Accepted"
-msgstr "Geaccepteerd"
-
-#: calendar/gui/e-itip-control.c:790 calendar/gui/itip-utils.c:326
-msgid "Tentatively Accepted"
-msgstr "Voorlopig Geaccepteerd"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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-itip-control.c:794 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
-msgid "Declined"
-msgstr "Geweigerd"
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
+#, c-format
+msgid "Error executing %s."
+msgstr "Fout bij uitvoeren filter %s."
 
-#: calendar/gui/e-itip-control.c:798 calendar/gui/e-itip-control.c:997
-#: calendar/gui/e-itip-control.c:1068 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: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
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:318
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
 #: 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:844 calendar/gui/e-itip-control.c:860
-#: calendar/gui/e-itip-control.c:876 calendar/gui/e-itip-control.c:889
-#: calendar/gui/e-itip-control.c:902 calendar/gui/e-itip-control.c:915
-msgid "Choose an action:"
-msgstr "Kies een actie:"
-
-#: calendar/gui/e-itip-control.c:845
-msgid "Update"
-msgstr "Verversen"
-
-#: calendar/gui/e-itip-control.c:846 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:917
-#: shell/e-shell.c:1980 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:861
-msgid "Accept"
-msgstr "Accepteren"
-
-#: calendar/gui/e-itip-control.c:862
-msgid "Tentatively accept"
-msgstr "Voorlopig accepteren"
-
-#: calendar/gui/e-itip-control.c:863
-msgid "Decline"
-msgstr "Weigeren"
-
-#: calendar/gui/e-itip-control.c:877
-msgid "Send Free/Busy Information"
-msgstr "Verstuur Vrij/Bezet Informatie"
-
-#: calendar/gui/e-itip-control.c:890
-msgid "Update respondent status"
-msgstr "Ververs antwoordstatus"
-
-#: calendar/gui/e-itip-control.c:903
-msgid "Send Latest Information"
-msgstr "Verstuur Laatste Informatie"
-
-#: calendar/gui/e-itip-control.c:916 calendar/gui/itip-utils.c:343
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: calendar/gui/e-itip-control.c:964
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> heeft bijeenkomstgegevens beschikbaar gemaakt."
-
-#: calendar/gui/e-itip-control.c:965
-msgid "Meeting Information"
-msgstr "Bijeenkomst Informatie"
-
-#: calendar/gui/e-itip-control.c:969
-#, 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:970
-msgid "Meeting Proposal"
-msgstr "Vergadering Voorstel"
-
-#: calendar/gui/e-itip-control.c:974
-#, 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:975
-msgid "Meeting Update"
-msgstr "Vergadering Update"
-
-#: calendar/gui/e-itip-control.c:979
-#, 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:980
-msgid "Meeting Update Request"
-msgstr "VergaderingsUpdate Verzoek"
-
-#: calendar/gui/e-itip-control.c:1003
-#, 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:1004
-msgid "Meeting Reply"
-msgstr "Bijeenkomst Antwoord"
-
-#: calendar/gui/e-itip-control.c:1008
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> heeft een bijeenkomst geannuleerd."
-
-#: calendar/gui/e-itip-control.c:1009
-msgid "Meeting Cancellation"
-msgstr "Bijeenkomst Annulering"
-
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1119
-#, 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:1014
-msgid "Bad Meeting Message"
-msgstr "Fout Bijeenkomstbericht"
-
-#: calendar/gui/e-itip-control.c:1034
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> heeft taakgegevens beschikbaar gemaakt."
-
-#: calendar/gui/e-itip-control.c:1035
-msgid "Task Information"
-msgstr "Taak Informatie"
-
-#: calendar/gui/e-itip-control.c:1039
-#, 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:1040
-msgid "Task Proposal"
-msgstr "Taak Voorstel"
-
-#: calendar/gui/e-itip-control.c:1044
-#, 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:1045
-msgid "Task Update"
-msgstr "Taak Update"
-
-#: calendar/gui/e-itip-control.c:1049
-#, 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:1050
-msgid "Task Update Request"
-msgstr "Taak Update Verzoek"
-
-#: calendar/gui/e-itip-control.c:1074
-#, 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:1075
-msgid "Task Reply"
-msgstr "Taak Antwoord"
-
-#: calendar/gui/e-itip-control.c:1079
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> heeft een taak geannuleerd."
-
-#: calendar/gui/e-itip-control.c:1080
-msgid "Task Cancellation"
-msgstr "Taak Annulering"
-
-#: calendar/gui/e-itip-control.c:1085
-msgid "Bad Task Message"
-msgstr "Fout Taakbericht"
-
-#: calendar/gui/e-itip-control.c:1104
-#, 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:1105
-msgid "Free/Busy Information"
-msgstr "Vrij/Bezet Informatie"
-
-#: calendar/gui/e-itip-control.c:1109
-#, 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:1110
-msgid "Free/Busy Request"
-msgstr "Vrij/Bezet Verzoek"
-
-#: calendar/gui/e-itip-control.c:1114
-#, 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:1115
-msgid "Free/Busy Reply"
-msgstr "Vrij/Bezet Antwoord"
-
-#: calendar/gui/e-itip-control.c:1120
-msgid "Bad Free/Busy Message"
-msgstr "Foutief Vrij/Bezet Bericht"
-
-#: calendar/gui/e-itip-control.c:1193
-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:1212
-msgid "The message contains only unsupported requests."
-msgstr "Het bericht bevat slechts niet ondersteunde aanvragen."
-
-#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1246
-msgid "The attachment does not contain a valid calendar message"
-msgstr "De bijlage bevat geen geldig kalenderbericht"
-
-#: calendar/gui/e-itip-control.c:1271
-msgid "The attachment has no viewable calendar items"
-msgstr "De bijlage heeft geen bekijkbaar kalenderobject"
-
-#: calendar/gui/e-itip-control.c:1403
+#: 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:1405
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Update Voltooid\n"
 
-#: calendar/gui/e-itip-control.c:1446
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1625
 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:1472
+#: 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:1474
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Bezoekerstatus ververst\n"
 
-#: calendar/gui/e-itip-control.c:1476
-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:1504
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Verwijderen Voltooid"
 
-#: calendar/gui/e-itip-control.c:1534 calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Item Verzonden!\n"
 
-#: calendar/gui/e-itip-control.c:1536 calendar/gui/e-itip-control.c:1588
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Dit item kon niet verzonden worden!\n"
 
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Selecteer Map"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Selecteer Map"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4973,57 +5135,58 @@ 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:789
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Persoon"
 
 #: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
 msgid "Group"
 msgstr "Groep"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
 msgid "Resource"
 msgstr "Hulpbron"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
 msgid "Room"
 msgstr "Kamer"
 
 #: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
 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:806
+#: calendar/gui/e-meeting-model.c:535
 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:807
 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:808
 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:834
+#: calendar/gui/e-meeting-model.c:543
 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-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Voorlopig"
 
 #: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:838
 msgid "Delegated"
 msgstr "Overgedragen"
 
@@ -5128,29 +5291,39 @@ 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:654
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Voltooiingsdatum"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Geselecteerde objecten verwijderen"
+
+#: calendar/gui/e-tasks.c:659
 msgid "Expunging"
 msgstr "Bezig met Schrappen"
 
-#: calendar/gui/e-week-view.c:3431
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Nieuwe _Afspraak..."
 
-#: calendar/gui/e-week-view.c:3497
+#: calendar/gui/e-week-view.c:3489
 msgid "_Delete this Appointment"
 msgstr "_Verwijder deze Afspraak"
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1879
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Bezig met openen kalender op %s"
@@ -5219,40 +5392,6 @@ msgstr "Er is minstens ��n bezoeker nodig"
 msgid "An organizer must be set."
 msgstr "Er moet een organisator ingesteld worden."
 
-#: calendar/gui/itip-utils.c:295
-msgid "Event information"
-msgstr "Gebeurtenis informatie"
-
-#: calendar/gui/itip-utils.c:297
-msgid "Task information"
-msgstr "Taak informatie"
-
-#: calendar/gui/itip-utils.c:299
-msgid "Journal information"
-msgstr "Journaal informatie"
-
-#: calendar/gui/itip-utils.c:301
-msgid "Free/Busy information"
-msgstr "Vrij/Bezet informatie"
-
-#: calendar/gui/itip-utils.c:303
-msgid "Calendar information"
-msgstr "Kalenderinformatie"
-
-#: calendar/gui/itip-utils.c:339
-#, fuzzy
-msgid "Updated"
-msgstr "Verversen"
-
-#: calendar/gui/itip-utils.c:347
-#, fuzzy
-msgid "Refresh"
-msgstr "Lijst Verversen"
-
-#: calendar/gui/itip-utils.c:351
-msgid "Counter-proposal"
-msgstr ""
-
 #: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "U moet een bezoeker zijn van het evenement."
@@ -5414,87 +5553,54 @@ msgid "Sa"
 msgstr "Za"
 
 #. Day
-#: calendar/gui/print.c:1840
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Geselecteerde dag (%a %b %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 %b %d"
 
-#: 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 %b %d %Y"
 
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Geselecteerde week (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1885
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Geselecteerde maand (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Geselecteerde jaar (%Y)"
 
-#: calendar/gui/print.c:2226
-msgid "Task"
-msgstr "Taak"
-
-#: calendar/gui/print.c:2283
-#, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
-
-#: calendar/gui/print.c:2301
-#, c-format
-msgid "Priority: %s"
-msgstr "Prioriteit: %s"
-
-#: calendar/gui/print.c:2315
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Procent Voltooid: %i"
-
-#: calendar/gui/print.c:2327
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2341
-#, c-format
-msgid "Categories: %s"
-msgstr "Categorie�n: %s"
-
-#: calendar/gui/print.c:2352
-msgid "Contacts: "
-msgstr "Contacten: "
-
-#: calendar/gui/print.c:2407
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Kalender afdrukken"
 
-#: calendar/gui/print.c:2498 calendar/gui/print.c:2590
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2879
-#: my-evolution/e-summary.c:604 ui/evolution-addressbook.xml.h:20
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
-#: calendar/gui/print.c:2527
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Item afdrukken"
 
-#: calendar/gui/print.c:2608
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Printerinstellingen"
 
@@ -5520,8 +5626,8 @@ msgstr ""
 "\n"
 "De taken echt verwijderen?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2375
-#: mail/mail-callbacks.c:2614
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "Dit bericht niet meer weergeven."
 
@@ -5584,11 +5690,6 @@ 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"
@@ -5608,91 +5709,91 @@ msgstr ""
 msgid "Gnome Calendar"
 msgstr "Kalender"
 
-#: calendar/pcs/query.c:246
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now verwacht 0 argumenten"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time verwacht 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 verwacht dat argument 1 een string is"
 
-#: 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 argument 1 moet een ISO-8601 date/time string zijn"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day verwacht 2 argumenten"
 
-#: 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 verwacht dat argument 1 een time_t is"
 
-#: 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 verwacht dat argument 2 een integer is"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin verwacht 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-bewgin verwacht dat argument 1 een time_t is"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-dat-end verwacht 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-dat-end verwacht dat argument 1 een time_t is"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype verwacht geen argumenten"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? verwacht 2 argumenten"
 
-#: 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? verwacht dat argument 1 een time_t is"
 
-#: 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? verwacht dat argument 2 een time_t is"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "Bevat? verwacht 2 argumenten"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? verwacht dat argument 1 een string is"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? verwacht dat argument 2 een string is"
 
-#: calendar/pcs/query.c:691
+#: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr ""
-"contains? verwacht dat argument 1 een kleuze is uit \"any\",\"summary\","
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
 "\"description\""
+msgstr ""
+"contains? verwacht dat argument 1 een kleuze is uit "
+"\"any\",\"summary\",\"description\""
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? verwacht op zijn minst 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)"
@@ -5700,15 +5801,15 @@ msgstr ""
 "has-categories? verwacht dat alle argumenten strings zijn, of dat slechts "
 "een argument booleaans onwaar is (#f)"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? verwacht 0 argumenten"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? verwacht 1 argumenten"
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? verwacht dat argument 1 een time_t is"
 
@@ -7249,11 +7350,11 @@ msgstr "Het gespecificeerde type word niet ondersteund door deze steutel"
 msgid "Decryption is not supported by this cipher"
 msgstr "Het gespecificeerde type word niet ondersteund door deze sleutel"
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 msgid "Unable to create cache path"
 msgstr "Kon cache pad niet cre�ren"
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:441
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kon cache item: %s niet verwijderen: %s"
@@ -7292,12 +7393,12 @@ 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:1198
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, 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:1204
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fout bij uitvoeren filter: %s: %s"
@@ -7311,7 +7412,6 @@ msgid "Unable to process spool folder"
 msgstr "Kan de spoolmap niet verwerken"
 
 #: camel/camel-filter-driver.c:911
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ophalen bericht %d(%d%%)"
 
@@ -7324,16 +7424,16 @@ msgstr "Kan bericht niet opnemen"
 msgid "Failed on message %d"
 msgstr "Faalde bij bericht %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1050
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Bezig met synchroniseren map"
 
-#: camel/camel-filter-driver.c:1017
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Bezig met ophalen bericht %d van %d"
 
-#: camel/camel-filter-driver.c:1032
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Faalde bij bericht %d van %d"
@@ -7369,27 +7469,27 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(past-allen) vereist enkelvoudig booleaans resultaat"
 
-#: camel/camel-folder-search.c:649
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Bezig met uitvoeren van zoekopdracht op onbekende kop: %s"
 
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Opdracht wordt niet ondersteund: bericht achteraan toevoegen: voor %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Opdracht wordt niet ondersteund: zoeken op expressie: voor %s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Opdracht wordt niet ondersteund: zoeken op uids: voor %s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Verplaatsen van berichten"
 
@@ -7500,128 +7600,84 @@ msgstr "Voer uw %s passphrase voor %s in"
 msgid "Please enter your %s passphrase"
 msgstr "Voer uw %s passphrase in."
 
-#: camel/camel-pgp-context.c:622
+#: camel/camel-pgp-context.c:621
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 "Kan dit bericht niet ondertekenen: geen gewone tekst om te ondertekenen"
 
-#: camel/camel-pgp-context.c:629 camel/camel-pgp-context.c:803
+#: 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:635 camel/camel-pgp-context.c:809
+#: 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:796
+#: 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:988
+#: 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:994
+#: 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:1005
+#: 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:1178
+#: 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:1188
+#: 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:1195
+#: 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:1204
+#: 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:1373
+#: 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:1381
+#: 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:1388
+#: 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-pgp-mime.c:332
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "Dit berichtdeel is digitaal gesigneerd"
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Voor uw wachtwoord in voor %s"
-
-#: camel/camel-pkcs7-context.c:213
-msgid "Error hashing password."
-msgstr "Fout bij fijnhakken van wachtwoord"
-
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr "Ongeldig wachtwoord."
-
-#: camel/camel-pkcs7-context.c:329
-#, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Kon niet ondertekenen: certificaat voor \"%s\" niet gevonden."
-
-#: camel/camel-pkcs7-context.c:378
-#, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Kon niet ondertekenen: certificaat voor \"%s\" niet gevonden"
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "Kon niet coderen: kon ingevouwen informatie niet aanmaken"
-
-#: camel/camel-pkcs7-context.c:590
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "Kon niet versleutelen: gefaald bij maken van encryptiecontext."
-
-#: camel/camel-pkcs7-context.c:620
-#, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Kon gegevens niet versleutelen: ongeldige gebruikers-sleutel: \"%s\"."
-
-#: camel/camel-pkcs7-context.c:626
-msgid "Could not encrypt: encoding failed."
-msgstr "Kon niet versleutelen: versleutelen mislukt"
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr "Kan bericht niet decoderen: Onbekende fout"
-
-#: 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 "Kon %s niet laden. Module laden niet ondersteund door dit systeem"
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kon %s niet laden: %s"
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kon %s niet laden: Geen initialisatie code in de module."
@@ -7650,14 +7706,14 @@ msgstr "Kon niet verbinden met %s (poort %d): %s"
 msgid "(unknown host)"
 msgstr "(onbekende machine)"
 
-#: camel/camel-remote-store.c:348 camel/camel-remote-store.c:410
-#: camel/camel-remote-store.c:471
+#: 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:474
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7757,8 +7813,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
@@ -7770,7 +7826,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Fout aanmeldingsantwoord van server."
 
@@ -7798,12 +7854,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:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:115
+#: 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"
 
@@ -7849,26 +7905,41 @@ msgstr "URL '%s' heeft een machinenaamcomponent nodig"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' heeft een padcomponent nodig"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolving \"%s\""
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fout bij opzoeken naam: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Machine niet gevonden: %s machine niet gevonden"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Machine opzoeken faalde: %s onbekende reden"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Resolving \"%s\""
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Machine niet gevonden: %s machine niet gevonden"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Machine opzoeken faalde: %s onbekende reden"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Virtuele map email-aanbieder"
@@ -7891,6 +7962,11 @@ msgstr ""
 "Kon de directory %s niet aanmaken:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Voor uw wachtwoord in voor %s"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Geef de bijnaam van het certificaat aan waarmee u wilt ondertekenen"
@@ -8004,27 +8080,27 @@ msgstr "kon URL %s niet verwerken"
 msgid "No such message %s in %s"
 msgstr "Dergelijk bericht %s bestaat niet in %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Een dergelijk bericht bestaat niet: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kon map: %s niet verwijderen: map bestaat niet"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kon de naam van map: %s niet wijzigen naar: map bestaat niet"
@@ -8057,22 +8133,22 @@ msgstr "Het antwoord van de IMAP-server bevatte geen %s informatie"
 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:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kon directory %s niet maken: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kon samenvatting voor %s niet laden"
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:467
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Bezig met zoeken naar veranderde berichten"
 
@@ -8094,15 +8170,15 @@ msgstr "Bezig met zoeken naar nieuwe berichten"
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH-antwoord."
 
-#: 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 "Kon cache map %s niet openen"
 
-#: 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 "Faalde bij cachen bericht %s: %s"
@@ -8149,28 +8225,28 @@ msgstr ""
 "Deze optie zal bij het verbinden met de IMAP-server het wachtwoord versturen "
 "als platte tekst."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
+#: camel/providers/imap/camel-imap-store.c:529
 #: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Geen ondersteuning voor aanmeldingstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
+#: camel/providers/imap/camel-imap-store.c:568
 #: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "U heeft geen wachtwoord ingevoerd"
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8181,57 +8257,58 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "De map kan geen submappen bevatten"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "MH-formaat postbussen"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 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:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Lokale bezorging"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 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:63
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Maildir-formaat mail direcories"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 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:80
+#: 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:81
+#: camel/providers/local/camel-local-provider.c:101
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 "Voor het lezen en opslaan van lokale post in standaard mbox spool bestanden."
 
-#: camel/providers/local/camel-local-provider.c:91
+#: 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:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8248,7 +8325,7 @@ 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:110
+#: camel/providers/local/camel-spoold-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Opslaglocatie %s is geen absoluut pad"
@@ -8274,17 +8351,22 @@ 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:864
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kon de naam van map %s niet wijzigen naar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:375
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Kon de naam van de map niet wijzigen: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kon samenvattingsbestand van map `%s' niet verwijderen: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-local-store.c:389
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kon indexbestand van map `%s' niet verwijderen: %s"
@@ -8295,7 +8377,7 @@ 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:1160
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kan geen bericht toevoegen aan de korte inhoud: onbekende reden"
 
@@ -8336,7 +8418,7 @@ msgstr "Een dergelijk bericht bestaat niet"
 msgid "Invalid message contents"
 msgstr "Ongeldige berichtinhoud"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8346,14 +8428,14 @@ msgstr ""
 "Kon map `%s' niet openen:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8363,24 +8445,24 @@ msgstr ""
 "Kon map `%s' niet maken:\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' is geen maildir-directory."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kon map `%s' niet verwijderen: %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "geen maildir-directory"
 
-#: camel/providers/local/camel-maildir-store.c:331
-#: camel/providers/local/camel-spoold-store.c:252
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kon map `%s' niet scannen: %s"
@@ -8409,7 +8491,7 @@ msgstr "Bezig met zoeken naar nieuwe berichten"
 #: 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:938
+#: camel/providers/local/camel-spool-summary.c:945
 msgid "Storing folder"
 msgstr "Bezig met opslaan map"
 
@@ -8534,8 +8616,8 @@ msgstr "Kon tijdelijke postbus niet openen: %s"
 #: 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:981
-#: camel/providers/local/camel-spool-summary.c:989
+#: 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"
 
@@ -8553,7 +8635,7 @@ 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:1039
+#: camel/providers/local/camel-spool-summary.c:1046
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kon de bronmap %s niet sluiten: %s"
@@ -8570,7 +8652,7 @@ 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:1113
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Onbekende fout: %s"
@@ -8605,7 +8687,7 @@ 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:141
-#: camel/providers/local/camel-spoold-store.c:147
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Map `%s/%s' bestaat niet."
@@ -8615,31 +8697,31 @@ msgstr "Map `%s/%s' bestaat niet."
 msgid "Spool mail file %s"
 msgstr "Spool mail bestand %s"
 
-#: camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spoold-store.c:192
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Spoolmappen kunnen niet hernoemd worden"
 
-#: camel/providers/local/camel-spool-store.c:217
-#: camel/providers/local/camel-spoold-store.c:200
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmappen kunnen niet gewist worden"
 
-#: camel/providers/local/camel-spool-summary.c:791
-#: camel/providers/local/camel-spool-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:809
+#: camel/providers/local/camel-spool-summary.c:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:824
+#: camel/providers/local/camel-spool-summary.c:831
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kon spoolmap: %s niet synchroniseren: %s"
 
-#: camel/providers/local/camel-spool-summary.c:854
-#: camel/providers/local/camel-spool-summary.c:872
-#: camel/providers/local/camel-spool-summary.c:884
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8648,80 +8730,25 @@ msgstr ""
 "Synchroniseren spoolmap '%s' is mislukt: %s\n"
 "Map is wellicht beschadigd, kopie opgeslagen in '%s'"
 
-#: camel/providers/local/camel-spool-summary.c:943
+#: 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:116
+#: 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:161
+#: camel/providers/local/camel-spoold-store.c:162
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spoold-store.c:172
+#: 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-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Voer het NNTP-wachtwoord voor %s@%s in"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "De server weigerde de gebruikersnaam"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Versturen van de gebruikersnaam naar de server mislukt"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "De server weigerde de gebruikernaam en/of het wachtwoord"
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Interne fout: uid heeft ongeldige opmaak: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:153
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#: camel/providers/pop3/camel-pop3-folder.c:522
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Kan bericht: %s niet verkrijgen: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:444
-#: camel/providers/pop3/camel-pop3-folder.c:503
-#: camel/providers/pop3/camel-pop3-folder.c:520
-msgid "User cancelled"
-msgstr "Gebruiker geannuleerd"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Kon groepenlijst niet van server ophalen."
-
-#: 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 "Fout bij het laden van het groepenlijstbestand voor %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Fout bij het opslaan van het groepenlijstbestand voor %s: %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET-nieuws"
@@ -8732,12 +8759,12 @@ msgstr ""
 "Dit is een provider voor het lezen van en versturen naar USENET "
 "nieuwsgroepen."
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-Nieuws via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8783,28 +8810,43 @@ msgstr "Bewerking mislukt: %s"
 msgid "Retrieving POP summary"
 msgstr "POP-samenvatting aan het ophalen"
 
+#: 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 "Gebruiker geannuleerd"
+
 #: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Kan POP-samenvatting niet verkrijgen: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:323
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Bezit met schrappen van verwijderde berichten"
 
-#: camel/providers/pop3/camel-pop3-folder.c:418
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, c-format
 msgid "No message with uid %s"
 msgstr "Geen bericht met 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:425
+#: camel/providers/pop3/camel-pop3-folder.c:427
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Bezig met ophalen POP-bericht %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:512
+#: 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 "Kan bericht: %s niet verkrijgen: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
 msgid "Unknown reason"
 msgstr "Onbekende reden"
 
@@ -8821,7 +8863,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:114
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -8835,9 +8877,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 ""
@@ -8901,7 +8943,8 @@ msgstr "I/O Fout: %s"
 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:503
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8910,13 +8953,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:593
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, 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:147
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8970,7 +9013,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Postaflevering via het sendmail programma"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:135
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9141,7 +9184,7 @@ msgstr "Postaflevering via %s"
 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:604
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Bezig met versturen bericht"
 
@@ -9153,62 +9196,62 @@ msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
 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:837
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "SMTP Begroeting"
 
-#: camel/providers/smtp/camel-smtp-transport.c:863
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:883
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "'HELO respons'- fout: %s: niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:931
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "SMTP Aanmelding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Fout bij aanmaken van SASL aanmeldingsobject"
 
-#: camel/providers/smtp/camel-smtp-transport.c:954
-#: camel/providers/smtp/camel-smtp-transport.c:966
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Time-out tijdens AUTH-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "AUTH verzoek faalde"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1036
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Fout aanmeldingsantwoord van server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1062
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1076
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "MAIL FROM response error"
 msgstr "Fout bij 'MAIL FROM'-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1101
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:1117
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
@@ -9216,37 +9259,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:1167
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 msgid "DATA response error"
 msgstr "Fout bij DATA-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1207
-#: camel/providers/smtp/camel-smtp-transport.c:1225
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1239
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 msgid "DATA termination response error"
 msgstr "DATA terminatie foutmelding."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1262
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1276
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 msgid "RSET response error"
 msgstr "Fout bij RSET-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1299
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 msgid "QUIT response error"
 msgstr "Fout bij QUIT-respons"
 
@@ -9275,7 +9318,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:149
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
 msgid "attachment"
 msgstr "bijlage"
 
@@ -9319,52 +9362,52 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Probeer bijlage automatisch weer te geven"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Klik hier voor het adresboek"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Van:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Antwoordadres:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Aan:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Geef de geadresseerden"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 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:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9377,7 +9420,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Voeg een bestand toe als bijlage"
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9386,34 +9429,34 @@ msgstr ""
 "Fout bij lezen bestand %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:965
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Waarschuwing"
 
-#: composer/e-msg-composer.c:969
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Bestand bestaat reeds, overschrijven?"
 
-#: composer/e-msg-composer.c:991
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
-#: composer/e-msg-composer.c:1010
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fout bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:1041
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fout bij benaderen bestand: %s"
 
-#: composer/e-msg-composer.c:1049
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Kon bericht niet van editor halen"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9422,7 +9465,7 @@ msgstr ""
 "Niet in staat te zoeken op bestand: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9431,7 +9474,7 @@ msgstr ""
 "Niet in staat om bestand: %s af te kappen\n"
 "%s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9440,7 +9483,7 @@ msgstr ""
 "Fout bij automatisch opslaan bericht: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1174
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9449,7 +9492,7 @@ msgstr ""
 "gevonden.\n"
 "Wilt u dat deze hersteld worden?"
 
-#: composer/e-msg-composer.c:1332
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9459,23 +9502,23 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Waarschuwing: Veranderd Bericht"
 
-#: composer/e-msg-composer.c:1362
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Bestand openen"
 
-#: composer/e-msg-composer.c:1511
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Bestand Invoegen"
 
-#: composer/e-msg-composer.c:2047 composer/e-msg-composer.c:2644
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Stel een nieuw bericht op"
 
-#: composer/e-msg-composer.c:2661
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9483,7 +9526,7 @@ msgstr ""
 "Kon het venster Opstellen niet aanmaken:\n"
 "Kan adresselectie niet activeren."
 
-#: composer/e-msg-composer.c:2684 composer/e-msg-composer.c:2739
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9491,12 +9534,6 @@ 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:3464
-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"
@@ -9558,8 +9595,8 @@ msgstr "Onderwerp bevat"
 msgid "Subject does not contain"
 msgstr "Onderwerp bevat niet"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2243
-#: mail/mail-display.c:119
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -9568,11 +9605,11 @@ msgstr ""
 "Overschrijven?"
 
 #. 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 "Onthoud dit wachtwoord"
 
-#: 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 "Onthoud dit wachtwoord tot het einde van deze sessie"
 
@@ -9670,169 +9707,6 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolution-component voor de samenvatting."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Fabriek voor het Evolution-samenvattingscomponent."
-
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Kan het Samenvattingscomponent van Evolution niet initializeren"
-
-#: executive-summary/component/e-summary-callbacks.c:125
-msgid "Select a service"
-msgstr "Selecteer een service"
-
-#: 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 ""
-"U kunt een andere HTML-pagina kiezen als achtergrond voor de samenvatting.\n"
-"\n"
-"Laat deze leeg voor de standaardachtergrond."
-
-#: 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 "Open %s met het standaard GNOME-programma"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Open %s met de standaard GNOME-browser"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Verstuur een bericht naar %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Verander de weergave naar %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Voer %s uit"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Sluit %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Verplaats %s naar links"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Verplaats %s naar rechts"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Verplaats %s naar de vorige rij"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Verplaats %s naar de volgende rij"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Configureer %s"
-
-#: executive-summary/component/e-summary-url.c:553
-msgid "page"
-msgstr "pagina"
-
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Kon HTML bestand niet openen:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Fout bij lezen gegevens:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr "Bestand heeft geen plaats voor de services.\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 ""
-"Samenvatting kon Bonobo niet starten.\n"
-"Als er een waarschuwing was over de RootPOA, dan is Bonobo\n"
-"waarschijnlijk gecompileerd met GOAD in plaats van OAF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Fabriek voor de RDF samenvatting."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF Samenvatting"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Fabriek voor het test-bonobo component."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Fabriek voor het test-component."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Test bonobo service"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Test service"
-
-#: 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 "Fout"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "Automatisch verversen"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "Nu bijwerken"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "Actualiseer elke "
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "jaar"
@@ -9865,11 +9739,7 @@ msgstr "uur"
 msgid "minute"
 msgstr "minuut"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "seconde"
-
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:224
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "seconden"
 
@@ -9965,7 +9835,7 @@ msgstr "Dan"
 msgid "Add action"
 msgstr "Actie Toevoegen"
 
-#: 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."
@@ -9973,19 +9843,11 @@ msgstr ""
 "U bent vergeten een map te kiezen.\n"
 "Ga terug en kies een geldige map om berichten in op te slaan"
 
-#: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:899
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Selecteer Map"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Voer een Map-URI in"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<klik hier om een map te selecteren>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9995,7 +9857,7 @@ msgstr ""
 "Fout in reguliere expressie '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:45
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test"
 
@@ -10024,7 +9886,8 @@ msgid "if all criteria are met"
 msgstr "als aan alle criteria wordt voldaan"
 
 #: filter/filter-rule.c:769
-msgid "if any criteria are met"
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "als aan een van de criteria wordt voldaan"
 
 #: filter/filter-rule.c:780
@@ -10081,206 +9944,211 @@ msgstr "met alle lokale folders"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Geef Score"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Geef Kleur"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Geef Score"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Bijlages"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
 #, fuzzy
 msgid "Beep"
 msgstr "Belem"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "bevat"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopieer naar Map"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ontvangstdatum"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Verzendingsdatum"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "bevat niet"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "eindigt niet op"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "bestaat niet"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "klinkt niet als"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "begint niet met"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "bestaat niet"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Klad"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "eindigt op"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr "Shellopdracht uitvoeren"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Bestaat"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "bestaat"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expressie"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Antwoord"
 
-#: filter/libfilter-i18n.h:25 mail/mail-config.c:74
-#: mail/mail-config.glade.h:82
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Belangrijk"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "is"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "is na"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "is voor"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr "is Gemarkeerd"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "is groter dan"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "is kleiner dan"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "is niet"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr "Is niet Gemarkeerd"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "Mailinglijst"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Berichtinhoud"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "Berichtkop"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Verplaats naar Map"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:39
 #, fuzzy
 msgid "Play Sound"
 msgstr "Speel een geluid af:"
 
-#: filter/libfilter-i18n.h:39 mail/message-tag-followup.c:58
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Gelezen"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Geadresseerden"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "Overeenkomende Regex"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "Beantwoord aan"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:44 mail/mail-callbacks.c:1548
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Afzender"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Stel Status in"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Grootte (kB)"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "klinkt als"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "Source-Account"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Specifieke kop"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "begint met"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-#: filter/libfilter-i18n.h:53 mail/mail-format.c:938
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
 #: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Onderwerp"
@@ -10313,30 +10181,30 @@ msgstr "U moet minstens ��n map als bron opgeven."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution is uw oude Elm mail aan het importeren"
 
-#: 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 "Importeren..."
 
-#: 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 "Een ogenblik geduld aub"
 
-#: 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 "Importeren %s als %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 "Bezig met doorzoeken %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:101
 msgid "Mail"
 msgstr "Post"
 
@@ -10364,23 +10232,74 @@ msgstr ""
 "Evolution heeft GnomeCard bestanden geovnden.\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Prioriteit: %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 importeert uw oude Netscape informatie"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Prullenbak"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Lokaal postbusbestand %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Map wordt gescant"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Importeren wordt gestart"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Instellingen:"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Filters Bewerken"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10410,97 +10329,111 @@ msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:2
 #, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
+msgid "Configuration control for the Evolution Display Fonts."
 msgstr "Fabriek voor de Evolution takencomponent"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:3
 #, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Fabriek voor de Evolution takencomponent"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
 msgid "Configuration control for the Evolution Mailer."
 msgstr "Fabriek voor de Evolution opsteller."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
 #, fuzzy
 msgid "Configuration control for the Evolution Message Composer."
 msgstr "Fabriek voor de Evolution opsteller."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5 notes/GNOME_Evolution_Notes.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Evolution-component voor het afhandelen van post"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolution bericht-opsteller."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Evolution post-samenvattingscomponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Evolution postmap-weergavecomponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Evolution postmap-factorycomponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Fabriek voor de Evolution opsteller."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Fabriek voor het post-samenvattingscomponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Samenvatting Instellingen"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Accounts"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13 mail/mail-config.glade.h:94
+#: 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:14
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "Mail configuratie interface"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
+#: 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:16
+#: 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:17
+#: 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:101
 msgid "Folder containing mail"
 msgstr "Map die post bevat"
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtueal Afval"
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Virtuele Afvalmap"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Deze map kan geen berichten bevatten."
 
-#: mail/component-factory.c:401
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Eigenschappen..."
 
-#: mail/component-factory.c:401
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Verander de eigenschappen van deze map"
 
-#: mail/component-factory.c:764
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10508,36 +10441,36 @@ msgstr ""
 "Sommige van uw email-instellingen lijken ongeldig, controleer alstublieft of "
 "alles goed staat."
 
-#: mail/component-factory.c:923
+#: mail/component-factory.c:925
 msgid "You have not set a mail transport method"
 msgstr "Er is geen post-transportmethode ingesteld"
 
-#: mail/component-factory.c:965
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Nieuw Bericht"
 
-#: mail/component-factory.c:965 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "Bericht"
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan de Mail-component van Evolution niet initialiseren."
 
-#: mail/component-factory.c:1001
+#: mail/component-factory.c:1003
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan de mailconfiguratie-component van Evolution niet initialiseren."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan de Map-info-component van Evolution niet initialiseren."
 
-#: mail/component-factory.c:1207 mail/component-factory.c:1238
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
 #, fuzzy
 msgid "Connecting..."
 msgstr "Verbinden met server..."
 
-#: mail/component-factory.c:1248
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
@@ -10550,199 +10483,195 @@ msgstr "Eigenschappen voor \"%s\""
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: mail/folder-browser.c:300 mail/mail-display.c:331 mail/mail-display.c:840
+#: mail/folder-browser.c:305 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:755
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr " %d nieuw"
 
-#: mail/folder-browser.c:758 mail/folder-browser.c:766
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d verborgen"
 
-#: mail/folder-browser.c:762
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr "%d zichtbaar"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d geselecteerd"
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d niet verzonden"
 
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d verzonden"
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d totaal"
 
-#: mail/folder-browser.c:1083
+#: mail/folder-browser.c:1088
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Maak VMap Van Bericht"
 
-#: mail/folder-browser.c:1575
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "VMap op _Onderwerp"
 
-#: mail/folder-browser.c:1576
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "VMap op Afze_nder"
 
-#: mail/folder-browser.c:1577
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
-#: mail/folder-browser.c:1578
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "VMap op Mailing_Lijst"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filter op Afzen_der"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/folder-browser.c:1585 mail/folder-browser.c:1917
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filter op _Mailinglijst"
 
-#: mail/folder-browser.c:1603 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "B_ewerk als Nieuw Bericht..."
 
-#: mail/folder-browser.c:1605
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Afdrukken"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Afzender beantwoorden"
 
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Lijst Be_antwoorden"
 
-#: mail/folder-browser.c:1611 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Iedereen Be_antwoorden"
 
-#: mail/folder-browser.c:1612
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: mail/folder-browser.c:1616
+#: mail/folder-browser.c:1622
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Antwoord..."
 
-#: mail/folder-browser.c:1617
+#: mail/folder-browser.c:1623
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Markeer als Voltooid"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1624
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Markering Wissen"
 
 #. separator here?
-#: mail/folder-browser.c:1622 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_keer als Gelezen"
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1629
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markeer als O_ngelezen"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Markeer als _Belangrijk"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1631
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markeer Als _Onbelangrijk"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1636
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Herstellen"
 
-#: mail/folder-browser.c:1634
+#: mail/folder-browser.c:1640
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Verplaatsen naar Map..."
 
-#: mail/folder-browser.c:1635 ui/evolution-addressbook.xml.h:36
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Kopi�ren naar Map..."
 
-#: mail/folder-browser.c:1639
+#: mail/folder-browser.c:1645
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: mail/folder-browser.c:1643
+#: mail/folder-browser.c:1649
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Afzender aan Adresboek Toevoegen"
 
-#: mail/folder-browser.c:1647
+#: mail/folder-browser.c:1653
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1657
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Creeer Regel Van Bericht"
 
-#: mail/folder-browser.c:1918
+#: mail/folder-browser.c:1936
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VMap op Mailinglijst"
 
-#: mail/folder-browser.c:1920
+#: mail/folder-browser.c:1938
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter op Mailinglijst (%s)"
 
-#: mail/folder-browser.c:1921
+#: mail/folder-browser.c:1939
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VMap op Mailinglijst (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Standaard"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Bezig met Verkrijgen Mapinformatie"
@@ -10813,92 +10742,74 @@ msgstr "Evolution Nieuwsbeheer"
 msgid "Evolution Account Editor"
 msgstr "Evolution Accountbeheer"
 
-#: mail/mail-account-gui.c:52 mail/mail-config.glade.h:17
-#, fuzzy
-msgid "Always"
-msgstr "Albany"
-
-#: mail/mail-account-gui.c:53 mail/mail-config.glade.h:176
-msgid "Whenever Possible"
-msgstr ""
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "Computernaam:"
 
-#: mail/mail-account-gui.c:54 mail/mail-config.glade.h:107
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
 #, fuzzy
-msgid "Never"
-msgstr "_elke"
+msgid "User_name:"
+msgstr "Gebruikersnaam:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "_Pad:"
 
-#: mail/mail-account-gui.c:1080 mail/mail-account-gui.c:1081
-#: mail/mail-account-gui.c:1324 mail/mail-account-gui.c:1329
-#: mail/mail-config.glade.h:127
+#: 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:1150 mail/mail-account-gui.c:1165
+#: 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:1846
+#: mail/mail-account-gui.c:1985
 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:210
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "Weet u zeker dat u deze account wilt verwijderen?"
 
-#: mail/mail-accounts.c:214
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Niet verwijderen"
 
-#: mail/mail-accounts.c:217
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Daadwerkelijk dit account verwijderen?"
 
-#: mail/mail-accounts.c:340 mail/mail-accounts.c:374
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
 msgid "Disable"
 msgstr "Uitzetten."
 
-#: mail/mail-accounts.c:342 mail/mail-accounts.c:376
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
 msgid "Enable"
 msgstr "Aanzetten"
 
-#: mail/mail-accounts.c:498 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:70
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+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
 msgid "Enabled"
 msgstr "Aangezet"
 
-#: mail/mail-accounts.c:499 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Accountnaam:"
 
-#: mail/mail-accounts.c:500 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Post versturen naar %s"
-
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Onderwerp is %s"
-
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Post ophalen van %s"
-
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "%s mailinglijst"
-
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Filterregel Toevoegen"
@@ -10999,20 +10910,20 @@ msgstr "een onbekende afzender"
 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:1426 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Verplaats bericht(en) naar"
 
-#: mail/mail-callbacks.c:1428 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopieer bericht(en) naar"
 
-#: mail/mail-callbacks.c:2087
+#: mail/mail-callbacks.c:2091
 #, 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:2112
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11020,7 +10931,7 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:2151
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11028,32 +10939,32 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:2165
+#: mail/mail-callbacks.c:2169
 #, 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:2191
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Geen bericht geselecteerd"
 
-#: mail/mail-callbacks.c:2236 mail/mail-display.c:115
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
-#: mail/mail-callbacks.c:2290
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Bericht Opslaan Als..."
 
-#: mail/mail-callbacks.c:2292
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Berichten Opslaan Als..."
 
-#: mail/mail-callbacks.c:2360
+#: mail/mail-callbacks.c:2366
 msgid "Go to next folder with unread messages?"
 msgstr "Volgende map met ongelezen berichten tonen?"
 
-#: mail/mail-callbacks.c:2367
+#: mail/mail-callbacks.c:2373
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11061,7 +10972,7 @@ msgstr ""
 "Er zijn geen nieuwe berichten meer in deze map.\n"
 "Wil je naar de volgende map gaan?"
 
-#: mail/mail-callbacks.c:2607
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11073,7 +10984,7 @@ msgstr ""
 "\n"
 "De berichten echt verwijderen?"
 
-#: mail/mail-callbacks.c:2717
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11082,28 +10993,28 @@ msgstr ""
 "Fout bij het laden van filterinformatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2729
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/mail-callbacks.c:2772
+#: mail/mail-callbacks.c:2783
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d van %d"
 
-#: mail/mail-callbacks.c:2824
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:2851
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
-#: mail/mail-callbacks.c:3069 mail/mail-callbacks.c:3109
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11160,40 +11071,35 @@ msgstr ""
 "naam zal alleen worden gebruikt als roepnaam."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistent"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:177
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:116
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:167
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:90
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "na"
 
-#: mail/mail-config.c:631
-#, c-format
-msgid "Account %d"
-msgstr "Account %d"
-
-#: mail/mail-config.c:2451
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -11204,46 +11110,41 @@ msgstr ""
 "%s\n"
 "Er zal geen snelkoppeling aangemaakt worden."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2462
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Inkomende post"
-
-#: mail/mail-config.c:2712
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Dienst wordt gecontroleerd"
 
-#: mail/mail-config.c:2790 mail/mail-config.c:2794
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 msgstr "Verbinden met server..."
 
-#: mail/mail-config.c:2991
+#: mail/mail-config.c:2999
 #, fuzzy
 msgid "Unnamed"
 msgstr "Ander contact"
 
-#: mail/mail-config.c:3169
+#: mail/mail-config.c:3177
 msgid "Cannot execute signature script"
 msgstr ""
 
 #: mail/mail-config.glade.h:1
-msgid "                        "
-msgstr ""
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " _Check for supported types "
-msgstr "_Controleer op ondersteunde types"
+#, fuzzy
+msgid " Edit "
+msgstr "B_ewerken..."
 
 #: mail/mail-config.glade.h:3
-msgid " color"
-msgstr " kleur"
+#, fuzzy
+msgid " New "
+msgstr "Nieuw"
 
 #: mail/mail-config.glade.h:4
-msgid "&lt;&lt; S_imple"
-msgstr ""
+msgid " _Check for supported types "
+msgstr "_Controleer op ondersteunde types"
 
 #: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of Evolution)"
@@ -11254,140 +11155,113 @@ 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
-msgid "/home/rodo/cvs/evolution/mail/"
-msgstr ""
-
-#: mail/mail-config.glade.h:8
 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:9
-msgid "Account"
-msgstr "Account"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Account %d"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Accountinformatie"
 
-#: mail/mail-config.glade.h:11 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Accountbeheer"
 
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Bewerking Annuleren"
+
 #: mail/mail-config.glade.h:12
-msgid "Accounts"
-msgstr "Accounts"
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Arkansas"
 
 #: mail/mail-config.glade.h:13
 #, fuzzy
-msgid "Ad_vanced &gt;&gt;"
-msgstr "Uitgebreid"
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr ""
+"Versleutel berichten altijd naar mijzelf bij het versturen van versleutelde "
+"berichten"
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Add new signature"
-msgstr "Bewaar handtekening"
+msgid "Alerts"
+msgstr "Alberta"
 
 #: mail/mail-config.glade.h:15
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Bewerking Annuleren"
-
-#: mail/mail-config.glade.h:16
-#, fuzzy
-msgid "Afrikaans"
-msgstr "Arkansas"
+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:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Altijd een geheime kopie (Bcc) naar:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Altijd een kopie (Cc) naar:"
 
-#: mail/mail-config.glade.h:20
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr ""
-"Versleutel berichten altijd naar mijzelf bij het versturen van versleutelde "
-"berichten"
-
-#: mail/mail-config.glade.h:21
-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:22
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Arabic"
 msgstr "Arica"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "Voeg een bestand bij het bericht"
 
-#: mail/mail-config.glade.h:24 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bijlage"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Aanmelding"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 #, fuzzy
-msgid "Automatically detect links"
+msgid "Automatically _detect links"
 msgstr "_Automatisch controleren op nieuwe post"
 
-#: mail/mail-config.glade.h:27
-msgid "Baltic (IS0-8859-13)"
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
-msgid "Beep when new mail arrives"
-msgstr "Piep bij binnenkomst van nieuwe email"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:26
 #, fuzzy
-msgid "Character Set:"
+msgid "C_haracter set:"
 msgstr "Karakterencodering"
 
-#: mail/mail-config.glade.h:31
-msgid "Checking for New Mail"
-msgstr "Controleren voor Nieuwe Berichten"
-
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:27
 #, fuzzy
-msgid "Colors"
+msgid "C_olors"
 msgstr "Komoren"
 
-#: mail/mail-config.glade.h:33
-#, fuzzy
-msgid "Command"
-msgstr "Bedrijf"
-
-#: mail/mail-config.glade.h:34
-msgid "Composer"
-msgstr "Editor"
+#: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
+msgstr "Controleren voor Nieuwe Berichten"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Berichten Opstellen"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: mail/mail-config.glade.h:37
-msgid "Confirm when Expunging a folder"
-msgstr "Bevestigen bij het Legen van een map"
-
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11402,503 +11276,369 @@ msgstr ""
 "\n"
 "Klik op \"Voltooien\" om uw instellingen op te slaan."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:37
 #, fuzzy
 msgid "Dari"
 msgstr "Bari"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "Standaard"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Standaard Prioriteit:"
 
-#: mail/mail-config.glade.h:47
-msgid "Default Forward style is: "
-msgstr "Standaardwijze van doorsturen: "
-
-#: mail/mail-config.glade.h:48
-#, fuzzy
-msgid "Default Forward style:"
-msgstr "Standaardwijze van doorsturen: "
-
-#: mail/mail-config.glade.h:49
-#, fuzzy
-msgid "Default Reply style:"
-msgstr "Standaardwijze van doorsturen: "
-
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:40
 #, fuzzy
-msgid "Default character encoding:"
+msgid "Default character _encoding:"
 msgstr "Standaard karaktercode:"
 
-#: mail/mail-config.glade.h:51
-msgid "Default character encoding: "
-msgstr "Standaard karaktercode:"
-
-#: mail/mail-config.glade.h:52
-msgid "Defaults"
-msgstr "Standaard"
-
-#: mail/mail-config.glade.h:53
-#, fuzzy
-msgid "Delete selected signature"
-msgstr "Verwijder alles behalve de  handtekening"
-
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Berichten aan het ontvangen"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitale ID's..."
 
-#: mail/mail-config.glade.h:57
-msgid "Display"
-msgstr "Weergave"
-
-#: mail/mail-config.glade.h:58
-msgid "Do not notify me when new mail arrives"
-msgstr "Geen melding bij binnenkomst van nieuwe berichten"
-
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Kan bericht niet opnemen"
 
-#: mail/mail-config.glade.h:60 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Klaar"
 
-#: mail/mail-config.glade.h:61 shell/e-local-storage.c:174
-msgid "Drafts"
-msgstr "Klad"
-
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:46
 #, fuzzy
-msgid "E_mail address:"
-msgstr "_Emailadres:"
+msgid "Drafts _folder:"
+msgstr "_Klad map:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "Aanzetten"
 
-#: mail/mail-config.glade.h:64
-#, fuzzy
-msgid "Ed_it..."
-msgstr "Bewerken..."
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:48
 #, fuzzy
-msgid "Edi_t..."
-msgstr "Bewerken..."
-
-#: mail/mail-config.glade.h:66
-msgid "Edit signature content in editor"
-msgstr ""
+msgid "E_nable advanced options"
+msgstr "Bewerking Annuleren"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Oost"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Email bevat"
 
-#: mail/mail-config.glade.h:69
-msgid "Enable advanced options"
-msgstr ""
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "_Emailadres:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "Leeg prullenbakken bij het afsluiten"
+
+#: mail/mail-config.glade.h:53
 msgid "Execute Command..."
 msgstr "Opdracht Uitvoeren..."
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "File containing signature"
-msgstr "Map die post bevat"
+msgid "Fi_xed -width:"
+msgstr "eindigt op"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Forwards and Replies"
+msgid "Font Properties"
+msgstr "Eigenschappen"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Haal Digitaal ID op..."
 
-#: mail/mail-config.glade.h:76
-#, fuzzy
-msgid "HTML Mail"
-msgstr "In HTML-berichten"
-
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Hide advanced settings"
-msgstr "Weerinstellingen"
+msgid "Highlight _quotations with"
+msgstr "_Accentueer citaten met"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Hulu"
 msgstr "Hurlburt"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:80 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 "Identiteit"
 
-#: mail/mail-config.glade.h:81
-msgid "If selected signature will be included in random signature list"
-msgstr ""
-
-#: mail/mail-config.glade.h:83
-msgid "In HTML mail"
-msgstr "In HTML-berichten"
-
-#: mail/mail-config.glade.h:84
-msgid "Include in _random signatures list"
-msgstr ""
-
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Ingebonden"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:87
-#, fuzzy
-msgid "Keyboard Shortcuts"
-msgstr "Snelkoppelingen"
-
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Opslaan en Sluiten"
 
-#: mail/mail-config.glade.h:89
-#, fuzzy
-msgid "Language:"
-msgstr "Taal"
-
-#: mail/mail-config.glade.h:91
-#, fuzzy
-msgid "List of signatures"
-msgstr "Bestand met _HTML-ondertekening:"
-
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Toon _Afbeeldingen"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Postconfiguratie"
 
-#: mail/mail-config.glade.h:95
-msgid "Mail Settings"
-msgstr "Mail-instellingen"
-
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Mailbox locatie"
 
-#: mail/mail-config.glade.h:97
-msgid "Make this my _default account"
-msgstr "Stel dit in als standaardaccount"
-
-#: mail/mail-config.glade.h:98
-#, fuzzy
-msgid "Mark messages as read after"
-msgstr "_Markeer berichten als Gelezen na "
-
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Composer"
 msgstr "Berichten"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Display"
 msgstr "_Berichtweergave"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Microsoft"
 msgstr "Micronesi�"
 
-#: mail/mail-config.glade.h:102
-msgid "Misspelled color: "
-msgstr ""
-
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP Server"
 
-#: mail/mail-config.glade.h:104
-#, fuzzy
-msgid "N_ew..."
-msgstr "Nieuw..."
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
-msgid "Name of selected signature"
-msgstr "Verwijder alles behalve de  handtekening"
-
-#: mail/mail-config.glade.h:106
-#, fuzzy
-msgid "Ne_w..."
-msgstr "Nieuw..."
-
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Nieuwe Mail Notificatie"
 
-#: mail/mail-config.glade.h:109
-msgid "News"
-msgstr "Nieuws"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "_Nieuwsbronnen"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Optionele Informatie"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organisatie:"
+
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG sleutel ID:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Kies een kleur"
 
-#: mail/mail-config.glade.h:118
-msgid "Play sound file when new mail arrives"
-msgstr "Geluid afspelen bij binnekomst van nieuwe berichten"
+#: mail/mail-config.glade.h:88
+#, 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:119
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:120
-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:121
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Waarschuw wanneer een bericht verstuurd wordt zonder _onderwerp"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:90
 #, 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:123
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr ""
-"Waarschuw wanneer berichten worden verstuurd met alleen _Bcc-ontvangers"
+msgid "Printed Fonts"
+msgstr "Druk geselecteerde contacten af"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Kan bericht niet opnemen"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Geciteerd"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:95
 msgid "Randomized"
 msgstr ""
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Onthoud dit wachtwoord"
 
-#: mail/mail-config.glade.h:130 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Antwoordadres:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Email Ontvangen"
 
-#: mail/mail-config.glade.h:131
-msgid "Receiving Mail"
-msgstr "Berichten Ophalen"
-
-#: mail/mail-config.glade.h:132
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Ontvangst Instellingen"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Onthoud dit wachtwoord"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Vereiste informatie"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:103
 #, fuzzy
-msgid "Restore defaults"
-msgstr " (standaard)"
+msgid "S_ecurity"
+msgstr "Beveiliging"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Same as text"
 msgstr "Somerset"
 
-#: mail/mail-config.glade.h:137
-msgid "Script which is run before signature loading from specified filename"
-msgstr ""
-
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Beveiligde MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:139
-msgid "Security"
-msgstr "Beveiliging"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:140
-msgid "Select Filter Log file..."
-msgstr "Selecteer een Filter Log bestand..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:141
-msgid "Select PGP binary"
-msgstr "Selecteer het pad naar PGP"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Selecteer het pad naar PGP"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Select a signature file"
 msgstr "Handtekeningbestand:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Select a signature script"
 msgstr "Verwijder alles behalve de  handtekening"
 
-#: mail/mail-config.glade.h:145 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Email Versturen"
 
-#: mail/mail-config.glade.h:146
-msgid "Sending Mail"
-msgstr "Berichten versturen"
-
-#: mail/mail-config.glade.h:148 mail/message-list.etspec.h:9
-#: shell/e-local-storage.c:177
-msgid "Sent"
-msgstr "Verzonden"
-
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Verzonden _berichtenmap:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Verzonden en Klad Berichten"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Server _vereist aanmelding"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Serverconfiguratie"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "Server _Type: "
 
-#: mail/mail-config.glade.h:154
-#, fuzzy
-msgid "Shortcut"
-msgstr "_Snelkoppeling"
-
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:120
 #, fuzzy
-msgid "Shortcuts type:"
+msgid "Shortcuts _type:"
 msgstr "Snelkoppelingen"
 
-#: mail/mail-config.glade.h:156
-#, fuzzy
-msgid "Show advanced settings"
-msgstr "Nieuwsbron-instellingen:"
-
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "Show animated images"
-msgstr "Toon Tijd Als"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Signature"
 msgstr "Bewaar handtekening"
 
-#: mail/mail-config.glade.h:159
-#, fuzzy
-msgid "Signatures"
-msgstr "Bewaar handtekening"
-
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Bron"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Bron Informatie"
 
-#: mail/mail-config.glade.h:162
-msgid "Sources"
-msgstr "Bronnen"
-
-#: mail/mail-config.glade.h:163
-msgid "Specify filename:"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
 msgstr "Geef Bestandsnaam:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:125
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Standaard Unix mailboxbestand"
 
-#: mail/mail-config.glade.h:166
-#, fuzzy
-msgid "Text _Signature:"
-msgstr "Bestand met _HTML-ondertekening:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:128
 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:171
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "Use _HTML for this signature"
 msgstr "Bestand met _HTML-ondertekening:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:132
 #, fuzzy
-msgid "Use s_ecure connection (SSL):"
-msgstr "Gebruik een beveiligde verbinding (SSL)"
+msgid "V_ariable-width:"
+msgstr "Variabel"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11908,197 +11648,220 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "XEmacs"
 msgstr "Oost"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "Altijd afbeeldingen ophalen va het internet"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:141
 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:182
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Aanmeldings Type:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:143
 msgid "_Authentication type: "
 msgstr "_Aanmeldings type:"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "_Automatisch controleren op nieuwe post"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:145
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "Piep bij binnenkomst van nieuwe email"
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Certificaat-ID:"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Bevestigen bij het Legen van een map"
 
-#: mail/mail-config.glade.h:188
-msgid "_Drafts folder:"
-msgstr "_Klad map:"
-
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:149
 #, fuzzy
-msgid "_Edit..."
-msgstr "Bewerken..."
+msgid "_Defaults"
+msgstr "Standaard"
 
-#: mail/mail-config.glade.h:191
-msgid "_Empty trash folders on exit"
-msgstr "Leeg prullenbakken bij het afsluiten"
+#: mail/mail-config.glade.h:151
+#, fuzzy
+msgid "_Do not notify me when new mail arrives"
+msgstr "Geen melding bij binnenkomst van nieuwe berichten"
 
-#: mail/mail-config.glade.h:192
+#: mail/mail-config.glade.h:153
 msgid "_Enable spell checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:193
+#: mail/mail-config.glade.h:154
 #, fuzzy
-msgid "_Filename"
+msgid "_Filename:"
 msgstr "Bestandsnaam:"
 
-#: mail/mail-config.glade.h:194
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
 #, fuzzy
-msgid "_Filename:"
-msgstr "Bestandsnaam:"
+msgid "_Forward style:"
+msgstr "Standaardwijze van doorsturen: "
 
-#: mail/mail-config.glade.h:195
+#: mail/mail-config.glade.h:157
 msgid "_Full name:"
 msgstr "_Volledige Naam:"
 
-#: mail/mail-config.glade.h:196
+#: mail/mail-config.glade.h:159
+#, 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:197
-msgid "_Highlight citations with"
-msgstr "_Accentueer citaten met"
-
-#: mail/mail-config.glade.h:198
+#: mail/mail-config.glade.h:162
 #, fuzzy
-msgid "_Highlight quotations with"
-msgstr "_Accentueer citaten met"
+msgid "_Identity"
+msgstr "Identiteit"
 
-#: mail/mail-config.glade.h:199
-msgid "_Host:"
-msgstr "Computernaam:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Taal"
 
-#: mail/mail-config.glade.h:200
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr "Toon afbeeldingen als de afzender in het adresboek voorkomt"
 
-#: mail/mail-config.glade.h:201
-msgid "_Log filter actions to:"
-msgstr "_Log filteracties in:"
-
-#: mail/mail-config.glade.h:202
-msgid "_Mark messages as Read after"
-msgstr "_Markeer berichten als Gelezen na "
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Stel dit in als standaardaccount"
 
-#: mail/mail-config.glade.h:203
+#: mail/mail-config.glade.h:166
 #, fuzzy
-msgid "_Name"
-msgstr "_Naam:"
+msgid "_Mark messages as read after"
+msgstr "_Markeer berichten als Gelezen na "
 
-#: mail/mail-config.glade.h:204
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: mail/mail-config.glade.h:205
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_Nooit afbeeldingen van het internet ophalen"
 
-#: mail/mail-config.glade.h:206
-msgid "_Organization:"
-msgstr "Organisatie:"
-
-#: mail/mail-config.glade.h:207
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "_Pad naar het PGP-programma:"
 
-#: mail/mail-config.glade.h:208
-msgid "_Path:"
-msgstr "_Pad:"
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Play sound file when new mail arrives"
+msgstr "Geluid afspelen bij binnekomst van nieuwe berichten"
 
-#: mail/mail-config.glade.h:209
+#: mail/mail-config.glade.h:172
+#, 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
+#, 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:210
-msgid "_Remember this password"
-msgstr "_Onthoud dit wachtwoord"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Berichten Ophalen"
 
-#: mail/mail-config.glade.h:211
+#: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Script"
-msgstr "_Beveiliging"
+msgid "_Reply style:"
+msgstr "Standaardwijze van doorsturen: "
 
-#: mail/mail-config.glade.h:212
+#: mail/mail-config.glade.h:177
+#, fuzzy
+msgid "_Restore defaults"
+msgstr " (standaard)"
+
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Script:"
 msgstr "_Beveiliging"
 
-#: mail/mail-config.glade.h:213
-msgid "_Send mail in HTML format by default."
-msgstr "Stuur berichten standaard in HTML-formaat."
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Beveiliging"
 
-#: mail/mail-config.glade.h:214
+#: mail/mail-config.glade.h:180
 #, fuzzy
-msgid "_Send messages in HTML format by default"
-msgstr "Stuur berichten standaard in HTML-formaat."
+msgid "_Sending Mail"
+msgstr "Berichten versturen"
 
-#: mail/mail-config.glade.h:215
-msgid "_Server type: "
-msgstr "_Server type: "
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Toon Tijd Als"
 
-#: mail/mail-config.glade.h:216
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "_Signatures"
 msgstr "Bestand met ondertekening:"
 
-#: mail/mail-config.glade.h:217
-msgid "_Username:"
-msgstr "Gebruikersnaam:"
+#: 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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Variabel"
 
-#: mail/mail-config.glade.h:218
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_elke"
 
-#: mail/mail-config.glade.h:219
+#: mail/mail-config.glade.h:187
 #, fuzzy
 msgid "color"
 msgstr " kleur"
 
-#: mail/mail-config.glade.h:220
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "omschrijving"
 
-#: mail/mail-config.glade.h:222
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "niewswindow1"
 
-#: mail/mail-config.glade.h:223
-msgid "placeholder"
-msgstr "vuller"
-
-#: mail/mail-config.glade.h:225
-msgid "seconds."
-msgstr "seconden."
-
-#: mail/mail-config.glade.h:226
-#, fuzzy
-msgid "use _HTML for this signature"
-msgstr "Bestand met _HTML-ondertekening:"
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Kon geen PGP handtekening-context maken"
@@ -12135,24 +11898,24 @@ msgstr "Kon geen S/MIME envelope context maken"
 msgid "Could not create a S/MIME decode context."
 msgstr "Kon geen S/MIME decode context maken"
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Bijlage Opslaan"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:344
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Kon tijdelijke bestand '%s' niet maken: %s"
 
-#: mail/mail-display.c:387
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Opslaan op Schijf..."
 
-#: mail/mail-display.c:389
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Geef Ingebonden Weer"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Openen in %s..."
@@ -12174,119 +11937,98 @@ msgstr "Extern Weergave Programma"
 msgid "Loading message content"
 msgstr "Bezig met laden berichtinhoud"
 
-#: mail/mail-display.c:1757
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Open Link in Browser"
 
-#: mail/mail-display.c:1759
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Kopieer Link Locatie"
 
-#: mail/mail-display.c:1762
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Sla Link op als (FIXME)"
 
-#: mail/mail-display.c:1765
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Sla Figuur op als..."
 
-#: mail/mail-format.c:652
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijlage"
 
-#: mail/mail-format.c:698
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kon MIME bericht niet verwerken. Laat zien als source"
 
-#: mail/mail-format.c:781
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Ongeldig Emailadres"
 
-#: mail/mail-format.c:916 mail/message-list.etspec.h:6
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Van"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Antwoordadres"
 
-#: mail/mail-format.c:925 mail/message-list.etspec.h:13
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Aan"
 
-#: mail/mail-format.c:930
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:935
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1712
+#: mail/mail-format.c:915
 #, fuzzy
-msgid "View messages..."
-msgstr "Bericht Opslaan Als..."
-
-#: mail/mail-format.c:1806
-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:1829
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution herkent dit type ondertekening niet."
-
-#: mail/mail-format.c:1837
-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:1845
-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 "Mailer"
+msgstr "Post"
 
-#: mail/mail-format.c:2088
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Verwijzing naar FTP site (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2120
 #, 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:2107
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Verwijzing naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:2136
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Verwijzing naar externe gegevens (%s)"
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:2149
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Misvormd extern-berichtgedeelte"
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Map opnieuw configureren"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12295,27 +12037,27 @@ msgstr ""
 "Kan map-metainfo niet opslaan: deze map kan waarschijnlijk niet\n"
 "meer worden geopend: %s: %s"
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan map-matainfo niet opslaan in %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan map-metagegevens %s niet verwijderen: %s"
 
-#: mail/mail-local.c:1280
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
 
-#: mail/mail-local.c:1295
+#: mail/mail-local.c:1294
 #, 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:1317
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12323,11 +12065,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:1406
+#: mail/mail-local.c:1405
 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:1415
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Herconfigureer /%s"
@@ -12354,117 +12096,112 @@ msgstr ""
 msgid "Working"
 msgstr "Bezig"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Map wordt Gefilterd"
 
-#: mail/mail-ops.c:259
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Berichten aan het ontvangen"
 
-#: 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 "Maar het bericht is wel succesvol verzonden."
 
-#: mail/mail-ops.c:600
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Bezig met verzenden \"%s\""
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Bezig met verzenden bericht %d van %d"
 
-#: mail/mail-ops.c:739
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "faalde op bericht %d van %d"
 
-#: mail/mail-ops.c:741 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "Voltooid."
 
-#: mail/mail-ops.c:834
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Bezig met opslaan bericht in map"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Bezig met verplaatsen van berichten naar %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Bezig met het kopi�ren van berichten naar %s"
 
-#: mail/mail-ops.c:941
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Bezig met verplaatsen"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Bezig met kopi�ren"
 
-#: mail/mail-ops.c:1054
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1104 shell/e-local-storage.c:179
-msgid "Trash"
-msgstr "Prullenbak"
-
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-ops.c:1280
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met openen map %s"
 
-#: mail/mail-ops.c:1352
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Bezig met openen van opslag %s"
 
-#: mail/mail-ops.c:1421
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "verwijderen map %s"
 
-#: mail/mail-ops.c:1515
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Bezig met opslaan map '%s'"
 
-#: mail/mail-ops.c:1566
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Map wordt ververest"
 
-#: mail/mail-ops.c:1602
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Bezig met legen map"
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Bezig met ophalen bericht %s"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Bezig met ophalen van %d bericht(en)"
 
-#: mail/mail-ops.c:1804
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Bezig met het opslaan van %d bericht(en)"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12473,7 +12210,7 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12482,11 +12219,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12495,22 +12232,22 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Bezig met opnieuw verbinden met %s"
 
-#: mail/mail-ops.c:2234
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Shellopdracht wordt uitgevoerd: %s"
@@ -12603,15 +12340,16 @@ msgstr "Voer uw Wachtwoord in voor %s"
 msgid "Enter Password"
 msgstr "Voer Wachtwoord in"
 
-#: mail/mail-signature-editor.c:71
-msgid "Could not save signature file."
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
 msgstr "Kon handtekening-bestand niet opslaan."
 
-#: mail/mail-signature-editor.c:155
+#: mail/mail-signature-editor.c:172
 msgid "Save signature"
 msgstr "Bewaar handtekening"
 
-#: mail/mail-signature-editor.c:161
+#: mail/mail-signature-editor.c:178
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12621,29 +12359,21 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: mail/mail-signature-editor.c:340
+#: mail/mail-signature-editor.c:357
 #, fuzzy
 msgid "Signature name:"
 msgstr "Handtekeningbestand:"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "Invcomplete berichten geschreven op de pijp!"
-
-#: mail/mail-summary.c:467
-msgid "Mail Summary"
-msgstr "Berichten Samenvatting"
-
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Doorgestuurd bericht - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Doorgestuurd bericht"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Doorgestuurd Bericht"
 
@@ -12670,10 +12400,6 @@ msgstr ""
 "    '%s'\n"
 "En zijn aangepast."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "VMappen"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "vMappen"
@@ -12692,11 +12418,11 @@ msgstr ""
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(geen onderwerp)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Bericht"
@@ -12761,23 +12487,23 @@ msgstr "%b %d %Y"
 msgid "Generating message list"
 msgstr "Bezig met genereren van berichtenlijst"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Verloopdatum"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "Markering Status"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Gemarkeerd"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr "Antwoord Markering"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Ontvangen"
 
@@ -12785,52 +12511,52 @@ msgstr "Ontvangen"
 msgid "Size"
 msgstr "Grootte"
 
-#: mail/message-tag-editor.c:91
-#, fuzzy
-msgid "Flag to Follow Up"
-msgstr "Antwoord"
-
-#: mail/message-tag-followup.c:52
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:53
+#: mail/message-tag-followup.c:58
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Doorsturen"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:59
 #, fuzzy
 msgid "Follow-Up"
 msgstr "Antwoord"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:60
 #, fuzzy
 msgid "For Your Information"
 msgstr "Bron Informatie"
 
-#: mail/message-tag-followup.c:56 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:62
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:59 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
 msgid "Reply"
 msgstr "Beantwoorden"
 
-#: mail/message-tag-followup.c:60 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
 msgid "Reply to All"
 msgstr "Iedereen beantwoorden"
 
-#: mail/message-tag-followup.c:61
+#: mail/message-tag-followup.c:66
 #, fuzzy
 msgid "Review"
 msgstr "Voorbeeld"
 
+#: mail/message-tag-followup.c:315
+#, fuzzy
+msgid "Flag to Follow Up"
+msgstr "Antwoord"
+
 #: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -22718,7 +22444,7 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:48
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "Mappen met de Evolution Samenvatting"
 
@@ -22742,11 +22468,17 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Geen omschrijving"
 
-#: my-evolution/e-summary-mail.c:134
+#: my-evolution/e-summary-mail.c:151
 msgid "Mail summary"
 msgstr "Samenvatting Post"
 
-#: my-evolution/e-summary-mail.c:398 shell/e-local-storage.c:1022
+#. 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
 msgid "Local Folders"
 msgstr "Lokale Mappen"
 
@@ -22765,23 +22497,23 @@ msgstr "Lokale Mappen"
 msgid "KBOS"
 msgstr "EHAM:EHEH:EHGG:EHLW:EHBK:EHRD:EHSB:EBAW:EBBR:EBLG:EBOS"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Woord van de Dag"
 
-#: my-evolution/e-summary-preferences.c:487
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Quotes van de Dag"
 
-#: my-evolution/e-summary-preferences.c:746
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Voeg een nieuwsbron toe"
 
-#: my-evolution/e-summary-preferences.c:754
+#: my-evolution/e-summary-preferences.c:728
 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:758
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Naam:"
 
@@ -22793,17 +22525,24 @@ msgstr "Fout bij downloaden van RDF"
 msgid "News Feed"
 msgstr "Nieuws Bron"
 
-#: my-evolution/e-summary-shown.c:467
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
 #, fuzzy
-msgid "Add->"
+msgid "Add ->"
 msgstr "_Toevoegen"
 
-#: my-evolution/e-summary-shown.c:473
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
 #, fuzzy
-msgid "<-Remove"
+msgid "<- Remove"
 msgstr "Verwijderen"
 
-#: my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Sneeuwval"
@@ -22828,19 +22567,19 @@ msgstr "Er trad een fout op bij het downloaden van gegevens voor"
 msgid "Weather"
 msgstr "Weer"
 
-#: my-evolution/e-summary.c:189
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:474
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "Even geduld a.u.b..."
 
-#: my-evolution/e-summary.c:565 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Samenvatting Afdrukken"
 
-#: my-evolution/e-summary.c:611
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Afdrukken van Samenvatting mislukt"
 
@@ -22848,38 +22587,6 @@ msgstr "Afdrukken van Samenvatting mislukt"
 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"
@@ -24110,18 +23817,24 @@ msgstr "_Planning"
 msgid "_Weather"
 msgstr "_Weer"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
-msgstr "Fabriek voor de Evolution kalendercomponent."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for Evolution default folders."
+msgstr "Fabriek voor de Evolution opsteller."
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr "Fabriek voor Notitiebeheer."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Selecteer Map"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: 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"
+msgstr ""
+
 #: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Details weergeven"
@@ -24130,20 +23843,11 @@ msgstr "Details weergeven"
 msgid "Cancel Operation"
 msgstr "Bewerking Annuleren"
 
-#: 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-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution installatie"
 
-#: 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"
@@ -24151,17 +23855,17 @@ msgstr ""
 "Deze nieuwe versie van Evolution moet enkele extra bestanden installeren\n"
 "in uw persoonlijke Evolution-directory"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Klik op \"OK\" om de bestanden te installeren, of \"Annuleren\" om af te "
 "breken."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Kon bestanden niet correct actualiseren"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24172,7 +23876,7 @@ msgstr ""
 "%s\n"
 "Fout: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -24181,7 +23885,7 @@ msgstr ""
 "Er trad een fout op bij het kopie�ren van bestanden naar\n"
 "`%s'."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -24192,7 +23896,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -24203,7 +23907,7 @@ msgstr ""
 "heeft niet de juiste rechten. Maak het alstublieft\n"
 "leesbaar en uitvoerbaar en herstart Evolution."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -24214,7 +23918,7 @@ msgstr ""
 "moet verwijderd worden om Evolution correct te laten werken.\n"
 "Verwijder dit bestand en herstart Evolution."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -24225,7 +23929,7 @@ msgstr ""
 "Verplaats het om de installatie van de Evolution\n"
 "bestanden af te maken."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -24238,7 +23942,7 @@ msgstr ""
 "voordat Evolution kan werken.\n"
 "Wilt u dat ik de map voor u verwijder?"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -24559,52 +24263,43 @@ msgstr "Mapnaam mag geen slashes bevatten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' en '..' zijn gereserveerde mapnamen."
 
-#: shell/e-shell-view-menu.c:170
+#: shell/e-shell-view-menu.c:168
 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:178
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kon niet worden gestart."
 
-#: shell/e-shell-view-menu.c:220
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Over Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:446
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Ga naar map..."
 
-#: shell/e-shell-view-menu.c:447
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Selecteer de map die je wilt openen"
 
-#: shell/e-shell-view-menu.c:567
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Maak een nieuwe snelkoppeling"
 
-#: shell/e-shell-view-menu.c:568
+#: shell/e-shell-view-menu.c:566
 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:616
-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."
-
-#: shell/e-shell-view-menu.c:624
-#, c-format
-msgid "Error executing %s."
-msgstr "Fout bij uitvoeren filter %s."
-
-#: shell/e-shell-view-menu.c:739
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "Werk Online"
 
-#: shell/e-shell-view-menu.c:752 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Werk Offline"
 
-#: shell/e-shell-view-menu.c:765 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Werk zonder netwerk"
 
@@ -24612,38 +24307,50 @@ msgstr "Werk zonder netwerk"
 msgid "(No folder displayed)"
 msgstr "(Geen map weergegeven)"
 
-#: 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 "(Geen)"
 
-#: 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 ""
 "Evolution is nu verbonden met het netwerk.  Klik op deze knop om zonder "
 "netwerkverbinding te werken"
 
-#: shell/e-shell-view.c:1858
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution is in bezig offline te gaan."
 
-#: 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 Evolution is nu offline. Klik op deze knop on online te gaan werken."
 
-#: shell/e-shell.c:652
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"De fout van het activeringssysteem is:\n"
+"%s"
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan de lokale opslag niet opzetten -- %s"
 
-#: shell/e-shell.c:1719
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24655,19 +24362,23 @@ msgstr ""
 "gestopt. U zult Evolution opnieuw moeten starten om die informatie\n"
 "weer te kunnen benaderen."
 
-#: shell/e-shell.c:1982
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Ongeldige argumenten"
 
-#: shell/e-shell.c:1984
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Kan niet registreren op OAF"
 
-#: shell/e-shell.c:1986
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Configuratiedatabase niet gevonden"
 
-#: shell/e-shell.c:1988 shell/e-storage.c:487
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Generieke fout"
 
@@ -24792,14 +24503,9 @@ msgstr "Fout bij opslaan van snelkoppelingen."
 msgid "Shortcuts"
 msgstr "Snelkoppelingen"
 
-#: shell/e-storage-set-view.c:650
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Kan map niet overzetten:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Inbox"
 
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
@@ -24864,10 +24570,13 @@ 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
+msgid "<click here to select a folder>"
+msgstr "<klik hier om een map te selecteren>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -24905,67 +24614,67 @@ msgstr ""
 "De fout van het activeringssysteem is:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "CORBA fout"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Onderbroken"
 
-#: shell/evolution-shell-component.c:1048
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Ongeldige argument"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Heeft al een eigenaar"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Geen eigenaar"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Niet gevonden"
 
-#: shell/evolution-shell-component.c:1056
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Niet ondersteund type"
 
-#: shell/evolution-shell-component.c:1058
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Niet ondersteund schema"
 
-#: shell/evolution-shell-component.c:1060
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Niet ondersteunde bewerking"
 
-#: shell/evolution-shell-component.c:1062
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: shell/evolution-shell-component.c:1066
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Bestaat"
 
-#: shell/evolution-shell-component.c:1068
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Ongeldige URI"
 
-#: shell/evolution-shell-component.c:1072
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Heeft submappen"
 
-#: shell/evolution-shell-component.c:1074
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Geen ruimte over"
 
-#: shell/evolution-shell-component.c:1076
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Oude eigenaar is gestorven"
 
-#: shell/evolution-test-component.c:45
+#: shell/evolution-test-component.c:47
 msgid "Test type"
 msgstr "Test type"
 
@@ -25095,40 +24804,40 @@ 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:88
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:94
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution is bezig met afsluiten ..."
 
-#: shell/main.c:223
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan geen toegang verkrijgen tot de Evolution shell."
 
-#: shell/main.c:232
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan de Ximian Evolution-schil niet initialiseren: %s"
 
-#: shell/main.c:302
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Splash screen niet tonen"
 
-#: shell/main.c:303
+#: shell/main.c:318
 msgid "Start in offline mode"
 msgstr "Beginnen in offline modus"
 
-#: shell/main.c:304
+#: shell/main.c:319
 msgid "Start in online mode"
 msgstr "Beginnen in online modus"
 
-#: shell/main.c:305
+#: shell/main.c:320
 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:323
+#: shell/main.c:338
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -25137,7 +24846,7 @@ msgstr ""
 "%s: --online en --oflinne kan niet tegelijk worden gebruikt.\n"
 "  Gebruik %s --help voor meer informatie.\n"
 
-#: shell/main.c:353
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan het Bonobo-componentensysteem niet initializeren"
 
@@ -25188,67 +24897,63 @@ msgstr "Knip de selectie"
 msgid "Delete selected contacts"
 msgstr "Verwijder geselecteerde contacten"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "Dump"
-msgstr "Dump"
-
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:13
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Verplaats Contact(en) naar een Andere Map..."
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:14
 msgid "Move to Folder..."
 msgstr "Verplaatsen naar Map..."
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Plak het klembord"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Geeft een voorbeeld van de af te drukken contacten"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Druk geselecteerde contacten af"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Bewaar de geselecteerde contacten als een VCard."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Alles Selecteren"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Selecteer alle contacten"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Stuur een bericht naar de geselecteerde contacten."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Stuur bericht aan contact..."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Stuur de geselecteerde contacten naar iemand anders."
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Stoppen"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Stop met Laden"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 msgid "View the current contact"
 msgstr "Huidige contact weergeven"
 
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:25
+#: 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
@@ -25258,31 +24963,31 @@ msgstr "Huidige contact weergeven"
 msgid "_Actions"
 msgstr "_Acties"
 
-#: ui/evolution-addressbook.xml.h:34
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "_Contacten Lijst"
 
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "Contacten _Doorsturen..."
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:38
 msgid "_Move to Folder..."
 msgstr "_Verplaatsen naar Map..."
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "Op_slaan als VCard"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_Zoek naar Contacten"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "Alles _Selecteren"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:45
 msgid "_Send Message to Contact..."
 msgstr "Stuur Bericht aan Contact..."
 
@@ -25501,6 +25206,10 @@ 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"
@@ -26127,6 +25836,10 @@ msgstr "Voeg een bestand bij het bericht"
 msgid "Insert text file..."
 msgstr "Tekstbestand invoegen..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Openen"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Bestand openen"
@@ -26266,10 +25979,6 @@ msgstr "_Openen..."
 msgid "_Reply-To Field"
 msgstr "Antwoordadres-veld:"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Beveiliging"
-
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Help"
@@ -26739,25 +26448,24 @@ msgstr "Zoekopdracht-editor"
 msgid "Save Search"
 msgstr "Bewaar Zoekopdracht"
 
-#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:97
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Bewaar Zoekopdracht"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Voeg toe aan Bewaarde Zoekopdrachten"
 
-#: widgets/misc/e-filter-bar.h:93
-#, fuzzy
-msgid "_Advanced Search..."
-msgstr "Uitgebreid zoeken"
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informatie"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Fout"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Vraag"
@@ -26781,14 +26489,14 @@ msgstr "Zoek Nu"
 msgid "_Clear"
 msgstr "Wissen"
 
-#: widgets/misc/e-search-bar.c:844
-msgid "Find Now"
-msgstr "Zoek Nu"
-
-#: widgets/misc/e-search-bar.c:846
+#: widgets/misc/e-search-bar.c:835
 msgid "Clear"
 msgstr "Wissen"
 
+#: widgets/misc/e-search-bar.c:837
+msgid "Find Now"
+msgstr "Zoek Nu"
+
 #: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
 #: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
 msgid "The Personal Addressbook Server"
@@ -26811,508 +26519,1302 @@ 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"
+
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "Aanmelding bij server middels:"
+
+#~ msgid "Account Name"
+#~ msgstr "Accountnaam"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Adresboek Toevoegen"
+
+#~ msgid "Advanced"
+#~ msgstr "Uitgebreid"
+
+#~ msgid "Base"
+#~ msgstr "Basis"
+
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Controleer dit als de server aanmelding vereist."
+
+#~ 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 "Server Name"
+#~ msgstr "Servernaam"
+
+#~ 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 "This information is not required for most ldap servers. "
+#~ msgstr "Deze informatie is niet noodzakelijk voor de meeste LDAP-servers. "
+
+#~ 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."
+
+#~ 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."
+
+#~ 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:"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Andere Adresboeken"
+
+#~ 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?"
+#~ 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%"
+
+#~ 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 "Free/Busy info begins: <b>"
+#~ msgstr "Vrij/Bezet informatie begint <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Begint: <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Einde bijeenkomst: <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Vrij/Bezet informatie eindigt: <b>"
+
+#~ msgid "Ends: <b>"
+#~ msgstr "Eindigt: <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr " (Taak Voltooid: <b>"
+
+#~ msgid "Task Due: <b>"
+#~ msgstr "Taak klaar: <b>"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "iCalendar Informatie"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "iCalendar Fout"
+
+#~ msgid "An unknown person"
+#~ msgstr "Een onbekende persoon"
+
+#~ 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."
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Geen</i>"
+
+#~ msgid "Status:"
+#~ msgstr "Status:"
+
+#~ msgid "Tentatively Accepted"
+#~ msgstr "Voorlopig Geaccepteerd"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Kies een actie:"
+
+#~ msgid "Update"
+#~ msgstr "Verversen"
+
+#~ msgid "Accept"
+#~ msgstr "Accepteren"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Voorlopig accepteren"
+
+#~ msgid "Decline"
+#~ msgstr "Weigeren"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Verstuur Vrij/Bezet Informatie"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Ververs antwoordstatus"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Verstuur Laatste Informatie"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> heeft bijeenkomstgegevens beschikbaar gemaakt."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Bijeenkomst Informatie"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> verzoekt u bij de bijeenkomst aanwezig te zijn."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Vergadering Voorstel"
+
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ msgstr "<b>%s</b> wil graag aan een bestaande bijeenkomst bijdragen."
+
+#~ msgid "Meeting Update"
+#~ msgstr "Vergadering Update"
+
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ msgstr "<b>%s</b> wil graag  de laatste bijeenkomstgegevens ontvangen."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "VergaderingsUpdate Verzoek"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s<b> heeft geantwoord op een bijeenkomstverzoek."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Bijeenkomst Antwoord"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> heeft een bijeenkomst geannuleerd."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Bijeenkomst Annulering"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> heeft een onleesbaar bericht gestuurd."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Fout Bijeenkomstbericht"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> heeft taakgegevens beschikbaar gemaakt."
+
+#~ msgid "Task Information"
+#~ msgstr "Taak Informatie"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> verzoekt u een taak uit te voeren."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Taak Voorstel"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> wil graag iets toevoegen aan een bestaande taak."
+
+#~ msgid "Task Update"
+#~ msgstr "Taak Update"
+
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "<b>%s</b> wil graag de laatste taakgegevens ontvangen."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Taak Update Verzoek"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b> heeft een taakopdracht beantwoord."
+
+#~ msgid "Task Reply"
+#~ msgstr "Taak Antwoord"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> heeft een taak geannuleerd."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Taak Annulering"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Fout Taakbericht"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s<b> heeft vrij/bezet informatie gepubliceerd."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Vrij/Bezet Informatie"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> vraagt om uw beschikbaarheidsinformatie."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Vrij/Bezet Verzoek"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr ""
+#~ "<b>%s</b> heeft een verzoek om beschikbaarheidsinformatie beantwoord."
+
+#~ 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 "Journal information"
+#~ msgstr "Journaal informatie"
+
+#~ msgid "Free/Busy information"
+#~ msgstr "Vrij/Bezet informatie"
+
+#~ msgid "Calendar information"
+#~ msgstr "Kalenderinformatie"
+
 #, fuzzy
-msgid "Card: "
-msgstr "Kaartweergave"
+#~ msgid "Updated"
+#~ msgstr "Verversen"
 
 #, fuzzy
-msgid ""
-"\n"
-"Name: "
-msgstr "Naam:"
+#~ msgid "Refresh"
+#~ msgstr "Lijst Verversen"
 
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Voorvoegsel:      "
+#~ msgid "Task"
+#~ msgstr "Taak"
 
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Gegeven:      "
+#~ msgid "Status: %s"
+#~ msgstr "Status: %s"
+
+#~ msgid "Percent Complete: %i"
+#~ msgstr "Procent Voltooid: %i"
+
+#~ msgid "URL: %s"
+#~ msgstr "URL: %s"
+
+#~ msgid "Categories: %s"
+#~ msgstr "Categorie�n: %s"
+
+#~ msgid "Contacts: "
+#~ msgstr "Contacten: "
 
 #, fuzzy
-msgid ""
-"\n"
-"  Additional: "
-msgstr "Traditioneel"
+#~ msgid "Reminder!!"
+#~ msgstr "Herinnering"
 
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Familie:      "
+#~ msgid "Error hashing password."
+#~ msgstr "Fout bij fijnhakken van wachtwoord"
+
+#~ msgid "Invalid password."
+#~ msgstr "Ongeldig wachtwoord."
+
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Kon niet ondertekenen: certificaat voor \"%s\" niet gevonden."
+
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Kon niet ondertekenen: certificaat voor \"%s\" niet gevonden"
+
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ msgstr "Kon niet coderen: kon ingevouwen informatie niet aanmaken"
+
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "Kon niet versleutelen: gefaald bij maken van encryptiecontext."
+
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr ""
+#~ "Kon gegevens niet versleutelen: ongeldige gebruikers-sleutel: \"%s\"."
+
+#~ 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"
+
+#~ msgid "Server rejected username"
+#~ msgstr "De server weigerde de gebruikersnaam"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Versturen van de gebruikersnaam naar de server mislukt"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "De server weigerde de gebruikernaam en/of het wachtwoord"
+
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "Interne fout: uid heeft ongeldige opmaak: %s"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Kon groepenlijst niet van server ophalen."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Fout bij het laden van het groepenlijstbestand voor %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Fout bij het opslaan van het groepenlijstbestand voor %s: %s"
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "Evolution-component voor de samenvatting."
+
+#~ msgid "Factory for the Evolution executive summary component."
+#~ msgstr "Fabriek voor het Evolution-samenvattingscomponent."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Kan het Samenvattingscomponent van Evolution niet initializeren"
+
+#~ msgid "Select a service"
+#~ msgstr "Selecteer een service"
+
+#~ 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 ""
+#~ "U kunt een andere HTML-pagina kiezen als achtergrond voor de samenvatting.\n"
+#~ "\n"
+#~ "Laat deze leeg voor de standaardachtergrond."
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Open %s met het standaard GNOME-programma"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Open %s met de standaard GNOME-browser"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Verstuur een bericht naar %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Voer %s uit"
+
+#~ msgid "Close %s"
+#~ msgstr "Sluit %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Verplaats %s naar links"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Verplaats %s naar rechts"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Verplaats %s naar de vorige rij"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Verplaats %s naar de volgende rij"
+
+#~ msgid "Configure %s"
+#~ msgstr "Configureer %s"
+
+#~ msgid "page"
+#~ msgstr "pagina"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kon HTML bestand niet openen:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Fout bij lezen gegevens:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Bestand heeft geen plaats voor de services.\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 ""
+#~ "Samenvatting kon Bonobo niet starten.\n"
+#~ "Als er een waarschuwing was over de RootPOA, dan is Bonobo\n"
+#~ "waarschijnlijk gecompileerd met GOAD in plaats van OAF."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Fabriek voor de RDF samenvatting."
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF Samenvatting"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Fabriek voor het test-bonobo component."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Fabriek voor het test-component."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Test bonobo service"
+
+#~ msgid "Test service"
+#~ msgstr "Test service"
+
+#~ msgid "Update automatically"
+#~ msgstr "Automatisch verversen"
+
+#~ msgid "Update now"
+#~ msgstr "Nu bijwerken"
+
+#~ msgid "Update every "
+#~ msgstr "Actualiseer elke "
+
+#~ 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"
 
 #, fuzzy
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr "Achtervoeg_sel:"
+#~ msgid "Ad_vanced &gt;&gt;"
+#~ msgstr "Uitgebreid"
 
 #, fuzzy
-msgid ""
-"\n"
-"Birth Date: "
-msgstr "Geboortedatum"
+#~ 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 ""
-"\n"
-"Address:"
-msgstr "_Adres:"
+#~ msgid "Command"
+#~ msgstr "Bedrijf"
 
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Postbus:  "
+#~ msgid "Composer"
+#~ msgstr "Editor"
 
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Ext:           "
+#~ msgid "Confirm when Expunging a folder"
+#~ msgstr "Bevestigen bij het Legen van een map"
 
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Straat:      "
+#~ msgid "Default Forward style is: "
+#~ msgstr "Standaardwijze van doorsturen: "
 
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Plaats:        "
+#~ msgid "Default character encoding: "
+#~ msgstr "Standaard karaktercode:"
 
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Regio:      "
+#, fuzzy
+#~ msgid "Delete selected signature"
+#~ msgstr "Verwijder alles behalve de  handtekening"
 
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Postcode: "
+#~ msgid "Display"
+#~ msgstr "Weergave"
+
+#~ msgid "Drafts"
+#~ msgstr "Klad"
 
 #, fuzzy
-msgid ""
-"\n"
-"  Country:     "
-msgstr "_Land:"
+#~ msgid "E_mail address:"
+#~ msgstr "_Emailadres:"
 
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Afleveringslabel: "
+#, fuzzy
+#~ msgid "Ed_it..."
+#~ msgstr "Bewerken..."
 
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefoons:\n"
+#, fuzzy
+#~ msgid "Edi_t..."
+#~ msgstr "Bewerken..."
 
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefoon:"
+#, fuzzy
+#~ msgid "File containing signature"
+#~ msgstr "Map die post bevat"
 
 #, fuzzy
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr "Email"
+#~ msgid "Forwards and Replies"
+#~ msgstr "Doorgestuurde berichten"
 
 #, fuzzy
-msgid ""
-"\n"
-"E-mail:"
-msgstr "Email"
+#~ msgid "Hide advanced settings"
+#~ msgstr "Weerinstellingen"
+
+#~ msgid "In HTML mail"
+#~ msgstr "In HTML-berichten"
 
 #, fuzzy
-msgid ""
-"\n"
-"Mailer: "
-msgstr "Post"
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Snelkoppelingen"
 
 #, fuzzy
-msgid ""
-"\n"
-"Time Zone: "
-msgstr "Tijdzones"
+#~ msgid "List of signatures"
+#~ msgstr "Bestand met _HTML-ondertekening:"
+
+#~ msgid "Mail Settings"
+#~ msgstr "Mail-instellingen"
 
 #, fuzzy
-msgid ""
-"\n"
-"Geo Location: "
-msgstr "Geografische Locatie: "
+#~ msgid "N_ew..."
+#~ msgstr "Nieuw..."
 
 #, fuzzy
-msgid ""
-"\n"
-"Business Role: "
-msgstr "Bedrijf Telefoon-2"
+#~ msgid "Name of selected signature"
+#~ msgstr "Verwijder alles behalve de  handtekening"
 
 #, fuzzy
-msgid ""
-"\n"
-"Org: "
-msgstr "Org"
+#~ msgid "Ne_w..."
+#~ msgstr "Nieuw..."
+
+#~ msgid "News"
+#~ msgstr "Nieuws"
+
+#~ msgid "Prompt when sending messages with an _empty subject"
+#~ msgstr "Waarschuw wanneer een bericht verstuurd wordt zonder _onderwerp"
+
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Selecteer een Filter Log bestand..."
+
+#~ msgid "Select PGP binary"
+#~ msgstr "Selecteer het pad naar PGP"
+
+#~ msgid "Sent"
+#~ msgstr "Verzonden"
 
 #, fuzzy
-msgid ""
-"\n"
-"  Name:  "
-msgstr "Naam:"
+#~ msgid "Shortcut"
+#~ msgstr "_Snelkoppeling"
 
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Eenheid:  "
+#, fuzzy
+#~ msgid "Show advanced settings"
+#~ msgstr "Nieuwsbron-instellingen:"
 
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Eenheid2: "
+#, fuzzy
+#~ msgid "Signatures"
+#~ msgstr "Bewaar handtekening"
 
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Eenheid3: "
+#~ msgid "Sources"
+#~ msgstr "Bronnen"
 
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Eenheid4: "
+#, fuzzy
+#~ msgid "_Edit..."
+#~ msgstr "Bewerken..."
 
 #, fuzzy
-msgid ""
-"\n"
-"Categories: "
-msgstr "Categorie�n: %s"
+#~ msgid "_Filename"
+#~ msgstr "Bestandsnaam:"
+
+#~ msgid "_Highlight citations with"
+#~ msgstr "_Accentueer citaten met"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "_Log filteracties in:"
+
+#~ msgid "_Mark messages as Read after"
+#~ msgstr "_Markeer berichten als Gelezen na "
 
 #, fuzzy
-msgid ""
-"\n"
-"Comment: "
-msgstr "Commentaar bevat"
+#~ msgid "_Name"
+#~ msgstr "_Naam:"
 
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Unieke Tekenreeks: "
+#~ msgid "_Organization:"
+#~ msgstr "Organisatie:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Onthoud dit wachtwoord"
 
 #, fuzzy
-msgid ""
-"\n"
-"Public Key: "
-msgstr "Openbaar"
+#~ msgid "_Script"
+#~ msgstr "_Beveiliging"
 
-msgid "Connecting to LDAP server..."
-msgstr "Verbinding met LDAP server wordt opgezet..."
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Stuur berichten standaard in HTML-formaat."
 
-msgid "Unable to connect to LDAP server."
-msgstr "Kan geen verbinding krijgen met LDAP server."
+#, fuzzy
+#~ msgid "_Send messages in HTML format by default"
+#~ msgstr "Stuur berichten standaard in HTML-formaat."
+
+#~ msgid "_Server type: "
+#~ msgstr "_Server type: "
 
-msgid "Waiting for connection to LDAP server..."
-msgstr "Wacht op antwoord van de LDAP server..."
+#~ msgid "placeholder"
+#~ msgstr "vuller"
+
+#~ msgid "seconds."
+#~ msgstr "seconden."
 
 #, fuzzy
-msgid "New _Contact"
-msgstr "Nieuw Contact"
+#~ msgid "use _HTML for this signature"
+#~ msgstr "Bestand met _HTML-ondertekening:"
 
 #, fuzzy
-msgid "New Contact _List"
-msgstr "Nieuwe Contactenlijst"
+#~ 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 "Name contains"
-msgstr "Naam bevat"
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr "Dit bericht is digitaal ondertekend en is authentiek."
 
-msgid "Create a new appointment"
-msgstr "Maak een nieuwe afspraak"
+#~ 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 "Create a new task"
-msgstr "Nieuwe taak aanmaken"
+#~ 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"
 
 #, fuzzy
-msgid "New _Task"
-msgstr "Nieuwe Taak"
+#~ msgid "_Advanced Search..."
+#~ msgstr "Uitgebreid zoeken"
 
-msgid "_Delete this Task"
-msgstr "_Verwijder deze taak"
+#, fuzzy
+#~ msgid "Card: "
+#~ msgstr "Kaartweergave"
 
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr "Kan geen van uw identiteiten vinden in de bezoekerlijst!\n"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr "Naam:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Voorvoegsel:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Gegeven:      "
 
-msgid "Free/Busy information (%s to %s)"
-msgstr "Vrij/Bezet informatie (%s tot %s)"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr "Traditioneel"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Familie:      "
 
-msgid "iCalendar information"
-msgstr "iCalendar informatie"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr "Achtervoeg_sel:"
 
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Ongeldig type in bericht-bevat, verwacht een tekenreeks"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr "Geboortedatum"
 
 #, fuzzy
-msgid "NT Login"
-msgstr "Login"
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr "_Adres:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postbus:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ext:           "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Straat:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Plaats:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Regio:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postcode: "
 
 #, fuzzy
-msgid "Could not check POP server for new messages: %s"
-msgstr "Kon niet verbinden met POP-server op %s."
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr "_Land:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Afleveringslabel: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefoons:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefoon:"
 
 #, fuzzy
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Kon MIME bericht niet verwerken. Laat zien als source"
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr "Email"
 
 #, fuzzy
-msgid "Could not fetch message: %s"
-msgstr "Kon bericht niet versturen: %s"
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr "Email"
 
 #, fuzzy
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Kon niet verbinden met POP-server op %s."
+#~ msgid ""
+#~ "\n"
+#~ "Mailer: "
+#~ msgstr "Post"
 
 #, fuzzy
-msgid ""
-"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."
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr "Tijdzones"
 
 #, fuzzy
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Kon niet verbinden met POP-server op %s."
+#~ msgid ""
+#~ "\n"
+#~ "Geo Location: "
+#~ msgstr "Geografische Locatie: "
 
 #, fuzzy
-msgid "Could not connect to server: %s"
-msgstr "Kon niet verbinden met POP-server op %s."
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr "Bedrijf Telefoon-2"
 
 #, fuzzy
-msgid "(Unknown)"
-msgstr "Onbekend"
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr "Org"
 
 #, fuzzy
-msgid "Unexpected response from POP server: %s"
-msgstr "Onverwacht antwoord van IMAP-server: %s"
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr "Naam:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Eenheid:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Eenheid2: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Eenheid3: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Eenheid4: "
 
-msgid "Could not find 'From' address in message"
-msgstr "Kon 'Van'-adres niet vinden in berichtinhoud"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr "Categorie�n: %s"
 
-msgid "Cannot send message: sender address not defined."
-msgstr "Kan bericht niet versturen: afzender niet gedefini�erd."
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr "Commentaar bevat"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Unieke Tekenreeks: "
 
 #, fuzzy
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Time-out tijdens 'RCPT TO'-verzoek: %s: bericht niet verzonden"
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr "Openbaar"
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Verbinding met LDAP server wordt opgezet..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Wacht op antwoord van de LDAP server..."
 
 #, fuzzy
-msgid "DATA response error: %s: mail not sent"
-msgstr "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
+#~ msgid "New _Contact"
+#~ msgstr "Nieuw Contact"
 
 #, fuzzy
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-"Time-out tijdens het versturen van DATA: bericht afgebroken: %s: bericht "
-"niet verstuurd"
+#~ msgid "New Contact _List"
+#~ msgstr "Nieuwe Contactenlijst"
+
+#~ msgid "Name contains"
+#~ msgstr "Naam bevat"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Maak een nieuwe afspraak"
+
+#~ msgid "Create a new task"
+#~ msgstr "Nieuwe taak aanmaken"
 
 #, fuzzy
-msgid "QUIT response error: %s: non-fatal"
-msgstr "'HELO respons'- fout: %s: niet-fataal"
+#~ msgid "New _Task"
+#~ msgstr "Nieuwe Taak"
+
+#~ msgid "_Delete this Task"
+#~ msgstr "_Verwijder deze taak"
+
+#~ msgid "Unable to find any of your identities in the attendees list!\n"
+#~ msgstr "Kan geen van uw identiteiten vinden in de bezoekerlijst!\n"
+
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "Vrij/Bezet informatie (%s tot %s)"
+
+#~ msgid "iCalendar information"
+#~ msgstr "iCalendar informatie"
+
+#~ msgid "Invalid type in body-contains, expecting string"
+#~ msgstr "Ongeldig type in bericht-bevat, verwacht een tekenreeks"
 
 #, fuzzy
-msgid "Needs Reply"
-msgstr "Vrij/Bezet Antwoord"
+#~ msgid "NT Login"
+#~ msgstr "Login"
 
-msgid "Mail storage folder (internal)"
-msgstr "Berichten opslagmap (intern)"
+#, fuzzy
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Kon niet verbinden met POP-server op %s."
 
-msgid "Cannot connect to store: %s"
-msgstr "Kon niet verbinden met de opslag: %s"
+#, fuzzy
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr "Kon MIME bericht niet verwerken. Laat zien als source"
 
 #, fuzzy
-msgid "New _Mail Message"
-msgstr "Nieuw Bericht"
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Kon bericht niet versturen: %s"
 
-msgid "Create vFolder from Search"
-msgstr "Maak vFolder van Zoekopracht"
+#, fuzzy
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ msgstr "Kon niet verbinden met POP-server op %s."
 
-msgid "Mark as Unim_portant"
-msgstr "Markeer als Onbe_langrijk"
+#, fuzzy
+#~ msgid ""
+#~ "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."
 
 #, fuzzy
-msgid "Mark as Needing Reply"
-msgstr "Bijeenkomst Antwoord"
+#~ msgid "Could not authenticate to KPOP server: %s"
+#~ msgstr "Kon niet verbinden met POP-server op %s."
 
 #, fuzzy
-msgid "Mark as Not Needing Reply"
-msgstr "Bijeenkomst Antwoord"
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Kon niet verbinden met POP-server op %s."
 
-msgid "Filter on Mailing List"
-msgstr "Filter op Mailinglijst"
+#, fuzzy
+#~ msgid "(Unknown)"
+#~ msgstr "Onbekend"
 
-msgid "Indexing:"
-msgstr "Bezig met indexeren:"
+#, fuzzy
+#~ msgid "Unexpected response from POP server: %s"
+#~ msgstr "Onverwacht antwoord van IMAP-server: %s"
 
-msgid "Mailbox Format"
-msgstr "Mailbox Formaat"
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "Kon 'Van'-adres niet vinden in berichtinhoud"
 
-msgid "Are you sure you want to delete this news account?"
-msgstr "Weet u zeker dat u dit nieuws-account wilt verwijderen?"
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "Kan bericht niet versturen: afzender niet gedefini�erd."
 
 #, fuzzy
-msgid "This message contains invalid recipients:"
-msgstr "Dit bericht bevat alleen Bcc-ontvangers."
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "Time-out tijdens 'RCPT TO'-verzoek: %s: bericht niet verzonden"
 
-msgid "HTML signature file:"
-msgstr "HTML Handtekeningbestand:"
+#, fuzzy
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
 
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Kon de Evolution Samenvattingscomponent niet initialiseren."
+#, fuzzy
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr ""
+#~ "Time-out tijdens het versturen van DATA: bericht afgebroken: %s: bericht "
+#~ "niet verstuurd"
 
 #, fuzzy
-msgid "Regions"
-msgstr "Regina"
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "'HELO respons'- fout: %s: niet-fataal"
 
 #, fuzzy
-msgid " _Remove"
-msgstr "Ve_rwijderen"
+#~ msgid "Needs Reply"
+#~ msgstr "Vrij/Bezet Antwoord"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Berichten opslagmap (intern)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Kon niet verbinden met de opslag: %s"
 
 #, fuzzy
-msgid "Al_l stations:"
-msgstr "College Station"
+#~ msgid "New _Mail Message"
+#~ msgstr "Nieuw Bericht"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Maak vFolder van Zoekopracht"
+
+#~ msgid "Mark as Unim_portant"
+#~ msgstr "Markeer als Onbe_langrijk"
 
 #, fuzzy
-msgid "All _folders:"
-msgstr "Alle mappen"
+#~ msgid "Mark as Needing Reply"
+#~ msgstr "Bijeenkomst Antwoord"
 
 #, fuzzy
-msgid "All news _feeds:"
-msgstr "Nieuws_bron toevoegen"
+#~ msgid "Mark as Not Needing Reply"
+#~ msgstr "Bijeenkomst Antwoord"
+
+#~ msgid "Filter on Mailing List"
+#~ msgstr "Filter op Mailinglijst"
+
+#~ msgid "Indexing:"
+#~ msgstr "Bezig met indexeren:"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "Mailbox Formaat"
 
 #, fuzzy
-msgid "_Display folders:"
-msgstr "_Klad map:"
+#~ 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."
 
 #, fuzzy
-msgid "_Display stations:"
-msgstr "Weergave-instellingen"
+#~ msgid "Regions"
+#~ msgstr "Regina"
 
 #, fuzzy
-msgid "_Displayed feeds:"
-msgstr "Kaarten weergeven"
+#~ msgid " _Remove"
+#~ msgstr "Ve_rwijderen"
 
-msgid "Evolution "
-msgstr "Evolution "
+#, fuzzy
+#~ msgid "Al_l stations:"
+#~ msgstr "College Station"
 
 #, fuzzy
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
+#~ msgid "All _folders:"
+#~ msgstr "Alle mappen"
 
-msgid "(No name)"
-msgstr "(Geen naam)"
+#, fuzzy
+#~ msgid "All news _feeds:"
+#~ msgstr "Nieuws_bron toevoegen"
 
 #, fuzzy
-msgid "New List"
-msgstr "Telefoontypes"
+#~ msgid "_Display folders:"
+#~ msgstr "_Klad map:"
 
-msgid "_Addressbook Sources..."
-msgstr "_Adresboekbronnen"
+#, fuzzy
+#~ msgid "_Display stations:"
+#~ msgstr "Weergave-instellingen"
 
-msgid "Configure the calendar's settings"
-msgstr "Kalender instellen"
+#, fuzzy
+#~ msgid "_Displayed feeds:"
+#~ msgstr "Kaarten weergeven"
 
-msgid "Create a New All Day _Event"
-msgstr "Maak een Nieuwr 'Hele Dag' Gebeurtenis"
+#~ msgid "Evolution "
+#~ msgstr "Evolution "
 
-msgid "Create a New _Task"
-msgstr "Maak een Nieuwe _Taak"
+#, fuzzy
+#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+#~ msgstr "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
 
-msgid "Create a _New Appointment"
-msgstr "Maak een _Nieuwe Afspraak"
+#~ msgid "(No name)"
+#~ msgstr "(Geen naam)"
+
+#, fuzzy
+#~ msgid "New List"
+#~ msgstr "Telefoontypes"
 
-msgid "Create an event for the whole day"
-msgstr "Een gebeurtenis aanmaken voor de hele dag"
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Kalender instellen"
 
-msgid "_Appointment..."
-msgstr "_Afspraak..."
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Maak een Nieuwr 'Hele Dag' Gebeurtenis"
 
-msgid "_Calendar Settings..."
-msgstr "_Kalender Instellingen..."
+#~ msgid "Create a New _Task"
+#~ msgstr "Maak een Nieuwe _Taak"
 
-msgid "_Task..."
-msgstr "_Taak..."
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Maak een _Nieuwe Afspraak"
 
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Creeer of bewerk een emailaccount of andere voorkeuren"
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Een gebeurtenis aanmaken voor de hele dag"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Afspraak..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Kalender Instellingen..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Taak..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Creeer of bewerk een emailaccount of andere voorkeuren"
 
 #, fuzzy
-msgid "New Message"
-msgstr "Volgend Bericht"
+#~ msgid "New Message"
+#~ msgstr "Volgend Bericht"
 
-msgid "_Mail Settings..."
-msgstr "Postinstellingen..."
+#~ msgid "_Mail Settings..."
+#~ msgstr "Postinstellingen..."
 
 #, fuzzy
-msgid "Forward As"
-msgstr "Doorsturen"
+#~ msgid "Forward As"
+#~ msgstr "Doorsturen"
 
 #, fuzzy
-msgid "Forward _Attached"
-msgstr "_Bijgevoegd"
+#~ msgid "Forward _Attached"
+#~ msgstr "_Bijgevoegd"
 
 #, fuzzy
-msgid "Forward _Quoted"
-msgstr "Stuur Contact Door"
+#~ msgid "Forward _Quoted"
+#~ msgstr "Stuur Contact Door"
 
-msgid "_Apply Filters"
-msgstr "Filters _Toepassen"
+#~ msgid "_Apply Filters"
+#~ msgstr "Filters _Toepassen"
 
-msgid "Configure the task view's settings"
-msgstr "Configureer de weergave van taken"
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Configureer de weergave van taken"
 
-msgid "Tasks Settings..."
-msgstr "Taakinstellingen..."
+#~ msgid "Tasks Settings..."
+#~ msgstr "Taakinstellingen..."
 
-msgid "Change the settings for the summary"
-msgstr "Verander de instellingen van de samenvatting"
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Verander de instellingen van de samenvatting"
 
-msgid "_Summary Settings..."
-msgstr "_Samenvatting Instellingen..."
+#~ msgid "_Summary Settings..."
+#~ msgstr "_Samenvatting Instellingen..."
 
-msgid "Show All"
-msgstr "Alles Weergeven"
+#~ msgid "Show All"
+#~ msgstr "Alles Weergeven"
 
-msgid "Sear_ch"
-msgstr "_Zoeken"
+#~ msgid "Sear_ch"
+#~ msgstr "_Zoeken"
 
 #~ msgid "Create a _New Meeting"
 #~ msgstr "Maak Een Nieuwe _Bijeenkomst"
diff --git a/po/nn.po b/po/nn.po
index 29c9c4a900..8f92ccd88c 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-01-30 06:12+0100\n"
+"POT-Creation-Date: 2002-05-07 15:46-0400\n"
 "PO-Revision-Date: 2002-01-30 06:10+0100\n"
 "Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
 "Language-Team: \n"
@@ -30,21 +30,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importerar VCard-filer inn i Evolution."
 
 #: 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 "Arkiver som"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Namn"
 
 #: 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 "E-post"
 
 #: 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:1731
 msgid "Primary"
 msgstr "Prim�r"
 
@@ -54,16 +55,16 @@ 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:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:994
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 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:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
 msgid "Business"
 msgstr "Firma"
 
@@ -73,12 +74,12 @@ msgid "Bus"
 msgstr "Frm"
 
 #: 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:1720
 msgid "Callback"
 msgstr "Ring tilbake"
 
 #: 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:1722
 msgid "Company"
 msgstr "Firma"
 
@@ -89,13 +90,13 @@ 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:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
 msgid "Home"
 msgstr "Heim"
 
 #: 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 "Organisasjon"
 
@@ -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:1727
 msgid "Mobile"
 msgstr "Mobil"
 
 #: 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:1721
 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:1647
-#: addressbook/gui/widgets/e-addressbook-view.c:974
+#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Firma-fax"
 
@@ -126,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:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:975
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "Firma 2"
 
@@ -141,69 +142,68 @@ msgid "Bus 2"
 msgstr "Frm 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:1724
 msgid "Home 2"
 msgstr "Heim 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:978
+#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: 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:57
+#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "Anna"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:981
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:982
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:983
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: 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:984
+#: 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:986
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:987
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-post 3"
 
 #: 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 "Nettstad"
 
@@ -212,7 +212,7 @@ msgid "Url"
 msgstr "Url"
 
 #: 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 "Avdeling"
 
@@ -221,7 +221,7 @@ msgid "Dep"
 msgstr "Avd"
 
 #: 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 "Kontor"
 
@@ -230,12 +230,12 @@ msgid "Off"
 msgstr "Av"
 
 #: 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 "Tittel"
 
 #: 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 "Yrke"
 
@@ -244,7 +244,7 @@ msgid "Prof"
 msgstr "Yrke"
 
 #: 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 "Sjef"
 
@@ -257,7 +257,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: 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 "Kallenamn"
 
@@ -266,12 +266,12 @@ msgid "Nick"
 msgstr "Kallenamn"
 
 #: 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 "Ektefelle"
 
 #: 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 "Merknad"
 
@@ -284,7 +284,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: 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 "Ledit-oppteke URL"
 
@@ -313,300 +313,16 @@ msgstr "Kategoriar"
 msgid "Family Name"
 msgstr "Etternamn"
 
-#: 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 "Kort: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Namn: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Prefiks:    "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Fornamn:    "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Tillegg:"
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Etternamn:  "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Etterstaving:    "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"F�dselsdato: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adresse:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Postboks:"
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Prefix:    "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Gateaddresse:"
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  By:          "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Region:      "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Postnummer: "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Land:        "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Leveringsetikett: "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefonar:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-post:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-post:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Tidssone:"
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geo lokasjon: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Forretningsrolle: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Namn:  "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-" Eining: "
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-" Eining2: "
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-" Eining3: "
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-" Eining4: "
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategoriar: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Merknad:"
-
-#. 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"
-"Unik streng:"
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Offentleg n�kkel: "
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Fleire VKort"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VKort for %s"
@@ -614,86 +330,89 @@ msgstr "VKort for %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:1721
+#: 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: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:171 calendar/gui/main.c:63
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikkje initialisere Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2272
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "S�kjer ..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Lastar ..."
 
 #. 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 "Feil i s�keuttrykk."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:486
-msgid "Connecting to LDAP server..."
-msgstr "Koplar til LDAP-tenar ..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:496
-msgid "Unable to connect to LDAP server."
-msgstr "Klarte ikkje � kople til LDAP-tenar."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:512
-msgid "Waiting for connection to LDAP server..."
-msgstr "Ventar p� � kople til LDAP-tenar ..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:915
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Legg til kort til LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1016
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Fjernar kort fr� LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Endrar kort fr� LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2217
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Startar s�k om att."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Mottek LDAP-s�keresultat ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2222
-msgid "Restarting search."
-msgstr "Startar s�k om att."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Feil ved fjerning av kort"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Klarter ikkje � tolke URL fr� �%s�"
 
-#: addressbook/conduit/address-conduit.c:426
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "E-postadresse:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Mark�r kunne ikkje lastast\n"
 
-#: addressbook/conduit/address-conduit.c:439
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "EBook vart ikkje lasta\n"
 
-#: 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 "Klarte ikkje � starte wombat-tenar."
 
-#: 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 "Klarte ikkje � starte wombat."
 
-#: 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 "Klarte ikkje � lese addresseblokka i programmet til piloten"
 
@@ -706,358 +425,835 @@ msgid "A Bonobo control for displaying an address."
 msgstr "Ein bonobo-kontroll for vising av addresser."
 
 #: 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 "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
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolutions addressebok minikortlesar"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Evolutionkomponent for handsaming av kontakter."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fabrikk for Minikortkontrolle i addresseboka"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Fabrikk for addressevisaren til addresseboka"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the Addressbook's address popup"
 msgstr "Fabrikke for sprettopp-vindauget til addresseboka"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrikk for ein eksemple adressebokkontroll"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Mappe som inneheld kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP-tenar"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "LDAP-tenar som inneheld kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:527
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New _Contact"
-msgstr "Ny _kontakt"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:530
-msgid "New Contact _List"
-msgstr "Ny kontakt_liste"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "&Innhald ..."
+
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+msgid "Could not initialize gnome-vfs"
+msgstr "Klarte ikkje � initialisere gnome-vfs"
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr "Ikkje i stand � opne adresseboka"
+
+#: 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 ""
+
+#: 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"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Oppgi passord for %s (brukar %s)"
+
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "sluttar med"
+
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "E-post 2"
+
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "Kategori er"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: 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
+msgid "Advanced..."
+msgstr "Avansert ..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
+msgstr "Nokon kategori"
+
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
+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
+msgid "Primary Email"
+msgstr "Prim�r e-post"
+
+#: addressbook/gui/component/e-address-popup.c:587
+msgid "Select an Action"
+msgstr "Vel ei handling"
+
+#: addressbook/gui/component/e-address-popup.c:593
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Lag ny kontakt �%s�"
+
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Legg til addresser for eksisterande kontakt �%s�"
+
+#: addressbook/gui/component/e-address-popup.c:891
+msgid "Querying Addressbook..."
+msgstr "Sp�r adresseboka ..."
+
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
+msgstr "Rediger kontaktinformasjon"
+
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+msgid "Add to Contacts"
+msgstr "Legg til kontakter"
+
+#: addressbook/gui/component/e-address-popup.c:1046
+msgid "Merge E-Mail Address"
+msgstr "Flett e-postadresser"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
+msgstr "Sl� av sp�rjingar"
+
+#: addressbook/gui/component/e-address-widget.c:364
+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:193
-msgid "Edit Addressbook"
-msgstr "Rediger adressebok"
+#: 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.glade.h:1
+#: 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 "100"
+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
+#, fuzzy
+msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Account Name"
-msgstr "Kontonamn"
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Add Addressbook"
-msgstr "Legg til adressebok"
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "Addressebokkjelder"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Advanced"
-msgstr "Avansert"
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Alarmar"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonym"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Base"
-msgstr "Base"
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Enkel"
+#: 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/addressbook-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "DN Customization"
+msgstr "Ingen informasjon"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "De_lete"
 msgstr "S_lett"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Liste_namn:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Email Address:"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+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 kjem til � bruke denne e-postaddressa for � autentisere deg "
+"ovanfor tenaren"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution kjem til � bruke denne e-postaddressa for � autentisere deg "
 "ovanfor tenaren"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "F_inn"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Allment"
+
+#: 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 "Oppsett"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Margar"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_kvar"
+
+#: 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 "Ein"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search _base:"
-msgstr "S�ke_base:"
+#: 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 "Forvald"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Forvald"
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Search s_cope: "
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
 msgstr "S�kes_kop:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid "Server Name"
-msgstr "Tenarnamn"
+#. 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 "S�ker"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Vel alle"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Sletta"
+
+#: 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 "Tenarinformasjon"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr " Koplar til tenar ..."
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: 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 "Sub"
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Informasjon trengs for � legge til ei addressebok."
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Ust�tta skjema"
+
+#: 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/addressbook-config.glade.h:18
-msgid "This information is not required for most ldap servers. "
-msgstr "Denne informasjonen er ikkje naudsynt for dei fleste ldap-tenarer."
+#: 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/addressbook-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:76
 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."
+"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 ""
-"Denne informasjonen er brukt av ldap-tenaren for � spesifierse kva nodar som "
-"skal brukast i s�ket. Kontakt tenaradmistratoren din for meir informasjon."
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"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/addressbook-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid ""
-"This is the maximum number of cards to download.  Setting this number too "
-"large will slow down this addressbook."
+"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/addressbook-config.glade.h:22
-msgid "This is the name of the server where your addressbook is located."
+#: 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:23
-msgid "This is the port that your ldap server uses."
+#: 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/addressbook-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"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 ""
 "Namnet blir brukt til � identifisere kontoen din. Det er kun til for "
 "visningsf�rem�l."
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
-msgid "_Account name:"
-msgstr "Konton_amn:"
+#: 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/addressbook-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+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
+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:99 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:139
 msgid "_Add"
 msgstr "_Legg til"
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Download Limit"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-#: 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
-msgid "_Edit"
-msgstr "R_edig�r"
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Legg til"
 
-#: addressbook/gui/component/addressbook-config.glade.h:29
-msgid "_My server requires authentication"
-msgstr "_Min tenar treng autentisering"
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Legg til handling"
 
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Port:"
-msgstr "_Port:"
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Legg til handling"
 
-#: addressbook/gui/component/addressbook-config.glade.h:31
-msgid "_Server name:"
-msgstr "_Tenarnamn:"
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Alarmar"
 
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-msgid "Could not initialize gnome-vfs"
-msgstr "Klarte ikkje � initialisere gnome-vfs"
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "S_lett alle"
 
-#: addressbook/gui/component/addressbook-storage.c:168
-msgid "Other Contacts"
-msgstr "Andre kontakter"
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Vis"
 
-#: addressbook/gui/component/addressbook.c:499
-msgid "Unable to open addressbook"
-msgstr "Ikkje i stand � opne adresseboka"
+#: addressbook/gui/component/ldap-config.glade.h:111
+msgid "_Distinguished Name (DN):"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:508
-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"
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:513
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:521
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: 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
+#: 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 "R_edig�r"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "R_edig�r avtale"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution alarm"
+
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:654
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Oppgi passord for %s (brukar %s)"
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:822
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Nokon felt inneheld"
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:823
-msgid "Name contains"
-msgstr "Namn inneheld"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:824
-msgid "Email contains"
-msgstr "E-post inneheld"
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Val"
 
-#: addressbook/gui/component/addressbook.c:825
-#: calendar/gui/cal-search-bar.c:59
-msgid "Category is"
-msgstr "Kategori er"
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Port:"
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:826 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Avansert ..."
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Forvald"
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1053
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
-msgstr "Nokon kategori"
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "S�ke_base:"
 
-#: addressbook/gui/component/addressbook.c:1136
-msgid "The URI that the Folder Browser will display"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Tenarnamn:"
 
-#.
-#. * 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/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "L�g grense (minutt):"
 
-#: 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
-msgid "Primary Email"
-msgstr "Prim�r e-post"
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Konto %d"
 
-#: addressbook/gui/component/e-address-popup.c:587
-msgid "Select an Action"
-msgstr "Vel ei handling"
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "contact-list-editor"
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Lag ny kontakt �%s�"
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Ingen kort"
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Legg til addresser for eksisterande kontakt �%s�"
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Koplar til %s p� nytt"
 
-#: addressbook/gui/component/e-address-popup.c:891
-msgid "Querying Addressbook..."
-msgstr "Sp�r adresseboka ..."
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
-msgstr "Rediger kontaktinformasjon"
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-msgid "Add to Contacts"
-msgstr "Legg til kontakter"
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "Allment"
 
-#: addressbook/gui/component/e-address-popup.c:1046
-msgid "Merge E-Mail Address"
-msgstr "Flett e-postadresser"
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
-msgstr "Sl� av sp�rjingar"
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
-msgstr "Sl� p� sp�rjingar (Farleg!)"
+#: addressbook/gui/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "S�ker"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 #, fuzzy
@@ -1069,9 +1265,9 @@ msgid "Factory for the Addressbook's name selection interface"
 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
+#: 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
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1100,7 +1296,12 @@ msgstr "(%d ikkje vist)"
 msgid "Unnamed Contact"
 msgstr "Kontakt utan namn"
 
-#: addressbook/gui/component/select-names/e-select-names.c:581
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Avsendar inneheld"
+
+#: 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"
@@ -1110,7 +1311,7 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: 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"
@@ -1118,31 +1319,40 @@ msgid ""
 "correct this problem."
 msgstr ""
 
-#: 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
-msgid "C_ontaining:"
-msgstr "I_nneheld:"
+msgid "Select Names"
+msgstr "Vel namn"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "F_inn"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Slett kontakt?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Vel namn"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Kontakter"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Vis kontakter som stemmer med desse kriteria:"
+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 "_Flytt ..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Mapper:"
 
@@ -1178,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:1293
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -1203,10 +1413,6 @@ msgstr "Arkiver _som:"
 msgid "Full _Name..."
 msgstr "Fullt _namn ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Allment"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1248,10 +1454,11 @@ 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:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1478 mail/mail-config.glade.h:105
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -1279,35 +1486,1054 @@ msgstr "_Offentleg kalendar-URL:"
 msgid "_Web page address:"
 msgstr "_Nettsideaddresse"
 
-#: 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-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
+msgstr "USA"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: my-evolution/Locations.h:42
+msgid "Albania"
+msgstr "Albania"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: my-evolution/Locations.h:54
+msgid "Algeria"
+msgstr "Algerie"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+msgid "American Samoa"
+msgstr "Amerikansk samoa"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+msgid "Andorra"
+msgstr "Andorra"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+msgid "Angola"
+msgstr "Angola"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+msgid "Antarctica"
+msgstr "Antarktis"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+msgid "Antigua And Barbuda"
+msgstr "Antigua og Barbuda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: my-evolution/Locations.h:120
+msgid "Argentina"
+msgstr "Argentina"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+msgid "Armenia"
+msgstr "Armenia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+msgid "Aruba"
+msgstr "Aruba"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: my-evolution/Locations.h:154
+msgid "Australia"
+msgstr "Australia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: my-evolution/Locations.h:155
+msgid "Austria"
+msgstr "Austerrike"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+msgid "Azerbaijan"
+msgstr "Aserbadjan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: my-evolution/Locations.h:161
+msgid "Bahamas"
+msgstr "Bahamas"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: my-evolution/Locations.h:164
+msgid "Bahrain"
+msgstr "Bahrain"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+msgid "Barbados"
+msgstr "Barbados"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+msgid "Belarus"
+msgstr "Kviterussland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: my-evolution/Locations.h:216
+msgid "Belgium"
+msgstr "Belgia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: my-evolution/Locations.h:218
+msgid "Belize"
+msgstr "Belize"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+msgid "Benin"
+msgstr "Benin"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+msgid "Bermuda"
+msgstr "Bermuda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: my-evolution/Locations.h:270
+msgid "Bolivia"
+msgstr "Bolivia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+msgid "Bosnia And Herzegowina"
+msgstr "Bosnia og Herzegovina"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+msgid "Botswana"
+msgstr "Botswana"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+msgid "Bouvet Island"
+msgstr "Bouvet Island"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: my-evolution/Locations.h:294
+msgid "Brazil"
+msgstr "Brasil"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+msgid "British Indian Ocean Territory"
+msgstr "Britisk Indisk sj�territorium"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+msgid "Brunei Darussalam"
+msgstr "Brunei Darussalam"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: my-evolution/Locations.h:320
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+msgid "Burundi"
+msgstr "Burundi"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+msgid "Cambodia"
+msgstr "Kambodsja"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+msgid "Cameroon"
+msgstr "Kamerun"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: my-evolution/Locations.h:354
+msgid "Canada"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+msgid "Cape Verde"
+msgstr "Cape Verde"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: my-evolution/Locations.h:389
+msgid "Cayman Islands"
+msgstr "Cayman Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+msgid "Central African Republic"
+msgstr "Den Sentralafrikanske republikken"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+msgid "Chad"
+msgstr "Tjad"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: my-evolution/Locations.h:438
+msgid "Chile"
+msgstr "Chile"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+msgid "China"
+msgstr "Kina"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: my-evolution/Locations.h:451
+msgid "Christmas Island"
+msgstr "Christmas Island"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+msgid "Cocos (Keeling) Islands"
+msgstr "Cocos (Keeling) Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: my-evolution/Locations.h:483
+msgid "Colombia"
+msgstr "Colombia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+msgid "Comoros"
+msgstr "Comoros"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+msgid "Congo"
+msgstr "Kongo"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+msgid "Cook Islands"
+msgstr "Cook Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: my-evolution/Locations.h:517
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+msgid "Cote d'Ivoire"
+msgstr "Cote d'Ivoire"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: my-evolution/Locations.h:528
+msgid "Croatia"
+msgstr "Krotia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: my-evolution/Locations.h:532
+msgid "Cuba"
+msgstr "Kuba"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: my-evolution/Locations.h:545
+msgid "Cyprus"
+msgstr "Kypros"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: my-evolution/Locations.h:546
+msgid "Czech Republic"
+msgstr "Tjekkisk republikk"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: my-evolution/Locations.h:580
+msgid "Denmark"
+msgstr "Danmark"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+msgid "Djibouti"
+msgstr "Djibouti"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+msgid "Dominica"
+msgstr "Dominica"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: my-evolution/Locations.h:608
+msgid "Dominican Republic"
+msgstr "Dominikanske republikk"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+msgid "East Timor"
+msgstr "Aust-timor"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: my-evolution/Locations.h:641
+msgid "Ecuador"
+msgstr "Ecuador"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: my-evolution/Locations.h:650
+msgid "Egypt"
+msgstr "Egypt"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: my-evolution/Locations.h:666
+msgid "El Salvador"
+msgstr "El Salvador"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+msgid "Equatorial Guinea"
+msgstr "Ekvatorial Guinea"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: my-evolution/Locations.h:684
+msgid "Estonia"
+msgstr "Estland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+msgid "Ethiopia"
+msgstr "Etiopia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+msgid "Falkland Islands"
+msgstr "Falklands�yane"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+msgid "Faroe Islands"
+msgstr "F�r�yane"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+msgid "Fiji"
+msgstr "Fiji"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: my-evolution/Locations.h:716
+msgid "Finland"
+msgstr "Finland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: my-evolution/Locations.h:766
+msgid "France"
+msgstr "Frankrike"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+msgid "French Guiana"
+msgstr "French Guiana"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+msgid "French Polynesia"
+msgstr "French Polynesia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+msgid "French Southern Territories"
+msgstr "Fransk s�rleg territoriar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+msgid "Gabon"
+msgstr "Gabon"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+msgid "Gambia"
+msgstr "Gambia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: my-evolution/Locations.h:811
+msgid "Georgia"
+msgstr "Georgia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: my-evolution/Locations.h:812
+msgid "Germany"
+msgstr "Tyskland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+msgid "Ghana"
+msgstr "Ghana"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: my-evolution/Locations.h:815
+msgid "Gibraltar"
+msgstr "Gibraltar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: my-evolution/Locations.h:846
+msgid "Greece"
+msgstr "Hellas"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+msgid "Greenland"
+msgstr "Gr�nland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+msgid "Grenada"
+msgstr "Grenada"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+msgid "Guadeloupe"
+msgstr "Guadeloupe"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+msgid "Guam"
+msgstr "Guam"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: my-evolution/Locations.h:867
+msgid "Guatemala"
+msgstr "Guatemala"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+msgid "Guinea"
+msgstr "Guinea"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+msgid "Guinea-bissau"
+msgstr "Guinea-bissau"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+msgid "Guyana"
+msgstr "Guyana"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: my-evolution/Locations.h:888
+msgid "Haiti"
+msgstr "Haiti"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+msgid "Heard And McDonald Islands"
+msgstr "Heard And McDonald Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Holy See"
+msgstr "Den heilage sj�"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: my-evolution/Locations.h:945
+msgid "Honduras"
+msgstr "Honduras"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: my-evolution/Locations.h:946
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: my-evolution/Locations.h:966
+msgid "Hungary"
+msgstr "Ungarn"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: my-evolution/Locations.h:978
+msgid "Iceland"
+msgstr "Island"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: my-evolution/Locations.h:991
+msgid "India"
+msgstr "India"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+msgid "Indonesia"
+msgstr "Indonesia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: my-evolution/Locations.h:1007
+msgid "Ireland"
+msgstr "Irland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+msgid "Israel"
+msgstr "Israel"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: my-evolution/Locations.h:1016
+msgid "Italy"
+msgstr "Italia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: my-evolution/Locations.h:1031
+msgid "Jamaica"
+msgstr "Jamaica"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: my-evolution/Locations.h:1035
+msgid "Japan"
+msgstr "Japansk"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: my-evolution/Locations.h:1046
+msgid "Jordan"
+msgstr "Jordan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+msgid "Kazakhstan"
+msgstr "Kasakstan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+msgid "Kenya"
+msgstr "Kenya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#: 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 "Kuwait"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+msgid "Kyrgyzstan"
+msgstr "Kirgistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+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
+msgid "Lebanon"
+msgstr "Libanon"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+msgid "Lesotho"
+msgstr "Lesotho"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
+msgid "Liberia"
+msgstr "Liberia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: my-evolution/Locations.h:1234
+msgid "Lithuania"
+msgstr "Litauen"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: my-evolution/Locations.h:1268
+msgid "Luxembourg"
+msgstr "Luxembourg"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+msgid "Macau"
+msgstr "Macau"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+msgid "Macedonia"
+msgstr "Makedonia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+msgid "Malawi"
+msgstr "Malawi"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+msgid "Malaysia"
+msgstr "Malaysia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+msgid "Maldives"
+msgstr "Maldivane"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+msgid "Mali"
+msgstr "Mali"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
+msgid "Malta"
+msgstr "Malta"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+msgid "Marshall Islands"
+msgstr "Marshall Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+msgid "Martinique"
+msgstr "Martinique"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+msgid "Mauritania"
+msgstr "Mauritania"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+msgid "Mauritius"
+msgstr "Mauritius"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1387
+msgid "Mexico"
+msgstr "Mexico"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+msgid "Micronesia"
+msgstr "Mikronesia"
+
+#: 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 "Monaco"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+msgid "Mongolia"
+msgstr "Mongolia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: my-evolution/Locations.h:1470
+msgid "Morocco"
+msgstr "Marokko"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+msgid "Mozambique"
+msgstr "Mozambique"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+msgid "Namibia"
+msgstr "Namibia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+msgid "Nauru"
+msgstr "Nauru"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+msgid "Nepal"
+msgstr "Nepal"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
+msgid "Netherlands"
+msgstr "Nederland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+msgid "Netherlands Antilles"
+msgstr "Nederlandske antillar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+msgid "New Caledonia"
+msgstr "New Caledonia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1560
+msgid "New Zealand"
+msgstr "Ny Zealand"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: my-evolution/Locations.h:1562
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+msgid "Niger"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+msgid "Niue"
+msgstr "Niue"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: my-evolution/Locations.h:1574
+msgid "Norfolk Island"
+msgstr "Norfolk Island"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+msgid "Northern Mariana Islands"
+msgstr "Northern Mariana Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
+msgid "Norway"
+msgstr "Noreg"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1632
+msgid "Oman"
+msgstr "Oman"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+msgid "Palau"
+msgstr "Palau"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+msgid "Palestinian Territory"
+msgstr "Palestina"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
+msgid "Panama"
+msgstr "Panama"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+msgid "Papua New Guinea"
+msgstr "Papua New Guinea"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1688
+msgid "Paraguay"
+msgstr "Paraguay"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
+msgid "Peru"
+msgstr "Peru"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+msgid "Philippines"
+msgstr "Fillipinene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+msgid "Pitcairn"
+msgstr "Pitcairn"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
+msgid "Poland"
+msgstr "Polen"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
+msgid "Portugal"
+msgstr "Portugal"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1824
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
+msgid "Qatar"
+msgstr "Qatar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+msgid "Reunion"
+msgstr "Reunion"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
+msgid "Romania"
+msgstr "Romania"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+msgid "Russian Federation"
+msgstr "Russland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+msgid "Rwanda"
+msgstr "Rwanda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+msgid "Saint Kitts And Nevis"
+msgstr "Saint Kitts And Nevis"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+msgid "Saint Lucia"
+msgstr "Saint Lucia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+msgid "Saint Vincent And The Grena-dines"
+msgstr "Saint Vincent And The Grena-dines"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+msgid "Samoa"
+msgstr "Samoa"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+msgid "San Marino"
+msgstr "San Marino"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+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
+msgid "Saudi Arabia"
+msgstr "Saudi Arabia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+msgid "Senegal"
+msgstr "Senegal"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+msgid "Seychelles"
+msgstr "Seychellene"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2090
+msgid "Singapore"
+msgstr "Singapore"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: my-evolution/Locations.h:2103
+msgid "Slovakia"
+msgstr "Slovakia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: my-evolution/Locations.h:2104
+msgid "Slovenia"
+msgstr "Slovenia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+msgid "Solomon Islands"
+msgstr "Solomon Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+msgid "Somalia"
+msgstr "Somalia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2119
+msgid "South Africa"
+msgstr "S�r-Afrika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+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
+msgid "Spain"
+msgstr "Spania"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+msgid "St. Helena"
+msgstr "St. Helena"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+msgid "St. Pierre And Miquelon"
+msgstr "St. Pierre And Miquelon"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+msgid "Sudan"
+msgstr "Sudan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
+msgid "Suriname"
+msgstr "Suriname"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+msgid "Svalbard And Jan Mayen Islands"
+msgstr "Svalbard og Jan Mayen"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+msgid "Swaziland"
+msgstr "Swaziland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
+msgid "Sweden"
+msgstr "Sverige"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2183
+msgid "Switzerland"
+msgstr "Sveits"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+msgid "Tajikistan"
+msgstr "Tajikistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#, fuzzy
+msgid "Tanzania, United Republic Of"
+msgstr "Tanzania"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+msgid "Thailand"
+msgstr "Thailand"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+msgid "Togo"
+msgstr "Togo"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+msgid "Tonga"
+msgstr "Tonga"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+msgid "Trinidad And Tobago"
+msgstr "Trinidad og Tobago"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+msgid "Tunisia"
+msgstr "Tunisia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
+msgid "Turkey"
+msgstr "Tyrkia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+msgid "Turks And Caicos Islands"
+msgstr "Turks And Caicos Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+msgid "Uganda"
+msgstr "Uganda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
+msgid "Ukraine"
+msgstr "Ukrainia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+msgid "United Arab Emirates"
+msgstr "Forente Arabiske Emirater"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2342
+msgid "United Kingdom"
+msgstr "Storbritannia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+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
+msgid "Uruguay"
+msgstr "Uruguay"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+msgid "Uzbekistan"
+msgstr "Usbekistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2380
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
+msgid "Viet Nam"
+msgstr "Vietnam"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#, fuzzy
+msgid "Virgin Islands, British"
+msgstr "U.S. Virgin Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#, fuzzy
+msgid "Virgin Islands, U.S."
+msgstr "U.S. Virgin Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+msgid "Wallis And Futuna Islands"
+msgstr "Wallis And Futuna Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+msgid "Western Sahara"
+msgstr "Western Sahara"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
+msgid "Yemen"
+msgstr "Yemen"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2524
+msgid "Yugoslavia"
+msgstr "Jugoslavia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+msgid "Zambia"
+msgstr "Zambia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Slett kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:757
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
 msgid "Category editor not available."
 msgstr "Kategoriredigering ikkje tilgjengeleg."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:764
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
 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:1044
 msgid "Save Contact as VCard"
 msgstr "Lagre kontakt som VKort"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2309
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -1321,7 +2547,7 @@ msgid "Edit Full"
 msgstr "Rediger full"
 
 #: 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 "Fullt namn"
 
@@ -1526,7 +2752,7 @@ msgid ""
 msgstr ""
 
 #: 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 "Avansert s�k"
 
@@ -1535,173 +2761,118 @@ msgstr "Avansert s�k"
 msgid "Search"
 msgstr "S�k"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d kort"
 
-#: 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 "Lagre som VKort"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Opne"
-
-#: 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 "Vidaresend kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
-#: addressbook/gui/widgets/e-addressbook-view.c:836
-msgid "Send Message to Contact"
-msgstr "Send melding til kontakt"
-
-#: 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 "Skriv ut"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
-#: addressbook/gui/widgets/e-addressbook-view.c:839
-msgid "Print Envelope"
-msgstr "Skriv ut konvolutt"
-
-#: 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 "Klipp ut"
-
-#: 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 "Kopier"
-
-#: 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 "Lim inn"
-
-#: 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
-msgid "Delete"
-msgstr "Slett"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+msgid "Error getting book view"
+msgstr ""
+"Feil ved nedlasting av fil:\n"
+"%1"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Feil ved endringa av kort"
 
-#: 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:1043
 msgid "Success"
 msgstr "Vellukka"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: 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:1895
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: 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
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #, fuzzy
 msgid "Repository offline"
 msgstr "depot i vcs"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Fann ikkje kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "Kort-id eksisterar allereide"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protokollen er ikkje st�tta"
 
-#: 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/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
 msgid "Cancelled"
 msgstr "Avbroten"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Anna feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Feil ved tillegging av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Feil ved tilleggjing av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1389
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Feil ved fjerning av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:202
+#: addressbook/gui/widgets/e-addressbook-util.c:204
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Vis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:203
+#: addressbook/gui/widgets/e-addressbook-util.c:205
 #, fuzzy
 msgid "Display Cards"
 msgstr "Vis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -1709,81 +2880,203 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 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: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,�,�,�"
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Monte Scuro"
 
-#. 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,�,�,�"
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:959
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Ingen kort"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Ingen kort"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Trykk her for � legge til ein kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:963
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Prim�r telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:964
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Telefon til assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:965
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Firma-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:966
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Tilbakering telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:967
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:968
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Heime-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:970
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Firma-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:971
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Heime-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:972
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:973
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Bil-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:976
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Firma-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:977
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Heime-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:979
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Alternativ telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:985
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Lagre som VKort"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Ny kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_G� til mappe"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Import�r ..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "Slett kolonne"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Kjelde:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Pilot-innstillingar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Vidaresend kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Send melding til kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Skriv ut konvolutt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "_Kopier til mappe ..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "Flytt til _mappe ..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: 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
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Aktiv visning"
+
+#. 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:940
+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:945
+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."
@@ -1797,15 +3090,22 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr "Lagre i addressebok"
 
-#: 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 "Kort-visning"
@@ -1893,6 +3193,7 @@ msgid "Include:"
 msgstr "Inkluder:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Liggjande"
 
@@ -1917,6 +3218,7 @@ msgid "Options"
 msgstr "Val"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Retning"
 
@@ -1937,7 +3239,9 @@ msgstr "Papir"
 msgid "Paper source:"
 msgstr "Papirkjelde:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "St�ande"
 
@@ -1997,34 +3301,30 @@ msgstr "_Skrifttype ..."
 msgid "Untitled appointment"
 msgstr "Avtale utan namn"
 
-#: 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:500 calendar/cal-util/cal-util.c:522
+#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
 msgid "High"
 msgstr "H�g"
 
-#: 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/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Vanleg"
 
-#: 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:504 calendar/cal-util/cal-util.c:526
+#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
 msgid "Low"
 msgstr "Lav"
 
 #. 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
 msgid "Undefined"
 msgstr "Udefinert"
 
 #: 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 "Feil ved kommunikasjon mot kalendartenaren"
 
@@ -2034,8 +3334,13 @@ msgstr "Feil ved kommunikasjon mot kalendartenaren"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:889
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "_Prioritet:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -2049,48 +3354,62 @@ msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Innstillingar for kalendar og oppg�ver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Calendar."
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Evolutionkomponent for handtere kalendaren."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "�ydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory for the calendar iTip view control"
 msgstr "�ydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the sample Calendar control"
 msgstr "�ydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "�ydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "�ydelagd oppsettfil."
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 ""
@@ -2099,22 +3418,10 @@ 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
-msgid "Evolution Alarm"
-msgstr "Evolution alarm"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -2152,7 +3459,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2235
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�tvaring"
@@ -2173,7 +3480,7 @@ 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:57
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikkje initiere Bonobo"
@@ -2194,68 +3501,66 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Samandrag inneheld"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Skildring inneheld"
 
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Merknad inneheld"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1081
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "Ikkje truffe"
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/calendar-commands.c:405
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%1 bit %2 %3"
 
 #. 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 "%d. %a %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 "%d. %a %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 ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:385
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Offentleg"
 
@@ -2276,32 +3581,27 @@ msgid "W"
 msgstr "V"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
 msgid "Free"
 msgstr "Ledig"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:479 calendar/gui/print.c:2246
 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:480 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Ferdig"
 
@@ -2314,9 +3614,10 @@ 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/mail-account-gui.c:1494
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
-#: mail/mail-config.glade.h:55
+#: 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
 #: 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
@@ -2331,23 +3632,15 @@ msgstr "Repeterande"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: 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:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
 msgid "Yes"
 msgstr "Ja"
 
-#: 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:310
 msgid "No"
 msgstr "Nei"
 
-#. 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 "S�ker"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Dagsvisning"
@@ -2364,48 +3657,84 @@ msgstr "Vekesvisning"
 msgid "Month View"
 msgstr "M�nadsvising"
 
-#: 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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Mappe inneheld avtaler og hendingar"
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Oppg�ver"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Mappe inneheld huskeliste"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "Lag ein ny avtale"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "Nettverksinnstillingar"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "M�te"
+
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "Ny oppg�ve"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "_Oppg�ve"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Ny avtale"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "Ny _avtale"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "Opprett ei ny oppg�ve"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Ny avtale"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "Ny oppg�ve"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "Avtale"
+
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr ""
+"Kan ikkje fjerna post fr�\n"
+"postboksen '%1':\n"
+"%2"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:167
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "Viser korleis datoverdiar vert viste."
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "Endra namnet p� denne mappa"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Val for lydlarm"
@@ -2471,9 +3800,7 @@ msgstr "Oppdater kvart"
 msgid "hours"
 msgstr "timar"
 
-#: 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 "minutt"
 
@@ -2601,7 +3928,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.c:748 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samandrag:"
 
@@ -2630,7 +3957,7 @@ msgstr "slutt p� avtale"
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "minutt"
 
@@ -2672,174 +3999,169 @@ msgid "Color for tasks due today"
 msgstr "Farge eller pixmap"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
-msgid "Create new appointments with a default _reminder"
-msgstr "&Slett avtale"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Dagar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "F�rste ve_kedag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Timar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minutt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "M�ndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#, fuzzy
-msgid "O_verdue tasks:"
-msgstr "&Syntaksmerkingsmodusar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, fuzzy
-msgid "Show appointment _end times in week and month views"
-msgstr "Avtale"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "Vis veke_nummer i datonavigat�ren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "Su_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:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "S�ndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "_Oppg�ver som skal vere ferdig i dag:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "T_or"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "T_ys"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "_Oppg�ver som skal vere ferdig i dag:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "_Oppg�veliste"
 
-#: 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 "Torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Tid"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Tid_ssone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Oppdeling a_v tid:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: 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 "Tysdag"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Arbeidsveke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timers (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 timar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Vis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Generelt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "Neste melding"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_M�n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Anna"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "&Syntaksmerkingsmodusar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_Lau"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "_Oppg�veliste"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "Avtale"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Oppdeling a_v tid:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "before the start of the appointment"
 msgstr "&Slett avtale"
@@ -2912,74 +4234,61 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: 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 " til "
 
-#: 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 " (Ferdig "
 
-#: 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 "Ferdig "
 
-#: 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 " (Ferdig"
 
-#: 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 "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor.c:321
+#: calendar/gui/dialogs/comp-editor.c:322
 #, fuzzy
 msgid "Could not update object!"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Redig�r avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Oppg�ve - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppf�ring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2015
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "Skriv over fil?"
-
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2022
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ei fil med det namnet finst alt.\n"
-"Vil du skrive over den?"
-
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "Lagre som ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Ikkje stand til � f� tak i noverande versjon!"
 
@@ -3040,7 +4349,7 @@ msgstr "Deleg�r til:"
 msgid "Enter Delegate"
 msgstr "Tast inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Avtale"
 
@@ -3054,14 +4363,14 @@ msgstr "Repetering"
 
 #: 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:365
 #, 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:366
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "M�te"
 
@@ -3108,7 +4417,7 @@ msgid "Pu_blic"
 msgstr "_Offentleg"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Vis tid som"
 
@@ -3153,55 +4462,49 @@ msgstr "Deltakar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "Felles namn"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegert fr�"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegert til"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Spr�k"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Medlem"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:809
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Rolle"
 
-#: 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/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"
 msgstr "Status"
 
-#: 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:94
+#: 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
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
@@ -3216,7 +4519,7 @@ msgid "_Change Organizer"
 msgstr "_Endre organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "_Inviter andre ..."
 
@@ -3225,29 +4528,100 @@ msgstr "_Inviter andre ..."
 msgid "_Other Organizer"
 msgstr "Planleggjar"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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
+#, fuzzy
+msgid "th"
+msgstr "4."
+
+#: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "p�"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "liste"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "sekund"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Anna"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Nord"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "liste"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Alternativ faks"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 #, fuzzy
 msgid "on the"
 msgstr "M�nad"
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-#, fuzzy
-msgid "th"
-msgstr "4."
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
@@ -3348,7 +4722,7 @@ msgid "Progress"
 msgstr "Framgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:966
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -3360,15 +4734,19 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "Enkel"
+
 #: 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:324
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Skildring:"
 
@@ -3380,116 +4758,80 @@ msgstr "Sta_rt-dato:"
 msgid "_Due Date:"
 msgstr "Forfalls_dato:"
 
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:438
-#, 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:751 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: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: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
 msgid "_Open"
 msgstr "_Opne"
 
-#: 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:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Lagre som ..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "S_kriv ut"
+
+#: calendar/gui/e-calendar-table.c:978 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: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:979 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: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:980 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 "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Tildel oppg�ve"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Fort framover"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Merk som komplett"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "Slett _denne oppg�va"
-
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk oppg�ver som ferdig"
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppg�ver"
 
-#: 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:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Oppdaterar objekt"
 
-#: calendar/gui/e-calendar-table.c:1247
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Trykk her for � leggje til ei oppg�ve"
 
@@ -3497,48 +4839,47 @@ msgstr "Trykk her for � leggje til ei oppg�ve"
 msgid "Alarms"
 msgstr "Alarmar"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Fullf�ringsdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Forfallsdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Sluttdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Geografisk plassering"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Samandrag"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Sort�r oppg�ver"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -3572,404 +4913,180 @@ msgstr "%02i minutt oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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
 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
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "Ny _avtale"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "G� _til idag"
-
-#: calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
-msgid "_Go to Date..."
-msgstr "_G� til dato ..."
-
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-msgid "_Delete this Appointment"
-msgstr "Slett _denne avtalen"
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
-#, fuzzy
-msgid "Make this Occurrence _Movable"
-msgstr "Se&nd avtale"
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
-#, fuzzy
-msgid "Delete this _Occurrence"
-msgstr "Erstatt denne f�rekomsten?"
-
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 #, fuzzy
-msgid "Delete _All Occurrences"
-msgstr "Slettar klassen"
+msgid "New Meeting"
+msgstr "M�te"
 
-#: calendar/gui/e-itip-control.c:535
-msgid "Meeting begins: <b>"
-msgstr "M�tet byrjar: <b>"
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Ny oppg�ve"
 
-#: calendar/gui/e-itip-control.c:540
-msgid "Task begins: <b>"
-msgstr "Oppg�va byrjar: <b>"
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Skriv ut ..."
 
-#: calendar/gui/e-itip-control.c:545
-#, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "Informasjon"
+#: 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 "G� _til idag"
 
-#: calendar/gui/e-itip-control.c:549
-msgid "Begins: <b>"
-msgstr "Byrjar: <b>"
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+msgid "_Go to Date..."
+msgstr "_G� til dato ..."
 
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: ui/evolution-calendar.xml.h:31
 #, fuzzy
-msgid "Meeting ends: <b>"
+msgid "_Publish Free/Busy Information"
 msgstr "Informasjon"
 
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
 #, fuzzy
-msgid "Free/Busy info ends: <b>"
-msgstr "Informasjon"
-
-#: calendar/gui/e-itip-control.c:568
-msgid "Ends: <b>"
-msgstr "Sluttar: <b>"
+msgid "_Configure..."
+msgstr "Set opp %1"
 
-#: calendar/gui/e-itip-control.c:582
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
 #, fuzzy
-msgid "Task Completed: <b>"
-msgstr "Ferdig"
-
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Due: <b>"
-msgstr "Oppg�va ferdig: <b>"
+msgid "_Configure Pilot..."
+msgstr "Set opp %1"
 
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-#, fuzzy
-msgid "iCalendar Information"
-msgstr "Informasjon"
+#: 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
+msgid "_Save As..."
+msgstr "_Lagre som ..."
 
-#. Title
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 #, fuzzy
-msgid "iCalendar Error"
-msgstr "Skriv ut alle"
-
-#: calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-msgid "An unknown person"
-msgstr "Ein ukjent person"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:732
-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:748
-msgid "<i>None</i>"
-msgstr "<i>Ingen</i>"
-
-#: 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
-msgid "Choose an action:"
-msgstr "Vel ei handling:"
-
-#: calendar/gui/e-itip-control.c:790
-msgid "Update"
-msgstr "Oppdater"
-
-#: calendar/gui/e-itip-control.c:791 calendar/gui/e-itip-control.c:810
-#: 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
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Godta"
+msgid "_Schedule Meeting..."
+msgstr "K�yreplan ..."
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 #, fuzzy
-msgid "Tentatively accept"
-msgstr "Mellombels"
-
-#: calendar/gui/e-itip-control.c:808
-msgid "Decline"
-msgstr "Avsl�"
+msgid "_Forward as iCalendar..."
+msgstr "Fort framover"
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 #, fuzzy
-msgid "Send Free/Busy Information"
-msgstr "Informasjon"
-
-#: calendar/gui/e-itip-control.c:835
-msgid "Update respondent status"
-msgstr "Opdat�r status p� svar"
+msgid "Make this Occurrence _Movable"
+msgstr "Se&nd avtale"
 
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 #, fuzzy
-msgid "Send Latest Information"
-msgstr "Informasjon"
-
-#: calendar/gui/e-itip-control.c:861 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: calendar/gui/e-itip-control.c:909
-#, fuzzy, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "generer avlusingsinformasjon"
+msgid "Delete this _Occurrence"
+msgstr "Erstatt denne f�rekomsten?"
 
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 #, fuzzy
-msgid "Meeting Information"
-msgstr "Personleg informasjon"
-
-#: calendar/gui/e-itip-control.c:914
-#, 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:915
-msgid "Meeting Proposal"
-msgstr "M�teframlegg"
+msgid "Delete _All Occurrences"
+msgstr "Slettar klassen"
 
-#: calendar/gui/e-itip-control.c:919
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:920
-msgid "Meeting Update"
-msgstr "M�teoppdatering"
-
-#: calendar/gui/e-itip-control.c:924
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, fuzzy, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "generer avlusingsinformasjon"
-
-#: calendar/gui/e-itip-control.c:925
-msgid "Meeting Update Request"
+msgid "Error executing %s."
 msgstr ""
+"Feil ved lesing a fil:\n"
+"%1"
 
-#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:1013
-#: 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: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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:948
-#, 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:949
-msgid "Meeting Reply"
-msgstr "M�tesvar"
-
-#: calendar/gui/e-itip-control.c:953
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:954
-msgid "Meeting Cancellation"
-msgstr "M�tekansellering"
-
-#: calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.c:1029
-#: calendar/gui/e-itip-control.c:1064
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:959
-#, fuzzy
-msgid "Bad Meeting Message"
-msgstr "&Finn i melding ..."
-
-#: calendar/gui/e-itip-control.c:979
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:980
-msgid "Task Information"
-msgstr "Oppg�veinformasjon"
-
-#: calendar/gui/e-itip-control.c:984
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
+#: calendar/gui/e-itip-control.c:1564
+msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:985
-msgid "Task Proposal"
-msgstr "Oppg�veframlegg"
-
-#: calendar/gui/e-itip-control.c:989
-#, 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:990
-msgid "Task Update"
-msgstr "Oppg�veoppdatering"
-
-#: calendar/gui/e-itip-control.c:994
-#, 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:995
-msgid "Task Update Request"
-msgstr "Oppg�veoppdateringsforep�rjing"
-
-#: calendar/gui/e-itip-control.c:1019
-#, 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:1020
-msgid "Task Reply"
-msgstr "Oppg�vesvar"
-
-#: calendar/gui/e-itip-control.c:1024
-#, 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:1025
-msgid "Task Cancellation"
-msgstr "Oppg�vekansellering"
-
-#: calendar/gui/e-itip-control.c:1030
+#: calendar/gui/e-itip-control.c:1566
 #, fuzzy
-msgid "Bad Task Message"
-msgstr "Skriv ut alle"
-
-#: calendar/gui/e-itip-control.c:1049
-#, fuzzy, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "Skriv avlusingsinformasjon"
-
-#: calendar/gui/e-itip-control.c:1050
-msgid "Free/Busy Information"
-msgstr "Fri/ledig-informasjon"
-
-#: calendar/gui/e-itip-control.c:1054
-#, 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:1055
-msgid "Free/Busy Request"
-msgstr "Fri/ledig foresp�rsel"
-
-#: calendar/gui/e-itip-control.c:1059
-#, 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:1060
-msgid "Free/Busy Reply"
-msgstr "Fri/Oppteke svar"
-
-#: calendar/gui/e-itip-control.c:1065
-#, fuzzy
-msgid "Bad Free/Busy Message"
-msgstr "Private meldingar"
-
-#: calendar/gui/e-itip-control.c:1138
-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:1157
-#, fuzzy
-msgid "The message contains only unsupported requests."
-msgstr "Meldinga har ingen sendar"
-
-#: calendar/gui/e-itip-control.c:1185 calendar/gui/e-itip-control.c:1191
-msgid "The attachment does not contain a valid calendar message"
-msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
+msgid "Update complete\n"
+msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:1216
-msgid "The attachment has no viewable calendar items"
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1315
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1317
-#, fuzzy
-msgid "Update complete\n"
-msgstr "Ferdig"
-
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1638
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1372
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1374
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Dato"
 
-#: calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1648
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Vel mappe"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Vel mappe"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4008,209 +5125,214 @@ msgstr "sluttdato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Bil-telefon"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 #, fuzzy
 msgid "Required Participants"
 msgstr "Tenarinformasjon"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "Ikkje-deltakarar"
 
-#: 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:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Individuell"
 
-#: 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:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Gruppe"
 
-#: 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:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Ressurs"
 
-#: 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:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Rom"
 
-#: 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:264 calendar/gui/e-meeting-model.c:281
 #, fuzzy
 msgid "Chair"
 msgstr "Teikn"
 
-#: 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:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 #, fuzzy
 msgid "Required Participant"
 msgstr "Tenarinformasjon"
 
-#: 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:268 calendar/gui/e-meeting-model.c:285
 #, fuzzy
 msgid "Optional Participant"
 msgstr "Personleg informasjon"
 
-#: 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:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Ikkje-deltakar"
 
-#: 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:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 #, fuzzy
 msgid "Needs Action"
 msgstr "Vel ikon"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:824
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr "Akseptert"
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:825
+#: 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: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:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Mellombels"
 
-#: 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:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "Delegert"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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:2118 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:436
 msgid "Out of Office"
 msgstr "Ute av kontoret"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Val"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Vis kun _arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
 #, fuzzy
 msgid "Show _Zoomed Out"
 msgstr "Forminsk"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 #, fuzzy
 msgid "_Update Free/Busy"
 msgstr "Oppdateringsfrekvens"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Autoplukk"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 #, fuzzy
 msgid "_All People and Resources"
 msgstr "Alle filer og katalogar"
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
 #, fuzzy
 msgid "Meeting _start time:"
 msgstr "&Helsingstekst:"
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "M�t_e slutttid:"
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:362
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: calendar/gui/e-tasks.c:367
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-tasks.c:379
+#: calendar/gui/e-tasks.c:404
 #, fuzzy, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje st�tta."
 
-#: calendar/gui/e-tasks.c:629
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Fullf�ringsdato"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Slettar valde objekt"
+
+#: calendar/gui/e-tasks.c:659
 #, fuzzy
 msgid "Expunging"
 msgstr "Forventar %1"
 
-#: 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 "Ny _avtale ..."
 
-#: calendar/gui/gnome-cal.c:1493
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "Slett _denne avtalen"
+
+#: calendar/gui/gnome-cal.c:1538
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
@@ -4218,12 +5340,12 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/gnome-cal.c:1504
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1859
+#: calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Feil ved opning"
@@ -4284,53 +5406,19 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-#, fuzzy
-msgid "Event information"
-msgstr "Informasjon"
-
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-msgid "Task information"
-msgstr "Informasjon om oppg�ve"
-
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-#, fuzzy
-msgid "Journal information"
-msgstr "Personleg informasjon"
-
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-#, fuzzy
-msgid "Free/Busy information"
-msgstr "Informasjon"
-
-#: calendar/gui/itip-utils.c:321
-#, fuzzy
-msgid "Calendar information"
-msgstr "Informasjon"
-
-#: calendar/gui/itip-utils.c:370
-#, fuzzy, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Informasjon"
-
-#: calendar/gui/itip-utils.c:382
-#, fuzzy
-msgid "iCalendar information"
-msgstr "Informasjon"
-
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr ""
@@ -4338,239 +5426,207 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: 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 "Sun"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "M�n"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Tys"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Lau"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Vald dag (%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 "Vald veke (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Vald m�nad (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Vald �r (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Oppg�ve"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Prioritet: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Prosent ferdig: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Kategoriar %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "Kontaktar: "
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Skriv ut kalendar"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2512 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "F�rehandsvising av utskrift"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Skriv ut element"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Utskriftoppsett"
 
@@ -4579,12 +5635,12 @@ msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "Viser korleis datoverdiar vert viste."
 
-#: 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"
@@ -4592,10 +5648,16 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2249
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "Ikkje sp�r igjen"
 
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Skriv ut kort"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -4638,103 +5700,127 @@ msgstr "Fabrikk for � importere VCard-filer inn i Evolution."
 msgid "Imports iCalendar files into Evolution"
 msgstr "Importerar VCard-filer inn i Evolution."
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "Importerar VCard-filer inn i Evolution."
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Kalendermelding"
+
+#: 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 har funne Pine e-postfiler.\n"
+"Vil du importere desse inn i Evolution?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Kalender"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:317
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:324
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:356
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:388
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:691
+#: 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:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
@@ -6291,12 +7377,12 @@ msgstr "Knapp (ikkje st�tta av KControl)"
 msgid "Decryption is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-data-cache.c:159
+#: camel/camel-data-cache.c:169
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/camel-data-cache.c:426
+#: camel/camel-data-cache.c:441
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
@@ -6332,58 +7418,57 @@ msgstr "Registrerer hj� tenaren ..."
 msgid "You must be working online to complete this operation"
 msgstr "Kan ikkje gjera LIST-operasjon ferdig"
 
-#: 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 "Synkroniserar mapper"
 
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:887
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Kan ikkje 'chown' 'spool'-katalogen"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: camel/camel-filter-driver.c:889
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Mottek melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Kan ikkje opne melding"
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Synkroniser mapper"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1016
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1031
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mottek meldingar fr� %1"
@@ -6400,7 +7485,7 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -6409,7 +7494,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -6418,39 +7503,35 @@ msgstr ""
 "Feil ved lesing av fil:\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 ""
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: 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:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Flyttar melding"
 
@@ -6571,167 +7652,119 @@ msgstr "Oppgi ditt OpenPGP-passord"
 msgid "Please enter your %s passphrase"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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:755
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:953
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:959
+#: 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:970
+#: 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:1143
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1153
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1160
+#: 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:1169
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1352
+#: 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:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, fuzzy, c-format
-msgid "Please enter your password for %s"
-msgstr "Oppgi ditt OpenPGP-passord"
-
-#: camel/camel-pkcs7-context.c:213
-#, fuzzy
-msgid "Error hashing password."
-msgstr "Feil ved tilleggjing av kort"
-
-#: camel/camel-pkcs7-context.c:222
-#, fuzzy
-msgid "Invalid password."
-msgstr "Ugyldig argument"
-
-#: camel/camel-pkcs7-context.c:329
-#, fuzzy, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Kunne ikkje lasta biletet '%1'\n"
-
-#: camel/camel-pkcs7-context.c:378
-#, fuzzy, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Kunne ikkje lasta biletet '%1'\n"
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:590
-#, fuzzy
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "Kunne ikkje laga kio-jobb.\n"
-
-#: camel/camel-pkcs7-context.c:620
-#, fuzzy, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/camel-pkcs7-context.c:626
-#, fuzzy
-msgid "Could not encrypt: encoding failed."
-msgstr "Klarte ikkje � lagre signaturfil."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr ""
-
-#: 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 ""
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Klarte ikkje � laste %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 ""
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s tenar %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:264
+#: 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:267
-#: camel/providers/smtp/camel-smtp-transport.c:274
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(ukjend vert)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -6830,13 +7863,14 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
-msgstr "NT Login"
+#, 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."
@@ -6847,9 +7881,19 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Inga autentisering i det heile"
 
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+#: camel/camel-sasl-ntlm.c:33
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+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:60
+#: 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"
 
@@ -6894,26 +7938,39 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Sl�r opp: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Feil i namneoppslag: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Sl�r opp: %s"
+
+#: camel/camel-service.c:787
+msgid "Host lookup failed: host not found"
+msgstr ""
+
+#: camel/camel-service.c:790
+msgid "Host lookup failed: unknown reason"
+msgstr ""
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
@@ -6922,12 +7979,12 @@ msgstr ""
 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 ""
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6936,6 +7993,11 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Oppgi ditt OpenPGP-passord"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
@@ -6969,23 +8031,23 @@ msgstr "Klarte ikkje � dekode melding."
 msgid "Failed to verify certificates."
 msgstr "�tvaring ved &tilbaketrekte sertifikat"
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Klarar ikkje � opprette mappe: Ugyldig operasjon p� dette lageret"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7002,7 +8064,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:438
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7011,16 +8073,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:500
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7045,27 +8107,27 @@ msgstr "Klarter ikkje � tolke URL fr� �%s�"
 msgid "No such message %s in %s"
 msgstr "Inga slik melding %s i %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Inga slik melding: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Leitar etter tilleggsmodular"
@@ -7099,59 +8161,59 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, 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:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, fuzzy, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2104
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 #, fuzzy
 msgid "This message is not currently available"
 msgstr "%1 er ikkje tilgjengeleg."
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:2141
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, fuzzy, c-format
 msgid "Could not open cache directory: %s"
 msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: 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 "Kunne ikkje leggja til melding:\n"
@@ -7166,7 +8228,7 @@ msgstr "Berre sjekk for ny e-post."
 msgid "Check for new messages in all folders"
 msgstr "Berre sjekk for ny e-post."
 
-#: 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 "Mapper"
 
@@ -7200,28 +8262,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:390
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Du tasta ikkje inn eit passord."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -7231,87 +8293,101 @@ msgstr ""
 "Ikkje i stand til � autentisere mot IMAP-tenar.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Vidaresendt melding"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "Separate katalogar"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:64
 #, fuzzy
 msgid "Local delivery"
 msgstr "Mapper"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "Separate katalogar"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "Standardfil"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, 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
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "er ei vanleg fil"
 
-#: 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
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: 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:197
 #, fuzzy, c-format
 msgid "Local mail file %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: 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:863
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
@@ -7319,7 +8395,12 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/local/camel-local-store.c:379
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
@@ -7327,18 +8408,18 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:389
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -7359,7 +8440,7 @@ msgstr "Mottek meldingar fr� %1"
 #: 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-spool-folder.c:582
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -7369,7 +8450,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 #, fuzzy
 msgid "No such message"
 msgstr "Vidaresendt melding"
@@ -7379,7 +8460,7 @@ msgstr "Vidaresendt melding"
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, fuzzy, c-format
 msgid ""
@@ -7390,14 +8471,14 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappa �%s� eksisterar ikkje."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, fuzzy, c-format
 msgid ""
@@ -7405,29 +8486,30 @@ msgid ""
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 ""
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, fuzzy, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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
 #, fuzzy, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
@@ -7435,14 +8517,36 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Berre sjekk for ny e-post."
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "Lagrar mappe"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -7463,9 +8567,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -7473,16 +8577,16 @@ msgid ""
 msgstr "Mottek meldingar fr� %1"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:93
+#: camel/providers/local/camel-mbox-store.c:95
 #, fuzzy, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -7492,45 +8596,34 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-store.c:109
+#: camel/providers/local/camel-mbox-store.c:111
 #, fuzzy, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-store.c: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� er ikkje ei vanleg fil."
 
-#: 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
 #, fuzzy, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-store.c:152
+#: camel/providers/local/camel-mbox-store.c:154
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 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-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 "Lagrar mappe"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
@@ -7538,21 +8631,21 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: 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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
@@ -7560,8 +8653,8 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, fuzzy, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
@@ -7569,49 +8662,49 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: 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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:801
+#: camel/providers/local/camel-spool-summary.c:1046
 #, 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:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, fuzzy, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjend feil"
@@ -7631,12 +8724,12 @@ msgstr "Mottek meldingar fr� %1"
 msgid "`%s' is not a directory."
 msgstr "�%s� er ikkje ein katalog"
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, fuzzy, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikkje opna katalogen %1"
 
-#: camel/providers/local/camel-spool-folder.c:512
+#: camel/providers/local/camel-spool-folder.c:515
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Mottek meldingar fr� %1"
@@ -7647,6 +8740,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "%1 finst, men er inga vanleg fil"
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Fila finst ikkje\n"
@@ -7658,19 +8752,21 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 #, fuzzy
 msgid "Spool folders cannot be renamed"
 msgstr "Denne mappa kan ikkje fjernast."
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 #, fuzzy
 msgid "Spool folders cannot be deleted"
 msgstr "Denne mappa kan ikkje slettast."
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
@@ -7678,73 +8774,38 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: 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/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Tenaren avslo brukarnamnet"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:153
-#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/local/camel-spoold-store.c:117
 #, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Kan ikkje setja blokkstorleik for band."
-
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#, fuzzy
-msgid "User cancelled"
-msgstr "Operasjonen vart avbroten"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
-msgid "Could not get group list from server."
-msgstr "Kunne ikkje starta underprosess."
+msgid "Store `%s' does not exist or is not a directory"
+msgstr "%1 finst, men er inga vanleg fil"
 
-#: 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"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-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"
@@ -7754,12 +8815,12 @@ msgstr "USENET news"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -7801,143 +8862,153 @@ msgstr "Avbryt"
 msgid "Operation failed: %s"
 msgstr "Operasjonen vart avbroten"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/pop3/camel-pop3-folder.c:272
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, fuzzy, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
+#: 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 "Operasjonen vart avbroten"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Leitar etter tilleggsmodular"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Sentrer dei valte elementa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, fuzzy, c-format
-msgid "Could not fetch message: %s"
-msgstr "Vidaresendt melding fr� %1"
-
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, fuzzy, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Slett e-post fr� tenaren"
-
-#: camel/providers/pop3/camel-pop3-folder.c:367
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "Lag meldingar og sl� saman"
 
-#: 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
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: 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 "Kan ikkje setja blokkstorleik for band."
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Kjende program"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 #, fuzzy
 msgid "Message storage"
 msgstr "Meldingsliste"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 #, fuzzy
 msgid "Leave messages on server"
 msgstr "&La e-posten liggja p� tenaren."
 
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:43
 #, fuzzy, c-format
 msgid "Delete after %s day(s)"
 msgstr "Slett denne adressa"
 
-#: 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:84
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
-
-#: camel/providers/pop3/camel-pop3-store.c:198
-#, fuzzy, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Kunne ikkje starta underprosess."
-
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
 #, fuzzy, c-format
-msgid "Could not connect to server: %s"
+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:321
+#: 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
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s."
+msgid "Could not connect to POP server on %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:377
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
-"Error sending username: %s"
+"No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
-msgid "(Unknown)"
-msgstr "(Ukjend)"
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+#: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "I/U-feil"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Inga slik mappe �%s�."
 
-#: camel/providers/pop3/camel-pop3-store.c:563
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "Uventa svar fr� POP-tenaren: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7947,55 +9018,50 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "Klarter ikkje � tolke URL fr� �%s�"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, fuzzy, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, fuzzy, c-format
 msgid "Could not send message: %s"
 msgstr "Vidaresendt melding fr� %1"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-#, fuzzy
-msgid "Could not find 'From' address in message"
-msgstr "Vidaresendt melding fr� %1"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-#, fuzzy
-msgid "Could not parse recipient list"
-msgstr "Klarter ikkje � tolke URL fr� �%s�"
-
-#: 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:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: 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:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -8003,126 +9069,147 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: 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:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: 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:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 #, fuzzy
 msgid "Help message"
 msgstr "Lagra melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Teneste klar"
 
-#: 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:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: 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: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: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:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: 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: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: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: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: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:209
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: 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:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Ingen passord oppgitt."
 
-#: 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:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:224
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:318
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, fuzzy
+msgid "STARTTLS response error"
+msgstr "Feil svar p� RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:458
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8130,137 +9217,135 @@ msgid ""
 "\n"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tenar %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:615
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Meldinga har ingen sendar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:674
+#: camel/providers/smtp/camel-smtp-transport.c:838
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "M�te"
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:716
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:754
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:769
-#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:790
+#: camel/providers/smtp/camel-smtp-transport.c:981
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:864
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:883
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1081
+#, fuzzy
+msgid "MAIL FROM response error"
+msgstr "Feil svar p� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:908
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:927
-#, fuzzy, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
+#: camel/providers/smtp/camel-smtp-transport.c:1121
+#, c-format
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:961
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:980
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-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
+#, fuzzy
+msgid "DATA response error"
+msgstr "Feil svar p� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1020
-#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1057
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1100
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "Feil svar p� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1123
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1142
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "Feil svar p� RSET: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -8287,7 +9372,7 @@ 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 "vedlegg"
 
@@ -8331,11 +9416,11 @@ msgid "MIME type:"
 msgstr "MIME-type:"
 
 #: 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:326
+#: composer/e-msg-composer-hdrs.c:333
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -8343,57 +9428,57 @@ msgstr "Legg adresse til adresseboka"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Fr�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:395
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn p� meldinga."
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:403
 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:291
+#: composer/e-msg-composer-select-file.c:267
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer.c:688
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -8402,57 +9487,53 @@ msgstr ""
 "Feil ved lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:905
-msgid "Save as..."
-msgstr "Lagre som ..."
-
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "�tvaring:"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Fila eksisterar, skriv over?"
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:993
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:959
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil ved lasting av fil %s"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:998
+#: composer/e-msg-composer.c:1051
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1058
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1065
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1074
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -8461,13 +9542,13 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1123
+#: composer/e-msg-composer.c:1176
 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:1281
+#: composer/e-msg-composer.c:1334
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -8477,42 +9558,42 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "�tvaring: Melding er endra"
 
-#: composer/e-msg-composer.c:1311
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:1460
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Set inn fil"
 
-#: composer/e-msg-composer.c:1846 composer/e-msg-composer.c:2322
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Skriv ei melding"
 
-#: composer/e-msg-composer.c:2339
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2362 composer/e-msg-composer.c:2417
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: 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."
 msgstr ""
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Klarar ikkje � starte Evolution-komponisten."
 
@@ -8564,15 +9645,33 @@ msgstr "Emne inneheld"
 msgid "Subject does not contain"
 msgstr "Emne inneheld ikkje"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Ei fil med det namnet finst alt.\n"
+"Vil du skrive over den?"
+
 #. 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 "Husk dette passordet"
 
-#: 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 ""
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "Kategoriar"
+
 #. 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
@@ -8659,171 +9758,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 "Evolutionkomponent for Mitt samandrag"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Kan ikkje initialisera lokale variablar"
-
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Kan ikkje initialisera lokale variablar"
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Vel ei fil"
-
-#: 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 ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Send ein e-post"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Endra namnet p� denne mappa"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL: %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Lukk"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Flytt denne mappa til ein annan plass"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Set opp %1"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Side"
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Feil ved asting av %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: 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 ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the RDF summary."
-msgstr "�ydelagd oppsettfil."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "Samandrag"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "�ydelagd oppsettfil."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "�ydelagd oppsettfil."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-#, fuzzy
-msgid "Test service"
-msgstr "Estherville"
-
-#: 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 "Feil"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Oppdater"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "Oppdateringsfrekvens"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "�r"
@@ -8856,11 +9790,7 @@ msgstr "time"
 msgid "minute"
 msgstr "minutt"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "sekund"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "sekund"
 
@@ -8930,7 +9860,7 @@ msgstr " sidan"
 msgid "ago"
 msgstr "sidan"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:973
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %k:%M"
@@ -8945,34 +9875,26 @@ msgid "Filter Rules"
 msgstr "Filter-reglar"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 #, fuzzy
 msgid "Then"
 msgstr "Tiaren"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Legg til handling"
 
-#: 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."
 msgstr ""
 
-#: 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:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Vel mappe"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<klikk her for � velje mappe>"
-
 #: filter/filter-input.c:198
 #, fuzzy, c-format
 msgid ""
@@ -8982,7 +9904,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: filter/filter-part.c:488 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test"
 
@@ -8990,40 +9912,40 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "Du gi dette filteret eit namn."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Regelnamn: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Utan tittel"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Dersom"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 #, fuzzy
 msgid "Execute actions"
 msgstr "K�yr autorun.sh"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+msgid "if any criterion are met"
 msgstr ""
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Legg til kriterium"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "inkomande"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "Utg�ande"
 
@@ -9070,194 +9992,217 @@ msgstr ""
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Tildel farge"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Vedlegg"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belem"
+
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "inneheld"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dato motteke"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Sletta"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "inneheld ikkje"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "sluttar ikkje med"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "finst ikkje"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "h�yres ikkje ut som"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "startar ikkje med"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Eksisterar ikkje"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Kladd"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "sluttar med"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Eksisterar"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "eksisterar"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Viktig"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "var etter"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "var f�r"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Flagga"
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "er st�rre enn"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "er ikkje"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Flagga"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Message Header"
 msgstr "Melding motteken"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:34 mail/message-list.c:671
-#: mail/message-list.etspec.h:4
+#: filter/libfilter-i18n.h:39
 #, fuzzy
-msgid "Needs Reply"
-msgstr "Fri/Oppteke svar"
+msgid "Play Sound"
+msgstr "Spel lyd:"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Les"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Mottakarar"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "Svart til"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Poengsum"
 
-#: filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1486
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Avsendar"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Sett status"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Storleik (kB)"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "h�yres ut som"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:49
 #, fuzzy
 msgid "Source Account"
 msgstr "Set opp konto"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "byrjar med"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Stopp prosessering"
 
-#: filter/libfilter-i18n.h:49 mail/mail-format.c:932
-#: mail/message-list.etspec.h:10
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Emne"
 
@@ -9265,11 +10210,11 @@ msgstr "Emne"
 msgid "Rules"
 msgstr "Linjer"
 
-#: filter/rule-editor.c:284
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: filter/rule-editor.c:357
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
@@ -9290,30 +10235,30 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: 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 "Importerar ..."
 
-#: 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 "Venlegast vent"
 
-#: 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 "Importerar %s som %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
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Sender %1"
 
-#: 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:101
 msgid "Mail"
 msgstr "E-post"
 
@@ -9337,24 +10282,77 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Prioritet: %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 ""
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Papirkorg"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr ""
+"Feil ved lesing a fil:\n"
+"%1"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Leitar etter tilleggsmodular"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Startar importering"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Rediger filter"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -9376,54 +10374,104 @@ msgstr ""
 msgid "Pine"
 msgstr "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
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "�ydelagd oppsettfil."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "�ydelagd oppsettfil."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "�ydelagd oppsettfil."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "�ydelagd oppsettfil."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Evolutionskomponent for � handtere e-post."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 #, fuzzy
 msgid "Evolution mail composer."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 #, fuzzy
 msgid "Evolution mail executive summary component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 #, fuzzy
 msgid "Evolution mail folder display component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 #, fuzzy
 msgid "Evolution mail folder factory component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the Evolution composer."
 msgstr "�ydelagd oppsettfil."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the Mail Summary component."
 msgstr "�ydelagd oppsettfil."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Repetering"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Kontoar"
+
+#: 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
 #, fuzzy
 msgid "Mail configuration interface"
 msgstr "Oppsett"
 
-#: mail/component-factory.c:100
+#: 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:101
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Fil alt i liste"
 
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr "E-post lagrinsmappe (intern)"
-
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtuell papirkorg"
@@ -9433,25 +10481,20 @@ msgstr "Virtuell papirkorg"
 msgid "Virtual Trash folder"
 msgstr "Mapper"
 
-#: mail/component-factory.c:129
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Denne mappe kan ikkje innehalde meldingar."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Eigenskapar ..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Endra namnet p� spelarane"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -9459,228 +10502,240 @@ msgstr ""
 "Nokre av e-postinstillingane dine ser ut til � vere �ydelagde, sjekk at alt "
 "er i orden."
 
-#: mail/component-factory.c:952
+#: mail/component-factory.c:925
+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
 msgid "New Mail Message"
 msgstr "Ny e-postmelding"
 
-#: mail/component-factory.c:952
-msgid "New _Mail Message"
-msgstr "Ny e-post_melding"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr ""
 
-#: mail/component-factory.c:977
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Klarar ikkje initialisere Evolution sin e-postkomponent"
 
-#: mail/component-factory.c:986
+#: mail/component-factory.c:1003
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1009
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:1208
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr " Koplar til tenar ..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Klarar ikkje � registrer lager med skal"
 
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenskapar for �%s�"
 
-#: mail/folder-browser-ui.c:274
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Eigenskapar"
 
-#: mail/folder-browser.c:298 mail/mail-display.c:307
+#: mail/folder-browser.c:305 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:752
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d nye"
 
-#: mail/folder-browser.c:755 mail/folder-browser.c:763
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:757
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d g�ymde"
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d valde"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendt"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d sendt"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1055
-msgid "Create vFolder from Search"
-msgstr "Lag vFolder fr� s�k"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Mapper"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "vMappe p� _emne"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "vMappe p� avse_dar"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "vMappe p� mottaka_r"
 
-#: mail/folder-browser.c:1441
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "vMappe p� e-post_liste"
 
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtr�r p� _emne"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtr�r p� avsen_dar:"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1590
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:105
-msgid "_Save As..."
-msgstr "_Lagre som ..."
-
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Svar til _liste"
 
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1465
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Ferdig"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "T�m"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Marker som _ulesen"
 
-#: mail/folder-browser.c:1469
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: mail/folder-browser.c:1470
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Marker som uvi_ktig"
 
-#: mail/folder-browser.c:1471
+#: mail/folder-browser.c:1636
 #, fuzzy
-msgid "Mark as Needing Reply"
-msgstr "M�tesvar"
+msgid "U_ndelete"
+msgstr "Slett"
 
-#: mail/folder-browser.c:1472
+#: mail/folder-browser.c:1640
 #, fuzzy
-msgid "Mark as Not Needing Reply"
-msgstr "M�tesvar"
-
-#: mail/folder-browser.c:1476
-msgid "_Move to Folder..."
+msgid "Mo_ve to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: mail/folder-browser.c:1477
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:107
+#: mail/folder-browser.c:1645
 #, fuzzy
-msgid "_Undelete"
-msgstr "Slett"
+msgid "Label"
+msgstr "Laurel"
 
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Legg til avsendar i adresseboka"
 
-#: mail/folder-browser.c:1486
-msgid "Apply Filters"
-msgstr "Bruk filter"
-
-#: mail/folder-browser.c:1488
+#: mail/folder-browser.c:1653
 #, fuzzy
-msgid "Create Ru_le From Message"
-msgstr "Mapper"
+msgid "Appl_y Filters"
+msgstr "Bruk filter"
 
 #: mail/folder-browser.c:1657
 #, fuzzy
-msgid "Filter on Mailing List"
-msgstr "Fil alt i liste"
+msgid "Crea_te Rule From Message"
+msgstr "Mapper"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1936
 #, fuzzy
-msgid "VFolder on Mailing List"
+msgid "VFolder on M_ailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1660
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr�r p� e-postliste (%s)"
 
-#: mail/folder-browser.c:1661
+#: mail/folder-browser.c:1939
 #, fuzzy, c-format
-msgid "VFolder on Mailing List (%s)"
+msgid "VFolder on M_ailing List (%s)"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Forvald"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Hentar informasjon om mapper"
@@ -9703,28 +10758,21 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Import�r Outlook Express 4 filer inn i Evolution"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Kroppsinnhald"
-
-#: mail/local-config.glade.h:2
 #, fuzzy
 msgid "Current store format:"
 msgstr "Kunne ikkje starta %1."
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Indekserar"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Postkasseformat"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Kroppsinnhald"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 #, fuzzy
 msgid "New store format:"
 msgstr "&Ny type"
 
-#: 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"
@@ -9734,15 +10782,15 @@ msgstr ""
 "(slik som slutt p� diskplass) kan vere vanskeleg � rette opp.\n"
 "Bruk denne funksjonen med varsemd."
 
-#: 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"
 
@@ -9761,89 +10809,82 @@ msgstr "KDeelop-installering"
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontohandtering"
 
-#: mail/mail-account-gui.c:959
-msgid "Could not save signature file."
-msgstr "Klarte ikkje � lagre signaturfil."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:1036
-msgid "Save signature"
-msgstr "Lagre signatur"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "Br_ukarnamn:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "_Sti:"
 
-#: mail/mail-account-gui.c:1042
+#: 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 ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Dette er siste trekk.\n"
-"Vil du leggja til fleire trekk?"
 
-#: mail/mail-account-gui.c:1663
+#: mail/mail-account-gui.c:1985
 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:149
-msgid " (default)"
-msgstr " (standard)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Skru av"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Skru p�"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 #, 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:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Ikkje slett"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Verkeleg slette konto?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Skru av"
+
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Skru p�"
+
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:49
-msgid "Mail Settings"
-msgstr "Innstillingar for e-post"
-
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Melding til %s"
-
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Emne er %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "P�"
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Melding fr� %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Konton_amn:"
 
-#: mail/mail-autofilter.c:289
-#, fuzzy, c-format
-msgid "%s mailing list"
-msgstr "E-post&liste for spr�ket:"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Puerto Rico"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 #, fuzzy
 msgid "Add Filter Rule"
 msgstr "Filter-reglar"
 
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -9855,7 +10896,7 @@ msgstr ""
 "eller skrive e-post.\n"
 "Vil du sette opp dette no?"
 
-#: mail/mail-callbacks.c:143
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -9863,7 +10904,7 @@ msgstr ""
 "Du m� sette opp ein identitet\n"
 "f�r du skrive e-post."
 
-#: mail/mail-callbacks.c:157
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -9871,12 +10912,8 @@ msgstr ""
 "Du m� sette opp ein transport av e-post\n"
 "f�r du kan skrive e-post."
 
-#: mail/mail-callbacks.c:187
-msgid "You have not set a mail transport method"
-msgstr "Du har ikkje sett opp ein transportmetode for e-post"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -9884,18 +10921,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:237
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Send likevel?"
 
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:251
 #, fuzzy
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr "Meldinga har ingen sendar"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -9903,11 +10940,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:327
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "Denne meldinga inneheld kun Bcc-mottakarar."
 
-#: mail/mail-callbacks.c:331
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -9917,80 +10954,90 @@ msgstr ""
 "�Apparently-To�-topptekst.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:461
-#, fuzzy
-msgid "This message contains invalid recipients:"
-msgstr "Meldinga har ingen sendar"
-
-#: mail/mail-callbacks.c:496
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr "Du m� spesifisere mottakarar for � sende denne meldinga."
 
-#: mail/mail-callbacks.c:584
+#: mail/mail-callbacks.c:497
 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:703
+#: mail/mail-callbacks.c:623
 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:913
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "ein ukjend avsendar"
 
-#: mail/mail-callbacks.c:918
+#: mail/mail-callbacks.c:981
 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:1363 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:1365 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:1866
+#: mail/mail-callbacks.c:2091
 #, 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:1891
+#: mail/mail-callbacks.c:2116
 #, 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:1930
+#: mail/mail-callbacks.c:2155
 #, 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:1944
+#: mail/mail-callbacks.c:2169
 #, 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:1970
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Ingen meldingar vald!"
 
-#: mail/mail-callbacks.c:2069
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Skriv over fil?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Lagre melding som ..."
 
-#: mail/mail-callbacks.c:2071
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Lagre meldingar som ..."
 
-#: mail/mail-callbacks.c:2242
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Vis informasjonsmelding"
+
+#: mail/mail-callbacks.c:2373
+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
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -9998,30 +11045,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2357
+#: mail/mail-callbacks.c:2728
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:2369
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2453
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Mottek meldingar fr� %1"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:2480
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2519
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Utskrift av melding feila"
 
-#: mail/mail-callbacks.c:2685
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, 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?"
@@ -10063,17 +11115,36 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "KDeelop-installering"
 
-#: mail/mail-config.c:337
-#, c-format
-msgid "Account %d"
-msgstr "Konto %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
 
-#: mail/mail-config.c:1954
+#. blue
+#: mail/mail-config.c:78 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"
@@ -10081,109 +11152,158 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1965
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: innboks"
-
-#: mail/mail-config.c:2207
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Sjekkar teneste"
 
-#: mail/mail-config.c:2285 mail/mail-config.c:2289
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 #, 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 " _Check for supported types "
-msgstr "Vel modemtype ..."
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr "farge"
+#, 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
+#, fuzzy
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr "Den oppgitte fila finst ikkje"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
-msgid "Account"
-msgstr "Konto"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Information"
 msgstr "Informasjon"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "Kontoar"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Avbryt operasjon"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Arkansas"
+
+#: mail/mail-config.glade.h:13
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: 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:11
-msgid "Always blind carbon-copy to:"
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
-msgid "Always carbon-copy to:"
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:13 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "Arica"
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Kunne ikkje lagra melding(ar)."
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:15
-msgid "Beep when new mail arrives"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "enkle innlegg"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Ukjent teiknsett: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_Lukk"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Ser etter ny e-post"
 
-#: mail/mail-config.glade.h:17
-msgid "Composer"
-msgstr "Meldingsskrivar"
-
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Skriv ei melding"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:20
-#, fuzzy
-msgid "Confirm when Expunging a folder"
-msgstr "Forventar %1"
-
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10193,400 +11313,596 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: 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:28
-msgid "Default Forward style is: "
-msgstr "Standard vidaresendingsstil er: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:40
 #, fuzzy
-msgid "Default character encoding: "
+msgid "Default character _encoding:"
 msgstr "Standardteiknsett"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:41
 #, fuzzy
-msgid "Defaults"
-msgstr "Forvald"
+msgid "Deleting Mail"
+msgstr "Hentar e-post"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitale IDar ..."
 
-#: mail/mail-config.glade.h:33
-msgid "Display"
-msgstr "Vis"
-
-#: mail/mail-config.glade.h:34
-msgid "Do not notify me when new mail arrives"
-msgstr ""
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Kan ikkje opne melding"
 
-#: mail/mail-config.glade.h:35 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:36 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Kladd"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Lagra i &kladdemappe"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "S_l� p�"
 
-#: mail/mail-config.glade.h:38 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Rediger ..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:39
-msgid "Enabled"
-msgstr "P�"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Aust"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "E-post inneheld"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "E-postadresse:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "T�m papirkorg ved avslutting"
+
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Execute Command..."
 msgstr "K�yr autorun.sh"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "sluttar med"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Eigenskapar"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Vidaresendt melding"
+
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Get Digital ID..."
 msgstr "Les band-ID ..."
 
-#: mail/mail-config.glade.h:42
-msgid "HTML signature file:"
-msgstr "HTML-signaturfil:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "Merkingsvilk�r"
+
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Honolulu"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:44 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:45
-msgid "In HTML mail"
-msgstr "I HTML-e-post"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Innvevd"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Lagre og lukk"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Last b_ileter"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Oppsett for post"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Postkaseeplassering"
 
-#: mail/mail-config.glade.h:51
-msgid "Make this my _default account"
-msgstr "Gjer _dette til min standardkonto"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Melding motteken"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_Meldingsvisning"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikronesia"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP-tenar:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Oppsett for post"
 
-#: mail/mail-config.glade.h:54
-msgid "News"
-msgstr "Nyhende"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Diskusjonsgruppetenarar"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Valfri informasjon"
 
-#: mail/mail-config.glade.h:58
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organi_sasjon:"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "PGP-lykje ID:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Vel ein farge"
 
-#: mail/mail-config.glade.h:62
-msgid "Play sound file when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:63
-msgid "Pretty Good Privacy"
-msgstr "Pretty Good Privacy"
-
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:88
 #, fuzzy
-msgid "Prompt when sending HTML messages to contacts that don't want them"
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:89
 #, fuzzy
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Sender meldingar til %1"
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:90
 #, fuzzy
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "Sender meldingar til %1"
+msgid "Printed Fonts"
+msgstr "&Innhald ..."
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Kan ikkje opne melding"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Husk dette passordet"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Svar-til:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Mottek e-post"
 
-#: mail/mail-config.glade.h:71
-msgid "Receiving Mail"
-msgstr "Mottak av e-post"
-
-#: mail/mail-config.glade.h:72
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Val for mottak"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Husk dette passordet"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Required Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:75
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+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:76
-msgid "Security"
-msgstr "Tryggleik"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
 #, fuzzy
-msgid "Select Filter Log file..."
+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:78
-msgid "Select PGP binary"
-msgstr "Vel PGP-bin�r"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Slett alt utanom signatur"
 
-#: mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:80
-msgid "Sending Mail"
-msgstr "Sender e-post"
-
-#: mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Sendt"
-
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Tenar-oppsett"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "Tenar-_type: "
 
-#: mail/mail-config.glade.h:88
-msgid "Signature file:"
-msgstr "Signaturfil:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Snarvegar"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Lagre signatur"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Kjelde"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "Source Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:91
-msgid "Sources"
-msgstr "Kjelder"
-
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:124
 #, fuzzy
-msgid "Specify filename:"
+msgid "Specify _filename:"
 msgstr "Stilnamn:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Standard unix e-postkasse"
 
-#: mail/mail-config.glade.h:95
-msgid "Use s_ecure connection (SSL)"
-msgstr "Bruk sikker tilknytning (SSL)"
+#: mail/mail-config.glade.h:128
+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:96
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "_HTML-signatur:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Variabel"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Aust"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "_Autentiseringtype: "
+
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "enkle innlegg"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
 #, fuzzy
-msgid "_Drafts folder:"
-msgstr "Lagra i &kladdemappe"
+msgid "_Confirm when expunging a folder"
+msgstr "Forventar %1"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:149
 #, fuzzy
-msgid "_Email Address:"
-msgstr "E-post-adresse:"
+msgid "_Defaults"
+msgstr "Forvald"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:151
+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
 #, fuzzy
-msgid "_Empty trash folders on exit"
-msgstr "T�m papirkorg ved avslutting"
+msgid "_Filename:"
+msgstr "Filnamn:"
 
-#: mail/mail-config.glade.h:110
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Vidaresend som"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "_Fullt namn:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:159
+#, 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:112
+#: mail/mail-config.glade.h:162
 #, fuzzy
-msgid "_Highlight citations with"
-msgstr "Merkingsvilk�r"
+msgid "_Identity"
+msgstr "Identitet"
 
-#: mail/mail-config.glade.h:113
-msgid "_Host:"
-msgstr "_Vert:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Spr�k"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "Last alle bileta i ein katalog"
 
-#: mail/mail-config.glade.h:115
-msgid "_Log filter actions to:"
-msgstr "_Loggf�r filterhandlingar til:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Gjer _dette til min standardkonto"
 
-#: mail/mail-config.glade.h:116
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_Merk meldingar som lest etter"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "Last aldri bileter fr� _nettet"
 
-#: mail/mail-config.glade.h:119
-msgid "_Organization:"
-msgstr "_Organisasjon:"
-
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
-msgid "_Path:"
-msgstr "_Sti:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:172
 #, fuzzy
-msgid "_Remember this password"
-msgstr "Fjern denne oppf�ringa"
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:173
 #, fuzzy
-msgid "_Send mail in HTML format by default."
-msgstr "Send meldingar:"
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:124
-msgid "_Server Type: "
-msgstr "_Tenartype: "
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Radio"
 
-#: mail/mail-config.glade.h:125
-msgid "_Signature file:"
-msgstr "_Signaturfil:"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Mottak av e-post"
 
-#: mail/mail-config.glade.h:126
-msgid "_Username:"
-msgstr "Br_ukarnamn:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Svar til alle"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Tryggleik"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Tryggleik"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Sender e-post"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Vis tid som"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Variabel"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_kvar"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr "farge"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "skildring"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:131
-#, fuzzy
-msgid "placeholder"
-msgstr "Bruk &plasshaldarar"
-
-#: mail/mail-config.glade.h:132
-msgid "seconds."
-msgstr "sekund."
-
 #: mail/mail-crypto.c:59
 #, fuzzy
 msgid "Could not create a PGP signature context."
@@ -10632,185 +11948,178 @@ msgstr "Kunne ikkje laga kio-jobb.\n"
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-display.c:252
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:359
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Klarte ikkje � lage mellombels katalog: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Lagra til disk ..."
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Vis innvevd"
 
-#: mail/mail-display.c:363
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Opne i %s ..."
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:428
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "G�ym"
 
-#: mail/mail-display.c:449
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Ekstern visar"
 
-#: mail/mail-display.c:1171
+#: mail/mail-display.c:1265
 #, fuzzy
 msgid "Loading message content"
 msgstr "Markerer meldingar"
 
-#: mail/mail-display.c:1666
+#: mail/mail-display.c:1832
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/mail-display.c:1668
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
-#: mail/mail-display.c:1671
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenkje som "
 
-#: mail/mail-display.c:1674
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Lagre  bilete som ..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s vedlegg"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Ugyldig addresse"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Fr�"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:11
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1768
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-
-#: mail/mail-format.c:1791
-msgid "Evolution does not recognize this type of signed message."
-msgstr ""
-
-#: mail/mail-format.c:1799
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1807
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
+msgstr "E-post"
 
-#: mail/mail-format.c:2022
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2036
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2041
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2070
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2078
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Les mapper"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, 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:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Klarar ikkje � lagre mappemetainfo til %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 #, 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:1416
+#: mail/mail-local.c:1414
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Set opp %1"
@@ -10837,127 +12146,122 @@ msgstr ""
 msgid "Working"
 msgstr "Arbeidar"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-ops.c:498 mail/mail-ops.c:527
+#: mail/mail-ops.c:538 mail/mail-ops.c:567
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender �%s�"
 
-#: mail/mail-ops.c:683
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:702
+#: mail/mail-ops.c:742
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Markerer meldingar"
 
-#: mail/mail-ops.c:704 mail/mail-send-recv.c:545
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "Ferdig."
 
-#: mail/mail-ops.c:797
+#: mail/mail-ops.c:837
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-ops.c:877
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/mail-ops.c:877
+#: mail/mail-ops.c:917
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Melding"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:1017
+#: mail/mail-ops.c:1057
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1067 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Papirkorg"
-
-#: mail/mail-ops.c:1200
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-ops.c:1243
+#: mail/mail-ops.c:1283
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1315
+#: mail/mail-ops.c:1355
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1384
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/mail-ops.c:1478
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappe �%s�"
 
-#: mail/mail-ops.c:1529
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Friskar opp mappe"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1605
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:1614
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hentat melding %s"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mottek %d melding(ar)"
 
-#: mail/mail-ops.c:1767
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrar %d melding(ar)"
 
-#: mail/mail-ops.c:1879
+#: mail/mail-ops.c:1919
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1907
+#: mail/mail-ops.c:1947
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -10966,38 +12270,38 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: mail/mail-ops.c:1981
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: mail/mail-ops.c:1997
+#: mail/mail-ops.c:2037
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:2028
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje � skrive data: %s"
 
-#: mail/mail-ops.c:2097
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar fr� %s"
 
-#: mail/mail-ops.c:2098
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s p� nytt"
 
-#: mail/mail-ops.c:2197
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_S�k"
 
@@ -11033,42 +12337,42 @@ msgstr "Finn:"
 msgid "Matches:"
 msgstr "Treff:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Avbryt ..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tenar: %s, Type: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Send og motta e-post"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Avbryt alle"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Oppdaterar ..."
 
-#: 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 "Ventar ..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Avbroten."
 
@@ -11085,25 +12389,40 @@ msgstr "Tast inn passord for %s"
 msgid "Enter Password"
 msgstr "Tast inn passord"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Klarte ikkje � lagre signaturfil."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Lagre signatur"
+
+#: mail/mail-signature-editor.c:178
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
+"Dette er siste trekk.\n"
+"Vil du leggja til fleire trekk?"
 
-#: mail/mail-summary.c:467
+#: mail/mail-signature-editor.c:357
 #, fuzzy
-msgid "Mail Summary"
-msgstr "Postsamandrag"
+msgid "Signature name:"
+msgstr "Signaturfil:"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidaresendt melding - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Vidaresendt melding"
 
@@ -11126,10 +12445,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "vMapper"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "vMapper"
@@ -11147,87 +12462,145 @@ msgstr "Pr�var � redigere ei vmappe �%s� som ikkje finnest."
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Ikkje noko emne)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - melding"
 
-#: mail/message-list.c:662
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Ulesen"
 
-#: mail/message-list.c:663
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Svara"
 
-#: mail/message-list.c:665
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Fleire uleste meldingar"
 
-#: mail/message-list.c:666
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Fleire meldingar"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Lavast"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Senk"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "H�gare"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "H�gast"
 
-#: mail/message-list.c:937
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:944
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "I dag, %H:%M"
 
-#: mail/message-list.c:953
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "I g�r %H:%M"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:975
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:2387
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Opprettar meldingsliste"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "Ferdig"
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Status"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Flagga"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Mottatt"
 
-#: mail/message-list.etspec.h:8
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Storleik"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "McCall"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "G� framover"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Tenarinformasjon"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Vidaresend"
+
+#: 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 "Svar"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Svar til alle"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "F�rehandsvisning"
+
+#: mail/message-tag-followup.c:315
+msgid "Flag to Follow Up"
+msgstr ""
+
 #: mail/subscribe-dialog.c:219
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -11249,7 +12622,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Mottek meldingar fr� %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 "Mappe"
 
@@ -11294,6 +12667,35 @@ msgstr "_Abboner"
 msgid "_Unsubscribe"
 msgstr "_Fjern abbonnment"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "Evolutionkomponent for Mitt samandrag"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "�ydelagd oppsettfil."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Innstillingar for samandrag"
+
+#: 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 "�rhus"
@@ -11458,10 +12860,6 @@ msgstr "Alaska"
 msgid "Al Baha"
 msgstr "Al Baha"
 
-#: my-evolution/Locations.h:42
-msgid "Albania"
-msgstr "Albania"
-
 #: my-evolution/Locations.h:43
 msgid "Albany"
 msgstr "Albany"
@@ -11506,10 +12904,6 @@ msgstr "Alexandria/Nouzha"
 msgid "Alexandroupolis"
 msgstr "Alexandroupolis"
 
-#: my-evolution/Locations.h:54
-msgid "Algeria"
-msgstr "Algerie"
-
 #: my-evolution/Locations.h:55
 msgid "Alghero"
 msgstr "Alghero"
@@ -11770,10 +13164,6 @@ msgstr "Ardmore"
 msgid "Arequipa"
 msgstr "Arequipa"
 
-#: my-evolution/Locations.h:120
-msgid "Argentina"
-msgstr "Argentina"
-
 #: my-evolution/Locations.h:121
 msgid "Arica"
 msgstr "Arica"
@@ -11906,14 +13296,6 @@ msgstr "Austin"
 msgid "Australasia"
 msgstr "Australasia"
 
-#: my-evolution/Locations.h:154
-msgid "Australia"
-msgstr "Australia"
-
-#: my-evolution/Locations.h:155
-msgid "Austria"
-msgstr "Austerrike"
-
 #: my-evolution/Locations.h:156
 msgid "Avalon"
 msgstr "Avalon"
@@ -11934,10 +13316,6 @@ msgstr "Bage"
 msgid "Bagotville"
 msgstr "Bagotville"
 
-#: my-evolution/Locations.h:161
-msgid "Bahamas"
-msgstr "Bahamas"
-
 #: my-evolution/Locations.h:162
 msgid "Bahia Blanca"
 msgstr "Bahia Blanca"
@@ -11946,10 +13324,6 @@ msgstr "Bahia Blanca"
 msgid "Bahias de Huatulco"
 msgstr "Bahias de Huatulco"
 
-#: my-evolution/Locations.h:164
-msgid "Bahrain"
-msgstr "Bahrain"
-
 #: my-evolution/Locations.h:165
 msgid "Baker City"
 msgstr "Baker City"
@@ -12154,18 +13528,10 @@ msgstr "Belfast/Aldergrove"
 msgid "Belfast/Harbour"
 msgstr "Belfast/Harbour"
 
-#: my-evolution/Locations.h:216
-msgid "Belgium"
-msgstr "Belgia"
-
 #: my-evolution/Locations.h:217
 msgid "Belgorod"
 msgstr "Belgorod"
 
-#: my-evolution/Locations.h:218
-msgid "Belize"
-msgstr "Belize"
-
 #: my-evolution/Locations.h:219
 msgid "Belleville"
 msgstr "Belleville"
@@ -12370,10 +13736,6 @@ msgstr "Bogota/Eldorado"
 msgid "Boise"
 msgstr "Boise"
 
-#: my-evolution/Locations.h:270
-msgid "Bolivia"
-msgstr "Bolivia"
-
 #: my-evolution/Locations.h:271
 msgid "Bologna"
 msgstr "Bologna"
@@ -12466,10 +13828,6 @@ msgstr "Bratsk"
 msgid "Braunschweig"
 msgstr "Braunschweig"
 
-#: my-evolution/Locations.h:294
-msgid "Brazil"
-msgstr "Brasil"
-
 #: my-evolution/Locations.h:295
 msgid "Bremen"
 msgstr "Bremen"
@@ -12570,10 +13928,6 @@ msgstr "Budapest"
 msgid "Buffalo"
 msgstr "Buffalo"
 
-#: my-evolution/Locations.h:320
-msgid "Bulgaria"
-msgstr "Bulgaria"
-
 #: my-evolution/Locations.h:321
 msgid "Bullfrog"
 msgstr "Bullfrog"
@@ -12706,10 +14060,6 @@ msgstr "Camp Stanley/H-207"
 msgid "Canaan"
 msgstr "Canaan"
 
-#: my-evolution/Locations.h:354
-msgid "Canada"
-msgstr "Canada"
-
 #: my-evolution/Locations.h:355
 msgid "Canarias/Fuerteventura"
 msgstr "Canarias/Fuerteventura"
@@ -12846,10 +14196,6 @@ msgstr "Catacamas"
 msgid "Catania"
 msgstr "Catania"
 
-#: my-evolution/Locations.h:389
-msgid "Cayman Islands"
-msgstr "Cayman Islands"
-
 #: my-evolution/Locations.h:390
 msgid "Cayo Largo del Sur"
 msgstr "Cayo Largo del Sur"
@@ -13042,10 +14388,6 @@ msgstr "Chihuahua"
 msgid "Childress"
 msgstr "Childress"
 
-#: my-evolution/Locations.h:438
-msgid "Chile"
-msgstr "Chile"
-
 #: my-evolution/Locations.h:439
 msgid "China Lake"
 msgstr "China Lake"
@@ -13094,10 +14436,6 @@ msgstr "Chongju Ab"
 msgid "Christchurch"
 msgstr "Christchurch"
 
-#: my-evolution/Locations.h:451
-msgid "Christmas Island"
-msgstr "Christmas Island"
-
 #: my-evolution/Locations.h:452
 msgid "Chulitna"
 msgstr "Chulitna"
@@ -13222,10 +14560,6 @@ msgstr "College Station"
 msgid "Colmar-Meyenheim"
 msgstr "Colmar-Meyenheim"
 
-#: my-evolution/Locations.h:483
-msgid "Colombia"
-msgstr "Colombia"
-
 #: my-evolution/Locations.h:484
 msgid "Colonia"
 msgstr "Colonia"
@@ -13358,10 +14692,6 @@ msgstr "Cortez"
 msgid "Corumba"
 msgstr "Corumba"
 
-#: my-evolution/Locations.h:517
-msgid "Costa Rica"
-msgstr "Costa Rica"
-
 #: my-evolution/Locations.h:518
 msgid "Cotulla"
 msgstr "Cotulla"
@@ -13402,10 +14732,6 @@ msgstr "Creston"
 msgid "Crestview"
 msgstr "Crestview"
 
-#: my-evolution/Locations.h:528
-msgid "Croatia"
-msgstr "Krotia"
-
 #: my-evolution/Locations.h:529
 msgid "Cross City"
 msgstr "Cross City"
@@ -13418,10 +14744,6 @@ msgstr "Crossville"
 msgid "Crotone"
 msgstr "Crotone"
 
-#: my-evolution/Locations.h:532
-msgid "Cuba"
-msgstr "Kuba"
-
 #: my-evolution/Locations.h:533
 msgid "Cuba Awrs"
 msgstr "Cuba Awrs"
@@ -13470,14 +14792,6 @@ msgstr "Cut Bank"
 msgid "Cuzco"
 msgstr "Cuzco"
 
-#: my-evolution/Locations.h:545
-msgid "Cyprus"
-msgstr "Kypros"
-
-#: my-evolution/Locations.h:546
-msgid "Czech Republic"
-msgstr "Tjekkisk republikk"
-
 #: my-evolution/Locations.h:547
 msgid "Dagali"
 msgstr "Dagali"
@@ -13610,10 +14924,6 @@ msgstr "Den Helder/De Kooy"
 msgid "Denison"
 msgstr "Denison"
 
-#: my-evolution/Locations.h:580
-msgid "Denmark"
-msgstr "Danmark"
-
 #: my-evolution/Locations.h:581
 msgid "Denton"
 msgstr "Denton"
@@ -13722,10 +15032,6 @@ msgstr "Doha"
 msgid "Dole"
 msgstr "Dole"
 
-#: my-evolution/Locations.h:608
-msgid "Dominican Republic"
-msgstr "Dominikanske republikk"
-
 #: my-evolution/Locations.h:609
 #, fuzzy
 msgid "Donetsk"
@@ -13855,10 +15161,6 @@ msgstr "East St Louis"
 msgid "Eau Claire"
 msgstr "Eau Claire"
 
-#: my-evolution/Locations.h:641
-msgid "Ecuador"
-msgstr "Ecuador"
-
 #: my-evolution/Locations.h:642
 msgid "Edinburgh"
 msgstr "Edinburgh"
@@ -13891,10 +15193,6 @@ msgstr "Eglin"
 msgid "Eglington/Londonderry"
 msgstr "Eglington/Londonderry"
 
-#: my-evolution/Locations.h:650
-msgid "Egypt"
-msgstr "Egypt"
-
 #: my-evolution/Locations.h:651
 msgid "Eindhoven"
 msgstr "Eindhoven"
@@ -13955,10 +15253,6 @@ msgstr "El Monte"
 msgid "El Paso"
 msgstr "El Paso"
 
-#: my-evolution/Locations.h:666
-msgid "El Salvador"
-msgstr "El Salvador"
-
 #: my-evolution/Locations.h:667
 msgid "El Salvador Int."
 msgstr "El Salvador Int."
@@ -14027,10 +15321,6 @@ msgstr "Eskisehir"
 msgid "Estherville"
 msgstr "Estherville"
 
-#: my-evolution/Locations.h:684
-msgid "Estonia"
-msgstr "Estland"
-
 #: my-evolution/Locations.h:685
 msgid "Eugene"
 msgstr "Eugene"
@@ -14155,10 +15445,6 @@ msgstr "Figari"
 msgid "Findlay"
 msgstr "Findlay"
 
-#: my-evolution/Locations.h:716
-msgid "Finland"
-msgstr "Finland"
-
 #: my-evolution/Locations.h:717
 msgid "Firenze"
 msgstr "Firenze"
@@ -14355,10 +15641,6 @@ msgstr "Fourchon"
 msgid "Foz Do Iguacu"
 msgstr "Foz Do Iguacu"
 
-#: my-evolution/Locations.h:766
-msgid "France"
-msgstr "Frankrike"
-
 #: my-evolution/Locations.h:767
 msgid "Frankfort"
 msgstr "Frankfort"
@@ -14535,14 +15817,6 @@ msgstr "George Airport"
 msgid "Georgetown"
 msgstr "Georgetown"
 
-#: my-evolution/Locations.h:811
-msgid "Georgia"
-msgstr "Georgia"
-
-#: my-evolution/Locations.h:812
-msgid "Germany"
-msgstr "Tyskland"
-
 #: my-evolution/Locations.h:813
 msgid "Ghardaia"
 msgstr "Ghardaia"
@@ -14551,10 +15825,6 @@ msgstr "Ghardaia"
 msgid "Ghedi"
 msgstr "Ghedi"
 
-#: my-evolution/Locations.h:815
-msgid "Gibraltar"
-msgstr "Gibraltar"
-
 #: my-evolution/Locations.h:816
 msgid "Gifu Ab"
 msgstr "Gifu Ab"
@@ -14675,10 +15945,6 @@ msgstr "Graz"
 msgid "Great Falls"
 msgstr "Great Falls"
 
-#: my-evolution/Locations.h:846
-msgid "Greece"
-msgstr "Hellas"
-
 #: my-evolution/Locations.h:847
 msgid "Greeley"
 msgstr "Greeley"
@@ -14759,10 +16025,6 @@ msgstr "Guaratingueta"
 msgid "Guarulhos"
 msgstr "Guarulhos"
 
-#: my-evolution/Locations.h:867
-msgid "Guatemala"
-msgstr "Guatemala"
-
 #: my-evolution/Locations.h:868
 msgid "Guayaquil/Simon Bolivar"
 msgstr "Guayaquil/Simon Bolivar"
@@ -14844,10 +16106,6 @@ msgstr "Hailey-Sun Valley"
 msgid "Haines"
 msgstr "Haines"
 
-#: my-evolution/Locations.h:888
-msgid "Haiti"
-msgstr "Haiti"
-
 #: my-evolution/Locations.h:889
 msgid "Hakodate Airport"
 msgstr "Hakodate Airport"
@@ -15072,14 +16330,6 @@ msgstr "Homestead AFB"
 msgid "Hondo"
 msgstr "Hondo"
 
-#: my-evolution/Locations.h:945
-msgid "Honduras"
-msgstr "Honduras"
-
-#: my-evolution/Locations.h:946
-msgid "Hong Kong"
-msgstr "Hong Kong"
-
 #: my-evolution/Locations.h:947
 msgid "Honningsvag"
 msgstr "Honningsv�g"
@@ -15156,10 +16406,6 @@ msgstr "Hulien"
 msgid "Humberside"
 msgstr "Humberside"
 
-#: my-evolution/Locations.h:966
-msgid "Hungary"
-msgstr "Ungarn"
-
 #: my-evolution/Locations.h:967
 msgid "Huntington"
 msgstr "Huntington"
@@ -15204,10 +16450,6 @@ msgstr "Iasi"
 msgid "Ibiza"
 msgstr "Ibiza"
 
-#: my-evolution/Locations.h:978
-msgid "Iceland"
-msgstr "Island"
-
 #: my-evolution/Locations.h:979
 msgid "Ichikawa"
 msgstr "Ichikawa"
@@ -15256,10 +16498,6 @@ msgstr "Imperial Beach"
 msgid "In Amenas"
 msgstr "In Amenas"
 
-#: my-evolution/Locations.h:991
-msgid "India"
-msgstr "India"
-
 #: my-evolution/Locations.h:992
 msgid "Indiana"
 msgstr "Indiana"
@@ -15320,10 +16558,6 @@ msgstr "Iraklion"
 msgid "Iran, Islamic Republic of"
 msgstr "Iran, Islamic Republic of"
 
-#: my-evolution/Locations.h:1007
-msgid "Ireland"
-msgstr "Irland"
-
 #: my-evolution/Locations.h:1008
 msgid "Iron Mountain"
 msgstr "Iron Mountain"
@@ -15356,10 +16590,6 @@ msgstr "Istanbul"
 msgid "Itaituba"
 msgstr "Itaituba"
 
-#: my-evolution/Locations.h:1016
-msgid "Italy"
-msgstr "Italia"
-
 #: my-evolution/Locations.h:1017
 msgid "Ithaca"
 msgstr "Ithaca"
@@ -15416,10 +16646,6 @@ msgstr "Jacksonville NAS"
 msgid "Jaffrey"
 msgstr "Jaffrey"
 
-#: my-evolution/Locations.h:1031
-msgid "Jamaica"
-msgstr "Jamaica"
-
 #: my-evolution/Locations.h:1032
 msgid "Jamestown"
 msgstr "Jamestown"
@@ -15432,10 +16658,6 @@ msgstr "Janesville"
 msgid "Jan Smuts"
 msgstr "Jan Smuts"
 
-#: my-evolution/Locations.h:1035
-msgid "Japan"
-msgstr "Japansk"
-
 #: my-evolution/Locations.h:1036
 msgid "Jeddah King Abdul Aziz International Airport"
 msgstr "Jeddah King Abdul Aziz International Airport"
@@ -15476,10 +16698,6 @@ msgstr "Jonk�ping"
 msgid "Joplin"
 msgstr "Joplin"
 
-#: my-evolution/Locations.h:1046
-msgid "Jordan"
-msgstr "Jordan"
-
 #: my-evolution/Locations.h:1047
 msgid "Juanjui"
 msgstr "Juanjui"
@@ -15876,10 +17094,6 @@ msgstr "Kunming"
 msgid "Kushiro Airport"
 msgstr "Kushiro Airport"
 
-#: my-evolution/Locations.h:1146
-msgid "Kuwait"
-msgstr "Kuwait"
-
 #: my-evolution/Locations.h:1147
 msgid "Kyyiv/Boryspil"
 msgstr ""
@@ -16052,10 +17266,6 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1190
-msgid "Latvia"
-msgstr "Latvia"
-
 #: my-evolution/Locations.h:1191
 msgid "Laughlin"
 msgstr "Laughlin"
@@ -16084,10 +17294,6 @@ msgstr "Leadville"
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1198
-msgid "Lebanon"
-msgstr "Libanon"
-
 #: my-evolution/Locations.h:1199
 msgid "Lecce"
 msgstr "Lecce"
@@ -16164,10 +17370,6 @@ msgstr "Lexington"
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1218
-msgid "Liberia"
-msgstr "Liberia"
-
 #: my-evolution/Locations.h:1219
 msgid "Libya"
 msgstr "Libya"
@@ -16228,10 +17430,6 @@ msgstr "Lista"
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1234
-msgid "Lithuania"
-msgstr "Litauen"
-
 #: my-evolution/Locations.h:1235
 msgid "Little Rock"
 msgstr "Little Rock"
@@ -16364,10 +17562,6 @@ msgstr "Luqa"
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1268
-msgid "Luxembourg"
-msgstr "Luxembourg"
-
 #: my-evolution/Locations.h:1269
 msgid "Luxeuil"
 msgstr "Luxeuil"
@@ -16481,10 +17675,6 @@ msgstr "Maldonado/Punta Est"
 msgid "Malmo/Sturup"
 msgstr "Malm�/Sturup"
 
-#: my-evolution/Locations.h:1297
-msgid "Malta"
-msgstr "Malta"
-
 #: my-evolution/Locations.h:1298
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
@@ -16841,10 +18031,6 @@ msgstr "Metz-Frescaty"
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1387
-msgid "Mexico"
-msgstr "Mexico"
-
 #: my-evolution/Locations.h:1388
 msgid "Miami"
 msgstr "Miami"
@@ -17173,10 +18359,6 @@ msgstr "Morgantown"
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1470
-msgid "Morocco"
-msgstr "Marokko"
-
 #: my-evolution/Locations.h:1471
 msgid "Morristown"
 msgstr "Morristown"
@@ -17417,10 +18599,6 @@ msgstr "Needles"
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1531
-msgid "Netherlands"
-msgstr "Nederland"
-
 #: my-evolution/Locations.h:1532
 msgid "Neuquen"
 msgstr "Neuquen"
@@ -17533,18 +18711,10 @@ msgstr "New York-JFK Arpt"
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1560
-msgid "New Zealand"
-msgstr "Ny Zealand"
-
 #: my-evolution/Locations.h:1561
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1562
-msgid "Nicaragua"
-msgstr "Nicaragua"
-
 #: my-evolution/Locations.h:1563
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
@@ -17589,10 +18759,6 @@ msgstr "Nome"
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1574
-msgid "Norfolk Island"
-msgstr "Norfolk Island"
-
 #: my-evolution/Locations.h:1575
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
@@ -17641,10 +18807,6 @@ msgstr "Northway"
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1587
-msgid "Norway"
-msgstr "Noreg"
-
 #: my-evolution/Locations.h:1588
 msgid "Norwich"
 msgstr "Norwich"
@@ -17822,10 +18984,6 @@ msgstr "Omaha-Bellevue"
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1632
-msgid "Oman"
-msgstr "Oman"
-
 #: my-evolution/Locations.h:1633
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
@@ -17982,10 +19140,6 @@ msgstr "Paengnyongdo Ab"
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1673
-msgid "Pakistan"
-msgstr "Pakistan"
-
 #: my-evolution/Locations.h:1674
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
@@ -18022,10 +19176,6 @@ msgstr "Palo Alto"
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1683
-msgid "Panama"
-msgstr "Panama"
-
 #: my-evolution/Locations.h:1684
 msgid "Panama City"
 msgstr "Panama City"
@@ -18042,10 +19192,6 @@ msgstr "Papa"
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1688
-msgid "Paraguay"
-msgstr "Paraguay"
-
 #: my-evolution/Locations.h:1689
 msgid "Paris"
 msgstr "Paris"
@@ -18182,10 +19328,6 @@ msgstr "Perry-Foley"
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1723
-msgid "Peru"
-msgstr "Peru"
-
 #: my-evolution/Locations.h:1724
 msgid "Perugia"
 msgstr "Perugia"
@@ -18346,10 +19488,6 @@ msgstr "Point Piedras Blanca"
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1764
-msgid "Poland"
-msgstr "Polen"
-
 #: my-evolution/Locations.h:1765
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
@@ -18454,10 +19592,6 @@ msgstr "Port Said"
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1791
-msgid "Portugal"
-msgstr "Portugal"
-
 #: my-evolution/Locations.h:1792
 msgid "Posadas"
 msgstr "Posadas"
@@ -18586,10 +19720,6 @@ msgstr "Puerto Montt"
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1824
-msgid "Puerto Rico"
-msgstr "Puerto Rico"
-
 #: my-evolution/Locations.h:1825
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
@@ -18634,10 +19764,6 @@ msgstr "Pyongtaek Ab"
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1836
-msgid "Qatar"
-msgstr "Qatar"
-
 #: my-evolution/Locations.h:1837
 msgid "Quantico"
 msgstr "Quantico"
@@ -18939,10 +20065,6 @@ msgstr "Roma/Ciampino"
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1912
-msgid "Romania"
-msgstr "Romania"
-
 #: my-evolution/Locations.h:1913
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
@@ -19431,10 +20553,6 @@ msgstr "Saskatoon"
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2035
-msgid "Saudi Arabia"
-msgstr "Saudi Arabia"
-
 #: my-evolution/Locations.h:2036
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
@@ -19651,10 +20769,6 @@ msgstr "Silver City"
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2090
-msgid "Singapore"
-msgstr "Singapore"
-
 #: my-evolution/Locations.h:2091
 msgid "Sioux City"
 msgstr "Sioux City"
@@ -19703,14 +20817,6 @@ msgstr "Skwentna"
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2103
-msgid "Slovakia"
-msgstr "Slovakia"
-
-#: my-evolution/Locations.h:2104
-msgid "Slovenia"
-msgstr "Slovenia"
-
 #: my-evolution/Locations.h:2105
 msgid "Smithers"
 msgstr "Smithers"
@@ -19767,10 +20873,6 @@ msgstr "Songmu Ab"
 msgid "Sorkjosen"
 msgstr "S�rkjosen"
 
-#: my-evolution/Locations.h:2119
-msgid "South Africa"
-msgstr "S�r-Afrika"
-
 #: my-evolution/Locations.h:2120
 msgid "Southampton"
 msgstr "Southampton"
@@ -19799,10 +20901,6 @@ msgstr "South Marsh Island"
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2127
-msgid "Spain"
-msgstr "Spania"
-
 #: my-evolution/Locations.h:2128
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
@@ -19995,10 +21093,6 @@ msgstr "Sungshan/Taipei"
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2176
-msgid "Suriname"
-msgstr "Suriname"
-
 #: my-evolution/Locations.h:2177
 msgid "Sutton"
 msgstr "Sutton"
@@ -20015,18 +21109,10 @@ msgstr "Svalbard"
 msgid "Svolvaer/Helle"
 msgstr "Svolv�r/Helle"
 
-#: my-evolution/Locations.h:2181
-msgid "Sweden"
-msgstr "Sverige"
-
 #: my-evolution/Locations.h:2182
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2183
-msgid "Switzerland"
-msgstr "Sveits"
-
 #: my-evolution/Locations.h:2184
 msgid "Sydney"
 msgstr "Sydney"
@@ -20112,10 +21198,6 @@ msgstr "Taif"
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2205
-msgid "Taiwan"
-msgstr "Taiwan"
-
 #: my-evolution/Locations.h:2206
 msgid "Taiyuan"
 msgstr "Taiyuan"
@@ -20576,10 +21658,6 @@ msgstr "Turaif"
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2321
-msgid "Turkey"
-msgstr "Tyrkia"
-
 #: my-evolution/Locations.h:2322
 msgid "Turku"
 msgstr "Turku"
@@ -20628,10 +21706,6 @@ msgstr "Ufa"
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2334
-msgid "Ukraine"
-msgstr "Ukrainia"
-
 #: my-evolution/Locations.h:2335
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
@@ -20660,14 +21734,6 @@ msgstr "Unalakleet"
 msgid "United Arab Emirates "
 msgstr "Sameinte Arabiske Emiratar"
 
-#: my-evolution/Locations.h:2342
-msgid "United Kingdom"
-msgstr "Storbritannia"
-
-#: my-evolution/Locations.h:2343
-msgid "United States"
-msgstr "USA"
-
 #: my-evolution/Locations.h:2344
 msgid "Unst"
 msgstr "Unst"
@@ -20684,10 +21750,6 @@ msgstr "Uruapan"
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2348
-msgid "Uruguay"
-msgstr "Uruguay"
-
 #: my-evolution/Locations.h:2349
 msgid "Urumqi"
 msgstr "Urumqi"
@@ -20813,10 +21875,6 @@ msgstr "V�xj�"
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2380
-msgid "Venezuela"
-msgstr "Venezuela"
-
 #: my-evolution/Locations.h:2381
 msgid "Venice"
 msgstr "Venice"
@@ -20861,10 +21919,6 @@ msgstr "Vicksburg"
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2392
-msgid "Viet Nam"
-msgstr "Vietnam"
-
 #: my-evolution/Locations.h:2393
 msgid "Vigo"
 msgstr "Vigo"
@@ -21341,10 +22395,6 @@ msgstr "Yellowknife"
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2512
-msgid "Yemen"
-msgstr "Yemen"
-
 #: my-evolution/Locations.h:2513
 msgid "Yenbo"
 msgstr "Yenbo"
@@ -21389,10 +22439,6 @@ msgstr "Youngstown"
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2524
-msgid "Yugoslavia"
-msgstr "Jugoslavia"
-
 #: my-evolution/Locations.h:2525
 msgid "Yukon"
 msgstr "Yukon"
@@ -21449,114 +22495,137 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Z�rich"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:153
-#, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Kan ikkje initialisera lokale variablar"
-
-#: 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 "Avtalar"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "Ingen avtalar"
 
-#: my-evolution/e-summary-calendar.c:375
+#: my-evolution/e-summary-calendar.c:400
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d. %B"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:395
+#: my-evolution/e-summary-calendar.c:420
 msgid "No description"
 msgstr "Ingen skildring"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-mail.c:151
 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
+msgid "Local Folders"
+msgstr "Lokale mapper"
+
 #. 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:606
+#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "ENOV:ENGM"
 
-#: my-evolution/e-summary-preferences.c:445
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictinary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Tips for dagen"
 
-#: my-evolution/e-summary-preferences.c:946
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Legg til ei nyhendekjelde"
 
-#: my-evolution/e-summary-preferences.c:954
+#: my-evolution/e-summary-preferences.c:728
 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:958
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Namn:"
 
-#: my-evolution/e-summary-preferences.c:1504
-msgid "Summary Settings"
-msgstr "Innstillingar for samandrag"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "Feil ved nedlasting av RDF"
 
-#: my-evolution/e-summary-rdf.c:443
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr "Nyhendekjelde"
 
-#: my-evolution/e-summary-tasks.c:241
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "_Legg til"
+
+#. 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
+#, fuzzy
+msgid "Shown"
+msgstr "Shannon"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Ingen oppg�ver"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(Ingen skildring)"
 
-#: my-evolution/e-summary-weather.c:70
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Mitt v�r"
 
-#: my-evolution/e-summary-weather.c:504
+#: 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 "V�r"
 
-#: my-evolution/e-summary-weather.c:667
-msgid "Regions"
-msgstr "Omr�der"
-
-#: 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 "Venlegast vent ..."
 
-#: 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 "Skriv ut samandrag"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Utskrift av samandrag feila"
 
@@ -21565,38 +22634,6 @@ msgstr "Utskrift av samandrag feila"
 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"
@@ -22844,194 +23881,151 @@ msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr "Fje_rn"
-
-#: my-evolution/my-evolution.glade.h:2
 #, fuzzy
 msgid "Add n_ews feed"
 msgstr "Legg til nytt bilete"
 
-#: my-evolution/my-evolution.glade.h:3
-#, fuzzy
-msgid "Al_l stations:"
-msgstr "&Tilgjengelege handlingar:"
-
-#: my-evolution/my-evolution.glade.h:4
-#, fuzzy
-msgid "All _folders:"
-msgstr "Alle kantar"
-
-#: my-evolution/my-evolution.glade.h:5
-#, fuzzy
-msgid "All news _feeds:"
-msgstr "&Alle felt"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr "C_elsius"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 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:9
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
 msgid "Ma_x number of items shown:"
 msgstr "&H�gste tal p� hopp:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 #, fuzzy
 msgid "News Feed Settings"
 msgstr "Nettverksinnstillingar"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr "Ein _m�nad"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr "Ei v_eke"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "R_efresh time (seconds):"
 msgstr "&Oppfriskingsrate:"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 #, fuzzy
 msgid "Refresh _time (seconds):"
 msgstr "&Oppfriskingsrate:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "Vis sidekantar"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr "Vis _alle oppg�ver"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "Vedlegg"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr "Vis temperatur i:"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "Oppg�ver"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 #, fuzzy
 msgid "Weather settings"
 msgstr "Toppinnstillingar"
 
-#: my-evolution/my-evolution.glade.h:22
-#, fuzzy
-msgid "_Display folders:"
-msgstr "Skjermkontrollerarar"
-
-#: my-evolution/my-evolution.glade.h:23
-#, fuzzy
-msgid "_Display stations:"
-msgstr "Visingsval:"
-
-#: my-evolution/my-evolution.glade.h:24
-#, fuzzy
-msgid "_Displayed feeds:"
-msgstr "Vist namn:"
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr "_Fem dagar"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "_Mail"
 msgstr "Send"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "_News Feeds"
 msgstr "Diskusjonsgruppetenarar"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr "_Ein dag"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 #, fuzzy
 msgid "_Schedule"
 msgstr "&Plan"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr "_V�r"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-#, fuzzy
-msgid "Factory for the Evolution notes component."
-msgstr "�ydelagd oppsettfil."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Factory for the Notes control"
-msgstr "�ydelagd oppsettfil."
+msgid "Default Folders"
+msgstr "Spesialmapper"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 #, fuzzy
 msgid "The Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Vis detaljar"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Avbryt operasjon"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Innboks"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Utboks"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Lokale mapper"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 #, fuzzy
 msgid "Evolution installation"
 msgstr "KDeelop-installering"
 
-#: 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 "Klikk �OK� for � installere filene, eller �Avbryt� for � avslutte."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 #, fuzzy
 msgid "Could not update files correctly"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, fuzzy, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -23041,14 +24035,14 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "Ein feil oppstod ved lagring."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, fuzzy, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -23058,7 +24052,7 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -23066,7 +24060,7 @@ msgid ""
 "readable and executable and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -23074,7 +24068,7 @@ msgid ""
 "Please remove this file and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -23082,7 +24076,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -23091,7 +24085,7 @@ 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"
@@ -23099,88 +24093,90 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: 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 "Opphavsrett � 1999, 2000, 2001 Ximian, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Leitar etter tilleggsmodular"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: shell/e-shell-folder-commands.c:190
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "Kan ikkje flytta mappe "
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr "kan ikkje opna fila %1"
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:206
 #, fuzzy
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Kan ikkje flytta ei foreldremappe inn i ei barnemappe."
 
-#: 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 ""
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Kopier mappe"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 #, fuzzy
 msgid "Move folder"
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Slett �%s�"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: shell/e-shell-folder-commands.c:425
 #, 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?"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:502
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endra namn p� profil '%1'"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 #, fuzzy
 msgid "Rename folder"
 msgstr "Endra namn p� profil '%1'"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, fuzzy, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23195,7 +24191,7 @@ msgstr ""
 "Kan ikkje laga fila\n"
 "\""
 
-#: shell/e-shell-folder-creation-dialog.c:304
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Opprett ny mappe"
 
@@ -23209,7 +24205,7 @@ msgstr ""
 msgid "New..."
 msgstr "Ny ..."
 
-#: 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 "(Utan tittel)"
 
@@ -23371,6 +24367,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Ny"
+
 #: shell/e-shell-utils.c:114
 #, fuzzy
 msgid "No folder name specified."
@@ -23394,96 +24396,93 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr "�.� og �..� er resverte mappenamn."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 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:173
+#: shell/e-shell-view-menu.c:176
 #, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Oppl�ysing"
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:444
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:445
 #, fuzzy
 msgid "Select the folder that you want to open"
 msgstr "Vel det ikontemaet du vil bruka:"
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:565
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:566
 #, fuzzy
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vel katalogen som inneheld tenestene"
 
-#: 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
-#, fuzzy, c-format
-msgid "Error executing %s."
-msgstr ""
-"Feil ved lesing a fil:\n"
-"%1"
-
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Arbeid _fr�kopla"
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Arbeid fr�kopla"
 
-#: shell/e-shell-view.c:215
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1598
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1600
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: 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 ""
 
-#: shell/e-shell-view.c:1654
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: 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 ""
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, fuzzy, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1660
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23491,20 +24490,24 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1887
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Ugyldig(e) argument"
 
-#: shell/e-shell.c:1889
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1891
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: shell/e-shell.c:1893 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Generell feil"
 
@@ -23630,83 +24633,81 @@ msgstr "Fj_ern"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarvegen fr� snarvegstolpen"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av snavegar."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
-#: shell/e-storage-set-view.c:658
-#, fuzzy, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Innboks"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Ingen namn)"
+#: 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 "Ingen feil"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 #, fuzzy
 msgid "A folder with the same name already exists"
 msgstr "Ein tabell med det namnet finst alt."
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 #, fuzzy
 msgid "Not enough space to create the folder"
 msgstr "Ikkje nok skip � senda."
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Mappa er ikkje tom"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 #, fuzzy
 msgid "The specified folder was not found"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Kommando ikkje st�tta p� tenar"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Operasjonen vart stoppa"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 #, fuzzy
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan ikkje flytta ei foreldremappe inn i ei barnemappe."
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Leitar etter tilleggsmodular"
@@ -23717,10 +24718,14 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, fuzzy, c-format
+#, fuzzy
 msgid "%s (%d%% complete)"
 msgstr "%1 av %2 ferdig"
 
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<klikk her for � velje mappe>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, fuzzy, c-format
 msgid ""
@@ -23747,70 +24752,70 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "CORBA-feil"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Avbroten"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Har allereide ein eigar"
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Ingen eigar"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1055
 #, fuzzy
 msgid "Not found"
 msgstr "Fann ikkje fil"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1057
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Vel modemtype ..."
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Ust�tta skjema"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Ust�tta operasjon"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Eksisterar"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1073
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Vidaresendt melding"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Ikkje noko plass att"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Gammal eigar har d�ydd"
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
 #, fuzzy
 msgid "Test type"
 msgstr "Filtype:"
@@ -23938,33 +24943,50 @@ msgstr "Ikkje sp�r meg igjen"
 msgid "Evolution can import data from the following files:"
 msgstr "Bruk p� f�lgjande delar:"
 
-#: shell/main.c:83
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:89
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avsluttar no ..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Sl� av oppstartsskjerm"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Startar importering"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Startar importering"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
@@ -23989,264 +25011,222 @@ msgstr "Utdata fil"
 msgid "No filename provided."
 msgstr "G� til side"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "&Kopier bileteplassering"
+
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopier utval"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "_Kopier til mappe ..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Opprett ny kontak"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 #, fuzzy
 msgid "Create new contact list"
 msgstr "Lagar eit nytt dokument"
 
-#: 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 "Klipp ut valde omr�de"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Delete selected contacts"
 msgstr "Slett den valte oppg�va"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Ny liste"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Lagra side til ascii-fil"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Flytt til _mappe ..."
 
-#: 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 "Lim inn fr� utklippstavla"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "&Innhald ..."
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "Slett den valte oppg�va"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Vel alle"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Vel alle kontatene"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#, fuzzy
-msgid "Send _Message to Contact..."
-msgstr "Sender ei melding til ein nettverksspelar"
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "Slett den valte oppg�va"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 #, fuzzy
 msgid "Send message to contact"
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Stopp lasting"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:30
 #, fuzzy
 msgid "View the current contact"
 msgstr "tid no"
 
-#: 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-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:16
+#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
+#: ui/evolution.xml.h:35
 msgid "_Actions"
 msgstr "H_andlingar"
 
-#: ui/evolution-addressbook.xml.h:31
-#, fuzzy
-msgid "_Addressbook Sources..."
-msgstr "Kjelde:"
-
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Kontakt"
-
 #: ui/evolution-addressbook.xml.h:33
 #, fuzzy
 msgid "_Contact List"
 msgstr "&Innhald ..."
 
-#: 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 "_Vidaresend kontakt ..."
 
-#: 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:103
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "S_kriv ut"
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "Flytt til _mappe ..."
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Save as VCard"
 msgstr "Lagra som"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ui/evolution-addressbook.xml.h:43
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "Slett kolonne"
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Vel alt"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:4
-#, fuzzy
-msgid "Create a New All Day _Event"
-msgstr "Feil ved opning"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
+#: ui/evolution-addressbook.xml.h:45
 #, fuzzy
-msgid "Create a New _Task"
-msgstr "Lagar eit nytt dokument"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Lag ein _ny avtale"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr ""
+msgid "_Send Message to Contact..."
+msgstr "Sender ei melding til ein nettverksspelar"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
 msgid "Delete the appointment"
 msgstr "&Slett avtale"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "G� til"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "G� bakover"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "G� framover"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "G� til _dato"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "G� til spesifisert dato"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "G� til i dag"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "M�nad"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Ny avtale"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-msgid "New Task"
-msgstr "Ny oppg�ve"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Sen melding"
 
-#: 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 "F�rehands_vising av utskrift"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Print this calendar"
 msgstr "Skriv ut alle"
 
-#: 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 "Vis ein dag"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Vis ein m�nad"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Vis ei veke"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
 msgid "Show the working week"
 msgstr "Vis hovudvindauget"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Veke"
 
-#: ui/evolution-calendar.xml.h:35
-#, fuzzy
-msgid "_Appointment..."
-msgstr "Avtale"
-
-#: ui/evolution-calendar.xml.h:36
-#, fuzzy
-msgid "_Calendar Settings..."
-msgstr "Skriftinnstillingar"
-
-#: ui/evolution-calendar.xml.h:42
-#, fuzzy
-msgid "_Publish Free/Busy Information"
-msgstr "Informasjon"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "_Oppg�ve ..."
-
 #: 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
@@ -24278,18 +25258,18 @@ msgstr "Sen melding"
 msgid "Print this item"
 msgstr "Skriv ut dette elementet"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Skriv ut ..."
-
 #: 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 "Lagre"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Lagre som ..."
+
 #: 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 "Lagre og lukk"
 
@@ -24305,8 +25285,8 @@ msgstr "Lagre dette elementet til disk"
 #: 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:40
 msgid "_File"
 msgstr "_Fil"
 
@@ -24324,10 +25304,15 @@ msgstr "L_agre som ..."
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
+#: ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Sender ei melding til ein nettverksspelar"
+
 #: 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 "_Lagre"
 
@@ -24397,6 +25382,10 @@ 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"
@@ -24407,86 +25396,57 @@ msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: 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:6
 msgid "Empty _Trash"
 msgstr "T�m _papirkorga"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 #, fuzzy
 msgid "Forget _Passwords"
 msgstr "Lagra som"
 
-#: 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
-msgid "New Message"
-msgstr "Ny melding"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Opne eit vindauge for skriving av ei e-postmelding"
 
-#: 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
-msgid "Send / Receive"
-msgstr "Send / Motta"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Send k�a meldingar og motta ny meldingar"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Vis meldings-f�rehandsvisningsvindauge"
 
-#: 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:13
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Mapper"
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filter ..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "_Innstillingar for e-post ..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "F�rehandsvis i"
 
-#: ui/evolution-mail-global.xml.h:23
-#, fuzzy
-msgid "_Send / Receive"
-msgstr "Mottakar"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "Leitar etter tilleggsmodular"
@@ -24592,11 +25552,11 @@ msgstr "Mellombels g�ym dei valde meldingane"
 msgid "Threaded Message list"
 msgstr "Tr�da meldingsliste"
 
-#: 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 ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Mappe"
 
@@ -24612,171 +25572,181 @@ msgstr "Ei_genskapar ..."
 msgid "_Threaded Message List"
 msgstr "_Tr�da meldingsliste"
 
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Legg til avsendar i adresseboka"
+
 #: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Bruk filter"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Legg til avsendar i adresseboka"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Bruk filterreglar p� valde meldingar"
 
-#: ui/evolution-mail-message.xml.h:3
+#: ui/evolution-mail-message.xml.h:5
 #, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: 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:7
 #, fuzzy
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:9
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "&Kopier bileteplassering"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:10
 #, fuzzy
 msgid "Create _Virtual Folder From Message"
 msgstr "Mapper"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
 #, fuzzy
 msgid "Create a rule to filter messages from this sender"
 msgstr "Slett e-post fr� tenaren"
 
-#: 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: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:14
 #, fuzzy
 msgid "Create a rule to filter messages with this subject"
 msgstr "Lag eit nytt rammesett med denne ramma"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create a virtual folder for these recipients"
 msgstr "Mapper"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 #, fuzzy
 msgid "Create a virtual folder for this mailing list"
 msgstr "Mapper"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 #, fuzzy
 msgid "Create a virtual folder for this sender"
 msgstr "Mapper"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Create a virtual folder for this subject"
 msgstr "Mapper"
 
-#: 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:21
 #, fuzzy
 msgid "Display the next important message"
 msgstr "Vis informasjonsmelding"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Display the next message"
 msgstr "Vis �tvaringsmelding"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Vis informasjonsmelding"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:24
 #, fuzzy
 msgid "Display the next unread thread"
 msgstr "Neste ulesne &tr�d"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
 msgid "Display the previous important message"
 msgstr "Vis det f�rre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Vis det f�rre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Display the previous unread message"
 msgstr "Vis det f�rre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Vidaresend"
+
+#: ui/evolution-mail-message.xml.h:29
 #, fuzzy
 msgid "Filter on Mailing _List..."
 msgstr "Fil alt i liste"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "Fil under:"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "Skriv ut filer"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "Ingen emne"
 
-#: ui/evolution-mail-message.xml.h:30
-msgid "Force images in HTML mail to be loaded"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward"
-msgstr "Vidaresend"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward As"
-msgstr "Vidaresend som"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Attached"
-msgstr "Vidaresend som _vedlegg"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Sentrer dei valte elementa"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Inline"
-msgstr "Vidaresend _innvevd"
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "Fullt _namn ..."
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Forward _Quoted"
-msgstr "Vidaresend _sitert"
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message in the body of a new message"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
@@ -24794,6 +25764,10 @@ msgstr "Last b_ileter"
 msgid "Mark as I_mportant"
 msgstr "Marker som lesen"
 
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Marker som _ulesen"
+
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Mark as Unimp_ortant"
@@ -24801,22 +25775,22 @@ msgstr "Marker som lesen"
 
 #: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-msgid "Mark the selected messages as having been read"
+msgid "Mark the selected message(s) as having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
 #: ui/evolution-mail-message.xml.h:48
 #, fuzzy
-msgid "Mark the selected messages as important"
+msgid "Mark the selected message(s) as important"
 msgstr "Sentrer dei valte elementa"
 
 #: ui/evolution-mail-message.xml.h:49
 #, fuzzy
-msgid "Mark the selected messages as not having been read"
+msgid "Mark the selected message(s) as not having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
 #: ui/evolution-mail-message.xml.h:50
 #, fuzzy
-msgid "Mark the selected messages as unimportant"
+msgid "Mark the selected message(s) as unimportant"
 msgstr "Sentrer dei valte elementa"
 
 #: ui/evolution-mail-message.xml.h:51
@@ -24830,7 +25804,7 @@ msgstr "Flytt"
 
 #: ui/evolution-mail-message.xml.h:53
 #, fuzzy
-msgid "Move selected messages to another folder"
+msgid "Move selected message(s) to another folder"
 msgstr "Lagra side til ascii-fil"
 
 #: ui/evolution-mail-message.xml.h:54
@@ -24838,64 +25812,63 @@ msgid "Next"
 msgstr "Neste"
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Important Message"
+#, fuzzy
+msgid "Next _Important Message"
 msgstr "Neste viktige melding"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Message"
-msgstr "Neste melding"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Neste tr�d"
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Next Unread Message"
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Neste uleste melding"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Opne vald melding i eit eige vindauge"
 
-#: 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 "Opne vald melding for sending p� nytt"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Opprinneleg _storleik"
 
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Forrige ulesne melding"
+
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Forrige viktige melding"
+
+#: ui/evolution-mail-message.xml.h:63
 msgid "Preview the message to be printed"
 msgstr "F�rehandsvis meldinga som skal skrivast ut"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Important Message"
-msgstr "Forrige viktige melding"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Message"
-msgstr "Forrige melding"
-
-#: ui/evolution-mail-message.xml.h:66
-msgid "Previous Unread Message"
-msgstr "Forrige ulesne melding"
-
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Skriv ut denne meldinga"
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply"
-msgstr "Svar"
+#: 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 "Svar til alle"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Sentrer dei valte elementa"
 
 #: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
@@ -24973,8 +25946,8 @@ msgstr "Ingen emne"
 
 #: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-msgid "_Apply Filters"
-msgstr "Rediger fil"
+msgid "_Attached"
+msgstr "Legg ved"
 
 #: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
@@ -24989,43 +25962,72 @@ msgid "_Forward Message"
 msgstr "_Vidaresend melding"
 
 #: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "G� til"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "Innvevd"
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_St�rre"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Neste melding"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_Opne melding"
 
-#: 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 "Forrige melding"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Sitert"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "Verk_ty"
 
+#: ui/evolution-mail-message.xml.h:112
+#, fuzzy
+msgid "_Undelete"
+msgstr "Slett"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Lukk vindauge"
 
 #: 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:36
 msgid "_Close"
 msgstr "L_ukk"
 
 #: 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:56
 msgid "_View"
 msgstr "_Visning"
 
@@ -25049,11 +26051,11 @@ msgstr "Krypt�r denne meldinga med PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Krypt�r denne meldinga med ditt S/MIME-krypteringssertifikat"
 
-#: 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 "Form_at"
 
-#: 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"
 
@@ -25069,6 +26071,10 @@ msgstr "Sett inn ei fil som tekst i meldinga"
 msgid "Insert text file..."
 msgstr "Sett inn tekstfil ..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Opne"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Opne ei fil"
@@ -25102,7 +26108,7 @@ msgid "Save in folder..."
 msgstr "Lagre i mappe ..."
 
 #: 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 "Lagre aktiv fil"
 
@@ -25127,6 +26133,7 @@ msgid "Send _later"
 msgstr "Send _seinare"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Send meldinga i HTML-format"
 
@@ -25195,7 +26202,7 @@ msgid "_From Field"
 msgstr "_Fr� felt"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "Set _inn"
 
@@ -25207,11 +26214,7 @@ msgstr "_Opne ..."
 msgid "_Reply-To Field"
 msgstr "_Reply-To felt"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Tryggleik"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -25268,43 +26271,41 @@ msgstr "generer avlusingsinformasjon"
 msgid "Re_fresh Task"
 msgstr "_Frisk opp oppg�ve"
 
-#: 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:3
 msgid "Copy selected task"
 msgstr "Kopier valde oppg�ver"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Klipp ut valde oppg�vr"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 #, fuzzy
 msgid "Delete completed tasks"
 msgstr "Slett valde oppg�ver"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Slett valde oppg�ver"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "Mar_k as Complete"
 msgstr "_Merk som komplett"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Lim inn oppg�ve fr� utklippstavla"
 
-#: ui/evolution-tasks.xml.h:15
-msgid "Tasks Settings..."
-msgstr "Innstillingar for oppg�ver ..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Sen melding"
 
-#: ui/evolution-tasks.xml.h:22
-msgid "_Task"
-msgstr "_Oppg�ve"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Skriv ut denne meldinga"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25371,113 +26372,119 @@ msgid "Open this folder in an other window"
 msgstr "Opne denne mappe i eit anna vindauge"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Send / Motta"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Send k�a meldingar og motta ny meldingar"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "Vis informasjon om Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Send inn _feilrapport"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Byt"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Avgjer om snarvegstolpen skal vise"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Vis den valde mappa"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution ..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Kopier ..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "_Mappestolpe"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_G� til mappe"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Import�r ..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Flytt ..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_Pilot-innstillingar"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Omd�yp ..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+#, fuzzy
+msgid "_Send / Receive"
+msgstr "Mottakar"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Snarveg"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "_Snarvegstolpe"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Endre p� innstillingar for samandrag"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Skriv ut samandrag"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Last om att"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Last om att visning"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "Innstillingar for _samandrag ..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Adressekort"
@@ -25491,18 +26498,27 @@ msgid "Phone List"
 msgstr "Telefonliste"
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "Vel mappe"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Etter sendar"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Etter status"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Etter emne"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Meldingar"
 
@@ -25536,11 +26552,21 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "_Aktiv visning"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "Definer visningar"
 
@@ -25633,24 +26659,20 @@ msgstr "Ukrainsk"
 msgid "Visual"
 msgstr "Visalia"
 
-#: widgets/misc/e-charset-picker.c:104
-msgid "New"
-msgstr "Ny"
-
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ukjent teiknsett: %s"
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Oppgi teiknsett"
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Andre ..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Teiknkoding"
 
@@ -25658,30 +26680,32 @@ msgstr "Teiknkoding"
 msgid "..."
 msgstr "... "
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Redigering av s�k"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Lagre s�k"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Legg til lagra s�k"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "T�m"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Lagre s�k"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Vis alle"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Legg til lagra s�k"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informasjon"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Feil"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Sp�rsm�l"
@@ -25695,11 +26719,21 @@ msgstr "Melding"
 msgid "Don't show this message again."
 msgstr "Ikkje vis denne meldinga att"
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "_S�k"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Finn no"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "T�m"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "T�m"
+
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Finn no"
 
@@ -25725,443 +26759,1023 @@ msgstr "init_corba(): klarte ikkje initialisere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 
-#~ msgid "Co_ntacts:"
-#~ msgstr "Ko_ntakter:"
+#~ msgid "Card: "
+#~ msgstr "Kort: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Namn: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Prefiks:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Fornamn:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Tillegg:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Etternamn:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Etterstaving:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "F�dselsdato: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Adresse:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postboks:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  Prefix:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Gateaddresse:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  By:          "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Region:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postnummer: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Land:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Leveringsetikett: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefonar:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefon:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "E-post:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "E-post:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Tidssone:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Geo Location: "
+#~ msgstr ""
+#~ "\n"
+#~ "Geo lokasjon: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "Forretningsrolle: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "Org: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Namn:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ " Eining: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ " Eining2: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ " Eining3: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ " Eining4: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kategoriar: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Merknad:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Unik streng:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Offentleg n�kkel: "
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Koplar til LDAP-tenar ..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Ventar p� � kople til LDAP-tenar ..."
+
+#~ msgid "New _Contact"
+#~ msgstr "Ny _kontakt"
+
+#~ msgid "New Contact _List"
+#~ msgstr "Ny kontakt_liste"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Rediger adressebok"
+
+#~ msgid "Account Name"
+#~ msgstr "Kontonamn"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Legg til adressebok"
 
-#~ msgid "_Message Recipients:"
-#~ msgstr "_Mottakarar:"
+#~ msgid "Advanced"
+#~ msgstr "Avansert"
 
-#~ msgid "Afghanistan"
-#~ msgstr "Afganistan"
+#~ msgid "Base"
+#~ msgstr "Base"
 
-#~ msgid "American Samoa"
-#~ msgstr "Amerikansk samoa"
+#~ msgid "Server Name"
+#~ msgstr "Tenarnamn"
 
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "Informasjon trengs for � legge til ei addressebok."
 
-#~ msgid "Angola"
-#~ msgstr "Angola"
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "Denne informasjonen er ikkje naudsynt for dei fleste ldap-tenarer."
 
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
+#~ 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 ""
+#~ "Denne informasjonen er brukt av ldap-tenaren for � spesifierse kva nodar som "
+#~ "skal brukast i s�ket. Kontakt tenaradmistratoren din for meir informasjon."
 
-#~ msgid "Antarctica"
-#~ msgstr "Antarktis"
+#~ msgid "_My server requires authentication"
+#~ msgstr "_Min tenar treng autentisering"
 
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "Antigua og Barbuda"
+#~ msgid "Other Contacts"
+#~ msgstr "Andre kontakter"
 
-#~ msgid "Armenia"
-#~ msgstr "Armenia"
+#~ msgid "Name contains"
+#~ msgstr "Namn inneheld"
 
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
+#~ msgid "(none)"
+#~ msgstr "(ingen)"
 
-#~ msgid "Azerbaijan"
-#~ msgstr "Aserbadjan"
+#~ msgid "C_ontaining:"
+#~ msgstr "I_nneheld:"
 
-#~ msgid "Bangladesh"
-#~ msgstr "Bangladesh"
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Vis kontakter som stemmer med desse kriteria:"
 
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Er du sikker p� at du vil\n"
+#~ " slette denne kontakta?"
 
-#~ msgid "Belarus"
-#~ msgstr "Kviterussland"
+#~ msgid "Starting:"
+#~ msgstr "Startar:"
 
-#~ msgid "Benin"
-#~ msgstr "Benin"
+#~ msgid "Ending:"
+#~ msgstr "Slutt:"
 
-#~ msgid "Bermuda"
-#~ msgstr "Bermuda"
+#~ msgid "Create a new appointment"
+#~ msgstr "Lag ein ny avtale"
 
-#~ msgid "Bhutan"
-#~ msgstr "Bhutan"
+#~ msgid "Create a new task"
+#~ msgstr "Opprett ei ny oppg�ve"
 
-#~ msgid "Bosnia And Herzegowina"
-#~ msgstr "Bosnia og Herzegovina"
+#~ msgid "New _Task"
+#~ msgstr "Ny oppg�ve"
 
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
+#, fuzzy
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "&Slett avtale"
 
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvet Island"
+#~ msgid "First day of wee_k:"
+#~ msgstr "F�rste ve_kedag:"
 
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Britisk Indisk sj�territorium"
+#~ msgid "_Other"
+#~ msgstr "_Anna"
 
-#~ msgid "British Virgin Islands"
-#~ msgstr "British Virgin Islands"
+#~ msgid "Click here to add an attendee"
+#~ msgstr "Klikke her for � leggje til ein deltakar"
 
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunei Darussalam"
+#~ msgid "0%"
+#~ msgstr "0%"
 
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
+#~ msgid "10%"
+#~ msgstr "10%"
 
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
+#~ msgid "20%"
+#~ msgstr "20%"
 
-#~ msgid "Cambodia"
-#~ msgstr "Kambodsja"
+#~ msgid "30%"
+#~ msgstr "30%"
 
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
+#~ msgid "40%"
+#~ msgstr "40%"
 
-#~ msgid "Cape Verde"
-#~ msgstr "Cape Verde"
+#~ msgid "50%"
+#~ msgstr "50%"
 
-#~ msgid "Central African Republic"
-#~ msgstr "Den Sentralafrikanske republikken"
+#~ msgid "60%"
+#~ msgstr "60%"
 
-#~ msgid "Chad"
-#~ msgstr "Tjad"
+#~ msgid "70%"
+#~ msgstr "70%"
 
-#~ msgid "China"
-#~ msgstr "Kina"
+#~ msgid "80%"
+#~ msgstr "80%"
 
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Cocos (Keeling) Islands"
+#~ msgid "90%"
+#~ msgstr "90%"
 
-#~ msgid "Comoros"
-#~ msgstr "Comoros"
+#~ msgid "100%"
+#~ msgstr "100%"
 
-#~ msgid "Congo"
-#~ msgstr "Kongo"
+#~ msgid "_Delete this Task"
+#~ msgstr "Slett _denne oppg�va"
 
-#~ msgid "Cook Islands"
-#~ msgstr "Cook Islands"
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "M�tet byrjar: <b>"
 
-#~ msgid "Cote d'Ivoire"
-#~ msgstr "Cote d'Ivoire"
+#~ msgid "Task begins: <b>"
+#~ msgstr "Oppg�va byrjar: <b>"
 
-#~ msgid "Djibouti"
-#~ msgstr "Djibouti"
+#, fuzzy
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Informasjon"
 
-#~ msgid "Dominica"
-#~ msgstr "Dominica"
+#~ msgid "Begins: <b>"
+#~ msgstr "Byrjar: <b>"
 
-#~ msgid "East Timor"
-#~ msgstr "Aust-timor"
+#, fuzzy
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Informasjon"
 
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Ekvatorial Guinea"
+#, fuzzy
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Informasjon"
 
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
+#~ msgid "Ends: <b>"
+#~ msgstr "Sluttar: <b>"
 
-#~ msgid "Ethiopia"
-#~ msgstr "Etiopia"
+#, fuzzy
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Ferdig"
 
-#~ msgid "Falkland Islands"
-#~ msgstr "Falklands�yane"
+#~ msgid "Task Due: <b>"
+#~ msgstr "Oppg�va ferdig: <b>"
 
-#~ msgid "Faroe Islands"
-#~ msgstr "F�r�yane"
+#, fuzzy
+#~ msgid "iCalendar Information"
+#~ msgstr "Informasjon"
 
-#~ msgid "Fiji"
-#~ msgstr "Fiji"
+#, fuzzy
+#~ msgid "iCalendar Error"
+#~ msgstr "Skriv ut alle"
 
-#~ msgid "French Guiana"
-#~ msgstr "French Guiana"
+#~ msgid "An unknown person"
+#~ msgstr "Ein ukjent person"
 
-#~ msgid "French Polynesia"
-#~ msgstr "French Polynesia"
+#~ 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 "French Southern Territories"
-#~ msgstr "Fransk s�rleg territoriar"
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ingen</i>"
 
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
+#~ msgid "Choose an action:"
+#~ msgstr "Vel ei handling:"
 
-#~ msgid "Gambia"
-#~ msgstr "Gambia"
+#~ msgid "Update"
+#~ msgstr "Oppdater"
 
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
+#~ msgid "Accept"
+#~ msgstr "Godta"
 
-#~ msgid "Greenland"
-#~ msgstr "Gr�nland"
+#, fuzzy
+#~ msgid "Tentatively accept"
+#~ msgstr "Mellombels"
 
-#~ msgid "Grenada"
-#~ msgstr "Grenada"
+#~ msgid "Decline"
+#~ msgstr "Avsl�"
 
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
+#, fuzzy
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Informasjon"
 
-#~ msgid "Guam"
-#~ msgstr "Guam"
+#~ msgid "Update respondent status"
+#~ msgstr "Opdat�r status p� svar"
 
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
+#, fuzzy
+#~ msgid "Send Latest Information"
+#~ msgstr "Informasjon"
 
-#~ msgid "Guinea-bissau"
-#~ msgstr "Guinea-bissau"
+#, fuzzy
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "generer avlusingsinformasjon"
 
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
+#, fuzzy
+#~ msgid "Meeting Information"
+#~ msgstr "Personleg informasjon"
 
-#~ msgid "Heard And McDonald Islands"
-#~ msgstr "Heard And McDonald Islands"
+#~ 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 "Holy See"
-#~ msgstr "Den heilage sj�"
+#~ msgid "Meeting Proposal"
+#~ msgstr "M�teframlegg"
 
-#~ msgid "Indonesia"
-#~ msgstr "Indonesia"
+#~ msgid "Meeting Update"
+#~ msgstr "M�teoppdatering"
 
-#~ msgid "Israel"
-#~ msgstr "Israel"
+#, fuzzy
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ msgstr "generer avlusingsinformasjon"
 
-#~ msgid "Kazakhstan"
-#~ msgstr "Kasakstan"
+#, fuzzy
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "Dette er ei repeterande hending."
 
-#~ msgid "Kenya"
-#~ msgstr "Kenya"
+#~ msgid "Meeting Reply"
+#~ msgstr "M�tesvar"
 
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
+#~ msgid "Meeting Cancellation"
+#~ msgstr "M�tekansellering"
 
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgistan"
+#, fuzzy
+#~ msgid "Bad Meeting Message"
+#~ msgstr "&Finn i melding ..."
 
-#~ msgid "Laos"
-#~ msgstr "Laos"
+#~ msgid "Task Information"
+#~ msgstr "Oppg�veinformasjon"
 
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
+#~ msgid "Task Proposal"
+#~ msgstr "Oppg�veframlegg"
 
-#~ msgid "Liechtenstein"
-#~ msgstr "Liechtenstein"
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> �nskjar � leggje til ei eksisterande oppg�ve."
 
-#~ msgid "Macau"
-#~ msgstr "Macau"
+#~ msgid "Task Update"
+#~ msgstr "Oppg�veoppdatering"
 
-#~ msgid "Macedonia"
-#~ msgstr "Makedonia"
+#, fuzzy
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "Dette er ei f�rehandsvising av det valte bakgrunnsbiletet."
 
-#~ msgid "Madagascar"
-#~ msgstr "Madagaskar"
+#~ msgid "Task Update Request"
+#~ msgstr "Oppg�veoppdateringsforep�rjing"
 
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
+#, fuzzy
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "Dette er ei repeterande hending."
 
-#~ msgid "Malaysia"
-#~ msgstr "Malaysia"
+#~ msgid "Task Reply"
+#~ msgstr "Oppg�vesvar"
 
-#~ msgid "Maldives"
-#~ msgstr "Maldivane"
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> har kansellert ei oppg�ve."
 
-#~ msgid "Mali"
-#~ msgstr "Mali"
+#~ msgid "Task Cancellation"
+#~ msgstr "Oppg�vekansellering"
 
-#~ msgid "Marshall Islands"
-#~ msgstr "Marshall Islands"
+#, fuzzy
+#~ msgid "Bad Task Message"
+#~ msgstr "Skriv ut alle"
 
-#~ msgid "Martinique"
-#~ msgstr "Martinique"
+#, fuzzy
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "Skriv avlusingsinformasjon"
 
-#~ msgid "Mauritania"
-#~ msgstr "Mauritania"
+#~ msgid "Free/Busy Information"
+#~ msgstr "Fri/ledig-informasjon"
 
-#~ msgid "Mauritius"
-#~ msgstr "Mauritius"
+#, fuzzy
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "Pr�v �%s --help� for meir informasjon\n"
 
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
+#~ msgid "Free/Busy Request"
+#~ msgstr "Fri/ledig foresp�rsel"
 
-#~ msgid "Micronesia"
-#~ msgstr "Mikronesia"
+#, fuzzy
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "Dette er ei repeterande hending."
 
-#~ msgid "Monaco"
-#~ msgstr "Monaco"
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Fri/Oppteke svar"
 
-#~ msgid "Mongolia"
-#~ msgstr "Mongolia"
+#, fuzzy
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Private meldingar"
 
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
+#, fuzzy
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Meldinga har ingen sendar"
 
-#~ msgid "Mozambique"
-#~ msgstr "Mozambique"
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
 
-#~ msgid "Myanmar"
-#~ msgstr "Myanmar"
+#, fuzzy
+#~ msgid "Event information"
+#~ msgstr "Informasjon"
 
-#~ msgid "Namibia"
-#~ msgstr "Namibia"
+#~ msgid "Task information"
+#~ msgstr "Informasjon om oppg�ve"
 
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
+#, fuzzy
+#~ msgid "Journal information"
+#~ msgstr "Personleg informasjon"
 
-#~ msgid "Nepal"
-#~ msgstr "Nepal"
+#, fuzzy
+#~ msgid "Free/Busy information"
+#~ msgstr "Informasjon"
 
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Nederlandske antillar"
+#, fuzzy
+#~ msgid "Calendar information"
+#~ msgstr "Informasjon"
 
-#~ msgid "New Caledonia"
-#~ msgstr "New Caledonia"
+#, fuzzy
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "Informasjon"
 
-#~ msgid "Niger"
-#~ msgstr "Niger"
+#, fuzzy
+#~ msgid "iCalendar information"
+#~ msgstr "Informasjon"
 
-#~ msgid "Nigeria"
-#~ msgstr "Nigeria"
+#~ msgid "Task"
+#~ msgstr "Oppg�ve"
 
-#~ msgid "Niue"
-#~ msgstr "Niue"
+#~ msgid "Status: %s"
+#~ msgstr "Status: %s"
 
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Northern Mariana Islands"
+#~ msgid "Percent Complete: %i"
+#~ msgstr "Prosent ferdig: %i"
 
-#~ msgid "Palau"
-#~ msgstr "Palau"
+#~ msgid "URL: %s"
+#~ msgstr "URL: %s"
 
-#~ msgid "Palestinian Territory"
-#~ msgstr "Palestina"
+#~ msgid "Categories: %s"
+#~ msgstr "Kategoriar %s"
 
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua New Guinea"
+#~ msgid "Contacts: "
+#~ msgstr "Kontaktar: "
 
-#~ msgid "Philippines"
-#~ msgstr "Fillipinene"
+#, fuzzy
+#~ msgid "Error hashing password."
+#~ msgstr "Feil ved tilleggjing av kort"
 
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairn"
+#, fuzzy
+#~ msgid "Invalid password."
+#~ msgstr "Ugyldig argument"
 
-#~ msgid "Republic Of Korea"
-#~ msgstr "Republic Of Korea"
+#, fuzzy
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Kunne ikkje lasta biletet '%1'\n"
 
-#~ msgid "Republic Of Moldova"
-#~ msgstr "Moldovia"
+#, fuzzy
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Kunne ikkje lasta biletet '%1'\n"
 
-#~ msgid "Reunion"
-#~ msgstr "Reunion"
+#, fuzzy
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#~ msgid "Russian Federation"
-#~ msgstr "Russland"
+#, fuzzy
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#~ msgid "Rwanda"
-#~ msgstr "Rwanda"
+#, fuzzy
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "Klarte ikkje � lagre signaturfil."
 
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "Saint Kitts And Nevis"
+#~ msgid "NT Login"
+#~ msgstr "NT Login"
 
-#~ msgid "Saint Lucia"
-#~ msgstr "Saint Lucia"
+#~ msgid "Server rejected username"
+#~ msgstr "Tenaren avslo brukarnamnet"
 
-#~ msgid "Saint Vincent And The Grena-dines"
-#~ msgstr "Saint Vincent And The Grena-dines"
+#, fuzzy
+#~ msgid "Could not get group list from server."
+#~ msgstr "Kunne ikkje starta underprosess."
 
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
+#, fuzzy
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#~ msgid "San Marino"
-#~ msgstr "San Marino"
+#, fuzzy
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Vidaresendt melding fr� %1"
 
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "Sao Tome And Principe"
+#, fuzzy
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ msgstr "Slett e-post fr� tenaren"
 
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
+#, fuzzy
+#~ msgid "Could not authenticate to KPOP server: %s"
+#~ msgstr "Kunne ikkje starta underprosess."
 
-#~ msgid "Seychelles"
-#~ msgstr "Seychellene"
+#, fuzzy
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
+#~ msgid "(Unknown)"
+#~ msgstr "(Ukjend)"
 
-#~ msgid "Solomon Islands"
-#~ msgstr "Solomon Islands"
+#~ msgid "Unexpected response from POP server: %s"
+#~ msgstr "Uventa svar fr� POP-tenaren: %s"
 
-#~ msgid "Somalia"
-#~ msgstr "Somalia"
+#, fuzzy
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "Vidaresendt melding fr� %1"
 
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "South Georgia And The South Sandwich Islands"
+#, fuzzy
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#~ msgid "Sri Lanka"
-#~ msgstr "Sri Lanka"
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Kan ikkje initialisera lokale variablar"
 
-#~ msgid "St. Helena"
-#~ msgstr "St. Helena"
+#, fuzzy
+#~ msgid "Select a service"
+#~ msgstr "Vel ei fil"
 
-#~ msgid "St. Pierre And Miquelon"
-#~ msgstr "St. Pierre And Miquelon"
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "Send ein e-post"
 
-#~ msgid "Sudan"
-#~ msgstr "Sudan"
+#, fuzzy
+#~ msgid "Run %s"
+#~ msgstr "URL: %s"
 
-#~ msgid "Svalbard And Jan Mayen Islands"
-#~ msgstr "Svalbard og Jan Mayen"
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "Lukk"
 
-#~ msgid "Swaziland"
-#~ msgstr "Swaziland"
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "Flytt denne mappa til ein annan plass"
 
-#~ msgid "Tajikistan"
-#~ msgstr "Tajikistan"
+#, fuzzy
+#~ msgid "page"
+#~ msgstr "Side"
 
-#~ msgid "Thailand"
-#~ msgstr "Thailand"
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#~ msgid "Togo"
-#~ msgstr "Togo"
+#, fuzzy
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr "Feil ved asting av %s"
 
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
+#, fuzzy
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "�ydelagd oppsettfil."
 
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Samandrag"
 
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "Trinidad og Tobago"
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "�ydelagd oppsettfil."
 
-#~ msgid "Tunisia"
-#~ msgstr "Tunisia"
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "�ydelagd oppsettfil."
 
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkmenistan"
+#, fuzzy
+#~ msgid "Test service"
+#~ msgstr "Estherville"
 
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "Turks And Caicos Islands"
+#, fuzzy
+#~ msgid "Update now"
+#~ msgstr "Oppdater"
 
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
+#, fuzzy
+#~ msgid "Update every "
+#~ msgstr "Oppdateringsfrekvens"
 
-#~ msgid "U.S. Virgin Islands"
-#~ msgstr "U.S. Virgin Islands"
+#, fuzzy
+#~ msgid "Needs Reply"
+#~ msgstr "Fri/Oppteke svar"
 
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "E-post lagrinsmappe (intern)"
 
-#~ msgid "United Arab Emirates"
-#~ msgstr "Forente Arabiske Emirater"
+#, fuzzy
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "Ny e-post_melding"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Lag vFolder fr� s�k"
+
+#, fuzzy
+#~ msgid "Mark as Needing Reply"
+#~ msgstr "M�tesvar"
+
+#, fuzzy
+#~ msgid "Mark as Not Needing Reply"
+#~ msgstr "M�tesvar"
+
+#, fuzzy
+#~ msgid "Filter on Mailing List"
+#~ msgstr "Fil alt i liste"
+
+#~ msgid "Default"
+#~ msgstr "Forvald"
+
+#~ msgid "Indexing:"
+#~ msgstr "Indekserar"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "Postkasseformat"
 
-#~ msgid "United Republic Of Tanzania"
-#~ msgstr "Tanzania"
+#~ msgid " (default)"
+#~ msgstr " (standard)"
 
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "United States Minor Outlying Islands"
+#~ 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"
+
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: innboks"
+
+#~ msgid "Account"
+#~ msgstr "Konto"
+
+#~ msgid "Composer"
+#~ msgstr "Meldingsskrivar"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Standard vidaresendingsstil er: "
+
+#~ msgid "Display"
+#~ msgstr "Vis"
+
+#~ msgid "Drafts"
+#~ msgstr "Kladd"
+
+#~ msgid "Edit..."
+#~ msgstr "Rediger ..."
+
+#~ msgid "HTML signature file:"
+#~ msgstr "HTML-signaturfil:"
+
+#~ msgid "News"
+#~ msgstr "Nyhende"
+
+#, fuzzy
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Signaturfil:"
+
+#~ msgid "Sent"
+#~ msgstr "Sendt"
+
+#~ msgid "Sources"
+#~ msgstr "Kjelder"
+
+#, fuzzy
+#~ msgid "_Email Address:"
+#~ msgstr "E-post-adresse:"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "_Loggf�r filterhandlingar til:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organisasjon:"
+
+#, fuzzy
+#~ msgid "_Remember this password"
+#~ msgstr "Fjern denne oppf�ringa"
+
+#, fuzzy
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Send meldingar:"
+
+#~ msgid "_Server Type: "
+#~ msgstr "_Tenartype: "
+
+#~ msgid "_Signature file:"
+#~ msgstr "_Signaturfil:"
+
+#, fuzzy
+#~ msgid "placeholder"
+#~ msgstr "Bruk &plasshaldarar"
+
+#~ msgid "seconds."
+#~ msgstr "sekund."
+
+#, fuzzy
+#~ msgid "Mail Summary"
+#~ msgstr "Postsamandrag"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Kan ikkje initialisera lokale variablar"
 
-#~ msgid "Uzbekistan"
-#~ msgstr "Usbekistan"
+#~ msgid "Regions"
+#~ msgstr "Omr�der"
 
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
+#~ msgid " F"
+#~ msgstr " F"
 
-#~ msgid "Wallis And Futuna Islands"
-#~ msgstr "Wallis And Futuna Islands"
+#~ msgid " C"
+#~ msgstr " C"
 
-#~ msgid "Western Sahara"
-#~ msgstr "Western Sahara"
+#~ msgid "knots"
+#~ msgstr "knop"
 
-#~ msgid "Zambia"
-#~ msgstr "Zambia"
+#~ msgid "kph"
+#~ msgstr "km/t"
 
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbabwe"
+#~ 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:"
+
+#, fuzzy
+#~ msgid "All _folders:"
+#~ msgstr "Alle kantar"
+
+#, fuzzy
+#~ msgid "All news _feeds:"
+#~ msgstr "&Alle felt"
+
+#, fuzzy
+#~ msgid "_Display folders:"
+#~ msgstr "Skjermkontrollerarar"
+
+#, fuzzy
+#~ msgid "_Display stations:"
+#~ msgstr "Visingsval:"
+
+#, fuzzy
+#~ msgid "_Displayed feeds:"
+#~ msgstr "Vist namn:"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution notes component."
+#~ msgstr "�ydelagd oppsettfil."
+
+#, fuzzy
+#~ 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)"
+
+#~ msgid "New List"
+#~ msgstr "Ny liste"
+
+#, fuzzy
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Feil ved opning"
+
+#, fuzzy
+#~ msgid "Create a New _Task"
+#~ msgstr "Lagar eit nytt dokument"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Lag ein _ny avtale"
+
+#, fuzzy
+#~ msgid "_Appointment..."
+#~ msgstr "Avtale"
+
+#, fuzzy
+#~ msgid "_Calendar Settings..."
+#~ msgstr "Skriftinnstillingar"
+
+#~ msgid "_Task..."
+#~ msgstr "_Oppg�ve ..."
+
+#~ msgid "New Message"
+#~ msgstr "Ny melding"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_Innstillingar for e-post ..."
+
+#~ msgid "Forward _Attached"
+#~ msgstr "Vidaresend som _vedlegg"
+
+#~ msgid "Forward _Inline"
+#~ msgstr "Vidaresend _innvevd"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "Vidaresend _sitert"
+
+#, fuzzy
+#~ msgid "_Apply Filters"
+#~ msgstr "Rediger fil"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Innstillingar for oppg�ver ..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Endre p� innstillingar for samandrag"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "Innstillingar for _samandrag ..."
+
+#~ msgid "Show All"
+#~ msgstr "Vis alle"
+
+#~ msgid "Sear_ch"
+#~ msgstr "_S�k"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "Ko_ntakter:"
+
+#~ msgid "_Message Recipients:"
+#~ msgstr "_Mottakarar:"
+
+#~ msgid "British Virgin Islands"
+#~ msgstr "British Virgin Islands"
+
+#~ msgid "Republic Of Korea"
+#~ msgstr "Republic Of Korea"
+
+#~ msgid "Republic Of Moldova"
+#~ msgstr "Moldovia"
 
 #~ msgid "Message %s not found."
 #~ msgstr "Melding %s ikkje funnen."
@@ -26178,9 +27792,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "on or before"
 #~ msgstr "p� eller f�r"
 
-#~ msgid "Special Folders"
-#~ msgstr "Spesialmapper"
-
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>Klarte ikkje � kontakte v�rtenaren</b></dd>"
 
diff --git a/po/no.po b/po/no.po
index f439fda322..390dacfd8b 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-04-01 21:58+0200\n"
+"POT-Creation-Date: 2002-05-07 15:46-0400\n"
 "PO-Revision-Date: 2002-04-01 22:10+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -30,7 +30,7 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importerer VCard-filer til Evolution."
 
 #: 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 "Lagre som"
 
@@ -40,7 +40,7 @@ msgid "Name"
 msgstr "Navn"
 
 #: 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-post"
 
@@ -56,7 +56,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/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -96,7 +96,7 @@ msgid "Home"
 msgstr "Hjemme"
 
 #: 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 "Organisasjon"
 
@@ -118,7 +118,7 @@ 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/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Faks p� arbeid"
 
@@ -128,7 +128,7 @@ msgstr "Faks i buss"
 
 #: 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/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
@@ -148,7 +148,7 @@ msgstr "Hjemme 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/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -156,55 +156,54 @@ msgstr "ISDN"
 #: 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:112
 msgid "Other"
 msgstr "Andre"
 
 #: 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/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Annen 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/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Persons�ker"
 
 #: 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/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/widgets/e-addressbook-view.c:355
+#: 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/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/widgets/e-addressbook-view.c:359
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-post 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 "Nettside"
 
@@ -213,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 "Avdeling"
 
@@ -222,7 +221,7 @@ msgid "Dep"
 msgstr "Avd"
 
 #: 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 "Kontor"
 
@@ -231,12 +230,12 @@ msgid "Off"
 msgstr "Av"
 
 #: 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 "Tittel"
 
 #: 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 "Yrke"
 
@@ -245,7 +244,7 @@ msgid "Prof"
 msgstr "Yrke"
 
 #: 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 "Leder"
 
@@ -258,7 +257,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: 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 "Kallenavn"
 
@@ -267,12 +266,12 @@ msgid "Nick"
 msgstr "Kallenavn"
 
 #: 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 "Ektefelle"
 
 #: 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 "Kommentar"
 
@@ -285,7 +284,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: 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 "Ledig-/opptatt-URL"
 
@@ -319,11 +318,11 @@ msgstr "Etternavn"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -344,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2738
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "S�ker..."
 
@@ -357,31 +356,31 @@ msgstr "Laster..."
 msgid "Error in search expression."
 msgstr "Feil i s�keuttrykk."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1129
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Legger til kort p� LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1232
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Fjerner kort fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1468
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Endrer kort fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2592
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
 msgid "Restarting search."
 msgstr "Starter s�k p� nytt."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2684
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Mottar s�keresultater fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2765
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
 msgid "Error performing search"
 msgstr "Feil ved utf�ring av s�k"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2789
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
 msgid "Could not parse query string"
 msgstr "Kunne ikke tolke streng i sp�rring"
 
@@ -423,299 +422,120 @@ msgid "A Bonobo control for displaying an address."
 msgstr "En Bonobo-kontroll for visning av en adresse."
 
 #: 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 "Eksempel p� Bonobo-kontroll som viser en adressebok."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Addressbook Settings"
+msgstr "Adressebok-kilder"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Addressbook Storages."
+msgstr "Konfigurasjonskontroll for evolutions adressebok-komponent."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Configuration control for the Evolution Addressbook."
 msgstr "Konfigurasjonskontroll for evolutions adressebok-komponent."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Kontroll som viser et minikort for Evolutions adressebok."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Directory Servers"
 msgstr "Katalogtjenere"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution adressebok minikort visning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Evolution komponent for h�ndtering av kontakter."
 
-#: 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 Minicard control"
 msgstr "Factory for minikort kontroll for adressebok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Factory for adressebokens adressevisning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the Addressbook's address popup"
 msgstr "Factory for adressebokens adressevisning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the configuration control for the Evolution Addressbook."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#, fuzzy
+msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 "Factory for konfigurasjonskontroll for evolutions adressebok-komponent."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory for eksempelkontroll for adressebok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid ""
-"This page can be used to configure access to directory servers using the "
-"LDAP protocol"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
+#, fuzzy
+msgid "This page can be used to configure Addressbook Settings"
+msgstr ""
+"Denne siden kan brukes til � konfigurere innstillinger for e-posth�ndtereren"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#, fuzzy
+msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 "Denne siden kan brukes til � konfigurere tilgang til katalogtjenere som "
 "bruker LDAP-protokollen."
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Mappe som inneholder kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP-tjener"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "LDAP-tjener s�mme inneholder kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:560
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:560
-#: ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: addressbook/gui/component/addressbook-config.c:238
-msgid "Edit Addressbook"
-msgstr "Rediger adressebok"
-
-#: 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 "A_utentiser med tjener og bruk:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Kontonavn"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Legg til adressebok"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Addressbook Sources"
-msgstr "Adressebok-kilder"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Avansert"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Basis"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Grunnleggende"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr "Sjekk om denne tjeneren krever at du autentiserer deg."
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "De_lete"
-msgstr "S_lett"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr "Distinguished name (DN)"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "E-post adresse"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
-msgstr ""
-"Evolution vil bruke �Distinguished Name� (DN) til � autentisere deg mot "
-"tjeneren"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolution vil bruke denne e-post adressen til � autentisere deg mot tjeneren"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr "En"
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "S�ke_basis:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
-msgstr "S�_keomr�de:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Tjenernavn:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
-msgstr "Under"
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Informasjonen under kreves for � legge til en adressebok."
-
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "Denne informasjonen kreves ikke for de fleste LDAP-tjenere."
-
-#: 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 ""
-"Denne informasjonen brukes av din LDAP-tjener for � spesifisere hvilke noder "
-"som brukes i et s�k. Kontakt din administrator for mer informasjon."
-
-#: 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 ""
-"Dette er basisnoden for alle dine s�k p� LDAP-tjeneren. Kontakt din "
-"administrator for mer informasjon."
-
-#: 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 ""
-"Dette er maksimalt antall kort som skal lastes ned. Hvis du setter dette "
-"tallet for h�yt vil adresseboken bli treg."
-
-#: 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."
-msgstr ""
-"Dette er metoden Evolution bruker for � autentisere deg. Merk at hvis du "
-"setter denne til �e-post-adresse� krever anonym tilgang til din LDAP-tjener."
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Dette er navnet p� tjeneren hvor din adressebok er lokalisert."
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "Dette er porten som din LDAP-tjener bruker."
-
-#: 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 ""
-"Dette navnet vil brukes til � identifisere din konto. Det brukes kun for "
-"visning p� skjermen."
-
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "Konton_avn:"
-
-#: 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:179
-msgid "_Add"
-msgstr "_Legg til"
-
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr "_Distinguished Name:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr "Grense for ne_dlasting"
-
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:189
-#: ui/evolution-addressbook.xml.h:37 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 "R_ediger"
-
-#: addressbook/gui/component/addressbook-config.glade.h:35
-msgid "_Email address:"
-msgstr "_E-post adresse:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Port:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "_Tjenernavn:"
-
-#: addressbook/gui/component/addressbook-factory.c:70
+#: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
 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:519
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke �pne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:528
+#: 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"
@@ -725,7 +545,7 @@ msgstr ""
 "at du har skrevet inn en ugyldig URI, eller at LDAP-tjeneren\n"
 "er nede"
 
-#: addressbook/gui/component/addressbook.c:533
+#: 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"
@@ -737,7 +557,7 @@ msgstr ""
 "m� du kompilere programmet fra kildekoden i CVS etter �\n"
 "ha hentet OpenLDAP fra lenken under.\n"
 
-#: addressbook/gui/component/addressbook.c:541
+#: 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."
@@ -745,54 +565,45 @@ msgstr ""
 "Kunne ikke �pne denne adresseboken. Vennligst sjekk at stien\n"
 "eksisterer og at du har rettigheter til � aksessere den."
 
-#: addressbook/gui/component/addressbook.c:649
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Skriv inn passord for %s (bruker %s)"
 
-#: addressbook/gui/component/addressbook.c:825
+#: addressbook/gui/component/addressbook.c:769
 msgid "Name begins with"
 msgstr "Navn begynner med"
 
-#: addressbook/gui/component/addressbook.c:826
+#: addressbook/gui/component/addressbook.c:770
 msgid "Email is"
 msgstr "E-post er"
 
-#: addressbook/gui/component/addressbook.c:827
+#: addressbook/gui/component/addressbook.c:771
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:828
+#: addressbook/gui/component/addressbook.c:772
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:829
+#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
 msgid "Advanced..."
 msgstr "Avansert..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1057
+#: addressbook/gui/component/addressbook.c:1001
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/component/addressbook.c:1139
+#: addressbook/gui/component/addressbook.c:1083
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren 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
@@ -841,6 +652,633 @@ msgstr "Deaktiver sp�rringer"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aktiver sp�rringer (Farlig!)"
 
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Kunne ikke koble til LDAP-tjener."
+
+#: addressbook/gui/component/addressbook-config.c:215
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Kunne ikke autentisere mot IMAP-tjener.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:235
+#, fuzzy
+msgid "Could not perform query on Root DSE"
+msgstr "Kunne ikke tolke streng i sp�rring"
+
+#: 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 ugjennomsiktig sporingsinformasjon:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1169
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
+
+#: addressbook/gui/component/addressbook-config.c:1613
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL er ikke st�ttet i denne versjonen av Evolution)"
+
+#: addressbook/gui/component/addressbook-config.c:1689
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Fullf�rt dato"
+
+#: addressbook/gui/component/ldap-config.glade.h:1
+#, fuzzy
+msgid "  S_how Supported Bases "
+msgstr "_S�k etter st�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 "<-Fjern"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+#, fuzzy
+msgid "1234"
+msgstr "123"
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "Adressebok-kilder"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+msgid "Always"
+msgstr "Alltid"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonym"
+
+#: 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 "Kobler til..."
+
+#: 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 "Ingen informasjon"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "S_lett"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "_Distinguished Name:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "E-post adresse:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+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 vil bruke denne e-post adressen til � autentisere deg mot tjeneren"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolution vil bruke denne e-post adressen til � autentisere deg mot tjeneren"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "F_inn"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Generelt"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+#, fuzzy
+msgid "LDAP Attribute"
+msgstr "LDAP-autentisering"
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Konfigurasjon"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Marger"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+msgid "Never"
+msgstr "Aldri"
+
+#: 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 "_Objekt"
+
+#: 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 "En"
+
+#: 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 " Gjenopprett forvalg"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr " Gjenopprett forvalg"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "S�_keomr�de:"
+
+#. 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 "S�ker"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Velg alle"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Slettet"
+
+#: 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 "Kildeinformasjon"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Kobler til tjener..."
+
+#: 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 "Pip ved visning av alarmer"
+
+#: addressbook/gui/component/ldap-config.glade.h:69
+msgid "Sub"
+msgstr "Under"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Ust�ttet schema"
+
+#: 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 ""
+"Dette er maksimalt antall kort som skal lastes ned. Hvis du setter dette "
+"tallet for h�yt vil adresseboken bli treg."
+
+#: 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 ""
+"Dette er metoden Evolution bruker for � autentisere deg. Merk at hvis du "
+"setter denne til �e-post-adresse� krever anonym tilgang til din LDAP-tjener."
+
+#: 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 ""
+"Dette navnet vil brukes til � identifisere din konto. Det brukes kun for "
+"visning p� skjermen."
+
+#: 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 "Distinguished name (DN)"
+
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+msgid "Using email address"
+msgstr "E-post adresse"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+msgid "Whenever Possible"
+msgstr "N�r mulig"
+
+#: 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:139
+msgid "_Add"
+msgstr "_Legg til"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "Legg til->"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Legg til handling"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Legg til handling"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Alltid"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Slett alle"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Vis"
+
+#: addressbook/gui/component/ldap-config.glade.h:111
+#, fuzzy
+msgid "_Distinguished Name (DN):"
+msgstr "Distinguished name (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 "Grense for ne_dlasting"
+
+#: 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
+#: 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 "R_ediger"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "R_ediger avtale"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution alarm"
+
+#: 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 "_Alternativer"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "Portnummer:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr " Gjenopprett forvalg"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "S�ke_basis:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Tjenernavn:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Utsett-tid (minutter)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Konto %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "kontakt-liste-redigering"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Ingen kort"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Kobler til %s p� nytt"
+
+#: 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 "Generelt"
+
+#: 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 "S�ker"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolution adressebok-komponent"
@@ -850,7 +1288,7 @@ msgid "Factory for the Addressbook's name selection interface"
 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:852
+#: 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
 msgid "Remove"
@@ -881,7 +1319,12 @@ msgstr "(%d ikke vist)"
 msgid "Unnamed Contact"
 msgstr "Kontakt uten navn:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:603
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Finn en kontakt"
+
+#: 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"
@@ -897,7 +1340,7 @@ msgstr ""
 "vennligst send en melding til Jon Trowbridge <trow@ximian.com> med en\n"
 "detaljert beskrivelse av omstendighetene rundt feilen. Takk."
 
-#: addressbook/gui/component/select-names/e-select-names.c:611
+#: 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"
@@ -909,31 +1352,40 @@ msgstr ""
 "Du vil kanskje m�tte avslutte og starte Evolution p� nytt for\n"
 "� rette opp dette problemet."
 
-#: addressbook/gui/component/select-names/e-select-names.c:693
+#: addressbook/gui/component/select-names/e-select-names.c:806
 msgid "Select Contacts from Addressbook"
 msgstr "Velg kontakter fra adresseboken"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "Inneh_older:"
+msgid "Select Names"
+msgstr "Velg navn"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "F_inn"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Slett kontakt?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Velg navn"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Hete kontakter"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Vis kontakter som m�ter f�lgende kriterier:"
+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 "_Flytt..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Mappe:"
 
@@ -994,11 +1446,6 @@ msgstr "Lagre _som:"
 msgid "Full _Name..."
 msgstr "Fullt _navn..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: mail/mail-config.glade.h:74
-msgid "General"
-msgstr "Generelt"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1043,12 +1490,11 @@ 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:707
-#: calendar/gui/e-calendar-table.c:1001 calendar/gui/e-day-view.c:3609
-#: filter/filter.glade.h:8 mail/folder-browser.c:1629
-#: mail/mail-config.glade.h:187 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: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
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -2099,14 +2545,6 @@ 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 kontakten?"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Slett kontakt?"
 
@@ -2140,7 +2578,7 @@ msgid "Edit Full"
 msgstr "Rediger alt"
 
 #: 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 "Fullt navn"
 
@@ -2355,99 +2793,23 @@ msgstr "Avansert s�k"
 msgid "Search"
 msgstr "S�k"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:136
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:139
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:369
+#: addressbook/gui/widgets/e-addressbook-model.c:370
 msgid "Error getting book view"
 msgstr "Feil under henting av bokvisning"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: 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 "Lagre som VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:313
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "�pne"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:1017
-#: ui/evolution-addressbook.xml.h:13
-msgid "Forward Contact"
-msgstr "Videresend kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1018
-msgid "Send Message to Contact"
-msgstr "Send melding til kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:317
-#: 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:65
-#: ui/my-evolution.xml.h:1
-msgid "Print"
-msgstr "Skriv ut"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:319
-#: addressbook/gui/widgets/e-addressbook-view.c:1021
-msgid "Print Envelope"
-msgstr "Skriv ut konvolutt"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-msgid "Copy to folder..."
-msgstr "Kopier til mappe..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:324
-#: addressbook/gui/widgets/e-addressbook-view.c:1026
-msgid "Move to folder..."
-msgstr "Flytt til mappe..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
-#: addressbook/gui/widgets/e-addressbook-view.c:1029
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: 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:2
-msgid "Copy"
-msgstr "Kopier"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1031
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:9
-msgid "Paste"
-msgstr "Lim inn"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:330
-#: addressbook/gui/widgets/e-addressbook-view.c:1032
-#: filter/libfilter-i18n.h:10 mail/mail-accounts.c:213
-#: 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-table-adapter.c:140
 #: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
@@ -2455,14 +2817,15 @@ msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1042
+#: shell/evolution-shell-component.c:1043
 msgid "Success"
 msgstr "Suksess"
 
 #: 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:1990
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1079
+#: 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
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -2471,7 +2834,7 @@ msgid "Repository offline"
 msgstr "Frakoblet lager"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1070
+#: shell/evolution-shell-component.c:1071
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
@@ -2489,9 +2852,9 @@ msgstr "Protokollen er ikke st�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
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2276
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: 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
 msgid "Cancelled"
 msgstr "Avbrutt"
 
@@ -2523,7 +2886,7 @@ 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:1436
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Feil ved fjerning av kort"
 
@@ -2546,86 +2909,186 @@ msgstr ""
 "vil\n"
 "vises p� skjermen. Vil du virkelig vise alle disse kortene?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:342
+#: addressbook/gui/widgets/e-addressbook-util.c:344
 msgid "Move card to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:346
 msgid "Copy card to"
 msgstr "Kopier kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Move cards to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:351
 msgid "Copy cards to"
 msgstr "Kopier kort til"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:331
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Klikk her for � legge til en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Prim�r telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Assistents telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Arbeidstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Telefon for tilbakeringing"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Hjemmetelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Arbeidsadresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Hjemmeadresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Hjemmetelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:351
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Annen telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 msgid "Other Address"
 msgstr "Annen 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Lagre som VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Ny kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_G� til mappe..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Importer..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_S�k etter kontakter"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Adressebok-kilder..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Innstillinger for _pilot..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Videresend kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Send melding til kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Skriv ut konvolutt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Copy to folder..."
+msgstr "Kopier til mappe..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Move to folder..."
+msgstr "Flytt til mappe..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: 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
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Aktiv visning"
+
+#. 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:940
 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"
 
@@ -2633,7 +3096,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:945
 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"
 
@@ -2650,7 +3113,7 @@ msgstr "og et annet kort."
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
@@ -2664,7 +3127,7 @@ msgstr ""
 "\n"
 "Dobbelklikk her for � opprette en ny kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
+#: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
 "\n"
 "\n"
@@ -2869,29 +3332,25 @@ msgstr "Skri_fttype..."
 msgid "Untitled appointment"
 msgstr "Avtale uten navn"
 
-#: 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:416 mail/message-list.c:684
+#: 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
 msgid "High"
 msgstr "H�y"
 
-#: 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:417 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
-#: 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:418 mail/message-list.c:682
+#: 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
 msgid "Low"
 msgstr "Lav"
 
 #. 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:419
 msgid "Undefined"
 msgstr "Udefinert"
 
@@ -2979,22 +3438,10 @@ msgstr "Alarm-tjeneste"
 msgid "Factory for the alarm notification service"
 msgstr "Factory for alarm-tjenesten"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-msgid "Starting:"
-msgstr "Starter:"
-
-#: 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 tid"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-msgid "Evolution Alarm"
-msgstr "Evolution alarm"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3034,7 +3481,7 @@ msgstr ""
 "for p�minnelse i stedet."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2583
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advarsel"
@@ -3084,7 +3531,7 @@ msgstr "Beskrivelse inneholder"
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1118
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "Ingen treff"
 
@@ -3095,7 +3542,7 @@ 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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1421 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3113,11 +3560,11 @@ msgstr "%d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1468
+#: 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:775
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3125,16 +3572,14 @@ msgstr ""
 "konfigurasjon."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:395
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:396
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:394
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Offentlig"
 
@@ -3155,32 +3600,27 @@ msgid "W"
 msgstr "V"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:468
 msgid "Free"
 msgstr "Ledig"
 
-#: 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:1064
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 msgid "Busy"
 msgstr "Opptatt"
 
 #: 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:2267
 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:490 calendar/gui/print.c:2270
 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-calendar-table.c:491 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2273
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Fullf�rt"
 
@@ -3196,11 +3636,10 @@ 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:1591
-#: mail/mail-account-gui.c:1035 mail/mail-account-gui.c:1036
-#: mail/mail-account-gui.c:1621 mail/mail-accounts.c:426
-#: mail/mail-accounts.c:435 mail/mail-config.glade.h:110
-#: mail/message-tag-followup.c:62
+#: 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
 #: 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
@@ -3217,21 +3656,13 @@ 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
 msgid "Yes"
 msgstr "Ja"
 
 #: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
 msgid "No"
 msgstr "Nei"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1695
-#: calendar/gui/e-week-view.c:1206
-msgid "Searching"
-msgstr "S�ker"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Dagvisning"
@@ -3248,8 +3679,8 @@ msgstr "Ukevisning"
 msgid "Month View"
 msgstr "M�nedsvisning"
 
-#: calendar/gui/component-factory.c:67 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3257,11 +3688,10 @@ msgstr "Kalender"
 msgid "Folder containing appointments and events"
 msgstr "Mappe som inneholder avtaler og hendelser"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/print.c:1754
-#: calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
-#: 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
+#: 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
 msgid "Tasks"
 msgstr "Oppgaver"
@@ -3270,47 +3700,52 @@ msgstr "Oppgaver"
 msgid "Folder containing to-do items"
 msgstr "Mappe som inneholder oppgaver"
 
-#: calendar/gui/component-factory.c:690
+#: calendar/gui/component-factory.c:695
 msgid "New meeting"
 msgstr "Nytt m�te"
 
-#: calendar/gui/component-factory.c:690
+#: calendar/gui/component-factory.c:695
 msgid "_Meeting"
 msgstr "_M�te"
 
-#: calendar/gui/component-factory.c:694
+#: calendar/gui/component-factory.c:699
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/component-factory.c:694
+#: calendar/gui/component-factory.c:699
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: calendar/gui/component-factory.c:698
+#: calendar/gui/component-factory.c:703
 msgid "New All Day Appointment"
 msgstr "Ny avtale for hele dagen"
 
-#: calendar/gui/component-factory.c:698
+#: calendar/gui/component-factory.c:703
 msgid "All _Day Appointment"
 msgstr "Avtale for hele _dagen"
 
-#: calendar/gui/component-factory.c:702
+#: calendar/gui/component-factory.c:707
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/component-factory.c:702
+#: calendar/gui/component-factory.c:707
 msgid "_Appointment"
 msgstr "_Avtale"
 
-#: calendar/gui/control-factory.c:103
+#: calendar/gui/control-factory.c:123
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Kunne ikke �pne mappen i �%s�"
 
-#: calendar/gui/control-factory.c:130
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "Endre visning til %s"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Alternativer for lyd-alarmer"
@@ -3375,9 +3810,7 @@ msgstr "ekstra ganger hver"
 msgid "hours"
 msgstr "timer"
 
-#: 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 "minutter"
 
@@ -3505,7 +3938,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.c:769 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -3534,7 +3967,7 @@ msgstr "slutt p� avtale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:221
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -3575,170 +4008,168 @@ msgid "Color for tasks due today"
 msgstr "Farge for oppgaver som g�r ut i dag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Opp_rett en ny avtale med standard p�minnelse"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Dager"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "F�rste dag i u_ken:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Timer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Mandag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Utg�tte oppga_ver:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "L�rdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
-msgstr "Vis tid for avtal_ers slutt i ukes- og m�nedsvisning"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "Vis uke_nummer i datonavigasjon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "S�_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:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "S�ndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Opp_gaver som g�r ut i dag:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "T_or"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "T_ir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Opp_gaver som g�r ut i dag:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "O_ppgaveliste"
 
-#: 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 "Torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Tid"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Tids_sone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Oppdeling a_v tid:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: 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 "Tirsdag"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Arbeidsuke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "Sp�r etter bekreftelse ved sletting _av oppf�ringer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "_Komprimer helger i m�nedsvisning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Vis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Generell"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul utf�rte oppgaver etter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Man"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Andre"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Utg�tte oppga_ver:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "L_�r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "O_ppgaveliste"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "Vis tid for avtal_ers slutt i ukes- og m�nedsvisning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Oppdeling a_v tid:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "f�r avtalen starter"
 
@@ -3804,23 +4235,23 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 
-#: 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 " til "
 
-#: 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 " (Fullf�rt "
 
-#: 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 "Fullf�rt "
 
-#: 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 " (Ferdig "
 
-#: 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 "Ferdig "
 
@@ -3852,8 +4283,8 @@ msgid "No summary"
 msgstr "Ingen sammendrag"
 
 #: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3801
-#: calendar/gui/e-week-view.c:3707 composer/e-msg-composer.c:956
+#: 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
 msgid "Save as..."
 msgstr "Lagre som..."
 
@@ -3915,7 +4346,7 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2224
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Avtale"
 
@@ -3982,7 +4413,7 @@ msgid "Pu_blic"
 msgstr "Of_fentlig"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Vis tid som"
 
@@ -4027,55 +4458,49 @@ msgstr "Deltaker"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Klikk her for � legge til en deltaker"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Vanlig navn"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegert fra"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegert til"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Spr�k"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Medlem"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:864
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Rolle"
 
-#: 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
+#: 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"
 msgstr "Status"
 
-#: 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:168
+#: 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
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
@@ -4098,28 +4523,98 @@ msgstr "_Inviter andre..."
 msgid "_Other Organizer"
 msgstr "Annen _organisator"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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 "de"
+
+#: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "p�"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+msgid "first"
+msgstr "f�rste"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "sekund"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "denne"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Nord"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "liste"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Annen faks"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr "de"
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr "gjentakelser"
 
@@ -4214,7 +4709,7 @@ msgid "Progress"
 msgstr "Fremdrift"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:766
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4226,15 +4721,19 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+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
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:812
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:55
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -4246,132 +4745,76 @@ msgstr "Sta_rt dato:"
 msgid "_Due Date:"
 msgstr "Fer_dig-dato:"
 
-#: calendar/gui/e-calendar-table.c:438
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:439
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:440
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:441
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:442
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:443
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:444
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:445
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:446
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:447
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:448
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2744
-#: calendar/gui/e-week-view.c:1846
+#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3583
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1602
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:40
+#: 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
 msgid "_Open"
 msgstr "_�pne"
 
-#: calendar/gui/e-calendar-table.c:974
+#: calendar/gui/e-calendar-table.c:973
 msgid "_Save as..."
 msgstr "_Lagre som..."
 
-#: calendar/gui/e-calendar-table.c:976 calendar/gui/e-day-view.c:3587
-#: calendar/gui/e-week-view.c:3442 calendar/gui/e-week-view.c:3475
-#: ui/evolution-addressbook.xml.h:42 ui/evolution-calendar.xml.h:30
+#: calendar/gui/e-calendar-table.c:974 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 "S_kriv ut..."
 
-#: calendar/gui/e-calendar-table.c:981 calendar/gui/e-day-view.c:3593
-#: calendar/gui/e-week-view.c:3481 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:978 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:983 calendar/gui/e-day-view.c:3595
-#: calendar/gui/e-week-view.c:3483 ui/evolution-addressbook.xml.h:35
+#: calendar/gui/e-calendar-table.c:979 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:985 calendar/gui/e-day-view.c:3559
-#: calendar/gui/e-day-view.c:3597 calendar/gui/e-week-view.c:3447
-#: calendar/gui/e-week-view.c:3485 ui/evolution-addressbook.xml.h:41
+#: calendar/gui/e-calendar-table.c:980 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 "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:990
+#: calendar/gui/e-calendar-table.c:984
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:985
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:994
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Merk som fullf�rt"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:987
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valgte oppgaver som fullf�rt"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "Sle_tt valgte oppgaver"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7366
-#: calendar/gui/e-week-view.c:4155
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: calendar/gui/e-calendar-table.c:1354
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Klikk for � legge til en oppgave"
 
@@ -4379,48 +4822,47 @@ msgstr "Klikk for � legge til en oppgave"
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1055
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Fullf�rt"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Fullf�rt dato"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Ferdig-dato"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Sluttdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Geografisk plassering"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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:16
-#: my-evolution/component-factory.c:48 shell/e-shell.c:661
-#: shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Oppgavesortering"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4454,443 +4896,170 @@ msgstr "%02i minutters oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1407
-#: 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:1434
+#: 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:632 calendar/gui/e-week-view.c:368
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:371
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3543
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "Ny _avtale"
 
-#: calendar/gui/e-day-view.c:3545 calendar/gui/e-week-view.c:3433
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: calendar/gui/e-day-view.c:3547 calendar/gui/e-week-view.c:3435
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 msgid "New Meeting"
 msgstr "Nytt m�te"
 
-#: calendar/gui/e-day-view.c:3549 calendar/gui/e-week-view.c:3437
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
 msgid "New Task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/e-day-view.c:3554 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: calendar/gui/e-day-view.c:3564 calendar/gui/e-week-view.c:3452
+#: 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 "G� _til i dag"
 
-#: calendar/gui/e-day-view.c:3566 calendar/gui/e-week-view.c:3454
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 msgid "_Go to Date..."
 msgstr "_G� til dato..."
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
+#: 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 "_Publiser ledig/opptatt-informasjon"
 
-#: calendar/gui/e-day-view.c:3576 calendar/gui/e-week-view.c:3464
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
 #: ui/evolution.xml.h:37
 msgid "_Configure..."
 msgstr "_Konfigurer..."
 
-#: calendar/gui/e-day-view.c:3585 calendar/gui/e-week-view.c:3473
-#: mail/folder-browser.c:1604 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+msgid "_Configure Pilot..."
+msgstr "_Konfigurer..."
+
+#: 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
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: calendar/gui/e-day-view.c:3602 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp m�te..."
 
-#: calendar/gui/e-day-view.c:3604 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3499
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "Gj�r denne hendelsen _flyttbar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3501
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3503
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: calendar/gui/e-itip-control.c:556
-msgid "Meeting begins: <b>"
-msgstr "M�te starter: <b>"
-
-#: calendar/gui/e-itip-control.c:561
-msgid "Task begins: <b>"
-msgstr "Oppgave starter: <b>"
-
-#: calendar/gui/e-itip-control.c:566
-msgid "Free/Busy info begins: <b>"
-msgstr "Ledig/opptatt-informasjon starter: <b>"
-
-#: calendar/gui/e-itip-control.c:570
-msgid "Begins: <b>"
-msgstr "Starter: <b>"
-
-#: calendar/gui/e-itip-control.c:582
-msgid "Meeting ends: <b>"
-msgstr "M�te slutter: <b>"
-
-#: calendar/gui/e-itip-control.c:585
-msgid "Free/Busy info ends: <b>"
-msgstr "Ledig/opptatt-informasjon slutter: <b>"
-
-#: calendar/gui/e-itip-control.c:589
-msgid "Ends: <b>"
-msgstr "Slutter: <b>"
-
-#: calendar/gui/e-itip-control.c:603
-msgid "Task Completed: <b>"
-msgstr "Oppgave fullf�rt: <b>"
-
-#: calendar/gui/e-itip-control.c:613
-msgid "Task Due: <b>"
-msgstr "Oppgave ferdig: <b>"
-
-#: calendar/gui/e-itip-control.c:650 calendar/gui/e-itip-control.c:699
-msgid "iCalendar Information"
-msgstr "iCalendar-informasjon"
-
-#. Title
-#: calendar/gui/e-itip-control.c:665
-msgid "iCalendar Error"
-msgstr "iCalender-feil"
-
-#: calendar/gui/e-itip-control.c:730 calendar/gui/e-itip-control.c:746
-msgid "An unknown person"
-msgstr "En ukjent person"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:753
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
-"<br>Vennligst sjekk f�lgende informasjon og velg s� en handling fra menyen "
-"under."
-
-#: calendar/gui/e-itip-control.c:769
-msgid "<i>None</i>"
-msgstr "<i>Ingen</i>"
-
-#: calendar/gui/e-itip-control.c:781
-msgid "Status:"
-msgstr "Status:"
-
-#: calendar/gui/e-itip-control.c:786 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
-msgid "Accepted"
-msgstr "Godtatt"
-
-#: calendar/gui/e-itip-control.c:790 calendar/gui/itip-utils.c:326
-msgid "Tentatively Accepted"
-msgstr "Akteptert tentativt"
+"GNOME pilot verkt�yene ser ikke ut til � v�re installert p� dette systemet."
 
-#: calendar/gui/e-itip-control.c:794 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
-msgid "Declined"
-msgstr "Avsl�tt"
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
+#, c-format
+msgid "Error executing %s."
+msgstr "Feil under kj�ring av %s."
 
-#: calendar/gui/e-itip-control.c:798 calendar/gui/e-itip-control.c:997
-#: calendar/gui/e-itip-control.c:1068 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: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
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:318
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/e-itip-control.c:844 calendar/gui/e-itip-control.c:860
-#: calendar/gui/e-itip-control.c:876 calendar/gui/e-itip-control.c:889
-#: calendar/gui/e-itip-control.c:902 calendar/gui/e-itip-control.c:915
-msgid "Choose an action:"
-msgstr "Velg en handling:"
-
-#: calendar/gui/e-itip-control.c:845
-msgid "Update"
-msgstr "Oppdater"
-
-#: calendar/gui/e-itip-control.c:846 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:917
-#: shell/e-shell.c:1980 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:861
-msgid "Accept"
-msgstr "Godta"
-
-#: calendar/gui/e-itip-control.c:862
-msgid "Tentatively accept"
-msgstr "Godta tentativt"
-
-#: calendar/gui/e-itip-control.c:863
-msgid "Decline"
-msgstr "Avsl�"
-
-#: calendar/gui/e-itip-control.c:877
-msgid "Send Free/Busy Information"
-msgstr "Send ledig/opptatt-informasjon"
-
-#: calendar/gui/e-itip-control.c:890
-msgid "Update respondent status"
-msgstr "Oppdater status for respondent"
-
-#: calendar/gui/e-itip-control.c:903
-msgid "Send Latest Information"
-msgstr "Send siste informasjon"
-
-#: calendar/gui/e-itip-control.c:916 calendar/gui/itip-utils.c:343
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: calendar/gui/e-itip-control.c:964
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> har publisert m�teinformasjon."
-
-#: calendar/gui/e-itip-control.c:965
-msgid "Meeting Information"
-msgstr "M�teinformasjon"
-
-#: calendar/gui/e-itip-control.c:969
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> foresp�r din tilstedev�relse i et m�te."
-
-#: calendar/gui/e-itip-control.c:970
-msgid "Meeting Proposal"
-msgstr "M�teforslag"
-
-#: calendar/gui/e-itip-control.c:974
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "<b>%s</b> �nsker � legge til informasjon i et eksisterende m�te."
-
-#: calendar/gui/e-itip-control.c:975
-msgid "Meeting Update"
-msgstr "M�teoppdatering"
-
-#: calendar/gui/e-itip-control.c:979
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> �nsker � motta seneste m�teinformasjon."
-
-#: calendar/gui/e-itip-control.c:980
-msgid "Meeting Update Request"
-msgstr "Foresp�rsel om m�teoppdatering"
-
-#: calendar/gui/e-itip-control.c:1003
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> har svart p� en m�teforesp�rsel."
-
-#: calendar/gui/e-itip-control.c:1004
-msgid "Meeting Reply"
-msgstr "M�tesvar"
-
-#: calendar/gui/e-itip-control.c:1008
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> har avlyst et m�te."
-
-#: calendar/gui/e-itip-control.c:1009
-msgid "Meeting Cancellation"
-msgstr "M�teavlysing"
-
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1119
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> har sendt en uforst�elig melding."
-
-#: calendar/gui/e-itip-control.c:1014
-msgid "Bad Meeting Message"
-msgstr "Ugyldig m�temelding"
-
-#: calendar/gui/e-itip-control.c:1034
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> har publisert informasjon om en oppgave."
-
-#: calendar/gui/e-itip-control.c:1035
-msgid "Task Information"
-msgstr "Oppgaveinformasjon"
-
-#: calendar/gui/e-itip-control.c:1039
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> foresp�r at du utf�rer en oppgave."
-
-#: calendar/gui/e-itip-control.c:1040
-msgid "Task Proposal"
-msgstr "Foresp�rsel om oppgave"
-
-#: calendar/gui/e-itip-control.c:1044
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b>%s</b> �nsker � legge til informasjon i en eksisterende oppgave."
-
-#: calendar/gui/e-itip-control.c:1045
-msgid "Task Update"
-msgstr "Oppgaveoppdatering"
-
-#: calendar/gui/e-itip-control.c:1049
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> �nsker � motta den seneste informasjon om oppgaven."
-
-#: calendar/gui/e-itip-control.c:1050
-msgid "Task Update Request"
-msgstr "Foresp�rsel om oppgaveoppdatering"
-
-#: calendar/gui/e-itip-control.c:1074
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> har svart p� en oppgavetildeling."
-
-#: calendar/gui/e-itip-control.c:1075
-msgid "Task Reply"
-msgstr "Svar p� oppgave"
-
-#: calendar/gui/e-itip-control.c:1079
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> har avlyst en oppgave."
-
-#: calendar/gui/e-itip-control.c:1080
-msgid "Task Cancellation"
-msgstr "Avlysning av oppgave"
-
-#: calendar/gui/e-itip-control.c:1085
-msgid "Bad Task Message"
-msgstr "Ugyldig oppgavemelding"
-
-#: calendar/gui/e-itip-control.c:1104
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> har publisert ledig/opptatt-informasjon."
-
-#: calendar/gui/e-itip-control.c:1105
-msgid "Free/Busy Information"
-msgstr "Ledig/opptatt-informasjon"
-
-#: calendar/gui/e-itip-control.c:1109
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> foresp�r din ledig/opptatt-informasjon."
-
-#: calendar/gui/e-itip-control.c:1110
-msgid "Free/Busy Request"
-msgstr "Ledig/opptatt foresp�rsel"
-
-#: calendar/gui/e-itip-control.c:1114
-#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> har svart p� en foresp�rsel etter ledig/opptatt-informasjon."
-
-#: calendar/gui/e-itip-control.c:1115
-msgid "Free/Busy Reply"
-msgstr "Ledig/opptatt svar"
-
-#: calendar/gui/e-itip-control.c:1120
-msgid "Bad Free/Busy Message"
-msgstr "Ugyldig ledig/opptatt-melding"
-
-#: calendar/gui/e-itip-control.c:1193
-msgid "The message does not appear to be properly formed"
-msgstr "Meldingen ser ikke ut til � v�re riktig utformet"
-
-#: calendar/gui/e-itip-control.c:1212
-msgid "The message contains only unsupported requests."
-msgstr "Denne meldingen inneholder foresp�rsler som ikke er st�ttet."
-
-#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1246
-msgid "The attachment does not contain a valid calendar message"
-msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
-
-#: calendar/gui/e-itip-control.c:1271
-msgid "The attachment has no viewable calendar items"
-msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
-
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1564
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke oppdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Oppdatering fullf�rt\n"
 
-#: calendar/gui/e-itip-control.c:1446
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"Deltakerstatus kan ikke oppdateres fordi oppf�ringen ikke eksisterer lenger"
+
+#: calendar/gui/e-itip-control.c:1613
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Dette svaret er ikke fra en aktiv deltaker. Legg til som deltaker?"
 
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1638
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1474
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1476
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Deltakerstatus kan ikke oppdateres fordi oppf�ringen ikke eksisterer lenger"
-
-#: calendar/gui/e-itip-control.c:1504
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Fjerning fullf�rt"
 
-#: calendar/gui/e-itip-control.c:1534 calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Oppf�ring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1536 calendar/gui/e-itip-control.c:1588
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Oppf�ringen kunne ikke sendes!\n"
 
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Velg mappe"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Velg mappe"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4945,57 +5114,58 @@ 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:533
 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
 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
 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
 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
 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:535
 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
 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
 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:543
 msgid "Needs Action"
 msgstr "Trenger handling"
 
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+msgid "Accepted"
+msgstr "Godtatt"
+
+#: 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-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:434
 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
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -5100,29 +5270,39 @@ msgstr "Kunne ikke laste oppgavene i �%s�"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er n�dvendig for � laste �%s� er ikke st�ttet"
 
-#: calendar/gui/e-tasks.c:654
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Fullf�rt dato"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Sletter valgte objekter"
+
+#: calendar/gui/e-tasks.c:659
 msgid "Expunging"
 msgstr "T�mmer"
 
-#: calendar/gui/e-week-view.c:3431
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: calendar/gui/e-week-view.c:3497
+#: calendar/gui/e-week-view.c:3489
 msgid "_Delete this Appointment"
 msgstr "Sle_tt denne avtalen"
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke �pne mappen i �%s�"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som er n�dvendig for � �pne �%s� er ikke st�ttet"
 
-#: calendar/gui/gnome-cal.c:1879
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�pner kalender p� %s"
@@ -5191,38 +5371,6 @@ msgstr "Minst en deltaker kreves"
 msgid "An organizer must be set."
 msgstr "En organisator m� oppgis."
 
-#: calendar/gui/itip-utils.c:295
-msgid "Event information"
-msgstr "Hendelsesinformasjon"
-
-#: calendar/gui/itip-utils.c:297
-msgid "Task information"
-msgstr "Oppgaveinformasjon"
-
-#: calendar/gui/itip-utils.c:299
-msgid "Journal information"
-msgstr "Journalinformasjon"
-
-#: calendar/gui/itip-utils.c:301
-msgid "Free/Busy information"
-msgstr "Ledig/opptatt-informasjon"
-
-#: calendar/gui/itip-utils.c:303
-msgid "Calendar information"
-msgstr "Kalenderinformasjon"
-
-#: calendar/gui/itip-utils.c:339
-msgid "Updated"
-msgstr "Oppdatert"
-
-#: calendar/gui/itip-utils.c:347
-msgid "Refresh"
-msgstr "Oppdater"
-
-#: calendar/gui/itip-utils.c:351
-msgid "Counter-proposal"
-msgstr "Motforslag"
-
 #: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Du m� v�re en deltager i hendelsen."
@@ -5384,87 +5532,54 @@ msgid "Sa"
 msgstr "L�r"
 
 #. Day
-#: calendar/gui/print.c:1840
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valgt dag (%a %b %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 %b %d"
 
-#: 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 %b %d %Y"
 
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valgt uke (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1885
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Valgt m�ned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Valgt �r (%Y)"
 
-#: calendar/gui/print.c:2226
-msgid "Task"
-msgstr "Oppgave"
-
-#: calendar/gui/print.c:2283
-#, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
-
-#: calendar/gui/print.c:2301
-#, c-format
-msgid "Priority: %s"
-msgstr "Prioritet: %s"
-
-#: calendar/gui/print.c:2315
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Prosent fullf�rt: %i"
-
-#: calendar/gui/print.c:2327
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2341
-#, c-format
-msgid "Categories: %s"
-msgstr "Kategorier: %s"
-
-#: calendar/gui/print.c:2352
-msgid "Contacts: "
-msgstr "Kontakter: "
-
-#: calendar/gui/print.c:2407
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:2498 calendar/gui/print.c:2590
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2862
-#: my-evolution/e-summary.c:604 ui/evolution-addressbook.xml.h:20
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Forh�ndsvisning av utskrift"
 
-#: calendar/gui/print.c:2527
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Skriv ut oppf�ring"
 
-#: calendar/gui/print.c:2608
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
@@ -5491,8 +5606,8 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2358
-#: mail/mail-callbacks.c:2597
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "Ikke sp�r meg igjen."
 
@@ -5554,10 +5669,6 @@ msgstr "Importerer iCalendar-filer til Evolution"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importerer vCalendar-filer til Evolution"
 
-#: calendar/importers/icalendar-importer.c:424
-msgid "Reminder!!"
-msgstr "P�minnelse!!"
-
 #: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Hendlelser i kalenderen"
@@ -5574,90 +5685,90 @@ msgstr ""
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
-#: calendar/pcs/query.c:246
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "tid-n� forventer 0 argumenter"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "lag-tid forventer 1 argument"
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "lag-tid forventer at argument 1 er en streng"
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "argument 1 til make-time m� v�re en dato/tid streng p� ISO 8601 format"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "tid-add-day forventer 2 argumenter"
 
-#: 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 forventer at argument 1 er en 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 forventer at argument 2 er et heltall"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin forventer 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 forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end forventer 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 forventer at argument 1 er av type time_t"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype forventer 0 argumenter"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? forventer 2 argumenter"
 
-#: 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? forventer at argument 1 er av type 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 forventer at argument 2 er av type time_t"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "inneholder? forventer 2 argumenter"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? forventer at argument 1 er en streng"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? forventer at argument 2 er en streng"
 
-#: calendar/pcs/query.c:691
+#: 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 av �any�, �summary�, �description�"
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? forventer minst 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)"
@@ -5665,15 +5776,15 @@ msgstr ""
 "has-categories? forventer at alle argumenter er strenger eller ett, og kun "
 "ett, argument er den bolske verdien falsk (#f)"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? forventer 0 argumenter"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? forventer 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? forventer at argument 1 er en time_t"
 
@@ -7214,11 +7325,11 @@ msgstr "Kryptering er ikke st�ttet av dette cipheret"
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke st�ttet av dette cipheret"
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 msgid "Unable to create cache path"
 msgstr "Kunne ikke opprette sti til buffer"
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:441
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kunne ikke fjerne cache-oppf�ring: %s: %s"
@@ -7257,12 +7368,12 @@ msgstr "Du m� arbeide tilknyttet for � fullf�re denne operasjonen"
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1198
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1204
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under kj�ring av filter: %s: %s"
@@ -7276,7 +7387,6 @@ msgid "Unable to process spool folder"
 msgstr "Kan ikke prosessere spool-mappen"
 
 #: camel/camel-filter-driver.c:911
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter melding %d (%d%%)"
 
@@ -7289,16 +7399,16 @@ msgstr "Kan ikke �pne melding"
 msgid "Failed on message %d"
 msgstr "Feilet p� melding %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1050
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:1017
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter melding %d av %d"
 
-#: camel/camel-filter-driver.c:1032
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Feilet p� melding %d av %d"
@@ -7334,27 +7444,27 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(treff-alle) krever et enkelt bolsk resultat"
 
-#: camel/camel-folder-search.c:649
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Utf�rer sp�rring p� ukjent header: %s"
 
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Ust�ttet operasjon: legg til melding: for %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Ust�ttet operasjon: s�k etter uttrykk: etter %s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Ust�ttet operasjon: s�k p� uid: etter %s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Flytter meldinger"
 
@@ -7463,134 +7573,90 @@ msgstr "Vennligst skriv inn din %s passphrase for %s"
 msgid "Please enter your %s passphrase"
 msgstr "Vennligst skriv inn din %s passphrase"
 
-#: camel/camel-pgp-context.c:622
+#: camel/camel-pgp-context.c:621
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Kan ikke signere denne meldingen: ingen tekst � signere"
 
-#: camel/camel-pgp-context.c:629 camel/camel-pgp-context.c:803
+#: 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 meldingen: ingen passord oppgitt"
 
-#: camel/camel-pgp-context.c:635 camel/camel-pgp-context.c:809
+#: 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 ""
 "Kunne ikke signere denne meldingen: kunne ikke opprette r�r til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:796
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Kan ikke signere denne meldingen: ingen tekst for �clearsign�"
 
-#: camel/camel-pgp-context.c:988
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Kan ikke verifisere denne meldingen: ingen tekst � verifisere"
 
-#: camel/camel-pgp-context.c:994
+#: camel/camel-pgp-context.c:993
 #, 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"
+"Kunne ikke verifisere denne meldingen: kunne ikke opprette r�r til GPG/PGP: "
+"%s"
 
-#: camel/camel-pgp-context.c:1005
+#: camel/camel-pgp-context.c:1004
 #, 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"
+"Kunne ikke verifisere denne meldingen: kunne ikke opprette midlertidig fil: "
+"%s"
 
-#: camel/camel-pgp-context.c:1178
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Kan ikke kryptere denne meldingen: ingen tekst � kryptere"
 
-#: camel/camel-pgp-context.c:1188
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Kan ikke kryptere denne meldingen: ingen passord oppgitt"
 
-#: camel/camel-pgp-context.c:1195
+#: camel/camel-pgp-context.c:1194
 #, 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:1204
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Kan ikke kryptere denne meldingen: ingen mottakere oppgitt"
 
-#: camel/camel-pgp-context.c:1373
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Kan ikke dekryptere denne meldingen: ingen ciphertekst � dekryptere"
 
-#: camel/camel-pgp-context.c:1381
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Kan ikke dekryptere denne meldingen: ingen passord oppgitt"
 
-#: camel/camel-pgp-context.c:1388
+#: camel/camel-pgp-context.c:1387
 #, 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"
+"Kunne ikke dekryptere denne meldingen: kunne ikke opprette r�r til GPG/PGP: "
+"%s"
 
-#: camel/camel-pgp-mime.c:332
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt signert meldingsdel"
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Vennligst skriv inn ditt passord for %s"
-
-#: camel/camel-pkcs7-context.c:213
-msgid "Error hashing password."
-msgstr "Feil under hashing av passord."
-
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr "Ugyldig passord"
-
-#: camel/camel-pkcs7-context.c:329
-#, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Kunne ikke signere: fant ikke sertifikat for �%s�."
-
-#: camel/camel-pkcs7-context.c:378
-#, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Kunne uf�re �clearsign�: fant ikke sertifikat for �%s�."
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "Kunne ikke kryptere: feil under oppretting av konvolutert data."
-
-#: camel/camel-pkcs7-context.c:590
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "Kunne ikke kryptere: klarte ikke � opprette krypteringskontekst."
-
-#: camel/camel-pkcs7-context.c:620
-#, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Kunne ikke kryptere data: ugyldig n�kkel for bruker: �%s�."
-
-#: camel/camel-pkcs7-context.c:626
-msgid "Could not encrypt: encoding failed."
-msgstr "Kunne ikke kryptere: koding feilet."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr "Klarte ikke � dekryptere: Ukjent"
-
-#: 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 "Kunne ikke laste %s: Modullasting er ikke st�ttet p� dette systemet."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikke laste %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 "Kunne ikke laste %s: Ingen initieringskode i modulen."
@@ -7619,14 +7685,14 @@ msgstr "Kunne ikke koble til %s (port %d): %s"
 msgid "(unknown host)"
 msgstr "(ukjent vert)"
 
-#: camel/camel-remote-store.c:348 camel/camel-remote-store.c:410
-#: camel/camel-remote-store.c:471
+#: 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 "Operasjon avbrutt"
 
-#: camel/camel-remote-store.c:474
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7739,7 +7805,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar p� autentisering fra tjener."
 
@@ -7768,8 +7834,8 @@ msgstr ""
 "Authentication."
 
 #: 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:115
+#: 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"
 
@@ -7814,26 +7880,41 @@ msgstr "URL �%s� m� inneholde et vertsnavn"
 msgid "URL '%s' needs a path component"
 msgstr "URL �%s� m� inneholde en sti"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Finner: �%s�"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Feil i navneoppslag: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Vertsoppslag feilet: %s: vert ikke funnet"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Vertsoppslag feilet: %s: ukjent �rsak"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Finner: �%s�"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Vertsoppslag feilet: %s: vert ikke funnet"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Vertsoppslag feilet: %s: ukjent �rsak"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "E-post-tilbyder for virtuelle mapper"
@@ -7842,12 +7923,12 @@ msgstr "E-post-tilbyder for virtuelle mapper"
 msgid "For reading mail as a query of another set of folders"
 msgstr "For lesing av e-post som en sp�rring p� et annet sett med mapper"
 
-#: camel/camel-session.c: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 "Ingen tilbyder tilgjengelig for protokoll �%s�"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7856,6 +7937,11 @@ msgstr ""
 "Kan ikke opprette katalog %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Vennligst skriv inn ditt passord for %s"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Vennligst oppgi kallenavnet for et sertifikat du vil signere med."
@@ -7888,11 +7974,11 @@ msgstr "Feil under dekoding av melding."
 msgid "Failed to verify certificates."
 msgstr "Feil under verifisering av sertifikater."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finne mappe: Ugyldig operasjon p� dette lageret"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke opprette mappe: Ugyldig operasjon p� dette lageret"
 
@@ -7922,7 +8008,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:467
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7935,16 +8021,16 @@ msgstr ""
 "Fingeravtrykk      %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-ssl.c:473
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr "GODTATT"
 
-#: camel/camel-tcp-stream-ssl.c:473
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr "UGYLDIG"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:476
+#: camel/camel-tcp-stream-ssl.c:500
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7969,27 +8055,27 @@ msgstr "Kunne ikke tolke URL �%s�"
 msgid "No such message %s in %s"
 msgstr "Ingen slik melding %s i %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Ingen slik melding: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke endre navn p� mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke endre navn p� mappe: %s: Ingen slik mappe"
@@ -8022,52 +8108,52 @@ msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar �OK� fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke opprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "S�ker etter endrede meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformasjon for nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "S�ker etter nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:2145
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
-#: 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 "Kan ikke �pne cache-katalog: %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 "Feil under mellomlagring av melding %s: %s"
@@ -8111,31 +8197,31 @@ msgstr "For lesing og lagring av e-post p� IMAP-tjenere."
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
-"Dette valget vil la deg koble til en IMAP-tjener ved � bruke et klartekst-"
-"passord."
+"Dette valget vil la deg koble til en IMAP-tjener ved � bruke et "
+"klartekst-passord."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-tjener %s st�tter ikke etterspurt autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:528
+#: camel/providers/imap/camel-imap-store.c:529
 #: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen st�tte for autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVennligst skriv inn IMAP-passord for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap/camel-imap-store.c:568
 #: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8146,56 +8232,57 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Opphavsmappen tillates ikke � ha undermapper"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "E-postkataloger i MH-format"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 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:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Lokal levering"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 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:63
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "E-postkataloger i maildir-format"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 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:80
+#: 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:81
+#: camel/providers/local/camel-local-provider.c:101
 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:91
+#: camel/providers/local/camel-local-provider.c:116
 msgid "Directory tree of mbox files"
 msgstr "Katalogtree av mbox-filer"
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8210,7 +8297,7 @@ 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:110
+#: camel/providers/local/camel-spoold-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrot %s er ikke en absolutt sti"
@@ -8236,17 +8323,22 @@ msgstr "Lokalt lager har ikke en innboks"
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:864
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke endre navn p� mappe %s til %s: %s"
 
-#: camel/providers/local/camel-local-store.c:375
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Kunne ikke endre navn p� mappe `%s': %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kunne ikke slette sammendragsfil for mappe �%s�: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-local-store.c:389
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe �%s�: %s"
@@ -8257,7 +8349,7 @@ 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:1160
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke legge til melding i sammendraget: ukjent grunn"
 
@@ -8298,7 +8390,7 @@ msgstr "Ingen slik melding"
 msgid "Invalid message contents"
 msgstr "Ugyldig meldingsinnhold"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8308,14 +8400,14 @@ msgstr ""
 "Kan ikke �pne mappe �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen �%s� eksisterer ikke."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8325,24 +8417,24 @@ msgstr ""
 "Kunne ikke opprette mappe �%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� er ikke en maildir katalog."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe �%s�: %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
-#: camel/providers/local/camel-maildir-store.c:331
-#: camel/providers/local/camel-spoold-store.c:252
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikke s�ke i mappe �%s�: %s"
@@ -8369,7 +8461,7 @@ msgstr "Ser etter nye meldinger"
 #: 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:938
+#: camel/providers/local/camel-spool-summary.c:945
 msgid "Storing folder"
 msgstr "Lagrer mappe"
 
@@ -8494,8 +8586,8 @@ msgstr "Kan ikke �pne midlertidig postboks: %s"
 #: 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:981
-#: camel/providers/local/camel-spool-summary.c:989
+#: 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"
 
@@ -8513,7 +8605,7 @@ 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:1039
+#: camel/providers/local/camel-spool-summary.c:1046
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
@@ -8530,7 +8622,7 @@ 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:1113
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
@@ -8565,7 +8657,7 @@ 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:141
-#: camel/providers/local/camel-spoold-store.c:147
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen �%s/%s� eksisterer ikke."
@@ -8575,31 +8667,31 @@ msgstr "Mappen �%s/%s� eksisterer ikke."
 msgid "Spool mail file %s"
 msgstr "Spool e-post-fil %s"
 
-#: camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spoold-store.c:192
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mapper kan ikke v�re gis nytt navn"
 
-#: camel/providers/local/camel-spool-store.c:217
-#: camel/providers/local/camel-spoold-store.c:200
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmapper kan ikke v�re slettes"
 
-#: camel/providers/local/camel-spool-summary.c:791
-#: camel/providers/local/camel-spool-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:809
+#: camel/providers/local/camel-spool-summary.c:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:824
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:854
-#: camel/providers/local/camel-spool-summary.c:872
-#: camel/providers/local/camel-spool-summary.c:884
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8608,80 +8700,25 @@ 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:943
+#: 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:116
+#: 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:161
+#: 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:172
+#: camel/providers/local/camel-spoold-store.c:173
 #, c-format
 msgid "Mail tree %s"
 msgstr "E-post-tre %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Vennligst skriv inn NNTP-passord for %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Tjeneren godtok ikke brukernavn"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Feil under sending av brukernavn til tjener"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Tjeneren godtok ikke brukernavn/passord"
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Intern feil: uid i ugyldig format: %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 "Kan ikke hente melding %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 "Bruker avbr�t"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Kunne ikke hente gruppeliste fra tjeneren."
-
-#: 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 "Kunne ikke laste gruppelistefil for %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Kunne ikke lagre gruppelistefil for %s: %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET news"
@@ -8692,12 +8729,12 @@ msgstr ""
 "Dette er en tilbyder for lesing av og posting av innlegg til USENET "
 "nyhetsgrupper."
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8740,32 +8777,47 @@ msgstr "Bruk avbryt"
 msgid "Operation failed: %s"
 msgstr "Operasjonen feilet: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Henter POP-sammendrag"
 
-#: 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 "Bruker avbr�t"
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Kan ikke hente POP-sammendrag: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:316
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Fjerner slettede meldinger"
 
-#: 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 "Ingen melding med 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 "Henter POP-melding %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 "Kan ikke hente melding %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
 msgid "Unknown reason"
 msgstr "Ukjent �rsak"
 
@@ -8782,7 +8834,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:114
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -8796,8 +8848,8 @@ msgid ""
 "is the only option supported by many POP servers."
 msgstr ""
 "Dette alternativet lar deg koble til POP-tjeneren ved bruk av passord i "
-"klartekst. Dette er det eneste alternativet som er st�ttet av mange POP-"
-"tjenere."
+"klartekst. Dette er det eneste alternativet som er st�ttet av mange "
+"POP-tjenere."
 
 #: camel/providers/pop3/camel-pop3-provider.c:81
 msgid ""
@@ -8857,7 +8909,8 @@ msgstr "I/U-feil: %s"
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sVennligst oppgi POP-passord for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:503
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8866,13 +8919,13 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil ved oversending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:593
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe �%s�."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8926,7 +8979,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:135
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9093,7 +9146,7 @@ msgstr "SMTP e-postlevering via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Sender melding"
 
@@ -9105,62 +9158,62 @@ msgstr "Kan ikke sende melding: ingen mottakere definert."
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan ikke sende melding: en eller flere ugyldige mottakere"
 
-#: camel/providers/smtp/camel-smtp-transport.c:837
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:863
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Tidsavbrudd for HELO-foresp�rsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:883
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Feil ved HELO-svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:931
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Feil under oppretting av SASL-autentiseringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:954
-#: camel/providers/smtp/camel-smtp-transport.c:966
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsavbrudd for AUTH-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "AUTH-foresp�rsel feilet."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1036
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar p� autentisering fra tjener.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1062
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for �MAIL FROM�-foresp�rsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1076
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "MAIL FROM response error"
 msgstr "Feil i �MAIL FROM�-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1101
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for �RCPT TO�-foresp�rsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1117
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> feilet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for DATA-foresp�rsel: %s: melding ikke sendt."
@@ -9168,36 +9221,36 @@ msgstr "Tidsavbrudd for DATA-foresp�rsel: %s: melding 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:1167
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 msgid "DATA response error"
 msgstr "Feil i DATA-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1207
-#: camel/providers/smtp/camel-smtp-transport.c:1225
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Tidsavbrudd for DATA-send: meldingsterminering: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1239
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 msgid "DATA termination response error"
 msgstr "Feil i DATA-termineringssvar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1262
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsavbrudd for RSET-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1276
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 msgid "RSET response error"
 msgstr "Feil i RSET-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1299
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Tidsavbrudd for QUIT-foresp�rsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 msgid "QUIT response error"
 msgstr "Feil i QUIT-svar"
 
@@ -9226,7 +9279,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:149
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -9270,52 +9323,52 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foresl� automatisk visning av vedlegg"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Klikk her for � f� opp adresseboken"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9328,7 +9381,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9337,34 +9390,34 @@ msgstr ""
 "Feil under lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:965
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: composer/e-msg-composer.c:969
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:991
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:1010
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:1041
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1049
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9373,7 +9426,7 @@ msgstr ""
 "Kunne ikke s�ke i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9382,7 +9435,7 @@ msgstr ""
 "Kunne ikke kutte av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9391,7 +9444,7 @@ msgstr ""
 "Feil under autolagring av av melding: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1174
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9399,7 +9452,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:1332
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9409,23 +9462,23 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Endret melding"
 
-#: composer/e-msg-composer.c:1362
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "�pne fil"
 
-#: composer/e-msg-composer.c:1511
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Sett inn fil"
 
-#: composer/e-msg-composer.c:2047 composer/e-msg-composer.c:2644
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2661
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9433,7 +9486,7 @@ msgstr ""
 "Kunne ikke opprette vindu for ny melding:\n"
 "Klarte ikke � aktivere kontroll for adressevelger."
 
-#: composer/e-msg-composer.c:2684 composer/e-msg-composer.c:2739
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9441,14 +9494,6 @@ msgstr ""
 "Kunne ikke opprette skrivevindu:\n"
 "Klarte ikke � aktivere HTML-redigeringskomponenten."
 
-#: composer/e-msg-composer.c:3464
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
-"<b>"
-msgstr ""
-"<b>(Meldingsredigering inneholder en meldingskropp som ikke er tekst, og "
-"derfor ikke kan redigeres.)"
-
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9509,8 +9554,8 @@ msgstr "Emne inneholder"
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2226
-#: mail/mail-display.c:119
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -9519,11 +9564,11 @@ msgstr ""
 "Overskriv den?"
 
 #. 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 "Husk dette passordet"
 
-#: 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 "Husk dette passordet for resten av denne sesjonen"
 
@@ -9621,169 +9666,6 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolution-komponent for sammendrag."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Factory for Evolutions sammendrag-komponent."
-
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Kan ikke initiere Evolutions sammendragskomponent."
-
-#: executive-summary/component/e-summary-callbacks.c:125
-msgid "Select a service"
-msgstr "Velg en tjeneste"
-
-#: 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 ""
-"Du kan velge en annen HTML-side som bakgrunn for sammendraget.\n"
-"\n"
-"Bare la den v�re blank som standard"
-
-#: 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 "�pne %s med standard GNOME applikasjon"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "�pne %s med standard GNOME nettleser"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Send en melding til %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Endre visning til %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Kj�r %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Lukk %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Flytt %s til venstre"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Flytt %s til h�yre"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Flytt %s til forrige rad"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Flytt %s til neste rad"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Konfigurer %s"
-
-#: executive-summary/component/e-summary-url.c:553
-msgid "page"
-msgstr "side"
-
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Kan ikke �pne HTML-fil:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Feil under lesing av data:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr "Filen har ikke en plass til tjenestene.\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 ""
-"Sammendragskomponenten kunne ikke initiere Bonobo.\n"
-"Hvis du s� en advarsel ang�ende RootPOA, betyr dette sannsynligvis\n"
-"at du kompilerte Bonobo mot GOAD i stedet for OAF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Factory RDF-sammendrag."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF-sammendrag"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Factory for test bonobo-komponent."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Factory for test-komponent."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Test bonobo-tjeneste"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Test-tjeneste"
-
-#: 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 "Feil"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "Oppdater automatisk"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "Oppdater n�"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "Oppdater hver(t)"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "�r"
@@ -9816,11 +9698,7 @@ msgstr "time"
 msgid "minute"
 msgstr "minutt"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "sekund"
-
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:224
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr " sekunder"
 
@@ -9916,7 +9794,7 @@ msgstr "S�"
 msgid "Add action"
 msgstr "Legg til handling"
 
-#: 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."
@@ -9924,19 +9802,11 @@ msgstr ""
 "Du glemte � velge en mappe.\n"
 "Vennligst g� tilbake og spesifiser en gyldig mappe for levering av e-post."
 
-#: 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:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Velg mappe"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Skriv inn URI for mappen"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<klikk her for � velge en mappe>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9946,7 +9816,7 @@ msgstr ""
 "Feil i regul�rt uttrykk �%s�:\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:45
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test"
 
@@ -9975,7 +9845,8 @@ msgid "if all criteria are met"
 msgstr "hvis alle kriterier er m�tt"
 
 #: filter/filter-rule.c:769
-msgid "if any criteria are met"
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "hvis et kriterie er m�tt"
 
 #: filter/filter-rule.c:780
@@ -10032,204 +9903,209 @@ msgstr "med alle lokale mapper"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Gi poeng"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Tilegn farge"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Gi poeng"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Vedlegg"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
 msgid "Beep"
 msgstr "Pip"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "inneholder"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Slettet"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "inneholder ikke"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "slutter ikke med"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "eksisterer ikke"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "ligner ikke"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "starter ikke med"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Eksisterer ikke"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Skisse"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "slutter med"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr "Kj�r skall-kommando"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Eksisterer"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "eksisterer"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "F�lg opp"
 
-#: filter/libfilter-i18n.h:25 mail/mail-config.c:74
-#: mail/mail-config.glade.h:82
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Viktig"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "er etter"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "er f�r"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr "er merket"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "er st�rre enn"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "er ikke"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr "er ikke merket"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "Meldingshode"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:39
 msgid "Play Sound"
 msgstr "Spill lyd"
 
-#: filter/libfilter-i18n.h:39 mail/message-tag-followup.c:58
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Les"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Mottakere"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "Treff p� vanlig uttrykk"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "Svart til"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Gi poeng"
 
-#: filter/libfilter-i18n.h:44 mail/mail-callbacks.c:1533
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Avsender"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Sett status"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "St�rrelse (kB)"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "lyder som"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Spesifikk header"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "starter med"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:53 mail/mail-format.c:938
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
 #: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Emne"
@@ -10238,11 +10114,11 @@ msgstr "Emne"
 msgid "Rules"
 msgstr "Regler"
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
@@ -10262,30 +10138,30 @@ msgstr "Du m� spesifisere minst en mappe som kilde."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gammel e-post fra 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 "Importerer..."
 
-#: 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 "Vennligst vent"
 
-#: 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 "Importerer %s som %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 "S�ker i %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:101
 msgid "Mail"
 msgstr "Post"
 
@@ -10313,23 +10189,74 @@ msgstr ""
 "Evolution har funnet GnomeCard filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Prioritet: %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 importerer dine gamle data fra Netscape"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "S�ppel"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Skanner IMAP-mappe"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "S�ker i katalog"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Starter import"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Rediger filtre"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10358,95 +10285,110 @@ msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Configuration control for the Evolution Mail Accounts."
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
 msgstr "Konfigurasjonskontroll for Evolution e-post-konti."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Konfigurasjonskontroll for Evolution e-post-konti."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
 msgid "Configuration control for the Evolution Mailer."
 msgstr "Konfigurasjonskontroll for Evolution e-posth�ndterer."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
 msgid "Configuration control for the Evolution Message Composer."
 msgstr "Konfigurasjonskontroll for Evolution meldingsredigering."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5 notes/GNOME_Evolution_Notes.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Evolution komponent for h�ndtering av e-post."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolutions e-postredigering."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Evolution e-post komponent for sammendrag."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Evolution komponent for e-post mappevisning."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Evolution komponent for e-postmappe factory."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Factory for Evolution meldingsredigering."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Factory for e-post sammendrag komponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Brukervalg for e-post"
+
+#: 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:13 mail/mail-config.glade.h:94
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "Grensesnitt for e-post-konfigurasjon"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#, fuzzy
+msgid "This Page can be used to configure the Fonts"
+msgstr "Denne siden kan brukes til � konfigurere meldingsredigering"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:18
 msgid "This page can be used to configure E-Mail Accounts"
 msgstr "Denne siden kan brukes til � konfigurere e-post-konti"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19
 msgid "This page can be used to configure Mailer preferences"
 msgstr ""
 "Denne siden kan brukes til � konfigurere brukervalg for e-posth�ndtereren"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
 msgid "This page can be used to configure the Composer"
 msgstr "Denne siden kan brukes til � konfigurere meldingsredigering"
 
-#: mail/component-factory.c:100
+#: mail/component-factory.c:101
 msgid "Folder containing mail"
 msgstr "Mappe som inneholder e-post"
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtuell s�ppel"
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Virtuelle s�ppelmappe"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Denne mappen kan ikke inneholde meldinger."
 
-#: mail/component-factory.c:401
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
-#: mail/component-factory.c:401
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Endre denne mappens egenskaper"
 
-#: mail/component-factory.c:764
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10454,227 +10396,223 @@ msgstr ""
 "Noen av dine innstillinger for e-post ser ut til � v�re korrupt. Vennligst "
 "sjekk at alt er i orden."
 
-#: mail/component-factory.c:923
+#: mail/component-factory.c:925
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
-#: mail/component-factory.c:965
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/component-factory.c:965 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:1001
+#: mail/component-factory.c:1003
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikke initiere Evolutions konfigurasjonskomponent for e-post."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
 
-#: mail/component-factory.c:1207 mail/component-factory.c:1238
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
 msgid "Connecting..."
 msgstr "Kobler til..."
 
-#: mail/component-factory.c:1248
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser-ui.c:343
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper for �%s�"
 
-#: mail/folder-browser-ui.c:345
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:300 mail/mail-display.c:331 mail/mail-display.c:840
+#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/folder-browser.c:755
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d nye"
 
-#: mail/folder-browser.c:758 mail/folder-browser.c:766
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d skjulte"
 
-#: mail/folder-browser.c:762
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr "%d synlig"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d valgt"
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendte"
 
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d sendt"
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1083
+#: mail/folder-browser.c:1088
 msgid "Create _Virtual Folder From Search..."
 msgstr "Lag _virtuell mappe fra s�k..."
 
-#: mail/folder-browser.c:1575
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "VFolder p� e_mne"
 
-#: mail/folder-browser.c:1576
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/folder-browser.c:1577
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/folder-browser.c:1578
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "VFolder p� e-post_liste"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtrer p� em_ne"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtrer p� sen_der"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filtrer p� motta_ker"
 
-#: mail/folder-browser.c:1585 mail/folder-browser.c:1917
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filtrer p� e-_postliste"
 
-#: mail/folder-browser.c:1603 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/folder-browser.c:1605
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1611 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1612
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1616
+#: mail/folder-browser.c:1622
 msgid "Follo_w Up..."
 msgstr "F�l_g opp..."
 
-#: mail/folder-browser.c:1617
+#: mail/folder-browser.c:1623
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullf�rt"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1624
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
 #. separator here?
-#: mail/folder-browser.c:1622 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1629
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1631
 msgid "_Mark as Unimportant"
 msgstr "_Merk som uviktig"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1636
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: mail/folder-browser.c:1634
+#: mail/folder-browser.c:1640
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/folder-browser.c:1635 ui/evolution-addressbook.xml.h:36
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/folder-browser.c:1639
+#: mail/folder-browser.c:1645
 msgid "Label"
 msgstr "Etikett"
 
-#: mail/folder-browser.c:1643
+#: mail/folder-browser.c:1649
 msgid "Add Sender to Address_book"
 msgstr "Legg til sender i adresse_bok"
 
-#: mail/folder-browser.c:1647
+#: mail/folder-browser.c:1653
 msgid "Appl_y Filters"
 msgstr "_P�f�r filtre"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1657
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
-#: mail/folder-browser.c:1918
+#: mail/folder-browser.c:1936
 msgid "VFolder on M_ailing List"
 msgstr "VFolder p� _e-postliste"
 
-#: mail/folder-browser.c:1920
+#: mail/folder-browser.c:1938
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrer _p� e-postliste (%s)"
 
-#: mail/folder-browser.c:1921
+#: mail/folder-browser.c:1939
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VFolder _p� e-postliste (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Forvalgt"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Henter mappeinformasjon"
@@ -10743,25 +10681,26 @@ msgstr "Evolution nyhetsredigerer"
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:52 mail/mail-config.glade.h:17
-msgid "Always"
-msgstr "Alltid"
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:53 mail/mail-config.glade.h:176
-msgid "Whenever Possible"
-msgstr "N�r mulig"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "Br_ukernavn:"
 
-#: mail/mail-account-gui.c:54 mail/mail-config.glade.h:107
-msgid "Never"
-msgstr "Aldri"
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "S_ti:"
 
-#: mail/mail-account-gui.c:1039 mail/mail-account-gui.c:1040
-#: mail/mail-account-gui.c:1283 mail/mail-account-gui.c:1288
-#: mail/mail-config.glade.h:127
+#: 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 "Tilfeldig"
 
-#: mail/mail-account-gui.c:1109 mail/mail-account-gui.c:1124
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
@@ -10769,63 +10708,46 @@ msgstr ""
 "Vennligst oppgi filnavn for signatur\n"
 "under avanserte innstillinger for signaturer."
 
-#: mail/mail-account-gui.c:1794
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
-#: mail/mail-accounts.c:210
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker p� at du vil slette denne kontoen?"
 
-#: mail/mail-accounts.c:214
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Ikke slett"
 
-#: mail/mail-accounts.c:217
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Vil du virkelig slette kontoen?"
 
-#: mail/mail-accounts.c:340 mail/mail-accounts.c:374
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: mail/mail-accounts.c:342 mail/mail-accounts.c:376
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
 msgid "Enable"
 msgstr "Aktiver"
 
-#: mail/mail-accounts.c:498 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:70
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+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:731 mail/mail-accounts.etspec.h:2
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: mail/mail-accounts.c:499 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Kontonavn"
 
-#: mail/mail-accounts.c:500 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Send til %s"
-
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Emne er %s"
-
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "E-post fra %s"
-
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "%s e-postliste"
-
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
@@ -10909,7 +10831,7 @@ msgstr "Du m� spesifisere mottakere for � kunne sende denne meldingen."
 msgid "You must configure an account before you can send this email."
 msgstr "Du m� konfigurere en konto f�r du kan sender denne meldingen."
 
-#: mail/mail-callbacks.c:616
+#: mail/mail-callbacks.c:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10917,28 +10839,28 @@ msgstr ""
 "Kunne ikke �pne skisse-mappen for denne kontoen.\n"
 "Vil du bruke standard skisse-mappe?"
 
-#: mail/mail-callbacks.c:962
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: mail/mail-callbacks.c:966
+#: mail/mail-callbacks.c:981
 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:1411 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:1413 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopier melding(er) til"
 
-#: mail/mail-callbacks.c:2070
+#: mail/mail-callbacks.c:2091
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker p� at du vil redigere alle %d meldingene?"
 
-#: mail/mail-callbacks.c:2095
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10946,7 +10868,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:2134
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10954,32 +10876,32 @@ msgstr ""
 "Du kan kun sende meldinger p� nytt\n"
 "som er lagret i sendt-katalogen."
 
-#: mail/mail-callbacks.c:2148
+#: mail/mail-callbacks.c:2169
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker p� at du vil sende alle %d meldingene p� nytt?"
 
-#: mail/mail-callbacks.c:2174
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Ingen melding valgt"
 
-#: mail/mail-callbacks.c:2219 mail/mail-display.c:115
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:2273
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:2275
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:2343
+#: mail/mail-callbacks.c:2366
 msgid "Go to next folder with unread messages?"
 msgstr "G� til neste mappe med uleste meldinger?"
 
-#: mail/mail-callbacks.c:2350
+#: mail/mail-callbacks.c:2373
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -10987,7 +10909,7 @@ msgstr ""
 "Ingen flere nye meldinger i denne mappen.\n"
 "Vil du g� til neste mappe?"
 
-#: mail/mail-callbacks.c:2590
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10999,7 +10921,7 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse meldingene?"
 
-#: mail/mail-callbacks.c:2700
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11008,28 +10930,28 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2712
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2755
+#: mail/mail-callbacks.c:2783
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: mail/mail-callbacks.c:2807
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:2834
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-letter"
 
-#: mail/mail-callbacks.c:2869
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#: mail/mail-callbacks.c:3052 mail/mail-callbacks.c:3092
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker p� at du vil �pne alle %d meldingene i separate vinduer?"
@@ -11086,36 +11008,31 @@ msgstr ""
 "under. Dette navnet blir kun brukt for visning p� skjermen."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:177
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
 msgid "Work"
 msgstr "Arbeid"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:116
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr "Personlig"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:167
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
 msgid "To Do"
 msgstr "Oppgaver"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:90
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr "Senere"
 
-#: mail/mail-config.c:631
-#, c-format
-msgid "Account %d"
-msgstr "Konto %d"
-
-#: mail/mail-config.c:2451
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -11126,45 +11043,40 @@ msgstr ""
 "%s\n"
 "Ingen snarvei vil bli opprettet."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2462
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Innboks"
-
-#: mail/mail-config.c:2712
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: mail/mail-config.c:2790 mail/mail-config.c:2794
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
-#: mail/mail-config.c:2991
+#: mail/mail-config.c:2999
 msgid "Unnamed"
 msgstr "Uten navn"
 
-#: mail/mail-config.c:3169
+#: mail/mail-config.c:3177
 msgid "Cannot execute signature script"
 msgstr "Kan ikke kj�re signaturskript"
 
 #: mail/mail-config.glade.h:1
-msgid "                        "
-msgstr "                        "
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " _Check for supported types "
-msgstr "_S�k etter st�ttede typer"
+#, fuzzy
+msgid " Edit "
+msgstr "Rediger"
 
 #: mail/mail-config.glade.h:3
-msgid " color"
-msgstr " farge"
+#, fuzzy
+msgid " New "
+msgstr "Ny"
 
 #: mail/mail-config.glade.h:4
-msgid "&lt;&lt; S_imple"
-msgstr "&lt;&lt; En_kel"
+msgid " _Check for supported types "
+msgstr "_S�k etter st�ttede typer"
 
 #: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of Evolution)"
@@ -11175,126 +11087,106 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL er ikke st�ttet i denne versjonen av evolution)"
 
 #: mail/mail-config.glade.h:7
-msgid "/home/rodo/cvs/evolution/mail/"
-msgstr ""
-
-#: mail/mail-config.glade.h:8
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "A_lltid krypter til meg selv ved sending av kryptert e-post"
 
-#: mail/mail-config.glade.h:9
-msgid "Account"
-msgstr "Konto"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: mail/mail-config.glade.h:11 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "H�ndtering av konti"
 
+#: mail/mail-config.glade.h:11
+msgid "Advanced Options"
+msgstr "Avanserte alternativer"
+
 #: mail/mail-config.glade.h:12
-msgid "Accounts"
-msgstr "Kontoer"
+msgid "Afrikaans"
+msgstr "Afrikaans"
 
 #: mail/mail-config.glade.h:13
-msgid "Ad_vanced &gt;&gt;"
-msgstr "Avansert &gt;&gt;"
+#, fuzzy
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "A_lltid krypter til meg selv ved sending av kryptert e-post"
 
 #: mail/mail-config.glade.h:14
-msgid "Add new signature"
-msgstr "Legg til ny signatur"
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
 
 #: mail/mail-config.glade.h:15
-msgid "Advanced Options"
-msgstr "Avanserte alternativer"
-
-#: mail/mail-config.glade.h:16
-msgid "Afrikaans"
-msgstr "Afrikaans"
+#, fuzzy
+msgid "Alwa_ys sign outgoing messages when using this account"
+msgstr "Alltid _signer utg�ende meldinger n�r denne kontoen brukes"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Alltid _blind karbonkopi (Bcc) til:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Alltid _karbonkopi (Cc) til:"
 
-#: mail/mail-config.glade.h:20
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "Alltid krypt_er til meg selv ved sending av kryptert e-post"
-
-#: mail/mail-config.glade.h:21
-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:22
+#: mail/mail-config.glade.h:19
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Legg ved opprinnelig melding"
 
-#: mail/mail-config.glade.h:24 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:26
-msgid "Automatically detect links"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
 msgstr "Finn lenker automatisk"
 
-#: mail/mail-config.glade.h:27
-msgid "Baltic (IS0-8859-13)"
+#: mail/mail-config.glade.h:24
+#, fuzzy
+msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:29
-msgid "Beep when new mail arrives"
-msgstr "Pip n�r nye meldinger ankommer"
-
-#: mail/mail-config.glade.h:30
-msgid "Character Set:"
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
 msgstr "Tegnsett"
 
-#: mail/mail-config.glade.h:31
-msgid "Checking for New Mail"
-msgstr "Ser etter nye meldinger"
-
-#: mail/mail-config.glade.h:32
-msgid "Colors"
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
 msgstr "Farger"
 
-#: mail/mail-config.glade.h:33
-msgid "Command"
-msgstr "Kommando"
-
-#: mail/mail-config.glade.h:34
-msgid "Composer"
-msgstr "Skriv"
+#: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
+msgstr "Ser etter nye meldinger"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Skriver meldinger"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: mail/mail-config.glade.h:37
-msgid "Confirm when Expunging a folder"
-msgstr "Bekreft ved t�mming av mappe"
-
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11310,440 +11202,334 @@ msgstr ""
 "\n"
 "Klikk �Fullf�r� for � lagre dine innstillinger"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:37
 msgid "Dari"
 msgstr "Dari"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:39
 msgid "Default Behavior"
 msgstr "Forvalgt oppf�rsel"
 
-#: mail/mail-config.glade.h:47
-msgid "Default Forward style is: "
-msgstr "Standard videresendingsstil er: "
-
-#: mail/mail-config.glade.h:48
-msgid "Default Forward style:"
-msgstr "Forvalgt videresendingsstil:"
-
-#: mail/mail-config.glade.h:49
-msgid "Default Reply style:"
-msgstr "Forvalgt svarstil:"
-
-#: mail/mail-config.glade.h:50
-msgid "Default character encoding:"
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Forvalgt tegnkoding:"
 
-#: mail/mail-config.glade.h:51
-msgid "Default character encoding: "
-msgstr "Standard tegnkoding: "
-
-#: mail/mail-config.glade.h:52
-msgid "Defaults"
-msgstr "Forvalg"
-
-#: mail/mail-config.glade.h:53
-msgid "Delete selected signature"
-msgstr "Slett valgt signatur"
-
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:41
 msgid "Deleting Mail"
 msgstr "Sletter meldinger"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitale IDer..."
 
-#: mail/mail-config.glade.h:57
-msgid "Display"
-msgstr "Vis"
-
-#: mail/mail-config.glade.h:58
-msgid "Do not notify me when new mail arrives"
-msgstr "Ikke gi beskjed n�r nye meldinger ankommer"
-
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:44
 msgid "Do not quote original message"
 msgstr "Ikke siter opprinnelig melding"
 
-#: mail/mail-config.glade.h:60 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:61 shell/e-local-storage.c:174
-msgid "Drafts"
-msgstr "Skisser"
-
-#: mail/mail-config.glade.h:62
-msgid "E_mail address:"
-msgstr "E-_post adresse:"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Mappe _for skisser:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "A_ktiver"
 
-#: mail/mail-config.glade.h:64
-msgid "Ed_it..."
-msgstr "Red_iger..."
-
-#: mail/mail-config.glade.h:65
-msgid "Edi_t..."
-msgstr "R_ediger..."
-
-#: mail/mail-config.glade.h:66
-msgid "Edit signature content in editor"
-msgstr "Rediger signaturinnhold"
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "E_nable advanced options"
+msgstr "Aktiver avanserte alternativer"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:50
 msgid "Email Accounts"
 msgstr "E-post konti"
 
-#: mail/mail-config.glade.h:69
-msgid "Enable advanced options"
-msgstr "Aktiver avanserte alternativer"
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "_E-post adresse:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "T�m s�pp_elkurven ved slutt"
+
+#: mail/mail-config.glade.h:53
 msgid "Execute Command..."
 msgstr "Kj�r kommando..."
 
-#: mail/mail-config.glade.h:72
-msgid "File containing signature"
-msgstr "Fil som inneholder signatur"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "slutter med"
 
-#: mail/mail-config.glade.h:73
-msgid "Forwards and Replies"
-msgstr "Videresending og svar"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Egenskaper for konto"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Videresendte meldinger"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Hent digital ID..."
 
-#: mail/mail-config.glade.h:76
-msgid "HTML Mail"
-msgstr "HTML-e-post"
-
-#: mail/mail-config.glade.h:77
-msgid "Hide advanced settings"
-msgstr "Skjul avanserte innstillinger"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Merk sitering med"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:59
 msgid "Hulu"
 msgstr "Hulu"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:80 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:81
-msgid "If selected signature will be included in random signature list"
-msgstr "Om valgt signatur skal inkluderes i listen over tilfeldige signaturer"
-
-#: mail/mail-config.glade.h:83
-msgid "In HTML mail"
-msgstr "I HTML e-post"
-
-#: mail/mail-config.glade.h:84
-msgid "Include in _random signatures list"
-msgstr "Inklude_r i listen over tilfeldige signaturer"
-
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:87
-msgid "Keyboard Shortcuts"
-msgstr "Tastatursnarveier"
-
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr "Etiketter og farger"
 
-#: mail/mail-config.glade.h:89
-msgid "Language:"
-msgstr "Spr�k:"
-
-#: mail/mail-config.glade.h:91
-msgid "List of signatures"
-msgstr "Liste over signaturer"
-
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr "Laster bilder"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:95
-msgid "Mail Settings"
-msgstr "Innstillinger for e-post"
-
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: mail/mail-config.glade.h:97
-msgid "Make this my _default account"
-msgstr "Bruk denne som stan_dard konto"
-
-#: mail/mail-config.glade.h:98
-msgid "Mark messages as read after"
-msgstr "Merk meldinger som lest etter"
-
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:72
 msgid "Message Composer"
 msgstr "Meldingsredigering"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:73
 msgid "Message Display"
 msgstr "Meldingsvisning"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:74
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:102
-msgid "Misspelled color: "
-msgstr "Feilstavet farge: "
-
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP-tjener:"
 
-#: mail/mail-config.glade.h:104
-msgid "N_ew..."
-msgstr "N_y..."
-
-#: mail/mail-config.glade.h:105
-msgid "Name of selected signature"
-msgstr "Navn p� valgt signatur"
-
-#: mail/mail-config.glade.h:106
-msgid "Ne_w..."
-msgstr "_Ny..."
-
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Melding om ny e-post"
 
-#: mail/mail-config.glade.h:109
-msgid "News"
-msgstr "News"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Rediger news-tjener"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Tilleggsinformasjon"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organisas_jon:"
+
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-n�_kkel ID:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: mail/mail-config.glade.h:118
-msgid "Play sound file when new mail arrives"
-msgstr "Spill en lydfil n�r nye meldinger ankommer"
+#: mail/mail-config.glade.h:88
+#, fuzzy
+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:119
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:120
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr "Sp�r ved sending av HTML-meldinger til kontakter som ikke �nsker dem"
-
-#: mail/mail-config.glade.h:121
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Sp�r ved sending av meldinger uten _emne"
-
-#: mail/mail-config.glade.h:122
-msgid "Prompt when sending messages with an empty subject line"
-msgstr "Sp�r ved sending av meldinger med tomt emnefelt"
-
-#: mail/mail-config.glade.h:123
-msgid "Prompt 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
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Skriv ut valgte kontakter"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Siter opprinnelig melding"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:95
 msgid "Randomized"
 msgstr "Tilfeldig"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "H_usk dette passordet"
 
-#: mail/mail-config.glade.h:130 shell/glade/evolution-startup-wizard.glade.h:6
-msgid "Receiving Email"
-msgstr "Innkommende e-post"
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Svar-til:"
 
-#: mail/mail-config.glade.h:131
-msgid "Receiving Mail"
+#: 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:132
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Alternativer innkommende"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Husk dette passordet"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "N�dvendig informasjon"
 
-#: mail/mail-config.glade.h:134
-msgid "Restore defaults"
-msgstr " Gjenopprett forvalg"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+msgstr "Sikkerhet"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:104
 msgid "Same as text"
 msgstr "Samme som tekst"
 
-#: mail/mail-config.glade.h:137
-msgid "Script which is run before signature loading from specified filename"
-msgstr "Skript som kj�res f�r lasting av signatur fra spesifisert filnavn"
-
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:139
-msgid "Security"
-msgstr "Sikkerhet"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:140
-msgid "Select Filter Log file..."
-msgstr "Velg en loggfil for filter..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:141
-msgid "Select PGP binary"
-msgstr "Velg PGP-bin�rfil"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
 msgid "Select PGP program"
 msgstr "Velg PGP-program"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:111
 msgid "Select a signature file"
 msgstr "Velg en signaturfil"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:112
 msgid "Select a signature script"
 msgstr "Velg et signaturskript"
 
-#: mail/mail-config.glade.h:145 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Utg�ende e-post"
 
-#: mail/mail-config.glade.h:146
-msgid "Sending Mail"
-msgstr "Utg�ende e-post"
-
-#: mail/mail-config.glade.h:148 mail/message-list.etspec.h:9
-#: shell/e-local-storage.c:177
-msgid "Sent"
-msgstr "Sendt"
-
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Sendte meldinger og skisser"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: mail/mail-config.glade.h:154
-msgid "Shortcut"
-msgstr "Snarvei"
-
-#: mail/mail-config.glade.h:155
-msgid "Shortcuts type:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
 msgstr "Snarveitype:"
 
-#: mail/mail-config.glade.h:156
-msgid "Show advanced settings"
-msgstr "Vis avanserte innstillinger"
-
-#: mail/mail-config.glade.h:157
-msgid "Show animated images"
-msgstr "Vis animerte bilder"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:121
 msgid "Signature"
 msgstr "Signatur"
 
-#: mail/mail-config.glade.h:159
-msgid "Signatures"
-msgstr "Signaturer"
-
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Kilde"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Kildeinformasjon"
 
-#: mail/mail-config.glade.h:162
-msgid "Sources"
-msgstr "Kilder"
-
-#: mail/mail-config.glade.h:163
-msgid "Specify filename:"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
 msgstr "Spesifiser filnavn:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:125
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:166
-msgid "Text _Signature:"
-msgstr "Tekst_signatur:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:128
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11751,15 +11537,16 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel �Arbeid� eller �Personlig�"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:130
 msgid "Use _HTML for this signature"
 msgstr "Bruk _HTML for denne signaturen"
 
-#: mail/mail-config.glade.h:172
-msgid "Use s_ecure connection (SSL):"
-msgstr "Bruk sikk_er forbindelse (SSL):"
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Variabel"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11769,182 +11556,211 @@ msgstr ""
 "\n"
 "Klikk �Neste� for � begynne. "
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:138
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "_Alltid last bilder fra nettet"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:141
 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:182
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Autentiseringstype: "
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:143
 msgid "_Authentication type: "
 msgstr "_Autentiseringstype: "
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "Sjekk etter meldinger _automatisk"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:145
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "Pip n�r nye meldinger ankommer"
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
 msgid "_Confirm when expunging a folder"
 msgstr "_Bekreft ved t�mming av mappe"
 
-#: mail/mail-config.glade.h:188
-msgid "_Drafts folder:"
-msgstr "Mappe _for skisser:"
-
-#: mail/mail-config.glade.h:190
-msgid "_Edit..."
-msgstr "R_ediger..."
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Forvalg"
 
-#: mail/mail-config.glade.h:191
-msgid "_Empty trash folders on exit"
-msgstr "T�m s�pp_elkurven ved slutt"
+#: mail/mail-config.glade.h:151
+#, fuzzy
+msgid "_Do not notify me when new mail arrives"
+msgstr "Ikke gi beskjed n�r nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:192
+#: mail/mail-config.glade.h:153
 msgid "_Enable spell checking"
 msgstr "_Aktiver stavekontroll"
 
-#: mail/mail-config.glade.h:193
-msgid "_Filename"
-msgstr "_Filnavn:"
-
-#: mail/mail-config.glade.h:194
+#: mail/mail-config.glade.h:154
 msgid "_Filename:"
 msgstr "_Filnavn:"
 
-#: mail/mail-config.glade.h:195
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Forvalgt videresendingsstil:"
+
+#: mail/mail-config.glade.h:157
 msgid "_Full name:"
 msgstr "_Fullt navn:"
 
-#: mail/mail-config.glade.h:196
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "HTML-e-post"
+
+#: mail/mail-config.glade.h:160
 msgid "_HTML Signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:197
-msgid "_Highlight citations with"
-msgstr "M_erk sitering med"
-
-#: mail/mail-config.glade.h:198
-msgid "_Highlight quotations with"
-msgstr "_Merk sitering med"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Identitet"
 
-#: mail/mail-config.glade.h:199
-msgid "_Host:"
-msgstr "_Vert:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Spr�k:"
 
-#: mail/mail-config.glade.h:200
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr "_Last bilder hvis avsender er i adresseboken"
 
-#: mail/mail-config.glade.h:201
-msgid "_Log filter actions to:"
-msgstr "_Logg filterhandlinger til:"
-
-#: mail/mail-config.glade.h:202
-msgid "_Mark messages as Read after"
-msgstr "_Merk meldinger som Lest etter"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Bruk denne som stan_dard konto"
 
-#: mail/mail-config.glade.h:203
-msgid "_Name"
-msgstr "_Navn"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
+msgstr "Merk meldinger som lest etter"
 
-#: mail/mail-config.glade.h:204
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:205
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "Aldri last bilder fra _nettet"
 
-#: mail/mail-config.glade.h:206
-msgid "_Organization:"
-msgstr "_Organisasjon:"
-
-#: mail/mail-config.glade.h:207
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "Sti til _PGP-bin�rfil:"
 
-#: mail/mail-config.glade.h:208
-msgid "_Path:"
-msgstr "S_ti:"
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Play sound file when new mail arrives"
+msgstr "Spill en lydfil n�r nye meldinger ankommer"
+
+#: mail/mail-config.glade.h:172
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr "Sp�r ved sending av HTML-meldinger til kontakter som ikke �nsker dem"
+
+#: mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "Sp�r ved sending av meldinger med tomt emnefelt"
+
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Tilfeldig"
 
-#: mail/mail-config.glade.h:209
-msgid "_Randomize"
-msgstr "_Tilfeldiggj�r"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:210
-msgid "_Remember this password"
-msgstr "Husk dette passo_rdet"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Forvalgt svarstil:"
 
-#: mail/mail-config.glade.h:211
-msgid "_Script"
-msgstr "_Skript"
+#: mail/mail-config.glade.h:177
+#, fuzzy
+msgid "_Restore defaults"
+msgstr " Gjenopprett forvalg"
 
-#: mail/mail-config.glade.h:212
+#: mail/mail-config.glade.h:178
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:213
-msgid "_Send mail in HTML format by default."
-msgstr "_Send meldinger i HTML-format som standard."
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Sikkerhet"
 
-#: mail/mail-config.glade.h:214
-msgid "_Send messages in HTML format by default"
-msgstr "_Send meldinger i HTML-format som standard"
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Utg�ende e-post"
 
-#: mail/mail-config.glade.h:215
-msgid "_Server type: "
-msgstr "_Tjenertype: "
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Vis animerte bilder"
 
-#: mail/mail-config.glade.h:216
+#: mail/mail-config.glade.h:182
 msgid "_Signatures"
 msgstr "_Signaturer"
 
-#: mail/mail-config.glade.h:217
-msgid "_Username:"
-msgstr "Br_ukernavn:"
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Text Signature:"
+msgstr "Tekst_signatur:"
 
-#: mail/mail-config.glade.h:218
+#: mail/mail-config.glade.h:184
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "Bruk sikk_er forbindelse (SSL):"
+
+#: mail/mail-config.glade.h:185
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Variabel"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "hv_er(t)"
 
-#: mail/mail-config.glade.h:219
+#: mail/mail-config.glade.h:187
 msgid "color"
 msgstr "farge"
 
-#: mail/mail-config.glade.h:220
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-config.glade.h:222
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "nyhetsvindu1"
 
-#: mail/mail-config.glade.h:223
-msgid "placeholder"
-msgstr "plassholder"
-
-#: mail/mail-config.glade.h:225
-msgid "seconds."
-msgstr "sekunder"
-
-#: mail/mail-config.glade.h:226
-msgid "use _HTML for this signature"
-msgstr "bruk_HTML for denne signaturen"
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Kunne ikke opprette PGP signaturkontekst."
@@ -11981,24 +11797,24 @@ msgstr "Kunne ikke opprette S/MIME �envelope�-kontekst."
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikke opprette S/MIME dekodingskontekst."
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:344
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Kunne ikke opprette midlertidig fil �%s�: %s"
 
-#: mail/mail-display.c:387
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Lagre til disk..."
 
-#: mail/mail-display.c:389
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Vis �inline�"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "�pne i %s..."
@@ -12020,115 +11836,98 @@ msgstr "Ekstern visning"
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-display.c:1757
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "�pne lenke i nettleser"
 
-#: mail/mail-display.c:1759
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Kopier lokasjon for lenke"
 
-#: mail/mail-display.c:1762
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenke som"
 
-#: mail/mail-display.c:1765
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Lagre bilde som..."
 
-#: mail/mail-format.c:652
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:698
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: mail/mail-format.c:781
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Ugyldig e-post-adresse:"
 
-#: mail/mail-format.c:916 mail/message-list.etspec.h:6
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Fra"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:925 mail/message-list.etspec.h:13
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:930
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:935
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1712
-msgid "View messages..."
-msgstr "Vis meldinger..."
-
-#: mail/mail-format.c:1806
-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:1829
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Kan ikke kjenne igjen denne typen signert melding."
-
-#: mail/mail-format.c:1837
-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:1845
-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:915
+#, fuzzy
+msgid "Mailer"
+msgstr "Post"
 
-#: mail/mail-format.c:2088
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2120
 #, 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:2107
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:2136
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data (�%s�-type)"
 
-#: mail/mail-format.c:2149
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12137,28 +11936,28 @@ msgstr ""
 "Kan ikke lagre metainformasjon for mappe; du vil sannsynligvis\n"
 "ikke kunne �pne denne mappen igjen: %s: %s"
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan ikke lagre metainformasjon om mappe p�: %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan ikke slette metainformasjon for mappe %s: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Endrer mappe �%s� til �%s�-format"
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 "%s kan kanskje ikke konfigureres p� nytt fordi det ikke er en lokal mappe"
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12166,11 +11965,11 @@ msgstr ""
 "Hvis du ikke kan �pne denne postboksen igjen m�\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan ikke endre format p� en ikke-lokal mappe."
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigurer /%s p� nytt"
@@ -12197,117 +11996,112 @@ msgstr ""
 msgid "Working"
 msgstr "Arbeider"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:259
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: 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 "Likevel, fullf�rte sending av meldingen."
 
-#: mail/mail-ops.c:600
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender �%s�"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:739
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feilet p� melding %d av %d"
 
-#: mail/mail-ops.c:741 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "Fullf�rt."
 
-#: mail/mail-ops.c:834
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:941
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:1054
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i �%s�"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1104 shell/e-local-storage.c:179
-msgid "Trash"
-msgstr "S�ppel"
-
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1280
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "�pner mappe %s"
 
-#: mail/mail-ops.c:1352
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "�pner lager %s"
 
-#: mail/mail-ops.c:1421
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1515
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe �%s�"
 
-#: mail/mail-ops.c:1566
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: mail/mail-ops.c:1602
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "T�mmer mappe"
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d melding(er)"
 
-#: mail/mail-ops.c:1804
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrer %d melding(er)"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12316,7 +12110,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12325,11 +12119,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12338,22 +12132,22 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s p� nytt"
 
-#: mail/mail-ops.c:2234
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Kj�rer skall-kommando: %s"
@@ -12446,15 +12240,16 @@ msgstr "Skriv inn passord for %s"
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: mail/mail-signature-editor.c:44
-msgid "Could not save signature file."
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
 msgstr "Kunne ikke lagre signaturfil."
 
-#: mail/mail-signature-editor.c:128
+#: mail/mail-signature-editor.c:172
 msgid "Save signature"
 msgstr "Lagre signatur"
 
-#: mail/mail-signature-editor.c:134
+#: mail/mail-signature-editor.c:178
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12464,28 +12259,20 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: mail/mail-signature-editor.c:313
+#: mail/mail-signature-editor.c:357
 msgid "Signature name:"
 msgstr "Signaturnavn:"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "Uferdig melding skrevet p� r�r!"
-
-#: mail/mail-summary.c:467
-msgid "Mail Summary"
-msgstr "E-post-sammendrag"
-
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Videresendt melding"
 
@@ -12512,10 +12299,6 @@ msgstr ""
 "    �%s�\n"
 "Og har blitt oppdatert."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "VFoldere"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "vMapper"
@@ -12533,11 +12316,11 @@ msgstr "Pr�ver � redigere en vfolder �%s� som ikke eksisterer."
 msgid "New VFolder"
 msgstr "Ny VFolder"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Uten emne)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Melding"
@@ -12602,23 +12385,23 @@ msgstr "%b %d %Y"
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Ferdig til"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "Status for merking"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Merket"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr "F�lg opp-flagg"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Mottatt"
 
@@ -12626,46 +12409,46 @@ msgstr "Mottatt"
 msgid "Size"
 msgstr "St�rrelse"
 
-#: mail/message-tag-editor.c:91
-msgid "Flag to Follow Up"
-msgstr "Merk for oppf�lging"
-
-#: mail/message-tag-followup.c:52
+#: mail/message-tag-followup.c:57
 msgid "Call"
 msgstr "Ring"
 
-#: mail/message-tag-followup.c:53
+#: mail/message-tag-followup.c:58
 msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:59
 msgid "Follow-Up"
 msgstr "F�lg opp"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:60
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: mail/message-tag-followup.c:56 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:62
 msgid "No Response Necessary"
 msgstr "Ingen respons n�dvendig"
 
-#: mail/message-tag-followup.c:59 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:60 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/message-tag-followup.c:61
+#: mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Gjennomg�"
 
+#: mail/message-tag-followup.c:315
+msgid "Flag to Follow Up"
+msgstr "Merk for oppf�lging"
+
 #: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -12687,7 +12470,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement p� mappe �%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 "Mappe"
 
@@ -22548,7 +22331,7 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:48
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "Mappe som inneholder Evolution sammendrag"
 
@@ -22572,11 +22355,17 @@ msgstr "%l: %M %d %B"
 msgid "No description"
 msgstr "Ingen beskrivelse"
 
-#: my-evolution/e-summary-mail.c:134
+#: my-evolution/e-summary-mail.c:151
 msgid "Mail summary"
 msgstr "E-post sammendrag"
 
-#: my-evolution/e-summary-mail.c:398 shell/e-local-storage.c:1022
+#. 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 "VFoldere"
+
+#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
+#: my-evolution/e-summary-mail.c:761
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
@@ -22590,23 +22379,23 @@ msgstr "Lokale mapper"
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:487
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Dagens sitat"
 
-#: my-evolution/e-summary-preferences.c:746
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Legg til news-tjener"
 
-#: my-evolution/e-summary-preferences.c:754
+#: my-evolution/e-summary-preferences.c:728
 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-preferences.c:758
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Navn:"
 
@@ -22618,15 +22407,24 @@ msgstr "Feil under nedlasting av RDF"
 msgid "News Feed"
 msgstr "Nyhetstjenester"
 
-#: my-evolution/e-summary-shown.c:467
-msgid "Add->"
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "_Alle"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
 msgstr "Legg til->"
 
-#: my-evolution/e-summary-shown.c:473
-msgid "<-Remove"
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
 msgstr "<-Fjern"
 
-#: my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Vist"
 
@@ -22650,19 +22448,19 @@ msgstr "Det oppsto en feil under nedlasting av data for"
 msgid "Weather"
 msgstr "V�r"
 
-#: my-evolution/e-summary.c:189
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:474
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "Vennligst vent..."
 
-#: my-evolution/e-summary.c:565 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Skriv ut sammendrag"
 
-#: my-evolution/e-summary.c:611
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Feil under utskrift av sammendrag"
 
@@ -22670,38 +22468,6 @@ msgstr "Feil under utskrift av sammendrag"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Executive summary komponent kunne ikke initiere 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 "kpt"
-
-#: 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"
@@ -23932,18 +23698,25 @@ msgstr "_Sett av tid"
 msgid "_Weather"
 msgstr "_V�r"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
-msgstr "Factory for Evolution notat-komponent."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for Evolution default folders."
+msgstr "Konfigurasjonskontroll for Evolution e-posth�ndterer."
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr "Factory for notat-kontroll"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Spesielle mapper"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution skallet."
 
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+#, fuzzy
+msgid "This page can be used to configure default folders"
+msgstr "Denne siden kan brukes til � konfigurere meldingsredigering"
+
 #: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Vis detaljer"
@@ -23952,20 +23725,11 @@ msgstr "Vis detaljer"
 msgid "Cancel Operation"
 msgstr "Avlys operasjon"
 
-#: 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-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution installasjon"
 
-#: 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"
@@ -23973,16 +23737,16 @@ msgstr ""
 "Denne nye versjonen av Evolution m� installere tilleggsfiler i\n"
 "din personlige Evolution-katalog"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Vennligst klikk �OK� for � installere filene, eller �Avbryt� for � avslutte."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Kunne ikke oppdatere filene."
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -23993,7 +23757,7 @@ msgstr ""
 "%s\n"
 "Feil: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -24002,7 +23766,7 @@ msgstr ""
 "En feil oppsto under kopiering av filer til\n"
 "�%s�."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -24013,7 +23777,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -24024,7 +23788,7 @@ msgstr ""
 "har ikke korrekte rettigheter. Vennligst gj�r den\n"
 "lesbar og kj�rbar og start Evolution p� nytt."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -24035,7 +23799,7 @@ msgstr ""
 "m� fjernes for at Evolution skal fungere riktig.\n"
 "Vennligst fjern denne filen og start Evolution p� nytt."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -24046,7 +23810,7 @@ msgstr ""
 "Vennligst flytt denne for � tillate installasjon\n"
 "av Evolution's brukerfiler."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -24060,7 +23824,7 @@ msgstr ""
 "kan kj�re.\n"
 "Vil du fjerne denne katalogen?"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -24379,53 +24143,43 @@ msgstr "Mappenavn kan ikke inneholde skr�streker."
 msgid "'.' and '..' are reserved folder names."
 msgstr "�.� og �..� er reserverte mappenavn."
 
-#: shell/e-shell-view-menu.c:170
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ble ikke funnet i din $PATH."
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kj�res."
 
-#: shell/e-shell-view-menu.c:220
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Om Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:446
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "G� til mappe..."
 
-#: shell/e-shell-view-menu.c:447
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Velg mappen du �nsker � �pne"
 
-#: shell/e-shell-view-menu.c:567
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Opprett en ny snarvei"
 
-#: shell/e-shell-view-menu.c:568
+#: shell/e-shell-view-menu.c:566
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Velg mappen du �nsker snarveien skal peke til:"
 
-#: shell/e-shell-view-menu.c:616
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-"GNOME pilot verkt�yene ser ikke ut til � v�re installert p� dette systemet."
-
-#: shell/e-shell-view-menu.c:624
-#, c-format
-msgid "Error executing %s."
-msgstr "Feil under kj�ring av %s."
-
-#: shell/e-shell-view-menu.c:739
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: shell/e-shell-view-menu.c:752 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: shell/e-shell-view-menu.c:765 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
@@ -24433,39 +24187,51 @@ msgstr "Arbeid frakoblet"
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: 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 "(Ingen)"
 
-#: 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 Evolution er koblet til. Klikk p� denne knappen for � arbeide "
 "frakoblet."
 
-#: shell/e-shell-view.c:1858
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution er i ferd med � koble fra."
 
-#: 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 Evolution er frakoblet. Klikk p� denne knappen for � arbeide "
 "tilkoblet."
 
-#: shell/e-shell.c:652
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Feilen fra aktiveringssystemet er:\n"
+"%s"
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1719
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24476,19 +24242,23 @@ msgstr ""
 "har avsluttet uventet. Du vil m�tte avslutte Evolution og starte p�\n"
 "nytt for � f� tilgang til disse dataene igjen."
 
-#: shell/e-shell.c:1982
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:1984
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:1986
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:1988 shell/e-storage.c:487
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -24613,14 +24383,14 @@ msgstr "Feil under lagring av snarveier."
 msgid "Shortcuts"
 msgstr "Snarveier"
 
-#: shell/e-storage-set-view.c:649
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Kan ikke overf�re mappe:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Innboks"
+
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Chico"
 
 #: shell/e-storage.c:485
 msgid "No error"
@@ -24680,10 +24450,13 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullf�rt)"
 
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<klikk her for � velge en mappe>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -24721,67 +24494,67 @@ msgstr ""
 "Feilen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "CORBA-feil"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Avbrutt"
 
-#: shell/evolution-shell-component.c:1048
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Har allerede en eier"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Ingen eier"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Ikke funnet"
 
-#: shell/evolution-shell-component.c:1056
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Ust�ttet type"
 
-#: shell/evolution-shell-component.c:1058
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Ust�ttet schema"
 
-#: shell/evolution-shell-component.c:1060
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Ust�ttet operasjon"
 
-#: shell/evolution-shell-component.c:1062
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: shell/evolution-shell-component.c:1066
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Eksisterer"
 
-#: shell/evolution-shell-component.c:1068
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1072
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Har undermapper"
 
-#: shell/evolution-shell-component.c:1074
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Ingen plass igjen"
 
-#: shell/evolution-shell-component.c:1076
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Gammel eier er d�d"
 
-#: shell/evolution-test-component.c:45
+#: shell/evolution-test-component.c:47
 msgid "Test type"
 msgstr "Testtype"
 
@@ -24909,40 +24682,40 @@ msgstr "Ikke sp�r meg igjen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra f�lgende filer:"
 
-#: shell/main.c:88
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:94
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avslutter n�..."
 
-#: shell/main.c:223
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikke aksessere Ximian Evolution-skallet."
 
-#: shell/main.c:232
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikke initiere Ximian Evolution-skallet: %s"
 
-#: shell/main.c:302
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Deaktiver splash"
 
-#: shell/main.c:303
+#: shell/main.c:318
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
-#: shell/main.c:304
+#: shell/main.c:319
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: shell/main.c:305
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feils�kingsutskrift for alle komponentene til en fil."
 
-#: shell/main.c:323
+#: shell/main.c:338
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -24951,7 +24724,7 @@ msgstr ""
 "%s: --online og --offline kan ikke brukes samtidig.\n"
 "  Bruk %s --help for mer informasjon.\n"
 
-#: shell/main.c:353
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initiere Bonobo komponentsystemet."
 
@@ -25002,67 +24775,63 @@ msgstr "Klipp ut utvalget"
 msgid "Delete selected contacts"
 msgstr "Slett valgte kontakter"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "Dump"
-msgstr "Dump"
-
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:13
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Flytt kontakt(er) til en annen mappe..."
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:14
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Forh�ndsviser kontaktene som skal skrives ut"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Skriv ut valgte kontakter"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Lagre valgte kontakter som et VCard."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Velg alle kontakter"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Send en melding til valgte kontakter."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Send melding til kontakt"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Send valgte kontakter til en annen person."
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Stopp innlesing"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 msgid "View the current contact"
 msgstr "Vis aktiv kontakt"
 
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:25
+#: 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
@@ -25072,31 +24841,31 @@ msgstr "Vis aktiv kontakt"
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ui/evolution-addressbook.xml.h:34
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "_Kontaktliste"
 
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Videresend kontakt..."
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:38
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "Lagre _som VCard"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_S�k etter kontakter"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Velg alle"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:45
 msgid "_Send Message to Contact..."
 msgstr "_Send melding til kontakt..."
 
@@ -25315,6 +25084,10 @@ msgstr "Sett opp m�te for denne oppf�ringen"
 msgid "Customise My Evolution"
 msgstr "Tilpass min 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 aktiv e-postoperasjon"
@@ -25924,6 +25697,10 @@ msgstr "Sett inn en tekstfil i meldingen"
 msgid "Insert text file..."
 msgstr "Sett inn tekstfil..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "�pne"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "�pne en fil"
@@ -26063,10 +25840,6 @@ msgstr "_�pne..."
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Sikkerhet"
-
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Hjelp"
@@ -26533,22 +26306,22 @@ msgstr "Redigering av s�k"
 msgid "Save Search"
 msgstr "Lagre s�k"
 
-#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:97
 msgid "_Save Search..."
 msgstr "_Lagre s�k..."
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:98
 msgid "_Edit Saved Searches..."
 msgstr "R_ediger lagrede s�k..."
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:99
-msgid "_Advanced Search..."
-msgstr "_Avansert s�k..."
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informasjon"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Feil"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Sp�rsm�l"
@@ -26570,14 +26343,14 @@ msgstr "_Finn n� "
 msgid "_Clear"
 msgstr "_T�m"
 
-#: widgets/misc/e-search-bar.c:844
-msgid "Find Now"
-msgstr "Finn n� "
-
-#: widgets/misc/e-search-bar.c:846
+#: widgets/misc/e-search-bar.c:835
 msgid "Clear"
 msgstr "T�m"
 
+#: widgets/misc/e-search-bar.c:837
+msgid "Find Now"
+msgstr "Finn n� "
+
 #: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
 #: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
 msgid "The Personal Addressbook Server"
@@ -26600,6 +26373,810 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 
+#~ msgid "Edit Addressbook"
+#~ msgstr "Rediger adressebok"
+
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "A_utentiser med tjener og bruk:"
+
+#~ msgid "Account Name"
+#~ msgstr "Kontonavn"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Legg til adressebok"
+
+#~ msgid "Advanced"
+#~ msgstr "Avansert"
+
+#~ msgid "Base"
+#~ msgstr "Basis"
+
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Sjekk om denne tjeneren krever at du autentiserer deg."
+
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
+#~ "server"
+#~ msgstr ""
+#~ "Evolution vil bruke �Distinguished Name� (DN) til � autentisere deg mot "
+#~ "tjeneren"
+
+#~ msgid "Server Name"
+#~ msgstr "Tjenernavn:"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "Informasjonen under kreves for � legge til en adressebok."
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "Denne informasjonen kreves ikke for de fleste LDAP-tjenere."
+
+#~ 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 ""
+#~ "Denne informasjonen brukes av din LDAP-tjener for � spesifisere hvilke noder "
+#~ "som brukes i et s�k. Kontakt din administrator for mer informasjon."
+
+#~ msgid ""
+#~ "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�k p� LDAP-tjeneren. Kontakt din "
+#~ "administrator for mer informasjon."
+
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Dette er navnet p� tjeneren hvor din adressebok er lokalisert."
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Dette er porten som din LDAP-tjener bruker."
+
+#~ msgid "_Account name:"
+#~ msgstr "Konton_avn:"
+
+#~ msgid "_Port:"
+#~ msgstr "_Port:"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Andre kontakter"
+
+#~ msgid "(none)"
+#~ msgstr "(ingen)"
+
+#~ msgid "C_ontaining:"
+#~ msgstr "Inneh_older:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Vis kontakter som m�ter f�lgende kriterier:"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Er du sikker p� at du vil\n"
+#~ "slette denne kontakten?"
+
+#~ msgid "Starting:"
+#~ msgstr "Starter:"
+
+#~ msgid "Ending:"
+#~ msgstr "Slutter:"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Opp_rett en ny avtale med standard p�minnelse"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "F�rste dag i u_ken:"
+
+#~ msgid "_Other"
+#~ msgstr "_Andre"
+
+#~ msgid "Click here to add an attendee"
+#~ msgstr "Klikk her for � legge til en deltaker"
+
+#~ 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 "Meeting begins: <b>"
+#~ msgstr "M�te starter: <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "Oppgave starter: <b>"
+
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Ledig/opptatt-informasjon starter: <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Starter: <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "M�te slutter: <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Ledig/opptatt-informasjon slutter: <b>"
+
+#~ msgid "Ends: <b>"
+#~ msgstr "Slutter: <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Oppgave fullf�rt: <b>"
+
+#~ msgid "Task Due: <b>"
+#~ msgstr "Oppgave ferdig: <b>"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "iCalendar-informasjon"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "iCalender-feil"
+
+#~ msgid "An unknown person"
+#~ msgstr "En ukjent person"
+
+#~ msgid ""
+#~ "<br> Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr ""
+#~ "<br>Vennligst sjekk f�lgende informasjon og velg s� en handling fra menyen "
+#~ "under."
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ingen</i>"
+
+#~ msgid "Status:"
+#~ msgstr "Status:"
+
+#~ msgid "Tentatively Accepted"
+#~ msgstr "Akteptert tentativt"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Velg en handling:"
+
+#~ msgid "Update"
+#~ msgstr "Oppdater"
+
+#~ msgid "Accept"
+#~ msgstr "Godta"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Godta tentativt"
+
+#~ msgid "Decline"
+#~ msgstr "Avsl�"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Send ledig/opptatt-informasjon"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Oppdater status for respondent"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Send siste informasjon"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> har publisert m�teinformasjon."
+
+#~ msgid "Meeting Information"
+#~ msgstr "M�teinformasjon"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> foresp�r din tilstedev�relse i et m�te."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "M�teforslag"
+
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ msgstr "<b>%s</b> �nsker � legge til informasjon i et eksisterende m�te."
+
+#~ msgid "Meeting Update"
+#~ msgstr "M�teoppdatering"
+
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ msgstr "<b>%s</b> �nsker � motta seneste m�teinformasjon."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Foresp�rsel om m�teoppdatering"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b> har svart p� en m�teforesp�rsel."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "M�tesvar"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> har avlyst et m�te."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "M�teavlysing"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> har sendt en uforst�elig melding."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Ugyldig m�temelding"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> har publisert informasjon om en oppgave."
+
+#~ msgid "Task Information"
+#~ msgstr "Oppgaveinformasjon"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> foresp�r at du utf�rer en oppgave."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Foresp�rsel om oppgave"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> �nsker � legge til informasjon i en eksisterende oppgave."
+
+#~ msgid "Task Update"
+#~ msgstr "Oppgaveoppdatering"
+
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "<b>%s</b> �nsker � motta den seneste informasjon om oppgaven."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Foresp�rsel om oppgaveoppdatering"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b> har svart p� en oppgavetildeling."
+
+#~ msgid "Task Reply"
+#~ msgstr "Svar p� oppgave"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> har avlyst en oppgave."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Avlysning av oppgave"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Ugyldig oppgavemelding"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> har publisert ledig/opptatt-informasjon."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Ledig/opptatt-informasjon"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> foresp�r din ledig/opptatt-informasjon."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Ledig/opptatt foresp�rsel"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr ""
+#~ "<b>%s</b> har svart p� en foresp�rsel etter ledig/opptatt-informasjon."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Ledig/opptatt svar"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Ugyldig ledig/opptatt-melding"
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Meldingen ser ikke ut til � v�re riktig utformet"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Denne meldingen inneholder foresp�rsler som ikke er st�ttet."
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
+
+#~ msgid "Event information"
+#~ msgstr "Hendelsesinformasjon"
+
+#~ msgid "Task information"
+#~ msgstr "Oppgaveinformasjon"
+
+#~ msgid "Journal information"
+#~ msgstr "Journalinformasjon"
+
+#~ msgid "Free/Busy information"
+#~ msgstr "Ledig/opptatt-informasjon"
+
+#~ msgid "Calendar information"
+#~ msgstr "Kalenderinformasjon"
+
+#~ msgid "Updated"
+#~ msgstr "Oppdatert"
+
+#~ msgid "Refresh"
+#~ msgstr "Oppdater"
+
+#~ msgid "Counter-proposal"
+#~ msgstr "Motforslag"
+
+#~ msgid "Task"
+#~ msgstr "Oppgave"
+
+#~ msgid "Status: %s"
+#~ msgstr "Status: %s"
+
+#~ msgid "Percent Complete: %i"
+#~ msgstr "Prosent fullf�rt: %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 "Feil under hashing av passord."
+
+#~ msgid "Invalid password."
+#~ msgstr "Ugyldig passord"
+
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Kunne ikke signere: fant ikke sertifikat for �%s�."
+
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Kunne uf�re �clearsign�: fant ikke sertifikat for �%s�."
+
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ msgstr "Kunne ikke kryptere: feil under oppretting av konvolutert data."
+
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "Kunne ikke kryptere: klarte ikke � opprette krypteringskontekst."
+
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Kunne ikke kryptere data: ugyldig n�kkel for bruker: �%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"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Tjeneren godtok ikke brukernavn"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Feil under sending av brukernavn til tjener"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Tjeneren godtok ikke brukernavn/passord"
+
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "Intern feil: uid i ugyldig format: %s"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Kunne ikke hente gruppeliste fra tjeneren."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Kunne ikke laste gruppelistefil for %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Kunne ikke lagre gruppelistefil for %s: %s"
+
+#~ msgid ""
+#~ "<b>(The composer contains a non-text message body, which cannot be "
+#~ "editted.)<b>"
+#~ msgstr ""
+#~ "<b>(Meldingsredigering inneholder en meldingskropp som ikke er tekst, og "
+#~ "derfor ikke kan redigeres.)"
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "Evolution-komponent for sammendrag."
+
+#~ msgid "Factory for the Evolution executive summary component."
+#~ msgstr "Factory for Evolutions sammendrag-komponent."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Kan ikke initiere Evolutions sammendragskomponent."
+
+#~ msgid "Select a service"
+#~ msgstr "Velg en tjeneste"
+
+#~ 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 ""
+#~ "Du kan velge en annen HTML-side som bakgrunn for sammendraget.\n"
+#~ "\n"
+#~ "Bare la den v�re blank som standard"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "�pne %s med standard GNOME applikasjon"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "�pne %s med standard GNOME nettleser"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Send en melding til %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Kj�r %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Lukk %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Flytt %s til venstre"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Flytt %s til h�yre"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Flytt %s til forrige rad"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Flytt %s til neste rad"
+
+#~ msgid "Configure %s"
+#~ msgstr "Konfigurer %s"
+
+#~ msgid "page"
+#~ msgstr "side"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikke �pne HTML-fil:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Feil under lesing av data:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Filen har ikke en plass til tjenestene.\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 ""
+#~ "Sammendragskomponenten kunne ikke initiere Bonobo.\n"
+#~ "Hvis du s� en advarsel ang�ende RootPOA, betyr dette sannsynligvis\n"
+#~ "at du kompilerte Bonobo mot GOAD i stedet for OAF."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Factory RDF-sammendrag."
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF-sammendrag"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Factory for test bonobo-komponent."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Factory for test-komponent."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Test bonobo-tjeneste"
+
+#~ msgid "Test service"
+#~ msgstr "Test-tjeneste"
+
+#~ msgid "Update automatically"
+#~ msgstr "Oppdater automatisk"
+
+#~ msgid "Update now"
+#~ msgstr "Oppdater n�"
+
+#~ msgid "Update every "
+#~ msgstr "Oppdater hver(t)"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Skriv inn URI for mappen"
+
+#~ msgid "Default"
+#~ msgstr "Forvalgt"
+
+#~ msgid "Mail to %s"
+#~ msgstr "Send til %s"
+
+#~ 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 "%s: Inbox"
+#~ msgstr "%s: Innboks"
+
+#~ msgid "                        "
+#~ msgstr "                        "
+
+#~ msgid " color"
+#~ msgstr " farge"
+
+#~ msgid "&lt;&lt; S_imple"
+#~ msgstr "&lt;&lt; En_kel"
+
+#~ msgid "Account"
+#~ msgstr "Konto"
+
+#~ msgid "Accounts"
+#~ msgstr "Kontoer"
+
+#~ msgid "Ad_vanced &gt;&gt;"
+#~ msgstr "Avansert &gt;&gt;"
+
+#~ msgid "Add new signature"
+#~ msgstr "Legg til ny signatur"
+
+#~ msgid "Always _encrypt to myself when sending encrypted mail"
+#~ msgstr "Alltid krypt_er til meg selv ved sending av kryptert e-post"
+
+#~ msgid "Command"
+#~ msgstr "Kommando"
+
+#~ msgid "Composer"
+#~ msgstr "Skriv"
+
+#~ msgid "Confirm when Expunging a folder"
+#~ msgstr "Bekreft ved t�mming av mappe"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Standard videresendingsstil er: "
+
+#~ msgid "Default character encoding: "
+#~ msgstr "Standard tegnkoding: "
+
+#~ msgid "Delete selected signature"
+#~ msgstr "Slett valgt signatur"
+
+#~ msgid "Display"
+#~ msgstr "Vis"
+
+#~ msgid "Drafts"
+#~ msgstr "Skisser"
+
+#~ msgid "E_mail address:"
+#~ msgstr "E-_post adresse:"
+
+#~ msgid "Ed_it..."
+#~ msgstr "Red_iger..."
+
+#~ msgid "Edi_t..."
+#~ msgstr "R_ediger..."
+
+#~ msgid "Edit signature content in editor"
+#~ msgstr "Rediger signaturinnhold"
+
+#~ msgid "File containing signature"
+#~ msgstr "Fil som inneholder signatur"
+
+#~ msgid "Forwards and Replies"
+#~ msgstr "Videresending og svar"
+
+#~ msgid "Hide advanced settings"
+#~ msgstr "Skjul avanserte innstillinger"
+
+#~ msgid "If selected signature will be included in random signature list"
+#~ msgstr ""
+#~ "Om valgt signatur skal inkluderes i listen over tilfeldige signaturer"
+
+#~ msgid "In HTML mail"
+#~ msgstr "I HTML e-post"
+
+#~ msgid "Include in _random signatures list"
+#~ msgstr "Inklude_r i listen over tilfeldige signaturer"
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Tastatursnarveier"
+
+#~ msgid "List of signatures"
+#~ msgstr "Liste over signaturer"
+
+#~ msgid "Mail Settings"
+#~ msgstr "Innstillinger for e-post"
+
+#~ msgid "Misspelled color: "
+#~ msgstr "Feilstavet farge: "
+
+#~ msgid "N_ew..."
+#~ msgstr "N_y..."
+
+#~ msgid "Name of selected signature"
+#~ msgstr "Navn p� valgt signatur"
+
+#~ msgid "Ne_w..."
+#~ msgstr "_Ny..."
+
+#~ msgid "News"
+#~ msgstr "News"
+
+#~ msgid "Prompt when sending messages with an _empty subject"
+#~ msgstr "Sp�r ved sending av meldinger uten _emne"
+
+#~ msgid "Script which is run before signature loading from specified filename"
+#~ msgstr "Skript som kj�res f�r lasting av signatur fra spesifisert filnavn"
+
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Velg en loggfil for filter..."
+
+#~ msgid "Select PGP binary"
+#~ msgstr "Velg PGP-bin�rfil"
+
+#~ msgid "Sent"
+#~ msgstr "Sendt"
+
+#~ msgid "Shortcut"
+#~ msgstr "Snarvei"
+
+#~ msgid "Show advanced settings"
+#~ msgstr "Vis avanserte innstillinger"
+
+#~ msgid "Signatures"
+#~ msgstr "Signaturer"
+
+#~ msgid "Sources"
+#~ msgstr "Kilder"
+
+#~ msgid "_Edit..."
+#~ msgstr "R_ediger..."
+
+#~ msgid "_Filename"
+#~ msgstr "_Filnavn:"
+
+#~ msgid "_Highlight citations with"
+#~ msgstr "M_erk sitering med"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "_Logg filterhandlinger til:"
+
+#~ msgid "_Mark messages as Read after"
+#~ msgstr "_Merk meldinger som Lest etter"
+
+#~ msgid "_Name"
+#~ msgstr "_Navn"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organisasjon:"
+
+#~ msgid "_Randomize"
+#~ msgstr "_Tilfeldiggj�r"
+
+#~ msgid "_Remember this password"
+#~ msgstr "Husk dette passo_rdet"
+
+#~ msgid "_Script"
+#~ msgstr "_Skript"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "_Send meldinger i HTML-format som standard."
+
+#~ msgid "_Send messages in HTML format by default"
+#~ msgstr "_Send meldinger i HTML-format som standard"
+
+#~ msgid "_Server type: "
+#~ msgstr "_Tjenertype: "
+
+#~ msgid "placeholder"
+#~ msgstr "plassholder"
+
+#~ msgid "seconds."
+#~ msgstr "sekunder"
+
+#~ msgid "use _HTML for this signature"
+#~ msgstr "bruk_HTML for denne signaturen"
+
+#~ msgid "View messages..."
+#~ msgstr "Vis meldinger..."
+
+#~ 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."
+
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "Kan ikke kjenne igjen denne typen signert melding."
+
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr "Denne meldingen er digitalt signert og er funnet autentisk."
+
+#~ 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."
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Uferdig melding skrevet p� r�r!"
+
+#~ msgid "Mail Summary"
+#~ msgstr "E-post-sammendrag"
+
+#~ msgid " F"
+#~ msgstr " F"
+
+#~ msgid " C"
+#~ msgstr " C"
+
+#~ msgid "knots"
+#~ msgstr "knop"
+
+#~ msgid "kph"
+#~ msgstr "kpt"
+
+#~ msgid "inHg"
+#~ msgstr "inHg"
+
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
+
+#~ msgid "miles"
+#~ msgstr "engelske mil"
+
+#~ msgid "kilometers"
+#~ msgstr "kilometer"
+
+#~ msgid "Factory for the Evolution notes component."
+#~ msgstr "Factory for Evolution notat-komponent."
+
+#~ msgid "Factory for the Notes control"
+#~ msgstr "Factory for notat-kontroll"
+
+#~ msgid "Outbox"
+#~ msgstr "Utboks"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikke overf�re mappe:\n"
+#~ "%s"
+
+#~ msgid "Dump"
+#~ msgstr "Dump"
+
+#~ msgid "_Advanced Search..."
+#~ msgstr "_Avansert s�k..."
+
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "Kunne ikke finne noen av dine identiteter i deltakerlisten!\n"
 
@@ -26624,11 +27201,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Cannot send message: sender address not defined."
 #~ msgstr "Kan ikke sende melding: senderadresse ikke definert."
 
-#~ msgid "This page can be used to configure your mailer settings"
-#~ msgstr ""
-#~ "Denne siden kan brukes til � konfigurere innstillinger for e-"
-#~ "posth�ndtereren"
-
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr "Opprett eller rediger e-post kontoer og andre brukervalg"
 
@@ -26647,9 +27219,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Mailbox Format"
 #~ msgstr "Format for postboks"
 
-#~ msgid "Are you sure you want to delete this news account?"
-#~ msgstr "Er du sikker p� at du vil slette denne diskusjonsgruppekontoen?"
-
 #~ msgid "Edit..."
 #~ msgstr "Rediger..."
 
@@ -26662,9 +27231,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Connecting to LDAP server..."
 #~ msgstr "Kobler til LDAP-tjener..."
 
-#~ msgid "Unable to connect to LDAP server."
-#~ msgstr "Kunne ikke koble til LDAP-tjener."
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Venter p� tilkobling til LDAP-tjener..."
 
@@ -26704,9 +27270,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "(No name)"
 #~ msgstr "(Uten navn)"
 
-#~ msgid "_Addressbook Sources..."
-#~ msgstr "_Adressebok-kilder..."
-
 #~ msgid "Configure the calendar's settings"
 #~ msgstr "Konfigurer innstillinger for kalender"
 
@@ -27084,8 +27647,7 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgstr "Kunne ikke hente melding fra POP-tjener %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 lar deg koble til POP-tjeneren ved � bruke Kerberos 4 som "
 #~ "autentisering."
@@ -27117,9 +27679,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "Denne meldingen inneholder ugyldige mottakere:"
 
-#~ msgid "Email Address:"
-#~ msgstr "E-post adresse:"
-
 #~ msgid "Co_ntacts:"
 #~ msgstr "Ko_ntakter:"
 
@@ -27182,9 +27741,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "on or before"
 #~ msgstr "p� eller f�r"
 
-#~ msgid "Special Folders"
-#~ msgstr "Spesielle mapper"
-
 #~ msgid "Open a new Evolution window"
 #~ msgstr "�pne et nytt Evolution vindu"
 
@@ -27281,8 +27837,7 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ "We hope that you enjoy the results of our hard work, and we\n"
 #~ "eagerly await your contributions!\n"
 #~ msgstr ""
-#~ "Hei. Takk for at du har tatt deg tid til � laste ned denne "
-#~ "pr�veversjonen\n"
+#~ "Hei. Takk for at du har tatt deg tid til � laste ned denne pr�veversjonen\n"
 #~ "av Ximian Evolution gruppevarepakken.\n"
 #~ "\n"
 #~ "Ximian Evolution er ikke ferdig. Det n�rmer seg, men deler av "
@@ -27396,9 +27951,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "Vennligst skriv inn din e-postadresse og passord for tilgang til %s"
 
-#~ msgid "LDAP Authentication"
-#~ msgstr "LDAP-autentisering"
-
 #~ msgid "Password:"
 #~ msgstr "Passord:"
 
@@ -27439,8 +27991,8 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgstr "Kunne ikke finne lokalt lager. Burde aldri skje."
 
 #~ 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 er %s. Unix tiden er %ld akkurat n�. Vi bare tenkte du ville vite det."
 
@@ -27535,9 +28087,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "%a %l:%M%p"
 #~ msgstr "%a %l:%M%p"
 
-#~ msgid "123"
-#~ msgstr "123"
-
 #~ msgid "a"
 #~ msgstr "a"
 
@@ -27632,13 +28181,12 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgstr "E-post filer i Unix mbox spool-format"
 
 #~ 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 ""
-#~ "For tilkobling til POP-tjenere. POP-protokollen kan ogs� brukes for � "
-#~ "hente e-post fra enkelte e-posttilbydere via web i tillegg til "
-#~ "propriet�re e-postsystemer."
+#~ "For tilkobling til POP-tjenere. POP-protokollen kan ogs� brukes for � hente "
+#~ "e-post fra enkelte e-posttilbydere via web i tillegg til propriet�re "
+#~ "e-postsystemer."
 
 #~ msgid "This seems to be the first time you are running Evolution."
 #~ msgstr "Dette ser ut til � v�re f�rste gang du kj�rer Evolution."
@@ -27670,9 +28218,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Add"
 #~ msgstr "Legg til"
 
-#~ msgid "Edit"
-#~ msgstr "Rediger"
-
 #~ msgid "Send _Contact to Other"
 #~ msgstr "Send _kontakt til andre"
 
@@ -27827,8 +28372,8 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgstr "Opprett sti hvis den ikke eksisterer."
 
 #~ 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 ""
 #~ "Velg type adressebok du har, og skriv inn relevant informasjon om den."
 
@@ -27856,9 +28401,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Goals/Objectives"
 #~ msgstr "M�l/Objektiver"
 
-#~ msgid "Hot Contacts"
-#~ msgstr "Hete kontakter"
-
 #~ msgid "Strategies"
 #~ msgstr "Strategier"
 
@@ -27946,9 +28488,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Has category"
 #~ msgstr "Har kategori"
 
-#~ msgid "Scanning IMAP folder"
-#~ msgstr "Skanner IMAP-mappe"
-
 #~ msgid "[Fwd: No Subject]"
 #~ msgstr "[Fwd: Uten emne]"
 
@@ -27956,11 +28495,11 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgstr "Videresendt melding (uten emne)"
 
 #~ 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 ""
-#~ "-----Videresendt melding---<br><b>Fra:</b> %s<br><b>Til:</b> %"
-#~ "s<br><b>Emne:</b> %s<br>"
+#~ "-----Videresendt melding---<br><b>Fra:</b> %s<br><b>Til:</b> "
+#~ "%s<br><b>Emne:</b> %s<br>"
 
 #~ msgid "Wipe trackers"
 #~ msgstr "Visk ut sporere"
@@ -28193,8 +28732,8 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ "This applet monitors the charge of your laptop's battery.  Click on it to "
 #~ "change display modes."
 #~ msgstr ""
-#~ "Denne appleten overv�ker str�mstyrken til batteriet p� din b�rbare. Klikk "
-#~ "p� den for � endre visningsmodus."
+#~ "Denne appleten overv�ker str�mstyrken til batteriet p� din b�rbare. Klikk p� "
+#~ "den for � endre visningsmodus."
 
 #~ msgid "Could not allocate space for graph values"
 #~ msgstr "Kunne ikke allokere plass for grafverdiene"
@@ -28322,8 +28861,8 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ "Gnome panel applet for copying and retrieving selections with a history "
 #~ "list. Released under GNU General Public Licence."
 #~ msgstr ""
-#~ "Gnome Panel applet for � kopiere og hente tilbake utvalg med en "
-#~ "historikk. Utgitt under GNU General Puclic License."
+#~ "Gnome Panel applet for � kopiere og hente tilbake utvalg med en historikk. "
+#~ "Utgitt under GNU General Puclic License."
 
 #~ msgid "John Ellis <johne@bellatlantic.net>"
 #~ msgstr "John Ellis <johne@bellatlantic.net>"
@@ -28381,14 +28920,14 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgstr "GNOME Aksjeoverv�ker"
 
 #~ msgid ""
-#~ "This program connects to a popular site and downloads current stock "
-#~ "quotes.  The GNOME Stock Ticker is a free Internet-based application.  It "
-#~ "comes with ABSOLUTELY NO WARRANTY.  Do not use the GNOME Stock Ticker for "
-#~ "making investment decisions; it is for informational purposes only."
+#~ "This program connects to a popular site and downloads current stock quotes.  "
+#~ "The GNOME Stock Ticker is a free Internet-based application.  It comes with "
+#~ "ABSOLUTELY NO WARRANTY.  Do not use the GNOME Stock Ticker for making "
+#~ "investment decisions; it is for informational purposes only."
 #~ msgstr ""
 #~ "Dette programmet laster ned aksjekurser fra popul�re nettsteder. GNOME "
-#~ "aksjeoverv�ker er en fri internett-basert applikasjon. Det f�lger IKKE "
-#~ "MED NOEN GARANTIER. Ikke bruk GNOME aksjeoverv�ker til � gj�re "
+#~ "aksjeoverv�ker er en fri internett-basert applikasjon. Det f�lger IKKE MED "
+#~ "NOEN GARANTIER. Ikke bruk GNOME aksjeoverv�ker til � gj�re "
 #~ "investeringsavgj�relser; kun for informasjonsform�l."
 
 #~ msgid "New Symbol:"
@@ -28579,8 +29118,8 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ "jpg, jpeg, bmp, cgm, cmyk, dib, eps, fig, fpx, gif, ico, map, miff, pcx,\n"
 #~ "pict, pix, png, pnm, ppm, psd, rgb, rgba, rla, rle, tiff, tga, xbm, xpm,\n"
 #~ "and several obscure ones. Try your luck with something interesting!\n"
-#~ "Eg .html for a client-side image map. You'll get a .gif, .html, and a ."
-#~ "shtml\n"
+#~ "Eg .html for a client-side image map. You'll get a .gif, .html, and a "
+#~ ".shtml\n"
 #~ "\n"
 #~ "Recommendations:\n"
 #~ "Small file, pretty good quality:   jpg, 75% quality\n"
@@ -28593,13 +29132,12 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ "jpg, jpeg, bmp, cgm, cmyk, dib, eps, fig, fpx, gif, ico, map, miff, pcx,\n"
 #~ "pict, pix, png, pnm, ppm, psd, rgb, rgba, rla, rle, tiff, tga, xbm, xpm,\n"
 #~ "og flere andre obskure typer. Pr�v ditt hell med noe interessant!\n"
-#~ "For eksempel .html for et klientside bildekart. Du vil f� et .gif, .html "
-#~ "og et .shtml.\n"
+#~ "For eksempel .html for et klientside bildekart. Du vil f� et .gif, .html og "
+#~ "et .shtml.\n"
 #~ "\n"
 #~ "Forslag:\n"
 #~ "Liten fil ganske god kvalitet:        jpg, 75% kvalitet\n"
-#~ "Litt st�rre fil men uten tap av data: png, s� mye kompresjon som du "
-#~ "�nsker.\n"
+#~ "Litt st�rre fil men uten tap av data: png, s� mye kompresjon som du �nsker.\n"
 #~ "- kompresjon av png filer tar lengre tid ved h�yere rater, men er likevel "
 #~ "uten tap av data"
 
@@ -28630,23 +29168,22 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgstr "Bruk h�ykvalitets mellomlagring under oppretting av miniatyr"
 
 #~ msgid ""
-#~ "(This'll chug loads of CPU, but will prevent compressing the image twice "
-#~ "if a\n"
+#~ "(This'll chug loads of CPU, but will prevent compressing the image twice if "
+#~ "a\n"
 #~ "lossy file format is used)\n"
 #~ "Don't use this if you're using a lossless compression format, or if you "
 #~ "cherish\n"
 #~ "speed and don't mind imperfection in your thumbnails."
 #~ msgstr ""
-#~ "(Dette vil bruke mye prosessorkraft, men vil forhindre at bildet "
-#~ "komprimeres \n"
+#~ "(Dette vil bruke mye prosessorkraft, men vil forhindre at bildet komprimeres "
+#~ "\n"
 #~ "to ganger hvis du bruker et format som taper data)\n"
-#~ "Ikke bruk dette alternativet hvis du bruker et tapsfritt "
-#~ "kompresjonsformat, eller hvis du setter pris p� \n"
+#~ "Ikke bruk dette alternativet hvis du bruker et tapsfritt kompresjonsformat, "
+#~ "eller hvis du setter pris p� \n"
 #~ "hurtighet og ikke bryr deg om mindre feil i miniatyrene."
 
 #~ msgid ""
-#~ "All post-processing, frill and spurious options will chug more CPU than "
-#~ "a\n"
+#~ "All post-processing, frill and spurious options will chug more CPU than a\n"
 #~ "simple screenshot, due to the creation and then conversion of an "
 #~ "intermediate\n"
 #~ "image. Intensive operations may take some time on less spiffy CPUs."
@@ -28715,8 +29252,7 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ "specified on the commandline as follows:\n"
 #~ "{Script_Name} {Image_Filename} {Thumbnail_filename_if_specified}\n"
 #~ "Hint: I use a script to update my website screenshot page.\n"
-#~ "An example script should've been included in the tarball, or at my "
-#~ "website."
+#~ "An example script should've been included in the tarball, or at my website."
 #~ msgstr ""
 #~ "Skript/program som vil startes etter oppretting av bildet med bildets\n"
 #~ "filnavn spesifisert p� kommandolinjen som f�lger:\n"
@@ -29159,9 +29695,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Hide _Deleted"
 #~ msgstr "Skjul slette_de"
 
-#~ msgid "_All"
-#~ msgstr "_Alle"
-
 #~ msgid "_Normal"
 #~ msgstr "_Normal"
 
@@ -29180,9 +29713,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "As _Table"
 #~ msgstr "Som _tabell"
 
-#~ msgid "Find a contact"
-#~ msgstr "Finn en kontakt"
-
 #~ msgid "Mark Complete"
 #~ msgstr "Merk som fullf�rt"
 
@@ -29326,8 +29856,8 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgstr "PLAIN"
 
 #~ 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 ""
 #~ "Dette alternativet kobler til tjeneren med bruk av PLAIN SASL-mekanismen "
 #~ "hvis tjeneren st�tter det."
@@ -29349,20 +29879,20 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgstr "Sikker 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 ""
-#~ "For tilkobling til POP-tjenere over en SSL-forbindelse. POP-protokollen "
-#~ "kan ogs� brukes for � hente e-post fra enkelte e-posttilbydere via web i "
-#~ "tillegg til propriet�re e-postsystemer."
+#~ "For tilkobling til POP-tjenere over en SSL-forbindelse. POP-protokollen kan "
+#~ "ogs� brukes for � hente e-post fra enkelte e-posttilbydere via web i tillegg "
+#~ "til propriet�re e-postsystemer."
 
 #~ 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 ""
-#~ "For levering av e-post via en ekstern e-posttjener med SMTP over en SSL-"
-#~ "forbindelse.\n"
+#~ "For levering av e-post via en ekstern e-posttjener med SMTP over en "
+#~ "SSL-forbindelse.\n"
 
 #~ msgid ""
 #~ "One or more of your servers are not configured correctly.\n"
@@ -29545,9 +30075,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Enter the subject of the mail"
 #~ msgstr "Skriv inn emnet for meldingen"
 
-#~ msgid "Account Properties"
-#~ msgstr "Egenskaper for konto"
-
 #~ msgid "Incoming Mail Server"
 #~ msgstr "E-posttjener for innkommende post"
 
@@ -29648,9 +30175,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Page Set_up"
 #~ msgstr "Sideoppsett"
 
-#~ msgid "_Object"
-#~ msgstr "_Objekt"
-
 #~ msgid "Ne_xt"
 #~ msgstr "Nes_te"
 
@@ -29789,13 +30313,12 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgstr "Kalenderlager"
 
 #~ 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 ""
-#~ "Skriv inn ditt navn og din e-post adresse for bruk i utg�ende post. Du "
-#~ "kan ogs� skrive inn navnet p� din organisasjon, og navnet p� en "
-#~ "signaturfil."
+#~ "Skriv inn ditt navn og din e-post adresse for bruk i utg�ende post. Du kan "
+#~ "ogs� skrive inn navnet p� din organisasjon, og navnet p� en signaturfil."
 
 #~ msgid "Mail source type:"
 #~ msgstr "Type e-post-kilde:"
@@ -29812,9 +30335,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Edit Identity"
 #~ msgstr "Rediger identitet"
 
-#~ msgid "Edit News Server"
-#~ msgstr "Rediger news-tjener"
-
 #~ msgid "The connection was successful!"
 #~ msgstr "Tilkoblingen var vellykket!"
 
@@ -29840,8 +30360,7 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgstr "Videresender en melding uten emne"
 
 #~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded "
-#~ "message."
+#~ "Failed to generate mime part from message while generating forwarded message."
 #~ msgstr ""
 #~ "Kunne ikke generere MIME-del fra melding under generering av videresendt "
 #~ "melding."
@@ -29858,9 +30377,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "External Directories"
 #~ msgstr "Eksterne kataloger"
 
-#~ msgid "Port Number:"
-#~ msgstr "Portnummer:"
-
 #~ msgid "Outline:"
 #~ msgstr "Omriss:"
 
@@ -29933,15 +30449,9 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "yesterday"
 #~ msgstr "ig�r"
 
-#~ msgid "this"
-#~ msgstr "denne"
-
 #~ msgid "next"
 #~ msgstr "neste"
 
-#~ msgid "first"
-#~ msgstr "f�rste"
-
 #~ msgid "sixth"
 #~ msgstr "sjette"
 
@@ -29961,8 +30471,8 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
 #~ msgstr ""
-#~ "For lesing av e-post levert av det lokale systemet, og for lagring av e-"
-#~ "post p� lokal disk."
+#~ "For lesing av e-post levert av det lokale systemet, og for lagring av e-post "
+#~ "p� lokal disk."
 
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr "Kunne ikke endre navn p� mappe %s til %s: m�let eksisterer"
@@ -29979,9 +30489,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Cannot copy data to output file: %s"
 #~ msgstr "Kan ikke kopiere data til utfil: %s"
 
-#~ msgid "Could not rename folder `%s': %s"
-#~ msgstr "Kunne ikke endre navn p� mappe `%s': %s"
-
 #~ msgid "Could not rename folder `%s': %s exists"
 #~ msgstr "Kunne ikke endre navn p� mappe `%s': %s eksisterer"
 
@@ -30082,9 +30589,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "To Do List"
 #~ msgstr "Oppgaveliste"
 
-#~ msgid "Beep on display alarms"
-#~ msgstr "Pip ved visning av alarmer"
-
 #~ msgid "Audio alarms timeout after"
 #~ msgstr "Tidsavbrudd for lydalarmer"
 
diff --git a/po/pl.po b/po/pl.po
index c87113695c..006131157e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-11-14 19:26-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -34,21 +34,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importuje pliki VCard do 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 "Nazwa karty"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nazwa"
 
 #: 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 "E-mail"
 
 #: 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:1731
 msgid "Primary"
 msgstr "G��wny"
 
@@ -58,15 +59,16 @@ 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:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asystent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: 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
 msgid "Business"
 msgstr "Praca"
 
@@ -76,12 +78,12 @@ msgid "Bus"
 msgstr "Prc"
 
 #: 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:1720
 msgid "Callback"
 msgstr "Telefon kontaktowy"
 
 #: 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:1722
 msgid "Company"
 msgstr "Firma"
 
@@ -91,13 +93,14 @@ msgstr "Frma"
 
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: 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
 msgid "Home"
 msgstr "Dom"
 
 #: 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 "Organizacja"
 
@@ -106,18 +109,20 @@ msgid "Org"
 msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "Przeno�ny"
 
 #: 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:1721
 msgid "Car"
 msgstr "Samoch�d"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: 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:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Faks s�u�bowy"
 
@@ -126,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:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "Praca 2"
 
@@ -141,69 +146,68 @@ msgid "Bus 2"
 msgstr "Prc 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:1724
 msgid "Home 2"
 msgstr "Dom 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:1726
+#: 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:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "Inne"
 
 #: 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:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: 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: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:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-mail 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 "Serwis WWW"
 
@@ -212,7 +216,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 "Oddzia�"
 
@@ -221,7 +225,7 @@ msgid "Dep"
 msgstr "Oddz"
 
 #: 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 "Biuro"
 
@@ -230,12 +234,12 @@ msgid "Off"
 msgstr "Bro"
 
 #: 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 "Tytu�"
 
 #: 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 "Zaw�d"
 
@@ -244,7 +248,7 @@ msgid "Prof"
 msgstr "Zawd"
 
 #: 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 "Menad�er"
 
@@ -257,7 +261,7 @@ msgid "Ass"
 msgstr "Asyst"
 
 #: 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 "Przydomek"
 
@@ -266,12 +270,12 @@ msgid "Nick"
 msgstr "Przyd"
 
 #: 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 "Ma��onek"
 
 #: 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 "Notka"
 
@@ -284,7 +288,7 @@ msgid "CALUri"
 msgstr "URIKal"
 
 #: 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 sygnalizuj�cy zaj�to��"
 
@@ -313,302 +317,16 @@ msgstr "Kategorie"
 msgid "Family Name"
 msgstr "Nazwisko panie�skie"
 
-#: 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 "Karta: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Nazwa: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Przedrostek: "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Imi�:       "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Dodatkowe:  "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Rodzina:    "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Przyrostek: "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Data urodzenia: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adres:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Skrzynka pocztowa: "
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Rozszerzony: "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Ulica:       "
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Miasto:      "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Region:      "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Kod pocztowy: "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Kraj:        "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Etykieta pocztowa: "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefony:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-mail:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-mail:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Dostarczyciel poczty: "
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Strefa czasowa: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Po�o�enie geograficzne: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Stanowisko s�u�bowe: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Organizacja: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Nazwa: "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Jednostka: "
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Jednostka2: "
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Jednostka3: "
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Jednostka4: "
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategorie: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Komentarz: "
-
-#. 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"
-"Unikatowy napis: "
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Klucz publiczny: "
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Plik VCard z wieloma pozycjami"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "Plik VCard z pozycj� %s"
@@ -616,85 +334,89 @@ msgstr "Plik VCard z pozycj� %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: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:1130
-#: 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:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Nie mo�na zainicjowa� Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2215
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Wyszukiwanie..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
 #. 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 "B��d w wyra�eniu wyszukiwania."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:475
-msgid "Connecting to LDAP server..."
-msgstr "Nawi�zywanie po��czenia z serwerem LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:485
-msgid "Unable to connect to LDAP server."
-msgstr "Nie mo�na nawi�za� po��czenia z serwerem LDAP."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:501
-msgid "Waiting for connection to LDAP server..."
-msgstr "Oczekiwanie na po��czenie z serwerem LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:870
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Dodawanie karty na serwerze LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:971
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Usuwanie karty z serwera LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Modyfikowanie karty na serwerze LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2160
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Ponowne rozpoczynanie wyszukiwania."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Pobieranie wynik�w wyszukiwania na LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2165
-msgid "Restarting search."
-msgstr "Ponowne rozpoczynanie wyszukiwania."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "B��d przy usuwaniu karty"
 
-#: addressbook/conduit/address-conduit.c:294
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Nie mo�na rozpozna� URL-a \"%s\""
+
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "Adres e-mail:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Nie mo�na wczyta� kursora\n"
 
-#: addressbook/conduit/address-conduit.c:307
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "Nie mo�na wczyta� EBook\n"
 
-#: addressbook/conduit/address-conduit.c:1089
-#: calendar/conduits/calendar/calendar-conduit.c:981
-#: calendar/conduits/todo/todo-conduit.c:694
+#: 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 "Nie mo�na uruchomi� serwera wombat"
 
-#: addressbook/conduit/address-conduit.c:1090
-#: calendar/conduits/calendar/calendar-conduit.c:982
-#: calendar/conduits/todo/todo-conduit.c:695
+#: 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 "Nie mo�na uruchomi� wombata"
 
-#: 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 "Nie mo�na odczyta� bloku aplikacji adresowej pilota"
 
@@ -711,228 +433,112 @@ 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
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Przegl�darka miniaturowych kart ksi��ki adresowej Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Komponent Evolution obs�uguj�cy kontakty."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Generator przyk�adowych komponent�w ksi��ki adresowej"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Folder zawieraj�cy informacje o kontaktach"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "Serwer LDAP zawieraj�cy informacje o kontaktach"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Nowy kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
-msgstr "Nowy _kontakt"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Nowa lista kontakt�w"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
-msgstr "Nowa _lista kontakt�w"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
-msgstr "Ustawienia ksi��ki adresowej"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
-msgstr "Nazwa konta"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "Dodanie ksi��ki adresowej"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
-msgstr "�r�d�a ksi��ki adresowej"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
-msgstr "Podstawa"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Proste"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "De_lete"
-msgstr "_Usu�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "Adres e-mail:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolution wykorzysta ten adres e-mail przy uwierzytelnianiu na serwerze"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "One"
-msgstr "Pojedyncze"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
-msgstr "_Podstawa wyszukiwania:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search s_cope: "
-msgstr "_Zakres wyszukiwania:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Server Name"
-msgstr "Nazwa serwera"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid "Sub"
-msgstr "Podrz�dne"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "W celu dodania ksi��ki adresowej potrzebne s� poni�sze informacje."
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "This information is not required for most ldap servers. "
-msgstr "W przypadku wi�kszo�ci serwer�w LDAP te informacje nie s� potrzebne."
-
-#: 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 ""
-"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."
-
-#: 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 ""
-"To jest w�ze� bazowy dla wszystkich wyszukiwa� na serwerze LDAP. Aby uzysta� "
-"wi�cej informacji, skontaktuj si� z administratorem systemu."
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "This is the name of the server where your addressbook is located."
-msgstr "To jest nazwa serwera, na kt�rym zlokalizowana jest ksi��ka adresowa."
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
-msgstr "To jest numer portu, wykorzystywanego przez serwer 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 ""
-"Ta nazwa b�dzie wykorzystywana do identyfikacji konta. Jest ona przeznaczona "
-"tylko do wy�wietlania."
-
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "_Account name:"
-msgstr "Nazwa _konta:"
-
-#: 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 "_Dodaj"
-
-#: 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 "_Edycja"
-
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
-msgstr "_Serwer wymaga uwierzytelnienia"
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
-msgstr "P_ort:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
-msgstr "_Nazwa serwera:"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "Lista _kontakt�w"
 
-#: 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "Nie mo�na zainicjowa� gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:167
-msgid "Other Contacts"
-msgstr "Inne kontakty"
-
-#: addressbook/gui/component/addressbook.c:468
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Nie mo�na otworzy� ksi��ki adresowej"
 
-#: 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"
@@ -941,7 +547,7 @@ msgstr ""
 "Nie mo�na otworzy� tej ksi��ki adresowej. Mo�e to by� spowodowane\n"
 "wprowadzeniem niepoprawnego URI lub niedost�pno�ci� serwera LDAP."
 
-#: 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"
@@ -952,7 +558,7 @@ msgstr ""
 "Aby m�c wykorzysta� LDAP, nale�y pobra� OpenLDAP spod podanego\n"
 "poni�ej adresu i ponownie skompilowa� Evolution ze �r�de�.\n"
 
-#: 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."
@@ -960,57 +566,50 @@ 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:623
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Wprowad� has�o dla %s (u�ytkownik %s)"
 
-#: addressbook/gui/component/addressbook.c:786
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Jakiekolwiek pole zawiera"
-
-#: addressbook/gui/component/addressbook.c:787
-msgid "Name contains"
-msgstr "Nazwa zawiera"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "ko�czy si� na"
 
-#: addressbook/gui/component/addressbook.c:788
-msgid "Email contains"
-msgstr "E-mail zawiera"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "E-mail 2"
 
-#: addressbook/gui/component/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori� jest"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:772
+#: 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
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1031
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Dowolna kategoria"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1083
 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:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1686
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 msgid "Primary Email"
 msgstr "G��wny e-mail"
 
@@ -1056,6 +655,619 @@ 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
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "�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
+#, fuzzy
+msgid "Always"
+msgstr "Alarmy"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonimowy"
+
+#: 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 "Ponowne nawi�zywanie po��czenia z %s"
+
+#: 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 "Brak informacji"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "_Usu�"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Nazwa _listy:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "Adres e-mail:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Alarm Evolution"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr ""
+"Evolution wykorzysta ten adres e-mail przy uwierzytelnianiu na serwerze"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolution wykorzysta ten adres e-mail przy uwierzytelnianiu na serwerze"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "_Znajd�:"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Og�lne"
+
+#: 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 "Konfiguracja"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Marginesy"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_co"
+
+#: 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 "Pojedyncze"
+
+#: 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 "_Zakres wyszukiwania:"
+
+#. 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 "Wyszukiwanie"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Zaznacz wszystkie"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Usuni�ty"
+
+#: 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 "Informacje o �r�dle"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Nawi�zywanie po��czenia z serwerem..."
+
+#: 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 "Podrz�dne"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Nieobs�ugiwany schemat"
+
+#: 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 ""
+"Ta nazwa b�dzie wykorzystywana do identyfikacji konta. Jest ona przeznaczona "
+"tylko do wy�wietlania."
+
+#: 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 "_To jest adres pocztowy"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+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:139
+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 czynno��"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Dodaj czynno��"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Alarmy"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Usu� wszystko"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "Wy�wi_etlanie"
+
+#: 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:152 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 "_Edycja"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Zmodyfikuj termin"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Alarm 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 "Opcj_e"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "P_ort:"
+
+#: 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 "_Podstawa wyszukiwania:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Nazwa serwera:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Czas u�pienia (minuty)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Konto %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "Edytor listy kontakt�w"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Brak kart"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Ponowne nawi�zywanie po��czenia 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 "Og�lne"
+
+#: 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 "Wyszukiwanie"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Interfejs wyboru nazwy ksi��ki adresowej Evolution"
@@ -1065,9 +1277,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Generator interfejsu wyboru nazwy ksi��ki adresowej Evolution"
 
 #: 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: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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Usu�"
 
@@ -1096,7 +1308,12 @@ msgstr "(%d niewy�wietlonych)"
 msgid "Unnamed Contact"
 msgstr "Kontakt bez nazwy"
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Nadawca zawiera"
+
+#: 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"
@@ -1106,13 +1323,14 @@ 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."
 
-#: 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"
@@ -1124,88 +1342,107 @@ msgstr ""
 "Aby naprawi� ten problem, konieczne mo�e by� zako�czenie, a\n"
 "nast�pnie ponowne uruchomienie Evolution."
 
-#: 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 "Wyb�r kontakt�w z ksi��ki adresowej"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "Z_awieraj�cy:"
+msgid "Select Names"
+msgstr "Wyb�r nazw"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Co_ntacts:"
-msgstr "K_ontakty:"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Usun�� kontakt?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "F_ind"
-msgstr "_Znajd�:"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Kontakty"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "Wyb�r nazw"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
-msgstr "Wy�wietlenie kontakt�w, odpowiadaj�cych nast�puj�cym kryteriom:"
+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 "_Przenie�..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Folder:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Message Recipients:"
-msgstr "Odbiorcy _listu:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "Anni_versary:"
-msgstr "_Rocznica:"
+#, fuzzy
+msgid "A_ssistant's name:"
+msgstr "_Nazwisko asystenta:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "B_usiness"
-msgstr "Pra_ca"
+#, fuzzy
+msgid "Add_ress..."
+msgstr "Adre_s..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Business _Fax"
-msgstr "_Faks s�u�bowy"
+msgid "Anni_versary:"
+msgstr "_Rocznica:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#, fuzzy
+msgid "Birthda_y:"
+msgstr "_Urodziny:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#, fuzzy
+msgid "C_ontacts..."
+msgstr "_Kontakty..."
+
+#: 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 "Ka_tegorie..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr "Wsp�praca"
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Edytor kontakt�w"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "D_epartment:"
+msgstr "_Oddzia�:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Szczeg�y"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
 msgstr "URL sygnalizuj�cy zaj�to��:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "File A_s:"
 msgstr "N_azwa karty:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "General"
-msgstr "Og�lne"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#, fuzzy
+msgid "Full _Name..."
+msgstr "Pe�na _nazwa..."
 
-#: 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"
@@ -1215,1137 +1452,1194 @@ msgstr ""
 "informacje kalendarza, podaj tutaj adres\n"
 "tych informacji."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr "Nowy typ telefonu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "No_tes:"
 msgstr "No_tatki:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Organi_zation:"
 msgstr "_Organizacja:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#, fuzzy
+msgid "P_rofession:"
+msgstr "Z_aw�d:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Phone Types"
 msgstr "Typy telefon�w"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Wants to receive _HTML mail"
-msgstr "Chce otrzymywa� listy w HTML-u"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Address..."
-msgstr "Adre_s..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Assistant's name:"
-msgstr "_Nazwisko asystenta:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Birthday:"
-msgstr "_Urodziny:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+msgid "S_pouse:"
+msgstr "_Ma��onek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Business"
-msgstr "_Praca"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#, fuzzy
+msgid "This is the _mailing address"
+msgstr "_To jest adres pocztowy"
 
-#: 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 "_Kontakty..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "Wants to receive _HTML mail"
+msgstr "Chce otrzymywa� listy w HTML-u"
 
-#: 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: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:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "_Usu�"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Department:"
-msgstr "_Oddzia�:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Full Name..."
-msgstr "Pe�na _nazwa..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Home"
-msgstr "_Dom"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Job title:"
 msgstr "Tytu� s�u�_bowy:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager's Name:"
 msgstr "Nazwisko _szefa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Mobile"
-msgstr "P_rzeno�ny"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
 msgstr "Przy_domek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
 msgstr "_Biuro:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Profession:"
-msgstr "Z_aw�d:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Public Calendar URL:"
 msgstr "URL publicznego _kalendarza:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Spouse:"
-msgstr "_Ma��onek:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr "_To jest adres pocztowy"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "Adres strony _WWW:"
 
-#: 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:756
-msgid "Category editor not available."
-msgstr "Edytor kategorii nie jest dost�pny."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:763
-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:1662
-msgid "TTY/TDD"
-msgstr "TTy/TDD"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Nie mo�na odnale�� widgetu zwi�zanego z polem: \"%s\""
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
-msgstr "Szybkie dodanie kontaku"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
-msgstr "Pe�na edycja"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr "Pe�na nazwa"
-
-#: 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 "karta.vcf"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
-msgid "list"
-msgstr "lista"
-
-#: 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 istnieje.\n"
-"Czy chcesz go nadpisa�?"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adres _2:"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
+msgstr "Stany Zjednoczone"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: 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 "Albania"
 
-#: 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 "Algieria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "American Samoa"
 msgstr "Samoa Ameryka�ska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Andorra"
 msgstr "Andora"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Antarctica"
 msgstr "Antarktyka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Antigua And Barbuda"
 msgstr "Antigua i Barbuda"
 
-#: 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 "Argentyna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Aruba"
 msgstr "Aruba"
 
-#: 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 "Australia"
 
-#: 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 "Austria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Azerbaijan"
 msgstr "Azerbejd�an"
 
-#: 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 "Bahamy"
 
-#: 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 "Bahrain"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Bangladesh"
 msgstr "Bangladesz"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Belarus"
 msgstr "Bia�ogu�"
 
-#: 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 "Belgia"
 
-#: 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 "Belize"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bermuda"
 msgstr "Bermudy"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: 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 "Boliwia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bosnia And Herzegowina"
 msgstr "Bo�nia i Hercegowina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bouvet Island"
 msgstr "Wyspa Bouveta"
 
-#: 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 "Brazylia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "British Indian Ocean Territory"
 msgstr "Brytyjskie Terytorium Oceanu Spokojnego"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:33
-msgid "British Virgin Islands"
-msgstr "Brytyjskie Wyspy Dziewicze"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Brunei Darussalam"
 msgstr "Su�tanat 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 "Bu�garia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Cambodia"
 msgstr "Kambod�a"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: 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 "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cape Verde"
 msgstr "Wyspy Zielonego Przyl�dka"
 
-#: 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 "Kajmany"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Central African Republic"
 msgstr "Republika �rodkowej Afryki"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Chad"
 msgstr "Czad"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-msgid "Check Address"
-msgstr "Sprawd� adres"
-
-#: 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 "Chile"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "China"
 msgstr "Chiny"
 
-#: 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 "Wyspa Bo�ego Narodzenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cocos (Keeling) Islands"
 msgstr "Wyspy Kokosowe"
 
-#: 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 "Columbia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Comoros"
 msgstr "Komory"
 
-#: 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 "Kongo"
 
 # [cyba] Nie mam pewno�ci, ale jest zatoka Cooka, cie�nina, g�ry, wi�c chyba...
-#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Cook Islands"
 msgstr "Wyspy Cooka"
 
-#: 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 "Kostaryka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:56
-msgid "Countr_y:"
-msgstr "_Kraj:"
-
-#: 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 "Chorwacja"
 
-#: 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 "Kuba"
 
-#: 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 "Cypr"
 
-#: 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 "Republika Czeska"
 
-#: 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 "Dania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Djibouti"
 msgstr "D�ibuti"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Dominica"
 msgstr "Dominika"
 
-#: 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 "Republika Dominikany"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "East Timor"
 msgstr "Wschodni Timor"
 
-#: 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 "Ekwador"
 
-#: 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 "Egipt"
 
-#: 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 "Salwador"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Equatorial Guinea"
 msgstr "Gwinea R�wnikowa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Eritrea"
 msgstr "Erytrea"
 
-#: 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 "Estonia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Falkland Islands"
 msgstr "Falklandy"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Faroe Islands"
 msgstr "Wyspy Faroe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Fiji"
 msgstr "Fid�i"
 
-#: 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 "Finlandia"
 
-#: 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 "Francja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "French Guiana"
 msgstr "Gujana Francuska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "French Polynesia"
 msgstr "Polinezja Francuska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Southern Territories"
 msgstr "Francuskie terytoria po�udniowe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Gambia"
 msgstr "Gambia"
 
-#: 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 "Georgia"
 
-#: 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 "Niemcy"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Ghana"
 msgstr "Ghana"
 
-#: 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 "Gibraltar"
 
-#: 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 "Grecja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Greenland"
 msgstr "Grenlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Guadeloupe"
 msgstr "Gwadelupa"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Gwatemala"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guinea"
 msgstr "Gwinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guinea-bissau"
 msgstr "Gwinea Bissau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guyana"
 msgstr "Gujana"
 
-#: 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 "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 "Wyspy Headra i McDonalda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Holy See"
 msgstr "Watykan"
 
-#: 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 "Hinduras"
 
-#: 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 "Hong Kong"
 
-#: 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 "W�gry"
 
-#: 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 "Islandia"
 
-#: 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 "Indie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Indonesia"
 msgstr "Indonezja"
 
-#: 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 "Irlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Israel"
 msgstr "Izrael"
 
-#: 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 "W�ochy"
 
-#: 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 "Jamajka"
 
-#: 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 "Japonia"
 
-#: 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 "Jordania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Kazakhstan"
 msgstr "Kazahstan"
 
-#: 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 "Kiribati"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#, fuzzy
+msgid "Korea, Republic Of"
+msgstr "Republika Korei"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwejt"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Kyrgyzstan"
 msgstr "Kirgistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Litwa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: my-evolution/Locations.h:1198
 msgid "Lebanon"
 msgstr "Libia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: my-evolution/Locations.h:1234
 msgid "Lithuania"
 msgstr "�otwa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: my-evolution/Locations.h:1268
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Macau"
 msgstr "Makao"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Malaysia"
 msgstr "Malezja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Maldives"
 msgstr "Mo�dawia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Marshall Islands"
 msgstr "Wyspy Marshalla"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Martinique"
 msgstr "Martynika"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Mauritania"
 msgstr "Mauretania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mayotte"
 msgstr "Majotta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1387
 msgid "Mexico"
 msgstr "Meksyk"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Micronesia"
 msgstr "Mikronezja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+msgid "Moldova, Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Monaco"
 msgstr "Monako"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: my-evolution/Locations.h:1470
 msgid "Morocco"
 msgstr "Maroko"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mozambique"
 msgstr "Mozambik"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
 msgid "Netherlands"
 msgstr "Holandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Netherlands Antilles"
 msgstr "Antyle holenderskie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "New Caledonia"
 msgstr "Nowa Kaledonia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1560
 msgid "New Zealand"
 msgstr "Nowa Zelandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: my-evolution/Locations.h:1562
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: my-evolution/Locations.h:1574
 msgid "Norfolk Island"
 msgstr "Wyspa Norfolk"
 
 # [cyba] S� Mariany, wi�c p�nocne pewnie te�...
-#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Northern Mariana Islands"
 msgstr "P�nocne Mariany"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
 msgid "Norway"
 msgstr "Norwegia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1632
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
 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 "Palau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Palestinian Territory"
 msgstr "Autonomia Palesty�ska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
 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 "Papua Nowa Guinea"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1688
 msgid "Paraguay"
 msgstr "Paragwaj"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr "Filipiny"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
 msgid "Poland"
 msgstr "Polska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
 msgid "Portugal"
 msgstr "Portugalia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1824
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
 msgid "Qatar"
 msgstr "Katar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:173
-msgid "Republic Of Korea"
-msgstr "Republika Korei"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:174
-msgid "Republic Of Moldova"
-msgstr "Republika Mo�dawii"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Reunion"
 msgstr "Reunion"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
 msgid "Romania"
 msgstr "Rumunia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Russian Federation"
 msgstr "Federacja rosyjska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Saint Kitts And Nevis"
 msgstr "St Kitts i Nevis"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: 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 "Saint Vincent i Grenadyny"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "San Marino"
 msgstr "San Marino"
 
 # [cyba] Tak jest w moim atlasie, drugiej cz�ci nie ma
-#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: my-evolution/Locations.h:2035
 msgid "Saudi Arabia"
 msgstr "Arabia Saudyjska"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Seychelles"
 msgstr "Szeszele"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2090
 msgid "Singapore"
 msgstr "Singapur"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: my-evolution/Locations.h:2103
 msgid "Slovakia"
 msgstr "S�owacja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: my-evolution/Locations.h:2104
 msgid "Slovenia"
 msgstr "S�owenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Solomon Islands"
 msgstr "Wyspy Salomona"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2119
 msgid "South Africa"
 msgstr "Po�udniowa Afryka"
 
-#: 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 "Po�udniowa Georgia i Sandwich Po�udniowy"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
 msgid "Spain"
 msgstr "Hiszpania"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "St. Helena"
 msgstr "�wi�ta Helena"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre i Miquelon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
 msgid "Suriname"
 msgstr "Surinam"
 
-#: 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 "Wyspy Svalbard i Jan Mayen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Swaziland"
 msgstr "Suazi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
 msgid "Sweden"
 msgstr "Szwecja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2183
 msgid "Switzerland"
 msgstr "Szwajcaria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Tajikistan"
 msgstr "Tad�ykistan"
 
-#: 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 "Zjednoczona REpublika Tanzanii"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
 msgstr "Tajlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Trinidad And Tobago"
 msgstr "Trynidad i Tobago"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tunisia"
 msgstr "Tunezja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
 msgid "Turkey"
 msgstr "Turcja"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Turks And Caicos Islands"
 msgstr "Turks i Caicos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:218
-msgid "U.S. Virgin Islands"
-msgstr "Ameryka�skie Wyspy Dziewicze"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Uganda"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "United Arab Emirates"
 msgstr "Zjednoczone Emiraty Arabskie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2342
 msgid "United Kingdom"
 msgstr "Zjednoczone Kr�lestwo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr "Zjednoczona REpublika Tanzanii"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-msgid "United States"
-msgstr "Stany Zjednoczone"
-
-#: 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 "Oddalone drobne wyspy Stan�w Zjednoczonych"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: my-evolution/Locations.h:2348
 msgid "Uruguay"
 msgstr "Urugwaj"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2380
 msgid "Venezuela"
 msgstr "Wenezuela"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
 msgid "Viet Nam"
 msgstr "Wietnam"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#, fuzzy
+msgid "Virgin Islands, British"
+msgstr "Ameryka�skie Wyspy Dziewicze"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#, fuzzy
+msgid "Virgin Islands, U.S."
+msgstr "Ameryka�skie Wyspy Dziewicze"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Wallis And Futuna Islands"
 msgstr "Wyspy Wallis i Futuna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Western Sahara"
 msgstr "Zachodnia Sachara"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
 msgid "Yemen"
 msgstr "Jemen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2524
 msgid "Yugoslavia"
 msgstr "Jugos�awia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Usun�� kontakt?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+msgid "Category editor not available."
+msgstr "Edytor kategorii nie jest dost�pny."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+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
+#, fuzzy
+msgid "Save Contact as VCard"
+msgstr "Zapisz jako VCard"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr "TTy/TDD"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Nie mo�na odnale�� widgetu zwi�zanego z polem: \"%s\""
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+msgid "Contact Quick-Add"
+msgstr "Szybkie dodanie kontaku"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+msgid "Edit Full"
+msgstr "Pe�na edycja"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr "Pe�na nazwa"
+
+#: 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 "karta.vcf"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+msgid "list"
+msgstr "lista"
+
+#: 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 istnieje.\n"
+"Czy chcesz go nadpisa�?"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Adres _2:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "Sprawd� adres"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "_Kraj:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "_Miasto:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "Sk_rzynka pocztowa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Stan/Prowincja:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "K_od pocztowy:"
 
@@ -2444,10 +2738,15 @@ msgid "contact-list-editor"
 msgstr "Edytor listy kontakt�w"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 msgid "Contact List Editor"
 msgstr "Edytor listy kontakt�w"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#, fuzzy
+msgid "Save List as VCard"
+msgstr "Zapisz jako VCard"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Dodaj mimo tego"
@@ -2494,7 +2793,7 @@ msgstr ""
 "Czy pomimo tego chcesz go doda�?"
 
 #: 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 "Zaawansowane wyszukiwanie"
 
@@ -2503,219 +2802,321 @@ msgstr "Zaawansowane wyszukiwanie"
 msgid "Search"
 msgstr "Wyszukiwanie"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "liczba kart: 1"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "liczba kart: %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
-msgid "Save as VCard"
-msgstr "Zapisz jako VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Otw�rz"
-
-#: 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 "Prze�lij kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-msgid "Send Message to Contact"
-msgstr "Wy�lij list do kontaktu"
-
-#: 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 "Wydrukuj"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr "Wydrukuj kopert�"
-
-#: 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 "Usu�"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "B��d przy modyfikacji karty"
 
-#: 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:1043
 msgid "Success"
 msgstr "Sukces"
 
-#: 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: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
 msgid "Unknown error"
 msgstr "Nieznany b��d"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Repozytorium roz��czone"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "Brak uprawnie�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Nie odnaleziono karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "Karta z tym ID ju� istnieje"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protok� nie jest obs�ugiwany"
 
-#: 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:607 camel/camel-service.c:643
+#: 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
 msgid "Cancelled"
 msgstr "Anulowane"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Inny b��d"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "B��d przy dodawaniu listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "B��d przy dodawaniu karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "B��d przy modyfikacji listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "B��d przy usuwaniu listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "B��d przy usuwaniu karty"
 
-#. 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:204
+#, fuzzy
+msgid "Display Cards?"
+msgstr "Wy�wietlanie"
 
-#. 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"
+#: addressbook/gui/widgets/e-addressbook-util.c:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "Wy�wietlanie"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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 ""
-",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-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Brak kart"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Brak kart"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Brak kart"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Brak kart"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Kliknij, aby doda� kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "G��wny telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Telefon asystenta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Telefon s�u�bowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Telefon callbacka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Telefon firmowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Telefon domowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Adres firmowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Adres domowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Telefon przeno�ny"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Telefon samochodowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Telefon s�u�bowy 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Telefon domowy 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Inny telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Zapisz jako VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Nowy kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Nowa lista kontakt�w"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Przejd� do folderu..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "Za_importuj..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Szukaj kontakt�w"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "�r�d�a ksi��ki adresowej..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Ustawienia pilota..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Prze�lij kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Wy�lij list do kontaktu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Wydrukuj kopert�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "S_kopiuj do folderu..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "P_rzenie� do folderu..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Wytnij"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Bie��cy widok"
+
+#. 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:940
+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:945
+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."
@@ -2729,11 +3130,12 @@ msgstr "oraz jedna inna karta."
 msgid "Save in addressbook"
 msgstr "Zapisz w ksi��ce adresowej"
 
-#: 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 ""
@@ -2743,10 +3145,37 @@ msgstr ""
 "\n"
 "Dwukrotne klikni�cie stworzy nowy kontakt."
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Brak element�w w tym widoku\n"
+"\n"
+"Dwukrotne klikni�cie stworzy nowy kontakt."
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Widok karty"
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr "Wydrukuj kopert�"
+
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr "Wydrukuj karty"
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+msgid "Print card"
+msgstr "Wydrukuj kart�"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10-punktowa Tahoma"
@@ -2816,6 +3245,7 @@ msgid "Include:"
 msgstr "Do��czanie:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Pejza�"
 
@@ -2840,10 +3270,12 @@ msgid "Options"
 msgstr "Opcje"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "U�o�enie"
 
 #: addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "Strona"
 
@@ -2859,7 +3291,9 @@ msgstr "Papier"
 msgid "Paper source:"
 msgstr "�r�d�o papieru:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Portret"
 
@@ -2915,62 +3349,49 @@ msgstr "Szeroko��:"
 msgid "_Font..."
 msgstr "_Czcionka..."
 
-#: addressbook/printing/e-contact-print.c:1111
-msgid "Print cards"
-msgstr "Wydrukuj karty"
-
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-msgid "Print card"
-msgstr "Wydrukuj kart�"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr "Wydrukuj kopert�"
-
-#: calendar/cal-util/cal-component.c:1202
+#: calendar/cal-util/cal-component.c:1207
 msgid "Untitled appointment"
 msgstr "Termin pozbawiony nazwy"
 
-#: 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:405 mail/message-list.c:651
+#: 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
 msgid "High"
 msgstr "Wysoki"
 
-#: 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:650
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Zwyk�y"
 
-#: 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:407 mail/message-list.c:649
+#: 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
 msgid "Low"
 msgstr "Niski"
 
 #. 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
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
-#: calendar/conduits/calendar/calendar-conduit.c:937
-#: calendar/conduits/todo/todo-conduit.c:649
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "B��d przy komunikacji z serwerem kalendarza"
 
-#: 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 "Nie mo�na odczyta� bloku aplikacji kalendarza pilota"
 
-#: calendar/conduits/todo/todo-conduit.c:756
-#: calendar/conduits/todo/todo-conduit.c:759
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "P_riorytet:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie mo�na odczyta� bloku aplikacji \"do zrobienia\" pilota"
 
@@ -2983,41 +3404,55 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Komponent Bonobo wy�wietlaj�cy kalendarz."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Ustawienia kalendarza i zada�"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Komponent Bonobo obs�uguj�cy kalendarz."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr "Generator formantu zada� Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "Generator formantu wy�wietlania iTip kalendarza"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "Generator przyk�adowego formantu kalendarza"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Generator centralizuj�cy okna edytora komponentu kalendarza"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr "Generator tworz�cy generator komponentu edytora"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 "Us�uga przypominania za pomoc� alarmu"
@@ -3026,22 +3461,10 @@ 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
-msgid "Starting:"
-msgstr "Pocz�tek:"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-msgid "Ending:"
-msgstr "Koniec:"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "niepoprawny czas"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-msgid "Evolution Alarm"
-msgstr "Alarm Evolution"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3064,11 +3487,11 @@ msgstr "Czas u�pienia (minuty)"
 msgid "_Edit appointment"
 msgstr "_Zmodyfikuj termin"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:670
+#: calendar/gui/alarm-notify/alarm-queue.c:675
 msgid "No description available."
 msgstr "Brak opisu."
 
-#: 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"
@@ -3080,11 +3503,17 @@ msgstr ""
 "z powiadamianiem za po�rednictwem list�w. Zamiast tego\n"
 "zostanie wy�wietlone zwyk�e okno przypomnienia."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:781
-#, c-format
+#: calendar/gui/alarm-notify/alarm-queue.c:753
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Ostrze�enie"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:758
+#, fuzzy, 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"
@@ -3097,7 +3526,12 @@ msgstr ""
 "\n"
 "Czy na pewno chcesz uruchomi� ten program?"
 
-#: 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 "Bez pytania o to w przysz�o�ci."
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Nie mo�na zainicjowa� GNOME"
 
@@ -3109,52 +3543,66 @@ msgstr "Nie mo�na stworzy� us�ugi przypominania za pomoc� alarmu"
 msgid "Could not create the alarm notify service factory"
 msgstr "Nie mo�na stworzy� generatora us�ugi przypominania za pomoc� alarmu"
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Zestawienie zawiera"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Opis zawiera"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Komentarz zawiera"
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr "Niedopasowane"
+
+#: 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: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/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:805
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 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:384
 msgid "Private"
 msgstr "Prywatny"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Tajny"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Publiczny"
 
@@ -3175,32 +3623,27 @@ msgid "W"
 msgstr "W"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Wolny"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 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:479 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Zako�czone"
 
@@ -3216,12 +3659,13 @@ 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/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/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
+#: 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 "Brak"
 
@@ -3233,23 +3677,15 @@ msgstr "Powtarzanie"
 msgid "Assigned"
 msgstr "Przyporz�dkowany"
 
-#: 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:803
+#: 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
 msgid "Yes"
 msgstr "Tak"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr "Nie"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1974 calendar/gui/e-day-view.c:1675
-#: calendar/gui/e-week-view.c:1182
-msgid "Searching"
-msgstr "Wyszukiwanie"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Widok dnia"
@@ -3266,63 +3702,79 @@ msgstr "Widok tygodnia"
 msgid "Month View"
 msgstr "Widok miesi�ca"
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
-msgstr "Zestawienie zawiera"
-
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
-msgstr "Opis zawiera"
-
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "Komentarz zawiera"
-
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
-msgid "Unmatched"
-msgstr "Niedopasowane"
-
-#: 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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Folder zawieraj�cy terminy i zdarzenia"
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Zadania"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Folder zawieraj�cy pozycje do wykonania"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "Tworzy nowy termin"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "Ustawienia �r�de� nowo�ci"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "Spotkanie"
+
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "Nowe zadanie"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "_Zadanie"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Nowy termin"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "Nowy _termin"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
-msgstr "Tworzy nowe zadanie"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Nowy termin"
+
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "Termin"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "Nowe _zadanie"
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Nie mo�na otworzy� folderu w \"%s\""
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URI wy�wietlany przez kalendarz"
 
+#: 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 "Ustawienia alarmu d�wi�kowego"
@@ -3489,12 +3941,12 @@ msgstr "%s %s po ko�cu terminu"
 msgid "%s at the end of the appointment"
 msgstr "%s na ko�cu terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:453
+#: calendar/gui/dialogs/alarm-page.c:452
 #, c-format
 msgid "%s at %s"
 msgstr "%s o %s"
 
-#: calendar/gui/dialogs/alarm-page.c:459
+#: calendar/gui/dialogs/alarm-page.c:458
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s z nieznanym typem warunku"
@@ -3515,7 +3967,7 @@ msgstr "Przypominanie"
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "Zestawienie:"
 
@@ -3523,12 +3975,11 @@ msgstr "Zestawienie:"
 msgid "_Options..."
 msgstr "_Opcje..."
 
-#. 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 "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "przed"
 
@@ -3545,7 +3996,7 @@ msgstr "koniec terminu"
 msgid "hour(s)"
 msgstr "godzin"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "minut"
 
@@ -3586,171 +4037,169 @@ msgid "Color for tasks due today"
 msgstr "Kolor dzisiejszych zada�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Tworzenie nowych termin�w z domy�lnym p_rzypomnieniem"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Dni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Pierwszy dzie� _tygodnia:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Pi�tek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Godzin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Poniedzia�ek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Z_aleg�e zadania:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: 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"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
 msgstr ""
-"Wy�wietlanie _czas�w zako�czenia termin�w w widoku tygodniowym i miesi�cznym"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 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:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_Nie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Zadania na _dzi�:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "_Czw"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "_Wto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Zadania na _dzi�:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "Lista _zada�"
 
-#: 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 "Czwartek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Czas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Strefa c_zasowa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Prze_dzia�y czasu:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Format czasu:"
 
-#: 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 "Wtorek"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "�roda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Tydzie� roboczy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12-godzinny (AP/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24-godzinny"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Potwierdzanie przed usuni�ciem element�w"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "_Kompresowanie weekend�w na widoku miesi�cznym"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "Wy�wi_etlanie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_End of day:"
 msgstr "_Koniec dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Pi�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "Og�_lne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "_Ukrywanie zako�czonych zada� po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "P_on"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Inne"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Z_aleg�e zadania:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_Sob"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "Lista _zada�"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Prze_dzia�y czasu:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "�_ro"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "przed pocz�tkiem terminu"
 
@@ -3814,73 +4263,60 @@ msgstr "%s  Wprowadzono zmiany. Anulowa� je wszystkie i uaktualni� edytor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nie wprowadzono �adnych zmian, uaktualni� edytor?"
 
-#: 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 " do "
 
-#: 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 " (Zako�czone "
 
-#: 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 "Zako�czone"
 
-#: 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 " (Nale�ne "
 
-#: 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 "Nale�ne "
 
-#: calendar/gui/dialogs/comp-editor.c:303
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "Nie mo�na uaktualni� obiektu!"
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Wpis dziennika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Brak zestawienia"
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1897
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "Nadpisa� plik?"
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1904
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Plik o tej nazwie ju� istnieje.\n"
-"Nadpisa� go?"
-
-#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Nie mo�na uzyska� bie��cej wersji!"
 
@@ -3938,7 +4374,7 @@ msgstr "Oddelegowanie do:"
 msgid "Enter Delegate"
 msgstr "Oddelegowanie"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Termin"
 
@@ -3952,13 +4388,13 @@ msgstr "Powtarzalno��"
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 msgid "Scheduling"
 msgstr "Planowanie"
 
 #: calendar/gui/dialogs/event-editor.c:207
 #: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "Spotkanie"
 
@@ -3991,30 +4427,42 @@ msgid "F_ree"
 msgstr "_Wolny"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
+#, fuzzy
+msgid "L_ocation:"
+msgstr ""
+"\n"
+"Po�o�enie geograficzne: "
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "P_rywatny"
 
-#: 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 "Pu_bliczny"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Forma wy�wietlania czasu"
 
-#: 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 "Z_estawienie:"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Kontakty..."
+
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "_Czas zako�czenia:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "Cza_s rozpocz�cia:"
 
@@ -4041,55 +4489,49 @@ msgstr "Uczestnik"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "Wsp�lna nazwa"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Oddelegowane od"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Oddelegowane do"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "J�zyk"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Cz�onek"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:798
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Rola"
 
-#: 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/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"
 msgstr "Stan"
 
-#: 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -4104,7 +4546,7 @@ msgid "_Change Organizer"
 msgstr "_Zmie� organizatora"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:445
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "_Zapro� innych..."
 
@@ -4112,28 +4554,99 @@ msgstr "_Zapro� innych..."
 msgid "_Other Organizer"
 msgstr "_Inny organizator"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Termin zawiera powt�rzenia, kt�rych nie mo�na zmienia� za pomoc� Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "lista"
+
+#: 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 "Inne"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "P�noc"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "lista"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Inny faks"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dzie�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "w"
 
-#: 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 "powt�rzeniami"
 
@@ -4197,17 +4710,23 @@ msgstr "tygodni"
 msgid "year(s)"
 msgstr "lat"
 
-#: 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 "Informacje o spotkaniu zosta�y zmienione. Czy wys�a� aktualn� wersj�?"
+
+#: calendar/gui/dialogs/send-comp.c:59
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Informacje o spotkaniu zosta�y zmienione. Czy wys�a� aktualn� wersj�?"
 
-#: 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 "Informacje o zadaniu zosta�y zmienione. Czy wys�a� aktualn� wersj�?"
 
-#: calendar/gui/dialogs/send-comp.c:65
-msgid "The journal entry has changed. Send an updated version?"
-msgstr "Wpis dziennika zosta� zmieniony. Czy wys�a� aktualn� wersj�?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
+msgstr "Informacje o zadaniu zosta�y zmienione. Czy wys�a� aktualn� wersj�?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
@@ -4224,7 +4743,7 @@ msgid "Progress"
 msgstr "Post�p"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4236,15 +4755,19 @@ msgstr "P_riorytet:"
 msgid "_Status:"
 msgstr "_Stan:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "Proste"
+
 #: 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:324
 msgid "Assignment"
 msgstr "Przyporz�dkowanie"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Opis:"
 
@@ -4256,191 +4779,154 @@ msgstr "Cza_s rozpocz�cia:"
 msgid "_Due Date:"
 msgstr "_Czas zako�czenia:"
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: 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:751 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:941 calendar/gui/e-day-view.c:3544
-#: calendar/gui/e-week-view.c:3422 mail/folder-browser.c:1447
-#: shell/e-shortcuts-view.c:384
+#: 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
 msgid "_Open"
 msgstr "_Otw�rz"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Zapisz jako..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "Wy_drukuj..."
+
+#: calendar/gui/e-calendar-table.c:978 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:947 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3433 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:979 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:949 calendar/gui/e-day-view.c:3530
-#: calendar/gui/e-day-view.c:3557 calendar/gui/e-week-view.c:3409
-#: calendar/gui/e-week-view.c:3435 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:980 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 "Wk_lej"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Przypisz zadanie"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Prze�lij jako i_Calendar"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Oznacz jako zako�czone"
 
-#: calendar/gui/e-calendar-table.c:956
-msgid "_Delete this Task"
-msgstr "_Usu� zadanie"
-
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_Oznacz zadania jako zako�czone"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_Usu� zaznaczone zadania"
 
-#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7115
-#: calendar/gui/e-week-view.c:3918
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Aktualizowanie obiekt�w"
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Kliknij, aby doda� zadanie"
 
-#. 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 %H:%M:%S"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Data musi by� podana w formacie: \n"
-"\n"
-"%s"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Zako�czone"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Data zako�czenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Data wykonania"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Data zako�czenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Pozycja geograficzna"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Priorytet"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Zestawienie"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Porz�dek zada�"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 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 %H:%M:%S"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Data musi by� podana w formacie: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -4448,376 +4934,174 @@ msgstr "%02i-minutowe przedzia�y czasu"
 
 #. 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"
 
 #. 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"
 
 #. 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
 msgid "am"
 msgstr "am"
 
 #. 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
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "Nowy _termin"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Nowe zdarzenie _ca�odniowe"
 
-#: 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:3553 calendar/gui/e-week-view.c:3440
+#, fuzzy
+msgid "New Meeting"
+msgstr "Spotkanie"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Nowe zadanie"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Wydrukuj..."
+
+#: 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 "Przejd� do d_zisiaj"
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 msgid "_Go to Date..."
 msgstr "_Przejd� do daty..."
 
-#: calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-msgid "_Delete this Appointment"
-msgstr "_Usu� termin"
+#: 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 "_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
+#, fuzzy
+msgid "_Configure..."
+msgstr "Konfiguracja"
 
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
+msgid "_Save As..."
+msgstr "Zapisz j_ako..."
+
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "_Zaplanuj spotkanie"
+
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Prze�lij jako i_Calendar"
+
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "Przekszta�� to wyst�pienie w p_rzesuwalne"
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "Usu� to _wyst�pienie"
 
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 msgid "Delete _All Occurrences"
 msgstr "Usu� w_szystkie wyst�pienia"
 
-#: calendar/gui/e-itip-control.c:524
-msgid "Meeting begins: <b>"
-msgstr "Czas rozpocz�cia spotkania: <b>"
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Task begins: <b>"
-msgstr "Czas rozpocz�cia zadania: <b>"
-
-#: calendar/gui/e-itip-control.c:534
-msgid "Free/Busy info begins: <b>"
-msgstr "Czas rozpocz�cia informacji o zaj�to�ci: <b>"
-
-#: calendar/gui/e-itip-control.c:538
-msgid "Begins: <b>"
-msgstr "Rozpocz�cie: <b>"
-
-#: calendar/gui/e-itip-control.c:550
-msgid "Meeting ends: <b>"
-msgstr "Czas zako�czenia spotkania spotkania: <b>"
-
-#: calendar/gui/e-itip-control.c:553
-msgid "Free/Busy info ends: <b>"
-msgstr "Czas zako�czenia informacji o zaj�to�ci: <b>"
-
-#: calendar/gui/e-itip-control.c:557
-msgid "Ends: <b>"
-msgstr "Zako�czenie: <b>"
-
-#: calendar/gui/e-itip-control.c:571
-msgid "Task Completed: <b>"
-msgstr "Zadanie uko�czone: <b>"
-
-#: calendar/gui/e-itip-control.c:581
-msgid "Task Due: <b>"
-msgstr "Zadanie na: <b>"
-
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
-msgid "iCalendar Information"
-msgstr "Informacje iKalendarza"
-
-#. Title
-#: calendar/gui/e-itip-control.c:633
-msgid "iCalendar Error"
-msgstr "B��d iKalendarza"
-
-#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
-msgid "An unknown person"
-msgstr "Nieznana osoba"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
-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:737
-msgid "<i>None</i>"
-msgstr "<i>Brak</i>"
-
-#: 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
-msgid "Choose an action:"
-msgstr "Wyb�r czynno�ci:"
-
-#: calendar/gui/e-itip-control.c:779
-msgid "Update"
-msgstr "Aktualizacja"
-
-#: 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
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:795
-msgid "Accept"
-msgstr "Akceptacja"
-
-#: calendar/gui/e-itip-control.c:796
-msgid "Tentatively accept"
-msgstr "Pr�bna akceptacja"
-
-#: calendar/gui/e-itip-control.c:797
-msgid "Decline"
-msgstr "Odrzucenie"
-
-#: calendar/gui/e-itip-control.c:811
-msgid "Send Free/Busy Information"
-msgstr "Wys�anie informacji o zaj�to�ci"
-
-#: calendar/gui/e-itip-control.c:824
-msgid "Update respondent status"
-msgstr "Pobranie stanu wezwanej osoby"
-
-#: calendar/gui/e-itip-control.c:838
-msgid "Send Latest Information"
-msgstr "Wys�anie naj�wie�szej informacji"
-
-#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: calendar/gui/e-itip-control.c:867
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> opublikowa� informacje o spotkaniu."
-
-#: calendar/gui/e-itip-control.c:868
-msgid "Meeting Information"
-msgstr "Informacje o spotkaniu"
-
-#: calendar/gui/e-itip-control.c:872
-#, 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:873
-msgid "Meeting Proposal"
-msgstr "Propozycja spotkania"
-
-#: calendar/gui/e-itip-control.c:877
-#, 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:878
-msgid "Meeting Update"
-msgstr "Aktualizacja spotkania"
-
-#: calendar/gui/e-itip-control.c:882
-#, 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:883
-msgid "Meeting Update Request"
-msgstr "Zwr�cenie si� o aktualizacj� spotkania"
-
-#: calendar/gui/e-itip-control.c:887
-#, 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:888
-msgid "Meeting Reply"
-msgstr "Odpowied� na spotkanie"
-
-#: calendar/gui/e-itip-control.c:892
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> anulowa� spotkanie."
-
-#: calendar/gui/e-itip-control.c:893
-msgid "Meeting Cancellation"
-msgstr "Anulowanie spotkania"
-
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
-#: calendar/gui/e-itip-control.c:982
-#, 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:898
-msgid "Bad Meeting Message"
-msgstr "Niepoprawna wiadomo�� o spotkaniu"
-
-#: calendar/gui/e-itip-control.c:917
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> opublikowa� informacje o spotkaniu."
-
-#: calendar/gui/e-itip-control.c:918
-msgid "Task Information"
-msgstr "Informacje o zadaniu"
-
-#: calendar/gui/e-itip-control.c:922
-#, 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:923
-msgid "Task Proposal"
-msgstr "Propozycja zadania"
-
-#: calendar/gui/e-itip-control.c:927
-#, 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:928
-msgid "Task Update"
-msgstr "Aktualizacja zadania"
-
-#: calendar/gui/e-itip-control.c:932
-#, 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:933
-msgid "Task Update Request"
-msgstr "Zwr�cenie si� o aktualizacj� zadania"
-
-#: calendar/gui/e-itip-control.c:937
-#, 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:938
-msgid "Task Reply"
-msgstr "Odpowied� na zadanie"
-
-#: calendar/gui/e-itip-control.c:942
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> anulowa� zadanie."
-
-#: calendar/gui/e-itip-control.c:943
-msgid "Task Cancellation"
-msgstr "Anulowanie zadania"
-
-#: calendar/gui/e-itip-control.c:948
-msgid "Bad Task Message"
-msgstr "Niepoprawna wiadomo�� o zadaniu"
-
-#: calendar/gui/e-itip-control.c:967
-#, 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:968
-msgid "Free/Busy Information"
-msgstr "Informacja o zaj�to�ci"
-
-#: calendar/gui/e-itip-control.c:972
-#, 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:973
-msgid "Free/Busy Request"
-msgstr "Zwr�cenie si� o informacj� o zaj�to�ci"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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-itip-control.c:977
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, 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:978
-msgid "Free/Busy Reply"
-msgstr "Odpowied� z informacj� o zaj�to�ci"
-
-#: calendar/gui/e-itip-control.c:983
-msgid "Bad Free/Busy Message"
-msgstr "Niepoprawna wiadomo�� o zaj�to�ci"
-
-#: calendar/gui/e-itip-control.c:1052
-msgid "The message does not appear to be properly formed"
-msgstr "Forma listu jest niepoprawna"
-
-#: calendar/gui/e-itip-control.c:1071
-msgid "The message contains only unsupported requests."
-msgstr "Lista zawiera tylko nieobs�ugiwane ��dania."
-
-#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
-msgid "The attachment does not contain a valid calendar message"
-msgstr "Za��cznik nie zawiera poprawnego komunikatu kalendarza"
+msgid "Error executing %s."
+msgstr "B��d przy wykonywaniu %s."
 
-#: calendar/gui/e-itip-control.c:1130
-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: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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1229
+#: 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:1231
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Aktualizacja zako�czona\n"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 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:1284
-msgid "Attendee status ould not be updated!\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:1286
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Stan uczestnika zosta� uaktualniony\n"
 
-#: calendar/gui/e-itip-control.c:1288
-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:1316
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Usuni�cie zako�czone"
 
-#: calendar/gui/e-itip-control.c:1348 calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Element zosta� wys�any!\n"
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Nie mo�na wys�a� elementu!\n"
 
-#: calendar/gui/e-itip-control.c:1566
-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"
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Wyb�r folderu"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Wyb�r folderu"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4856,211 +5140,213 @@ msgstr "data-pocz�tkowa"
 msgid "date-start"
 msgstr "data-ko�cowa"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Osoby przewodnicz�ce"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1535
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Wymagani uczestnicy"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "Opcjonalni uczestnicy"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "Nie uczestnicy"
 
-#: 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:771
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Osoba"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Zas�b"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Pomieszczenie"
 
-#: 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:775
-#: calendar/gui/e-meeting-model.c:791
-#: 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 "Nieznany"
-
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "Przewodniczenie"
 
-#: 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:788
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "Wymagany uczestnik"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "Opcjonalny uczestnik"
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Nie uczestnik"
 
-#: 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:816
+#: 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 "Wymaga dzia�ania"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr "Zaakceptowane"
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 msgid "Declined"
 msgstr "Odrzucone"
 
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:819 calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Pr�bnie zaakceptowane"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "Oddelegowane"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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:2113 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel-item.c:479
+#: calendar/gui/e-meeting-time-sel.c:2118 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
-#: 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 "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:428
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "Poza biurem"
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Brak informacji"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "Opcj_e"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Wy�wietlanie _tylko godzin roboczych"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "Wy�wietlanie w p_owi�kszeniu"
 
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "_Uaktualnij informacj� o zaj�to�ci"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Automatyczny wyb�r"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "_Wszyscy ludzie i zasoby"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "Wszyscy _ludzie i jeden zas�b"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "Wy_magani ludzie"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "Wymagani ludzie i j_eden zas�b"
 
-#: calendar/gui/e-meeting-time-sel.c:641
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "Czas p_ocz�tku spotkania:"
 
-#: calendar/gui/e-meeting-time-sel.c:660
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Czas _ko�ca spotkania:"
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otwieranie zada� z %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 "Nie mo�na wczyta� zadania w \"%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 "Metoda wymagana do odczytu \"%s\" nie jest obs�ugiwana"
 
-#: calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Data zako�czenia"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Usuwanie zaznaczonych obiekt�w"
+
+#: calendar/gui/e-tasks.c:659
+#, fuzzy
+msgid "Expunging"
+msgstr "Oczyszczanie folderu"
+
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Nowy _termin..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "_Usu� termin"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nie mo�na otworzy� folderu w \"%s\""
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1865
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otwieranie kalendarza z %s"
@@ -5121,268 +5407,261 @@ msgstr "Pa�dziernik"
 msgid "September"
 msgstr "Wrzesie�"
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:220
+#, fuzzy
+msgid "At least one attendee is necessary"
 msgstr "Wymagany jest co najmniej jeden uczestnik"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "Nale�y poda� organizatora."
 
-#: calendar/gui/itip-utils.c:570
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Musisz nale�e� do uczestnik�w zdarzenia."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr "Nie mo�na stworzy� generatora komponentu edytora"
 
-#: 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 "Ni"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Wt"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "�r"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Cz"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Pt"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "So"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Wybrany dzie� dzie� (%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 "Wybrany tydzie� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Wybrany miesi�c (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Wybrany rok (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Zadanie"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Stan: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Priorytet: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Procent zako�czenia: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Kategorie: %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "Kontakty: "
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Wydrukuj kalendarz"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2358 my-evolution/e-summary.c:619
-#: 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Podgl�d wydruku"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Wydruk elementu"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Ustawienia wydruku"
 
-#: calendar/gui/tasks-control.c:126
-msgid "The URI of the tasks folder to display"
-msgstr "URI folderu zada�, kt�ry nale�y wy�wietli�"
-
 #: calendar/gui/tasks-control-factory.c:75
 msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie mo�na stworzy� widoku zada�.  Zweryfikuj ustawienia ORBita i OAF-a."
 
+#: calendar/gui/tasks-control.c:147
+msgid "The URI of the tasks folder to display"
+msgstr "URI folderu zada�, kt�ry nale�y wy�wietli�"
+
+#: 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 ""
+"Wykonanie tej operacji spowoduje trwa�e usuni�cie wszystkich list�w "
+"oznaczonych do usuni�cia. W przypadku kontynuowania operacji p�niejsze "
+"odzyskanie list�w nie b�dzie mo�liwe.\n"
+"\n"
+"Czy rzeczywi�cie usun�� te listy?"
+
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+msgid "Do not ask me again."
+msgstr "Bez pytania o to w przysz�o�ci."
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Wydrukuj karty"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5425,100 +5704,134 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "NPW�CPS"
 
-#: calendar/pcs/query.c:234
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "Generator importu plik�w z VCard do Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "Importuje pliki VCard do Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "Importuje pliki VCard do Evolution."
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Komunikat kalendarza"
+
+#: calendar/importers/icalendar-importer.c:663
+#, fuzzy
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Odnaleziono pliki pocztowe programu Pine.\n"
+"Czy chcesz zaimportowa� je do Evolution?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Kalendarz"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now wymaga 0 argument�w"
 
-#: calendar/pcs/query.c:258
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "time-now wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:263
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time wymaga, �eby 1. argument by� napisem"
 
-#: 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 wymaga, aby 1. argument by� napisem z dat�/czasem w formacie ISO "
 "8601"
 
-#: calendar/pcs/query.c:300
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day wymaga 2 argument�w"
 
-#: 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 wymaga, aby 1. argument by� liczb� okre�laj�c� czas (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 wymaga, aby 2. argument by� liczb� ca�kowit�"
 
-#: calendar/pcs/query.c:339
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin wymaga 1 argumentu"
 
-#: 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 wymaga, aby 1. argument by� liczb� okre�laj�c� czas (time_t)"
 
-#: calendar/pcs/query.c:371
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end wymaga 1 argumentu"
 
-#: 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 wymaga, aby 1. argument by� liczb� okre�laj�c� czas (time_t)"
 
-#: calendar/pcs/query.c:412
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype wymaga 0 argument�w"
 
-#: calendar/pcs/query.c:508
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? wymaga 2 argument�w"
 
-#: 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? wymaga, aby 1. argument by� liczb� okre�laj�c� czas "
 "(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? wymaga, aby 2. argument by� liczb� okre�laj�c� czas "
 "(time_t)"
 
-#: calendar/pcs/query.c:650
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? wymaga 2 argument�w"
 
-#: calendar/pcs/query.c:655
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? wymaga, �eby 1. argument by� napisem"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? wymaga, �eby 2. argument by� napisem"
 
-#: calendar/pcs/query.c:679
+#: 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:721
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? wymaga co najmniej 1 argumentu"
 
-#: 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)"
@@ -5526,44 +5839,1671 @@ msgstr ""
 "has-categories? wymaga, �eby wszystkie argumenty by�y napisami, lub �eby "
 "podany by� dok�adnie jeden argument, b�d�cy fa�szem logicznym (#f)"
 
-#: calendar/pcs/query.c:821
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? wymaga 0 argument�w"
 
-#: calendar/pcs/query.c:866
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:871
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 "completed-before? wymaga, aby 1. argument by� liczb� okre�laj�c� czas "
 "(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 "Przetworzenie wyra�enia wyszukiwania nie da�o warto�ci logicznej"
 
-#: camel/camel-cipher-context.c:171
+#.
+#. * 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 "D�ibuti"
+
+#: 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 "Samoa Ameryka�ska"
+
+#: calendar/zones.h:60
+#, fuzzy
+msgid "America/Anchorage"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:61
+#, fuzzy
+msgid "America/Anguilla"
+msgstr "Anguilla"
+
+#: calendar/zones.h:62
+#, fuzzy
+msgid "America/Antigua"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:63
+#, fuzzy
+msgid "America/Araguaina"
+msgstr "Nikaragua"
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+#, fuzzy
+msgid "America/Asuncion"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:66
+#, fuzzy
+msgid "America/Barbados"
+msgstr "Barbados"
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: calendar/zones.h:68
+#, fuzzy
+msgid "America/Belize"
+msgstr "Belize"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+#, fuzzy
+msgid "America/Bogota"
+msgstr "Samoa Ameryka�ska"
+
+#: 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 "Samoa Ameryka�ska"
+
+#: calendar/zones.h:76
+#, fuzzy
+msgid "America/Catamarca"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+#, fuzzy
+msgid "America/Cayman"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:79
+#, fuzzy
+msgid "America/Chicago"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+#, fuzzy
+msgid "America/Cordoba"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:82
+#, fuzzy
+msgid "America/Costa_Rica"
+msgstr "Kostaryka"
+
+#: calendar/zones.h:83
+#, fuzzy
+msgid "America/Cuiaba"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:84
+#, fuzzy
+msgid "America/Curacao"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+#, fuzzy
+msgid "America/Dawson"
+msgstr "Samoa Ameryka�ska"
+
+#: 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 "Dominika"
+
+#: calendar/zones.h:91
+#, fuzzy
+msgid "America/Edmonton"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+#, fuzzy
+msgid "America/El_Salvador"
+msgstr "Salwador"
+
+#: 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 "Samoa Ameryka�ska"
+
+#: 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 "Samoa Ameryka�ska"
+
+#: calendar/zones.h:100
+#, fuzzy
+msgid "America/Guadeloupe"
+msgstr "Gwadelupa"
+
+#: calendar/zones.h:101
+#, fuzzy
+msgid "America/Guatemala"
+msgstr "Gwatemala"
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+#, fuzzy
+msgid "America/Guyana"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:104
+#, fuzzy
+msgid "America/Halifax"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:105
+#, fuzzy
+msgid "America/Havana"
+msgstr "Samoa Ameryka�ska"
+
+#: 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 "Samoa Ameryka�ska"
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+#, fuzzy
+msgid "America/Juneau"
+msgstr "Samoa Ameryka�ska"
+
+#: 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 "Samoa Ameryka�ska"
+
+#: calendar/zones.h:120
+#, fuzzy
+msgid "America/Lima"
+msgstr "Samoa Ameryka�ska"
+
+#: 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 "Samoa Ameryka�ska"
+
+#: calendar/zones.h:124
+#, fuzzy
+msgid "America/Managua"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:125
+#, fuzzy
+msgid "America/Manaus"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:126
+#, fuzzy
+msgid "America/Martinique"
+msgstr "Martynika"
+
+#: calendar/zones.h:127
+#, fuzzy
+msgid "America/Mazatlan"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:128
+#, fuzzy
+msgid "America/Mendoza"
+msgstr "Samoa Ameryka�ska"
+
+#: 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 "Samoa Ameryka�ska"
+
+#: calendar/zones.h:136
+#, fuzzy
+msgid "America/Montserrat"
+msgstr "Montserrat"
+
+#: calendar/zones.h:137
+#, fuzzy
+msgid "America/Nassau"
+msgstr "Samoa Ameryka�ska"
+
+#: 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 "Samoa Ameryka�ska"
+
+#: calendar/zones.h:141
+#, fuzzy
+msgid "America/Noronha"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+#, fuzzy
+msgid "America/Panama"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+#, fuzzy
+msgid "America/Paramaribo"
+msgstr "Samoa Ameryka�ska"
+
+#: 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 "Puerto Rico"
+
+#: 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 "Samoa Ameryka�ska"
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+#, fuzzy
+msgid "America/Rosario"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:157
+#, fuzzy
+msgid "America/Santiago"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:158
+#, fuzzy
+msgid "America/Santo_Domingo"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:159
+#, fuzzy
+msgid "America/Sao_Paulo"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+#, fuzzy
+msgid "America/Shiprock"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:162
+#, fuzzy
+msgid "America/St_Johns"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+#, fuzzy
+msgid "America/St_Lucia"
+msgstr "Samoa Ameryka�ska"
+
+#: calendar/zones.h:165
+#, fuzzy
+msgid "America/St_Thomas"
+msgstr "Samoa Ameryka�ska"
+
+#: 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 "Azerbejd�an"
+
+#: calendar/zones.h:172
+#, fuzzy
+msgid "America/Tortola"
+msgstr "Samoa Ameryka�ska"
+
+#: 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 "Samoa Ameryka�ska"
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: calendar/zones.h:178
+#, fuzzy
+msgid "Antarctica/Casey"
+msgstr "Antarktyka"
+
+#: calendar/zones.h:179
+#, fuzzy
+msgid "Antarctica/Davis"
+msgstr "Antarktyka"
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: calendar/zones.h:181
+#, fuzzy
+msgid "Antarctica/Mawson"
+msgstr "Antarktyka"
+
+#: calendar/zones.h:182
+#, fuzzy
+msgid "Antarctica/McMurdo"
+msgstr "Antarktyka"
+
+#: calendar/zones.h:183
+#, fuzzy
+msgid "Antarctica/Palmer"
+msgstr "Antarktyka"
+
+#: calendar/zones.h:184
+#, fuzzy
+msgid "Antarctica/South_Pole"
+msgstr "Antarktyka"
+
+#: calendar/zones.h:185
+#, fuzzy
+msgid "Antarctica/Syowa"
+msgstr "Antarktyka"
+
+#: calendar/zones.h:186
+#, fuzzy
+msgid "Antarctica/Vostok"
+msgstr "Antarktyka"
+
+#: 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 "Bahrain"
+
+#: 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 "Columbia"
+
+#: 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 "Hong Kong"
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+#: calendar/zones.h:216
+#, fuzzy
+msgid "Asia/Istanbul"
+msgstr "Asystent"
+
+#: 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 "Kuwejt"
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr ""
+
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Muscat"
+msgstr "Asystent"
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: calendar/zones.h:235
+#, fuzzy
+msgid "Asia/Omsk"
+msgstr "Przypisz zadanie"
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+#, fuzzy
+msgid "Asia/Qatar"
+msgstr "Katar"
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:247
+#, fuzzy
+msgid "Asia/Singapore"
+msgstr "Singapur"
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+#, fuzzy
+msgid "Atlantic/Bermuda"
+msgstr "Bermudy"
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+#, fuzzy
+msgid "Atlantic/Cape_Verde"
+msgstr "Wyspy Zielonego Przyl�dka"
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+#, fuzzy
+msgid "Australia/Adelaide"
+msgstr "Australia"
+
+#: calendar/zones.h:274
+#, fuzzy
+msgid "Australia/Brisbane"
+msgstr "Australia"
+
+#: calendar/zones.h:275
+#, fuzzy
+msgid "Australia/Broken_Hill"
+msgstr "Australia"
+
+#: calendar/zones.h:276
+#, fuzzy
+msgid "Australia/Darwin"
+msgstr "Australia"
+
+#: calendar/zones.h:277
+#, fuzzy
+msgid "Australia/Hobart"
+msgstr "Australia"
+
+#: calendar/zones.h:278
+#, fuzzy
+msgid "Australia/Lindeman"
+msgstr "Australia"
+
+#: calendar/zones.h:279
+#, fuzzy
+msgid "Australia/Lord_Howe"
+msgstr "Australia"
+
+#: calendar/zones.h:280
+#, fuzzy
+msgid "Australia/Melbourne"
+msgstr "Australia"
+
+#: calendar/zones.h:281
+#, fuzzy
+msgid "Australia/Perth"
+msgstr "Australia"
+
+#: calendar/zones.h:282
+#, fuzzy
+msgid "Australia/Sydney"
+msgstr "Australia"
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:284
+#, fuzzy
+msgid "Europe/Andorra"
+msgstr "Andora"
+
+#: calendar/zones.h:285
+#, fuzzy
+msgid "Europe/Athens"
+msgstr "W�a�ciwo�ci"
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:296
+#, fuzzy
+msgid "Europe/Gibraltar"
+msgstr "Gibraltar"
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:304
+#, fuzzy
+msgid "Europe/Luxembourg"
+msgstr "Luksemburg"
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr ""
+
+#: calendar/zones.h:308
+#, fuzzy
+msgid "Europe/Monaco"
+msgstr "Monako"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr ""
+
+#: calendar/zones.h:312
+#, fuzzy
+msgid "Europe/Paris"
+msgstr "W�a�ciwo�ci"
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:317
+#, fuzzy
+msgid "Europe/San_Marino"
+msgstr "San Marino"
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "Komory"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+#, fuzzy
+msgid "Indian/Mahe"
+msgstr "Indie"
+
+#: calendar/zones.h:341
+#, fuzzy
+msgid "Indian/Maldives"
+msgstr "Mo�dawia"
+
+#: calendar/zones.h:342
+#, fuzzy
+msgid "Indian/Mauritius"
+msgstr "Mauritius"
+
+#: calendar/zones.h:343
+#, fuzzy
+msgid "Indian/Mayotte"
+msgstr "Majotta"
+
+#: calendar/zones.h:344
+#, fuzzy
+msgid "Indian/Reunion"
+msgstr "Reunion"
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+#, fuzzy
+msgid "Pacific/Pitcairn"
+msgstr "Pitcairn"
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
+#: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje podpisywania"
 
-#: camel/camel-cipher-context.c:211
+#: 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:251
+#: camel/camel-cipher-context.c:249
 msgid "Verifying is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje weryfikacji"
 
-#: camel/camel-cipher-context.c:294
+#: camel/camel-cipher-context.c:292
 msgid "Encryption is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje kodowania"
 
-#: camel/camel-cipher-context.c:336
+#: camel/camel-cipher-context.c:334
 msgid "Decryption is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje rozkodowywania"
 
+#: camel/camel-data-cache.c:169
+#, fuzzy
+msgid "Unable to create cache path"
+msgstr ""
+"Nie mo�na stworzy� pliku wyj�ciowego: %s\n"
+" %s"
+
+#: camel/camel-data-cache.c:441
+#, 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
 #, c-format
 msgid ""
@@ -5594,81 +7534,66 @@ msgstr "Ponowne synchronizowanie z serwerem"
 msgid "You must be working online to complete this operation"
 msgstr "Do zako�czenia tej operacji konieczne jest po��czenie z sieci�"
 
-#: 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 "Synchronizowanie folder�w"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, 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
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "B��d przy wykonywaniu filtru: %s: %s"
+
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Nie mo�na otworzy� folderu kolejki"
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Nie mo�na przetworzy� folderu kolejki"
 
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Pobieranie %d. listu (%d%%)"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Nie mo�na otworzy� listu"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Niepowodzenie przy %d. li�cie"
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Synchronizowanie folderu"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Pobieranie %d. listu z %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Niepowodzenie przy li�cie %d z %d"
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "B��d przy analizie sk�adni filtru: %s: %s"
-
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "B��d przy wykonywaniu filtru: %s: %s"
+#: camel/camel-filter-search.c:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "Nie mo�na odkodowa� listu."
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "B��d przy wykonywaniu wyszukiwania przez filtr: %s: %s"
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nieobs�ugiwana operacja: do��czenie listu: typ %s"
-
-#: camel/camel-folder.c:1040
-#, 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:1080
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Nieobs�ugiwana operacja: wyszukiwanie wed�ug uid: dla %s"
-
-#: camel/camel-folder.c:1262
-msgid "Moving messages"
-msgstr "Przenoszenie list�w"
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5677,7 +7602,7 @@ msgstr ""
 "B��d w wyra�eniu wyszukiwania: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5686,18 +7611,33 @@ msgstr ""
 "B��d przy wykonywaniu wyra�enia wyszukiwania %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) wymaga pojedynczego wyniku logicznego"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Wykonywanie zapytania na nieznanym nag��wku: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Niepoprawny typ warto�ci body-contains, oczekiwano napisu"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nieobs�ugiwana operacja: do��czenie listu: typ %s"
+
+#: camel/camel-folder.c:1038
+#, 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
+#, 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
+msgid "Moving messages"
+msgstr "Przenoszenie list�w"
 
 #: camel/camel-lock-client.c:111
 #, c-format
@@ -5807,117 +7747,122 @@ msgstr "Wprowad� swoje d�ugie has�o %s dla %s"
 msgid "Please enter your %s passphrase"
 msgstr "Wprowad� swoje d�ugie has�o %s"
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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:755
+#: 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:953
+#: 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:959
+#: 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:970
+#: camel/camel-pgp-context.c:1004
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 "Nie mo�na zweryfikowa� listu: nie mo�na stworzy� pliku tymczasowego: %s"
 
-#: camel/camel-pgp-context.c:1143
+#: 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:1153
+#: 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:1160
+#: 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:1169
+#: 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:1337
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 "Nie mo�na odszyfrowa� listu: brak zaszyfrowanego tekstu, kt�ry mo�na "
 "odszyfrowa�"
 
-#: camel/camel-pgp-context.c:1345
+#: 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:1352
+#: 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-provider.c:130
+#: camel/camel-pgp-mime.c:354
+msgid "This is a digitally signed message part"
+msgstr ""
+
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Nie mo�na za�adowa� %s: System nie obs�uguje �adowania modu��w."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nie mo�na wczyta� %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 "Nie mo�na wczyta� %s: Brak kodu inicjuj�cego w module."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "serwer %s %s"
 
-#: camel/camel-remote-store.c:207
+#: 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:264
+#: 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:267
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(nieznany komputer)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "Operacja anulowana"
 
-#: camel/camel-remote-store.c:484
+#: 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"
@@ -5997,8 +7942,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"
@@ -6032,12 +7977,13 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie."
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
+#, fuzzy
+msgid "Login"
 msgstr "Logowanie NT"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
@@ -6050,9 +7996,22 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Nieznany stan uwierzytelnienia."
 
+#: 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 ""
+"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:301
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: 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"
 
@@ -6097,28 +8056,45 @@ msgstr "W URL-u \"%s\" wymagana jest nazwa komputera"
 msgid "URL '%s' needs a path component"
 msgstr "W URL-u \"%s\" wymagana jest �cie�ka"
 
-#: camel/camel-service.c:611
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Wyszukiwanie: %s"
 
-#: camel/camel-service.c:638
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s"
 
-#: camel/camel-service.c:663
+#: camel/camel-service.c:673
 #, 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:665
+#: camel/camel-service.c:675
 #, 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
+#, fuzzy
+msgid "Resolving address"
+msgstr "Wyszukiwanie: %s"
+
+#: camel/camel-service.c:787
+#, 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
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr ""
+"Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s: przyczyna nieznana"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Dostarczyciel poczty dla folder�w wirtualnych"
@@ -6127,12 +8103,12 @@ msgstr "Dostarczyciel poczty dla folder�w wirtualnych"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Do odczytu poczty jako zapytania na innym zbiorze folder�w"
 
-#: 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 "Brak dostarczyciela dla protoko�u \"%s\""
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6179,18 +8155,18 @@ msgstr "Nie mo�na odkodowa� listu."
 msgid "Failed to verify certificates."
 msgstr "Nie mo�na zweryfikowa� certyfikatu."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 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:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Nie mo�na stworzy� folderu: Niepoprawna operacja na tym miejscu "
 "przechowywania"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6199,8 +8175,7 @@ msgstr ""
 "Wydawca: %s\n"
 "Temat: %s"
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:428
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6215,24 +8190,40 @@ msgstr ""
 "\n"
 "Czy pomimo tego chcesz go zaakceptowa�?"
 
-#: 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:491
 #, 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"
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
 msgstr ""
-"E-mail: %s\n"
-"Wsp�lna nazwa: %s\n"
-"Jednostka organizacyjna: %s\n"
-"Organizacja: %s\n"
-"Narodowo��: %s\n"
-"Stan: %s\n"
-"Kraj: %s"
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, fuzzy, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
+msgstr ""
+"Niepoprawny certyfikat od %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Czy pomimo tego chcesz go zaakceptowa�?"
 
 #: camel/camel-url.c:288
 #, c-format
@@ -6244,27 +8235,27 @@ msgstr "Nie mo�na rozpozna� URL-a \"%s\""
 msgid "No such message %s in %s"
 msgstr "Brak listu %s w %s."
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Brak listu: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie mo�na usun�� folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie mo�na usun�� folderu: %s: Folder nie istnieje"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie mo�na zmieni� nazwy folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie mo�na zmieni� nazwy folderu %s: Folder nie istnieje"
@@ -6273,76 +8264,76 @@ msgstr "Nie mo�na zmieni� nazwy folderu %s: Folder nie istnieje"
 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:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied� od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nie powiod�o si� polecenie IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr "Odpowied� serwera zako�czy�a si� zbyt wcze�nie."
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, 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:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, 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:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie mo�na stworzy� katalogu %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nie mo�na wczyta� zestawienia dla %s"
 
-#: camel/providers/imap/camel-imap-folder.c:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Wyszukiwanie zmodyfikowanych list�w"
 
-#: camel/providers/imap/camel-imap-folder.c:1566
-#: camel/providers/imap/camel-imap-folder.c:1978
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Ten list jest obecnie niedost�pny"
 
-#: camel/providers/imap/camel-imap-folder.c:1717
-#: camel/providers/imap/camel-imap-folder.c:1798
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "Pobieranie informacji podsumowuj�cych nowe listy"
 
-#: camel/providers/imap/camel-imap-folder.c:1723
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Wyszukiwanie nowych list�w"
 
-#: camel/providers/imap/camel-imap-folder.c:2015
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "Nie mo�na odnale�� tre�ci listu w odpowiedzi na FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nie mo�na otworzy� katalogu 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 "Nie mo�na zapisa� listu %s w cache: %s"
@@ -6355,7 +8346,7 @@ msgstr "Sprawdzanie nowej poczty"
 msgid "Check for new messages in all folders"
 msgstr "Sprawdzanie nowych list�w we wszystkich folderach"
 
-#: 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 "Foldery"
 
@@ -6390,28 +8381,28 @@ 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:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Brak obs�ugi typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Nie wprowadzono has�a."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6422,106 +8413,125 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder \"%s\" nie istnieje"
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 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:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "Katalogi z listami formacie MH"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 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:52
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Dostarczanie lokalne"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:62
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Katalogi z listami formacie Maildir"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr "Do przechowywania lokalnej poczty w katalogach Maildir."
 
-#: camel/providers/local/camel-local-provider.c:80
+#: 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:81
+#: camel/providers/local/camel-local-provider.c:101
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 "Do odczytu i przechowywania lokalnej poczty w standardowych plikach kolejek "
 "w formacie mbox."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 "Lokalizacja nadrz�dna miejsca przechowywania %s nie jest �cie�k� bezwzgl�dn�"
 
-#: 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 ""
 "Lokalizacja nadrz�dna miejsca przechowywania %s nie jest zwyk�ym katalogiem"
 
-#: 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 "Nie mo�na pobra� folderu: %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 "Lokalne miejsca przechowywania nie maj� skrzynki nadchodz�cej"
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalny plik z listami %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nie mo�na zmieni� nazwy folderu %s na %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 "Nie mo�na zmieni� nazwy folderu: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nie mo�na usun�� pliku z zestawieniem folderu \"%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 "Nie mo�na usun�� pliku \"%s\" z indeksem folderu: %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nie mo�na zapisa� zestawienia: %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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nie mo�na doda� listu do zestawienia: przyczyna nieznana"
 
@@ -6541,7 +8551,7 @@ msgstr "Nie mo�na do��czy� listu do folderu w formacie maildir: %s: %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6553,7 +8563,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "Nie ma takiego listu"
 
@@ -6562,7 +8572,7 @@ msgstr "Nie ma takiego listu"
 msgid "Invalid message contents"
 msgstr "Niepoprawna zawarto�� listu"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -6572,15 +8582,15 @@ msgstr ""
 "Nie mo�na otworzy� folderu \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Folder \"%s\" nie istnieje."
 
 # y, c-format
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -6590,41 +8600,64 @@ msgstr ""
 "Nie mo�na stworzy� folderu \"%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\" nie jest katalogiem z listami w formacie maildir."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie mo�na usun�� folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "to nie katalog z listami w formacie maildir"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nie mo�na przeszuka� folderu \"%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 "Nie mo�na otworzy� katalogu z listami ze scie�ki: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Sprawdzanie nowej poczty"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "Zapisywanie folderu"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nie mo�na otworzy� skrzynki: %s: %s\n"
@@ -6641,9 +8674,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6653,16 +8686,16 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 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:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Stworzenie listu nie powiod�o si�: Uszkodzona skrzynka?"
 
-#: 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"
@@ -6671,7 +8704,7 @@ msgstr ""
 "Nie mo�na otworzy� pliku \"%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"
@@ -6680,14 +8713,14 @@ msgstr ""
 "Nie mo�na stworzy� pliku \"%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\" nie jest zwyk�ym plikiem."
 
-#: 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"
@@ -6696,96 +8729,85 @@ msgstr ""
 "Nie mo�na usun�� folderu \"%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 "Folder \"%s\" nie jest pusty. Nie zosta� usuni�ty."
 
-#. 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 "Zapisywanie folderu"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nie mo�na otworzy� folderu %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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nie mo�na sprawdzi� folderu: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nie mo�na otworzy� pliku %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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nie mo�na otworzy� tymczasowej skrzynki: %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
+#: 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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "Nie mo�na zamkn�� folderu �r�d�owego %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie mo�na zamkn�� folderu tymczasowego: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie mo�na zmieni� nazwy folderu: %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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nieznany b��d: %s"
@@ -6804,12 +8826,12 @@ msgstr "Nie mo�na do��czy� listu do folderu mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "\"%s\" nie jest katalogiem."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, 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:512
+#: 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"
@@ -6820,6 +8842,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Folder \"%s/%s\" nie istnieje."
@@ -6829,29 +8852,31 @@ msgstr "Folder \"%s/%s\" nie istnieje."
 msgid "Spool mail file %s"
 msgstr "Plik %s z kolejk� list�w"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Nie mo�na zmienia� nazw folder�w kolejek"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Nie mo�na usuwa� folder�w kolejek"
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6860,47 +8885,24 @@ 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:940
+#: 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/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Podaj has�o NNTP dla %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Serwer odrzuci� nazw� u�ytkownika"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Wys�anie nazwy u�ytkownika do serwera nie powiod�o si�"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Serwer odrzuci� nazw� u�ytkownika/has�o"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Nie odnaleziono listu %s."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Nie mo�na pobra� z serwera listy grup."
+#: 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/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 "Nie mo�na odczyta� pliku z list� grup dla %s: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Nie mo�na zapisa� pliku z list� grup dla %s: %s"
+#: 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"
@@ -6911,17 +8913,12 @@ 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:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Nie mo�na otworzy� katalogu serwera nowin: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nowiny USENET za po�rednictwem %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6929,71 +8926,112 @@ msgstr ""
 "Przy tej opcji uwierzytelnianie na serwerze NNTP b�dzie przeprowadzane z "
 "u�yciem has�a w postaci czystego tekstu."
 
-#: 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 "Nie mo�na otworzy� lub stworzy� pliku .newsrc dla %s: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Folder \"%s\" nie istnieje"
+
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "Stworzenie potoku nie powiod�o si�: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Nie powiod�o si� polecenie 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 "Wyszukiwanie nowych list�w"
+
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "Nieznany b��d: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/nntp/camel-nntp-summary.c:566
+#, fuzzy
+msgid "Use cancel"
+msgstr "Anuluj"
+
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "Operacja anulowana"
+
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Pobieranie zestawienia POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "Nie mo�na sprawdzi� nowych list�w na serwerze POP: %s"
+#: 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 "Operacja anulowana"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Nie mo�na otworzy� folderu: spis list�w by� niekompletny."
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Nie mo�na pobra� folderu: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Oczyszczanie z usuni�tych list�w"
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "Nie mo�na pobra� listu: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Nie mo�na pobra� listu z serwera POP %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:367
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, c-format
 msgid "No message with uid %s"
 msgstr "Brak listu o warto�ci 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 "Pobieranie %d. listu z serwera POP"
 
-#: 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 ""
+"Nie mo�na pobra� listu: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Nieznane opady"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "Miejsce przechowywania list�w"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Pozostawianie list�w na serwerze"
 
-#: 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 "Usuwanie po %s dniach"
 
-#: 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:84
 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 "Do ��czenia si� i pobierania poczty z serwer�w POP."
 
-#: 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."
@@ -7002,7 +9040,7 @@ msgstr ""
 "u�yciem has�a w postaci czystego tekstu. Wiele serwer�w POP obs�uguje tylko "
 "t� opcj�."
 
-#: 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 "
@@ -7012,48 +9050,32 @@ 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-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
-"Przy tej opcji uwierzytelnianie na serwerze POP b�dzie przeprowadzane przy "
-"u�yciu Kerberosa 4 ."
+"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:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Nie mo�na przeprowadzi� uwierzytelnienia na serwerze KPOP: %s"
+#: camel/providers/pop3/camel-pop3-store.c:210
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Nieobs�ugiwana operacja"
 
-#: camel/providers/pop3/camel-pop3-store.c:214
-#, c-format
-msgid "Could not connect to server: %s"
-msgstr "Nie mo�na nawi�za� po��czenia z serwerem: %s"
+#: 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:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, 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:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sPodaj has�o POP3 dla %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:378
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %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:381
-#: camel/providers/pop3/camel-pop3-store.c:418
-msgid "(Unknown)"
-msgstr "(Nieznane)"
-
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -7061,7 +9083,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
+#, 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
+msgid "SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "B��d We/Wy"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7070,18 +9112,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:483
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
-#: camel/providers/pop3/camel-pop3-store.c:566
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "Nieoczekiwana odpowied� od serwera POP: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7093,51 +9130,52 @@ msgstr ""
 "Do wysy�ania poczty poprzez przekazania jej dzia�aj�cemu lokalnie programowi "
 "\"sendmail\"."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "Nie mo�na rozpozna� URL-a \"%s\""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Nie mo�na stworzy� potoku do programu sendmail: %s: nie wys�ano poczty"
 
-#: 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 ""
 "Nie mo�na stworzy� procesu dla programu sendmail: %s: nie wys�ano poczty"
 
-#: 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 "Nie mo�na wys�a� listu: %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 "Program sendmail zosta� przerwany przez sygna� %s: nie wys�ano poczty."
 
-#: 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 "Nie mo�na wykona� %s: nie wys�ano poczty."
 
-#: 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 ""
 "Program sendmail zosta� zako�czony z kodem stanu %d: nie wys�ano poczty."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr "Nie mo�na odnale�� adresu \"Od\" w li�cie"
-
-#: 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 "Wysy�anie list�w za pomoc� programu 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"
 
@@ -7147,123 +9185,146 @@ msgstr ""
 "Do wysy�ania poczty poprzez ��czenie si� ze zdalnym serwerem pocztowym przy "
 "u�yciu SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "B��d sk�adniowy. Nie rozpoznano polecenia."
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "B��d sk�adniowy w�r�d parametr�w lub argument�w"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Niezaimplementowane polecenie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Niezaimplementowany parametr polecenia"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Stan systemu lub odpowied� z pomoc� systemow�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Komunikat pomocy"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Us�uga gotowa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Us�uga zamyka kana� transmisyjny"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Us�uga nie jest dost�pna, zamykanie kana�u transmisyjnego"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Pomy�lnie wykonano ��dan� operacj� na li�cie"
 
-#: 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 "U�ytkownik nie jest lokalny; przes�anie do <forward-path>"
 
-#: 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 "Nie wykonano ��danej operacji na li�cie: skrzynka jest niedost�pna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Nie wykonano ��danej operacji: skrzynka jest niedost�pna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Przerwano ��dan� czynno��: b��d przy przetwarzaniu"
 
-#: 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 "U�ytkownik nie jest lokalny; spr�buj <forward-path>"
 
-#: 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 ""
 "Nie wykonano ��danej operacji: brak miejsca w miejscu przechowywania list�w"
 
-#: 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 "Przerwano ��dan� czynno��: przekroczony wykorzystany rozmiar"
 
-#: 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 "Nie wykonano ��danej operacji: niedozwolona nazwa skrzynki"
 
-#: 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 "Rozpocznij wprowadzanie listu; zako�cz poprzez <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Transakcja nie powiod�a si�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Potrzebna jest zmiana has�a"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Mechanizm uwierzytelniania jest zbyt s�aby"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "��dany miechanizm uwierzytelniaj�cy wymaga szyfrowania"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Chwilowe niepowodzenie przy uwierzytelnianiu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Wymagane uwierzytelnienie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, 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:376
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "Forma listu jest niepoprawna"
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, 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
+#, 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"
 msgstr "Serwer SMTP %s nie obs�uguje wymaganego typu uwierzytelniania %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:415
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7274,130 +9335,134 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serwer SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, 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:581
-msgid "Cannot send message: sender address not defined."
-msgstr "Nie mo�na wys�a� listu: nie podano adresu nadawcy."
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:593 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Wysy�anie listu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+#, 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
 msgid "SMTP Greeting"
 msgstr "Powitanie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, 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:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "Uwierzytelnianie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "B��d przy tworzeniu obiektu uwierzytelniaj�cego SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Up�yn�� czas oczekiwania po AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "Nie powiod�o si� wykonanie AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:893
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1081
+#, 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:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "B��dna odpowied� na RCPT TO: %s: nie wys�ano poczty"
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Up�yn�� czas oczekiwania po DATA: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "B��dna odpowied� na 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
+#, fuzzy
+msgid "DATA response error"
+msgstr "B��dna odpowied� na 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:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "B��dna odpowied� na DATA: przerwanie listu: %s: nie wys�ano poczty"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Up�yn�� czas oczekiwania po RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "B��dna odpowied� na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "B��dna odpowied� na QUIT: %s: mo�na kontynuowa�"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "B��dna odpowied� na RSET: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -7424,19 +9489,19 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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 "za��cznik"
 
-#: 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 "Usuwa wybrane elementy z listy za��cznik�w"
 
-#: composer/e-msg-composer-attachment-bar.c:531
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "Dodaj za��cznik..."
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "Za��cza plik do listu"
 
@@ -7464,68 +9529,68 @@ msgid "MIME type:"
 msgstr "Typ 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 "Sugerowanie automatycznego wy�wietlenia za��cznika"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Kliknij tu aby otworzy� ksi��k� adresow�"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Odpowied� do:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Temat:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Dla:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Podaj adres odbiorcy listu"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:397
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 "Podaj adresy, pod kt�re zostanie przes�ana kopia listu bez listy odbiorc�w."
 
-#: composer/e-msg-composer-select-file.c:228
+#: composer/e-msg-composer-select-file.c:267
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Za��czenie pliku"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7534,46 +9599,34 @@ msgstr ""
 "B��d przy odczycie pliku %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:894
-msgid "Save as..."
-msgstr "Zapisz jako..."
-
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Ostrze�enie!"
 
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Plik istnieje, nadpisa�?"
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "B��d przy zapisie pliku: %s"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "B��d przy odczycie pliku : %s"
 
-#: composer/e-msg-composer.c:1019
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Nie mo�na otworzy� folderu poczty roboczej, zwi�zanego z tym kontem.\n"
-"Czy chcesz zamiast tego wykorzysta� domy�lny folder Poczta robocza?"
-
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "B��d przy dost�pie do pliku: %s"
 
-#: composer/e-msg-composer.c:1077
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Nie mo�na pobra� listu z edytora"
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7582,7 +9635,7 @@ msgstr ""
 "Nie mo�na zmieni� po�o�enia w pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1091
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7591,7 +9644,7 @@ msgstr ""
 "Nie mo�na przyci�� pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1100
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7600,7 +9653,7 @@ msgstr ""
 "B��d przy automatycznym zapisie listu: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1202
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7608,7 +9661,7 @@ msgstr ""
 "Odnaleziono niezapisane pliki z poprzedniej sesji Evolution.\n"
 "Czy chcesz spr�bowa� je odzyska�?"
 
-#: composer/e-msg-composer.c:1356
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7618,23 +9671,23 @@ msgstr ""
 "\n"
 "Czy chcesz zapisa� zmiany?"
 
-#: composer/e-msg-composer.c:1363
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Uwaga: Zmodyfikowany list"
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Otwarcie pliku"
 
-#: composer/e-msg-composer.c:1535
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Wstawienie pliku"
 
-#: composer/e-msg-composer.c:1910 composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Tworzenie listu"
 
-#: composer/e-msg-composer.c:2368
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -7642,7 +9695,7 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu:\n"
 "Nie mo�na uaktywni� formantu wyboru adresu."
 
-#: composer/e-msg-composer.c:2391 composer/e-msg-composer.c:2446
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7650,7 +9703,7 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu:\n"
 "Nie mo�na uaktywni� komponentu edytora HTML-a."
 
-#: 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."
@@ -7658,18 +9711,19 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu, poniewa� w komponencie\n"
 "pocztowym nie zosta�y jeszcze skonfigurowane �adne to�samo�ci."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nie mo�na zainicjowa� edytora list�w Evolution."
 
-#: 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:1
 msgid "The Evolution groupware suite"
 msgstr "Evolution - pakiet do pracy grupowej"
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "_Najcz�ciej zadawane pytania"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "karta adresowa"
@@ -7710,15 +9764,33 @@ msgstr "Temat zawiera"
 msgid "Subject does not contain"
 msgstr "Temat nie zawiera"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Plik o tej nazwie ju� istnieje.\n"
+"Nadpisa� go?"
+
 #. Remember the password?
-#: e-util/e-passwords.c:347 mail/mail-session.c:267
+#: e-util/e-passwords.c:363 mail/mail-session.c:269
 msgid "Remember this password"
 msgstr "Zapami�tanie has�a"
 
-#: e-util/e-passwords.c:349 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 "Zapami�tanie tego has�a na czas bie��cej sesji"
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "Kategorie"
+
 #. 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
@@ -7790,13 +9862,13 @@ 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"
 
 #. 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"
 
@@ -7837,11 +9909,7 @@ msgstr "godzina"
 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:191
 msgid "seconds"
 msgstr "sekund"
 
@@ -7915,7 +9983,7 @@ msgstr " temu"
 msgid "ago"
 msgstr "temu"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
@@ -7928,15 +9996,15 @@ msgid "Filter Rules"
 msgstr "Regu�y filtr�w"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "Podejmowane czynno�ci"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Dodaj czynno��"
 
-#: 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."
@@ -7944,19 +10012,11 @@ msgstr ""
 "Nie zosta� wybrany folder.\n"
 "Wr�� i podaj folder, do kt�rego powinna by� dostarczona poczta."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:364
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Wyb�r folderu"
 
-#: filter/filter-folder.c:267
-msgid "Enter folder URI"
-msgstr "Podaj URI folderu"
-
-#: filter/filter-folder.c:314
-msgid "<click here to select a folder>"
-msgstr "<kliknij, aby wybra� folder> "
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -7966,7 +10026,7 @@ msgstr ""
 "B��d w wyra�eniu regularnym \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test"
 
@@ -7974,39 +10034,40 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "Nale�y nada� temu filtrowi nazw�."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Nazwa regu�y: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Bez nazwy"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Lista warunk�w"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "Wykonywanie czynno�ci"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "przy spe�nieniu wszystkich kryteri�w"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "przy spe�nieniu kt�regokolwiek z kryteri�w"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Dodaj kryterium"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "nadchodz�ce"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "wychodz�ce"
 
@@ -8050,6 +10111,12 @@ msgstr "ze wszystkimi lokalnymi i aktywnymi zdalnymi folderami"
 msgid "with all local folders"
 msgstr "ze wszystkimi lokalnymi folderami"
 
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Przypisz punkty"
+
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Przypisz kolor"
@@ -8062,6 +10129,11 @@ msgstr "Przypisz punkty"
 msgid "Attachments"
 msgstr "Za��czniki"
 
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belize"
+
 #: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "zawiera"
@@ -8115,144 +10187,154 @@ msgid "ends with"
 msgstr "ko�czy si� na"
 
 #: filter/libfilter-i18n.h:21
+msgid "Execute Shell Command"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Istnieje"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "istnieje"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Wyra�enie"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Wa�ny"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "jest"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "jest po"
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "jest przed"
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Oznaczony"
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "jest wi�kszy ni�"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "jest mniejszy ni�"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "nie jest"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Oznaczony"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "Lista dyskusyjna"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Tre�� listu"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "Nag��wek listu"
 
-#: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr "List zosta� otrzymany"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message was sent"
-msgstr "List zosta� wys�any"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Przenie� do folderu"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "w lub po"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "w lub przed"
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "Odtwarzany d�wi�k:"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Przeczytany"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Lista odbiorc�w"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "Dopasowanie wg regexp"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "Z odpowiedzi� do"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Punkty"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1404
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Nadawca"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Ustaw stan"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Rozmiar (KB)"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "brzmi jak"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "Konto �r�d�owe"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Okre�lony nag��wek"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "rozpoczyna si� od"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Zatrzymanie przetwarzania"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Temat"
 
-#: filter/libfilter-i18n.h:52
-msgid "was after"
-msgstr "jest po"
-
-#: filter/libfilter-i18n.h:53
-msgid "was before"
-msgstr "jest przed"
-
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Regu�y"
 
-#: filter/rule-editor.c:278
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Dodaj regu��"
 
-#: filter/rule-editor.c:344
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Zmodyfikuj regu��"
 
@@ -8272,30 +10354,30 @@ msgstr "Nale�y poda� jako �r�d�o przynajmniej jeden folder."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje star� poczt� Elma"
 
-#: 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 "Importowanie..."
 
-#: 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 "Poczekaj chwil�"
 
-#: 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 "Importowanie %s jako %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 "Analizowanie %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:101
 msgid "Mail"
 msgstr "Poczta"
 
@@ -8323,23 +10405,74 @@ msgstr ""
 "Odnaleziono pliki programu GnomeCard.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Priorytet: %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 importuje stare dane Netscape'a"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "�mietnik"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Lokalny plik z listami %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Analizowanie katalogu"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Rozpoczynanie importowania"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Modyfikacja filtr�w"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8364,44 +10497,94 @@ msgid "Pine"
 msgstr "Pine"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Generator edytora list�w Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Generator formantu zada� Evolution"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Generator edytora list�w Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Generator edytora list�w Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Komponent Evolution obs�uguj�cy poczt�."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Edytor list�w Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Komponent zestawienia wykonawczego poczty Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Komponent wy�wietlania folderu pocztowego Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Generator komponent�w folderu pocztowego Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Generator edytora list�w Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Generator komponentu zestawienia poczty."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "_Brak powtarzalno�ci"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Konta"
+
+#: 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 "Interfejs konfiguracji poczty"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Folder zawieraj�cy poczt�"
+#: 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:101
-msgid "Mail storage folder (internal)"
-msgstr "Folder przechowuj�cy poczt� (wewn�trzny)"
+msgid "Folder containing mail"
+msgstr "Folder zawieraj�cy poczt�"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -8411,24 +10594,19 @@ msgstr "Wirtualny �mietnik"
 msgid "Virtual Trash folder"
 msgstr "Folder wirtualnego �mietnika"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Nie mo�na nawi�za� po��czenia z miejscem przechowywania: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Ten folder nie mo�e zawiera� list�w."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "W�a�ciwo�ci..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Zmienia w�a�ciwo�ci folderu"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -8436,205 +10614,235 @@ msgstr ""
 "Wygl�da na to, �e cz�� twoich ustawie� poczty zosta�a uszkodzona. Upewnij "
 "si�, �e wszystko jest na miejscu."
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr "Nie zosta� ustawiony spos�b przekazywania list�w"
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Nowy list"
 
-#: mail/component-factory.c:951
-msgid "New _Mail Message"
-msgstr "Nowy _list"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "L_ist"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie mo�na zainicjowa� komponentu pocztowego Evolution."
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nie mo�na zainicjowa� komponentu konfiguracji poczty Evolution."
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nie mo�na zainicjowa� komponentu informacji o folderach Evolution."
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Nawi�zywanie po��czenia z serwerem..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Nie mo�na zarejstrowa� w pow�oce miejsca przechowywania"
 
-#: mail/folder-browser-ui.c:271
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "W�a�ciwo�ci \"%s\""
 
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "W�a�ciwo�ci"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "nowych: %d"
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "ukrytych: %d"
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "zaznaczonych: %d"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "niewys�anych: %d"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "niewys�anych: %d"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "og�em: %d"
 
-#: mail/folder-browser.c:1049
-msgid "Create vFolder from Search"
-msgstr "Stw�rz vFolder na podstawie wyszukiwania"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Stw�rz _wirtualny folder na podstawie listu"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawc�"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorc�w"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _list� dyskusyjn�"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawc�"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorc�w"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filtr w oparciu o li_st� dyskusyjn�"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "Z_redaguj jako nowy list..."
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:104
-msgid "_Save As..."
-msgstr "Zapisz j_ako..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Odpowiedz na _list�"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Prze�lij"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Zako�czone"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Wyczy��"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "O_znacz jako przeczytane"
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Oz_nacz jako wa�ny"
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Oz_nacz jako niewa�ny"
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Cofnij usuni�cie"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "P_rzenie� do folderu..."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "S_kopiuj do folderu..."
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:106
-msgid "_Undelete"
-msgstr "_Cofnij usuni�cie"
+#: mail/folder-browser.c:1645
+msgid "Label"
+msgstr ""
 
-#: mail/folder-browser.c:1473
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Dodaj nadawc� do ksi��ki adresowej"
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Zastosuj filtry"
 
-#: mail/folder-browser.c:1478
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "_Stw�rz regu�� na podstawie listu"
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
-msgstr "Filtr w oparciu o list� dyskusyjn�"
-
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "VFolder w oparciu o list� dyskusyjn�"
 
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr w oparciu o list� dyskusyjn� (%s)"
 
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "VFolder w oparciu o list� dyskusyjn� (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Domy�lny"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Pobieranie informacji o folderze"
@@ -8656,26 +10864,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importuje pliki Outlook Express 4 do Evolution."
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Tre�� zawiera"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Bie��cy format przechowywania:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Indeksowanie:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Format skrzynki"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Tre�� zawiera"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nowy format przechowywania:"
 
-#: 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"
@@ -8686,15 +10887,15 @@ msgstr ""
 "do stanu, w kt�rym automatyczne odtworzenie danych nie b�dzie\n"
 "mo�liwe. Korzystaj wi�c z tej opcji bardzo ostro�nie."
 
-#: 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"
 
@@ -8712,86 +10913,79 @@ msgstr "Edytor nowin Evolution"
 msgid "Evolution Account Editor"
 msgstr "Modyfikacja konta Evolution"
 
-#: mail/mail-account-gui.c:962
-msgid "Could not save signature file."
-msgstr "Nie mo�na zapisa� pliku z podpisem."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Komputer:"
 
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "Zapisz podpis"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "Nazwa _u�ytkownika:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "�_cie�ka:"
 
-#: mail/mail-account-gui.c:1045
+#: 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 ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Podpis zosta� zmieniony, lecz zmiany nie s� zapisane.\n"
-"\n"
-"Czy chcesz je zapisa�?"
 
-#: mail/mail-account-gui.c:1654
+#: mail/mail-account-gui.c:1985
 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:149
-msgid " (default)"
-msgstr " (domy�lne)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Unieaktywnij"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Uaktywnij"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "Czy na pewno chcesz usun�� to konto?"
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Nie usuwaj"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Rzeczywi�cie usun�� konto?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-msgid "Are you sure you want to delete this news account?"
-msgstr "Czy na pewno chcesz usun�� to konto?"
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Unieaktywnij"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:783 mail/mail-config.glade.h:42
-msgid "Mail Settings"
-msgstr "Ustawienia poczty"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Uaktywnij"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "List do %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "Czy na pewno chcesz usun�� to konto?"
 
-#: mail/mail-autofilter.c:215
-#, c-format
-msgid "Subject is %s"
-msgstr "Tematem jest %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Aktywne"
 
-#: mail/mail-autofilter.c:231
-#, c-format
-msgid "Mail from %s"
-msgstr "List od %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Nazwa _konta:"
 
-#: mail/mail-autofilter.c:287
-#, c-format
-msgid "%s mailing list"
-msgstr "lista dyskusyjna %s"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Puerto Rico"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Dodanie regu�y filtra"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8804,7 +10998,7 @@ msgstr ""
 "jakichkolwiek list�w.\n"
 "Czy chcesz przeprowadzi� j� teraz?"
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8812,7 +11006,7 @@ msgstr ""
 "Przed wys�aniem listu nale�y skonfigurowa�\n"
 "wykorzystywan� to�samo��."
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8820,12 +11014,8 @@ msgstr ""
 "Przed stworzeniem listu nale�y skonfigurowa�\n"
 "spos�b przekazywania list�w."
 
-#: mail/mail-callbacks.c:230
-msgid "You have not set a mail transport method"
-msgstr "Nie zosta� ustawiony spos�b przekazywania list�w"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:265
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -8833,11 +11023,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:280
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Czy pomimo tego wys�a�?"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8845,7 +11035,7 @@ msgstr ""
 "List nie zawiera tematu.\n"
 "Rzeczywi�cie wys�a�?"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8854,11 +11044,11 @@ msgstr ""
 "ukrywa� adresy jej cz�onk�w, list zawiera� b�dzie tylko ukrytych adresat�w "
 "(bcc)."
 
-#: mail/mail-callbacks.c:370
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "Ten list zawiera tylko ukrytych adresat�w (bcc)"
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8868,40 +11058,44 @@ msgstr ""
 "nag��wek Apparently-To.\n"
 "Czy pomimo tego wys�a�?"
 
-#: mail/mail-callbacks.c:469
-msgid "This message contains invalid recipients:"
-msgstr "Ten list zawiera niepoprawnych adresat�w:"
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 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:600
+#: mail/mail-callbacks.c:497
 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:838
+#: mail/mail-callbacks.c:623
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+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
 msgid "an unknown sender"
 msgstr "nieznany nadawca"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 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:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Przeniesienie list�w do folderu"
 
-#: mail/mail-callbacks.c:1283 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopiowanie list�w do folderu"
 
-#: mail/mail-callbacks.c:1753
+#: mail/mail-callbacks.c:2091
 #, 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:1778
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8909,7 +11103,7 @@ msgstr ""
 "Mo�liwe jest redagowanie wy��cznie\n"
 "list�w zapisanych w folderze Poczta robocza."
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8917,28 +11111,39 @@ msgstr ""
 "Listy zapisane w folderze Wys�ane\n"
 "mo�na tylko wys�a� ponownie."
 
-#: mail/mail-callbacks.c:1831
+#: mail/mail-callbacks.c:2169
 #, 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:1857
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Nie zaznaczono �adnego listu"
 
-#: mail/mail-callbacks.c:1951
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Nadpisa� plik?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Zapis listu pod podan� nazw�"
 
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Zapis list�w pod podan� nazw�"
 
-#: mail/mail-callbacks.c:2122 widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Ostrze�enie"
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Wy�wietla kolejny nieprzeczytany list"
+
+#: mail/mail-callbacks.c:2373
+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:2129
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8951,11 +11156,7 @@ msgstr ""
 "\n"
 "Czy rzeczywi�cie usun�� te listy?"
 
-#: mail/mail-callbacks.c:2136
-msgid "Do not ask me again."
-msgstr "Bez pytania o to w przysz�o�ci."
-
-#: mail/mail-callbacks.c:2244
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8964,19 +11165,28 @@ msgstr ""
 "B��d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2256
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/mail-callbacks.c:2319
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Pobieranie %d. listu z %d"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Wydruk listu"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2863
+msgid "US-Letter"
+msgstr ""
+
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Wydrukowanie listu nie powiod�o si�"
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, 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?"
@@ -9035,16 +11245,34 @@ msgstr ""
 "kont."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Druid kont Evolution"
 
-#: mail/mail-config.c:326
-#, c-format
-msgid "Account %d"
-msgstr "Konto %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Przetwarzanie"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
 
-#: mail/mail-config.c:1859
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: mail/mail-config.c:78 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"
@@ -9056,87 +11284,154 @@ msgstr ""
 "%s\n"
 "Skr�t nie b�dzie stworzony."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Nadchodz�ce"
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Sprawdzanie us�ugi"
 
-#: mail/mail-config.c:2183 mail/mail-config.c:2187
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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
-msgid " _Check for supported types "
-msgstr " _Sprawd� obs�ugiwane typy "
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " "
+#, 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
+#, 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
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Ta kopia Evolution nie obs�uguje SSL-a)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 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:5
-msgid "Account"
-msgstr "Konto"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Informacje o koncie"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Zarz�dzanie kontami"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "Konta"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Anuluj operacj�"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "Przy wysy�aniu zaszyfrowanych list�w s_zyfrowanie zawsze do siebie"
+#: 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:10
-msgid "Always _sign outgoing messages when using this account"
+#: 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:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Za��cza plik do listu"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Za��cznik"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "_Automatyczne sprawdzanie nowych list�w"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Nieznany zestaw znak�w: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "Zam_knij"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Sprawdzanie nowej poczty"
 
-#: mail/mail-config.glade.h:14
-msgid "Composer"
-msgstr "Nowe listy"
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Composing Messages"
+msgstr "Tworzenie listu"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: mail/mail-config.glade.h:16
-msgid "Confirm when Expunging a folder"
-msgstr "Potwierdzanie oczyszczenia folderu"
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9151,231 +11446,370 @@ msgstr ""
 "\n"
 "Kliknij \"Zako�cz\", aby zapisa� ustawienia."
 
-#: mail/mail-config.glade.h:23
+#: 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:24
-msgid "Default Forward style is: "
-msgstr "Domy�lny spos�b \"przesy�ania\" list�w: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Domy�lny"
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Domy�lny zestaw znak�w: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Pobieranie poczty"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Identyfikatory cyfrowe..."
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr "Wy�wietlanie"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Nie mo�na otworzy� listu"
 
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Gotowe"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Szkice"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Folder ze _szkicami:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "U_aktywnij"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Zmodyfikuj..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
-msgstr "Aktywne"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Wsch�d"
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "E-mail zawiera"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "Adres e-mail:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "_Opr�nianie folder�w �mietnika przy zako�czeniu"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "Wykonywanie czynno�ci"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "ko�czy si� na"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "W�a�ciwo�ci"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Przes�ane listy"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Pobierz identyfikator cyfrowy..."
 
-#: mail/mail-config.glade.h:35
-msgid "HTML signature file:"
-msgstr "Plik z podpisem w HTML-u:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Oznaczanie cytat�w za pomoc� koloru"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Tuvalu"
+
+#: 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 "To�samo��"
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr "Listy napisane w HTML-u"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Tre�� listu"
 
-#: 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 "Zapisz i zamknij"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Pobierz _obrazy"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Po�o�enie skrzynki"
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
-msgstr "Ustawienie jako konto _domy�lne"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Nag��wek listu"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "Wy�wietlanie lis_tu"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikronezja"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "Serwer NNTP:"
 
-#: mail/mail-config.glade.h:46
-msgid "News"
-msgstr "Nowiny"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "�r�d�a _nowo�ci"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Informacje opcjonalne"
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "_Organizacja:"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "ID _klucza PGP:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Wyb�r koloru"
 
-#: 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 ""
-"Potwierdzanie przy wysy�aniu list�w w formacie HTML do os�b, kt�re ich nie "
-"chc�"
+#: mail/mail-config.glade.h:88
+#, 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:56
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Potwierdzanie przy wysy�aniu listu bez _tematu"
+#: mail/mail-config.glade.h:89
+#, 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 "Potwierdzanie przy wysy�aniu listu tylko z _ukrytymi adresatami (bcc)"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Drukuje zaznaczone kontakty"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Katalog maildir Qmaila"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Nie mo�na otworzy� listu"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Jako cytat"
 
-#: mail/mail-config.glade.h:60
+#: 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"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
-msgid "Receiving Email"
-msgstr "Odbieranie poczty"
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Odpowied� do:"
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+msgid "Receiving Email"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Opcje odbioru"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Zapami�tanie has�a"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Wymagane informacje"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+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:67
-msgid "Security"
-msgstr "Bezpiecze�stwo"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
-msgstr "Wyb�r pliku dziennika komunikat�w o filtrowaniu..."
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "Wyb�r pliku programu PGP"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Wysy�anie list�w"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Plik z podpisem:"
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
-msgstr "Wysy�anie list�w"
+#: 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:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Wys�ane"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "Wysy�anie list�w"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Folder z _wys�anymi listami:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Listy wys�ane i szkice"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Serwer wymaga _uwierzytelnienia"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Konfiguracja serwera"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "_Typ serwera:"
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
-msgstr "Plik z podpisem:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Skr�ty"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Zapisz podpis"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "�r�d�o"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Informacje o �r�dle"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "�r�d�a"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "Nazwa stylu:"
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
-msgstr "Foldery specjalne"
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Standardowy uniksowy plik mbox"
 
-#: mail/mail-config.glade.h:86
-msgid "Use s_ecure connection (SSL)"
-msgstr "Wykorzystanie bezpiecznego po��czenia (_SSL)"
+#: mail/mail-config.glade.h:128
+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:87
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "Podpis w _HTML-u"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Zmienny"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9385,126 +11819,217 @@ msgstr ""
 "\n"
 "Aby rozpocz��, kliknij \"Naprz�d\"."
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Wsch�d"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "Pobieranie obraz�w z sieci w _ka�dym przypadku"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:141
 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:93
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "Typ _uwierzytelniania: "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "Typ _uwierzytelniania: "
+
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "_Automatyczne sprawdzanie nowych list�w"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "ID _certyfikatu:"
 
-#: mail/mail-config.glade.h:97
-msgid "_Drafts folder:"
-msgstr "Folder ze _szkicami:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
-msgstr "Adres _e-mail:"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Potwierdzanie oczyszczenia folderu"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
-msgstr "_Opr�nianie folder�w �mietnika przy zako�czeniu"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Domy�lny"
 
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:151
+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
+#, fuzzy
+msgid "_Filename:"
+msgstr "Nazwa pliku:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Prze�lij jako"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "_Pe�na nazwa:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:159
+#, 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:103
-msgid "_Highlight citations with"
-msgstr "_Oznaczanie cytat�w za pomoc� koloru"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "To�samo��"
 
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
-msgstr "_Komputer:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "J�zyk"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 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:106
-msgid "_Log filter actions to:"
-msgstr "_Dziennik komunikat�w o filtrowaniu:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Ustawienie jako konto _domy�lne"
 
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "O_znaczanie list�w jako \"przeczytanych\" po up�ywie"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_Bez pobierania jakichkolwiek obraz�w z sieci"
 
-#: mail/mail-config.glade.h:110
-msgid "_Organization:"
-msgstr "_Organizacja:"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "�cie�ka programu _PGP:"
 
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
-msgstr "�_cie�ka:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
-msgstr "_Zapami�tanie has�a"
+#: mail/mail-config.glade.h:172
+#, 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:114
-msgid "_Send mail in HTML format by default."
-msgstr "Domy�lne _wysy�anie list�w w formacie HTML."
+#: mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "Potwierdzanie przy wysy�aniu listu bez _tematu"
 
-#: mail/mail-config.glade.h:115
-msgid "_Server Type: "
-msgstr "_Typ serwera:"
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Radio"
 
-#: mail/mail-config.glade.h:116
-msgid "_Signature file:"
-msgstr "Plik z p_odpisem:"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
-msgstr "Nazwa _u�ytkownika:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Wszystkim"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Bezpiecze�stwo"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Bezpiecze�stwo"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Wysy�anie list�w"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Forma wy�wietlania czasu"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Zmienny"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_co"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " "
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr "placeholder"
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr "sekund."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Nie mo�na stworzy� kontekstu podpisu PGP."
@@ -9542,148 +12067,140 @@ msgstr "Nie mo�na stworzy� kontekstu otoczki S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nie mo�na stworzy� kontekstu dekodowania S/MIME."
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Zapis za��cznika"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Nie mo�na stworzy� katalogu tymczasowego: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Zapisz na dysk..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Wy�wietl na miejscu"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Otw�rz za pomoc� programu %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Wy�wietl na miejscu (za pomoc� programu %s)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Ukryj"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Zewn�trzna przegl�darka"
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Wczytywanie tre�ci listu"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Otw�rz odno�nik w przegl�darce"
 
-#: mail/mail-display.c:1594
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Skopiuj adres odno�nika"
 
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Zapisz odno�nik jako (FIXME)"
 
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Zapisz obraz jako..."
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "Za��cznik: %s"
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 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:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Niepoprawny adres"
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Odpowied� do"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Dla"
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1813
-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:1836
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution nie rozpoznaje podpisanego listu tego typu."
-
-#: mail/mail-format.c:1844
-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:1852
-msgid "This message is digitally signed but can not be proven to be authentic."
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
 msgstr ""
-"List zosta� podpisany cyfrowo lecz nie potwierdzono jego autentyczno�ci."
+"\n"
+"Dostarczyciel poczty: "
 
-#: mail/mail-format.c:2068
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wska�nik do witryny FTP (%s)"
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2120
 #, 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:2087
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wska�nik do lokalnego pliku (%s)"
 
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Wska�nik na zdalne dane (%s)"
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wska�nik na nieznane zewn�trzne dane (typu \"%s\")"
 
-#: mail/mail-format.c:2129
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Niepoprawna forma cz�ci external-body."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Przekonfigurowywanie folderu"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9692,27 +12209,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:763
+#: mail/mail-local.c:762
 #, 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:815
+#: mail/mail-local.c:814
 #, 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:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Konwertowanie folderu \"%s\" na format \"%s\""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, 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:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9720,11 +12237,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:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nie mo�na zmieni� formatu zdalnego folderu."
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Zmiana konfiguracji /%s"
@@ -9751,117 +12268,112 @@ msgstr ""
 msgid "Working"
 msgstr "Przetwarzanie"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtrowanie folderu"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Pobieranie poczty"
 
-#: 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 "Mimo wszystko, list zosta� wys�any pomy�lnie."
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Wysy�anie \"%s\""
 
-#: mail/mail-ops.c:677
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Wysy�anie %d. listu z %d"
 
-#: mail/mail-ops.c:696
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Niepowodzenie przy %d. li�cie z %d"
 
-#: 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 "Gotowe."
 
-#: mail/mail-ops.c:791
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Zapisywanie listu w folderze"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Przenoszenie list�w do %s"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiowanie list�w do %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Przenoszenie"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopiowanie"
 
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizowanie folder�w w \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "�mietnik"
-
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Przes�ane listy"
 
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otwieranie folderu %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Otwieranie miejsca przechowywania %s"
 
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Usuwanie folderu %s"
 
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Zapisywanie folderu \"%s\""
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Od�wie�anie folderu"
 
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Oczyszczanie folderu"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Pobieranie listu %s"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Pobieranie %d list�w"
 
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Zapisywanie %d list�w"
 
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9870,7 +12382,7 @@ msgstr ""
 "Nie mo�na stworzy� pliku wyj�ciowego: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9879,11 +12391,11 @@ msgstr ""
 "B��d przy zapisie list�w do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Zapisywanie za��cznika"
 
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9892,22 +12404,27 @@ msgstr ""
 "Nie mo�na stworzy� pliku wyj�ciowego: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie mo�na zapisa� danych: %s"
 
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Od��czanie od %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponowne nawi�zywanie po��czenia z %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Znajd�"
 
@@ -9947,64 +12464,88 @@ msgstr "Dopasowania:"
 msgid "Cancelling..."
 msgstr "Anulowanie..."
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serwer: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "�cie�ka: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:286
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Wysy�anie i odbi�r poczty"
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Anuluj wszystko"
 
-#: mail/mail-send-recv.c:348
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Aktualizowanie..."
 
-#: 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 "Oczekiwanie..."
 
-#: mail/mail-send-recv.c:533
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Anulowano."
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Operacja anulowana przez u�ytkownika."
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Wprowad� has�o dla %s"
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 msgid "Enter Password"
 msgstr "Wprowad� has�o"
 
-#: mail/mail-tools.c:255
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Nie mo�na zapisa� pliku z podpisem."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Zapisz podpis"
+
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Podpis zosta� zmieniony, lecz zmiany nie s� zapisane.\n"
+"\n"
+"Czy chcesz je zapisa�?"
+
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "Plik z podpisem:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Przes�any list - %s"
 
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Przes�any list"
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Przes�any list"
 
@@ -10031,104 +12572,163 @@ msgstr ""
 "   \"%s\"\n"
 "I zosta�y zaktualizowane."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "VFoldery"
+#: mail/mail-vfolder.c:785
+#, fuzzy
+msgid "vFolders"
+msgstr "Foldery"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:825
 msgid "Edit VFolder"
 msgstr "Modyfikacja VFoldera"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:841
 #, 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:894
+#: mail/mail-vfolder.c:895
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Brak tematu)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - List"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Niewidziany"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Widziany"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Z odpowiedzi�"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Wiele niewidzianych list�w"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Wiele list�w"
 
-#: mail/message-list.c:647
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Najni�szy"
 
-#: mail/message-list.c:648
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Ni�szy"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Wy�szy"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Najwy�szy"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Dzi� %k:%M"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Wczoraj %k:%M"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Aktualizowanie zestawienia list�w"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "Nale�ne "
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Stan"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Oznaczony"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Odebrany"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Rozmiar"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "Telefon kontaktowy"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Naprz�d"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Informacje o �r�dle"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Prze�lij"
+
+#: 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 "Odpowiedz"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Wszystkim"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Podgl�d"
+
+#: 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\""
@@ -10150,7 +12750,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Odsubskrybowywanie folderu \"%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 "Folder"
 
@@ -10195,86 +12795,10996 @@ msgid "_Unsubscribe"
 msgstr "O_dsubskrybuj"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Komponent Evolution obs�uguj�cy zestawienie wykonawcze."
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "Folder zawieraj�cy Zestawienie Evolution"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Edytor list�w Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Generator formantu zada� Evolution"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Generator komponentu zestawienia poczty."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Ustawienia zestawienia"
+
+#: 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
+#, fuzzy
+msgid "Aarhus"
+msgstr "Alarmy"
+
+#: my-evolution/Locations.h:2
+#, fuzzy
+msgid "Abakan"
+msgstr "Azerbejd�an"
+
+#: my-evolution/Locations.h:3
+msgid "Abbotsford"
+msgstr ""
+
+#: my-evolution/Locations.h:4
+#, fuzzy
+msgid "Aberdeen"
+msgstr "Uczestnik"
+
+#: my-evolution/Locations.h:5
+#, fuzzy
+msgid "Abha"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:6
+#, fuzzy
+msgid "Abilene"
+msgstr "Telefon przeno�ny"
+
+#: 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 "Nikaragua"
+
+#: my-evolution/Locations.h:13
+msgid "Adak"
+msgstr ""
+
+#: my-evolution/Locations.h:14
+#, fuzzy
+msgid "Adana"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:15
+msgid "Adana/Incirlik"
+msgstr ""
+
+#: my-evolution/Locations.h:16
+msgid "Adelaide"
+msgstr ""
+
+#: my-evolution/Locations.h:17
+#, fuzzy
+msgid "Aden"
+msgstr "Szwecja"
+
+#: my-evolution/Locations.h:18
+#, fuzzy
+msgid "Adrar"
+msgstr "Andora"
+
+#: my-evolution/Locations.h:19
+msgid "Aeroparque"
+msgstr ""
+
+#: my-evolution/Locations.h:20
+msgid "Aeropuerto del Norte"
+msgstr ""
+
+#: my-evolution/Locations.h:21
+#, fuzzy
+msgid "Afonsos"
+msgstr "Anonimowy"
+
+#: my-evolution/Locations.h:22
+#, fuzzy
+msgid "Africa"
+msgstr "Po�udniowa Afryka"
+
+#: my-evolution/Locations.h:23
+msgid "Afyon"
+msgstr ""
+
+#: my-evolution/Locations.h:24
+#, fuzzy
+msgid "Agen"
+msgstr "Argentyna"
+
+#: my-evolution/Locations.h:25
+#, fuzzy
+msgid "Aguascaliantes"
+msgstr "Australia"
+
+#: 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 "Albania"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:39
+#, fuzzy
+msgid "Alamosa"
+msgstr "Alarmy"
+
+#: my-evolution/Locations.h:40
+#, fuzzy
+msgid "Alaska"
+msgstr "Alarmy"
+
+#: my-evolution/Locations.h:41
+msgid "Al Baha"
+msgstr ""
+
+#: my-evolution/Locations.h:43
+#, fuzzy
+msgid "Albany"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:44
+#, fuzzy
+msgid "Albenga"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:45
+#, fuzzy
+msgid "Alberta"
+msgstr "Algieria"
+
+#: my-evolution/Locations.h:46
+msgid "Alborg"
+msgstr ""
+
+#: my-evolution/Locations.h:47
+msgid "Albuquerque"
+msgstr ""
+
+#: my-evolution/Locations.h:48
+#, fuzzy
+msgid "Alderney"
+msgstr "Nazwa folderu:"
+
+#: my-evolution/Locations.h:49
+msgid "Alesund"
+msgstr ""
+
+#: my-evolution/Locations.h:50
+#, fuzzy
+msgid "Alexandria"
+msgstr "Albania"
+
+#: 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 "Algieria"
+
+#: my-evolution/Locations.h:56
+#, fuzzy
+msgid "Algona"
+msgstr "Angola"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:62
+#, fuzzy
+msgid "Alliance"
+msgstr "Zaawansowane"
+
+#: my-evolution/Locations.h:63
+#, fuzzy
+msgid "Alma"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:64
+#, fuzzy
+msgid "Almeria"
+msgstr "Algieria"
+
+#: my-evolution/Locations.h:65
+#, fuzzy
+msgid "Alpena"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:66
+msgid "Al Qaysumah"
+msgstr ""
+
+#: my-evolution/Locations.h:67
+#, fuzzy
+msgid "Alta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:68
+#, fuzzy
+msgid "Altamira"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:69
+#, fuzzy
+msgid "Alton"
+msgstr "C_zynno�ci"
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr ""
+
+#: my-evolution/Locations.h:71
+#, fuzzy
+msgid "Alturas"
+msgstr "Alarmy"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:75
+#, fuzzy
+msgid "Amarillo"
+msgstr "E-mail"
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr ""
+
+#: my-evolution/Locations.h:77
+#, fuzzy
+msgid "Ambler"
+msgstr "Cz�onek"
+
+#: my-evolution/Locations.h:78
+#, fuzzy
+msgid "Amelia"
+msgstr "Armenia"
+
+#: my-evolution/Locations.h:79
+#, fuzzy
+msgid "Amendola"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:80
+#, fuzzy
+msgid "Ames"
+msgstr "mile"
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr ""
+
+#: my-evolution/Locations.h:82
+#, fuzzy
+msgid "Amsterdam"
+msgstr "Austria"
+
+#: my-evolution/Locations.h:83
+#, fuzzy
+msgid "Anadyr"
+msgstr "Andora"
+
+#: my-evolution/Locations.h:84
+msgid "Anaktuvuk"
+msgstr ""
+
+#: my-evolution/Locations.h:85
+#, fuzzy
+msgid "Anapa"
+msgstr "Japonia"
+
+#: my-evolution/Locations.h:86
+#, fuzzy
+msgid "Anchorage"
+msgstr "Andora"
+
+#: my-evolution/Locations.h:87
+msgid "Anchorage - Elmendorf AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:88
+#, fuzzy
+msgid "Ancona"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:89
+msgid "Andahuayla"
+msgstr ""
+
+#: my-evolution/Locations.h:90
+#, fuzzy
+msgid "Anderson"
+msgstr "Burza"
+
+#: my-evolution/Locations.h:91
+#, fuzzy
+msgid "Andoya"
+msgstr "Andora"
+
+#: my-evolution/Locations.h:92
+#, fuzzy
+msgid "Andravida"
+msgstr "Osoba"
+
+#: 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 "Albania"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:101
+#, fuzzy
+msgid "Anniston"
+msgstr "Afganistan"
+
+#: my-evolution/Locations.h:102
+#, fuzzy
+msgid "Antalya"
+msgstr "W�ochy"
+
+#: my-evolution/Locations.h:103
+#, fuzzy
+msgid "Antartica"
+msgstr "Antarktyka"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/Locations.h:104
+#, fuzzy
+msgid "Antigo"
+msgstr "Angola"
+
+#: my-evolution/Locations.h:105
+#, fuzzy
+msgid "Antigua"
+msgstr "Anguilla"
+
+#: my-evolution/Locations.h:106
+#, fuzzy
+msgid "Antigua and Barbuda"
+msgstr "Antigua i Barbuda"
+
+#: my-evolution/Locations.h:107
+#, fuzzy
+msgid "Antofagasta"
+msgstr "Afganistan"
+
+#: 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 "placeholder"
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr ""
+
+#: my-evolution/Locations.h:112
+#, fuzzy
+msgid "Aquadilla"
+msgstr "Anguilla"
+
+#: my-evolution/Locations.h:113
+#, fuzzy
+msgid "Aracaju"
+msgstr "Makao"
+
+#: my-evolution/Locations.h:114
+#, fuzzy
+msgid "Arad"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:115
+#, fuzzy
+msgid "Arar"
+msgstr "Aruba"
+
+#: my-evolution/Locations.h:116
+#, fuzzy
+msgid "Araxos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:117
+#, fuzzy
+msgid "Arcata"
+msgstr "Antarktyka"
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr ""
+
+#: my-evolution/Locations.h:119
+#, fuzzy
+msgid "Arequipa"
+msgstr "Armenia"
+
+#: my-evolution/Locations.h:121
+#, fuzzy
+msgid "Arica"
+msgstr "Algieria"
+
+#: my-evolution/Locations.h:122
+#, fuzzy
+msgid "Arizona"
+msgstr "Argentyna"
+
+#: my-evolution/Locations.h:123
+msgid "Arkansas"
+msgstr ""
+
+#: my-evolution/Locations.h:124
+msgid "Arkhangelsk"
+msgstr ""
+
+#: my-evolution/Locations.h:125
+#, fuzzy
+msgid "Arlington"
+msgstr "U�o�enie"
+
+#: my-evolution/Locations.h:126
+#, fuzzy
+msgid "Artigas"
+msgstr "Argentyna"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:131
+#, fuzzy
+msgid "Ashfield"
+msgstr "Przyporz�dkowany"
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:133
+#, fuzzy
+msgid "Ashland"
+msgstr "Tajlandia"
+
+#: my-evolution/Locations.h:134
+#, fuzzy
+msgid "Asia"
+msgstr "Austria"
+
+#: my-evolution/Locations.h:135
+#, fuzzy
+msgid "Aspen"
+msgstr "Otw�rz"
+
+#: my-evolution/Locations.h:136
+#, fuzzy
+msgid "Asswan"
+msgstr "Asystent"
+
+#: my-evolution/Locations.h:137
+#, fuzzy
+msgid "Astoria"
+msgstr "Austria"
+
+#: my-evolution/Locations.h:138
+#, fuzzy
+msgid "Astrakhan"
+msgstr "Australia"
+
+#: my-evolution/Locations.h:139
+#, fuzzy
+msgid "Asturias"
+msgstr "Austria"
+
+#: my-evolution/Locations.h:140
+#, fuzzy
+msgid "Asuncion"
+msgstr "Reunion"
+
+#: my-evolution/Locations.h:141
+#, fuzzy
+msgid "Athens"
+msgstr "Za��czniki"
+
+#: my-evolution/Locations.h:142
+#, fuzzy
+msgid "Athinai"
+msgstr "Chiny"
+
+#: my-evolution/Locations.h:143
+#, fuzzy
+msgid "Atlanta"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:144
+#, fuzzy
+msgid "Atlantic"
+msgstr "Automatycznie"
+
+#: 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 "Islandia"
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:150
+#, fuzzy
+msgid "Augusta"
+msgstr "Sierpie�"
+
+#: my-evolution/Locations.h:151
+#, fuzzy
+msgid "Aurora"
+msgstr "Andora"
+
+#: my-evolution/Locations.h:152
+#, fuzzy
+msgid "Austin"
+msgstr "Austria"
+
+#: my-evolution/Locations.h:153
+#, fuzzy
+msgid "Australasia"
+msgstr "Australia"
+
+#: my-evolution/Locations.h:156
+msgid "Avalon"
+msgstr ""
+
+#: my-evolution/Locations.h:157
+msgid "Aviano"
+msgstr ""
+
+#: my-evolution/Locations.h:158
+msgid "Ayacucho"
+msgstr ""
+
+#: my-evolution/Locations.h:159
+#, fuzzy
+msgid "Bage"
+msgstr "Podstawa"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:170
+#, fuzzy
+msgid "Ball Mountain"
+msgstr "E-mail zawiera"
+
+#: my-evolution/Locations.h:171
+#, fuzzy
+msgid "Baltimore"
+msgstr "Ba�tycki"
+
+#: my-evolution/Locations.h:172
+msgid "Baltimore-Glen Burnie"
+msgstr ""
+
+#: my-evolution/Locations.h:173
+#, fuzzy
+msgid "Banak"
+msgstr "Botswana"
+
+#: my-evolution/Locations.h:174
+#, fuzzy
+msgid "Bandarabbass"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:175
+#, fuzzy
+msgid "Bangor"
+msgstr "temu"
+
+#: my-evolution/Locations.h:176
+#, fuzzy
+msgid "Baracoa"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:177
+msgid "Barbers Point"
+msgstr ""
+
+#: my-evolution/Locations.h:178
+#, fuzzy
+msgid "Barcelona"
+msgstr "Macedonia"
+
+#: my-evolution/Locations.h:179
+#, fuzzy
+msgid "Bardufoss"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:180
+msgid "Bar Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:181
+#, fuzzy
+msgid "Bari"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:182
+msgid "Bariloche"
+msgstr ""
+
+#: my-evolution/Locations.h:183
+#, fuzzy
+msgid "Barinas"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:184
+#, fuzzy
+msgid "Barking Sand"
+msgstr "Szalej�cy piasek"
+
+#: my-evolution/Locations.h:185
+#, fuzzy
+msgid "Barksdale"
+msgstr "Podstawa"
+
+#: my-evolution/Locations.h:186
+#, fuzzy
+msgid "Barnaul"
+msgstr "Brazylia"
+
+#: 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 "Wyspy Faroe"
+
+#: 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 "Proste"
+
+#: my-evolution/Locations.h:194
+msgid "Batesville"
+msgstr ""
+
+#: my-evolution/Locations.h:195
+#, fuzzy
+msgid "Batman"
+msgstr "Bhutan"
+
+#: my-evolution/Locations.h:196
+msgid "Baton Rouge"
+msgstr ""
+
+#: my-evolution/Locations.h:197
+msgid "Battle Creek"
+msgstr ""
+
+#: my-evolution/Locations.h:198
+#, fuzzy
+msgid "Battle Mountain"
+msgstr "Nazwa zawiera"
+
+#: my-evolution/Locations.h:199
+#, fuzzy
+msgid "Bauru"
+msgstr "Nauru"
+
+#: my-evolution/Locations.h:200
+#, fuzzy
+msgid "Bayamo"
+msgstr "Bahamy"
+
+#: my-evolution/Locations.h:201
+msgid "Bayreuth"
+msgstr ""
+
+#: my-evolution/Locations.h:202
+#, fuzzy
+msgid "Beatrice"
+msgstr "Ba�tycki"
+
+#: my-evolution/Locations.h:203
+msgid "Beaufort"
+msgstr ""
+
+#: my-evolution/Locations.h:204
+#, fuzzy
+msgid "Beaumont"
+msgstr "miesi�c"
+
+#: 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 "Bahrain"
+
+#: my-evolution/Locations.h:208
+#, fuzzy
+msgid "Beckley"
+msgstr "Belize"
+
+#: my-evolution/Locations.h:209
+#, fuzzy
+msgid "Bedford"
+msgstr "przed"
+
+#: my-evolution/Locations.h:210
+#, fuzzy
+msgid "Beijing"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:211
+#, fuzzy
+msgid "Beirut"
+msgstr "Bia�ogu�"
+
+#: my-evolution/Locations.h:212
+msgid "Beja"
+msgstr ""
+
+#: my-evolution/Locations.h:213
+#, fuzzy
+msgid "Belem"
+msgstr "Belize"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:219
+#, fuzzy
+msgid "Belleville"
+msgstr "Belize"
+
+#: my-evolution/Locations.h:220
+#, fuzzy
+msgid "Bellingham"
+msgstr "Szalej�cy grad"
+
+#: my-evolution/Locations.h:221
+msgid "Belmar-Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:222
+#, fuzzy
+msgid "Belo Horizonte"
+msgstr "Belize"
+
+#: 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 "Wenezuela"
+
+#: my-evolution/Locations.h:226
+#, fuzzy
+msgid "Benina"
+msgstr "Benin"
+
+#: 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 "Od�wie�"
+
+#: my-evolution/Locations.h:230
+msgid "Bergamo"
+msgstr ""
+
+#: my-evolution/Locations.h:231
+#, fuzzy
+msgid "Bergen"
+msgstr "Widziany"
+
+#: my-evolution/Locations.h:232
+msgid "Bergstrom AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:233
+msgid "Berlevag"
+msgstr ""
+
+#: my-evolution/Locations.h:234
+#, fuzzy
+msgid "Berlin"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:235
+msgid "Berlin-Tegel"
+msgstr ""
+
+#: my-evolution/Locations.h:236
+msgid "Berlin-Tempelhof"
+msgstr ""
+
+#: my-evolution/Locations.h:237
+#, fuzzy
+msgid "Bern"
+msgstr "Benin"
+
+#: my-evolution/Locations.h:238
+#, fuzzy
+msgid "Bethel"
+msgstr "Pogoda"
+
+#: my-evolution/Locations.h:239
+msgid "Bethlehem Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:240
+#, fuzzy
+msgid "Bettles"
+msgstr "Belize"
+
+#: my-evolution/Locations.h:241
+#, fuzzy
+msgid "Beverly"
+msgstr "_co"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:245
+#, fuzzy
+msgid "Big Piney"
+msgstr "Pine"
+
+#: 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 "Lista dyskusyjna"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:257
+#, fuzzy
+msgid "Blanding"
+msgstr "Cieniowanie"
+
+# [cyba] Nie mam pewno�ci, ale jest zatoka Cooka, cie�nina, g�ry, wi�c chyba...
+#: my-evolution/Locations.h:258
+#, fuzzy
+msgid "Block Island"
+msgstr "Wyspy Cooka"
+
+#: my-evolution/Locations.h:259
+msgid "Bloemfontein J. B. M. Hertzog "
+msgstr ""
+
+#: my-evolution/Locations.h:260
+#, fuzzy
+msgid "Bloomington"
+msgstr "Szalej�cy piasek"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:267
+#, fuzzy
+msgid "Bodo"
+msgstr "Tre��"
+
+#: my-evolution/Locations.h:268
+msgid "Bogota/Eldorado"
+msgstr ""
+
+#: my-evolution/Locations.h:269
+#, fuzzy
+msgid "Boise"
+msgstr "Podstawa"
+
+#: my-evolution/Locations.h:271
+msgid "Bologna"
+msgstr ""
+
+#: my-evolution/Locations.h:272
+#, fuzzy
+msgid "Bolzano"
+msgstr "Polska"
+
+#: my-evolution/Locations.h:273
+msgid "Bombay/Santacruz"
+msgstr ""
+
+#: my-evolution/Locations.h:274
+#, fuzzy
+msgid "Boone"
+msgstr "Brak"
+
+#: my-evolution/Locations.h:275
+msgid "Bordeaux"
+msgstr ""
+
+#: my-evolution/Locations.h:276
+#, fuzzy
+msgid "Borger"
+msgstr "bez ko�ca"
+
+#: 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 "Bo�nia i Hercegowina"
+
+#: my-evolution/Locations.h:280
+#, fuzzy
+msgid "Boston"
+msgstr "Estonia"
+
+#: my-evolution/Locations.h:281
+#, fuzzy
+msgid "Boulmer"
+msgstr "Folder"
+
+#: my-evolution/Locations.h:282
+#, fuzzy
+msgid "Bourges"
+msgstr "�r�d�a"
+
+#: my-evolution/Locations.h:283
+msgid "Bournemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:284
+#, fuzzy
+msgid "Bowling Green"
+msgstr "Szalej�cy piasek"
+
+#: my-evolution/Locations.h:285
+#, fuzzy
+msgid "Bozeman"
+msgstr "Korea�ski"
+
+#: my-evolution/Locations.h:286
+#, fuzzy
+msgid "Bradford"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:287
+msgid "Bradshaw Field"
+msgstr ""
+
+#: my-evolution/Locations.h:288
+#, fuzzy
+msgid "Brainerd"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:289
+#, fuzzy
+msgid "Brasilia"
+msgstr "Brazylia"
+
+#: my-evolution/Locations.h:290
+msgid "Brasschaat"
+msgstr ""
+
+#: my-evolution/Locations.h:291
+#, fuzzy
+msgid "Bratislava"
+msgstr "Brazylia"
+
+#: my-evolution/Locations.h:292
+#, fuzzy
+msgid "Bratsk"
+msgstr "Szkice"
+
+#: my-evolution/Locations.h:293
+msgid "Braunschweig"
+msgstr ""
+
+#: my-evolution/Locations.h:295
+#, fuzzy
+msgid "Bremen"
+msgstr "Jemen"
+
+#: my-evolution/Locations.h:296
+msgid "Bremerton"
+msgstr ""
+
+#: my-evolution/Locations.h:297
+#, fuzzy
+msgid "Brest"
+msgstr "Test"
+
+#: my-evolution/Locations.h:298
+msgid "Bridgeport"
+msgstr ""
+
+#: my-evolution/Locations.h:299
+#, fuzzy
+msgid "Brindisi"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:300
+msgid "Brisbane"
+msgstr ""
+
+#: my-evolution/Locations.h:301
+#, fuzzy
+msgid "Bristol"
+msgstr "Brazylia"
+
+#: 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 "Barbados"
+
+#: my-evolution/Locations.h:305
+#, fuzzy
+msgid "Broken Bow"
+msgstr "Fragmentaryczne chmury"
+
+#: my-evolution/Locations.h:306
+msgid "Bronnoysund"
+msgstr ""
+
+#: my-evolution/Locations.h:307
+#, fuzzy
+msgid "Brookings"
+msgstr "Przetwarzanie"
+
+#: my-evolution/Locations.h:308
+msgid "Brooksville"
+msgstr ""
+
+#: my-evolution/Locations.h:309
+#, fuzzy
+msgid "Broome"
+msgstr "Dolny:"
+
+#: my-evolution/Locations.h:310
+msgid "Brownsville"
+msgstr ""
+
+#: my-evolution/Locations.h:311
+#, fuzzy
+msgid "Brunswick"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:312
+msgid "Brussels-National Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:313
+msgid "Bryansk"
+msgstr ""
+
+#: my-evolution/Locations.h:314
+#, fuzzy
+msgid "Bryce Canyon"
+msgstr "Wed�ug firmy"
+
+#: 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 "Bhutan"
+
+#: my-evolution/Locations.h:323
+#, fuzzy
+msgid "Burgas"
+msgstr "Prc"
+
+#: my-evolution/Locations.h:324
+#, fuzzy
+msgid "Burley"
+msgstr "Turcja"
+
+#: my-evolution/Locations.h:325
+msgid "Burlington"
+msgstr ""
+
+#: my-evolution/Locations.h:326
+#, fuzzy
+msgid "Burnet"
+msgstr "Burundi"
+
+#: my-evolution/Locations.h:327
+#, fuzzy
+msgid "Burns"
+msgstr "Prc"
+
+#: my-evolution/Locations.h:328
+#, fuzzy
+msgid "Bursa"
+msgstr "Prc"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:332
+#, fuzzy
+msgid "Cagliari"
+msgstr "Kalendarz"
+
+#: my-evolution/Locations.h:333
+#, fuzzy
+msgid "Cairns"
+msgstr "Przewodniczenie"
+
+#: my-evolution/Locations.h:334
+#, fuzzy
+msgid "Cairo"
+msgstr "Przewodniczenie"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:338
+#, fuzzy
+msgid "Calgary"
+msgstr "Kalendarz"
+
+#: my-evolution/Locations.h:339
+msgid "Cali/Alfonso Bonillaaragon"
+msgstr ""
+
+#: my-evolution/Locations.h:340
+#, fuzzy
+msgid "Caliente"
+msgstr "Kalendarz"
+
+#: my-evolution/Locations.h:341
+#, fuzzy
+msgid "California"
+msgstr "Nowa Kaledonia"
+
+#: my-evolution/Locations.h:342
+msgid "Calvi-Ste-Catherine"
+msgstr ""
+
+#: my-evolution/Locations.h:343
+#, fuzzy
+msgid "Camaguey"
+msgstr "Paragwaj"
+
+#: 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 "Kamerun"
+
+#: my-evolution/Locations.h:347
+#, fuzzy
+msgid "Camiri"
+msgstr "Przewodniczenie"
+
+#: my-evolution/Locations.h:348
+#, fuzzy
+msgid "Campeche"
+msgstr "Zako�czone"
+
+#: my-evolution/Locations.h:349
+#, fuzzy
+msgid "Campinas"
+msgstr "Kambod�a"
+
+#: my-evolution/Locations.h:350
+#, fuzzy
+msgid "Campo"
+msgstr "Frma"
+
+#: my-evolution/Locations.h:351
+#, fuzzy
+msgid "Campo Grande"
+msgstr "Wyspy Zielonego Przyl�dka"
+
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr ""
+
+#: my-evolution/Locations.h:353
+#, fuzzy
+msgid "Canaan"
+msgstr "Kanada"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:363
+#, fuzzy
+msgid "Cancun"
+msgstr "Anuluj"
+
+#: my-evolution/Locations.h:364
+msgid "Cannes-Mandelieu"
+msgstr ""
+
+#: my-evolution/Locations.h:365
+#, fuzzy
+msgid "Cantwell"
+msgstr "Anuluj"
+
+#: my-evolution/Locations.h:366
+#, fuzzy
+msgid "Cape Girardeau"
+msgstr "Wyspy Zielonego Przyl�dka"
+
+#: my-evolution/Locations.h:367
+#, fuzzy
+msgid "Cape Hatteras"
+msgstr "Wyspy Zielonego Przyl�dka"
+
+#: my-evolution/Locations.h:368
+#, fuzzy
+msgid "Cape Lisburne"
+msgstr "�r�d�o papieru:"
+
+#: my-evolution/Locations.h:369
+#, fuzzy
+msgid "Cape Newenham"
+msgstr "Wyspy Zielonego Przyl�dka"
+
+#: 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 "Wyspy Zielonego Przyl�dka"
+
+#: my-evolution/Locations.h:374
+msgid "Caracas La Carlota"
+msgstr ""
+
+#: my-evolution/Locations.h:375
+msgid "Caracas Maiquetia"
+msgstr ""
+
+#: my-evolution/Locations.h:376
+#, fuzzy
+msgid "Caravelas"
+msgstr "Anuluj zadanie"
+
+#: my-evolution/Locations.h:377
+#, fuzzy
+msgid "Carbondale"
+msgstr "Kambod�a"
+
+#: my-evolution/Locations.h:378
+#, fuzzy
+msgid "Cardiff"
+msgstr "Widok karty"
+
+#: my-evolution/Locations.h:379
+#, fuzzy
+msgid "Caribou"
+msgstr "Samoch�d"
+
+#: my-evolution/Locations.h:380
+#, fuzzy
+msgid "Carlisle"
+msgstr "Zmienny"
+
+#: my-evolution/Locations.h:381
+#, fuzzy
+msgid "Carlsbad"
+msgstr "Telefon kontaktowy"
+
+#: my-evolution/Locations.h:382
+#, fuzzy
+msgid "Carroll"
+msgstr "Samoch�d"
+
+#: my-evolution/Locations.h:383
+msgid "Cartagena/Rafael Nunez"
+msgstr ""
+
+#: my-evolution/Locations.h:384
+msgid "Casa Granda"
+msgstr ""
+
+#: my-evolution/Locations.h:385
+#, fuzzy
+msgid "Cascade"
+msgstr "Pejza�"
+
+#: my-evolution/Locations.h:386
+#, fuzzy
+msgid "Casper"
+msgstr "Papier"
+
+#: my-evolution/Locations.h:387
+#, fuzzy
+msgid "Catacamas"
+msgstr "Bahamy"
+
+#: my-evolution/Locations.h:388
+#, fuzzy
+msgid "Catania"
+msgstr "Chorwacja"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:393
+#, fuzzy
+msgid "Cedar City"
+msgstr "Czyste niebo"
+
+#: 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 "Algieria"
+
+#: my-evolution/Locations.h:397
+msgid "Chacarita"
+msgstr ""
+
+#: my-evolution/Locations.h:398
+#, fuzzy
+msgid "Chadron"
+msgstr "Czad"
+
+#: my-evolution/Locations.h:399
+#, fuzzy
+msgid "Challis"
+msgstr "Przewodniczenie"
+
+#: my-evolution/Locations.h:400
+#, fuzzy
+msgid "Chamberlain"
+msgstr "Kamerun"
+
+#: my-evolution/Locations.h:401
+#, fuzzy
+msgid "Chambery"
+msgstr "Kamerun"
+
+#: my-evolution/Locations.h:402
+#, fuzzy
+msgid "Champaign"
+msgstr "Firma"
+
+#: my-evolution/Locations.h:403
+#, fuzzy
+msgid "Chandalar Lake"
+msgstr "Komunikat kalendarza"
+
+#: my-evolution/Locations.h:404
+#, fuzzy
+msgid "Chandler"
+msgstr "Czad"
+
+#: my-evolution/Locations.h:405
+#, fuzzy
+msgid "Chania"
+msgstr "Chiny"
+
+#: my-evolution/Locations.h:406
+#, fuzzy
+msgid "Chanute"
+msgstr "Anuluj"
+
+#: my-evolution/Locations.h:407
+#, fuzzy
+msgid "Chariton"
+msgstr "Kamerun"
+
+#: my-evolution/Locations.h:408
+msgid "Charleroi-Brussels South"
+msgstr ""
+
+#: my-evolution/Locations.h:409
+msgid "Charles City"
+msgstr ""
+
+#: my-evolution/Locations.h:410
+#, fuzzy
+msgid "Charleston"
+msgstr "Osoby przewodnicz�ce"
+
+#: my-evolution/Locations.h:411
+#, fuzzy
+msgid "Charlotte"
+msgstr "Majotta"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:416
+#, fuzzy
+msgid "Cheju"
+msgstr "Chile"
+
+#: 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 "Luksemburg"
+
+#: my-evolution/Locations.h:420
+#, fuzzy
+msgid "Cherry Point"
+msgstr "Inny telefon"
+
+#: 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 "Chiny"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:431
+#, fuzzy
+msgid "Chiclayo"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:432
+#, fuzzy
+msgid "Chico"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:433
+msgid "Chicopee Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:434
+#, fuzzy
+msgid "Chievres"
+msgstr "Chi�ski"
+
+#: my-evolution/Locations.h:435
+#, fuzzy
+msgid "Chihhang"
+msgstr "Chiny"
+
+#: my-evolution/Locations.h:436
+msgid "Chihuahua"
+msgstr ""
+
+#: my-evolution/Locations.h:437
+#, fuzzy
+msgid "Childress"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:439
+#, fuzzy
+msgid "China Lake"
+msgstr "Chiny"
+
+#: my-evolution/Locations.h:440
+#, fuzzy
+msgid "Chinandega"
+msgstr "Chiny"
+
+#: my-evolution/Locations.h:441
+msgid "Chinmem/Shatou"
+msgstr ""
+
+#: my-evolution/Locations.h:442
+#, fuzzy
+msgid "Chino"
+msgstr "Chiny"
+
+#: my-evolution/Locations.h:443
+msgid "Chippewa County"
+msgstr ""
+
+#: my-evolution/Locations.h:444
+#, fuzzy
+msgid "Chita"
+msgstr "Chiny"
+
+#: 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 "Chiny"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:462
+#, fuzzy
+msgid "Clarinda"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:463
+#, fuzzy
+msgid "Clarion"
+msgstr "Wsp�praca"
+
+#: my-evolution/Locations.h:464
+msgid "Clarksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:465
+#, fuzzy
+msgid "Clayton"
+msgstr "Wsp�praca"
+
+#: my-evolution/Locations.h:466
+msgid "Clayton Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:467
+msgid "Clermont-Ferrand"
+msgstr ""
+
+#: my-evolution/Locations.h:468
+#, fuzzy
+msgid "Cleveland"
+msgstr "Grenlandia"
+
+#: 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 "Columbia"
+
+#: my-evolution/Locations.h:474
+msgid "Cochabamba"
+msgstr ""
+
+#: my-evolution/Locations.h:475
+msgid "Cocoa Beach"
+msgstr ""
+
+# [cyba] Nie mam pewno�ci, ale jest zatoka Cooka, cie�nina, g�ry, wi�c chyba...
+#: my-evolution/Locations.h:476
+#, fuzzy
+msgid "Cocos Island"
+msgstr "Wyspy Cooka"
+
+#: my-evolution/Locations.h:477
+#, fuzzy
+msgid "Cody"
+msgstr "Tre��"
+
+#: my-evolution/Locations.h:478
+msgid "Coeur d'Alene"
+msgstr ""
+
+#: my-evolution/Locations.h:479
+#, fuzzy
+msgid "Cold Bay"
+msgstr "Pasek f_older�w"
+
+#: my-evolution/Locations.h:480
+#, fuzzy
+msgid "Colima"
+msgstr "Columbia"
+
+#: my-evolution/Locations.h:481
+#, fuzzy
+msgid "College Station"
+msgstr "Wsp�praca"
+
+#: my-evolution/Locations.h:482
+msgid "Colmar-Meyenheim"
+msgstr ""
+
+#: my-evolution/Locations.h:484
+#, fuzzy
+msgid "Colonia"
+msgstr "Columbia"
+
+#: my-evolution/Locations.h:485
+#, fuzzy
+msgid "Colorado"
+msgstr "Wsp�praca"
+
+#: my-evolution/Locations.h:486
+msgid "Colorado Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:487
+#, fuzzy
+msgid "Columbia"
+msgstr "Columbia"
+
+#: my-evolution/Locations.h:488
+msgid "Columbia-McEntire"
+msgstr ""
+
+#: my-evolution/Locations.h:489
+#, fuzzy
+msgid "Columbus"
+msgstr "Columbia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:494
+#, fuzzy
+msgid "Colville"
+msgstr "Chile"
+
+#: my-evolution/Locations.h:495
+msgid "Comodoro Rivadavia"
+msgstr ""
+
+#: my-evolution/Locations.h:496
+#, fuzzy
+msgid "Comox"
+msgstr "Frma"
+
+#: my-evolution/Locations.h:497
+msgid "Conceicao Do Araguaia"
+msgstr ""
+
+#: my-evolution/Locations.h:498
+#, fuzzy
+msgid "Concepcion"
+msgstr "Anuluj operacj�"
+
+#: my-evolution/Locations.h:499
+#, fuzzy
+msgid "Concord"
+msgstr "Kongo"
+
+#: my-evolution/Locations.h:500
+msgid "Concordia"
+msgstr ""
+
+#: my-evolution/Locations.h:501
+msgid "Connaught"
+msgstr ""
+
+#: my-evolution/Locations.h:502
+#, fuzzy
+msgid "Connecticut"
+msgstr "Kontakty"
+
+#: my-evolution/Locations.h:503
+#, fuzzy
+msgid "Conroe"
+msgstr "Kongo"
+
+#: my-evolution/Locations.h:504
+#, fuzzy
+msgid "Constantine"
+msgstr "Z_awieraj�cy:"
+
+#: my-evolution/Locations.h:505
+msgid "Copper Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:506
+#, fuzzy
+msgid "Cordoba"
+msgstr "Columbia"
+
+#: my-evolution/Locations.h:507
+#, fuzzy
+msgid "Cordova"
+msgstr "Jordania"
+
+#: my-evolution/Locations.h:508
+msgid "Cork"
+msgstr ""
+
+#: my-evolution/Locations.h:509
+#, fuzzy
+msgid "Coro"
+msgstr "Komory"
+
+#: my-evolution/Locations.h:510
+#, fuzzy
+msgid "Corona"
+msgstr "Komory"
+
+#: my-evolution/Locations.h:511
+msgid "Corpus Christi"
+msgstr ""
+
+#: my-evolution/Locations.h:512
+msgid "Corpus Christi NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:513
+#, fuzzy
+msgid "Corrientes"
+msgstr "powt�rzeniami"
+
+#: my-evolution/Locations.h:514
+#, fuzzy
+msgid "Corsicana"
+msgstr "Kostaryka"
+
+#: my-evolution/Locations.h:515
+#, fuzzy
+msgid "Cortez"
+msgstr "Notka"
+
+#: my-evolution/Locations.h:516
+#, fuzzy
+msgid "Corumba"
+msgstr "Kuba"
+
+#: my-evolution/Locations.h:518
+msgid "Cotulla"
+msgstr ""
+
+#: my-evolution/Locations.h:519
+msgid "Council Bluffs"
+msgstr ""
+
+#: my-evolution/Locations.h:520
+#, fuzzy
+msgid "Coventry"
+msgstr "_Kraj:"
+
+#: my-evolution/Locations.h:521
+#, fuzzy
+msgid "Covington"
+msgstr "Kongo"
+
+#: my-evolution/Locations.h:522
+msgid "Cozumel"
+msgstr ""
+
+#: my-evolution/Locations.h:523
+#, fuzzy
+msgid "Craig"
+msgstr "Chorwacja"
+
+#: my-evolution/Locations.h:524
+#, fuzzy
+msgid "Cranfield"
+msgstr "Anulowane"
+
+#: my-evolution/Locations.h:525
+msgid "Crescent City"
+msgstr ""
+
+#: my-evolution/Locations.h:526
+#, fuzzy
+msgid "Creston"
+msgstr "Pytanie"
+
+#: my-evolution/Locations.h:527
+#, fuzzy
+msgid "Crestview"
+msgstr "Podgl�d"
+
+#: 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 "Kamerun"
+
+#: my-evolution/Locations.h:533
+#, fuzzy
+msgid "Cuba Awrs"
+msgstr "Kuba"
+
+#: my-evolution/Locations.h:534
+msgid "Cuernavaca"
+msgstr ""
+
+#: my-evolution/Locations.h:535
+#, fuzzy
+msgid "Cuiaba"
+msgstr "Kuba"
+
+#: my-evolution/Locations.h:536
+#, fuzzy
+msgid "Culdrose"
+msgstr "Zamknij"
+
+#: my-evolution/Locations.h:537
+msgid "Culiacan"
+msgstr ""
+
+#: my-evolution/Locations.h:538
+#, fuzzy
+msgid "Cumana"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:539
+msgid "Cumberland"
+msgstr ""
+
+#: my-evolution/Locations.h:540
+#, fuzzy
+msgid "Curitiba"
+msgstr "Chorwacja"
+
+#: my-evolution/Locations.h:541
+msgid "Curitiba Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:542
+#, fuzzy
+msgid "Custer"
+msgstr "Wytnij"
+
+#: my-evolution/Locations.h:543
+msgid "Cut Bank"
+msgstr ""
+
+#: my-evolution/Locations.h:544
+msgid "Cuzco"
+msgstr ""
+
+#: my-evolution/Locations.h:547
+#, fuzzy
+msgid "Dagali"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:548
+msgid "Daggett"
+msgstr ""
+
+#: my-evolution/Locations.h:549
+msgid "Dalhart"
+msgstr ""
+
+#: my-evolution/Locations.h:550
+#, fuzzy
+msgid "Dalian"
+msgstr "Taiwan"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:556
+#, fuzzy
+msgid "Danbury"
+msgstr "Stycze�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:562
+#, fuzzy
+msgid "Dayton"
+msgstr "Dzie�"
+
+#: my-evolution/Locations.h:563
+msgid "Daytona Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:564
+msgid "Dayton-Fairborn"
+msgstr ""
+
+#: my-evolution/Locations.h:565
+#, fuzzy
+msgid "Dayton-South Airport"
+msgstr "Nie importuj"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:571
+#, fuzzy
+msgid "Deelen"
+msgstr "Usu�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:576
+#, fuzzy
+msgid "Delta"
+msgstr "Usu�"
+
+#: my-evolution/Locations.h:577
+#, fuzzy
+msgid "Deming"
+msgstr "Spotkanie"
+
+#: my-evolution/Locations.h:578
+msgid "Den Helder/De Kooy"
+msgstr ""
+
+#: my-evolution/Locations.h:579
+#, fuzzy
+msgid "Denison"
+msgstr "Reunion"
+
+#: my-evolution/Locations.h:581
+#, fuzzy
+msgid "Denton"
+msgstr "Libia"
+
+#: my-evolution/Locations.h:582
+#, fuzzy
+msgid "Denver"
+msgstr "Nadawca"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:587
+#, fuzzy
+msgid "Des Moines"
+msgstr "Strefy czasowe"
+
+#: my-evolution/Locations.h:588
+#, fuzzy
+msgid "Destin"
+msgstr "Pytanie"
+
+#: 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 "Bahrain"
+
+#: my-evolution/Locations.h:596
+#, fuzzy
+msgid "Dickinson"
+msgstr "Wymiary:"
+
+#: my-evolution/Locations.h:597
+#, fuzzy
+msgid "Dijon"
+msgstr "Gotowe"
+
+#: my-evolution/Locations.h:598
+#, fuzzy
+msgid "Dillingham"
+msgstr "Zbli�aj�cy si� grad"
+
+#: my-evolution/Locations.h:599
+#, fuzzy
+msgid "Dillon"
+msgstr "Gotowe"
+
+#: my-evolution/Locations.h:600
+#, fuzzy
+msgid "Dinard"
+msgstr "Wydrukuj kart�"
+
+#: 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 "Rola"
+
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "Gotowe"
+
+#: my-evolution/Locations.h:610
+#, fuzzy
+msgid "Dongsha"
+msgstr "Tonga"
+
+#: my-evolution/Locations.h:611
+msgid "Dongshi"
+msgstr ""
+
+#: my-evolution/Locations.h:612
+#, fuzzy
+msgid "Don Torcuato"
+msgstr "w lub po"
+
+#: my-evolution/Locations.h:613
+msgid "Dortmund-Wickede"
+msgstr ""
+
+#: my-evolution/Locations.h:614
+#, fuzzy
+msgid "Dothan"
+msgstr "Gotowe"
+
+#: my-evolution/Locations.h:615
+msgid "Douglas"
+msgstr ""
+
+#: my-evolution/Locations.h:616
+#, fuzzy
+msgid "Dover"
+msgstr "bez ko�ca"
+
+#: 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 "Kuba"
+
+#: my-evolution/Locations.h:620
+msgid "Dubbo"
+msgstr ""
+
+#: my-evolution/Locations.h:621
+#, fuzzy
+msgid "Dublin"
+msgstr "Publiczny"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:625
+#, fuzzy
+msgid "Dugway"
+msgstr "Dzie�"
+
+#: my-evolution/Locations.h:626
+#, fuzzy
+msgid "Duluth"
+msgstr "Domy�lny"
+
+#: my-evolution/Locations.h:627
+#, fuzzy
+msgid "Dundee"
+msgstr "Nale�ne "
+
+#: my-evolution/Locations.h:628
+#, fuzzy
+msgid "Durango"
+msgstr "temu"
+
+#: 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 "Kurzawa"
+
+#: my-evolution/Locations.h:633
+msgid "Dutch Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:634
+msgid "Dyersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:635
+#, fuzzy
+msgid "Eagle"
+msgstr "Uaktywnij"
+
+#: 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 "Wsch�d - po�udniowy wsch�d"
+
+#: my-evolution/Locations.h:640
+msgid "Eau Claire"
+msgstr ""
+
+#: my-evolution/Locations.h:642
+#, fuzzy
+msgid "Edinburgh"
+msgstr "Koniec:"
+
+#: my-evolution/Locations.h:643
+#, fuzzy
+msgid "Edmonton"
+msgstr "miesi�c"
+
+#: 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 "Tornado"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:661
+#, fuzzy
+msgid "Elkins"
+msgstr "lista"
+
+#: my-evolution/Locations.h:662
+msgid "Elko"
+msgstr ""
+
+#: my-evolution/Locations.h:663
+#, fuzzy
+msgid "Elmira"
+msgstr "Elm"
+
+#: my-evolution/Locations.h:664
+#, fuzzy
+msgid "El Monte"
+msgstr "Miesi�c"
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr ""
+
+#: my-evolution/Locations.h:667
+#, fuzzy
+msgid "El Salvador Int."
+msgstr "Salwador"
+
+#: my-evolution/Locations.h:668
+msgid "Elsenborn"
+msgstr ""
+
+#: my-evolution/Locations.h:669
+#, fuzzy
+msgid "Ely"
+msgstr "Elm"
+
+#: my-evolution/Locations.h:670
+msgid "Emmonak"
+msgstr ""
+
+#: my-evolution/Locations.h:671
+#, fuzzy
+msgid "Emporia"
+msgstr "Wa�ny"
+
+#: my-evolution/Locations.h:672
+msgid "Enid"
+msgstr ""
+
+#: my-evolution/Locations.h:673
+#, fuzzy
+msgid "Enid/Woodring"
+msgstr "Koniec:"
+
+#: 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 "Erytrea"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:685
+#, fuzzy
+msgid "Eugene"
+msgstr "Czerwiec"
+
+#: my-evolution/Locations.h:686
+#, fuzzy
+msgid "Eureka"
+msgstr "Erytrea"
+
+#: my-evolution/Locations.h:687
+msgid "Europe"
+msgstr ""
+
+#: my-evolution/Locations.h:688
+#, fuzzy
+msgid "Evanston"
+msgstr "Estonia"
+
+#: my-evolution/Locations.h:689
+msgid "Evansville"
+msgstr ""
+
+#: my-evolution/Locations.h:690
+#, fuzzy
+msgid "Everett"
+msgstr "Co"
+
+#: my-evolution/Locations.h:691
+msgid "Evergreen"
+msgstr ""
+
+#: my-evolution/Locations.h:692
+msgid "Evreux-Fauville"
+msgstr ""
+
+#: my-evolution/Locations.h:693
+#, fuzzy
+msgid "Exeter"
+msgstr "Pogoda"
+
+#: my-evolution/Locations.h:694
+msgid "Ezeiza"
+msgstr ""
+
+#: my-evolution/Locations.h:695
+#, fuzzy
+msgid "Fagernes"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:696
+msgid "Fairbanks"
+msgstr ""
+
+#: my-evolution/Locations.h:697
+msgid "Fairchild"
+msgstr ""
+
+#: my-evolution/Locations.h:698
+#, fuzzy
+msgid "Fairfield"
+msgstr "Pole _Od"
+
+#: my-evolution/Locations.h:699
+#, fuzzy
+msgid "Fairmont"
+msgstr "Czcionki"
+
+#: 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 "temu"
+
+#: my-evolution/Locations.h:705
+#, fuzzy
+msgid "Farmingdale"
+msgstr "Zmienny"
+
+#: my-evolution/Locations.h:706
+#, fuzzy
+msgid "Farmington"
+msgstr "Utrzymuj�ce si� tornado"
+
+#: my-evolution/Locations.h:707
+#, fuzzy
+msgid "Farmville"
+msgstr "Nazwisko panie�skie"
+
+#: my-evolution/Locations.h:708
+#, fuzzy
+msgid "Faro"
+msgstr "Od"
+
+#: my-evolution/Locations.h:709
+msgid "Fayetteville"
+msgstr ""
+
+#: my-evolution/Locations.h:710
+#, fuzzy
+msgid "Feng Nin"
+msgstr "Utrzymuj�cy si� deszcz"
+
+#: my-evolution/Locations.h:711
+msgid "Fergus Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:712
+msgid "Fernando De Noronha"
+msgstr ""
+
+#: my-evolution/Locations.h:713
+#, fuzzy
+msgid "Ferrara"
+msgstr "Luty"
+
+#: my-evolution/Locations.h:714
+#, fuzzy
+msgid "Figari"
+msgstr "Nigeria"
+
+#: my-evolution/Locations.h:715
+#, fuzzy
+msgid "Findlay"
+msgstr "Pi�tek"
+
+#: my-evolution/Locations.h:717
+#, fuzzy
+msgid "Firenze"
+msgstr "Wolny"
+
+#: my-evolution/Locations.h:718
+msgid "Fitchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:719
+msgid "Flagstaff"
+msgstr ""
+
+#: my-evolution/Locations.h:720
+#, fuzzy
+msgid "Flint"
+msgstr "lista"
+
+#: my-evolution/Locations.h:721
+#, fuzzy
+msgid "Flippin"
+msgstr "Filipiny"
+
+#: my-evolution/Locations.h:722
+#, fuzzy
+msgid "Florence"
+msgstr "Francja"
+
+#: my-evolution/Locations.h:723
+#, fuzzy
+msgid "Florennes"
+msgstr "Wolny"
+
+#: my-evolution/Locations.h:724
+#, fuzzy
+msgid "Flores"
+msgstr "Nazwa karty"
+
+#: my-evolution/Locations.h:725
+msgid "Florianopolis"
+msgstr ""
+
+#: my-evolution/Locations.h:726
+#, fuzzy
+msgid "Florida"
+msgstr "Pi�tek"
+
+#: my-evolution/Locations.h:727
+#, fuzzy
+msgid "Floro"
+msgstr "Od"
+
+#: my-evolution/Locations.h:728
+msgid "Fond Du Lac"
+msgstr ""
+
+#: my-evolution/Locations.h:729
+#, fuzzy
+msgid "Forde/Bringeland"
+msgstr "Finlandia"
+
+#: my-evolution/Locations.h:730
+#, fuzzy
+msgid "Forli"
+msgstr "_Pi�"
+
+#: my-evolution/Locations.h:731
+#, fuzzy
+msgid "Formosa"
+msgstr "Format"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:742
+#, fuzzy
+msgid "Fort Eustis"
+msgstr "Skr�ty"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:748
+#, fuzzy
+msgid "Fort Leonard"
+msgstr "Prze�lij"
+
+#: my-evolution/Locations.h:749
+msgid "Fort Lewis"
+msgstr ""
+
+#: my-evolution/Locations.h:750
+msgid "Fort Madison"
+msgstr ""
+
+#: my-evolution/Locations.h:751
+#, fuzzy
+msgid "Fort Meade"
+msgstr "_Prze�lij list"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:757
+#, fuzzy
+msgid "Fort Smith"
+msgstr "Format"
+
+#: my-evolution/Locations.h:758
+#, fuzzy
+msgid "Fort Stewart"
+msgstr "Przed rozpocz�ciem"
+
+#: my-evolution/Locations.h:759
+msgid "Fort Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:760
+#, fuzzy
+msgid "Fort Wayne"
+msgstr "Francja"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:769
+#, fuzzy
+msgid "Franklin"
+msgstr "Prze�lij _wstawiony"
+
+#: my-evolution/Locations.h:770
+#, fuzzy
+msgid "Fredericton"
+msgstr "opis"
+
+#: my-evolution/Locations.h:771
+#, fuzzy
+msgid "Freeport"
+msgstr "Wolny"
+
+#: my-evolution/Locations.h:772
+msgid "Frenchville"
+msgstr ""
+
+#: my-evolution/Locations.h:773
+#, fuzzy
+msgid "Fresno"
+msgstr "Utrzymuj�cy si� �nieg"
+
+#: my-evolution/Locations.h:774
+msgid "Fresno-Chandler"
+msgstr ""
+
+#: my-evolution/Locations.h:775
+#, fuzzy
+msgid "Friday Harbor"
+msgstr "Pi�tek"
+
+#: my-evolution/Locations.h:776
+msgid "Friedrichshafen"
+msgstr ""
+
+#: my-evolution/Locations.h:777
+#, fuzzy
+msgid "Frigg"
+msgstr "_Pi�"
+
+#: my-evolution/Locations.h:778
+#, fuzzy
+msgid "Frontone"
+msgstr "Czcionki"
+
+#: my-evolution/Locations.h:779
+#, fuzzy
+msgid "Frosinone"
+msgstr "Zaw�d"
+
+#: my-evolution/Locations.h:780
+#, fuzzy
+msgid "Fryeburg"
+msgstr "Luty"
+
+#: 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 "Macedonia"
+
+#: my-evolution/Locations.h:789
+msgid "Gadsden"
+msgstr ""
+
+#: my-evolution/Locations.h:790
+#, fuzzy
+msgid "Gage"
+msgstr "Strona"
+
+#: my-evolution/Locations.h:791
+#, fuzzy
+msgid "Gainesville"
+msgstr "Anulowane"
+
+#: 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 "Ghana"
+
+#: my-evolution/Locations.h:796
+msgid "Galesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:797
+#, fuzzy
+msgid "Gallup"
+msgstr "Gwadelupa"
+
+#: my-evolution/Locations.h:798
+msgid "Galveston"
+msgstr ""
+
+#: my-evolution/Locations.h:799
+#, fuzzy
+msgid "Gambell"
+msgstr "Gambia"
+
+#: my-evolution/Locations.h:800
+#, fuzzy
+msgid "Gander"
+msgstr "G��wka"
+
+#: my-evolution/Locations.h:801
+#, fuzzy
+msgid "Garden City"
+msgstr "To�samo��"
+
+#: my-evolution/Locations.h:802
+msgid "Gary"
+msgstr ""
+
+#: my-evolution/Locations.h:803
+#, fuzzy
+msgid "Gassim"
+msgstr "Guam"
+
+#: my-evolution/Locations.h:804
+#, fuzzy
+msgid "Gatineau"
+msgstr "Gwinea"
+
+#: my-evolution/Locations.h:805
+msgid "Gaziantep"
+msgstr ""
+
+#: my-evolution/Locations.h:806
+#, fuzzy
+msgid "Gdansk"
+msgstr "dni"
+
+#: my-evolution/Locations.h:807
+#, fuzzy
+msgid "Geneve"
+msgstr "Grecja"
+
+#: my-evolution/Locations.h:808
+#, fuzzy
+msgid "Genova"
+msgstr "Og�lne"
+
+#: 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 "Ghana"
+
+#: my-evolution/Locations.h:814
+msgid "Ghedi"
+msgstr ""
+
+#: my-evolution/Locations.h:816
+msgid "Gifu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:817
+#, fuzzy
+msgid "Gila Bend"
+msgstr "Finlandia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:821
+#, fuzzy
+msgid "Girona"
+msgstr "Gwinea"
+
+#: my-evolution/Locations.h:822
+#, fuzzy
+msgid "Gizan"
+msgstr "Gabon"
+
+#: my-evolution/Locations.h:823
+#, fuzzy
+msgid "Glasgow"
+msgstr "temu"
+
+#: my-evolution/Locations.h:824
+#, fuzzy
+msgid "Glendive"
+msgstr "Mo�dawia"
+
+#: my-evolution/Locations.h:825
+msgid "Glens Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:826
+#, fuzzy
+msgid "Goiania"
+msgstr "Rumunia"
+
+#: my-evolution/Locations.h:827
+msgid "Goldsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:828
+#, fuzzy
+msgid "Goodland"
+msgstr "Polska"
+
+#: my-evolution/Locations.h:829
+#, fuzzy
+msgid "Goose Bay"
+msgstr "Przejd� do dzi�"
+
+#: my-evolution/Locations.h:830
+msgid "Goteborg (Landvetter)"
+msgstr ""
+
+#: my-evolution/Locations.h:831
+msgid "Goteborg (Save)"
+msgstr ""
+
+#: my-evolution/Locations.h:832
+#, fuzzy
+msgid "Granada"
+msgstr "Grenada"
+
+#: 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 "Falklandy"
+
+#: 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 "San Marino"
+
+#: my-evolution/Locations.h:840
+msgid "Grand Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:841
+#, fuzzy
+msgid "Grandview"
+msgstr "Podgl�d"
+
+#: my-evolution/Locations.h:842
+#, fuzzy
+msgid "Grangeville"
+msgstr "Anulowane"
+
+#: my-evolution/Locations.h:843
+#, fuzzy
+msgid "Grants"
+msgstr "Szkice"
+
+#: my-evolution/Locations.h:844
+#, fuzzy
+msgid "Graz"
+msgstr "Brazylia"
+
+#: my-evolution/Locations.h:845
+msgid "Great Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:847
+#, fuzzy
+msgid "Greeley"
+msgstr "Grecja"
+
+#: my-evolution/Locations.h:848
+#, fuzzy
+msgid "Green Bay"
+msgstr "Grenlandia"
+
+#: my-evolution/Locations.h:849
+msgid "Green River"
+msgstr ""
+
+#: my-evolution/Locations.h:850
+msgid "Greensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:851
+#, fuzzy
+msgid "Greenville"
+msgstr "Grenlandia"
+
+#: my-evolution/Locations.h:852
+msgid "Greenville-Spartanburg"
+msgstr ""
+
+#: my-evolution/Locations.h:853
+#, fuzzy
+msgid "Greenwood"
+msgstr "Grenlandia"
+
+#: my-evolution/Locations.h:854
+msgid "Grenoble-Saint-Geoirs"
+msgstr ""
+
+#: my-evolution/Locations.h:855
+msgid "Griffiss AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:856
+#, fuzzy
+msgid "Groningen"
+msgstr "Ostrze�enie"
+
+#: 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 "Gwatemala"
+
+#: my-evolution/Locations.h:860
+#, fuzzy
+msgid "Guadalupe Pass"
+msgstr "Gwadelupa"
+
+#: my-evolution/Locations.h:861
+#, fuzzy
+msgid "Guanare"
+msgstr "Gujana"
+
+#: my-evolution/Locations.h:862
+msgid "Guangzhou"
+msgstr ""
+
+#: my-evolution/Locations.h:863
+#, fuzzy
+msgid "Guantanamo"
+msgstr "Gwatemala"
+
+#: my-evolution/Locations.h:864
+#, fuzzy
+msgid "Guarany"
+msgstr "Niemcy"
+
+#: my-evolution/Locations.h:865
+#, fuzzy
+msgid "Guaratingueta"
+msgstr "Gwinea"
+
+#: my-evolution/Locations.h:866
+msgid "Guarulhos"
+msgstr ""
+
+#: my-evolution/Locations.h:868
+msgid "Guayaquil/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:869
+#, fuzzy
+msgid "Guaymas"
+msgstr "Guam"
+
+#: my-evolution/Locations.h:870
+#, fuzzy
+msgid "Guernsey"
+msgstr "Niemcy"
+
+#: my-evolution/Locations.h:871
+#, fuzzy
+msgid "Guidonia"
+msgstr "Gwinea"
+
+#: my-evolution/Locations.h:872
+msgid "Gulfport"
+msgstr ""
+
+#: my-evolution/Locations.h:873
+#, fuzzy
+msgid "Gulkana"
+msgstr "Gujana"
+
+#: my-evolution/Locations.h:874
+msgid "Gullfax C"
+msgstr ""
+
+#: my-evolution/Locations.h:875
+#, fuzzy
+msgid "Gunnison"
+msgstr "Reunion"
+
+#: my-evolution/Locations.h:876
+msgid "Gunnison (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:877
+#, fuzzy
+msgid "Guriat"
+msgstr "Gwinea"
+
+#: my-evolution/Locations.h:878
+msgid "Gustavus"
+msgstr ""
+
+#: my-evolution/Locations.h:879
+#, fuzzy
+msgid "Guymon"
+msgstr "Gujana"
+
+#: my-evolution/Locations.h:880
+#, fuzzy
+msgid "Habana"
+msgstr "Albania"
+
+#: 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 ""
+
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+msgid "Hail"
+msgstr "Grad"
+
+#: my-evolution/Locations.h:886
+msgid "Hailey-Sun Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:887
+#, fuzzy
+msgid "Haines"
+msgstr "Nag��wki"
+
+#: 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 "Burza gradowa"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:902
+#, fuzzy
+msgid "Ha Noi"
+msgstr "Grad"
+
+#: my-evolution/Locations.h:903
+msgid "Harbor Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:904
+#, fuzzy
+msgid "Harlingen"
+msgstr "Ostrze�enie"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:911
+#, fuzzy
+msgid "Hastings"
+msgstr "Nag��wki"
+
+#: my-evolution/Locations.h:912
+msgid "Haugesund"
+msgstr ""
+
+#: my-evolution/Locations.h:913
+#, fuzzy
+msgid "Havre"
+msgstr "Zamglenie"
+
+#: my-evolution/Locations.h:914
+#, fuzzy
+msgid "Hawaii"
+msgstr "Haiti"
+
+#: my-evolution/Locations.h:915
+msgid "Hawthorne"
+msgstr ""
+
+#: my-evolution/Locations.h:916
+#, fuzzy
+msgid "Hayden"
+msgstr "G��wka"
+
+#: my-evolution/Locations.h:917
+msgid "Hayes River"
+msgstr ""
+
+#: my-evolution/Locations.h:918
+#, fuzzy
+msgid "Hays"
+msgstr "dni"
+
+#: 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 "�wi�ta Helena"
+
+#: my-evolution/Locations.h:922
+msgid "Helsinki"
+msgstr ""
+
+#: my-evolution/Locations.h:923
+#, fuzzy
+msgid "Henderson"
+msgstr "G��wka"
+
+#: 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 "Burza gradowa"
+
+#: my-evolution/Locations.h:930
+#, fuzzy
+msgid "Hilo"
+msgstr "Grad"
+
+#: my-evolution/Locations.h:931
+msgid "Hinesville"
+msgstr ""
+
+#: my-evolution/Locations.h:932
+msgid "Hiroshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:933
+#, fuzzy
+msgid "Hobart"
+msgstr "Komputer"
+
+#: my-evolution/Locations.h:934
+#, fuzzy
+msgid "Hobbs"
+msgstr "Komputer"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:941
+#, fuzzy
+msgid "Holguin"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:942
+#, fuzzy
+msgid "Homer"
+msgstr "Dom"
+
+#: my-evolution/Locations.h:943
+#, fuzzy
+msgid "Homestead AFB"
+msgstr "Zako�czone"
+
+#: my-evolution/Locations.h:944
+#, fuzzy
+msgid "Hondo"
+msgstr "Tornado"
+
+#: 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 "wychodz�ce"
+
+#: my-evolution/Locations.h:954
+#, fuzzy
+msgid "Houma"
+msgstr "Dom"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:960
+#, fuzzy
+msgid "Howard AFB"
+msgstr "Prze�lij jako"
+
+#: my-evolution/Locations.h:961
+msgid "Hsinchu"
+msgstr ""
+
+#: my-evolution/Locations.h:962
+msgid "Huanuco"
+msgstr ""
+
+#: my-evolution/Locations.h:963
+msgid "Huehuetenango"
+msgstr ""
+
+#: my-evolution/Locations.h:964
+#, fuzzy
+msgid "Hulien"
+msgstr "Ukryj"
+
+#: my-evolution/Locations.h:965
+msgid "Humberside"
+msgstr ""
+
+#: my-evolution/Locations.h:967
+msgid "Huntington"
+msgstr ""
+
+#: my-evolution/Locations.h:968
+#, fuzzy
+msgid "Huntsville"
+msgstr "a� do"
+
+#: my-evolution/Locations.h:969
+msgid "Hurlburt"
+msgstr ""
+
+#: my-evolution/Locations.h:970
+#, fuzzy
+msgid "Huron"
+msgstr "Godzin"
+
+#: 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 "Proste"
+
+#: my-evolution/Locations.h:977
+#, fuzzy
+msgid "Ibiza"
+msgstr "Indie"
+
+#: my-evolution/Locations.h:979
+msgid "Ichikawa"
+msgstr ""
+
+#: my-evolution/Locations.h:980
+#, fuzzy
+msgid "Idaho"
+msgstr "Indie"
+
+#: 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 "Islandia"
+
+#: my-evolution/Locations.h:985
+#, fuzzy
+msgid "Iliamna"
+msgstr "Tre�� listu"
+
+#: my-evolution/Locations.h:986
+msgid "Illinois"
+msgstr ""
+
+#: my-evolution/Locations.h:987
+#, fuzzy
+msgid "Imperial"
+msgstr "Kwiecie�"
+
+#: my-evolution/Locations.h:988
+msgid "Imperial (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:989
+msgid "Imperial Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:990
+#, fuzzy
+msgid "In Amenas"
+msgstr "Armenia"
+
+#: my-evolution/Locations.h:992
+#, fuzzy
+msgid "Indiana"
+msgstr "Indie"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:998
+#, fuzzy
+msgid "Inverness"
+msgstr "W trakcie"
+
+#: my-evolution/Locations.h:999
+msgid "Inyokern"
+msgstr ""
+
+#: my-evolution/Locations.h:1000
+#, fuzzy
+msgid "Iowa"
+msgstr "Norwegia"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1005
+#, fuzzy
+msgid "Iraklion"
+msgstr "Informacje"
+
+#: my-evolution/Locations.h:1006
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1008
+#, fuzzy
+msgid "Iron Mountain"
+msgstr "Komentarz zawiera"
+
+#: 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 "W�ochy"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1025
+#, fuzzy
+msgid "Izumo Airport"
+msgstr "Import"
+
+#: 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 "Japo�ski"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1044
+#, fuzzy
+msgid "Jonkoping"
+msgstr "Przetwarzanie"
+
+#: my-evolution/Locations.h:1045
+#, fuzzy
+msgid "Joplin"
+msgstr "Kopiowanie"
+
+#: 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 "Japonia"
+
+#: my-evolution/Locations.h:1050
+#, fuzzy
+msgid "Jujuy"
+msgstr "Lipiec"
+
+#: my-evolution/Locations.h:1051
+#, fuzzy
+msgid "Juliaca"
+msgstr "Publiczny"
+
+#: my-evolution/Locations.h:1052
+#, fuzzy
+msgid "Junction"
+msgstr "Reunion"
+
+#: my-evolution/Locations.h:1053
+#, fuzzy
+msgid "Juneau"
+msgstr "Czerwiec"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1059
+#, fuzzy
+msgid "Kalamata"
+msgstr "Malta"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1071
+#, fuzzy
+msgid "Karachi"
+msgstr "Marzec"
+
+#: my-evolution/Locations.h:1072
+#, fuzzy
+msgid "Karup"
+msgstr "Nauru"
+
+#: 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 "Kazahstan"
+
+#: my-evolution/Locations.h:1080
+#, fuzzy
+msgid "Kearney"
+msgstr "Kenia"
+
+#: my-evolution/Locations.h:1081
+#, fuzzy
+msgid "Keene"
+msgstr "Widziany"
+
+#: 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 "Kenia"
+
+#: my-evolution/Locations.h:1085
+#, fuzzy
+msgid "Kenosha"
+msgstr "Kenia"
+
+#: my-evolution/Locations.h:1086
+#, fuzzy
+msgid "Kentucky"
+msgstr "Kenia"
+
+#: 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 "Niemcy"
+
+#: my-evolution/Locations.h:1090
+msgid "Ketchikan"
+msgstr ""
+
+#: my-evolution/Locations.h:1091
+#, fuzzy
+msgid "Key West"
+msgstr "Zach�d"
+
+#: 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 ""
+
+# [cyba] Nie mam pewno�ci, ale jest zatoka Cooka, cie�nina, g�ry, wi�c chyba...
+#: my-evolution/Locations.h:1096
+#, fuzzy
+msgid "Kikai Island"
+msgstr "Wyspy Cooka"
+
+#: 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 "Kenia"
+
+#: my-evolution/Locations.h:1132
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1133
+#, fuzzy
+msgid "Korea, Republic of"
+msgstr "Republika Czeska"
+
+#: 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 "Korea�ski"
+
+#: 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 "nadchodz�ce"
+
+#: 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 "Macedonia"
+
+#: my-evolution/Locations.h:1151
+msgid "La Coruna"
+msgstr ""
+
+#: my-evolution/Locations.h:1152
+#, fuzzy
+msgid "La Crosse"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1153
+msgid "La Esperanza"
+msgstr ""
+
+#: my-evolution/Locations.h:1154
+#, fuzzy
+msgid "Lafayette"
+msgstr "Majotta"
+
+#: my-evolution/Locations.h:1155
+msgid "La Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1156
+#, fuzzy
+msgid "Lahaina"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:1157
+#, fuzzy
+msgid "Lahore"
+msgstr "_Wi�kszy"
+
+#: my-evolution/Locations.h:1158
+#, fuzzy
+msgid "Lajes"
+msgstr "Laos"
+
+#: 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 "Islandia"
+
+#: my-evolution/Locations.h:1164
+msgid "Lake Tahoe"
+msgstr ""
+
+#: my-evolution/Locations.h:1165
+#, fuzzy
+msgid "Lakeview"
+msgstr "Podgl�d"
+
+#: my-evolution/Locations.h:1166
+#, fuzzy
+msgid "Lamar"
+msgstr "Myanmar"
+
+#: my-evolution/Locations.h:1167
+#, fuzzy
+msgid "La Mesa"
+msgstr "L_ist"
+
+#: my-evolution/Locations.h:1168
+#, fuzzy
+msgid "Lamezia"
+msgstr "Gambia"
+
+#: my-evolution/Locations.h:1169
+#, fuzzy
+msgid "Lamoni"
+msgstr "Libia"
+
+#: my-evolution/Locations.h:1170
+msgid "Lampedusa"
+msgstr ""
+
+#: my-evolution/Locations.h:1171
+#, fuzzy
+msgid "Lanai"
+msgstr "J�zyk"
+
+#: my-evolution/Locations.h:1172
+#, fuzzy
+msgid "Lancaster"
+msgstr "Pejza�"
+
+#: my-evolution/Locations.h:1173
+#, fuzzy
+msgid "Lander"
+msgstr "G��wka"
+
+#: my-evolution/Locations.h:1174
+#, fuzzy
+msgid "Langebaanweg"
+msgstr "J�zyk"
+
+#: my-evolution/Locations.h:1175
+msgid "Langley AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1176
+#, fuzzy
+msgid "Lannion"
+msgstr "Libia"
+
+#: my-evolution/Locations.h:1177
+#, fuzzy
+msgid "Lansing"
+msgstr "Ostrze�enie"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1182
+#, fuzzy
+msgid "Laredo"
+msgstr "_Wi�kszy"
+
+#: my-evolution/Locations.h:1183
+#, fuzzy
+msgid "Larnaka"
+msgstr "Sri Lanka"
+
+#: my-evolution/Locations.h:1184
+#, fuzzy
+msgid "La Romana"
+msgstr "Rumunia"
+
+#: 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 "Litwa"
+
+#: my-evolution/Locations.h:1189
+msgid "Latrobe"
+msgstr ""
+
+#: my-evolution/Locations.h:1191
+msgid "Laughlin"
+msgstr ""
+
+#: my-evolution/Locations.h:1192
+#, fuzzy
+msgid "Laurel"
+msgstr "_Wi�kszy"
+
+#: my-evolution/Locations.h:1193
+#, fuzzy
+msgid "La Verne"
+msgstr "Wyspy Zielonego Przyl�dka"
+
+#: my-evolution/Locations.h:1194
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1195
+#, fuzzy
+msgid "Lawton"
+msgstr "Libia"
+
+#: my-evolution/Locations.h:1196
+msgid "Leadville"
+msgstr ""
+
+#: my-evolution/Locations.h:1197
+#, fuzzy
+msgid "Learmouth"
+msgstr "Lesotho"
+
+#: my-evolution/Locations.h:1199
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1201
+#, fuzzy
+msgid "Leesburg"
+msgstr "Luksemburg"
+
+#: my-evolution/Locations.h:1202
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1205
+msgid "Leknes"
+msgstr ""
+
+#: my-evolution/Locations.h:1206
+#, fuzzy
+msgid "Le Mans"
+msgstr "Mnd�"
+
+#: my-evolution/Locations.h:1207
+#, fuzzy
+msgid "Le Marine"
+msgstr "Martynika"
+
+#: my-evolution/Locations.h:1208
+#, fuzzy
+msgid "Lemmon"
+msgstr "Libia"
+
+#: my-evolution/Locations.h:1209
+#, fuzzy
+msgid "Lemoore"
+msgstr "Usu�"
+
+#: my-evolution/Locations.h:1210
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1212
+#, fuzzy
+msgid "Leuchars"
+msgstr "lat"
+
+#: my-evolution/Locations.h:1213
+#, fuzzy
+msgid "Lewisburg"
+msgstr "Luksemburg"
+
+#: my-evolution/Locations.h:1214
+#, fuzzy
+msgid "Lewiston"
+msgstr "Lesotho"
+
+#: my-evolution/Locations.h:1215
+#, fuzzy
+msgid "Lewistown"
+msgstr "Lesotho"
+
+#: my-evolution/Locations.h:1216
+#, fuzzy
+msgid "Lexington"
+msgstr "Libia"
+
+#: my-evolution/Locations.h:1217
+#, fuzzy
+msgid "Liberal"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1219
+#, fuzzy
+msgid "Libya"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1220
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1221
+msgid "Lidgerwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1222
+#, fuzzy
+msgid "Liege"
+msgstr "Niger"
+
+#: my-evolution/Locations.h:1223
+#, fuzzy
+msgid "Lihue"
+msgstr "Niue"
+
+#: my-evolution/Locations.h:1224
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1225
+msgid "Lima-Callao"
+msgstr ""
+
+#: my-evolution/Locations.h:1226
+#, fuzzy
+msgid "Limnos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1227
+#, fuzzy
+msgid "Limoges"
+msgstr "Najni�szy"
+
+#: my-evolution/Locations.h:1228
+#, fuzzy
+msgid "Limon"
+msgstr "miesi�c"
+
+#: my-evolution/Locations.h:1229
+#, fuzzy
+msgid "Lincoln"
+msgstr "nadchodz�ce"
+
+#: my-evolution/Locations.h:1230
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1231
+#, fuzzy
+msgid "Lisboa"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1232
+#, fuzzy
+msgid "Lista"
+msgstr "lista"
+
+#: my-evolution/Locations.h:1233
+#, fuzzy
+msgid "Litchfield"
+msgstr "Lekki grad"
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1240
+msgid "Ljubljana"
+msgstr ""
+
+#: my-evolution/Locations.h:1241
+#, fuzzy
+msgid "Logan"
+msgstr "Logowanie NT"
+
+#: my-evolution/Locations.h:1242
+msgid "Lolland Falster"
+msgstr ""
+
+#: my-evolution/Locations.h:1243
+#, fuzzy
+msgid "Lompoc"
+msgstr "Frma"
+
+#: my-evolution/Locations.h:1244
+#, fuzzy
+msgid "London"
+msgstr "Libia"
+
+#: my-evolution/Locations.h:1245
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1249
+#, fuzzy
+msgid "Londrina"
+msgstr "Hinduras"
+
+#: my-evolution/Locations.h:1250
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1253
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+#: my-evolution/Locations.h:1254
+#, fuzzy
+msgid "Los Alamos"
+msgstr "Alarmy"
+
+#: my-evolution/Locations.h:1255
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1260
+#, fuzzy
+msgid "Lousiana"
+msgstr "Botswana"
+
+#: my-evolution/Locations.h:1261
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1265
+#, fuzzy
+msgid "Lugano"
+msgstr "Libia"
+
+#: my-evolution/Locations.h:1266
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1267
+#, fuzzy
+msgid "Luton"
+msgstr "wychodz�ce"
+
+#: my-evolution/Locations.h:1269
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1270
+#, fuzzy
+msgid "Luxor"
+msgstr "Luksemburg"
+
+#: my-evolution/Locations.h:1271
+#, fuzzy
+msgid "Lviv"
+msgstr "Litwa"
+
+#: my-evolution/Locations.h:1272
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1275
+msgid "Lyon-Satolas"
+msgstr ""
+
+#: my-evolution/Locations.h:1276
+#, fuzzy
+msgid "Maastricht"
+msgstr "Marzec"
+
+#: my-evolution/Locations.h:1277
+#, fuzzy
+msgid "Macae"
+msgstr "Makao"
+
+#: my-evolution/Locations.h:1278
+#, fuzzy
+msgid "Macapa"
+msgstr "Makao"
+
+#: my-evolution/Locations.h:1279
+#, fuzzy
+msgid "Maceio"
+msgstr "Macedonia"
+
+#: my-evolution/Locations.h:1280
+#, fuzzy
+msgid "Macon"
+msgstr "Mnd�"
+
+#: my-evolution/Locations.h:1281
+#, fuzzy
+msgid "Madinah"
+msgstr "Macedonia"
+
+#: my-evolution/Locations.h:1282
+#, fuzzy
+msgid "Madison"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1283
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1285
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+#: my-evolution/Locations.h:1286
+#, fuzzy
+msgid "Magadan"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:1287
+msgid "Magdalena"
+msgstr ""
+
+#: my-evolution/Locations.h:1288
+#, fuzzy
+msgid "Maine"
+msgstr "Mnd�"
+
+#: my-evolution/Locations.h:1289
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1290
+msgid "Makkah"
+msgstr ""
+
+#: my-evolution/Locations.h:1291
+#, fuzzy
+msgid "Makung"
+msgstr "Mnd�"
+
+#: my-evolution/Locations.h:1292
+#, fuzzy
+msgid "Malad City"
+msgstr "Malawi"
+
+#: my-evolution/Locations.h:1293
+#, fuzzy
+msgid "Malaga"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1294
+#, fuzzy
+msgid "Malatya"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1295
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1296
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1298
+msgid "Mammoth Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1299
+#, fuzzy
+msgid "Managua"
+msgstr "Menad�er"
+
+#: my-evolution/Locations.h:1300
+#, fuzzy
+msgid "Manassas"
+msgstr "Malezja"
+
+#: my-evolution/Locations.h:1301
+#, fuzzy
+msgid "Manaus"
+msgstr "Makao"
+
+#: my-evolution/Locations.h:1302
+#, fuzzy
+msgid "Manchester"
+msgstr "Dopasowania:"
+
+#: my-evolution/Locations.h:1303
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+msgid "Manhattan"
+msgstr ""
+
+#: my-evolution/Locations.h:1305
+#, fuzzy
+msgid "Manisa"
+msgstr "Mnd�"
+
+#: my-evolution/Locations.h:1306
+#, fuzzy
+msgid "Manistee"
+msgstr "Mgie�ka"
+
+#: my-evolution/Locations.h:1307
+#, fuzzy
+msgid "Manitoba"
+msgstr "G��wny pasek narz�dziowy"
+
+#: my-evolution/Locations.h:1308
+msgid "Manitowoc"
+msgstr ""
+
+#: my-evolution/Locations.h:1309
+#, fuzzy
+msgid "Mankato"
+msgstr "Monako"
+
+#: my-evolution/Locations.h:1310
+#, fuzzy
+msgid "Mansfield"
+msgstr "Poczta"
+
+#: my-evolution/Locations.h:1311
+#, fuzzy
+msgid "Manta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1312
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1313
+#, fuzzy
+msgid "Maraba"
+msgstr "Mauretania"
+
+#: my-evolution/Locations.h:1314
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1315
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1316
+#, fuzzy
+msgid "Marathon"
+msgstr "Marzec"
+
+#: my-evolution/Locations.h:1317
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1318
+#, fuzzy
+msgid "Margarita"
+msgstr "Mauretania"
+
+#: my-evolution/Locations.h:1319
+#, fuzzy
+msgid "Marianna"
+msgstr "Mauretania"
+
+#: my-evolution/Locations.h:1320
+#, fuzzy
+msgid "Marib"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1321
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1322
+#, fuzzy
+msgid "Marietta"
+msgstr "Mauretania"
+
+#: my-evolution/Locations.h:1323
+msgid "Marino di Ravenna"
+msgstr ""
+
+#: my-evolution/Locations.h:1324
+#, fuzzy
+msgid "Marion"
+msgstr "Marginesy"
+
+#: my-evolution/Locations.h:1325
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1326
+#, fuzzy
+msgid "Marquette"
+msgstr "Martynika"
+
+#: my-evolution/Locations.h:1327
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+msgid "Marseilles"
+msgstr ""
+
+#: my-evolution/Locations.h:1329
+#, fuzzy
+msgid "Marshall"
+msgstr "Wyspy Marshalla"
+
+#: my-evolution/Locations.h:1330
+#, fuzzy
+msgid "Marshalltown"
+msgstr "Wyspy Marshalla"
+
+#: my-evolution/Locations.h:1331
+msgid "Marshfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1332
+#, fuzzy
+msgid "Marte"
+msgstr "Martynika"
+
+#: my-evolution/Locations.h:1333
+#, fuzzy
+msgid "Marthas Vineyard"
+msgstr "Oznacz jako ni_eprzeczytane"
+
+#: my-evolution/Locations.h:1334
+#, fuzzy
+msgid "Martinsburg"
+msgstr "Martynika"
+
+#: my-evolution/Locations.h:1335
+#, fuzzy
+msgid "Martinsville"
+msgstr "Martynika"
+
+#: my-evolution/Locations.h:1336
+#, fuzzy
+msgid "Maryland"
+msgstr "Irlandia"
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1339
+msgid "Mashhad"
+msgstr ""
+
+#: my-evolution/Locations.h:1340
+#, fuzzy
+msgid "Masirah"
+msgstr "Malezja"
+
+#: my-evolution/Locations.h:1341
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1343
+#, fuzzy
+msgid "Massena"
+msgstr "Macedonia"
+
+#: my-evolution/Locations.h:1344
+#, fuzzy
+msgid "Matamoros"
+msgstr "Komory"
+
+#: my-evolution/Locations.h:1345
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1347
+msgid "Matsuyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1348
+#, fuzzy
+msgid "Mattoon"
+msgstr "Mnd�"
+
+#: my-evolution/Locations.h:1349
+#, fuzzy
+msgid "Mayaguez"
+msgstr "Menad�er"
+
+#: my-evolution/Locations.h:1350
+#, fuzzy
+msgid "Mayport"
+msgstr "Majotta"
+
+#: my-evolution/Locations.h:1351
+#, fuzzy
+msgid "Mazatlan"
+msgstr "Kazahstan"
+
+#: my-evolution/Locations.h:1352
+#, fuzzy
+msgid "Mazu"
+msgstr "Makao"
+
+#: my-evolution/Locations.h:1353
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1354
+msgid "McAllen"
+msgstr ""
+
+#: my-evolution/Locations.h:1355
+#, fuzzy
+msgid "McCall"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1356
+#, fuzzy
+msgid "McCarthy"
+msgstr "Marzec"
+
+#: my-evolution/Locations.h:1357
+#, fuzzy
+msgid "McClellan"
+msgstr "Islandia"
+
+#: my-evolution/Locations.h:1358
+#, fuzzy
+msgid "McComb"
+msgstr "Frma"
+
+#: my-evolution/Locations.h:1359
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1361
+msgid "Mc Gregor"
+msgstr ""
+
+#: my-evolution/Locations.h:1362
+#, fuzzy
+msgid "Meacham"
+msgstr "Makao"
+
+#: my-evolution/Locations.h:1363
+#, fuzzy
+msgid "Medford"
+msgstr "przed"
+
+#: my-evolution/Locations.h:1364
+msgid "Medicine Lodge"
+msgstr ""
+
+#: my-evolution/Locations.h:1365
+#, fuzzy
+msgid "Mehamn"
+msgstr "Mnd�"
+
+#: my-evolution/Locations.h:1366
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1367
+msgid "Melbourne"
+msgstr ""
+
+#: my-evolution/Locations.h:1368
+#, fuzzy
+msgid "Melfa"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1369
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1373
+#, fuzzy
+msgid "Mendoza"
+msgstr "Macedonia"
+
+#: my-evolution/Locations.h:1374
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1377
+msgid "Merced"
+msgstr ""
+
+#: my-evolution/Locations.h:1378
+#, fuzzy
+msgid "Merida"
+msgstr "Pi�tek"
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1380
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1381
+#, fuzzy
+msgid "Merril Field"
+msgstr "Pole _Od"
+
+#: my-evolution/Locations.h:1382
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1386
+#, fuzzy
+msgid "Mexicali"
+msgstr "Meksyk"
+
+#: my-evolution/Locations.h:1388
+#, fuzzy
+msgid "Miami"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1391
+msgid "Michigan"
+msgstr ""
+
+#: my-evolution/Locations.h:1392
+#, fuzzy
+msgid "Middle East"
+msgstr "_Drugie:"
+
+#: my-evolution/Locations.h:1393
+#, fuzzy
+msgid "Middleton Island"
+msgstr "Wyspy Salomona"
+
+#: my-evolution/Locations.h:1394
+#, fuzzy
+msgid "Middletown"
+msgstr "_Drugie:"
+
+#: my-evolution/Locations.h:1395
+#, fuzzy
+msgid "Midland"
+msgstr "Finlandia"
+
+#: my-evolution/Locations.h:1396
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1398
+msgid "Milano/Malpensa"
+msgstr ""
+
+#: my-evolution/Locations.h:1399
+#, fuzzy
+msgid "Miles City"
+msgstr "Typ pliku:"
+
+#: my-evolution/Locations.h:1400
+#, fuzzy
+msgid "Milford"
+msgstr "z"
+
+#: my-evolution/Locations.h:1401
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1402
+msgid "Millville"
+msgstr ""
+
+#: my-evolution/Locations.h:1403
+#, fuzzy
+msgid "Milton"
+msgstr "List do %s"
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1407
+#, fuzzy
+msgid "Minatitlan"
+msgstr "Mauretania"
+
+#: my-evolution/Locations.h:1408
+#, fuzzy
+msgid "Minchumina"
+msgstr "nadchodz�ce"
+
+#: my-evolution/Locations.h:1409
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1414
+#, fuzzy
+msgid "Minnesota"
+msgstr "Mikronezja"
+
+#: my-evolution/Locations.h:1415
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1416
+#, fuzzy
+msgid "Minot"
+msgstr "nie jest"
+
+#: my-evolution/Locations.h:1417
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1419
+msgid "Mississippi"
+msgstr ""
+
+#: my-evolution/Locations.h:1420
+#, fuzzy
+msgid "Missoula"
+msgstr "Panna"
+
+#: my-evolution/Locations.h:1421
+#, fuzzy
+msgid "Missouri"
+msgstr "Panna"
+
+#: my-evolution/Locations.h:1422
+#, fuzzy
+msgid "Mitchell"
+msgstr "Dopasowania:"
+
+#: my-evolution/Locations.h:1423
+#, fuzzy
+msgid "Mitilini"
+msgstr "Lista dyskusyjna"
+
+#: my-evolution/Locations.h:1424
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1425
+msgid "Miyazaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1426
+#, fuzzy
+msgid "Moa"
+msgstr "Po"
+
+#: my-evolution/Locations.h:1427
+#, fuzzy
+msgid "Mobile Downtown"
+msgstr "Telefon przeno�ny"
+
+#: my-evolution/Locations.h:1428
+msgid "Mobile Regional Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1429
+#, fuzzy
+msgid "Mobridge"
+msgstr "Przeno�ny"
+
+#: my-evolution/Locations.h:1430
+#, fuzzy
+msgid "Modesto"
+msgstr "Umiarkowana mg�a"
+
+#: my-evolution/Locations.h:1431
+msgid "Mo I Rana"
+msgstr ""
+
+#: my-evolution/Locations.h:1432
+#, fuzzy
+msgid "Mojave"
+msgstr "Przenie�"
+
+#: my-evolution/Locations.h:1433
+#, fuzzy
+msgid "Molde"
+msgstr "Przeno�ny"
+
+#: my-evolution/Locations.h:1434
+#, fuzzy
+msgid "Moldova"
+msgstr "Poniedzia�ek"
+
+#: my-evolution/Locations.h:1435
+msgid "Moline-Quad Cities"
+msgstr ""
+
+#: my-evolution/Locations.h:1436
+#, fuzzy
+msgid "Molokai"
+msgstr "Malawi"
+
+#: my-evolution/Locations.h:1437
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1438
+msgid "Monchengladbach"
+msgstr ""
+
+#: my-evolution/Locations.h:1439
+#, fuzzy
+msgid "Monclova"
+msgstr "Monako"
+
+#: my-evolution/Locations.h:1440
+#, fuzzy
+msgid "Moncton"
+msgstr "Monako"
+
+#: my-evolution/Locations.h:1441
+#, fuzzy
+msgid "Monida"
+msgstr "Poniedzia�ek"
+
+#: my-evolution/Locations.h:1442
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+#: my-evolution/Locations.h:1443
+#, fuzzy
+msgid "Monroe"
+msgstr "Monako"
+
+#: my-evolution/Locations.h:1444
+#, fuzzy
+msgid "Montague"
+msgstr "Menad�er"
+
+#: my-evolution/Locations.h:1445
+#, fuzzy
+msgid "Montana"
+msgstr "Botswana"
+
+#: my-evolution/Locations.h:1446
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1448
+#, fuzzy
+msgid "Monte Bisbino"
+msgstr "Umiarkowany �nieg"
+
+#: my-evolution/Locations.h:1449
+msgid "Monte Calamita"
+msgstr ""
+
+#: my-evolution/Locations.h:1450
+#, fuzzy
+msgid "Monte Cimone"
+msgstr "Widok miesi�ca"
+
+#: my-evolution/Locations.h:1451
+#, fuzzy
+msgid "Montego Bay"
+msgstr "Mongolia"
+
+#: my-evolution/Locations.h:1452
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1453
+#, fuzzy
+msgid "Monterey"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1454
+#, fuzzy
+msgid "Monterrey"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1458
+#, fuzzy
+msgid "Montgomery"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1459
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1460
+#, fuzzy
+msgid "Monticello"
+msgstr "Monako"
+
+#: my-evolution/Locations.h:1461
+#, fuzzy
+msgid "Montpelier"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1465
+#, fuzzy
+msgid "Montrose"
+msgstr "Montserrat"
+
+#: my-evolution/Locations.h:1466
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1467
+#, fuzzy
+msgid "Morelia"
+msgstr "Mongolia"
+
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Morgantown"
+msgstr "Organizacja"
+
+#: my-evolution/Locations.h:1469
+#, fuzzy
+msgid "Moriarty"
+msgstr "G��wny"
+
+#: my-evolution/Locations.h:1471
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1474
+msgid "Moses Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1475
+#, fuzzy
+msgid "Mosinee"
+msgstr "Przeno�ny"
+
+#: my-evolution/Locations.h:1476
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain Home"
+msgstr ""
+
+#: my-evolution/Locations.h:1479
+#, fuzzy
+msgid "Mountain View"
+msgstr "Widok miesi�ca"
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1482
+#, fuzzy
+msgid "Mount Shasta"
+msgstr "Po�udniowy wsch�d"
+
+#: my-evolution/Locations.h:1483
+#, fuzzy
+msgid "Mount Vernon"
+msgstr "Widok miesi�ca"
+
+#: my-evolution/Locations.h:1484
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1487
+msgid "Muir"
+msgstr ""
+
+#: my-evolution/Locations.h:1488
+#, fuzzy
+msgid "Mullan"
+msgstr "Mnd�"
+
+#: my-evolution/Locations.h:1489
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1490
+msgid "Munchen"
+msgstr ""
+
+#: my-evolution/Locations.h:1491
+#, fuzzy
+msgid "Muncie"
+msgstr "Czerwiec"
+
+#: my-evolution/Locations.h:1492
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1493
+#, fuzzy
+msgid "Murcia"
+msgstr "Mauretania"
+
+#: my-evolution/Locations.h:1494
+msgid "Murmansk"
+msgstr ""
+
+#: my-evolution/Locations.h:1495
+#, fuzzy
+msgid "Mus"
+msgstr "Prc"
+
+#: my-evolution/Locations.h:1496
+#, fuzzy
+msgid "Muscatine"
+msgstr "Martynika"
+
+#: my-evolution/Locations.h:1497
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1498
+msgid "Muskegon"
+msgstr ""
+
+#: my-evolution/Locations.h:1499
+#, fuzzy
+msgid "Mykonos"
+msgstr "w�z�y"
+
+#: my-evolution/Locations.h:1500
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1507
+#, fuzzy
+msgid "Najran"
+msgstr "Bahrain"
+
+#: my-evolution/Locations.h:1508
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1509
+msgid "Nalchik"
+msgstr ""
+
+#: my-evolution/Locations.h:1510
+#, fuzzy
+msgid "Namsos"
+msgstr "Nazwa"
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1513
+msgid "Nankishirahama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1514
+#, fuzzy
+msgid "Nanning"
+msgstr "Ostrze�enie"
+
+#: my-evolution/Locations.h:1515
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1516
+msgid "Nantucket"
+msgstr ""
+
+#: my-evolution/Locations.h:1517
+#, fuzzy
+msgid "Napa"
+msgstr "Japonia"
+
+#: my-evolution/Locations.h:1518
+#, fuzzy
+msgid "Naples"
+msgstr "Nazwa"
+
+#: my-evolution/Locations.h:1519
+#, fuzzy
+msgid "Napoli"
+msgstr "Mali"
+
+#: my-evolution/Locations.h:1520
+#, fuzzy
+msgid "Narvik"
+msgstr "Przyd"
+
+#: my-evolution/Locations.h:1521
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1524
+msgid "Nassau"
+msgstr ""
+
+#: my-evolution/Locations.h:1525
+#, fuzzy
+msgid "Natal"
+msgstr "W�ochy"
+
+#: my-evolution/Locations.h:1526
+#, fuzzy
+msgid "Natchez"
+msgstr "Dopasowania:"
+
+#: my-evolution/Locations.h:1527
+msgid "Nawabshah"
+msgstr ""
+
+#: my-evolution/Locations.h:1528
+#, fuzzy
+msgid "Nebraska"
+msgstr "Nowe zadanie"
+
+#: my-evolution/Locations.h:1529
+msgid "Needles"
+msgstr ""
+
+#: my-evolution/Locations.h:1530
+#, fuzzy
+msgid "Nenana"
+msgstr "Grenada"
+
+#: my-evolution/Locations.h:1532
+msgid "Neuquen"
+msgstr ""
+
+#: my-evolution/Locations.h:1533
+#, fuzzy
+msgid "Nevada"
+msgstr "Grenada"
+
+#: my-evolution/Locations.h:1534
+#, fuzzy
+msgid "Newark"
+msgstr "Nowe zadanie"
+
+#: my-evolution/Locations.h:1535
+#, fuzzy
+msgid "New Bedford"
+msgstr "�r�d�o nowo�ci"
+
+#: my-evolution/Locations.h:1536
+#, fuzzy
+msgid "New Bern"
+msgstr "Nowa Zelandia"
+
+#: my-evolution/Locations.h:1537
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1539
+msgid "Newburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1540
+#, fuzzy
+msgid "Newcastle"
+msgstr "Nowiny"
+
+#: my-evolution/Locations.h:1541
+#, fuzzy
+msgid "New Delhi/Palam"
+msgstr "Nowa Zelandia"
+
+#: my-evolution/Locations.h:1542
+#, fuzzy
+msgid "Newfoundland"
+msgstr "Nowa Zelandia"
+
+#: my-evolution/Locations.h:1543
+msgid "New Hampshire"
+msgstr ""
+
+#: my-evolution/Locations.h:1544
+#, fuzzy
+msgid "New Haven"
+msgstr "Nowa Kaledonia"
+
+#: my-evolution/Locations.h:1545
+#, fuzzy
+msgid "New Iberia"
+msgstr "Nowa Kaledonia"
+
+#: my-evolution/Locations.h:1546
+#, fuzzy
+msgid "New Jersey"
+msgstr "Nowy list"
+
+#: my-evolution/Locations.h:1547
+#, fuzzy
+msgid "New Mexico"
+msgstr "Meksyk"
+
+#: my-evolution/Locations.h:1548
+#, fuzzy
+msgid "New Orleans"
+msgstr "Holandia"
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1550
+msgid "New Orleans NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1551
+#, fuzzy
+msgid "Newport"
+msgstr "P�noc"
+
+#: my-evolution/Locations.h:1552
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1553
+msgid "New Port Richey"
+msgstr ""
+
+#: my-evolution/Locations.h:1554
+#, fuzzy
+msgid "New River"
+msgstr "Nowy VFolder"
+
+#: my-evolution/Locations.h:1555
+msgid "New Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1556
+#, fuzzy
+msgid "Newton"
+msgstr "Nowy"
+
+#: my-evolution/Locations.h:1557
+#, fuzzy
+msgid "New York"
+msgstr "Nowy VFolder"
+
+#: my-evolution/Locations.h:1558
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1559
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1561
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1564
+msgid "Niigata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1565
+#, fuzzy
+msgid "Nimes-Garons"
+msgstr "Wymiary:"
+
+#: my-evolution/Locations.h:1566
+#, fuzzy
+msgid "Nipawin"
+msgstr "Hiszpania"
+
+#: my-evolution/Locations.h:1567
+#, fuzzy
+msgid "Nis"
+msgstr "jest"
+
+#: my-evolution/Locations.h:1568
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1570
+msgid "N Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1571
+#, fuzzy
+msgid "Nogales"
+msgstr "Zwyk�y"
+
+#: my-evolution/Locations.h:1572
+#, fuzzy
+msgid "Nome"
+msgstr "Nazwa"
+
+#: my-evolution/Locations.h:1573
+#, fuzzy
+msgid "Norfolk"
+msgstr "Wyspa Norfolk"
+
+#: my-evolution/Locations.h:1575
+#, fuzzy
+msgid "Norfolk NAS"
+msgstr "Wyspa Norfolk"
+
+#: my-evolution/Locations.h:1576
+#, fuzzy
+msgid "Norrkoping"
+msgstr "Przetwarzanie"
+
+#: my-evolution/Locations.h:1577
+#, fuzzy
+msgid "North Adams"
+msgstr "P�nocny wsch�d"
+
+#: my-evolution/Locations.h:1578
+#, fuzzy
+msgid "North Bend"
+msgstr "P�noc"
+
+#: my-evolution/Locations.h:1579
+msgid "North Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:1580
+#, fuzzy
+msgid "North Conway"
+msgstr "Norwegia"
+
+#: my-evolution/Locations.h:1581
+#, fuzzy
+msgid "North Dakota"
+msgstr "P�nocny wsch�d"
+
+#: my-evolution/Locations.h:1582
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1583
+msgid "North Kingstown"
+msgstr ""
+
+#: my-evolution/Locations.h:1584
+#, fuzzy
+msgid "North Platte"
+msgstr "P�nocny wsch�d"
+
+#: my-evolution/Locations.h:1585
+#, fuzzy
+msgid "Northway"
+msgstr "Norwegia"
+
+#: my-evolution/Locations.h:1586
+#, fuzzy
+msgid "Northwest Territories"
+msgstr "Francuskie terytoria po�udniowe"
+
+#: my-evolution/Locations.h:1588
+#, fuzzy
+msgid "Norwich"
+msgstr "P�noc"
+
+#: my-evolution/Locations.h:1589
+#, fuzzy
+msgid "Norwood"
+msgstr "Norwegia"
+
+#: my-evolution/Locations.h:1590
+#, fuzzy
+msgid "Notodden"
+msgstr "Notka"
+
+#: my-evolution/Locations.h:1591
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1595
+msgid "Nueva Ocotepeque"
+msgstr ""
+
+#: my-evolution/Locations.h:1596
+#, fuzzy
+msgid "Nuevo Laredo"
+msgstr "Przed rozpocz�ciem"
+
+#: my-evolution/Locations.h:1597
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+msgid "Oahu"
+msgstr ""
+
+#: my-evolution/Locations.h:1600
+msgid "Oak Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:1601
+#, fuzzy
+msgid "Oakland"
+msgstr "Tajlandia"
+
+#: my-evolution/Locations.h:1602
+#, fuzzy
+msgid "Oaxaca"
+msgstr "Jamajka"
+
+#: my-evolution/Locations.h:1603
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+msgid "Obihiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1605
+#, fuzzy
+msgid "Ocala"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1606
+#, fuzzy
+msgid "Oceanside"
+msgstr "Islandia"
+
+#: my-evolution/Locations.h:1607
+#, fuzzy
+msgid "Odense"
+msgstr "Pojedyncze"
+
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1609
+#, fuzzy
+msgid "Oelwen"
+msgstr "Otw�rz"
+
+#: my-evolution/Locations.h:1610
+#, fuzzy
+msgid "Ogden"
+msgstr "Otw�rz"
+
+#: my-evolution/Locations.h:1611
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1613
+msgid "Ohio"
+msgstr ""
+
+#: my-evolution/Locations.h:1614
+#, fuzzy
+msgid "Ohrid"
+msgstr "Inne"
+
+#: my-evolution/Locations.h:1615
+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
+#, fuzzy
+msgid "Ojika Island"
+msgstr "Wyspy Cooka"
+
+#: my-evolution/Locations.h:1617
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1624
+#, fuzzy
+msgid "Okushiri Island"
+msgstr "Brytyjskie Wyspy Dziewicze"
+
+#: my-evolution/Locations.h:1625
+#, fuzzy
+msgid "Olathe"
+msgstr "Inne"
+
+#: my-evolution/Locations.h:1626
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1627
+#, fuzzy
+msgid "Olbia"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:1628
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1629
+#, fuzzy
+msgid "Omaha"
+msgstr "Oman"
+
+#: my-evolution/Locations.h:1630
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1631
+#, fuzzy
+msgid "Omak"
+msgstr "Oman"
+
+#: my-evolution/Locations.h:1633
+msgid "Ominato Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1634
+msgid "Omsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1635
+msgid "O'Neill"
+msgstr ""
+
+#: my-evolution/Locations.h:1636
+#, fuzzy
+msgid "Ontario"
+msgstr "U�o�enie"
+
+#: my-evolution/Locations.h:1637
+#, fuzzy
+msgid "Oostende"
+msgstr "Uczestnik"
+
+#: my-evolution/Locations.h:1638
+#, fuzzy
+msgid "Oran"
+msgstr "Oman"
+
+#: my-evolution/Locations.h:1639
+msgid "Oran/Es Senia"
+msgstr ""
+
+#: my-evolution/Locations.h:1640
+#, fuzzy
+msgid "Orange"
+msgstr "Org"
+
+#: my-evolution/Locations.h:1641
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1642
+msgid "Ord-Sharp"
+msgstr ""
+
+#: my-evolution/Locations.h:1643
+#, fuzzy
+msgid "Oregon"
+msgstr "Org"
+
+#: my-evolution/Locations.h:1644
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1645
+#, fuzzy
+msgid "Orland"
+msgstr "Irlandia"
+
+#: my-evolution/Locations.h:1646
+#, fuzzy
+msgid "Orlando"
+msgstr "Irlandia"
+
+#: my-evolution/Locations.h:1647
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1648
+msgid "Orsta-Volda"
+msgstr ""
+
+#: my-evolution/Locations.h:1649
+#, fuzzy
+msgid "Oruro"
+msgstr "B��d"
+
+#: my-evolution/Locations.h:1650
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1652
+#, fuzzy
+msgid "Oscoda"
+msgstr "sekunda"
+
+#: my-evolution/Locations.h:1653
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1657
+#, fuzzy
+msgid "Ostrava"
+msgstr "Australia"
+
+#: my-evolution/Locations.h:1658
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1661
+#, fuzzy
+msgid "Owyhee"
+msgstr "tydzie�"
+
+#: my-evolution/Locations.h:1662
+#, fuzzy
+msgid "Oxford"
+msgstr "z"
+
+#: my-evolution/Locations.h:1663
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1670
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1671
+#, fuzzy
+msgid "Paganella"
+msgstr "Strona"
+
+#: my-evolution/Locations.h:1674
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1675
+#, fuzzy
+msgid "Palacios"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1676
+#, fuzzy
+msgid "Palermo"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:1677
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1678
+#, fuzzy
+msgid "Palmdale"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1679
+#, fuzzy
+msgid "Palmer"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:1680
+#, fuzzy
+msgid "Palm Springs"
+msgstr "Ustawienia poczty"
+
+#: my-evolution/Locations.h:1681
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1682
+#, fuzzy
+msgid "Pamplona"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1684
+#, fuzzy
+msgid "Panama City"
+msgstr "Panama"
+
+#: my-evolution/Locations.h:1685
+#, fuzzy
+msgid "Pantelleria"
+msgstr "Anulowane"
+
+#: my-evolution/Locations.h:1686
+#, fuzzy
+msgid "Papa"
+msgstr "Japonia"
+
+#: my-evolution/Locations.h:1687
+#, fuzzy
+msgid "Paphos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:1689
+#, fuzzy
+msgid "Paris"
+msgstr "G�wn"
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1692
+#, fuzzy
+msgid "Paris/Orly"
+msgstr "Cz�ciowy py� wodny"
+
+#: my-evolution/Locations.h:1693
+msgid "Parkersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1694
+#, fuzzy
+msgid "Pasco"
+msgstr "Has�o"
+
+#: my-evolution/Locations.h:1695
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1700
+msgid "Passo Rolle"
+msgstr ""
+
+#: my-evolution/Locations.h:1701
+#, fuzzy
+msgid "Patna"
+msgstr "Panama"
+
+#: my-evolution/Locations.h:1702
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1706
+#, fuzzy
+msgid "Paysandu"
+msgstr "Obfity piasek"
+
+#: my-evolution/Locations.h:1707
+#, fuzzy
+msgid "Payson"
+msgstr "Odtwarzany d�wi�k:"
+
+#: my-evolution/Locations.h:1708
+#, fuzzy
+msgid "Pellston"
+msgstr "Pytanie"
+
+#: my-evolution/Locations.h:1709
+#, fuzzy
+msgid "Pelotas"
+msgstr "Od�wie�"
+
+#: my-evolution/Locations.h:1710
+#, fuzzy
+msgid "Pendleton"
+msgstr "Wyb�r:"
+
+#: my-evolution/Locations.h:1711
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1716
+#, fuzzy
+msgid "Peoria"
+msgstr "Georgia"
+
+#: my-evolution/Locations.h:1717
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1718
+msgid "Pereira/Matecana"
+msgstr ""
+
+#: my-evolution/Locations.h:1719
+#, fuzzy
+msgid "Perm"
+msgstr "G�wn"
+
+#: my-evolution/Locations.h:1720
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1721
+msgid "Perry-Foley"
+msgstr ""
+
+#: my-evolution/Locations.h:1722
+#, fuzzy
+msgid "Perth"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1724
+#, fuzzy
+msgid "Perugia"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1725
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1730
+#, fuzzy
+msgid "Philip"
+msgstr "Filipiny"
+
+#: my-evolution/Locations.h:1731
+#, fuzzy
+msgid "Philipsburg"
+msgstr "Filipiny"
+
+#: my-evolution/Locations.h:1732
+#, fuzzy
+msgid "Phillips"
+msgstr "Filipiny"
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1739
+msgid "Piedras Negras"
+msgstr ""
+
+#: my-evolution/Locations.h:1740
+#, fuzzy
+msgid "Pierre"
+msgstr "Peru"
+
+#: my-evolution/Locations.h:1741
+msgid "Pietersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1742
+#, fuzzy
+msgid "Pikeville"
+msgstr "Podgl�d"
+
+#: my-evolution/Locations.h:1743
+msgid "Pine Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+msgid "Pirassununga"
+msgstr ""
+
+#: my-evolution/Locations.h:1747
+#, fuzzy
+msgid "Pisa"
+msgstr "Pakistan"
+
+#: my-evolution/Locations.h:1748
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1753
+#, fuzzy
+msgid "Plymouth"
+msgstr "miesi�c"
+
+#: my-evolution/Locations.h:1754
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+msgid "Pocos De Caldas"
+msgstr ""
+
+#: my-evolution/Locations.h:1756
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1757
+#, fuzzy
+msgid "Podgorica Titograd"
+msgstr "Cz�ciowe tornado"
+
+#: my-evolution/Locations.h:1758
+msgid "Pohang Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1759
+#, fuzzy
+msgid "Point Hope"
+msgstr "Wydrukuj kopert�"
+
+#: my-evolution/Locations.h:1760
+#, fuzzy
+msgid "Point Lay"
+msgstr "Wydrukuj"
+
+#: my-evolution/Locations.h:1761
+#, fuzzy
+msgid "Point Mugu"
+msgstr "Wydruk listu"
+
+#: my-evolution/Locations.h:1762
+msgid "Point Piedras Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1763
+#, fuzzy
+msgid "Poitiers"
+msgstr "W�a�ciwo�ci"
+
+#: my-evolution/Locations.h:1765
+msgid "Pompano Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1766
+#, fuzzy
+msgid "Ponca City"
+msgstr "Lista telefon�w"
+
+#: my-evolution/Locations.h:1767
+#, fuzzy
+msgid "Ponce"
+msgstr "Brak"
+
+#: my-evolution/Locations.h:1768
+msgid "Ponta Pora"
+msgstr ""
+
+#: my-evolution/Locations.h:1769
+#, fuzzy
+msgid "Pontiac"
+msgstr "Kontakty"
+
+#: my-evolution/Locations.h:1770
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1771
+msgid "Poplar Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1772
+#, fuzzy
+msgid "Poprad"
+msgstr "Polska"
+
+#: my-evolution/Locations.h:1773
+#, fuzzy
+msgid "Port Alexander"
+msgstr "Wydrukuj kalendarz"
+
+#: my-evolution/Locations.h:1774
+msgid "Port Alsworth"
+msgstr ""
+
+#: my-evolution/Locations.h:1775
+#, fuzzy
+msgid "Port Angeles"
+msgstr "Wydrukuj kopert�"
+
+#: my-evolution/Locations.h:1776
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1777
+msgid "Port Elizabeth"
+msgstr ""
+
+#: my-evolution/Locations.h:1778
+#, fuzzy
+msgid "Porterville"
+msgstr "Podgl�d"
+
+#: my-evolution/Locations.h:1779
+#, fuzzy
+msgid "Port Hardy"
+msgstr "Wydrukuj kart�"
+
+#: my-evolution/Locations.h:1780
+#, fuzzy
+msgid "Port Hedland"
+msgstr "Polska"
+
+#: my-evolution/Locations.h:1781
+msgid "Port Heiden"
+msgstr ""
+
+#: my-evolution/Locations.h:1782
+#, fuzzy
+msgid "Portland"
+msgstr "Polska"
+
+#: my-evolution/Locations.h:1783
+#, fuzzy
+msgid "Porto"
+msgstr "P_ort:"
+
+#: my-evolution/Locations.h:1784
+#, fuzzy
+msgid "Porto Alegre"
+msgstr "Post�p"
+
+#: my-evolution/Locations.h:1785
+msgid "Porto Alegre Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:1786
+#, fuzzy
+msgid "Portoroz"
+msgstr "Portret"
+
+#: my-evolution/Locations.h:1787
+#, fuzzy
+msgid "Porto Santo"
+msgstr "Portret"
+
+#: my-evolution/Locations.h:1788
+msgid "Porto Velho"
+msgstr ""
+
+#: my-evolution/Locations.h:1789
+#, fuzzy
+msgid "Port Said"
+msgstr "Portret"
+
+#: my-evolution/Locations.h:1790
+msgid "Portsmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1792
+#, fuzzy
+msgid "Posadas"
+msgstr "Polska"
+
+#: my-evolution/Locations.h:1793
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1796
+#, fuzzy
+msgid "Poza Rica"
+msgstr "Kostaryka"
+
+#: my-evolution/Locations.h:1797
+#, fuzzy
+msgid "Poznan"
+msgstr "Polska"
+
+#: my-evolution/Locations.h:1798
+#, fuzzy
+msgid "Praha"
+msgstr "Paragwaj"
+
+#: my-evolution/Locations.h:1799
+#, fuzzy
+msgid "Pratica di Mare"
+msgstr "Cz�ciowa m�awka"
+
+#: my-evolution/Locations.h:1800
+msgid "Prescott"
+msgstr ""
+
+#: my-evolution/Locations.h:1801
+#, fuzzy
+msgid "Presidente Prudente"
+msgstr "Podgl�d wydruku"
+
+#: my-evolution/Locations.h:1802
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1804
+#, fuzzy
+msgid "Pretoria"
+msgstr "Georgia"
+
+#: my-evolution/Locations.h:1805
+#, fuzzy
+msgid "Preveza"
+msgstr "Podgl�d"
+
+#: my-evolution/Locations.h:1806
+#, fuzzy
+msgid "Price-Carbon"
+msgstr "Pitcairn"
+
+#: my-evolution/Locations.h:1807
+#, fuzzy
+msgid "Pristina"
+msgstr "Tradycyjny"
+
+#: my-evolution/Locations.h:1808
+#, fuzzy
+msgid "Providence"
+msgstr "_Stan/Prowincja:"
+
+#: my-evolution/Locations.h:1809
+#, fuzzy
+msgid "Provincetown"
+msgstr "Podgl�d"
+
+#: my-evolution/Locations.h:1810
+#, fuzzy
+msgid "Provo"
+msgstr "Zawd"
+
+#: my-evolution/Locations.h:1811
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1812
+#, fuzzy
+msgid "Pucallpa"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1813
+msgid "Pudahuel"
+msgstr ""
+
+#: my-evolution/Locations.h:1814
+#, fuzzy
+msgid "Puebla"
+msgstr "Publiczny"
+
+#: my-evolution/Locations.h:1815
+#, fuzzy
+msgid "Pueblo"
+msgstr "Publiczny"
+
+#: my-evolution/Locations.h:1816
+#, fuzzy
+msgid "Puerto Barrios"
+msgstr "Puerto Rico"
+
+#: my-evolution/Locations.h:1817
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1818
+#, fuzzy
+msgid "Puerto Escondido"
+msgstr "Puerto Rico"
+
+#: my-evolution/Locations.h:1819
+#, fuzzy
+msgid "Puerto Lempira"
+msgstr "Puerto Rico"
+
+#: my-evolution/Locations.h:1820
+#, fuzzy
+msgid "Puerto Limon"
+msgstr "Puerto Rico"
+
+#: my-evolution/Locations.h:1821
+#, fuzzy
+msgid "Puerto Maldonado"
+msgstr "Cz�ciowe tornado"
+
+#: my-evolution/Locations.h:1822
+#, fuzzy
+msgid "Puerto Montt"
+msgstr "Puerto Rico"
+
+#: my-evolution/Locations.h:1823
+#, fuzzy
+msgid "Puerto Plata"
+msgstr "Puerto Rico"
+
+#: my-evolution/Locations.h:1825
+#, fuzzy
+msgid "Puerto Suarez"
+msgstr "Wydrukuj"
+
+#: my-evolution/Locations.h:1826
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1827
+#, fuzzy
+msgid "Pula"
+msgstr "Palau"
+
+#: my-evolution/Locations.h:1828
+#, fuzzy
+msgid "Pullman"
+msgstr "Polska"
+
+#: my-evolution/Locations.h:1829
+msgid "Punta Arenas"
+msgstr ""
+
+#: my-evolution/Locations.h:1830
+#, fuzzy
+msgid "Punta Cana"
+msgstr "Wydrukuj kalendarz"
+
+#: my-evolution/Locations.h:1831
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1835
+msgid "Pyongyang"
+msgstr ""
+
+#: my-evolution/Locations.h:1837
+#, fuzzy
+msgid "Quantico"
+msgstr "Pytanie"
+
+#: my-evolution/Locations.h:1838
+#, fuzzy
+msgid "Quebec"
+msgstr "Temat"
+
+#: my-evolution/Locations.h:1839
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1842
+msgid "Quimper"
+msgstr ""
+
+#: my-evolution/Locations.h:1843
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1850
+#, fuzzy
+msgid "Rapid City"
+msgstr "Z odpowiedzi� do"
+
+#: my-evolution/Locations.h:1851
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1852
+msgid "Ras Al Khaimah"
+msgstr ""
+
+#: my-evolution/Locations.h:1853
+#, fuzzy
+msgid "Rawlins"
+msgstr "Deszcz"
+
+#: my-evolution/Locations.h:1854
+#, fuzzy
+msgid "Reading"
+msgstr "Nag��wki"
+
+#: my-evolution/Locations.h:1855
+#, fuzzy
+msgid "Rebun Island"
+msgstr "Wyspa Bouveta"
+
+#: my-evolution/Locations.h:1856
+#, fuzzy
+msgid "Recife"
+msgstr "Odebrany"
+
+#: my-evolution/Locations.h:1857
+msgid "Red Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1858
+#, fuzzy
+msgid "Redding"
+msgstr "Nag��wki"
+
+#: my-evolution/Locations.h:1859
+#, fuzzy
+msgid "Redig"
+msgstr "Przeczytany"
+
+#: my-evolution/Locations.h:1860
+#, fuzzy
+msgid "Redmond"
+msgstr "Przypominanie"
+
+#: my-evolution/Locations.h:1861
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1863
+msgid "Reggio Calabria"
+msgstr ""
+
+#: my-evolution/Locations.h:1864
+#, fuzzy
+msgid "Regina"
+msgstr "Regiony"
+
+#: my-evolution/Locations.h:1865
+msgid "Reims-Champagne"
+msgstr ""
+
+#: my-evolution/Locations.h:1866
+#, fuzzy
+msgid "Rennes"
+msgstr "Przypominanie"
+
+#: my-evolution/Locations.h:1867
+#, fuzzy
+msgid "Reno"
+msgstr "Reunion"
+
+#: my-evolution/Locations.h:1868
+#, fuzzy
+msgid "Renton"
+msgstr "Reunion"
+
+#: my-evolution/Locations.h:1869
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1870
+#, fuzzy
+msgid "Reus"
+msgstr "Regu�y"
+
+#: my-evolution/Locations.h:1871
+#, fuzzy
+msgid "Reyes"
+msgstr "lat"
+
+#: my-evolution/Locations.h:1872
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1873
+#, fuzzy
+msgid "Reynosa"
+msgstr "Od�wie�"
+
+#: my-evolution/Locations.h:1874
+#, fuzzy
+msgid "Rhinelander"
+msgstr "Finlandia"
+
+#: my-evolution/Locations.h:1875
+#, fuzzy
+msgid "Rhode Island"
+msgstr "Wyspa Bouveta"
+
+#: my-evolution/Locations.h:1876
+#, fuzzy
+msgid "Riberalta"
+msgstr "Gibraltar"
+
+#: my-evolution/Locations.h:1877
+msgid "Richmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1878
+#, fuzzy
+msgid "Rickenbacker"
+msgstr "Przydomek"
+
+#: my-evolution/Locations.h:1879
+#, fuzzy
+msgid "Rieti"
+msgstr "Haiti"
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rifle"
+msgstr "Rola"
+
+#: my-evolution/Locations.h:1881
+#, fuzzy
+msgid "Riga"
+msgstr "Prawy:"
+
+#: my-evolution/Locations.h:1882
+#, fuzzy
+msgid "Rijeka"
+msgstr "Przeczytany"
+
+#: my-evolution/Locations.h:1883
+#, fuzzy
+msgid "Rimini"
+msgstr "Rumunia"
+
+#: my-evolution/Locations.h:1884
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1885
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1886
+msgid "Rio Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1887
+#, fuzzy
+msgid "Rioja"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1888
+#, fuzzy
+msgid "Rio / Jacarepagua"
+msgstr "Nikaragua"
+
+#: my-evolution/Locations.h:1889
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+#, fuzzy
+msgid "Rishiri Island"
+msgstr "Brytyjskie Wyspy Dziewicze"
+
+#: my-evolution/Locations.h:1891
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+#, fuzzy
+msgid "Rivera"
+msgstr "Liberia"
+
+#: my-evolution/Locations.h:1893
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1894
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1895
+msgid "Riverton"
+msgstr ""
+
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "Pine"
+
+#: my-evolution/Locations.h:1897
+#, fuzzy
+msgid "Rivolto"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:1898
+#, fuzzy
+msgid "Riyadh"
+msgstr "Przeczytany"
+
+#: my-evolution/Locations.h:1899
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1900
+#, fuzzy
+msgid "Roatan"
+msgstr "Chorwacja"
+
+#: my-evolution/Locations.h:1901
+#, fuzzy
+msgid "Robore"
+msgstr "przed"
+
+#: my-evolution/Locations.h:1902
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1903
+msgid "Rockford"
+msgstr ""
+
+#: my-evolution/Locations.h:1904
+#, fuzzy
+msgid "Rockland"
+msgstr "Polska"
+
+#: my-evolution/Locations.h:1905
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1907
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1908
+#, fuzzy
+msgid "Rodos"
+msgstr "Pomieszczenie"
+
+#: my-evolution/Locations.h:1909
+#, fuzzy
+msgid "Rogers"
+msgstr "Foldery"
+
+#: my-evolution/Locations.h:1910
+#, fuzzy
+msgid "Roma/Ciampino"
+msgstr "Rumunia"
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1917
+msgid "Roosevelt"
+msgstr ""
+
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Roros"
+msgstr "Komory"
+
+#: my-evolution/Locations.h:1919
+msgid "Rorvik/Ryum"
+msgstr ""
+
+#: my-evolution/Locations.h:1920
+#, fuzzy
+msgid "Rosario"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1921
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1922
+#, fuzzy
+msgid "Roseglen"
+msgstr "Rola"
+
+#: my-evolution/Locations.h:1923
+#, fuzzy
+msgid "Rost"
+msgstr "Komputer"
+
+#: my-evolution/Locations.h:1924
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1927
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1928
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1929
+#, fuzzy
+msgid "Rurrenabaque"
+msgstr "Powtarzalno��"
+
+#: my-evolution/Locations.h:1930
+msgid "Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1931
+#, fuzzy
+msgid "Russia"
+msgstr "Austria"
+
+#: my-evolution/Locations.h:1932
+#, fuzzy
+msgid "Rutland"
+msgstr "Bhutan"
+
+#: my-evolution/Locations.h:1933
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1935
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1936
+msgid "Sabine Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:1937
+#, fuzzy
+msgid "Sacramento"
+msgstr "Oddzia�"
+
+#: my-evolution/Locations.h:1938
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1939
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1940
+#, fuzzy
+msgid "Saginaw"
+msgstr "Hiszpania"
+
+#: my-evolution/Locations.h:1941
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1944
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1945
+#, fuzzy
+msgid "Saint Mary's"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1946
+#, fuzzy
+msgid "Saint Mawgan"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1947
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1948
+#, fuzzy
+msgid "Saint Paul"
+msgstr "Saint Lucia"
+
+#: my-evolution/Locations.h:1949
+#, fuzzy
+msgid "Saiq"
+msgstr "Hiszpania"
+
+#: my-evolution/Locations.h:1950
+#, fuzzy
+msgid "Salalah"
+msgstr "Nawa�nica"
+
+#: my-evolution/Locations.h:1951
+#, fuzzy
+msgid "Salem"
+msgstr "Zapisz"
+
+#: my-evolution/Locations.h:1952
+#, fuzzy
+msgid "Salida"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:1953
+msgid "Salida-Harriet"
+msgstr ""
+
+#: my-evolution/Locations.h:1954
+#, fuzzy
+msgid "Salina"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:1955
+#, fuzzy
+msgid "Salinas"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:1956
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1957
+#, fuzzy
+msgid "Salmon"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1958
+msgid "Salmon (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1959
+#, fuzzy
+msgid "Salta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:1960
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1961
+msgid "Salt Lake City"
+msgstr ""
+
+#: my-evolution/Locations.h:1962
+#, fuzzy
+msgid "Salto"
+msgstr "_Sob"
+
+#: my-evolution/Locations.h:1963
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+#, fuzzy
+msgid "Salvador"
+msgstr "Salwador"
+
+#: my-evolution/Locations.h:1965
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1966
+#, fuzzy
+msgid "Samara"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1967
+#, fuzzy
+msgid "Samos"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:1968
+#, fuzzy
+msgid "Samsun"
+msgstr "_Nie"
+
+#: my-evolution/Locations.h:1969
+#, fuzzy
+msgid "Sana'A"
+msgstr "Piasek"
+
+#: my-evolution/Locations.h:1970
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+#, fuzzy
+msgid "San Angelo"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1975
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1976
+#, fuzzy
+msgid "San Carlos"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1977
+#, fuzzy
+msgid "Sandane"
+msgstr "Piasek"
+
+#: my-evolution/Locations.h:1978
+#, fuzzy
+msgid "Sandberg"
+msgstr "Nadawca"
+
+#: my-evolution/Locations.h:1979
+#, fuzzy
+msgid "Sanderson"
+msgstr "Nadawca"
+
+#: my-evolution/Locations.h:1980
+#, fuzzy
+msgid "San Diego"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1986
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1987
+#, fuzzy
+msgid "Sand Point"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1988
+msgid "San Fernando De Apure"
+msgstr ""
+
+#: my-evolution/Locations.h:1989
+#, fuzzy
+msgid "Sanford"
+msgstr "Piasek"
+
+#: my-evolution/Locations.h:1990
+#, fuzzy
+msgid "San Francisco"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1991
+#, fuzzy
+msgid "Sangju"
+msgstr "Cieniowanie"
+
+#: my-evolution/Locations.h:1992
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1993
+#, fuzzy
+msgid "San Joaquin"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1994
+#, fuzzy
+msgid "San Jose"
+msgstr "Zapisz i zamknij"
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1997
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1998
+#, fuzzy
+msgid "San Juan"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:1999
+msgid "Sankt-Peterburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2000
+#, fuzzy
+msgid "Sanliurfa"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:2001
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2002
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2003
+#, fuzzy
+msgid "San Miguel"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2004
+#, fuzzy
+msgid "San Nicholas Island"
+msgstr "Wyspa Norfolk"
+
+#: my-evolution/Locations.h:2005
+#, fuzzy
+msgid "San Salvador"
+msgstr "Salwador"
+
+#: my-evolution/Locations.h:2006
+#, fuzzy
+msgid "San Sebastian"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2007
+#, fuzzy
+msgid "Santa Ana"
+msgstr "Saint Lucia"
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+#, fuzzy
+msgid "Santa Maria"
+msgstr "San Marino"
+
+#: my-evolution/Locations.h:2012
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2013
+#, fuzzy
+msgid "Santa Monica"
+msgstr "Saint Lucia"
+
+#: my-evolution/Locations.h:2014
+#, fuzzy
+msgid "Santander"
+msgstr "Nadawca"
+
+#: my-evolution/Locations.h:2015
+#, fuzzy
+msgid "Santarem"
+msgstr "Burza piaskowa"
+
+#: my-evolution/Locations.h:2016
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2017
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+#, fuzzy
+msgid "Santiago"
+msgstr "Saint Lucia"
+
+#: my-evolution/Locations.h:2019
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2020
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2021
+#, fuzzy
+msgid "Santorini"
+msgstr "Burza piaskowa"
+
+#: my-evolution/Locations.h:2022
+#, fuzzy
+msgid "Santos"
+msgstr "Stan"
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+#, fuzzy
+msgid "Sao Luiz"
+msgstr "Saint Lucia"
+
+#: my-evolution/Locations.h:2025
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2028
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+#, fuzzy
+msgid "Sarasota"
+msgstr "Samoa"
+
+#: my-evolution/Locations.h:2030
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+#, fuzzy
+msgid "Sarzana"
+msgstr "Sri Lanka"
+
+#: my-evolution/Locations.h:2032
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2033
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2038
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2039
+msgid "Sawyer AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2040
+#, fuzzy
+msgid "Sayun"
+msgstr "_Nie"
+
+#: my-evolution/Locations.h:2041
+#, fuzzy
+msgid "Scatsta"
+msgstr "Stan"
+
+#: my-evolution/Locations.h:2042
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2045
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2046
+msgid "Scottsdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Scranton"
+msgstr "Organizacja"
+
+#: my-evolution/Locations.h:2048
+msgid "Seattle"
+msgstr ""
+
+#: my-evolution/Locations.h:2049
+#, fuzzy
+msgid "Seattle-Boeing"
+msgstr "Ustawienia"
+
+#: my-evolution/Locations.h:2050
+#, fuzzy
+msgid "Sedalia"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:2051
+#, fuzzy
+msgid "Seeb"
+msgstr "Widziany"
+
+#: my-evolution/Locations.h:2052
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+#, fuzzy
+msgid "Sendai Airport"
+msgstr "Rozpoczynanie importowania"
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2058
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2059
+msgid "Sevilla"
+msgstr ""
+
+#: my-evolution/Locations.h:2060
+#, fuzzy
+msgid "Seward"
+msgstr "Wyszukiwanie"
+
+#: my-evolution/Locations.h:2061
+msgid "Sexton Summit"
+msgstr ""
+
+#: my-evolution/Locations.h:2062
+#, fuzzy
+msgid "Shanghai"
+msgstr "Cieniowanie"
+
+#: my-evolution/Locations.h:2063
+msgid "Shannon"
+msgstr ""
+
+#: my-evolution/Locations.h:2064
+#, fuzzy
+msgid "Sharjah"
+msgstr "Wyszukiwanie"
+
+#: my-evolution/Locations.h:2065
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+#: my-evolution/Locations.h:2066
+#, fuzzy
+msgid "Sharurah"
+msgstr "Sobota"
+
+#: my-evolution/Locations.h:2067
+#, fuzzy
+msgid "Shawbury"
+msgstr "Sobota"
+
+#: my-evolution/Locations.h:2068
+#, fuzzy
+msgid "Shearwater"
+msgstr "Data rozpocz�cia"
+
+#: my-evolution/Locations.h:2069
+msgid "Sheboygan"
+msgstr ""
+
+#: my-evolution/Locations.h:2070
+#, fuzzy
+msgid "Sheldon"
+msgstr "Szwecja"
+
+#: my-evolution/Locations.h:2071
+msgid "Shelter Cove"
+msgstr ""
+
+#: my-evolution/Locations.h:2072
+#, fuzzy
+msgid "Shelton"
+msgstr "Wyb�r:"
+
+#: my-evolution/Locations.h:2073
+msgid "Shenandoah"
+msgstr ""
+
+#: my-evolution/Locations.h:2074
+#, fuzzy
+msgid "Sheridan"
+msgstr "Sudan"
+
+#: my-evolution/Locations.h:2075
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2076
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2077
+msgid "Shingle Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2078
+#, fuzzy
+msgid "Shiraz"
+msgstr "Rozmiar"
+
+#: my-evolution/Locations.h:2079
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2080
+msgid "Shizuhama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2081
+#, fuzzy
+msgid "Shoreham"
+msgstr "Punkty"
+
+#: my-evolution/Locations.h:2082
+#, fuzzy
+msgid "Show Low"
+msgstr "S�aby �nieg"
+
+#: my-evolution/Locations.h:2083
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2084
+msgid "Shreveport Regional"
+msgstr ""
+
+#: my-evolution/Locations.h:2085
+#, fuzzy
+msgid "Sidney"
+msgstr "Pine"
+
+#: my-evolution/Locations.h:2086
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2087
+msgid "Siloam Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2088
+#, fuzzy
+msgid "Silver City"
+msgstr "Bezpiecze�stwo"
+
+#: my-evolution/Locations.h:2089
+#, fuzzy
+msgid "Sindal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2091
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2097
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2098
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+#: my-evolution/Locations.h:2099
+#, fuzzy
+msgid "Skive"
+msgstr "Rozmiar"
+
+#: my-evolution/Locations.h:2100
+#, fuzzy
+msgid "Skopje"
+msgstr "Zatrzymaj"
+
+#: my-evolution/Locations.h:2101
+#, fuzzy
+msgid "Skwentna"
+msgstr "Wys�ane"
+
+#: my-evolution/Locations.h:2102
+#, fuzzy
+msgid "Slana"
+msgstr "Albania"
+
+#: my-evolution/Locations.h:2105
+#, fuzzy
+msgid "Smithers"
+msgstr "minut"
+
+#: my-evolution/Locations.h:2106
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2107
+#, fuzzy
+msgid "Snowshoe Lake"
+msgstr "Kr�tkotrwa�y �nieg"
+
+#: my-evolution/Locations.h:2108
+#, fuzzy
+msgid "Sochi"
+msgstr "Po�udnie"
+
+#: my-evolution/Locations.h:2109
+#, fuzzy
+msgid "Socorro"
+msgstr "Punkty"
+
+#: my-evolution/Locations.h:2110
+#, fuzzy
+msgid "Socotra"
+msgstr "Punkty"
+
+#: my-evolution/Locations.h:2111
+#, fuzzy
+msgid "Soda Springs"
+msgstr "Ziarna �niegu"
+
+#: my-evolution/Locations.h:2112
+#, fuzzy
+msgid "Sofia"
+msgstr "Somalia"
+
+#: my-evolution/Locations.h:2113
+#, fuzzy
+msgid "Sogndal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2114
+#, fuzzy
+msgid "Soldotna"
+msgstr "S�owenia"
+
+#: my-evolution/Locations.h:2115
+#, fuzzy
+msgid "Somerset"
+msgstr "Kr�tkotrwa�a m�awka"
+
+#: my-evolution/Locations.h:2116
+#, fuzzy
+msgid "Sonderborg"
+msgstr "Nadawca"
+
+#: my-evolution/Locations.h:2117
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2120
+#, fuzzy
+msgid "Southampton"
+msgstr "Po�udniowy wsch�d"
+
+#: my-evolution/Locations.h:2121
+#, fuzzy
+msgid "South Bend"
+msgstr "Po�udnie"
+
+#: my-evolution/Locations.h:2122
+#, fuzzy
+msgid "South Carolina"
+msgstr "Po�udniowa Afryka"
+
+#: my-evolution/Locations.h:2123
+#, fuzzy
+msgid "South Dakota"
+msgstr "Po�udniowy wsch�d"
+
+#: my-evolution/Locations.h:2124
+#, fuzzy
+msgid "Southend"
+msgstr "Po�udnie"
+
+#: my-evolution/Locations.h:2125
+#, fuzzy
+msgid "South Marsh Island"
+msgstr "Wyspy Marshalla"
+
+#: my-evolution/Locations.h:2126
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2128
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2129
+#, fuzzy
+msgid "Spencer"
+msgstr "Nadawca"
+
+#: my-evolution/Locations.h:2130
+msgid "Spickard"
+msgstr ""
+
+#: my-evolution/Locations.h:2131
+#, fuzzy
+msgid "Split"
+msgstr "lista"
+
+#: my-evolution/Locations.h:2132
+#, fuzzy
+msgid "Spokane"
+msgstr "Hiszpania"
+
+#: my-evolution/Locations.h:2133
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2134
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "Springfield"
+msgstr "Uproszczony"
+
+#: my-evolution/Locations.h:2136
+msgid "Stampede Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:2137
+#, fuzzy
+msgid "State College"
+msgstr "Data zako�czenia:"
+
+#: my-evolution/Locations.h:2138
+#, fuzzy
+msgid "Stauning"
+msgstr "Pocz�tek:"
+
+#: my-evolution/Locations.h:2139
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2140
+msgid "Stavanger/Sola"
+msgstr ""
+
+#: my-evolution/Locations.h:2141
+#, fuzzy
+msgid "Staverton"
+msgstr "Pocz�tek:"
+
+#: my-evolution/Locations.h:2142
+#, fuzzy
+msgid "Stavropol"
+msgstr "Zatrzymaj"
+
+#: my-evolution/Locations.h:2143
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2144
+msgid "Steamboat Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2145
+#, fuzzy
+msgid "Stephenville"
+msgstr "Szeszele"
+
+#: my-evolution/Locations.h:2146
+#, fuzzy
+msgid "St. George"
+msgstr "�wi�ta Helena"
+
+#: my-evolution/Locations.h:2147
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2148
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2149
+msgid "St Johnsbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2150
+#, fuzzy
+msgid "St Joseph"
+msgstr "Zatrzymaj"
+
+#: my-evolution/Locations.h:2151
+#, fuzzy
+msgid "St Louis"
+msgstr "Saint Lucia"
+
+#: my-evolution/Locations.h:2152
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2157
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2158
+#, fuzzy
+msgid "Storm Lake"
+msgstr "Sri Lanka"
+
+#: my-evolution/Locations.h:2159
+#, fuzzy
+msgid "Stornoway"
+msgstr "Norwegia"
+
+#: my-evolution/Locations.h:2160
+#, fuzzy
+msgid "St Paul"
+msgstr "Stan"
+
+#: my-evolution/Locations.h:2161
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2164
+msgid "Strevell"
+msgstr ""
+
+#: my-evolution/Locations.h:2165
+#, fuzzy
+msgid "St Simon's Island"
+msgstr "Wyspy Salomona"
+
+#: my-evolution/Locations.h:2166
+msgid "Stumpy Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2167
+#, fuzzy
+msgid "Sturgeon Bay"
+msgstr "Sobota"
+
+#: my-evolution/Locations.h:2168
+msgid "Stuttgart"
+msgstr ""
+
+#: my-evolution/Locations.h:2169
+#, fuzzy
+msgid "Sucre"
+msgstr "Punkty"
+
+#: my-evolution/Locations.h:2170
+#, fuzzy
+msgid "Sumburgh"
+msgstr "Luksemburg"
+
+#: my-evolution/Locations.h:2171
+#, fuzzy
+msgid "Sumter"
+msgstr "Zestawienie"
+
+#: my-evolution/Locations.h:2172
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2174
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2175
+msgid "Superior"
+msgstr ""
+
+#: my-evolution/Locations.h:2177
+#, fuzzy
+msgid "Sutton"
+msgstr "_Nie"
+
+#: my-evolution/Locations.h:2178
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2179
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2188
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2189
+msgid "Szombathely"
+msgstr ""
+
+#: my-evolution/Locations.h:2190
+#, fuzzy
+msgid "Tabatinga"
+msgstr "Tradycyjny"
+
+#: my-evolution/Locations.h:2191
+msgid "Tabriz"
+msgstr ""
+
+#: my-evolution/Locations.h:2192
+#, fuzzy
+msgid "Tabuk"
+msgstr "Zadanie"
+
+#: my-evolution/Locations.h:2193
+msgid "Tachikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+#, fuzzy
+msgid "Tacna"
+msgstr "Ghana"
+
+#: my-evolution/Locations.h:2195
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2199
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+#, fuzzy
+msgid "Taejon"
+msgstr "Podejmowane czynno�ci"
+
+#: my-evolution/Locations.h:2201
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2202
+msgid "Taichung"
+msgstr ""
+
+#: my-evolution/Locations.h:2203
+#, fuzzy
+msgid "Taif"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2204
+#, fuzzy
+msgid "Tainan"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2206
+#, fuzzy
+msgid "Taiyuan"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2207
+#, fuzzy
+msgid "Taiz"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2208
+#, fuzzy
+msgid "Tajima"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2209
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Talara"
+msgstr ""
+
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Talinn"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2212
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tallahassee"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2215
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2216
+#, fuzzy
+msgid "Tampa"
+msgstr "Japonia"
+
+#: my-evolution/Locations.h:2217
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2218
+#, fuzzy
+msgid "Tampere"
+msgstr "Papier"
+
+#: my-evolution/Locations.h:2219
+msgid "Tampico"
+msgstr ""
+
+#: my-evolution/Locations.h:2220
+#, fuzzy
+msgid "Tanana"
+msgstr "Kanada"
+
+#: my-evolution/Locations.h:2221
+msgid "Tanegashima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2222
+#, fuzzy
+msgid "Taos"
+msgstr "Laos"
+
+#: my-evolution/Locations.h:2223
+#, fuzzy
+msgid "Taoyuan"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2224
+msgid "Tapachula"
+msgstr ""
+
+#: my-evolution/Locations.h:2225
+#, fuzzy
+msgid "Taranto"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2226
+#, fuzzy
+msgid "Tarbes"
+msgstr "Zadanie"
+
+#: my-evolution/Locations.h:2227
+#, fuzzy
+msgid "Tarija"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2228
+msgid "Tarvisio"
+msgstr ""
+
+#: my-evolution/Locations.h:2229
+#, fuzzy
+msgid "Tatalina"
+msgstr "Tradycyjny"
+
+#: my-evolution/Locations.h:2230
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2235
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2236
+#, fuzzy
+msgid "Tela"
+msgstr "Tokelau"
+
+#: my-evolution/Locations.h:2237
+#, fuzzy
+msgid "Temple"
+msgstr "Teleks"
+
+#: my-evolution/Locations.h:2238
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2244
+msgid "Texarkana"
+msgstr ""
+
+#: my-evolution/Locations.h:2245
+#, fuzzy
+msgid "Texas"
+msgstr "Zadanie"
+
+#: my-evolution/Locations.h:2246
+#, fuzzy
+msgid "The Dalles"
+msgstr "Szeszele"
+
+#: my-evolution/Locations.h:2247
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2248
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2249
+msgid "Thiruvananthapuram"
+msgstr ""
+
+#: my-evolution/Locations.h:2250
+#, fuzzy
+msgid "Thisted"
+msgstr "Tytu�"
+
+#: my-evolution/Locations.h:2251
+msgid "Thompson Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2252
+#, fuzzy
+msgid "Thumrait"
+msgstr "Czwartek"
+
+#: my-evolution/Locations.h:2253
+#, fuzzy
+msgid "Tianjin"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2254
+#, fuzzy
+msgid "Tijuana"
+msgstr "�otwa"
+
+#: my-evolution/Locations.h:2255
+msgid "Timisoara"
+msgstr ""
+
+#: my-evolution/Locations.h:2256
+msgid "Tin City"
+msgstr ""
+
+#: my-evolution/Locations.h:2257
+#, fuzzy
+msgid "Tirana"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2258
+#, fuzzy
+msgid "Tiree"
+msgstr "Wolny"
+
+#: my-evolution/Locations.h:2259
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2260
+msgid "Tiruchchirapalli"
+msgstr ""
+
+#: my-evolution/Locations.h:2261
+#, fuzzy
+msgid "Titusville"
+msgstr "Tytu�"
+
+#: my-evolution/Locations.h:2262
+#, fuzzy
+msgid "Tivat"
+msgstr "Prywatny"
+
+#: my-evolution/Locations.h:2263
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2267
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+#, fuzzy
+msgid "Tokunoshima Island"
+msgstr "Wyspa Bo�ego Narodzenia"
+
+#: my-evolution/Locations.h:2269
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2271
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2272
+msgid "Tokyo New International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2273
+#, fuzzy
+msgid "Toledo"
+msgstr "Prze��cz"
+
+#: my-evolution/Locations.h:2274
+#, fuzzy
+msgid "Toluca"
+msgstr "Tokelau"
+
+#: my-evolution/Locations.h:2275
+#, fuzzy
+msgid "Tonopah"
+msgstr "Tonga"
+
+#: my-evolution/Locations.h:2276
+#, fuzzy
+msgid "Topeka"
+msgstr "Tokelau"
+
+#: my-evolution/Locations.h:2277
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2279
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2280
+#, fuzzy
+msgid "Toronto"
+msgstr "Tornado"
+
+#: my-evolution/Locations.h:2281
+#, fuzzy
+msgid "Torp"
+msgstr "G�rny:"
+
+#: my-evolution/Locations.h:2282
+#, fuzzy
+msgid "Torrance"
+msgstr "Francja"
+
+#: my-evolution/Locations.h:2283
+#, fuzzy
+msgid "Torreon"
+msgstr "Korea�ski"
+
+#: my-evolution/Locations.h:2284
+#, fuzzy
+msgid "Tottori Airport"
+msgstr "Rozpoczynanie importowania"
+
+#: my-evolution/Locations.h:2285
+#, fuzzy
+msgid "Toulouse"
+msgstr "Zamknij"
+
+#: my-evolution/Locations.h:2286
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2290
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2291
+#, fuzzy
+msgid "Trabzon"
+msgstr "Gabon"
+
+#: my-evolution/Locations.h:2292
+#, fuzzy
+msgid "Trapani"
+msgstr "Japonia"
+
+#: my-evolution/Locations.h:2293
+msgid "Traverse City"
+msgstr ""
+
+#: my-evolution/Locations.h:2294
+#, fuzzy
+msgid "Trelew"
+msgstr "Teleks"
+
+#: my-evolution/Locations.h:2295
+#, fuzzy
+msgid "Trenton"
+msgstr "U�o�enie"
+
+#: my-evolution/Locations.h:2296
+#, fuzzy
+msgid "Trevico"
+msgstr "Poprzedni"
+
+#: my-evolution/Locations.h:2297
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2298
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2299
+#, fuzzy
+msgid "Trieste"
+msgstr "Test"
+
+#: my-evolution/Locations.h:2300
+#, fuzzy
+msgid "Trinidad"
+msgstr "Tornado"
+
+#: my-evolution/Locations.h:2301
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2304
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2305
+msgid "Troyes/Barberey"
+msgstr ""
+
+#: my-evolution/Locations.h:2306
+#, fuzzy
+msgid "Truckee"
+msgstr "Turcja"
+
+#: my-evolution/Locations.h:2307
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2314
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2315
+msgid "Tulancingo"
+msgstr ""
+
+#: my-evolution/Locations.h:2316
+#, fuzzy
+msgid "Tulcea"
+msgstr "Wtorek"
+
+#: my-evolution/Locations.h:2317
+#, fuzzy
+msgid "Tulsa"
+msgstr "Tunezja"
+
+#: my-evolution/Locations.h:2318
+#, fuzzy
+msgid "Tupelo"
+msgstr "_Wto"
+
+#: my-evolution/Locations.h:2319
+#, fuzzy
+msgid "Turaif"
+msgstr "Turecki"
+
+#: my-evolution/Locations.h:2320
+#, fuzzy
+msgid "Turin"
+msgstr "Turecki"
+
+#: my-evolution/Locations.h:2322
+#, fuzzy
+msgid "Turku"
+msgstr "Turcja"
+
+#: my-evolution/Locations.h:2323
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2324
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+#: my-evolution/Locations.h:2325
+#, fuzzy
+msgid "Twenthe"
+msgstr "Pr�bnie zaakceptowane"
+
+#: my-evolution/Locations.h:2326
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2327
+msgid "Twin Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2328
+#, fuzzy
+msgid "Tyler"
+msgstr "Typ"
+
+#: my-evolution/Locations.h:2329
+msgid "Tyndall AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2330
+#, fuzzy
+msgid "Tyumen"
+msgstr "_Wto"
+
+#: my-evolution/Locations.h:2331
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2332
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2340
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2341
+#, fuzzy
+msgid "United Arab Emirates "
+msgstr "Zjednoczone Emiraty Arabskie"
+
+#: my-evolution/Locations.h:2344
+#, fuzzy
+msgid "Unst"
+msgstr "Niewidziany"
+
+#: my-evolution/Locations.h:2345
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2346
+#, fuzzy
+msgid "Uruapan"
+msgstr "Japonia"
+
+#: my-evolution/Locations.h:2347
+#, fuzzy
+msgid "Uruguaiana"
+msgstr "Urugwaj"
+
+#: my-evolution/Locations.h:2349
+msgid "Urumqi"
+msgstr ""
+
+#: my-evolution/Locations.h:2350
+#, fuzzy
+msgid "Utah"
+msgstr "."
+
+#: my-evolution/Locations.h:2351
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2353
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:2355
+#, fuzzy
+msgid "Vadso"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:2356
+#, fuzzy
+msgid "Vaerlose"
+msgstr "Zmienny"
+
+#: my-evolution/Locations.h:2357
+#, fuzzy
+msgid "Vagar"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:2358
+msgid "Valdez 2"
+msgstr ""
+
+#: my-evolution/Locations.h:2359
+#, fuzzy
+msgid "Valdosta"
+msgstr "Malta"
+
+#: my-evolution/Locations.h:2360
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2361
+#, fuzzy
+msgid "Valencia"
+msgstr "S�owenia"
+
+#: my-evolution/Locations.h:2362
+#, fuzzy
+msgid "Valentine"
+msgstr "Wy�wietl na miejscu"
+
+#: my-evolution/Locations.h:2363
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2366
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2367
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2368
+#, fuzzy
+msgid "Van"
+msgstr "Mnd�"
+
+#: my-evolution/Locations.h:2369
+msgid "Vancouver"
+msgstr ""
+
+#: my-evolution/Locations.h:2370
+#, fuzzy
+msgid "Vandel"
+msgstr "Anuluj"
+
+#: my-evolution/Locations.h:2371
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2373
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+#, fuzzy
+msgid "Varadero"
+msgstr "Barbados"
+
+#: my-evolution/Locations.h:2375
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2376
+#, fuzzy
+msgid "Varna"
+msgstr "Vanuatu"
+
+#: my-evolution/Locations.h:2377
+#, fuzzy
+msgid "Vasteras"
+msgstr "po"
+
+#: my-evolution/Locations.h:2378
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2379
+#, fuzzy
+msgid "Venezia"
+msgstr "Wenezuela"
+
+#: my-evolution/Locations.h:2381
+#, fuzzy
+msgid "Venice"
+msgstr "Unicode"
+
+#: my-evolution/Locations.h:2382
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2383
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2384
+#, fuzzy
+msgid "Vermont"
+msgstr "miesi�c"
+
+#: my-evolution/Locations.h:2385
+#, fuzzy
+msgid "Vernal"
+msgstr "Og�lne"
+
+#: my-evolution/Locations.h:2386
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+#, fuzzy
+msgid "Vicenza"
+msgstr "Wenezuela"
+
+#: my-evolution/Locations.h:2388
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2390
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2393
+msgid "Vigo"
+msgstr ""
+
+#: my-evolution/Locations.h:2394
+#, fuzzy
+msgid "Vilhena"
+msgstr "Nazwa pliku:"
+
+#: my-evolution/Locations.h:2395
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+msgid "Villahermosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2398
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2404
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+#, fuzzy
+msgid "Visalia"
+msgstr "Australia"
+
+#: my-evolution/Locations.h:2406
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2410
+msgid "Vladivostok"
+msgstr ""
+
+#: my-evolution/Locations.h:2411
+#, fuzzy
+msgid "Vlieland"
+msgstr "Finlandia"
+
+#: my-evolution/Locations.h:2412
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2413
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2414
+#, fuzzy
+msgid "Volkel"
+msgstr "Tokelau"
+
+#: my-evolution/Locations.h:2415
+#, fuzzy
+msgid "Volk Field"
+msgstr "Pole _Od"
+
+#: my-evolution/Locations.h:2416
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2417
+#, fuzzy
+msgid "Voslau"
+msgstr "Tokelau"
+
+#: my-evolution/Locations.h:2418
+#, fuzzy
+msgid "Waco"
+msgstr "Monako"
+
+#: my-evolution/Locations.h:2419
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2423
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2424
+#, fuzzy
+msgid "Wallops Island"
+msgstr "Falklandy"
+
+#: my-evolution/Locations.h:2425
+msgid "Walnut Ridge"
+msgstr ""
+
+#: my-evolution/Locations.h:2426
+#, fuzzy
+msgid "Warner Robins"
+msgstr "Ostrze�enie"
+
+#: my-evolution/Locations.h:2427
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2429
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2430
+msgid "Washington/Dulles"
+msgstr ""
+
+#: my-evolution/Locations.h:2431
+#, fuzzy
+msgid "Waterbury"
+msgstr "Pogoda"
+
+#: my-evolution/Locations.h:2432
+#, fuzzy
+msgid "Waterloo"
+msgstr "Pogoda"
+
+#: my-evolution/Locations.h:2433
+#, fuzzy
+msgid "Watertown"
+msgstr "Pogoda"
+
+#: my-evolution/Locations.h:2434
+#, fuzzy
+msgid "Waterville"
+msgstr "Kategorie"
+
+#: my-evolution/Locations.h:2435
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+#, fuzzy
+msgid "Wausau"
+msgstr "Vanuatu"
+
+#: my-evolution/Locations.h:2437
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2438
+msgid "Waynesboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2439
+#, fuzzy
+msgid "Webster City"
+msgstr "Serwis WWW"
+
+#: my-evolution/Locations.h:2440
+#, fuzzy
+msgid "Wejh"
+msgstr "�r"
+
+#: my-evolution/Locations.h:2441
+msgid "Wellington"
+msgstr ""
+
+#: my-evolution/Locations.h:2442
+#, fuzzy
+msgid "Wenatchee"
+msgstr "Pogoda"
+
+#: my-evolution/Locations.h:2443
+#, fuzzy
+msgid "Wendover"
+msgstr "Nadawca"
+
+#: my-evolution/Locations.h:2444
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2445
+#, fuzzy
+msgid "West Burke"
+msgstr "Zachodnioeuropejski"
+
+#: my-evolution/Locations.h:2446
+#, fuzzy
+msgid "Westerland"
+msgstr "Holandia"
+
+#: my-evolution/Locations.h:2447
+#, fuzzy
+msgid "Westfield"
+msgstr "Zach�d"
+
+#: my-evolution/Locations.h:2448
+msgid "Westhampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2449
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2451
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2452
+msgid "West Yellowstone (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2453
+#, fuzzy
+msgid "Wheeling"
+msgstr "Planowanie"
+
+#: my-evolution/Locations.h:2454
+#, fuzzy
+msgid "Whidbey Island"
+msgstr "Wyspa Bo�ego Narodzenia"
+
+#: my-evolution/Locations.h:2455
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2461
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2462
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2463
+#, fuzzy
+msgid "Wick"
+msgstr "Przyd"
+
+#: my-evolution/Locations.h:2464
+#, fuzzy
+msgid "Wien"
+msgstr "�r"
+
+#: my-evolution/Locations.h:2465
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2467
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2468
+msgid "Williamsport"
+msgstr ""
+
+#: my-evolution/Locations.h:2469
+#, fuzzy
+msgid "Williston"
+msgstr "lista"
+
+#: my-evolution/Locations.h:2470
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2472
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2473
+#, fuzzy
+msgid "Winchester"
+msgstr "Liechtenstein"
+
+#: my-evolution/Locations.h:2474
+#, fuzzy
+msgid "Windsor"
+msgstr "Burza piaskowa"
+
+#: my-evolution/Locations.h:2475
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2478
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+#, fuzzy
+msgid "Winslow"
+msgstr "teraz"
+
+#: my-evolution/Locations.h:2480
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2481
+msgid "Winter Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:2482
+#, fuzzy
+msgid "Winter Park"
+msgstr "Wprowad� has�o"
+
+#: my-evolution/Locations.h:2483
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+#, fuzzy
+msgid "Wisconsin"
+msgstr "Mikronezja"
+
+#: my-evolution/Locations.h:2485
+msgid "Wisconsin Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:2486
+#, fuzzy
+msgid "Wise"
+msgstr "�r"
+
+#: my-evolution/Locations.h:2487
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2488
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2489
+#, fuzzy
+msgid "Woong Cheon"
+msgstr "Hong Kong"
+
+#: my-evolution/Locations.h:2490
+#, fuzzy
+msgid "Wooster"
+msgstr "Stopka:"
+
+#: my-evolution/Locations.h:2491
+#, fuzzy
+msgid "Worcester"
+msgstr "bez ko�ca"
+
+#: my-evolution/Locations.h:2492
+#, fuzzy
+msgid "Worland"
+msgstr "Polska"
+
+#: my-evolution/Locations.h:2493
+#, fuzzy
+msgid "Worthington"
+msgstr "Przetwarzanie"
+
+#: my-evolution/Locations.h:2494
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2495
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2496
+msgid "Wuchia Observatory"
+msgstr ""
+
+#: my-evolution/Locations.h:2497
+#, fuzzy
+msgid "Wyoming"
+msgstr "Przetwarzanie"
+
+#: my-evolution/Locations.h:2498
+#, fuzzy
+msgid "Xiamen"
+msgstr "Nazwa"
+
+#: my-evolution/Locations.h:2499
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2505
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2506
+msgid "Yankton"
+msgstr ""
+
+#: my-evolution/Locations.h:2507
+#, fuzzy
+msgid "Yao Airport"
+msgstr "Nie importuj"
+
+#: my-evolution/Locations.h:2508
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2510
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2511
+msgid "Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2513
+#, fuzzy
+msgid "Yenbo"
+msgstr "Jemen"
+
+#: my-evolution/Locations.h:2514
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2522
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2528
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2529
+msgid "Zacatecas"
+msgstr ""
+
+#: my-evolution/Locations.h:2530
+#, fuzzy
+msgid "Zadar"
+msgstr "Kalendarz"
+
+#: my-evolution/Locations.h:2531
+#, fuzzy
+msgid "Zagreb"
+msgstr "Strona"
+
+#: my-evolution/Locations.h:2532
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2533
+msgid "Zama Airfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2534
+#, fuzzy
+msgid "Zanesville"
+msgstr "Anulowane"
+
+#: my-evolution/Locations.h:2535
+#, fuzzy
+msgid "Zaragoza"
+msgstr "Paragwaj"
+
+#: my-evolution/Locations.h:2536
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2537
+msgid "Zuni Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:2538
+#, fuzzy
+msgid "Zurich"
+msgstr "Turecki"
+
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "Folder zawieraj�cy Zestawienie Evolution"
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Nie mo�na zainicjowa� komponentu zestawienia Evolution."
-
-#: 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 "Terminy"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "Brak termin�w"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:400
 msgid "%k:%M %d %B"
 msgstr "%d %B, %k:%M"
 
 # [cyba] Wypada zostawi� ten format 12-godzinny, bo jest te� alternatywa (z %k) wybierana przez program
-#: my-evolution/e-summary-calendar.c:379
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr "%d %B, %l:%M"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-calendar.c:420
+#, fuzzy
+msgid "No description"
+msgstr "opis"
+
+#: my-evolution/e-summary-mail.c:151
 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
+msgid "Local Folders"
+msgstr "Lokalne foldery"
+
 #. 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:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "EPGD:EPKK:EPWA"
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "S�owo dnia Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Cytaty dnia"
 
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Nowe �r�d�o nowo�ci"
 
-#: my-evolution/e-summary-preferences.c:953
+#: my-evolution/e-summary-preferences.c:728
 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:957
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: my-evolution/e-summary-preferences.c:1503
-msgid "Summary Settings"
-msgstr "Ustawienia zestawienia"
-
-#: 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
 msgid "Error downloading RDF"
 msgstr "B��d przy pobieraniu RDF-a"
 
-#: my-evolution/e-summary-rdf.c:528
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr "�r�d�o nowo�ci"
 
-#: my-evolution/e-summary-tasks.c:248
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
+msgstr ""
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+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
+#, fuzzy
+msgid "Shown"
+msgstr "Kr�tkotrwa�a m�awka"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Brak zada�"
 
-#: my-evolution/e-summary-tasks.c:287
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(Brak opisu)"
 
@@ -10282,23 +23792,24 @@ msgstr "(Brak opisu)"
 msgid "My Weather"
 msgstr "Moja pogoda"
 
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr "<dd><b>Nie mo�na nawi�za� po��czenia z serwerem pogodowym</b></dd>"
+#: 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:501
 msgid "Weather"
 msgstr "Pogoda"
 
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr "Regiony"
-
 #: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B, %Y"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:488
+#, fuzzy
+msgid "Please wait..."
+msgstr "Poczekaj chwil�"
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Wydrukuj"
 
@@ -10306,43 +23817,10 @@ msgstr "Wydrukuj"
 msgid "Printing of Summary failed"
 msgstr "Wydrukowanie zestawienia nie powiod�o si�"
 
-#: my-evolution/main.c:66
+#: my-evolution/main.c:65
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponent zestawienia wykonawczego nie m�g� zainicjowa� 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 "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
-msgid "miles"
-msgstr "mile"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilometry"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Czyste niebo"
@@ -10741,11 +24219,6 @@ msgstr "Zbli�aj�ce si� kulki lodowe"
 msgid "Freezing ice pellets"
 msgstr "Utrzymuj�ce si� kulki lodowe"
 
-#. HAIL
-#: my-evolution/metar.c:217
-msgid "Hail"
-msgstr "Grad"
-
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "Nadchodz�cy grad"
@@ -11491,151 +24964,124 @@ msgid "Drifting dust whirls"
 msgstr "Zbli�aj�ce si� wiruj�ce tumany kurzu"
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr " _Usu�"
-
-#: my-evolution/my-evolution.glade.h:2
 msgid "Add n_ews feed"
 msgstr "Dodaj �_r�d�o"
 
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "Wszy_stkie stacje:"
-
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "W_szystkie foldery:"
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "W_szystkie �r�d�a nowo�ci:"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 #, fuzzy
 msgid "C_elsius"
 msgstr "_Celsjusza"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 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:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr "_Maksymalna liczba wy�wietlanych element�w:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr "Ustawienia �r�de� nowo�ci"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr "Jeden _miesi�c"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr "J_eden tydzie�"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr "O_kres od�wie�ania (sekundy):"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr "O_kres od�wie�ania (sekundy):"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 msgid "S_how full path for folders"
 msgstr "_Wy�wietlanie pe�nych �cie�ek folder�w"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr "Wy�wietlanie _wszystkich zada�"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _today's tasks"
 msgstr "Wy�wietlanie _dzisiejszych zada�"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr "Wy�wietlanie temperatur w skali:"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "Zadania "
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr "Ustawienia dotycz�ce pogody"
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "Wy�wi_etlane foldery:"
-
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "Wy�wi_etlane stacje:"
-
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
-msgstr "Wy�wi_etlane �r�d�a:"
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr "_Fahrenheita"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr "_Pi�� dni"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr "Pocz_ta"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 msgid "_News Feeds"
 msgstr "�r�d�a _nowo�ci"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr "_Jeden dzie�"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr "P_lanowanie"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr "Pogod_a"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Foldery specjalne"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Pow�oka Evolution."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Wy�wietl szczeg�y"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Anuluj operacj�"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Nadchodz�ce"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Wychodz�ce"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Lokalne foldery"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instalacja 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"
@@ -11643,15 +25089,15 @@ msgstr ""
 "Uruchomiona w�a�nie nowa wersja Evolution wymaga zainstalowania\n"
 "dodatkowych plik�w w osobistym katalogu Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "Kliknij \"OK\" aby zainstalowa� pliki lub \"Anuluj\" aby zako�czy�."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Nie mo�na poprawnie uaktualni� plik�w"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11662,7 +25108,7 @@ msgstr ""
 "%s\n"
 "B��d: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11671,7 +25117,33 @@ msgstr ""
 "Wyst�pi� b��d przy kopiowaniu plik�w do\n"
 "\"%s\"."
 
-#: shell/e-setup.c:281
+#: shell/e-setup.c:282
+#, fuzzy, c-format
+msgid ""
+"Evolution could not create directory\n"
+"%s:\n"
+"%s"
+msgstr ""
+"Nie mo�na stworzy� katalogu %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:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11682,7 +25154,7 @@ msgstr ""
 "Przenie� go w inne miejsce, aby umo�liwi�\n"
 "instalacj� plik�w u�ytkownika Evolution."
 
-#: shell/e-setup.c:295
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11695,7 +25167,7 @@ msgstr ""
 "jego usuni�cie.\n"
 "Czy chcesz usun�� ten katalog?"
 
-#: shell/e-setup.c:320
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11706,49 +25178,53 @@ msgstr ""
 "Evolution. Przenie� go w inne miejsce, aby umo�liwi�\n"
 "instalacj� plik�w u�ytkownika Evolution."
 
-#: 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."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Dostarczone przez"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Nie mo�na sprawdzi� folderu: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Nie mo�na zmieni� nazwy folderu:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Nie mo�na przenie�� folderu do niego samego."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Nie mo�na skopiowa� folderu do niego samego."
 
-#: 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 "Nie mo�na skopiowa� folderu do jego folderu podrz�dnego."
 
-#: 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 "Wybierz folder, do kt�rego chcesz skopiowa� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Kopiowanie folderu"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Przeniesienie folderu"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11757,18 +25233,18 @@ msgstr ""
 "Nie mo�na usun�� folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Usuni�cie \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11777,22 +25253,22 @@ msgstr ""
 "Nie mo�na zmieni� nazwy folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Zmiana nazwy folderu \"%s\" na:"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Zmiana nazwy folderu"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:148
+#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Podana nazwa folderu nie jest poprawna: %s"
 
-#: 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"
@@ -11801,7 +25277,7 @@ msgstr ""
 "Nie mo�na stworzy� podanego folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:267
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - tworzenie nowego folderu"
 
@@ -11813,11 +25289,11 @@ msgstr ""
 "Typ wybranego folderu nie jest poprawny w odniesieniu\n"
 "do ��danej operacji."
 
-#: shell/e-shell-folder-selection-dialog.c:359
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nowy..."
 
-#: 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 "(Bez nazwy)"
 
@@ -11839,7 +25315,7 @@ msgstr ""
 "Je�li nie znasz typu pliku, wybierz \"Automatycznie\", a Evolution spr�buje "
 "go rozpozna�."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
+#: 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 "Wybierz informacje, kt�re chcesz zaimportowa�:"
 
@@ -11865,16 +25341,22 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie %d. elementu."
 
-#: shell/e-shell-importer.c:397
+#: shell/e-shell-importer.c:409
 #, c-format
 msgid "File %s does not exist"
 msgstr "Plik %s nie istnieje."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution "
+
+#: shell/e-shell-importer.c:420
 msgid "You may only import to local folders"
 msgstr "Mo�na importowa� tylko lokalne foldery"
 
-#: shell/e-shell-importer.c:424
+#: shell/e-shell-importer.c:435
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11883,11 +25365,11 @@ msgstr ""
 "�aden z importer�w nie potrafi obs�u�y� pliku\n"
 "%s"
 
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:445
 msgid "Importing"
 msgstr "Importowanie"
 
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:453
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11896,17 +25378,17 @@ msgstr ""
 "Importowanie %s.\n"
 "Rozpoczynanie %s"
 
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:466
 #, c-format
 msgid "Error starting %s"
 msgstr "B��d przy uruchamianiu %s"
 
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:485
 #, c-format
 msgid "Error loading %s"
 msgstr "B��d odczycie %s"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:502
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11915,31 +25397,31 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie 1. elementu."
 
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:572
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:623
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: shell/e-shell-importer.c:617
+#: shell/e-shell-importer.c:628
 msgid "Select a file"
 msgstr "Wyb�r pliku"
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:638
 msgid "File type:"
 msgstr "Typ pliku:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:663
 msgid "Import data and settings from older programs"
 msgstr "Import danych i ustawie� ze starszych program�w"
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:667
 msgid "Import a single file"
 msgstr "Import pojedynczego pliku"
 
-#: 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
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11947,24 +25429,24 @@ msgstr ""
 "Poczekaj chwil�...\n"
 "Trwa analizowanie istniej�cej konfiguracji"
 
-#: 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
 msgid "Starting Intelligent Importers"
 msgstr "Uruchamianie inteligentnych importer�w"
 
-#: 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
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1014
+#: shell/e-shell-importer.c:1027
 msgid "Select folder"
 msgstr "Wyb�r folderu"
 
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1028
 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:1127 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import"
 
@@ -11985,6 +25467,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Nowy"
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr "Nie podano nazwy folderu."
@@ -12001,92 +25489,95 @@ 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:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nie znajduje si� w �cie�ce."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Nie mo�na uruchomi� Bug buddy."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Informacje o Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:409
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Przej�cie do innego folderu..."
 
-#: shell/e-shell-view-menu.c:410
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Wybierz folder, kt�ry chcesz otworzy�"
 
-#: shell/e-shell-view-menu.c:530
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Tworzy nowy skr�t"
 
-#: shell/e-shell-view-menu.c:531
+#: shell/e-shell-view-menu.c:566
 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:562
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "W systemie nie jest zainstalowany GNOME Pilot tools."
-
-#: shell/e-shell-view-menu.c:570
-#, c-format
-msgid "Error executing %s."
-msgstr "B��d przy wykonywaniu %s."
-
-#: shell/e-shell-view-menu.c:672
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "Praca _z pod��czeniem"
 
-#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Praca _bez pod��czenia"
 
-#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Praca bez pod��czenia"
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Nie wy�wietlono folderu)"
 
-#: shell/e-shell-view.c:1574
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1576
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(Brak)"
 
-#: 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 dzia�a obecnie w trybie z pod��czeniem do sieci. Aby "
 "przej�� w tryb bez pod��czenia, kliknij ten przycisk."
 
-#: 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 przechodzi obecnie w tryb bez pod��czenia do sieci."
 
-#: 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 dzia�a obecnie w trybie bez pod��czenia do sieci. Aby "
 "przej�� w tryb z pod��czeniem, kliknij ten przycisk."
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Opis b��du otrzymany od systemu aktywacji:\n"
+"%s"
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nie mo�na ustawi� lokalnego miejsca przechowywania -- %s"
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12097,19 +25588,23 @@ 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:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Niepoprawny argumenty"
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Nie mo�na dokona� rejestracji na serwerze OAF"
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Nie odnaleziono bazy danych konfiguracji"
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "B��d og�lny"
 
@@ -12226,76 +25721,71 @@ msgstr "_Usu�"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Usuwa skr�t z paska skr�t�w"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "B��d przy zapisywaniu skr�t�w."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Skr�ty"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Nie mo�na przenie�� folderu:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Nadchodz�ce"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Bez nazwy)"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "bez b��du"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Folder o tej nazwie ju� istnieje"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Podany typ folderu nie jest poprawny"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "B��d We/Wy"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Brak miejsca na stworzenie folderu"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Folder nie jest pusty"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Nie odnaleziono okre�lonego folderu"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funkcja nie zosta�a zaimplementowana dla tego miejsca przechowywania"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Nieobs�ugiwana operacja"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Podany typ nie jest obs�ugiwany dla tego miejsca przechowywania"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nie mo�na zmodyfikowa� ani usun�� podanego folderu"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nie mo�na ustawi� folderu jako potomka jednego z folder�w podrz�dnych"
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "Nie mo�na stworzy� folderu o tej nazwie"
 
@@ -12305,106 +25795,114 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zako�czono %d%%)"
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<kliknij, aby wybra� folder> "
+
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Nieznany b��d."
+
+#: 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"
+"Opis b��du otrzymany od systemu komponent�w:\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"
+"Opis b��du otrzymany od systemu aktywacji:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "B��d Corby"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Przerwane"
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Niepoprawny argument"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Ma ju� w�a�ciciela"
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Brak w�a�ciciela"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Nie odnaleziono"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Nieobs�ugiwany typ"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Nieobs�ugiwany schemat"
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Nieobs�ugiwana operacja"
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "B��d wewn�trzny"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Istnieje"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Niepoprawny URI"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Zawiera foldery podrz�dne"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Brak miejsca"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Poprzedni w�a�ciciel zako�czy� dzia�anie"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Nieznany b��d."
-
-#: 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"
-"Opis b��du otrzymany od systemu komponent�w:\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"
-"Opis b��du otrzymany od systemu aktywacji:\n"
-"%s"
+#: shell/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "Typ pliku:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -12533,292 +26031,272 @@ 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
+msgid "Evolution"
+msgstr "Evolution"
+
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ko�czy prac�..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nie mo�na uzyska� dost�pu do pow�oki Ximian Evolution."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nie mo�na zainicjowa� pow�oki Ximian Evolution: %s"
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Ukrywa okno powitalne"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Rozpoczynanie importowania"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Uruchamianie inteligentnych importer�w"
+
+#: shell/main.c:320
 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:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie mo�na zainicjowa� systemu komponent�w 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 "B��d przy odczycie domy�lnej ksi��ki adresowej."
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Plik wy�ciowy"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Plik wej�ciowy"
 
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr "Plik wy�ciowy"
+
 #: tools/evolution-addressbook-import.c:80
 msgid "No filename provided."
 msgstr "Nie podano nazwy pliku."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Skopiuj"
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Kopiuje zaznaczone listy do innego folderu"
 
-#: 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 "Kopiuje zaznaczenie"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "S_kopiuj do folderu..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Tworzy nowy kontakt"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Tworzy now� list� kontakt�w"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "Wytnij"
-
-#: 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 "Wycina zaznaczenie"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "Usuwa zaznaczone kontakty"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Nowa lista"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Przenosi zaznaczone listy do nowego folderu"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Wklej"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "P_rzenie� do folderu..."
 
-#: 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 "Wkleja zawarto�� schowka"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Wy�wietla podgl�d kontakt�w w postaci przygotowanej do druku"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Drukuje zaznaczone kontakty"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Zapisuje zaznaczone kontakty w formacie VCard."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Zaznacz wszystkie"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Zaznacza wszystkie kontakty"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "Wy�lij _list do kontaktu..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Wysy�a list do wybranych kontakt�w"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Wy�lij list do kontaktu"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Wysy�a zaznaczone kontakty do innej osoby."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Zatrzymuje wczytywanie"
 
-#: 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 "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: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-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
 msgid "_Actions"
 msgstr "C_zynno�ci"
 
-#: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr "�r�d�a ksi��ki adresowej..."
-
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "Lista _kontakt�w"
 
-#: 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 "_Prze�lij kontakt..."
 
-#: 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 "Wy_drukuj..."
-
 #: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "P_rzenie� do folderu..."
+
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "Z_apisz jako VCard"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_Szukaj kontakt�w"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "Z_aznacz wszystko"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Konfiguruje ustawienia kalendarza"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "Wy�lij _list do kontaktu..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Stw�rz nowe zdarzenie _ca�odniowe"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a New _Task"
-msgstr "Stw�rz nowe _zadanie"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Stw�rz _nowy termin"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "Tworzy nowe zdarzenie ca�odniowe"
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Dzie�"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Usuwa termin"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Przejd� do"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Wstecz"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Naprz�d"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Przejd� do _daty"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Przechodzi do podanej daty"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Przechodzi do dzisiaj"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Miesi�c"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Nowy termin"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr "Nowe zadanie"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Wy�wietla podgl�d kalendarza w postaci przygotowanej do druku"
 
-#: 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 "Podgl�d wyd_ruku"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Drukuje zawarto�� kalendarza"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Poblikuje informacj� o zaj�to�ci na podstawie tego kalendarza"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Wy�wietla jeden dzie�"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Wy�wietla jeden miesi�c"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Wy�wietla jeden tydzie�"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Wy�wietla tydzie� roboczy"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Tydzie�"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "_Termin..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Ustawienia kalendarza..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "_Opublikuj informacj� o zaj�to�ci"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "_Zadanie..."
-
 #: 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
@@ -12848,18 +26326,18 @@ msgstr "Wy�wietla podgl�d elementu w postaci przygotowanej do druku"
 msgid "Print this item"
 msgstr "Drukuje bie��cy element"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Wydrukuj..."
-
-#: 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 "Zapisz"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Zapisz jako..."
+
 #: 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 "Zapisz i zamknij"
 
@@ -12875,8 +26353,8 @@ msgstr "Zapisuje bie��cy element na dysku"
 #: 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:40
 msgid "_File"
 msgstr "_Plik"
 
@@ -12885,7 +26363,7 @@ msgid "Print En_velope..."
 msgstr "Wydrukuj _kopert�..."
 
 #: 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 "Zapisz j_ako..."
@@ -12894,10 +26372,14 @@ msgstr "Zapisz j_ako..."
 msgid "Save the contact and close the dialog box"
 msgstr "Zapisuje kontakt i zamyka okno dialogowe"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "Wy�lij _list do kontaktu..."
+
 #: 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 "_Zapisz"
 
@@ -12957,6 +26439,10 @@ 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"
@@ -12966,85 +26452,56 @@ msgid "Compose _New Message"
 msgstr "Stw�rz _nowy list"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-"Pozwala na stworzenie i modyfikacj� kont pocztowych oraz innych ustawie�"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Pozwala na stworzenie lub modyfikacj� regu� filtrowania list�w"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Pozwala na stworzenie lub modyfikacj� definicji wirtualnych folder�w"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Opr�nij �mie_tnik"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Zapomnij _has�a"
 
-#: 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 "Zapomina zapami�tane has�a, co spowoduje ponowne pytanie o nie"
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Nowy list"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Otwiera okno umo�liwiaj�ce napisanie nowego listu"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trwale usuwa listy oznaczone do usuni�cia ze wszystkich folder�w"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "Wy�lij / Odbierz"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Wysy�a listy w kolejce i pobiera nowe"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Wy�wietla podgl�d listu w wydzielonej cz�ci okna"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 "Pozwala za zasubskrybowanie lub odsubskrybowanie folder�w na zdalnych "
 "serwerach"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "_Edytor wirtualnych folder�w..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filtry..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "L_ist"
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "_Ustawienia poczty..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Podgl�d listu"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "Wy�lij / _Odbierz"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "Su_bskrybcje folder�w..."
 
@@ -13139,11 +26596,11 @@ msgstr "Czasowo ukrywa zaznaczone listy"
 msgid "Threaded Message list"
 msgstr "Prze��cza grupowanie list�w w w�tki"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "Wy_czy��"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Folder"
 
@@ -13160,211 +26617,228 @@ msgid "_Threaded Message List"
 msgstr "Grupowanie list�w w w�t_ki"
 
 #: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Dodaj nadawc� do ksi��ki adresowej"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Zastosuj filtry"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Dodaj nadawc� do ksi��ki adresowej"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Zastosowuje regu�y filtru w odniesieniu do zaznaczonych list�w"
 
-#: 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 "Odpowiada wszystkim odbiorcom zaznaczonego listu"
 
-#: 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 "Odpowiada na list� dyskusyjn� zwi�zan� z zaznaczonym listem"
 
-#: 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 "Odpowiada nadawcy zaznaczonego listu"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopiuje zaznaczone listy do innego folderu"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Stw�rz _wirtualny folder na podstawie listu"
 
-#: 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 "Tworzy regu��, filtruj�c� listy od tego nadawcy"
 
-#: 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 "Tworzy regu��, filtruj�c� listy do tych odbiorc�w"
 
-#: 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 "Tworzy regu��, filtruj�c� listy z tej listy dyskusyjnej"
 
-#: 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 "Tworzy regu��, filtruj�c� listy o tym temacie"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Tworzy wirtualny folder dla tych odbiorc�w"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Tworzy wirtualny folder dla tej listy dyskusyjnej"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Tworzy wirtualny folder dla tego nadawcy"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Tworzy wirtualny folder dla tego tematu"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Zmniejsza rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Wy�wietla kolejny wa�ny list"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Wy�wietla kolejny list"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Wy�wietla kolejny nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Wy�wietla kolejny nieprzeczytany w�tek"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Wy�wietla poprzedni wa�ny list"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Wy�wietla poprzedni list"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Wy�wietla poprzedni nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Prze�lij"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filtr w oparciu o li_st� dyskusyjn�..."
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filtr w oparciu o n_adawc�..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filtr w oparciu o o_dbiorc�w..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filtr w oparciu o t_emat..."
 
-#: ui/evolution-mail-message.xml.h:29
-msgid "Force images in HTML mail to be loaded"
-msgstr "Wymusza pobranie obraz�w pojawiaj�cych si� w HTML-u"
-
-#: ui/evolution-mail-message.xml.h:30
-msgid "Forward"
-msgstr "Prze�lij"
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward As"
-msgstr "Prze�lij jako"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward _Attached"
-msgstr "Prze�lij _za��czony"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Inline"
-msgstr "Prze�lij _wstawiony"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Oznacza zaznaczone listy do usuni�cie"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Quoted"
-msgstr "Prze�lij z_acytowany"
+msgid "Follow _Up..."
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr "Wymusza pobranie obraz�w pojawiaj�cych si� w HTML-u"
+
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Przesy�a zaznaczony list do innej osoby w tre�ci nowego listu"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Przesy�a zaznaczony list do innej osoby zacytowany jak przy odpowiedzi"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Przesy�a zaznaczony list do innej osoby"
 
-#: 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 "Przesy�a zaznaczony list do innej osoby w postaci za��cznika"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Zwi�ksza rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Pobierz _obrazy"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Oz_nacz jako wa�ne"
 
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Oznacz jako ni_eprzeczytane"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Ozn_acz jako niewa�ne"
 
-#: 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 "Oznacza zaznaczone listy jako przeczytane"
 
-#: 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 "Oznacza zaznaczone listy jako wa�ne"
 
-#: 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 "Oznacza zaznaczone listy jako nieprzeczytane"
 
-#: 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 "Oznacza zaznaczone listy jako niewa�ne"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Oznacza zaznaczone listy do usuni�cie"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Przenie�"
 
-#: 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 "Przenosi zaznaczone listy do nowego folderu"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Nast�pny"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "Kolejny wa�ny list"
-
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
-msgstr "Kolejny list"
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "Kolejny wa�ny list"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Kolejny w�tek"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Kolejny nieprzeczytany list"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -13382,159 +26856,187 @@ msgid "Original Si_ze"
 msgstr "_Pierwotny rozmiar"
 
 #: ui/evolution-mail-message.xml.h:61
-msgid "Preview the message to be printed"
-msgstr "Wy�wietla podgl�d listu w postaci przygotowanej do druku"
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Poprzedni nieprzeczytany list"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "Poprzedni"
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Poprzedni wa�ny list"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "Poprzedni wa�ny list"
+msgid "Preview the message to be printed"
+msgstr "Wy�wietla podgl�d listu w postaci przygotowanej do druku"
 
 #: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "Poprzedni list"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "Poprzedni nieprzeczytany list"
+msgid "Previous"
+msgstr "Poprzedni"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Drukuje list"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "Odpowiedz"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Re_direct"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "Wszystkim"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Przesy�a zaznaczony list do innej osoby"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr "Przywraca pierwotny rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "_Przeszukaj list..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "_Mniejszy"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "Zapisuje list w pliku tekstowym"
 
-#: 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 "Wyszukuje tekst w tre�ci wy�wietlanego listu"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "Ustala ustawienia strony bie��cej drukarki"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "Wy�wietlanie postaci �_r�d�owej listu"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "Wy�wietlanie wszystkich _nag��wk�w"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "Wy�wietla list w zwyk�y spos�b"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "Wy�wietla list wraz ze wszystkimi nag��wkami"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "Wy�wietla list w surowej, �r�d�owej postaci"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "_Rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Cofa oznaczenie do usuni�cia dla wszystkich zaznaczonych list�w"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder w oparciu o _list� dyskusyjn�..."
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "VFolder w oparciu o _nadawc�..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "VFolder w oparciu o _odbiorc�w..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "VFolder w oparciu o _temat..."
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
-msgstr "_Zastosuj filtry"
-
 #: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Attached"
+msgstr "Za��cz"
+
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "S_kopiuj do folderu"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "_Stw�rz filtr na podstawie listu"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "_Prze�lij list"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Przejd� do"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "Tre�� listu"
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Wi�kszy"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "Wy�wietlanie lis_tu"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "P_rzenie� do folderu"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Kolejny list"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Zwyk�e wy�wietlanie"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_Otw�rz list"
 
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Poprzedni list"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Jako cytat"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_Narz�dzia"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Cofnij usuni�cie"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 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: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:36
 msgid "_Close"
 msgstr "Zam_knij"
 
 #: 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:56
 msgid "_View"
 msgstr "_Widok"
 
@@ -13558,11 +27060,11 @@ msgstr "Szyfruje list przy u�yciu PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Szyfruje list za pomoc� cerftyfikatu szyfruj�cego 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 "_Format"
 
-#: 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"
 
@@ -13578,6 +27080,10 @@ msgstr "Wstawia zawarto�� pliku jako tekst do listu"
 msgid "Insert text file..."
 msgstr "Wstaw plik tekstowy.."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Otw�rz"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Otwiera plik"
@@ -13611,7 +27117,7 @@ msgid "Save in folder..."
 msgstr "Zapisz w folderze..."
 
 #: 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 "Zapisuje bie��cy plik"
 
@@ -13636,6 +27142,7 @@ msgid "Send _later"
 msgstr "Wy�lij p�_niej"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Okre�la, czy list powinien zosta� wys�any w formacie HTML"
 
@@ -13704,7 +27211,7 @@ msgid "_From Field"
 msgstr "Pole _Od"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "W_staw"
 
@@ -13716,11 +27223,7 @@ msgstr "_Otw�rz..."
 msgid "_Reply-To Field"
 msgstr "Pole Odpowied� _do"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Bezpiecze�stwo"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "Pomo_c"
 
@@ -13776,33 +27279,41 @@ msgstr "Pobiera naj�wie�sze informacje o spotkaniu"
 msgid "Re_fresh Task"
 msgstr "_Od�wie� zadanie"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Konfiguruje ustawienia widoku zadania"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiuje zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Wycina zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "Usuwa zaznaczone zadanie"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Usuwa zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "_Oznacz jako zako�czone"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Wkleja zadanie ze schowka"
 
-#: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings..."
-msgstr "Ustawienia zada�..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Wy�wietla podgl�d kontakt�w w postaci przygotowanej do druku"
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
-msgstr "_Zadanie"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Drukuje list"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -13869,114 +27380,119 @@ msgid "Open this folder in an other window"
 msgstr "Otwiera folder w nowym oknie"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Wy�lij / Odbierz"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Wysy�a listy w kolejce i pobiera nowe"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "Wy�wietla informacje o Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Wy�lij zg�oszenie b��du"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Wy�lij zg�oszenie _b��du"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Wysy�a zg�oszenie b��du za pomoc� Bug Buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Prze��cz"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Prze��cza wy�wietlanie paska folder�w"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prze��cza wy�wietlanie paska skr�t�w"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 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:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Wy�wietla zaznaczony folder"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "_Najcz�ciej zadawane pytania"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "_Informacje o Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "Pasek f_older�w"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_Przejd� do folderu..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "Za_importuj..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Przenie�..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Nowy"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Nowy folder"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_Ustawienia pilota..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Zmie� nazw�..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "Wy�lij / _Odbierz"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Skr�t"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "Pasek _skr�t�w"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Zmienia ustawienia zestawienia"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Wydrukuj zestawienie"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Od�wie�"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Od�wie�a widok"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "_Ustawienia zestawienia..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Karty adresowe"
@@ -13990,18 +27506,27 @@ msgid "Phone List"
 msgstr "Lista telefon�w"
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "Wyb�r folderu"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Wed�ug nadawcy"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Wed�ug stanu"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Wed�ug tematu"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Listy"
 
@@ -14009,6 +27534,12 @@ msgstr "Listy"
 msgid "With Category"
 msgstr "Wraz z kategoriami"
 
+#. Check for UTC.
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+msgid "UTC"
+msgstr ""
+
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "Select a Time Zone"
 msgstr "Wyb�r strefy czasowej"
@@ -14031,11 +27562,21 @@ msgstr ""
 "stref� czasow�.\n"
 "Przyci�ni�cie prawego przycisku przywraca zwyk�e powi�kszenie."
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "_Bie��cy widok"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "_Bie��cy widok"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "Zdefiniuj widoki"
 
@@ -14067,76 +27608,81 @@ msgstr "Czas musi by� podany w formacie: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Warto�� procentowa musi si� zawiera� w przedziale od 0 do 100 w��cznie"
 
-#: widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "Ba�tycki"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "�rodkowoeuropejski"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "Chi�ski"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr "Cyrylica"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "Grecki"
 
-#: 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 "Japo�ski"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Korean"
 msgstr "Korea�ski"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turecki"
 
-#: 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 "Zachodnioeuropejski"
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 msgid "Traditional"
 msgstr "Tradycyjny"
 
-#: 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 "Uproszczony"
 
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:92
 msgid "Ukrainian"
 msgstr "Ukrai�ski"
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "Nowy"
+#: widgets/misc/e-charset-picker.c:95
+#, fuzzy
+msgid "Visual"
+msgstr "Unieaktywnij"
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Nieznany zestaw znak�w: %s"
 
-#: widgets/misc/e-charset-picker.c:201
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Podaj wykorzystywany zestaw znak�w"
 
-#: widgets/misc/e-charset-picker.c:276
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Inny..."
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Standard kodowania znak�w"
 
@@ -14144,25 +27690,23 @@ msgstr "Standard kodowania znak�w"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Edytor wyszukiwa�"
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Zapisz wyszukiwanie"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Dodaj do zapisanych wyszukiwa�"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Wyczy��"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Zapisz wyszukiwanie"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Wy�wietl wszystkie"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Dodaj do zapisanych wyszukiwa�"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -14185,11 +27729,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:334
-msgid "Sear_ch"
-msgstr "Wy_szukiwanie"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Znajd�"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Wyczy��"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Wyczy��"
+
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Znajd�"
 
@@ -14214,3 +27768,917 @@ msgstr "init_corba(): nie mo�na zainicjowa� GNOME"
 #: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
+
+#~ msgid "Card: "
+#~ msgstr "Karta: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Nazwa: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Przedrostek: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Imi�:       "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Dodatkowe:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Rodzina:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Przyrostek: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Data urodzenia: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Adres:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Skrzynka pocztowa: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  Rozszerzony: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ulica:       "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Miasto:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Region:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Kod pocztowy: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Kraj:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Etykieta pocztowa: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefony:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefon:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "E-mail:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "E-mail:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Strefa czasowa: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "Stanowisko s�u�bowe: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "Organizacja: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Nazwa: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Jednostka: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Jednostka2: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Jednostka3: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Jednostka4: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kategorie: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Komentarz: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Unikatowy napis: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Klucz publiczny: "
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Nawi�zywanie po��czenia z serwerem LDAP..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Oczekiwanie na po��czenie z serwerem LDAP..."
+
+#~ msgid "New _Contact"
+#~ msgstr "Nowy _kontakt"
+
+#~ msgid "New Contact _List"
+#~ msgstr "Nowa _lista kontakt�w"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Ustawienia ksi��ki adresowej"
+
+#~ msgid "Account Name"
+#~ msgstr "Nazwa konta"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Dodanie ksi��ki adresowej"
+
+#~ msgid "Server Name"
+#~ msgstr "Nazwa serwera"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "W celu dodania ksi��ki adresowej potrzebne s� poni�sze informacje."
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr ""
+#~ "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."
+#~ 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."
+
+#~ msgid ""
+#~ "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."
+
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr ""
+#~ "To jest nazwa serwera, na kt�rym zlokalizowana jest ksi��ka adresowa."
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "To jest numer portu, wykorzystywanego przez serwer LDAP."
+
+#~ 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:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Wy�wietlenie kontakt�w, odpowiadaj�cych nast�puj�cym kryteriom:"
+
+#~ msgid "_Message Recipients:"
+#~ msgstr "Odbiorcy _listu:"
+
+#~ msgid "B_usiness"
+#~ msgstr "Pra_ca"
+
+#~ msgid "Business _Fax"
+#~ msgstr "_Faks s�u�bowy"
+
+#~ msgid "_Business"
+#~ msgstr "_Praca"
+
+#~ msgid "_Home"
+#~ msgstr "_Dom"
+
+#~ 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"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Tworzy nowy termin"
+
+#~ msgid "Create a new task"
+#~ msgstr "Tworzy nowe zadanie"
+
+#~ msgid "New _Task"
+#~ msgstr "Nowe _zadanie"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Tworzenie nowych termin�w z domy�lnym p_rzypomnieniem"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "Pierwszy dzie� _tygodnia:"
+
+#~ 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"
+
+#~ msgid ""
+#~ "EMail: %s\n"
+#~ "Common Name: %s\n"
+#~ "Organization Unit: %s\n"
+#~ "Organization: %s\n"
+#~ "Locality: %s\n"
+#~ "State: %s\n"
+#~ "Country: %s"
+#~ msgstr ""
+#~ "E-mail: %s\n"
+#~ "Wsp�lna nazwa: %s\n"
+#~ "Jednostka organizacyjna: %s\n"
+#~ "Organizacja: %s\n"
+#~ "Narodowo��: %s\n"
+#~ "Stan: %s\n"
+#~ "Kraj: %s"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Podaj has�o NNTP dla %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Serwer odrzuci� nazw� u�ytkownika"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Wys�anie nazwy u�ytkownika do serwera nie powiod�o si�"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Serwer odrzuci� nazw� u�ytkownika/has�o"
+
+#~ msgid "Message %s not found."
+#~ msgstr "Nie odnaleziono listu %s."
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Nie mo�na pobra� z serwera listy grup."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Nie mo�na odczyta� pliku z list� grup dla %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Nie mo�na zapisa� pliku z list� grup dla %s: %s"
+
+#~ msgid "Could not open directory for news server: %s"
+#~ msgstr "Nie mo�na otworzy� katalogu serwera nowin: %s"
+
+#~ msgid "Unable to open or create .newsrc file for %s: %s"
+#~ msgstr "Nie mo�na otworzy� lub stworzy� pliku .newsrc dla %s: %s"
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Nie mo�na sprawdzi� nowych list�w na serwerze POP: %s"
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr "Nie mo�na otworzy� folderu: spis list�w by� niekompletny."
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Nie mo�na pobra� listu: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ 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."
+#~ msgstr ""
+#~ "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"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Nie mo�na nawi�za� po��czenia z serwerem: %s"
+
+#~ 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"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "Nie mo�na wys�a� listu: nie podano adresu nadawcy."
+
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "B��dna odpowied� na RCPT TO: %s: nie wys�ano poczty"
+
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "B��dna odpowied� na DATA: %s: nie wys�ano poczty"
+
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr "B��dna odpowied� na DATA: przerwanie listu: %s: nie wys�ano poczty"
+
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "B��dna odpowied� na QUIT: %s: mo�na kontynuowa�"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Podaj URI folderu"
+
+#~ msgid "Message was received"
+#~ msgstr "List zosta� otrzymany"
+
+#~ msgid "Message was sent"
+#~ msgstr "List zosta� wys�any"
+
+#~ msgid "on or before"
+#~ msgstr "w lub przed"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Folder przechowuj�cy poczt� (wewn�trzny)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Nie mo�na nawi�za� po��czenia z miejscem przechowywania: %s"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "Nowy _list"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Stw�rz vFolder na podstawie wyszukiwania"
+
+#~ 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"
+
+#~ msgid "Composer"
+#~ msgstr "Nowe listy"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Domy�lny spos�b \"przesy�ania\" list�w: "
+
+#~ 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..."
+
+#~ msgid "_Email Address:"
+#~ msgstr "Adres _e-mail:"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "_Dziennik komunikat�w o filtrowaniu:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organizacja:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Zapami�tanie has�a"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Domy�lne _wysy�anie list�w w formacie HTML."
+
+#~ msgid "_Server Type: "
+#~ msgstr "_Typ serwera:"
+
+#~ msgid "_Signature file:"
+#~ msgstr "Plik z p_odpisem:"
+
+#~ 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."
+
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Nie mo�na zainicjowa� komponentu zestawienia Evolution."
+
+#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#~ msgstr "<dd><b>Nie mo�na nawi�za� po��czenia z serwerem pogodowym</b></dd>"
+
+#~ msgid "�F"
+#~ msgstr "�F"
+
+#~ 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:"
+
+#~ msgid "_Display stations:"
+#~ msgstr "Wy�wi_etlane stacje:"
+
+#~ 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)"
+
+#~ msgid "New List"
+#~ msgstr "Nowa lista"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Konfiguruje ustawienia kalendarza"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Stw�rz nowe zdarzenie _ca�odniowe"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Stw�rz nowe _zadanie"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Stw�rz _nowy termin"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Tworzy nowe zdarzenie ca�odniowe"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Termin..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Ustawienia kalendarza..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Zadanie..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr ""
+#~ "Pozwala na stworzenie i modyfikacj� kont pocztowych oraz innych ustawie�"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_Ustawienia poczty..."
+
+#~ msgid "Forward _Attached"
+#~ msgstr "Prze�lij _za��czony"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "Prze�lij z_acytowany"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Zastosuj filtry"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Konfiguruje ustawienia widoku zadania"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Ustawienia zada�..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Zmienia ustawienia zestawienia"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "_Ustawienia zestawienia..."
+
+#~ msgid "Show All"
+#~ msgstr "Wy�wietl wszystkie"
+
+#~ msgid "Sear_ch"
+#~ msgstr "Wy_szukiwanie"
diff --git a/po/pt.po b/po/pt.po
index 42b66b4f65..852a497fb1 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: 2001-11-14 19:26-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -30,24 +30,25 @@ msgid "Imports VCard files into Evolution."
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:849
+#: addressbook/gui/widgets/e-addressbook-view.c:335
 #, fuzzy
 msgid "File As"
 msgstr "_Pasta"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 #, fuzzy
 msgid "Name"
 msgstr "Nome"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/gui/widgets/e-addressbook-view.c:337
 #, fuzzy
 msgid "Email"
 msgstr "Correio electr�nico 2"
 
 #: 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:1731
 msgid "Primary"
 msgstr "Prim�rio"
 
@@ -58,15 +59,16 @@ 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:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: 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
 msgid "Business"
 msgstr ""
 
@@ -77,12 +79,12 @@ msgid "Bus"
 msgstr "Ocupado"
 
 #: 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:1720
 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:1722
 msgid "Company"
 msgstr "Empresa"
 
@@ -93,13 +95,14 @@ msgstr "Copiar"
 
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: 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
 msgid "Home"
 msgstr "Casa"
 
 #: 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 "Organiza��o"
 
@@ -108,18 +111,20 @@ msgid "Org"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "Telem�vel"
 
 #: 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:1721
 msgid "Car"
 msgstr "Carro"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: 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:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr ""
 
@@ -128,13 +133,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: 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:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr ""
 
@@ -144,69 +149,68 @@ msgid "Bus 2"
 msgstr "Ocupado"
 
 #: 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:1724
 msgid "Home 2"
 msgstr "Casa 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:1726
+#: 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:1656
-#: addressbook/gui/contact-editor/e-contact-editor.c:1714
-#: mail/mail-config.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "Outro"
 
 #: 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:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: 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 ""
 
 #: 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:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Correio electr�nico 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 ""
 
@@ -215,7 +219,7 @@ msgid "Url"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:364
 #, fuzzy
 msgid "Department"
 msgstr "Data"
@@ -225,7 +229,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:365
 #, fuzzy
 msgid "Office"
 msgstr "Fora do escrit�rio"
@@ -236,13 +240,13 @@ msgid "Off"
 msgstr "Fora do escrit�rio"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:366
 #, fuzzy
 msgid "Title"
 msgstr "_Pasta"
 
 #: 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 ""
 
@@ -251,7 +255,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:368
 #, fuzzy
 msgid "Manager"
 msgstr "Bip"
@@ -266,7 +270,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:370
 #, fuzzy
 msgid "Nickname"
 msgstr "Nome"
@@ -277,13 +281,13 @@ msgid "Nick"
 msgstr "Nome"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:371
 #, fuzzy
 msgid "Spouse"
 msgstr "Fontes"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:372
 #, fuzzy
 msgid "Note"
 msgstr "Nenhuma"
@@ -298,7 +302,7 @@ msgid "CALUri"
 msgstr ""
 
 #: 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 ""
 
@@ -329,239 +333,16 @@ msgstr ""
 msgid "Family Name"
 msgstr "Nome completo:"
 
-#: addressbook/backend/ebook/e-card-simple.c:788
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, c-format
 msgid "%x"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3712
-#, fuzzy
-msgid "Card: "
-msgstr "Carro"
-
-#: addressbook/backend/ebook/e-card.c:3714
-#, fuzzy
-msgid ""
-"\n"
-"Name: "
-msgstr "Nome"
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3744
-#, fuzzy
-msgid ""
-"\n"
-"Address:"
-msgstr "Endere�o"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3804
-#, fuzzy
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr "Correio electr�nico 2"
-
-#: addressbook/backend/ebook/e-card.c:3807
-#, fuzzy
-msgid ""
-"\n"
-"E-mail:"
-msgstr "Correio electr�nico 2"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3879
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-
-#: 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 ""
@@ -569,90 +350,93 @@ msgstr ""
 #: 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:1130
-#: 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:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2215
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 #, fuzzy
 msgid "Searching..."
 msgstr "Ano"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 #, fuzzy
 msgid "Loading..."
 msgstr "Imprimir calend�rio"
 
 #. 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 "Erro a gravar os atalhos."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:475
-msgid "Connecting to LDAP server..."
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:485
-#, fuzzy
-msgid "Unable to connect to LDAP server."
-msgstr "Criar um novo calend�rio"
-
-#: addressbook/backend/pas/pas-backend-ldap.c:501
-msgid "Waiting for connection to LDAP server..."
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:870
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:971
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2160
-msgid "Receiving LDAP search results..."
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2165
-msgid "Restarting search."
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
+msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:294
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Erro a gravar os atalhos."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Criar um novo calend�rio"
+
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "Endere�o de correio:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:307
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1089
-#: calendar/conduits/calendar/calendar-conduit.c:981
-#: calendar/conduits/todo/todo-conduit.c:694
+#: 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 ""
 
-#: addressbook/conduit/address-conduit.c:1090
-#: calendar/conduits/calendar/calendar-conduit.c:982
-#: calendar/conduits/todo/todo-conduit.c:695
+#: addressbook/conduit/address-conduit.c:1355
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:890
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: 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 ""
 
@@ -669,374 +453,845 @@ 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 "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
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 #, fuzzy
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Atalho para _barra do Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 #, fuzzy
 msgid "Evolution component for handling contacts."
 msgstr "Uma pasta contendo contactos"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 #, 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:13
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#, 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
 #, fuzzy
 msgid "Factory for the sample Addressbook control"
 msgstr "Pressione aqui para o livro de endere�os"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 #, fuzzy
 msgid "Contacts"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 #, fuzzy
 msgid "Folder containing contact information"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor:"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "New Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:526
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "New _Contact"
+msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "New Contact List"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
-msgid "New Contact _List"
+msgid "Contact _List"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-config.c:186
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
 #, fuzzy
-msgid "Edit Addressbook"
+msgid "Could not initialize gnome-vfs"
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: 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"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:769
+msgid "Name begins with"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "Correio electr�nico 2"
+
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
-msgid "Account Name"
+msgid "Category is"
 msgstr "�cone_s pequenos"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: calendar/gui/cal-search-bar.c:49
 #, fuzzy
-msgid "Add Addressbook"
+msgid "Any field contains"
+msgstr "Uma pasta contendo tarefas"
+
+#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#, fuzzy
+msgid "Advanced..."
+msgstr "Adicionar..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
+msgstr "O URI que o navegador de pastas mostrar�"
+
+#: 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
+msgid "Primary Email"
+msgstr "Endere�o principal de correio electr�nico"
+
+#: addressbook/gui/component/e-address-popup.c:587
+#, fuzzy
+msgid "Select an Action"
+msgstr "Apagar um contacto"
+
+#: addressbook/gui/component/e-address-popup.c:593
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Criar um novo contacto"
+
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:891
+#, fuzzy
+msgid "Querying Addressbook..."
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/component/e-address-popup.c:1046
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Endere�o de correio:"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:364
+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"
+
+#: 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
+msgid "1:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+msgid "380"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Addressbook Sources"
 msgstr "Adicionar Fonte"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
 #, fuzzy
-msgid "Advanced"
-msgstr "Adicionar..."
+msgid "Always"
+msgstr "Alarmes"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
-msgid "Base"
-msgstr "Colar"
+msgid "Connecting"
+msgstr "Abrir ficheiro"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
-msgid "Basic"
-msgstr "Colar"
+msgid "DN Customization"
+msgstr "Nenhuma Informa��o"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "De_lete"
 msgstr "Apagar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Utilizador:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Email Address:"
 msgstr "Endere�o de correio:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "Encontrar"
+
+#: 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
+#, fuzzy
+msgid "LDAP Attribute"
+msgstr "Autentica��o"
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Configura��o do correio"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+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
+#, fuzzy
+msgid "Never"
+msgstr "Remover"
+
+#: 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 "_Objecto"
+
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: 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 "Apagar"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
-msgid "Search _base:"
+msgid "Re_store Defaults"
+msgstr "Apagar"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
 msgstr "Ano"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#. 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 "Search s_cope: "
+msgid "Searching"
 msgstr "Ano"
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
-msgid "Server Name"
-msgstr "_Items seleccionados"
+msgid "Select"
+msgstr "Reponder para todos"
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Apagar"
+
+#: 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 "Nenhuma Informa��o"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Abrir ficheiro"
+
+#: 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
 #, fuzzy
 msgid "Sub"
 msgstr "Do"
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "The information below is required in order to add an addressbook.  "
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "_Nova pasta"
+
+#: 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:17
-msgid "This information is not required for most ldap servers. "
+#: 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/addressbook-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:90
 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 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/addressbook-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"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/addressbook-config.glade.h:20
-msgid "This is the name of the server where your addressbook is located."
+#: 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/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
+#: addressbook/gui/component/ldap-config.glade.h:96
+msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"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/addressbook-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:102
 #, fuzzy
-msgid "_Account name:"
-msgstr "�cone_s pequenos"
+msgid "Using email address"
+msgstr "Endere�o de correio:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+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:90 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Add"
 msgstr "Adicionar"
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
-msgid "_Edit"
-msgstr "Editar..."
+msgid "_Add ->"
+msgstr "Adicionar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "_Ac��es"
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
-msgid "_Port:"
-msgstr "Prioridade:"
+msgid "_Add to DN"
+msgstr "_Ac��es"
 
-#: addressbook/gui/component/addressbook-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
-msgid "_Server name:"
-msgstr "Encontrar mensagens"
+msgid "_Always"
+msgstr "Alarmes"
 
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "N�o se consegui inicializar Bonobo"
+msgid "_Delete Mapping"
+msgstr "Apagar"
 
-#: addressbook/gui/component/addressbook-storage.c:167
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
-msgid "Other Contacts"
-msgstr "_Novo Contacto"
+msgid "_Display name:"
+msgstr "Dia"
 
-#: addressbook/gui/component/addressbook.c:468
-msgid "Unable to open addressbook"
-msgstr "Imposs�vel abrir o livro de endere�os"
+#: addressbook/gui/component/ldap-config.glade.h:111
+msgid "_Distinguished Name (DN):"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:477
-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"
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:482
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:490
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: 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
+#: 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
+#, fuzzy
+msgid "_Edit"
+msgstr "Editar..."
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Editar Compromisso"
+
+#: 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/addressbook.c:623
-#, c-format
-msgid "Enter password for %s (user %s)"
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:786
-#: calendar/gui/cal-search-bar.c:55
-#, fuzzy
-msgid "Any field contains"
-msgstr "Uma pasta contendo tarefas"
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:787
-msgid "Name contains"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:788
+#: addressbook/gui/component/ldap-config.glade.h:121
 #, fuzzy
-msgid "Email contains"
-msgstr "�cone_s pequenos"
+msgid "_More Options >>"
+msgstr "_Op��es"
 
-#: addressbook/gui/component/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/ldap-config.glade.h:122
 #, fuzzy
-msgid "Category is"
-msgstr "�cone_s pequenos"
+msgid "_Port number:"
+msgstr "Prioridade:"
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/ldap-config.glade.h:123
 #, fuzzy
-msgid "Advanced..."
-msgstr "Adicionar..."
-
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1031
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
-msgstr ""
+msgid "_Restore Defaults"
+msgstr "Apagar"
 
-#: addressbook/gui/component/addressbook.c:1071
-msgid "The URI that the Folder Browser will display"
-msgstr "O URI que o navegador de pastas mostrar�"
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "Ano"
 
-#.
-#. * 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
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
-msgid "(none)"
-msgstr "Nome"
+msgid "_Server name:"
+msgstr "Encontrar mensagens"
 
-#: 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:1686
-msgid "Primary Email"
-msgstr "Endere�o principal de correio electr�nico"
+#: addressbook/gui/component/ldap-config.glade.h:126
+msgid "_Timeout (minutes):"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
-msgid "Select an Action"
-msgstr "Apagar um contacto"
+msgid "account-druid"
+msgstr "�cone_s pequenos"
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, fuzzy, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Criar um novo contacto"
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "_Contacto"
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "_Come�ando"
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
-msgid "Querying Addressbook..."
-msgstr "Imposs�vel abrir o livro de endere�os"
+msgid "connecting-tab"
+msgstr "Abrir ficheiro"
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-#, fuzzy
-msgid "Add to Contacts"
-msgstr "_Novo Contacto"
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1046
-#, fuzzy
-msgid "Merge E-Mail Address"
-msgstr "Endere�o de correio:"
+#: addressbook/gui/component/ldap-config.glade.h:133
+msgid "general-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
+#: 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 "Ano"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr ""
@@ -1046,9 +1301,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: 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: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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Remover"
 
@@ -1082,7 +1337,12 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Encontrar um contacto"
+
+#: 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"
@@ -1092,7 +1352,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"
@@ -1100,1309 +1360,1373 @@ 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:1
 #, fuzzy
-msgid "C_ontaining:"
-msgstr "_Ac��es"
+msgid "Select Names"
+msgstr "_Items seleccionados"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
-msgid "Co_ntacts:"
-msgstr "_Contacto"
+msgid "Selected Contacts:"
+msgstr "Apagar um contacto"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "F_ind"
-msgstr "Encontrar"
+msgid "Show Contacts"
+msgstr "_Contacto"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-#, fuzzy
-msgid "Select Names"
-msgstr "_Items seleccionados"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
+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 "Sg"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 #, fuzzy
 msgid "_Folder:"
 msgstr "_Pasta"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-#, fuzzy
-msgid "_Message Recipients:"
-msgstr "Situa��o das mensagens"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "Anni_versary:"
-msgstr ""
+#, fuzzy
+msgid "A_ssistant's name:"
+msgstr "Utilizador:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "B_usiness"
-msgstr ""
+#, fuzzy
+msgid "Add_ress..."
+msgstr "Endere�o"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Business _Fax"
+msgid "Anni_versary:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#, fuzzy
+msgid "Birthda_y:"
+msgstr "Hora de �n_icio de encontro"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#, fuzzy
+msgid "C_ontacts..."
+msgstr "_Contacto"
+
+#: 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 ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 #, fuzzy
 msgid "Contact Editor"
 msgstr "_Contacto"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "D_epartment:"
+msgstr "Data"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "File A_s:"
 msgstr "_Pasta"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "General"
-msgstr ""
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#, fuzzy
+msgid "Full _Name..."
+msgstr "Nome completo:"
 
-#: 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"
 "of that information here."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "No_tes:"
 msgstr "_Nota"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "Organiza��o:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "Phone Types"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Wants to receive _HTML mail"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#, fuzzy
-msgid "_Address..."
-msgstr "Endere�o"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Assistant's name:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Birthday:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Business"
-msgstr ""
-
 #: 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
 #, fuzzy
-msgid "_Contacts..."
-msgstr "_Contacto"
+msgid "P_rofession:"
+msgstr "Propriedades do alarme"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: 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:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
-#, fuzzy
-msgid "_Delete"
-msgstr "Apagar"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Department:"
+msgid "Phone Types"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
-msgid "_Full Name..."
-msgstr "Nome completo:"
+msgid "S_pouse:"
+msgstr "Fontes"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#, fuzzy
-msgid "_Home"
-msgstr "Casa"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Job title:"
+msgid "This is the _mailing address"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "_Manager's Name:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "Wants to receive _HTML mail"
 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
 #, fuzzy
-msgid "_Mobile"
-msgstr "Telem�vel"
+msgid "_Delete"
+msgstr "Apagar"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Nickname:"
+msgid "_Job title:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "_Office:"
+msgid "_Manager's Name:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Profession:"
+msgid "_Nickname:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
+msgid "_Office:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "_Public Calendar URL:"
 msgstr "Novo Ca_lend�rio"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Spouse:"
-msgstr ""
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Web page address:"
 msgstr "Endere�o de correio:"
 
-#: 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:756
-#, fuzzy
-msgid "Category editor not available."
-msgstr "Nenhum sum�rio"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:763
-msgid "This contact belongs to these categories:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
-#, fuzzy, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Criar um novo calend�rio"
-
-#: 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
-#, fuzzy
-msgid "Edit Full"
-msgstr "_Pastas"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#, fuzzy
-msgid "Full Name"
-msgstr "Nome completo:"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
-#, fuzzy
-msgid "E-mail"
-msgstr "Correio electr�nico 2"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
 #, fuzzy
-msgid "list"
-msgstr "Pr�_ximo"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-#, fuzzy
-msgid "Address _2:"
-msgstr "Endere�o"
+msgid "United States"
+msgstr "Encontrar mensagens"
 
-#: 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 ""
 
-#: 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
 #, fuzzy
 msgid "Argentina"
 msgstr "Organiza��o"
 
-#: 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 ""
 
-#: 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
 #, fuzzy
 msgid "Belarus"
 msgstr "Ano"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:23
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: my-evolution/Locations.h:218
 #, fuzzy
 msgid "Belize"
 msgstr "Tamanho"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #, fuzzy
 msgid "Benin"
 msgstr "Enviar"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: my-evolution/Locations.h:294
 #, fuzzy
 msgid "Brazil"
 msgstr "_Correio"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: my-evolution/Locations.h:354
 #, fuzzy
 msgid "Canada"
 msgstr "Novo Ca_lend�rio"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:44
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 #, fuzzy
 msgid "Chad"
 msgstr "Carro"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-#, fuzzy
-msgid "Check Address"
-msgstr "Endere�o"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: my-evolution/Locations.h:438
 #, fuzzy
 msgid "Chile"
 msgstr "_Pasta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 #, fuzzy
 msgid "China"
 msgstr "Carro"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 #, fuzzy
 msgid "Comoros"
 msgstr "Cores"
 
-#: 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
 #, fuzzy
 msgid "Congo"
 msgstr "Copiar"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:56
-msgid "Countr_y:"
-msgstr ""
-
-#: 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/gui/contact-editor/fulladdr.glade.h:76
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: my-evolution/Locations.h:716
 #, fuzzy
 msgid "Finland"
 msgstr "Encontrar"
 
-#: 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
 #, fuzzy
 msgid "Germany"
 msgstr "Dia"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: my-evolution/Locations.h:846
 #, fuzzy
 msgid "Greece"
 msgstr "Semana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #, fuzzy
 msgid "Greenland"
 msgstr "Encontrar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #, fuzzy
 msgid "Grenada"
 msgstr "Novo Ca_lend�rio"
 
-#: 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
 #, fuzzy
 msgid "Guam"
 msgstr "am"
 
-#: 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/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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: my-evolution/Locations.h:888
 #, fuzzy
 msgid "Haiti"
 msgstr "_Correio"
 
-#: 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
 #, fuzzy
 msgid "Honduras"
 msgstr "Horas"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: my-evolution/Locations.h:966
 #, fuzzy
 msgid "Hungary"
 msgstr "Domingo"
 
-#: 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
 #, fuzzy
 msgid "Italy"
 msgstr "Hoje"
 
-#: 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
+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 ""
 
-#: 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
+#: my-evolution/Locations.h:1190
 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:1198
 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Liberia"
 msgstr "_Correio"
 
-#: 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:1234
 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:1268
 msgid "Luxembourg"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #, fuzzy
 msgid "Macau"
 msgstr "Ano"
 
-#: 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
 #, fuzzy
 msgid "Malawi"
 msgstr "_Correio"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #, fuzzy
 msgid "Mali"
 msgstr "_Correio"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
 #, fuzzy
 msgid "Malta"
 msgstr "_Correio"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 #, fuzzy
 msgid "Mauritius"
 msgstr "�cones _grandes"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 #, fuzzy
 msgid "Mayotte"
 msgstr "Segunda-feira"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1387
 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
+msgid "Moldova, Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 #, fuzzy
 msgid "Monaco"
 msgstr "Segunda-feira"
 
-#: 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:1470
 msgid "Morocco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 #, fuzzy
 msgid "Mozambique"
 msgstr "Telem�vel"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #, fuzzy
 msgid "Myanmar"
 msgstr "Bip"
 
-#: 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
 #, fuzzy
 msgid "Nepal"
 msgstr "Responder"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
 #, fuzzy
 msgid "Netherlands"
 msgstr "Reponder para todos"
 
-#: 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
 #, fuzzy
 msgid "New Caledonia"
 msgstr "_Contacto"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1560
 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:1562
 msgid "Nicaragua"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #, fuzzy
 msgid "Niger"
 msgstr "Cabe�alhos:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #, fuzzy
 msgid "Nigeria"
 msgstr "_Correio"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 #, fuzzy
 msgid "Niue"
 msgstr "Minuto"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: my-evolution/Locations.h:1574
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norway"
 msgstr "Novo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1632
 msgid "Oman"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
 #, fuzzy
 msgid "Pakistan"
 msgstr "Colar"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama"
 msgstr "Novo Ca_lend�rio"
 
-#: 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:1688
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Peru"
 msgstr "Bip"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr ""
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
 #, fuzzy
 msgid "Poland"
 msgstr "Encontrar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Portugal"
 msgstr "Prioridade"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1824
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Qatar"
 msgstr "Data"
 
-#: 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
 #, fuzzy
 msgid "Reunion"
 msgstr "Segundos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
 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/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #, fuzzy
 msgid "Rwanda"
 msgstr "Novo Ca_lend�rio"
 
-#: 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
 #, fuzzy
 msgid "Samoa"
 msgstr "Fontes"
 
-#: 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:2035
 msgid "Saudi Arabia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 #, fuzzy
 msgid "Senegal"
 msgstr "Enviar"
 
-#: 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:2090
 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:2103
 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:2104
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #, fuzzy
 msgid "Somalia"
 msgstr "F_ormato"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2119
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spain"
 msgstr "Enviar"
 
-#: 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
 #, fuzzy
 msgid "Sudan"
 msgstr "Dom"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
 #, fuzzy
 msgid "Suriname"
 msgstr "Nome"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #, fuzzy
 msgid "Swaziland"
 msgstr "Encontrar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
 #, fuzzy
 msgid "Sweden"
 msgstr "Enviar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2183
 msgid "Switzerland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
 msgid "Taiwan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #, fuzzy
 msgid "Tajikistan"
 msgstr "Lista de tarefas"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+msgid "Tanzania, United Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 #, fuzzy
 msgid "Thailand"
 msgstr "Encontrar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 #, fuzzy
 msgid "Togo"
 msgstr "Para:"
 
-#: 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
 #, fuzzy
 msgid "Tonga"
 msgstr "Hoje"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
 #, fuzzy
 msgid "Turkey"
 msgstr "Ter"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 #, fuzzy
 msgid "Uganda"
 msgstr "Novo Ca_lend�rio"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
 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:2342
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-#, fuzzy
-msgid "United States"
-msgstr "Encontrar mensagens"
-
-#: 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:2348
 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:2380
 msgid "Venezuela"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Viet Nam"
 msgstr "_Items seleccionados"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+msgid "Virgin Islands, British"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
 #, fuzzy
 msgid "Yemen"
 msgstr "Enviar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2524
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#, fuzzy
+msgid "Delete Contact?"
+msgstr "Apagar um contacto"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#, fuzzy
+msgid "Category editor not available."
+msgstr "Nenhum sum�rio"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+msgid "This contact belongs to these categories:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#, fuzzy
+msgid "Save Contact as VCard"
+msgstr "Gravar como VCard"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Criar um novo calend�rio"
+
+#: 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
+#, fuzzy
+msgid "Edit Full"
+msgstr "_Pastas"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+#, fuzzy
+msgid "Full Name"
+msgstr "Nome completo:"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#, fuzzy
+msgid "E-mail"
+msgstr "Correio electr�nico 2"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "Pr�_ximo"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#, fuzzy
+msgid "Address _2:"
+msgstr "Endere�o"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Check Address"
+msgstr "Endere�o"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 #, fuzzy
 msgid "_Address:"
 msgstr "Endere�o"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 #, fuzzy
 msgid "_City:"
 msgstr "Prioridade:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr ""
 
@@ -2506,11 +2830,16 @@ msgid "contact-list-editor"
 msgstr "_Contacto"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "_Contacto"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#, fuzzy
+msgid "Save List as VCard"
+msgstr "Gravar como VCard"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
@@ -2557,7 +2886,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:231
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Adicionar..."
@@ -2568,239 +2897,340 @@ msgstr "Adicionar..."
 msgid "Search"
 msgstr "Ano"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 #, fuzzy
 msgid "No cards"
 msgstr "_Come�ando"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 #, fuzzy
 msgid "1 card"
 msgstr "Imprimir calend�rio"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr " segundos"
 
-#: 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 "Gravar como VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: ui/evolution-message-composer.xml.h:13
-#, fuzzy
-msgid "Open"
-msgstr "_Abrir"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:734
-#: ui/evolution-addressbook.xml.h:10
-#, fuzzy
-msgid "Forward Contact"
-msgstr "Enviar esta mensagem"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-model.c:370
 #, fuzzy
-msgid "Send Message to Contact"
-msgstr "Enviar mensagem em formato HTML"
-
-#: 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 "Imprimir"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-#, fuzzy
-msgid "Print Envelope"
-msgstr "Imprimir..."
-
-#: 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 "Apagar"
+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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: 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:1043
 #, fuzzy
 msgid "Success"
 msgstr "Fontes"
 
-#: 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: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
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr ""
 
-#: 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:1071
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 #, fuzzy
 msgid "Card not found"
 msgstr "Ficheiro n�o encontrado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr ""
 
-#: 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:607 camel/camel-service.c:643
+#: 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
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 #, fuzzy
 msgid "Other error"
 msgstr "Outro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 #, fuzzy
 msgid "Error adding list"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 #, fuzzy
 msgid "Error adding card"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 #, fuzzy
 msgid "Error removing list"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #, fuzzy
 msgid "Error removing card"
 msgstr "Erro a gravar os atalhos."
 
-#. 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 ""
+#: addressbook/gui/widgets/e-addressbook-util.c:204
+#, fuzzy
+msgid "Display Cards?"
+msgstr "Dia"
 
-#. 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"
+#: addressbook/gui/widgets/e-addressbook-util.c:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "Dia"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "_Come�ando"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "_Come�ando"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "_Come�ando"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "_Come�ando"
+
+#: 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:338
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Prim�rio"
 
-#: 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:854
+#: 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:341
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 #, fuzzy
 msgid "Company Phone"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 #, fuzzy
 msgid "Home Phone"
 msgstr "Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 #, fuzzy
 msgid "Business Address"
 msgstr "Endere�o"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 #, fuzzy
 msgid "Home Address"
 msgstr "Endere�o"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "Telem�vel"
 
-#: 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:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 #, fuzzy
 msgid "Other Phone"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 #, fuzzy
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Gravar como VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "_Contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "_Contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "Ir para a _pasta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "Seg"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Adicionar Fonte"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Configura��o do co_rreio..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Enviar esta mensagem"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#, fuzzy
+msgid "Send Message to Contact"
+msgstr "Enviar mensagem em formato HTML"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+#, fuzzy
+msgid "Print Envelope"
+msgstr "Imprimir..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "Ir para a _pasta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "Ir para a _pasta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "Ano corrente (%Y)"
+
+#. 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:940
+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 ""
+
+#. 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
+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 ""
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -2815,20 +3245,44 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: 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
 #, fuzzy
 msgid "Card View"
 msgstr "Carro"
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+#, fuzzy
+msgid "Print envelope"
+msgstr "Imprimir..."
+
+#: addressbook/printing/e-contact-print.c:1115
+#, fuzzy
+msgid "Print cards"
+msgstr "Imprimir calend�rio"
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+#, fuzzy
+msgid "Print card"
+msgstr "Imprimir calend�rio"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr ""
@@ -2908,6 +3362,7 @@ msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr ""
 
@@ -2934,11 +3389,13 @@ msgid "Options"
 msgstr "_Op��es"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 #, fuzzy
 msgid "Orientation"
 msgstr "Organiza��o"
 
 #: addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1672
 #, fuzzy
 msgid "Page"
 msgstr "Bip"
@@ -2958,7 +3415,9 @@ msgstr "Bip"
 msgid "Paper source:"
 msgstr "Fontes de correio"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 #, fuzzy
 msgid "Portrait"
 msgstr "Prioridade"
@@ -3025,69 +3484,53 @@ msgstr ""
 msgid "_Font..."
 msgstr "Imprimir..."
 
-#: addressbook/printing/e-contact-print.c:1111
-#, fuzzy
-msgid "Print cards"
-msgstr "Imprimir calend�rio"
-
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-#, fuzzy
-msgid "Print card"
-msgstr "Imprimir calend�rio"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-#, fuzzy
-msgid "Print envelope"
-msgstr "Imprimir..."
-
-#: calendar/cal-util/cal-component.c:1202
+#: calendar/cal-util/cal-component.c:1207
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "_Editar Compromisso"
 
-#: 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:405 mail/message-list.c:651
+#: 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
 #, fuzzy
 msgid "High"
 msgstr "Cabe�alhos:"
 
-#: 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:650
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 #, fuzzy
 msgid "Normal"
 msgstr "F_ormato"
 
-#: 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:407 mail/message-list.c:649
+#: 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
 #, fuzzy
 msgid "Low"
 msgstr "Novo"
 
 #. 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
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:937
-#: calendar/conduits/todo/todo-conduit.c:649
+#: 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: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 ""
 
-#: calendar/conduits/todo/todo-conduit.c:756
-#: calendar/conduits/todo/todo-conduit.c:759
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "Prioridade:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -3101,48 +3544,62 @@ msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Prefer�ncias"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Calendar."
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, 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:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, 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:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, 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:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 #, 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:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 #, 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
+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 ""
@@ -3151,26 +3608,11 @@ 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"
@@ -3196,12 +3638,12 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "_Editar Compromisso"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:670
+#: calendar/gui/alarm-notify/alarm-queue.c:675
 #, fuzzy
 msgid "No description available."
 msgstr "Nenhum sum�rio"
 
-#: 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"
@@ -3209,18 +3651,30 @@ 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:2608
+#: widgets/misc/e-messagebox.c:159
+#, fuzzy
+msgid "Warning"
+msgstr "Seg"
+
+#: 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 "Enviar esta mensagem"
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "N�o se consegui inicializar Bonobo"
@@ -3234,52 +3688,69 @@ msgstr "Criar um novo calend�rio"
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/cal-search-bar.c:50
+#, fuzzy
+msgid "Summary contains"
+msgstr "�cone_s pequenos"
+
+#: calendar/gui/cal-search-bar.c:51
+#, fuzzy
+msgid "Description contains"
+msgstr "Nenhuma descri��o"
+
+#: calendar/gui/cal-search-bar.c:52
+#, fuzzy
+msgid "Comment contains"
+msgstr "Assunto"
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:384
 #, fuzzy
 msgid "Private"
 msgstr "Imprimir"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr ""
 
@@ -3302,34 +3773,29 @@ msgid "W"
 msgstr "Qa"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "Semana"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 #, 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:479 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 #, fuzzy
 msgid "Completed"
 msgstr "Cores"
@@ -3343,12 +3809,13 @@ 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/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/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
+#: 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 "Nenhuma"
 
@@ -3360,25 +3827,16 @@ msgstr ""
 msgid "Assigned"
 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:803
+#: 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
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 #, fuzzy
 msgid "No"
 msgstr "Novo"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1974 calendar/gui/e-day-view.c:1675
-#: calendar/gui/e-week-view.c:1182
-#, fuzzy
-msgid "Searching"
-msgstr "Ano"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 #, fuzzy
 msgid "Day View"
@@ -3399,74 +3857,84 @@ msgstr "Semana"
 msgid "Month View"
 msgstr "M�s"
 
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Summary contains"
-msgstr "�cone_s pequenos"
-
-#: calendar/gui/cal-search-bar.c:57
-#, fuzzy
-msgid "Description contains"
-msgstr "Nenhuma descri��o"
-
-#: calendar/gui/cal-search-bar.c:58
-#, fuzzy
-msgid "Comment contains"
-msgstr "Assunto"
-
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
-msgid "Unmatched"
-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
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 #, fuzzy
 msgid "Calendar"
 msgstr "Novo Ca_lend�rio"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 #, fuzzy
 msgid "Folder containing appointments and events"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 #, fuzzy
 msgid "Tasks"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:695
 #, fuzzy
-msgid "Create a new appointment"
-msgstr "Criar um novo compromisso para hoje"
+msgid "New meeting"
+msgstr "Seg"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
+#: calendar/gui/component-factory.c:695
 #, fuzzy
-msgid "New _Appointment"
-msgstr "Novo compromisso"
+msgid "_Meeting"
+msgstr "Seg"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
+#: calendar/gui/component-factory.c:699
 #, fuzzy
-msgid "Create a new task"
-msgstr "Criar um novo contacto"
+msgid "New task"
+msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:649
+#: calendar/gui/component-factory.c:699
 #, fuzzy
-msgid "New _Task"
+msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "Compromissos:"
+
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Criar um novo calend�rio"
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "O URI que o calend�rio mostrar�"
 
+#: 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 ""
@@ -3644,12 +4112,12 @@ msgstr "_Editar Compromisso"
 msgid "%s at the end of the appointment"
 msgstr "_Editar Compromisso"
 
-#: calendar/gui/dialogs/alarm-page.c:453
+#: calendar/gui/dialogs/alarm-page.c:452
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%s%s"
 
-#: calendar/gui/dialogs/alarm-page.c:459
+#: calendar/gui/dialogs/alarm-page.c:458
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3672,7 +4140,7 @@ msgstr "Enviar"
 
 #: 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.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "Sum�rio:"
@@ -3682,13 +4150,12 @@ msgstr "Sum�rio:"
 msgid "_Options..."
 msgstr "_Op��es"
 
-#. 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
 #, fuzzy
 msgid "after"
 msgstr "Data"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr ""
 
@@ -3708,7 +4175,7 @@ msgstr "_Editar Compromisso"
 msgid "hour(s)"
 msgstr "Horas"
 
-#: 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:189
 #, fuzzy
 msgid "minute(s)"
 msgstr "Minutos"
@@ -3758,195 +4225,186 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
-msgid "Create new appointments with a default _reminder"
-msgstr "Criar um novo compromisso para hoje"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
 msgid "Days"
 msgstr "5 Dias"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 #, fuzzy
 msgid "Friday"
 msgstr "Sex"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 #, fuzzy
 msgid "Saturday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #, fuzzy
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar 1 semana"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #, fuzzy
 msgid "Su_n"
 msgstr "Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "T_asks due today:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_hu"
 msgstr "Qui"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "T_ue"
 msgstr "Ter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "Lista de tarefas"
 
-#: 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
 #, fuzzy
 msgid "Thursday"
 msgstr "Hoje"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #, fuzzy
 msgid "Time"
 msgstr "_Pasta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #, fuzzy
 msgid "Time _zone:"
 msgstr "Nome completo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
-msgid "Time di_visions:"
-msgstr "Nenhuma descri��o"
-
-#: 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:31
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1122
 #, fuzzy
 msgid "Tuesday"
 msgstr "Hoje"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Work Week"
 msgstr "Semana"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #, fuzzy
 msgid "_12 hour (AM/PM)"
 msgstr "12 horas (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #, fuzzy
 msgid "_24 hour"
 msgstr "24 horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 #, fuzzy
 msgid "_Display"
 msgstr "Dia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "_End of day:"
 msgstr "Hora de �n_icio de encontro"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
 msgid "_Fri"
 msgstr "Sex"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Mon"
 msgstr "Seg"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#, fuzzy
-msgid "_Other"
-msgstr "Outro"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "_Overdue tasks:"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Sat"
 msgstr "S�b"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "_Show appointment end times in week and month views"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #, fuzzy
-msgid "_Task List"
-msgstr "Lista de tarefas"
+msgid "_Time divisions:"
+msgstr "Nenhuma descri��o"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Wed"
 msgstr "Qua"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "before the start of the appointment"
 msgstr "Novo compromisso"
@@ -4011,73 +4469,63 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid " to "
 msgstr "Ir para"
 
-#: 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: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/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:322
 #, fuzzy
 msgid "Could not update object!"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "_Editar Compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "_Entrada di�ria?"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Nenhum sum�rio"
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1897
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1904
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: 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 ""
+#: 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
+#, fuzzy
+msgid "Save as..."
+msgstr "Gravar como VCard"
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4138,7 +4586,7 @@ msgstr "Apagar"
 msgid "Enter Delegate"
 msgstr "Apagar"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 #, fuzzy
 msgid "Appointment"
 msgstr "Compromissos:"
@@ -4155,14 +4603,14 @@ 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:362
+#: calendar/gui/dialogs/event-editor.c:365
 #, 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:365
+#: calendar/gui/dialogs/event-editor.c:368
 #, fuzzy
 msgid "Meeting"
 msgstr "Seg"
@@ -4199,34 +4647,45 @@ msgid "F_ree"
 msgstr "Semana"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
+#, fuzzy
+msgid "L_ocation:"
+msgstr "_Ac��es"
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 #, fuzzy
 msgid "Pri_vate"
 msgstr "Activar"
 
-#: 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 ""
 
-#: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 #, fuzzy
 msgid "Show Time As"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:9
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "Sum�rio:"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:10
+#, fuzzy
+msgid "_Contacts..."
+msgstr "_Contacto"
+
+#: calendar/gui/dialogs/event-page.glade.h:14
 #, fuzzy
 msgid "_End time:"
 msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 #, fuzzy
 msgid "_Start time:"
 msgstr "Hora de �n_icio de encontro"
@@ -4255,61 +4714,54 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-#, fuzzy
-msgid "Click here to add an attendee"
-msgstr "Pressione aqui para o livro de endere�os"
+msgid "Common Name"
+msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr ""
+#, fuzzy
+msgid "Delegated From"
+msgstr "Apagar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
-msgid "Delegated From"
+msgid "Delegated To"
 msgstr "Apagar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
 #, fuzzy
-msgid "Delegated To"
-msgstr "Apagar"
+msgid "Language"
+msgstr "Bip"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-#, fuzzy
-msgid "Language"
-msgstr "Bip"
+msgid "Member"
+msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
+msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:798
 #: 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: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/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
 #, fuzzy
 msgid "Status"
 msgstr "S�b"
 
-#: 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -4325,7 +4777,7 @@ msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:445
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr ""
 
@@ -4333,31 +4785,103 @@ msgstr ""
 msgid "_Other Organizer"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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 "Pr�_ximo"
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "Enviar"
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "Sx"
+
+#: 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
+#, fuzzy
+msgid "th"
+msgstr "h"
+
+#: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 #, fuzzy
 msgid "on"
 msgstr "Seg"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "Pr�_ximo"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#, fuzzy
+msgid "second"
+msgstr " segundos"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Outro"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Hora"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "Pr�_ximo"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Outro Fax"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 #, fuzzy
 msgid "day"
 msgstr "Hoje"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 #, fuzzy
 msgid "on the"
 msgstr "M�s"
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-#, fuzzy
-msgid "th"
-msgstr "h"
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 #, fuzzy
 msgid "occurrences"
 msgstr "Apagar todas as ocurr�ncias"
@@ -4435,16 +4959,20 @@ msgstr "Semanas"
 msgid "year(s)"
 msgstr "Ano"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:56
+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
+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?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
@@ -4463,7 +4991,7 @@ msgid "Progress"
 msgstr "Propriedades do alarme"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr ""
 
@@ -4477,16 +5005,21 @@ msgstr "Prioridade:"
 msgid "_Status:"
 msgstr "S�b"
 
+#: calendar/gui/dialogs/task-editor.c:178
+#, 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:322
+#: calendar/gui/dialogs/task-editor.c:324
 #, fuzzy
 msgid "Assignment"
 msgstr "Compromissos:"
 
-#: 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.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:42
 #, fuzzy
 msgid "Description:"
 msgstr "Nenhuma descri��o"
@@ -4500,202 +5033,164 @@ msgstr "Hora de �n_icio de encontro"
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "100%"
-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:751 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:941 calendar/gui/e-day-view.c:3544
-#: calendar/gui/e-week-view.c:3422 mail/folder-browser.c:1447
-#: shell/e-shortcuts-view.c:384
+#: 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
 #, fuzzy
 msgid "_Open"
 msgstr "_Abrir"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:973
+#, 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-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
+#, fuzzy
+msgid "_Print..."
+msgstr "Imprimir..."
+
+#: calendar/gui/e-calendar-table.c:978 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:947 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3433 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:979 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
 #, fuzzy
 msgid "_Copy"
 msgstr "Copiar"
 
-#: calendar/gui/e-calendar-table.c:949 calendar/gui/e-day-view.c:3530
-#: calendar/gui/e-day-view.c:3557 calendar/gui/e-week-view.c:3409
-#: calendar/gui/e-week-view.c:3435 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:980 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
 #, fuzzy
 msgid "_Paste"
 msgstr "Colar"
 
-#: calendar/gui/e-calendar-table.c:954
-msgid "_Mark as Complete"
+#: calendar/gui/e-calendar-table.c:984
+msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:956
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
-msgid "_Delete this Task"
-msgstr "Apagar este item"
+msgid "_Forward as iCalendar"
+msgstr "Imprimir calend�rio"
 
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:986
+msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: calendar/gui/e-calendar-table.c:992
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Apagar este item"
 
-#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7115
-#: calendar/gui/e-week-view.c:3918
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Pressione aqui para o livro de endere�os"
 
-#. 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 ""
-
-#. 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 ""
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 #, fuzzy
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 #, fuzzy
 msgid "Complete"
 msgstr "Cores"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "End Date"
 msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 #, fuzzy
 msgid "Summary"
 msgstr "Sum�rio"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, fuzzy
 msgid "Task sort"
 msgstr "Lista de tarefas"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr ""
 
+#. 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 ""
+
+#. 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 ""
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -4703,407 +5198,182 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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 ""
 
 #. 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 ""
 
 #. 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
 msgid "am"
 msgstr "am"
 
 #. 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
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
-msgid "New All Day _Event"
-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:3549
 #, fuzzy
-msgid "Go to _Today"
-msgstr "Hoje"
-
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
-#, fuzzy
-msgid "_Go to Date..."
-msgstr "Ir para a _pasta..."
-
-#: calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-#, fuzzy
-msgid "_Delete this Appointment"
+msgid "New _Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
-#, fuzzy
-msgid "Make this Occurrence _Movable"
-msgstr "Apagar esta ocurr�ncia"
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
-#, fuzzy
-msgid "Delete this _Occurrence"
-msgstr "Apagar esta ocurr�ncia"
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
-#, fuzzy
-msgid "Delete _All Occurrences"
-msgstr "Apagar todas as ocurr�ncias"
-
-#: calendar/gui/e-itip-control.c:524
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Task begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:534
-#, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "Nenhuma Informa��o"
-
-#: calendar/gui/e-itip-control.c:538
-msgid "Begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:550
-#, fuzzy
-msgid "Meeting ends: <b>"
-msgstr "Hora de _fim de _encontro"
-
-#: calendar/gui/e-itip-control.c:553
-#, fuzzy
-msgid "Free/Busy info ends: <b>"
-msgstr "Nenhuma Informa��o"
-
-#: calendar/gui/e-itip-control.c:557
-msgid "Ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:571
-#, fuzzy
-msgid "Task Completed: <b>"
-msgstr "Cores"
-
-#: calendar/gui/e-itip-control.c:581
-msgid "Task Due: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
-#, fuzzy
-msgid "iCalendar Information"
-msgstr "Nenhuma Informa��o"
-
-#. Title
-#: calendar/gui/e-itip-control.c:633
-#, fuzzy
-msgid "iCalendar Error"
-msgstr "Novo Ca_lend�rio"
-
-#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
-msgid "An unknown person"
-msgstr ""
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:737
-msgid "<i>None</i>"
-msgstr ""
-
-#: 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
-#, fuzzy
-msgid "Choose an action:"
-msgstr "Apagar um contacto"
-
-#: calendar/gui/e-itip-control.c:779
-#, fuzzy
-msgid "Update"
-msgstr "Lista de tarefas"
-
-#: 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
-msgid "OK"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:795
-#, fuzzy
-msgid "Accept"
-msgstr "�cone_s pequenos"
-
-#: calendar/gui/e-itip-control.c:796
-msgid "Tentatively accept"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:797
-#, fuzzy
-msgid "Decline"
-msgstr "Receber"
-
-#: calendar/gui/e-itip-control.c:811
-#, fuzzy
-msgid "Send Free/Busy Information"
-msgstr "Nenhuma Informa��o"
-
-#: calendar/gui/e-itip-control.c:824
-msgid "Update respondent status"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:838
-#, fuzzy
-msgid "Send Latest Information"
-msgstr "Nenhuma Informa��o"
-
-#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:867
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:868
-#, fuzzy
-msgid "Meeting Information"
-msgstr "Nenhuma Informa��o"
-
-#: calendar/gui/e-itip-control.c:872
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:873
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 #, fuzzy
-msgid "Meeting Proposal"
+msgid "New Meeting"
 msgstr "Seg"
 
-#: calendar/gui/e-itip-control.c:877
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
 #, fuzzy
-msgid "Meeting Update"
-msgstr "Hora de _fim de _encontro"
+msgid "New Task"
+msgstr "_Tarefa"
 
-#: calendar/gui/e-itip-control.c:882
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr ""
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Imprimir..."
 
-#: calendar/gui/e-itip-control.c:883
+#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: ui/evolution-calendar.xml.h:10
 #, fuzzy
-msgid "Meeting Update Request"
-msgstr "Pedido de _encontro"
-
-#: calendar/gui/e-itip-control.c:887
-#, fuzzy, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "Nenhuma Informa��o"
+msgid "Go to _Today"
+msgstr "Hoje"
 
-#: calendar/gui/e-itip-control.c:888
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 #, fuzzy
-msgid "Meeting Reply"
-msgstr "Seg"
-
-#: calendar/gui/e-itip-control.c:892
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
+msgid "_Go to Date..."
+msgstr "Ir para a _pasta..."
 
-#: calendar/gui/e-itip-control.c:893
+#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: ui/evolution-calendar.xml.h:31
 #, fuzzy
-msgid "Meeting Cancellation"
-msgstr "Apagar um contacto"
-
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
-#: calendar/gui/e-itip-control.c:982
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
+msgid "_Publish Free/Busy Information"
+msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
 #, fuzzy
-msgid "Bad Meeting Message"
-msgstr "Mensagens enviadas"
-
-#: calendar/gui/e-itip-control.c:917
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr ""
+msgid "_Configure..."
+msgstr "Configura��o do correio"
 
-#: calendar/gui/e-itip-control.c:918
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
 #, fuzzy
-msgid "Task Information"
-msgstr "Nenhuma Informa��o"
-
-#: calendar/gui/e-itip-control.c:922
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr ""
+msgid "_Configure Pilot..."
+msgstr "Configura��o do correio"
 
-#: calendar/gui/e-itip-control.c:923
+#: 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
 #, fuzzy
-msgid "Task Proposal"
-msgstr "_Tarefa"
-
-#: calendar/gui/e-itip-control.c:927
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr ""
+msgid "_Save As..."
+msgstr "Gravar na _pasta..."
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 #, fuzzy
-msgid "Task Update"
-msgstr "Lista de tarefas"
-
-#: calendar/gui/e-itip-control.c:932
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr ""
+msgid "_Schedule Meeting..."
+msgstr "Fontes"
 
-#: calendar/gui/e-itip-control.c:933
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 #, fuzzy
-msgid "Task Update Request"
-msgstr "_Pedido de tarefa"
-
-#: calendar/gui/e-itip-control.c:937
-#, fuzzy, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "Nenhuma Informa��o"
+msgid "_Forward as iCalendar..."
+msgstr "Imprimir calend�rio"
 
-#: calendar/gui/e-itip-control.c:938
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 #, fuzzy
-msgid "Task Reply"
-msgstr "Responder"
-
-#: calendar/gui/e-itip-control.c:942
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:943
-msgid "Task Cancellation"
-msgstr ""
+msgid "Make this Occurrence _Movable"
+msgstr "Apagar esta ocurr�ncia"
 
-#: calendar/gui/e-itip-control.c:948
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 #, fuzzy
-msgid "Bad Task Message"
-msgstr "Novo Ca_lend�rio"
-
-#: calendar/gui/e-itip-control.c:967
-#, fuzzy, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "Nenhuma Informa��o"
+msgid "Delete this _Occurrence"
+msgstr "Apagar esta ocurr�ncia"
 
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 #, fuzzy
-msgid "Free/Busy Information"
-msgstr "Nenhuma Informa��o"
-
-#: calendar/gui/e-itip-control.c:972
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr ""
+msgid "Delete _All Occurrences"
+msgstr "Apagar todas as ocurr�ncias"
 
-#: calendar/gui/e-itip-control.c:973
-msgid "Free/Busy Request"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:977
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, fuzzy, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "Nenhuma Informa��o"
-
-#: calendar/gui/e-itip-control.c:978
-msgid "Free/Busy Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:983
-#, fuzzy
-msgid "Bad Free/Busy Message"
-msgstr "Encontrar mensagens"
-
-#: calendar/gui/e-itip-control.c:1052
-msgid "The message does not appear to be properly formed"
-msgstr ""
+msgid "Error executing %s."
+msgstr "Erro a gravar os atalhos."
 
-#: calendar/gui/e-itip-control.c:1071
-msgid "The message contains only unsupported requests."
+#: 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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1099 calendar/gui/e-itip-control.c:1105
-msgid "The attachment does not contain a valid calendar message"
+#: calendar/gui/e-itip-control.c:1564
+msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1130
-msgid "The attachment has no viewable calendar items"
+#: calendar/gui/e-itip-control.c:1566
+msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1231
-msgid "Update complete\n"
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1284
-msgid "Attendee status ould not be updated!\n"
+#: calendar/gui/e-itip-control.c:1638
+msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1288
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Cores"
 
-#: calendar/gui/e-itip-control.c:1348 calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data"
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "_Nova pasta"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "_Nova pasta"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -5147,219 +5417,221 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1535
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr ""
 
-#: 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:771
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 #, fuzzy
 msgid "Group"
 msgstr "Grupo %i"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 #, fuzzy
 msgid "Resource"
 msgstr "Fontes"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr ""
 
-#: 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:775
-#: calendar/gui/e-meeting-model.c:791
-#: 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 ""
-
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 #, fuzzy
 msgid "Chair"
 msgstr "Carro"
 
-#: 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:788
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 #, fuzzy
 msgid "Required Participant"
 msgstr "Pessoas _Necess�rias"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr ""
 
-#: 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:816
+#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 #, fuzzy
 msgid "Needs Action"
 msgstr "Remover grupo"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:818
+#: 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:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:819 calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 #, fuzzy
 msgid "Delegated"
 msgstr "Apagar"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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: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:2118 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 ""
 
 #. 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 ""
 
-#: calendar/gui/e-meeting-time-sel.c:428
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "Fora do escrit�rio"
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Op��es"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "Pessoas _Necess�rias"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:641
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "Hora de �n_icio de encontro"
 
-#: calendar/gui/e-meeting-time-sel.c:660
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrir ficheiro"
 
-#: calendar/gui/e-tasks.c:355
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Criar um novo calend�rio"
 
-#: 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 ""
 
-#: calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-tasks.c:543
+msgid "Completing tasks..."
+msgstr ""
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Apagar um contacto"
+
+#: calendar/gui/e-tasks.c:659
+#, fuzzy
+msgid "Expunging"
+msgstr "Cabe�alhos:"
+
+#: calendar/gui/e-week-view.c:3438
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Novo compromisso"
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/gnome-cal.c:1538
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Criar um novo calend�rio"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1865
+#: calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrir calend�rio"
@@ -5426,275 +5698,260 @@ msgstr "Outro"
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:220
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:570
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Criar um novo calend�rio"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr ""
 
-#: 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 "Do"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Sg"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Te"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Qa"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Qi"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Sx"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "S�"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Ano corrente (%Y)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "M�s corrente (%a %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Ano corrente (%Y)"
 
-#: calendar/gui/print.c:2205
-#, fuzzy
-msgid "Task"
-msgstr "_Tarefa"
-
-#: calendar/gui/print.c:2262
-#, fuzzy, c-format
-msgid "Status: %s"
-msgstr "S�b"
-
-#: calendar/gui/print.c:2280
-#, fuzzy, c-format
-msgid "Priority: %s"
-msgstr "Prioridade:"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr ""
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr ""
-
-#: calendar/gui/print.c:2320
-#, fuzzy, c-format
-msgid "Categories: %s"
-msgstr "�cone_s pequenos"
-
-#: calendar/gui/print.c:2331
-#, fuzzy
-msgid "Contacts: "
-msgstr "_Contacto"
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Imprimir calend�rio"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2358 my-evolution/e-summary.c:619
-#: 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Prever impress�o"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 #, fuzzy
 msgid "Print Item"
 msgstr "Imprimir este item"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 #, fuzzy
 msgid "Print Setup"
 msgstr "Imprimir..."
 
-#: 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 ""
+
+#: calendar/gui/tasks-control.c:147
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "O URI que o calend�rio mostrar�"
 
-#: calendar/gui/tasks-control-factory.c:75
+#: calendar/gui/tasks-control.c:456
 msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
+"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 ""
 
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Enviar esta mensagem"
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Imprimir calend�rio"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5727,130 +5984,1692 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/pcs/query.c:234
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+msgid "Imports iCalendar files into Evolution"
+msgstr ""
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+msgid "Imports vCalendar files into Evolution"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Novo Ca_lend�rio"
+
+#: calendar/importers/icalendar-importer.c:663
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "_Fechar Calend�rio"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:258
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:263
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:300
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:305
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:339
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:344
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:371
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:376
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:412
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:508
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:513
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:650
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:655
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:679
+#: 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:721
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: 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)"
 msgstr ""
 
-#: calendar/pcs/query.c:821
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:866
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:871
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1159
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
-#: camel/camel-cipher-context.c:171
+#.
+#. * 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
+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
+msgid "America/Adak"
+msgstr ""
+
+#: calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr ""
+
+#: calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr ""
+
+#: calendar/zones.h:62
+msgid "America/Antigua"
+msgstr ""
+
+#: calendar/zones.h:63
+msgid "America/Araguaina"
+msgstr ""
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr ""
+
+#: calendar/zones.h:66
+msgid "America/Barbados"
+msgstr ""
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: calendar/zones.h:68
+#, fuzzy
+msgid "America/Belize"
+msgstr "Tamanho"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+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
+msgid "America/Caracas"
+msgstr ""
+
+#: calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr ""
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+msgid "America/Cayman"
+msgstr ""
+
+#: calendar/zones.h:79
+msgid "America/Chicago"
+msgstr ""
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr ""
+
+#: calendar/zones.h:82
+msgid "America/Costa_Rica"
+msgstr ""
+
+#: calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr ""
+
+#: calendar/zones.h:84
+msgid "America/Curacao"
+msgstr ""
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+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
+msgid "America/Dominica"
+msgstr ""
+
+#: calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr ""
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+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
+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 "Novo Ca_lend�rio"
+
+#: calendar/zones.h:100
+msgid "America/Guadeloupe"
+msgstr ""
+
+#: calendar/zones.h:101
+msgid "America/Guatemala"
+msgstr ""
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+msgid "America/Guyana"
+msgstr ""
+
+#: calendar/zones.h:104
+msgid "America/Halifax"
+msgstr ""
+
+#: calendar/zones.h:105
+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
+msgid "America/Jamaica"
+msgstr ""
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+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
+msgid "America/La_Paz"
+msgstr ""
+
+#: calendar/zones.h:120
+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
+msgid "America/Maceio"
+msgstr ""
+
+#: calendar/zones.h:124
+msgid "America/Managua"
+msgstr ""
+
+#: calendar/zones.h:125
+msgid "America/Manaus"
+msgstr ""
+
+#: calendar/zones.h:126
+msgid "America/Martinique"
+msgstr ""
+
+#: calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr ""
+
+#: calendar/zones.h:128
+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
+msgid "America/Montreal"
+msgstr ""
+
+#: calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr ""
+
+#: calendar/zones.h:137
+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
+msgid "America/Nome"
+msgstr ""
+
+#: calendar/zones.h:141
+msgid "America/Noronha"
+msgstr ""
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+#, fuzzy
+msgid "America/Panama"
+msgstr "Novo Ca_lend�rio"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+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
+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
+msgid "America/Regina"
+msgstr ""
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+msgid "America/Rosario"
+msgstr ""
+
+#: calendar/zones.h:157
+msgid "America/Santiago"
+msgstr ""
+
+#: calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr ""
+
+#: calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr ""
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr ""
+
+#: calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr ""
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr ""
+
+#: calendar/zones.h:165
+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
+msgid "America/Tijuana"
+msgstr ""
+
+#: calendar/zones.h:172
+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
+msgid "America/Yakutat"
+msgstr ""
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: calendar/zones.h:178
+msgid "Antarctica/Casey"
+msgstr ""
+
+#: calendar/zones.h:179
+msgid "Antarctica/Davis"
+msgstr ""
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: calendar/zones.h:181
+msgid "Antarctica/Mawson"
+msgstr ""
+
+#: calendar/zones.h:182
+msgid "Antarctica/McMurdo"
+msgstr ""
+
+#: calendar/zones.h:183
+msgid "Antarctica/Palmer"
+msgstr ""
+
+#: calendar/zones.h:184
+msgid "Antarctica/South_Pole"
+msgstr ""
+
+#: calendar/zones.h:185
+msgid "Antarctica/Syowa"
+msgstr ""
+
+#: calendar/zones.h:186
+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
+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
+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
+msgid "Asia/Hong_Kong"
+msgstr ""
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+#: calendar/zones.h:216
+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
+msgid "Asia/Kuwait"
+msgstr ""
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr ""
+
+#: calendar/zones.h:232
+msgid "Asia/Muscat"
+msgstr ""
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: calendar/zones.h:235
+msgid "Asia/Omsk"
+msgstr ""
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+#, fuzzy
+msgid "Asia/Qatar"
+msgstr "Data"
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:247
+msgid "Asia/Singapore"
+msgstr ""
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+msgid "Atlantic/Bermuda"
+msgstr ""
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+msgid "Atlantic/Cape_Verde"
+msgstr ""
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+msgid "Australia/Adelaide"
+msgstr ""
+
+#: calendar/zones.h:274
+msgid "Australia/Brisbane"
+msgstr ""
+
+#: calendar/zones.h:275
+msgid "Australia/Broken_Hill"
+msgstr ""
+
+#: calendar/zones.h:276
+msgid "Australia/Darwin"
+msgstr ""
+
+#: calendar/zones.h:277
+msgid "Australia/Hobart"
+msgstr ""
+
+#: calendar/zones.h:278
+msgid "Australia/Lindeman"
+msgstr ""
+
+#: calendar/zones.h:279
+msgid "Australia/Lord_Howe"
+msgstr ""
+
+#: calendar/zones.h:280
+msgid "Australia/Melbourne"
+msgstr ""
+
+#: calendar/zones.h:281
+msgid "Australia/Perth"
+msgstr ""
+
+#: calendar/zones.h:282
+msgid "Australia/Sydney"
+msgstr ""
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:284
+msgid "Europe/Andorra"
+msgstr ""
+
+#: calendar/zones.h:285
+#, fuzzy
+msgid "Europe/Athens"
+msgstr "Propriedades do alarme"
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:296
+msgid "Europe/Gibraltar"
+msgstr ""
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:304
+msgid "Europe/Luxembourg"
+msgstr ""
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr ""
+
+#: calendar/zones.h:308
+#, fuzzy
+msgid "Europe/Monaco"
+msgstr "Segunda-feira"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr ""
+
+#: calendar/zones.h:312
+#, fuzzy
+msgid "Europe/Paris"
+msgstr "Propriedades do alarme"
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:317
+msgid "Europe/San_Marino"
+msgstr ""
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "Cores"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+msgid "Indian/Mahe"
+msgstr ""
+
+#: calendar/zones.h:341
+msgid "Indian/Maldives"
+msgstr ""
+
+#: calendar/zones.h:342
+#, fuzzy
+msgid "Indian/Mauritius"
+msgstr "�cones _grandes"
+
+#: calendar/zones.h:343
+#, fuzzy
+msgid "Indian/Mayotte"
+msgstr "Segunda-feira"
+
+#: calendar/zones.h:344
+#, fuzzy
+msgid "Indian/Reunion"
+msgstr "Segundos"
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
+#: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:211
+#: 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
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:294
+#: camel/camel-cipher-context.c:292
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:336
+#: camel/camel-cipher-context.c:334
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
+#: camel/camel-data-cache.c:169
+msgid "Unable to create cache path"
+msgstr ""
+
+#: camel/camel-data-cache.c:441
+#, fuzzy, c-format
+msgid "Could not remove cache entry: %s: %s"
+msgstr "Criar um novo calend�rio"
+
 #: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
@@ -5875,113 +7694,114 @@ msgstr ""
 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:710 camel/camel-filter-driver.c:719
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Sincronizar"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, 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
+#, fuzzy, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-filter-driver.c:887
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: camel/camel-filter-driver.c:688
-#, fuzzy, c-format
+#: camel/camel-filter-driver.c:911
+#, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 #, fuzzy
 msgid "Cannot open message"
 msgstr "Encontrar mensagens"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Sincronizar"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:921
-#, fuzzy, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Erro a gravar os atalhos."
-
-#: camel/camel-filter-driver.c:927
-#, fuzzy, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Erro a gravar os atalhos."
+#: camel/camel-filter-search.c:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "Anexar um ficheiro � mensagem"
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1040
-#, fuzzy, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Erro a gravar os atalhos."
-
-#: camel/camel-folder.c:1080
-#, fuzzy, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Erro a gravar os atalhos."
-
-#: camel/camel-folder.c:1262
-#, fuzzy
-msgid "Moving messages"
-msgstr "Erro a gravar os atalhos."
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr "Erro a gravar os atalhos."
 
-#: 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 ""
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
+#: camel/camel-folder.c:1038
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-folder.c:1078
+#, fuzzy, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-folder.c:1260
+#, fuzzy
+msgid "Moving messages"
+msgstr "Erro a gravar os atalhos."
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -6087,115 +7907,120 @@ msgstr ""
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
 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:628 camel/camel-pgp-context.c:802
 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: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:755
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:953
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:959
+#: 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:970
+#: 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:1143
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1153
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1160
+#: 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:1169
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1352
+#: camel/camel-pgp-context.c:1387
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-provider.c:130
+#: camel/camel-pgp-mime.c:354
+msgid "This is a digitally signed message part"
+msgstr ""
+
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 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:270
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Abrir calend�rio"
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
+#: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -6294,12 +8119,12 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
+msgid "Login"
 msgstr ""
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
@@ -6311,9 +8136,19 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Autentica��o"
 
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+#: camel/camel-sasl-ntlm.c:33
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+
 #: 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
+#: 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"
@@ -6359,26 +8194,39 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:611
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:638
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:663
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:665
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Abrir ficheiro"
+
+#: camel/camel-service.c:787
+msgid "Host lookup failed: host not found"
+msgstr ""
+
+#: camel/camel-service.c:790
+msgid "Host lookup failed: unknown reason"
+msgstr ""
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
@@ -6387,12 +8235,12 @@ msgstr ""
 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 ""
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6437,25 +8285,24 @@ msgstr "Anexar um ficheiro � mensagem"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
 msgstr "Assunto"
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:428
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6465,16 +8312,34 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: 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:491
 #, 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"
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
 msgstr ""
 
 #: camel/camel-url.c:288
@@ -6487,27 +8352,27 @@ msgstr "Criar um novo calend�rio"
 msgid "No such message %s in %s"
 msgstr "Enviar a mensagem"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Enviar a mensagem"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "N�o consigo abrir a localiza��o: %s"
@@ -6516,78 +8381,78 @@ msgstr "N�o consigo abrir a localiza��o: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Enviar uma nova mensagem"
 
-#: camel/providers/imap/camel-imap-folder.c:1566
-#: camel/providers/imap/camel-imap-folder.c:1978
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1717
-#: camel/providers/imap/camel-imap-folder.c:1798
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1723
+#: camel/providers/imap/camel-imap-folder.c:1799
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Encontrar mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:2015
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, fuzzy, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Criar um novo calend�rio"
 
-#: 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 "Anexar um ficheiro � mensagem"
@@ -6602,7 +8467,7 @@ msgstr "Verificar novo correio"
 msgid "Check for new messages in all folders"
 msgstr "Verificar novo correio"
 
-#: 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 "_Pastas"
 
@@ -6635,28 +8500,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentica��o"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6664,103 +8529,122 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Enviar a mensagem"
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:64
 #, fuzzy
 msgid "Local delivery"
 msgstr "_Pastas"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, 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 ""
 
-#: 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:197
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: 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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: 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 "Criar um novo calend�rio"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -6781,7 +8665,7 @@ msgstr ""
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6791,7 +8675,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 #, fuzzy
 msgid "No such message"
 msgstr "Enviar a mensagem"
@@ -6801,7 +8685,7 @@ msgstr "Enviar a mensagem"
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -6809,14 +8693,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -6824,41 +8708,65 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: 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:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Criar um novo calend�rio"
 
-#: 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
 #, fuzzy, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Verificar novo correio"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+#, fuzzy
+msgid "Storing folder"
+msgstr "Sincronizar"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "N�o consigo abrir a localiza��o: %s"
@@ -6876,9 +8784,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6886,134 +8794,122 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#: 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"
 "%s"
 msgstr ""
 
-#: 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 ""
 
-#. 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 "Sincronizar"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, 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:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:648
+#: camel/providers/local/camel-mbox-summary.c:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, 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: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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
@@ -7033,12 +8929,12 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, 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:512
+#: 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"
@@ -7049,6 +8945,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
@@ -7058,76 +8955,55 @@ msgstr ""
 msgid "Spool mail file %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: 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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: 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/nntp/camel-nntp-auth.c:44
+#: camel/providers/local/camel-spoold-store.c:117
 #, c-format
-msgid "Please enter the NNTP password for %s@%s"
+msgid "Store `%s' does not exist or is not a directory"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/local/camel-spoold-store.c:173
 #, fuzzy, c-format
-msgid "Message %s not found."
-msgstr "Ficheiro n�o encontrado"
-
-#: 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
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
+msgid "Mail tree %s"
+msgstr "Fontes de correio"
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
@@ -7137,165 +9013,198 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:495
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Enviar a mensagem"
+
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "Criar uma nova mensagem"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr ""
+
+#: 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 "Encontrar mensagens"
+
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
+msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/nntp/camel-nntp-summary.c:566
+msgid "Use cancel"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "Abrir calend�rio"
+
+#: camel/providers/pop3/camel-pop3-folder.c:272
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Encontrar mensagens"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, fuzzy, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "Criar uma nova mensagem"
+#: 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 "Abrir calend�rio"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr ""
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Criar um novo calend�rio"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, fuzzy, c-format
-msgid "Could not fetch message: %s"
-msgstr "Criar uma nova mensagem"
-
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr ""
-
-#: 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 ""
 
-#: 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
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Enviar esta mensagem"
 
-#: 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 "Criar uma nova mensagem"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Imposs�vel abrir o livro de endere�os"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 #, fuzzy
 msgid "Message storage"
 msgstr "Situa��o das mensagens"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 #, fuzzy
 msgid "Leave messages on server"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:43
 #, fuzzy, c-format
 msgid "Delete after %s day(s)"
 msgstr "Apagar este item"
 
-#: 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:84
 msgid "POP"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, 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:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
+#: camel/providers/pop3/camel-pop3-store.c:210
+msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Autentica��o"
+
+#: camel/providers/pop3/camel-pop3-store.c:348
 #, fuzzy, c-format
-msgid "Could not connect to server: %s"
+msgid "Could not connect to POP server on %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:360
+#: camel/providers/pop3/camel-pop3-store.c:405
 #, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
+msgid "SASL `%s' Login failed: %s"
 msgstr ""
 
-#: 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:416
+msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:381
-#: camel/providers/pop3/camel-pop3-store.c:418
-msgid "(Unknown)"
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, c-format
+msgid "I/O Error: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, c-format
+msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:566
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr ""
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Sendmail"
 msgstr "Enviar"
@@ -7306,50 +9215,50 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "Criar um novo calend�rio"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: 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 ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:149
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, fuzzy, c-format
 msgid "Could not send message: %s"
 msgstr "Criar uma nova mensagem"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-#, fuzzy
-msgid "Could not find 'From' address in message"
-msgstr "Criar uma nova mensagem"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:204
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:248
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: 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 ""
 
@@ -7357,126 +9266,145 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: 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:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: 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:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 #, fuzzy
 msgid "Help message"
 msgstr "Encontrar mensagens"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 #, fuzzy
 msgid "Service ready"
 msgstr "Servidor:"
 
-#: 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:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: 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: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: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:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: 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: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: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: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: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:205
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: 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:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr ""
 
-#: 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:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:222
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autentica��o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:224
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autentica��o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:376
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+msgid "server does not appear to support SSL"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+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:415
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7484,129 +9412,127 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 #, fuzzy
 msgid "Sending message"
 msgstr "Mensagens enviadas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+msgid "Cannot send message: one or more invalid recipients"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentica��o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: 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:1081
+msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
+#. 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
+msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1030
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+msgid "QUIT response error"
 msgstr ""
 
 #: composer/e-msg-composer-attachment-bar.c:101
@@ -7634,20 +9560,20 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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
 #, fuzzy
 msgid "attachment"
 msgstr "Anexo"
 
-#: 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 "Remover items seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:531
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "Anexar um ficheiro � mensagem"
 
@@ -7677,18 +9603,18 @@ msgid "MIME type:"
 msgstr ""
 
 #: 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:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Pressione aqui para o livro de endere�os"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 #, fuzzy
 msgid "From:"
 msgstr "De"
@@ -7696,7 +9622,7 @@ msgstr "De"
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Responder"
@@ -7704,31 +9630,31 @@ msgstr "Responder"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Introduza os receptores da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:397
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7736,141 +9662,131 @@ msgstr ""
 "Entre os endere�os que ir�o receber uma c�pia da mensagem sem conhecimento "
 "do receptor"
 
-#: 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 "Anexar um ficheiro"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:718
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:894
-#, fuzzy
-msgid "Save as..."
-msgstr "Gravar como VCard"
-
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:967
 #, fuzzy
 msgid "Warning!"
 msgstr "Seg"
 
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:993
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1019
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:1077
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1091
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1100
+#: composer/e-msg-composer.c:1074
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:1202
+#: composer/e-msg-composer.c:1176
 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:1356
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1363
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Enviar esta mensagem"
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1535
+#: composer/e-msg-composer.c:1513
 #, fuzzy
 msgid "Insert File"
 msgstr "_Inserir"
 
-#: composer/e-msg-composer.c:1910 composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Criar uma nova mensagem"
 
-#: composer/e-msg-composer.c:2368
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2391 composer/e-msg-composer.c:2446
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: 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:1
 #, fuzzy
 msgid "The Evolution groupware suite"
 msgstr "Atalho para _barra do Evolution"
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Evolution"
+
 #: data/evolution.keys.in.h:1
 #, fuzzy
 msgid "address card"
@@ -7921,15 +9837,31 @@ msgstr "Assunto"
 msgid "Subject does not contain"
 msgstr "Assunto"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
 #. Remember the password?
-#: e-util/e-passwords.c:347 mail/mail-session.c:267
+#: 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:268
+#: 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 ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "�cone_s pequenos"
+
 #. 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
@@ -8001,13 +9933,13 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
@@ -8056,12 +9988,7 @@ msgstr "Hora"
 msgid "minute"
 msgstr "Minuto"
 
-#: filter/filter-datespec.c:86
-#, fuzzy
-msgid "second"
-msgstr " segundos"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 #, fuzzy
 msgid "seconds"
 msgstr " segundos"
@@ -8130,7 +10057,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr ""
 
@@ -8143,36 +10070,28 @@ msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 #, fuzzy
 msgid "Then"
 msgstr "Qi"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 #, fuzzy
 msgid "Add action"
 msgstr "_Ac��es"
 
-#: 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."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:364
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 #, fuzzy
 msgid "Select Folder"
 msgstr "_Nova pasta"
 
-#: filter/filter-folder.c:267
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:314
-msgid "<click here to select a folder>"
-msgstr ""
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -8180,7 +10099,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr ""
 
@@ -8188,41 +10107,41 @@ msgstr ""
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 #, fuzzy
 msgid "Rule name: "
 msgstr "Nome completo:"
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 #, fuzzy
 msgid "Untitled"
 msgstr "(Sem t�tulo)"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+msgid "if any criterion are met"
 msgstr ""
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr ""
 
@@ -8269,6 +10188,12 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Adicionar Fonte"
+
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr ""
@@ -8282,6 +10207,11 @@ msgstr ""
 msgid "Attachments"
 msgstr "Anexo"
 
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Tamanho"
+
 #: filter/libfilter-i18n.h:7
 #, fuzzy
 msgid "contains"
@@ -8343,157 +10273,164 @@ msgstr ""
 
 #: filter/libfilter-i18n.h:21
 #, fuzzy
+msgid "Execute Shell Command"
+msgstr "Sum�rio executivo"
+
+#: filter/libfilter-i18n.h:22
+#, fuzzy
 msgid "Exist"
 msgstr "Pr�_ximo"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "Data"
+
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:34
+msgid "is not Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:36
 #, fuzzy
 msgid "Message Body"
 msgstr "Situa��o das mensagens"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Message Header"
 msgstr "Situa��o das mensagens"
 
-#: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-#, fuzzy
-msgid "Message was sent"
-msgstr "Situa��o das mensagens"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:38
 #, fuzzy
 msgid "Move to Folder"
 msgstr "Ir para a _pasta..."
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr ""
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "Esquecer _Senhas"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Read"
 msgstr "Remover"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "Replied to"
 msgstr "Reponder para todos"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 #, fuzzy
 msgid "Score"
 msgstr "Fontes"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1404
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 #, fuzzy
 msgid "Sender"
 msgstr "Enviar"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 #, fuzzy
 msgid "Set Status"
 msgstr "Situa��o online"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Tamanho"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 #, fuzzy
 msgid "Source Account"
 msgstr "�cone_s pequenos"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Assunto"
 
-#: filter/libfilter-i18n.h:52
-msgid "was after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:53
-msgid "was before"
-msgstr ""
-
 #: filter/rule-editor.c:179
 #, fuzzy
 msgid "Rules"
 msgstr "Adicionar Fonte"
 
-#: filter/rule-editor.c:278
+#: filter/rule-editor.c:286
 #, fuzzy
 msgid "Add Rule"
 msgstr "Adicionar Fonte"
 
-#: filter/rule-editor.c:344
+#: filter/rule-editor.c:361
 #, fuzzy
 msgid "Edit Rule"
 msgstr "Adicionar Fonte"
@@ -8516,31 +10453,31 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "Importing..."
 msgstr "Seg"
 
-#: 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 ""
 
-#: 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
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr "Seg"
 
-#: 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
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Sincronizar"
 
-#: 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:101
 #, fuzzy
 msgid "Mail"
 msgstr "_Correio"
@@ -8566,24 +10503,76 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Prioridade:"
+
+#: 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 ""
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+#, fuzzy
+msgid "Trash"
+msgstr "_Tarefa"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Sincronizar"
+
+#: 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:963
+#: importers/netscape-importer.c:2126
 #, fuzzy
 msgid "Settings"
 msgstr "Segundos"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "_Pasta"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8605,53 +10594,105 @@ msgid "Pine"
 msgstr "Imprimir"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Prefer�ncias"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 #, fuzzy
 msgid "Evolution mail composer."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 #, fuzzy
 msgid "Evolution mail executive summary component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 #, fuzzy
 msgid "Evolution mail folder display component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 #, fuzzy
 msgid "Evolution mail folder factory component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the Evolution composer."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the Mail Summary component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Prefer�ncias"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "�cone_s pequenos"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Prefer�ncias"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 #, fuzzy
 msgid "Mail configuration interface"
 msgstr "Configura��o do correio"
 
-#: mail/component-factory.c:100
+#: 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:101
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr ""
-
 #: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
@@ -8662,255 +10703,270 @@ msgstr "_Pastas"
 msgid "Virtual Trash folder"
 msgstr "_Pastas"
 
-#: mail/component-factory.c:129
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Criar um novo calend�rio"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "This folder cannot contain messages."
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 #, fuzzy
 msgid "Properties..."
 msgstr "Propriedades do alarme"
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Propriedades"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/component-factory.c:967
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mensagem de _correio"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 #, fuzzy
-msgid "New _Mail Message"
+msgid "_Mail Message"
 msgstr "Mensagem de _correio"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1009
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Ano"
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:271
+#: mail/folder-browser-ui.c:342
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriedades do alarme"
 
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:344
 #, fuzzy
 msgid "Properties"
 msgstr "Propriedades do alarme"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Apagar"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr " segundos"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1049
+#: mail/folder-browser.c:1088
 #, fuzzy
-msgid "Create vFolder from Search"
+msgid "Create _Virtual Folder From Search..."
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Assunto"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Situa��o das mensagens"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Encontrar mensagens"
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:104
-#, fuzzy
-msgid "_Save As..."
-msgstr "Gravar na _pasta..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 #, fuzzy
 msgid "_Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Cores"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Carro"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1466
+#: mail/folder-browser.c:1636
 #, fuzzy
-msgid "_Move to Folder..."
+msgid "U_ndelete"
+msgstr "Apagar"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:106
-#, fuzzy
-msgid "_Undelete"
-msgstr "Apagar"
+#: mail/folder-browser.c:1645
+msgid "Label"
+msgstr ""
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1649
 #, fuzzy
-msgid "Add Sender to Address Book"
+msgid "Add Sender to Address_book"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
-msgstr ""
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
+msgstr "Dru�da dos _filtros"
 
-#: mail/folder-browser.c:1478
+#: mail/folder-browser.c:1657
 #, fuzzy
-msgid "Create Ru_le From Message"
+msgid "Crea_te Rule From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1936
 #, fuzzy
-msgid "VFolder on Mailing List"
+msgid "VFolder on M_ailing List"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr ""
-
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
-msgstr ""
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "Uma pasta contendo items de correio"
 
-#: mail/folder-browser.h:26
-#, fuzzy
-msgid "Default"
-msgstr "Apagar"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "Uma pasta contendo items de correio"
 
 #: mail/folder-info.c:64
 #, fuzzy
@@ -8935,47 +10991,37 @@ msgstr ""
 
 #: mail/local-config.glade.h:1
 #, fuzzy
-msgid "Body contents"
-msgstr "_Ac��es"
-
-#: mail/local-config.glade.h:2
-#, fuzzy
 msgid "Current store format:"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/local-config.glade.h:3
-#, fuzzy
-msgid "Indexing:"
-msgstr "�nd_ice de ajuda"
-
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:2
 #, fuzzy
-msgid "Mailbox Format"
-msgstr "F_ormato"
+msgid "Index body contents"
+msgstr "_Ac��es"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 #, fuzzy
 msgid "New store format:"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: 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"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 #, fuzzy
 msgid "maildir"
 msgstr "Correio electr�nico 2"
 
-#: mail/local-config.glade.h:10
+#: mail/local-config.glade.h:8
 #, fuzzy
 msgid "mbox"
 msgstr "Correio novo"
 
-#: mail/local-config.glade.h:11
+#: mail/local-config.glade.h:9
 #, fuzzy
 msgid "mh"
 msgstr "h"
@@ -8996,89 +11042,82 @@ msgstr "Atalho para _barra do Evolution"
 msgid "Evolution Account Editor"
 msgstr "Atalho para _barra do Evolution"
 
-#: mail/mail-account-gui.c:962
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
 #, fuzzy
-msgid "Could not save signature file."
-msgstr "N�o se consegui inicializar Bonobo"
+msgid "_Host:"
+msgstr "Horas"
 
-#: mail/mail-account-gui.c:1039
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
 #, fuzzy
-msgid "Save signature"
-msgstr "Ficheiro com assinatura:"
-
-#: 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 ""
-
-#: mail/mail-account-gui.c:1654
-msgid "You may not create two accounts with the same name."
-msgstr ""
+msgid "User_name:"
+msgstr "Utilizador:"
 
-#: mail/mail-accounts.c:149
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
 #, fuzzy
-msgid " (default)"
-msgstr "Apagar"
+msgid "_Path:"
+msgstr "Caminho"
 
-#: mail/mail-accounts.c:194
+#: 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 "Disable"
-msgstr "Como _Tabela"
+msgid "Random"
+msgstr "Novo Ca_lend�rio"
 
-#: mail/mail-accounts.c:196
-msgid "Enable"
+#: 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
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:216
 #, fuzzy
 msgid "Don't delete"
 msgstr "Apagar"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
-msgid "Are you sure you want to delete this news account?"
-msgstr ""
-
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:783 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
 #, fuzzy
-msgid "Mail Settings"
-msgstr "Configura��o do co_rreio..."
+msgid "Disable"
+msgstr "Como _Tabela"
 
-#: mail/mail-autofilter.c:72
-#, fuzzy, c-format
-msgid "Mail to %s"
-msgstr "Fontes de correio"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr ""
 
-#: mail/mail-autofilter.c:215
-#, fuzzy, c-format
-msgid "Subject is %s"
-msgstr "Assunto"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr ""
 
-#: mail/mail-autofilter.c:231
-#, c-format
-msgid "Mail from %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
 msgstr ""
 
-#: mail/mail-autofilter.c:287
-#, c-format
-msgid "%s mailing list"
+#: mail/mail-accounts.c:732 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
+msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -9086,127 +11125,135 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: 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:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:280
+#: mail/mail-callbacks.c:209
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Enviar"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 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:299
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 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:469
-msgid "This message contains invalid recipients:"
-msgstr ""
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:600
+#: mail/mail-callbacks.c:497
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:838
+#: mail/mail-callbacks.c:623
+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
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 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:1435 mail/message-browser.c:133
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Criar uma nova mensagem"
 
-#: mail/mail-callbacks.c:1753
+#: mail/mail-callbacks.c:2091
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1778
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1831
+#: mail/mail-callbacks.c:2169
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1857
+#: mail/mail-callbacks.c:2195
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Situa��o das mensagens"
 
-#: mail/mail-callbacks.c:1951
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2122 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2366
 #, fuzzy
-msgid "Warning"
-msgstr "Seg"
+msgid "Go to next folder with unread messages?"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: mail/mail-callbacks.c:2373
+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:2129
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -9214,33 +11261,37 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2136
-#, fuzzy
-msgid "Do not ask me again."
-msgstr "Enviar esta mensagem"
-
-#: mail/mail-callbacks.c:2244
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2256
+#: mail/mail-callbacks.c:2740
 #, fuzzy
 msgid "Filters"
 msgstr "_Pasta"
 
-#: mail/mail-callbacks.c:2319
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Enviar esta mensagem"
+
+#: mail/mail-callbacks.c:2836
 #, fuzzy
 msgid "Print Message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2863
+msgid "US-Letter"
+msgstr ""
+
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -9282,17 +11333,35 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Atalho para _barra do Evolution"
 
-#: mail/mail-config.c:326
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "�cone_s pequenos"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Seg"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Para:"
+
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "Data"
 
-#: mail/mail-config.c:1859
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -9300,96 +11369,154 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, fuzzy, c-format
-msgid "%s: Inbox"
-msgstr "Correio novo"
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2183 mail/mail-config.c:2187
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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 " _Check for supported types "
+msgid " "
 msgstr ""
 
 #: mail/mail-config.glade.h:2
 #, fuzzy
-msgid " color"
-msgstr "Cores"
+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 ""
+
+#: mail/mail-config.glade.h:5
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:8
 #, fuzzy
-msgid "Account"
+msgid "Account Editor"
 msgstr "�cone_s pequenos"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Accounts"
-msgstr "�cone_s pequenos"
+msgid "Advanced Options"
+msgstr "Encontrar avan�ado"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:12
+msgid "Afrikaans"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:13
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: 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
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Anexar um ficheiro � mensagem"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Authentication"
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
 #, fuzzy
-msgid "Checking for New Mail"
+msgid "Automatically _detect links"
 msgstr "Verificar novo correio"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+msgid "C_haracter set:"
+msgstr ""
+
+#: mail/mail-config.glade.h:27
 #, fuzzy
-msgid "Composer"
+msgid "C_olors"
 msgstr "Cores"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:28
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "Verificar novo correio"
+
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Composing Messages"
+msgstr "Criar uma nova mensagem"
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Configuration"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:16
-msgid "Confirm when Expunging a folder"
-msgstr ""
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9399,400 +11526,590 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: 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:24
-msgid "Default Forward style is: "
-msgstr ""
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Apagar"
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Enviar"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid "Display"
-msgstr "Dia"
+msgid "Do not quote original message"
+msgstr "Encontrar mensagens"
 
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Done"
 msgstr "Nenhuma"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
+#: mail/mail-config.glade.h:46
 #, fuzzy
-msgid "Drafts"
-msgstr "Data"
+msgid "Drafts _folder:"
+msgstr "Criar um novo calend�rio"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr ""
 
-#: 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:48
 #, fuzzy
-msgid "Edit..."
-msgstr "Imprimir..."
+msgid "E_nable advanced options"
+msgstr "Encontrar avan�ado"
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Colar"
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "�cone_s pequenos"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "Endere�o de correio:"
+
+#: mail/mail-config.glade.h:52
+msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
-msgid "Get Digital ID..."
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "Sum�rio executivo"
+
+#: mail/mail-config.glade.h:54
+msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "HTML signature file:"
-msgstr "Ficheiro com assinatura:"
+msgid "Font Properties"
+msgstr "Propriedades do alarme"
 
-#: mail/mail-config.glade.h:36
-msgid "IMAPv4 "
+#: mail/mail-config.glade.h:56
+#, 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:37 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
+#: mail/mail-config.glade.h:58
+msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
+#: mail/mail-config.glade.h:59
+msgid "Hulu"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:60
+msgid "IMAPv4 "
+msgstr ""
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
+msgid "Identity"
+msgstr ""
+
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Guardar Calend�rio como"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Enviar esta mensagem"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Mailbox location"
 msgstr "F_ormato"
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Situa��o das mensagens"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "Mensagem de _correio"
+
+#: mail/mail-config.glade.h:74
+msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:77
 #, fuzzy
-msgid "News"
-msgstr "Novo"
+msgid "New Mail Notification"
+msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Fontes"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Optional Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
-msgstr ""
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organiza��o:"
 
-#: mail/mail-config.glade.h:53
-msgid "Pick a color"
+#: mail/mail-config.glade.h:83
+msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
-msgid "Pretty Good Privacy"
+#: mail/mail-config.glade.h:87
+msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
-msgid "Prompt when sending HTML messages to contacts that don't want them"
+#: mail/mail-config.glade.h:88
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Prompt when sending messages with an _empty subject"
+#: mail/mail-config.glade.h:89
+msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr ""
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Imprimir contactos"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Encontrar mensagens"
+
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quoted"
 msgstr "Nenhuma"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Mudar nome de atalho"
 
-#: 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 "Responder"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
-msgstr ""
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
+msgstr "Receber"
 
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
-msgstr ""
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Mudar nome de atalho"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Required Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
-msgid "Security"
+#: mail/mail-config.glade.h:104
+msgid "Same as text"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-#, fuzzy
-msgid "Select Filter Log file..."
-msgstr "Ficheiro com assinatura:"
+#: mail/mail-config.glade.h:105
+msgid "Secure MIME (S/MIME)"
+msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110
 #, fuzzy
-msgid "Sending Email"
-msgstr "Enviar"
+msgid "Select PGP program"
+msgstr "_Items seleccionados"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:111
 #, fuzzy
-msgid "Sending Mail"
-msgstr "Enviar"
+msgid "Select a signature file"
+msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
+#: mail/mail-config.glade.h:112
 #, fuzzy
-msgid "Sent"
+msgid "Select a signature script"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#, fuzzy
+msgid "Sending Email"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Mudar nome de atalho"
+
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Source"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "Source Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "Fontes"
-
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:124
 #, fuzzy
-msgid "Special Folders"
-msgstr "_Pastas"
+msgid "Specify _filename:"
+msgstr "Nome completo:"
+
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
-msgid "Use s_ecure connection (SSL)"
+#: mail/mail-config.glade.h:128
+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:87
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-config.glade.h:132
+msgid "V_ariable-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Colar"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "Autentica��o"
+
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Verificar novo correio"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
+msgid "_Confirm when expunging a folder"
+msgstr ""
+
+#: mail/mail-config.glade.h:149
 #, fuzzy
-msgid "_Drafts folder:"
-msgstr "Criar um novo calend�rio"
+msgid "_Defaults"
+msgstr "Apagar"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:151
+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
 #, fuzzy
-msgid "_Email Address:"
-msgstr "Endere�o de correio:"
+msgid "_Filename:"
+msgstr "Nome completo:"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:156
 #, fuzzy
-msgid "_Full Name:"
+msgid "_Forward style:"
+msgstr "Enviar esta mensagem"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "Nome completo:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:159
+#, 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:103
-msgid "_Highlight citations with"
+#: mail/mail-config.glade.h:162
+msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:163
 #, fuzzy
-msgid "_Host:"
-msgstr "Horas"
+msgid "_Language:"
+msgstr "Bip"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
+#: mail/mail-config.glade.h:165
+msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:166
 #, fuzzy
-msgid "_Mark messages as Read after"
+msgid "_Mark messages as read after"
 msgstr "Situa��o das mensagens"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Name:"
 msgstr "Nome"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
-#, fuzzy
-msgid "_Organization:"
-msgstr "Organiza��o:"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: 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"
+msgstr ""
+
+#: mail/mail-config.glade.h:173
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr ""
+
+#: mail/mail-config.glade.h:174
 #, fuzzy
-msgid "_Path:"
-msgstr "Caminho"
+msgid "_Random"
+msgstr "Anular"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:175
 #, fuzzy
-msgid "_Remember this password"
-msgstr "Mudar nome de atalho"
+msgid "_Receiving Mail"
+msgstr "Receber"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Send mail in HTML format by default."
-msgstr "Enviar mensagem em formato HTML"
+msgid "_Reply style:"
+msgstr "Reponder para todos"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 #, fuzzy
-msgid "_Server Type: "
-msgstr "Servidor:"
+msgid "_Script:"
+msgstr "Nenhuma descri��o"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:180
 #, fuzzy
-msgid "_Signature file:"
+msgid "_Sending Mail"
+msgstr "Enviar"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Horas"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Username:"
-msgstr "Utilizador:"
+msgid "_Text Signature:"
+msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:184
+msgid "_Use secure connection (SSL):"
+msgstr ""
+
+#: mail/mail-config.glade.h:185
+msgid "_Variable-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "_every"
 msgstr "Remover"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr "Cores"
+
+#: mail/mail-config.glade.h:188
 #, fuzzy
 msgid "description"
 msgstr "Nenhuma descri��o"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr ""
-
-#: mail/mail-config.glade.h:123
-#, fuzzy
-msgid "seconds."
-msgstr " segundos"
-
 #: mail/mail-crypto.c:59
 #, fuzzy
 msgid "Could not create a PGP signature context."
@@ -9838,194 +12155,187 @@ msgstr "N�o se consegui inicializar Bonobo"
 msgid "Could not create a S/MIME decode context."
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Anexo"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Criar um novo calend�rio"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1265
 #, fuzzy
 msgid "Loading message content"
 msgstr "Mensagens enviadas"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1832
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "�brir em nova janela"
 
-#: mail/mail-display.c:1594
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1835
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Gravar na _pasta..."
 
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1837
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Gravar como VCard"
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Adicionar anexo"
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 #, fuzzy
 msgid "Bad Address"
 msgstr "Endere�o"
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 #, fuzzy
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 #, fuzzy
 msgid "Reply-To"
 msgstr "Responder"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 #, fuzzy
 msgid "To"
 msgstr "Para:"
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1813
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-
-#: mail/mail-format.c:1836
-msgid "Evolution does not recognize this type of signed message."
-msgstr ""
-
-#: mail/mail-format.c:1844
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1852
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
+msgstr "_Correio"
 
-#: mail/mail-format.c:2068
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2087
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2129
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Nova pasta"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, 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:762
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "_Nova pasta"
@@ -10049,167 +12359,166 @@ msgstr ""
 msgid "Working"
 msgstr "Seg"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "_Nova pasta"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Enviar"
 
-#: 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:557
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:677
+#: mail/mail-ops.c:723
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Mensagens enviadas"
 
-#: mail/mail-ops.c:696
+#: mail/mail-ops.c:742
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 #, fuzzy
 msgid "Complete."
 msgstr "Cores"
 
-#: mail/mail-ops.c:791
+#: mail/mail-ops.c:837
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Erro a gravar os atalhos."
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:944
 #, fuzzy
 msgid "Moving"
 msgstr "Seg"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:947
 #, fuzzy
 msgid "Copying"
 msgstr "Copiar"
 
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
-#, fuzzy
-msgid "Trash"
-msgstr "_Tarefa"
-
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1240
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1283
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1355
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1424
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1518
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1569
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Nova pasta"
 
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1654
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1721
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1807
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1947
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Erro a gravar os atalhos."
 
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:2021
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Anexo"
 
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2037
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Criar um novo calend�rio"
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2138
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Search"
 msgstr "Ano"
@@ -10257,69 +12566,91 @@ msgstr "Caminho"
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:246
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor:"
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Para:"
 
-#: mail/mail-send-recv.c:286
+#: mail/mail-send-recv.c:287
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Receber"
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:289
 #, fuzzy
 msgid "Cancel All"
 msgstr "Novo Ca_lend�rio"
 
-#: mail/mail-send-recv.c:348
+#: 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:350 mail/mail-send-recv.c:403
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:533
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 #, fuzzy
 msgid "User canceled operation."
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 #, fuzzy
 msgid "Enter Password"
 msgstr "Esquecer _Senhas"
 
-#: mail/mail-tools.c:255
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: mail/mail-signature-editor.c:172
+#, fuzzy
+msgid "Save signature"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-signature-editor.c:178
+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
+#, fuzzy
+msgid "Signature name:"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-tools.c:257
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:261
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:399
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Enviar esta mensagem"
@@ -10343,116 +12674,172 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
+#: mail/mail-vfolder.c:785
 #, fuzzy
-msgid "VFolders"
+msgid "vFolders"
 msgstr "_Pastas"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:825
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "_Pastas"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:841
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:895
 #, fuzzy
 msgid "New VFolder"
 msgstr "_Nova pasta"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 #, fuzzy
 msgid "(No subject)"
 msgstr "Assunto"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "Mensagem de _correio"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:640
+#: mail/message-list.c:673
 #, fuzzy
 msgid "Seen"
 msgstr "Enviar"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:642
+#: mail/message-list.c:675
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Criar uma nova mensagem"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:676
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Encontrar mensagens"
 
-#: mail/message-list.c:647
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:648
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:652
+#: mail/message-list.c:685
 #, fuzzy
 msgid "Higher"
 msgstr "Cabe�alhos:"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:686
 #, fuzzy
 msgid "Highest"
 msgstr "Cabe�alhos:"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:931
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:941
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2396
 #, fuzzy
 msgid "Generating message list"
 msgstr "Encontrar mensagens"
 
-#: mail/message-list.etspec.h:2
-msgid "Flagged"
+#: mail/message-list.etspec.h:3
+msgid "Due By"
 msgstr ""
 
 #: mail/message-list.etspec.h:4
 #, fuzzy
+msgid "Flag Status"
+msgstr "S�b"
+
+#: mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
+#, fuzzy
 msgid "Received"
 msgstr "Receber"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 #, fuzzy
 msgid "Size"
 msgstr "Tamanho"
 
+#: mail/message-tag-followup.c:57
+msgid "Call"
+msgstr ""
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Enviar esta mensagem"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Nenhuma Informa��o"
+
+#: 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-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr "Responder"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Reponder para todos"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Prever impress�o"
+
+#: mail/message-tag-followup.c:315
+msgid "Flag to Follow Up"
+msgstr ""
+
 #: mail/subscribe-dialog.c:219
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -10474,7 +12861,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Abrir ficheiro"
 
 #: 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
 #, fuzzy
 msgid "Folder"
 msgstr "_Pastas"
@@ -10527,95 +12914,10696 @@ msgid "_Unsubscribe"
 msgstr "Fontes"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Prefer�ncias"
+
+#: 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/component-factory.c:44
-msgid "Folder containing the Evolution Summary"
+#: my-evolution/Locations.h:1
+#, fuzzy
+msgid "Aarhus"
+msgstr "Alarmes"
+
+#: my-evolution/Locations.h:2
+msgid "Abakan"
+msgstr ""
+
+#: my-evolution/Locations.h:3
+msgid "Abbotsford"
 msgstr ""
 
-#: my-evolution/component-factory.c:153
+#: my-evolution/Locations.h:4
+msgid "Aberdeen"
+msgstr ""
+
+#: my-evolution/Locations.h:5
+msgid "Abha"
+msgstr ""
+
+#: my-evolution/Locations.h:6
 #, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "N�o consigo inicializar o componente de mail do Evolution."
+msgid "Abilene"
+msgstr "Telem�vel"
+
+#: 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
+msgid "Acarigua"
+msgstr ""
+
+#: my-evolution/Locations.h:13
+msgid "Adak"
+msgstr ""
+
+#: my-evolution/Locations.h:14
+#, fuzzy
+msgid "Adana"
+msgstr "Adicionar..."
+
+#: my-evolution/Locations.h:15
+msgid "Adana/Incirlik"
+msgstr ""
+
+#: my-evolution/Locations.h:16
+msgid "Adelaide"
+msgstr ""
+
+#: my-evolution/Locations.h:17
+#, fuzzy
+msgid "Aden"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:18
+msgid "Adrar"
+msgstr ""
+
+#: my-evolution/Locations.h:19
+msgid "Aeroparque"
+msgstr ""
+
+#: my-evolution/Locations.h:20
+msgid "Aeropuerto del Norte"
+msgstr ""
+
+#: my-evolution/Locations.h:21
+msgid "Afonsos"
+msgstr ""
+
+#: my-evolution/Locations.h:22
+#, fuzzy
+msgid "Africa"
+msgstr "Prim�rio"
+
+#: my-evolution/Locations.h:23
+msgid "Afyon"
+msgstr ""
+
+#: my-evolution/Locations.h:24
+#, fuzzy
+msgid "Agen"
+msgstr "Organiza��o"
+
+#: my-evolution/Locations.h:25
+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
+#, fuzzy
+msgid "Air Force"
+msgstr "Adicionar Fonte"
+
+#: 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 "Novo Ca_lend�rio"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:39
+#, fuzzy
+msgid "Alamosa"
+msgstr "Alarmes"
+
+#: my-evolution/Locations.h:40
+#, fuzzy
+msgid "Alaska"
+msgstr "Alarmes"
+
+#: my-evolution/Locations.h:41
+msgid "Al Baha"
+msgstr ""
+
+#: my-evolution/Locations.h:43
+msgid "Albany"
+msgstr ""
+
+#: my-evolution/Locations.h:44
+msgid "Albenga"
+msgstr ""
+
+#: my-evolution/Locations.h:45
+msgid "Alberta"
+msgstr ""
+
+#: my-evolution/Locations.h:46
+msgid "Alborg"
+msgstr ""
+
+#: my-evolution/Locations.h:47
+msgid "Albuquerque"
+msgstr ""
+
+#: my-evolution/Locations.h:48
+#, fuzzy
+msgid "Alderney"
+msgstr "Nome completo:"
+
+#: my-evolution/Locations.h:49
+#, fuzzy
+msgid "Alesund"
+msgstr " segundos"
+
+#: my-evolution/Locations.h:50
+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 "Cabe�alhos:"
+
+#: my-evolution/Locations.h:56
+msgid "Algona"
+msgstr ""
+
+#: my-evolution/Locations.h:57
+#, fuzzy
+msgid "Alicante"
+msgstr "Activar"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:62
+#, fuzzy
+msgid "Alliance"
+msgstr "Adicionar..."
+
+#: my-evolution/Locations.h:63
+#, fuzzy
+msgid "Alma"
+msgstr "Alarmes"
+
+#: my-evolution/Locations.h:64
+#, fuzzy
+msgid "Almeria"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:65
+#, fuzzy
+msgid "Alpena"
+msgstr "_Abrir"
+
+#: my-evolution/Locations.h:66
+msgid "Al Qaysumah"
+msgstr ""
+
+#: my-evolution/Locations.h:67
+#, fuzzy
+msgid "Alta"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:68
+msgid "Altamira"
+msgstr ""
+
+#: my-evolution/Locations.h:69
+#, fuzzy
+msgid "Alton"
+msgstr "_Ac��es"
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr ""
+
+#: my-evolution/Locations.h:71
+#, fuzzy
+msgid "Alturas"
+msgstr "Outro"
+
+#: my-evolution/Locations.h:72
+#, fuzzy
+msgid "Altus"
+msgstr "Outro"
+
+#: my-evolution/Locations.h:73
+msgid "Amami Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:74
+msgid "Amapala"
+msgstr ""
+
+#: my-evolution/Locations.h:75
+#, fuzzy
+msgid "Amarillo"
+msgstr "Correio electr�nico 2"
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr ""
+
+#: my-evolution/Locations.h:77
+msgid "Ambler"
+msgstr ""
+
+#: my-evolution/Locations.h:78
+#, fuzzy
+msgid "Amelia"
+msgstr "F_ormato"
+
+#: my-evolution/Locations.h:79
+msgid "Amendola"
+msgstr ""
+
+#: my-evolution/Locations.h:80
+#, fuzzy
+msgid "Ames"
+msgstr "_Pasta"
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr ""
+
+#: my-evolution/Locations.h:82
+msgid "Amsterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:83
+msgid "Anadyr"
+msgstr ""
+
+#: my-evolution/Locations.h:84
+msgid "Anaktuvuk"
+msgstr ""
+
+#: my-evolution/Locations.h:85
+msgid "Anapa"
+msgstr ""
+
+#: my-evolution/Locations.h:86
+msgid "Anchorage"
+msgstr ""
+
+#: my-evolution/Locations.h:87
+msgid "Anchorage - Elmendorf AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:88
+#, fuzzy
+msgid "Ancona"
+msgstr "�cone_s pequenos"
+
+#: my-evolution/Locations.h:89
+msgid "Andahuayla"
+msgstr ""
+
+#: my-evolution/Locations.h:90
+msgid "Anderson"
+msgstr ""
+
+#: my-evolution/Locations.h:91
+#, fuzzy
+msgid "Andoya"
+msgstr "Anular"
+
+#: my-evolution/Locations.h:92
+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
+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 ""
+
+#: my-evolution/Locations.h:101
+msgid "Anniston"
+msgstr ""
+
+#: my-evolution/Locations.h:102
+#, fuzzy
+msgid "Antalya"
+msgstr "Hoje"
+
+#: my-evolution/Locations.h:103
+msgid "Antartica"
+msgstr ""
+
+#: my-evolution/Locations.h:104
+#, fuzzy
+msgid "Antigo"
+msgstr "_Ac��es"
+
+#: my-evolution/Locations.h:105
+#, fuzzy
+msgid "Antigua"
+msgstr "Organiza��o"
+
+#: my-evolution/Locations.h:106
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: my-evolution/Locations.h:107
+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
+msgid "Apalachicola"
+msgstr ""
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr ""
+
+#: my-evolution/Locations.h:112
+msgid "Aquadilla"
+msgstr ""
+
+#: my-evolution/Locations.h:113
+#, fuzzy
+msgid "Aracaju"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:114
+msgid "Arad"
+msgstr ""
+
+#: my-evolution/Locations.h:115
+#, fuzzy
+msgid "Arar"
+msgstr "Alarmes"
+
+#: my-evolution/Locations.h:116
+msgid "Araxos"
+msgstr ""
+
+#: my-evolution/Locations.h:117
+msgid "Arcata"
+msgstr ""
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr ""
+
+#: my-evolution/Locations.h:119
+msgid "Arequipa"
+msgstr ""
+
+#: my-evolution/Locations.h:121
+#, fuzzy
+msgid "Arica"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:122
+#, fuzzy
+msgid "Arizona"
+msgstr "Organiza��o"
+
+#: my-evolution/Locations.h:123
+msgid "Arkansas"
+msgstr ""
+
+#: my-evolution/Locations.h:124
+msgid "Arkhangelsk"
+msgstr ""
+
+#: my-evolution/Locations.h:125
+#, fuzzy
+msgid "Arlington"
+msgstr "Organiza��o"
+
+#: my-evolution/Locations.h:126
+#, fuzzy
+msgid "Artigas"
+msgstr "Organiza��o"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:131
+msgid "Ashfield"
+msgstr ""
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr ""
 
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/Locations.h:133
+#, fuzzy
+msgid "Ashland"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:134
+msgid "Asia"
+msgstr ""
+
+#: my-evolution/Locations.h:135
+#, fuzzy
+msgid "Aspen"
+msgstr "_Abrir"
+
+#: my-evolution/Locations.h:136
+msgid "Asswan"
+msgstr ""
+
+#: my-evolution/Locations.h:137
+msgid "Astoria"
+msgstr ""
+
+#: my-evolution/Locations.h:138
+msgid "Astrakhan"
+msgstr ""
+
+#: my-evolution/Locations.h:139
+#, fuzzy
+msgid "Asturias"
+msgstr "Outro"
+
+#: my-evolution/Locations.h:140
+#, fuzzy
+msgid "Asuncion"
+msgstr "Segundos"
+
+#: my-evolution/Locations.h:141
+#, fuzzy
+msgid "Athens"
+msgstr "Anexo"
+
+#: my-evolution/Locations.h:142
+#, fuzzy
+msgid "Athinai"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:143
+#, fuzzy
+msgid "Atlanta"
+msgstr "Anexar"
+
+#: my-evolution/Locations.h:144
+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
+msgid "Auckland"
+msgstr ""
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:150
+msgid "Augusta"
+msgstr ""
+
+#: my-evolution/Locations.h:151
+msgid "Aurora"
+msgstr ""
+
+#: my-evolution/Locations.h:152
+#, fuzzy
+msgid "Austin"
+msgstr "Nenhuma descri��o"
+
+#: my-evolution/Locations.h:153
+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 ""
+
+#: my-evolution/Locations.h:159
+#, fuzzy
+msgid "Bage"
+msgstr "Colar"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:170
+#, fuzzy
+msgid "Ball Mountain"
+msgstr "�cone_s pequenos"
+
+#: my-evolution/Locations.h:171
+msgid "Baltimore"
+msgstr ""
+
+#: my-evolution/Locations.h:172
+msgid "Baltimore-Glen Burnie"
+msgstr ""
+
+#: my-evolution/Locations.h:173
+msgid "Banak"
+msgstr ""
+
+#: my-evolution/Locations.h:174
+msgid "Bandarabbass"
+msgstr ""
+
+#: my-evolution/Locations.h:175
+#, fuzzy
+msgid "Bangor"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:176
+msgid "Baracoa"
+msgstr ""
+
+#: my-evolution/Locations.h:177
+msgid "Barbers Point"
+msgstr ""
+
+#: my-evolution/Locations.h:178
+msgid "Barcelona"
+msgstr ""
+
+#: my-evolution/Locations.h:179
+#, fuzzy
+msgid "Bardufoss"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:180
+msgid "Bar Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:181
+#, fuzzy
+msgid "Bari"
+msgstr "Colar"
+
+#: my-evolution/Locations.h:182
+msgid "Bariloche"
+msgstr ""
+
+#: my-evolution/Locations.h:183
+#, fuzzy
+msgid "Barinas"
+msgstr "�cones _grandes"
+
+#: my-evolution/Locations.h:184
+msgid "Barking Sand"
+msgstr ""
+
+#: my-evolution/Locations.h:185
+#, fuzzy
+msgid "Barksdale"
+msgstr "Colar"
+
+#: my-evolution/Locations.h:186
+#, fuzzy
+msgid "Barnaul"
+msgstr "_Correio"
+
+#: 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
+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 "Colar"
+
+#: my-evolution/Locations.h:194
+msgid "Batesville"
+msgstr ""
+
+#: my-evolution/Locations.h:195
+msgid "Batman"
+msgstr ""
+
+#: my-evolution/Locations.h:196
+msgid "Baton Rouge"
+msgstr ""
+
+#: my-evolution/Locations.h:197
+msgid "Battle Creek"
+msgstr ""
+
+#: my-evolution/Locations.h:198
+#, fuzzy
+msgid "Battle Mountain"
+msgstr "�cone_s pequenos"
+
+#: my-evolution/Locations.h:199
+#, fuzzy
+msgid "Bauru"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:200
+msgid "Bayamo"
+msgstr ""
+
+#: my-evolution/Locations.h:201
+msgid "Bayreuth"
+msgstr ""
+
+#: my-evolution/Locations.h:202
+#, fuzzy
+msgid "Beatrice"
+msgstr "Colar"
+
+#: my-evolution/Locations.h:203
+msgid "Beaufort"
+msgstr ""
+
+#: my-evolution/Locations.h:204
+#, fuzzy
+msgid "Beaumont"
+msgstr "M�s"
+
+#: 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 "Ano"
+
+#: my-evolution/Locations.h:208
+#, fuzzy
+msgid "Beckley"
+msgstr "Tamanho"
+
+#: my-evolution/Locations.h:209
+#, fuzzy
+msgid "Bedford"
+msgstr "Hora"
+
+#: my-evolution/Locations.h:210
+#, fuzzy
+msgid "Beijing"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:211
+#, fuzzy
+msgid "Beirut"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:212
+msgid "Beja"
+msgstr ""
+
+#: my-evolution/Locations.h:213
+#, fuzzy
+msgid "Belem"
+msgstr "Tamanho"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:219
+#, fuzzy
+msgid "Belleville"
+msgstr "Tamanho"
+
+#: my-evolution/Locations.h:220
+msgid "Bellingham"
+msgstr ""
+
+#: my-evolution/Locations.h:221
+msgid "Belmar-Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:222
+#, fuzzy
+msgid "Belo Horizonte"
+msgstr "Tamanho"
+
+#: my-evolution/Locations.h:223
+msgid "Belo Horizonte Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:224
+msgid "Bemidji"
+msgstr ""
+
+#: my-evolution/Locations.h:225
+msgid "Benbecula"
+msgstr ""
+
+#: my-evolution/Locations.h:226
+#, fuzzy
+msgid "Benina"
+msgstr "Enviar"
+
+#: 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 "Remover"
+
+#: my-evolution/Locations.h:230
+msgid "Bergamo"
+msgstr ""
+
+#: my-evolution/Locations.h:231
+#, fuzzy
+msgid "Bergen"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:232
+msgid "Bergstrom AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:233
+msgid "Berlevag"
+msgstr ""
+
+#: my-evolution/Locations.h:234
+#, fuzzy
+msgid "Berlin"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:235
+msgid "Berlin-Tegel"
+msgstr ""
+
+#: my-evolution/Locations.h:236
+msgid "Berlin-Tempelhof"
+msgstr ""
+
+#: my-evolution/Locations.h:237
+#, fuzzy
+msgid "Bern"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:238
+#, fuzzy
+msgid "Bethel"
+msgstr "Outro"
+
+#: my-evolution/Locations.h:239
+msgid "Bethlehem Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:240
+#, fuzzy
+msgid "Bettles"
+msgstr "Tamanho"
+
+#: my-evolution/Locations.h:241
+#, fuzzy
+msgid "Beverly"
+msgstr "Remover"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:245
+#, fuzzy
+msgid "Big Piney"
+msgstr "Imprimir"
+
+#: my-evolution/Locations.h:246
+msgid "Big River Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:247
+msgid "Bilbao"
+msgstr ""
+
+#: my-evolution/Locations.h:248
+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 ""
+
+#: my-evolution/Locations.h:257
+#, fuzzy
+msgid "Blanding"
+msgstr "Cabe�alhos:"
+
+#: my-evolution/Locations.h:258
+msgid "Block Island"
+msgstr ""
+
+#: my-evolution/Locations.h:259
+msgid "Bloemfontein J. B. M. Hertzog "
+msgstr ""
+
+#: my-evolution/Locations.h:260
+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 ""
+
+#: my-evolution/Locations.h:267
+#, fuzzy
+msgid "Bodo"
+msgstr "Hoje"
+
+#: my-evolution/Locations.h:268
+msgid "Bogota/Eldorado"
+msgstr ""
+
+#: my-evolution/Locations.h:269
+#, fuzzy
+msgid "Boise"
+msgstr "Colar"
+
+#: my-evolution/Locations.h:271
+msgid "Bologna"
+msgstr ""
+
+#: my-evolution/Locations.h:272
+#, fuzzy
+msgid "Bolzano"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:273
+msgid "Bombay/Santacruz"
+msgstr ""
+
+#: my-evolution/Locations.h:274
+#, fuzzy
+msgid "Boone"
+msgstr "Nenhuma"
+
+#: my-evolution/Locations.h:275
+msgid "Bordeaux"
+msgstr ""
+
+#: my-evolution/Locations.h:276
+#, fuzzy
+msgid "Borger"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:277
+msgid "Bornholm"
+msgstr ""
+
+#: my-evolution/Locations.h:278
+msgid "Boscombe Down"
+msgstr ""
+
+#: my-evolution/Locations.h:279
+msgid "Bosnia-Herzegovina"
+msgstr ""
+
+#: my-evolution/Locations.h:280
+#, fuzzy
+msgid "Boston"
+msgstr "Horas"
+
+#: my-evolution/Locations.h:281
+#, fuzzy
+msgid "Boulmer"
+msgstr "_Pastas"
+
+#: my-evolution/Locations.h:282
+#, fuzzy
+msgid "Bourges"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:283
+msgid "Bournemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:284
+msgid "Bowling Green"
+msgstr ""
+
+#: my-evolution/Locations.h:285
+msgid "Bozeman"
+msgstr ""
+
+#: my-evolution/Locations.h:286
+msgid "Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:287
+msgid "Bradshaw Field"
+msgstr ""
+
+#: my-evolution/Locations.h:288
+msgid "Brainerd"
+msgstr ""
+
+#: my-evolution/Locations.h:289
+#, fuzzy
+msgid "Brasilia"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:290
+msgid "Brasschaat"
+msgstr ""
+
+#: my-evolution/Locations.h:291
+#, fuzzy
+msgid "Bratislava"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:292
+#, fuzzy
+msgid "Bratsk"
+msgstr "Data"
+
+#: my-evolution/Locations.h:293
+msgid "Braunschweig"
+msgstr ""
+
+#: my-evolution/Locations.h:295
+#, fuzzy
+msgid "Bremen"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:296
+msgid "Bremerton"
+msgstr ""
+
+#: my-evolution/Locations.h:297
+#, fuzzy
+msgid "Brest"
+msgstr "Qa"
+
+#: my-evolution/Locations.h:298
+msgid "Bridgeport"
+msgstr ""
+
+#: my-evolution/Locations.h:299
+msgid "Brindisi"
+msgstr ""
+
+#: my-evolution/Locations.h:300
+msgid "Brisbane"
+msgstr ""
+
+#: my-evolution/Locations.h:301
+#, fuzzy
+msgid "Bristol"
+msgstr "_Correio"
+
+#: 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 "Ocupado"
+
+#: my-evolution/Locations.h:305
+msgid "Broken Bow"
+msgstr ""
+
+#: my-evolution/Locations.h:306
+msgid "Bronnoysund"
+msgstr ""
+
+#: my-evolution/Locations.h:307
+#, fuzzy
+msgid "Brookings"
+msgstr "Seg"
+
+#: my-evolution/Locations.h:308
+msgid "Brooksville"
+msgstr ""
+
+#: my-evolution/Locations.h:309
+#, fuzzy
+msgid "Broome"
+msgstr "Casa"
+
+#: my-evolution/Locations.h:310
+msgid "Brownsville"
+msgstr ""
+
+#: my-evolution/Locations.h:311
+msgid "Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:312
+msgid "Brussels-National Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:313
+msgid "Bryansk"
+msgstr ""
+
+#: my-evolution/Locations.h:314
+#, fuzzy
+msgid "Bryce Canyon"
+msgstr "Empresa"
+
+#: 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
+msgid "Burbank"
+msgstr ""
+
+#: my-evolution/Locations.h:323
+#, fuzzy
+msgid "Burgas"
+msgstr "Ocupado"
+
+#: my-evolution/Locations.h:324
+#, fuzzy
+msgid "Burley"
+msgstr "Ter"
+
+#: my-evolution/Locations.h:325
+msgid "Burlington"
+msgstr ""
+
+#: my-evolution/Locations.h:326
+#, fuzzy
+msgid "Burnet"
+msgstr "Pr�_ximo"
+
+#: my-evolution/Locations.h:327
+#, fuzzy
+msgid "Burns"
+msgstr "Ocupado"
+
+#: my-evolution/Locations.h:328
+#, fuzzy
+msgid "Bursa"
+msgstr "Ocupado"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:332
+#, fuzzy
+msgid "Cagliari"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:333
+#, fuzzy
+msgid "Cairns"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:334
+#, fuzzy
+msgid "Cairo"
+msgstr "Carro"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:338
+#, fuzzy
+msgid "Calgary"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:339
+msgid "Cali/Alfonso Bonillaaragon"
+msgstr ""
+
+#: my-evolution/Locations.h:340
+#, fuzzy
+msgid "Caliente"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:341
+#, fuzzy
+msgid "California"
+msgstr "_Contacto"
+
+#: my-evolution/Locations.h:342
+msgid "Calvi-Ste-Catherine"
+msgstr ""
+
+#: my-evolution/Locations.h:343
+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 "Carro"
+
+#: my-evolution/Locations.h:347
+#, fuzzy
+msgid "Camiri"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:348
+#, fuzzy
+msgid "Campeche"
+msgstr "Cores"
+
+#: my-evolution/Locations.h:349
+#, fuzzy
+msgid "Campinas"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:350
+#, fuzzy
+msgid "Campo"
+msgstr "Copiar"
+
+#: my-evolution/Locations.h:351
+msgid "Campo Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr ""
+
+#: my-evolution/Locations.h:353
+#, fuzzy
+msgid "Canaan"
+msgstr "Novo Ca_lend�rio"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:363
+msgid "Cancun"
+msgstr ""
+
+#: my-evolution/Locations.h:364
+msgid "Cannes-Mandelieu"
+msgstr ""
+
+#: my-evolution/Locations.h:365
+#, fuzzy
+msgid "Cantwell"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:366
+msgid "Cape Girardeau"
+msgstr ""
+
+#: my-evolution/Locations.h:367
+msgid "Cape Hatteras"
+msgstr ""
+
+#: my-evolution/Locations.h:368
+#, fuzzy
+msgid "Cape Lisburne"
+msgstr "Fontes de correio"
+
+#: my-evolution/Locations.h:369
+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
+msgid "Capo Mele"
+msgstr ""
+
+#: my-evolution/Locations.h:374
+msgid "Caracas La Carlota"
+msgstr ""
+
+#: my-evolution/Locations.h:375
+msgid "Caracas Maiquetia"
+msgstr ""
+
+#: my-evolution/Locations.h:376
+msgid "Caravelas"
+msgstr ""
+
+#: my-evolution/Locations.h:377
+#, fuzzy
+msgid "Carbondale"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:378
+#, fuzzy
+msgid "Cardiff"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:379
+#, fuzzy
+msgid "Caribou"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:380
+#, fuzzy
+msgid "Carlisle"
+msgstr "_Pasta"
+
+#: my-evolution/Locations.h:381
+msgid "Carlsbad"
+msgstr ""
+
+#: my-evolution/Locations.h:382
+#, fuzzy
+msgid "Carroll"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:383
+msgid "Cartagena/Rafael Nunez"
+msgstr ""
+
+#: my-evolution/Locations.h:384
+msgid "Casa Granda"
+msgstr ""
+
+#: my-evolution/Locations.h:385
+#, fuzzy
+msgid "Cascade"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:386
+#, fuzzy
+msgid "Casper"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:387
+msgid "Catacamas"
+msgstr ""
+
+#: my-evolution/Locations.h:388
+#, fuzzy
+msgid "Catania"
+msgstr "Novo Ca_lend�rio"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:393
+#, fuzzy
+msgid "Cedar City"
+msgstr "Carro"
+
+#: 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 "_Correio"
+
+#: my-evolution/Locations.h:397
+msgid "Chacarita"
+msgstr ""
+
+#: my-evolution/Locations.h:398
+#, fuzzy
+msgid "Chadron"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:399
+#, fuzzy
+msgid "Challis"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:400
+msgid "Chamberlain"
+msgstr ""
+
+#: my-evolution/Locations.h:401
+#, fuzzy
+msgid "Chambery"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:402
+#, fuzzy
+msgid "Champaign"
+msgstr "Empresa"
+
+#: my-evolution/Locations.h:403
+#, fuzzy
+msgid "Chandalar Lake"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:404
+#, fuzzy
+msgid "Chandler"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:405
+#, fuzzy
+msgid "Chania"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:406
+#, fuzzy
+msgid "Chanute"
+msgstr "Minuto"
+
+#: my-evolution/Locations.h:407
+#, fuzzy
+msgid "Chariton"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:408
+msgid "Charleroi-Brussels South"
+msgstr ""
+
+#: my-evolution/Locations.h:409
+msgid "Charles City"
+msgstr ""
+
+#: my-evolution/Locations.h:410
+msgid "Charleston"
+msgstr ""
+
+#: my-evolution/Locations.h:411
+#, fuzzy
+msgid "Charlotte"
+msgstr "Segunda-feira"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:416
+#, fuzzy
+msgid "Cheju"
+msgstr "_Pasta"
+
+#: 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 "Hora"
+
+#: my-evolution/Locations.h:420
+#, fuzzy
+msgid "Cherry Point"
+msgstr "_Novo Contacto"
+
+#: 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 "Carro"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:431
+#, fuzzy
+msgid "Chiclayo"
+msgstr "_Pasta"
+
+#: my-evolution/Locations.h:432
+#, fuzzy
+msgid "Chico"
+msgstr "_Pasta"
+
+#: my-evolution/Locations.h:433
+msgid "Chicopee Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:434
+#, fuzzy
+msgid "Chievres"
+msgstr "_Pasta"
+
+#: my-evolution/Locations.h:435
+#, fuzzy
+msgid "Chihhang"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:436
+msgid "Chihuahua"
+msgstr ""
+
+#: my-evolution/Locations.h:437
+#, fuzzy
+msgid "Childress"
+msgstr "_Pasta"
+
+#: my-evolution/Locations.h:439
+#, fuzzy
+msgid "China Lake"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:440
+#, fuzzy
+msgid "Chinandega"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:441
+msgid "Chinmem/Shatou"
+msgstr ""
+
+#: my-evolution/Locations.h:442
+#, fuzzy
+msgid "Chino"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:443
+msgid "Chippewa County"
+msgstr ""
+
+#: my-evolution/Locations.h:444
+#, fuzzy
+msgid "Chita"
+msgstr "Carro"
+
+#: 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 "Carro"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:462
+#, fuzzy
+msgid "Clarinda"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:463
+#, fuzzy
+msgid "Clarion"
+msgstr "Carro"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:468
+#, fuzzy
+msgid "Cleveland"
+msgstr "Encontrar"
+
+#: 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
+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
+msgid "Cocos Island"
+msgstr ""
+
+#: my-evolution/Locations.h:477
+#, fuzzy
+msgid "Cody"
+msgstr "Hoje"
+
+#: my-evolution/Locations.h:478
+msgid "Coeur d'Alene"
+msgstr ""
+
+#: my-evolution/Locations.h:479
+#, fuzzy
+msgid "Cold Bay"
+msgstr "_Pasta"
+
+#: my-evolution/Locations.h:480
+#, fuzzy
+msgid "Colima"
+msgstr "Empresa"
+
+#: my-evolution/Locations.h:481
+#, fuzzy
+msgid "College Station"
+msgstr "_Ac��es"
+
+#: my-evolution/Locations.h:482
+msgid "Colmar-Meyenheim"
+msgstr ""
+
+#: my-evolution/Locations.h:484
+#, fuzzy
+msgid "Colonia"
+msgstr "_Contacto"
+
+#: my-evolution/Locations.h:485
+#, fuzzy
+msgid "Colorado"
+msgstr "Cores"
+
+#: my-evolution/Locations.h:486
+msgid "Colorado Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:487
+msgid "Columbia"
+msgstr ""
+
+#: my-evolution/Locations.h:488
+msgid "Columbia-McEntire"
+msgstr ""
+
+#: my-evolution/Locations.h:489
+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 ""
+
+#: my-evolution/Locations.h:494
+#, fuzzy
+msgid "Colville"
+msgstr "_Pasta"
+
+#: my-evolution/Locations.h:495
+msgid "Comodoro Rivadavia"
+msgstr ""
+
+#: my-evolution/Locations.h:496
+#, fuzzy
+msgid "Comox"
+msgstr "Copiar"
+
+#: my-evolution/Locations.h:497
+msgid "Conceicao Do Araguaia"
+msgstr ""
+
+#: my-evolution/Locations.h:498
+#, fuzzy
+msgid "Concepcion"
+msgstr "_Ac��es"
+
+#: my-evolution/Locations.h:499
+#, fuzzy
+msgid "Concord"
+msgstr "Copiar"
+
+#: my-evolution/Locations.h:500
+msgid "Concordia"
+msgstr ""
+
+#: my-evolution/Locations.h:501
+msgid "Connaught"
+msgstr ""
+
+#: my-evolution/Locations.h:502
+#, fuzzy
+msgid "Connecticut"
+msgstr "_Contacto"
+
+#: my-evolution/Locations.h:503
+#, fuzzy
+msgid "Conroe"
+msgstr "Copiar"
+
+#: my-evolution/Locations.h:504
+#, fuzzy
+msgid "Constantine"
+msgstr "_Ac��es"
+
+#: my-evolution/Locations.h:505
+msgid "Copper Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:506
+msgid "Cordoba"
+msgstr ""
+
+#: my-evolution/Locations.h:507
+msgid "Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:508
+msgid "Cork"
+msgstr ""
+
+#: my-evolution/Locations.h:509
+#, fuzzy
+msgid "Coro"
+msgstr "Cores"
+
+#: my-evolution/Locations.h:510
+#, fuzzy
+msgid "Corona"
+msgstr "Cores"
+
+#: my-evolution/Locations.h:511
+msgid "Corpus Christi"
+msgstr ""
+
+#: my-evolution/Locations.h:512
+msgid "Corpus Christi NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:513
+#, fuzzy
+msgid "Corrientes"
+msgstr "Apagar todas as ocurr�ncias"
+
+#: my-evolution/Locations.h:514
+msgid "Corsicana"
+msgstr ""
+
+#: my-evolution/Locations.h:515
+#, fuzzy
+msgid "Cortez"
+msgstr "Nenhuma"
+
+#: my-evolution/Locations.h:516
+#, fuzzy
+msgid "Corumba"
+msgstr "F_ormato"
+
+#: my-evolution/Locations.h:518
+msgid "Cotulla"
+msgstr ""
+
+#: my-evolution/Locations.h:519
+msgid "Council Bluffs"
+msgstr ""
+
+#: my-evolution/Locations.h:520
+msgid "Coventry"
+msgstr ""
+
+#: my-evolution/Locations.h:521
+#, fuzzy
+msgid "Covington"
+msgstr "Copiar"
+
+#: my-evolution/Locations.h:522
+msgid "Cozumel"
+msgstr ""
+
+#: my-evolution/Locations.h:523
+#, fuzzy
+msgid "Craig"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:524
+msgid "Cranfield"
+msgstr ""
+
+#: my-evolution/Locations.h:525
+msgid "Crescent City"
+msgstr ""
+
+#: my-evolution/Locations.h:526
+#, fuzzy
+msgid "Creston"
+msgstr "Nenhuma descri��o"
+
+#: my-evolution/Locations.h:527
+#, fuzzy
+msgid "Crestview"
+msgstr "Prever impress�o"
+
+#: my-evolution/Locations.h:529
+msgid "Cross City"
+msgstr ""
+
+#: my-evolution/Locations.h:530
+msgid "Crossville"
+msgstr ""
+
+#: my-evolution/Locations.h:531
+msgid "Crotone"
+msgstr ""
+
+#: my-evolution/Locations.h:533
+msgid "Cuba Awrs"
+msgstr ""
+
+#: my-evolution/Locations.h:534
+msgid "Cuernavaca"
+msgstr ""
+
+#: my-evolution/Locations.h:535
+msgid "Cuiaba"
+msgstr ""
+
+#: my-evolution/Locations.h:536
+#, fuzzy
+msgid "Culdrose"
+msgstr "Cores"
+
+#: my-evolution/Locations.h:537
+msgid "Culiacan"
+msgstr ""
+
+#: my-evolution/Locations.h:538
+#, fuzzy
+msgid "Cumana"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:539
+msgid "Cumberland"
+msgstr ""
+
+#: my-evolution/Locations.h:540
+msgid "Curitiba"
+msgstr ""
+
+#: my-evolution/Locations.h:541
+msgid "Curitiba Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:542
+#, fuzzy
+msgid "Custer"
+msgstr "Cortar"
+
+#: my-evolution/Locations.h:543
+msgid "Cut Bank"
+msgstr ""
+
+#: my-evolution/Locations.h:544
+msgid "Cuzco"
+msgstr ""
+
+#: my-evolution/Locations.h:547
+#, fuzzy
+msgid "Dagali"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:548
+msgid "Daggett"
+msgstr ""
+
+#: my-evolution/Locations.h:549
+msgid "Dalhart"
+msgstr ""
+
+#: my-evolution/Locations.h:550
+#, fuzzy
+msgid "Dalian"
+msgstr "F_ormato"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:556
+#, fuzzy
+msgid "Danbury"
+msgstr "DiasRascunhos"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:562
+#, fuzzy
+msgid "Dayton"
+msgstr "DiasRascunhos"
+
+#: my-evolution/Locations.h:563
+msgid "Daytona Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:564
+msgid "Dayton-Fairborn"
+msgstr ""
+
+#: my-evolution/Locations.h:565
+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 ""
+
+#: my-evolution/Locations.h:571
+#, fuzzy
+msgid "Deelen"
+msgstr "Apagar"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:576
+#, fuzzy
+msgid "Delta"
+msgstr "Apagar"
+
+#: my-evolution/Locations.h:577
+#, fuzzy
+msgid "Deming"
+msgstr "Seg"
+
+#: my-evolution/Locations.h:578
+msgid "Den Helder/De Kooy"
+msgstr ""
+
+#: my-evolution/Locations.h:579
+#, fuzzy
+msgid "Denison"
+msgstr "Segundos"
+
+#: my-evolution/Locations.h:581
+#, fuzzy
+msgid "Denton"
+msgstr "Segundos"
+
+#: my-evolution/Locations.h:582
+#, fuzzy
+msgid "Denver"
+msgstr "Enviar"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:587
+msgid "Des Moines"
+msgstr ""
+
+#: my-evolution/Locations.h:588
+#, fuzzy
+msgid "Destin"
+msgstr "Nenhuma descri��o"
+
+#: 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
+msgid "Dhahran"
+msgstr ""
+
+#: my-evolution/Locations.h:596
+#, fuzzy
+msgid "Dickinson"
+msgstr "Nenhuma descri��o"
+
+#: my-evolution/Locations.h:597
+#, fuzzy
+msgid "Dijon"
+msgstr "Nenhuma"
+
+#: my-evolution/Locations.h:598
+msgid "Dillingham"
+msgstr ""
+
+#: my-evolution/Locations.h:599
+#, fuzzy
+msgid "Dillon"
+msgstr "Nenhuma"
+
+#: my-evolution/Locations.h:600
+#, fuzzy
+msgid "Dinard"
+msgstr "Imprimir calend�rio"
+
+#: 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 "Telem�vel"
+
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "Nenhuma"
+
+#: my-evolution/Locations.h:610
+#, fuzzy
+msgid "Dongsha"
+msgstr "Hoje"
+
+#: my-evolution/Locations.h:611
+msgid "Dongshi"
+msgstr ""
+
+#: my-evolution/Locations.h:612
+msgid "Don Torcuato"
+msgstr ""
+
+#: my-evolution/Locations.h:613
+msgid "Dortmund-Wickede"
+msgstr ""
+
+#: my-evolution/Locations.h:614
+#, fuzzy
+msgid "Dothan"
+msgstr "Nenhuma"
+
+#: my-evolution/Locations.h:615
+msgid "Douglas"
+msgstr ""
+
+#: my-evolution/Locations.h:616
+#, fuzzy
+msgid "Dover"
+msgstr "Nenhuma"
+
+#: my-evolution/Locations.h:617
+msgid "Dresden-Klotzsche"
+msgstr ""
+
+#: my-evolution/Locations.h:618
+msgid "Drummond"
+msgstr ""
+
+#: my-evolution/Locations.h:619
+msgid "Dubai"
+msgstr ""
+
+#: my-evolution/Locations.h:620
+msgid "Dubbo"
+msgstr ""
+
+#: my-evolution/Locations.h:621
+#, fuzzy
+msgid "Dublin"
+msgstr "Receber"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:625
+#, fuzzy
+msgid "Dugway"
+msgstr "DiasRascunhos"
+
+#: my-evolution/Locations.h:626
+#, fuzzy
+msgid "Duluth"
+msgstr "Apagar"
+
+#: my-evolution/Locations.h:627
+#, fuzzy
+msgid "Dundee"
+msgstr "Nenhuma"
+
+#: my-evolution/Locations.h:628
+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
+msgid "Dusseldorf"
+msgstr ""
+
+#: my-evolution/Locations.h:633
+msgid "Dutch Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:634
+msgid "Dyersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:635
+#, fuzzy
+msgid "Eagle"
+msgstr "Bip"
+
+#: 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
+msgid "East St Louis"
+msgstr ""
+
+#: my-evolution/Locations.h:640
+msgid "Eau Claire"
+msgstr ""
+
+#: my-evolution/Locations.h:642
+#, fuzzy
+msgid "Edinburgh"
+msgstr "Cabe�alhos:"
+
+#: my-evolution/Locations.h:643
+#, fuzzy
+msgid "Edmonton"
+msgstr "M�s"
+
+#: 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
+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 ""
+
+#: my-evolution/Locations.h:661
+#, fuzzy
+msgid "Elkins"
+msgstr "Pr�_ximo"
+
+#: my-evolution/Locations.h:662
+msgid "Elko"
+msgstr ""
+
+#: my-evolution/Locations.h:663
+msgid "Elmira"
+msgstr ""
+
+#: my-evolution/Locations.h:664
+#, fuzzy
+msgid "El Monte"
+msgstr "M�s"
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr ""
+
+#: my-evolution/Locations.h:667
+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
+#, fuzzy
+msgid "Emmonak"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:671
+#, fuzzy
+msgid "Emporia"
+msgstr "Seg"
+
+#: my-evolution/Locations.h:672
+msgid "Enid"
+msgstr ""
+
+#: my-evolution/Locations.h:673
+#, fuzzy
+msgid "Enid/Woodring"
+msgstr "Cabe�alhos:"
+
+#: 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
+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 ""
+
+#: my-evolution/Locations.h:685
+msgid "Eugene"
+msgstr ""
+
+#: my-evolution/Locations.h:686
+msgid "Eureka"
+msgstr ""
+
+#: my-evolution/Locations.h:687
+msgid "Europe"
+msgstr ""
+
+#: my-evolution/Locations.h:688
+#, fuzzy
+msgid "Evanston"
+msgstr "Colar"
+
+#: my-evolution/Locations.h:689
+msgid "Evansville"
+msgstr ""
+
+#: my-evolution/Locations.h:690
+msgid "Everett"
+msgstr ""
+
+#: my-evolution/Locations.h:691
+msgid "Evergreen"
+msgstr ""
+
+#: my-evolution/Locations.h:692
+msgid "Evreux-Fauville"
+msgstr ""
+
+#: my-evolution/Locations.h:693
+#, fuzzy
+msgid "Exeter"
+msgstr "Outro"
+
+#: my-evolution/Locations.h:694
+msgid "Ezeiza"
+msgstr ""
+
+#: my-evolution/Locations.h:695
+#, fuzzy
+msgid "Fagernes"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:696
+msgid "Fairbanks"
+msgstr ""
+
+#: my-evolution/Locations.h:697
+msgid "Fairchild"
+msgstr ""
+
+#: my-evolution/Locations.h:698
+msgid "Fairfield"
+msgstr ""
+
+#: my-evolution/Locations.h:699
+#, fuzzy
+msgid "Fairmont"
+msgstr "M�s"
+
+#: 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 "De"
+
+#: my-evolution/Locations.h:705
+msgid "Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:706
+msgid "Farmington"
+msgstr ""
+
+#: my-evolution/Locations.h:707
+#, fuzzy
+msgid "Farmville"
+msgstr "Nome completo:"
+
+#: my-evolution/Locations.h:708
+#, fuzzy
+msgid "Faro"
+msgstr "De"
+
+#: my-evolution/Locations.h:709
+msgid "Fayetteville"
+msgstr ""
+
+#: my-evolution/Locations.h:710
+#, fuzzy
+msgid "Feng Nin"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:711
+msgid "Fergus Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:712
+msgid "Fernando De Noronha"
+msgstr ""
+
+#: my-evolution/Locations.h:713
+msgid "Ferrara"
+msgstr ""
+
+#: my-evolution/Locations.h:714
+#, fuzzy
+msgid "Figari"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:715
+#, fuzzy
+msgid "Findlay"
+msgstr "Sex"
+
+#: my-evolution/Locations.h:717
+#, fuzzy
+msgid "Firenze"
+msgstr "Semana"
+
+#: my-evolution/Locations.h:718
+#, fuzzy
+msgid "Fitchburg"
+msgstr "Outro"
+
+#: my-evolution/Locations.h:719
+msgid "Flagstaff"
+msgstr ""
+
+#: my-evolution/Locations.h:720
+#, fuzzy
+msgid "Flint"
+msgstr "Pr�_ximo"
+
+#: my-evolution/Locations.h:721
+msgid "Flippin"
+msgstr ""
+
+#: my-evolution/Locations.h:722
+#, fuzzy
+msgid "Florence"
+msgstr "Semana"
+
+#: my-evolution/Locations.h:723
+#, fuzzy
+msgid "Florennes"
+msgstr "Semana"
+
+#: my-evolution/Locations.h:724
+#, fuzzy
+msgid "Flores"
+msgstr "_Pasta"
+
+#: my-evolution/Locations.h:725
+msgid "Florianopolis"
+msgstr ""
+
+#: my-evolution/Locations.h:726
+#, fuzzy
+msgid "Florida"
+msgstr "Sex"
+
+#: my-evolution/Locations.h:727
+#, fuzzy
+msgid "Floro"
+msgstr "De"
+
+#: my-evolution/Locations.h:728
+msgid "Fond Du Lac"
+msgstr ""
+
+#: my-evolution/Locations.h:729
+#, fuzzy
+msgid "Forde/Bringeland"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:730
+#, fuzzy
+msgid "Forli"
+msgstr "Sex"
+
+#: my-evolution/Locations.h:731
+#, fuzzy
+msgid "Formosa"
+msgstr "F_ormato"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:742
+#, fuzzy
+msgid "Fort Eustis"
+msgstr "Mudar nome de atalho"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:748
+msgid "Fort Leonard"
+msgstr ""
+
+#: my-evolution/Locations.h:749
+msgid "Fort Lewis"
+msgstr ""
+
+#: my-evolution/Locations.h:750
+msgid "Fort Madison"
+msgstr ""
+
+#: my-evolution/Locations.h:751
+#, fuzzy
+msgid "Fort Meade"
+msgstr "Enviar esta mensagem"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:757
+#, fuzzy
+msgid "Fort Smith"
+msgstr "F_ormato"
+
+#: my-evolution/Locations.h:758
+#, fuzzy
+msgid "Fort Stewart"
+msgstr "_Come�ando"
+
+#: my-evolution/Locations.h:759
+msgid "Fort Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:760
+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 ""
+
+#: my-evolution/Locations.h:769
+msgid "Franklin"
+msgstr ""
+
+#: my-evolution/Locations.h:770
+#, fuzzy
+msgid "Fredericton"
+msgstr "Nenhuma descri��o"
+
+#: my-evolution/Locations.h:771
+#, fuzzy
+msgid "Freeport"
+msgstr "Semana"
+
+#: my-evolution/Locations.h:772
+msgid "Frenchville"
+msgstr ""
+
+#: my-evolution/Locations.h:773
+#, fuzzy
+msgid "Fresno"
+msgstr "Semana"
+
+#: my-evolution/Locations.h:774
+msgid "Fresno-Chandler"
+msgstr ""
+
+#: my-evolution/Locations.h:775
+#, fuzzy
+msgid "Friday Harbor"
+msgstr "Sex"
+
+#: my-evolution/Locations.h:776
+msgid "Friedrichshafen"
+msgstr ""
+
+#: my-evolution/Locations.h:777
+#, fuzzy
+msgid "Frigg"
+msgstr "Sex"
+
+#: my-evolution/Locations.h:778
+#, fuzzy
+msgid "Frontone"
+msgstr "M�s"
+
+#: my-evolution/Locations.h:779
+msgid "Frosinone"
+msgstr ""
+
+#: my-evolution/Locations.h:780
+msgid "Fryeburg"
+msgstr ""
+
+#: 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 "_Contacto"
+
+#: my-evolution/Locations.h:789
+msgid "Gadsden"
+msgstr ""
+
+#: my-evolution/Locations.h:790
+#, fuzzy
+msgid "Gage"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:791
+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 "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:796
+msgid "Galesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:797
+msgid "Gallup"
+msgstr ""
+
+#: my-evolution/Locations.h:798
+msgid "Galveston"
+msgstr ""
+
+#: my-evolution/Locations.h:799
+msgid "Gambell"
+msgstr ""
+
+#: my-evolution/Locations.h:800
+#, fuzzy
+msgid "Gander"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:801
+msgid "Garden City"
+msgstr ""
+
+#: my-evolution/Locations.h:802
+msgid "Gary"
+msgstr ""
+
+#: my-evolution/Locations.h:803
+#, fuzzy
+msgid "Gassim"
+msgstr "am"
+
+#: my-evolution/Locations.h:804
+msgid "Gatineau"
+msgstr ""
+
+#: my-evolution/Locations.h:805
+msgid "Gaziantep"
+msgstr ""
+
+#: my-evolution/Locations.h:806
+#, fuzzy
+msgid "Gdansk"
+msgstr "DiasRascunhos"
+
+#: my-evolution/Locations.h:807
+#, fuzzy
+msgid "Geneve"
+msgstr "Semana"
+
+#: my-evolution/Locations.h:808
+#, fuzzy
+msgid "Genova"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:809
+msgid "George Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:810
+msgid "Georgetown"
+msgstr ""
+
+#: my-evolution/Locations.h:813
+msgid "Ghardaia"
+msgstr ""
+
+#: my-evolution/Locations.h:814
+msgid "Ghedi"
+msgstr ""
+
+#: my-evolution/Locations.h:816
+msgid "Gifu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:817
+#, fuzzy
+msgid "Gila Bend"
+msgstr "Encontrar"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:821
+#, fuzzy
+msgid "Girona"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:822
+msgid "Gizan"
+msgstr ""
+
+#: my-evolution/Locations.h:823
+msgid "Glasgow"
+msgstr ""
+
+#: my-evolution/Locations.h:824
+msgid "Glendive"
+msgstr ""
+
+#: my-evolution/Locations.h:825
+msgid "Glens Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:826
+msgid "Goiania"
+msgstr ""
+
+#: my-evolution/Locations.h:827
+msgid "Goldsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:828
+#, fuzzy
+msgid "Goodland"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:829
+#, fuzzy
+msgid "Goose Bay"
+msgstr "Hoje"
+
+#: my-evolution/Locations.h:830
+msgid "Goteborg (Landvetter)"
+msgstr ""
+
+#: my-evolution/Locations.h:831
+msgid "Goteborg (Save)"
+msgstr ""
+
+#: my-evolution/Locations.h:832
+#, fuzzy
+msgid "Granada"
+msgstr "Novo Ca_lend�rio"
+
+#: 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 "Encontrar"
+
+#: my-evolution/Locations.h:837
+msgid "Grand Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:838
+msgid "Grand Junction"
+msgstr ""
+
+#: my-evolution/Locations.h:839
+msgid "Grand Marais"
+msgstr ""
+
+#: my-evolution/Locations.h:840
+msgid "Grand Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:841
+#, fuzzy
+msgid "Grandview"
+msgstr "Prever impress�o"
+
+#: my-evolution/Locations.h:842
+msgid "Grangeville"
+msgstr ""
+
+#: my-evolution/Locations.h:843
+#, fuzzy
+msgid "Grants"
+msgstr "Data"
+
+#: my-evolution/Locations.h:844
+#, fuzzy
+msgid "Graz"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:845
+#, fuzzy
+msgid "Great Falls"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:847
+#, fuzzy
+msgid "Greeley"
+msgstr "Semana"
+
+#: my-evolution/Locations.h:848
+#, fuzzy
+msgid "Green Bay"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:849
+msgid "Green River"
+msgstr ""
+
+#: my-evolution/Locations.h:850
+msgid "Greensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:851
+#, fuzzy
+msgid "Greenville"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:852
+msgid "Greenville-Spartanburg"
+msgstr ""
+
+#: my-evolution/Locations.h:853
+#, fuzzy
+msgid "Greenwood"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:854
+msgid "Grenoble-Saint-Geoirs"
+msgstr ""
+
+#: my-evolution/Locations.h:855
+msgid "Griffiss AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:856
+#, fuzzy
+msgid "Groningen"
+msgstr "Seg"
+
+#: my-evolution/Locations.h:857
+msgid "Grosseto"
+msgstr ""
+
+#: my-evolution/Locations.h:858
+msgid "Groton"
+msgstr ""
+
+#: my-evolution/Locations.h:859
+msgid "Guadalajara"
+msgstr ""
+
+#: my-evolution/Locations.h:860
+msgid "Guadalupe Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:861
+msgid "Guanare"
+msgstr ""
+
+#: my-evolution/Locations.h:862
+msgid "Guangzhou"
+msgstr ""
+
+#: my-evolution/Locations.h:863
+msgid "Guantanamo"
+msgstr ""
+
+#: my-evolution/Locations.h:864
+#, fuzzy
+msgid "Guarany"
+msgstr "Dia"
+
+#: my-evolution/Locations.h:865
+msgid "Guaratingueta"
+msgstr ""
+
+#: my-evolution/Locations.h:866
+msgid "Guarulhos"
+msgstr ""
+
+#: my-evolution/Locations.h:868
+msgid "Guayaquil/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:869
+#, fuzzy
+msgid "Guaymas"
+msgstr "am"
+
+#: my-evolution/Locations.h:870
+#, fuzzy
+msgid "Guernsey"
+msgstr "Dia"
+
+#: my-evolution/Locations.h:871
+msgid "Guidonia"
+msgstr ""
+
+#: my-evolution/Locations.h:872
+msgid "Gulfport"
+msgstr ""
+
+#: my-evolution/Locations.h:873
+msgid "Gulkana"
+msgstr ""
+
+#: my-evolution/Locations.h:874
+msgid "Gullfax C"
+msgstr ""
+
+#: my-evolution/Locations.h:875
+#, fuzzy
+msgid "Gunnison"
+msgstr "Segundos"
+
+#: my-evolution/Locations.h:876
+msgid "Gunnison (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:877
+#, fuzzy
+msgid "Guriat"
+msgstr "Imprimir"
+
+#: my-evolution/Locations.h:878
+msgid "Gustavus"
+msgstr ""
+
+#: my-evolution/Locations.h:879
+#, fuzzy
+msgid "Guymon"
+msgstr "am"
+
+#: my-evolution/Locations.h:880
+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 ""
+
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#, fuzzy
+msgid "Hail"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:886
+msgid "Hailey-Sun Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:887
+#, fuzzy
+msgid "Haines"
+msgstr "Cabe�alhos:"
+
+#: 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 "_Correio"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:902
+#, fuzzy
+msgid "Ha Noi"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:903
+msgid "Harbor Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:904
+#, fuzzy
+msgid "Harlingen"
+msgstr "Seg"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:911
+#, fuzzy
+msgid "Hastings"
+msgstr "Cabe�alhos:"
+
+#: my-evolution/Locations.h:912
+msgid "Haugesund"
+msgstr ""
+
+#: my-evolution/Locations.h:913
+#, fuzzy
+msgid "Havre"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:914
+#, fuzzy
+msgid "Hawaii"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:915
+msgid "Hawthorne"
+msgstr ""
+
+#: my-evolution/Locations.h:916
+#, fuzzy
+msgid "Hayden"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:917
+msgid "Hayes River"
+msgstr ""
+
+#: my-evolution/Locations.h:918
+#, fuzzy
+msgid "Hays"
+msgstr "DiasRascunhos"
+
+#: 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 "Enviar"
+
+#: my-evolution/Locations.h:922
+msgid "Helsinki"
+msgstr ""
+
+#: my-evolution/Locations.h:923
+#, fuzzy
+msgid "Henderson"
+msgstr "Ano"
+
+#: 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
+msgid "Hillsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:930
+#, fuzzy
+msgid "Hilo"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:931
+msgid "Hinesville"
+msgstr ""
+
+#: my-evolution/Locations.h:932
+msgid "Hiroshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:933
+#, fuzzy
+msgid "Hobart"
+msgstr "Horas"
+
+#: my-evolution/Locations.h:934
+#, fuzzy
+msgid "Hobbs"
+msgstr "Horas"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:941
+#, fuzzy
+msgid "Holguin"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:942
+#, fuzzy
+msgid "Homer"
+msgstr "Casa"
+
+#: my-evolution/Locations.h:943
+msgid "Homestead AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:944
+#, fuzzy
+msgid "Hondo"
+msgstr "Anular"
+
+#: 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 "Evolution"
+
+#: my-evolution/Locations.h:954
+#, fuzzy
+msgid "Houma"
+msgstr "Casa"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:960
+#, fuzzy
+msgid "Howard AFB"
+msgstr "Enviar esta mensagem"
+
+#: my-evolution/Locations.h:961
+msgid "Hsinchu"
+msgstr ""
+
+#: my-evolution/Locations.h:962
+msgid "Huanuco"
+msgstr ""
+
+#: my-evolution/Locations.h:963
+msgid "Huehuetenango"
+msgstr ""
+
+#: my-evolution/Locations.h:964
+msgid "Hulien"
+msgstr ""
+
+#: my-evolution/Locations.h:965
+msgid "Humberside"
+msgstr ""
+
+#: my-evolution/Locations.h:967
+msgid "Huntington"
+msgstr ""
+
+#: my-evolution/Locations.h:968
+#, fuzzy
+msgid "Huntsville"
+msgstr "(Sem t�tulo)"
+
+#: my-evolution/Locations.h:969
+msgid "Hurlburt"
+msgstr ""
+
+#: my-evolution/Locations.h:970
+#, fuzzy
+msgid "Huron"
+msgstr "Horas"
+
+#: 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 "Colar"
+
+#: my-evolution/Locations.h:977
+msgid "Ibiza"
+msgstr ""
+
+#: my-evolution/Locations.h:979
+msgid "Ichikawa"
+msgstr ""
+
+#: my-evolution/Locations.h:980
+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 "Encontrar"
+
+#: my-evolution/Locations.h:985
+msgid "Iliamna"
+msgstr ""
+
+#: my-evolution/Locations.h:986
+msgid "Illinois"
+msgstr ""
+
+#: my-evolution/Locations.h:987
+#, fuzzy
+msgid "Imperial"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:988
+#, fuzzy
+msgid "Imperial (2)"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:989
+#, fuzzy
+msgid "Imperial Beach"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:990
+msgid "In Amenas"
+msgstr ""
+
+#: my-evolution/Locations.h:992
+#, fuzzy
+msgid "Indiana"
+msgstr "�nd_ice de ajuda"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:998
+msgid "Inverness"
+msgstr ""
+
+#: my-evolution/Locations.h:999
+msgid "Inyokern"
+msgstr ""
+
+#: my-evolution/Locations.h:1000
+#, fuzzy
+msgid "Iowa"
+msgstr "Novo"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1005
+#, fuzzy
+msgid "Iraklion"
+msgstr "Nenhuma Informa��o"
+
+#: my-evolution/Locations.h:1006
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1008
+#, fuzzy
+msgid "Iron Mountain"
+msgstr "Assunto"
+
+#: 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 "Hoje"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1025
+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
+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 ""
+
+#: my-evolution/Locations.h:1044
+#, fuzzy
+msgid "Jonkoping"
+msgstr "Seg"
+
+#: my-evolution/Locations.h:1045
+#, fuzzy
+msgid "Joplin"
+msgstr "Copiar"
+
+#: my-evolution/Locations.h:1047
+msgid "Juanjui"
+msgstr ""
+
+#: my-evolution/Locations.h:1048
+msgid "Juan Santamaria"
+msgstr ""
+
+#: my-evolution/Locations.h:1049
+msgid "Juigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:1050
+msgid "Jujuy"
+msgstr ""
+
+#: my-evolution/Locations.h:1051
+msgid "Juliaca"
+msgstr ""
+
+#: my-evolution/Locations.h:1052
+#, fuzzy
+msgid "Junction"
+msgstr "Segundos"
+
+#: my-evolution/Locations.h:1053
+msgid "Juneau"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1059
+#, fuzzy
+msgid "Kalamata"
+msgstr "_Correio"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1071
+#, fuzzy
+msgid "Karachi"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:1072
+#, fuzzy
+msgid "Karup"
+msgstr "Grupo %i"
+
+#: 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
+msgid "Kazan"
+msgstr ""
+
+#: my-evolution/Locations.h:1080
+msgid "Kearney"
+msgstr ""
+
+#: my-evolution/Locations.h:1081
+#, fuzzy
+msgid "Keene"
+msgstr "Enviar"
+
+#: 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 "Enviar"
+
+#: my-evolution/Locations.h:1085
+msgid "Kenosha"
+msgstr ""
+
+#: my-evolution/Locations.h:1086
+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 "Dia"
+
+#: my-evolution/Locations.h:1090
+msgid "Ketchikan"
+msgstr ""
+
+#: my-evolution/Locations.h:1091
+#, fuzzy
+msgid "Key West"
+msgstr "Qa"
+
+#: 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 "Encontrar"
+
+#: 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 "Hoje"
+
+#: my-evolution/Locations.h:1132
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1133
+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
+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
+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
+msgid "Laconia"
+msgstr ""
+
+#: my-evolution/Locations.h:1151
+msgid "La Coruna"
+msgstr ""
+
+#: my-evolution/Locations.h:1152
+msgid "La Crosse"
+msgstr ""
+
+#: my-evolution/Locations.h:1153
+msgid "La Esperanza"
+msgstr ""
+
+#: my-evolution/Locations.h:1154
+#, fuzzy
+msgid "Lafayette"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1155
+msgid "La Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1156
+#, fuzzy
+msgid "Lahaina"
+msgstr "Carro"
+
+#: my-evolution/Locations.h:1157
+#, fuzzy
+msgid "Lahore"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1158
+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 "Encontrar"
+
+#: my-evolution/Locations.h:1164
+msgid "Lake Tahoe"
+msgstr ""
+
+#: my-evolution/Locations.h:1165
+#, fuzzy
+msgid "Lakeview"
+msgstr "Prever impress�o"
+
+#: my-evolution/Locations.h:1166
+#, fuzzy
+msgid "Lamar"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1167
+#, fuzzy
+msgid "La Mesa"
+msgstr "Mensagem de _correio"
+
+#: my-evolution/Locations.h:1168
+msgid "Lamezia"
+msgstr ""
+
+#: my-evolution/Locations.h:1169
+msgid "Lamoni"
+msgstr ""
+
+#: my-evolution/Locations.h:1170
+msgid "Lampedusa"
+msgstr ""
+
+#: my-evolution/Locations.h:1171
+#, fuzzy
+msgid "Lanai"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1172
+#, fuzzy
+msgid "Lancaster"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1173
+#, fuzzy
+msgid "Lander"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:1174
+#, fuzzy
+msgid "Langebaanweg"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1175
+msgid "Langley AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1176
+msgid "Lannion"
+msgstr ""
+
+#: my-evolution/Locations.h:1177
+#, fuzzy
+msgid "Lansing"
+msgstr "Seg"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1182
+#, fuzzy
+msgid "Laredo"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1183
+#, fuzzy
+msgid "Larnaka"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:1184
+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
+msgid "Latina"
+msgstr ""
+
+#: my-evolution/Locations.h:1189
+msgid "Latrobe"
+msgstr ""
+
+#: my-evolution/Locations.h:1191
+msgid "Laughlin"
+msgstr ""
+
+#: my-evolution/Locations.h:1192
+#, fuzzy
+msgid "Laurel"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1193
+msgid "La Verne"
+msgstr ""
+
+#: my-evolution/Locations.h:1194
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1195
+msgid "Lawton"
+msgstr ""
+
+#: my-evolution/Locations.h:1196
+msgid "Leadville"
+msgstr ""
+
+#: my-evolution/Locations.h:1197
+msgid "Learmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1199
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1201
+msgid "Leesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1202
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1205
+msgid "Leknes"
+msgstr ""
+
+#: my-evolution/Locations.h:1206
+#, fuzzy
+msgid "Le Mans"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1207
+#, fuzzy
+msgid "Le Marine"
+msgstr "�cones _grandes"
+
+#: my-evolution/Locations.h:1208
+msgid "Lemmon"
+msgstr ""
+
+#: my-evolution/Locations.h:1209
+#, fuzzy
+msgid "Lemoore"
+msgstr "Remover"
+
+#: my-evolution/Locations.h:1210
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1212
+#, fuzzy
+msgid "Leuchars"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:1213
+msgid "Lewisburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1214
+#, fuzzy
+msgid "Lewiston"
+msgstr "Novo"
+
+#: my-evolution/Locations.h:1215
+msgid "Lewistown"
+msgstr ""
+
+#: my-evolution/Locations.h:1216
+msgid "Lexington"
+msgstr ""
+
+#: my-evolution/Locations.h:1217
+#, fuzzy
+msgid "Liberal"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1219
+#, fuzzy
+msgid "Libya"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1220
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1221
+msgid "Lidgerwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1222
+#, fuzzy
+msgid "Liege"
+msgstr "Cabe�alhos:"
+
+#: my-evolution/Locations.h:1223
+#, fuzzy
+msgid "Lihue"
+msgstr "Minuto"
+
+#: my-evolution/Locations.h:1224
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1225
+msgid "Lima-Callao"
+msgstr ""
+
+#: my-evolution/Locations.h:1226
+msgid "Limnos"
+msgstr ""
+
+#: my-evolution/Locations.h:1227
+msgid "Limoges"
+msgstr ""
+
+#: my-evolution/Locations.h:1228
+#, fuzzy
+msgid "Limon"
+msgstr "M�s"
+
+#: my-evolution/Locations.h:1229
+msgid "Lincoln"
+msgstr ""
+
+#: my-evolution/Locations.h:1230
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1231
+#, fuzzy
+msgid "Lisboa"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1232
+#, fuzzy
+msgid "Lista"
+msgstr "Pr�_ximo"
+
+#: my-evolution/Locations.h:1233
+msgid "Litchfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1240
+msgid "Ljubljana"
+msgstr ""
+
+#: my-evolution/Locations.h:1241
+#, fuzzy
+msgid "Logan"
+msgstr "Hoje"
+
+#: my-evolution/Locations.h:1242
+msgid "Lolland Falster"
+msgstr ""
+
+#: my-evolution/Locations.h:1243
+#, fuzzy
+msgid "Lompoc"
+msgstr "Copiar"
+
+#: my-evolution/Locations.h:1244
+#, fuzzy
+msgid "London"
+msgstr "Anular"
+
+#: my-evolution/Locations.h:1245
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1249
+#, fuzzy
+msgid "Londrina"
+msgstr "Horas"
+
+#: my-evolution/Locations.h:1250
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1253
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+#: my-evolution/Locations.h:1254
+#, fuzzy
+msgid "Los Alamos"
+msgstr "Alarmes"
+
+#: my-evolution/Locations.h:1255
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1260
+msgid "Lousiana"
+msgstr ""
+
+#: my-evolution/Locations.h:1261
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1265
+msgid "Lugano"
+msgstr ""
+
+#: my-evolution/Locations.h:1266
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1267
+#, fuzzy
+msgid "Luton"
+msgstr "Nenhuma descri��o"
+
+#: my-evolution/Locations.h:1269
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1270
+msgid "Luxor"
+msgstr ""
+
+#: my-evolution/Locations.h:1271
+msgid "Lviv"
+msgstr ""
+
+#: my-evolution/Locations.h:1272
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1275
+msgid "Lyon-Satolas"
+msgstr ""
+
+#: my-evolution/Locations.h:1276
+#, fuzzy
+msgid "Maastricht"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:1277
+#, fuzzy
+msgid "Macae"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:1278
+#, fuzzy
+msgid "Macapa"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:1279
+#, fuzzy
+msgid "Maceio"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1280
+#, fuzzy
+msgid "Macon"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1281
+#, fuzzy
+msgid "Madinah"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1282
+#, fuzzy
+msgid "Madison"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1283
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1285
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+#: my-evolution/Locations.h:1286
+#, fuzzy
+msgid "Magadan"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:1287
+msgid "Magdalena"
+msgstr ""
+
+#: my-evolution/Locations.h:1288
+#, fuzzy
+msgid "Maine"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1289
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1290
+msgid "Makkah"
+msgstr ""
+
+#: my-evolution/Locations.h:1291
+#, fuzzy
+msgid "Makung"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1292
+#, fuzzy
+msgid "Malad City"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1293
+#, fuzzy
+msgid "Malaga"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1294
+#, fuzzy
+msgid "Malatya"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1295
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1296
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1298
+msgid "Mammoth Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1299
+#, fuzzy
+msgid "Managua"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1300
+#, fuzzy
+msgid "Manassas"
+msgstr "Mensagem de _correio"
+
+#: my-evolution/Locations.h:1301
+#, fuzzy
+msgid "Manaus"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:1302
+#, fuzzy
+msgid "Manchester"
+msgstr "Caminho"
+
+#: my-evolution/Locations.h:1303
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+msgid "Manhattan"
+msgstr ""
+
+#: my-evolution/Locations.h:1305
+#, fuzzy
+msgid "Manisa"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1306
+#, fuzzy
+msgid "Manistee"
+msgstr "Colar"
+
+#: my-evolution/Locations.h:1307
+#, fuzzy
+msgid "Manitoba"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1308
+msgid "Manitowoc"
+msgstr ""
+
+#: my-evolution/Locations.h:1309
+#, fuzzy
+msgid "Mankato"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1310
+#, fuzzy
+msgid "Mansfield"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1311
+#, fuzzy
+msgid "Manta"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1312
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1313
+msgid "Maraba"
+msgstr ""
+
+#: my-evolution/Locations.h:1314
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1315
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1316
+#, fuzzy
+msgid "Marathon"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:1317
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1318
+#, fuzzy
+msgid "Margarita"
+msgstr "�cones _grandes"
+
+#: my-evolution/Locations.h:1319
+#, fuzzy
+msgid "Marianna"
+msgstr "�cones _grandes"
+
+#: my-evolution/Locations.h:1320
+#, fuzzy
+msgid "Marib"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1321
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1322
+#, fuzzy
+msgid "Marietta"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1323
+msgid "Marino di Ravenna"
+msgstr ""
+
+#: my-evolution/Locations.h:1324
+#, fuzzy
+msgid "Marion"
+msgstr "�cones _grandes"
+
+#: my-evolution/Locations.h:1325
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1326
+#, fuzzy
+msgid "Marquette"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1327
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+msgid "Marseilles"
+msgstr ""
+
+#: my-evolution/Locations.h:1329
+#, fuzzy
+msgid "Marshall"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:1330
+msgid "Marshalltown"
+msgstr ""
+
+#: my-evolution/Locations.h:1331
+msgid "Marshfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1332
+#, fuzzy
+msgid "Marte"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1333
+msgid "Marthas Vineyard"
+msgstr ""
+
+#: my-evolution/Locations.h:1334
+#, fuzzy
+msgid "Martinsburg"
+msgstr "�cones _grandes"
+
+#: my-evolution/Locations.h:1335
+#, fuzzy
+msgid "Martinsville"
+msgstr "�cones _grandes"
+
+#: my-evolution/Locations.h:1336
+#, fuzzy
+msgid "Maryland"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1339
+msgid "Mashhad"
+msgstr ""
+
+#: my-evolution/Locations.h:1340
+#, fuzzy
+msgid "Masirah"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:1341
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1343
+#, fuzzy
+msgid "Massena"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1344
+#, fuzzy
+msgid "Matamoros"
+msgstr "Cores"
+
+#: my-evolution/Locations.h:1345
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1347
+msgid "Matsuyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1348
+#, fuzzy
+msgid "Mattoon"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1349
+#, fuzzy
+msgid "Mayaguez"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1350
+#, fuzzy
+msgid "Mayport"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1351
+#, fuzzy
+msgid "Mazatlan"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1352
+#, fuzzy
+msgid "Mazu"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:1353
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1354
+msgid "McAllen"
+msgstr ""
+
+#: my-evolution/Locations.h:1355
+#, fuzzy
+msgid "McCall"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1356
+#, fuzzy
+msgid "McCarthy"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:1357
+msgid "McClellan"
+msgstr ""
+
+#: my-evolution/Locations.h:1358
+#, fuzzy
+msgid "McComb"
+msgstr "Copiar"
+
+#: my-evolution/Locations.h:1359
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1361
+msgid "Mc Gregor"
+msgstr ""
+
+#: my-evolution/Locations.h:1362
+#, fuzzy
+msgid "Meacham"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:1363
+#, fuzzy
+msgid "Medford"
+msgstr "Hora"
+
+#: my-evolution/Locations.h:1364
+msgid "Medicine Lodge"
+msgstr ""
+
+#: my-evolution/Locations.h:1365
+#, fuzzy
+msgid "Mehamn"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1366
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1367
+msgid "Melbourne"
+msgstr ""
+
+#: my-evolution/Locations.h:1368
+#, fuzzy
+msgid "Melfa"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1369
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1373
+#, fuzzy
+msgid "Mendoza"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1374
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1377
+msgid "Merced"
+msgstr ""
+
+#: my-evolution/Locations.h:1378
+#, fuzzy
+msgid "Merida"
+msgstr "Sex"
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1380
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1381
+msgid "Merril Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1382
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1386
+#, fuzzy
+msgid "Mexicali"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1388
+#, fuzzy
+msgid "Miami"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1391
+msgid "Michigan"
+msgstr ""
+
+#: my-evolution/Locations.h:1392
+#, fuzzy
+msgid "Middle East"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1393
+msgid "Middleton Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1394
+#, fuzzy
+msgid "Middletown"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1395
+#, fuzzy
+msgid "Midland"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1396
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1398
+msgid "Milano/Malpensa"
+msgstr ""
+
+#: my-evolution/Locations.h:1399
+#, fuzzy
+msgid "Miles City"
+msgstr "Nome completo:"
+
+#: my-evolution/Locations.h:1400
+#, fuzzy
+msgid "Milford"
+msgstr "Hora"
+
+#: my-evolution/Locations.h:1401
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1402
+msgid "Millville"
+msgstr ""
+
+#: my-evolution/Locations.h:1403
+#, fuzzy
+msgid "Milton"
+msgstr "atalhos principais"
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1407
+msgid "Minatitlan"
+msgstr ""
+
+#: my-evolution/Locations.h:1408
+msgid "Minchumina"
+msgstr ""
+
+#: my-evolution/Locations.h:1409
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1414
+#, fuzzy
+msgid "Minnesota"
+msgstr "Minutos"
+
+#: my-evolution/Locations.h:1415
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1416
+#, fuzzy
+msgid "Minot"
+msgstr "Minutos"
+
+#: my-evolution/Locations.h:1417
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1419
+msgid "Mississippi"
+msgstr ""
+
+#: my-evolution/Locations.h:1420
+msgid "Missoula"
+msgstr ""
+
+#: my-evolution/Locations.h:1421
+msgid "Missouri"
+msgstr ""
+
+#: my-evolution/Locations.h:1422
+#, fuzzy
+msgid "Mitchell"
+msgstr "Caminho"
+
+#: my-evolution/Locations.h:1423
+msgid "Mitilini"
+msgstr ""
+
+#: my-evolution/Locations.h:1424
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1425
+#, fuzzy
+msgid "Miyazaki Airport"
+msgstr "Transporte de correio"
+
+#: my-evolution/Locations.h:1426
+#, fuzzy
+msgid "Moa"
+msgstr "Sg"
+
+#: my-evolution/Locations.h:1427
+#, fuzzy
+msgid "Mobile Downtown"
+msgstr "Telem�vel"
+
+#: my-evolution/Locations.h:1428
+msgid "Mobile Regional Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1429
+#, fuzzy
+msgid "Mobridge"
+msgstr "Telem�vel"
+
+#: my-evolution/Locations.h:1430
+msgid "Modesto"
+msgstr ""
+
+#: my-evolution/Locations.h:1431
+msgid "Mo I Rana"
+msgstr ""
+
+#: my-evolution/Locations.h:1432
+#, fuzzy
+msgid "Mojave"
+msgstr "Sg"
+
+#: my-evolution/Locations.h:1433
+#, fuzzy
+msgid "Molde"
+msgstr "Telem�vel"
+
+#: my-evolution/Locations.h:1434
+#, fuzzy
+msgid "Moldova"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1435
+msgid "Moline-Quad Cities"
+msgstr ""
+
+#: my-evolution/Locations.h:1436
+#, fuzzy
+msgid "Molokai"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1437
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1438
+msgid "Monchengladbach"
+msgstr ""
+
+#: my-evolution/Locations.h:1439
+#, fuzzy
+msgid "Monclova"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1440
+#, fuzzy
+msgid "Moncton"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1441
+#, fuzzy
+msgid "Monida"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1442
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+#: my-evolution/Locations.h:1443
+#, fuzzy
+msgid "Monroe"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1444
+#, fuzzy
+msgid "Montague"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1445
+#, fuzzy
+msgid "Montana"
+msgstr "_Ac��es"
+
+#: my-evolution/Locations.h:1446
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1448
+msgid "Monte Bisbino"
+msgstr ""
+
+#: my-evolution/Locations.h:1449
+msgid "Monte Calamita"
+msgstr ""
+
+#: my-evolution/Locations.h:1450
+#, fuzzy
+msgid "Monte Cimone"
+msgstr "M�s"
+
+#: my-evolution/Locations.h:1451
+msgid "Montego Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:1452
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1453
+#, fuzzy
+msgid "Monterey"
+msgstr "M�s"
+
+#: my-evolution/Locations.h:1454
+msgid "Monterrey"
+msgstr ""
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1458
+msgid "Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1459
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1460
+#, fuzzy
+msgid "Monticello"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1461
+#, fuzzy
+msgid "Montpelier"
+msgstr "M�s"
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1465
+#, fuzzy
+msgid "Montrose"
+msgstr "M�s"
+
+#: my-evolution/Locations.h:1466
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1467
+msgid "Morelia"
+msgstr ""
+
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Morgantown"
+msgstr "Organiza��o"
+
+#: my-evolution/Locations.h:1469
+#, fuzzy
+msgid "Moriarty"
+msgstr "Prim�rio"
+
+#: my-evolution/Locations.h:1471
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1474
+msgid "Moses Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1475
+#, fuzzy
+msgid "Mosinee"
+msgstr "Telem�vel"
+
+#: my-evolution/Locations.h:1476
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain Home"
+msgstr ""
+
+#: my-evolution/Locations.h:1479
+#, fuzzy
+msgid "Mountain View"
+msgstr "M�s"
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1482
+#, fuzzy
+msgid "Mount Shasta"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:1483
+#, fuzzy
+msgid "Mount Vernon"
+msgstr "M�s"
+
+#: my-evolution/Locations.h:1484
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1487
+msgid "Muir"
+msgstr ""
+
+#: my-evolution/Locations.h:1488
+#, fuzzy
+msgid "Mullan"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:1489
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1490
+msgid "Munchen"
+msgstr ""
+
+#: my-evolution/Locations.h:1491
+msgid "Muncie"
+msgstr ""
+
+#: my-evolution/Locations.h:1492
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1493
+msgid "Murcia"
+msgstr ""
+
+#: my-evolution/Locations.h:1494
+msgid "Murmansk"
+msgstr ""
+
+#: my-evolution/Locations.h:1495
+#, fuzzy
+msgid "Mus"
+msgstr "Ocupado"
+
+#: my-evolution/Locations.h:1496
+msgid "Muscatine"
+msgstr ""
+
+#: my-evolution/Locations.h:1497
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1498
+msgid "Muskegon"
+msgstr ""
+
+#: my-evolution/Locations.h:1499
+#, fuzzy
+msgid "Mykonos"
+msgstr "M�s"
+
+#: my-evolution/Locations.h:1500
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1507
+msgid "Najran"
+msgstr ""
+
+#: my-evolution/Locations.h:1508
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1509
+msgid "Nalchik"
+msgstr ""
+
+#: my-evolution/Locations.h:1510
+#, fuzzy
+msgid "Namsos"
+msgstr "Nome"
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1513
+msgid "Nankishirahama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1514
+#, fuzzy
+msgid "Nanning"
+msgstr "Seg"
+
+#: my-evolution/Locations.h:1515
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1516
+msgid "Nantucket"
+msgstr ""
+
+#: my-evolution/Locations.h:1517
+#, fuzzy
+msgid "Napa"
+msgstr "Responder"
+
+#: my-evolution/Locations.h:1518
+#, fuzzy
+msgid "Naples"
+msgstr "Nome"
+
+#: my-evolution/Locations.h:1519
+#, fuzzy
+msgid "Napoli"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1520
+#, fuzzy
+msgid "Narvik"
+msgstr "Nome"
+
+#: my-evolution/Locations.h:1521
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1524
+msgid "Nassau"
+msgstr ""
+
+#: my-evolution/Locations.h:1525
+#, fuzzy
+msgid "Natal"
+msgstr "Hoje"
+
+#: my-evolution/Locations.h:1526
+#, fuzzy
+msgid "Natchez"
+msgstr "Caminho"
+
+#: my-evolution/Locations.h:1527
+msgid "Nawabshah"
+msgstr ""
+
+#: my-evolution/Locations.h:1528
+#, fuzzy
+msgid "Nebraska"
+msgstr "_Tarefa"
+
+#: my-evolution/Locations.h:1529
+msgid "Needles"
+msgstr ""
+
+#: my-evolution/Locations.h:1530
+#, fuzzy
+msgid "Nenana"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:1532
+msgid "Neuquen"
+msgstr ""
+
+#: my-evolution/Locations.h:1533
+#, fuzzy
+msgid "Nevada"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:1534
+#, fuzzy
+msgid "Newark"
+msgstr "_Tarefa"
+
+#: my-evolution/Locations.h:1535
+#, fuzzy
+msgid "New Bedford"
+msgstr "Servidor:"
+
+#: my-evolution/Locations.h:1536
+#, fuzzy
+msgid "New Bern"
+msgstr "_Nova pasta"
+
+#: my-evolution/Locations.h:1537
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1539
+msgid "Newburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1540
+#, fuzzy
+msgid "Newcastle"
+msgstr "Novo"
+
+#: my-evolution/Locations.h:1541
+msgid "New Delhi/Palam"
+msgstr ""
+
+#: my-evolution/Locations.h:1542
+msgid "Newfoundland"
+msgstr ""
+
+#: my-evolution/Locations.h:1543
+msgid "New Hampshire"
+msgstr ""
+
+#: my-evolution/Locations.h:1544
+#, fuzzy
+msgid "New Haven"
+msgstr "_Contacto"
+
+#: my-evolution/Locations.h:1545
+#, fuzzy
+msgid "New Iberia"
+msgstr "_Contacto"
+
+#: my-evolution/Locations.h:1546
+#, fuzzy
+msgid "New Jersey"
+msgstr "Mensagem de _correio"
+
+#: my-evolution/Locations.h:1547
+msgid "New Mexico"
+msgstr ""
+
+#: my-evolution/Locations.h:1548
+#, fuzzy
+msgid "New Orleans"
+msgstr "Reponder para todos"
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1550
+msgid "New Orleans NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1551
+#, fuzzy
+msgid "Newport"
+msgstr "Hora"
+
+#: my-evolution/Locations.h:1552
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1553
+msgid "New Port Richey"
+msgstr ""
+
+#: my-evolution/Locations.h:1554
+#, fuzzy
+msgid "New River"
+msgstr "_Nova pasta"
+
+#: my-evolution/Locations.h:1555
+msgid "New Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1556
+#, fuzzy
+msgid "Newton"
+msgstr "Novo"
+
+#: my-evolution/Locations.h:1557
+#, fuzzy
+msgid "New York"
+msgstr "_Nova pasta"
+
+#: my-evolution/Locations.h:1558
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1559
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1561
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1564
+msgid "Niigata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1565
+#, fuzzy
+msgid "Nimes-Garons"
+msgstr "Nenhuma descri��o"
+
+#: my-evolution/Locations.h:1566
+#, fuzzy
+msgid "Nipawin"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:1567
+msgid "Nis"
+msgstr ""
+
+#: my-evolution/Locations.h:1568
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1570
+msgid "N Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1571
+#, fuzzy
+msgid "Nogales"
+msgstr "F_ormato"
+
+#: my-evolution/Locations.h:1572
+#, fuzzy
+msgid "Nome"
+msgstr "Nome"
+
+#: my-evolution/Locations.h:1573
+#, fuzzy
+msgid "Norfolk"
+msgstr "F_ormato"
+
+#: my-evolution/Locations.h:1575
+msgid "Norfolk NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1576
+#, fuzzy
+msgid "Norrkoping"
+msgstr "Seg"
+
+#: my-evolution/Locations.h:1577
+#, fuzzy
+msgid "North Adams"
+msgstr "_Nota"
+
+#: my-evolution/Locations.h:1578
+#, fuzzy
+msgid "North Bend"
+msgstr "Hora"
+
+#: my-evolution/Locations.h:1579
+msgid "North Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:1580
+#, fuzzy
+msgid "North Conway"
+msgstr "Novo"
+
+#: my-evolution/Locations.h:1581
+#, fuzzy
+msgid "North Dakota"
+msgstr "_Nota"
+
+#: my-evolution/Locations.h:1582
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1583
+msgid "North Kingstown"
+msgstr ""
+
+#: my-evolution/Locations.h:1584
+#, fuzzy
+msgid "North Platte"
+msgstr "_Nota"
+
+#: my-evolution/Locations.h:1585
+#, fuzzy
+msgid "Northway"
+msgstr "Novo"
+
+#: my-evolution/Locations.h:1586
+#, fuzzy
+msgid "Northwest Territories"
+msgstr "_Nota"
+
+#: my-evolution/Locations.h:1588
+#, fuzzy
+msgid "Norwich"
+msgstr "Hora"
+
+#: my-evolution/Locations.h:1589
+#, fuzzy
+msgid "Norwood"
+msgstr "Novo"
+
+#: my-evolution/Locations.h:1590
+#, fuzzy
+msgid "Notodden"
+msgstr "Nenhuma"
+
+#: my-evolution/Locations.h:1591
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1595
+msgid "Nueva Ocotepeque"
+msgstr ""
+
+#: my-evolution/Locations.h:1596
+#, fuzzy
+msgid "Nuevo Laredo"
+msgstr "_Come�ando"
+
+#: my-evolution/Locations.h:1597
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+msgid "Oahu"
+msgstr ""
+
+#: my-evolution/Locations.h:1600
+msgid "Oak Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:1601
+#, fuzzy
+msgid "Oakland"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1602
+msgid "Oaxaca"
+msgstr ""
+
+#: my-evolution/Locations.h:1603
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+msgid "Obihiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1605
+#, fuzzy
+msgid "Ocala"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1606
+msgid "Oceanside"
+msgstr ""
+
+#: my-evolution/Locations.h:1607
+#, fuzzy
+msgid "Odense"
+msgstr "_Abrir"
+
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1609
+#, fuzzy
+msgid "Oelwen"
+msgstr "_Abrir"
+
+#: my-evolution/Locations.h:1610
+#, fuzzy
+msgid "Ogden"
+msgstr "_Abrir"
+
+#: my-evolution/Locations.h:1611
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1613
+msgid "Ohio"
+msgstr ""
+
+#: my-evolution/Locations.h:1614
+#, fuzzy
+msgid "Ohrid"
+msgstr "Outro"
+
+#: my-evolution/Locations.h:1615
+msgid "Oita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1616
+msgid "Ojika Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1617
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1624
+msgid "Okushiri Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1625
+#, fuzzy
+msgid "Olathe"
+msgstr "Outro"
+
+#: my-evolution/Locations.h:1626
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1627
+msgid "Olbia"
+msgstr ""
+
+#: my-evolution/Locations.h:1628
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1629
+msgid "Omaha"
+msgstr ""
+
+#: my-evolution/Locations.h:1630
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1631
+#, fuzzy
+msgid "Omak"
+msgstr "Ok"
+
+#: my-evolution/Locations.h:1633
+msgid "Ominato Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1634
+#, fuzzy
+msgid "Omsk"
+msgstr "Ok"
+
+#: my-evolution/Locations.h:1635
+msgid "O'Neill"
+msgstr ""
+
+#: my-evolution/Locations.h:1636
+#, fuzzy
+msgid "Ontario"
+msgstr "Organiza��o"
+
+#: my-evolution/Locations.h:1637
+msgid "Oostende"
+msgstr ""
+
+#: my-evolution/Locations.h:1638
+msgid "Oran"
+msgstr ""
+
+#: my-evolution/Locations.h:1639
+msgid "Oran/Es Senia"
+msgstr ""
+
+#: my-evolution/Locations.h:1640
+#, fuzzy
+msgid "Orange"
+msgstr "Organiza��o:"
+
+#: my-evolution/Locations.h:1641
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1642
+msgid "Ord-Sharp"
+msgstr ""
+
+#: my-evolution/Locations.h:1643
+#, fuzzy
+msgid "Oregon"
+msgstr "Segundos"
+
+#: my-evolution/Locations.h:1644
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1645
+#, fuzzy
+msgid "Orland"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1646
+#, fuzzy
+msgid "Orlando"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1647
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1648
+msgid "Orsta-Volda"
+msgstr ""
+
+#: my-evolution/Locations.h:1649
+msgid "Oruro"
+msgstr ""
+
+#: my-evolution/Locations.h:1650
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1652
+#, fuzzy
+msgid "Oscoda"
+msgstr " segundos"
+
+#: my-evolution/Locations.h:1653
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1657
+msgid "Ostrava"
+msgstr ""
+
+#: my-evolution/Locations.h:1658
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1661
+#, fuzzy
+msgid "Owyhee"
+msgstr "Semana"
+
+#: my-evolution/Locations.h:1662
+#, fuzzy
+msgid "Oxford"
+msgstr "Hora"
+
+#: my-evolution/Locations.h:1663
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1670
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1671
+#, fuzzy
+msgid "Paganella"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1674
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1675
+msgid "Palacios"
+msgstr ""
+
+#: my-evolution/Locations.h:1676
+#, fuzzy
+msgid "Palermo"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1677
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1678
+msgid "Palmdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1679
+#, fuzzy
+msgid "Palmer"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1680
+#, fuzzy
+msgid "Palm Springs"
+msgstr "Configura��o do co_rreio..."
+
+#: my-evolution/Locations.h:1681
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1682
+#, fuzzy
+msgid "Pamplona"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:1684
+#, fuzzy
+msgid "Panama City"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:1685
+msgid "Pantelleria"
+msgstr ""
+
+#: my-evolution/Locations.h:1686
+#, fuzzy
+msgid "Papa"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1687
+msgid "Paphos"
+msgstr ""
+
+#: my-evolution/Locations.h:1689
+#, fuzzy
+msgid "Paris"
+msgstr "Prim�rio"
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1692
+#, fuzzy
+msgid "Paris/Orly"
+msgstr "Prioridade"
+
+#: my-evolution/Locations.h:1693
+msgid "Parkersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1694
+#, fuzzy
+msgid "Pasco"
+msgstr "Esquecer _Senhas"
+
+#: my-evolution/Locations.h:1695
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1700
+msgid "Passo Rolle"
+msgstr ""
+
+#: my-evolution/Locations.h:1701
+#, fuzzy
+msgid "Patna"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:1702
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1706
+#, fuzzy
+msgid "Paysandu"
+msgstr "Esquecer _Senhas"
+
+#: my-evolution/Locations.h:1707
+#, fuzzy
+msgid "Payson"
+msgstr "Esquecer _Senhas"
+
+#: my-evolution/Locations.h:1708
+#, fuzzy
+msgid "Pellston"
+msgstr "Nenhuma descri��o"
+
+#: my-evolution/Locations.h:1709
+#, fuzzy
+msgid "Pelotas"
+msgstr "Remover"
+
+#: my-evolution/Locations.h:1710
+#, fuzzy
+msgid "Pendleton"
+msgstr "Segundos"
+
+#: my-evolution/Locations.h:1711
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1716
+#, fuzzy
+msgid "Peoria"
+msgstr "Prim�rio"
+
+#: my-evolution/Locations.h:1717
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1718
+msgid "Pereira/Matecana"
+msgstr ""
+
+#: my-evolution/Locations.h:1719
+#, fuzzy
+msgid "Perm"
+msgstr "Prim�rio"
+
+#: my-evolution/Locations.h:1720
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1721
+msgid "Perry-Foley"
+msgstr ""
+
+#: my-evolution/Locations.h:1722
+#, fuzzy
+msgid "Perth"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1724
+#, fuzzy
+msgid "Perugia"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1725
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1730
+msgid "Philip"
+msgstr ""
+
+#: my-evolution/Locations.h:1731
+msgid "Philipsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1732
+msgid "Phillips"
+msgstr ""
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1739
+msgid "Piedras Negras"
+msgstr ""
+
+#: my-evolution/Locations.h:1740
+#, fuzzy
+msgid "Pierre"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:1741
+msgid "Pietersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1742
+#, fuzzy
+msgid "Pikeville"
+msgstr "Prever impress�o"
+
+#: my-evolution/Locations.h:1743
+#, fuzzy
+msgid "Pine Bluff"
+msgstr "Endere�o principal de correio electr�nico"
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+msgid "Pirassununga"
+msgstr ""
+
+#: my-evolution/Locations.h:1747
+#, fuzzy
+msgid "Pisa"
+msgstr "Colar"
+
+#: my-evolution/Locations.h:1748
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1753
+#, fuzzy
+msgid "Plymouth"
+msgstr "M�s"
+
+#: my-evolution/Locations.h:1754
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+#, fuzzy
+msgid "Pocos De Caldas"
+msgstr "_Fechar Calend�rio"
+
+#: my-evolution/Locations.h:1756
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1757
+msgid "Podgorica Titograd"
+msgstr ""
+
+#: my-evolution/Locations.h:1758
+msgid "Pohang Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1759
+#, fuzzy
+msgid "Point Hope"
+msgstr "Imprimir..."
+
+#: my-evolution/Locations.h:1760
+#, fuzzy
+msgid "Point Lay"
+msgstr "Sum�rio"
+
+#: my-evolution/Locations.h:1761
+#, fuzzy
+msgid "Point Mugu"
+msgstr "Encontrar mensagens"
+
+#: my-evolution/Locations.h:1762
+msgid "Point Piedras Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1763
+#, fuzzy
+msgid "Poitiers"
+msgstr "Propriedades do alarme"
+
+#: my-evolution/Locations.h:1765
+msgid "Pompano Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1766
+msgid "Ponca City"
+msgstr ""
+
+#: my-evolution/Locations.h:1767
+#, fuzzy
+msgid "Ponce"
+msgstr "Nenhuma"
+
+#: my-evolution/Locations.h:1768
+msgid "Ponta Pora"
+msgstr ""
+
+#: my-evolution/Locations.h:1769
+#, fuzzy
+msgid "Pontiac"
+msgstr "_Contacto"
+
+#: my-evolution/Locations.h:1770
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1771
+msgid "Poplar Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1772
+#, fuzzy
+msgid "Poprad"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1773
+#, fuzzy
+msgid "Port Alexander"
+msgstr "Imprimir calend�rio"
+
+#: my-evolution/Locations.h:1774
+msgid "Port Alsworth"
+msgstr ""
+
+#: my-evolution/Locations.h:1775
+#, fuzzy
+msgid "Port Angeles"
+msgstr "Imprimir..."
+
+#: my-evolution/Locations.h:1776
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1777
+msgid "Port Elizabeth"
+msgstr ""
+
+#: my-evolution/Locations.h:1778
+#, fuzzy
+msgid "Porterville"
+msgstr "Prever impress�o"
+
+#: my-evolution/Locations.h:1779
+#, fuzzy
+msgid "Port Hardy"
+msgstr "Imprimir calend�rio"
+
+#: my-evolution/Locations.h:1780
+#, fuzzy
+msgid "Port Hedland"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1781
+msgid "Port Heiden"
+msgstr ""
+
+#: my-evolution/Locations.h:1782
+#, fuzzy
+msgid "Portland"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1783
+#, fuzzy
+msgid "Porto"
+msgstr "Prioridade:"
+
+#: my-evolution/Locations.h:1784
+#, fuzzy
+msgid "Porto Alegre"
+msgstr "Propriedades do alarme"
+
+#: my-evolution/Locations.h:1785
+msgid "Porto Alegre Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:1786
+#, fuzzy
+msgid "Portoroz"
+msgstr "Prioridade"
+
+#: my-evolution/Locations.h:1787
+#, fuzzy
+msgid "Porto Santo"
+msgstr "Prioridade"
+
+#: my-evolution/Locations.h:1788
+msgid "Porto Velho"
+msgstr ""
+
+#: my-evolution/Locations.h:1789
+#, fuzzy
+msgid "Port Said"
+msgstr "Prioridade"
+
+#: my-evolution/Locations.h:1790
+msgid "Portsmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1792
+#, fuzzy
+msgid "Posadas"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1793
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1796
+msgid "Poza Rica"
+msgstr ""
+
+#: my-evolution/Locations.h:1797
+#, fuzzy
+msgid "Poznan"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1798
+#, fuzzy
+msgid "Praha"
+msgstr "_Tarefa"
+
+#: my-evolution/Locations.h:1799
+msgid "Pratica di Mare"
+msgstr ""
+
+#: my-evolution/Locations.h:1800
+msgid "Prescott"
+msgstr ""
+
+#: my-evolution/Locations.h:1801
+#, fuzzy
+msgid "Presidente Prudente"
+msgstr "Prever impress�o"
+
+#: my-evolution/Locations.h:1802
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1804
+#, fuzzy
+msgid "Pretoria"
+msgstr "Prioridade"
+
+#: my-evolution/Locations.h:1805
+#, fuzzy
+msgid "Preveza"
+msgstr "Prever impress�o"
+
+#: my-evolution/Locations.h:1806
+msgid "Price-Carbon"
+msgstr ""
+
+#: my-evolution/Locations.h:1807
+#, fuzzy
+msgid "Pristina"
+msgstr "_Op��es"
+
+#: my-evolution/Locations.h:1808
+#, fuzzy
+msgid "Providence"
+msgstr "Prever impress�o"
+
+#: my-evolution/Locations.h:1809
+#, fuzzy
+msgid "Provincetown"
+msgstr "Prever impress�o"
+
+#: my-evolution/Locations.h:1810
+#, fuzzy
+msgid "Provo"
+msgstr "An_terior"
+
+#: my-evolution/Locations.h:1811
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1812
+msgid "Pucallpa"
+msgstr ""
+
+#: my-evolution/Locations.h:1813
+msgid "Pudahuel"
+msgstr ""
+
+#: my-evolution/Locations.h:1814
+msgid "Puebla"
+msgstr ""
+
+#: my-evolution/Locations.h:1815
+msgid "Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:1816
+msgid "Puerto Barrios"
+msgstr ""
+
+#: my-evolution/Locations.h:1817
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1818
+msgid "Puerto Escondido"
+msgstr ""
+
+#: my-evolution/Locations.h:1819
+msgid "Puerto Lempira"
+msgstr ""
+
+#: my-evolution/Locations.h:1820
+#, fuzzy
+msgid "Puerto Limon"
+msgstr "Nenhuma descri��o"
+
+#: my-evolution/Locations.h:1821
+msgid "Puerto Maldonado"
+msgstr ""
+
+#: my-evolution/Locations.h:1822
+msgid "Puerto Montt"
+msgstr ""
+
+#: my-evolution/Locations.h:1823
+msgid "Puerto Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1825
+#, fuzzy
+msgid "Puerto Suarez"
+msgstr "Sum�rio"
+
+#: my-evolution/Locations.h:1826
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1827
+#, fuzzy
+msgid "Pula"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1828
+#, fuzzy
+msgid "Pullman"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1829
+msgid "Punta Arenas"
+msgstr ""
+
+#: my-evolution/Locations.h:1830
+#, fuzzy
+msgid "Punta Cana"
+msgstr "Imprimir calend�rio"
+
+#: my-evolution/Locations.h:1831
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1835
+msgid "Pyongyang"
+msgstr ""
+
+#: my-evolution/Locations.h:1837
+#, fuzzy
+msgid "Quantico"
+msgstr "Nenhuma descri��o"
+
+#: my-evolution/Locations.h:1838
+#, fuzzy
+msgid "Quebec"
+msgstr "Assunto"
+
+#: my-evolution/Locations.h:1839
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1842
+msgid "Quimper"
+msgstr ""
+
+#: my-evolution/Locations.h:1843
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1850
+#, fuzzy
+msgid "Rapid City"
+msgstr "Reponder para todos"
+
+#: my-evolution/Locations.h:1851
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1852
+msgid "Ras Al Khaimah"
+msgstr ""
+
+#: my-evolution/Locations.h:1853
+msgid "Rawlins"
+msgstr ""
+
+#: my-evolution/Locations.h:1854
+#, fuzzy
+msgid "Reading"
+msgstr "Cabe�alhos:"
+
+#: my-evolution/Locations.h:1855
+msgid "Rebun Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1856
+#, fuzzy
+msgid "Recife"
+msgstr "Receber"
+
+#: my-evolution/Locations.h:1857
+msgid "Red Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1858
+#, fuzzy
+msgid "Redding"
+msgstr "Cabe�alhos:"
+
+#: my-evolution/Locations.h:1859
+#, fuzzy
+msgid "Redig"
+msgstr "Remover"
+
+#: my-evolution/Locations.h:1860
+#, fuzzy
+msgid "Redmond"
+msgstr "Remover"
+
+#: my-evolution/Locations.h:1861
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1863
+msgid "Reggio Calabria"
+msgstr ""
+
+#: my-evolution/Locations.h:1864
+#, fuzzy
+msgid "Regina"
+msgstr "Segundos"
+
+#: my-evolution/Locations.h:1865
+msgid "Reims-Champagne"
+msgstr ""
+
+#: my-evolution/Locations.h:1866
+#, fuzzy
+msgid "Rennes"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:1867
+#, fuzzy
+msgid "Reno"
+msgstr "Remover"
+
+#: my-evolution/Locations.h:1868
+#, fuzzy
+msgid "Renton"
+msgstr "Segundos"
+
+#: my-evolution/Locations.h:1869
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1870
+#, fuzzy
+msgid "Reus"
+msgstr "Adicionar Fonte"
+
+#: my-evolution/Locations.h:1871
+#, fuzzy
+msgid "Reyes"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:1872
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1873
+#, fuzzy
+msgid "Reynosa"
+msgstr "Remover"
+
+#: my-evolution/Locations.h:1874
+#, fuzzy
+msgid "Rhinelander"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1875
+msgid "Rhode Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1876
+#, fuzzy
+msgid "Riberalta"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1877
+msgid "Richmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1878
+#, fuzzy
+msgid "Rickenbacker"
+msgstr "Nome"
+
+#: my-evolution/Locations.h:1879
+#, fuzzy
+msgid "Rieti"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rifle"
+msgstr "Telem�vel"
+
+#: my-evolution/Locations.h:1881
+#, fuzzy
+msgid "Riga"
+msgstr "Cabe�alhos:"
+
+#: my-evolution/Locations.h:1882
+#, fuzzy
+msgid "Rijeka"
+msgstr "Remover"
+
+#: my-evolution/Locations.h:1883
+msgid "Rimini"
+msgstr ""
+
+#: my-evolution/Locations.h:1884
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1885
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1886
+msgid "Rio Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1887
+msgid "Rioja"
+msgstr ""
+
+#: my-evolution/Locations.h:1888
+msgid "Rio / Jacarepagua"
+msgstr ""
+
+#: my-evolution/Locations.h:1889
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+msgid "Rishiri Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1891
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+#, fuzzy
+msgid "Rivera"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1893
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1894
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1895
+msgid "Riverton"
+msgstr ""
+
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "Imprimir"
+
+#: my-evolution/Locations.h:1897
+#, fuzzy
+msgid "Rivolto"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:1898
+#, fuzzy
+msgid "Riyadh"
+msgstr "Remover"
+
+#: my-evolution/Locations.h:1899
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1900
+msgid "Roatan"
+msgstr ""
+
+#: my-evolution/Locations.h:1901
+#, fuzzy
+msgid "Robore"
+msgstr "Telem�vel"
+
+#: my-evolution/Locations.h:1902
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1903
+msgid "Rockford"
+msgstr ""
+
+#: my-evolution/Locations.h:1904
+#, fuzzy
+msgid "Rockland"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1905
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1907
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1908
+#, fuzzy
+msgid "Rodos"
+msgstr "Remover"
+
+#: my-evolution/Locations.h:1909
+#, fuzzy
+msgid "Rogers"
+msgstr "_Pastas"
+
+#: my-evolution/Locations.h:1910
+msgid "Roma/Ciampino"
+msgstr ""
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1917
+msgid "Roosevelt"
+msgstr ""
+
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Roros"
+msgstr "Cores"
+
+#: my-evolution/Locations.h:1919
+msgid "Rorvik/Ryum"
+msgstr ""
+
+#: my-evolution/Locations.h:1920
+msgid "Rosario"
+msgstr ""
+
+#: my-evolution/Locations.h:1921
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1922
+#, fuzzy
+msgid "Roseglen"
+msgstr "Telem�vel"
+
+#: my-evolution/Locations.h:1923
+#, fuzzy
+msgid "Rost"
+msgstr "Horas"
+
+#: my-evolution/Locations.h:1924
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1927
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1928
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1929
+#, fuzzy
+msgid "Rurrenabaque"
+msgstr "Apagar todas as ocurr�ncias"
+
+#: my-evolution/Locations.h:1930
+msgid "Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1931
+msgid "Russia"
+msgstr ""
+
+#: my-evolution/Locations.h:1932
+#, fuzzy
+msgid "Rutland"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:1933
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1935
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1936
+msgid "Sabine Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:1937
+#, fuzzy
+msgid "Sacramento"
+msgstr "Data"
+
+#: my-evolution/Locations.h:1938
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1939
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1940
+#, fuzzy
+msgid "Saginaw"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:1941
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1944
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1945
+#, fuzzy
+msgid "Saint Mary's"
+msgstr "Imprimir calend�rio"
+
+#: my-evolution/Locations.h:1946
+msgid "Saint Mawgan"
+msgstr ""
+
+#: my-evolution/Locations.h:1947
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1948
+msgid "Saint Paul"
+msgstr ""
+
+#: my-evolution/Locations.h:1949
+#, fuzzy
+msgid "Saiq"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:1950
+msgid "Salalah"
+msgstr ""
+
+#: my-evolution/Locations.h:1951
+#, fuzzy
+msgid "Salem"
+msgstr "S�"
+
+#: my-evolution/Locations.h:1952
+#, fuzzy
+msgid "Salida"
+msgstr "F_ormato"
+
+#: my-evolution/Locations.h:1953
+msgid "Salida-Harriet"
+msgstr ""
+
+#: my-evolution/Locations.h:1954
+#, fuzzy
+msgid "Salina"
+msgstr "F_ormato"
+
+#: my-evolution/Locations.h:1955
+#, fuzzy
+msgid "Salinas"
+msgstr "F_ormato"
+
+#: my-evolution/Locations.h:1956
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1957
+#, fuzzy
+msgid "Salmon"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:1958
+msgid "Salmon (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1959
+#, fuzzy
+msgid "Salta"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:1960
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1961
+msgid "Salt Lake City"
+msgstr ""
+
+#: my-evolution/Locations.h:1962
+#, fuzzy
+msgid "Salto"
+msgstr "S�b"
+
+#: my-evolution/Locations.h:1963
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+msgid "Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:1965
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1966
+#, fuzzy
+msgid "Samara"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:1967
+#, fuzzy
+msgid "Samos"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:1968
+#, fuzzy
+msgid "Samsun"
+msgstr "Dom"
+
+#: my-evolution/Locations.h:1969
+#, fuzzy
+msgid "Sana'A"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:1970
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+msgid "San Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1975
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1976
+#, fuzzy
+msgid "San Carlos"
+msgstr "Guardar Calend�rio como"
+
+#: my-evolution/Locations.h:1977
+#, fuzzy
+msgid "Sandane"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:1978
+#, fuzzy
+msgid "Sandberg"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:1979
+#, fuzzy
+msgid "Sanderson"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:1980
+msgid "San Diego"
+msgstr ""
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1986
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1987
+msgid "Sand Point"
+msgstr ""
+
+#: my-evolution/Locations.h:1988
+msgid "San Fernando De Apure"
+msgstr ""
+
+#: my-evolution/Locations.h:1989
+#, fuzzy
+msgid "Sanford"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:1990
+msgid "San Francisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1991
+#, fuzzy
+msgid "Sangju"
+msgstr "Cabe�alhos:"
+
+#: my-evolution/Locations.h:1992
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1993
+msgid "San Joaquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1994
+#, fuzzy
+msgid "San Jose"
+msgstr "Guardar Calend�rio como"
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1997
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1998
+#, fuzzy
+msgid "San Juan"
+msgstr "Dom"
+
+#: my-evolution/Locations.h:1999
+msgid "Sankt-Peterburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2000
+#, fuzzy
+msgid "Sanliurfa"
+msgstr "F_ormato"
+
+#: my-evolution/Locations.h:2001
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2002
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2003
+msgid "San Miguel"
+msgstr ""
+
+#: my-evolution/Locations.h:2004
+msgid "San Nicholas Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2005
+msgid "San Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:2006
+msgid "San Sebastian"
+msgstr ""
+
+#: my-evolution/Locations.h:2007
+msgid "Santa Ana"
+msgstr ""
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+msgid "Santa Maria"
+msgstr ""
+
+#: my-evolution/Locations.h:2012
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2013
+msgid "Santa Monica"
+msgstr ""
+
+#: my-evolution/Locations.h:2014
+#, fuzzy
+msgid "Santander"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2015
+#, fuzzy
+msgid "Santarem"
+msgstr "Data"
+
+#: my-evolution/Locations.h:2016
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2017
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+msgid "Santiago"
+msgstr ""
+
+#: my-evolution/Locations.h:2019
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2020
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2021
+msgid "Santorini"
+msgstr ""
+
+#: my-evolution/Locations.h:2022
+#, fuzzy
+msgid "Santos"
+msgstr "S�b"
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+msgid "Sao Luiz"
+msgstr ""
+
+#: my-evolution/Locations.h:2025
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2028
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+#, fuzzy
+msgid "Sarasota"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2030
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+#, fuzzy
+msgid "Sarzana"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:2032
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2033
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2038
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2039
+msgid "Sawyer AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2040
+#, fuzzy
+msgid "Sayun"
+msgstr "Dom"
+
+#: my-evolution/Locations.h:2041
+#, fuzzy
+msgid "Scatsta"
+msgstr "S�b"
+
+#: my-evolution/Locations.h:2042
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2045
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2046
+msgid "Scottsdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Scranton"
+msgstr "Organiza��o"
+
+#: my-evolution/Locations.h:2048
+msgid "Seattle"
+msgstr ""
+
+#: my-evolution/Locations.h:2049
+#, fuzzy
+msgid "Seattle-Boeing"
+msgstr "Segundos"
+
+#: my-evolution/Locations.h:2050
+#, fuzzy
+msgid "Sedalia"
+msgstr "F_ormato"
+
+#: my-evolution/Locations.h:2051
+#, fuzzy
+msgid "Seeb"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2052
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+msgid "Sendai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2058
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2059
+msgid "Sevilla"
+msgstr ""
+
+#: my-evolution/Locations.h:2060
+#, fuzzy
+msgid "Seward"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:2061
+msgid "Sexton Summit"
+msgstr ""
+
+#: my-evolution/Locations.h:2062
+#, fuzzy
+msgid "Shanghai"
+msgstr "Cabe�alhos:"
+
+#: my-evolution/Locations.h:2063
+msgid "Shannon"
+msgstr ""
+
+#: my-evolution/Locations.h:2064
+#, fuzzy
+msgid "Sharjah"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:2065
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+#: my-evolution/Locations.h:2066
+#, fuzzy
+msgid "Sharurah"
+msgstr "Domingo"
+
+#: my-evolution/Locations.h:2067
+#, fuzzy
+msgid "Shawbury"
+msgstr "Domingo"
+
+#: my-evolution/Locations.h:2068
+#, fuzzy
+msgid "Shearwater"
+msgstr "Hora de �n_icio de encontro"
+
+#: my-evolution/Locations.h:2069
+msgid "Sheboygan"
+msgstr ""
+
+#: my-evolution/Locations.h:2070
+#, fuzzy
+msgid "Sheldon"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2071
+msgid "Shelter Cove"
+msgstr ""
+
+#: my-evolution/Locations.h:2072
+#, fuzzy
+msgid "Shelton"
+msgstr "Segundos"
+
+#: my-evolution/Locations.h:2073
+msgid "Shenandoah"
+msgstr ""
+
+#: my-evolution/Locations.h:2074
+#, fuzzy
+msgid "Sheridan"
+msgstr "Dom"
+
+#: my-evolution/Locations.h:2075
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2076
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2077
+msgid "Shingle Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2078
+#, fuzzy
+msgid "Shiraz"
+msgstr "Tamanho"
+
+#: my-evolution/Locations.h:2079
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2080
+msgid "Shizuhama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2081
+#, fuzzy
+msgid "Shoreham"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2082
+#, fuzzy
+msgid "Show Low"
+msgstr "Mostrar 1 semana"
+
+#: my-evolution/Locations.h:2083
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2084
+msgid "Shreveport Regional"
+msgstr ""
+
+#: my-evolution/Locations.h:2085
+#, fuzzy
+msgid "Sidney"
+msgstr "Imprimir"
+
+#: my-evolution/Locations.h:2086
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2087
+msgid "Siloam Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2088
+msgid "Silver City"
+msgstr ""
+
+#: my-evolution/Locations.h:2089
+#, fuzzy
+msgid "Sindal"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2091
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2097
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2098
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+#: my-evolution/Locations.h:2099
+#, fuzzy
+msgid "Skive"
+msgstr "Tamanho"
+
+#: my-evolution/Locations.h:2100
+#, fuzzy
+msgid "Skopje"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2101
+#, fuzzy
+msgid "Skwentna"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2102
+#, fuzzy
+msgid "Slana"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2105
+#, fuzzy
+msgid "Smithers"
+msgstr "Minutos"
+
+#: my-evolution/Locations.h:2106
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2107
+msgid "Snowshoe Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2108
+#, fuzzy
+msgid "Sochi"
+msgstr "Hora"
+
+#: my-evolution/Locations.h:2109
+#, fuzzy
+msgid "Socorro"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2110
+#, fuzzy
+msgid "Socotra"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2111
+msgid "Soda Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2112
+#, fuzzy
+msgid "Sofia"
+msgstr "F_ormato"
+
+#: my-evolution/Locations.h:2113
+#, fuzzy
+msgid "Sogndal"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2114
+msgid "Soldotna"
+msgstr ""
+
+#: my-evolution/Locations.h:2115
+#, fuzzy
+msgid "Somerset"
+msgstr "Horas"
+
+#: my-evolution/Locations.h:2116
+#, fuzzy
+msgid "Sonderborg"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2117
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2120
+#, fuzzy
+msgid "Southampton"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2121
+#, fuzzy
+msgid "South Bend"
+msgstr "Hora"
+
+#: my-evolution/Locations.h:2122
+#, fuzzy
+msgid "South Carolina"
+msgstr "Sobre o calend�rio"
+
+#: my-evolution/Locations.h:2123
+#, fuzzy
+msgid "South Dakota"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2124
+#, fuzzy
+msgid "Southend"
+msgstr "Hora"
+
+#: my-evolution/Locations.h:2125
+msgid "South Marsh Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2126
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2128
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2129
+#, fuzzy
+msgid "Spencer"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2130
+msgid "Spickard"
+msgstr ""
+
+#: my-evolution/Locations.h:2131
+#, fuzzy
+msgid "Split"
+msgstr "Pr�_ximo"
+
+#: my-evolution/Locations.h:2132
+#, fuzzy
+msgid "Spokane"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2133
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2134
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "Springfield"
+msgstr "Sincronizar"
+
+#: my-evolution/Locations.h:2136
+msgid "Stampede Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:2137
+msgid "State College"
+msgstr ""
+
+#: my-evolution/Locations.h:2138
+#, fuzzy
+msgid "Stauning"
+msgstr "Segundos"
+
+#: my-evolution/Locations.h:2139
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2140
+msgid "Stavanger/Sola"
+msgstr ""
+
+#: my-evolution/Locations.h:2141
+#, fuzzy
+msgid "Staverton"
+msgstr "Segundos"
+
+#: my-evolution/Locations.h:2142
+#, fuzzy
+msgid "Stavropol"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2143
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2144
+msgid "Steamboat Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2145
+msgid "Stephenville"
+msgstr ""
+
+#: my-evolution/Locations.h:2146
+#, fuzzy
+msgid "St. George"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2147
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2148
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2149
+msgid "St Johnsbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2150
+#, fuzzy
+msgid "St Joseph"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2151
+#, fuzzy
+msgid "St Louis"
+msgstr "Cabe�alhos:"
+
+#: my-evolution/Locations.h:2152
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2157
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2158
+#, fuzzy
+msgid "Storm Lake"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2159
+#, fuzzy
+msgid "Stornoway"
+msgstr "Novo"
+
+#: my-evolution/Locations.h:2160
+#, fuzzy
+msgid "St Paul"
+msgstr "S�b"
+
+#: my-evolution/Locations.h:2161
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2164
+#, fuzzy
+msgid "Strevell"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2165
+msgid "St Simon's Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2166
+msgid "Stumpy Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2167
+#, fuzzy
+msgid "Sturgeon Bay"
+msgstr "Domingo"
+
+#: my-evolution/Locations.h:2168
+msgid "Stuttgart"
+msgstr ""
+
+#: my-evolution/Locations.h:2169
+#, fuzzy
+msgid "Sucre"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2170
+msgid "Sumburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:2171
+#, fuzzy
+msgid "Sumter"
+msgstr "Sum�rio"
+
+#: my-evolution/Locations.h:2172
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2174
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2175
+msgid "Superior"
+msgstr ""
+
+#: my-evolution/Locations.h:2177
+#, fuzzy
+msgid "Sutton"
+msgstr "Dom"
+
+#: my-evolution/Locations.h:2178
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2179
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2188
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2189
+msgid "Szombathely"
+msgstr ""
+
+#: my-evolution/Locations.h:2190
+#, fuzzy
+msgid "Tabatinga"
+msgstr "_Op��es"
+
+#: my-evolution/Locations.h:2191
+msgid "Tabriz"
+msgstr ""
+
+#: my-evolution/Locations.h:2192
+#, fuzzy
+msgid "Tabuk"
+msgstr "_Tarefa"
+
+#: my-evolution/Locations.h:2193
+msgid "Tachikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+#, fuzzy
+msgid "Tacna"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:2195
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2199
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+#, fuzzy
+msgid "Taejon"
+msgstr "Qi"
+
+#: my-evolution/Locations.h:2201
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2202
+msgid "Taichung"
+msgstr ""
+
+#: my-evolution/Locations.h:2203
+msgid "Taif"
+msgstr ""
+
+#: my-evolution/Locations.h:2204
+#, fuzzy
+msgid "Tainan"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:2206
+#, fuzzy
+msgid "Taiyuan"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:2207
+msgid "Taiz"
+msgstr ""
+
+#: my-evolution/Locations.h:2208
+#, fuzzy
+msgid "Tajima"
+msgstr "Lista de tarefas"
+
+#: my-evolution/Locations.h:2209
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Talara"
+msgstr ""
+
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Talinn"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:2212
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tallahassee"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2215
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2216
+#, fuzzy
+msgid "Tampa"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2217
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2218
+#, fuzzy
+msgid "Tampere"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:2219
+msgid "Tampico"
+msgstr ""
+
+#: my-evolution/Locations.h:2220
+#, fuzzy
+msgid "Tanana"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:2221
+msgid "Tanegashima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2222
+#, fuzzy
+msgid "Taos"
+msgstr "_Tarefa"
+
+#: my-evolution/Locations.h:2223
+msgid "Taoyuan"
+msgstr ""
+
+#: my-evolution/Locations.h:2224
+msgid "Tapachula"
+msgstr ""
+
+#: my-evolution/Locations.h:2225
+msgid "Taranto"
+msgstr ""
+
+#: my-evolution/Locations.h:2226
+#, fuzzy
+msgid "Tarbes"
+msgstr "_Tarefa"
+
+#: my-evolution/Locations.h:2227
+msgid "Tarija"
+msgstr ""
+
+#: my-evolution/Locations.h:2228
+msgid "Tarvisio"
+msgstr ""
+
+#: my-evolution/Locations.h:2229
+#, fuzzy
+msgid "Tatalina"
+msgstr "_Op��es"
+
+#: my-evolution/Locations.h:2230
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2235
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2236
+#, fuzzy
+msgid "Tela"
+msgstr "Telex"
+
+#: my-evolution/Locations.h:2237
+#, fuzzy
+msgid "Temple"
+msgstr "Telex"
+
+#: my-evolution/Locations.h:2238
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2244
+msgid "Texarkana"
+msgstr ""
+
+#: my-evolution/Locations.h:2245
+#, fuzzy
+msgid "Texas"
+msgstr "_Tarefa"
+
+#: my-evolution/Locations.h:2246
+msgid "The Dalles"
+msgstr ""
+
+#: my-evolution/Locations.h:2247
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2248
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2249
+msgid "Thiruvananthapuram"
+msgstr ""
+
+#: my-evolution/Locations.h:2250
+#, fuzzy
+msgid "Thisted"
+msgstr "_Pasta"
+
+#: my-evolution/Locations.h:2251
+msgid "Thompson Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2252
+#, fuzzy
+msgid "Thumrait"
+msgstr "Hoje"
+
+#: my-evolution/Locations.h:2253
+msgid "Tianjin"
+msgstr ""
+
+#: my-evolution/Locations.h:2254
+msgid "Tijuana"
+msgstr ""
+
+#: my-evolution/Locations.h:2255
+msgid "Timisoara"
+msgstr ""
+
+#: my-evolution/Locations.h:2256
+msgid "Tin City"
+msgstr ""
+
+#: my-evolution/Locations.h:2257
+msgid "Tirana"
+msgstr ""
+
+#: my-evolution/Locations.h:2258
+#, fuzzy
+msgid "Tiree"
+msgstr "Semana"
+
+#: my-evolution/Locations.h:2259
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2260
+msgid "Tiruchchirapalli"
+msgstr ""
+
+#: my-evolution/Locations.h:2261
+#, fuzzy
+msgid "Titusville"
+msgstr "_Pasta"
+
+#: my-evolution/Locations.h:2262
+#, fuzzy
+msgid "Tivat"
+msgstr "Imprimir"
+
+#: my-evolution/Locations.h:2263
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2267
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+msgid "Tokunoshima Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2269
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2271
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2272
+msgid "Tokyo New International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2273
+#, fuzzy
+msgid "Toledo"
+msgstr "Para:"
+
+#: my-evolution/Locations.h:2274
+msgid "Toluca"
+msgstr ""
+
+#: my-evolution/Locations.h:2275
+#, fuzzy
+msgid "Tonopah"
+msgstr "Hoje"
+
+#: my-evolution/Locations.h:2276
+#, fuzzy
+msgid "Topeka"
+msgstr "Para:"
+
+#: my-evolution/Locations.h:2277
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2279
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2280
+msgid "Toronto"
+msgstr ""
+
+#: my-evolution/Locations.h:2281
+#, fuzzy
+msgid "Torp"
+msgstr "Para:"
+
+#: my-evolution/Locations.h:2282
+#, fuzzy
+msgid "Torrance"
+msgstr "Apagar todas as ocurr�ncias"
+
+#: my-evolution/Locations.h:2283
+msgid "Torreon"
+msgstr ""
+
+#: my-evolution/Locations.h:2284
+msgid "Tottori Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2285
+#, fuzzy
+msgid "Toulouse"
+msgstr "Cores"
+
+#: my-evolution/Locations.h:2286
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2290
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2291
+msgid "Trabzon"
+msgstr ""
+
+#: my-evolution/Locations.h:2292
+#, fuzzy
+msgid "Trapani"
+msgstr "Transportes"
+
+#: my-evolution/Locations.h:2293
+msgid "Traverse City"
+msgstr ""
+
+#: my-evolution/Locations.h:2294
+#, fuzzy
+msgid "Trelew"
+msgstr "Telex"
+
+#: my-evolution/Locations.h:2295
+#, fuzzy
+msgid "Trenton"
+msgstr "Organiza��o"
+
+#: my-evolution/Locations.h:2296
+#, fuzzy
+msgid "Trevico"
+msgstr "An_terior"
+
+#: my-evolution/Locations.h:2297
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2298
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2299
+#, fuzzy
+msgid "Trieste"
+msgstr "_Pasta"
+
+#: my-evolution/Locations.h:2300
+msgid "Trinidad"
+msgstr ""
+
+#: my-evolution/Locations.h:2301
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2304
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2305
+msgid "Troyes/Barberey"
+msgstr ""
+
+#: my-evolution/Locations.h:2306
+#, fuzzy
+msgid "Truckee"
+msgstr "Ter"
+
+#: my-evolution/Locations.h:2307
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2314
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2315
+msgid "Tulancingo"
+msgstr ""
+
+#: my-evolution/Locations.h:2316
+#, fuzzy
+msgid "Tulcea"
+msgstr "Hoje"
+
+#: my-evolution/Locations.h:2317
+#, fuzzy
+msgid "Tulsa"
+msgstr "Hoje"
+
+#: my-evolution/Locations.h:2318
+#, fuzzy
+msgid "Tupelo"
+msgstr "Ter"
+
+#: my-evolution/Locations.h:2319
+msgid "Turaif"
+msgstr ""
+
+#: my-evolution/Locations.h:2320
+#, fuzzy
+msgid "Turin"
+msgstr "Nome"
+
+#: my-evolution/Locations.h:2322
+#, fuzzy
+msgid "Turku"
+msgstr "Ter"
+
+#: my-evolution/Locations.h:2323
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2324
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+#: my-evolution/Locations.h:2325
+#, fuzzy
+msgid "Twenthe"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2326
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2327
+msgid "Twin Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2328
+#, fuzzy
+msgid "Tyler"
+msgstr "Ano"
+
+#: my-evolution/Locations.h:2329
+msgid "Tyndall AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2330
+#, fuzzy
+msgid "Tyumen"
+msgstr "Ter"
+
+#: my-evolution/Locations.h:2331
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2332
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2340
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2341
+#, fuzzy
+msgid "United Arab Emirates "
+msgstr "Encontrar mensagens"
+
+#: my-evolution/Locations.h:2344
+msgid "Unst"
+msgstr ""
+
+#: my-evolution/Locations.h:2345
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2346
+msgid "Uruapan"
+msgstr ""
+
+#: my-evolution/Locations.h:2347
+#, fuzzy
+msgid "Uruguaiana"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:2349
+msgid "Urumqi"
+msgstr ""
+
+#: my-evolution/Locations.h:2350
+#, fuzzy
+msgid "Utah"
+msgstr "h"
+
+#: my-evolution/Locations.h:2351
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2353
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:2355
+msgid "Vadso"
+msgstr ""
+
+#: my-evolution/Locations.h:2356
+#, fuzzy
+msgid "Vaerlose"
+msgstr "Cores"
+
+#: my-evolution/Locations.h:2357
+#, fuzzy
+msgid "Vagar"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:2358
+msgid "Valdez 2"
+msgstr ""
+
+#: my-evolution/Locations.h:2359
+#, fuzzy
+msgid "Valdosta"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:2360
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2361
+#, fuzzy
+msgid "Valencia"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:2362
+msgid "Valentine"
+msgstr ""
+
+#: my-evolution/Locations.h:2363
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2366
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2367
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2368
+#, fuzzy
+msgid "Van"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:2369
+msgid "Vancouver"
+msgstr ""
+
+#: my-evolution/Locations.h:2370
+#, fuzzy
+msgid "Vandel"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2371
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2373
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+msgid "Varadero"
+msgstr ""
+
+#: my-evolution/Locations.h:2375
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2376
+msgid "Varna"
+msgstr ""
+
+#: my-evolution/Locations.h:2377
+#, fuzzy
+msgid "Vasteras"
+msgstr "Data"
+
+#: my-evolution/Locations.h:2378
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2379
+msgid "Venezia"
+msgstr ""
+
+#: my-evolution/Locations.h:2381
+msgid "Venice"
+msgstr ""
+
+#: my-evolution/Locations.h:2382
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2383
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2384
+#, fuzzy
+msgid "Vermont"
+msgstr "M�s"
+
+#: my-evolution/Locations.h:2385
+#, fuzzy
+msgid "Vernal"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2386
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+msgid "Vicenza"
+msgstr ""
+
+#: my-evolution/Locations.h:2388
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2390
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2393
+msgid "Vigo"
+msgstr ""
+
+#: my-evolution/Locations.h:2394
+#, fuzzy
+msgid "Vilhena"
+msgstr "Nome completo:"
+
+#: my-evolution/Locations.h:2395
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+#, fuzzy
+msgid "Villahermosa"
+msgstr "Alarmes"
+
+#: my-evolution/Locations.h:2398
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2404
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+#, fuzzy
+msgid "Visalia"
+msgstr "Alarmes"
+
+#: my-evolution/Locations.h:2406
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2410
+msgid "Vladivostok"
+msgstr ""
+
+#: my-evolution/Locations.h:2411
+#, fuzzy
+msgid "Vlieland"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:2412
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2413
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2414
+#, fuzzy
+msgid "Volkel"
+msgstr "Telem�vel"
+
+#: my-evolution/Locations.h:2415
+msgid "Volk Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2416
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2417
+msgid "Voslau"
+msgstr ""
+
+#: my-evolution/Locations.h:2418
+#, fuzzy
+msgid "Waco"
+msgstr "Segunda-feira"
+
+#: my-evolution/Locations.h:2419
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2423
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2424
+msgid "Wallops Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2425
+msgid "Walnut Ridge"
+msgstr ""
+
+#: my-evolution/Locations.h:2426
+#, fuzzy
+msgid "Warner Robins"
+msgstr "Seg"
+
+#: my-evolution/Locations.h:2427
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2429
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2430
+msgid "Washington/Dulles"
+msgstr ""
+
+#: my-evolution/Locations.h:2431
+#, fuzzy
+msgid "Waterbury"
+msgstr "Outro"
+
+#: my-evolution/Locations.h:2432
+#, fuzzy
+msgid "Waterloo"
+msgstr "Outro"
+
+#: my-evolution/Locations.h:2433
+#, fuzzy
+msgid "Watertown"
+msgstr "Outro"
+
+#: my-evolution/Locations.h:2434
+msgid "Waterville"
+msgstr ""
+
+#: my-evolution/Locations.h:2435
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+msgid "Wausau"
+msgstr ""
+
+#: my-evolution/Locations.h:2437
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2438
+msgid "Waynesboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2439
+msgid "Webster City"
+msgstr ""
+
+#: my-evolution/Locations.h:2440
+#, fuzzy
+msgid "Wejh"
+msgstr "Qa"
+
+#: my-evolution/Locations.h:2441
+msgid "Wellington"
+msgstr ""
+
+#: my-evolution/Locations.h:2442
+#, fuzzy
+msgid "Wenatchee"
+msgstr "Outro"
+
+#: my-evolution/Locations.h:2443
+#, fuzzy
+msgid "Wendover"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2444
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2445
+msgid "West Burke"
+msgstr ""
+
+#: my-evolution/Locations.h:2446
+#, fuzzy
+msgid "Westerland"
+msgstr "Reponder para todos"
+
+#: my-evolution/Locations.h:2447
+#, fuzzy
+msgid "Westfield"
+msgstr "Qa"
+
+#: my-evolution/Locations.h:2448
+msgid "Westhampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2449
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2451
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2452
+msgid "West Yellowstone (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2453
+#, fuzzy
+msgid "Wheeling"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2454
+msgid "Whidbey Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2455
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2461
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2462
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2463
+#, fuzzy
+msgid "Wick"
+msgstr "Nome"
+
+#: my-evolution/Locations.h:2464
+#, fuzzy
+msgid "Wien"
+msgstr "Qa"
+
+#: my-evolution/Locations.h:2465
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2467
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2468
+#, fuzzy
+msgid "Williamsport"
+msgstr "Transporte de correio"
+
+#: my-evolution/Locations.h:2469
+#, fuzzy
+msgid "Williston"
+msgstr "Pr�_ximo"
+
+#: my-evolution/Locations.h:2470
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2472
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2473
+msgid "Winchester"
+msgstr ""
+
+#: my-evolution/Locations.h:2474
+msgid "Windsor"
+msgstr ""
+
+#: my-evolution/Locations.h:2475
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2478
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+msgid "Winslow"
+msgstr ""
+
+#: my-evolution/Locations.h:2480
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2481
+msgid "Winter Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:2482
+#, fuzzy
+msgid "Winter Park"
+msgstr "Esquecer _Senhas"
+
+#: my-evolution/Locations.h:2483
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+#, fuzzy
+msgid "Wisconsin"
+msgstr " segundos"
+
+#: my-evolution/Locations.h:2485
+msgid "Wisconsin Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:2486
+#, fuzzy
+msgid "Wise"
+msgstr "Qa"
+
+#: my-evolution/Locations.h:2487
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2488
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2489
+msgid "Woong Cheon"
+msgstr ""
+
+#: my-evolution/Locations.h:2490
+#, fuzzy
+msgid "Wooster"
+msgstr "_Pastas"
+
+#: my-evolution/Locations.h:2491
+#, fuzzy
+msgid "Worcester"
+msgstr "Fontes"
+
+#: my-evolution/Locations.h:2492
+#, fuzzy
+msgid "Worland"
+msgstr "Encontrar"
+
+#: my-evolution/Locations.h:2493
+#, fuzzy
+msgid "Worthington"
+msgstr "Seg"
+
+#: my-evolution/Locations.h:2494
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2495
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2496
+msgid "Wuchia Observatory"
+msgstr ""
+
+#: my-evolution/Locations.h:2497
+#, fuzzy
+msgid "Wyoming"
+msgstr "Seg"
+
+#: my-evolution/Locations.h:2498
+#, fuzzy
+msgid "Xiamen"
+msgstr "Nome"
+
+#: my-evolution/Locations.h:2499
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2505
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2506
+msgid "Yankton"
+msgstr ""
+
+#: my-evolution/Locations.h:2507
+msgid "Yao Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2508
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2510
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2511
+msgid "Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2513
+#, fuzzy
+msgid "Yenbo"
+msgstr "Enviar"
+
+#: my-evolution/Locations.h:2514
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2522
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2528
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2529
+msgid "Zacatecas"
+msgstr ""
+
+#: my-evolution/Locations.h:2530
+#, fuzzy
+msgid "Zadar"
+msgstr "Novo Ca_lend�rio"
+
+#: my-evolution/Locations.h:2531
+#, fuzzy
+msgid "Zagreb"
+msgstr "Bip"
+
+#: my-evolution/Locations.h:2532
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2533
+msgid "Zama Airfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2534
+msgid "Zanesville"
+msgstr ""
+
+#: my-evolution/Locations.h:2535
+msgid "Zaragoza"
+msgstr ""
+
+#: my-evolution/Locations.h:2536
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2537
+msgid "Zuni Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:2538
+msgid "Zurich"
+msgstr ""
+
+#: 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
 #, fuzzy
 msgid "Appointments"
 msgstr "Compromissos:"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 #, fuzzy
 msgid "No appointments"
 msgstr "Compromisso - %s"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:400
 msgid "%k:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:379
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-calendar.c:420
+#, fuzzy
+msgid "No description"
+msgstr "Nenhuma descri��o"
+
+#: my-evolution/e-summary-mail.c:151
 #, 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
+#, fuzzy
+msgid "Local Folders"
+msgstr "_Pastas"
+
 #. 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:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:720
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Adicionar novo grupo"
 
-#: my-evolution/e-summary-preferences.c:953
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:957
+#: my-evolution/e-summary-preferences.c:732
 #, fuzzy
 msgid "Name:"
 msgstr "Nome"
 
-#: my-evolution/e-summary-preferences.c:1503
-#, fuzzy
-msgid "Summary Settings"
-msgstr "Segundos"
-
-#: 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
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "Erro a gravar os atalhos."
 
-#: my-evolution/e-summary-rdf.c:528
+#: my-evolution/e-summary-rdf.c:444
 #, fuzzy
 msgid "News Feed"
 msgstr "Servidor:"
 
-#: my-evolution/e-summary-tasks.c:248
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
+msgstr ""
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+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
+#, fuzzy
+msgid "Shown"
+msgstr "Horas"
+
+#: my-evolution/e-summary-tasks.c:251
 #, fuzzy
 msgid "No tasks"
 msgstr "Ver _anexos"
 
-#: my-evolution/e-summary-tasks.c:287
+#: my-evolution/e-summary-tasks.c:291
 #, fuzzy
 msgid "(No Description)"
 msgstr "Nenhuma descri��o"
@@ -10624,25 +23612,24 @@ msgstr "Nenhuma descri��o"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#: 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:501
 #, fuzzy
 msgid "Weather"
 msgstr "Outro"
 
-#: my-evolution/e-summary-weather.c:722
-#, fuzzy
-msgid "Regions"
-msgstr "Segundos"
-
 #: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:488
+msgid "Please wait..."
+msgstr ""
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
 msgstr "Sum�rio"
@@ -10651,47 +23638,11 @@ msgstr "Sum�rio"
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:66
+#: my-evolution/main.c:65
 #, 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"
@@ -11101,12 +24052,6 @@ msgstr ""
 msgid "Freezing ice pellets"
 msgstr ""
 
-#. HAIL
-#: my-evolution/metar.c:217
-#, fuzzy
-msgid "Hail"
-msgstr "_Correio"
-
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
@@ -11864,190 +24809,153 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid " _Remove"
-msgstr "Remover"
-
-#: my-evolution/my-evolution.glade.h:2
-#, fuzzy
 msgid "Add n_ews feed"
 msgstr "Adicionar novo grupo"
 
-#: my-evolution/my-evolution.glade.h:3
-#, fuzzy
-msgid "Al_l stations:"
-msgstr "_Ac��es"
-
-#: my-evolution/my-evolution.glade.h:4
-#, fuzzy
-msgid "All _folders:"
-msgstr "_Pastas"
-
-#: my-evolution/my-evolution.glade.h:5
-#, fuzzy
-msgid "All news _feeds:"
-msgstr "Adicionar novo grupo"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 #, fuzzy
 msgid "One mont_h"
 msgstr "M�s"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "One w_eek"
 msgstr "Semana"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "Novas mensagens de correio"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "Show _all tasks"
 msgstr "Ver _anexos"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "Ver _anexos"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 #, fuzzy
 msgid "Tasks "
 msgstr "_Tarefa"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:22
-#, fuzzy
-msgid "_Display folders:"
-msgstr "Mostrar uma pasta diferente"
-
-#: my-evolution/my-evolution.glade.h:23
-#, fuzzy
-msgid "_Display stations:"
-msgstr "_Ac��es"
-
-#: my-evolution/my-evolution.glade.h:24
-#, fuzzy
-msgid "_Displayed feeds:"
-msgstr "Dia"
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 #, fuzzy
 msgid "_Five days"
 msgstr "Sex"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr "_Correio"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "_News Feeds"
 msgstr "Servidor:"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "_One day"
 msgstr "Segunda-feira"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 #, fuzzy
 msgid "_Schedule"
 msgstr "Fontes"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 #, fuzzy
 msgid "_Weather"
 msgstr "Outro"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "_Pastas"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 #, fuzzy
 msgid "The Evolution shell."
 msgstr "Evolution - %s"
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 #, fuzzy
 msgid "Show Details"
 msgstr "Ver _anexos"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-#, fuzzy
-msgid "Inbox"
-msgstr "Correio novo"
-
-#: shell/e-local-storage.c:175
-#, fuzzy
-msgid "Outbox"
-msgstr "Correio novo"
-
-#: shell/e-local-storage.c:636
-#, fuzzy
-msgid "Local Folders"
-msgstr "_Pastas"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instala��o do 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
 #, fuzzy
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Carregue em \\\"OK\\\" para instalar os ficheiros de utilizador do Evolution "
 "em"
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -12055,14 +24963,38 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:281
+#: shell/e-setup.c:282
+#, fuzzy, c-format
+msgid ""
+"Evolution could not create directory\n"
+"%s:\n"
+"%s"
+msgstr "Criar um novo calend�rio"
+
+#: 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:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -12070,7 +25002,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:295
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -12079,7 +25011,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:320
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -12087,101 +25019,101 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-about-box.c:40
-#, fuzzy
-msgid "Evolution "
-msgstr "Evolution"
-
-#: shell/e-shell-about-box.c:41
-#, fuzzy
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "N�o consigo abrir a localiza��o: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: 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: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 ""
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 #, fuzzy
 msgid "Copy folder"
 msgstr "Ir para a _pasta..."
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 #, fuzzy
 msgid "Move folder"
 msgstr "Ir para a _pasta..."
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Apagar"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:549
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Abrir ficheiro"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:556
 #, fuzzy
 msgid "Rename folder"
 msgstr "Abrir ficheiro"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:148
+#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:111
+#: shell/e-shell-folder-creation-dialog.c:125
 #, fuzzy, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: shell/e-shell-folder-creation-dialog.c:267
+#: shell/e-shell-folder-creation-dialog.c:291
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "O Evolution n�o consegue criar as suas pastas locais"
@@ -12192,12 +25124,12 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:359
+#: shell/e-shell-folder-selection-dialog.c:376
 #, fuzzy
 msgid "New..."
 msgstr "Novo"
 
-#: 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 "(Sem t�tulo)"
 
@@ -12214,7 +25146,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
+#: 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 ""
 
@@ -12235,104 +25167,110 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:397
+#: shell/e-shell-importer.c:409
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: shell/e-shell-importer.c:420
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:424
+#: shell/e-shell-importer.c:435
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:445
 #, fuzzy
 msgid "Importing"
 msgstr "Seg"
 
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:453
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:466
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:485
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:502
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:572
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:623
 #, fuzzy
 msgid "Filename:"
 msgstr "Nome completo:"
 
-#: shell/e-shell-importer.c:617
+#: shell/e-shell-importer.c:628
 #, fuzzy
 msgid "Select a file"
 msgstr "Ficheiro com assinatura:"
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:638
 #, fuzzy
 msgid "File type:"
 msgstr "Nome completo:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:663
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:667
 #, fuzzy
 msgid "Import a single file"
 msgstr "Seg"
 
-#: 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
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: 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
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: 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
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De"
 
-#: shell/e-shell-importer.c:1014
+#: shell/e-shell-importer.c:1027
 #, fuzzy
 msgid "Select folder"
 msgstr "_Nova pasta"
 
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1028
 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:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
@@ -12352,6 +25290,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Novo"
+
 #: shell/e-shell-utils.c:114
 #, fuzzy
 msgid "No folder name specified."
@@ -12370,94 +25314,93 @@ msgstr "Uma pasta contendo items de correio"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 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:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "N�o consegui correr o Bub buddy"
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:409
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Ir para a _pasta..."
 
-#: shell/e-shell-view-menu.c:410
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:530
+#: shell/e-shell-view-menu.c:565
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shell-view-menu.c:531
+#: shell/e-shell-view-menu.c:566
 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 ""
-
-#: shell/e-shell-view-menu.c:570
-#, fuzzy, c-format
-msgid "Error executing %s."
-msgstr "Erro a gravar os atalhos."
-
-#: shell/e-shell-view-menu.c:672
+#: shell/e-shell-view-menu.c:732
 #, fuzzy
 msgid "_Work Online"
 msgstr "Seg"
 
-#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Seg"
 
-#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 #, fuzzy
 msgid "Work Offline"
 msgstr "Seg"
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta mostrada)"
 
-#: shell/e-shell-view.c:1574
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1576
+#: shell/e-shell-view.c:1820
 #, fuzzy
 msgid "(None)"
 msgstr "Nome"
 
-#: 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 ""
 
-#: shell/e-shell-view.c:1630
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: 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 ""
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12465,20 +25408,24 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr ""
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configura��o do correio"
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr ""
 
@@ -12613,76 +25560,73 @@ msgstr "Remover"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-storage-set-view.c:658
-#, fuzzy, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr "Gravar a mensagem na pasta especificada"
-
-#: shell/e-storage.c:181 shell/e-storage.c:187
+#: shell/e-shortcuts.c:1033
 #, fuzzy
-msgid "(No name)"
-msgstr "Nome"
+msgid "Inbox"
+msgstr "Correio novo"
 
-#: shell/e-storage.c:498
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
+
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr ""
 
-#: 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:491
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr ""
 
-#: 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:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr ""
 
-#: 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:505
 msgid "Operation not supported"
 msgstr ""
 
-#: 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: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 ""
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "N�o consigo abrir a localiza��o: %s"
@@ -12693,105 +25637,113 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, 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/evolution-shell-component.c:1045
 #, fuzzy
 msgid "CORBA error"
 msgstr "Outro"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 #, fuzzy
 msgid "No owner"
 msgstr "Nenhuma"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 #, fuzzy
 msgid "Not found"
 msgstr "Ficheiro n�o encontrado"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Transporte de correio"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Nenhuma Informa��o"
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 #, fuzzy
 msgid "Internal error"
 msgstr "Outro"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 #, fuzzy
 msgid "Exists"
 msgstr "Pr�_ximo"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Novo Ca_lend�rio"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Enviar a mensagem"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 #, fuzzy
 msgid "No space left"
 msgstr "Situa��o das mensagens"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:124
-#, 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/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "Nome completo:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
@@ -12919,344 +25871,310 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #: shell/main.c:89
+msgid "Evolution"
+msgstr "Evolution"
+
+#: shell/main.c:95
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolution"
 
-#: shell/main.c:210
+#: shell/main.c:227
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, 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:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Enviar uma nova mensagem"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Enviar uma nova mensagem"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Falhou a inicializa��o do sistema de componentes Bonobo."
 
+#: 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 "Erro a gravar os atalhos."
 
-#: tools/evolution-addressbook-export.c:46
-#, fuzzy
-msgid "Output File"
-msgstr "Abrir ficheiro"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "_Inserir"
 
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Abrir ficheiro"
+
 #: tools/evolution-addressbook-import.c:80
 #, fuzzy
 msgid "No filename provided."
 msgstr "(Nenhuma pasta mostrada)"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Copiar"
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Ir para a _pasta..."
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 #, fuzzy
 msgid "Copy the selection"
 msgstr "Anular a �ltima opera��o"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Ir para a _pasta..."
+
+#: ui/evolution-addressbook.xml.h:6
 #, fuzzy
 msgid "Create new contact"
 msgstr "Criar um novo contacto"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 #, fuzzy
 msgid "Create new contact list"
 msgstr "A sua lista de contactos"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "Cortar"
-
-#: 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:11
 #, fuzzy
 msgid "Delete selected contacts"
 msgstr "Apagar um contacto"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:13
 #, fuzzy
-msgid "New List"
-msgstr "Novo"
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Ir para a _pasta..."
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Colar"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Ir para a _pasta..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Colar item da �rea de transfer�ncia"
 
-#: 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:20
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "Imprimir contactos"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "Apagar um contacto"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "Select All"
 msgstr "Reponder para todos"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Apagar um contacto"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#, fuzzy
-msgid "Send _Message to Contact..."
-msgstr "Enviar mensagem em formato HTML"
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "Apagar um contacto"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 #, fuzzy
 msgid "Send message to contact"
 msgstr "Enviar mensagem em formato HTML"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "Stop"
 msgstr "Fontes"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 #, fuzzy
 msgid "Stop Loading"
 msgstr "Cabe�alhos:"
 
-#: 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 "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: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-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
 msgid "_Actions"
 msgstr "_Ac��es"
 
-#: ui/evolution-addressbook.xml.h:30
-#, fuzzy
-msgid "_Addressbook Sources..."
-msgstr "Adicionar Fonte"
-
-#: ui/evolution-addressbook.xml.h:31
-#, fuzzy
-msgid "_Contact"
-msgstr "_Contacto"
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 #, fuzzy
 msgid "_Contact List"
 msgstr "_Contacto"
 
-#: 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
 #, fuzzy
 msgid "_Forward Contact..."
 msgstr "_Contacto"
 
-#: 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
+#: ui/evolution-addressbook.xml.h:38
 #, fuzzy
-msgid "_Print..."
-msgstr "Imprimir..."
+msgid "_Move to Folder..."
+msgstr "Ir para a _pasta..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Save as VCard"
 msgstr "Gravar como VCard"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "_Novo Contacto"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 #, fuzzy
 msgid "_Select All"
 msgstr "Reponder para todos"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:4
-#, fuzzy
-msgid "Create a New All Day _Event"
-msgstr "Criar um novo contacto"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
-msgid "Create a New _Task"
-msgstr "Criar um novo contacto"
-
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:45
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "Criar um novo compromisso para hoje"
-
-#: ui/evolution-calendar.xml.h:9
-#, fuzzy
-msgid "Create an event for the whole day"
-msgstr "Criar um novo compromisso para hoje"
+msgid "_Send Message to Contact..."
+msgstr "Enviar mensagem em formato HTML"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:4
 #, fuzzy
 msgid "Day"
 msgstr "DiasRascunhos"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
 msgid "Delete the appointment"
 msgstr "Novo compromisso"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Go To"
 msgstr "Ir para"
 
-#: 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:8
 #, fuzzy
 msgid "Go forward"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Go to _Date"
 msgstr "Ir para"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Ir para uma data espec�fica"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to today"
 msgstr "Hoje"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
 msgid "Month"
 msgstr "M�s"
 
-#: ui/evolution-calendar.xml.h:21
-#, fuzzy
-msgid "New Appointment"
-msgstr "Novo compromisso"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-#, fuzzy
-msgid "New Task"
-msgstr "_Tarefa"
-
-#: 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:16 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 #, fuzzy
 msgid "Print Pre_view"
 msgstr "Prever impress�o"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Print this calendar"
 msgstr "Imprimir este calend�rio"
 
-#: 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
 #, fuzzy
 msgid "Show one day"
 msgstr "Mostrar 1 dia"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Show one month"
 msgstr "Mostrar 1 m�s"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Show one week"
 msgstr "Mostrar 1 semana"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Mostrar a semana de trabalho"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 #, fuzzy
 msgid "Week"
 msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:35
-#, fuzzy
-msgid "_Appointment..."
-msgstr "_Novo compromisso..."
-
-#: ui/evolution-calendar.xml.h:36
-#, fuzzy
-msgid "_Calendar Settings..."
-msgstr "Prefer�ncias"
-
-#: ui/evolution-calendar.xml.h:42
-#, fuzzy
-msgid "_Publish Free/Busy Information"
-msgstr "Nenhuma Informa��o"
-
-#: ui/evolution-calendar.xml.h:43
-#, fuzzy
-msgid "_Task..."
-msgstr "_Tarefa"
-
 #: 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
@@ -13289,19 +26207,19 @@ msgstr "Imprimir este item"
 msgid "Print this item"
 msgstr "Imprimir este item"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Imprimir..."
-
-#: 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
 #, fuzzy
 msgid "Save"
 msgstr "S�"
 
+#: 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-signature-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:6
 #, fuzzy
 msgid "Save and Close"
 msgstr "Guardar Calend�rio como"
@@ -13318,8 +26236,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:40
 #, fuzzy
 msgid "_File"
 msgstr "_Pasta"
@@ -13330,7 +26248,7 @@ msgid "Print En_velope..."
 msgstr "Imprimir..."
 
 #: 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
 #, fuzzy
 msgid "Save _As..."
@@ -13340,10 +26258,15 @@ msgstr "Gravar na _pasta..."
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
+#: ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Enviar mensagem em formato HTML"
+
 #: 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
 #, fuzzy
 msgid "_Save"
 msgstr "S�"
@@ -13410,6 +26333,10 @@ 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"
@@ -13421,92 +26348,59 @@ msgid "Compose _New Message"
 msgstr "Criar uma nova mensagem"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: 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:6
 #, fuzzy
 msgid "Empty _Trash"
 msgstr "Dias vazios:"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Esquecer _Senhas"
 
-#: 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
-#, fuzzy
-msgid "New Message"
-msgstr "Mensagem de _correio"
-
-#: 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:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
-#, fuzzy
-msgid "Send / Receive"
-msgstr "Receber"
-
-#: 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:11
 #, fuzzy
 msgid "Show message preview window"
 msgstr "Se uma previs�o da mensagem deve ser mostrada"
 
-#: 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:13
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "_Pastas"
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "_Filters..."
 msgstr "Dru�da dos _filtros"
 
-#: ui/evolution-mail-global.xml.h:20
-#, fuzzy
-msgid "_Mail Message"
-msgstr "Mensagem de _correio"
-
-#: ui/evolution-mail-global.xml.h:21
-#, fuzzy
-msgid "_Mail Settings..."
-msgstr "Configura��o do co_rreio..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "Prever impress�o"
 
-#: ui/evolution-mail-global.xml.h:23
-#, fuzzy
-msgid "_Send / Receive"
-msgstr "Receber"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "Ir para a _pasta..."
@@ -13613,11 +26507,11 @@ msgstr "Imprimir a mensagem seleccionada"
 msgid "Threaded Message list"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Pasta"
 
@@ -13637,238 +26531,245 @@ msgstr "Enviar esta mensagem"
 
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Imposs�vel abrir o livro de endere�os"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Dru�da dos _filtros"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Imposs�vel abrir o livro de endere�os"
+
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
 msgid "Apply filter rules to the selected messages"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
 #, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Reponder a todos receptores da mensagem"
 
-#: 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-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:7
 #, fuzzy
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Responder ao emissor desta mensagem"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:9
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:10
 #, fuzzy
 msgid "Create _Virtual Folder From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: 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-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-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-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-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr ""
 
-#: 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-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: 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-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
 #, fuzzy
 msgid "Display the next important message"
 msgstr "Responder ao emissor desta mensagem"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Display the next message"
 msgstr "Descartar esta mensagem?"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Descartar esta mensagem?"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Display the previous unread message"
 msgstr "Descartar esta mensagem?"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Enviar esta mensagem"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "Ficheiro n�o encontrado"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "Ficheiro n�o encontrado"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "Ficheiro n�o encontrado"
 
-#: ui/evolution-mail-message.xml.h:29
-msgid "Force images in HTML mail to be loaded"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:30
-msgid "Forward"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
-msgid "Forward As"
-msgstr "Enviar esta mensagem"
+msgid "Flag selected message(s) for follow-up"
+msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward _Attached"
+#: ui/evolution-mail-message.xml.h:34
+msgid "Follow _Up..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Inline"
+#: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:34
-#, fuzzy
-msgid "Forward _Quoted"
-msgstr "Enviar esta mensagem"
-
-#: ui/evolution-mail-message.xml.h:35
+#: 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:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: 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-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Load _Images"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:45
-msgid "Mark as Unimp_ortant"
+msgid "Mark as U_nread"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:46
-#, fuzzy
-msgid "Mark the selected messages as having been read"
-msgstr "Imprimir a mensagem seleccionada"
+msgid "Mark as Unimp_ortant"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-msgid "Mark the selected messages as important"
+msgid "Mark the selected message(s) as having been read"
 msgstr "Imprimir a mensagem seleccionada"
 
 #: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as not having been read"
-msgstr ""
+#, fuzzy
+msgid "Mark the selected message(s) as important"
+msgstr "Imprimir a mensagem seleccionada"
 
 #: ui/evolution-mail-message.xml.h:49
 #, fuzzy
-msgid "Mark the selected messages as unimportant"
+msgid "Mark the selected message(s) as not having been read"
 msgstr "Imprimir a mensagem seleccionada"
 
 #: ui/evolution-mail-message.xml.h:50
 #, fuzzy
-msgid "Mark the selected messages for deletion"
+msgid "Mark the selected message(s) as unimportant"
 msgstr "Imprimir a mensagem seleccionada"
 
 #: ui/evolution-mail-message.xml.h:51
 #, fuzzy
-msgid "Move"
-msgstr "Sg"
+msgid "Mark the selected messages for deletion"
+msgstr "Imprimir a mensagem seleccionada"
 
 #: ui/evolution-mail-message.xml.h:52
 #, fuzzy
-msgid "Move selected messages to another folder"
-msgstr "Gravar a mensagem na pasta especificada"
+msgid "Move"
+msgstr "Sg"
 
 #: ui/evolution-mail-message.xml.h:53
 #, fuzzy
-msgid "Next"
-msgstr "Pr�_ximo"
+msgid "Move selected message(s) to another folder"
+msgstr "Gravar a mensagem na pasta especificada"
 
 #: ui/evolution-mail-message.xml.h:54
 #, fuzzy
-msgid "Next Important Message"
-msgstr "Responder ao emissor desta mensagem"
+msgid "Next"
+msgstr "Pr�_ximo"
 
 #: ui/evolution-mail-message.xml.h:55
 #, fuzzy
-msgid "Next Message"
-msgstr "Mensagem de _correio"
+msgid "Next _Important Message"
+msgstr "Responder ao emissor desta mensagem"
 
 #: ui/evolution-mail-message.xml.h:56
 #, fuzzy
-msgid "Next Thread"
+msgid "Next _Thread"
 msgstr "Reponder para todos"
 
 #: ui/evolution-mail-message.xml.h:57
 #, fuzzy
-msgid "Next Unread Message"
+msgid "Next _Unread Message"
 msgstr "Encontrar mensagens"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -13886,169 +26787,194 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-msgid "Preview the message to be printed"
-msgstr "Enviar a mensagem"
+msgid "P_revious Unread Message"
+msgstr "Descartar esta mensagem?"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Previous"
-msgstr "An_terior"
+msgid "Pr_evious Important Message"
+msgstr "Encontrar mensagens"
 
 #: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Previous Important Message"
-msgstr "Encontrar mensagens"
+msgid "Preview the message to be printed"
+msgstr "Enviar a mensagem"
 
 #: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-msgid "Previous Message"
-msgstr "Encontrar mensagens"
-
-#: ui/evolution-mail-message.xml.h:65
-#, fuzzy
-msgid "Previous Unread Message"
-msgstr "Descartar esta mensagem?"
+msgid "Previous"
+msgstr "An_terior"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 #, fuzzy
 msgid "Print this message"
 msgstr "Encontrar mensagens"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "Responder"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Re_direct"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "Reponder para todos"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Imprimir a mensagem seleccionada"
 
-#: 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-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: 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-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
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "atalhos principais"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Novas mensagens de correio"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Enviar mensagem em formato HTML"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "Ficheiro n�o encontrado"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-msgid "_Apply Filters"
-msgstr "Dru�da dos _filtros"
+msgid "_Attached"
+msgstr "Anexar"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Ir para"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "Seg"
+
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Larger"
 msgstr "Bip"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Message Display"
 msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Mensagem de _correio"
+
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Dia"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:105
 #, fuzzy
 msgid "_Open Message"
 msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Encontrar mensagens"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Nenhuma"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_Ferramentas"
 
+#: ui/evolution-mail-message.xml.h:112
+#, fuzzy
+msgid "_Undelete"
+msgstr "Apagar"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
 msgid "Close this window"
@@ -14056,14 +26982,14 @@ msgstr "Novo compromisso"
 
 #: 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:36
 #, fuzzy
 msgid "_Close"
 msgstr "Cores"
 
 #: 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:56
 #, fuzzy
 msgid "_View"
 msgstr "_Novo"
@@ -14091,12 +27017,12 @@ msgstr "Enviar a mensagem"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
-#: 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 "F_ormato"
 
-#: 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 ""
 
@@ -14113,6 +27039,11 @@ msgstr "Anexar um ficheiro � mensagem"
 msgid "Insert text file..."
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "_Abrir"
+
 #: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "Open a file"
@@ -14149,7 +27080,7 @@ msgid "Save in folder..."
 msgstr "Gravar na _pasta..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:7
 #, fuzzy
 msgid "Save the current file"
 msgstr "Ficheiro com assinatura:"
@@ -14178,6 +27109,7 @@ msgid "Send _later"
 msgstr "Enviar"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Enviar mensagem em formato HTML"
@@ -14259,7 +27191,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -14273,11 +27205,7 @@ msgstr "_Abrir"
 msgid "_Reply-To Field"
 msgstr "Responder"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr ""
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 #, fuzzy
 msgid "_Help"
 msgstr "Casa"
@@ -14337,39 +27265,45 @@ msgstr ""
 msgid "Re_fresh Task"
 msgstr ""
 
-#: 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:3
 #, fuzzy
 msgid "Copy selected task"
 msgstr "Copiar item seleccionada para a �rea de transfer�ncia"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Apagar este item"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "Apagar este item"
+
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Delete selected tasks"
 msgstr "Apagar este item"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "Cores"
+
+#: ui/evolution-tasks.xml.h:10
 #, fuzzy
 msgid "Paste task from the clipboard"
 msgstr "Colar item da �rea de transfer�ncia"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:11
 #, fuzzy
-msgid "Tasks Settings..."
-msgstr "Segundos"
+msgid "Previews the list of tasks to be printed"
+msgstr "Enviar a mensagem"
 
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
-msgid "_Task"
-msgstr "_Tarefa"
+msgid "Print the list of tasks"
+msgstr "Encontrar mensagens"
 
 #: ui/evolution.xml.h:1
 #, fuzzy
@@ -14447,132 +27381,137 @@ msgid "Open this folder in an other window"
 msgstr ""
 
 #: ui/evolution.xml.h:21
+#, fuzzy
+msgid "Send / Receive"
+msgstr "Receber"
+
+#: ui/evolution.xml.h:22
+msgid "Send queued items and retrieve new items"
+msgstr ""
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostrar a barra de pastas"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "View the selected folder"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Copy..."
 msgstr "Copiar"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Pasta"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Import..."
 msgstr "Seg"
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Move..."
 msgstr "Sg"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 #, fuzzy
 msgid "_New Folder"
 msgstr "_Nova pasta"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "Configura��o do co_rreio..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Abrir"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+#, fuzzy
+msgid "_Send / Receive"
+msgstr "Receber"
+
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Shortcut"
 msgstr "Mudar nome de atalho"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: 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:3
 #, fuzzy
 msgid "Print summary"
 msgstr "Nenhum sum�rio"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 #, fuzzy
 msgid "Reload"
 msgstr "Remover"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 #, fuzzy
 msgid "Reload the view"
 msgstr "Encontrar mensagens"
 
-#: ui/my-evolution.xml.h:8
-#, fuzzy
-msgid "_Summary Settings..."
-msgstr "Configura��o do co_rreio..."
-
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "Address Cards"
@@ -14589,20 +27528,29 @@ msgstr ""
 
 #: views/mail/galview.xml.h:1
 #, fuzzy
+msgid "As Sent Folder"
+msgstr "_Nova pasta"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
 msgid "By Sender"
 msgstr "Enviar"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 #, fuzzy
 msgid "By Status"
 msgstr "S�b"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 #, fuzzy
 msgid "By Subject"
 msgstr "Assunto"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem de _correio"
@@ -14611,6 +27559,12 @@ msgstr "Mensagem de _correio"
 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 ""
+
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 #, fuzzy
 msgid "Select a Time Zone"
@@ -14632,12 +27586,22 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 #, fuzzy
 msgid "_Current View"
 msgstr "Ano corrente (%Y)"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "Ano corrente (%Y)"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr ""
 
@@ -14670,79 +27634,84 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: 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 ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 #, fuzzy
 msgid "Greek"
 msgstr "Semana"
 
-#: 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 ""
 
-#: 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 ""
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 #, fuzzy
 msgid "Traditional"
 msgstr "_Op��es"
 
-#: 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 ""
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "Novo"
+#: widgets/misc/e-charset-picker.c:95
+#, fuzzy
+msgid "Visual"
+msgstr "Alarmes"
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:201
+#: 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:281
 #, fuzzy
 msgid "Other..."
 msgstr "Outro"
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr ""
 
@@ -14750,29 +27719,25 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:146
 #, fuzzy
 msgid "Search Editor"
 msgstr "_Contacto"
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:162
 #, fuzzy
 msgid "Save Search"
 msgstr "Ano"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:97
 #, fuzzy
-msgid "Add to Saved Searches"
+msgid "_Save Search..."
 msgstr "Ano"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:98
 #, fuzzy
-msgid "Clear"
-msgstr "Carro"
-
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr ""
+msgid "_Edit Saved Searches..."
+msgstr "Ano"
 
 #: widgets/misc/e-messagebox.c:152
 #, fuzzy
@@ -14799,11 +27764,22 @@ msgstr "Mensagem de _correio"
 msgid "Don't show this message again."
 msgstr "Enviar esta mensagem"
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr ""
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Encontrar"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Carro"
+
+#: widgets/misc/e-search-bar.c:835
+#, fuzzy
+msgid "Clear"
+msgstr "Carro"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 #, fuzzy
 msgid "Find Now"
 msgstr "Encontrar"
@@ -14835,6 +27811,428 @@ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr "Correio electr�nico 2"
+
+#, fuzzy
+#~ msgid "New _Contact"
+#~ msgstr "_Contacto"
+
+#, fuzzy
+#~ msgid "New Contact _List"
+#~ msgstr "_Contacto"
+
+#, fuzzy
+#~ msgid "Edit Addressbook"
+#~ msgstr "Imposs�vel abrir o livro de endere�os"
+
+#, fuzzy
+#~ msgid "Account Name"
+#~ msgstr "�cone_s pequenos"
+
+#, fuzzy
+#~ msgid "Add Addressbook"
+#~ msgstr "Imposs�vel abrir o livro de endere�os"
+
+#, fuzzy
+#~ msgid "Server Name"
+#~ msgstr "_Items seleccionados"
+
+#, fuzzy
+#~ msgid "Other Contacts"
+#~ msgstr "_Novo Contacto"
+
+#, fuzzy
+#~ msgid "(none)"
+#~ msgstr "Nome"
+
+#, fuzzy
+#~ msgid "Co_ntacts:"
+#~ msgstr "_Contacto"
+
+#, fuzzy
+#~ msgid "_Message Recipients:"
+#~ msgstr "Situa��o das mensagens"
+
+#, fuzzy
+#~ msgid "_Home"
+#~ msgstr "Casa"
+
+#, fuzzy
+#~ msgid "_Mobile"
+#~ msgstr "Telem�vel"
+
+#, fuzzy
+#~ msgid "Create a new appointment"
+#~ msgstr "Criar um novo compromisso para hoje"
+
+#, fuzzy
+#~ msgid "Create a new task"
+#~ msgstr "Criar um novo contacto"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "_Tarefa"
+
+#, fuzzy
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Criar um novo compromisso para hoje"
+
+#, fuzzy
+#~ msgid "_Other"
+#~ msgstr "Outro"
+
+#, fuzzy
+#~ msgid "Click here to add an attendee"
+#~ msgstr "Pressione aqui para o livro de endere�os"
+
+#, fuzzy
+#~ msgid "_Delete this Task"
+#~ msgstr "Apagar este item"
+
+#, fuzzy
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Nenhuma Informa��o"
+
+#, fuzzy
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Hora de _fim de _encontro"
+
+#, fuzzy
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Nenhuma Informa��o"
+
+#, fuzzy
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Cores"
+
+#, fuzzy
+#~ msgid "iCalendar Information"
+#~ msgstr "Nenhuma Informa��o"
+
+#, fuzzy
+#~ msgid "iCalendar Error"
+#~ msgstr "Novo Ca_lend�rio"
+
+#, fuzzy
+#~ msgid "Choose an action:"
+#~ msgstr "Apagar um contacto"
+
+#, fuzzy
+#~ msgid "Update"
+#~ msgstr "Lista de tarefas"
+
+#, fuzzy
+#~ msgid "Accept"
+#~ msgstr "�cone_s pequenos"
+
+#, fuzzy
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Nenhuma Informa��o"
+
+#, fuzzy
+#~ msgid "Send Latest Information"
+#~ msgstr "Nenhuma Informa��o"
+
+#, fuzzy
+#~ msgid "Meeting Information"
+#~ msgstr "Nenhuma Informa��o"
+
+#, fuzzy
+#~ msgid "Meeting Proposal"
+#~ msgstr "Seg"
+
+#, fuzzy
+#~ msgid "Meeting Update"
+#~ msgstr "Hora de _fim de _encontro"
+
+#, fuzzy
+#~ msgid "Meeting Update Request"
+#~ msgstr "Pedido de _encontro"
+
+#, fuzzy
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "Nenhuma Informa��o"
+
+#, fuzzy
+#~ msgid "Meeting Reply"
+#~ msgstr "Seg"
+
+#, fuzzy
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Apagar um contacto"
+
+#, fuzzy
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Mensagens enviadas"
+
+#, fuzzy
+#~ msgid "Task Information"
+#~ msgstr "Nenhuma Informa��o"
+
+#, fuzzy
+#~ msgid "Task Proposal"
+#~ msgstr "_Tarefa"
+
+#, fuzzy
+#~ msgid "Task Update"
+#~ msgstr "Lista de tarefas"
+
+#, fuzzy
+#~ msgid "Task Update Request"
+#~ msgstr "_Pedido de tarefa"
+
+#, fuzzy
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "Nenhuma Informa��o"
+
+#, fuzzy
+#~ msgid "Task Reply"
+#~ msgstr "Responder"
+
+#, fuzzy
+#~ msgid "Bad Task Message"
+#~ msgstr "Novo Ca_lend�rio"
+
+#, fuzzy
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "Nenhuma Informa��o"
+
+#, fuzzy
+#~ msgid "Free/Busy Information"
+#~ msgstr "Nenhuma Informa��o"
+
+#, fuzzy
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "Nenhuma Informa��o"
+
+#, fuzzy
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Encontrar mensagens"
+
+#, fuzzy
+#~ msgid "Status: %s"
+#~ msgstr "S�b"
+
+#, fuzzy
+#~ msgid "Contacts: "
+#~ msgstr "_Contacto"
+
+#, fuzzy
+#~ msgid "Message %s not found."
+#~ msgstr "Ficheiro n�o encontrado"
+
+#, fuzzy
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Criar uma nova mensagem"
+
+#, fuzzy
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "Criar uma nova mensagem"
+
+#, fuzzy
+#~ msgid "Message was sent"
+#~ msgstr "Situa��o das mensagens"
+
+#, fuzzy
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Criar um novo calend�rio"
+
+#, fuzzy
+#~ msgid "New _Mail Message"
+#~ msgstr "Mensagem de _correio"
+
+#, fuzzy
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Mensagens de correio em rascunho"
+
+#, fuzzy
+#~ msgid "Mailbox Format"
+#~ msgstr "F_ormato"
+
+#, fuzzy
+#~ msgid " (default)"
+#~ msgstr "Apagar"
+
+#, fuzzy
+#~ msgid "Subject is %s"
+#~ msgstr "Assunto"
+
+#, fuzzy
+#~ msgid "%s: Inbox"
+#~ msgstr "Correio novo"
+
+#, fuzzy
+#~ msgid "Composer"
+#~ msgstr "Cores"
+
+#, fuzzy
+#~ msgid "Edit..."
+#~ msgstr "Imprimir..."
+
+#, fuzzy
+#~ msgid "HTML signature file:"
+#~ msgstr "Ficheiro com assinatura:"
+
+#, fuzzy
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Ficheiro com assinatura:"
+
+#, fuzzy
+#~ msgid "_Email Address:"
+#~ msgstr "Endere�o de correio:"
+
+#, fuzzy
+#~ msgid "_Full Name:"
+#~ msgstr "Nome completo:"
+
+#, fuzzy
+#~ msgid "_Organization:"
+#~ msgstr "Organiza��o:"
+
+#, fuzzy
+#~ msgid "_Remember this password"
+#~ msgstr "Mudar nome de atalho"
+
+#, fuzzy
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Enviar mensagem em formato HTML"
+
+#, fuzzy
+#~ msgid "_Server Type: "
+#~ msgstr "Servidor:"
+
+#, fuzzy
+#~ msgid "_Signature file:"
+#~ msgstr "Ficheiro com assinatura:"
+
+#, fuzzy
+#~ msgid "seconds."
+#~ msgstr " segundos"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#, fuzzy
+#~ msgid "Summary Settings"
+#~ 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"
+
+#, fuzzy
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Criar um novo contacto"
+
+#, fuzzy
+#~ msgid "Create a New _Task"
+#~ msgstr "Criar um novo contacto"
+
+#, fuzzy
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Criar um novo compromisso para hoje"
+
+#, fuzzy
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Criar um novo compromisso para hoje"
+
+#, fuzzy
+#~ msgid "_Appointment..."
+#~ msgstr "_Novo compromisso..."
+
+#, fuzzy
+#~ msgid "_Calendar Settings..."
+#~ msgstr "Prefer�ncias"
+
+#, fuzzy
+#~ msgid "_Task..."
+#~ msgstr "_Tarefa"
+
+#, fuzzy
+#~ msgid "_Mail Settings..."
+#~ msgstr "Configura��o do co_rreio..."
+
+#, fuzzy
+#~ msgid "Forward _Quoted"
+#~ msgstr "Enviar esta mensagem"
+
+#, fuzzy
+#~ msgid "Tasks Settings..."
+#~ msgstr "Segundos"
+
+#, fuzzy
+#~ msgid "_Summary Settings..."
+#~ msgstr "Configura��o do co_rreio..."
+
+#, fuzzy
 #~ msgid "Importing Data"
 #~ msgstr "Seg"
 
@@ -14871,18 +28269,10 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
 #, fuzzy
-#~ msgid "_Imperial"
-#~ msgstr "_Correio"
-
-#, fuzzy
 #~ msgid "Folder cannot contain the directory separator."
 #~ msgstr "Criar um novo calend�rio"
 
 #, fuzzy
-#~ msgid "Ximian Evolution"
-#~ msgstr "Evolution"
-
-#, fuzzy
 #~ msgid "%s - Ximian Evolution %s"
 #~ msgstr "Evolution - %s"
 
@@ -14894,10 +28284,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "F_ormato"
 
 #, fuzzy
-#~ msgid "LDAP Authentication"
-#~ msgstr "Autentica��o"
-
-#, fuzzy
 #~ msgid "Password:"
 #~ msgstr "Esquecer _Senhas"
 
@@ -14934,10 +28320,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Propriedades do alarme"
 
 #, fuzzy
-#~ msgid "Factory for the Evolution addressbook component."
-#~ msgstr "N�o consigo inicializar o componente de mail do Evolution."
-
-#, fuzzy
 #~ msgid "a"
 #~ msgstr "am"
 
@@ -14977,10 +28359,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "pm"
 
 #, fuzzy
-#~ msgid "r"
-#~ msgstr "Sx"
-
-#, fuzzy
 #~ msgid "t"
 #~ msgstr "h"
 
@@ -14993,16 +28371,9 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Nenhuma"
 
 #, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "N�o consigo inicializar o componente de mail do Evolution."
-
-#, fuzzy
 #~ msgid "Snooze"
 #~ msgstr "Tamanho"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
 #, fuzzy
 #~ msgid "Synchronizing folder"
 #~ msgstr "Sincronizar"
@@ -15012,10 +28383,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Correio electr�nico 2"
 
 #, fuzzy
-#~ msgid "Pine mail"
-#~ msgstr "Endere�o principal de correio electr�nico"
-
-#, fuzzy
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Enviar esta mensagem"
 
@@ -15028,54 +28395,26 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Abrir ficheiro"
 
 #, fuzzy
-#~ msgid "Factory for the Evolution executive summary component."
-#~ msgstr "N�o consigo inicializar o componente de mail do Evolution."
-
-#, fuzzy
 #~ msgid "This seems to be the first time you are running Evolution."
 #~ msgstr "Esta parece ser a primeira vez que est� a correr o Evolution."
 
 #~ 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"
 #~ msgstr "Sum�rio"
 
-#, fuzzy
-#~ msgid "Unknown addressbook type"
-#~ msgstr "Imposs�vel abrir o livro de endere�os"
-
-#, fuzzy
-#~ msgid "Subtree"
-#~ msgstr "Fontes"
-
 #~ msgid "Authentication:"
 #~ msgstr "Autentica��o"
 
 #, fuzzy
-#~ msgid "Advanced LDAP Options"
-#~ msgstr "Encontrar avan�ado"
-
-#, fuzzy
 #~ msgid "Select name from _folder:"
 #~ msgstr "_Items seleccionados"
 
 #, fuzzy
-#~ msgid "Transparent"
-#~ msgstr "Transportes"
-
-#, fuzzy
-#~ msgid "Calendar Preferences"
-#~ msgstr "Prefer�ncias"
-
-#, fuzzy
-#~ msgid "Defaults"
-#~ msgstr "Apagar"
-
-#, fuzzy
 #~ msgid "Remind me of all appointments"
 #~ msgstr "Compromisso - %s"
 
@@ -15096,22 +28435,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "_Pedido de tarefa"
 
 #, fuzzy
-#~ msgid "Store search as vFolder"
-#~ msgstr "_Nova pasta"
-
-#, fuzzy
-#~ msgid "Resend"
-#~ msgstr " segundos"
-
-#, fuzzy
-#~ msgid "Receiving"
-#~ msgstr "Receber"
-
-#, fuzzy
-#~ msgid "Store"
-#~ msgstr "Fontes"
-
-#, fuzzy
 #~ msgid "Print My Evolution"
 #~ msgstr "Evolution"
 
@@ -15148,10 +28471,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Imprimir..."
 
 #, fuzzy
-#~ msgid "_Action"
-#~ msgstr "_Ac��es"
-
-#, fuzzy
 #~ msgid "Show _All"
 #~ msgstr "Novas mensagens de correio"
 
@@ -15279,14 +28598,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Remover grupo"
 
 #, fuzzy
-#~ msgid "Move to Folder..."
-#~ msgstr "Ir para a _pasta..."
-
-#, fuzzy
-#~ msgid "Copy to Folder..."
-#~ msgstr "Ir para a _pasta..."
-
-#, fuzzy
 #~ msgid "Closing current folder"
 #~ msgstr "Fechar o calend�rio corrente"
 
@@ -15301,9 +28612,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgid "Evolution files successfully installed."
 #~ msgstr "Ficheiros do Evolution instalados com sucesso"
 
-#~ msgid "Activate"
-#~ msgstr "Activar"
-
 #~ msgid "Activate this shortcut"
 #~ msgstr "Activar este atalho"
 
@@ -15327,9 +28635,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgid "FIXME: Save Attac_hments..."
 #~ msgstr "Adicionar anexo..."
 
-#~ msgid "_Object"
-#~ msgstr "_Objecto"
-
 #, fuzzy
 #~ msgid "FIXME: __Formatting"
 #~ msgstr "_Contacto"
@@ -15338,10 +28643,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "_Ferramentas"
 
 #, fuzzy
-#~ msgid "_Forms"
-#~ msgstr "_Pasta"
-
-#, fuzzy
 #~ msgid "FIXME: New _Letter to Contact"
 #~ msgstr "_Contacto"
 
@@ -15388,26 +28689,14 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Encontrar"
 
 #, fuzzy
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarmes"
-
-#, fuzzy
 #~ msgid "Appointment Basics"
 #~ msgstr "Compromissos:"
 
 #, fuzzy
-#~ msgid "Mail _to:"
-#~ msgstr "atalhos principais"
-
-#, fuzzy
 #~ msgid "Hide from Sender"
 #~ msgstr "Ficheiro n�o encontrado"
 
 #, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Propriedades do alarme"
-
-#, fuzzy
 #~ msgid "Evolution Mail Configuration"
 #~ msgstr "Configura��o do correio"
 
@@ -15423,33 +28712,14 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgid "Save password"
 #~ msgstr "Gravar como VCard"
 
-#~ msgid "Full name:"
-#~ msgstr "Nome completo:"
-
-#~ msgid "Email address:"
-#~ msgstr "Endere�o de correio:"
-
 #, fuzzy
 #~ msgid "Mail source type:"
 #~ msgstr "Fontes de correio"
 
-#~ msgid "Add Source"
-#~ msgstr "Adicionar Fonte"
-
 #, fuzzy
 #~ msgid "Mail Sources"
 #~ msgstr "atalhos principais"
 
-#~ msgid "Mail Transport"
-#~ msgstr "Transporte de correio"
-
-#, fuzzy
-#~ msgid "News Sources"
-#~ msgstr "Fontes"
-
-#~ msgid "Find a contact"
-#~ msgstr "Encontrar um contacto"
-
 #, fuzzy
 #~ msgid "_Addressbook Configuration..."
 #~ msgstr "Configura��o do co_rreio..."
@@ -15477,25 +28747,10 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "_Compromisso"
 
 #, fuzzy
-#~ msgid "Redo"
-#~ msgstr "Remover"
-
-#~ msgid "Undo"
-#~ msgstr "Anular"
-
-#, fuzzy
 #~ msgid "_Find..."
 #~ msgstr "Encontrar"
 
 #, fuzzy
-#~ msgid "_Undo"
-#~ msgstr "Anular"
-
-#, fuzzy
-#~ msgid "Get Mail"
-#~ msgstr "_Correio"
-
-#, fuzzy
 #~ msgid "Print Preview of message..."
 #~ msgstr "Prever impress�o"
 
@@ -15520,41 +28775,13 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Domingo"
 
 #, fuzzy
-#~ msgid "monday"
-#~ msgstr "Segunda-feira"
-
-#, fuzzy
 #~ msgid "tuesday"
 #~ msgstr "Domingo"
 
 #, fuzzy
-#~ msgid "thur"
-#~ msgstr "Outro"
-
-#, fuzzy
-#~ msgid "thurs"
-#~ msgstr "Outro"
-
-#, fuzzy
-#~ msgid "friday"
-#~ msgstr "Prim�rio"
-
-#, fuzzy
-#~ msgid "next"
-#~ msgstr "Pr�_ximo"
-
-#, fuzzy
-#~ msgid "third"
-#~ msgstr "Outro"
-
-#, fuzzy
 #~ msgid "ninth"
 #~ msgstr "Imprimir"
 
-#, fuzzy
-#~ msgid "tenth"
-#~ msgstr "Enviar"
-
 #~ msgid "Year:"
 #~ msgstr "Ano:"
 
@@ -15580,15 +28807,9 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgid "Show 1 year"
 #~ msgstr "Mostrar 1 ano"
 
-#~ msgid "_Close Calendar"
-#~ msgstr "_Fechar Calend�rio"
-
 #~ msgid "New appointment for _today..."
 #~ msgstr "Novo compromisso para _hoje..."
 
-#~ msgid "About Calendar"
-#~ msgstr "Sobre o calend�rio"
-
 #, fuzzy
 #~ msgid "'s calendar"
 #~ msgstr "O seu calend�rio"
@@ -15682,9 +28903,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgid "Rename Group"
 #~ msgstr "Mudar nome de grupo"
 
-#~ msgid "Executive Summary"
-#~ msgstr "Sum�rio executivo"
-
 #~ msgid "Enables some debugging functions"
 #~ msgstr "Liga algumas fun��es de deupra��o"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 33f23c8ff5..8c430b34f7 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-04-04 08:47-0300\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -30,7 +30,7 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importa arquivos VCard no Evolution."
 
 #: 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 "Arquivar como"
 
@@ -40,7 +40,7 @@ msgid "Name"
 msgstr "Nome"
 
 #: 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-mail"
 
@@ -56,7 +56,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/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistente"
 
@@ -96,7 +96,7 @@ msgid "Home"
 msgstr "Residencial"
 
 #: 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 "Empresa"
 
@@ -118,7 +118,7 @@ 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/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax comercial"
 
@@ -128,7 +128,7 @@ msgstr "Fax com"
 
 #: 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/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax residencial"
 
@@ -148,7 +148,7 @@ msgstr "Residencial 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/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -156,55 +156,54 @@ msgstr "ISDN"
 #: 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:112
 msgid "Other"
 msgstr "Outro"
 
 #: 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/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/widgets/e-addressbook-view.c:353
+#: 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/widgets/e-addressbook-view.c:354
+#: 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/widgets/e-addressbook-view.c:355
+#: 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: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/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/widgets/e-addressbook-view.c:359
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-mail 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 "Site web"
 
@@ -213,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 "Departamento"
 
@@ -222,7 +221,7 @@ msgid "Dep"
 msgstr "Dep"
 
 #: 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 "Escrit�rio"
 
@@ -231,12 +230,12 @@ msgid "Off"
 msgstr "Escr"
 
 #: 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 "Tratamento"
 
 #: 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 "Profiss�o"
 
@@ -245,7 +244,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: 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 "Gerente"
 
@@ -258,7 +257,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: 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 "Apelido"
 
@@ -267,12 +266,12 @@ msgid "Nick"
 msgstr "Apelido"
 
 #: 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 "C�njuge"
 
 #: 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 "Nota"
 
@@ -285,7 +284,7 @@ msgid "CALUri"
 msgstr "URIAge"
 
 #: 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 livre-ocupado"
 
@@ -319,11 +318,11 @@ msgstr "Sobrenome"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "V�rios VCards"
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -344,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:2738
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Buscando..."
 
@@ -357,32 +356,32 @@ msgstr "Carregando..."
 msgid "Error in search expression."
 msgstr "Erro na express�o de busca."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1129
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Adicionando cart�o ao servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1232
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Removendo cart�o do servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1468
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Modificando cart�o do servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2592
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
 msgid "Restarting search."
 msgstr "Reiniciando busca."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2684
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Recebendo resultados da busca LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2765
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
 #, fuzzy
 msgid "Error performing search"
 msgstr "Erro ao remover cart�o"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2789
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "N�o foi poss�vel analisar URL `%s'"
@@ -426,301 +425,116 @@ msgid "A Bonobo control for displaying an address."
 msgstr "Um controle Bonobo para exibir um endere�o."
 
 #: 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 "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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 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:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Componente do Evolution para manipular contatos."
 
-#: 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 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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 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:12
-msgid "Factory for the configuration control for the Evolution Addressbook."
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#, 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:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 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:14
-msgid ""
-"This page can be used to configure access to directory servers using the "
-"LDAP protocol"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
+msgid "This page can be used to configure Addressbook Settings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Contatos"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Pasta contendo informa��o sobre contatos"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "Servidor LDAP contendo informa��o sobre contatos"
 
-#: addressbook/gui/component/addressbook-component.c:560
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Novo contato"
 
-#: addressbook/gui/component/addressbook-component.c:560
-#: ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Contato"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Nova lista de contatos"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Contact _List"
 msgstr "Lista de _contatos"
 
-#: addressbook/gui/component/addressbook-config.c:238
-msgid "Edit Addressbook"
-msgstr "Editar cat�logo de endere�os"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#, fuzzy
-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 "A_utenticar com servidor usando:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Nome da conta"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Adicionar cat�logo de endere�os"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Addressbook Sources"
-msgstr "Fontes de cat�logos de endere�os"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Avan�ado"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "B�sico"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr "Marque aqui se o servidor exige que voc� se autentique."
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "De_lete"
-msgstr "E_xcluir"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr "Distinguished name (DN)"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "Endere�o de e-mail"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-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"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"O Evolution usar� este endere�o de e-mail para autentic�-lo com o servidor"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr "Um"
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "_Base de busca:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
-msgstr "_Escopo de busca:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Nome do servidor"
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-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.  "
-
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "Esta informa��o n�o � necess�ria para a maioria dos servidores 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."
-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."
-
-#: 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 ""
-"Este � o n� base para todas as suas buscas no servidor ldap. Procure o "
-"administrador de seu servidor para mais informa��es."
-
-#: 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
-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 ""
-"Este � o m�todo que o Evolution usar� para autentic�-lo. Note que a op��o "
-"\"Endere�o de e-mail\" requer acesso an�nimo ao seu servidor ldap."
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-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."
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "Esta � a porta que o seu servidor ldap usa."
-
-#: 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 ""
-"Este nome ser� usado para identificar sua conta. Ele � usado apenas para "
-"exibi��o."
-
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "Nome da _conta:"
-
-#: 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:179
-msgid "_Add"
-msgstr "_Adicionar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr "_Distinguished Name:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:189
-#: ui/evolution-addressbook.xml.h:37 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 "_Editar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:35
-msgid "_Email address:"
-msgstr "_Endere�o de e-mail:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Porta:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "Nome do _servidor:"
-
-#: addressbook/gui/component/addressbook-factory.c:70
+#: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
 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:519
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "N�o � poss�vel abrir o cat�logo de endere�os"
 
-#: addressbook/gui/component/addressbook.c:528
+#: 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"
@@ -730,7 +544,7 @@ msgstr ""
 "significa que voc� forneceu uma URI incorreta ou o servidor\n"
 "LDAP est� fora do ar"
 
-#: addressbook/gui/component/addressbook.c:533
+#: 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"
@@ -742,7 +556,7 @@ msgstr ""
 "voc� deve recompilar o programa dos fontes em CVS ap�s\n"
 "obter o OpenLDAP a partir do link abaixo.\n"
 
-#: addressbook/gui/component/addressbook.c:541
+#: 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."
@@ -751,54 +565,45 @@ msgstr ""
 "Por favor, verifique se o arquivo existe e que voc�\n"
 "possui as permiss�es para acess�-lo."
 
-#: addressbook/gui/component/addressbook.c:649
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Entre senha para %s (usu�rio %s)"
 
-#: addressbook/gui/component/addressbook.c:825
+#: addressbook/gui/component/addressbook.c:769
 msgid "Name begins with"
 msgstr "Nome come�a com"
 
-#: addressbook/gui/component/addressbook.c:826
+#: addressbook/gui/component/addressbook.c:770
 msgid "Email is"
 msgstr "E-mail �"
 
-#: addressbook/gui/component/addressbook.c:827
+#: addressbook/gui/component/addressbook.c:771
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categoria �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:828
+#: addressbook/gui/component/addressbook.c:772
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualquer campo cont�m"
 
-#: addressbook/gui/component/addressbook.c:829 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
 msgid "Advanced..."
 msgstr "Avan�ado..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1057
+#: addressbook/gui/component/addressbook.c:1001
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Qualquer categoria"
 
-#: addressbook/gui/component/addressbook.c:1139
+#: addressbook/gui/component/addressbook.c:1083
 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
@@ -847,6 +652,628 @@ 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
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "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
+#, fuzzy
+msgid "Always"
+msgstr "Albany"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "An�nimo"
+
+#: 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 "Conectando ao servidor..."
+
+#: 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 "Sem informa��o"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "E_xcluir"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "_Distinguished Name:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Email Address:"
+msgstr "_Endere�o de e-mail:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Alarme do Evolution"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr ""
+"O Evolution usar� este endere�o de e-mail para autentic�-lo com o servidor"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"O Evolution usar� este endere�o de e-mail para autentic�-lo com o servidor"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "_Localizar"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Geral"
+
+#: 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 "Configura��o"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Margens"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "a _cada"
+
+#: 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 "Um"
+
+#: 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 " (padr�o)"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr " (padr�o)"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "_Escopo de busca:"
+
+#. 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 "Buscando"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Selecionar todos"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Exclu�da"
+
+#: 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 "Informa��o da fonte"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Conectando ao servidor..."
+
+#: 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 "Sub"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Schema n�o suportado"
+
+#: 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 ""
+"Este � o m�todo que o Evolution usar� para autentic�-lo. Note que a op��o "
+"\"Endere�o de e-mail\" requer acesso an�nimo ao seu servidor 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 ""
+"Este nome ser� usado para identificar sua conta. Ele � usado apenas para "
+"exibi��o."
+
+#: 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 "Distinguished name (DN)"
+
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+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
+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:139
+msgid "_Add"
+msgstr "_Adicionar"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Adicionar"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Adicionar a��o"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Adicionar a��o"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Albany"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Excluir todos"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Exibi��o"
+
+#: addressbook/gui/component/ldap-config.glade.h:111
+#, fuzzy
+msgid "_Distinguished Name (DN):"
+msgstr "Distinguished name (DN)"
+
+#: 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:152 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 "_Editar"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Editar compromisso"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Alarme do 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 "_Op��es"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Porta:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr " (padr�o)"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "_Base de busca:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "Nome do _servidor:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Tempo de adiamento (minutos)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Conta %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 "Sem cart�es"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Reconectando a %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 "Geral"
+
+#: 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 "Buscando"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Interface para sele��o de nomes do cat�logo de endere�os do Evolution"
@@ -856,7 +1283,7 @@ 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"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:852
+#: 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
 msgid "Remove"
@@ -887,7 +1314,12 @@ msgstr "(%d n�o exibidos)"
 msgid "Unnamed Contact"
 msgstr "Contato sem nome"
 
-#: addressbook/gui/component/select-names/e-select-names.c:603
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Remetente cont�m"
+
+#: 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"
@@ -897,14 +1329,14 @@ 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"
 "Obrigado."
 
-#: addressbook/gui/component/select-names/e-select-names.c:611
+#: 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"
@@ -916,31 +1348,40 @@ msgstr ""
 "Voc� pode precisar sair e reiniciar o Evolution para corrigir\n"
 "este problema."
 
-#: addressbook/gui/component/select-names/e-select-names.c:693
+#: addressbook/gui/component/select-names/e-select-names.c:806
 msgid "Select Contacts from Addressbook"
 msgstr "Selecionar contatos do cat�lago de endere�os"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "C_ontendo:"
+msgid "Select Names"
+msgstr "Selecionar nomes"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "_Localizar"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Excluir contato?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Selecionar nomes"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Contatos"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Exibir contatos casando com os seguintes crit�rios:"
+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 "_Mover..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Categoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Pasta:"
 
@@ -1001,11 +1442,6 @@ msgstr "A_rquivar como:"
 msgid "Full _Name..."
 msgstr "Nome _completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: mail/mail-config.glade.h:74
-msgid "General"
-msgstr "Geral"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1050,12 +1486,11 @@ 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:707
-#: calendar/gui/e-calendar-table.c:1001 calendar/gui/e-day-view.c:3609
-#: filter/filter.glade.h:8 mail/folder-browser.c:1629
-#: mail/mail-config.glade.h:187 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: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
 msgid "_Delete"
 msgstr "_Excluir"
 
@@ -2111,14 +2546,6 @@ 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?"
 
@@ -2152,7 +2579,7 @@ msgid "Edit Full"
 msgstr "Editar completo"
 
 #: 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 "Nome completo"
 
@@ -2367,101 +2794,23 @@ msgstr "Busca avan�ada"
 msgid "Search"
 msgstr "Buscar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:136
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Sem cart�es"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:139
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 cart�o"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d cart�es"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:369
+#: addressbook/gui/widgets/e-addressbook-model.c:370
 msgid "Error getting book view"
 msgstr "Erro ao obter vis�o de livro"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: 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 "Salvar como VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:313
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Abrir"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:1017
-#: ui/evolution-addressbook.xml.h:13
-msgid "Forward Contact"
-msgstr "Encaminhar contato"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1018
-msgid "Send Message to Contact"
-msgstr "Enviar mensagem ao contato"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:317
-#: 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:65
-#: ui/my-evolution.xml.h:1
-msgid "Print"
-msgstr "Imprimir"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:319
-#: addressbook/gui/widgets/e-addressbook-view.c:1021
-msgid "Print Envelope"
-msgstr "Imprimir envelope"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-#, fuzzy
-msgid "Copy to folder..."
-msgstr "_Copiar para pasta..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:324
-#: addressbook/gui/widgets/e-addressbook-view.c:1026
-#, fuzzy
-msgid "Move to folder..."
-msgstr "_Mover para pasta..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
-#: addressbook/gui/widgets/e-addressbook-view.c:1029
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Recortar"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: 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:2
-msgid "Copy"
-msgstr "Copiar"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1031
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:9
-msgid "Paste"
-msgstr "Colar"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:330
-#: addressbook/gui/widgets/e-addressbook-view.c:1032
-#: filter/libfilter-i18n.h:10 mail/mail-accounts.c:213
-#: 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-table-adapter.c:140
 #: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
@@ -2469,14 +2818,15 @@ msgid "Error modifying card"
 msgstr "Erro ao modificar cart�o"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1042
+#: shell/evolution-shell-component.c:1043
 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 shell/e-shell.c:1990
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1079
+#: 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
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -2485,7 +2835,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:1070
+#: shell/evolution-shell-component.c:1071
 msgid "Permission denied"
 msgstr "Permiss�o negada"
 
@@ -2503,9 +2853,9 @@ 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
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2276
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: 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
 msgid "Cancelled"
 msgstr "Cancelada"
 
@@ -2537,7 +2887,7 @@ 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:1436
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Erro ao remover cart�o"
 
@@ -2559,90 +2909,192 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:342
+#: addressbook/gui/widgets/e-addressbook-util.c:344
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:346
 #, fuzzy
 msgid "Copy card to"
 msgstr "Copiar tarefa selecionada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Move cards to"
 msgstr "Sem cart�es"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:351
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Sem cart�es"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:331
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Clique aqui para adicionar um contato *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Telefone principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Telefone do assistente:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Telefone comercial"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Telefone de retorno"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Telefone da empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Telefone residencial"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Endere�o comercial"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Endere�o residencial"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Telefone celular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Telefone no carro"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Telefone comercial 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Telefone residencial 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:351
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Outro telefone"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Salvar como VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Novo contato"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Nova lista de contatos"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Ir para pasta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Importar..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Buscar contatos"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Fontes de cat�logos de endere�os..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Configura��es do _pilot..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Encaminhar contato"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Enviar mensagem ao contato"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Imprimir envelope"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "_Copiar para pasta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "_Mover para pasta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Recortar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Vis�o atual"
+
+#. 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:940
 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"
 
@@ -2650,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:585
+#: addressbook/gui/widgets/e-addressbook-view.c:945
 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"
 
@@ -2667,7 +3119,7 @@ msgstr "e um outro cart�o."
 msgid "Save in addressbook"
 msgstr "Salvar no cat�logo de endere�os"
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
+#: addressbook/gui/widgets/e-minicard-view.c:140
 #, fuzzy
 msgid ""
 "\n"
@@ -2682,7 +3134,7 @@ msgstr ""
 "\n"
 "Clique duas vezes aqui para criar um novo contato."
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
+#: addressbook/gui/widgets/e-minicard-view.c:143
 #, fuzzy
 msgid ""
 "\n"
@@ -2890,29 +3342,25 @@ msgstr "_Fonte..."
 msgid "Untitled appointment"
 msgstr "Compromisso sem nome"
 
-#: 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:416 mail/message-list.c:684
+#: 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
 msgid "High"
 msgstr "Alta"
 
-#: 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:417 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
-#: 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:418 mail/message-list.c:682
+#: 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
 msgid "Low"
 msgstr "Baixa"
 
 #. 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:419
 msgid "Undefined"
 msgstr "Indefinido"
 
@@ -3002,22 +3450,10 @@ 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
-msgid "Evolution Alarm"
-msgstr "Alarme do Evolution"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3057,7 +3493,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:2600
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Alerta"
@@ -3108,7 +3544,7 @@ msgstr "Descri��o cont�m"
 msgid "Comment contains"
 msgstr "Coment�rio cont�m"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1118
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "N�o casadas"
 
@@ -3119,7 +3555,7 @@ msgstr "%A, %d de %B de %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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1421 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3137,11 +3573,11 @@ msgstr "%d de %B de %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1468
+#: 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:775
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3149,16 +3585,14 @@ msgstr ""
 "do seu ORBit e OAF."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:395
 msgid "Private"
 msgstr "Particular"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:396
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:394
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "P�blico"
 
@@ -3179,32 +3613,27 @@ msgid "W"
 msgstr "O"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:468
 msgid "Free"
 msgstr "Livre"
 
-#: 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:1064
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:489 calendar/gui/print.c:2267
 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:490 calendar/gui/print.c:2270
 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-calendar-table.c:491 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2273
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Conclu�da"
 
@@ -3220,11 +3649,10 @@ 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:1591
-#: mail/mail-account-gui.c:1076 mail/mail-account-gui.c:1077
-#: mail/mail-account-gui.c:1673 mail/mail-accounts.c:426
-#: mail/mail-accounts.c:435 mail/mail-config.glade.h:110
-#: mail/message-tag-followup.c:64
+#: 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
 #: 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
@@ -3241,21 +3669,13 @@ 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/e-meeting-model.c:821
 msgid "Yes"
 msgstr "Sim"
 
 #: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
 msgid "No"
 msgstr "N�o"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1695
-#: calendar/gui/e-week-view.c:1206
-msgid "Searching"
-msgstr "Buscando"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Vis�o de dia"
@@ -3272,8 +3692,8 @@ msgstr "Vis�o de semana"
 msgid "Month View"
 msgstr "Vis�o de m�s"
 
-#: calendar/gui/component-factory.c:67 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -3281,11 +3701,10 @@ msgstr "Agenda"
 msgid "Folder containing appointments and events"
 msgstr "Pasta contendo compromissos e eventos"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/print.c:1754
-#: calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
-#: 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
+#: 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
 msgid "Tasks"
 msgstr "Tarefas"
@@ -3294,54 +3713,59 @@ msgstr "Tarefas"
 msgid "Folder containing to-do items"
 msgstr "Pasta contendo itens de tarefa"
 
-#: calendar/gui/component-factory.c:690
+#: calendar/gui/component-factory.c:695
 #, fuzzy
 msgid "New meeting"
 msgstr "Configura��es de fontes de not�cias"
 
-#: calendar/gui/component-factory.c:690
+#: calendar/gui/component-factory.c:695
 #, fuzzy
 msgid "_Meeting"
 msgstr "Reuni�o"
 
-#: calendar/gui/component-factory.c:694
+#: calendar/gui/component-factory.c:699
 #, fuzzy
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/component-factory.c:694
+#: calendar/gui/component-factory.c:699
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:698
+#: calendar/gui/component-factory.c:703
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:698
+#: calendar/gui/component-factory.c:703
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Novo _compromisso"
 
-#: calendar/gui/component-factory.c:702
+#: calendar/gui/component-factory.c:707
 #, fuzzy
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:702
+#: calendar/gui/component-factory.c:707
 #, fuzzy
 msgid "_Appointment"
 msgstr "Compromisso"
 
-#: calendar/gui/control-factory.c:103
+#: calendar/gui/control-factory.c:123
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "N�o foi poss�vel abrir pasta em '%s'"
 
-#: calendar/gui/control-factory.c:130
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "A URI que a agenda vai exibir"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "Mudar o nome desta pasta"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Op��es do alarme aud�vel"
@@ -3406,9 +3830,7 @@ msgstr "vezes extra a cada"
 msgid "hours"
 msgstr "horas"
 
-#: 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 "minutos"
 
@@ -3536,7 +3958,7 @@ msgstr "Lembretes"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -3565,7 +3987,7 @@ msgstr "fim do compromisso"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:221
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -3606,170 +4028,168 @@ msgid "Color for tasks due today"
 msgstr "Cor das tarefas com prazo para hoje"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "_Criar novos compromissos com um lembrete padr�o"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Dias"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "P_rimeiro dia da semana:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Tarefas _atrasadas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "S�bado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-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:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 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:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domigo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Tarefas com prazo para _hoje:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "Qu_i"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "_Ter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Tarefas com prazo para _hoje:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "_Lista de tarefas"
 
-#: 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 "Quinta-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Tempo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "_Fuso hor�rio:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "_Unidades de tempo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Formato da hora:"
 
-#: 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 "Ter�a-feira"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Semana �til"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pedir confirma��o ao apagar itens"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Exibi��o"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "Se_x"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Geral"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "E_sconder tarefas conclu�das ap�s"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Seg"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Outros"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Tarefas _atrasadas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "S�_b"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "_Lista de tarefas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "_Unidades de tempo:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "Qu_a"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "antes do in�cio do compromisso"
 
@@ -3834,23 +4254,23 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Voc� n�o fez altera��es, atualizar o editor?"
 
-#: 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 " para "
 
-#: 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 " (Conclu�da "
 
-#: 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 "Conclu�da "
 
-#: 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 " (Prazo "
 
-#: 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 "Prazo "
 
@@ -3882,8 +4302,8 @@ msgid "No summary"
 msgstr "Sem resumo"
 
 #: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3801
-#: calendar/gui/e-week-view.c:3707 composer/e-msg-composer.c:956
+#: 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
 msgid "Save as..."
 msgstr "Salvar como..."
 
@@ -3945,7 +4365,7 @@ msgstr "Delegar para:"
 msgid "Enter Delegate"
 msgstr "Entrar delegado"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2224
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Compromisso"
 
@@ -4012,7 +4432,7 @@ msgid "Pu_blic"
 msgstr "_P�blico"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Exibir como tempo"
 
@@ -4057,55 +4477,49 @@ msgstr "Participante"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "Nome comum"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegado por"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegado para"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "L�ngua"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Membro"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:864
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Papel"
 
-#: 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
+#: 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"
 msgstr "Estado"
 
-#: 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:168
+#: 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
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
@@ -4128,27 +4542,98 @@ msgstr "_Convidar outros..."
 msgid "_Other Organizer"
 msgstr "_Outro organizador"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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� de"
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "2 de"
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "3 de"
+
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Este compromisso possui repeti��es que o Evolution n�o pode editar."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "lista"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "segundo"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Outro"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Norte"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "lista"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Outro fax"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dia"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "no"
 
-#: 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 "ocorr�ncias"
 
@@ -4245,7 +4730,7 @@ msgid "Progress"
 msgstr "Progresso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:766
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4257,15 +4742,19 @@ msgstr "_Prioridade:"
 msgid "_Status:"
 msgstr "_Estado:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+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
 msgid "Assignment"
 msgstr "Atribui��o"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:812
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:55
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Descri��o:"
 
@@ -4277,136 +4766,80 @@ msgstr "_Data de in�cio:"
 msgid "_Due Date:"
 msgstr "Pra_zo de conclus�o:"
 
-#: calendar/gui/e-calendar-table.c:438
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:439
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:440
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:441
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:442
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:443
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:444
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:445
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:446
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:447
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:448
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2744
-#: calendar/gui/e-week-view.c:1846
+#: calendar/gui/e-calendar-table.c:751 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:3583
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1602
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:40
+#: 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
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:974
+#: calendar/gui/e-calendar-table.c:973
 #, fuzzy
 msgid "_Save as..."
 msgstr "Salvar como..."
 
-#: calendar/gui/e-calendar-table.c:976 calendar/gui/e-day-view.c:3587
-#: calendar/gui/e-week-view.c:3442 calendar/gui/e-week-view.c:3475
-#: ui/evolution-addressbook.xml.h:42 ui/evolution-calendar.xml.h:30
+#: calendar/gui/e-calendar-table.c:974 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 "_Imprimir..."
 
-#: calendar/gui/e-calendar-table.c:981 calendar/gui/e-day-view.c:3593
-#: calendar/gui/e-week-view.c:3481 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:978 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:983 calendar/gui/e-day-view.c:3595
-#: calendar/gui/e-week-view.c:3483 ui/evolution-addressbook.xml.h:35
+#: calendar/gui/e-calendar-table.c:979 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:985 calendar/gui/e-day-view.c:3559
-#: calendar/gui/e-day-view.c:3597 calendar/gui/e-week-view.c:3447
-#: calendar/gui/e-week-view.c:3485 ui/evolution-addressbook.xml.h:41
+#: calendar/gui/e-calendar-table.c:980 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 "C_olar"
 
-#: calendar/gui/e-calendar-table.c:990
+#: calendar/gui/e-calendar-table.c:984
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Atribuir tarefa"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Encaminar como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:994
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Marcar como conclu�da"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:987
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tarefas como conclu�das"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir tarefas selecionadas"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7366
-#: calendar/gui/e-week-view.c:4155
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1354
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Clique para adicionar uma tarefa"
 
@@ -4414,48 +4847,47 @@ msgstr "Clique para adicionar uma tarefa"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1055
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Conclu�da"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Data de conclus�o"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Prazo de conclus�o"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Data de t�rmino"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Posi��o geogr�fica"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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:16
-#: my-evolution/component-factory.c:48 shell/e-shell.c:661
-#: shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Ordena��o de tarefas"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4489,450 +4921,177 @@ msgstr "%02i fra��es de minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1407
-#: 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:1434
+#: 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:632 calendar/gui/e-week-view.c:368
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:371
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3543
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "Novo _compromisso"
 
-#: calendar/gui/e-day-view.c:3545 calendar/gui/e-week-view.c:3433
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Novo _evento de dia inteiro"
 
-#: calendar/gui/e-day-view.c:3547 calendar/gui/e-week-view.c:3435
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 #, fuzzy
 msgid "New Meeting"
 msgstr "Reuni�o"
 
-#: calendar/gui/e-day-view.c:3549 calendar/gui/e-week-view.c:3437
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
 msgid "New Task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/e-day-view.c:3554 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3564 calendar/gui/e-week-view.c:3452
+#: 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 "Ir para _hoje"
 
-#: calendar/gui/e-day-view.c:3566 calendar/gui/e-week-view.c:3454
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 msgid "_Go to Date..."
 msgstr "Ir para _data..."
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
+#: 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 "_Publicar informa��o de livre/ocupado"
 
-#: calendar/gui/e-day-view.c:3576 calendar/gui/e-week-view.c:3464
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
 #: ui/evolution.xml.h:37
 #, fuzzy
 msgid "_Configure..."
 msgstr "Configura��o"
 
-#: calendar/gui/e-day-view.c:3585 calendar/gui/e-week-view.c:3473
-#: mail/folder-browser.c:1604 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
 msgid "_Save As..."
 msgstr "Salvar _como..."
 
-#: calendar/gui/e-day-view.c:3602 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Agendar _reuni�o"
 
-#: calendar/gui/e-day-view.c:3604 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Encaminar como i_Calendar"
 
-#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3499
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "Tornar esta ocorr�ncia _m�vel"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3501
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "Excluir esta _ocorr�ncia"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3503
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 msgid "Delete _All Occurrences"
 msgstr "Excluir _todas as ocorr�ncias"
 
-#: calendar/gui/e-itip-control.c:556
-msgid "Meeting begins: <b>"
-msgstr "Reuni�o come�a: <b>"
-
-#: calendar/gui/e-itip-control.c:561
-msgid "Task begins: <b>"
-msgstr "Tarefa come�a: <b>"
-
-#: calendar/gui/e-itip-control.c:566
-msgid "Free/Busy info begins: <b>"
-msgstr "Informa��o de livre/ocupado come�a: <b>"
-
-#: calendar/gui/e-itip-control.c:570
-msgid "Begins: <b>"
-msgstr "Come�a: <b>"
-
-#: calendar/gui/e-itip-control.c:582
-msgid "Meeting ends: <b>"
-msgstr "Reuni�o termina: <b>"
-
-#: calendar/gui/e-itip-control.c:585
-msgid "Free/Busy info ends: <b>"
-msgstr "Informa��o de livre/ocupado termina: <b>"
-
-#: calendar/gui/e-itip-control.c:589
-msgid "Ends: <b>"
-msgstr "Termina: <b>"
-
-#: calendar/gui/e-itip-control.c:603
-msgid "Task Completed: <b>"
-msgstr "Tarefa conclu�da: <b>"
-
-#: calendar/gui/e-itip-control.c:613
-msgid "Task Due: <b>"
-msgstr "Tarefa para: <b>"
-
-#: calendar/gui/e-itip-control.c:650 calendar/gui/e-itip-control.c:699
-msgid "iCalendar Information"
-msgstr "Informa��o de iCalendar"
-
-#. Title
-#: calendar/gui/e-itip-control.c:665
-msgid "iCalendar Error"
-msgstr "Erro de iCalendar"
-
-#: calendar/gui/e-itip-control.c:730 calendar/gui/e-itip-control.c:746
-msgid "An unknown person"
-msgstr "Uma raz�o desconhecida"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:753
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 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:769
-msgid "<i>None</i>"
-msgstr "<i>Nenhum</i>"
-
-#: calendar/gui/e-itip-control.c:781
-msgid "Status:"
-msgstr "Estado:"
-
-#: calendar/gui/e-itip-control.c:786 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
-msgid "Accepted"
-msgstr "Aceito"
-
-#: calendar/gui/e-itip-control.c:790 calendar/gui/itip-utils.c:326
-msgid "Tentatively Accepted"
-msgstr "Aceito preliminarmente"
+"As ferramentas do GNOME Pilot n�o aparentam estar instaladas no seu sistema."
 
-#: calendar/gui/e-itip-control.c:794 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
-msgid "Declined"
-msgstr "Recusado"
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
+#, c-format
+msgid "Error executing %s."
+msgstr "Erro ao executar %s."
 
-#: calendar/gui/e-itip-control.c:798 calendar/gui/e-itip-control.c:997
-#: calendar/gui/e-itip-control.c:1068 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: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
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:318
-#: mail/mail-display.c:849 widgets/misc/e-charset-picker.c:58
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:844 calendar/gui/e-itip-control.c:860
-#: calendar/gui/e-itip-control.c:876 calendar/gui/e-itip-control.c:889
-#: calendar/gui/e-itip-control.c:902 calendar/gui/e-itip-control.c:915
-msgid "Choose an action:"
-msgstr "Escolher uma a��o:"
-
-#: calendar/gui/e-itip-control.c:845
-msgid "Update"
-msgstr "Atualizar"
-
-#: calendar/gui/e-itip-control.c:846 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:917
-#: shell/e-shell.c:1980 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:861
-msgid "Accept"
-msgstr "Aceitar"
-
-#: calendar/gui/e-itip-control.c:862
-msgid "Tentatively accept"
-msgstr "Aceitar preliminarmente"
-
-#: calendar/gui/e-itip-control.c:863
-msgid "Decline"
-msgstr "Recusar"
-
-#: calendar/gui/e-itip-control.c:877
-msgid "Send Free/Busy Information"
-msgstr "Enviar informa��o de livre/ocupado"
-
-#: calendar/gui/e-itip-control.c:890
-msgid "Update respondent status"
-msgstr "Atualizar estado do respondente"
-
-#: calendar/gui/e-itip-control.c:903
-msgid "Send Latest Information"
-msgstr "Enviar informa��o mais recente"
-
-#: calendar/gui/e-itip-control.c:916 calendar/gui/itip-utils.c:343
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: calendar/gui/e-itip-control.c:964
-#, 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:965
-msgid "Meeting Information"
-msgstr "Informa��o de reuni�o"
-
-#: calendar/gui/e-itip-control.c:969
-#, 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:970
-msgid "Meeting Proposal"
-msgstr "Proposta de reuni�o"
-
-#: calendar/gui/e-itip-control.c:974
-#, 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:975
-msgid "Meeting Update"
-msgstr "Atualiza��o de reuni�o"
-
-#: calendar/gui/e-itip-control.c:979
-#, 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:980
-msgid "Meeting Update Request"
-msgstr "_Pedido de atualiza��o de reuni�o"
-
-#: calendar/gui/e-itip-control.c:1003
-#, 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:1004
-msgid "Meeting Reply"
-msgstr "Resposta a reuni�o"
-
-#: calendar/gui/e-itip-control.c:1008
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> cancelou a reuni�o."
-
-#: calendar/gui/e-itip-control.c:1009
-msgid "Meeting Cancellation"
-msgstr "Cancelamento de reuni�o"
-
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1119
-#, 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:1014
-msgid "Bad Meeting Message"
-msgstr "Mensagem de reuni�o inv�lida"
-
-#: calendar/gui/e-itip-control.c:1034
-#, 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:1035
-msgid "Task Information"
-msgstr "Informa��o de tarefa"
-
-#: calendar/gui/e-itip-control.c:1039
-#, 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:1040
-msgid "Task Proposal"
-msgstr "Proposta de tarefa"
-
-#: calendar/gui/e-itip-control.c:1044
-#, 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:1045
-msgid "Task Update"
-msgstr "Atualiza��o de tarefa"
-
-#: calendar/gui/e-itip-control.c:1049
-#, 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:1050
-msgid "Task Update Request"
-msgstr "Pedido de atualiza��o de tarefa"
-
-#: calendar/gui/e-itip-control.c:1074
-#, 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:1075
-msgid "Task Reply"
-msgstr "Resposta a tarefa"
-
-#: calendar/gui/e-itip-control.c:1079
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> cancelou uma tarefa."
-
-#: calendar/gui/e-itip-control.c:1080
-msgid "Task Cancellation"
-msgstr "Cancelamento de tarefa"
-
-#: calendar/gui/e-itip-control.c:1085
-msgid "Bad Task Message"
-msgstr "Mensagem de tarefa inv�lida"
-
-#: calendar/gui/e-itip-control.c:1104
-#, 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:1105
-msgid "Free/Busy Information"
-msgstr "Informa��o de livre/ocupado"
-
-#: calendar/gui/e-itip-control.c:1109
-#, 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:1110
-msgid "Free/Busy Request"
-msgstr "Pedido de livre/ocupado"
-
-#: calendar/gui/e-itip-control.c:1114
-#, 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:1115
-msgid "Free/Busy Reply"
-msgstr "Resposta de livre/ocupado"
-
-#: calendar/gui/e-itip-control.c:1120
-msgid "Bad Free/Busy Message"
-msgstr "Mensagem de livre/ocupado inv�lida"
-
-#: calendar/gui/e-itip-control.c:1193
-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:1212
-msgid "The message contains only unsupported requests."
-msgstr "A mensagem cont�m apenas pedidos n�o suportados."
-
-#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1246
-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:1271
-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:1403
+#: 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:1405
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Atualiza��o conclu�da\n"
 
-#: calendar/gui/e-itip-control.c:1446
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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
 #, 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:1459
+#: calendar/gui/e-itip-control.c:1625
 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:1472
+#: 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:1474
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Estado do participante atualizado\n"
 
-#: calendar/gui/e-itip-control.c:1476
-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:1504
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Remo��o conclu�da"
 
-#: calendar/gui/e-itip-control.c:1534 calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1536 calendar/gui/e-itip-control.c:1588
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 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
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Selecionar pasta"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Selecionar pasta"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4987,57 +5146,58 @@ 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:789
+#: calendar/gui/e-meeting-model.c:533
 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:790
 msgid "Group"
 msgstr "Grupo"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
 msgid "Resource"
 msgstr "Recurso"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
 msgid "Room"
 msgstr "Sala"
 
 #: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
 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:806
+#: calendar/gui/e-meeting-model.c:535
 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:807
 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:808
 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:834
+#: calendar/gui/e-meeting-model.c:543
 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-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Preliminar"
 
 #: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:838
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -5142,30 +5302,40 @@ 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:654
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Data de conclus�o"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Excluindo objetos selecionados"
+
+#: calendar/gui/e-tasks.c:659
 #, fuzzy
 msgid "Expunging"
 msgstr "Excluindo permanentemente pasta"
 
-#: calendar/gui/e-week-view.c:3431
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
-#: calendar/gui/e-week-view.c:3497
+#: calendar/gui/e-week-view.c:3489
 msgid "_Delete this Appointment"
 msgstr "_Excluir este compromisso"
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/gnome-cal.c:1538
 #, 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:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1879
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrindo agenda em %s"
@@ -5234,38 +5404,6 @@ msgstr "Pelo menos um participante � necess�rio"
 msgid "An organizer must be set."
 msgstr "Um organizador deve ser configurado."
 
-#: calendar/gui/itip-utils.c:295
-msgid "Event information"
-msgstr "Informa��o de evento"
-
-#: calendar/gui/itip-utils.c:297
-msgid "Task information"
-msgstr "Informa��o de tarefa"
-
-#: calendar/gui/itip-utils.c:299
-msgid "Journal information"
-msgstr "Informa��o de di�rio"
-
-#: calendar/gui/itip-utils.c:301
-msgid "Free/Busy information"
-msgstr "Informa��o de livre/ocupado"
-
-#: calendar/gui/itip-utils.c:303
-msgid "Calendar information"
-msgstr "Informa��o de agenda"
-
-#: calendar/gui/itip-utils.c:339
-msgid "Updated"
-msgstr "Atualizado"
-
-#: calendar/gui/itip-utils.c:347
-msgid "Refresh"
-msgstr "Atualizar"
-
-#: calendar/gui/itip-utils.c:351
-msgid "Counter-proposal"
-msgstr "Contra proposta"
-
 #: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Voc� deve ser um participante do evento."
@@ -5427,87 +5565,54 @@ msgid "Sa"
 msgstr "S�"
 
 #. Day
-#: calendar/gui/print.c:1840
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Dia selecionado (%a %d %b %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 "Semana selecionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1885
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "M�s selecionado (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Ano selecionado (%Y)"
 
-#: calendar/gui/print.c:2226
-msgid "Task"
-msgstr "Tarefa"
-
-#: calendar/gui/print.c:2283
-#, c-format
-msgid "Status: %s"
-msgstr "Estado: %s"
-
-#: calendar/gui/print.c:2301
-#, c-format
-msgid "Priority: %s"
-msgstr "Prioridade: %s"
-
-#: calendar/gui/print.c:2315
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Percentagem conclu�da: %i"
-
-#: calendar/gui/print.c:2327
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2341
-#, c-format
-msgid "Categories: %s"
-msgstr "Categorias: %s"
-
-#: calendar/gui/print.c:2352
-msgid "Contacts: "
-msgstr "Contatos: "
-
-#: calendar/gui/print.c:2407
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Imprimir agenda"
 
-#: calendar/gui/print.c:2498 calendar/gui/print.c:2590
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2879
-#: my-evolution/e-summary.c:604 ui/evolution-addressbook.xml.h:20
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Visualizar impress�o"
 
-#: calendar/gui/print.c:2527
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Imprimir item"
 
-#: calendar/gui/print.c:2608
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Configurar impress�o..."
 
@@ -5536,8 +5641,8 @@ msgstr ""
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2375
-#: mail/mail-callbacks.c:2614
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "N�o me pergunte novamente."
 
@@ -5603,11 +5708,6 @@ 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"
@@ -5627,91 +5727,91 @@ msgstr ""
 msgid "Gnome Calendar"
 msgstr "Agenda"
 
-#: calendar/pcs/query.c:246
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now espera 0 argumentos"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time espera 1 argumento"
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time espera que o argumento 1 seja uma string"
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "O argumento 1 de make-time deve ser uma string de data ISO 8601"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day espera 2 argumentos"
 
-#: 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 espera que o argumento 1 seja um 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 espera que o argumento 2 seja um inteiro"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin espera 1 argumento"
 
-#: 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 espera que o argument 1 seja um time_t"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end espera 1 argumento"
 
-#: 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 espera que o argument 1 seja um time_t"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype espera 0 argumentos"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? espera 2 argumentos"
 
-#: 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? espera que o argument 1 seja um 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? espera que o argument 2 seja um time_t"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? espera 2 argumentos"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? espera que o argument 1 seja uma string"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? espera que o argument 2 seja uma string"
 
-#: calendar/pcs/query.c:691
+#: 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\""
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? espera pelo menos 1 argumento"
 
-#: 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)"
@@ -5719,15 +5819,15 @@ msgstr ""
 "has-categories? espera que todos os argumentos sejam strings ou somente um "
 "argumento que seja o falso booleano (#f)"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? espera 0 argumentos"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? espera 1 argumento"
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? espera que o argumento 1 seja um time_t"
 
@@ -7268,14 +7368,14 @@ msgstr "Cifragem n�o � suportada por esta cifra"
 msgid "Decryption is not supported by this cipher"
 msgstr "Decifragem n�o � suportada por esta cifra"
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr ""
 "N�o � poss�vel criar arquivo de sa�da: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:441
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "N�o foi poss�vel abrir o diret�rio cache: %s"
@@ -7314,12 +7414,12 @@ 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:1198
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, 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:1204
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar filtro: %s: %s"
@@ -7333,7 +7433,6 @@ msgid "Unable to process spool folder"
 msgstr "N�o � poss�vel processar a pasta de fila"
 
 #: camel/camel-filter-driver.c:911
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obtendo mensagem %d (%d%%)"
 
@@ -7346,16 +7445,16 @@ msgstr "N�o � poss�vel abrir mensagem"
 msgid "Failed on message %d"
 msgstr "Falhou na mensagem %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1050
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Sincronizando pasta"
 
-#: camel/camel-filter-driver.c:1017
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obtendo mensagem %d de %d"
 
-#: camel/camel-filter-driver.c:1032
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Falhou na mensagem %d de %d"
@@ -7392,27 +7491,27 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) requer um simples resultado booleano"
 
-#: camel/camel-folder-search.c:649
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Executando consulta por cabe�alho desconhecido: %s"
 
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Opera��o n�o suportada: anexar mensagem: para %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, 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:1080
+#: camel/camel-folder.c:1078
 #, 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:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Movendo mensagens"
 
@@ -7523,148 +7622,100 @@ msgstr "Por favor, entre a sua frase-senha de %s para %s"
 msgid "Please enter your %s passphrase"
 msgstr "Por favor, entre a sua frase-senha de %s"
 
-#: camel/camel-pgp-context.c:622
+#: camel/camel-pgp-context.c:621
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 "N�o � poss�vel assinar esta mensagem: n�o existe texto claro para assinar"
 
-#: camel/camel-pgp-context.c:629 camel/camel-pgp-context.c:803
+#: 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:635 camel/camel-pgp-context.c:809
+#: 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 ""
-"N�o � poss�vel assinar esta mensagem: n�o foi poss�vel criar pipe para GPG/"
-"PGP: %s"
+"N�o � poss�vel assinar esta mensagem: n�o foi poss�vel criar pipe para "
+"GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:796
+#: 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:988
+#: 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:994
+#: 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"
+"N�o � poss�vel verificar esta mensagem: n�o foi poss�vel criar pipe para "
+"GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1005
+#: 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:1178
+#: 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:1188
+#: 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:1195
+#: 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"
+"N�o � poss�vel cifrar esta mensagem: n�o foi poss�vel criar pipe para "
+"GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1204
+#: 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:1373
+#: 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:1381
+#: 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:1388
+#: 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"
+"N�o � poss�vel decifrar esta mensagem: n�o foi poss�vel criar pipe para "
+"GPG/PGP: %s"
 
-#: camel/camel-pgp-mime.c:332
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "Esta � uma parte de mensagem assinada digitalmente"
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Por favor, entre a sua senha para %s"
-
-#: camel/camel-pkcs7-context.c:213
-#, fuzzy
-msgid "Error hashing password."
-msgstr "Erro ao adicionar cart�o"
-
-#: camel/camel-pkcs7-context.c:222
-#, fuzzy
-msgid "Invalid password."
-msgstr "Argumento inv�lido"
-
-#: camel/camel-pkcs7-context.c:329
-#, fuzzy, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Falhou a localiza��o do certificado para \"%s\"."
-
-#: camel/camel-pkcs7-context.c:378
-#, fuzzy, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Falhou a localiza��o do certificado para \"%s\"."
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:590
-#, fuzzy
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "N�o foi poss�vel criar um contexto de cifragem PGP."
-
-#: camel/camel-pkcs7-context.c:620
-#, fuzzy, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "N�o foi poss�vel conectar ao servidor: %s"
-
-#: camel/camel-pkcs7-context.c:626
-#, fuzzy
-msgid "Could not encrypt: encoding failed."
-msgstr "N�o foi poss�vel salvar arquivo de assinatura."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr ""
-
-#: 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 ""
 "N�o foi poss�vel carregar %s: A carga de m�dulos n�o � suportada neste "
 "sistema."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "N�o foi poss�vel carregar %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 "N�o foi poss�vel carregar %s: Sem c�digo de inicializa��o no m�dulo."
@@ -7693,14 +7744,14 @@ msgstr "N�o foi poss�vel conectar � %s (porta %d): %s."
 msgid "(unknown host)"
 msgstr "(m�quina desconhecida)"
 
-#: camel/camel-remote-store.c:348 camel/camel-remote-store.c:410
-#: camel/camel-remote-store.c:471
+#: 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:474
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7812,7 +7863,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Resposta de autentica��o inv�lida do servidor."
 
@@ -7841,8 +7892,8 @@ msgid ""
 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:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:115
+#: 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"
 
@@ -7886,26 +7937,41 @@ msgstr "A URL '%s' precisa de um componente m�quina"
 msgid "URL '%s' needs a path component"
 msgstr "A URL '%s' precisa de um componente caminho"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Falha na consulta de nome: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, 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:668
+#: camel/camel-service.c:675
 #, 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
+#, fuzzy
+msgid "Resolving address"
+msgstr "Resolvendo: %s"
+
+#: camel/camel-service.c:787
+#, 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
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Falhou a consulta de m�quina: %s: raz�o desconhecida"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Provedor de correio em pastas virtuais"
@@ -7928,6 +7994,11 @@ msgstr ""
 "N�o foi poss�vel criar diret�rio %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Por favor, entre a sua senha para %s"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Por favor, indique o apelido de um certificado com o qual assinar."
@@ -8035,27 +8106,27 @@ msgstr "N�o foi poss�vel analisar URL `%s'"
 msgid "No such message %s in %s"
 msgstr "N�o existe tal mensagem %s em %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "N�o existe tal mensagem: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "N�o � poss�vel excluir pasta: %s: Opera��o inv�lida"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "N�o � poss�vel excluir pasta: %s: N�o existe tal pasta"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "N�o � poss�vel renomear pasta: %s: Opera��o inv�lida"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "N�o � poss�vel renomear pasta: %s: N�o existe tal pasta"
@@ -8088,22 +8159,22 @@ msgstr "Resposta do servidor IMAP n�o cont�m informa��o de %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta OK inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, 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:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, 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:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:467
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Procurando mensagens alteradas"
 
@@ -8125,15 +8196,15 @@ msgstr "Procurando novas mensagens"
 msgid "Could not find message body in FETCH response."
 msgstr "N�o foi poss�vel localizar corpo da mensagem na resposta 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 "N�o foi poss�vel abrir o diret�rio 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 "Falhou a cria��o de cache para mensagem %s: %s"
@@ -8178,28 +8249,28 @@ msgstr "Para ler e armazenar correio em servidores IMAP."
 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:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
+#: camel/providers/imap/camel-imap-store.c:529
 #: camel/providers/smtp/camel-smtp-transport.c:468
 #, 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:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
+#: camel/providers/imap/camel-imap-store.c:568
 #: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Voc� n�o entrou uma senha."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8210,56 +8281,57 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "N�o existe a pasta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 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:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "Diret�rios de correio no formato MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 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:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Entrega local"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 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:63
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Diret�rios de correio no formato maildir"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr "Para armazenar correio local em diret�rios maildir."
 
-#: camel/providers/local/camel-local-provider.c:80
+#: 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:81
+#: 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:91
+#: camel/providers/local/camel-local-provider.c:116
 msgid "Directory tree of mbox files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8270,7 +8342,7 @@ 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:110
+#: camel/providers/local/camel-spoold-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Raiz de armazenagem %s n�o � um caminho absoluto"
@@ -8296,17 +8368,22 @@ 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:864
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "N�o foi poss�vel renomear pasta %s para %s: %s"
 
-#: camel/providers/local/camel-local-store.c:375
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "N�o foi poss�vel renomear pasta: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "N�o foi poss�vel excluir arquivo de resumo de pasta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-local-store.c:389
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "N�o foi poss�vel excluir arquivo de �ndice de pasta `%s': %s"
@@ -8317,7 +8394,7 @@ 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:1160
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "N�o � poss�vel adicionar mensagem ao resumo: raz�o desconhecida"
 
@@ -8358,7 +8435,7 @@ msgstr "N�o existe tal mensagem"
 msgid "Invalid message contents"
 msgstr "Conte�do de mensagem inv�lido"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8368,14 +8445,14 @@ msgstr ""
 "N�o foi poss�vel abrir pasta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Pasta `%s' n�o existe."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8385,24 +8462,24 @@ msgstr ""
 "N�o foi poss�vel criar pasta `%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' n�o � um diret�rio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "N�o foi poss�vel excluir a pasta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "n�o � um diret�rio maildir"
 
-#: camel/providers/local/camel-maildir-store.c:331
-#: camel/providers/local/camel-spoold-store.c:252
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "N�o foi poss�vel varrer pasta `%s': %s"
@@ -8431,7 +8508,7 @@ msgstr "Procurando novas mensagens"
 #: 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:938
+#: camel/providers/local/camel-spool-summary.c:945
 msgid "Storing folder"
 msgstr "Armazenando pasta"
 
@@ -8556,8 +8633,8 @@ msgstr "N�o � poss�vel abrir mbox tempor�rio: %s"
 #: 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:981
-#: camel/providers/local/camel-spool-summary.c:989
+#: 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"
 
@@ -8575,7 +8652,7 @@ 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:1039
+#: camel/providers/local/camel-spool-summary.c:1046
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "N�o foi poss�vel fechar pasta fonte %s: %s"
@@ -8592,7 +8669,7 @@ 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:1113
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desconhecido: %s"
@@ -8627,7 +8704,7 @@ 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:141
-#: camel/providers/local/camel-spoold-store.c:147
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Pasta `%s/%s' n�o existe."
@@ -8637,31 +8714,31 @@ msgstr "Pasta `%s/%s' n�o existe."
 msgid "Spool mail file %s"
 msgstr "Arquivo de fila de correio %s"
 
-#: camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spoold-store.c:192
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Pastas de fila n�o podem ser renomeadas"
 
-#: camel/providers/local/camel-spool-store.c:217
-#: camel/providers/local/camel-spoold-store.c:200
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Pastas de fila n�o podem ser exclu�das"
 
-#: camel/providers/local/camel-spool-summary.c:791
-#: camel/providers/local/camel-spool-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:809
+#: camel/providers/local/camel-spool-summary.c:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:824
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:854
-#: camel/providers/local/camel-spool-summary.c:872
-#: camel/providers/local/camel-spool-summary.c:884
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8670,83 +8747,25 @@ 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:943
+#: 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:116
+#: 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:161
+#: camel/providers/local/camel-spoold-store.c:162
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spoold-store.c:172
+#: camel/providers/local/camel-spoold-store.c:173
 #, fuzzy, c-format
 msgid "Mail tree %s"
 msgstr "Correio para %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Por favor entre a senha NNTP para %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "O servidor rejeitou o nome do usu�rio"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Falha ao enviar nome do usu�rio ao servidor"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Servidor rejeitou nome do usu�rio/senha"
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:153
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#: camel/providers/pop3/camel-pop3-folder.c:522
-#, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr ""
-"N�o � poss�vel obter mensagem: %s\n"
-"  %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:444
-#: camel/providers/pop3/camel-pop3-folder.c:503
-#: camel/providers/pop3/camel-pop3-folder.c:520
-#, fuzzy
-msgid "User cancelled"
-msgstr "Opera��o cancelada"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "N�o foi poss�vel obter a lista de grupos do servidor."
-
-#: 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 "N�o � poss�vel carregar o arquivo de lista de grupos para %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "N�o � poss�vel salvar o arquivo de lista de grupos para %s: %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Not�cias USENET"
@@ -8756,12 +8775,12 @@ 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:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "Not�cias USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8808,28 +8827,46 @@ msgstr "Opera��o cancelada"
 msgid "Retrieving POP summary"
 msgstr "Recuperando resumo POP"
 
+#: 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 "Opera��o cancelada"
+
 #: camel/providers/pop3/camel-pop3-folder.c:287
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "N�o � poss�vel obter pasta: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:323
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Excluindo permanentemente mensagens exclu�das"
 
-#: camel/providers/pop3/camel-pop3-folder.c:418
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, c-format
 msgid "No message with uid %s"
 msgstr "N�o existe mensagem com 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:425
+#: camel/providers/pop3/camel-pop3-folder.c:427
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Recuperando mensagem POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:512
+#: 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 ""
+"N�o � poss�vel obter mensagem: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipita��o desconhecida"
@@ -8847,7 +8884,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:114
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -8925,7 +8962,8 @@ msgstr "Erro de E/S"
 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:503
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8934,13 +8972,13 @@ msgstr ""
 "N�o � poss�vel conectar ao servidor POP.\n"
 "Erro ao enviar senha: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:593
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, 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:147
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8998,7 +9036,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correio usando o programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:135
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9169,7 +9207,7 @@ msgstr "Entrega de correio SMTP via %s"
 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:604
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
@@ -9182,63 +9220,63 @@ msgstr "N�o � poss�vel enviar mensagem: n�o foram definidos destinat�rios."
 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:837
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "Sauda��o SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:863
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:883
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, 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:931
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "Autentica��o SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao criar objeto de autentica��o SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:954
-#: camel/providers/smtp/camel-smtp-transport.c:966
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tempo excedido no pedido AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "Falhou o pedido AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1036
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta de autentica��o inv�lida do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1062
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1076
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 #, 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:1101
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:1117
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido DATA: %s: a mensagem n�o foi enviada"
@@ -9246,40 +9284,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:1167
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 #, fuzzy
 msgid "DATA response error"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1207
-#: camel/providers/smtp/camel-smtp-transport.c:1225
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1239
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Resposta de autentica��o inv�lida do servidor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1262
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1276
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 #, fuzzy
 msgid "RSET response error"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1299
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Erro na resposta de RSET: %s"
@@ -9309,7 +9347,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:150
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
 msgid "attachment"
 msgstr "anexo"
 
@@ -9353,52 +9391,52 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir exibi��o autom�tica de anexo"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Clique aqui para o cat�logo de endere�os"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Responder-a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Entre os destinat�rios da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 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:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9411,7 +9449,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Anexar um arquivo"
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9420,34 +9458,34 @@ msgstr ""
 "Erro ao ler arquivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:965
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Alerta!"
 
-#: composer/e-msg-composer.c:969
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Arquivo existe, sobrescrever?"
 
-#: composer/e-msg-composer.c:991
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:1010
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: composer/e-msg-composer.c:1041
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acessar arquivo: %s"
 
-#: composer/e-msg-composer.c:1049
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "N�o foi poss�vel recuperar mensagem do editor"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9456,7 +9494,7 @@ msgstr ""
 "N�o � poss�vel buscar no arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9465,7 +9503,7 @@ msgstr ""
 "N�o � poss�vel truncar arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9474,7 +9512,7 @@ msgstr ""
 "Erro ao salvar automaticamente mensagem: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1174
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9482,7 +9520,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:1332
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9492,23 +9530,23 @@ msgstr ""
 "\n"
 "Voc� deseja salvar as suas modifica��es?"
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Alerta: Mensagem modificada"
 
-#: composer/e-msg-composer.c:1362
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:1511
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Inserir arquivo"
 
-#: composer/e-msg-composer.c:2047 composer/e-msg-composer.c:2644
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Redigir uma mensagem"
 
-#: composer/e-msg-composer.c:2661
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9516,7 +9554,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:2684 composer/e-msg-composer.c:2739
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9524,14 +9562,6 @@ 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:3464
-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"
@@ -9592,8 +9622,8 @@ 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:2243
-#: mail/mail-display.c:120
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -9602,11 +9632,11 @@ msgstr ""
 "Sobrescrev�-lo?"
 
 #. 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 "Lembrar esta senha"
 
-#: 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 "Lembrar esta senha pelo restante desta sess�o"
 
@@ -9705,172 +9735,6 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "O componente do Evolution para o resumo executivo."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Componente resumo executivo de correio do Evolution."
-
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "N�o � poss�vel iniciar o componente de resumo do Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Selecionar um arquivo"
-
-#: 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 ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Enviar um e-mail"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Mudar o nome desta pasta"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL: %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Fechar"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Mover esta pasta para outro lugar"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Reconfigurar /%s"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "P�gina"
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"N�o � poss�vel renomear pasta:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Erro ao carregar %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: 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 ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the RDF summary."
-msgstr "F�brica para o componente resumo executivo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "Resumo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "F�brica para o redator do Evolution."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "F�brica para o componente resumo executivo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-#, fuzzy
-msgid "Test service"
-msgstr "Estherville"
-
-#: 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 "Erro"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Atualizar"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "_Atualizar livre/ocupado"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "ano"
@@ -9903,11 +9767,7 @@ msgstr "hora"
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "segundo"
-
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:224
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "segundos"
 
@@ -10003,7 +9863,7 @@ msgstr "Ent�o"
 msgid "Add action"
 msgstr "Adicionar a��o"
 
-#: 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."
@@ -10011,19 +9871,11 @@ msgstr ""
 "Voc� esqueceu de escolher uma pasta.\n"
 "Por favor volte e especifique uma pasta v�lida para onde entregar correio."
 
-#: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:899
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Selecionar pasta"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Entre URI da pasta"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<clique aqui para selecionar uma pasta>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -10033,7 +9885,7 @@ msgstr ""
 "Erro na express�o regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:45
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Teste"
 
@@ -10062,7 +9914,8 @@ msgid "if all criteria are met"
 msgstr "se todos os crit�rios forem atendidos"
 
 #: filter/filter-rule.c:769
-msgid "if any criteria are met"
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "se algum crit�rio for atendido"
 
 #: filter/filter-rule.c:780
@@ -10119,210 +9972,215 @@ msgstr "com todas as pastas locais"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Atribuir pontua��o"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Atribuir cor"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Atribuir pontua��o"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Anexos"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
 #, fuzzy
 msgid "Beep"
 msgstr "Bel�m"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "cont�m"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar para pasta"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data de recebimento"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data de envio"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Exclu�da"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "n�o cont�m"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "n�o termina com"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "n�o existe"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "n�o soa como"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "n�o come�a com"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "N�o existe"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Rascunho"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "termina com"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Express�o"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25 mail/mail-config.c:74
-#: mail/mail-config.glade.h:82
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "�"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "foi ap�s"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "foi antes"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "� maior que"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "� menor que"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "n�o �"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "Lista de discuss�o"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Corpo da mensagem"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "Cabe�alho da mensagem"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Mover para pasta"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:39
 #, fuzzy
 msgid "Play Sound"
 msgstr "Tocar um som:"
 
-#: filter/libfilter-i18n.h:39 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Lida"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Destinat�rios"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "Casamento com express�o regular"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "Em resposta a"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Pontua��o"
 
-#: filter/libfilter-i18n.h:44 mail/mail-callbacks.c:1548
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Remetente"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Atribuir estado"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Tamanho (kB)"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "soa como"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "Conta fonte"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Cabe�alho espec�fico"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "come�a com"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Parar o processamento"
 
-#: filter/libfilter-i18n.h:53 mail/mail-format.c:887
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
 #: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Assunto"
@@ -10355,29 +10213,29 @@ msgstr "Voc� precisa especificar pelo menos uma pasta como uma fonte."
 msgid "Evolution is importing your old Elm mail"
 msgstr "O Evolution est� importando seu correio antigo 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 "Importando..."
 
-#: 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 "Por favor aguarde"
 
-#: 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 "Importando %s como %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 "Varrendo %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:958
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
 #: importers/pine-importer.c:637 mail/component-factory.c:101
 msgid "Mail"
 msgstr "Correio"
@@ -10406,23 +10264,74 @@ msgstr ""
 "O Evolution achou arquivos do GnomeCard.\n"
 "Voc� gostaria que eles fossem importados no Evolution?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Prioridade: %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 "O Evolution est� importando seus dados antigos do Netscape"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Lixeira"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Arquivo de correio local %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Varrendo diret�rio"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Iniciando a importa��o"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Configura��es"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Editar filtros"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10452,69 +10361,83 @@ msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:2
 #, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
+msgid "Configuration control for the Evolution Display Fonts."
 msgstr "F�brica para o controle de tarefas do Evolution."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:3
 #, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "F�brica para o controle de tarefas do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
 msgid "Configuration control for the Evolution Mailer."
 msgstr "F�brica para o redator do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
 #, fuzzy
 msgid "Configuration control for the Evolution Message Composer."
 msgstr "F�brica para o redator do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5 notes/GNOME_Evolution_Notes.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "O componente do Evolution para manipular correio."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Redator de correio do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Componente resumo executivo de correio do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Componente de exibi��o de pastas de correio do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Componente f�brica de pastas de correio do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "F�brica para o redator do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "F�brica para o componente resumo executivo."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Configura��es do resumo"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Contas"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13 mail/mail-config.glade.h:94
+#: 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:14
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "Interface de configura��o de correio"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
+#: 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:16
+#: 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:17
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
@@ -10534,15 +10457,15 @@ msgstr "Pasta lixeira virtual"
 msgid "This folder cannot contain messages."
 msgstr "Esta pasta n�o pode conter mensagens."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Propriedades..."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Modificar as propriedades desta pasta"
 
-#: mail/component-factory.c:765
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10550,38 +10473,38 @@ msgstr ""
 "Algumas de suas configura��es de correio aparentam estar corrompidas, por "
 "favor verifique se tudo est� em ordem."
 
-#: mail/component-factory.c:924
+#: mail/component-factory.c:925
 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:966
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Nova mensagem de correio"
 
-#: mail/component-factory.c:966 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Mensagem de correio"
 
-#: mail/component-factory.c:993
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "N�o � poss�vel iniciar o componente de correio do Evolution."
 
-#: mail/component-factory.c:1002
+#: mail/component-factory.c:1003
 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:1008
+#: mail/component-factory.c:1009
 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:1208 mail/component-factory.c:1239
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando ao servidor..."
 
-#: mail/component-factory.c:1249
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "N�o � poss�vel registrar reposit�rio com a shell."
 
@@ -10594,198 +10517,194 @@ msgstr "Propriedades para \"%s\""
 msgid "Properties"
 msgstr "Propriedades"
 
-#: mail/folder-browser.c:300 mail/mail-display.c:332 mail/mail-display.c:841
+#: mail/folder-browser.c:305 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:755
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d novas"
 
-#: mail/folder-browser.c:758 mail/folder-browser.c:766
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d escondidas"
 
-#: mail/folder-browser.c:762
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d selecionadas"
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d n�o enviadas"
 
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d enviadas"
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1083
+#: mail/folder-browser.c:1088
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Criar pasta _virtual a partir da mensagem"
 
-#: mail/folder-browser.c:1575
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "Pasta virtual por _busca"
 
-#: mail/folder-browser.c:1576
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "Pasta virtual por _remetente"
 
-#: mail/folder-browser.c:1577
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "Pasta virtual por _destinat�rios"
 
-#: mail/folder-browser.c:1578
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "Pasta virtual por _lista de discuss�o"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtro por _assunto"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtro por _remetente"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filtro por _destinat�rios"
 
-#: mail/folder-browser.c:1585 mail/folder-browser.c:1917
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filtro por _lista de discuss�o"
 
-#: mail/folder-browser.c:1603 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
 
-#: mail/folder-browser.c:1605
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Res_ponder ao remetente"
 
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Responder a _lista"
 
-#: mail/folder-browser.c:1611 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/folder-browser.c:1612
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Encaminhar"
 
-#: mail/folder-browser.c:1616
+#: mail/folder-browser.c:1622
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1617
+#: mail/folder-browser.c:1623
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Conclu�da"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1624
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
 #. separator here?
-#: mail/folder-browser.c:1622 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1629
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _n�o lida"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1631
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar como _sem import�ncia"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1636
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Des_fazer exclus�o"
 
-#: mail/folder-browser.c:1634
+#: mail/folder-browser.c:1640
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover para pasta..."
 
-#: mail/folder-browser.c:1635 ui/evolution-addressbook.xml.h:36
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Copiar para pasta..."
 
-#: mail/folder-browser.c:1639
+#: mail/folder-browser.c:1645
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: mail/folder-browser.c:1643
+#: mail/folder-browser.c:1649
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adicionar remetente ao cat�logo de endere�os"
 
-#: mail/folder-browser.c:1647
+#: mail/folder-browser.c:1653
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar filtros"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1657
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Criar _regra a partir da mensagem"
 
-#: mail/folder-browser.c:1918
+#: mail/folder-browser.c:1936
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Pasta virtual por lista de discuss�o"
 
-#: mail/folder-browser.c:1920
+#: mail/folder-browser.c:1938
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtro por lista de discuss�o (%s)"
 
-#: mail/folder-browser.c:1921
+#: mail/folder-browser.c:1939
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Pasta virtual por lista de discuss�o (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Padr�o"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Obtendo informa��o de pasta"
@@ -10855,92 +10774,74 @@ msgstr "Editor de not�cias do Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor de contas do Evolution"
 
-#: mail/mail-account-gui.c:52 mail/mail-config.glade.h:17
-#, fuzzy
-msgid "Always"
-msgstr "Albany"
-
-#: mail/mail-account-gui.c:53 mail/mail-config.glade.h:176
-msgid "Whenever Possible"
-msgstr ""
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_M�quina:"
 
-#: mail/mail-account-gui.c:54 mail/mail-config.glade.h:107
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
 #, fuzzy
-msgid "Never"
-msgstr "a _cada"
+msgid "User_name:"
+msgstr "Nome do _usu�rio:"
 
-#: mail/mail-account-gui.c:1080 mail/mail-account-gui.c:1081
-#: mail/mail-account-gui.c:1324 mail/mail-account-gui.c:1329
-#: mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+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:1150 mail/mail-account-gui.c:1165
+#: 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:1846
+#: mail/mail-account-gui.c:1985
 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:210
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "Voc� tem certeza que deseja excluir esta conta?"
 
-#: mail/mail-accounts.c:214
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "N�o excluir"
 
-#: mail/mail-accounts.c:217
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Excluir conta mesmo?"
 
-#: mail/mail-accounts.c:340 mail/mail-accounts.c:374
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
 msgid "Disable"
 msgstr "Desativar"
 
-#: mail/mail-accounts.c:342 mail/mail-accounts.c:376
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
 msgid "Enable"
 msgstr "Ativar"
 
-#: mail/mail-accounts.c:498 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:70
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+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
 msgid "Enabled"
 msgstr "Ativado"
 
-#: mail/mail-accounts.c:499 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Nome da _conta:"
 
-#: mail/mail-accounts.c:500 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Rico"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Correio para %s"
-
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Assunto � %s"
-
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Correio de %s"
-
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "Lista de discuss�o %s"
-
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Adicionar regra de filtro"
@@ -11041,20 +10942,20 @@ msgstr "um remetente desconhecido"
 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:1426 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-callbacks.c:1428 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copiar mensagem(ns) para"
 
-#: mail/mail-callbacks.c:2087
+#: mail/mail-callbacks.c:2091
 #, 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:2112
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11062,7 +10963,7 @@ msgstr ""
 "Voc� pode apenas editar mensagens salvas\n"
 "na pasta Rascunho."
 
-#: mail/mail-callbacks.c:2151
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11070,39 +10971,39 @@ msgstr ""
 "Voc� pode apenas reenviar mensagens\n"
 "na pasta Enviada."
 
-#: mail/mail-callbacks.c:2165
+#: mail/mail-callbacks.c:2169
 #, 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:2191
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "N�o existe mensagem selecionada"
 
-#: mail/mail-callbacks.c:2236 mail/mail-display.c:116
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Sobrescrever arquivo?"
 
-#: mail/mail-callbacks.c:2290
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Salvar mensagem como..."
 
-#: mail/mail-callbacks.c:2292
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Salvar mensagens como..."
 
-#: mail/mail-callbacks.c:2360
+#: mail/mail-callbacks.c:2366
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Exibir a pr�xima mensagem n�o lida"
 
-#: mail/mail-callbacks.c:2367
+#: mail/mail-callbacks.c:2373
 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:2607
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11115,7 +11016,7 @@ msgstr ""
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: mail/mail-callbacks.c:2717
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11124,28 +11025,28 @@ msgstr ""
 "Erro ao carregar infora��o do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2729
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2772
+#: mail/mail-callbacks.c:2783
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Obtendo mensagem %d de %d"
 
-#: mail/mail-callbacks.c:2824
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
-#: mail/mail-callbacks.c:2851
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "Carta-US"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Falhou a impress�o da mensagem"
 
-#: mail/mail-callbacks.c:3072 mail/mail-callbacks.c:3112
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11204,40 +11105,35 @@ msgstr ""
 "Este nome ser� usado apenas para prop�sitos de exibi��o."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Assistente de contas do Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:177
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:116
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:167
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:90
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "ap�s"
 
-#: mail/mail-config.c:631
-#, c-format
-msgid "Account %d"
-msgstr "Conta %d"
-
-#: mail/mail-config.c:2451
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -11248,46 +11144,41 @@ msgstr ""
 "%s\n"
 "N�o ser� criado nenhum atalho."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2462
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Inbox"
-
-#: mail/mail-config.c:2712
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Verificando servi�o"
 
-#: mail/mail-config.c:2790 mail/mail-config.c:2794
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
-#: mail/mail-config.c:2991
+#: mail/mail-config.c:2999
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contato sem nome"
 
-#: mail/mail-config.c:3169
+#: mail/mail-config.c:3177
 msgid "Cannot execute signature script"
 msgstr ""
 
 #: mail/mail-config.glade.h:1
-msgid "                        "
-msgstr ""
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " _Check for supported types "
-msgstr " _Verificar tipos suportados "
+#, fuzzy
+msgid " Edit "
+msgstr "_Editar"
 
 #: mail/mail-config.glade.h:3
-msgid " color"
-msgstr " cor"
+#, fuzzy
+msgid " New "
+msgstr "Novo"
 
 #: mail/mail-config.glade.h:4
-msgid "&lt;&lt; S_imple"
-msgstr ""
+msgid " _Check for supported types "
+msgstr " _Verificar tipos suportados "
 
 #: mail/mail-config.glade.h:5
 #, fuzzy
@@ -11299,137 +11190,110 @@ 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
-msgid "/home/rodo/cvs/evolution/mail/"
-msgstr ""
-
-#: mail/mail-config.glade.h:8
 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:9
-msgid "Account"
-msgstr "Conta"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Conta %d"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Informa��o de conta"
 
-#: mail/mail-config.glade.h:11 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Ger�ncia de conta"
 
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Cancelar opera��o"
+
 #: mail/mail-config.glade.h:12
-msgid "Accounts"
-msgstr "Contas"
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Arkansas"
 
 #: mail/mail-config.glade.h:13
 #, fuzzy
-msgid "Ad_vanced &gt;&gt;"
-msgstr "Avan�ado"
+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 "Add new signature"
-msgstr "Salvar assinatura"
+msgid "Alerts"
+msgstr "Alberta"
 
 #: mail/mail-config.glade.h:15
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Cancelar opera��o"
-
-#: mail/mail-config.glade.h:16
-#, fuzzy
-msgid "Afrikaans"
-msgstr "Arkansas"
+msgid "Alwa_ys sign outgoing messages when using this account"
+msgstr "Sempre _assinar mensagens enviadas usando esta conta"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "Sempre _cifrar para mim mesmo ao enviar correio cifrado"
-
-#: mail/mail-config.glade.h:21
-msgid "Always _sign outgoing messages when using this account"
-msgstr "Sempre _assinar mensagens enviadas usando esta conta"
-
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Arabic"
 msgstr "Arica"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexar um arquivo � mensagem"
 
-#: mail/mail-config.glade.h:24 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 #, fuzzy
-msgid "Automatically detect links"
+msgid "Automatically _detect links"
 msgstr "_Verificar automaticamente novas mensagens"
 
-#: mail/mail-config.glade.h:27
-msgid "Baltic (IS0-8859-13)"
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
-msgid "Beep when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:26
 #, fuzzy
-msgid "Character Set:"
+msgid "C_haracter set:"
 msgstr "Codifica��o de caracteres"
 
-#: mail/mail-config.glade.h:31
-msgid "Checking for New Mail"
-msgstr "Verificando novas mensagens"
-
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:27
 #, fuzzy
-msgid "Colors"
+msgid "C_olors"
 msgstr "Comoros"
 
-#: mail/mail-config.glade.h:33
-#, fuzzy
-msgid "Command"
-msgstr "Empresa"
-
-#: mail/mail-config.glade.h:34
-msgid "Composer"
-msgstr "Redator"
+#: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
+msgstr "Verificando novas mensagens"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Redigir uma mensagem"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Configura��o"
 
-#: mail/mail-config.glade.h:37
-msgid "Confirm when Expunging a folder"
-msgstr "Confirmar ao excluir permanentemente uma pasta"
-
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11445,507 +11309,373 @@ msgstr ""
 "\n"
 "Pressione \"Concluir\" para salvar suas configura��es."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:37
 #, fuzzy
 msgid "Dari"
 msgstr "Bari"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Padr�o"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:47
-msgid "Default Forward style is: "
-msgstr "Estilo de encaminhamento padr�o �: "
-
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:40
 #, fuzzy
-msgid "Default Forward style:"
-msgstr "Estilo de encaminhamento padr�o �: "
-
-#: mail/mail-config.glade.h:49
-#, fuzzy
-msgid "Default Reply style:"
-msgstr "Estilo de encaminhamento padr�o �: "
-
-#: mail/mail-config.glade.h:50
-#, fuzzy
-msgid "Default character encoding:"
-msgstr "Codifica��o de caracteres padr�o: "
-
-#: mail/mail-config.glade.h:51
-msgid "Default character encoding: "
+msgid "Default character _encoding:"
 msgstr "Codifica��o de caracteres padr�o: "
 
-#: mail/mail-config.glade.h:52
-#, fuzzy
-msgid "Defaults"
-msgstr "Padr�o"
-
-#: mail/mail-config.glade.h:53
-#, fuzzy
-msgid "Delete selected signature"
-msgstr "Excluir tudo exceto a assinatura"
-
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Pegando correio"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "IDs digitais..."
 
-#: mail/mail-config.glade.h:57
-msgid "Display"
-msgstr "Exibi��o"
-
-#: mail/mail-config.glade.h:58
-msgid "Do not notify me when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "N�o � poss�vel abrir mensagem"
 
-#: mail/mail-config.glade.h:60 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Terminado"
 
-#: mail/mail-config.glade.h:61 shell/e-local-storage.c:174
-msgid "Drafts"
-msgstr "Rascunho"
-
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:46
 #, fuzzy
-msgid "E_mail address:"
-msgstr "_Endere�o de e-mail:"
+msgid "Drafts _folder:"
+msgstr "Pasta de _rascunhos:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "A_tivar"
 
-#: mail/mail-config.glade.h:64
-#, fuzzy
-msgid "Ed_it..."
-msgstr "Editar..."
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:48
 #, fuzzy
-msgid "Edi_t..."
-msgstr "Editar..."
-
-#: mail/mail-config.glade.h:66
-msgid "Edit signature content in editor"
-msgstr ""
+msgid "E_nable advanced options"
+msgstr "Cancelar opera��o"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Leste"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Contas"
 
-#: mail/mail-config.glade.h:69
-msgid "Enable advanced options"
-msgstr ""
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "_Endere�o de e-mail:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "_Esvaziar lixeiras ao sair"
+
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executar a��es"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "File containing signature"
-msgstr "Pasta contendo correio"
+msgid "Fi_xed -width:"
+msgstr "termina com"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Forwards and Replies"
-msgstr "Encaminhar _embutido"
+msgid "Font Properties"
+msgstr "Propriedades"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Mensagens encaminhadas"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Obter ID digital..."
 
-#: mail/mail-config.glade.h:76
-#, fuzzy
-msgid "HTML Mail"
-msgstr "Em correio HTML"
-
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Hide advanced settings"
-msgstr "Configura��es de tempo"
+msgid "Highlight _quotations with"
+msgstr "_Real�ar cita��es com"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Hulu"
 msgstr "Hurlburt"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:80 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 "Identidade"
 
-#: mail/mail-config.glade.h:81
-msgid "If selected signature will be included in random signature list"
-msgstr ""
-
-#: mail/mail-config.glade.h:83
-msgid "In HTML mail"
-msgstr "Em correio HTML"
-
-#: mail/mail-config.glade.h:84
-msgid "Include in _random signatures list"
-msgstr ""
-
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Embutido"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:87
-#, fuzzy
-msgid "Keyboard Shortcuts"
-msgstr "Atalhos"
-
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Salvar e fechar"
 
-#: mail/mail-config.glade.h:89
-#, fuzzy
-msgid "Language:"
-msgstr "L�ngua"
-
-#: mail/mail-config.glade.h:91
-#, fuzzy
-msgid "List of signatures"
-msgstr "Salvar assinatura"
-
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Carregar _imagens"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Configura��o de correio"
 
-#: mail/mail-config.glade.h:95
-msgid "Mail Settings"
-msgstr "Configura��es de correio"
-
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Localiza��o da caixa de correio"
 
-#: mail/mail-config.glade.h:97
-msgid "Make this my _default account"
-msgstr "Torne esta a minha conta _padr�o"
-
-#: mail/mail-config.glade.h:98
-#, fuzzy
-msgid "Mark messages as read after"
-msgstr "_Marcar mensagens como lidas ap�s"
-
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Composer"
 msgstr "Mensagens"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Display"
 msgstr "Exibi��o de _mensagem"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Microsoft"
 msgstr "Micron�sia"
 
-#: mail/mail-config.glade.h:102
-msgid "Misspelled color: "
-msgstr ""
-
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:104
-#, fuzzy
-msgid "N_ew..."
-msgstr "Novo..."
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
-msgid "Name of selected signature"
-msgstr "Excluir tudo exceto a assinatura"
-
-#: mail/mail-config.glade.h:106
-#, fuzzy
-msgid "Ne_w..."
-msgstr "Novo..."
-
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configura��o de correio"
 
-#: mail/mail-config.glade.h:109
-msgid "News"
-msgstr "Not�cias"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "_Fontes de not�cias"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Informa��o opcional"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "_Empresa:"
+
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da chave _PGP:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Escolha uma cor"
 
-#: mail/mail-config.glade.h:118
-msgid "Play sound file when new mail arrives"
-msgstr ""
+#: mail/mail-config.glade.h:88
+#, 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:119
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:120
-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:121
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Perguntar ao enviar mensagens com um assunto _vazio"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:90
 #, 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:123
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "Perguntar ao enviar mensagens com apenas destinat�rios _Bcc"
+msgid "Printed Fonts"
+msgstr "Imprimir contatos selecionados"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "N�o � poss�vel abrir mensagem"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:95
 msgid "Randomized"
 msgstr ""
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Lembrar esta senha"
 
-#: mail/mail-config.glade.h:130 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Responder-a:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:131
-msgid "Receiving Mail"
-msgstr "Recebendo correio"
-
-#: mail/mail-config.glade.h:132
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Op��es de recep��o"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Lembrar esta senha"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Informa��o exigida"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:103
 #, fuzzy
-msgid "Restore defaults"
-msgstr " (padr�o)"
+msgid "S_ecurity"
+msgstr "Seguran�a"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Same as text"
 msgstr "Somerset"
 
-#: mail/mail-config.glade.h:137
-msgid "Script which is run before signature loading from specified filename"
-msgstr ""
-
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME"
 
-#: mail/mail-config.glade.h:139
-msgid "Security"
-msgstr "Seguran�a"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:140
-msgid "Select Filter Log file..."
-msgstr "Selecionar arquivo de registro de filtros..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:141
-msgid "Select PGP binary"
-msgstr "Selecionar execut�vel PGP"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Selecionar execut�vel PGP"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Select a signature file"
 msgstr "Arquivo de assinatura:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Select a signature script"
 msgstr "Excluir tudo exceto a assinatura"
 
-#: mail/mail-config.glade.h:145 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando mensagem"
 
-#: mail/mail-config.glade.h:146
-msgid "Sending Mail"
-msgstr "Enviando correio"
-
-#: mail/mail-config.glade.h:148 mail/message-list.etspec.h:9
-#: shell/e-local-storage.c:177
-msgid "Sent"
-msgstr "Enviada"
-
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Pasta de mensagens _enviadas:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Mensagens enviadas e rascunhos"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Servidor requer _autentica��o"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Configura��o do servidor"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "Tipo do _servidor: "
 
-#: mail/mail-config.glade.h:154
-#, fuzzy
-msgid "Shortcut"
-msgstr "_Atalho"
-
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:120
 #, fuzzy
-msgid "Shortcuts type:"
+msgid "Shortcuts _type:"
 msgstr "Atalhos"
 
-#: mail/mail-config.glade.h:156
-#, fuzzy
-msgid "Show advanced settings"
-msgstr "Configura��es de fontes de not�cias"
-
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "Show animated images"
-msgstr "Exibir como tempo"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Signature"
 msgstr "Salvar assinatura"
 
-#: mail/mail-config.glade.h:159
-#, fuzzy
-msgid "Signatures"
-msgstr "Salvar assinatura"
-
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Fonte"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Informa��o da fonte"
 
-#: mail/mail-config.glade.h:162
-msgid "Sources"
-msgstr "Fontes"
-
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:124
 #, fuzzy
-msgid "Specify filename:"
+msgid "Specify _filename:"
 msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:125
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Mbox padr�o do Unix"
 
-#: mail/mail-config.glade.h:166
-#, fuzzy
-msgid "Text _Signature:"
-msgstr "Assinatura _HTML:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:128
 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:171
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "Use _HTML for this signature"
 msgstr "Assinatura _HTML:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:132
 #, fuzzy
-msgid "Use s_ecure connection (SSL):"
-msgstr "Usar conex�o se_gura (SSL)"
+msgid "V_ariable-width:"
+msgstr "Vari�vel"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11955,199 +11685,216 @@ msgstr ""
 "\n"
 "Pressione \"Pr�ximo\" para come�ar. "
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "XEmacs"
 msgstr "Leste"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "_Sempre carregar imagens da rede"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Sempre a_ssinar mensagens enviadas usando esta conta"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Tipo de autentica��o: "
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Tipo de autentica��o: "
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "_Verificar automaticamente novas mensagens"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_ID do certificado:"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Confirmar ao excluir permanentemente uma pasta"
 
-#: mail/mail-config.glade.h:188
-msgid "_Drafts folder:"
-msgstr "Pasta de _rascunhos:"
-
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:149
 #, fuzzy
-msgid "_Edit..."
-msgstr "Editar..."
+msgid "_Defaults"
+msgstr "Padr�o"
 
-#: mail/mail-config.glade.h:191
-msgid "_Empty trash folders on exit"
-msgstr "_Esvaziar lixeiras ao sair"
+#: mail/mail-config.glade.h:151
+msgid "_Do not notify me when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:192
+#: mail/mail-config.glade.h:153
 msgid "_Enable spell checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:193
+#: mail/mail-config.glade.h:154
 #, fuzzy
-msgid "_Filename"
+msgid "_Filename:"
 msgstr "Nome do arquivo:"
 
-#: mail/mail-config.glade.h:194
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
 #, fuzzy
-msgid "_Filename:"
-msgstr "Nome do arquivo:"
+msgid "_Forward style:"
+msgstr "Estilo de encaminhamento padr�o �: "
 
-#: mail/mail-config.glade.h:195
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nome _completo:"
 
-#: mail/mail-config.glade.h:196
+#: mail/mail-config.glade.h:159
+#, 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:197
-msgid "_Highlight citations with"
-msgstr "_Real�ar cita��es com"
-
-#: mail/mail-config.glade.h:198
+#: mail/mail-config.glade.h:162
 #, fuzzy
-msgid "_Highlight quotations with"
-msgstr "_Real�ar cita��es com"
+msgid "_Identity"
+msgstr "Identidade"
 
-#: mail/mail-config.glade.h:199
-msgid "_Host:"
-msgstr "_M�quina:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "L�ngua"
 
-#: mail/mail-config.glade.h:200
+#: mail/mail-config.glade.h:164
 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:201
-msgid "_Log filter actions to:"
-msgstr "_Registrar as a��es dos filtros em:"
-
-#: mail/mail-config.glade.h:202
-msgid "_Mark messages as Read after"
-msgstr "_Marcar mensagens como lidas ap�s"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Torne esta a minha conta _padr�o"
 
-#: mail/mail-config.glade.h:203
+#: mail/mail-config.glade.h:166
 #, fuzzy
-msgid "_Name"
-msgstr "_Nome:"
+msgid "_Mark messages as read after"
+msgstr "_Marcar mensagens como lidas ap�s"
 
-#: mail/mail-config.glade.h:204
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:205
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_Nunca carregar imagens da rede"
 
-#: mail/mail-config.glade.h:206
-msgid "_Organization:"
-msgstr "E_mpresa:"
-
-#: mail/mail-config.glade.h:207
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "Arquivo execut�vel _PGP:"
 
-#: mail/mail-config.glade.h:208
-msgid "_Path:"
-msgstr "_Caminho:"
+#: 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"
+msgstr "Perguntar ao enviar mensagens HTML para contatos que n�o as querem"
 
-#: mail/mail-config.glade.h:209
+#: mail/mail-config.glade.h:173
+#, 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:210
-msgid "_Remember this password"
-msgstr "_Lembrar esta senha"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Recebendo correio"
 
-#: mail/mail-config.glade.h:211
+#: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Script"
-msgstr "_Seguran�a"
+msgid "_Reply style:"
+msgstr "Estilo de encaminhamento padr�o �: "
 
-#: mail/mail-config.glade.h:212
+#: mail/mail-config.glade.h:177
+#, fuzzy
+msgid "_Restore defaults"
+msgstr " (padr�o)"
+
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Script:"
 msgstr "_Seguran�a"
 
-#: mail/mail-config.glade.h:213
-msgid "_Send mail in HTML format by default."
-msgstr "_Enviar mensagens em formato HTML por padr�o."
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Seguran�a"
 
-#: mail/mail-config.glade.h:214
+#: mail/mail-config.glade.h:180
 #, fuzzy
-msgid "_Send messages in HTML format by default"
-msgstr "_Enviar mensagens em formato HTML por padr�o."
+msgid "_Sending Mail"
+msgstr "Enviando correio"
 
-#: mail/mail-config.glade.h:215
+#: mail/mail-config.glade.h:181
 #, fuzzy
-msgid "_Server type: "
-msgstr "Tipo do _servidor: "
+msgid "_Show animated images"
+msgstr "Exibir como tempo"
 
-#: mail/mail-config.glade.h:216
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Arquivo de assinatura:"
 
-#: mail/mail-config.glade.h:217
-msgid "_Username:"
-msgstr "Nome do _usu�rio:"
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Text Signature:"
+msgstr "Assinatura _HTML:"
 
-#: mail/mail-config.glade.h:218
+#: 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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Vari�vel"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "a _cada"
 
-#: mail/mail-config.glade.h:219
+#: mail/mail-config.glade.h:187
 #, fuzzy
 msgid "color"
 msgstr " cor"
 
-#: mail/mail-config.glade.h:220
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "descri��o"
 
-#: mail/mail-config.glade.h:222
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:223
-msgid "placeholder"
-msgstr "placeholder"
-
-#: mail/mail-config.glade.h:225
-msgid "seconds."
-msgstr "segundos."
-
-#: mail/mail-config.glade.h:226
-#, fuzzy
-msgid "use _HTML for this signature"
-msgstr "Assinatura _HTML:"
-
 #: 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."
@@ -12184,20 +11931,20 @@ msgstr "N�o foi poss�vel criar um contexto de envelope S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "N�o foi poss�vel criar um contexto de decodifica��o S/MIME."
 
-#: mail/mail-display.c:277
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Salvar anexo"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:344
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "N�o foi poss�vel criar diret�rio tempor�rio: %s"
 
-#: mail/mail-display.c:388
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Salvar para o disco..."
 
-#: mail/mail-display.c:390
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Ver embutido"
 
@@ -12206,36 +11953,36 @@ msgstr "Ver embutido"
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
 
-#: mail/mail-display.c:453
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver embutido (via %s)"
 
-#: mail/mail-display.c:457
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Esconder"
 
-#: mail/mail-display.c:478
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Visualizador externo"
 
-#: mail/mail-display.c:1266
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Carregando conte�do da mensagem"
 
-#: mail/mail-display.c:1816
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Abrir v�nculo no navegador"
 
-#: mail/mail-display.c:1818
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Copiar local do v�nculo"
 
-#: mail/mail-display.c:1821
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Salvar v�nculo como (FIXME)"
 
-#: mail/mail-display.c:1824
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Salvar imagem como..."
 
@@ -12248,7 +11995,7 @@ msgstr "anexo %s"
 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/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
@@ -12256,7 +12003,7 @@ msgstr "Data"
 msgid "Bad Address"
 msgstr "Endere�o inv�lido"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:6
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De"
 
@@ -12276,66 +12023,45 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1661
+#: mail/mail-format.c:915
 #, fuzzy
-msgid "View messages..."
-msgstr "Salvar mensagem como..."
-
-#: mail/mail-format.c:1755
-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:1778
-msgid "Evolution does not recognize this type of signed message."
-msgstr "O Evolution n�o reconhece este tipo de mensagem assinada."
-
-#: mail/mail-format.c:1786
-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:1794
-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."
+msgid "Mailer"
+msgstr "Correio"
 
-#: mail/mail-format.c:2037
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Apontador para site FTP (%s)"
 
-#: mail/mail-format.c:2051
+#: mail/mail-format.c:2120
 #, 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:2056
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Apontador para arquivo local (%s)"
 
-#: mail/mail-format.c:2085
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Apontador para dados remotos (%s)"
 
-#: mail/mail-format.c:2093
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2098
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando pasta"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12344,27 +12070,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:763
+#: mail/mail-local.c:762
 #, 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:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "N�o � poss�vel excluir metainfo de pasta %s: %s"
 
-#: mail/mail-local.c:1280
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Alterando pasta \"%s\" para o formato \"%s\""
 
-#: mail/mail-local.c:1295
+#: mail/mail-local.c:1294
 #, 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:1317
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12372,11 +12098,11 @@ msgstr ""
 "Se voc� n�o pode mais abrir esta caixa postal\n"
 "ent�o voc� precisar repar�-la manualmente."
 
-#: mail/mail-local.c:1406
+#: mail/mail-local.c:1405
 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:1415
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar /%s"
@@ -12403,117 +12129,112 @@ msgstr ""
 msgid "Working"
 msgstr "Trabalhando"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtrando pasta"
 
-#: mail/mail-ops.c:259
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Pegando correio"
 
-#: 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 "No entanto, a mensagem foi enviada com sucesso."
 
-#: mail/mail-ops.c:600
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensagem %d de %d"
 
-#: mail/mail-ops.c:739
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Falha na mensagem %d de %d"
 
-#: mail/mail-ops.c:741 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "Conclu�da."
 
-#: mail/mail-ops.c:834
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Salvando mensagem na pasta"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensagens para %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensagens para %s"
 
-#: mail/mail-ops.c:941
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1054
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Varrendo pastas em \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1104 shell/e-local-storage.c:179
-msgid "Trash"
-msgstr "Lixeira"
-
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-ops.c:1280
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1352
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo reposit�rio %s"
 
-#: mail/mail-ops.c:1421
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removendo pasta %s"
 
-#: mail/mail-ops.c:1515
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Armazenando pasta '%s'"
 
-#: mail/mail-ops.c:1566
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Atualizando pasta"
 
-#: mail/mail-ops.c:1602
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Excluindo permanentemente pasta"
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recuperando mensagem %s"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recuperando %d mensagem(ns)"
 
-#: mail/mail-ops.c:1804
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvando %d mensagem(ns)"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12522,7 +12243,7 @@ msgstr ""
 "N�o � poss�vel criar arquivo de sa�da: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12531,11 +12252,11 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Salvando anexo"
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12544,22 +12265,22 @@ msgstr ""
 "N�o � poss�vel criar arquivo de sa�da: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "N�o foi poss�vel escrever dados: %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectando a %s"
 
-#: mail/mail-ops.c:2234
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
@@ -12652,15 +12373,16 @@ msgstr "Entre senha para %s"
 msgid "Enter Password"
 msgstr "Entre senha"
 
-#: mail/mail-signature-editor.c:71
-msgid "Could not save signature file."
+#: mail/mail-signature-editor.c:79
+#, 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:155
+#: mail/mail-signature-editor.c:172
 msgid "Save signature"
 msgstr "Salvar assinatura"
 
-#: mail/mail-signature-editor.c:161
+#: mail/mail-signature-editor.c:178
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12670,30 +12392,21 @@ msgstr ""
 "\n"
 "Voc� deseja salvar as suas modifica��es?"
 
-#: mail/mail-signature-editor.c:340
+#: mail/mail-signature-editor.c:357
 #, fuzzy
 msgid "Signature name:"
 msgstr "Arquivo de assinatura:"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-summary.c:467
-#, fuzzy
-msgid "Mail Summary"
-msgstr "Resumo das mensagens"
-
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensagem encaminhada - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Mensagem encaminhada"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Mensagem encaminhada"
 
@@ -12720,10 +12433,6 @@ msgstr ""
 "    '%s'\n"
 "e foi(foram) atualizada(s)."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "Pastas virtuais"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "Pastas virtuais"
@@ -12741,11 +12450,11 @@ msgstr "Tentando editar uma pasta virtual '%s' que n�o existe."
 msgid "New VFolder"
 msgstr "Nova pasta virtual"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Sem assunto)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensagem"
@@ -12810,25 +12519,25 @@ msgstr "%d %b %Y"
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
 #, fuzzy
 msgid "Due By"
 msgstr "Prazo "
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Flag Status"
 msgstr "Estado"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Marcada"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr ""
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Recebida"
 
@@ -12836,47 +12545,47 @@ msgstr "Recebida"
 msgid "Size"
 msgstr "Tamanho"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:58
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Encaminhar"
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:59
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:60
 #, fuzzy
 msgid "For Your Information"
 msgstr "Informa��o da fonte"
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:62
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:66
 #, fuzzy
 msgid "Review"
 msgstr "Visualizar"
 
-#: mail/message-tag-followup.c:312
+#: mail/message-tag-followup.c:315
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -22773,7 +22482,7 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:48
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "Pasta contendo o resumo do Evolution"
 
@@ -22797,11 +22506,17 @@ msgstr "%l:%M %d de %B"
 msgid "No description"
 msgstr "Sem descri��o"
 
-#: my-evolution/e-summary-mail.c:134
+#: my-evolution/e-summary-mail.c:151
 msgid "Mail summary"
 msgstr "Resumo das mensagens"
 
-#: my-evolution/e-summary-mail.c:398 shell/e-local-storage.c:1022
+#. 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
 msgid "Local Folders"
 msgstr "Pastas locais"
 
@@ -22815,23 +22530,23 @@ msgstr "Pastas locais"
 msgid "KBOS"
 msgstr "SBFN"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "\"Word of the Day\" do Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:487
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Cita��es do dia"
 
-#: my-evolution/e-summary-preferences.c:746
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Adicionar uma fonte de not�cias"
 
-#: my-evolution/e-summary-preferences.c:754
+#: my-evolution/e-summary-preferences.c:728
 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:758
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Nome:"
 
@@ -22843,17 +22558,24 @@ msgstr "Erro ao baixar RDF"
 msgid "News Feed"
 msgstr "Fonte de not�cias"
 
-#: my-evolution/e-summary-shown.c:467
+#: my-evolution/e-summary-shown.c:463
 #, fuzzy
-msgid "Add->"
+msgid "All"
+msgstr "McAllen"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
 msgstr "_Adicionar"
 
-#: my-evolution/e-summary-shown.c:473
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
 #, fuzzy
-msgid "<-Remove"
+msgid "<- Remove"
 msgstr "Remover"
 
-#: my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shelton"
@@ -22878,19 +22600,19 @@ msgstr ""
 msgid "Weather"
 msgstr "Tempo"
 
-#: my-evolution/e-summary.c:189
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e de %B, %Y"
 
-#: my-evolution/e-summary.c:474
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "Por favor aguarde..."
 
-#: my-evolution/e-summary.c:565 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimir resumo"
 
-#: my-evolution/e-summary.c:611
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Falhou a impress�o do resumo"
 
@@ -22899,38 +22621,6 @@ 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"
@@ -24161,20 +23851,24 @@ msgstr "A_genda"
 msgid "_Weather"
 msgstr "_Tempo"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
 #, fuzzy
-msgid "Factory for the Evolution notes component."
+msgid "Configuration control for Evolution default folders."
 msgstr "F�brica para o redator do Evolution."
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Factory for the Notes control"
-msgstr "F�brica para o controle de tarefas do Evolution."
+msgid "Default Folders"
+msgstr "Pastas especiais"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: 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"
+msgstr ""
+
 #: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Exibir detalhes"
@@ -24183,20 +23877,11 @@ msgstr "Exibir detalhes"
 msgid "Cancel Operation"
 msgstr "Cancelar opera��o"
 
-#: 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-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instala��o do 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"
@@ -24204,16 +23889,16 @@ msgstr ""
 "Esta nova vers�o do Evolution precisa instalar arquivos adicionais\n"
 "no seu diret�rio pessoal do Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Por favor clique \"OK\" para instalar os arquivos ou \"Cancelar\" para sair."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "N�o foi poss�vel atualizar os arquivos corretamente"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24224,7 +23909,7 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -24233,7 +23918,7 @@ msgstr ""
 "Um erro ocorreu ao copiar arquivos em\n"
 "`%s'."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -24244,7 +23929,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -24255,7 +23940,7 @@ msgstr ""
 "n�o possui as permiss�es corretas. Por favor torne-o\n"
 "leg�vel e execut�vel e reinicie o Evolution."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -24266,7 +23951,7 @@ msgstr ""
 "deve ser removido para permitir a execu��o correta do Evolution.\n"
 "Por favor remova este arquivo e reinicie o Evolution."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -24277,7 +23962,7 @@ msgstr ""
 "Por favor o mova para permitir a instala��o\n"
 "dos arquivos de usu�rio do Evolution."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -24291,7 +23976,7 @@ msgstr ""
 "que o Evolution execute.\n"
 "Voc� deseja remover este diret�rio?"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -24611,53 +24296,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:170
+#: shell/e-shell-view-menu.c:168
 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:178
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy n�o p�de ser executado."
 
-#: shell/e-shell-view-menu.c:220
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Sobre o Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:446
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Ir para a pasta..."
 
-#: shell/e-shell-view-menu.c:447
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Selecione a pasta que voc� quer abrir"
 
-#: shell/e-shell-view-menu.c:567
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Criar um novo atalho"
 
-#: shell/e-shell-view-menu.c:568
+#: shell/e-shell-view-menu.c:566
 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:616
-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."
-
-#: shell/e-shell-view-menu.c:624
-#, c-format
-msgid "Error executing %s."
-msgstr "Erro ao executar %s."
-
-#: shell/e-shell-view-menu.c:739
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "_Trabalhar conectado"
 
-#: shell/e-shell-view-menu.c:752 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Trabalhar desconectado"
 
-#: shell/e-shell-view-menu.c:765 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Trabalhar desconectado"
 
@@ -24665,39 +24340,51 @@ msgstr "Trabalhar desconectado"
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta exibida)"
 
-#: 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 "(Nenhum)"
 
-#: 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 ""
 "O Ximian Evolution est� atualmente conectado. Clique neste bot�o para "
 "trabalhar desconectado."
 
-#: shell/e-shell-view.c:1858
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "O Ximian Evolution est� em preocesso de se desconectar."
 
-#: 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 ""
 "O Ximian Evolution est� atualmente desconectado. Clique neste bot�o para "
 "trabalhar conectado."
 
-#: shell/e-shell.c:652
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"O erro do sistema de ativa��o �:\n"
+"%s"
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "N�o � poss�vel preparar reposit�rio local -- %s"
 
-#: shell/e-shell.c:1719
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24708,19 +24395,23 @@ msgstr ""
 "terminou inesperadamente. Voc� ter� que sair do Evolution e reinici�-lo\n"
 "para poder acessar os seus dados novamente."
 
-#: shell/e-shell.c:1982
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Argumentos inv�lidos"
 
-#: shell/e-shell.c:1984
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "N�o � poss�vel registrar no OAF"
 
-#: shell/e-shell.c:1986
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "N�o foi localizado o banco de dados de configura��o"
 
-#: shell/e-shell.c:1988 shell/e-storage.c:487
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Erro gen�rico"
 
@@ -24845,14 +24536,9 @@ msgstr "Erro ao salvar atalhos."
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: shell/e-storage-set-view.c:650
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"N�o � poss�vel transferir pasta:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Caixa de entrada"
 
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
@@ -24918,10 +24604,13 @@ 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
+msgid "<click here to select a folder>"
+msgstr "<clique aqui para selecionar uma pasta>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -24959,67 +24648,67 @@ msgstr ""
 "O erro do sistema de ativa��o �:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "Erro CORBA"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Interrompido"
 
-#: shell/evolution-shell-component.c:1048
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Argumento inv�lido"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "J� possui um dono"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Sem dono"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "N�o encontrado"
 
-#: shell/evolution-shell-component.c:1056
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Tipo n�o suportado"
 
-#: shell/evolution-shell-component.c:1058
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Schema n�o suportado"
 
-#: shell/evolution-shell-component.c:1060
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Opera��o n�o suportada"
 
-#: shell/evolution-shell-component.c:1062
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: shell/evolution-shell-component.c:1066
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:1068
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "URI inv�lida"
 
-#: shell/evolution-shell-component.c:1072
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Possui sub-pastas"
 
-#: shell/evolution-shell-component.c:1074
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Sem espa�o remanescente"
 
-#: shell/evolution-shell-component.c:1076
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "O dono anterior morreu"
 
-#: shell/evolution-test-component.c:45
+#: shell/evolution-test-component.c:47
 #, fuzzy
 msgid "Test type"
 msgstr "Tipo do arquivo:"
@@ -25149,49 +24838,49 @@ 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:88
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:94
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "O Evolution est� saindo agora ..."
 
-#: shell/main.c:223
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "N�o � poss�vel acessar a shell do Ximian Evolution."
 
-#: shell/main.c:232
+#: shell/main.c:236
 #, 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:302
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Desativar tela de abertura"
 
-#: shell/main.c:303
+#: shell/main.c:318
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Iniciando a importa��o"
 
-#: shell/main.c:304
+#: shell/main.c:319
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Iniciando importadores inteligentes"
 
-#: shell/main.c:305
+#: shell/main.c:320
 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:323
+#: shell/main.c:338
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:353
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "N�o � poss�vel iniciar o sistema de componentes Bonobo."
 
@@ -25244,70 +24933,66 @@ msgstr "Recortar a sele��o"
 msgid "Delete selected contacts"
 msgstr "Excluir contatos selecionados"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "Dump"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:13
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Mover as mensagens selecionadas para outra pasta"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:14
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "_Mover para pasta..."
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Colar a �rea de transfer�ncia"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Visualiza a impress�o dos contatos a serem impressos"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Imprimir contatos selecionados"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Salvar contatos selecionados como um VCard."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Selecionar todos"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Selecionar todos os contatos"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Enviar uma mensagem aos contatos selecionados."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Enviar mensagem ao contato"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Enviar contatos selecionados a outra pessoa."
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Parar a carga"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 #, fuzzy
 msgid "View the current contact"
 msgstr "o instante atual"
 
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:25
+#: 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
@@ -25317,31 +25002,31 @@ msgstr "o instante atual"
 msgid "_Actions"
 msgstr "_A��es"
 
-#: ui/evolution-addressbook.xml.h:34
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "Lista de _contatos"
 
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Encaminhar contato..."
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:38
 msgid "_Move to Folder..."
 msgstr "_Mover para pasta..."
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "_Salvar como VCard"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_Buscar contatos"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Selecionar todos"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:45
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Enviar _mensagem ao contato..."
@@ -25561,6 +25246,10 @@ 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"
@@ -26200,6 +25889,10 @@ msgstr "Inserir um arquivo como texto na mensagem"
 msgid "Insert text file..."
 msgstr "Inserir arquivo texto..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Abrir"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Abrir um arquivo"
@@ -26339,10 +26032,6 @@ msgstr "_Abrir..."
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-a"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Seguran�a"
-
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "Aj_uda"
@@ -26817,25 +26506,24 @@ msgstr "Editor de buscas"
 msgid "Save Search"
 msgstr "Salvar busca"
 
-#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:97
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Salvar busca"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Adicionar �s busca salvas"
 
-#: widgets/misc/e-filter-bar.h:93
-#, fuzzy
-msgid "_Advanced Search..."
-msgstr "Busca avan�ada"
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informa��o"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Erro"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Pergunta"
@@ -26859,14 +26547,14 @@ msgstr "Localizar agora"
 msgid "_Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:844
-msgid "Find Now"
-msgstr "Localizar agora"
-
-#: widgets/misc/e-search-bar.c:846
+#: widgets/misc/e-search-bar.c:835
 msgid "Clear"
 msgstr "Limpar"
 
+#: widgets/misc/e-search-bar.c:837
+msgid "Find Now"
+msgstr "Localizar agora"
+
 #: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
 #: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
 msgid "The Personal Addressbook Server"
@@ -26889,6 +26577,785 @@ 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"
+
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "A_utenticar com servidor usando:"
+
+#~ msgid "Account Name"
+#~ msgstr "Nome da conta"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Adicionar cat�logo de endere�os"
+
+#~ msgid "Advanced"
+#~ msgstr "Avan�ado"
+
+#~ msgid "Base"
+#~ msgstr "Base"
+
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Marque aqui se o servidor exige que voc� se autentique."
+
+#~ 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 "Server Name"
+#~ msgstr "Nome do servidor"
+
+#~ 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 "This information is not required for most ldap servers. "
+#~ msgstr ""
+#~ "Esta informa��o n�o � necess�ria para a maioria 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."
+#~ 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 ""
+#~ "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 "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 "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"
+
+#~ 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?"
+#~ msgstr ""
+#~ "Voc� tem certeza que deseja\n"
+#~ "excluir este contato?"
+
+#~ msgid "Starting:"
+#~ msgstr "Iniciando:"
+
+#~ 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 "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "Reuni�o come�a: <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "Tarefa come�a: <b>"
+
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Informa��o de livre/ocupado come�a: <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Come�a: <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Reuni�o termina: <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Informa��o de livre/ocupado termina: <b>"
+
+#~ msgid "Ends: <b>"
+#~ msgstr "Termina: <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Tarefa conclu�da: <b>"
+
+#~ msgid "Task Due: <b>"
+#~ msgstr "Tarefa para: <b>"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "Informa��o de iCalendar"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "Erro de iCalendar"
+
+#~ msgid "An unknown person"
+#~ msgstr "Uma raz�o desconhecida"
+
+#~ 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."
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b> respondeu a um pedido de reuni�o."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Resposta a reuni�o"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> cancelou a reuni�o."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Cancelamento de reuni�o"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> enviou uma mensagem incompreens�vel."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Mensagem de reuni�o inv�lida"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> publicou informa��o de tarefa."
+
+#~ msgid "Task Information"
+#~ msgstr "Informa��o de tarefa"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> requisita que voc� execute uma tarefa."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Proposta de tarefa"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> deseja acrescent�-lo a uma tarefa existente."
+
+#~ msgid "Task Update"
+#~ msgstr "Atualiza��o de tarefa"
+
+#~ 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 "Task Update Request"
+#~ msgstr "Pedido de atualiza��o de tarefa"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b> respondeu a uma atribui��o de tarefa."
+
+#~ msgid "Task Reply"
+#~ msgstr "Resposta a tarefa"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> cancelou uma tarefa."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Cancelamento de tarefa"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Mensagem de tarefa inv�lida"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> publicou informa��o de livre/ocupado."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Informa��o de livre/ocupado"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> requisita sua informa��o de livre/ocupado."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Pedido de livre/ocupado"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "<b>%s</b> respondeu a um pedido de livre/ocupado."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Resposta de livre/ocupado"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Mensagem de livre/ocupado inv�lida"
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "A mensagem n�o aparenta estar formada corretamente."
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "A mensagem cont�m apenas pedidos n�o suportados."
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "O anexo n�o cont�m uma mensagem de agenda v�lida"
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "O anexo n�o cont�m itens visualiz�veis de agenda"
+
+#~ msgid "Event information"
+#~ msgstr "Informa��o de evento"
+
+#~ msgid "Task information"
+#~ msgstr "Informa��o de tarefa"
+
+#~ msgid "Journal information"
+#~ msgstr "Informa��o de di�rio"
+
+#~ msgid "Free/Busy information"
+#~ msgstr "Informa��o de livre/ocupado"
+
+#~ msgid "Calendar information"
+#~ msgstr "Informa��o de agenda"
+
+#~ msgid "Updated"
+#~ msgstr "Atualizado"
+
+#~ msgid "Refresh"
+#~ msgstr "Atualizar"
+
+#~ msgid "Counter-proposal"
+#~ msgstr "Contra proposta"
+
+#~ msgid "Task"
+#~ msgstr "Tarefa"
+
+#~ msgid "Status: %s"
+#~ msgstr "Estado: %s"
+
+#~ msgid "Percent Complete: %i"
+#~ msgstr "Percentagem conclu�da: %i"
+
+#~ msgid "URL: %s"
+#~ msgstr "URL: %s"
+
+#~ msgid "Categories: %s"
+#~ msgstr "Categorias: %s"
+
+#~ msgid "Contacts: "
+#~ msgstr "Contatos: "
+
+#, fuzzy
+#~ msgid "Reminder!!"
+#~ msgstr "Lembrete"
+
+#, fuzzy
+#~ msgid "Error hashing password."
+#~ msgstr "Erro ao adicionar cart�o"
+
+#, fuzzy
+#~ msgid "Invalid password."
+#~ msgstr "Argumento inv�lido"
+
+#, fuzzy
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Falhou a localiza��o do certificado para \"%s\"."
+
+#, fuzzy
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Falhou a localiza��o do certificado para \"%s\"."
+
+#, fuzzy
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "N�o foi poss�vel criar um contexto de cifragem PGP."
+
+#, fuzzy
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "N�o foi poss�vel conectar ao servidor: %s"
+
+#, fuzzy
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "N�o foi poss�vel salvar arquivo de assinatura."
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Por favor entre a senha NNTP para %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "O servidor rejeitou o nome do usu�rio"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Falha ao enviar nome do usu�rio ao servidor"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Servidor rejeitou nome do usu�rio/senha"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "N�o foi poss�vel obter a lista de grupos do servidor."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "N�o � poss�vel carregar o arquivo de lista de grupos para %s: %s"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution executive summary component."
+#~ msgstr "Componente resumo executivo de correio do Evolution."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "N�o � poss�vel iniciar o componente de resumo do Evolution."
+
+#, fuzzy
+#~ msgid "Select a service"
+#~ msgstr "Selecionar um arquivo"
+
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "Enviar um e-mail"
+
+#, fuzzy
+#~ msgid "Run %s"
+#~ msgstr "URL: %s"
+
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "Fechar"
+
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "Mover esta pasta para outro lugar"
+
+#, fuzzy
+#~ msgid "Configure %s"
+#~ msgstr "Reconfigurar /%s"
+
+#, fuzzy
+#~ msgid "page"
+#~ msgstr "P�gina"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "N�o � poss�vel renomear pasta:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr "Erro ao carregar %s"
+
+#, fuzzy
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "F�brica para o componente resumo executivo."
+
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Resumo"
+
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "F�brica para o redator do Evolution."
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "F�brica para o componente resumo executivo."
+
+#, fuzzy
+#~ msgid "Test service"
+#~ msgstr "Estherville"
+
+#, fuzzy
+#~ msgid "Update now"
+#~ msgstr "Atualizar"
+
+#, fuzzy
+#~ msgid "Update every "
+#~ msgstr "_Atualizar livre/ocupado"
+
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Confirm when Expunging a folder"
+#~ msgstr "Confirmar ao excluir permanentemente uma pasta"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Estilo de encaminhamento padr�o �: "
+
+#~ msgid "Default character encoding: "
+#~ msgstr "Codifica��o de caracteres padr�o: "
+
+#, fuzzy
+#~ msgid "Delete selected signature"
+#~ msgstr "Excluir tudo exceto a assinatura"
+
+#~ msgid "Display"
+#~ msgstr "Exibi��o"
+
+#~ msgid "Drafts"
+#~ msgstr "Rascunho"
+
+#, fuzzy
+#~ msgid "E_mail address:"
+#~ msgstr "_Endere�o de e-mail:"
+
+#, fuzzy
+#~ msgid "Ed_it..."
+#~ msgstr "Editar..."
+
+#, fuzzy
+#~ msgid "Edi_t..."
+#~ msgstr "Editar..."
+
+#, fuzzy
+#~ msgid "File containing signature"
+#~ msgstr "Pasta contendo correio"
+
+#, fuzzy
+#~ msgid "Forwards and Replies"
+#~ msgstr "Encaminhar _embutido"
+
+#, fuzzy
+#~ msgid "Hide advanced settings"
+#~ msgstr "Configura��es de tempo"
+
+#~ msgid "In HTML mail"
+#~ msgstr "Em correio HTML"
+
+#, fuzzy
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Atalhos"
+
+#, fuzzy
+#~ msgid "List of signatures"
+#~ msgstr "Salvar assinatura"
+
+#~ msgid "Mail Settings"
+#~ msgstr "Configura��es de correio"
+
+#, fuzzy
+#~ msgid "N_ew..."
+#~ msgstr "Novo..."
+
+#, fuzzy
+#~ msgid "Name of selected signature"
+#~ msgstr "Excluir tudo exceto a assinatura"
+
+#, fuzzy
+#~ msgid "Ne_w..."
+#~ msgstr "Novo..."
+
+#~ msgid "News"
+#~ msgstr "Not�cias"
+
+#~ msgid "Prompt when sending messages with an _empty subject"
+#~ msgstr "Perguntar ao enviar mensagens com um assunto _vazio"
+
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Selecionar arquivo de registro de filtros..."
+
+#~ msgid "Select PGP binary"
+#~ msgstr "Selecionar execut�vel PGP"
+
+#~ msgid "Sent"
+#~ msgstr "Enviada"
+
+#, fuzzy
+#~ msgid "Shortcut"
+#~ msgstr "_Atalho"
+
+#, fuzzy
+#~ msgid "Show advanced settings"
+#~ msgstr "Configura��es de fontes de not�cias"
+
+#, fuzzy
+#~ msgid "Signatures"
+#~ msgstr "Salvar assinatura"
+
+#~ msgid "Sources"
+#~ msgstr "Fontes"
+
+#, fuzzy
+#~ msgid "_Edit..."
+#~ msgstr "Editar..."
+
+#, fuzzy
+#~ msgid "_Filename"
+#~ msgstr "Nome do arquivo:"
+
+#~ msgid "_Highlight citations with"
+#~ msgstr "_Real�ar cita��es com"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "_Registrar as a��es dos filtros em:"
+
+#~ msgid "_Mark messages as Read after"
+#~ msgstr "_Marcar mensagens como lidas ap�s"
+
+#, fuzzy
+#~ msgid "_Name"
+#~ msgstr "_Nome:"
+
+#~ msgid "_Organization:"
+#~ msgstr "E_mpresa:"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "_Send messages in HTML format by default"
+#~ msgstr "_Enviar mensagens em formato HTML por padr�o."
+
+#, fuzzy
+#~ msgid "_Server type: "
+#~ msgstr "Tipo do _servidor: "
+
+#~ msgid "placeholder"
+#~ msgstr "placeholder"
+
+#~ msgid "seconds."
+#~ msgstr "segundos."
+
+#, fuzzy
+#~ 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."
+
+#, fuzzy
+#~ 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"
+
 #~ msgid "Card: "
 #~ msgstr "Cart�o: "
 
@@ -27133,9 +27600,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "Connecting to LDAP server..."
 #~ msgstr "Conectando ao servidor LDAP..."
 
-#~ msgid "Unable to connect to LDAP server."
-#~ msgstr "N�o � poss�vel conectar ao servidor LDAP."
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Esperando por conex�o ao servidor LDAP..."
 
@@ -27224,8 +27688,7 @@ 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."
 
@@ -27295,18 +27758,12 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "Mailbox Format"
 #~ msgstr "Formato da caixa de correio"
 
-#~ msgid "Are you sure you want to delete this news account?"
-#~ msgstr "Voc� tem certeza que deseja excluir esta conta de not�cias?"
-
 #~ 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 "Special Folders"
-#~ msgstr "Pastas especiais"
-
 #~ 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>"
 
@@ -27346,9 +27803,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "New List"
 #~ msgstr "Nova lista"
 
-#~ msgid "_Addressbook Sources..."
-#~ msgstr "_Fontes de cat�logos de endere�os..."
-
 #~ msgid "Configure the calendar's settings"
 #~ msgstr "Configurar as op��es da agenda"
 
diff --git a/po/ro.po b/po/ro.po
index 28f956fa8c..4e891c4d1d 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: 2001-11-14 19:26-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -34,21 +34,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Import fi�ierele card V �n 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 "Pune la fi�ier ca"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nume"
 
 #: 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:1731
 msgid "Primary"
 msgstr "Principal"
 
@@ -58,15 +59,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:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: 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
 msgid "Business"
 msgstr "Serviciu"
 
@@ -76,12 +78,12 @@ msgid "Bus"
 msgstr ""
 
 #: 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:1720
 msgid "Callback"
 msgstr "Rechemare"
 
 #: 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:1722
 msgid "Company"
 msgstr "Companie"
 
@@ -91,13 +93,14 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: 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
 msgid "Home"
 msgstr "Adresa de acas�"
 
 #: 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 "Organiza�ie"
 
@@ -106,18 +109,20 @@ msgid "Org"
 msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "Mobil"
 
 #: 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:1721
 msgid "Car"
 msgstr "Ma�in�"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: 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:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax serviciu"
 
@@ -126,13 +131,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: 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:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "Serviciu 2"
 
@@ -141,69 +146,68 @@ msgid "Bus 2"
 msgstr ""
 
 #: 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:1724
 msgid "Home 2"
 msgstr "Adresa de acas� 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:1726
+#: 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:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "Alte"
 
 #: 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:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: 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:1759
+#: 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:1760
+#: 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 "Site web"
 
@@ -212,7 +216,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 "Departament"
 
@@ -221,7 +225,7 @@ msgid "Dep"
 msgstr "Dep"
 
 #: 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 "Birou"
 
@@ -230,12 +234,12 @@ msgid "Off"
 msgstr ""
 
 #: 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 "Titlu"
 
 #: 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 "Profesie"
 
@@ -244,7 +248,7 @@ msgid "Prof"
 msgstr ""
 
 #: 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 "Manager"
 
@@ -257,7 +261,7 @@ msgid "Ass"
 msgstr ""
 
 #: 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 "Porecl�"
 
@@ -266,12 +270,12 @@ msgid "Nick"
 msgstr "Porecl�"
 
 #: 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 "So�/so�ie"
 
 #: 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 "Not�"
 
@@ -284,7 +288,7 @@ msgid "CALUri"
 msgstr ""
 
 #: 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 liber-ocupat"
 
@@ -313,296 +317,16 @@ msgstr "Categorii"
 msgid "Family Name"
 msgstr "Nume de familie"
 
-#: addressbook/backend/ebook/e-card-simple.c:788
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, fuzzy, 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 ""
-"\n"
-"Nume: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Prefix:     "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Dat:        "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Suplimentar:  "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Familia:    "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Sufix:      "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Data na�terii:"
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adresa:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  C�su�a po�tal�:"
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Ext:         "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Strada:      "
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Ora�:        "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Regiunea:    "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Cod po�tal:  "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  �ara:        "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Eticheta de livrare:"
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefoane:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-mail:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-mail:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"Program de mail:"
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Nume:  "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  Unitate:"
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  Unitate2:"
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  Unitate3:"
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  Unitate4"
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Categorii:  "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Comentariu:"
-
-#. 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"
-"�ir unic:      "
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Cheia public�:"
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Carduri V multiple"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "Card V pentru %s"
@@ -610,85 +334,89 @@ msgstr "Card V pentru %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: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:1130
-#: 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:171 calendar/gui/main.c:63
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Nu pot ini�ializa Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2215
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Caut..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "�ncarc..."
 
 #. 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 "Eroare la c�utarea expresiei."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:475
-msgid "Connecting to LDAP server..."
-msgstr "Conectare la serverul LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:485
-msgid "Unable to connect to LDAP server."
-msgstr "Nu m� pot conecta la serverul LDAP."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:501
-msgid "Waiting for connection to LDAP server..."
-msgstr "A�tept conectarea la serverul LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:870
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Adaug� card la serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:971
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "�terge card de la serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Modificare card pentru serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2160
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Repornire c�utare."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Primesc rezultatele c�ut�rii LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2165
-msgid "Restarting search."
-msgstr "Repornire c�utare."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Eroare �tergere card"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Nu pot parsa URL `%s'"
 
-#: addressbook/conduit/address-conduit.c:294
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "Adresa email:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Nu pot �nc�rca cursorul\n"
 
-#: addressbook/conduit/address-conduit.c:307
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "EBook ne�nc�rcat\n"
 
-#: addressbook/conduit/address-conduit.c:1089
-#: calendar/conduits/calendar/calendar-conduit.c:981
-#: calendar/conduits/todo/todo-conduit.c:694
+#: 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 "Nu pot porni serverul wombat"
 
-#: addressbook/conduit/address-conduit.c:1090
-#: calendar/conduits/calendar/calendar-conduit.c:982
-#: calendar/conduits/todo/todo-conduit.c:695
+#: 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 "Nu pot porni wombat"
 
-#: 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 ""
 
@@ -705,223 +433,112 @@ msgid "A sample Bonobo control which displays an addressbook."
 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
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Vizualizor agend� minicard Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Component� Evolution pentru manipulare contacte"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Procesator pentru controlul agendei minicard"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#, 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
 msgid "Factory for the sample Addressbook control"
 msgstr "Procesator pentru controlul mostr� agend�"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Contacte"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Dosar con�in�nd informa�ie de contact"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "Server LDAP con�in�nd informa�ie de contact"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Contact nou"
 
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
-msgstr "_Contact nou"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_Contact"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "List� contacte nou�"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
-msgstr "List� contacte nou�"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
-msgstr "Editare agend�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
-msgstr "Nume cont"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "Ad�ugare agend�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
-msgstr "Surse agend�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "Avansat"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
-msgstr "Baza"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "De baz�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "De_lete"
-msgstr "�terge"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "Adresa email:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "One"
-msgstr "Unu"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
-msgstr "Domeniu c�utare:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search s_cope: "
-msgstr "Scopul c�ut�rii:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-#, fuzzy
-msgid "Server Name"
-msgstr "Selec�ie nume"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-#, fuzzy
-msgid "Sub"
-msgstr "Du"
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:23
-#, fuzzy
-msgid "_Account name:"
-msgstr "Management cont"
-
-#: 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 "_Adaug�"
-
-#: 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 "_Editeaz�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:26
-#, fuzzy
-msgid "_My server requires authentication"
-msgstr "Serverul necesit� autentificare"
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
-msgid "_Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-#, fuzzy
-msgid "_Server name:"
-msgstr "Mesaj server:"
+msgid "Contact _List"
+msgstr "_Contact"
 
-#: 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "Nu pot ini�ializa gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:167
-msgid "Other Contacts"
-msgstr "Alte contacte"
-
-#: addressbook/gui/component/addressbook.c:468
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Nu pot deschide agenda"
 
-#: 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"
@@ -931,7 +548,7 @@ msgstr ""
 "c� a�i introdus URI incorect, sau serverul LDAP\n"
 "e c�zut"
 
-#: 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"
@@ -943,7 +560,7 @@ msgstr ""
 "programul din sursele CVS dup� ce desc�rca�i OpenLDAP urm�nd\n"
 "leg�tura urm�toare.\n"
 
-#: 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."
@@ -951,60 +568,52 @@ 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:623
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduce�i parola pentru %s"
 
-#: addressbook/gui/component/addressbook.c:786
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Orice c�mp con�ine"
-
-#: addressbook/gui/component/addressbook.c:787
-msgid "Name contains"
-msgstr "Numele con�ine"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "se termin� cu"
 
-#: addressbook/gui/component/addressbook.c:788
-msgid "Email contains"
-msgstr "Email-ul con�ine"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "Email 2"
 
-#: addressbook/gui/component/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "Categorii"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:772
+#: 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
 msgid "Advanced..."
 msgstr "Avansat..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1031
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
 #, fuzzy
 msgid "Any Category"
 msgstr "Categorie:"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1083
 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:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1686
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 msgid "Primary Email"
 msgstr "Email principal"
 
@@ -1050,6 +659,619 @@ 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 "
+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
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "Surse agend�"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Alarme"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonim"
+
+#: 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 "Deconectare de la %s"
+
+#: 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 "Personalizeaz�"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "�terge"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "_Nume list�:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "Adresa email:"
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "G�se�te:"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "General"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+#, fuzzy
+msgid "LDAP Attribute"
+msgstr "Autentificare"
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Configurare mail"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Margini"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "Fiecare"
+
+#: 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 "Unu"
+
+#: 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 "Implicit"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Implicit"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "Scopul c�ut�rii:"
+
+#. 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 "Caut..."
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Selecteaz� tot"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "�terse"
+
+#: 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 "Informa�ie surs�"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Conectare la 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
+#, fuzzy
+msgid "Sub"
+msgstr "Du"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Stochez c�utarea ca dosar V"
+
+#: 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
+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/gui/component/ldap-config.glade.h:102
+#, fuzzy
+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
+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:139
+msgid "_Add"
+msgstr "_Adaug�"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "Adaug� ->"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Adaug� ac�iune"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Adaug� ac�iune"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Alarme"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "�terge tot"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "Afi�eaz�"
+
+#: 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:152 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 "_Editeaz�"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Editeaz� �nt�lnire"
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Op�iuni"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "Port:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Implicit"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "Domeniu c�utare:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+#, fuzzy
+msgid "_Server name:"
+msgstr "Mesaj server:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Durata de sfor�ire (minute)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Cont"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "editor-lista-contact"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Nepornit"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Deconectare de la %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 "General"
+
+#: 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 "Caut..."
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Interfa�a de selectare nume a agendei Evolution."
@@ -1059,9 +1281,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Procesator interfa�a de selectare nume a agendei"
 
 #: 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: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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "�terge"
 
@@ -1093,7 +1315,12 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Contact schimbat:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "G�se�te un contact"
+
+#: 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"
@@ -1103,7 +1330,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"
@@ -1111,1305 +1338,1373 @@ 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:1
-#, fuzzy
-msgid "C_ontaining:"
-msgstr "con�ine"
+msgid "Select Names"
+msgstr "Selec�ie nume"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
-msgid "Co_ntacts:"
-msgstr "Contacte"
+msgid "Selected Contacts:"
+msgstr "�terg persoana de contact?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "F_ind"
-msgstr "G�se�te:"
+msgid "Show Contacts"
+msgstr "Contacte"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "Selec�ie nume"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
+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 "_Mut�..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Categorie:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 #, fuzzy
 msgid "_Folder:"
 msgstr "Dosar"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-#, fuzzy
-msgid "_Message Recipients:"
-msgstr "Destinatari mesaj"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "Anni_versary:"
-msgstr "Ani_versare:"
+#, fuzzy
+msgid "A_ssistant's name:"
+msgstr "Nume _asistent:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "B_usiness"
-msgstr "Servici_u"
+#, fuzzy
+msgid "Add_ress..."
+msgstr "_Adresa..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Business _Fax"
-msgstr "_Fax serviciu"
+msgid "Anni_versary:"
+msgstr "Ani_versare:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#, fuzzy
+msgid "Birthda_y:"
+msgstr "Ziua de na�tere:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "C_ontacts..."
+msgstr "C_ontacte..."
+
+#: 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 "Ca_tegorii..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Editor de contacte"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "D_epartment:"
+msgstr "_Departament:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Detalii"
 
-#: 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 liber-ocupat"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "File A_s:"
 msgstr "Fi�ier ca:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "General"
-msgstr "General"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#, fuzzy
+msgid "Full _Name..."
+msgstr "_Nume complet..."
 
-#: 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"
 "of that information here."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr "Tip nou de telefon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "No_tes:"
 msgstr "No_ti�e"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Organi_zation:"
 msgstr "Organi_za�ie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#, fuzzy
+msgid "P_rofession:"
+msgstr "_Profesie:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Phone Types"
 msgstr "Tipuri de telefon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Wants to receive _HTML mail"
-msgstr "Dori�i sa primi�i mail-uri _HTML"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Address..."
-msgstr "_Adresa..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Assistant's name:"
-msgstr "Nume _asistent:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Birthday:"
-msgstr "Ziua de na�tere:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+msgid "S_pouse:"
+msgstr "_So�/so�ie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Business"
-msgstr "Serviciu"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#, fuzzy
+msgid "This is the _mailing address"
+msgstr "_Aceasta este adresa de expediere"
 
-#: 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 "_Contacte..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "Wants to receive _HTML mail"
+msgstr "Dori�i sa primi�i mail-uri _HTML"
 
-#: 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: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:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "_�terge"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Department:"
-msgstr "_Departament:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Full Name..."
-msgstr "_Nume complet..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Home"
-msgstr "_Acas�"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Job title:"
 msgstr "_Func�ia:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager's Name:"
 msgstr "_Nume manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Mobile"
-msgstr "_Mobil"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
 msgstr "Porecl�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
 msgstr "Birou:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Profession:"
-msgstr "_Profesie:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "_Public Calendar URL:"
 msgstr "Calendar URI"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Spouse:"
-msgstr "_So�/so�ie:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr "_Aceasta este adresa de expediere"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Web page address:"
 msgstr "Adresa paginii de web:"
 
-#: 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:756
-#, fuzzy
-msgid "Category editor not available."
-msgstr "Nu e disponibil� o descriere."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:763
-msgid "This contact belongs to these categories:"
-msgstr "Aceast� persoan� de contact apar�ine categoriilor:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
-#, fuzzy, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Nu pot �terge dosarul sumar al fi�ierelor `%s': %s"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
-msgstr "Contact Ad�ugare-Rapid�"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
-msgstr "Editare complet�"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr "Nume complet"
-
-#: 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 ""
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
 #, fuzzy
-msgid "list"
-msgstr "Cea��"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresa _2"
+msgid "United States"
+msgstr "(Mesaj f�r� titlu)"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
 #, fuzzy
 msgid "Afghanistan"
 msgstr "Asistent"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 #, fuzzy
 msgid "Antarctica"
 msgstr "Automat"
 
-#: 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
 #, fuzzy
 msgid "Argentina"
 msgstr "Orientare"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: my-evolution/Locations.h:155
 #, fuzzy
 msgid "Austria"
 msgstr "August"
 
-#: 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
 #, fuzzy
 msgid "Belarus"
 msgstr "ani"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:23
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: my-evolution/Locations.h:218
 #, fuzzy
 msgid "Belize"
 msgstr "M�rime"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #, fuzzy
 msgid "Benin"
 msgstr "Trimit"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: my-evolution/Locations.h:294
 #, fuzzy
 msgid "Brazil"
 msgstr "Grindin�"
 
-#: 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/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 ""
 
-#: 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
 #, fuzzy
 msgid "Chad"
 msgstr "Scaun"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-msgid "Check Address"
-msgstr "Verific� adresa"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: my-evolution/Locations.h:438
 #, fuzzy
 msgid "Chile"
 msgstr "Chinez"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 #, fuzzy
 msgid "China"
 msgstr "Chinez"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 #, fuzzy
 msgid "Comoros"
 msgstr "Culori"
 
-#: 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
 #, fuzzy
 msgid "Congo"
 msgstr "Copiez"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:56
-msgid "Countr_y:"
-msgstr "�ara"
-
-#: 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/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 "Finlanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: my-evolution/Locations.h:766
 #, fuzzy
 msgid "France"
 msgstr "Renun��"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: my-evolution/Locations.h:846
 #, fuzzy
 msgid "Greece"
 msgstr "Grec"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #, fuzzy
 msgid "Greenland"
 msgstr "Finlanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 #, fuzzy
 msgid "Grenada"
 msgstr "Canada"
 
-#: 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
 #, fuzzy
 msgid "Guam"
 msgstr "am"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:93
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #, fuzzy
 msgid "Guinea"
 msgstr "General"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: my-evolution/Locations.h:888
 #, fuzzy
 msgid "Haiti"
 msgstr "Grindin�"
 
-#: 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
 #, fuzzy
 msgid "Honduras"
 msgstr "ore"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: my-evolution/Locations.h:966
 #, fuzzy
 msgid "Hungary"
 msgstr "Duminic�"
 
-#: 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
 #, fuzzy
 msgid "Ireland"
 msgstr "Corean"
 
-#: 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
 #, fuzzy
 msgid "Japan"
 msgstr "Japonez"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: my-evolution/Locations.h:1046
 #, fuzzy
 msgid "Jordan"
 msgstr "Corean"
 
-#: 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
+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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #, fuzzy
 msgid "Laos"
 msgstr "Cea mai sc�zut�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: my-evolution/Locations.h:1190
 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:1198
 msgid "Lebanon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 #, fuzzy
 msgid "Lesotho"
 msgstr "Cea mai sc�zut�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
 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:1234
 #, fuzzy
 msgid "Lithuania"
 msgstr "Grindin� u�oar�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: my-evolution/Locations.h:1268
 msgid "Luxembourg"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 #, fuzzy
 msgid "Macau"
 msgstr "Martie"
 
-#: 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
 #, fuzzy
 msgid "Malawi"
 msgstr "Mail"
 
-#: 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #, fuzzy
 msgid "Mali"
 msgstr "Mail"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
 #, fuzzy
 msgid "Malta"
 msgstr "Mail"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 #, fuzzy
 msgid "Mauritius"
 msgstr "Margini"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 #, fuzzy
 msgid "Mayotte"
 msgstr "Mai"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1387
 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
+msgid "Moldova, Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 #, fuzzy
 msgid "Monaco"
 msgstr "Luni"
 
-#: 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:1470
 msgid "Morocco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 #, fuzzy
 msgid "Mozambique"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 #, fuzzy
 msgid "Myanmar"
 msgstr "Manager"
 
-#: 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
 #, fuzzy
 msgid "Nepal"
 msgstr "Mail nou"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
 #, fuzzy
 msgid "Netherlands"
 msgstr "Selec_teaz� �nl�n�uirea"
 
-#: 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
 #, fuzzy
 msgid "New Caledonia"
 msgstr "Contact nou"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1560
 #, fuzzy
 msgid "New Zealand"
 msgstr "Mail nou"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: my-evolution/Locations.h:1562
 msgid "Nicaragua"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 #, fuzzy
 msgid "Niger"
 msgstr "Mai mare"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 #, fuzzy
 msgid "Nigeria"
 msgstr "Mai mare"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 #, fuzzy
 msgid "Niue"
 msgstr "minut"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: my-evolution/Locations.h:1574
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norway"
 msgstr "Acum"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1632
 msgid "Oman"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
 #, fuzzy
 msgid "Pakistan"
 msgstr "Lipe�te"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama"
 msgstr "Canada"
 
-#: 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:1688
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Peru"
 msgstr "H�rtie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr ""
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
 #, fuzzy
 msgid "Poland"
 msgstr "Finlanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Portugal"
 msgstr "Portret"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1824
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Qatar"
 msgstr "dup�"
 
-#: 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
 #, fuzzy
 msgid "Reunion"
 msgstr "Regiuni"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
 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/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #, fuzzy
 msgid "Rwanda"
 msgstr "Canada"
 
-#: 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
 #, fuzzy
 msgid "Samoa"
 msgstr "Fum"
 
-#: 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:2035
 msgid "Saudi Arabia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 #, fuzzy
 msgid "Senegal"
 msgstr "General"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 #, fuzzy
 msgid "Seychelles"
 msgstr "Program"
 
-#: 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:2090
 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:2103
 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:2104
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 #, fuzzy
 msgid "Somalia"
 msgstr "Normal"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2119
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spain"
 msgstr "Ploaie"
 
-#: 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
 #, fuzzy
 msgid "Sudan"
 msgstr "Dum"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
 #, fuzzy
 msgid "Suriname"
 msgstr "Porecl�"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 #, fuzzy
 msgid "Swaziland"
 msgstr "Finlanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
 #, fuzzy
 msgid "Sweden"
 msgstr "V�zut"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2183
 msgid "Switzerland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Taiwan"
 msgstr "Ploaie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 #, fuzzy
 msgid "Tajikistan"
 msgstr "Lista de sarcini"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+msgid "Tanzania, United Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 #, fuzzy
 msgid "Thailand"
 msgstr "Finlanda"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 #, fuzzy
 msgid "Togo"
 msgstr "La"
 
-#: 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
 #, fuzzy
 msgid "Tonga"
 msgstr "Ast�zi"
 
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
 #, fuzzy
 msgid "Turkey"
 msgstr "Mar"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 #, fuzzy
 msgid "Turkmenistan"
 msgstr "Turc"
 
-#: 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/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 #, fuzzy
 msgid "Uganda"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
 #, fuzzy
 msgid "Ukraine"
 msgstr "Ucrainean"
 
-#: 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:2342
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-#, fuzzy
-msgid "United States"
-msgstr "(Mesaj f�r� titlu)"
-
-#: 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:2348
 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:2380
 msgid "Venezuela"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Viet Nam"
 msgstr "Selec�ie nume"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+msgid "Virgin Islands, British"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+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
 #, fuzzy
 msgid "Western Sahara"
 msgstr "Europa de vest"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
 #, fuzzy
 msgid "Yemen"
 msgstr "V�zut"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2524
 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 ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "�terg persoana de contact?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#, fuzzy
+msgid "Category editor not available."
+msgstr "Nu e disponibil� o descriere."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+msgid "This contact belongs to these categories:"
+msgstr "Aceast� persoan� de contact apar�ine categoriilor:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#, fuzzy
+msgid "Save Contact as VCard"
+msgstr "Salveaz� ca �i card V"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Nu pot �terge dosarul sumar al fi�ierelor `%s': %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+msgid "Contact Quick-Add"
+msgstr "Contact Ad�ugare-Rapid�"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+msgid "Edit Full"
+msgstr "Editare complet�"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr "Nume complet"
+
+#: 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 ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "Cea��"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Adresa _2"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "Verific� adresa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "�ara"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "Lo_calitate:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "C�su�a _po�tal�:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Stat/Provincie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "Cod po�tal:"
 
@@ -2508,10 +2803,15 @@ msgid "contact-list-editor"
 msgstr "editor-lista-contact"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 msgid "Contact List Editor"
 msgstr "Editor lista de contacte"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#, fuzzy
+msgid "Save List as VCard"
+msgstr "Salveaz� ca �i card V"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Adaug oricum"
@@ -2559,7 +2859,7 @@ msgstr ""
 "�n acest dosar. Dori�i s� continua�i �n acest caz?"
 
 #: 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 "C�utare avansat�"
 
@@ -2568,221 +2868,323 @@ msgstr "C�utare avansat�"
 msgid "Search"
 msgstr "Caut�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 #, fuzzy
 msgid "No cards"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 #, fuzzy
 msgid "1 card"
 msgstr "Tip�re�te calendar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr "%d secunde"
 
-#: 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 "Salveaz� ca �i card V"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Deschide"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:734
-#: ui/evolution-addressbook.xml.h:10
-#, fuzzy
-msgid "Forward Contact"
-msgstr "�nainteaz� _anexat"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-model.c:370
 #, fuzzy
-msgid "Send Message to Contact"
-msgstr "Trimite mesaj la contact"
-
-#: 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 "Tip�re�te"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr "Tip�re�te plic"
-
-#: 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 "�terg"
+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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Eroare la modificare 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:1043
 msgid "Success"
 msgstr "Succes"
 
-#: 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: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
 msgid "Unknown error"
 msgstr "Eroare necunoscut�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Depozitare offline"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "Acces interzis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Nu g�sesc card-ul"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "ID-ul card-ului exist� deja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protocol nesuportat"
 
-#: 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:607 camel/camel-service.c:643
+#: 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
 msgid "Cancelled"
 msgstr "Revocat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Alt� eroare"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Eroare ad�ugare list�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Eroare ad�ugare card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Eroare la modificarea listei"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Eroare la �tergerea listei"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Eroare �tergere 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 ""
+#: addressbook/gui/widgets/e-addressbook-util.c:204
+#, fuzzy
+msgid "Display Cards?"
+msgstr "Afi�eaz�"
 
-#. 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"
+#: addressbook/gui/widgets/e-addressbook-util.c:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "Afi�eaz�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Nepornit"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Nepornit"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Nepornit"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Nepornit"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Clic aici s� ad�uga�i un contact *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Telefon principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Telefon asistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Telefon serviciu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Telefon revenire"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Telefon companie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Telefon acas�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Adresa serviciu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Adresa acas�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Telefon mobil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Telefon ma�in�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Telefon serviciu 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Telefon acas� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Alt telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Salveaz� ca �i card V"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Contact nou"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "List� contacte nou�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "Mer_gi la dosarul..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Import�..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Caut� contacte"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Surse _agend�..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Set�ri _pilot..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+#, fuzzy
+msgid "Forward Contact"
+msgstr "�nainteaz� _anexat"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#, fuzzy
+msgid "Send Message to Contact"
+msgstr "Trimite mesaj la contact"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Tip�re�te plic"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "Copiez �n folderul..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "Mut �n folderul..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Decupeaz�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "Vizualizarea _curent�"
+
+#. 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:940
+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 ""
+
+#. 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
+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 ""
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -2796,11 +3198,12 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr "Salveaz� in agend�"
 
-#: 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 ""
@@ -2810,10 +3213,40 @@ msgstr ""
 "\n"
 "Dublu-click aici pentru crea un contact nou."
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Nu exist� articole de vizualizat\n"
+"\n"
+"Dublu-click aici pentru crea un contact nou."
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Vizualizare card"
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+#, fuzzy
+msgid "Print envelope"
+msgstr "Tip�re�te plic"
+
+#: addressbook/printing/e-contact-print.c:1115
+#, fuzzy
+msgid "Print cards"
+msgstr "Tip�re�te calendar"
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+#, fuzzy
+msgid "Print card"
+msgstr "Tip�re�te calendar"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -2884,6 +3317,7 @@ msgid "Include:"
 msgstr "Include:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Peisaj"
 
@@ -2908,10 +3342,12 @@ msgid "Options"
 msgstr "Op�iuni"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Orientare"
 
 #: addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "Pagin�"
 
@@ -2927,7 +3363,9 @@ msgstr "H�rtie"
 msgid "Paper source:"
 msgstr "Sursa hirtie"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Portret"
 
@@ -2984,66 +3422,50 @@ msgstr "L��ime:"
 msgid "_Font..."
 msgstr "Font..."
 
-#: addressbook/printing/e-contact-print.c:1111
-#, fuzzy
-msgid "Print cards"
-msgstr "Tip�re�te calendar"
-
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-#, fuzzy
-msgid "Print card"
-msgstr "Tip�re�te calendar"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-#, fuzzy
-msgid "Print envelope"
-msgstr "Tip�re�te plic"
-
-#: calendar/cal-util/cal-component.c:1202
+#: calendar/cal-util/cal-component.c:1207
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "_Editeaz� �nt�lnire"
 
-#: 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:405 mail/message-list.c:651
+#: 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
 msgid "High"
 msgstr "Ridicat"
 
-#: 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:650
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
-#: 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:407 mail/message-list.c:649
+#: 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
 msgid "Low"
 msgstr "Sc�zut"
 
 #. 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
 msgid "Undefined"
 msgstr "Nedefinit"
 
-#: calendar/conduits/calendar/calendar-conduit.c:937
-#: calendar/conduits/todo/todo-conduit.c:649
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Eroare in timpul comunic�rii cu serverul calendar"
 
-#: 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 "Nu pot citi pilotul blocului aplica�ie calendar"
 
-#: calendar/conduits/todo/todo-conduit.c:756
-#: calendar/conduits/todo/todo-conduit.c:759
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "_Prioritate:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nu pot citi pilotul blocului aplica�ie ToDo"
 
@@ -3057,44 +3479,58 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Mostr� de control Bonobo care afi�eaza un calendar."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Set�ri _mail..."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Component� Evolution pentru manipularea calendarului."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "Procesator pentru componenta de mail Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "Procesator pentru controlul calendar iTip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "Procesator pentru mostra controlului calendar"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Procesator pentru componenta calendarului Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Procesator pentru componenta calendarului Evolution."
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 "Serviciu notificare alarme"
@@ -3103,25 +3539,11 @@ 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
-msgid "Ending:"
-msgstr ""
-
 #: 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"
@@ -3144,11 +3566,11 @@ msgstr "Durata de sfor�ire (minute)"
 msgid "_Edit appointment"
 msgstr "_Editeaz� �nt�lnire"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:670
+#: calendar/gui/alarm-notify/alarm-queue.c:675
 msgid "No description available."
 msgstr "Nu e disponibil� o descriere."
 
-#: 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"
@@ -3156,18 +3578,29 @@ 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:2608
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Avertisment"
+
+#: 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 "Nu m� �ntreba din nou"
+
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Nu pot ini�ializa GNOME"
 
@@ -3180,26 +3613,42 @@ msgstr "Nu pot crea procesatorul servicului de notificare alarm�"
 msgid "Could not create the alarm notify service factory"
 msgstr "Nu pot crea procesatorul servicului de notificare alarm�"
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Rezumatul con�ine"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Descrierea con�ine"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Comentariul con�ine"
+
+#: calendar/gui/cal-search-bar.c:386
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:405
 #, fuzzy
 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: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/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
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %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
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %d %B %Y"
@@ -3207,27 +3656,25 @@ msgstr "%A, %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:805
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 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:384
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Confiden�ial"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Public"
 
@@ -3248,33 +3695,28 @@ msgid "W"
 msgstr "W"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 #, fuzzy
 msgid "Free"
 msgstr "Grec"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:478 calendar/gui/print.c:2246
 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:479 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Terminat"
 
@@ -3290,12 +3732,13 @@ 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/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/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
+#: 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 "Inexistent"
 
@@ -3307,24 +3750,15 @@ msgstr ""
 msgid "Assigned"
 msgstr "Alocat"
 
-#: 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:803
+#: 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
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr "Nu"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1974 calendar/gui/e-day-view.c:1675
-#: calendar/gui/e-week-view.c:1182
-#, fuzzy
-msgid "Searching"
-msgstr "Caut..."
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Afi�are zi"
@@ -3341,66 +3775,80 @@ msgstr "Afi�are s�ptam�n�"
 msgid "Month View"
 msgstr "Afi�are lun�"
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
-msgstr "Rezumatul con�ine"
-
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
-msgstr "Descrierea con�ine"
-
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "Comentariul con�ine"
-
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
-msgid "Unmatched"
-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
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Sarcini"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "Dosar V �n lista de mail"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "Creaz� o �nt�lnire nou�"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "�nt�lnire"
+
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "�nt�lnire"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
+#: calendar/gui/component-factory.c:699
 #, fuzzy
-msgid "New _Appointment"
+msgid "New task"
+msgstr "Sarcin� nou�"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "Sarcin�"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
-msgstr "Creaz� o sarcin� nou�"
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "�nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:649
+#: calendar/gui/component-factory.c:707
 #, fuzzy
-msgid "New _Task"
-msgstr "Sarcin� nou�"
+msgid "New appointment"
+msgstr "�nt�lnire nou�"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "�nt�lnire"
+
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Nu pot deschide dosarul �n `%s'"
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URI afi�at de calendar"
 
+#: 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 "Op�iuni alarm� audio"
@@ -3566,12 +4014,12 @@ msgstr "dup� sf�r�itul �nt�lnirii"
 msgid "%s at the end of the appointment"
 msgstr "dup� sf�r�itul �nt�lnirii"
 
-#: calendar/gui/dialogs/alarm-page.c:453
+#: calendar/gui/dialogs/alarm-page.c:452
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%s server %s"
 
-#: calendar/gui/dialogs/alarm-page.c:459
+#: calendar/gui/dialogs/alarm-page.c:458
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3592,7 +4040,7 @@ msgstr "Memorator"
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "Cuprins:"
 
@@ -3600,12 +4048,11 @@ msgstr "Cuprins:"
 msgid "_Options..."
 msgstr "_Op�iuni..."
 
-#. 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 "dup�"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "�nainte"
 
@@ -3622,7 +4069,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:120
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr "minut(e)"
 
@@ -3665,198 +4112,188 @@ msgstr "Culoare pentru sarcinile de ast�zi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
-msgid "Create new appointments with a default _reminder"
-msgstr "Creaz� o �nt�lnire nou�"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
 msgid "Days"
 msgstr "Zi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#, fuzzy
-msgid "First day of wee_k:"
-msgstr "Prima zi a s�pt�minii:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Vineri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "Hours"
 msgstr "ore"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
 msgid "Minutes"
 msgstr "minute"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Luni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#, fuzzy
-msgid "O_verdue tasks:"
-msgstr "Sarcini �nt�rziate"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "S�mb�t�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, fuzzy
-msgid "Show appointment _end times in week and month views"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
 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:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #, 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:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #, fuzzy
 msgid "Su_n"
 msgstr "Dum"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Duminic�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Sarcini pentru azi"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_hu"
 msgstr "Joi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "T_ue"
 msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
-msgid "Tas_ks due today:"
-msgstr "Sarcini pentru azi"
+msgid "Task List"
+msgstr "Lista de sarcini"
 
-#: 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 "Joi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Timp"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #, fuzzy
 msgid "Time _zone:"
 msgstr "Zona temporal�:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
-msgid "Time di_visions:"
-msgstr "Diviziuni de timp:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Format timp:"
 
-#: 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 "Mar�i"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "S�pt�m�na de lucru"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #, fuzzy
 msgid "_12 hour (AM/PM)"
 msgstr "12 ore (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #, fuzzy
 msgid "_24 hour"
 msgstr "24 ore"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #, fuzzy
 msgid "_Compress weekends in month view"
 msgstr "Comprim� weekend-urile la afi�area lunii"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 #, fuzzy
 msgid "_Display"
 msgstr "Afi�eaz�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "_End of day:"
 msgstr "Sfir�it zi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
 msgid "_Fri"
 msgstr "Vin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_General"
 msgstr "General"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "Ascunde mesajele �terse"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #, fuzzy
-msgid "_Other"
-msgstr "Alte"
+msgid "_Overdue tasks:"
+msgstr "Sarcini �nt�rziate"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Sat"
 msgstr "S�m"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "_Task List"
-msgstr "Lista de sarcini"
+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:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Diviziuni de timp:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Wed"
 msgstr "Mie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "before the start of the appointment"
 msgstr "�nainte de �nceperea �nt�lnirii"
@@ -3923,74 +4360,61 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nu a�i f�cut modific�ri, actualiza�i editorul?"
 
-#: 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 " la "
 
-#: 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 " (Terminat "
 
-#: 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 "Terminat "
 
-#: 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:2221
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:303
+#: calendar/gui/dialogs/comp-editor.c:322
 #, fuzzy
 msgid "Could not update object!"
 msgstr "Nu pot actualiza fi�ierele corect"
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Editeaz� �nt�lnire"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "�nt�lnire - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Sarcina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Intrare jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Nu exist� rezumat"
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1897
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "Suprascrie�i fi�ierul?"
-
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1904
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Fi�ier al c�rui nume exist� deja.\n"
-"�l suprascrie�i?"
-
-#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "Salveaz� ca..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Nu pot ob�ine versiunea curent�!"
 
@@ -4051,7 +4475,7 @@ msgstr "Delegat la:"
 msgid "Enter Delegate"
 msgstr "�terse"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "�nt�lnire"
 
@@ -4065,14 +4489,14 @@ msgstr "Revenire"
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 #, 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:365
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "�nt�lnire"
 
@@ -4108,31 +4532,41 @@ msgid "F_ree"
 msgstr "Grec"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
+#, fuzzy
+msgid "L_ocation:"
+msgstr "_Ac�iune"
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: 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 "Pu_blic"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 #, fuzzy
 msgid "Show Time As"
 msgstr "Ploaie toren�ial�"
 
-#: 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 "Rezu_mat:"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Contacte..."
+
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "Ora d_e sf�r�it"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "Ora de �nceput"
 
@@ -4160,56 +4594,49 @@ msgstr "Participare"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-#, 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 "Common Name"
 msgstr "Nume comun"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegat de la"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegat la"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Limbaj"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Membru"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:798
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Rol"
 
-#: 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/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"
 msgstr "Stare"
 
-#: 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tip"
@@ -4224,7 +4651,7 @@ msgid "_Change Organizer"
 msgstr "Schimb� organizator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:445
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "_Invit� pe al�ii..."
 
@@ -4232,28 +4659,99 @@ msgstr "_Invit� pe al�ii..."
 msgid "_Other Organizer"
 msgstr "Alt _organizator"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Aceast� �nt�lnire con�ine reveniri pe care Evolution nu le poate edita."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "�n"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "Cea��"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "secund�"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Alte"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Nord"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "Cea��"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Alt Fax"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "ziua"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "�n"
 
-#: 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 "apari�ii"
 
@@ -4321,20 +4819,29 @@ msgstr "s�pt�m�na"
 msgid "year(s)"
 msgstr "anul"
 
-#: 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 ""
+"Informa�iile despre �nt�lnire au fost schimbate. Trimit o versiune "
+"actualizat�?"
+
+#: calendar/gui/dialogs/send-comp.c:59
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Informa�iile despre �nt�lnire au fost schimbate. Trimit o versiune "
 "actualizat�?"
 
-#: 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 ""
 "Informa�iile despre sarcin� au fost schimbate. Trimit o versiune actualizat�?"
 
-#: calendar/gui/dialogs/send-comp.c:65
-msgid "The journal entry has changed. Send an updated version?"
-msgstr "Intrarea �n jurnal a fost schimbat�. Trimit o versiune actualizat�?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+"Informa�iile despre sarcin� au fost schimbate. Trimit o versiune actualizat�?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
@@ -4351,7 +4858,7 @@ msgid "Progress"
 msgstr "�n desf�urare"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:965
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4363,16 +4870,20 @@ msgstr "_Prioritate:"
 msgid "_Status:"
 msgstr "_Stare"
 
+#: calendar/gui/dialogs/task-editor.c:178
+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:322
+#: calendar/gui/dialogs/task-editor.c:324
 #, fuzzy
 msgid "Assignment"
 msgstr "Alocat"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Descriere:"
 
@@ -4384,197 +4895,158 @@ msgstr "Data de �nceput:"
 msgid "_Due Date:"
 msgstr "_Data scadent�:"
 
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: 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:751 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:941 calendar/gui/e-day-view.c:3544
-#: calendar/gui/e-week-view.c:3422 mail/folder-browser.c:1447
-#: shell/e-shortcuts-view.c:384
+#: 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
 msgid "_Open"
 msgstr "Deschide"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Salveaz� ca..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "_Tip�re�te..."
+
+#: calendar/gui/e-calendar-table.c:978 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:947 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3433 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:979 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:949 calendar/gui/e-day-view.c:3530
-#: calendar/gui/e-day-view.c:3557 calendar/gui/e-week-view.c:3409
-#: calendar/gui/e-week-view.c:3435 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:980 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 "_Lipe�te"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:984
 #, fuzzy
-msgid "_Mark as Complete"
-msgstr "Marcheaz� ca terminat"
+msgid "_Assign Task"
+msgstr "Atribuie task (FIXME)"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "�nainteaz� ca �i _calendar i"
 
-#: calendar/gui/e-calendar-table.c:956
+#: calendar/gui/e-calendar-table.c:986
 #, fuzzy
-msgid "_Delete this Task"
-msgstr "�terg aceast� sarcin�"
+msgid "_Mark as Complete"
+msgstr "Marcheaz� ca terminat"
 
-#: calendar/gui/e-calendar-table.c:959
+#: calendar/gui/e-calendar-table.c:987
 #, fuzzy
-msgid "_Mark Tasks as Complete"
+msgid "_Mark Selected Tasks as Complete"
 msgstr "Marcheaz� sarcinile ca terminate"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:992
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "�terge sarcinile selectate"
 
-#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7115
-#: calendar/gui/e-week-view.c:3918
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1228
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Clic aici s� ad�uga�i o sarcin�"
 
-#. 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"
-
-#. 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/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Data trebuie introdus� �n formatul: \n"
-"\n"
-"%s"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarme"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Terminat"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Data terminare"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Data scadent�"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Data sf�r�it"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Pozi�ie geografic�"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioritate"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Rezumat"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Sortare sarcini"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 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 %m/%d/%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 %m/%d/%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 ""
+"Data trebuie introdus� �n formatul: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -4582,415 +5054,184 @@ msgstr "%02i diviziuni 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: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"
 
 #. 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"
 
 #. 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
 msgid "am"
 msgstr "am"
 
 #. 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
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
+#: calendar/gui/e-day-view.c:3549
 #, fuzzy
-msgid "New All Day _Event"
-msgstr "Eveniment zilnic nou"
-
-#: calendar/gui/e-day-view.c:3535 calendar/gui/e-week-view.c:3414
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "Mergi la _ziua"
-
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
-#, fuzzy
-msgid "_Go to Date..."
-msgstr "Mergi la data..."
-
-#: calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-#, fuzzy
-msgid "_Delete this Appointment"
-msgstr "�terge aceast� �nt�lnire"
-
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
-#, fuzzy
-msgid "Make this Occurrence _Movable"
-msgstr "F� aceast� apari�ie mutabil�"
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
-#, fuzzy
-msgid "Delete this _Occurrence"
-msgstr "�terge aceast� apari�ie"
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
-#, fuzzy
-msgid "Delete _All Occurrences"
-msgstr "�terge toate apari�iile"
-
-#: calendar/gui/e-itip-control.c:524
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Task begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:534
-#, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "Informa�ie surs�"
-
-#: calendar/gui/e-itip-control.c:538
-msgid "Begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:550
-#, fuzzy
-msgid "Meeting ends: <b>"
-msgstr "Ora de sf�r�it a �nt�lnirii:"
-
-#: calendar/gui/e-itip-control.c:553
-#, fuzzy
-msgid "Free/Busy info ends: <b>"
-msgstr "Informa�ie surs�"
-
-#: calendar/gui/e-itip-control.c:557
-msgid "Ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:571
-#, fuzzy
-msgid "Task Completed: <b>"
-msgstr " (Terminat "
-
-#: calendar/gui/e-itip-control.c:581
-msgid "Task Due: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
-#, fuzzy
-msgid "iCalendar Information"
-msgstr "informa�ie calendar"
-
-#. Title
-#: calendar/gui/e-itip-control.c:633
-#, fuzzy
-msgid "iCalendar Error"
-msgstr "Calendar"
-
-#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
-#, fuzzy
-msgid "An unknown person"
-msgstr "Eroare necunoscut�"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:737
-msgid "<i>None</i>"
-msgstr ""
-
-#: 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
-#, fuzzy
-msgid "Choose an action:"
-msgstr "Selectez o ac�iune"
-
-#: calendar/gui/e-itip-control.c:779
-#, fuzzy
-msgid "Update"
-msgstr "a fost dup�"
-
-#: 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
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:795
-#, fuzzy
-msgid "Accept"
-msgstr " Accept� "
-
-#: calendar/gui/e-itip-control.c:796
-#, fuzzy
-msgid "Tentatively accept"
-msgstr " Inten�ie "
-
-#: calendar/gui/e-itip-control.c:797
-#, fuzzy
-msgid "Decline"
-msgstr " Refuz� "
-
-#: calendar/gui/e-itip-control.c:811
-#, fuzzy
-msgid "Send Free/Busy Information"
-msgstr "Informa�ie surs�"
-
-#: calendar/gui/e-itip-control.c:824
-msgid "Update respondent status"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:838
-#, fuzzy
-msgid "Send Latest Information"
-msgstr "Informa�ie"
-
-#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Renun��"
-
-#: calendar/gui/e-itip-control.c:867
-#, fuzzy, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
+msgid "New _Appointment"
+msgstr "�nt�lnire nou�"
 
-#: calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 #, fuzzy
-msgid "Meeting Information"
-msgstr "Informa�ie op�ional�"
-
-#: calendar/gui/e-itip-control.c:872
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr ""
+msgid "New All Day _Event"
+msgstr "Eveniment zilnic nou"
 
-#: calendar/gui/e-itip-control.c:873
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 #, fuzzy
-msgid "Meeting Proposal"
+msgid "New Meeting"
 msgstr "�nt�lnire"
 
-#: calendar/gui/e-itip-control.c:877
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Sarcin� nou�"
 
-#: calendar/gui/e-itip-control.c:878
-#, fuzzy
-msgid "Meeting Update"
-msgstr "Ora de sf�r�it a �nt�lnirii:"
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Tip�re�te"
 
-#: calendar/gui/e-itip-control.c:882
-#, 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-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: ui/evolution-calendar.xml.h:10
+msgid "Go to _Today"
+msgstr "Mergi la _ziua"
 
-#: calendar/gui/e-itip-control.c:883
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 #, fuzzy
-msgid "Meeting Update Request"
-msgstr "Cerere de �nt�lnire (FIXME)"
-
-#: calendar/gui/e-itip-control.c:887
-#, 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."
+msgid "_Go to Date..."
+msgstr "Mergi la data..."
 
-#: calendar/gui/e-itip-control.c:888
+#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: ui/evolution-calendar.xml.h:31
 #, fuzzy
-msgid "Meeting Reply"
-msgstr "�nt�lnire"
-
-#: calendar/gui/e-itip-control.c:892
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
+msgid "_Publish Free/Busy Information"
+msgstr "Aceasta e informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:893
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
 #, fuzzy
-msgid "Meeting Cancellation"
-msgstr "Selectez o ac�iune"
-
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
-#: calendar/gui/e-itip-control.c:982
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
+msgid "_Configure..."
+msgstr "Configurare mail"
 
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
 #, fuzzy
-msgid "Bad Meeting Message"
-msgstr "G�se�te �n mesaj"
+msgid "_Configure Pilot..."
+msgstr "Configurare mail"
 
-#: calendar/gui/e-itip-control.c:917
-#, c-format
-msgid "<b>%s</b> has published task information."
-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
+msgid "_Save As..."
+msgstr "_Salveaz� ca..."
 
-#: calendar/gui/e-itip-control.c:918
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 #, fuzzy
-msgid "Task Information"
-msgstr "Informa�ie"
-
-#: calendar/gui/e-itip-control.c:922
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr ""
+msgid "_Schedule Meeting..."
+msgstr "Progra_mare �nt�lniri"
 
-#: calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 #, fuzzy
-msgid "Task Proposal"
-msgstr "Panou sarcini"
-
-#: calendar/gui/e-itip-control.c:927
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr ""
+msgid "_Forward as iCalendar..."
+msgstr "�nainteaz� ca �i _calendar i"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 #, fuzzy
-msgid "Task Update"
-msgstr "a fost dup�"
-
-#: calendar/gui/e-itip-control.c:932
-#, 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�."
+msgid "Make this Occurrence _Movable"
+msgstr "F� aceast� apari�ie mutabil�"
 
-#: calendar/gui/e-itip-control.c:933
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 #, fuzzy
-msgid "Task Update Request"
-msgstr "Ce_rere task (FIXME)"
-
-#: calendar/gui/e-itip-control.c:937
-#, 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."
+msgid "Delete this _Occurrence"
+msgstr "�terge aceast� apari�ie"
 
-#: calendar/gui/e-itip-control.c:938
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 #, fuzzy
-msgid "Task Reply"
-msgstr "R�spunde"
+msgid "Delete _All Occurrences"
+msgstr "�terge toate apari�iile"
 
-#: calendar/gui/e-itip-control.c:942
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:943
-#, fuzzy
-msgid "Task Cancellation"
-msgstr "Aceasta e o anulare a unei sarcini"
-
-#: calendar/gui/e-itip-control.c:948
-#, fuzzy
-msgid "Bad Task Message"
-msgstr "Mesaj calendar"
-
-#: calendar/gui/e-itip-control.c:967
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, 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:968
-#, fuzzy
-msgid "Free/Busy Information"
-msgstr "Informa�ie surs�"
-
-#: calendar/gui/e-itip-control.c:972
-#, 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:973
-#, fuzzy
-msgid "Free/Busy Request"
-msgstr "URL liber-ocupat"
-
-#: calendar/gui/e-itip-control.c:977
-#, 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:978
-#, fuzzy
-msgid "Free/Busy Reply"
-msgstr "URL liber-ocupat"
-
-#: calendar/gui/e-itip-control.c:983
-#, fuzzy
-msgid "Bad Free/Busy Message"
-msgstr "Tip�re�te mesaj"
-
-#: calendar/gui/e-itip-control.c:1052
-msgid "The message does not appear to be properly formed"
-msgstr "Mesajul nu pare a fi formatat corespunz�tor."
-
-#: calendar/gui/e-itip-control.c:1071
-msgid "The message contains only unsupported requests."
-msgstr "Mesajul con�ine numai cererile nesuportate."
-
-#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
-msgid "The attachment does not contain a valid calendar message"
-msgstr ""
+msgid "Error executing %s."
+msgstr "Eroare execu�ie filtru: %s: %s"
 
-#: calendar/gui/e-itip-control.c:1130
-msgid "The attachment has no viewable calendar items"
-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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1229
+#: calendar/gui/e-itip-control.c:1564
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Nu pot �nc�rca cursorul\n"
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1566
 #, fuzzy
 msgid "Update complete\n"
 msgstr "�nt�lnire �ncheiat�:"
 
-#: 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:1592 calendar/gui/e-itip-control.c:1642
+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:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1625
+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 updated\n"
+msgid "Attendee status could not be updated!\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1288
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1640
+#, fuzzy
+msgid "Attendee status updated\n"
+msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Terminat"
 
-#: calendar/gui/e-itip-control.c:1348 calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Date trimise"
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Alege dosar"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Alege dosar"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -5029,223 +5270,226 @@ msgstr "dat� sf�r�it"
 msgid "date-start"
 msgstr "dat� �nceput"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Telefon ma�in�"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1535
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 #, fuzzy
 msgid "Required Participants"
 msgstr "Participant necesar"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Participant op�ional"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Neparticipant"
 
-#: 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:771
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 #, fuzzy
 msgid "Group"
 msgstr "Nume grup:"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 #, fuzzy
 msgid "Resource"
 msgstr "Surs�"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr ""
 
-#: 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:775
-#: calendar/gui/e-meeting-model.c:791
-#: 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 "Necunoscut"
-
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "Scaun"
 
-#: 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:788
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "Participant necesar"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "Participant op�ional"
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Neparticipant"
 
-#: 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:816
+#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 #, fuzzy
 msgid "Needs Action"
 msgstr "Selectez o ac�iune"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:817
+#: 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:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:818
+#: 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:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:819 calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Tentativ�"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 #, fuzzy
 msgid "Delegated"
 msgstr "�terse"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 #, fuzzy
 msgid "In Process"
 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: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:2088
 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: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:2118 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"
 
 #. 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"
 
-#: calendar/gui/e-meeting-time-sel.c:428
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "Afar� din oficiu"
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Nici o informa�ie"
 
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Op�iuni"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Arat� numai _orele de lucru"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "Arat� m�rit"
 
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "Act_ualizeaz� liber/ocupat"
 
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Alege automat"
 
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "To_ate persoanele �i resursele"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "Toate _persoanele �i o resurs�"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "Necesa_r o persoan�"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "Necesar o persoan� �i _o resurs�"
 
-#: calendar/gui/e-meeting-time-sel.c:641
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "Ora de �nceput a �nt�lnirii:"
 
-#: calendar/gui/e-meeting-time-sel.c:660
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Ora de sf�r�it a �nt�lnirii:"
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Deschid rezerva %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 "Nu pot inc�rca sarcinile �n `%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 "Metoda necesar� pentru a �nc�rca `%s' nesuportat�"
 
-#: calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Data terminare"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "�terge contactele selectate"
+
+#: calendar/gui/e-tasks.c:659
+#, fuzzy
+msgid "Expunging"
+msgstr "Distrug dosarul"
+
+#: calendar/gui/e-week-view.c:3438
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "�nt�lnire nou�..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "�terge aceast� �nt�lnire"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nu pot deschide dosarul �n `%s'"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1865
+#: calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Deschide calendar"
@@ -5307,275 +5551,259 @@ msgstr "Octombrie"
 msgid "September"
 msgstr "Septembrie"
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:220
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "Un organizator trebuie setat."
 
-#: calendar/gui/itip-utils.c:570
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Nu pot crea procesatorul servicului de notificare alarm�"
 
-#: 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 "Du"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Jo"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Vi"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "S�"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Ziua curent� (%a %b %d %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 %b %d"
 
-#: 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 %b %d %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "S�pt�m�na curent� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Luna curent� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Anul curent (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Sarcin�"
-
-#: calendar/gui/print.c:2262
-#, fuzzy, c-format
-msgid "Status: %s"
-msgstr "_Stare"
-
-#: calendar/gui/print.c:2280
-#, fuzzy, c-format
-msgid "Priority: %s"
-msgstr "_Prioritate:"
-
-#: calendar/gui/print.c:2294
-#, fuzzy, c-format
-msgid "Percent Complete: %i"
-msgstr "�nt�lnire �ncheiat�:"
-
-#: calendar/gui/print.c:2306
-#, fuzzy, c-format
-msgid "URL: %s"
-msgstr "URL:"
-
-#: calendar/gui/print.c:2320
-#, fuzzy, c-format
-msgid "Categories: %s"
-msgstr ""
-"\n"
-"Categorii:  "
-
-#: calendar/gui/print.c:2331
-#, fuzzy
-msgid "Contacts: "
-msgstr "Contacte"
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Tip�re�te calendar"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2358 my-evolution/e-summary.c:619
-#: 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Previzualizeaz� tip�rirea"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Tip�re�te elementul"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Seteaz� tip�rirea"
 
-#: calendar/gui/tasks-control.c:126
-msgid "The URI of the tasks folder to display"
-msgstr "De afi�at URI pentru dosarul sarcini"
-
 #: calendar/gui/tasks-control-factory.c:75
 #, fuzzy
 msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr "Nu pot crea vederea calendar. Verifica�i set�rile pentru ORBit si OAF"
 
+#: calendar/gui/tasks-control.c:147
+msgid "The URI of the tasks folder to display"
+msgstr "De afi�at URI pentru dosarul sarcini"
+
+#: 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"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Nu m� �ntreba din nou"
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Tip�re�te calendar"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5617,132 +5845,1717 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMJVS"
 
-#: calendar/pcs/query.c:234
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "Procesator pentru  importul fi�ierelor GnomeCard in Evolution"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "Import fi�ierele card V �n Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "Import fi�ierele card V �n Evolution."
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Mesaj calendar"
+
+#: 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 a g�sit fi�iere de mail Pine.\n"
+"Dori�i s� le importa�i �n Evolution?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Deschide calendar"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:258
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:263
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:300
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:305
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:339
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:344
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:371
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:376
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:412
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:508
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:513
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:650
+#: calendar/pcs/query.c:664
 #, fuzzy
 msgid "contains? expects 2 arguments"
 msgstr "Eroare de sintax� la parametri sau argumente"
 
-#: calendar/pcs/query.c:655
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:679
+#: 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:721
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: 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)"
 msgstr ""
 
-#: calendar/pcs/query.c:821
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:866
+#: calendar/pcs/query.c:880
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "Eroare de sintax� la parametri sau argumente"
 
-#: calendar/pcs/query.c:871
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1159
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
-#: camel/camel-cipher-context.c:171
+#.
+#. * 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
+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
+msgid "America/Adak"
+msgstr ""
+
+#: calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr ""
+
+#: calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr ""
+
+#: calendar/zones.h:62
+msgid "America/Antigua"
+msgstr ""
+
+#: calendar/zones.h:63
+msgid "America/Araguaina"
+msgstr ""
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr ""
+
+#: calendar/zones.h:66
+msgid "America/Barbados"
+msgstr ""
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: calendar/zones.h:68
+#, fuzzy
+msgid "America/Belize"
+msgstr "M�rime"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+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
+msgid "America/Caracas"
+msgstr ""
+
+#: calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr ""
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+msgid "America/Cayman"
+msgstr ""
+
+#: calendar/zones.h:79
+msgid "America/Chicago"
+msgstr ""
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr ""
+
+#: calendar/zones.h:82
+msgid "America/Costa_Rica"
+msgstr ""
+
+#: calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr ""
+
+#: calendar/zones.h:84
+msgid "America/Curacao"
+msgstr ""
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+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
+msgid "America/Dominica"
+msgstr ""
+
+#: calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr ""
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+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
+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 "Canada"
+
+#: calendar/zones.h:100
+msgid "America/Guadeloupe"
+msgstr ""
+
+#: calendar/zones.h:101
+msgid "America/Guatemala"
+msgstr ""
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+msgid "America/Guyana"
+msgstr ""
+
+#: calendar/zones.h:104
+msgid "America/Halifax"
+msgstr ""
+
+#: calendar/zones.h:105
+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
+msgid "America/Jamaica"
+msgstr ""
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+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
+msgid "America/La_Paz"
+msgstr ""
+
+#: calendar/zones.h:120
+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
+msgid "America/Maceio"
+msgstr ""
+
+#: calendar/zones.h:124
+msgid "America/Managua"
+msgstr ""
+
+#: calendar/zones.h:125
+msgid "America/Manaus"
+msgstr ""
+
+#: calendar/zones.h:126
+msgid "America/Martinique"
+msgstr ""
+
+#: calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr ""
+
+#: calendar/zones.h:128
+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
+msgid "America/Montreal"
+msgstr ""
+
+#: calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr ""
+
+#: calendar/zones.h:137
+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
+msgid "America/Nome"
+msgstr ""
+
+#: calendar/zones.h:141
+msgid "America/Noronha"
+msgstr ""
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+#, fuzzy
+msgid "America/Panama"
+msgstr "Canada"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+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
+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
+msgid "America/Regina"
+msgstr ""
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+msgid "America/Rosario"
+msgstr ""
+
+#: calendar/zones.h:157
+msgid "America/Santiago"
+msgstr ""
+
+#: calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr ""
+
+#: calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr ""
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr ""
+
+#: calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr ""
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr ""
+
+#: calendar/zones.h:165
+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
+msgid "America/Tijuana"
+msgstr ""
+
+#: calendar/zones.h:172
+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
+msgid "America/Yakutat"
+msgstr ""
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: calendar/zones.h:178
+#, fuzzy
+msgid "Antarctica/Casey"
+msgstr "Automat"
+
+#: calendar/zones.h:179
+#, fuzzy
+msgid "Antarctica/Davis"
+msgstr "Automat"
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: calendar/zones.h:181
+#, fuzzy
+msgid "Antarctica/Mawson"
+msgstr "Automat"
+
+#: calendar/zones.h:182
+#, fuzzy
+msgid "Antarctica/McMurdo"
+msgstr "Automat"
+
+#: calendar/zones.h:183
+#, fuzzy
+msgid "Antarctica/Palmer"
+msgstr "Automat"
+
+#: calendar/zones.h:184
+#, fuzzy
+msgid "Antarctica/South_Pole"
+msgstr "Automat"
+
+#: calendar/zones.h:185
+#, fuzzy
+msgid "Antarctica/Syowa"
+msgstr "Automat"
+
+#: calendar/zones.h:186
+#, fuzzy
+msgid "Antarctica/Vostok"
+msgstr "Automat"
+
+#: 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
+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
+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
+msgid "Asia/Hong_Kong"
+msgstr ""
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+#: calendar/zones.h:216
+#, fuzzy
+msgid "Asia/Istanbul"
+msgstr "Asistent"
+
+#: 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
+msgid "Asia/Kuwait"
+msgstr ""
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: calendar/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr ""
+
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Muscat"
+msgstr "Asistent"
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: calendar/zones.h:235
+#, fuzzy
+msgid "Asia/Omsk"
+msgstr "Atribuie task (FIXME)"
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: calendar/zones.h:239
+#, fuzzy
+msgid "Asia/Qatar"
+msgstr "dup�"
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:247
+msgid "Asia/Singapore"
+msgstr ""
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+msgid "Atlantic/Bermuda"
+msgstr ""
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+msgid "Atlantic/Cape_Verde"
+msgstr ""
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+msgid "Australia/Adelaide"
+msgstr ""
+
+#: calendar/zones.h:274
+msgid "Australia/Brisbane"
+msgstr ""
+
+#: calendar/zones.h:275
+msgid "Australia/Broken_Hill"
+msgstr ""
+
+#: calendar/zones.h:276
+#, fuzzy
+msgid "Australia/Darwin"
+msgstr "August"
+
+#: calendar/zones.h:277
+#, fuzzy
+msgid "Australia/Hobart"
+msgstr "August"
+
+#: calendar/zones.h:278
+msgid "Australia/Lindeman"
+msgstr ""
+
+#: calendar/zones.h:279
+msgid "Australia/Lord_Howe"
+msgstr ""
+
+#: calendar/zones.h:280
+msgid "Australia/Melbourne"
+msgstr ""
+
+#: calendar/zones.h:281
+#, fuzzy
+msgid "Australia/Perth"
+msgstr "August"
+
+#: calendar/zones.h:282
+#, fuzzy
+msgid "Australia/Sydney"
+msgstr "August"
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:284
+msgid "Europe/Andorra"
+msgstr ""
+
+#: calendar/zones.h:285
+#, fuzzy
+msgid "Europe/Athens"
+msgstr "Propriet��i"
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:296
+msgid "Europe/Gibraltar"
+msgstr ""
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:304
+msgid "Europe/Luxembourg"
+msgstr ""
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr ""
+
+#: calendar/zones.h:308
+#, fuzzy
+msgid "Europe/Monaco"
+msgstr "Luni"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Oslo"
+msgstr ""
+
+#: calendar/zones.h:312
+#, fuzzy
+msgid "Europe/Paris"
+msgstr "Propriet��i"
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:317
+msgid "Europe/San_Marino"
+msgstr ""
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:338
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "Culori"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+msgid "Indian/Mahe"
+msgstr ""
+
+#: calendar/zones.h:341
+msgid "Indian/Maldives"
+msgstr ""
+
+#: calendar/zones.h:342
+#, fuzzy
+msgid "Indian/Mauritius"
+msgstr "Margini"
+
+#: calendar/zones.h:343
+#, fuzzy
+msgid "Indian/Mayotte"
+msgstr "Mai"
+
+#: calendar/zones.h:344
+#, fuzzy
+msgid "Indian/Reunion"
+msgstr "Regiuni"
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+#: calendar/zones.h:372
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
+#: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
 msgstr "Semnarea e nesuportat� de acest cifru"
 
-#: camel/camel-cipher-context.c:211
+#: 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:251
+#: camel/camel-cipher-context.c:249
 msgid "Verifying is not supported by this cipher"
 msgstr "Verificarea nu e suportat� de acest cifru"
 
-#: camel/camel-cipher-context.c:294
+#: camel/camel-cipher-context.c:292
 msgid "Encryption is not supported by this cipher"
 msgstr "Criptarea nu e suportat� de acest cifru"
 
-#: camel/camel-cipher-context.c:336
+#: camel/camel-cipher-context.c:334
 msgid "Decryption is not supported by this cipher"
 msgstr "Decriptarea nu e suportat� de acest cifru"
 
+#: camel/camel-data-cache.c:169
+#, fuzzy
+msgid "Unable to create cache path"
+msgstr ""
+"Nu pot crea fi�ierul de ie�ire: %s\n"
+" %s"
+
+#: camel/camel-data-cache.c:441
+#, fuzzy, c-format
+msgid "Could not remove cache entry: %s: %s"
+msgstr "Nu pot deschide directorul cache: %s"
+
 #: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
@@ -5773,86 +7586,66 @@ msgstr "Resincronizare cu serverul"
 msgid "You must be working online to complete this operation"
 msgstr "Pentru aceast� opera�ie trebuie s� lucra�i online"
 
-#: 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 "Sincronizare foldere"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#, 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
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Eroare execu�ie filtru: %s: %s"
+
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Nu pot deschide dosarul spool"
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Nu pot procesa dosarul spool"
 
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Primesc mesaj %d (%d%%)"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Nu pot deschide mesajul"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "E�uare la mesajul %d"
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Sincronizare dosar"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "E�uare la mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Eroare parsare filtru: %s: %s"
-
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Eroare execu�ie filtru: %s: %s"
+#: camel/camel-filter-search.c:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Eroare execu�ie filtru c�utare: %s: %s"
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1040
-#, fuzzy, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-"Eroare executare expresia c�utare: %s:\n"
-"%s"
-
-#: camel/camel-folder.c:1080
-#, fuzzy, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-"Eroare executare expresia c�utare: %s:\n"
-"%s"
-
-#: camel/camel-folder.c:1262
-#, fuzzy
-msgid "Moving messages"
-msgstr "Copiez mesaje"
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5861,7 +7654,7 @@ msgstr ""
 "Nu pot parsa expresia de c�utare: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5870,18 +7663,38 @@ msgstr ""
 "Eroare executare expresia c�utare: %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 "(potrivire total�) se cere un singur rezultat"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Execut� interogare �n header necunoscut: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Tip invalid �n con�inutul mesajului, necesar �ir"
+#: camel/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1038
+#, 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
+#, 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
+#, fuzzy
+msgid "Moving messages"
+msgstr "Copiez mesaje"
 
 #: camel/camel-lock-client.c:111
 #, c-format
@@ -5989,123 +7802,128 @@ 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"
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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:755
+#: 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:953
+#: 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:959
+#: 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:970
+#: 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:1143
+#: 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:1153
+#: 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:1160
+#: 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:1169
+#: 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:1337
+#: 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:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1352
+#: 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-provider.c:130
+#: camel/camel-pgp-mime.c:354
+msgid "This is a digitally signed message part"
+msgstr ""
+
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Nu pot �nc�rca %s: �nc�rcarea modulului nu e suportat� �n acest sistem."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nu pot �nc�rca %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 "Nu pot �nc�rca %s: Nu exist� cod de ini�ializare �n modul"
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:207
+#: 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:264
+#: 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:267
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(gazd� necunoscut�)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:401
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "Opera�ia anulat�"
 
-#: camel/camel-remote-store.c:484
+#: 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"
@@ -6216,12 +8034,13 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "R�spuns de la server de autentificare e�uat�."
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
+#, fuzzy
+msgid "Login"
 msgstr "Logare NT"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
@@ -6232,9 +8051,21 @@ msgstr "Aceast� op�iune v� va conecta la server folosind o parol� simpl�."
 msgid "Unknown authentication state."
 msgstr "Stare necunoscut� a autentific�rii."
 
+#: 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 ""
+"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:301
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: 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"
 
@@ -6279,26 +8110,41 @@ msgstr "URL '%s' necesit� o component� gazd�"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necesit� o component� de cale"
 
-#: camel/camel-service.c:611
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Rezolv: %s"
 
-#: camel/camel-service.c:638
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "E�ec la c�utarea numelui: %s"
 
-#: camel/camel-service.c:663
+#: camel/camel-service.c:673
 #, 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:665
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "E�ec la c�utarea gazdei: %s: motiv necunoscut"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Rezolv: %s"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "E�ec la c�utarea gazdei: %s: gazd� neg�sit�"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "E�ec la c�utarea gazdei: %s: motiv necunoscut"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Furnizor de email �n dosar virtual"
@@ -6307,12 +8153,12 @@ msgstr "Furnizor de email �n dosar virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pentru citirea mailului ca o interogare a altui set de dosar"
 
-#: 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 "Nici un furnizor valid pentru protocolul `%s'"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6358,17 +8204,17 @@ msgstr "E�ec la decodarea mesajului."
 msgid "Failed to verify certificates."
 msgstr "E�ec la verificarea certificatului."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6377,8 +8223,7 @@ msgstr ""
 "Publicist: %s\n"
 "Subiect: %s"
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:428
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6393,24 +8238,40 @@ msgstr ""
 "\n"
 "Dori�i s� accepta�i oricum?"
 
-#: 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:491
 #, 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"
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
 msgstr ""
-"EMail: %s\n"
-"Nume: %s\n"
-"Unitate: %s\n"
-"Organiza�ie: %s\n"
-"Localitate: %s\n"
-"Stat: %s\n"
-"�ara: %s"
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, fuzzy, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
+msgstr ""
+"Certificat invalid de la %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Dori�i s� accepta�i oricum?"
 
 #: camel/camel-url.c:288
 #, c-format
@@ -6422,27 +8283,27 @@ msgstr "Nu pot parsa URL `%s'"
 msgid "No such message %s in %s"
 msgstr "Nu exist� mesajul %s �n %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Nu exist� mesajul: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
@@ -6451,78 +8312,78 @@ msgstr "Nu pot lua dosarul: %s: %s"
 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:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, 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:354
+#: camel/providers/imap/camel-imap-command.c:362
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Comanda IMAP e�uat�: %s"
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
 msgstr "R�spunsul serverului terminat prea repede."
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:610
 #, 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:637
+#: camel/providers/imap/camel-imap-command.c:646
 #, 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:194
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nu pot crea directorul %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nu pot �nc�rca sumarul pentru %s"
 
-#: camel/providers/imap/camel-imap-folder.c:277
+#: camel/providers/imap/camel-imap-folder.c:284
 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:461
+#: camel/providers/imap/camel-imap-folder.c:469
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Salvez mesajele"
 
-#: camel/providers/imap/camel-imap-folder.c:1566
-#: camel/providers/imap/camel-imap-folder.c:1978
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Mesajul nu este disponibil �n mod curent"
 
-#: camel/providers/imap/camel-imap-folder.c:1717
-#: camel/providers/imap/camel-imap-folder.c:1798
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1723
+#: camel/providers/imap/camel-imap-folder.c:1799
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Salvez mesajele"
 
-#: camel/providers/imap/camel-imap-folder.c:2015
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "Nu pot g�si corpul mesajului �n r�spunsul 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 "Nu pot deschide directorul 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
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "E�ec la decodarea mesajului."
@@ -6535,7 +8396,7 @@ msgstr "Verific mailurile noi"
 msgid "Check for new messages in all folders"
 msgstr "Verific mesajele noi �n toate dosarele"
 
-#: 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 "Dosare"
 
@@ -6569,28 +8430,28 @@ 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:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Tip de autentificare nesuportat %s"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Nu a�i introdus o parol�."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6601,109 +8462,128 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Nu exist� dosarul %s"
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "Director cu mail-uri �n format MH"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 #, 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:52
+#: camel/providers/local/camel-local-provider.c:64
 #, fuzzy
 msgid "Local delivery"
 msgstr "Dosare speciale"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 #, 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:62
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:68
+#: camel/providers/local/camel-local-provider.c:82
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "Director cu mail-uri �n format MH"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 #, 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:80
+#: 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:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Stocarea root %s nu e o cale absolut�"
 
-#: 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 "Stocarea root %s nu e director obi�nuit"
 
-#: 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 "Nu pot lua dosarul: %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 "Stoc�rile locale nu au un 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 "Fi�ier mail-uri locale %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nu pot redenumi dosarul %s �n %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 "Nu pot redenumi dosarul: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nu pot �terge dosarul sumar al fi�ierelor `%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 "Nu pot �terge dosarul index al fi�ierelor `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, 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:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nu pot ad�uga mesajul la sumar: motiv necunoscut"
 
@@ -6724,7 +8604,7 @@ msgstr "Nu pot ad�uga mesajul la dosarul maildir: %s: %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6736,7 +8616,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "Nu exist� mesaj"
 
@@ -6745,7 +8625,7 @@ msgstr "Nu exist� mesaj"
 msgid "Invalid message contents"
 msgstr "Con�inut invalid al mesajului"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -6755,14 +8635,14 @@ msgstr ""
 "Nu pot deschide dosarul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Dosarul `%s' nu exist�."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -6772,41 +8652,65 @@ msgstr ""
 "Nu pot crea dosarul `%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' nu e un director de tip maildir."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nu pot �terge dosarul `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "nu e director maildir"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nu pot scana dosarul `%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 "Nu pot deschide calea c�tre directorul maildir: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Verific mailurile noi"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+#, fuzzy
+msgid "Storing folder"
+msgstr "Sincronizare dosar"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nu pot deschide c�su�a po�tal�: %s: %s\n"
@@ -6824,9 +8728,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6836,16 +8740,16 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 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:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Construc�ia mesajului e�uat�: c�su�a po�tal� corupt�?"
 
-#: 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"
@@ -6854,7 +8758,7 @@ msgstr ""
 "Nu pot deschide fi�ierul `%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"
@@ -6863,14 +8767,14 @@ msgstr ""
 "Nu pot crea fi�ierul `%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' nu e un fi�ier obi�nuit."
 
-#: 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"
@@ -6879,101 +8783,89 @@ msgstr ""
 "Nu pot �terge dosarul `%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 "Dosarul `%s' nu e gol. Nu s-a �ters."
 
-#. 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 "Sincronizare dosar"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, 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:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nu pot lua dosarul: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, 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:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, 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: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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "Nu pot �nchide dosarul surs� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nu pot �nchide dosarul temporar: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nu pot redenumi dosarul: %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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Eroare necunoscut�: %s"
@@ -6993,12 +8885,12 @@ msgstr "Nu pot ad�uga mesajul la dosarul mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' nu e un director"
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, 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:512
+#: 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"
@@ -7009,6 +8901,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Dosarul `%s'/%s nu exist�."
@@ -7018,29 +8911,31 @@ msgstr "Dosarul `%s'/%s nu exist�."
 msgid "Spool mail file %s"
 msgstr "Fi�ier spool mail %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Dosarele spool nu pot fi redenumite"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Dosarele spool nu pot fi �terse"
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -7049,47 +8944,24 @@ msgstr ""
 "Nu pot sincroniza dosarul spool %s: %s\n"
 "Dosarul poate fi corupt, copia salvat� �n `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:940
+#: 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/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Introduce�i v� rog parola NNTP pentru %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Nume utilizator rejectat de server"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "E�ec la trimiterea numelui utilizator la server"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Nume utilizator/parol� rejectat de server"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Mesajul %s neg�sit."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Nu pot ob�ine lista grup de la server."
+#: 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/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 "Nu pot s� �ncarc fi�ierul list� de grup pentru %s: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Nu pot s� salvez fi�ierul list� de grup pentru: %s: %s"
+#: 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"
@@ -7101,90 +8973,126 @@ msgstr ""
 "Acesta e un provider pentru citirea din �i postarea �n grupuri de �tiri "
 "USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:230
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Nu pot deschide directorul pentru serverul de news: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "�tiri USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Aceast� optiune v� va autentifica la serverul NNTP folosind o parol� �n clar "
 
-#: 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 "Nu pot s� deschid sau s� creez fi�ierul .newsrc pentru %s: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Nu exist� dosarul %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 "Nu pot crea conexiunea: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Comanda IMAP e�uat�: %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 "Salvez mesajele"
+
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "Eroare necunoscut�: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:566
+#, fuzzy
+msgid "Use cancel"
+msgstr "Renun��"
+
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "Opera�ia anulat�"
+
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Primesc sumarul POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "Nu pot verifica mesajele noi pe serverul POP: %s"
+#: 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 "Opera�ia anulat�"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Nu pot deschide dosarul: lista de mesaje a fost incomplet�."
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Decupeaz� mesajele selectate"
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "Nu pot aduce mesajul: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Nu pot recupera primi de la serverul POP %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 "Nici un mesaj cu 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 "Primesc mesajul 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 ""
+"Nu pot lua mesajul: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Precipita�ie necunoscut�"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "Stocare mesaje"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Las� mesajele pe 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 "�tergere dup� %s zi(le)"
 
-#: 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:84
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52
+#: camel/providers/pop3/camel-pop3-provider.c:54
 #, fuzzy
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Pentru citirea �i stocarea mesajelor pe servere IMAP."
 
-#: 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."
@@ -7192,7 +9100,7 @@ msgstr ""
 "Aceast� op�iune v� va conecta la serverul POP folosind o parol� �n clar. "
 "Aceasta este singura op�iune suportat� de majoritatea serverelor POP."
 
-#: 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 "
@@ -7202,47 +9110,32 @@ 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-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
-"Aceasta v� va conecta la serverul POP folosind Kerberos 4 la autentificare."
+"Nu m� pot conecta la serverul POP.\n"
+"Eroare la trimiterea numelui utilizator: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Autentificare nereu�it� la serverul KPOP: %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:214
-#, c-format
-msgid "Could not connect to server: %s"
-msgstr "Nu m� pot conecta la serverul: %s"
+#: 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:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, 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:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sV� rog introduce�i parola POP3 pentru %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:378
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
-msgstr ""
-"Nu m� pot conecta la serverul POP.\n"
-"Eroare la trimiterea numelui utilizator: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:381
-#: camel/providers/pop3/camel-pop3-store.c:418
-msgid "(Unknown)"
-msgstr "(Necunoscut)"
-
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -7250,7 +9143,27 @@ msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Mecanismul de autentificare solicitat este nesuportat."
 
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "Comanda IMAP e�uat�: %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "Eroare I/O"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -7259,18 +9172,13 @@ msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea parolei: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nu exist� dosarul `%s'."
 
-#: camel/providers/pop3/camel-pop3-store.c:566
-#, fuzzy, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "R�spuns nea�teptat de la serverul IMAP: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7282,49 +9190,50 @@ msgstr ""
 "Pentru livrarea mailului prin trecerea lui la programul \"sendmail\" �n "
 "sistemul local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "Nu pot parsa URL `%s'"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Nu pot crea conexiunea c�tre sendmail: %s: mailul nu este trimis"
 
-#: 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 "Nu pot bifurca sendmail: %s: mailul nu este trimis"
 
-#: 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 "Nu pot trimite mesajul: %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 oprit cu mesajul %s: mailul nu este trimis."
 
-#: 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 "Nu pot executa %s: mailul nu este trimis."
 
-#: 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 oprit cu starea %d: mailul nu este trimis."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr "Nu g�sesc adresa 'De la' �n mesaj"
-
-#: 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 "Mail trimis prin intermediul programului 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"
 
@@ -7334,123 +9243,146 @@ msgstr ""
 "Pentru trimiterea mailului prin conectare la un hub de mailuri distant "
 "folosind SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Eroare de sintax�, comand� nerecunoscut�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Eroare de sintax� la parametri sau argumente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Comand� neimplementat�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Parametru al comenzii neimplementat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Starea sistemului, sau r�spuns de ajutor al sistemului"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Mesaj de ajutor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Serviciu preg�tit"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Serviciul �nchide canalul de transmisie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Serviciu invalid, canal de transmisie �nchis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Ac�iunea cerut� de mail terminat� cu succes"
 
-#: 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 "Utilizatorul nu e local: se va �nainta la <cale-�naintare>"
 
-#: 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 "Ac�iunea cerut� de mail neefectuat�: c�su�a po�tal� indisponibil�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Ac�iunea cerut� neefectuat�: c�su�a po�tal� indisponibil�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Ac�iunea cerut� anulat�: eroare la procesare"
 
-#: 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 "Utilizatorul nu este local; �ncerca�i v� rog <cale-�naintare>"
 
-#: 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 ""
 "Ac�iunea cerut� refuzat�: posibilitatea de stocare a sistemului dep�it�"
 
-#: 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 "Ac�iunea cerut� anulat�: dep�e�te posibilit��ile de stocare"
 
-#: 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 "Ac�iunea cerut� anulat�: numele c�su�ei de mail nu este permis"
 
-#: 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 "�ncepe�i introducerea mailului; termina�i cu <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Tranzac�ie e�uat�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "E nevoie de o tranzi�ie a parolei"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Mecanismul de autenticare este prea slab"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Mecanismul de autentificare cerut necesit� criptare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "E�uare temporar� a autentific�rii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Necesit� autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, 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:376
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "Comanda AUTH a expirat: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, 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"
 msgstr "Serverul SMTP %s nu suport� tipul cerut de autentificare %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:415
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:438
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7461,131 +9393,134 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "Server SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail livrat prin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr "Nu pot trimite mesajul: adresa expeditorului nedefinit�."
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr "Nu pot trimite mesajul: adresa expeditorului invalid�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Trimit mesaj"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:688
+#, 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
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "�nt�lnire"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Comanda HELO a expirat: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, 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:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Eroare la crearea obiectului de autentificare SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "E�ec la cererea AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "R�spuns de la server: autentificare e�uat�.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:893
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1081
+#, 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:918
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "R�spuns de eroare la comanda RCPT TO: %s: mailul nu a fost trimis"
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Comanda DATA a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "R�spuns de eroare la comanda DATA: %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
+#, fuzzy
+msgid "DATA response error"
+msgstr "R�spuns de eroare 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:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-"DATA r�spuns de eroare: terminarea mesajului: %s: mesajul nu a fost trimis"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "R�spuns de la server de autentificare e�uat�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Timp expirat pentru cererea RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "R�spuns de eroare RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Comanda QUIT a expirat: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "QUIT r�spuns de eroare: %s: nefatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "R�spuns de eroare RSET: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -7612,19 +9547,19 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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 "anex�"
 
-#: 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 "Scoate articolele selectate din lista de anexe"
 
-#: composer/e-msg-composer-attachment-bar.c:531
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "Adaug� anex�..."
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "Anexeaz� un fi�ier la mesaj"
 
@@ -7652,56 +9587,56 @@ msgid "MIME type:"
 msgstr "Tip 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 "Sugerez afi�area automat� a anexei"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Clic aici pentru agend�"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "De la:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "R�spunde la:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Subiect:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "La:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Introduce�i destinatarul mesajului"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:397
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7709,12 +9644,12 @@ msgstr ""
 "Introduce�i adresele care vor primi o copie a mesajului f�r� s� apar� �n "
 "lista destinatarilor mesajului"
 
-#: 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 "Anexeaz� un fisier"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7723,46 +9658,34 @@ msgstr ""
 "Eroare la citirea fi�ierului: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:894
-msgid "Save as..."
-msgstr "Salveaz� ca..."
-
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Avertisment!"
 
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Fi�ierul exist�, suprascriu?"
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Eroare la salvarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Eroare la �nc�rcarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1019
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Nu pot deschide dosarul cu ciorne pentru acest cont.\n"
-"Dori�i s� folosi�i dosarul cu ciorne implicit?"
-
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Eroare la accesarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1077
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Nu pot primi mesajul de la editor"
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7771,7 +9694,7 @@ msgstr ""
 "Nu pot c�uta �n fi�ierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1091
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7780,7 +9703,7 @@ msgstr ""
 "Nu pot trunchia fi�ierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1100
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7789,7 +9712,7 @@ msgstr ""
 "Eroare la salvarea automat� a mesajului: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1202
+#: composer/e-msg-composer.c:1176
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -7798,7 +9721,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:1356
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7807,30 +9730,30 @@ msgstr ""
 "Acest mesaj nu a fost trimis.\n"
 "Dori�i s� salva�i modific�rile?"
 
-#: composer/e-msg-composer.c:1363
+#: composer/e-msg-composer.c:1341
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mesaje �naintate"
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Deschide fi�ier"
 
-#: composer/e-msg-composer.c:1535
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Insereaz� fi�ier"
 
-#: composer/e-msg-composer.c:1910 composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Compune un mesaj"
 
-#: composer/e-msg-composer.c:2368
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2391 composer/e-msg-composer.c:2446
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -7839,7 +9762,7 @@ msgstr ""
 "Nu pot crea fereastra de compunere pentru c� n-a�i configurat �nc�\n"
 "nici o identitate �n componen�a mailului."
 
-#: 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."
@@ -7847,18 +9770,19 @@ msgstr ""
 "Nu pot crea fereastra de compunere pentru c� n-a�i configurat �nc�\n"
 "nici o identitate �n componen�a mailului."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nu pot ini�ializa compozitorul Evolution."
 
-#: 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:1
 msgid "The Evolution groupware suite"
 msgstr "Suita de programe Evolution"
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Evolution"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "carte de vizit�"
@@ -7907,15 +9831,33 @@ 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
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Fi�ier al c�rui nume exist� deja.\n"
+"�l suprascrie�i?"
+
 #. Remember the password?
-#: e-util/e-passwords.c:347 mail/mail-session.c:267
+#: e-util/e-passwords.c:363 mail/mail-session.c:269
 msgid "Remember this password"
 msgstr "Memorez aceast� parol�"
 
-#: e-util/e-passwords.c:349 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 ""
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "Categorii"
+
 #. 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
@@ -7995,13 +9937,13 @@ 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"
 
 #. 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"
 
@@ -8043,11 +9985,7 @@ msgstr "or�"
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "secund�"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "secunde"
 
@@ -8124,7 +10062,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -8137,15 +10075,15 @@ msgid "Filter Rules"
 msgstr "Reguli filtre"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "Atunci"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Adaug� ac�iune"
 
-#: filter/filter-folder.c:156
+#: filter/filter-folder.c:147
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -8154,19 +10092,11 @@ msgstr ""
 "Oops, a�i uitat s� alege�i un dosar.\n"
 "V� rog merge�i �napoi �i preciza�i un dosar pentru livrarea mailului."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:364
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Alege dosar"
 
-#: filter/filter-folder.c:267
-msgid "Enter folder URI"
-msgstr "Introdu dosar URI"
-
-#: filter/filter-folder.c:314
-msgid "<click here to select a folder>"
-msgstr "<clic aici s� alege�i un dosar>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -8176,7 +10106,7 @@ msgstr ""
 "Eroare �n expresia regulat� '%s':\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test"
 
@@ -8185,39 +10115,40 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "Schimb� numele acestui dosar"
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Nume regul�:"
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "F�r� titlu"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Dac�"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "Execut� ac�iunile"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "dac� toate criteriile sunt �ndeplinite"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "dac� oricare criteriu e �ndeplinit"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Adaug� criteriu"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "intr�"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "iese"
 
@@ -8261,6 +10192,12 @@ msgstr "cu toate dosarele locale �i distante active"
 msgid "with all local folders"
 msgstr "cu toate dosarele locale"
 
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Atribuie punctaj"
+
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Atribuie culoare"
@@ -8273,6 +10210,11 @@ msgstr "Atribuie punctaj"
 msgid "Attachments"
 msgstr "Anexe"
 
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "M�rime"
+
 #: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "con�ine"
@@ -8326,144 +10268,154 @@ msgid "ends with"
 msgstr "se termin� cu"
 
 #: filter/libfilter-i18n.h:21
+msgid "Execute Shell Command"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Exist�"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "exist�"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expresie"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Important"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "este"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "a fost dup�"
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "a fost �nainte"
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Marcat"
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "e mai mare dec�t"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "e mai mic dec�t"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "nu este"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Marcat"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "Lista de mail"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Corp mesaj"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "Antet mesaj"
 
-#: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr "Mesajul a fost recep�ionat"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message was sent"
-msgstr "Mesajul a fost trimis"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Mut� in dosar"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "�n sau dup�"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "�n sau �nainte"
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "Red� sunetul:"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Cite�te"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "Potrivire regex"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "R�spuns la"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Punctaj"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1404
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Expeditor"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Seteaz� starea"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "M�rime (kB)"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "sun� ca"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "Cont surs�"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Antet specific"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "�ncepe cu"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Opresc procesarea"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Subiect"
 
-#: filter/libfilter-i18n.h:52
-msgid "was after"
-msgstr "a fost dup�"
-
-#: filter/libfilter-i18n.h:53
-msgid "was before"
-msgstr "a fost �nainte"
-
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Reguli"
 
-#: filter/rule-editor.c:278
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Adaug� reguli"
 
-#: filter/rule-editor.c:344
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Editez reguli"
 
@@ -8485,19 +10437,19 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr "Component� Evolution pentru manipularea mailului."
 
-#: 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
 #, fuzzy
 msgid "Importing..."
 msgstr "Se import�"
 
-#: 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
 #, fuzzy
 msgid "Please wait"
 msgstr "se termin� cu"
 
-#: 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
 #, fuzzy, c-format
 msgid "Importing %s as %s"
@@ -8505,14 +10457,14 @@ msgstr ""
 "Se import� %s.\n"
 "Start %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
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Trimit \"%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:101
 msgid "Mail"
 msgstr "Mail"
 
@@ -8540,25 +10492,76 @@ msgstr ""
 "Evolution a g�sit fi�iere fi�iere GnomeCard.\n"
 "Dori�i s� le importa�i �n Evolution?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "_Prioritate:"
+
+#: 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 ""
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Gunoi"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Fi�ier mail-uri locale %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Scanez dosarul IMAP"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 #, fuzzy
 msgid "Starting import"
 msgstr "_Data �nceput:"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Set�ri"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Editeaz� filtre"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8584,46 +10587,98 @@ msgid "Pine"
 msgstr "Tip�re�te"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Preferin�e calendar"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Procesator pentru compozitorul Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Procesator pentru componenta calendarului Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Procesator pentru compozitorul Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Procesator pentru compozitorul Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Component� Evolution pentru manipularea mailului."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Compozitorul de mailuiri Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Componenta Evolution pentru sumarul activit��ilor."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Componenta Evolution pentru afi�area mailului."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Componenta Evolution pentru procesarea mailului."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Procesator pentru compozitorul Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Procesator pentru componenta sumar mail."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Modific� preferin�e"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Conturi"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Preferin�e calendar"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "Interfa�a de configurare mail"
 
-#: mail/component-factory.c:100
+#: 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:101
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr ""
-
 #: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
@@ -8634,237 +10689,259 @@ msgstr "Dosare virtuale"
 msgid "Virtual Trash folder"
 msgstr "Dosare virtuale"
 
-#: mail/component-factory.c:129
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Nu m� pot conecta la serverul: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 #, fuzzy
 msgid "Properties..."
 msgstr "_Propriet��i..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Modific� propriet��ile fi�ierului"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:925
+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
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/component-factory.c:951
-#, fuzzy
-msgid "New _Mail Message"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1003
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1009
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Conectare la server..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:271
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriet��i pentru \"%s\""
 
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Propriet��i"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:731
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d noi"
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d ascunse"
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "�terse"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d netrimise"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d netrimise"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1049
+#: mail/folder-browser.c:1088
 #, fuzzy
-msgid "Create vFolder from Search"
-msgstr "_Creaz� filtru din mesaj"
+msgid "Create _Virtual Folder From Search..."
+msgstr "Creaz� dosar virtual din mesaj"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "Doasr V pe _subiect"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "Dosar V pe expeditor"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "Dosar V pe destinatari"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtru pe subiect"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtru pe expeditor"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filtru pe destinatari"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filtru pe lista de mail"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Editeaz� ca mesaj nou..."
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:104
-msgid "_Save As..."
-msgstr "_Salveaz� ca..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "Ti_p�re�te"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_R�spunde la expeditor"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "R�spunde la _list�"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "R�spunde la to�i"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_�nainteaz�"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Terminat"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "�terge"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marcheaz� ca citit"
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
-msgstr "Marcheaz� ca _necitit"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
+msgstr "Marchez ca necitit"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Marcheaz� ca important"
 
-#: mail/folder-browser.c:1462
+#: mail/folder-browser.c:1631
 #, fuzzy
-msgid "Mark as Unim_portant"
+msgid "_Mark as Unimportant"
 msgstr "Marcheaz� ca important"
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
-msgstr "Mut� �n dosar..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "Rec_upereaz�"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
+msgstr "Mut �n folderul..."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Copiaz� �n dosarul..."
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:106
-msgid "_Undelete"
-msgstr "Rec_upereaz�"
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "eticheta26"
 
-#: mail/folder-browser.c:1473
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Adaug� expeditorul �n agend�"
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Aplic� filtre"
 
-#: mail/folder-browser.c:1478
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "Creaz� regul� din mesaj"
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
-msgstr "Filtru pe lista de mail"
-
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filtru pe lista de mail (%s)"
 
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "Dosar V pe lista de mail (%s)"
 
-#: mail/folder-browser.h:26
-#, fuzzy
-msgid "Default"
-msgstr "Implicit"
-
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -8887,28 +10964,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Import fi�ierele Outlook Express 4 �n Evolution"
 
 #: mail/local-config.glade.h:1
-#, fuzzy
-msgid "Body contents"
-msgstr "con�ine"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Formatul curent de stocare:"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:2
 #, fuzzy
-msgid "Indexing:"
-msgstr "_Index"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Format c�su�� de mail"
+msgid "Index body contents"
+msgstr "con�ine"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Format nou de stocare:"
 
-#: 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"
@@ -8918,15 +10986,15 @@ msgstr ""
 "o problem� (cum ar fi o lips� a spa�iului pe disc) care nu poate\n"
 "fi rezolvat� �n mod automat. V� rug�m folosi�i aceast� facilitate cu grij�."
 
-#: 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"
 
@@ -8944,89 +11012,81 @@ msgstr "Editor de �tiri Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor de conturi Evolution"
 
-#: mail/mail-account-gui.c:962
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
 #, fuzzy
-msgid "Could not save signature file."
-msgstr ""
-"Nu pot deschde fi�ierul semn�tur� %s:\n"
-"%s"
+msgid "_Host:"
+msgstr "Gazd�:"
 
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "Salveaz� semn�tura"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "Nume utilizator:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#, 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:1045
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Aceast� semn�tur� a fost modificat�, dar n-a fost salvat�.\n"
-"Dori�i s� salva�i modific�rile?"
 
-#: mail/mail-account-gui.c:1654
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (implicit)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Invalideaz�"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Valideaz�"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 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:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Nu �terge"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Chiar �terge�i acest cont?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Invalideaz�"
+
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Valideaz�"
+
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
 msgid "Are you sure you want to delete this news account?"
 msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont nou?"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:783 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
 #, fuzzy
-msgid "Mail Settings"
-msgstr "Set�ri _mail..."
-
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Mail la %s"
-
-#: mail/mail-autofilter.c:215
-#, c-format
-msgid "Subject is %s"
-msgstr "Subiectul este %s"
+msgid "Enabled"
+msgstr "Valideaz�"
 
-#: mail/mail-autofilter.c:231
-#, c-format
-msgid "Mail from %s"
-msgstr "Mail de la %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Management cont"
 
-#: mail/mail-autofilter.c:287
-#, c-format
-msgid "%s mailing list"
-msgstr "%s lista de mail"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+msgid "Protocol"
+msgstr ""
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Adaug� regul� de filtrare"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -9038,7 +11098,7 @@ msgstr ""
 "trimite, primi sau compune mailuri.\n"
 "Dori�i s� face�i configurarea acum?"
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -9046,7 +11106,7 @@ msgstr ""
 "Trebuie s� configura�i o identitate\n"
 "�nainte de a putea compune mailuri."
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -9054,23 +11114,19 @@ msgstr ""
 "Trebuie s� configura�i transportul mailurilor\n"
 "�nainte pentru a putea compune mailuri. "
 
-#: mail/mail-callbacks.c:230
-msgid "You have not set a mail transport method"
-msgstr "Nu a�i setat o metod� de transport a mailului"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:265
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:280
+#: mail/mail-callbacks.c:209
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Trimite un email"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -9078,18 +11134,18 @@ msgstr ""
 "Acest mesaj nu are subiect.\n"
 "Chiar trimite�i?"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 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:299
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "Mesajul con�ine numai cererile nesuportate."
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -9101,43 +11157,46 @@ msgstr ""
 "ad�ugarea unui antet Aparent-la.\n"
 "Trimite�i oricum?"
 
-#: mail/mail-callbacks.c:469
-#, fuzzy
-msgid "This message contains invalid recipients:"
-msgstr "Mesajul con�ine numai cererile nesuportate."
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:408
 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:600
+#: mail/mail-callbacks.c:497
 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:838
+#: mail/mail-callbacks.c:623
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+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
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Eroare necunoscut�"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Mut� mesaj(e) �n"
 
-#: mail/mail-callbacks.c:1283 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copiaz� mesaje(le) �n"
 
-#: mail/mail-callbacks.c:1753
+#: mail/mail-callbacks.c:2091
 #, 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:1778
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -9145,7 +11204,7 @@ msgstr ""
 "Pute�i numai s� edita�i mesajele\n"
 "salvate �n dosarul Ciorne"
 
-#: mail/mail-callbacks.c:1817
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -9153,28 +11212,39 @@ msgstr ""
 "Pute�i numai s� retrimite�i mesajele\n"
 "din dosarul Trimise"
 
-#: mail/mail-callbacks.c:1831
+#: mail/mail-callbacks.c:2169
 #, 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:1857
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Nici un mesaj selectat"
 
-#: mail/mail-callbacks.c:1951
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Suprascrie�i fi�ierul?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Salveaz� mesajul ca..."
 
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Salveaz� mesajele ca..."
 
-#: mail/mail-callbacks.c:2122 widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Avertisment"
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Afi�eaz� urm�torul mesaj necitit"
 
-#: mail/mail-callbacks.c:2129
+#: mail/mail-callbacks.c:2373
+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
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -9182,12 +11252,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2136
-#, fuzzy
-msgid "Do not ask me again."
-msgstr "Nu m� �ntreba din nou"
-
-#: mail/mail-callbacks.c:2244
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -9196,19 +11261,28 @@ msgstr ""
 "Eroare la �ncarcarea informa�iei de filtrare:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2256
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "_Filtre..."
 
-#: mail/mail-callbacks.c:2319
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Primesc mesajul %d din %d"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Tip�re�te mesaj"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2863
+msgid "US-Letter"
+msgstr ""
+
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Tip�rirea mesajului nereu�it�"
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -9222,9 +11296,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
@@ -9263,24 +11337,42 @@ 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:599
+#: mail/mail-config-druid.c:628
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Asistentul de conturi Evolution"
 
-#: mail/mail-config.c:326
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "Cont"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Lucrez"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
 
-#: mail/mail-config.c:1859
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "La"
+
+#. blue
+#: mail/mail-config.c:78 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"
@@ -9288,92 +11380,156 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, fuzzy, c-format
-msgid "%s: Inbox"
-msgstr "Inbox"
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2183 mail/mail-config.c:2187
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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 " _Check for supported types "
-msgstr "Verific tipurile suportate"
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " culoare"
+#, 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
+#, fuzzy
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr "Semnarea e nesuportat� de acest cifru"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Semnarea e nesuportat� de acest cifru"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
-msgid "Account"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
 msgstr "Cont"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Informa�ie cont"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Management cont"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "Conturi"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Op�iuni avansate LDAP "
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: 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
+msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Anexeaz� un fi�ier la mesaj"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anex�"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "Verific� automat dac� sunt mailuri noi la fiecare"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Set de caractere necunoscut: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "�nchide"
+
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Verific mailurile noi"
 
-#: mail/mail-config.glade.h:14
-msgid "Composer"
-msgstr "Compozitor"
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Composing Messages"
+msgstr "Compune un mesaj"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:16
-#, fuzzy
-msgid "Confirm when Expunging a folder"
-msgstr "Distrug dosarul"
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9390,245 +11546,374 @@ msgstr ""
 "\n"
 "Clic \"Terminare\" pentru a salva set�rile"
 
-#: mail/mail-config.glade.h:23
+#: 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:24
+#: mail/mail-config.glade.h:39
 #, fuzzy
-msgid "Default Forward style is: "
-msgstr "Stilul implicit pentru \"�nainteaz�\" este: "
+msgid "Default Behavior"
+msgstr "Implicit"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:40
 #, fuzzy
-msgid "Default character encoding: "
+msgid "Default character _encoding:"
 msgstr "Setul de caractere implicit: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Primesc mail"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "ID-uri digitale..."
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr "Afi�eaz�"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Nu pot deschide mesajul"
 
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Gata"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Ciorne"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Dosar ciorne:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "E_nable"
 msgstr "Valideaz�"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Editeaz�..."
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "E_nable advanced options"
+msgstr "Op�iuni avansate LDAP "
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:49
 #, fuzzy
-msgid "Enabled"
-msgstr "Valideaz�"
+msgid "Emacs"
+msgstr "Est"
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Email-ul con�ine"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "Adresa email:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "Gole�te dosarul cu reziduuri la ie�ire"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "Execut� ac�iunile"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "se termin� cu"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Propriet��i"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Mesaje �naintate"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Ia ID digital..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "HTML signature file:"
-msgstr "Semn�tur� HTML:"
+msgid "Highlight _quotations with"
+msgstr "Ilumineaz� citatele cu "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:59
+msgid "Hulu"
+msgstr ""
+
+#: 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 "Identitate"
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr "�n mailuri HTML"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "�n linie"
 
-#: 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 "Salveaz� �i �nchide"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "�ncarc� _imaginile"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Loca�ie c�su�� po�tal�"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:72
 #, fuzzy
-msgid "Make this my _default account"
-msgstr "F� contul acesta contul meu implicit"
+msgid "Message Composer"
+msgstr "Antet mesaj"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "Afi�eaz� mesaj"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Cea��"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "Server NNTP"
 
-#: mail/mail-config.glade.h:46
-msgid "News"
-msgstr "�tiri"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Dosar _nou"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Informa�ie op�ional�"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:82
 #, fuzzy
-msgid "PGP _Key ID:"
+msgid "Or_ganization:"
+msgstr "Organi_za�ie:"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "ID cheie PGP:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Alege o culoare"
 
-#: mail/mail-config.glade.h:54
-msgid "Pretty Good Privacy"
-msgstr ""
-
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:88
 #, fuzzy
-msgid "Prompt when sending HTML messages to contacts that don't want them"
+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:56
-#, fuzzy
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
+#: mail/mail-config.glade.h:89
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:90
 #, fuzzy
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
+msgid "Printed Fonts"
+msgstr "Tip�re�te contactele selectate"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Maildir Qmail "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Nu pot deschide mesajul"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Cotat"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Memorez aceast� parol�"
 
-#: 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 "R�spunde la:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Primesc email"
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
-msgstr "Primesc mail"
-
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Op�iuni primire"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Memorez aceast� parol�"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Informa�ie cerut�"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
-msgstr "MIME securizat"
-
-#: mail/mail-config.glade.h:67
-msgid "Security"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
 msgstr "Securitate"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:104
+msgid "Same as text"
+msgstr ""
+
+#: mail/mail-config.glade.h:105
 #, fuzzy
-msgid "Select Filter Log file..."
-msgstr "Selecteaz� un fi�ier"
+msgid "Secure MIME (S/MIME)"
+msgstr "MIME securizat"
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "Selecteaz� binarul PGP"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Trimit email"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Fi�ier semn�tur�:"
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
-msgstr "Trimit mail"
+#: 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:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Trimis"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "Trimit email"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Dosar mesaje trimise:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Trimite �i mesajele ciorn�"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Serverul necesit� _autentificare"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Configurare server"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tip server:"
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
-msgstr "Fi�ier semn�tur�:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Scurt�turi"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Salveaz� semn�tura"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Surs�"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Informa�ie surs�"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "Surse"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "Nume stil:"
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
-msgstr "Dosare speciale"
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Mbox Unix standard"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:128
+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 s_ecure connection (SSL)"
-msgstr "Folose�te conectare securizat� (SSL)"
+msgid "Use _HTML for this signature"
+msgstr "Semn�tur� HTML:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Variabil"
+
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -9639,151 +11924,226 @@ msgstr ""
 "\n"
 "Clic \"Urm�torul\" pentru a �ncepe"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Est"
+
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Always load images off the net"
 msgstr "�ntotdeauna �ncarc� imaginile neconectat"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Tip de autentificare: "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "Tip de autentificare: "
+
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Verific� automat dac� sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "ID certificat:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
 #, fuzzy
-msgid "_Drafts folder:"
-msgstr "Dosar ciorne:"
+msgid "_Confirm when expunging a folder"
+msgstr "Distrug dosarul"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:149
 #, fuzzy
-msgid "_Email Address:"
-msgstr "Adresa email:"
+msgid "_Defaults"
+msgstr "Implicit"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:151
+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
 #, fuzzy
-msgid "_Empty trash folders on exit"
-msgstr "Gole�te dosarul cu reziduuri la ie�ire"
+msgid "_Filename:"
+msgstr "Nume fi�ier:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
 #, fuzzy
-msgid "_Full Name:"
+msgid "_Forward style:"
+msgstr "�nainteaz� ca"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "Nume complet:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:159
+#, 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:103
+#: mail/mail-config.glade.h:162
 #, fuzzy
-msgid "_Highlight citations with"
-msgstr "Ilumineaz� citatele cu "
+msgid "_Identity"
+msgstr "Identitate"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:163
 #, fuzzy
-msgid "_Host:"
-msgstr "Gazd�:"
+msgid "_Language:"
+msgstr "Limbaj"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "�ncarc� imaginile dac� expeditorul e �n agend�"
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
-msgstr ""
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "F� contul acesta contul meu implicit"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:166
 #, fuzzy
-msgid "_Mark messages as Read after"
+msgid "_Mark messages as read after"
 msgstr "Marcheaz� mesajele ca \"Citit\" dup�"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Name:"
 msgstr "Nume:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Never load images off the net"
 msgstr "Nu �nc�rca niciodat� imaginile neconectat"
 
-#: mail/mail-config.glade.h:110
-#, fuzzy
-msgid "_Organization:"
-msgstr "Organiza�ie:"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "Cale binar� PGP:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:172
 #, fuzzy
-msgid "_Path:"
-msgstr "Cale:"
+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:113
+#: mail/mail-config.glade.h:173
 #, fuzzy
-msgid "_Remember this password"
-msgstr "Memorez aceast� parol�"
+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:114
+#: mail/mail-config.glade.h:174
 #, fuzzy
-msgid "_Send mail in HTML format by default."
-msgstr "Trimite implicit mail �n format HTML."
+msgid "_Random"
+msgstr "Radio"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:175
 #, fuzzy
-msgid "_Server Type: "
-msgstr "Tip server:"
+msgid "_Receiving Mail"
+msgstr "Primesc mail"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Signature file:"
-msgstr "Fi�ier semn�tur�:"
+msgid "_Reply style:"
+msgstr "R�spunde la to�i"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 #, fuzzy
-msgid "_Username:"
-msgstr "Nume utilizator:"
+msgid "_Script:"
+msgstr "_Securitate"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Securitate"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Trimit mail"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Ploaie toren�ial�"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Variabil"
+
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "_every"
 msgstr "Fiecare"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " culoare"
+
+#: mail/mail-config.glade.h:188
 #, fuzzy
 msgid "description"
 msgstr "Descriere:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "fereastra-�tiri1"
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr "plaseaz�"
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr "secunde"
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Nu pot crea un context pentru o semn�tur� PGP."
@@ -9820,149 +12180,142 @@ msgstr "Nu pot crea un context pentru anvelopa S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nu pot crea contextul pentru decodarea S/MIME."
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Salveaz� anexa"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Nu pot crea temporar mbox `%s': %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Salveaz� pe disc..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Vedere inline"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Deschide �n %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vedere inline (via %s)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Ascund"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Vizualizator extern"
 
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "�ncarc con�inut mesaj"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Deschide leg�tura �n navigator"
 
-#: mail/mail-display.c:1594
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Copiaz� leg�tura c�tre loca�ia"
 
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Salveaz� leg�tura ca (FIXME)"
 
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1837
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salveaz� imaginea ca..."
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s anex�"
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nu pot parsa mesajul MIME. Afi�ez ca surs�."
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adresa email:"
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De la"
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "R�spuns-la:"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "La"
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1813
-#, 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:1836
+#: mail/mail-format.c:915
 #, fuzzy
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Nu recunosc acest tip de component� a calendarului."
-
-#: mail/mail-format.c:1844
-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:1852
-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."
+msgid "Mailer"
+msgstr ""
+"\n"
+"Program de mail:"
 
-#: mail/mail-format.c:2068
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Indicator c�tre site-ul FTP (%s)"
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2120
 #, 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:2087
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Indicator c�tre fi�ierul local (%s)"
 
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2154
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Indicator c�tre site-ul FTP (%s)"
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Indicator c�tre o dat� extern� necunoscut� (tip \"%s\")"
 
-#: mail/mail-format.c:2129
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Corpul extern al mesajului par�ial deformat."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Reconfigurez dosarul"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9971,29 +12324,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:763
+#: mail/mail-local.c:762
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Schimb dosarul \"%s\" �n formatul \"%s\""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -10001,12 +12354,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:1407
+#: mail/mail-local.c:1405
 #, 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:1416
+#: mail/mail-local.c:1414
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigureaz� %s"
@@ -10033,119 +12386,114 @@ msgstr ""
 msgid "Working"
 msgstr "Lucrez"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Primesc mail"
 
-#: 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:557
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Trimit \"%s\""
 
-#: mail/mail-ops.c:677
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Trimit mesajul %d din %d"
 
-#: mail/mail-ops.c:696
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "E�ec la mesajul %d din %d"
 
-#: 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 "Terminat"
 
-#: mail/mail-ops.c:791
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Salvez mesaj �n dosar"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mut mesajele �n %s"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiez mesajele �n %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Mut"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Copiez"
 
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanez dosarele �n \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Gunoi"
-
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Deschid dosarul %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Deschid rezerva %s"
 
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "�terg dosarul %s"
 
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1518
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creez dosar nou"
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Primesc mesajul %s"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1721
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Primesc mesaje"
 
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1807
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvez mesajele"
 
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -10154,7 +12502,7 @@ msgstr ""
 "Nu pot crea fi�ierul de ie�ire: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -10163,11 +12511,11 @@ msgstr ""
 "Eroare la salvarea mesajului: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Salvez anexa"
 
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -10176,22 +12524,27 @@ msgstr ""
 "Nu pot crea fi�ierul de ie�ire: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2138
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Caut�"
 
@@ -10233,68 +12586,93 @@ msgstr "Potriviri:"
 msgid "Cancelling..."
 msgstr "Renun�..."
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Tip: %s"
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tip:"
 
-#: mail/mail-send-recv.c:286
+#: mail/mail-send-recv.c:287
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Trimite & Prime�te mailul"
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:289
 #, fuzzy
 msgid "Cancel All"
 msgstr "Renun��"
 
-#: mail/mail-send-recv.c:348
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Actualizez..."
 
-#: 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 "A�tept..."
 
-#: mail/mail-send-recv.c:533
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Anulat."
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Opera�ie anulat� de utilizator."
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduce�i parola pentru %s"
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 #, fuzzy
 msgid "Enter Password"
 msgstr "Introduce�i parola pentru %s"
 
-#: mail/mail-tools.c:255
+#: mail/mail-signature-editor.c:79
+#, 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
+msgid "Save signature"
+msgstr "Salveaz� semn�tura"
+
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+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
+#, fuzzy
+msgid "Signature name:"
+msgstr "Fi�ier semn�tur�:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mesaj �naintat - %s"
 
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:261
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:399
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Mesaje �naintate"
@@ -10318,107 +12696,165 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "Dosare V"
+#: mail/mail-vfolder.c:785
+#, fuzzy
+msgid "vFolders"
+msgstr "Dosare"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:825
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editeaz� dosare V"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:841
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:895
 msgid "New VFolder"
 msgstr "Dosar V Nou"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 #, fuzzy
 msgid "(No subject)"
 msgstr "�naintat: (f�r� subiect)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "Mesaj"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Nev�zut"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "V�zut"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "R�spuns"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Mesaje nev�zute multiple"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Mesaje multiple"
 
-#: mail/message-list.c:647
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Cea mai sc�zut�"
 
-#: mail/message-list.c:648
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Mai sc�zut�"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Mai mare"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Cea mai mare"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Ast�zi %l:%M %p"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l:%M %p"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2396
 #, fuzzy
 msgid "Generating message list"
 msgstr "Salvez mesajele"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+msgid "Due By"
+msgstr ""
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Stare"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Marcat"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Primit"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "M�rime"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "Rechemare"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Mergi �nainte �n timp"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Informa�ie surs�"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "�nainteaz�"
+
+#: 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 "R�spunde"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "R�spunde la to�i"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Previzualizare"
+
+#: mail/message-tag-followup.c:315
+msgid "Flag to Follow Up"
+msgstr ""
+
 #: mail/subscribe-dialog.c:219
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -10440,7 +12876,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Dezabonare de la dosarul \"%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 "Dosar"
 
@@ -10491,91 +12927,10818 @@ msgid "_Unsubscribe"
 msgstr "Dezaboneaz�"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
 msgstr "Componenta Evolution pentru sumarul activit��ilor."
 
-#: my-evolution/component-factory.c:44
-msgid "Folder containing the Evolution Summary"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Compozitorul de mailuiri Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Procesator pentru componenta de mail Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Procesator pentru componenta sumar a activit��ilor."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Preferin�e calendar"
+
+#: 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/component-factory.c:153
+#: my-evolution/Locations.h:1
 #, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Nu pot ini�ializa componenta mail Evolution."
+msgid "Aarhus"
+msgstr "Alarme"
+
+#: my-evolution/Locations.h:2
+msgid "Abakan"
+msgstr ""
+
+#: my-evolution/Locations.h:3
+msgid "Abbotsford"
+msgstr ""
+
+#: my-evolution/Locations.h:4
+#, fuzzy
+msgid "Aberdeen"
+msgstr "Participare"
+
+#: my-evolution/Locations.h:5
+msgid "Abha"
+msgstr ""
+
+#: my-evolution/Locations.h:6
+#, fuzzy
+msgid "Abilene"
+msgstr "Telefon mobil"
+
+#: 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
+msgid "Acarigua"
+msgstr ""
+
+#: my-evolution/Locations.h:13
+msgid "Adak"
+msgstr ""
+
+#: my-evolution/Locations.h:14
+#, fuzzy
+msgid "Adana"
+msgstr "Avansat"
+
+#: my-evolution/Locations.h:15
+msgid "Adana/Incirlik"
+msgstr ""
+
+#: my-evolution/Locations.h:16
+msgid "Adelaide"
+msgstr ""
+
+#: my-evolution/Locations.h:17
+#, fuzzy
+msgid "Aden"
+msgstr "V�zut"
+
+#: my-evolution/Locations.h:18
+msgid "Adrar"
+msgstr ""
+
+#: my-evolution/Locations.h:19
+#, fuzzy
+msgid "Aeroparque"
+msgstr "Opac"
+
+#: my-evolution/Locations.h:20
+msgid "Aeropuerto del Norte"
+msgstr ""
+
+#: my-evolution/Locations.h:21
+#, fuzzy
+msgid "Afonsos"
+msgstr "Anonim"
+
+#: my-evolution/Locations.h:22
+#, fuzzy
+msgid "Africa"
+msgstr "Automat"
+
+#: my-evolution/Locations.h:23
+msgid "Afyon"
+msgstr ""
+
+#: my-evolution/Locations.h:24
+#, fuzzy
+msgid "Agen"
+msgstr "Orientare"
+
+#: my-evolution/Locations.h:25
+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 "Canada"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:39
+#, fuzzy
+msgid "Alamosa"
+msgstr "Alarme"
+
+#: my-evolution/Locations.h:40
+#, fuzzy
+msgid "Alaska"
+msgstr "Alarme"
+
+#: my-evolution/Locations.h:41
+msgid "Al Baha"
+msgstr ""
+
+#: my-evolution/Locations.h:43
+msgid "Albany"
+msgstr ""
+
+#: my-evolution/Locations.h:44
+msgid "Albenga"
+msgstr ""
+
+#: my-evolution/Locations.h:45
+msgid "Alberta"
+msgstr ""
+
+#: my-evolution/Locations.h:46
+msgid "Alborg"
+msgstr ""
+
+#: my-evolution/Locations.h:47
+msgid "Albuquerque"
+msgstr ""
+
+#: my-evolution/Locations.h:48
+#, fuzzy
+msgid "Alderney"
+msgstr "Nume dosar:"
+
+#: my-evolution/Locations.h:49
+#, fuzzy
+msgid "Alesund"
+msgstr "Retrimite"
+
+#: my-evolution/Locations.h:50
+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 "Mai mare"
+
+#: my-evolution/Locations.h:56
+msgid "Algona"
+msgstr ""
+
+#: my-evolution/Locations.h:57
+#, fuzzy
+msgid "Alicante"
+msgstr "Activeaz�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:62
+#, fuzzy
+msgid "Alliance"
+msgstr "Avansat"
+
+#: my-evolution/Locations.h:63
+#, fuzzy
+msgid "Alma"
+msgstr "Alarme"
+
+#: my-evolution/Locations.h:64
+msgid "Almeria"
+msgstr ""
+
+#: my-evolution/Locations.h:65
+#, fuzzy
+msgid "Alpena"
+msgstr "Deschide"
+
+#: my-evolution/Locations.h:66
+msgid "Al Qaysumah"
+msgstr ""
+
+#: my-evolution/Locations.h:67
+#, fuzzy
+msgid "Alta"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:68
+msgid "Altamira"
+msgstr ""
+
+#: my-evolution/Locations.h:69
+#, fuzzy
+msgid "Alton"
+msgstr "_Ac�iune"
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr ""
+
+#: my-evolution/Locations.h:71
+#, fuzzy
+msgid "Alturas"
+msgstr "Alarme"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:75
+#, fuzzy
+msgid "Amarillo"
+msgstr "Email"
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr ""
+
+#: my-evolution/Locations.h:77
+#, fuzzy
+msgid "Ambler"
+msgstr "Membru"
+
+#: my-evolution/Locations.h:78
+#, fuzzy
+msgid "Amelia"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:79
+msgid "Amendola"
+msgstr ""
+
+#: my-evolution/Locations.h:80
+#, fuzzy
+msgid "Ames"
+msgstr "_Filtre..."
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr ""
+
+#: my-evolution/Locations.h:82
+#, fuzzy
+msgid "Amsterdam"
+msgstr "August"
+
+#: my-evolution/Locations.h:83
+msgid "Anadyr"
+msgstr ""
+
+#: my-evolution/Locations.h:84
+msgid "Anaktuvuk"
+msgstr ""
+
+#: my-evolution/Locations.h:85
+#, fuzzy
+msgid "Anapa"
+msgstr "Japonez"
+
+#: my-evolution/Locations.h:86
+msgid "Anchorage"
+msgstr ""
+
+#: my-evolution/Locations.h:87
+msgid "Anchorage - Elmendorf AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:88
+#, fuzzy
+msgid "Ancona"
+msgstr "Cont"
+
+#: my-evolution/Locations.h:89
+msgid "Andahuayla"
+msgstr ""
+
+#: my-evolution/Locations.h:90
+#, fuzzy
+msgid "Anderson"
+msgstr "Furtun�"
+
+#: my-evolution/Locations.h:91
+#, fuzzy
+msgid "Andoya"
+msgstr "Refacere"
+
+#: my-evolution/Locations.h:92
+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 "Aniv"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:101
+#, fuzzy
+msgid "Anniston"
+msgstr "Asistent"
+
+#: my-evolution/Locations.h:102
+msgid "Antalya"
+msgstr ""
+
+#: my-evolution/Locations.h:103
+#, fuzzy
+msgid "Antartica"
+msgstr "Automat"
+
+#: my-evolution/Locations.h:104
+#, fuzzy
+msgid "Antigo"
+msgstr "_Ac�iune"
+
+#: my-evolution/Locations.h:105
+#, fuzzy
+msgid "Antigua"
+msgstr "Orientare"
+
+#: my-evolution/Locations.h:106
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: my-evolution/Locations.h:107
+#, fuzzy
+msgid "Antofagasta"
+msgstr "Asistent"
+
+#: my-evolution/Locations.h:108
+#, fuzzy
+msgid "Antwerpen/Deurne"
+msgstr "Modific� preferin�e"
+
+#: my-evolution/Locations.h:109
+msgid "Aomori Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:110
+#, fuzzy
+msgid "Apalachicola"
+msgstr "plaseaz�"
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr ""
+
+#: my-evolution/Locations.h:112
+msgid "Aquadilla"
+msgstr ""
+
+#: my-evolution/Locations.h:113
+#, fuzzy
+msgid "Aracaju"
+msgstr "Martie"
+
+#: my-evolution/Locations.h:114
+msgid "Arad"
+msgstr ""
+
+#: my-evolution/Locations.h:115
+#, fuzzy
+msgid "Arar"
+msgstr "Alarme"
+
+#: my-evolution/Locations.h:116
+#, fuzzy
+msgid "Araxos"
+msgstr "Cea mai sc�zut�"
+
+#: my-evolution/Locations.h:117
+#, fuzzy
+msgid "Arcata"
+msgstr "Automat"
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr ""
+
+#: my-evolution/Locations.h:119
+msgid "Arequipa"
+msgstr ""
+
+#: my-evolution/Locations.h:121
+#, fuzzy
+msgid "Arica"
+msgstr "Automat"
+
+#: my-evolution/Locations.h:122
+#, fuzzy
+msgid "Arizona"
+msgstr "Orientare"
+
+#: my-evolution/Locations.h:123
+msgid "Arkansas"
+msgstr ""
+
+#: my-evolution/Locations.h:124
+msgid "Arkhangelsk"
+msgstr ""
+
+#: my-evolution/Locations.h:125
+#, fuzzy
+msgid "Arlington"
+msgstr "Orientare"
+
+#: my-evolution/Locations.h:126
+#, fuzzy
+msgid "Artigas"
+msgstr "Orientare"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:131
+#, fuzzy
+msgid "Ashfield"
+msgstr "Alocat"
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:133
+#, fuzzy
+msgid "Ashland"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:134
+#, fuzzy
+msgid "Asia"
+msgstr "August"
+
+#: my-evolution/Locations.h:135
+#, fuzzy
+msgid "Aspen"
+msgstr "Deschide"
+
+#: my-evolution/Locations.h:136
+#, fuzzy
+msgid "Asswan"
+msgstr "Asistent"
+
+#: my-evolution/Locations.h:137
+#, fuzzy
+msgid "Astoria"
+msgstr "August"
+
+#: my-evolution/Locations.h:138
+#, fuzzy
+msgid "Astrakhan"
+msgstr "August"
+
+#: my-evolution/Locations.h:139
+#, fuzzy
+msgid "Asturias"
+msgstr "August"
+
+#: my-evolution/Locations.h:140
+#, fuzzy
+msgid "Asuncion"
+msgstr "Regiuni"
+
+#: my-evolution/Locations.h:141
+#, fuzzy
+msgid "Athens"
+msgstr "Anexe"
+
+#: my-evolution/Locations.h:142
+#, fuzzy
+msgid "Athinai"
+msgstr "Chinez"
+
+#: my-evolution/Locations.h:143
+#, fuzzy
+msgid "Atlanta"
+msgstr "Asistent"
+
+#: my-evolution/Locations.h:144
+#, fuzzy
+msgid "Atlantic"
+msgstr "Automat"
+
+#: 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
+msgid "Auckland"
+msgstr ""
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:150
+#, fuzzy
+msgid "Augusta"
+msgstr "August"
+
+#: my-evolution/Locations.h:151
+#, fuzzy
+msgid "Aurora"
+msgstr "August"
+
+#: my-evolution/Locations.h:152
+#, fuzzy
+msgid "Austin"
+msgstr "August"
+
+#: my-evolution/Locations.h:153
+#, fuzzy
+msgid "Australasia"
+msgstr "August"
+
+#: my-evolution/Locations.h:156
+msgid "Avalon"
+msgstr ""
+
+#: my-evolution/Locations.h:157
+msgid "Aviano"
+msgstr ""
+
+#: my-evolution/Locations.h:158
+msgid "Ayacucho"
+msgstr ""
+
+#: my-evolution/Locations.h:159
+#, fuzzy
+msgid "Bage"
+msgstr "Baza"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:170
+#, fuzzy
+msgid "Ball Mountain"
+msgstr "Email-ul con�ine"
+
+#: my-evolution/Locations.h:171
+#, fuzzy
+msgid "Baltimore"
+msgstr "Baltic"
+
+#: my-evolution/Locations.h:172
+msgid "Baltimore-Glen Burnie"
+msgstr ""
+
+#: my-evolution/Locations.h:173
+msgid "Banak"
+msgstr ""
+
+#: my-evolution/Locations.h:174
+msgid "Bandarabbass"
+msgstr ""
+
+#: my-evolution/Locations.h:175
+#, fuzzy
+msgid "Bangor"
+msgstr "Manager"
+
+#: my-evolution/Locations.h:176
+msgid "Baracoa"
+msgstr ""
+
+#: my-evolution/Locations.h:177
+msgid "Barbers Point"
+msgstr ""
+
+#: my-evolution/Locations.h:178
+msgid "Barcelona"
+msgstr ""
+
+#: my-evolution/Locations.h:179
+#, fuzzy
+msgid "Bardufoss"
+msgstr "ani"
+
+#: my-evolution/Locations.h:180
+msgid "Bar Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:181
+#, fuzzy
+msgid "Bari"
+msgstr "De baz�"
+
+#: my-evolution/Locations.h:182
+msgid "Bariloche"
+msgstr ""
+
+#: my-evolution/Locations.h:183
+#, fuzzy
+msgid "Barinas"
+msgstr "Margini"
+
+#: my-evolution/Locations.h:184
+msgid "Barking Sand"
+msgstr ""
+
+#: my-evolution/Locations.h:185
+#, fuzzy
+msgid "Barksdale"
+msgstr "Baza"
+
+#: my-evolution/Locations.h:186
+#, fuzzy
+msgid "Barnaul"
+msgstr "Grindin�"
+
+#: 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 "Corean"
+
+#: 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 "De baz�"
+
+#: my-evolution/Locations.h:194
+msgid "Batesville"
+msgstr ""
+
+#: my-evolution/Locations.h:195
+msgid "Batman"
+msgstr ""
+
+#: my-evolution/Locations.h:196
+msgid "Baton Rouge"
+msgstr ""
+
+#: my-evolution/Locations.h:197
+msgid "Battle Creek"
+msgstr ""
+
+#: my-evolution/Locations.h:198
+#, fuzzy
+msgid "Battle Mountain"
+msgstr "Numele con�ine"
+
+#: my-evolution/Locations.h:199
+#, fuzzy
+msgid "Bauru"
+msgstr "ani"
+
+#: my-evolution/Locations.h:200
+msgid "Bayamo"
+msgstr ""
+
+#: my-evolution/Locations.h:201
+msgid "Bayreuth"
+msgstr ""
+
+#: my-evolution/Locations.h:202
+#, fuzzy
+msgid "Beatrice"
+msgstr "Baltic"
+
+#: my-evolution/Locations.h:203
+msgid "Beaufort"
+msgstr ""
+
+#: my-evolution/Locations.h:204
+#, fuzzy
+msgid "Beaumont"
+msgstr "lun�"
+
+#: 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 "Caut..."
+
+#: my-evolution/Locations.h:208
+#, fuzzy
+msgid "Beckley"
+msgstr "M�rime"
+
+#: my-evolution/Locations.h:209
+#, fuzzy
+msgid "Bedford"
+msgstr "�nainte"
+
+#: my-evolution/Locations.h:210
+#, fuzzy
+msgid "Beijing"
+msgstr "Trimit"
+
+#: my-evolution/Locations.h:211
+#, fuzzy
+msgid "Beirut"
+msgstr "ani"
+
+#: my-evolution/Locations.h:212
+msgid "Beja"
+msgstr ""
+
+#: my-evolution/Locations.h:213
+#, fuzzy
+msgid "Belem"
+msgstr "M�rime"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:219
+#, fuzzy
+msgid "Belleville"
+msgstr "M�rime"
+
+#: my-evolution/Locations.h:220
+#, fuzzy
+msgid "Bellingham"
+msgstr "Grindin� �n rafale"
+
+#: my-evolution/Locations.h:221
+msgid "Belmar-Farmingdale"
+msgstr ""
+
+#: my-evolution/Locations.h:222
+#, fuzzy
+msgid "Belo Horizonte"
+msgstr "M�rime"
+
+#: my-evolution/Locations.h:223
+msgid "Belo Horizonte Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:224
+msgid "Bemidji"
+msgstr ""
+
+#: my-evolution/Locations.h:225
+msgid "Benbecula"
+msgstr ""
+
+#: my-evolution/Locations.h:226
+#, fuzzy
+msgid "Benina"
+msgstr "Trimit"
+
+#: 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 "Re�ncarc�"
+
+#: my-evolution/Locations.h:230
+msgid "Bergamo"
+msgstr ""
+
+#: my-evolution/Locations.h:231
+#, fuzzy
+msgid "Bergen"
+msgstr "V�zut"
+
+#: my-evolution/Locations.h:232
+msgid "Bergstrom AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:233
+msgid "Berlevag"
+msgstr ""
+
+#: my-evolution/Locations.h:234
+#, fuzzy
+msgid "Berlin"
+msgstr "Trimit"
+
+#: my-evolution/Locations.h:235
+msgid "Berlin-Tegel"
+msgstr ""
+
+#: my-evolution/Locations.h:236
+msgid "Berlin-Tempelhof"
+msgstr ""
+
+#: my-evolution/Locations.h:237
+#, fuzzy
+msgid "Bern"
+msgstr "Trimit"
+
+#: my-evolution/Locations.h:238
+#, fuzzy
+msgid "Bethel"
+msgstr "Vremea"
+
+#: my-evolution/Locations.h:239
+msgid "Bethlehem Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:240
+#, fuzzy
+msgid "Bettles"
+msgstr "M�rime"
+
+#: my-evolution/Locations.h:241
+#, fuzzy
+msgid "Beverly"
+msgstr "Fiecare"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:245
+#, fuzzy
+msgid "Big Piney"
+msgstr "Tip�re�te"
+
+#: 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 "Lista de mail"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:257
+#, fuzzy
+msgid "Blanding"
+msgstr "Umbrire"
+
+#: my-evolution/Locations.h:258
+msgid "Block Island"
+msgstr ""
+
+#: my-evolution/Locations.h:259
+msgid "Bloemfontein J. B. M. Hertzog "
+msgstr ""
+
+#: my-evolution/Locations.h:260
+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 ""
+
+#: my-evolution/Locations.h:267
+#, fuzzy
+msgid "Bodo"
+msgstr "Corp"
+
+#: my-evolution/Locations.h:268
+msgid "Bogota/Eldorado"
+msgstr ""
+
+#: my-evolution/Locations.h:269
+#, fuzzy
+msgid "Boise"
+msgstr "Baza"
+
+#: my-evolution/Locations.h:271
+msgid "Bologna"
+msgstr ""
+
+#: my-evolution/Locations.h:272
+#, fuzzy
+msgid "Bolzano"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:273
+msgid "Bombay/Santacruz"
+msgstr ""
+
+#: my-evolution/Locations.h:274
+#, fuzzy
+msgid "Boone"
+msgstr "Inexistent"
+
+#: my-evolution/Locations.h:275
+msgid "Bordeaux"
+msgstr ""
+
+#: my-evolution/Locations.h:276
+#, fuzzy
+msgid "Borger"
+msgstr "�ntotdeauna"
+
+#: my-evolution/Locations.h:277
+msgid "Bornholm"
+msgstr ""
+
+#: my-evolution/Locations.h:278
+msgid "Boscombe Down"
+msgstr ""
+
+#: my-evolution/Locations.h:279
+msgid "Bosnia-Herzegovina"
+msgstr ""
+
+#: my-evolution/Locations.h:280
+#, fuzzy
+msgid "Boston"
+msgstr "Jos:"
+
+#: my-evolution/Locations.h:281
+#, fuzzy
+msgid "Boulmer"
+msgstr "Dosar"
+
+#: my-evolution/Locations.h:282
+#, fuzzy
+msgid "Bourges"
+msgstr "Surse"
+
+#: my-evolution/Locations.h:283
+msgid "Bournemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:284
+#, fuzzy
+msgid "Bowling Green"
+msgstr "Ploaie �n rafale"
+
+#: my-evolution/Locations.h:285
+#, fuzzy
+msgid "Bozeman"
+msgstr "Corean"
+
+#: my-evolution/Locations.h:286
+msgid "Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:287
+msgid "Bradshaw Field"
+msgstr ""
+
+#: my-evolution/Locations.h:288
+#, fuzzy
+msgid "Brainerd"
+msgstr "Ucrainean"
+
+#: my-evolution/Locations.h:289
+#, fuzzy
+msgid "Brasilia"
+msgstr "Grindin�"
+
+#: my-evolution/Locations.h:290
+msgid "Brasschaat"
+msgstr ""
+
+#: my-evolution/Locations.h:291
+#, fuzzy
+msgid "Bratislava"
+msgstr "Grindin�"
+
+#: my-evolution/Locations.h:292
+#, fuzzy
+msgid "Bratsk"
+msgstr "Ciorne"
+
+#: my-evolution/Locations.h:293
+msgid "Braunschweig"
+msgstr ""
+
+#: my-evolution/Locations.h:295
+#, fuzzy
+msgid "Bremen"
+msgstr "V�zut"
+
+#: my-evolution/Locations.h:296
+msgid "Bremerton"
+msgstr ""
+
+#: my-evolution/Locations.h:297
+#, fuzzy
+msgid "Brest"
+msgstr "Test"
+
+#: my-evolution/Locations.h:298
+msgid "Bridgeport"
+msgstr ""
+
+#: my-evolution/Locations.h:299
+msgid "Brindisi"
+msgstr ""
+
+#: my-evolution/Locations.h:300
+msgid "Brisbane"
+msgstr ""
+
+#: my-evolution/Locations.h:301
+#, fuzzy
+msgid "Bristol"
+msgstr "Grindin�"
+
+#: my-evolution/Locations.h:302
+msgid "British Columbia"
+msgstr ""
+
+#: my-evolution/Locations.h:303
+msgid "Brno"
+msgstr ""
+
+#: my-evolution/Locations.h:304
+msgid "Broadus"
+msgstr ""
+
+#: my-evolution/Locations.h:305
+#, fuzzy
+msgid "Broken Bow"
+msgstr "Temporar noros"
+
+#: my-evolution/Locations.h:306
+msgid "Bronnoysund"
+msgstr ""
+
+#: my-evolution/Locations.h:307
+#, fuzzy
+msgid "Brookings"
+msgstr "Lucrez"
+
+#: my-evolution/Locations.h:308
+msgid "Brooksville"
+msgstr ""
+
+#: my-evolution/Locations.h:309
+#, fuzzy
+msgid "Broome"
+msgstr "Jos:"
+
+#: my-evolution/Locations.h:310
+msgid "Brownsville"
+msgstr ""
+
+#: my-evolution/Locations.h:311
+msgid "Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:312
+msgid "Brussels-National Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:313
+msgid "Bryansk"
+msgstr ""
+
+#: my-evolution/Locations.h:314
+#, fuzzy
+msgid "Bryce Canyon"
+msgstr "Dup� companie"
+
+#: 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
+msgid "Burbank"
+msgstr ""
+
+#: my-evolution/Locations.h:323
+#, fuzzy
+msgid "Burgas"
+msgstr "Baza"
+
+#: my-evolution/Locations.h:324
+#, fuzzy
+msgid "Burley"
+msgstr "Mar"
+
+#: my-evolution/Locations.h:325
+msgid "Burlington"
+msgstr ""
+
+#: my-evolution/Locations.h:326
+#, fuzzy
+msgid "Burnet"
+msgstr "Iunie"
+
+#: my-evolution/Locations.h:327
+#, fuzzy
+msgid "Burns"
+msgstr "Ocupat"
+
+#: my-evolution/Locations.h:328
+#, fuzzy
+msgid "Bursa"
+msgstr "Ocupat"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:332
+#, fuzzy
+msgid "Cagliari"
+msgstr "Calendar"
+
+#: my-evolution/Locations.h:333
+#, fuzzy
+msgid "Cairns"
+msgstr "Scaun"
+
+#: my-evolution/Locations.h:334
+#, fuzzy
+msgid "Cairo"
+msgstr "Scaun"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:338
+#, fuzzy
+msgid "Calgary"
+msgstr "Calendar"
+
+#: my-evolution/Locations.h:339
+msgid "Cali/Alfonso Bonillaaragon"
+msgstr ""
+
+#: my-evolution/Locations.h:340
+#, fuzzy
+msgid "Caliente"
+msgstr "Calendar"
+
+#: my-evolution/Locations.h:341
+#, fuzzy
+msgid "California"
+msgstr "Contact nou"
+
+#: my-evolution/Locations.h:342
+msgid "Calvi-Ste-Catherine"
+msgstr ""
+
+#: my-evolution/Locations.h:343
+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 "Telefon ma�in�"
+
+#: my-evolution/Locations.h:347
+#, fuzzy
+msgid "Camiri"
+msgstr "Scaun"
+
+#: my-evolution/Locations.h:348
+#, fuzzy
+msgid "Campeche"
+msgstr "Terminat"
+
+#: my-evolution/Locations.h:349
+#, fuzzy
+msgid "Campinas"
+msgstr "Chinez"
+
+#: my-evolution/Locations.h:350
+#, fuzzy
+msgid "Campo"
+msgstr "Compune"
+
+#: my-evolution/Locations.h:351
+msgid "Campo Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr ""
+
+#: my-evolution/Locations.h:353
+#, fuzzy
+msgid "Canaan"
+msgstr "Canada"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:363
+#, fuzzy
+msgid "Cancun"
+msgstr "Renun��"
+
+#: my-evolution/Locations.h:364
+msgid "Cannes-Mandelieu"
+msgstr ""
+
+#: my-evolution/Locations.h:365
+#, fuzzy
+msgid "Cantwell"
+msgstr "Renun��"
+
+#: my-evolution/Locations.h:366
+msgid "Cape Girardeau"
+msgstr ""
+
+#: my-evolution/Locations.h:367
+msgid "Cape Hatteras"
+msgstr ""
+
+#: my-evolution/Locations.h:368
+#, fuzzy
+msgid "Cape Lisburne"
+msgstr "Sursa hirtie"
+
+#: my-evolution/Locations.h:369
+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
+msgid "Capo Mele"
+msgstr ""
+
+#: my-evolution/Locations.h:374
+msgid "Caracas La Carlota"
+msgstr ""
+
+#: my-evolution/Locations.h:375
+msgid "Caracas Maiquetia"
+msgstr ""
+
+#: my-evolution/Locations.h:376
+#, fuzzy
+msgid "Caravelas"
+msgstr "Anuleaz� sarcina"
+
+#: my-evolution/Locations.h:377
+#, fuzzy
+msgid "Carbondale"
+msgstr "Telefon ma�in�"
+
+#: my-evolution/Locations.h:378
+#, fuzzy
+msgid "Cardiff"
+msgstr "Vizualizare card"
+
+#: my-evolution/Locations.h:379
+#, fuzzy
+msgid "Caribou"
+msgstr "Ma�in�"
+
+#: my-evolution/Locations.h:380
+#, fuzzy
+msgid "Carlisle"
+msgstr "Variabil"
+
+#: my-evolution/Locations.h:381
+#, fuzzy
+msgid "Carlsbad"
+msgstr "Rechemare"
+
+#: my-evolution/Locations.h:382
+#, fuzzy
+msgid "Carroll"
+msgstr "Ma�in�"
+
+#: my-evolution/Locations.h:383
+msgid "Cartagena/Rafael Nunez"
+msgstr ""
+
+#: my-evolution/Locations.h:384
+msgid "Casa Granda"
+msgstr ""
+
+#: my-evolution/Locations.h:385
+#, fuzzy
+msgid "Cascade"
+msgstr "Peisaj"
+
+#: my-evolution/Locations.h:386
+#, fuzzy
+msgid "Casper"
+msgstr "H�rtie"
+
+#: my-evolution/Locations.h:387
+msgid "Catacamas"
+msgstr ""
+
+#: my-evolution/Locations.h:388
+#, fuzzy
+msgid "Catania"
+msgstr "Grindin� u�oar�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:393
+#, fuzzy
+msgid "Cedar City"
+msgstr "Cer senin"
+
+#: 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 "Mai mare"
+
+#: my-evolution/Locations.h:397
+msgid "Chacarita"
+msgstr ""
+
+#: my-evolution/Locations.h:398
+#, fuzzy
+msgid "Chadron"
+msgstr "Scaun"
+
+#: my-evolution/Locations.h:399
+#, fuzzy
+msgid "Challis"
+msgstr "Scaun"
+
+#: my-evolution/Locations.h:400
+msgid "Chamberlain"
+msgstr ""
+
+#: my-evolution/Locations.h:401
+#, fuzzy
+msgid "Chambery"
+msgstr "Scaun"
+
+#: my-evolution/Locations.h:402
+#, fuzzy
+msgid "Champaign"
+msgstr "Companie"
+
+#: my-evolution/Locations.h:403
+#, fuzzy
+msgid "Chandalar Lake"
+msgstr "Mesaj calendar"
+
+#: my-evolution/Locations.h:404
+#, fuzzy
+msgid "Chandler"
+msgstr "Scaun"
+
+#: my-evolution/Locations.h:405
+#, fuzzy
+msgid "Chania"
+msgstr "Chinez"
+
+#: my-evolution/Locations.h:406
+#, fuzzy
+msgid "Chanute"
+msgstr "Renun��"
+
+#: my-evolution/Locations.h:407
+#, fuzzy
+msgid "Chariton"
+msgstr "Chinez"
+
+#: my-evolution/Locations.h:408
+msgid "Charleroi-Brussels South"
+msgstr ""
+
+#: my-evolution/Locations.h:409
+msgid "Charles City"
+msgstr ""
+
+#: my-evolution/Locations.h:410
+#, fuzzy
+msgid "Charleston"
+msgstr "Telefon ma�in�"
+
+#: my-evolution/Locations.h:411
+#, fuzzy
+msgid "Charlotte"
+msgstr "Mai"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:416
+#, fuzzy
+msgid "Cheju"
+msgstr "Chinez"
+
+#: 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 "or�"
+
+#: my-evolution/Locations.h:420
+#, fuzzy
+msgid "Cherry Point"
+msgstr "Alt telefon"
+
+#: 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 "Chinez"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:431
+#, fuzzy
+msgid "Chiclayo"
+msgstr "Chinez"
+
+#: my-evolution/Locations.h:432
+#, fuzzy
+msgid "Chico"
+msgstr "Chinez"
+
+#: my-evolution/Locations.h:433
+msgid "Chicopee Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:434
+#, fuzzy
+msgid "Chievres"
+msgstr "Chinez"
+
+#: my-evolution/Locations.h:435
+#, fuzzy
+msgid "Chihhang"
+msgstr "Chinez"
+
+#: my-evolution/Locations.h:436
+msgid "Chihuahua"
+msgstr ""
+
+#: my-evolution/Locations.h:437
+#, fuzzy
+msgid "Childress"
+msgstr "Chinez"
+
+#: my-evolution/Locations.h:439
+#, fuzzy
+msgid "China Lake"
+msgstr "Chinez"
+
+#: my-evolution/Locations.h:440
+#, fuzzy
+msgid "Chinandega"
+msgstr "Chinez"
+
+#: my-evolution/Locations.h:441
+msgid "Chinmem/Shatou"
+msgstr ""
+
+#: my-evolution/Locations.h:442
+#, fuzzy
+msgid "Chino"
+msgstr "Chinez"
+
+#: my-evolution/Locations.h:443
+msgid "Chippewa County"
+msgstr ""
+
+#: my-evolution/Locations.h:444
+#, fuzzy
+msgid "Chita"
+msgstr "Chinez"
+
+#: 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 "Chinez"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:462
+#, fuzzy
+msgid "Clarinda"
+msgstr "Canada"
+
+#: my-evolution/Locations.h:463
+#, fuzzy
+msgid "Clarion"
+msgstr "�terge"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:468
+#, fuzzy
+msgid "Cleveland"
+msgstr "Finlanda"
+
+#: 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
+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
+msgid "Cocos Island"
+msgstr ""
+
+#: my-evolution/Locations.h:477
+#, fuzzy
+msgid "Cody"
+msgstr "Corp"
+
+#: my-evolution/Locations.h:478
+msgid "Coeur d'Alene"
+msgstr ""
+
+#: my-evolution/Locations.h:479
+#, fuzzy
+msgid "Cold Bay"
+msgstr "Bara dosar"
+
+#: my-evolution/Locations.h:480
+#, fuzzy
+msgid "Colima"
+msgstr "Companie"
+
+#: my-evolution/Locations.h:481
+#, fuzzy
+msgid "College Station"
+msgstr "Toate sta�iile:"
+
+#: my-evolution/Locations.h:482
+msgid "Colmar-Meyenheim"
+msgstr ""
+
+#: my-evolution/Locations.h:484
+#, fuzzy
+msgid "Colonia"
+msgstr "Contact nou"
+
+#: my-evolution/Locations.h:485
+#, fuzzy
+msgid "Colorado"
+msgstr "Culori"
+
+#: my-evolution/Locations.h:486
+msgid "Colorado Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:487
+msgid "Columbia"
+msgstr ""
+
+#: my-evolution/Locations.h:488
+msgid "Columbia-McEntire"
+msgstr ""
+
+#: my-evolution/Locations.h:489
+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 ""
+
+#: my-evolution/Locations.h:494
+#, fuzzy
+msgid "Colville"
+msgstr "Chinez"
+
+#: my-evolution/Locations.h:495
+msgid "Comodoro Rivadavia"
+msgstr ""
+
+#: my-evolution/Locations.h:496
+#, fuzzy
+msgid "Comox"
+msgstr "Culori"
+
+#: my-evolution/Locations.h:497
+msgid "Conceicao Do Araguaia"
+msgstr ""
+
+#: my-evolution/Locations.h:498
+#, fuzzy
+msgid "Concepcion"
+msgstr "Anulare opera�ie"
+
+#: my-evolution/Locations.h:499
+#, fuzzy
+msgid "Concord"
+msgstr "Copiez"
+
+#: my-evolution/Locations.h:500
+msgid "Concordia"
+msgstr ""
+
+#: my-evolution/Locations.h:501
+msgid "Connaught"
+msgstr ""
+
+#: my-evolution/Locations.h:502
+#, fuzzy
+msgid "Connecticut"
+msgstr "Contacte"
+
+#: my-evolution/Locations.h:503
+#, fuzzy
+msgid "Conroe"
+msgstr "Copiez"
+
+#: my-evolution/Locations.h:504
+#, fuzzy
+msgid "Constantine"
+msgstr "con�ine"
+
+#: my-evolution/Locations.h:505
+msgid "Copper Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:506
+#, fuzzy
+msgid "Cordoba"
+msgstr "Corean"
+
+#: my-evolution/Locations.h:507
+#, fuzzy
+msgid "Cordova"
+msgstr "Corean"
+
+#: my-evolution/Locations.h:508
+msgid "Cork"
+msgstr ""
+
+#: my-evolution/Locations.h:509
+#, fuzzy
+msgid "Coro"
+msgstr "Culori"
+
+#: my-evolution/Locations.h:510
+#, fuzzy
+msgid "Corona"
+msgstr "Culori"
+
+#: my-evolution/Locations.h:511
+msgid "Corpus Christi"
+msgstr ""
+
+#: my-evolution/Locations.h:512
+msgid "Corpus Christi NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:513
+#, fuzzy
+msgid "Corrientes"
+msgstr "apari�ii"
+
+#: my-evolution/Locations.h:514
+msgid "Corsicana"
+msgstr ""
+
+#: my-evolution/Locations.h:515
+#, fuzzy
+msgid "Cortez"
+msgstr "Not�"
+
+#: my-evolution/Locations.h:516
+#, fuzzy
+msgid "Corumba"
+msgstr "Format"
+
+#: my-evolution/Locations.h:518
+msgid "Cotulla"
+msgstr ""
+
+#: my-evolution/Locations.h:519
+msgid "Council Bluffs"
+msgstr ""
+
+#: my-evolution/Locations.h:520
+#, fuzzy
+msgid "Coventry"
+msgstr "�ara"
+
+#: my-evolution/Locations.h:521
+#, fuzzy
+msgid "Covington"
+msgstr "Copiez"
+
+#: my-evolution/Locations.h:522
+msgid "Cozumel"
+msgstr ""
+
+#: my-evolution/Locations.h:523
+#, fuzzy
+msgid "Craig"
+msgstr "Scaun"
+
+#: my-evolution/Locations.h:524
+#, fuzzy
+msgid "Cranfield"
+msgstr "Anulat"
+
+#: my-evolution/Locations.h:525
+msgid "Crescent City"
+msgstr ""
+
+#: my-evolution/Locations.h:526
+#, fuzzy
+msgid "Creston"
+msgstr "�ntrebare"
+
+#: my-evolution/Locations.h:527
+#, fuzzy
+msgid "Crestview"
+msgstr "Previzualizare"
+
+#: 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 "Telefon ma�in�"
+
+#: my-evolution/Locations.h:533
+msgid "Cuba Awrs"
+msgstr ""
+
+#: my-evolution/Locations.h:534
+msgid "Cuernavaca"
+msgstr ""
+
+#: my-evolution/Locations.h:535
+msgid "Cuiaba"
+msgstr ""
+
+#: my-evolution/Locations.h:536
+#, fuzzy
+msgid "Culdrose"
+msgstr "�nchide"
+
+#: my-evolution/Locations.h:537
+msgid "Culiacan"
+msgstr ""
+
+#: my-evolution/Locations.h:538
+#, fuzzy
+msgid "Cumana"
+msgstr "Canada"
+
+#: my-evolution/Locations.h:539
+msgid "Cumberland"
+msgstr ""
+
+#: my-evolution/Locations.h:540
+msgid "Curitiba"
+msgstr ""
+
+#: my-evolution/Locations.h:541
+msgid "Curitiba Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:542
+#, fuzzy
+msgid "Custer"
+msgstr "Decupeaz�"
+
+#: my-evolution/Locations.h:543
+msgid "Cut Bank"
+msgstr ""
+
+#: my-evolution/Locations.h:544
+msgid "Cuzco"
+msgstr ""
+
+#: my-evolution/Locations.h:547
+#, fuzzy
+msgid "Dagali"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:548
+msgid "Daggett"
+msgstr ""
+
+#: my-evolution/Locations.h:549
+msgid "Dalhart"
+msgstr ""
+
+#: my-evolution/Locations.h:550
+#, fuzzy
+msgid "Dalian"
+msgstr "Ploaie"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:556
+#, fuzzy
+msgid "Danbury"
+msgstr "Ianuarie"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:562
+#, fuzzy
+msgid "Dayton"
+msgstr "Zi"
+
+#: my-evolution/Locations.h:563
+msgid "Daytona Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:564
+msgid "Dayton-Fairborn"
+msgstr ""
+
+#: my-evolution/Locations.h:565
+#, fuzzy
+msgid "Dayton-South Airport"
+msgstr "Nu importa"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:571
+#, fuzzy
+msgid "Deelen"
+msgstr "�terg"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:576
+#, fuzzy
+msgid "Delta"
+msgstr "�terg"
+
+#: my-evolution/Locations.h:577
+#, fuzzy
+msgid "Deming"
+msgstr "�nt�lnire"
+
+#: my-evolution/Locations.h:578
+msgid "Den Helder/De Kooy"
+msgstr ""
+
+#: my-evolution/Locations.h:579
+#, fuzzy
+msgid "Denison"
+msgstr "Regiuni"
+
+#: my-evolution/Locations.h:581
+#, fuzzy
+msgid "Denton"
+msgstr "Regiuni"
+
+#: my-evolution/Locations.h:582
+#, fuzzy
+msgid "Denver"
+msgstr "Expeditor"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:587
+#, fuzzy
+msgid "Des Moines"
+msgstr "Ore locale"
+
+#: my-evolution/Locations.h:588
+#, fuzzy
+msgid "Destin"
+msgstr "�ntrebare"
+
+#: 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
+msgid "Dhahran"
+msgstr ""
+
+#: my-evolution/Locations.h:596
+#, fuzzy
+msgid "Dickinson"
+msgstr "Dimensiuni:"
+
+#: my-evolution/Locations.h:597
+#, fuzzy
+msgid "Dijon"
+msgstr "Gata"
+
+#: my-evolution/Locations.h:598
+#, fuzzy
+msgid "Dillingham"
+msgstr "Grindin� viscolit�"
+
+#: my-evolution/Locations.h:599
+#, fuzzy
+msgid "Dillon"
+msgstr "Gata"
+
+#: my-evolution/Locations.h:600
+#, fuzzy
+msgid "Dinard"
+msgstr "Tip�re�te calendar"
+
+#: 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 "Rol"
+
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "Gata"
+
+#: my-evolution/Locations.h:610
+#, fuzzy
+msgid "Dongsha"
+msgstr "Ast�zi"
+
+#: my-evolution/Locations.h:611
+msgid "Dongshi"
+msgstr ""
+
+#: my-evolution/Locations.h:612
+#, fuzzy
+msgid "Don Torcuato"
+msgstr "�n sau dup�"
+
+#: my-evolution/Locations.h:613
+msgid "Dortmund-Wickede"
+msgstr ""
+
+#: my-evolution/Locations.h:614
+#, fuzzy
+msgid "Dothan"
+msgstr "Gata"
+
+#: my-evolution/Locations.h:615
+msgid "Douglas"
+msgstr ""
+
+#: my-evolution/Locations.h:616
+#, fuzzy
+msgid "Dover"
+msgstr "�ntotdeauna"
+
+#: my-evolution/Locations.h:617
+msgid "Dresden-Klotzsche"
+msgstr ""
+
+#: my-evolution/Locations.h:618
+msgid "Drummond"
+msgstr ""
+
+#: my-evolution/Locations.h:619
+msgid "Dubai"
+msgstr ""
+
+#: my-evolution/Locations.h:620
+msgid "Dubbo"
+msgstr ""
+
+#: my-evolution/Locations.h:621
+#, fuzzy
+msgid "Dublin"
+msgstr "Public"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:625
+#, fuzzy
+msgid "Dugway"
+msgstr "Zi"
+
+#: my-evolution/Locations.h:626
+#, fuzzy
+msgid "Duluth"
+msgstr "Implicit"
+
+#: my-evolution/Locations.h:627
+#, fuzzy
+msgid "Dundee"
+msgstr "Iunie"
+
+#: my-evolution/Locations.h:628
+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
+msgid "Dusseldorf"
+msgstr ""
+
+#: my-evolution/Locations.h:633
+msgid "Dutch Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:634
+#, fuzzy
+msgid "Dyersburg"
+msgstr "_Depaneaz�"
+
+#: my-evolution/Locations.h:635
+#, fuzzy
+msgid "Eagle"
+msgstr "Valideaz�"
+
+#: 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 "Est - Sud Est"
+
+#: 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 "lun�"
+
+#: 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
+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 ""
+
+#: my-evolution/Locations.h:661
+#, fuzzy
+msgid "Elkins"
+msgstr "Cea��"
+
+#: my-evolution/Locations.h:662
+msgid "Elko"
+msgstr ""
+
+#: my-evolution/Locations.h:663
+msgid "Elmira"
+msgstr ""
+
+#: my-evolution/Locations.h:664
+#, fuzzy
+msgid "El Monte"
+msgstr "Luna"
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr ""
+
+#: my-evolution/Locations.h:667
+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 "Important"
+
+#: my-evolution/Locations.h:672
+msgid "Enid"
+msgstr ""
+
+#: my-evolution/Locations.h:673
+#, fuzzy
+msgid "Enid/Woodring"
+msgstr "Lucrez"
+
+#: 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
+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
+#, fuzzy
+msgid "Estherville"
+msgstr "Service de test"
+
+#: my-evolution/Locations.h:685
+#, fuzzy
+msgid "Eugene"
+msgstr "Iunie"
+
+#: my-evolution/Locations.h:686
+msgid "Eureka"
+msgstr ""
+
+#: my-evolution/Locations.h:687
+msgid "Europe"
+msgstr ""
+
+#: my-evolution/Locations.h:688
+#, fuzzy
+msgid "Evanston"
+msgstr "Est"
+
+#: my-evolution/Locations.h:689
+msgid "Evansville"
+msgstr ""
+
+#: my-evolution/Locations.h:690
+#, fuzzy
+msgid "Everett"
+msgstr "Fiecare"
+
+#: my-evolution/Locations.h:691
+msgid "Evergreen"
+msgstr ""
+
+#: my-evolution/Locations.h:692
+msgid "Evreux-Fauville"
+msgstr ""
+
+#: my-evolution/Locations.h:693
+#, fuzzy
+msgid "Exeter"
+msgstr "Vremea"
+
+#: my-evolution/Locations.h:694
+msgid "Ezeiza"
+msgstr ""
+
+#: my-evolution/Locations.h:695
+#, fuzzy
+msgid "Fagernes"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:696
+msgid "Fairbanks"
+msgstr ""
+
+#: my-evolution/Locations.h:697
+msgid "Fairchild"
+msgstr ""
+
+#: my-evolution/Locations.h:698
+#, fuzzy
+msgid "Fairfield"
+msgstr "C�mpul De la"
+
+#: my-evolution/Locations.h:699
+#, fuzzy
+msgid "Fairmont"
+msgstr "Fonturi"
+
+#: 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 "De la"
+
+#: my-evolution/Locations.h:705
+#, fuzzy
+msgid "Farmingdale"
+msgstr "Variabil"
+
+#: my-evolution/Locations.h:706
+msgid "Farmington"
+msgstr ""
+
+#: my-evolution/Locations.h:707
+#, fuzzy
+msgid "Farmville"
+msgstr "Fi�ier"
+
+#: my-evolution/Locations.h:708
+#, fuzzy
+msgid "Faro"
+msgstr "De la"
+
+#: my-evolution/Locations.h:709
+msgid "Fayetteville"
+msgstr ""
+
+#: my-evolution/Locations.h:710
+#, fuzzy
+msgid "Feng Nin"
+msgstr "Ploaie cu ghea��"
+
+#: my-evolution/Locations.h:711
+msgid "Fergus Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:712
+msgid "Fernando De Noronha"
+msgstr ""
+
+#: my-evolution/Locations.h:713
+#, fuzzy
+msgid "Ferrara"
+msgstr "Februarie"
+
+#: my-evolution/Locations.h:714
+#, fuzzy
+msgid "Figari"
+msgstr "Mai mare"
+
+#: my-evolution/Locations.h:715
+#, fuzzy
+msgid "Findlay"
+msgstr "Vineri"
+
+#: my-evolution/Locations.h:717
+#, fuzzy
+msgid "Firenze"
+msgstr "Grec"
+
+#: my-evolution/Locations.h:718
+msgid "Fitchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:719
+msgid "Flagstaff"
+msgstr ""
+
+#: my-evolution/Locations.h:720
+#, fuzzy
+msgid "Flint"
+msgstr "Cea��"
+
+#: my-evolution/Locations.h:721
+msgid "Flippin"
+msgstr ""
+
+#: my-evolution/Locations.h:722
+#, fuzzy
+msgid "Florence"
+msgstr "Renun��"
+
+#: my-evolution/Locations.h:723
+#, fuzzy
+msgid "Florennes"
+msgstr "Grec"
+
+#: my-evolution/Locations.h:724
+#, fuzzy
+msgid "Flores"
+msgstr "Pune la fi�ier ca"
+
+#: my-evolution/Locations.h:725
+msgid "Florianopolis"
+msgstr ""
+
+#: my-evolution/Locations.h:726
+#, fuzzy
+msgid "Florida"
+msgstr "Vineri"
+
+#: my-evolution/Locations.h:727
+#, fuzzy
+msgid "Floro"
+msgstr "De la"
+
+#: my-evolution/Locations.h:728
+msgid "Fond Du Lac"
+msgstr ""
+
+#: my-evolution/Locations.h:729
+#, fuzzy
+msgid "Forde/Bringeland"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:730
+#, fuzzy
+msgid "Forli"
+msgstr "Vin"
+
+#: my-evolution/Locations.h:731
+#, fuzzy
+msgid "Formosa"
+msgstr "Format"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:742
+#, fuzzy
+msgid "Fort Eustis"
+msgstr "Scurt�turi"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:748
+#, fuzzy
+msgid "Fort Leonard"
+msgstr "�nainteaz�"
+
+#: my-evolution/Locations.h:749
+msgid "Fort Lewis"
+msgstr ""
+
+#: my-evolution/Locations.h:750
+msgid "Fort Madison"
+msgstr ""
+
+#: my-evolution/Locations.h:751
+#, fuzzy
+msgid "Fort Meade"
+msgstr "�nainteaz� mesaj"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:757
+#, fuzzy
+msgid "Fort Smith"
+msgstr "Format"
+
+#: my-evolution/Locations.h:758
+#, fuzzy
+msgid "Fort Stewart"
+msgstr "Nepornit"
+
+#: my-evolution/Locations.h:759
+msgid "Fort Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:760
+#, fuzzy
+msgid "Fort Wayne"
+msgstr "Renun��"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:769
+#, fuzzy
+msgid "Franklin"
+msgstr "�nainteaz� _inline"
+
+#: my-evolution/Locations.h:770
+#, fuzzy
+msgid "Fredericton"
+msgstr "Descriere:"
+
+#: my-evolution/Locations.h:771
+#, fuzzy
+msgid "Freeport"
+msgstr "Grec"
+
+#: my-evolution/Locations.h:772
+msgid "Frenchville"
+msgstr ""
+
+#: my-evolution/Locations.h:773
+#, fuzzy
+msgid "Fresno"
+msgstr "Z�pad� cu ghea��"
+
+#: my-evolution/Locations.h:774
+msgid "Fresno-Chandler"
+msgstr ""
+
+#: my-evolution/Locations.h:775
+#, fuzzy
+msgid "Friday Harbor"
+msgstr "Vineri"
+
+#: my-evolution/Locations.h:776
+msgid "Friedrichshafen"
+msgstr ""
+
+#: my-evolution/Locations.h:777
+#, fuzzy
+msgid "Frigg"
+msgstr "Vin"
+
+#: my-evolution/Locations.h:778
+#, fuzzy
+msgid "Frontone"
+msgstr "Fonturi"
+
+#: my-evolution/Locations.h:779
+#, fuzzy
+msgid "Frosinone"
+msgstr "Profesie"
+
+#: my-evolution/Locations.h:780
+#, fuzzy
+msgid "Fryeburg"
+msgstr "Februarie"
+
+#: 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 "Contact nou"
+
+#: my-evolution/Locations.h:789
+msgid "Gadsden"
+msgstr ""
+
+#: my-evolution/Locations.h:790
+#, fuzzy
+msgid "Gage"
+msgstr "Pagin�"
+
+#: my-evolution/Locations.h:791
+#, fuzzy
+msgid "Gainesville"
+msgstr "Revocat"
+
+#: 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 "Calendar"
+
+#: my-evolution/Locations.h:796
+msgid "Galesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:797
+msgid "Gallup"
+msgstr ""
+
+#: my-evolution/Locations.h:798
+msgid "Galveston"
+msgstr ""
+
+#: my-evolution/Locations.h:799
+msgid "Gambell"
+msgstr ""
+
+#: my-evolution/Locations.h:800
+#, fuzzy
+msgid "Gander"
+msgstr "Antet"
+
+#: my-evolution/Locations.h:801
+#, fuzzy
+msgid "Garden City"
+msgstr "Identitate"
+
+#: my-evolution/Locations.h:802
+msgid "Gary"
+msgstr ""
+
+#: my-evolution/Locations.h:803
+#, fuzzy
+msgid "Gassim"
+msgstr "am"
+
+#: my-evolution/Locations.h:804
+#, fuzzy
+msgid "Gatineau"
+msgstr "General"
+
+#: my-evolution/Locations.h:805
+msgid "Gaziantep"
+msgstr ""
+
+#: my-evolution/Locations.h:806
+#, fuzzy
+msgid "Gdansk"
+msgstr "zile"
+
+#: my-evolution/Locations.h:807
+#, fuzzy
+msgid "Geneve"
+msgstr "Grec"
+
+#: my-evolution/Locations.h:808
+#, fuzzy
+msgid "Genova"
+msgstr "General"
+
+#: my-evolution/Locations.h:809
+msgid "George Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:810
+msgid "Georgetown"
+msgstr ""
+
+#: my-evolution/Locations.h:813
+msgid "Ghardaia"
+msgstr ""
+
+#: my-evolution/Locations.h:814
+msgid "Ghedi"
+msgstr ""
+
+#: my-evolution/Locations.h:816
+msgid "Gifu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:817
+#, fuzzy
+msgid "Gila Bend"
+msgstr "Finlanda"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:821
+#, fuzzy
+msgid "Girona"
+msgstr "General"
+
+#: my-evolution/Locations.h:822
+msgid "Gizan"
+msgstr ""
+
+#: my-evolution/Locations.h:823
+msgid "Glasgow"
+msgstr ""
+
+#: my-evolution/Locations.h:824
+msgid "Glendive"
+msgstr ""
+
+#: my-evolution/Locations.h:825
+msgid "Glens Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:826
+#, fuzzy
+msgid "Goiania"
+msgstr "Grindin� u�oar�"
+
+#: my-evolution/Locations.h:827
+msgid "Goldsboro"
+msgstr ""
+
+#: my-evolution/Locations.h:828
+#, fuzzy
+msgid "Goodland"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:829
+#, fuzzy
+msgid "Goose Bay"
+msgstr "Mer_gi la ziua de azi"
+
+#: my-evolution/Locations.h:830
+msgid "Goteborg (Landvetter)"
+msgstr ""
+
+#: my-evolution/Locations.h:831
+msgid "Goteborg (Save)"
+msgstr ""
+
+#: my-evolution/Locations.h:832
+#, fuzzy
+msgid "Granada"
+msgstr "Canada"
+
+#: 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 "Finlanda"
+
+#: my-evolution/Locations.h:837
+msgid "Grand Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:838
+msgid "Grand Junction"
+msgstr ""
+
+#: my-evolution/Locations.h:839
+msgid "Grand Marais"
+msgstr ""
+
+#: my-evolution/Locations.h:840
+msgid "Grand Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:841
+#, fuzzy
+msgid "Grandview"
+msgstr "Previzualizare"
+
+#: my-evolution/Locations.h:842
+#, fuzzy
+msgid "Grangeville"
+msgstr "Revocat"
+
+#: my-evolution/Locations.h:843
+#, fuzzy
+msgid "Grants"
+msgstr "Ciorne"
+
+#: my-evolution/Locations.h:844
+#, fuzzy
+msgid "Graz"
+msgstr "Grindin�"
+
+#: my-evolution/Locations.h:845
+msgid "Great Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:847
+#, fuzzy
+msgid "Greeley"
+msgstr "Grec"
+
+#: my-evolution/Locations.h:848
+#, fuzzy
+msgid "Green Bay"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:849
+msgid "Green River"
+msgstr ""
+
+#: my-evolution/Locations.h:850
+msgid "Greensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:851
+#, fuzzy
+msgid "Greenville"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:852
+msgid "Greenville-Spartanburg"
+msgstr ""
+
+#: my-evolution/Locations.h:853
+#, fuzzy
+msgid "Greenwood"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:854
+msgid "Grenoble-Saint-Geoirs"
+msgstr ""
+
+#: my-evolution/Locations.h:855
+msgid "Griffiss AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:856
+#, fuzzy
+msgid "Groningen"
+msgstr "Avertisment"
+
+#: my-evolution/Locations.h:857
+msgid "Grosseto"
+msgstr ""
+
+#: my-evolution/Locations.h:858
+msgid "Groton"
+msgstr ""
+
+#: my-evolution/Locations.h:859
+msgid "Guadalajara"
+msgstr ""
+
+#: my-evolution/Locations.h:860
+msgid "Guadalupe Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:861
+#, fuzzy
+msgid "Guanare"
+msgstr "General"
+
+#: my-evolution/Locations.h:862
+msgid "Guangzhou"
+msgstr ""
+
+#: my-evolution/Locations.h:863
+msgid "Guantanamo"
+msgstr ""
+
+#: my-evolution/Locations.h:864
+msgid "Guarany"
+msgstr ""
+
+#: my-evolution/Locations.h:865
+#, fuzzy
+msgid "Guaratingueta"
+msgstr "General"
+
+#: my-evolution/Locations.h:866
+msgid "Guarulhos"
+msgstr ""
+
+#: my-evolution/Locations.h:868
+msgid "Guayaquil/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:869
+#, fuzzy
+msgid "Guaymas"
+msgstr "am"
+
+#: my-evolution/Locations.h:870
+msgid "Guernsey"
+msgstr ""
+
+#: my-evolution/Locations.h:871
+#, fuzzy
+msgid "Guidonia"
+msgstr "General"
+
+#: my-evolution/Locations.h:872
+msgid "Gulfport"
+msgstr ""
+
+#: my-evolution/Locations.h:873
+#, fuzzy
+msgid "Gulkana"
+msgstr "General"
+
+#: my-evolution/Locations.h:874
+msgid "Gullfax C"
+msgstr ""
+
+#: my-evolution/Locations.h:875
+#, fuzzy
+msgid "Gunnison"
+msgstr "Regiuni"
+
+#: my-evolution/Locations.h:876
+msgid "Gunnison (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:877
+#, fuzzy
+msgid "Guriat"
+msgstr "General"
+
+#: my-evolution/Locations.h:878
+msgid "Gustavus"
+msgstr ""
+
+#: my-evolution/Locations.h:879
+#, fuzzy
+msgid "Guymon"
+msgstr "am"
+
+#: my-evolution/Locations.h:880
+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 ""
+
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+msgid "Hail"
+msgstr "Grindin�"
+
+#: my-evolution/Locations.h:886
+msgid "Hailey-Sun Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:887
+#, fuzzy
+msgid "Haines"
+msgstr "Titluri"
+
+#: 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 "Furtun� cu grindin�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:902
+#, fuzzy
+msgid "Ha Noi"
+msgstr "Grindin�"
+
+#: my-evolution/Locations.h:903
+msgid "Harbor Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:904
+#, fuzzy
+msgid "Harlingen"
+msgstr "Avertisment"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:911
+#, fuzzy
+msgid "Hastings"
+msgstr "Titluri"
+
+#: my-evolution/Locations.h:912
+msgid "Haugesund"
+msgstr ""
+
+#: my-evolution/Locations.h:913
+#, fuzzy
+msgid "Havre"
+msgstr "Cap"
+
+#: my-evolution/Locations.h:914
+#, fuzzy
+msgid "Hawaii"
+msgstr "Grindin�"
+
+#: my-evolution/Locations.h:915
+msgid "Hawthorne"
+msgstr ""
+
+#: my-evolution/Locations.h:916
+#, fuzzy
+msgid "Hayden"
+msgstr "Antet"
+
+#: my-evolution/Locations.h:917
+msgid "Hayes River"
+msgstr ""
+
+#: my-evolution/Locations.h:918
+#, fuzzy
+msgid "Hays"
+msgstr "zile"
+
+#: 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 "V�zut"
+
+#: my-evolution/Locations.h:922
+msgid "Helsinki"
+msgstr ""
+
+#: my-evolution/Locations.h:923
+#, fuzzy
+msgid "Henderson"
+msgstr "Antet"
+
+#: 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 "Furtun� cu grindin�"
+
+#: my-evolution/Locations.h:930
+#, fuzzy
+msgid "Hilo"
+msgstr "Grindin�"
+
+#: my-evolution/Locations.h:931
+msgid "Hinesville"
+msgstr ""
+
+#: my-evolution/Locations.h:932
+msgid "Hiroshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:933
+#, fuzzy
+msgid "Hobart"
+msgstr "Gazd�"
+
+#: my-evolution/Locations.h:934
+#, fuzzy
+msgid "Hobbs"
+msgstr "Gazd�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:941
+#, fuzzy
+msgid "Holguin"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:942
+#, fuzzy
+msgid "Homer"
+msgstr "Adresa de acas�"
+
+#: my-evolution/Locations.h:943
+#, fuzzy
+msgid "Homestead AFB"
+msgstr "Terminat "
+
+#: my-evolution/Locations.h:944
+#, fuzzy
+msgid "Hondo"
+msgstr "Refacere"
+
+#: 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 "iese"
+
+#: my-evolution/Locations.h:954
+#, fuzzy
+msgid "Houma"
+msgstr "Adresa de acas�"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:960
+#, fuzzy
+msgid "Howard AFB"
+msgstr "�nainteaz� ca"
+
+#: my-evolution/Locations.h:961
+msgid "Hsinchu"
+msgstr ""
+
+#: my-evolution/Locations.h:962
+msgid "Huanuco"
+msgstr ""
+
+#: my-evolution/Locations.h:963
+msgid "Huehuetenango"
+msgstr ""
+
+#: my-evolution/Locations.h:964
+#, fuzzy
+msgid "Hulien"
+msgstr "Ascund"
+
+#: my-evolution/Locations.h:965
+msgid "Humberside"
+msgstr ""
+
+#: my-evolution/Locations.h:967
+msgid "Huntington"
+msgstr ""
+
+#: my-evolution/Locations.h:968
+#, fuzzy
+msgid "Huntsville"
+msgstr "p�n� la"
+
+#: my-evolution/Locations.h:969
+msgid "Hurlburt"
+msgstr ""
+
+#: my-evolution/Locations.h:970
+#, fuzzy
+msgid "Huron"
+msgstr "ore"
+
+#: 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 "De baz�"
+
+#: my-evolution/Locations.h:977
+msgid "Ibiza"
+msgstr ""
+
+#: my-evolution/Locations.h:979
+msgid "Ichikawa"
+msgstr ""
+
+#: my-evolution/Locations.h:980
+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 "Corean"
+
+#: my-evolution/Locations.h:985
+#, fuzzy
+msgid "Iliamna"
+msgstr "�n linie"
+
+#: my-evolution/Locations.h:986
+msgid "Illinois"
+msgstr ""
+
+#: my-evolution/Locations.h:987
+#, fuzzy
+msgid "Imperial"
+msgstr "Aprilie"
+
+#: my-evolution/Locations.h:988
+msgid "Imperial (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:989
+msgid "Imperial Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:990
+msgid "In Amenas"
+msgstr ""
+
+#: my-evolution/Locations.h:992
+#, fuzzy
+msgid "Indiana"
+msgstr "_Index"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:998
+#, fuzzy
+msgid "Inverness"
+msgstr "�n derulare"
+
+#: my-evolution/Locations.h:999
+msgid "Inyokern"
+msgstr ""
+
+#: my-evolution/Locations.h:1000
+#, fuzzy
+msgid "Iowa"
+msgstr "Acum"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1005
+#, fuzzy
+msgid "Iraklion"
+msgstr "Informa�ie"
+
+#: my-evolution/Locations.h:1006
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1008
+#, fuzzy
+msgid "Iron Mountain"
+msgstr "Comentariul con�ine"
+
+#: 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
+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 ""
+
+#: my-evolution/Locations.h:1025
+#, fuzzy
+msgid "Izumo Airport"
+msgstr "Import"
+
+#: 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 "Japonez"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1044
+#, fuzzy
+msgid "Jonkoping"
+msgstr "Lucrez"
+
+#: my-evolution/Locations.h:1045
+#, fuzzy
+msgid "Joplin"
+msgstr "Copiez"
+
+#: 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 "Japonez"
+
+#: my-evolution/Locations.h:1050
+#, fuzzy
+msgid "Jujuy"
+msgstr "Iulie"
+
+#: my-evolution/Locations.h:1051
+#, fuzzy
+msgid "Juliaca"
+msgstr "Public"
+
+#: my-evolution/Locations.h:1052
+#, fuzzy
+msgid "Junction"
+msgstr "Regiuni"
+
+#: my-evolution/Locations.h:1053
+#, fuzzy
+msgid "Juneau"
+msgstr "Iunie"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1059
+#, fuzzy
+msgid "Kalamata"
+msgstr "Mail"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1071
+#, fuzzy
+msgid "Karachi"
+msgstr "Martie"
+
+#: my-evolution/Locations.h:1072
+#, fuzzy
+msgid "Karup"
+msgstr "Nume grup:"
+
+#: 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 "Japonez"
+
+#: my-evolution/Locations.h:1080
+#, fuzzy
+msgid "Kearney"
+msgstr "Corean"
+
+#: my-evolution/Locations.h:1081
+#, fuzzy
+msgid "Keene"
+msgstr "V�zut"
+
+#: 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 "Sendmail"
+
+#: my-evolution/Locations.h:1085
+msgid "Kenosha"
+msgstr ""
+
+#: my-evolution/Locations.h:1086
+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 "Corean"
+
+#: my-evolution/Locations.h:1090
+msgid "Ketchikan"
+msgstr ""
+
+#: my-evolution/Locations.h:1091
+#, fuzzy
+msgid "Key West"
+msgstr "Vest"
+
+#: 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 "Finlanda"
+
+#: 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 "Ast�zi"
+
+#: my-evolution/Locations.h:1132
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1133
+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 "Corean"
+
+#: 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 "intr�"
+
+#: 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 "Grindin� u�oar�"
+
+#: my-evolution/Locations.h:1151
+msgid "La Coruna"
+msgstr ""
+
+#: my-evolution/Locations.h:1152
+#, fuzzy
+msgid "La Crosse"
+msgstr "Cea mai sc�zut�"
+
+#: my-evolution/Locations.h:1153
+msgid "La Esperanza"
+msgstr ""
+
+#: my-evolution/Locations.h:1154
+#, fuzzy
+msgid "Lafayette"
+msgstr "Mai"
+
+#: my-evolution/Locations.h:1155
+msgid "La Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1156
+#, fuzzy
+msgid "Lahaina"
+msgstr "Chinez"
+
+#: my-evolution/Locations.h:1157
+#, fuzzy
+msgid "Lahore"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:1158
+#, fuzzy
+msgid "Lajes"
+msgstr "Cea mai sc�zut�"
+
+#: 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 "Corean"
+
+#: my-evolution/Locations.h:1164
+msgid "Lake Tahoe"
+msgstr ""
+
+#: my-evolution/Locations.h:1165
+#, fuzzy
+msgid "Lakeview"
+msgstr "Previzualizare"
+
+#: my-evolution/Locations.h:1166
+#, fuzzy
+msgid "Lamar"
+msgstr "Manager"
+
+#: my-evolution/Locations.h:1167
+#, fuzzy
+msgid "La Mesa"
+msgstr "Mesaj _mail"
+
+#: my-evolution/Locations.h:1168
+msgid "Lamezia"
+msgstr ""
+
+#: my-evolution/Locations.h:1169
+#, fuzzy
+msgid "Lamoni"
+msgstr "Cea mai sc�zut�"
+
+#: my-evolution/Locations.h:1170
+msgid "Lampedusa"
+msgstr ""
+
+#: my-evolution/Locations.h:1171
+#, fuzzy
+msgid "Lanai"
+msgstr "Limbaj"
+
+#: my-evolution/Locations.h:1172
+#, fuzzy
+msgid "Lancaster"
+msgstr "Peisaj"
 
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/Locations.h:1173
+#, fuzzy
+msgid "Lander"
+msgstr "Antet"
+
+#: my-evolution/Locations.h:1174
+#, fuzzy
+msgid "Langebaanweg"
+msgstr "Limbaj"
+
+#: my-evolution/Locations.h:1175
+msgid "Langley AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1176
+msgid "Lannion"
+msgstr ""
+
+#: my-evolution/Locations.h:1177
+#, fuzzy
+msgid "Lansing"
+msgstr "Avertisment"
+
+#: 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 ""
+
+#: my-evolution/Locations.h:1182
+#, fuzzy
+msgid "Laredo"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:1183
+#, fuzzy
+msgid "Larnaka"
+msgstr "Canada"
+
+#: my-evolution/Locations.h:1184
+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 "Ploaie"
+
+#: my-evolution/Locations.h:1189
+msgid "Latrobe"
+msgstr ""
+
+#: my-evolution/Locations.h:1191
+msgid "Laughlin"
+msgstr ""
+
+#: my-evolution/Locations.h:1192
+#, fuzzy
+msgid "Laurel"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:1193
+msgid "La Verne"
+msgstr ""
+
+#: my-evolution/Locations.h:1194
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1195
+#, fuzzy
+msgid "Lawton"
+msgstr "Cea mai sc�zut�"
+
+#: my-evolution/Locations.h:1196
+msgid "Leadville"
+msgstr ""
+
+#: my-evolution/Locations.h:1197
+#, fuzzy
+msgid "Learmouth"
+msgstr "Cea mai sc�zut�"
+
+#: my-evolution/Locations.h:1199
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1201
+msgid "Leesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1202
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1205
+msgid "Leknes"
+msgstr ""
+
+#: my-evolution/Locations.h:1206
+msgid "Le Mans"
+msgstr ""
+
+#: my-evolution/Locations.h:1207
+#, fuzzy
+msgid "Le Marine"
+msgstr "Margini"
+
+#: my-evolution/Locations.h:1208
+msgid "Lemmon"
+msgstr ""
+
+#: my-evolution/Locations.h:1209
+#, fuzzy
+msgid "Lemoore"
+msgstr "�terge"
+
+#: my-evolution/Locations.h:1210
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1212
+#, fuzzy
+msgid "Leuchars"
+msgstr "ani"
+
+#: my-evolution/Locations.h:1213
+msgid "Lewisburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1214
+#, fuzzy
+msgid "Lewiston"
+msgstr "Cea mai sc�zut�"
+
+#: my-evolution/Locations.h:1215
+#, fuzzy
+msgid "Lewistown"
+msgstr "Cea mai sc�zut�"
+
+#: my-evolution/Locations.h:1216
+msgid "Lexington"
+msgstr ""
+
+#: my-evolution/Locations.h:1217
+msgid "Liberal"
+msgstr ""
+
+#: my-evolution/Locations.h:1219
+msgid "Libya"
+msgstr ""
+
+#: my-evolution/Locations.h:1220
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1221
+msgid "Lidgerwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1222
+#, fuzzy
+msgid "Liege"
+msgstr "Mai mare"
+
+#: my-evolution/Locations.h:1223
+#, fuzzy
+msgid "Lihue"
+msgstr "minut"
+
+#: my-evolution/Locations.h:1224
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1225
+msgid "Lima-Callao"
+msgstr ""
+
+#: my-evolution/Locations.h:1226
+#, fuzzy
+msgid "Limnos"
+msgstr "Cea mai sc�zut�"
+
+#: my-evolution/Locations.h:1227
+#, fuzzy
+msgid "Limoges"
+msgstr "Cea mai sc�zut�"
+
+#: my-evolution/Locations.h:1228
+#, fuzzy
+msgid "Limon"
+msgstr "lun�"
+
+#: my-evolution/Locations.h:1229
+#, fuzzy
+msgid "Lincoln"
+msgstr "intr�"
+
+#: my-evolution/Locations.h:1230
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1231
+msgid "Lisboa"
+msgstr ""
+
+#: my-evolution/Locations.h:1232
+#, fuzzy
+msgid "Lista"
+msgstr "Cea��"
+
+#: my-evolution/Locations.h:1233
+#, fuzzy
+msgid "Litchfield"
+msgstr "Grindin� u�oar�"
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1240
+msgid "Ljubljana"
+msgstr ""
+
+#: my-evolution/Locations.h:1241
+#, fuzzy
+msgid "Logan"
+msgstr "Logare NT"
+
+#: my-evolution/Locations.h:1242
+msgid "Lolland Falster"
+msgstr ""
+
+#: my-evolution/Locations.h:1243
+#, fuzzy
+msgid "Lompoc"
+msgstr "Compune"
+
+#: my-evolution/Locations.h:1244
+#, fuzzy
+msgid "London"
+msgstr "Refacere"
+
+#: my-evolution/Locations.h:1245
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1249
+#, fuzzy
+msgid "Londrina"
+msgstr "ore"
+
+#: my-evolution/Locations.h:1250
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1253
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+#: my-evolution/Locations.h:1254
+#, fuzzy
+msgid "Los Alamos"
+msgstr "Alarme"
+
+#: my-evolution/Locations.h:1255
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1260
+msgid "Lousiana"
+msgstr ""
+
+#: my-evolution/Locations.h:1261
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1265
+#, fuzzy
+msgid "Lugano"
+msgstr "Cea mai sc�zut�"
+
+#: my-evolution/Locations.h:1266
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1267
+#, fuzzy
+msgid "Luton"
+msgstr "iese"
+
+#: my-evolution/Locations.h:1269
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1270
+#, fuzzy
+msgid "Luxor"
+msgstr "Mai sc�zut�"
+
+#: my-evolution/Locations.h:1271
+msgid "Lviv"
+msgstr ""
+
+#: my-evolution/Locations.h:1272
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1275
+msgid "Lyon-Satolas"
+msgstr ""
+
+#: my-evolution/Locations.h:1276
+#, fuzzy
+msgid "Maastricht"
+msgstr "Martie"
+
+#: my-evolution/Locations.h:1277
+#, fuzzy
+msgid "Macae"
+msgstr "Martie"
+
+#: my-evolution/Locations.h:1278
+#, fuzzy
+msgid "Macapa"
+msgstr "Martie"
+
+#: my-evolution/Locations.h:1279
+#, fuzzy
+msgid "Maceio"
+msgstr "Luni"
+
+#: my-evolution/Locations.h:1280
+#, fuzzy
+msgid "Macon"
+msgstr "Luni"
+
+#: my-evolution/Locations.h:1281
+msgid "Madinah"
+msgstr ""
+
+#: my-evolution/Locations.h:1282
+#, fuzzy
+msgid "Madison"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1283
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1285
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+#: my-evolution/Locations.h:1286
+#, fuzzy
+msgid "Magadan"
+msgstr "Canada"
+
+#: my-evolution/Locations.h:1287
+msgid "Magdalena"
+msgstr ""
+
+#: my-evolution/Locations.h:1288
+#, fuzzy
+msgid "Maine"
+msgstr "Manager"
+
+#: my-evolution/Locations.h:1289
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1290
+msgid "Makkah"
+msgstr ""
+
+#: my-evolution/Locations.h:1291
+#, fuzzy
+msgid "Makung"
+msgstr "Manager"
+
+#: my-evolution/Locations.h:1292
+#, fuzzy
+msgid "Malad City"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1293
+#, fuzzy
+msgid "Malaga"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1294
+#, fuzzy
+msgid "Malatya"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1295
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1296
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1298
+msgid "Mammoth Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1299
+#, fuzzy
+msgid "Managua"
+msgstr "Manager"
+
+#: my-evolution/Locations.h:1300
+#, fuzzy
+msgid "Manassas"
+msgstr "Mesaje"
+
+#: my-evolution/Locations.h:1301
+#, fuzzy
+msgid "Manaus"
+msgstr "Martie"
+
+#: my-evolution/Locations.h:1302
+#, fuzzy
+msgid "Manchester"
+msgstr "Potriviri:"
+
+#: my-evolution/Locations.h:1303
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+msgid "Manhattan"
+msgstr ""
+
+#: my-evolution/Locations.h:1305
+#, fuzzy
+msgid "Manisa"
+msgstr "Manager"
+
+#: my-evolution/Locations.h:1306
+#, fuzzy
+msgid "Manistee"
+msgstr "Cea��"
+
+#: my-evolution/Locations.h:1307
+#, fuzzy
+msgid "Manitoba"
+msgstr "Bara de unelte principal�"
+
+#: my-evolution/Locations.h:1308
+msgid "Manitowoc"
+msgstr ""
+
+#: my-evolution/Locations.h:1309
+#, fuzzy
+msgid "Mankato"
+msgstr "Luni"
+
+#: my-evolution/Locations.h:1310
+#, fuzzy
+msgid "Mansfield"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1311
+#, fuzzy
+msgid "Manta"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1312
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1313
+msgid "Maraba"
+msgstr ""
+
+#: my-evolution/Locations.h:1314
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1315
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1316
+#, fuzzy
+msgid "Marathon"
+msgstr "Martie"
+
+#: my-evolution/Locations.h:1317
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1318
+#, fuzzy
+msgid "Margarita"
+msgstr "Margini"
+
+#: my-evolution/Locations.h:1319
+#, fuzzy
+msgid "Marianna"
+msgstr "Margini"
+
+#: my-evolution/Locations.h:1320
+#, fuzzy
+msgid "Marib"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1321
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1322
+#, fuzzy
+msgid "Marietta"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1323
+msgid "Marino di Ravenna"
+msgstr ""
+
+#: my-evolution/Locations.h:1324
+#, fuzzy
+msgid "Marion"
+msgstr "Margini"
+
+#: my-evolution/Locations.h:1325
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1326
+#, fuzzy
+msgid "Marquette"
+msgstr "Mai"
+
+#: my-evolution/Locations.h:1327
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+msgid "Marseilles"
+msgstr ""
+
+#: my-evolution/Locations.h:1329
+#, fuzzy
+msgid "Marshall"
+msgstr "Martie"
+
+#: my-evolution/Locations.h:1330
+msgid "Marshalltown"
+msgstr ""
+
+#: my-evolution/Locations.h:1331
+msgid "Marshfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1332
+#, fuzzy
+msgid "Marte"
+msgstr "Mai"
+
+#: my-evolution/Locations.h:1333
+#, fuzzy
+msgid "Marthas Vineyard"
+msgstr "Marchez ca necitit"
+
+#: my-evolution/Locations.h:1334
+#, fuzzy
+msgid "Martinsburg"
+msgstr "Margini"
+
+#: my-evolution/Locations.h:1335
+#, fuzzy
+msgid "Martinsville"
+msgstr "Margini"
+
+#: my-evolution/Locations.h:1336
+#, fuzzy
+msgid "Maryland"
+msgstr "Corean"
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1339
+msgid "Mashhad"
+msgstr ""
+
+#: my-evolution/Locations.h:1340
+#, fuzzy
+msgid "Masirah"
+msgstr "Martie"
+
+#: my-evolution/Locations.h:1341
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1343
+msgid "Massena"
+msgstr ""
+
+#: my-evolution/Locations.h:1344
+#, fuzzy
+msgid "Matamoros"
+msgstr "Culori"
+
+#: my-evolution/Locations.h:1345
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1347
+msgid "Matsuyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1348
+msgid "Mattoon"
+msgstr ""
+
+#: my-evolution/Locations.h:1349
+#, fuzzy
+msgid "Mayaguez"
+msgstr "Manager"
+
+#: my-evolution/Locations.h:1350
+#, fuzzy
+msgid "Mayport"
+msgstr "Mai"
+
+#: my-evolution/Locations.h:1351
+#, fuzzy
+msgid "Mazatlan"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1352
+#, fuzzy
+msgid "Mazu"
+msgstr "Martie"
+
+#: my-evolution/Locations.h:1353
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1354
+#, fuzzy
+msgid "McAllen"
+msgstr "Tot"
+
+#: my-evolution/Locations.h:1355
+#, fuzzy
+msgid "McCall"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1356
+#, fuzzy
+msgid "McCarthy"
+msgstr "Martie"
+
+#: my-evolution/Locations.h:1357
+msgid "McClellan"
+msgstr ""
+
+#: my-evolution/Locations.h:1358
+msgid "McComb"
+msgstr ""
+
+#: my-evolution/Locations.h:1359
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1361
+msgid "Mc Gregor"
+msgstr ""
+
+#: my-evolution/Locations.h:1362
+#, fuzzy
+msgid "Meacham"
+msgstr "Martie"
+
+#: my-evolution/Locations.h:1363
+#, fuzzy
+msgid "Medford"
+msgstr "�nainte"
+
+#: my-evolution/Locations.h:1364
+msgid "Medicine Lodge"
+msgstr ""
+
+#: my-evolution/Locations.h:1365
+msgid "Mehamn"
+msgstr ""
+
+#: my-evolution/Locations.h:1366
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1367
+msgid "Melbourne"
+msgstr ""
+
+#: my-evolution/Locations.h:1368
+#, fuzzy
+msgid "Melfa"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1369
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1373
+#, fuzzy
+msgid "Mendoza"
+msgstr "Luni"
+
+#: my-evolution/Locations.h:1374
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1377
+msgid "Merced"
+msgstr ""
+
+#: my-evolution/Locations.h:1378
+#, fuzzy
+msgid "Merida"
+msgstr "Vineri"
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1380
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1381
+#, fuzzy
+msgid "Merril Field"
+msgstr "C�mpul De la"
+
+#: my-evolution/Locations.h:1382
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1386
+#, fuzzy
+msgid "Mexicali"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1388
+#, fuzzy
+msgid "Miami"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1391
+msgid "Michigan"
+msgstr ""
+
+#: my-evolution/Locations.h:1392
+#, fuzzy
+msgid "Middle East"
+msgstr "Ini�iala tat�lui:"
+
+#: my-evolution/Locations.h:1393
+msgid "Middleton Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1394
+#, fuzzy
+msgid "Middletown"
+msgstr "Ini�iala tat�lui:"
+
+#: my-evolution/Locations.h:1395
+#, fuzzy
+msgid "Midland"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:1396
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1398
+msgid "Milano/Malpensa"
+msgstr ""
+
+#: my-evolution/Locations.h:1399
+#, fuzzy
+msgid "Miles City"
+msgstr "Tip fi�ier:"
+
+#: my-evolution/Locations.h:1400
+#, fuzzy
+msgid "Milford"
+msgstr "pentru"
+
+#: my-evolution/Locations.h:1401
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1402
+msgid "Millville"
+msgstr ""
+
+#: my-evolution/Locations.h:1403
+#, fuzzy
+msgid "Milton"
+msgstr "Mail la %s"
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1407
+msgid "Minatitlan"
+msgstr ""
+
+#: my-evolution/Locations.h:1408
+#, fuzzy
+msgid "Minchumina"
+msgstr "intr�"
+
+#: my-evolution/Locations.h:1409
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1414
+#, fuzzy
+msgid "Minnesota"
+msgstr "minute"
+
+#: my-evolution/Locations.h:1415
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1416
+#, fuzzy
+msgid "Minot"
+msgstr "nu este"
+
+#: my-evolution/Locations.h:1417
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1419
+msgid "Mississippi"
+msgstr ""
+
+#: my-evolution/Locations.h:1420
+#, fuzzy
+msgid "Missoula"
+msgstr "D-ra."
+
+#: my-evolution/Locations.h:1421
+#, fuzzy
+msgid "Missouri"
+msgstr "D-ra."
+
+#: my-evolution/Locations.h:1422
+#, fuzzy
+msgid "Mitchell"
+msgstr "Potriviri:"
+
+#: my-evolution/Locations.h:1423
+#, fuzzy
+msgid "Mitilini"
+msgstr "Lista de mail"
+
+#: my-evolution/Locations.h:1424
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1425
+msgid "Miyazaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1426
+#, fuzzy
+msgid "Moa"
+msgstr "Lu"
+
+#: my-evolution/Locations.h:1427
+#, fuzzy
+msgid "Mobile Downtown"
+msgstr "Telefon mobil"
+
+#: my-evolution/Locations.h:1428
+msgid "Mobile Regional Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1429
+#, fuzzy
+msgid "Mobridge"
+msgstr "Mobil"
+
+#: my-evolution/Locations.h:1430
+#, fuzzy
+msgid "Modesto"
+msgstr "Negur� moderat�"
+
+#: my-evolution/Locations.h:1431
+msgid "Mo I Rana"
+msgstr ""
+
+#: my-evolution/Locations.h:1432
+#, fuzzy
+msgid "Mojave"
+msgstr "Mut�"
+
+#: my-evolution/Locations.h:1433
+#, fuzzy
+msgid "Molde"
+msgstr "Mobil"
+
+#: my-evolution/Locations.h:1434
+#, fuzzy
+msgid "Moldova"
+msgstr "Luni"
+
+#: my-evolution/Locations.h:1435
+msgid "Moline-Quad Cities"
+msgstr ""
+
+#: my-evolution/Locations.h:1436
+#, fuzzy
+msgid "Molokai"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1437
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1438
+msgid "Monchengladbach"
+msgstr ""
+
+#: my-evolution/Locations.h:1439
+#, fuzzy
+msgid "Monclova"
+msgstr "Luni"
+
+#: my-evolution/Locations.h:1440
+#, fuzzy
+msgid "Moncton"
+msgstr "Luni"
+
+#: my-evolution/Locations.h:1441
+#, fuzzy
+msgid "Monida"
+msgstr "Luni"
+
+#: my-evolution/Locations.h:1442
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+#: my-evolution/Locations.h:1443
+#, fuzzy
+msgid "Monroe"
+msgstr "Luni"
+
+#: my-evolution/Locations.h:1444
+#, fuzzy
+msgid "Montague"
+msgstr "Manager"
+
+#: my-evolution/Locations.h:1445
+#, fuzzy
+msgid "Montana"
+msgstr "con�ine"
+
+#: my-evolution/Locations.h:1446
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1448
+#, fuzzy
+msgid "Monte Bisbino"
+msgstr "Ninsoare moderat�"
+
+#: my-evolution/Locations.h:1449
+msgid "Monte Calamita"
+msgstr ""
+
+#: my-evolution/Locations.h:1450
+#, fuzzy
+msgid "Monte Cimone"
+msgstr "Afi�are lun�"
+
+#: my-evolution/Locations.h:1451
+msgid "Montego Bay"
+msgstr ""
+
+#: my-evolution/Locations.h:1452
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1453
+#, fuzzy
+msgid "Monterey"
+msgstr "Luna"
+
+#: my-evolution/Locations.h:1454
+msgid "Monterrey"
+msgstr ""
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1458
+msgid "Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1459
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1460
+#, fuzzy
+msgid "Monticello"
+msgstr "Luni"
+
+#: my-evolution/Locations.h:1461
+#, fuzzy
+msgid "Montpelier"
+msgstr "Afi�are lun�"
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1465
+#, fuzzy
+msgid "Montrose"
+msgstr "Fonturi"
+
+#: my-evolution/Locations.h:1466
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1467
+#, fuzzy
+msgid "Morelia"
+msgstr "Corean"
+
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Morgantown"
+msgstr "Organiza�ie"
+
+#: my-evolution/Locations.h:1469
+#, fuzzy
+msgid "Moriarty"
+msgstr "Principal"
+
+#: my-evolution/Locations.h:1471
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1474
+msgid "Moses Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1475
+#, fuzzy
+msgid "Mosinee"
+msgstr "Mobil"
+
+#: my-evolution/Locations.h:1476
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain Home"
+msgstr ""
+
+#: my-evolution/Locations.h:1479
+#, fuzzy
+msgid "Mountain View"
+msgstr "Afi�are lun�"
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1482
+#, fuzzy
+msgid "Mount Shasta"
+msgstr "Sud Est"
+
+#: my-evolution/Locations.h:1483
+#, fuzzy
+msgid "Mount Vernon"
+msgstr "Afi�are lun�"
+
+#: my-evolution/Locations.h:1484
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1487
+msgid "Muir"
+msgstr ""
+
+#: my-evolution/Locations.h:1488
+msgid "Mullan"
+msgstr ""
+
+#: my-evolution/Locations.h:1489
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1490
+msgid "Munchen"
+msgstr ""
+
+#: my-evolution/Locations.h:1491
+#, fuzzy
+msgid "Muncie"
+msgstr "Iunie"
+
+#: my-evolution/Locations.h:1492
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1493
+#, fuzzy
+msgid "Murcia"
+msgstr "August"
+
+#: my-evolution/Locations.h:1494
+msgid "Murmansk"
+msgstr ""
+
+#: my-evolution/Locations.h:1495
+#, fuzzy
+msgid "Mus"
+msgstr "minute"
+
+#: my-evolution/Locations.h:1496
+msgid "Muscatine"
+msgstr ""
+
+#: my-evolution/Locations.h:1497
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1498
+msgid "Muskegon"
+msgstr ""
+
+#: my-evolution/Locations.h:1499
+#, fuzzy
+msgid "Mykonos"
+msgstr "Fonturi"
+
+#: my-evolution/Locations.h:1500
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1507
+msgid "Najran"
+msgstr ""
+
+#: my-evolution/Locations.h:1508
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1509
+msgid "Nalchik"
+msgstr ""
+
+#: my-evolution/Locations.h:1510
+#, fuzzy
+msgid "Namsos"
+msgstr "Nume"
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1513
+msgid "Nankishirahama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1514
+#, fuzzy
+msgid "Nanning"
+msgstr "Avertisment"
+
+#: my-evolution/Locations.h:1515
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1516
+msgid "Nantucket"
+msgstr ""
+
+#: my-evolution/Locations.h:1517
+#, fuzzy
+msgid "Napa"
+msgstr "Japonez"
+
+#: my-evolution/Locations.h:1518
+#, fuzzy
+msgid "Naples"
+msgstr "Nume"
+
+#: my-evolution/Locations.h:1519
+#, fuzzy
+msgid "Napoli"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1520
+#, fuzzy
+msgid "Narvik"
+msgstr "Porecl�"
+
+#: my-evolution/Locations.h:1521
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1524
+msgid "Nassau"
+msgstr ""
+
+#: my-evolution/Locations.h:1525
+#, fuzzy
+msgid "Natal"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1526
+#, fuzzy
+msgid "Natchez"
+msgstr "Potriviri:"
+
+#: my-evolution/Locations.h:1527
+msgid "Nawabshah"
+msgstr ""
+
+#: my-evolution/Locations.h:1528
+#, fuzzy
+msgid "Nebraska"
+msgstr "Sarcin� nou�"
+
+#: my-evolution/Locations.h:1529
+msgid "Needles"
+msgstr ""
+
+#: my-evolution/Locations.h:1530
+#, fuzzy
+msgid "Nenana"
+msgstr "Canada"
+
+#: my-evolution/Locations.h:1532
+msgid "Neuquen"
+msgstr ""
+
+#: my-evolution/Locations.h:1533
+#, fuzzy
+msgid "Nevada"
+msgstr "Canada"
+
+#: my-evolution/Locations.h:1534
+#, fuzzy
+msgid "Newark"
+msgstr "Sarcin� nou�"
+
+#: my-evolution/Locations.h:1535
+#, fuzzy
+msgid "New Bedford"
+msgstr "Dosar _nou"
+
+#: my-evolution/Locations.h:1536
+#, fuzzy
+msgid "New Bern"
+msgstr "_Eveniment nou"
+
+#: my-evolution/Locations.h:1537
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1539
+msgid "Newburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1540
+#, fuzzy
+msgid "Newcastle"
+msgstr "�tiri"
+
+#: my-evolution/Locations.h:1541
+#, fuzzy
+msgid "New Delhi/Palam"
+msgstr "Mail nou"
+
+#: my-evolution/Locations.h:1542
+#, fuzzy
+msgid "Newfoundland"
+msgstr "Mail nou"
+
+#: my-evolution/Locations.h:1543
+msgid "New Hampshire"
+msgstr ""
+
+#: my-evolution/Locations.h:1544
+#, fuzzy
+msgid "New Haven"
+msgstr "_Eveniment nou"
+
+#: my-evolution/Locations.h:1545
+#, fuzzy
+msgid "New Iberia"
+msgstr "Contact nou"
+
+#: my-evolution/Locations.h:1546
+#, fuzzy
+msgid "New Jersey"
+msgstr "Mesaj nou"
+
+#: my-evolution/Locations.h:1547
+msgid "New Mexico"
+msgstr ""
+
+#: my-evolution/Locations.h:1548
+#, fuzzy
+msgid "New Orleans"
+msgstr "Selec_teaz� �nl�n�uirea"
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1550
+msgid "New Orleans NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1551
+#, fuzzy
+msgid "Newport"
+msgstr "Nord"
+
+#: my-evolution/Locations.h:1552
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1553
+msgid "New Port Richey"
+msgstr ""
+
+#: my-evolution/Locations.h:1554
+#, fuzzy
+msgid "New River"
+msgstr "_Eveniment nou"
+
+#: my-evolution/Locations.h:1555
+msgid "New Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1556
+#, fuzzy
+msgid "Newton"
+msgstr "Nou"
+
+#: my-evolution/Locations.h:1557
+#, fuzzy
+msgid "New York"
+msgstr "Dosar V Nou"
+
+#: my-evolution/Locations.h:1558
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1559
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1561
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1564
+msgid "Niigata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1565
+#, fuzzy
+msgid "Nimes-Garons"
+msgstr "Dimensiuni:"
+
+#: my-evolution/Locations.h:1566
+#, fuzzy
+msgid "Nipawin"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:1567
+#, fuzzy
+msgid "Nis"
+msgstr "este"
+
+#: my-evolution/Locations.h:1568
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1570
+msgid "N Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1571
+#, fuzzy
+msgid "Nogales"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:1572
+#, fuzzy
+msgid "Nome"
+msgstr "Nume"
+
+#: my-evolution/Locations.h:1573
+#, fuzzy
+msgid "Norfolk"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:1575
+msgid "Norfolk NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1576
+#, fuzzy
+msgid "Norrkoping"
+msgstr "Lucrez"
+
+#: my-evolution/Locations.h:1577
+#, fuzzy
+msgid "North Adams"
+msgstr "Nord Est"
+
+#: my-evolution/Locations.h:1578
+#, fuzzy
+msgid "North Bend"
+msgstr "Nord"
+
+#: my-evolution/Locations.h:1579
+msgid "North Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:1580
+#, fuzzy
+msgid "North Conway"
+msgstr "Acum"
+
+#: my-evolution/Locations.h:1581
+#, fuzzy
+msgid "North Dakota"
+msgstr "Nord Est"
+
+#: my-evolution/Locations.h:1582
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1583
+msgid "North Kingstown"
+msgstr ""
+
+#: my-evolution/Locations.h:1584
+#, fuzzy
+msgid "North Platte"
+msgstr "Nord Est"
+
+#: my-evolution/Locations.h:1585
+#, fuzzy
+msgid "Northway"
+msgstr "Acum"
+
+#: my-evolution/Locations.h:1586
+#, fuzzy
+msgid "Northwest Territories"
+msgstr "Nord Vest"
+
+#: my-evolution/Locations.h:1588
+#, fuzzy
+msgid "Norwich"
+msgstr "Nord"
+
+#: my-evolution/Locations.h:1589
+#, fuzzy
+msgid "Norwood"
+msgstr "Acum"
+
+#: my-evolution/Locations.h:1590
+#, fuzzy
+msgid "Notodden"
+msgstr "Not�"
+
+#: my-evolution/Locations.h:1591
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1595
+msgid "Nueva Ocotepeque"
+msgstr ""
+
+#: my-evolution/Locations.h:1596
+#, fuzzy
+msgid "Nuevo Laredo"
+msgstr "Nepornit"
+
+#: my-evolution/Locations.h:1597
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+#, fuzzy
+msgid "Oahu"
+msgstr "Opac"
+
+#: my-evolution/Locations.h:1600
+msgid "Oak Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:1601
+#, fuzzy
+msgid "Oakland"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:1602
+msgid "Oaxaca"
+msgstr ""
+
+#: my-evolution/Locations.h:1603
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+msgid "Obihiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1605
+#, fuzzy
+msgid "Ocala"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1606
+msgid "Oceanside"
+msgstr ""
+
+#: my-evolution/Locations.h:1607
+#, fuzzy
+msgid "Odense"
+msgstr "Unu"
+
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1609
+#, fuzzy
+msgid "Oelwen"
+msgstr "Deschide"
+
+#: my-evolution/Locations.h:1610
+#, fuzzy
+msgid "Ogden"
+msgstr "Deschide"
+
+#: my-evolution/Locations.h:1611
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1613
+msgid "Ohio"
+msgstr ""
+
+#: my-evolution/Locations.h:1614
+#, fuzzy
+msgid "Ohrid"
+msgstr "Alte"
+
+#: my-evolution/Locations.h:1615
+msgid "Oita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1616
+msgid "Ojika Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1617
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1624
+msgid "Okushiri Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1625
+#, fuzzy
+msgid "Olathe"
+msgstr "Alte"
+
+#: my-evolution/Locations.h:1626
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1627
+msgid "Olbia"
+msgstr ""
+
+#: my-evolution/Locations.h:1628
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1629
+msgid "Omaha"
+msgstr ""
+
+#: my-evolution/Locations.h:1630
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1631
+#, fuzzy
+msgid "Omak"
+msgstr "Ok"
+
+#: my-evolution/Locations.h:1633
+msgid "Ominato Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1634
+#, fuzzy
+msgid "Omsk"
+msgstr "Ok"
+
+#: my-evolution/Locations.h:1635
+msgid "O'Neill"
+msgstr ""
+
+#: my-evolution/Locations.h:1636
+#, fuzzy
+msgid "Ontario"
+msgstr "Orientare"
+
+#: my-evolution/Locations.h:1637
+#, fuzzy
+msgid "Oostende"
+msgstr "Participare"
+
+#: my-evolution/Locations.h:1638
+#, fuzzy
+msgid "Oran"
+msgstr "Renun��"
+
+#: my-evolution/Locations.h:1639
+msgid "Oran/Es Senia"
+msgstr ""
+
+#: my-evolution/Locations.h:1640
+#, fuzzy
+msgid "Orange"
+msgstr "Org"
+
+#: my-evolution/Locations.h:1641
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1642
+msgid "Ord-Sharp"
+msgstr ""
+
+#: my-evolution/Locations.h:1643
+#, fuzzy
+msgid "Oregon"
+msgstr "Org"
+
+#: my-evolution/Locations.h:1644
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1645
+#, fuzzy
+msgid "Orland"
+msgstr "Corean"
+
+#: my-evolution/Locations.h:1646
+#, fuzzy
+msgid "Orlando"
+msgstr "Corean"
+
+#: my-evolution/Locations.h:1647
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1648
+msgid "Orsta-Volda"
+msgstr ""
+
+#: my-evolution/Locations.h:1649
+#, fuzzy
+msgid "Oruro"
+msgstr "Eroare"
+
+#: my-evolution/Locations.h:1650
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1652
+#, fuzzy
+msgid "Oscoda"
+msgstr "secund�"
+
+#: my-evolution/Locations.h:1653
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1657
+msgid "Ostrava"
+msgstr ""
+
+#: my-evolution/Locations.h:1658
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1661
+#, fuzzy
+msgid "Owyhee"
+msgstr "s�pt�m�n�"
+
+#: my-evolution/Locations.h:1662
+#, fuzzy
+msgid "Oxford"
+msgstr "pentru"
+
+#: my-evolution/Locations.h:1663
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1670
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1671
+#, fuzzy
+msgid "Paganella"
+msgstr "Pagin�"
+
+#: my-evolution/Locations.h:1674
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1675
+msgid "Palacios"
+msgstr ""
+
+#: my-evolution/Locations.h:1676
+#, fuzzy
+msgid "Palermo"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:1677
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1678
+msgid "Palmdale"
+msgstr ""
+
+#: my-evolution/Locations.h:1679
+#, fuzzy
+msgid "Palmer"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:1680
+#, fuzzy
+msgid "Palm Springs"
+msgstr "Set�ri _mail..."
+
+#: my-evolution/Locations.h:1681
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1682
+#, fuzzy
+msgid "Pamplona"
+msgstr "Fum"
+
+#: my-evolution/Locations.h:1684
+#, fuzzy
+msgid "Panama City"
+msgstr "Canada"
+
+#: my-evolution/Locations.h:1685
+#, fuzzy
+msgid "Pantelleria"
+msgstr "Revocat"
+
+#: my-evolution/Locations.h:1686
+#, fuzzy
+msgid "Papa"
+msgstr "Japonez"
+
+#: my-evolution/Locations.h:1687
+#, fuzzy
+msgid "Paphos"
+msgstr "Cea mai sc�zut�"
+
+#: my-evolution/Locations.h:1689
+#, fuzzy
+msgid "Paris"
+msgstr "Margini"
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1692
+#, fuzzy
+msgid "Paris/Orly"
+msgstr "Cea�� par�ial�"
+
+#: my-evolution/Locations.h:1693
+msgid "Parkersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1694
+#, fuzzy
+msgid "Pasco"
+msgstr "Parola"
+
+#: my-evolution/Locations.h:1695
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1700
+msgid "Passo Rolle"
+msgstr ""
+
+#: my-evolution/Locations.h:1701
+#, fuzzy
+msgid "Patna"
+msgstr "Canada"
+
+#: my-evolution/Locations.h:1702
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1706
+#, fuzzy
+msgid "Paysandu"
+msgstr "Red� sunetul:"
+
+#: my-evolution/Locations.h:1707
+#, fuzzy
+msgid "Payson"
+msgstr "Red� sunetul:"
+
+#: my-evolution/Locations.h:1708
+#, fuzzy
+msgid "Pellston"
+msgstr "�ntrebare"
+
+#: my-evolution/Locations.h:1709
+#, fuzzy
+msgid "Pelotas"
+msgstr "Re�ncarc�"
+
+#: my-evolution/Locations.h:1710
+#, fuzzy
+msgid "Pendleton"
+msgstr "Selec�ie"
+
+#: my-evolution/Locations.h:1711
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1716
+#, fuzzy
+msgid "Peoria"
+msgstr "Principal"
+
+#: my-evolution/Locations.h:1717
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1718
+msgid "Pereira/Matecana"
+msgstr ""
+
+#: my-evolution/Locations.h:1719
+#, fuzzy
+msgid "Perm"
+msgstr "H�rtie"
+
+#: my-evolution/Locations.h:1720
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1721
+msgid "Perry-Foley"
+msgstr ""
+
+#: my-evolution/Locations.h:1722
+#, fuzzy
+msgid "Perth"
+msgstr "H�rtie"
+
+#: my-evolution/Locations.h:1724
+#, fuzzy
+msgid "Perugia"
+msgstr "H�rtie"
+
+#: my-evolution/Locations.h:1725
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1730
+msgid "Philip"
+msgstr ""
+
+#: my-evolution/Locations.h:1731
+msgid "Philipsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1732
+msgid "Phillips"
+msgstr ""
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1739
+msgid "Piedras Negras"
+msgstr ""
+
+#: my-evolution/Locations.h:1740
+#, fuzzy
+msgid "Pierre"
+msgstr "H�rtie"
+
+#: my-evolution/Locations.h:1741
+msgid "Pietersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1742
+#, fuzzy
+msgid "Pikeville"
+msgstr "Previzualizare"
+
+#: my-evolution/Locations.h:1743
+#, fuzzy
+msgid "Pine Bluff"
+msgstr "Mail Pine"
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+msgid "Pirassununga"
+msgstr ""
+
+#: my-evolution/Locations.h:1747
+#, fuzzy
+msgid "Pisa"
+msgstr "Lipe�te"
+
+#: my-evolution/Locations.h:1748
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1753
+#, fuzzy
+msgid "Plymouth"
+msgstr "lun�"
+
+#: my-evolution/Locations.h:1754
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+msgid "Pocos De Caldas"
+msgstr ""
+
+#: my-evolution/Locations.h:1756
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1757
+msgid "Podgorica Titograd"
+msgstr ""
+
+#: my-evolution/Locations.h:1758
+msgid "Pohang Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1759
+#, fuzzy
+msgid "Point Hope"
+msgstr "Tip�re�te plic"
+
+#: my-evolution/Locations.h:1760
+#, fuzzy
+msgid "Point Lay"
+msgstr "Rezumat"
+
+#: my-evolution/Locations.h:1761
+#, fuzzy
+msgid "Point Mugu"
+msgstr "Tip�re�te mesaj"
+
+#: my-evolution/Locations.h:1762
+msgid "Point Piedras Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1763
+#, fuzzy
+msgid "Poitiers"
+msgstr "Propriet��i"
+
+#: my-evolution/Locations.h:1765
+msgid "Pompano Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1766
+#, fuzzy
+msgid "Ponca City"
+msgstr "Lista de telefoane"
+
+#: my-evolution/Locations.h:1767
+#, fuzzy
+msgid "Ponce"
+msgstr "Inexistent"
+
+#: my-evolution/Locations.h:1768
+msgid "Ponta Pora"
+msgstr ""
+
+#: my-evolution/Locations.h:1769
+#, fuzzy
+msgid "Pontiac"
+msgstr "Contacte"
+
+#: my-evolution/Locations.h:1770
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1771
+msgid "Poplar Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1772
+#, fuzzy
+msgid "Poprad"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:1773
+#, fuzzy
+msgid "Port Alexander"
+msgstr "Tip�re�te calendar"
+
+#: my-evolution/Locations.h:1774
+msgid "Port Alsworth"
+msgstr ""
+
+#: my-evolution/Locations.h:1775
+#, fuzzy
+msgid "Port Angeles"
+msgstr "Tip�re�te plic"
+
+#: my-evolution/Locations.h:1776
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1777
+msgid "Port Elizabeth"
+msgstr ""
+
+#: my-evolution/Locations.h:1778
+#, fuzzy
+msgid "Porterville"
+msgstr "Previzualizare"
+
+#: my-evolution/Locations.h:1779
+#, fuzzy
+msgid "Port Hardy"
+msgstr "Tip�re�te calendar"
+
+#: my-evolution/Locations.h:1780
+#, fuzzy
+msgid "Port Hedland"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:1781
+msgid "Port Heiden"
+msgstr ""
+
+#: my-evolution/Locations.h:1782
+#, fuzzy
+msgid "Portland"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:1783
+#, fuzzy
+msgid "Porto"
+msgstr "Port:"
+
+#: my-evolution/Locations.h:1784
+#, fuzzy
+msgid "Porto Alegre"
+msgstr "�n desf�urare"
+
+#: my-evolution/Locations.h:1785
+msgid "Porto Alegre Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:1786
+#, fuzzy
+msgid "Portoroz"
+msgstr "Portret"
+
+#: my-evolution/Locations.h:1787
+#, fuzzy
+msgid "Porto Santo"
+msgstr "Portret"
+
+#: my-evolution/Locations.h:1788
+msgid "Porto Velho"
+msgstr ""
+
+#: my-evolution/Locations.h:1789
+#, fuzzy
+msgid "Port Said"
+msgstr "Portret"
+
+#: my-evolution/Locations.h:1790
+msgid "Portsmouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1792
+#, fuzzy
+msgid "Posadas"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:1793
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1796
+msgid "Poza Rica"
+msgstr ""
+
+#: my-evolution/Locations.h:1797
+#, fuzzy
+msgid "Poznan"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:1798
+#, fuzzy
+msgid "Praha"
+msgstr "Gunoi"
+
+#: my-evolution/Locations.h:1799
+#, fuzzy
+msgid "Pratica di Mare"
+msgstr "Burni�� par�ial"
+
+#: my-evolution/Locations.h:1800
+msgid "Prescott"
+msgstr ""
+
+#: my-evolution/Locations.h:1801
+#, fuzzy
+msgid "Presidente Prudente"
+msgstr "Previzualizeaz� tip�rirea"
+
+#: my-evolution/Locations.h:1802
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1804
+#, fuzzy
+msgid "Pretoria"
+msgstr "Portret"
+
+#: my-evolution/Locations.h:1805
+#, fuzzy
+msgid "Preveza"
+msgstr "Prev"
+
+#: my-evolution/Locations.h:1806
+msgid "Price-Carbon"
+msgstr ""
+
+#: my-evolution/Locations.h:1807
+#, fuzzy
+msgid "Pristina"
+msgstr "Tradi�ional"
+
+#: my-evolution/Locations.h:1808
+#, fuzzy
+msgid "Providence"
+msgstr "_Stat/Provincie"
+
+#: my-evolution/Locations.h:1809
+#, fuzzy
+msgid "Provincetown"
+msgstr "Previzualizare"
+
+#: my-evolution/Locations.h:1810
+#, fuzzy
+msgid "Provo"
+msgstr "Prev"
+
+#: my-evolution/Locations.h:1811
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1812
+msgid "Pucallpa"
+msgstr ""
+
+#: my-evolution/Locations.h:1813
+msgid "Pudahuel"
+msgstr ""
+
+#: my-evolution/Locations.h:1814
+#, fuzzy
+msgid "Puebla"
+msgstr "Public"
+
+#: my-evolution/Locations.h:1815
+#, fuzzy
+msgid "Pueblo"
+msgstr "Public"
+
+#: my-evolution/Locations.h:1816
+msgid "Puerto Barrios"
+msgstr ""
+
+#: my-evolution/Locations.h:1817
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1818
+msgid "Puerto Escondido"
+msgstr ""
+
+#: my-evolution/Locations.h:1819
+msgid "Puerto Lempira"
+msgstr ""
+
+#: my-evolution/Locations.h:1820
+#, fuzzy
+msgid "Puerto Limon"
+msgstr "�ntrebare"
+
+#: my-evolution/Locations.h:1821
+msgid "Puerto Maldonado"
+msgstr ""
+
+#: my-evolution/Locations.h:1822
+msgid "Puerto Montt"
+msgstr ""
+
+#: my-evolution/Locations.h:1823
+msgid "Puerto Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1825
+#, fuzzy
+msgid "Puerto Suarez"
+msgstr "Rezumat"
+
+#: my-evolution/Locations.h:1826
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1827
+#, fuzzy
+msgid "Pula"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:1828
+#, fuzzy
+msgid "Pullman"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:1829
+msgid "Punta Arenas"
+msgstr ""
+
+#: my-evolution/Locations.h:1830
+#, fuzzy
+msgid "Punta Cana"
+msgstr "Tip�re�te calendar"
+
+#: my-evolution/Locations.h:1831
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1835
+msgid "Pyongyang"
+msgstr ""
+
+#: my-evolution/Locations.h:1837
+#, fuzzy
+msgid "Quantico"
+msgstr "�ntrebare"
+
+#: my-evolution/Locations.h:1838
+#, fuzzy
+msgid "Quebec"
+msgstr "Subiect"
+
+#: my-evolution/Locations.h:1839
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1842
+msgid "Quimper"
+msgstr ""
+
+#: my-evolution/Locations.h:1843
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1850
+#, fuzzy
+msgid "Rapid City"
+msgstr "R�spuns la"
+
+#: my-evolution/Locations.h:1851
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1852
+msgid "Ras Al Khaimah"
+msgstr ""
+
+#: my-evolution/Locations.h:1853
+#, fuzzy
+msgid "Rawlins"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:1854
+#, fuzzy
+msgid "Reading"
+msgstr "Titluri"
+
+#: my-evolution/Locations.h:1855
+msgid "Rebun Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1856
+#, fuzzy
+msgid "Recife"
+msgstr "Primit"
+
+#: my-evolution/Locations.h:1857
+msgid "Red Bluff"
+msgstr ""
+
+#: my-evolution/Locations.h:1858
+#, fuzzy
+msgid "Redding"
+msgstr "Titluri"
+
+#: my-evolution/Locations.h:1859
+#, fuzzy
+msgid "Redig"
+msgstr "Cite�te"
+
+#: my-evolution/Locations.h:1860
+#, fuzzy
+msgid "Redmond"
+msgstr "Repetare"
+
+#: my-evolution/Locations.h:1861
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1863
+msgid "Reggio Calabria"
+msgstr ""
+
+#: my-evolution/Locations.h:1864
+#, fuzzy
+msgid "Regina"
+msgstr "Regiuni"
+
+#: my-evolution/Locations.h:1865
+msgid "Reims-Champagne"
+msgstr ""
+
+#: my-evolution/Locations.h:1866
+#, fuzzy
+msgid "Rennes"
+msgstr "Memorator"
+
+#: my-evolution/Locations.h:1867
+#, fuzzy
+msgid "Reno"
+msgstr "Repetare"
+
+#: my-evolution/Locations.h:1868
+#, fuzzy
+msgid "Renton"
+msgstr "Regiuni"
+
+#: my-evolution/Locations.h:1869
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1870
+#, fuzzy
+msgid "Reus"
+msgstr "Reguli"
+
+#: my-evolution/Locations.h:1871
+#, fuzzy
+msgid "Reyes"
+msgstr "ani"
+
+#: my-evolution/Locations.h:1872
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1873
+#, fuzzy
+msgid "Reynosa"
+msgstr "Re�ncarc�"
+
+#: my-evolution/Locations.h:1874
+#, fuzzy
+msgid "Rhinelander"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:1875
+msgid "Rhode Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1876
+msgid "Riberalta"
+msgstr ""
+
+#: my-evolution/Locations.h:1877
+msgid "Richmond"
+msgstr ""
+
+#: my-evolution/Locations.h:1878
+#, fuzzy
+msgid "Rickenbacker"
+msgstr "Porecl�"
+
+#: my-evolution/Locations.h:1879
+#, fuzzy
+msgid "Rieti"
+msgstr "Grindin�"
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rifle"
+msgstr "Rol"
+
+#: my-evolution/Locations.h:1881
+#, fuzzy
+msgid "Riga"
+msgstr "Dreapta:"
+
+#: my-evolution/Locations.h:1882
+#, fuzzy
+msgid "Rijeka"
+msgstr "Cite�te"
+
+#: my-evolution/Locations.h:1883
+#, fuzzy
+msgid "Rimini"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:1884
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1885
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1886
+msgid "Rio Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1887
+#, fuzzy
+msgid "Rioja"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1888
+msgid "Rio / Jacarepagua"
+msgstr ""
+
+#: my-evolution/Locations.h:1889
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+msgid "Rishiri Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1891
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+#, fuzzy
+msgid "Rivera"
+msgstr "Mai mare"
+
+#: my-evolution/Locations.h:1893
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1894
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1895
+msgid "Riverton"
+msgstr ""
+
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "Tip�re�te"
+
+#: my-evolution/Locations.h:1897
+#, fuzzy
+msgid "Rivolto"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:1898
+#, fuzzy
+msgid "Riyadh"
+msgstr "Cite�te"
+
+#: my-evolution/Locations.h:1899
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1900
+#, fuzzy
+msgid "Roatan"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:1901
+#, fuzzy
+msgid "Robore"
+msgstr "�nainte"
+
+#: my-evolution/Locations.h:1902
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1903
+msgid "Rockford"
+msgstr ""
+
+#: my-evolution/Locations.h:1904
+#, fuzzy
+msgid "Rockland"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:1905
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1907
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1908
+#, fuzzy
+msgid "Rodos"
+msgstr "Repetare"
+
+#: my-evolution/Locations.h:1909
+#, fuzzy
+msgid "Rogers"
+msgstr "Dosare"
+
+#: my-evolution/Locations.h:1910
+msgid "Roma/Ciampino"
+msgstr ""
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1917
+msgid "Roosevelt"
+msgstr ""
+
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Roros"
+msgstr "Culori"
+
+#: my-evolution/Locations.h:1919
+msgid "Rorvik/Ryum"
+msgstr ""
+
+#: my-evolution/Locations.h:1920
+#, fuzzy
+msgid "Rosario"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:1921
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1922
+#, fuzzy
+msgid "Roseglen"
+msgstr "Rol"
+
+#: my-evolution/Locations.h:1923
+#, fuzzy
+msgid "Rost"
+msgstr "Gazd�"
+
+#: my-evolution/Locations.h:1924
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1927
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1928
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:1929
+#, fuzzy
+msgid "Rurrenabaque"
+msgstr "Revenire"
+
+#: my-evolution/Locations.h:1930
+msgid "Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1931
+#, fuzzy
+msgid "Russia"
+msgstr "August"
+
+#: my-evolution/Locations.h:1932
+#, fuzzy
+msgid "Rutland"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:1933
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1935
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1936
+msgid "Sabine Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:1937
+#, fuzzy
+msgid "Sacramento"
+msgstr "Departament"
+
+#: my-evolution/Locations.h:1938
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1939
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1940
+#, fuzzy
+msgid "Saginaw"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:1941
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1944
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1945
+#, fuzzy
+msgid "Saint Mary's"
+msgstr "Tip�re�te calendar"
+
+#: my-evolution/Locations.h:1946
+msgid "Saint Mawgan"
+msgstr ""
+
+#: my-evolution/Locations.h:1947
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1948
+msgid "Saint Paul"
+msgstr ""
+
+#: my-evolution/Locations.h:1949
+#, fuzzy
+msgid "Saiq"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:1950
+msgid "Salalah"
+msgstr ""
+
+#: my-evolution/Locations.h:1951
+#, fuzzy
+msgid "Salem"
+msgstr "Salveaz�"
+
+#: my-evolution/Locations.h:1952
+#, fuzzy
+msgid "Salida"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:1953
+msgid "Salida-Harriet"
+msgstr ""
+
+#: my-evolution/Locations.h:1954
+#, fuzzy
+msgid "Salina"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:1955
+#, fuzzy
+msgid "Salinas"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:1956
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1957
+#, fuzzy
+msgid "Salmon"
+msgstr "Fum"
+
+#: my-evolution/Locations.h:1958
+msgid "Salmon (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1959
+#, fuzzy
+msgid "Salta"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:1960
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1961
+msgid "Salt Lake City"
+msgstr ""
+
+#: my-evolution/Locations.h:1962
+#, fuzzy
+msgid "Salto"
+msgstr "S�m"
+
+#: my-evolution/Locations.h:1963
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+msgid "Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:1965
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1966
+#, fuzzy
+msgid "Samara"
+msgstr "Fum"
+
+#: my-evolution/Locations.h:1967
+#, fuzzy
+msgid "Samos"
+msgstr "Fum"
+
+#: my-evolution/Locations.h:1968
+#, fuzzy
+msgid "Samsun"
+msgstr "Dum"
+
+#: my-evolution/Locations.h:1969
+msgid "Sana'A"
+msgstr ""
+
+#: my-evolution/Locations.h:1970
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+msgid "San Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1975
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1976
+#, fuzzy
+msgid "San Carlos"
+msgstr "Salveaz� �i �nchide"
+
+#: my-evolution/Locations.h:1977
+#, fuzzy
+msgid "Sandane"
+msgstr "Dum"
+
+#: my-evolution/Locations.h:1978
+#, fuzzy
+msgid "Sandberg"
+msgstr "Expeditor"
+
+#: my-evolution/Locations.h:1979
+#, fuzzy
+msgid "Sanderson"
+msgstr "Expeditor"
+
+#: my-evolution/Locations.h:1980
+msgid "San Diego"
+msgstr ""
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1986
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1987
+msgid "Sand Point"
+msgstr ""
+
+#: my-evolution/Locations.h:1988
+msgid "San Fernando De Apure"
+msgstr ""
+
+#: my-evolution/Locations.h:1989
+#, fuzzy
+msgid "Sanford"
+msgstr "pentru"
+
+#: my-evolution/Locations.h:1990
+msgid "San Francisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1991
+#, fuzzy
+msgid "Sangju"
+msgstr "Umbrire"
+
+#: my-evolution/Locations.h:1992
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1993
+msgid "San Joaquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1994
+#, fuzzy
+msgid "San Jose"
+msgstr "Salveaz� �i �nchide"
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1997
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1998
+#, fuzzy
+msgid "San Juan"
+msgstr "Dum"
+
+#: my-evolution/Locations.h:1999
+msgid "Sankt-Peterburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2000
+#, fuzzy
+msgid "Sanliurfa"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:2001
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2002
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2003
+msgid "San Miguel"
+msgstr ""
+
+#: my-evolution/Locations.h:2004
+msgid "San Nicholas Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2005
+msgid "San Salvador"
+msgstr ""
+
+#: my-evolution/Locations.h:2006
+msgid "San Sebastian"
+msgstr ""
+
+#: my-evolution/Locations.h:2007
+msgid "Santa Ana"
+msgstr ""
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+msgid "Santa Maria"
+msgstr ""
+
+#: my-evolution/Locations.h:2012
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2013
+msgid "Santa Monica"
+msgstr ""
+
+#: my-evolution/Locations.h:2014
+#, fuzzy
+msgid "Santander"
+msgstr "Expeditor"
+
+#: my-evolution/Locations.h:2015
+#, fuzzy
+msgid "Santarem"
+msgstr "dup�"
+
+#: my-evolution/Locations.h:2016
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2017
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+msgid "Santiago"
+msgstr ""
+
+#: my-evolution/Locations.h:2019
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2020
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2021
+#, fuzzy
+msgid "Santorini"
+msgstr "Lapovi�� �i ninsoare"
+
+#: my-evolution/Locations.h:2022
+#, fuzzy
+msgid "Santos"
+msgstr "Stare"
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+msgid "Sao Luiz"
+msgstr ""
+
+#: my-evolution/Locations.h:2025
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2028
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+#, fuzzy
+msgid "Sarasota"
+msgstr "Fum"
+
+#: my-evolution/Locations.h:2030
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+#, fuzzy
+msgid "Sarzana"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:2032
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2033
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2038
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2039
+msgid "Sawyer AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2040
+#, fuzzy
+msgid "Sayun"
+msgstr "Dum"
+
+#: my-evolution/Locations.h:2041
+#, fuzzy
+msgid "Scatsta"
+msgstr "Stare"
+
+#: my-evolution/Locations.h:2042
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2045
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2046
+msgid "Scottsdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Scranton"
+msgstr "Organiza�ie"
+
+#: my-evolution/Locations.h:2048
+msgid "Seattle"
+msgstr ""
+
+#: my-evolution/Locations.h:2049
+#, fuzzy
+msgid "Seattle-Boeing"
+msgstr "Set�ri"
+
+#: my-evolution/Locations.h:2050
+#, fuzzy
+msgid "Sedalia"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:2051
+#, fuzzy
+msgid "Seeb"
+msgstr "V�zut"
+
+#: my-evolution/Locations.h:2052
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+#, fuzzy
+msgid "Sendai Airport"
+msgstr "_Data �nceput:"
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2058
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2059
+msgid "Sevilla"
+msgstr ""
+
+#: my-evolution/Locations.h:2060
+#, fuzzy
+msgid "Seward"
+msgstr "Caut�"
+
+#: my-evolution/Locations.h:2061
+msgid "Sexton Summit"
+msgstr ""
+
+#: my-evolution/Locations.h:2062
+#, fuzzy
+msgid "Shanghai"
+msgstr "Umbrire"
+
+#: my-evolution/Locations.h:2063
+msgid "Shannon"
+msgstr ""
+
+#: my-evolution/Locations.h:2064
+#, fuzzy
+msgid "Sharjah"
+msgstr "Caut�"
+
+#: my-evolution/Locations.h:2065
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+#: my-evolution/Locations.h:2066
+#, fuzzy
+msgid "Sharurah"
+msgstr "S�mb�t�"
+
+#: my-evolution/Locations.h:2067
+#, fuzzy
+msgid "Shawbury"
+msgstr "S�mb�t�"
+
+#: my-evolution/Locations.h:2068
+#, fuzzy
+msgid "Shearwater"
+msgstr "Data �nceput"
+
+#: my-evolution/Locations.h:2069
+msgid "Sheboygan"
+msgstr ""
+
+#: my-evolution/Locations.h:2070
+#, fuzzy
+msgid "Sheldon"
+msgstr "V�zut"
+
+#: my-evolution/Locations.h:2071
+msgid "Shelter Cove"
+msgstr ""
+
+#: my-evolution/Locations.h:2072
+#, fuzzy
+msgid "Shelton"
+msgstr "Selec�ie"
+
+#: my-evolution/Locations.h:2073
+msgid "Shenandoah"
+msgstr ""
+
+#: my-evolution/Locations.h:2074
+#, fuzzy
+msgid "Sheridan"
+msgstr "Dum"
+
+#: my-evolution/Locations.h:2075
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2076
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2077
+msgid "Shingle Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2078
+#, fuzzy
+msgid "Shiraz"
+msgstr "M�rime"
+
+#: my-evolution/Locations.h:2079
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2080
+msgid "Shizuhama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2081
+#, fuzzy
+msgid "Shoreham"
+msgstr "Punctaj"
+
+#: my-evolution/Locations.h:2082
+#, fuzzy
+msgid "Show Low"
+msgstr "Ninsoare superficial�"
+
+#: my-evolution/Locations.h:2083
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2084
+msgid "Shreveport Regional"
+msgstr ""
+
+#: my-evolution/Locations.h:2085
+#, fuzzy
+msgid "Sidney"
+msgstr "Tip�re�te"
+
+#: my-evolution/Locations.h:2086
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2087
+msgid "Siloam Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2088
+#, fuzzy
+msgid "Silver City"
+msgstr "Securitate"
+
+#: my-evolution/Locations.h:2089
+#, fuzzy
+msgid "Sindal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2091
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2097
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2098
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+#: my-evolution/Locations.h:2099
+#, fuzzy
+msgid "Skive"
+msgstr "M�rime"
+
+#: my-evolution/Locations.h:2100
+#, fuzzy
+msgid "Skopje"
+msgstr "Stop"
+
+#: my-evolution/Locations.h:2101
+#, fuzzy
+msgid "Skwentna"
+msgstr "Trimis"
+
+#: my-evolution/Locations.h:2102
+#, fuzzy
+msgid "Slana"
+msgstr "Fum"
+
+#: my-evolution/Locations.h:2105
+#, fuzzy
+msgid "Smithers"
+msgstr "minute"
+
+#: my-evolution/Locations.h:2106
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2107
+#, fuzzy
+msgid "Snowshoe Lake"
+msgstr "Avers� de z�pad�"
+
+#: my-evolution/Locations.h:2108
+#, fuzzy
+msgid "Sochi"
+msgstr "Sud"
+
+#: my-evolution/Locations.h:2109
+#, fuzzy
+msgid "Socorro"
+msgstr "Punctaj"
+
+#: my-evolution/Locations.h:2110
+#, fuzzy
+msgid "Socotra"
+msgstr "Punctaj"
+
+#: my-evolution/Locations.h:2111
+#, fuzzy
+msgid "Soda Springs"
+msgstr "Lapovi�� �i ninsoare"
+
+#: my-evolution/Locations.h:2112
+#, fuzzy
+msgid "Sofia"
+msgstr "Normal"
+
+#: my-evolution/Locations.h:2113
+#, fuzzy
+msgid "Sogndal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2114
+msgid "Soldotna"
+msgstr ""
+
+#: my-evolution/Locations.h:2115
+#, fuzzy
+msgid "Somerset"
+msgstr "Ploaie toren�ial�"
+
+#: my-evolution/Locations.h:2116
+#, fuzzy
+msgid "Sonderborg"
+msgstr "Expeditor"
+
+#: my-evolution/Locations.h:2117
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2120
+#, fuzzy
+msgid "Southampton"
+msgstr "Sud Est"
+
+#: my-evolution/Locations.h:2121
+#, fuzzy
+msgid "South Bend"
+msgstr "Sud"
+
+#: my-evolution/Locations.h:2122
+msgid "South Carolina"
+msgstr ""
+
+#: my-evolution/Locations.h:2123
+#, fuzzy
+msgid "South Dakota"
+msgstr "Sud Est"
+
+#: my-evolution/Locations.h:2124
+#, fuzzy
+msgid "Southend"
+msgstr "Sud"
+
+#: my-evolution/Locations.h:2125
+msgid "South Marsh Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2126
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2128
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2129
+#, fuzzy
+msgid "Spencer"
+msgstr "Expeditor"
+
+#: my-evolution/Locations.h:2130
+msgid "Spickard"
+msgstr ""
+
+#: my-evolution/Locations.h:2131
+#, fuzzy
+msgid "Split"
+msgstr "Cea��"
+
+#: my-evolution/Locations.h:2132
+#, fuzzy
+msgid "Spokane"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:2133
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2134
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "Springfield"
+msgstr "Simplificat"
+
+#: my-evolution/Locations.h:2136
+msgid "Stampede Pass"
+msgstr ""
+
+#: my-evolution/Locations.h:2137
+#, fuzzy
+msgid "State College"
+msgstr "�nt�lnire �ncheiat�:"
+
+#: my-evolution/Locations.h:2138
+#, fuzzy
+msgid "Stauning"
+msgstr "Set�ri"
+
+#: my-evolution/Locations.h:2139
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2140
+msgid "Stavanger/Sola"
+msgstr ""
+
+#: my-evolution/Locations.h:2141
+#, fuzzy
+msgid "Staverton"
+msgstr "Set�ri"
+
+#: my-evolution/Locations.h:2142
+#, fuzzy
+msgid "Stavropol"
+msgstr "Stop"
+
+#: my-evolution/Locations.h:2143
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2144
+msgid "Steamboat Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:2145
+#, fuzzy
+msgid "Stephenville"
+msgstr "Program"
+
+#: my-evolution/Locations.h:2146
+msgid "St. George"
+msgstr ""
+
+#: my-evolution/Locations.h:2147
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2148
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2149
+msgid "St Johnsbury"
+msgstr ""
+
+#: my-evolution/Locations.h:2150
+#, fuzzy
+msgid "St Joseph"
+msgstr "Stop"
+
+#: my-evolution/Locations.h:2151
+#, fuzzy
+msgid "St Louis"
+msgstr "Opre�te �nc�rcarea"
+
+#: my-evolution/Locations.h:2152
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2157
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2158
+#, fuzzy
+msgid "Storm Lake"
+msgstr "Data �nceput"
+
+#: my-evolution/Locations.h:2159
+#, fuzzy
+msgid "Stornoway"
+msgstr "Acum"
+
+#: my-evolution/Locations.h:2160
+#, fuzzy
+msgid "St Paul"
+msgstr "Stare"
+
+#: my-evolution/Locations.h:2161
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2164
+#, fuzzy
+msgid "Strevell"
+msgstr "Subarbore"
+
+#: my-evolution/Locations.h:2165
+msgid "St Simon's Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2166
+msgid "Stumpy Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2167
+#, fuzzy
+msgid "Sturgeon Bay"
+msgstr "S�mb�t�"
+
+#: my-evolution/Locations.h:2168
+msgid "Stuttgart"
+msgstr ""
+
+#: my-evolution/Locations.h:2169
+#, fuzzy
+msgid "Sucre"
+msgstr "Punctaj"
+
+#: my-evolution/Locations.h:2170
+msgid "Sumburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:2171
+#, fuzzy
+msgid "Sumter"
+msgstr "Rezumat"
+
+#: my-evolution/Locations.h:2172
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2174
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2175
+msgid "Superior"
+msgstr ""
+
+#: my-evolution/Locations.h:2177
+#, fuzzy
+msgid "Sutton"
+msgstr "Dum"
+
+#: my-evolution/Locations.h:2178
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2179
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2188
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2189
+msgid "Szombathely"
+msgstr ""
+
+#: my-evolution/Locations.h:2190
+#, fuzzy
+msgid "Tabatinga"
+msgstr "Tradi�ional"
+
+#: my-evolution/Locations.h:2191
+msgid "Tabriz"
+msgstr ""
+
+#: my-evolution/Locations.h:2192
+#, fuzzy
+msgid "Tabuk"
+msgstr "Sarcin�"
+
+#: my-evolution/Locations.h:2193
+msgid "Tachikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+#, fuzzy
+msgid "Tacna"
+msgstr "Martie"
+
+#: my-evolution/Locations.h:2195
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2199
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+#, fuzzy
+msgid "Taejon"
+msgstr "Atunci"
+
+#: my-evolution/Locations.h:2201
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2202
+msgid "Taichung"
+msgstr ""
+
+#: my-evolution/Locations.h:2203
+#, fuzzy
+msgid "Taif"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:2204
+#, fuzzy
+msgid "Tainan"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:2206
+#, fuzzy
+msgid "Taiyuan"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:2207
+#, fuzzy
+msgid "Taiz"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:2208
+#, fuzzy
+msgid "Tajima"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:2209
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Talara"
+msgstr ""
+
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Talinn"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:2212
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tallahassee"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2215
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2216
+#, fuzzy
+msgid "Tampa"
+msgstr "Japonez"
+
+#: my-evolution/Locations.h:2217
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2218
+#, fuzzy
+msgid "Tampere"
+msgstr "H�rtie"
+
+#: my-evolution/Locations.h:2219
+msgid "Tampico"
+msgstr ""
+
+#: my-evolution/Locations.h:2220
+#, fuzzy
+msgid "Tanana"
+msgstr "Canada"
+
+#: my-evolution/Locations.h:2221
+msgid "Tanegashima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2222
+#, fuzzy
+msgid "Taos"
+msgstr "Cea mai sc�zut�"
+
+#: my-evolution/Locations.h:2223
+#, fuzzy
+msgid "Taoyuan"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:2224
+msgid "Tapachula"
+msgstr ""
+
+#: my-evolution/Locations.h:2225
+#, fuzzy
+msgid "Taranto"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:2226
+#, fuzzy
+msgid "Tarbes"
+msgstr "Sarcin�"
+
+#: my-evolution/Locations.h:2227
+#, fuzzy
+msgid "Tarija"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:2228
+msgid "Tarvisio"
+msgstr ""
+
+#: my-evolution/Locations.h:2229
+#, fuzzy
+msgid "Tatalina"
+msgstr "Tradi�ional"
+
+#: my-evolution/Locations.h:2230
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2235
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2236
+#, fuzzy
+msgid "Tela"
+msgstr "Telex"
+
+#: my-evolution/Locations.h:2237
+#, fuzzy
+msgid "Temple"
+msgstr "Telex"
+
+#: my-evolution/Locations.h:2238
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2244
+msgid "Texarkana"
+msgstr ""
+
+#: my-evolution/Locations.h:2245
+#, fuzzy
+msgid "Texas"
+msgstr "Sarcin�"
+
+#: my-evolution/Locations.h:2246
+#, fuzzy
+msgid "The Dalles"
+msgstr "Program"
+
+#: my-evolution/Locations.h:2247
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2248
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2249
+msgid "Thiruvananthapuram"
+msgstr ""
+
+#: my-evolution/Locations.h:2250
+#, fuzzy
+msgid "Thisted"
+msgstr "Titlu"
+
+#: my-evolution/Locations.h:2251
+msgid "Thompson Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2252
+#, fuzzy
+msgid "Thumrait"
+msgstr "Joi"
+
+#: my-evolution/Locations.h:2253
+#, fuzzy
+msgid "Tianjin"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:2254
+#, fuzzy
+msgid "Tijuana"
+msgstr "Grindin� u�oar�"
+
+#: my-evolution/Locations.h:2255
+msgid "Timisoara"
+msgstr ""
+
+#: my-evolution/Locations.h:2256
+msgid "Tin City"
+msgstr ""
+
+#: my-evolution/Locations.h:2257
+#, fuzzy
+msgid "Tirana"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:2258
+#, fuzzy
+msgid "Tiree"
+msgstr "Grec"
+
+#: my-evolution/Locations.h:2259
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2260
+msgid "Tiruchchirapalli"
+msgstr ""
+
+#: my-evolution/Locations.h:2261
+#, fuzzy
+msgid "Titusville"
+msgstr "Titlu"
+
+#: my-evolution/Locations.h:2262
+#, fuzzy
+msgid "Tivat"
+msgstr "Privat"
+
+#: my-evolution/Locations.h:2263
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2267
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+msgid "Tokunoshima Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2269
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2271
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2272
+msgid "Tokyo New International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2273
+#, fuzzy
+msgid "Toledo"
+msgstr "Comut�"
+
+#: my-evolution/Locations.h:2274
+msgid "Toluca"
+msgstr ""
+
+#: my-evolution/Locations.h:2275
+#, fuzzy
+msgid "Tonopah"
+msgstr "Ast�zi"
+
+#: my-evolution/Locations.h:2276
+#, fuzzy
+msgid "Topeka"
+msgstr "Sus:"
+
+#: my-evolution/Locations.h:2277
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2279
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2280
+msgid "Toronto"
+msgstr ""
+
+#: my-evolution/Locations.h:2281
+#, fuzzy
+msgid "Torp"
+msgstr "Sus:"
+
+#: my-evolution/Locations.h:2282
+#, fuzzy
+msgid "Torrance"
+msgstr "Renun��"
+
+#: my-evolution/Locations.h:2283
+#, fuzzy
+msgid "Torreon"
+msgstr "Corean"
+
+#: my-evolution/Locations.h:2284
+#, fuzzy
+msgid "Tottori Airport"
+msgstr "_Data �nceput:"
+
+#: my-evolution/Locations.h:2285
+#, fuzzy
+msgid "Toulouse"
+msgstr "�nchide"
+
+#: my-evolution/Locations.h:2286
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2290
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2291
+msgid "Trabzon"
+msgstr ""
+
+#: my-evolution/Locations.h:2292
+#, fuzzy
+msgid "Trapani"
+msgstr "Japonez"
+
+#: my-evolution/Locations.h:2293
+msgid "Traverse City"
+msgstr ""
+
+#: my-evolution/Locations.h:2294
+#, fuzzy
+msgid "Trelew"
+msgstr "Telex"
+
+#: my-evolution/Locations.h:2295
+#, fuzzy
+msgid "Trenton"
+msgstr "Orientare"
+
+#: my-evolution/Locations.h:2296
+#, fuzzy
+msgid "Trevico"
+msgstr "Precedent"
+
+#: my-evolution/Locations.h:2297
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2298
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2299
+#, fuzzy
+msgid "Trieste"
+msgstr "Test"
+
+#: my-evolution/Locations.h:2300
+msgid "Trinidad"
+msgstr ""
+
+#: my-evolution/Locations.h:2301
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2304
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2305
+msgid "Troyes/Barberey"
+msgstr ""
+
+#: my-evolution/Locations.h:2306
+#, fuzzy
+msgid "Truckee"
+msgstr "Mar"
+
+#: my-evolution/Locations.h:2307
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2314
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2315
+msgid "Tulancingo"
+msgstr ""
+
+#: my-evolution/Locations.h:2316
+#, fuzzy
+msgid "Tulcea"
+msgstr "Mar�i"
+
+#: my-evolution/Locations.h:2317
+#, fuzzy
+msgid "Tulsa"
+msgstr "Mar�i"
+
+#: my-evolution/Locations.h:2318
+#, fuzzy
+msgid "Tupelo"
+msgstr "Mar"
+
+#: my-evolution/Locations.h:2319
+#, fuzzy
+msgid "Turaif"
+msgstr "Turc"
+
+#: my-evolution/Locations.h:2320
+#, fuzzy
+msgid "Turin"
+msgstr "Turc"
+
+#: my-evolution/Locations.h:2322
+#, fuzzy
+msgid "Turku"
+msgstr "Mar"
+
+#: my-evolution/Locations.h:2323
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2324
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+#: my-evolution/Locations.h:2325
+#, fuzzy
+msgid "Twenthe"
+msgstr "Tentativ�"
+
+#: my-evolution/Locations.h:2326
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2327
+msgid "Twin Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2328
+#, fuzzy
+msgid "Tyler"
+msgstr "Tip"
+
+#: my-evolution/Locations.h:2329
+msgid "Tyndall AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2330
+#, fuzzy
+msgid "Tyumen"
+msgstr "Mar"
+
+#: my-evolution/Locations.h:2331
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2332
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2340
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2341
+#, fuzzy
+msgid "United Arab Emirates "
+msgstr "(Mesaj f�r� titlu)"
+
+#: my-evolution/Locations.h:2344
+#, fuzzy
+msgid "Unst"
+msgstr "Nev�zut"
+
+#: my-evolution/Locations.h:2345
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2346
+#, fuzzy
+msgid "Uruapan"
+msgstr "Japonez"
+
+#: my-evolution/Locations.h:2347
+#, fuzzy
+msgid "Uruguaiana"
+msgstr "Ucrainean"
+
+#: my-evolution/Locations.h:2349
+msgid "Urumqi"
+msgstr ""
+
+#: my-evolution/Locations.h:2350
+#, fuzzy
+msgid "Utah"
+msgstr "Ata�eaz�"
+
+#: my-evolution/Locations.h:2351
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2353
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:2355
+#, fuzzy
+msgid "Vadso"
+msgstr "Radio"
+
+#: my-evolution/Locations.h:2356
+#, fuzzy
+msgid "Vaerlose"
+msgstr "Variabil"
+
+#: my-evolution/Locations.h:2357
+#, fuzzy
+msgid "Vagar"
+msgstr "Pager"
+
+#: my-evolution/Locations.h:2358
+msgid "Valdez 2"
+msgstr ""
+
+#: my-evolution/Locations.h:2359
+#, fuzzy
+msgid "Valdosta"
+msgstr "Mail"
+
+#: my-evolution/Locations.h:2360
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2361
+#, fuzzy
+msgid "Valencia"
+msgstr "Calendar"
+
+#: my-evolution/Locations.h:2362
+#, fuzzy
+msgid "Valentine"
+msgstr "Vedere inline"
+
+#: my-evolution/Locations.h:2363
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2366
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2367
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2368
+msgid "Van"
+msgstr ""
+
+#: my-evolution/Locations.h:2369
+msgid "Vancouver"
+msgstr ""
+
+#: my-evolution/Locations.h:2370
+#, fuzzy
+msgid "Vandel"
+msgstr "Renun��"
+
+#: my-evolution/Locations.h:2371
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2373
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+#, fuzzy
+msgid "Varadero"
+msgstr "Variabil"
+
+#: my-evolution/Locations.h:2375
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2376
+#, fuzzy
+msgid "Varna"
+msgstr "Variabil"
+
+#: my-evolution/Locations.h:2377
+#, fuzzy
+msgid "Vasteras"
+msgstr "dup�"
+
+#: my-evolution/Locations.h:2378
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2379
+msgid "Venezia"
+msgstr ""
+
+#: my-evolution/Locations.h:2381
+#, fuzzy
+msgid "Venice"
+msgstr "Unicod"
+
+#: my-evolution/Locations.h:2382
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2383
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2384
+#, fuzzy
+msgid "Vermont"
+msgstr "lun�"
+
+#: my-evolution/Locations.h:2385
+#, fuzzy
+msgid "Vernal"
+msgstr "General"
+
+#: my-evolution/Locations.h:2386
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+msgid "Vicenza"
+msgstr ""
+
+#: my-evolution/Locations.h:2388
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2390
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2393
+msgid "Vigo"
+msgstr ""
+
+#: my-evolution/Locations.h:2394
+#, fuzzy
+msgid "Vilhena"
+msgstr "Nume fi�ier:"
+
+#: my-evolution/Locations.h:2395
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+#, fuzzy
+msgid "Villahermosa"
+msgstr "Alarme vizuale"
+
+#: my-evolution/Locations.h:2398
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2404
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+#, fuzzy
+msgid "Visalia"
+msgstr "Alarme vizuale"
+
+#: my-evolution/Locations.h:2406
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2410
+msgid "Vladivostok"
+msgstr ""
+
+#: my-evolution/Locations.h:2411
+#, fuzzy
+msgid "Vlieland"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:2412
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2413
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2414
+#, fuzzy
+msgid "Volkel"
+msgstr "Rol"
+
+#: my-evolution/Locations.h:2415
+#, fuzzy
+msgid "Volk Field"
+msgstr "C�mpul De la"
+
+#: my-evolution/Locations.h:2416
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2417
+msgid "Voslau"
+msgstr ""
+
+#: my-evolution/Locations.h:2418
+#, fuzzy
+msgid "Waco"
+msgstr "Luni"
+
+#: my-evolution/Locations.h:2419
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2423
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2424
+msgid "Wallops Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2425
+msgid "Walnut Ridge"
+msgstr ""
+
+#: my-evolution/Locations.h:2426
+#, fuzzy
+msgid "Warner Robins"
+msgstr "Avertisment"
+
+#: my-evolution/Locations.h:2427
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2429
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2430
+msgid "Washington/Dulles"
+msgstr ""
+
+#: my-evolution/Locations.h:2431
+#, fuzzy
+msgid "Waterbury"
+msgstr "Vremea"
+
+#: my-evolution/Locations.h:2432
+#, fuzzy
+msgid "Waterloo"
+msgstr "Vremea"
+
+#: my-evolution/Locations.h:2433
+#, fuzzy
+msgid "Watertown"
+msgstr "Vremea"
+
+#: my-evolution/Locations.h:2434
+#, fuzzy
+msgid "Waterville"
+msgstr "Categorii"
+
+#: my-evolution/Locations.h:2435
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+msgid "Wausau"
+msgstr ""
+
+#: my-evolution/Locations.h:2437
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2438
+msgid "Waynesboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2439
+#, fuzzy
+msgid "Webster City"
+msgstr "Site web"
+
+#: my-evolution/Locations.h:2440
+#, fuzzy
+msgid "Wejh"
+msgstr "Mi"
+
+#: my-evolution/Locations.h:2441
+msgid "Wellington"
+msgstr ""
+
+#: my-evolution/Locations.h:2442
+#, fuzzy
+msgid "Wenatchee"
+msgstr "Vremea"
+
+#: my-evolution/Locations.h:2443
+#, fuzzy
+msgid "Wendover"
+msgstr "Expeditor"
+
+#: my-evolution/Locations.h:2444
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2445
+#, fuzzy
+msgid "West Burke"
+msgstr "Europa de vest"
+
+#: my-evolution/Locations.h:2446
+#, fuzzy
+msgid "Westerland"
+msgstr "Selec_teaz� �nl�n�uirea"
+
+#: my-evolution/Locations.h:2447
+#, fuzzy
+msgid "Westfield"
+msgstr "Vest"
+
+#: my-evolution/Locations.h:2448
+msgid "Westhampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2449
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2451
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2452
+msgid "West Yellowstone (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2453
+#, fuzzy
+msgid "Wheeling"
+msgstr "Progra_mare �nt�lniri"
+
+#: my-evolution/Locations.h:2454
+msgid "Whidbey Island"
+msgstr ""
+
+#: my-evolution/Locations.h:2455
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2461
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2462
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2463
+#, fuzzy
+msgid "Wick"
+msgstr "Porecl�"
+
+#: my-evolution/Locations.h:2464
+#, fuzzy
+msgid "Wien"
+msgstr "Mi"
+
+#: my-evolution/Locations.h:2465
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2467
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2468
+msgid "Williamsport"
+msgstr ""
+
+#: my-evolution/Locations.h:2469
+#, fuzzy
+msgid "Williston"
+msgstr "Cea��"
+
+#: my-evolution/Locations.h:2470
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2472
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2473
+msgid "Winchester"
+msgstr ""
+
+#: my-evolution/Locations.h:2474
+msgid "Windsor"
+msgstr ""
+
+#: my-evolution/Locations.h:2475
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2478
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+#, fuzzy
+msgid "Winslow"
+msgstr "acum"
+
+#: my-evolution/Locations.h:2480
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2481
+msgid "Winter Haven"
+msgstr ""
+
+#: my-evolution/Locations.h:2482
+#, fuzzy
+msgid "Winter Park"
+msgstr "Introduce�i parola pentru %s"
+
+#: my-evolution/Locations.h:2483
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+#, fuzzy
+msgid "Wisconsin"
+msgstr "secunde"
+
+#: my-evolution/Locations.h:2485
+msgid "Wisconsin Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:2486
+#, fuzzy
+msgid "Wise"
+msgstr "Mi"
+
+#: my-evolution/Locations.h:2487
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2488
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2489
+msgid "Woong Cheon"
+msgstr ""
+
+#: my-evolution/Locations.h:2490
+#, fuzzy
+msgid "Wooster"
+msgstr "Subsol:"
+
+#: my-evolution/Locations.h:2491
+#, fuzzy
+msgid "Worcester"
+msgstr "�ntotdeauna"
+
+#: my-evolution/Locations.h:2492
+#, fuzzy
+msgid "Worland"
+msgstr "Finlanda"
+
+#: my-evolution/Locations.h:2493
+#, fuzzy
+msgid "Worthington"
+msgstr "Lucrez"
+
+#: my-evolution/Locations.h:2494
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2495
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2496
+msgid "Wuchia Observatory"
+msgstr ""
+
+#: my-evolution/Locations.h:2497
+#, fuzzy
+msgid "Wyoming"
+msgstr "Lucrez"
+
+#: my-evolution/Locations.h:2498
+#, fuzzy
+msgid "Xiamen"
+msgstr "Nume"
+
+#: my-evolution/Locations.h:2499
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2505
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2506
+msgid "Yankton"
+msgstr ""
+
+#: my-evolution/Locations.h:2507
+#, fuzzy
+msgid "Yao Airport"
+msgstr "Nu importa"
+
+#: my-evolution/Locations.h:2508
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2510
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2511
+msgid "Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2513
+#, fuzzy
+msgid "Yenbo"
+msgstr "V�zut"
+
+#: my-evolution/Locations.h:2514
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2522
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2528
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2529
+msgid "Zacatecas"
+msgstr ""
+
+#: my-evolution/Locations.h:2530
+#, fuzzy
+msgid "Zadar"
+msgstr "Calendar"
+
+#: my-evolution/Locations.h:2531
+#, fuzzy
+msgid "Zagreb"
+msgstr "Pagin�"
+
+#: my-evolution/Locations.h:2532
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2533
+msgid "Zama Airfield"
+msgstr ""
+
+#: my-evolution/Locations.h:2534
+#, fuzzy
+msgid "Zanesville"
+msgstr "Revocat"
+
+#: my-evolution/Locations.h:2535
+msgid "Zaragoza"
+msgstr ""
+
+#: my-evolution/Locations.h:2536
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2537
+msgid "Zuni Pueblo"
+msgstr ""
+
+#: my-evolution/Locations.h:2538
+#, fuzzy
+msgid "Zurich"
+msgstr "Turc"
+
+#: 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 "�nt�lniri"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "Nu exist� �nt�lniri"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:400
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:379
+#: my-evolution/e-summary-calendar.c:402
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-calendar.c:420
+#, fuzzy
+msgid "No description"
+msgstr "Descriere:"
+
+#: my-evolution/e-summary-mail.c:151
 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
+#, fuzzy
+msgid "Local Folders"
+msgstr "Dosare speciale"
+
 #. 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:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Vorba zilei"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Cotele zilei"
 
-#: my-evolution/e-summary-preferences.c:945
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Adaug� o surs� de �tiri"
 
-#: my-evolution/e-summary-preferences.c:953
+#: my-evolution/e-summary-preferences.c:728
 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:957
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Nume:"
 
-#: my-evolution/e-summary-preferences.c:1503
-#, fuzzy
-msgid "Summary Settings"
-msgstr "Rezumatul con�ine"
-
-#: 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
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Eroare �n timpul desc�rc�rii RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:528
+#: my-evolution/e-summary-rdf.c:444
 #, fuzzy
 msgid "News Feed"
 msgstr "Dosar _nou"
 
-#: my-evolution/e-summary-tasks.c:248
+#: my-evolution/e-summary-shown.c:463
+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
+#, fuzzy
+msgid "<- Remove"
+msgstr "�te_rge"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Ploaie toren�ial�"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Nu exist� sarcini"
 
-#: my-evolution/e-summary-tasks.c:287
+#: my-evolution/e-summary-tasks.c:291
 #, fuzzy
 msgid "(No Description)"
 msgstr "Descriere:"
@@ -10584,24 +23747,26 @@ msgstr "Descriere:"
 msgid "My Weather"
 msgstr "Vremea"
 
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr "<dd><b>Serverul pentru vreme nu a putut fi contactat</b></dd>"
+#: my-evolution/e-summary-weather.c:279
+#, fuzzy
+msgid "There was an error downloading data for"
+msgstr "S-a produs o eroare la desc�rcarea sursei de �tiri</dt>"
 
-#: my-evolution/e-summary-weather.c:559
+#: my-evolution/e-summary-weather.c:501
 msgid "Weather"
 msgstr "Vremea"
 
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr "Regiuni"
-
 #: my-evolution/e-summary.c:193
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %d, %Y"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:488
+#, fuzzy
+msgid "Please wait..."
+msgstr "se termin� cu"
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
 msgstr "Rezumat"
@@ -10611,46 +23776,10 @@ msgstr "Rezumat"
 msgid "Printing of Summary failed"
 msgstr "Tip�rirea mesajului nereu�it�"
 
-#: my-evolution/main.c:66
+#: my-evolution/main.c:65
 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
-msgid "�F"
-msgstr ""
-
-#: my-evolution/metar.c:29
-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"
@@ -11049,11 +24178,6 @@ msgstr ""
 msgid "Freezing ice pellets"
 msgstr ""
 
-#. HAIL
-#: my-evolution/metar.c:217
-msgid "Hail"
-msgstr "Grindin�"
-
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "Grindin� �n �mprejurimi"
@@ -11816,173 +24940,137 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid " _Remove"
-msgstr "�te_rge"
-
-#: my-evolution/my-evolution.glade.h:2
-#, fuzzy
 msgid "Add n_ews feed"
 msgstr "Adaug� o surs� de �tiri"
 
-#: my-evolution/my-evolution.glade.h:3
-#, fuzzy
-msgid "Al_l stations:"
-msgstr "Toate sta�iile:"
-
-#: my-evolution/my-evolution.glade.h:4
-#, fuzzy
-msgid "All _folders:"
-msgstr "Toate dosarele:"
-
-#: my-evolution/my-evolution.glade.h:5
-#, fuzzy
-msgid "All news _feeds:"
-msgstr "Adaug� o surs� de �tiri"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 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:9
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
 msgid "Ma_x number of items shown:"
 msgstr "Num�rul maxim de elemente afi�ate:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 #, fuzzy
 msgid "One mont_h"
 msgstr "O lun�"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "One w_eek"
 msgstr "O s�pt�m�n�"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "R_efresh time (seconds):"
 msgstr "Durata de actualizare (secunde):"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 #, fuzzy
 msgid "Refresh _time (seconds):"
 msgstr "Durata de actualizare (secunde):"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "Arat� �ntreaga cale pentru dosare"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "Show _all tasks"
 msgstr "Arat� toate sarcinile"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "Arat� sarcilnile de azi"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "Sarcini"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr "Set�ri vreme"
 
-#: my-evolution/my-evolution.glade.h:22
-#, fuzzy
-msgid "_Display folders:"
-msgstr "Afi�eaz� dosarele:"
-
-#: my-evolution/my-evolution.glade.h:23
-#, fuzzy
-msgid "_Display stations:"
-msgstr "Afi�eaz� sta�iile:"
-
-#: my-evolution/my-evolution.glade.h:24
-#, fuzzy
-msgid "_Displayed feeds:"
-msgstr "Afi�eaz� dosarele:"
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 #, fuzzy
 msgid "_Five days"
 msgstr "Cinci zile"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "_Mail"
 msgstr "Mail"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "_News Feeds"
 msgstr "Dosar _nou"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "_One day"
 msgstr "O zi"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 #, fuzzy
 msgid "_Schedule"
 msgstr "Program"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 #, fuzzy
 msgid "_Weather"
 msgstr "Vremea"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Dosare speciale"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Shell Evolution."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Arat� detalii"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Anulare opera�ie"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Inbox"
-
-#: shell/e-local-storage.c:175
-#, fuzzy
-msgid "Outbox"
-msgstr "mbox"
-
-#: shell/e-local-storage.c:636
-#, fuzzy
-msgid "Local Folders"
-msgstr "Dosare speciale"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instalare 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"
@@ -11990,17 +25078,17 @@ msgstr ""
 "Acest� versiune de Evolution are nevoie s� instaleze fi�iere �n plus\n"
 "�n directorul dumneavoastr� personal"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "V� rog s� da�i clic pe \"OK\" pentru a instala fi�ierele, sau \"Renun��\" "
 "pentru ie�ire"
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Nu pot actualiza fi�ierele corect"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -12011,7 +25099,7 @@ msgstr ""
 "%s\n"
 "Eroare: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -12020,7 +25108,33 @@ msgstr ""
 "A ap�rut o eroare �n timpul copierii fi�ierului �n\n"
 "`%s'."
 
-#: shell/e-setup.c:281
+#: shell/e-setup.c:282
+#, fuzzy, c-format
+msgid ""
+"Evolution could not create directory\n"
+"%s:\n"
+"%s"
+msgstr ""
+"Nu pot crea directorul %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:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -12031,7 +25145,7 @@ msgstr ""
 "V� rog s�-l muta�i pentru a permite instalarea\n"
 "fi�ierelor utilizator Evolution."
 
-#: shell/e-setup.c:295
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -12040,7 +25154,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:320
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -12051,50 +25165,53 @@ msgstr ""
 "V� rog s�-l muta�i pentru a permite instalarea\n"
 "fi�ierelor utilizator Evolution."
 
-#: shell/e-shell-about-box.c:40
-#, fuzzy
-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."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Nu pot �terge dosarul `%s':\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Nu pot muta un dosar peste el �nsu�i."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Nu copia un dosar peste el �nsu�i."
 
-#: 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 "Nu pot muta un dosar �ntr-unul din descenden�ii s�i/"
 
-#: 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 "Preciza�i un dosar pentru a copia dosarul \"%s\" �n:"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Copiaz� dosarul"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Mut� dosarul"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -12103,18 +25220,18 @@ msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "�terg"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: shell/e-shell-folder-commands.c:425
 #, 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'?"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:502
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -12123,23 +25240,23 @@ msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:549
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Redenum�te dosarul '%s'"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:556
 #, fuzzy
 msgid "Rename folder"
 msgstr "Redenum�te dosarul '%s'"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:148
+#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-creation-dialog.c:168
 #, fuzzy, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Numele dosarului specificat este invalid."
 
-#: 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"
@@ -12148,7 +25265,7 @@ msgstr ""
 "Nu pot crea dosarulul precizat:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:267
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Creare dosar nou"
 
@@ -12160,11 +25277,11 @@ msgstr ""
 "Tipul fi�ierului selectat nu e valid pentru\n"
 "opera�ia cerut�."
 
-#: shell/e-shell-folder-selection-dialog.c:359
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nou..."
 
-#: 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 "(F�r� titlu)"
 
@@ -12186,7 +25303,7 @@ msgstr ""
 "Pute�i selecta \"Automat\" dac� nu �ti�i tipul �i Evolution va �ncerca s�-l "
 "determine automat."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
+#: 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 ""
 
@@ -12212,16 +25329,22 @@ msgstr ""
 "Se import� %s\n"
 "Se import� articol %d."
 
-#: shell/e-shell-importer.c:397
+#: shell/e-shell-importer.c:409
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Dosarul `%s' nu exist�."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: shell/e-shell-importer.c:420
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:424
+#: shell/e-shell-importer.c:435
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -12230,11 +25353,11 @@ msgstr ""
 "Nu se reu�e�te importul\n"
 "%s"
 
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:445
 msgid "Importing"
 msgstr "Se import�"
 
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:453
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -12243,17 +25366,17 @@ msgstr ""
 "Se import� %s.\n"
 "Start %s"
 
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:466
 #, c-format
 msgid "Error starting %s"
 msgstr "Eroare la start %s"
 
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:485
 #, c-format
 msgid "Error loading %s"
 msgstr "Eroare la �nc�rcarea %s"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:502
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12262,55 +25385,55 @@ msgstr ""
 "Se import� %s\n"
 "Se import� elementul 1."
 
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:572
 msgid "Automatic"
 msgstr "Automat"
 
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:623
 msgid "Filename:"
 msgstr "Nume fi�ier:"
 
-#: shell/e-shell-importer.c:617
+#: shell/e-shell-importer.c:628
 msgid "Select a file"
 msgstr "Selecteaz� un fi�ier"
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:638
 msgid "File type:"
 msgstr "Tip fi�ier:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:663
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:667
 #, fuzzy
 msgid "Import a single file"
 msgstr "Import fi�iere"
 
-#: 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
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: 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
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: 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
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De la:"
 
-#: shell/e-shell-importer.c:1014
+#: shell/e-shell-importer.c:1027
 msgid "Select folder"
 msgstr "Alege dosarul"
 
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1028
 msgid "Select a destination folder for importing this data"
 msgstr "Alege�i dosarul destina�ie pentru importul datelor"
 
-#: shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import"
 
@@ -12330,6 +25453,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Nou"
+
 #: shell/e-shell-utils.c:114
 #, fuzzy
 msgid "No folder name specified."
@@ -12348,72 +25477,63 @@ msgstr "Nu pot deschide directorul cache: %s"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 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:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nu poate fi rulat."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Despre Evolution..."
 
-#: shell/e-shell-view-menu.c:409
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Mergi la dosarul..."
 
-#: shell/e-shell-view-menu.c:410
+#: shell/e-shell-view-menu.c:445
 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:530
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Creaz� o scurt�tur� nou�"
 
-#: shell/e-shell-view-menu.c:531
+#: shell/e-shell-view-menu.c:566
 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:562
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:570
-#, fuzzy, c-format
-msgid "Error executing %s."
-msgstr "Eroare execu�ie filtru: %s: %s"
-
-#: shell/e-shell-view-menu.c:672
+#: shell/e-shell-view-menu.c:732
 #, fuzzy
 msgid "_Work Online"
 msgstr "Lucreaz� offline"
 
-#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Lucreaz� deconectat"
 
-#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Lucreaz� deconectat"
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Nici un dosar afi�at)"
 
-#: shell/e-shell-view.c:1574
+#: shell/e-shell-view.c:1818
 #, fuzzy, c-format
 msgid "%s (%d)"
 msgstr "%s (...)"
 
-#: shell/e-shell-view.c:1576
+#: shell/e-shell-view.c:1820
 #, fuzzy
 msgid "(None)"
 msgstr "(F�r� nume)"
 
-#: shell/e-shell-view.c:1623
+#: shell/e-shell-view.c:1867
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
@@ -12421,12 +25541,12 @@ msgstr ""
 "Evolution este actualmente conectat. Da�i clic pe buton pentru a lucra "
 "deconectat."
 
-#: shell/e-shell-view.c:1630
+#: shell/e-shell-view.c:1874
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution este �n proces de deconectare."
 
-#: shell/e-shell-view.c:1636
+#: shell/e-shell-view.c:1880
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
@@ -12434,12 +25554,20 @@ msgstr ""
 "Evolution este actualmente deconectat. Da�i clic pe buton pentru a lucra "
 "conectat."
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nu pot seta stocarea local� -- %s"
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12447,20 +25575,24 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Con�inut invalid al mesajului"
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Eroare generic�"
 
@@ -12579,78 +25711,73 @@ msgstr "�terge"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "�nl�tur� aceast� scurt�tur� din bara de scurt�turi"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Eroare la salvarea scurt�turilor."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Scurt�turi"
 
-#: shell/e-storage-set-view.c:658
-#, fuzzy, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Nu pot �terge dosarul `%s':\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Inbox"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(F�r� nume)"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "F�r� eroare"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Exist� deja un dosar cu acela�i nume"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Tipul de dosar specificat nu e valid"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "Eroare I/O"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Spa�iu insuficient pentru a crea dosarul"
 
-#: 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:499
 msgid "The specified folder was not found"
 msgstr "Dosarul specificat nu a fost g�sit"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Func�ie neimplementat� �n aceast� stocare"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Opera�ie nesuportat�"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Tipul specificat nu e suportat �n acest� stocare"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Dosarul specificat nu a fost g�sit"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 #, fuzzy
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nu pot muta un dosar �ntr-unul din descenden�ii s�i/"
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
@@ -12661,106 +25788,114 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<clic aici s� alege�i un dosar>"
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "Eroare necunoscut�"
+
+#: 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/evolution-shell-component.c:1045
 #, fuzzy
 msgid "CORBA error"
 msgstr "Eroare I/O"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 #, fuzzy
 msgid "Invalid argument"
 msgstr "Con�inut invalid al mesajului"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 #, fuzzy
 msgid "No owner"
 msgstr "Nimeni"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 #, fuzzy
 msgid "Not found"
 msgstr "Nu g�sesc fi�ierul"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Verific tipurile suportate"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Opera�ie anulat� de utilizator."
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 #, fuzzy
 msgid "Internal error"
 msgstr "Alt� eroare"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 #, fuzzy
 msgid "Exists"
 msgstr "Exist�"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Invalid"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Nu exist� dosarul %s"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 #, fuzzy
 msgid "No space left"
 msgstr "Nici un mesaj selectat"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:124
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr "Eroare necunoscut�"
-
-#: 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/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "Tip fi�ier:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -12889,322 +26024,291 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution a g�sit urm�toarea surs� de date:"
 
 #: shell/main.c:89
+msgid "Evolution"
+msgstr "Evolution"
+
+#: shell/main.c:95
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Set�ri Evolution..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nu pot accesa shell-ul Evolution."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nu pot accesa shell-ul Evolution."
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Invalideaz� ecranul de pornire"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "_Data �nceput:"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "_Data �nceput:"
+
+#: shell/main.c:320
 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:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nu pot ini�ializa sistemul de componente Bonobo."
 
+#: 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 "Eroare la �nc�rcarea fi�ierului: %s"
 
-#: tools/evolution-addressbook-export.c:46
-#, fuzzy
-msgid "Output File"
-msgstr "Deschide fi�ier"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "Insereaz� fi�ier"
 
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Deschide fi�ier"
+
 #: tools/evolution-addressbook-import.c:80
 #, fuzzy
 msgid "No filename provided."
 msgstr "Nici un destinatar specificat"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Copiaz�"
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Copiez �n folderul..."
 
-#: 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 "Copiaz� selec�ia"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+msgid "Copy to Folder..."
+msgstr "Copiez �n folderul..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Creaz� contact nou"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Creaz� list� nou� de contacte"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "Decupeaz�"
-
-#: 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 "Decupeaz� selec�ia"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "�terge contactele selectate"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:13
 #, fuzzy
-msgid "New List"
-msgstr "List� nou�"
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Trimite co_ntact la altcineva..."
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Lipe�te"
+#: ui/evolution-addressbook.xml.h:14
+msgid "Move to Folder..."
+msgstr "Mut �n folderul..."
 
-#: 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 "Lipe�te clipboard-ul"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Previzualizeaz� contactele ce vor fi tip�rite"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Tip�re�te contactele selectate"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "�terge contactele selectate"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Selecteaz� tot"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Selecteaz� toate contactele"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#, fuzzy
-msgid "Send _Message to Contact..."
-msgstr "Trimite _mesaj c�tre contact..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "�terge contactele selectate"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Trimite mesaj la contact"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "Trimite contact la altcineva"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Opre�te �nc�rcarea"
 
-#: 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 "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: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-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
 msgid "_Actions"
 msgstr "_Ac�iuni"
 
-#: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr "Surse _agend�..."
-
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr "_Contact"
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 #, fuzzy
 msgid "_Contact List"
 msgstr "_Contact"
 
-#: 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
 #, fuzzy
 msgid "_Forward Contact..."
 msgstr "_Contacte..."
 
-#: 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 "_Tip�re�te..."
-
 #: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "Mut� �n dosar..."
+
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Save as VCard"
 msgstr "Salveaz� ca �i card V"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "_Caut� contacte"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Selecteaz� tot"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:4
-#, fuzzy
-msgid "Create a New All Day _Event"
-msgstr "Creaz� un eveniment zilnic nou"
-
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-addressbook.xml.h:45
 #, fuzzy
-msgid "Create a New _Task"
-msgstr "Creaz� o sarcin� nou�"
-
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a _New Appointment"
-msgstr "Creaz� o �nt�lnire nou�"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr ""
+msgid "_Send Message to Contact..."
+msgstr "Trimite _mesaj c�tre contact..."
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "Zi"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
 msgid "Delete the appointment"
 msgstr "�terge aceast� �nt�lnire"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Mergi la"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Go back"
 msgstr "Mergi �napoi �n timp"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Go forward"
 msgstr "Mergi �nainte �n timp"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Mergi la _data"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Mergi la o anumit� data"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to today"
 msgstr "Mergi la ziua de azi"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Luna"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "�nt�lnire nou�"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr "Sarcin� nou�"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Previzualizeaz� calendar ce va fi tip�rit"
 
-#: 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 "Pre_vizualizeaz� tip�rire"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Print this calendar"
 msgstr "Tip�re�te acest calendar"
 
-#: 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
 #, fuzzy
 msgid "Show one day"
 msgstr "Arat� 1 zi"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Show one month"
 msgstr "Arat� 1 lun�"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Show one week"
 msgstr "Arat� 1 s�pt�m�n�"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Arat� s�pt�m�na de lucru"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "S�pt�m�n�"
 
-#: ui/evolution-calendar.xml.h:35
-#, fuzzy
-msgid "_Appointment..."
-msgstr "_�nt�lnire"
-
-#: ui/evolution-calendar.xml.h:36
-#, fuzzy
-msgid "_Calendar Settings..."
-msgstr "Set�ri _mail..."
-
-#: ui/evolution-calendar.xml.h:42
-#, fuzzy
-msgid "_Publish Free/Busy Information"
-msgstr "Aceasta e informa�ie liber-ocupat."
-
-#: ui/evolution-calendar.xml.h:43
-#, fuzzy
-msgid "_Task..."
-msgstr "Sarcin�"
-
 #: 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
@@ -13235,18 +26339,18 @@ msgstr "Previzualizeaz� articolul tip�rit"
 msgid "Print this item"
 msgstr "Tip�re�te acest articol"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Tip�re�te"
-
-#: 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 "Salveaz�"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Salveaz� ca..."
+
 #: 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 "Salveaz� �i �nchide"
 
@@ -13263,8 +26367,8 @@ msgstr "Salveaz� acest articol pe disc"
 #: 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:40
 msgid "_File"
 msgstr "_Fi�ier"
 
@@ -13273,7 +26377,7 @@ msgid "Print En_velope..."
 msgstr "Tip�re�te plic..."
 
 #: 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 "S_alvez� ca..."
@@ -13282,10 +26386,15 @@ msgstr "S_alvez� ca..."
 msgid "Save the contact and close the dialog box"
 msgstr "Salveaz� contact �i �nchide c�su�a de dialog"
 
+#: ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Trimite _mesaj c�tre contact..."
+
 #: 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 "_Salveaz�"
 
@@ -13345,6 +26454,10 @@ 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�"
@@ -13354,82 +26467,54 @@ msgid "Compose _New Message"
 msgstr "Compune mesaj _nou"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Creaz� sau editeaz� conturile de mail �i alte preferin�e"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Creaz� sau editeaz� reguli pentru fltrarea mailurilor noi"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Creaz� sau editeaz� defini�iile dosarelor virtuale"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Gole�_te gunoiul"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Uit� _parolele"
 
-#: 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 "Uit� parolele memorate astfel ve�i fi �ntrebat despre ele din nou"
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Mesaj nou"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Deschide o fereastr� pentru a compune un mesaj nou"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "�terg pentru totdeauna mesajele �terse din toate dosarele"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "Trimite / Prime�te"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Trimite mailurile din coad� �i descarc� mailurile noi"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Arat� fereastra de previzualizare mesaje"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "V� abona�i sau dezabona�i la dosarele de pe serverul distant"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor dosar virtual..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "Mesaj _mail"
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "Set�ri _mail..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "Trimite / Prime�te"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "Abonare la dosarul \"%s\""
@@ -13527,11 +26612,11 @@ msgstr "Ascunde temporar mesajele selectate"
 msgid "Threaded Message list"
 msgstr "List� de mesaje �nl�n�uite"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "Distrug_e"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "Dosar"
 
@@ -13548,219 +26633,231 @@ msgid "_Threaded Message List"
 msgstr "List� de mesaje �nl�n�uite"
 
 #: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Adaug� expeditorul �n agend�"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Aplic� filtre"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Adaug� expeditorul �n agend�"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplic� regulile de filtrare pe mesajele selectate"
 
-#: 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 "Compune un r�spuns pentru to�i destinatarii acestui mesaj"
 
-#: 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 "Compune un mesaj pentru lista de mail a mesajului selectat"
 
-#: 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 "Compune un r�spuns pentru expeditorul acestui mesaj"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Copiaz� mesajul selectat �n alt dosar"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Creaz� dosar virtual din mesaj"
 
-#: 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 "Creaz� o regul� pentru a filtra mesajele de la acest expeditor"
 
-#: 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 "Creaz� o regul� pentru a filtra mesajele pentru ace�ti destinatari"
 
-#: 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 "Creaz� o regul� pentru a filtra mesajele pentru aceast� list� de mail"
 
-#: 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 "Creaz� o regul� pentru a filtra mesajele cu acest subiect"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Creaz� un dosar virtual pentru ace�ti destinatari"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Creaz� un dosar virtual pentru aceast� list� de mail"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Creaz� un dosar virtual pentru acest expeditor"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Creaz� un dosar virtual pentru acest subiect"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Afi�eaz� urm�torul mesaj important"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Afi�eaz� urm�torul mesaj"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Afi�eaz� urm�torul mesaj necitit"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Afi�eaz� urm�toarea �nl�n�uire necitit�"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Afi�eaz� mesajul precedent important"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Afi�eaz� mesajul precedent"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Afi�eaz� mesajul necitit precedent"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "�nainteaz�"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filtreaz� _lista de mail..."
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filtreaz� expeditorul..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filtreaz� destinatarul..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filtreaz� _subiectul..."
 
-#: ui/evolution-mail-message.xml.h:29
-msgid "Force images in HTML mail to be loaded"
-msgstr "For�eaz� �nc�rcarea imaginilor �n HTML"
-
-#: ui/evolution-mail-message.xml.h:30
-msgid "Forward"
-msgstr "�nainteaz�"
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward As"
-msgstr "�nainteaz� ca"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward _Attached"
-msgstr "�nainteaz� _anexat"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Inline"
-msgstr "�nainteaz� _inline"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "MArcheaz� mesajele selectate pentru �tergere"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Quoted"
-msgstr "�nainteaz� cotat"
+msgid "Follow _Up..."
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr "For�eaz� �nc�rcarea imaginilor �n HTML"
+
+#: 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:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "�nainteaz� mesajul selectat cotat ca r�spuns"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "�nainteaza mesajul selectat c�tre cineva"
 
-#: 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 "�nainteaz� mesajul selectat c�tre cineva ca o anex�"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Increase the text size"
 msgstr "Insereaz� fi�ier text..."
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "�ncarc� _imaginile"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark as I_mportant"
 msgstr "Marcheaz� ca important"
 
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Marcheaz� ca _necitit"
+
+#: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Mark as Unimp_ortant"
 msgstr "Marcheaz� ca important"
 
-#: 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 "Marcheaz� mesajele selectate ca citite"
 
-#: 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 "Marcheaz� mesajele selectate ca importante"
 
-#: 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 "Marcheaz� mesajele selectate ca necitite"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
-msgid "Mark the selected messages as unimportant"
+msgid "Mark the selected message(s) as unimportant"
 msgstr "Marcheaz� mesajele selectate ca importante"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "MArcheaz� mesajele selectate pentru �tergere"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Mut�"
 
-#: 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 "Mut� mesajele selectate �n alt dosar"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Urm�torul"
 
-#: ui/evolution-mail-message.xml.h:54
-#, fuzzy
-msgid "Next Important Message"
-msgstr "Afi�eaz� urm�torul mesaj important"
-
 #: ui/evolution-mail-message.xml.h:55
 #, fuzzy
-msgid "Next Message"
-msgstr "Mesaj"
+msgid "Next _Important Message"
+msgstr "Afi�eaz� urm�torul mesaj important"
 
 #: ui/evolution-mail-message.xml.h:56
 #, fuzzy
-msgid "Next Thread"
+msgid "Next _Thread"
 msgstr "Selec_teaz� �nl�n�uirea"
 
 #: ui/evolution-mail-message.xml.h:57
 #, fuzzy
-msgid "Next Unread Message"
+msgid "Next _Unread Message"
 msgstr "Trimite �i mesajele ciorn�"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -13777,165 +26874,190 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-msgid "Preview the message to be printed"
-msgstr "Previzualizeaz� mesajul ce va fi tip�rit"
+msgid "P_revious Unread Message"
+msgstr "Afi�eaz� mesajul necitit precedent"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "Precedent"
-
-#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Previous Important Message"
+msgid "Pr_evious Important Message"
 msgstr "Afi�eaz� mesajul precedent important"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Previous Message"
-msgstr "Tip�re�te mesaj"
+msgid "Preview the message to be printed"
+msgstr "Previzualizeaz� mesajul ce va fi tip�rit"
 
-#: ui/evolution-mail-message.xml.h:65
-#, fuzzy
-msgid "Previous Unread Message"
-msgstr "Afi�eaz� mesajul necitit precedent"
+#: ui/evolution-mail-message.xml.h:64
+msgid "Previous"
+msgstr "Precedent"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 #, fuzzy
 msgid "Print this message"
 msgstr "Tip�re�te mesaj"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "R�spunde"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Re_direct"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "R�spunde la to�i"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "�nainteaza mesajul selectat c�tre cineva"
 
-#: 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-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "Caut� m_esajul"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "Salveaz� mesajul ca un fi�ier text"
 
-#: 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 "Caut� textul �n corpul mesajului afi�at"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "Set�ri de pagin� pentru imprimanta curent�"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "Arat� sursa mesajului"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "Arat� toate antetele"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "Arat� mesajul �ntr-un stil normal"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "Arat� mesajul cu toate antetele mesajului"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "Ata�eaz� sursa primar� a mesajului a mesajului"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Recupereaz� mesajele selectate"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "Dosar V pentru _lista de mail..."
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "Dosar V pentru expeditor..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "Dosar V pentru destinata_ri..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "Dosar V pentru _subiect..."
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
-msgstr "_Aplic� filtrele"
-
 #: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Attached"
+msgstr "Ata�eaz�"
+
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "Copiaz� �n folder"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "_Creaz� filtru din mesaj"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "�nainteaz� mesaj"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Mergi la"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "�n linie"
+
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Larger"
 msgstr "Pager"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "Afi�eaz� mesaj"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Mut� in dosar"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Mesaj"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "Afi�are normal�"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "Deschide mesajul"
 
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Tip�re�te mesaj"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Cotat"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_Unelte"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "Rec_upereaz�"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "�nchide aceast� fereastr�"
 
 #: 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:36
 msgid "_Close"
 msgstr "�n_chide"
 
 #: 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:56
 msgid "_View"
 msgstr "_Vizualizare"
 
@@ -13959,12 +27081,12 @@ msgstr "Cripteaz� acest mesaj cu PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Cripteaz� acest mesaj cu certificatul de criptare S/MIME"
 
-#: 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 "Format"
 
-#: 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"
@@ -13982,6 +27104,10 @@ msgstr "Insereaz� un fi�ier ca text �n mesaj"
 msgid "Insert text file..."
 msgstr "Insereaz� fi�ier text..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Deschide"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Deschide fi�ier"
@@ -14015,7 +27141,7 @@ msgid "Save in folder..."
 msgstr "Salveaz� �n dosar..."
 
 #: 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 "Salveaz� fi�ierul curent"
 
@@ -14040,6 +27166,7 @@ msgid "Send _later"
 msgstr "Trimite mai t�rziu"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Trimite mailul �n format HTML"
 
@@ -14109,7 +27236,7 @@ msgid "_From Field"
 msgstr "C�mpul De la"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Insereaz�"
 
@@ -14121,11 +27248,7 @@ msgstr "Deschide..."
 msgid "_Reply-To Field"
 msgstr "C�mpul _R�spuns la"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Securitate"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "Ajutor"
 
@@ -14184,34 +27307,41 @@ msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
 msgid "Re_fresh Task"
 msgstr "Re�mprosp�teaz� sarcina"
 
-#: 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:3
 msgid "Copy selected task"
 msgstr "Copiaz� sarcinile selectate"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Decupeaz� sarcina selectat�"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "�terge sarcinile selectate"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "�terge sarcinile selectate"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "Marcheaz� ca terminat"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Lipe�te sarcina din clipboard"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:11
 #, fuzzy
-msgid "Tasks Settings..."
-msgstr "Set�ri"
+msgid "Previews the list of tasks to be printed"
+msgstr "Previzualizeaz� contactele ce vor fi tip�rite"
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
-msgstr "Sarcin�"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Editeaz� aceast� sarcin�"
 
 #: ui/evolution.xml.h:1
 #, fuzzy
@@ -14279,117 +27409,120 @@ msgid "Open this folder in an other window"
 msgstr "Deschide acest dosar �n alt� fereastr�"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Trimite / Prime�te"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Trimite mailurile din coad� �i descarc� mailurile noi"
+
+#: ui/evolution.xml.h:23
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Arat� informa�ii despre Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Raporteaz� o eroare"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Raporteaz� o eroare"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Raporteaz� o problem� folosind Bug Buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Comut�"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Comut� �n timp ce se arat� bara folder"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Comut� �n timp ce se arat� bara cu scurt�turi"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Selecteaz� �n timp lucr�m deconecta�i"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Vizualizeaz� dosarul selectat"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "Despre Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Copiaz�..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "Bara dosar"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "Mer_gi la dosarul..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Import�..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Mut�..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "Dosar _nou"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "Set�ri _pilot..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Redenume�te..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "Trimite / Prime�te"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Scurt�tur�"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "Bara cu _scurt�turi"
 
-#: ui/my-evolution.xml.h:1
-#, fuzzy
-msgid "Change the settings for the summary"
-msgstr "Schimb� set�rile pentru Evolution"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print summary"
 msgstr "Sumar mail"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Re�ncarc�"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr ""
 
-#: ui/my-evolution.xml.h:8
-#, fuzzy
-msgid "_Summary Settings..."
-msgstr "Set�ri pentru Executive Summary..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "C�r�i de vizit�"
@@ -14403,18 +27536,27 @@ msgid "Phone List"
 msgstr "Lista de telefoane"
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "Alege dosar"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Dup� expeditor"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Dup� stare"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Dup� subiect"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Mesaje"
 
@@ -14422,6 +27564,12 @@ msgstr "Mesaje"
 msgid "With Category"
 msgstr "Cu categorie"
 
+#. Check for UTC.
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+msgid "UTC"
+msgstr ""
+
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "Select a Time Zone"
 msgstr "Selectez ora local�"
@@ -14444,11 +27592,22 @@ msgstr ""
 "selecta�i ora local�.\n"
 " Folosi�i butonul din dreapta al mausului pentru a mic�ora."
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "Vizualizarea _curent�"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "Personalizeaz�"
+
+#: widgets/menus/gal-view-menus.c:333
+#, fuzzy
+msgid "Save Custom View"
+msgstr "Personalizeaz�"
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "Define�te vizualiz�ri"
 
@@ -14480,76 +27639,81 @@ msgstr "Ora trebuie s� fie �n formatul: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Valorile procentuale pot fi �ntre 0 �i 100, inclusiv"
 
-#: widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "Baltic"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "Europa central�"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "Chinez"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr "Chirilic"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "Grec"
 
-#: 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 "Japonez"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Korean"
 msgstr "Corean"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turc"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Unicod"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Europa de vest"
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 msgid "Traditional"
 msgstr "Tradi�ional"
 
-#: 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 "Simplificat"
 
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:92
 msgid "Ukrainian"
 msgstr "Ucrainean"
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "Nou"
+#: widgets/misc/e-charset-picker.c:95
+#, fuzzy
+msgid "Visual"
+msgstr "Alarme vizuale"
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Set de caractere necunoscut: %s"
 
-#: widgets/misc/e-charset-picker.c:201
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Introduce�i setul de carcatere de folosit"
 
-#: widgets/misc/e-charset-picker.c:276
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Alte..."
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Codare caractere"
 
@@ -14557,28 +27721,24 @@ msgstr "Codare caractere"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:146
 #, fuzzy
 msgid "Search Editor"
 msgstr "Caut� �nainte"
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Salveaz� c�utarea"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:97
 #, fuzzy
-msgid "Add to Saved Searches"
+msgid "_Save Search..."
 msgstr "Salveaz� c�utarea"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:98
 #, fuzzy
-msgid "Clear"
-msgstr "�terge"
-
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Afi�eaz� tot"
+msgid "_Edit Saved Searches..."
+msgstr "Salveaz� c�utarea"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -14601,11 +27761,22 @@ msgstr "Mesaj"
 msgid "Don't show this message again."
 msgstr "Nu ar�ta acest mesaj din nou"
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "_C�utare"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Leg�tura DN:"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "�terge"
+
+#: widgets/misc/e-search-bar.c:835
+#, fuzzy
+msgid "Clear"
+msgstr "�terge"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 #, fuzzy
 msgid "Find Now"
 msgstr "Leg�tura DN:"
@@ -14632,6 +27803,861 @@ msgstr "init_corba(): nu pot ini�ializa GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 
+#~ msgid "Card: "
+#~ msgstr "Card: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Nume: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Prefix:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Dat:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Suplimentar:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Familia:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Sufix:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Data na�terii:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Adresa:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  C�su�a po�tal�:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ext:         "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Strada:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ora�:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Regiunea:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Cod po�tal:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  �ara:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Eticheta de livrare:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefoane:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefon:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "E-mail:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "E-mail:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "Org: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Nume:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Unitate:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Unitate2:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Unitate3:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Unitate4"
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Categorii:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Comentariu:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "�ir unic:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Cheia public�:"
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Conectare la serverul LDAP..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "A�tept conectarea la serverul LDAP..."
+
+#~ msgid "New _Contact"
+#~ msgstr "_Contact nou"
+
+#~ msgid "New Contact _List"
+#~ msgstr "List� contacte nou�"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Editare agend�"
+
+#~ msgid "Account Name"
+#~ msgstr "Nume cont"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Ad�ugare agend�"
+
+#, fuzzy
+#~ msgid "Server Name"
+#~ msgstr "Selec�ie nume"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "_Message Recipients:"
+#~ msgstr "Destinatari mesaj"
+
+#~ msgid "B_usiness"
+#~ msgstr "Servici_u"
+
+#~ msgid "Business _Fax"
+#~ msgstr "_Fax serviciu"
+
+#~ msgid "_Business"
+#~ msgstr "Serviciu"
+
+#~ msgid "_Home"
+#~ msgstr "_Acas�"
+
+#~ 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�"
+
+#~ msgid "Create a new task"
+#~ msgstr "Creaz� o sarcin� nou�"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Sarcin� nou�"
+
+#, fuzzy
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Creaz� o �nt�lnire nou�"
+
+#, fuzzy
+#~ msgid "First day of wee_k:"
+#~ msgstr "Prima zi a s�pt�minii:"
+
+#, fuzzy
+#~ 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"
+
+#~ 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"
+#~ "Nume: %s\n"
+#~ "Unitate: %s\n"
+#~ "Organiza�ie: %s\n"
+#~ "Localitate: %s\n"
+#~ "Stat: %s\n"
+#~ "�ara: %s"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Introduce�i v� rog parola NNTP pentru %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Nume utilizator rejectat de server"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "E�ec la trimiterea numelui utilizator la server"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Nume utilizator/parol� rejectat de server"
+
+#~ msgid "Message %s not found."
+#~ msgstr "Mesajul %s neg�sit."
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Nu pot ob�ine lista grup de la server."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Nu pot s� �ncarc fi�ierul list� de grup pentru %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Nu pot s� salvez fi�ierul list� de grup pentru: %s: %s"
+
+#~ msgid "Could not open directory for news server: %s"
+#~ msgstr "Nu pot deschide directorul pentru serverul de news: %s"
+
+#~ msgid "Unable to open or create .newsrc file for %s: %s"
+#~ msgstr "Nu pot s� deschid sau s� creez fi�ierul .newsrc pentru %s: %s"
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Nu pot verifica mesajele noi pe serverul POP: %s"
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr "Nu pot deschide dosarul: lista de mesaje a fost incomplet�."
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Nu pot aduce mesajul: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ 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."
+#~ msgstr ""
+#~ "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"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Nu m� pot conecta la serverul: %s"
+
+#~ 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"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "Nu pot trimite mesajul: adresa expeditorului nedefinit�."
+
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "R�spuns de eroare la comanda RCPT TO: %s: mailul nu a fost trimis"
+
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "R�spuns de eroare la comanda DATA: %s: mailul nu a fost trimis"
+
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr ""
+#~ "DATA r�spuns de eroare: terminarea mesajului: %s: mesajul nu a fost trimis"
+
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "QUIT r�spuns de eroare: %s: nefatal"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Introdu dosar URI"
+
+#~ msgid "Message was received"
+#~ msgstr "Mesajul a fost recep�ionat"
+
+#~ msgid "Message was sent"
+#~ msgstr "Mesajul a fost trimis"
+
+#~ msgid "on or before"
+#~ msgstr "�n sau �nainte"
+
+#, fuzzy
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Nu m� pot conecta la serverul: %s"
+
+#, fuzzy
+#~ msgid "New _Mail Message"
+#~ msgstr "Mesaj _mail"
+
+#, fuzzy
+#~ msgid "Create vFolder from Search"
+#~ msgstr "_Creaz� filtru din mesaj"
+
+#~ msgid "Filter on Mailing List"
+#~ msgstr "Filtru pe lista de mail"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "%s: Inbox"
+#~ msgstr "Inbox"
+
+#~ msgid "Composer"
+#~ msgstr "Compozitor"
+
+#, fuzzy
+#~ msgid "Default Forward style is: "
+#~ msgstr "Stilul implicit pentru \"�nainteaz�\" este: "
+
+#~ msgid "Edit..."
+#~ msgstr "Editeaz�..."
+
+#, fuzzy
+#~ msgid "HTML signature file:"
+#~ msgstr "Semn�tur� HTML:"
+
+#, fuzzy
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Selecteaz� un fi�ier"
+
+#, fuzzy
+#~ msgid "_Email Address:"
+#~ msgstr "Adresa email:"
+
+#, fuzzy
+#~ msgid "_Organization:"
+#~ msgstr "Organiza�ie:"
+
+#, fuzzy
+#~ msgid "_Remember this password"
+#~ msgstr "Memorez aceast� parol�"
+
+#, fuzzy
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Trimite implicit mail �n format HTML."
+
+#, fuzzy
+#~ msgid "_Server Type: "
+#~ msgstr "Tip server:"
+
+#, fuzzy
+#~ msgid "_Signature file:"
+#~ msgstr "Fi�ier semn�tur�:"
+
+#~ msgid "seconds."
+#~ 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."
+
+#, fuzzy
+#~ msgid "Summary Settings"
+#~ msgstr "Rezumatul con�ine"
+
+#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#~ 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)"
+
+#, fuzzy
+#~ msgid "New List"
+#~ msgstr "List� nou�"
+
+#, fuzzy
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Creaz� un eveniment zilnic nou"
+
+#, fuzzy
+#~ msgid "Create a New _Task"
+#~ msgstr "Creaz� o sarcin� nou�"
+
+#, fuzzy
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Creaz� o �nt�lnire nou�"
+
+#, fuzzy
+#~ msgid "_Appointment..."
+#~ msgstr "_�nt�lnire"
+
+#, fuzzy
+#~ msgid "_Calendar Settings..."
+#~ msgstr "Set�ri _mail..."
+
+#, fuzzy
+#~ msgid "_Task..."
+#~ msgstr "Sarcin�"
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Creaz� sau editeaz� conturile de mail �i alte preferin�e"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "Set�ri _mail..."
+
+#~ msgid "Forward _Attached"
+#~ msgstr "�nainteaz� _anexat"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "�nainteaz� cotat"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Aplic� filtrele"
+
+#, fuzzy
+#~ msgid "Tasks Settings..."
+#~ msgstr "Set�ri"
+
+#, fuzzy
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Schimb� set�rile pentru Evolution"
+
+#, fuzzy
+#~ msgid "_Summary Settings..."
+#~ msgstr "Set�ri pentru Executive Summary..."
+
+#~ msgid "Show All"
+#~ msgstr "Afi�eaz� tot"
+
+#~ msgid "Sear_ch"
+#~ msgstr "_C�utare"
+
 #~ msgid "I couldn't remove the item from your calendar file!\n"
 #~ msgstr "Nu pot �terge elementul din fi�ierul calendar!\n"
 
@@ -14652,17 +28678,12 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "V� rog introduce�i parola pentru %s"
 
 #, fuzzy
-#~ msgid "LDAP Authentication"
-#~ msgstr "Autentificare"
-
-#, fuzzy
 #~ msgid "Password:"
 #~ msgstr "Parola"
 
 #~ 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"
@@ -14739,9 +28760,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Click icon to decrypt."
 #~ msgstr "Clic pe icon pentru decriptare."
 
-#~ msgid "Couldn't create temporary mbox `%s': %s"
-#~ msgstr "Nu pot crea temporar mbox `%s': %s"
-
 #~ msgid "Cannot initialize Evolution's Executive Summary component."
 #~ msgstr ""
 #~ "Nu pot ini�ializa componenta Evolution pentru sumarul activit��ilor."
@@ -14757,10 +28775,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "metric"
 
 #, fuzzy
-#~ msgid "Ximian Evolution"
-#~ msgstr "Evolution"
-
-#, fuzzy
 #~ msgid ""
 #~ "Ximian Evolution is a suite of groupware applications\n"
 #~ "for mail, calendaring, and contact management\n"
@@ -14855,21 +28869,12 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Rename"
 #~ msgstr "Redenume�te"
 
-#~ msgid "_Debug"
-#~ msgstr "_Depaneaz�"
-
 #~ msgid "Import an external file format"
 #~ msgstr "Import� un format de fi�ier extern"
 
 #~ msgid "_Import File..."
 #~ msgstr "_Import� fi�ier..."
 
-#~ msgid "Factory for the Evolution addressbook component."
-#~ msgstr "Procesator pentru componentele agendei Evolution."
-
-#~ msgid "123"
-#~ msgstr "123"
-
 #~ msgid "a"
 #~ msgstr "a"
 
@@ -14951,21 +28956,15 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Done."
 #~ msgstr "Gata."
 
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "Procesator pentru componenta calendarului Evolution."
-
 #~ msgid "Reminder of your appointment at "
 #~ msgstr "Aminte�te de �nt�lnire la "
 
 #~ msgid "Snooze"
 #~ msgstr "Sfor�ie"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
 #~ 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."
@@ -15024,13 +29023,12 @@ 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"
@@ -15043,9 +29041,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Elm mail"
 #~ msgstr "Mail Elm"
 
-#~ msgid "Pine mail"
-#~ msgstr "Mail Pine"
-
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Mesaj �naintat:\n"
 
@@ -15061,9 +29056,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Synchronizing '%s'"
 #~ msgstr "Sincronizare dosar"
 
-#~ msgid "Factory for the Evolution executive summary component."
-#~ msgstr "Procesator pentru componenta sumar a activit��ilor."
-
 #~ msgid "%l:%M%p"
 #~ msgstr "%l:%M%p"
 
@@ -15071,10 +29063,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "%a %l:%M%p"
 
 #, fuzzy
-#~ msgid "There was an error downloading news feed"
-#~ msgstr "S-a produs o eroare la desc�rcarea sursei de �tiri</dt>"
-
-#, fuzzy
 #~ msgid "_Refresh time (seconds):"
 #~ msgstr "Durata de actualizare (secunde):"
 
@@ -15090,9 +29078,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "RDF Summary"
 #~ msgstr "Rezumat RDF"
 
-#~ msgid "File"
-#~ msgstr "Fi�ier"
-
 #~ msgid "Unknown addressbook type"
 #~ msgstr "Tip de agend� necunoscut"
 
@@ -15102,9 +29087,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Unknown auth type"
 #~ msgstr "Tip de autorizare necunoscut"
 
-#~ msgid "Subtree"
-#~ msgstr "Subarbore"
-
 #~ msgid "FIXME Bind DN Help text here"
 #~ msgstr "FIXME Text ajutor pentru leg�tura DN"
 
@@ -15123,9 +29105,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Authentication:"
 #~ msgstr "Autentificare:"
 
-#~ msgid "Advanced LDAP Options"
-#~ msgstr "Op�iuni avansate LDAP "
-
 #~ msgid "FIXME Path Help text here"
 #~ msgstr "FIXME Text ajutor cale"
 
@@ -15133,8 +29112,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"
@@ -15157,15 +29136,9 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "USA"
 #~ msgstr "SUA"
 
-#~ msgid "Canceled"
-#~ msgstr "Anulat"
-
 #~ msgid "Transparent"
 #~ msgstr "Transparent"
 
-#~ msgid "Opaque"
-#~ msgstr "Opac"
-
 #~ msgid ""
 #~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 #~ msgstr ""
@@ -15179,18 +29152,12 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Beep when alarm windows appear."
 #~ msgstr "Beep c�nd apare fereastra alarmei."
 
-#~ msgid "Calendar Preferences"
-#~ msgstr "Preferin�e calendar"
-
 #~ msgid "Colors for Tasks"
 #~ msgstr "Culoare pentru sarcini"
 
 #~ msgid "Date Navigator"
 #~ msgstr "Data navigator"
 
-#~ msgid "Defaults"
-#~ msgstr "Implicit"
-
 #~ msgid "Notification Options"
 #~ msgstr "Op�iuni noficare"
 
@@ -15239,18 +29206,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "The information contained in this attachment was not valid"
 #~ msgstr "Informa�ia con�inut� �n acest ata� a fost invalid�"
 
-#~ msgid "All"
-#~ msgstr "Tot"
-
-#~ msgid "Edit"
-#~ msgstr "Editez"
-
-#~ msgid "Store search as vFolder"
-#~ msgstr "Stochez c�utarea ca dosar V"
-
-#~ msgid "Resend"
-#~ msgstr "Retrimite"
-
 #~ msgid "Evolution Account Manager"
 #~ msgstr "Manager de conturi Evolution"
 
@@ -15309,21 +29264,12 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Save the appointment and close the dialog box"
 #~ msgstr "Salveaz� �nt�lnirea �i �nchide c�su�a de dialog"
 
-#~ msgid "_Action"
-#~ msgstr "_Ac�iune"
-
 #~ msgid "Help"
 #~ msgstr "Ajutor"
 
-#~ msgid "Se_nd contact to other..."
-#~ msgstr "Trimite co_ntact la altcineva..."
-
 #~ msgid "See online help"
 #~ msgstr "Prime�te ajutor conectat"
 
-#~ msgid "Compose"
-#~ msgstr "Compune"
-
 #~ msgid "Manage _Subscriptions..."
 #~ msgstr "Administrare abonamente..."
 
@@ -15339,9 +29285,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Customi_ze Toolbars..."
 #~ msgstr "Personali_zeaz� bara de unelte..."
 
-#~ msgid "Customize"
-#~ msgstr "Personalizeaz�"
-
 #~ msgid "Customize toolbars"
 #~ msgstr "Personalizeaz� b�rile de unelte"
 
@@ -15378,9 +29321,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Save calendar"
 #~ msgstr "Salveaz� calendarul"
 
-#~ msgid "Edit this task"
-#~ msgstr "Editeaz� aceast� sarcin�"
-
 #~ msgid "Delete all Occurrences"
 #~ msgstr "�terge toate apari�iile"
 
@@ -15412,14 +29352,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>"
-
-#~ msgid "Add ->"
-#~ msgstr "Adaug� ->"
+#~ "-----Mesaj �naintat-----<br><b>De la:</b> %s<br><b>La:</b> "
+#~ "%s<br><b>Subiect:</b> %s<br>"
 
 #~ msgid "Remove <-"
 #~ msgstr "�terge <-"
@@ -15430,21 +29367,9 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "5 Days"
 #~ msgstr "5 zile"
 
-#~ msgid "Alter preferences"
-#~ msgstr "Modific� preferin�e"
-
 #~ msgid "Create a new calendar"
 #~ msgstr "Creaz� un calendar nou"
 
-#~ msgid "New _Event"
-#~ msgstr "_Eveniment nou"
-
-#~ msgid "Open Calendar"
-#~ msgstr "Deschide calendar"
-
-#~ msgid "Prev"
-#~ msgstr "Prev"
-
 #~ msgid "Save calendar as something else"
 #~ msgstr "Salveaz� calendarul ca altceva"
 
@@ -15475,9 +29400,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "TasksPreferences"
 #~ msgstr "Preferin�e task"
 
-#~ msgid "C_ontacts..."
-#~ msgstr "C_ontacte..."
-
 #~ msgid "_Company:"
 #~ msgstr "_Compania:"
 
@@ -15538,9 +29460,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Time Until Due"
 #~ msgstr "Timp r�mas"
 
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarme vizuale"
-
 #~ msgid "Work week"
 #~ msgstr "S�pt�m�n� lucr�toare"
 
@@ -15640,8 +29559,7 @@ 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"
 
@@ -15706,9 +29624,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Test bonobo service"
 #~ msgstr "Service bonobo de test"
 
-#~ msgid "Test service"
-#~ msgstr "Service de test"
-
 #~ msgid "Update automatically"
 #~ msgstr "Actualizare automat�"
 
@@ -15731,15 +29646,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Mark as Read"
 #~ msgstr "Marchez ca citit"
 
-#~ msgid "Mark as Unread"
-#~ msgstr "Marchez ca necitit"
-
-#~ msgid "Move to Folder..."
-#~ msgstr "Mut �n folderul..."
-
-#~ msgid "Copy to Folder..."
-#~ msgstr "Copiez �n folderul..."
-
 #~ msgid "Do you accept?"
 #~ msgstr "Accepta�i?"
 
@@ -15749,15 +29655,9 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Evolution files successfully installed."
 #~ msgstr "Fi�ierele Evolution au fost instalate cu succes."
 
-#~ msgid "Activate"
-#~ msgstr "Activeaz�"
-
 #~ msgid "Activate this shortcut"
 #~ msgstr "Activeaz� aceast� scurt�tur�"
 
-#~ msgid "Find a contact"
-#~ msgstr "G�se�te un contact"
-
 #~ msgid "View All"
 #~ msgstr "Vizualizeaz� tot"
 
@@ -15883,9 +29783,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "_Insert text file... (FIXME)"
 #~ msgstr "_Insereaz� fi�ier text... (FIXME)"
 
-#~ msgid "Redo"
-#~ msgstr "Repetare"
-
 #~ msgid "Redo the undone action"
 #~ msgstr "Repet� ac�iunea neefectuat�"
 
@@ -15910,9 +29807,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Search for a string"
 #~ msgstr "Caut� un �ir"
 
-#~ msgid "Undo"
-#~ msgstr "Refacere"
-
 #~ msgid "Undo the last action"
 #~ msgstr "Ref� ultima ac�iune"
 
@@ -15924,6 +29818,3 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 
 #~ msgid "Advanced ..."
 #~ msgstr "Avansat..."
-
-#~ msgid "label26"
-#~ msgstr "eticheta26"
diff --git a/po/ru.po b/po/ru.po
index c2f45251fe..3935673ecb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2002-01-30 01:31+0300\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -30,21 +30,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "����������� ����� VCard � Evolution."
 
 #: 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
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "���"
 
 #: 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 "��.�����"
 
 #: 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:1731
 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:994
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 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:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
 msgid "Business"
 msgstr "�������"
 
@@ -73,12 +74,12 @@ msgid "Bus"
 msgstr "���."
 
 #: 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:1720
 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:1722
 msgid "Company"
 msgstr "��������"
 
@@ -89,13 +90,13 @@ 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:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
 msgid "Home"
 msgstr "��������"
 
 #: 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 "�����������"
 
@@ -105,19 +106,19 @@ 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:1655
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "���������"
 
 #: 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:1721
 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:1647
-#: addressbook/gui/widgets/e-addressbook-view.c:974
+#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "������� ����"
 
@@ -126,13 +127,13 @@ msgid "Bus Fax"
 msgstr "���. ����"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:975
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: 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:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "������� 2"
 
@@ -141,69 +142,68 @@ msgid "Bus 2"
 msgstr "���. 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:1724
 msgid "Home 2"
 msgstr "�������� 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:978
+#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: 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:57
+#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 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:980
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: 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:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:981
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: 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:982
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: 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:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:983
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "������"
 
 #: 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"
 
 #: 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/contact-editor/e-contact-editor.c:1759
+#: 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:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:987
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "��.����� 3"
 
 #: 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 "���� � ���������"
 
@@ -212,7 +212,7 @@ msgid "Url"
 msgstr "URL"
 
 #: 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 "�����"
 
@@ -221,7 +221,7 @@ msgid "Dep"
 msgstr "���."
 
 #: 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 "����"
 
@@ -230,12 +230,12 @@ msgid "Off"
 msgstr "����"
 
 #: 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 "���������"
 
 #: 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 "���������"
 
@@ -244,7 +244,7 @@ msgid "Prof"
 msgstr "����."
 
 #: 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 "�e������"
 
@@ -257,7 +257,7 @@ msgid "Ass"
 msgstr "���."
 
 #: 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 "���������"
 
@@ -266,12 +266,12 @@ msgid "Nick"
 msgstr "���������"
 
 #: 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 "������(�)"
 
 #: 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 "�������"
 
@@ -284,7 +284,7 @@ msgid "CALUri"
 msgstr "URI���"
 
 #: 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 ���������"
 
@@ -305,6 +305,7 @@ msgid "Birth Date"
 msgstr "���� ��������"
 
 #: addressbook/backend/ebook/e-card-simple.c:104
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "���������"
 
@@ -312,302 +313,16 @@ msgstr "���������"
 msgid "Family Name"
 msgstr "�������"
 
-#: 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 "��������: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"���: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  �������:    "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  ���: "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  ����������: "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  �������:    "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  �������:     "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"���� ��������: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"�����:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"�������� ����:  "
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  ����.:        "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  �����:     "
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  �����:      "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  �������:      "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  �������� ��� (������): "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  ������:     "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"����� ��� ��������:"
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"��������:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"�������:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"��.�����:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"��.�����:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"�������� ������: "
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"������� ����: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"�����.���������: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"���������: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"�����������: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  ���:  "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"�������:  "
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"�������2: "
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"�������3: "
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"�������4: "
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"���������: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"�����������: "
-
-#. 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:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"��������� ����: "
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "��������� VCards"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard ��� %s"
@@ -615,86 +330,89 @@ msgstr "VCard ��� %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:1721
+#: 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: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:171 calendar/gui/main.c:63
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "�� ������� ���������������� Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2272
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "�����..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "��������..."
 
 #. 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 "������ � ���������."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:486
-msgid "Connecting to LDAP server..."
-msgstr "����������� � ������� LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:496
-msgid "Unable to connect to LDAP server."
-msgstr "���������� ������������ � ������� LDAP."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:512
-msgid "Waiting for connection to LDAP server..."
-msgstr "�������� ����������� � ������� LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:915
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "�������� �������� �� ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1016
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "�������� �������� � ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "��������� �������� �� ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2217
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "���������� ������."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "��������� ����������� ������ � ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2222
-msgid "Restarting search."
-msgstr "���������� ������."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "������ ��� �������� ��������"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "�� ������� ��������� URL \"%s\""
 
-#: addressbook/conduit/address-conduit.c:426
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "��.�����:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "������ �� ����� ���� ��������\n"
 
-#: addressbook/conduit/address-conduit.c:439
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "EBook �� ���������\n"
 
-#: 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"
 
-#: 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"
 
-#: 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 "�� ������� ��������� ���� ���������� ������� ������"
 
@@ -707,435 +425,848 @@ msgid "A Bonobo control for displaying an address."
 msgstr "����������� ������� Bonobo ��� ����������� ������."
 
 #: 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
+#, 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
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 "����������� �������, ������� ���������� ������������ �������� ����� "
 "Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 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:10
 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:11
 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:12
 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:13
 msgid "Factory for the Addressbook's address popup"
 msgstr "������� ��� ������������ ���� ������ �� �������� �����"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "������� ��� ������� ������������ �������� �������� �����"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-shortcuts.c:1061
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "��������"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "�����, ���������� ���������� ����������"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "������ LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "������ LDAP, ���������� ���������� ����������"
 
-#: addressbook/gui/component/addressbook-component.c:527
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "������� �������"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New _Contact"
-msgstr "����� �������"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "�������"
 
-#: addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "������� ������ ���������"
 
-#: addressbook/gui/component/addressbook-component.c:530
-msgid "New Contact _List"
-msgstr "����� ������ ���������"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "������ ���������"
+
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+msgid "Could not initialize gnome-vfs"
+msgstr "�� ������� ���������������� gnome-vfs"
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr "�� ������� ������� �������� �����"
+
+#: 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 ""
+"�� ������� ������� ��� �������� �����. ��� ������,\n"
+"��� ���� �� ����� �������� URI, ���� ������ LDAP\n"
+"�� ��������"
 
-#: addressbook/gui/component/addressbook-config.c:223
-msgid "Edit Addressbook"
-msgstr "������ �������� �����"
+#: 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"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"��� ������ Evolution �� ����� ���������� ��������� LDAP.\n"
+"���� �� ������ ������������ LDAP � Evolution, �� ������\n"
+"����������� ��������� �� �������� ������� �� CVS �����\n"
+"��������� OpenLDAP, ������� ����� ����� �� �����������\n"
+"���� ������.\n"
+
+#: 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."
+msgstr ""
+"�� ������� ������� ��� �������� �����. ���������, ��� ���� ����������\n"
+"� ��� � ��� ������� ����������� ����� �������."
+
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "������� ������ ��� %s (������������ %s)"
+
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "������������� ��"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "100"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "��.����� 2"
+
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "��������� "
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: 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
+msgid "Advanced..."
+msgstr "�����������..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
+msgstr "����� ���������"
+
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
+msgstr "URI, ������� ����� ������������ ��������� ��������� �����"
+
+#: 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
+msgid "Primary Email"
+msgstr "�������� ��.�����"
+
+#: addressbook/gui/component/e-address-popup.c:587
+msgid "Select an Action"
+msgstr "������� ��������"
+
+#: addressbook/gui/component/e-address-popup.c:593
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "������� ����� ������� \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "�������� ����� � ������������� �������� \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:891
+msgid "Querying Addressbook..."
+msgstr "����� � �������� �����..."
+
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
+msgstr "������ ���������� ����������"
+
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+msgid "Add to Contacts"
+msgstr "�������� � ���������"
+
+#: addressbook/gui/component/e-address-popup.c:1046
+msgid "Merge E-Mail Address"
+msgstr "���������� ��.������"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
+msgstr "��������� �������"
+
+#: addressbook/gui/component/e-address-widget.c:364
+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 "(� ���� ������ 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
+#, fuzzy
+msgid "<- _Remove"
+msgstr "�������"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "1234"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "A_uthenticate with server using:"
-msgstr "������������� �� ������� � ��������������:"
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "�������� ������� ������"
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "����� �������� �����"
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "��������� �������� ����"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "�����������"
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "������"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "��������"
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonymous"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-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/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-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/addressbook-config.glade.h:11
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "DN Customization"
+msgstr "��� ����������"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "De_lete"
 msgstr "�������"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "�������� ������:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Email Address:"
 msgstr "��.�����:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Evolution "
 
-#: 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 "����� �������������� ���� ��.����� ��� ������������� ��� �� �������"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "����� �������������� ���� ��.����� ��� ������������� ��� �� �������"
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "�����"
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "���������"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "����"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, 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/ldap-config.glade.h:44
 msgid "One"
 msgstr "����"
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-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/addressbook-config.glade.h:18
-msgid "Search s_cope: "
+#: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
+msgid "R_estore Defaults"
+msgstr "������� ��������"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "������� ��������"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
 msgstr "�������� ������: "
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "�������� �������"
+#. 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 "�����"
+
+#: 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/addressbook-config.glade.h:20
+#: 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 "���������� �� ���������"
+
+#: 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/ldap-config.glade.h:69
 msgid "Sub"
 msgstr "���"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "�����ģ���� ���� ���������� ���������� ��� �������� �������� �����."
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "���������������� �����"
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "��� ���������� �� ��������� ��� ����������� �������� LDAP."
+#: 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/addressbook-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:73
 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."
+"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 ""
-"��� ���������� ������������ ����� �������� LDAP ��� ����������� ����, ����� "
-"���� ������������ � ������. ��������� � ��������������� ������ ������� ��� "
-"��������� �������������� ����������."
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"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 ""
-"��� �������� ���� ��� ������������ ������ �� ������� LDAP. ��������� � "
-"��������������� ������ ������� ��� ��������� �������������� ����������."
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
-"This is the maximum number of cards to download.  Setting this number too "
-"large will slow down this addressbook."
+"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/addressbook-config.glade.h:26
+#: 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/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:28
-msgid "This is the port that your ldap server uses."
-msgstr "��� ����� �����, ������� ���������� ��� ������ LDAP."
-
-#: addressbook/gui/component/addressbook-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:91
+#, fuzzy
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"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/addressbook-config.glade.h:30
-msgid "_Account name:"
-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/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
-msgid "_Add"
-msgstr "��������"
+#: addressbook/gui/component/ldap-config.glade.h:96
+msgid "This option controls how long a search will be run."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
+#: 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/addressbook-config.glade.h:33
-msgid "_Download Limit"
+#: addressbook/gui/component/ldap-config.glade.h:100
+msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: 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
-msgid "_Edit"
-msgstr "������"
+#: addressbook/gui/component/ldap-config.glade.h:101
+msgid "Using distinguished name (DN)"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:35
-msgid "_Email address:"
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+msgid "Using email address"
 msgstr "��.�����:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "����:"
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+msgid "Whenever Possible"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-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:139
+msgid "_Add"
+msgstr "��������"
 
-#: addressbook/gui/component/addressbook-config.glade.h:38
-msgid "label18"
-msgstr "�����"
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "��������"
 
-#: addressbook/gui/component/addressbook-config.glade.h:39
-msgid "label19"
-msgstr "�����"
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "�������� ��������"
 
-#: addressbook/gui/component/addressbook-config.glade.h:40
-msgid "label20"
-msgstr "�����"
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "�������� ��������"
 
-#: addressbook/gui/component/addressbook-config.glade.h:41
-msgid "label47"
-msgstr "�����"
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "������"
 
-#: addressbook/gui/component/addressbook-config.glade.h:42
-msgid "label50"
-msgstr "�����"
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "������� ���"
 
-#: addressbook/gui/component/addressbook-config.glade.h:43
-msgid "label52"
-msgstr "�����"
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "�����������"
 
-#: addressbook/gui/component/addressbook-config.glade.h:44
-msgid "label53"
-msgstr "�����"
+#: addressbook/gui/component/ldap-config.glade.h:111
+msgid "_Distinguished Name (DN):"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:45
-msgid "label56"
-msgstr "�����"
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:46
-msgid "label58"
-msgstr "�����"
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Download limit:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:47
-msgid "label60"
-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
+#: 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 "������"
 
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-msgid "Could not initialize gnome-vfs"
-msgstr "�� ������� ���������������� gnome-vfs"
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "������ �������"
 
-#: addressbook/gui/component/addressbook.c:499
-msgid "Unable to open addressbook"
-msgstr "�� ������� ������� �������� �����"
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution "
 
-#: addressbook/gui/component/addressbook.c:508
-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"
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
 msgstr ""
-"�� ������� ������� ��� �������� �����. ��� ������,\n"
-"��� ���� �� ����� �������� URI, ���� ������ LDAP\n"
-"�� ��������"
 
-#: addressbook/gui/component/addressbook.c:513
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
 msgstr ""
-"��� ������ Evolution �� ����� ���������� ��������� LDAP.\n"
-"���� �� ������ ������������ LDAP � Evolution, �� ������\n"
-"����������� ��������� �� �������� ������� �� CVS �����\n"
-"��������� OpenLDAP, ������� ����� ����� �� �����������\n"
-"���� ������.\n"
 
-#: addressbook/gui/component/addressbook.c:521
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
 msgstr ""
-"�� ������� ������� ��� �������� �����. ���������, ��� ���� ����������\n"
-"� ��� � ��� ������� ����������� ����� �������."
 
-#: addressbook/gui/component/addressbook.c:655
-#: addressbook/gui/component/addressbook.c:658
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "������� ������ ��� %s (������������ %s)"
-
-#: addressbook/gui/component/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "����� ���� ��������"
-
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
-msgstr "��� ��������"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
-msgstr "��.����� ��������"
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "���������"
 
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:59
-msgid "Category is"
-msgstr "��������� "
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "����:"
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "�����������..."
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "������� ��������"
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1067
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
-msgstr "����� ���������"
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "���� ������:"
 
-#: addressbook/gui/component/addressbook.c:1150
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, ������� ����� ������������ ��������� ��������� �����"
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+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/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+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:1686
-msgid "Primary Email"
-msgstr "�������� ��.�����"
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "�ޣ���� ������"
 
-#: addressbook/gui/component/e-address-popup.c:587
-msgid "Select an Action"
-msgstr "������� ��������"
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "�������� ������ ���������"
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "������� ����� ������� \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "��� ��������"
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "�������� ����� � ������������� �������� \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "��������������� � %s"
 
-#: addressbook/gui/component/e-address-popup.c:891
-msgid "Querying Addressbook..."
-msgstr "����� � �������� �����..."
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
-msgstr "������ ���������� ����������"
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-msgid "Add to Contacts"
-msgstr "�������� � ���������"
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "�����"
 
-#: addressbook/gui/component/e-address-popup.c:1046
-msgid "Merge E-Mail Address"
-msgstr "���������� ��.������"
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
-msgstr "��������� �������"
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
-msgstr "�������� ������� (������!)"
+#: 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
 msgid "Evolution's addressbook name selection interface."
@@ -1146,9 +1277,9 @@ msgid "Factory for the Addressbook's name selection interface"
 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
+#: 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
 msgid "Remove"
 msgstr "�������"
 
@@ -1177,7 +1308,12 @@ msgstr "(%d �� ��������)"
 msgid "Unnamed Contact"
 msgstr "���������� �������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:581
+#: 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"
@@ -1193,7 +1329,7 @@ msgstr ""
 "� ��������� ��������� �������, ��� ������� ������ ������\n"
 "���������. �������."
 
-#: 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"
@@ -1204,31 +1340,40 @@ msgstr ""
 "� ���������� �������� ��� ������� �� ������ ���������.\n"
 "���������� ��������� ������ Evolution � ��������� ��� ������."
 
-#: 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
-msgid "C_ontaining:"
-msgstr "��������:"
+msgid "Select Names"
+msgstr "������� �����"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "�����"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "������� �������?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "������� �����"
+#, 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 ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "_Browse..."
+msgstr "�����������..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "���������:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "�����:"
 
@@ -1264,7 +1409,7 @@ msgstr "��������������"
 
 #. 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:1365
 msgid "Contact Editor"
 msgstr "�������� ���������"
 
@@ -1289,10 +1434,6 @@ msgstr "���� ���:"
 msgid "Full _Name..."
 msgstr "������ ���..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "�����"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1337,10 +1478,11 @@ 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:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1478 mail/mail-config.glade.h:105
-#: 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: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
 msgid "_Delete"
 msgstr "�������"
 
@@ -2394,23 +2536,23 @@ msgstr "��������"
 msgid "Delete Contact?"
 msgstr "������� �������?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:757
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
 msgid "Category editor not available."
 msgstr "�������� ��������� ����������."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:764
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
 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:1044
 msgid "Save Contact as VCard"
 msgstr "��������� ��� VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2309
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�� ������� ������� ����� ������� ���������� ��� ����: \"%s\""
@@ -2424,7 +2566,7 @@ msgid "Edit Full"
 msgstr "������ ������� �����"
 
 #: 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 "������ ���:"
 
@@ -2630,7 +2772,7 @@ msgstr ""
 "���������� � ���� �����. �ӣ ����� ������ ��������?"
 
 #: 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 "����������� �����"
 
@@ -2639,169 +2781,113 @@ msgstr "����������� �����"
 msgid "Search"
 msgstr "�����"
 
-#: 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:140
 msgid "1 card"
 msgstr "1 ��������"
 
-#: 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: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:277
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "�������"
-
-#: 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:280
-#: addressbook/gui/widgets/e-addressbook-view.c:836
-msgid "Send Message to Contact"
-msgstr "��������� ��������� � ��������"
-
-#: 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:283
-#: addressbook/gui/widgets/e-addressbook-view.c:839
-msgid "Print Envelope"
-msgstr "���������� �������"
-
-#: 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 "��������"
-
-#: 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 "�����������"
-
-#: 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: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
-msgid "Delete"
-msgstr "�������"
+#: 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
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: 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:1020
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: shell/evolution-shell-component.c:1043
 msgid "Success"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: 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:1895
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: 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
 msgid "Unknown error"
 msgstr "����������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "����������� ��� ����"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "����� � �������"
 
-#: 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 "������������� �������� ��� ����������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "�������� �� ��������������"
 
-#: 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 camel/camel-service.c:610
-#: camel/camel-service.c:646
+#: 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
 msgid "Cancelled"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "���� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "������ ��������� ���������?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "������ ��� ���������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "������ ��� ���������� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "������ ��� ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "������ ��� �������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1389
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "������ ��� �������� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:202
+#: addressbook/gui/widgets/e-addressbook-util.c:204
 msgid "Display Cards?"
 msgstr "�������� ��������?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:203
+#: addressbook/gui/widgets/e-addressbook-util.c:205
 msgid "Display Cards"
 msgstr "���������� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2809,81 +2895,207 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 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: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,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,abc,def,ghi,jkl,mno,pqr,stu,vwx,yz"
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+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: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,��,��,��,��,��,��,��,��,��,��,��,��,��,��,abc,def,ghi,jkl,mno,pqr,stu,vwx,yz"
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "��� ��������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "��� ��������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "��� ��������"
 
-#: 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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "�������� �������"
 
-#: 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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "������� �������"
 
-#: 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:967
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "������� ��������"
 
-#: 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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "������� �����"
 
-#: 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:972
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "��������� �������"
 
-#: 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:976
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "������� ������� 2"
 
-#: 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:979
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "������ ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:985
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "��������� ��� VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "������� �������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "������� ������ ���������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "������� � �����..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "�������������..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "����� ��������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "��������� �������� �����..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "��������� Pilot..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "��������� �������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "��������� ��������� � ��������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "���������� �������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "����������� � �����..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "����������� � �����..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "��������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "����������"
+
+#. 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:940
+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"
+
+#. 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
+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,"
+"yz"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -2897,11 +3109,12 @@ msgstr "� ���� ������ ��������."
 msgid "Save in addressbook"
 msgstr "��������� � �������� �����"
 
-#: 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 ""
@@ -2911,6 +3124,19 @@ msgstr ""
 "\n"
 "������ ݣ������ ����� ����� ������� ����� �������."
 
+#: 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
 msgid "Card View"
 msgstr "��� ��������"
@@ -2998,6 +3224,7 @@ msgid "Include:"
 msgstr "��������:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "������"
 
@@ -3022,6 +3249,7 @@ msgid "Options"
 msgstr "���������"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "����������"
 
@@ -3042,7 +3270,9 @@ msgstr "������"
 msgid "Paper source:"
 msgstr "�������� ������:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "�������"
 
@@ -3098,39 +3328,34 @@ msgstr "������:"
 msgid "_Font..."
 msgstr "�����..."
 
-#: addressbook/printing/e-contact-print.glade.h:43
-#: my-evolution/my-evolution.glade.h:32
-msgid "label26"
-msgstr "�����"
-
 #: calendar/cal-util/cal-component.c:1207
 msgid "Untitled appointment"
 msgstr "��������������� �������"
 
-#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:679
+#: 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
 msgid "High"
 msgstr "�������"
 
-#: 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 mail/message-list.c:678
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "����������"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:677
+#: 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
 msgid "Low"
 msgstr "������"
 
 #. 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
 msgid "Undefined"
 msgstr "������������"
 
 #: 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 "������ ��� ����������� � ������� ���������"
 
@@ -3139,8 +3364,13 @@ msgstr "������ ��� ����������� � ������� ���������"
 msgid "Could not read pilot's Calendar application block"
 msgstr "�� ������� ��������� ���� ���������� ��������� ������"
 
-#: calendar/conduits/todo/todo-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:889
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "���������:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "�� ������� ��������� ���� ���������� ������� ������"
 
@@ -3153,41 +3383,55 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "������ ������������ �������� Bonobo, ������� ���������� ���������."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "��������� ��������� � �����..."
+
+#: 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:5
 msgid "Evolution calendar executive summary component."
 msgstr "��������� Executive Summary ��������� ��������� Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 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:8
 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:9
 msgid "Factory for the Evolution Tasks control"
 msgstr "������� ��� ������������ �������� Evolution ������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "������� ��� ������������ �������� ��������� iTip ���������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "������� ��� ������� ������������ �������� ���������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "������� ��� ������������� �������� ���������� ��������� ���������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr "������� ��� �������� ������� ��������� �����������"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 "������ ����������� � �������"
@@ -3239,7 +3483,7 @@ msgstr ""
 "�����������."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2283
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "��������������"
@@ -3265,7 +3509,7 @@ msgstr ""
 msgid "Do not ask me about this program again."
 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:58
 msgid "Could not initialize GNOME"
 msgstr "�� ������� ���������������� GNOME"
 
@@ -3277,52 +3521,52 @@ msgstr "�� ������� ������� ������ ����������� � �������"
 msgid "Could not create the alarm notify service factory"
 msgstr "�� ������� ������� ������� ������� ����������� � �������"
 
-#: 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:51
 msgid "Description contains"
 msgstr "�������� ��������"
 
-#: 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
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "������"
 
-#: calendar/gui/calendar-commands.c:446
+#: 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 ""
@@ -3361,8 +3605,8 @@ msgstr "�"
 msgid "Free"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:432
-#: shell/evolution-shell-component.c:1042
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 msgid "Busy"
 msgstr "�����"
 
@@ -3378,7 +3622,7 @@ 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:329 calendar/gui/e-meeting-model.c:352
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "���������"
 
@@ -3394,9 +3638,10 @@ 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/mail-account-gui.c:1496
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
-#: mail/mail-config.glade.h:55
+#: 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
 #: 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
@@ -3411,21 +3656,15 @@ msgstr "����������"
 msgid "Assigned"
 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/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
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr "���"
 
-#. 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
 msgid "Day View"
 msgstr "��� ����"
@@ -3442,46 +3681,80 @@ msgstr "��� ������"
 msgid "Month View"
 msgstr "��� �����"
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-#: shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "���������"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "�����, ���������� ������� � �������"
 
-#: calendar/gui/component-factory.c:68 my-evolution/e-summary-tasks.c:240
-#: my-evolution/e-summary-tasks.c:257 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "������"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "����� ���������� �������� \"���������\""
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "������� ����� �������"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "��������� ��������� ��������"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "���������"
+
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "������� ������"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "������"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "������� �������"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "����� �������"
 
-#: 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:707
+#, fuzzy
+msgid "New appointment"
+msgstr "������� �������"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "����� ������"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "�������"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "�� ������� ������� ����� \"%s\""
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URI, ������� ����� ���������� ���������"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "�������� ��� %s"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "��������� ��������� �������"
@@ -3546,9 +3819,7 @@ msgstr "�������������� ����� ������"
 msgid "hours"
 msgstr "����"
 
-#: 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 "������"
 
@@ -3705,15 +3976,11 @@ msgstr "���������� �������"
 msgid "hour(s)"
 msgstr "���(-�,-��)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
-msgid "label55"
-msgstr "�����"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:129
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr "������(-�)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:17
 msgid "start of appointment"
 msgstr "������ �������"
 
@@ -3750,170 +4017,168 @@ msgid "Color for tasks due today"
 msgstr "���� ��� ����� �� �������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "��������� ����� ������� � ������������ �� ���������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "������ ���� ������:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 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:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "������������ ������:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
-msgstr "���������� ����� ��������� ������ � ������ ������ � ������"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "���������� ������ ������ � ���������� �� �����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Sta_rt of day:"
 msgstr "������ ���:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "������, ������������� �� �������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "������, ������������� �� �������"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "������ �����"
 
-#: 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:25
 msgid "Time"
 msgstr "�����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "������� ����: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "����������� �������:"
-
-#: 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: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:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "�����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "������� ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "12-������� (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "24-�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "����������� ������������� ��� �������� ���������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "������� �������� ��� � ������������� ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_End of day:"
 msgstr "����� ���:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "�����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "�������� ����������� ������ �����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "������"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "������������ ������:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "������ �����"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "���������� ����� ��������� ������ � ������ ������ � ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "����������� �������:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "�� ������ �������"
 
@@ -3977,73 +4242,60 @@ 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 " � "
 
-#: 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: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/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:321
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "�� ������� �������� ������!"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "������� �������"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "������ � ������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "��� �������� ��������"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
-#: mail/mail-display.c:101
-msgid "Overwrite file?"
-msgstr "������������ ����?"
-
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
-#: mail/mail-display.c:105
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"���� � ����� ��������� ��� ����������.\n"
-"������������ ���?"
-
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "��������� ���..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "�� ������� ��������� ������� ������!"
 
@@ -4115,13 +4367,13 @@ 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:365
 msgid "Scheduling"
 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:368
 msgid "Meeting"
 msgstr "���������"
 
@@ -4135,6 +4387,7 @@ msgstr "�����"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "�������������"
 
@@ -4167,6 +4420,7 @@ msgid "Pu_blic"
 msgstr "�����"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "�������� ����� ���"
 
@@ -4204,6 +4458,67 @@ msgstr "���� ������� ��� ��������� � ���������!"
 msgid "_Delegate To..."
 msgstr "��������..."
 
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "�������"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "�������� ������� ������"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "��������"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "��������:"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "�e������"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "�����"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#, fuzzy
+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
+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
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "���"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4214,7 +4529,7 @@ msgid "_Change Organizer"
 msgstr "�������� ������������"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "���������� ������..."
 
@@ -4222,29 +4537,100 @@ msgstr "���������� ������..."
 msgid "_Other Organizer"
 msgstr "������ �����������"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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: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:997
 msgid "on"
 msgstr "�"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: 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 "�������"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "������"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "��������"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "������"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "������ ����"
+
+#: 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:1260
 msgid "on the"
 msgstr " "
 
-#: 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 "������"
 
@@ -4293,22 +4679,18 @@ msgid "forever"
 msgstr "������"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:17
-msgid "label21"
-msgstr "�����"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "month(s)"
 msgstr "������"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "until"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "week(s)"
 msgstr "������"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "year(s)"
 msgstr "���(���)"
 
@@ -4329,6 +4711,7 @@ msgid "The task information has changed. Send an updated version?"
 msgstr "���������� � ������ ���� ��������. ��������� �����̣���� ������?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% ���������"
@@ -4342,7 +4725,7 @@ msgid "Progress"
 msgstr "�����������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:966
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4354,15 +4737,19 @@ msgstr "���������:"
 msgid "_Status:"
 msgstr "���������:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "��������"
+
 #: 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:324
 msgid "Assignment"
 msgstr "����������"
 
 #: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "��������:"
 
@@ -4374,63 +4761,139 @@ msgstr "���� ������:"
 msgid "_Due Date:"
 msgstr "����������� ����:"
 
-#: 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:751 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: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: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
 msgid "_Open"
 msgstr "�������"
 
-#: 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:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "��������� ���..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "����������..."
+
+#: calendar/gui/e-calendar-table.c:978 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: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:979 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: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:980 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 "��������"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "��������� ������"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "��������� ��� i_Calendar"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "�������� ��� �����������"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "������� ��� ������"
-
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "�������� ������ ��� �����������"
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "������� ��������� ������"
 
-#: 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:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "���������� ��������"
 
-#: calendar/gui/e-calendar-table.c:1247
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "�������� ����� ����� �������� ������"
 
+#: calendar/gui/e-calendar-table.etspec.h:3
+#, fuzzy
+msgid "Alarms"
+msgstr "������ � %s"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
+msgid "Complete"
+msgstr "���������"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+#, fuzzy
+msgid "Completion Date"
+msgstr "���������"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Due Date"
+msgstr "����������� ����:"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+#, fuzzy
+msgid "End Date"
+msgstr "����� ���������:"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+#, fuzzy
+msgid "Priority"
+msgstr "���������:"
+
+#: calendar/gui/e-calendar-table.etspec.h:13
+#, fuzzy
+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
+msgid "Summary"
+msgstr "�������"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+#, fuzzy
+msgid "Task sort"
+msgstr "������ �����"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+#, fuzzy
+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
@@ -4461,108 +4924,174 @@ msgstr "������� ����� %02i �����"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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/e-day-view.c:638 calendar/gui/e-week-view.c:375
 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/e-day-view.c:641 calendar/gui/e-week-view.c:378
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "����� �������"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "����� ���������� �������"
 
-#: 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:3553 calendar/gui/e-week-view.c:3440
+#, fuzzy
+msgid "New Meeting"
+msgstr "���������"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "������� ������"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "����������..."
+
+#: 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 "������� � ������������ ���"
 
-#: 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 "������� � ����..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-msgid "_Delete this Appointment"
-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 "������������ ���������� � ���������"
+
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
+#, fuzzy
+msgid "_Configure..."
+msgstr "��������� %s"
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
+msgid "_Save As..."
+msgstr "��������� ���..."
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "�������� ��������� � ����������"
+
+#: 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: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:3461
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "������� ��� ���������"
 
-#: 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 "������� ��� ���������"
 
-#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:1013
-#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:292
-#: calendar/gui/e-meeting-model.c:357
-#: 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-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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
+#, 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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1315
+#: calendar/gui/e-itip-control.c:1564
 msgid "Calendar file could not be updated!\n"
 msgstr "���� ��������� �� ����� ���� �����̣�!\n"
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "���������� ���������\n"
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"������ ��������� �� ����� ���� �����̣�, ������ ��� ������� ������ �� "
+"����������"
+
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "������ ��������� �� ����� ���� �����̣� ��-�� ��������� �������� �������!\n"
 
-#: calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1638
 msgid "Attendee status could not be updated!\n"
 msgstr "������ ��������� �� ����� ���� �����̣�!\n"
 
-#: calendar/gui/e-itip-control.c:1372
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "������ ��������� �����̣�!\n"
 
-#: calendar/gui/e-itip-control.c:1374
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"������ ��������� �� ����� ���� �����̣�, ������ ��� ������� ������ �� "
-"����������"
-
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "�������� ���������"
 
-#: calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "������� ���������!\n"
 
-#: calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "������� �� ����� ���� ������!\n"
 
-#: calendar/gui/e-itip-control.c:1648
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr "���������� ���������������� ��� � ������ ����������!\n"
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "������� �����"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "������� �����"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4601,198 +5130,212 @@ msgstr "����-����������"
 msgid "date-start"
 msgstr "����-������"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "������������"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "����������� ���������"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "�������������� ���������"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "�� ���������"
 
-#: 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:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "�������������"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "��������"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "�������"
 
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "������������"
 
-#: 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:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "��������� ���������"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "�������������� ���������"
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "�� ���������"
 
-#: 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: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:321 calendar/gui/e-meeting-model.c:344
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr "�������"
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 msgid "Declined"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "�����������������"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "��������"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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:2118 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:436
 msgid "Out of Office"
 msgstr "��� �����"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "��� ����������"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "���������� ������ ������� ����"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "���������� �����������"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "�������� ���������� � ���������"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "��� ���� � �������"
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "��� ���� � ���� ������"
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "��������� ����"
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "��������� ���� � ���� ������"
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "����� ������ ��������:"
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "����� ���������� ��������:"
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�������� ����� %s"
 
-#: 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\""
 
-#: 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/e-tasks.c:629
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "����������� � �������..."
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "�������� ��������� ��������"
+
+#: calendar/gui/e-tasks.c:659
 msgid "Expunging"
 msgstr "��������"
 
-#: 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 "����� �������..."
 
-#: calendar/gui/gnome-cal.c:1493
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "������� ��� �������"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "�� ������� ������� ����� \"%s\""
 
-#: calendar/gui/gnome-cal.c:1504
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "�����, ����������� ��� �������� \"%s\", �� ��������������"
 
-#: calendar/gui/gnome-cal.c:1859
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�������� ��������� %s"
@@ -4853,227 +5396,223 @@ msgstr "�������"
 msgid "September"
 msgstr "��������"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr "��������� ��� ������� ���� ��������"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "����������� ������ ���� ��������."
 
-#: calendar/gui/itip-utils.c:370
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "���������� � ��������� (� %s �� %s)"
-
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "�� ������ ���� ���������� �������."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 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 "��"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "��"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "��"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "��"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "C�"
 
 #. 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: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: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, %b %d %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "��������� ������ (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "��������� ����� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "��������� ��� (%Y)"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 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:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: 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:2550
 msgid "Print Item"
 msgstr "���������� �������"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "��������� ������"
 
@@ -5083,11 +5622,11 @@ msgid ""
 msgstr ""
 "�� ������� ������� ���� �����. ����������, ��������� ��������� ORBit � OAF."
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ������� ����� ������� � ����� ����� "
 
-#: 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"
@@ -5099,10 +5638,16 @@ msgstr ""
 "\n"
 "���������� ��� �������?"
 
-#: calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2297
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "�� ���������� �����."
 
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "���������� ��������"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5151,107 +5696,131 @@ msgstr "������� ��� ������� ������ iCalendar � Evolution."
 msgid "Imports iCalendar files into Evolution"
 msgstr "����������� ����� iCalendar � Evolution."
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "����������� ����� iCalendar � Evolution."
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "��������� ���������"
+
+#: calendar/importers/icalendar-importer.c:663
+#, fuzzy
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"���������� �������� ����� Pine.\n"
+"������ ������������� �� � Evolution?"
+
+#: 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 �� ������������ ����������"
 
-#: 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:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time ������������ ������ � �������� ��������� 1"
 
-#: 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 make-time ������ ���� ������� ���� � ������� ISO 8601"
 
-#: 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:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day ������������ ��� time_t � �������� ��������� 1"
 
-#: 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 ������������ ����� ����� � �������� ��������� 2"
 
-#: 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:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin ������������ ��� time_t � �������� ��������� 1"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end ������������ 1 ��������"
 
-#: 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 � �������� ��������� 1"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype �� ������������ ����������"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? ������������ 2 ���������"
 
-#: 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 � �������� ��������� 1"
 
-#: 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? ������������ ��� time_t � �������� ��������� 2"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? ������������ ��� ���������"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? ������������ ������ � �������� ��������� 1"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? ������������ ������ � �������� ��������� 2"
 
-#: calendar/pcs/query.c:691
+#: 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"
 
-#: 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: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? ������������, ��� ��� ��������� - ������ ��� ����-"
-"������������ �������� - ���������� ���� (#f)"
+"has-categories? ������������, ��� ��� ��������� - ������ ��� "
+"����-������������ �������� - ���������� ���� (#f)"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? �� ������������ ����������"
 
-#: 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:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? ������������ ��� time_t � �������� ��������� 1"
 
@@ -6792,11 +7361,11 @@ msgstr "���������� �� �������������� ���� ������"
 msgid "Decryption is not supported by this cipher"
 msgstr "����������� �� �������������� ���� ������"
 
-#: camel/camel-data-cache.c:159
+#: camel/camel-data-cache.c:169
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:426
+#: camel/camel-data-cache.c:441
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
@@ -6831,56 +7400,51 @@ msgstr "������������� � ��������"
 msgid "You must be working online to complete this operation"
 msgstr "��� ���������� ������ �������� ���������� ����������� � ����"
 
-#: 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:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "���������� ��������� ������: %s: %s"
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ���������� �������: %s: %s"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "�� ������� ������� ����� �����"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "�� ������� ���������� ����� �����"
 
-#: camel/camel-filter-driver.c:889
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "��������� ��������� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "���������� ������� ���������"
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "���� �� ��������� %d"
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "������������� �����"
 
-#: camel/camel-filter-driver.c:924 camel/camel-filter-driver.c:1026
-msgid "Complete"
-msgstr "���������"
-
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "��������� ��������� %d �� %d"
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "���� �� ��������� %d �� %d"
@@ -6894,7 +7458,7 @@ msgstr "�� ������� �������� ���������"
 msgid "Error executing filter search: %s: %s"
 msgstr "������ ���������� ������ �������: %s: %s"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -6903,7 +7467,7 @@ msgstr ""
 "������ � ���������� ��������� \"%s\":\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -6912,36 +7476,32 @@ msgstr ""
 "������ ��� ���������� ��������� ������ \"%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 "(��������� ���) ������� ������������� ����������� ����������"
 
-#: 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
-msgid "Invalid type in body-contains, expecting string"
-msgstr "������������ ��� � ����-��������, ��������� ������"
-
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "���������������� ��������: �������� ���������: ��� %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "���������������� ��������: ����� ���������: ��� %s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "���������������� ��������: ����� �� �������������� ������������: ��� %s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "����������� ���������"
 
@@ -7052,170 +7612,126 @@ msgstr "����������, ������� ��� %s ������ ��� %s"
 msgid "Please enter your %s passphrase"
 msgstr "����������, ������� ��� %s ������."
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
 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:628 camel/camel-pgp-context.c:802
 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: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:755
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "���������� ��������� ��� ���������: ��� ������ ��� ���������� �������"
 
-#: camel/camel-pgp-context.c:953
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "���������� ��������� ��� ���������: ��� ������ ��� ��������"
 
-#: camel/camel-pgp-context.c:959
+#: 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:970
+#: 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:1143
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "���������� ����������� ��� ���������: ��� ������ ��� ����������"
 
-#: camel/camel-pgp-context.c:1153
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr "���������� ����������� ��� ���������: �� ���ģ� ������"
 
-#: camel/camel-pgp-context.c:1160
+#: 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:1169
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "���������� ����������� ��� ���������: �� ���������� ����������"
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 "���������� ������������ ��� ���������: ��� �������������� ������ ��� "
 "�����������"
 
-#: camel/camel-pgp-context.c:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr "���������� ������������ ��� ���������: �� ���ģ� ������"
 
-#: camel/camel-pgp-context.c:1352
+#: 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:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "����������, ������� ��� ������ ��� %s"
-
-#: camel/camel-pkcs7-context.c:213
-msgid "Error hashing password."
-msgstr "������ ����������� ������."
-
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr "������������ ������."
-
-#: camel/camel-pkcs7-context.c:329
-#, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "�� ������� ���������: ���������� ��� \"%s\" �� ������."
-
-#: camel/camel-pkcs7-context.c:378
-#, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:590
-msgid "Could not encrypt: failed to create encryption context."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:620
-#, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:626
-msgid "Could not encrypt: encoding failed."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr ""
-
-#: 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:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "�� ������� ��������� %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 "�� ������� ��������� %s: � ������ ��� ����������������� ����."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s ������ %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s ������ ��� %s �� %s"
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "���������� ��������"
 
-#: camel/camel-remote-store.c:267
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(���� ����������)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7328,13 +7844,14 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "�������� ����� �� ������� ��� ��������������."
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
-msgstr "������������ NT"
+#, fuzzy
+msgid "Login"
+msgstr "�����"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
@@ -7346,9 +7863,22 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "����������� ��������� �������������."
 
+#: 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 ""
+"����������� � ������� ����� ������������� � �������������� ��� "
+"�������������� ��������� Kerberos 4."
+
 #: 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/nntp/camel-nntp-store.c:153
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "������"
 
@@ -7392,26 +7922,41 @@ msgstr "URL \\\"%s\\\" ��������� � ���������� �����"
 msgid "URL '%s' needs a path component"
 msgstr "URL \\\"%s\\\" ��������� � ���������� ����"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "����� ����: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "������ ��� ������ ����: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "���� ������ ����: %s: ���� �� ������"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "���� ������ ����: %s: ������� ����������"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "����� ����: %s"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "���� ������ ����: %s: ���� �� ������"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "���� ������ ����: %s: ������� ����������"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "��������� ����������� ����� ����������� �����"
@@ -7420,12 +7965,12 @@ msgstr "��������� ����������� ����� ����������� �����"
 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 "��������� ��� ��������� \"%s\" �� ��������"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7434,6 +7979,11 @@ msgstr ""
 "�� ������� ������� ������� %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "����������, ������� ��� ������ ��� %s"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "����������, ������� ����������, ������� ����� ����������� ��� �������."
@@ -7466,22 +8016,22 @@ msgstr "�� ������� ������������ ���������."
 msgid "Failed to verify certificates."
 msgstr "�� ������� ��������� �����������."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "�� ������� �������� �����: ������������ �������� � ���� ���������"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�� ������� ������� �����: ������������ �������� � ���� ���������"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7498,7 +8048,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:438
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7507,16 +8057,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:500
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7541,27 +8091,27 @@ msgstr "�� ������� ��������� URL \"%s\""
 msgid "No such message %s in %s"
 msgstr "��� ��������� %s � %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "��� ������ ���������: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "�� ������� ������� �����: %s: ������������ ��������"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "�� ������� ������� �����: %s: ��� ����� �����"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "�� ������� ������������� �����: %s: ������������ ��������"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "�� ������� ������������� �����: %s: ��� ����� �����"
@@ -7594,52 +8144,52 @@ msgstr "����� ������� IMAP �� �������� ���������� � %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "����������� ����� \"OK\" �� ������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "�� ������� ������� ������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "�� ������� ��������� ������� ���������� � %s"
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "����� �������� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2104
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "��� ��������� � ��������� ������ ����������"
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "��������� ������� ���������� �� ����� ���������� "
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "����� ����� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:2141
+#: camel/providers/imap/camel-imap-folder.c:2151
 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:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "�� ������� ������� ������� ����: %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 "���� ��� ����������� ��������� %s: %s"
@@ -7652,7 +8202,7 @@ msgstr "�������� ����� �����"
 msgid "Check for new messages in all folders"
 msgstr "��������� ����� ����� �� ���� ������"
 
-#: 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 "�����"
 
@@ -7687,28 +8237,28 @@ msgstr ""
 "����������� � ������� IMAP ����� ������������� � �������������� "
 "���������������� ������."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "������ IMAP %s �� ������������ ������������� ��� �������������� %s"
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:393
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "�������������� %s �� ��������������"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s����������, ������� ������ IMAP ��� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:434
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "�� �� ����� ������."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -7719,102 +8269,121 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "��� ����� ����� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "��� ����� �� ����� ��������� ��������"
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "�������� �������� � ������� UNIX MH"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 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:64
 msgid "Local delivery"
 msgstr "��������� ��������"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "��� ��������� ��������� ����� �� ����� � ����������� ������� mbox."
 
-#: camel/providers/local/camel-local-provider.c:62
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:82
 msgid "Maildir-format mail directories"
 msgstr "�������� �������� � ������� Maildir"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr "��� �������� ��������� ����� � �������� ��������� maildir."
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr "����������� ���� Unix mbox"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "������������� ���� � ��������� %s"
 
-#: 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: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: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:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "��������� �������� ���� %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�� ������� ������������� ����� %s � %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 "�� ������� ������������� �����: %s"
+
+#: 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: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/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "�� ������� ��������� ������� ����������: %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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "���������� �������� ��������� � ������� ����������: ������� ����������"
 
@@ -7834,7 +8403,7 @@ msgstr "���������� �������� ��������� � ����� ��������� ��������: %s: %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -7846,7 +8415,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "��� ������ ���������"
 
@@ -7855,7 +8424,7 @@ msgstr "��� ������ ���������"
 msgid "Invalid message contents"
 msgstr "�������� ���������� ���������"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -7865,14 +8434,14 @@ msgstr ""
 "�� ������� ������� ����� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "����� \"%s\" �� ����������."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -7882,41 +8451,64 @@ msgstr ""
 "�� ������� ������� ����� \"%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\" �� �������� �������� ���������."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "�� ������� ������� ����� \"%s\": %s"
 
-#: 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:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, 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:408
+#: camel/providers/local/camel-maildir-summary.c:531
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "���������� ������� ���� � ����� ��������� ��������: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "�������� ����� �����"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "���������� �����"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "���������� ������� �������� ����: %s: %s\n"
@@ -7933,9 +8525,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -7945,16 +8537,16 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "������, ����� ������������� ���������."
 
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "���� ��� �������� ���������: �������� ���� ���������?"
 
-#: 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"
@@ -7963,7 +8555,7 @@ msgstr ""
 "�� ������� ������� ���� \"%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"
@@ -7972,14 +8564,14 @@ msgstr ""
 "�� ������� ������� ���� \"%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\" �� �������� ������� ������."
 
-#: 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"
@@ -7988,96 +8580,85 @@ msgstr ""
 "�� ������� ������� ����� \"%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 "����� \"%s\" �� �����. �� �������."
 
-#. 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:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "�� ������� ������� �����: %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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "��������� ������ ��������� ����������� ����� ������� %ld � ����� %s"
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "�� ������� ������� ����: %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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %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
-#: 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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "�� ������� ������� �������� ����� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, 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:652
 #, 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "����������� ������: %s"
@@ -8096,12 +8677,12 @@ msgstr "���������� �������� ��������� � ����� mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "\"%s\" �� �������� ���������."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, 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:515
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "���������� �������� ��������� � ����� �����: %s: %s"
@@ -8112,6 +8693,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "���� ����� \"%s\" �� ���������� ��� �� �������� ������� ������"
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "����� \"%s%s\" �� ����������."
@@ -8121,29 +8703,31 @@ msgstr "����� \"%s%s\" �� ����������."
 msgid "Spool mail file %s"
 msgstr "���� ��������� ����� %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "����� ����� �� ����� ���� �������������"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "�� ������� ���������������� ��������� ����� %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8152,58 +8736,25 @@ msgstr ""
 "�� ������� ���������������� ����� �����: %s: %s\n"
 "����� ����� ���� ���������, ����� ��������� � \"%s\""
 
-#: camel/providers/local/camel-spool-summary.c:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "�� ������� ��������: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "����������, ������� ������ NNTP ��� %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "������ �� ������ ��� ������������"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "���� ��� �������� ����� ������������ �� ������"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-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\" �� ���������� ��� �� �������� ������� ������"
 
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:153
-#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/local/camel-spoold-store.c:173
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "���������� �������� ��������� %s: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:157
-msgid "User cancelled"
+msgid "Mail tree %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "�� ������� �������� � ������� ������ �����."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c: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
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "�� ������� ��������� ���� ������ ����� ��� %s: %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "������� USENET"
@@ -8213,12 +8764,12 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "��� ��������� ��� ������ � �������� ��������� � ������ �������� USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "������� USENET ����� %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8261,65 +8812,73 @@ msgstr ""
 msgid "Operation failed: %s"
 msgstr "���� ��������: %s"
 
-#: 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:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "�� ������� ��������� ������� ����� ��������� �� �������: POP %s"
+#: 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/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr "�� ������� ������� �����: ������ ��������� ��� �������."
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "�� ������� �������� �����: %s: %s"
 
-#: 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:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "�� ������� �������� ���������: %s"
-
-#: 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: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: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 "��������� ��������� %d �� POP"
 
-#: 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
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "���������� �������� ��������� %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "����������� ������"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "��������� ���������"
 
-#: 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:43
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "������� ����� %s ����"
 
-#: 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:84
 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 "��� ����������� � �������� ����� � �������� POP"
 
-#: 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."
@@ -8328,7 +8887,7 @@ msgstr ""
 "���������������� ������. ������������ �������� POP �������������� ������ "
 "���� �������."
 
-#: 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 "
@@ -8338,56 +8897,60 @@ msgstr ""
 "������ �� ��������� APOP. ��� ����� �������� �� ��� ���� ������������� ���� "
 "�� ��������, ������� ����� ������������ ���."
 
-#: camel/providers/pop3/camel-pop3-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
-"����������� � ������� POP ����� ������������� � �������������� "
-"�������������� Kerberos 4."
+"�� ������� ������������ � ������� POP.\n"
+"������ �������� ����� ������������: %s"
 
-#: 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:210
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "�������� �� ��������������"
 
-#: 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:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "���� ��������������."
 
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
 msgstr "�� ������� ������������ � ������� POP �� %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%s����������, ������� ������ POP3 ��� %s@%s"
-
-#: camel/providers/pop3/camel-pop3-store.c:377
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
-"Error sending username: %s"
+"No support for requested authentication mechanism."
 msgstr ""
 "�� ������� ������������ � ������� POP.\n"
-"������ �������� ����� ������������: %s"
+"�� �������������� ������������� �������� �������������."
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
-msgid "(Unknown)"
-msgstr "(����������)"
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "���� ������� IMAP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+#: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
 msgstr ""
-"�� ������� ������������ � ������� POP.\n"
-"�� �������������� ������������� �������� �������������."
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "������ �����/������"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8396,18 +8959,13 @@ msgstr ""
 "�� ������� ������������ � ������� POP.\n"
 "������ �������� ������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "��� ����� ����� \"%s\""
 
-#: camel/providers/pop3/camel-pop3-store.c:563
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "����������� ����� �� ������� POP: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8417,53 +8975,49 @@ msgid ""
 "system."
 msgstr "������������ ��������� \"sendmail\" ��� �������� �����."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+msgid "Could not parse recipient list"
+msgstr "�� ������� ��������� ������ �����������"
+
+#: 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: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: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: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: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:190
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "Sendmail ��������� ������ � ����������� %d: ����� �� ����������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-msgid "Could not find 'From' address in message"
-msgstr "� ��������� ����������� ���� \"From\""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-msgid "Could not parse recipient list"
-msgstr "�� ������� ��������� ������ �����������"
-
-#: 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: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:74
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -8473,124 +9027,146 @@ msgstr ""
 "��� �������� ����� � ������� ����������� � ���̣����� ��������� ���� �� "
 "��������� SMTP.\n"
 
-#: 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "�������������� ������ � ���������� ��� ����������"
 
-#: 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:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "�������� ������� �� ����������"
 
-#: 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:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "���������� ���������"
 
-#: 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "������ ��������� ����� ��������"
 
-#: 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:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "����������� �������� �������� ���������"
 
-#: 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 ""
 "�� ��������� ������������; ����� ���������� � ������������ � <forward-path>"
 
-#: 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:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "����������� �������� �� ���������: �������� ���� ����������"
 
-#: 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:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "����������� ������������; ���������� <forward-path>"
 
-#: 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: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: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: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:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "���� ����������"
 
-#: 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:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "������� ������ �������� ��������������"
 
-#: 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:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "��������� ���� ��������������"
 
-#: 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:320
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "������ �� ������ ����������: %s: ������ �����, ��� �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:383
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+msgid "server does not appear to support SSL"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "��������� ����� �������� ������ �� ������ AUTH: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, 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 "SMTP ������ %s �� ������������ ������������� ��� �������������� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:421
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s����������, ������� ������ SMTP ��� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:442
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8601,93 +9177,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "�������� SMTP ����� ����� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:591
-msgid "Cannot send message: sender address not defined."
-msgstr "���������� ��������� ���������: �� ��������� ����� �����������."
-
-#: camel/providers/smtp/camel-smtp-transport.c:598
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr "���������� ��������� ���������: �������� ����� �����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "�������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr "���������� ��������� ���������: �� ���������� ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:624
+#: camel/providers/smtp/camel-smtp-transport.c:688
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "���������� ��������� ���������: ���� ��� ����� ������������ �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "����������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:820
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "��������� ����� �������� ������ �� HELO: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:840
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "������ ������ HELO: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:883
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "�������������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "������ ��� �������� ������� �������������� SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:904
-#: camel/providers/smtp/camel-smtp-transport.c:916
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "��������� ����� �������� ������ �� ������ AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:925
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "������ ������� AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:973
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "�������� ����� �� ������� ��� ��������������.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:999
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "��������� ����� �������� ������ �� MAIL FROM: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "MAIL FROM response error"
 msgstr "������ ��� ������ �� 'MAIL FROM'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "���� 'RCPT TO <%s>'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "��������� ����� �������� ������ �� 'DATA': %s: ����� �� ����������"
@@ -8695,36 +9267,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:1104
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 msgid "DATA response error"
 msgstr "������ ��� ������ �� 'DATA'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1144
-#: camel/providers/smtp/camel-smtp-transport.c:1162
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "��������� ����� �������� DATA: ��������� ��������: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1176
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1199
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "��������� ����� �������� ������ �� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 msgid "RSET response error"
 msgstr "������ ��� ������ �� 'RSET'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1236
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "��������� ����� �������� ������ �� QUIT: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 msgid "QUIT response error"
 msgstr "������ ��� ������ �� 'QUIT'"
 
@@ -8753,7 +9325,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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 "������������ ����"
 
@@ -8793,56 +9365,56 @@ msgid "MIME type:"
 msgstr "��� 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 "������������ �������������� ����������� ������������� �����"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "�������� ����� ����� ������� �������� �����"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "��:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "��������:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "����������� ����������� ���������"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "�����:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "������� ���������, ������� ������� ����� ���������"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "���.�����:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -8850,12 +9422,12 @@ msgstr ""
 "������� ���������, ������� ������� ����� ���������, �� ����� � ������ "
 "�����������."
 
-#: 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 "������������ ����"
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -8864,38 +9436,34 @@ msgstr ""
 "������ ��� ������ ����� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:912
-msgid "Save as..."
-msgstr "��������� ���..."
-
-#: composer/e-msg-composer.c:921
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "��������������!"
 
-#: composer/e-msg-composer.c:925
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "���� ����������, ������������?"
 
-#: composer/e-msg-composer.c:947
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "������ ���������� �����: %s"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ ��� �������� �����: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "������ ������� � �����: %s"
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "�� ������� �������� ��������� �� ���������"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -8904,7 +9472,7 @@ msgstr ""
 "�� ������� ������������� �� �����: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1019
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -8913,7 +9481,7 @@ msgstr ""
 "�� ������� ����� ����: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1028
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -8922,7 +9490,7 @@ msgstr ""
 "������ ��� �������������� ���������: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1130
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -8930,7 +9498,7 @@ msgstr ""
 "���������� ����������� ����� ���������� ������.\n"
 "���������� ������� ��������������?"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -8940,23 +9508,23 @@ msgstr ""
 "\n"
 "��������� ���������?"
 
-#: composer/e-msg-composer.c:1295
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "��������: �������� ���������"
 
-#: composer/e-msg-composer.c:1318
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "������� ����"
 
-#: composer/e-msg-composer.c:1467
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "�������� ����"
 
-#: composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "������� ���������"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -8964,7 +9532,7 @@ msgstr ""
 "�� ������� ������� ���� ���������:\n"
 "���������� ������������ ����������� ������� ������ ������."
 
-#: composer/e-msg-composer.c:2374 composer/e-msg-composer.c:2429
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -8972,13 +9540,13 @@ msgstr ""
 "�� ������� ������� ���� ���������:\n"
 "���������� ������������ ��������� ��������� HTML."
 
-#: 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."
 msgstr "�� ������� ������� ���� ��������� - �� �������� �������� ���������."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "���������� ���������������� �������� ����� Evolution."
 
@@ -9030,12 +9598,21 @@ msgstr "���� ��������"
 msgid "Subject does not contain"
 msgstr "���� �� ��������"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"���� � ����� ��������� ��� ����������.\n"
+"������������ ���?"
+
 #. 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:270
+#: e-util/e-passwords.c:365 mail/mail-session.c:270
 msgid "Remember this password for the remainder of this session"
 msgstr "��������� ���� ������ �� ��������� ���� ������"
 
@@ -9133,164 +9710,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 "��������� Evolution ��� Executive Summary."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr ""
-
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-
-#: 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 ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "��������� ����� %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "�������� ��� %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "��������� %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "������� %s"
-
-#: 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
-#, c-format
-msgid "Move %s to the right"
-msgstr "����������� %s ������"
-
-#: 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
-#, c-format
-msgid "Move %s into the next row"
-msgstr "����������� %s � ��������� ������"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "��������� %s"
-
-#: executive-summary/component/e-summary-url.c:553
-msgid "page"
-msgstr "��������"
-
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"���������� ������� ���� HTML:\n"
-"%s"
-
-#: 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
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: 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 ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c: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
-msgid "Update automatically"
-msgstr "�������� �������������"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "�������� ������"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "��������� ������"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "���"
@@ -9323,11 +9742,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:191
 msgid "seconds"
 msgstr "�������"
 
@@ -9402,7 +9817,7 @@ msgstr " �����"
 msgid "ago"
 msgstr "�����"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:973
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9415,15 +9830,15 @@ msgid "Filter Rules"
 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
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -9431,19 +9846,11 @@ msgstr ""
 "�� ������ ������� �����.\n"
 "����������, ��������� � ������� ���������� ����� ��� �������� �����."
 
-#: 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:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "������� �����"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "������ URI �����"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<ݣ������ ����� ����� ������� �����>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9453,7 +9860,7 @@ msgstr ""
 "������ � ���������� ��������� \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:488 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "��������"
 
@@ -9461,39 +9868,40 @@ msgstr "��������"
 msgid "You must name this filter."
 msgstr "�� ������ ����������� ���� ������"
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "�������� �������: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "���������������"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "����"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "��������� ��������"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "���� ������������� ���� ���������"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "���� ������������� ������ �� ���������"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "�������� ��������"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "��������"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "���������"
 
@@ -9539,190 +9947,213 @@ 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 "��������� ����"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "��������� ���"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "������������ �����"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "�����"
+
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "����������� � �����"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "���� ���������"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "���� ��������"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "���̣����"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "�� ��������"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "�� ������������� ��"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "�� ����������."
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "������ �� ���"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "�� ���������� �"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "�� ����������"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "������������� ��"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "c���������"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "���� �����"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "���� ��"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "������ ���"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "������ ���"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "�� ��������"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "�� ��������"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "������ ��������"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "���� ���������"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "��������� ���������"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "����������� � �����"
 
-#: filter/libfilter-i18n.h:34 mail/message-list.c:671
-msgid "Needs Reply"
-msgstr "��������� �����"
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "������������� ����:"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "���������� ���.���������"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:39 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "���"
 
-#: filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1534
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "������ (��)"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "������ ���"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "�������� ������� ������"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "����������� ���������"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "���������� �"
 
-#: filter/libfilter-i18n.h:47
-msgid "Status"
-msgstr "���������"
-
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:49 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "����"
 
@@ -9730,11 +10161,11 @@ msgstr "����"
 msgid "Rules"
 msgstr "�������"
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "�������� �������"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "������ �������"
 
@@ -9754,30 +10185,30 @@ msgstr "������� ���� �� ���� ����� � �������� ���������."
 msgid "Evolution is importing your old Elm mail"
 msgstr "�������������� ����� ����� �� 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 "��������������..."
 
-#: 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 "��������� ����������"
 
-#: 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 "�������������� %s � �������� %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 "������������ %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:101
 msgid "Mail"
 msgstr "�����"
 
@@ -9805,23 +10236,75 @@ msgstr ""
 "���������� ����� GnomeCard.\n"
 "������ ������������� �� � Evolution?"
 
-#: importers/netscape-importer.c:106
+#: 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:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "�������������� ���������� �� Netscape"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+#, fuzzy
+msgid "Trash"
+msgstr "��������"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "��������� �������� ���� %s"
+
+#: 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:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "���������"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "������� �������"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -9845,45 +10328,95 @@ msgstr ""
 msgid "Pine"
 msgstr "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
+msgid "Composer Preferences"
+msgstr ""
+
+#: 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:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "������� ��� ������������ �������� Evolution ������"
+
+#: 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:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "������� ��� ��������� ����� ��������� Evolution."
+
+#: 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:7
 msgid "Evolution mail composer."
 msgstr "��������� ��������� ����� Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "��������� Executive Summary ��������� Evolution."
 
-#: 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:10
 msgid "Evolution mail folder factory component."
 msgstr "��������� ������� �������� ����� ��������� Evolution."
 
-#: 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:12
 msgid "Factory for the Mail Summary component."
 msgstr "������� ��� ���������� Mail Summary ��������� Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "��� ����������"
+
+#: 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:16
 msgid "Mail configuration interface"
 msgstr "��������� ��������� �����"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-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:101
-msgid "Mail storage folder (internal)"
-msgstr "����� ��� �������� ����� (����������)"
+msgid "Folder containing mail"
+msgstr "�����, ���������� �����"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -9893,24 +10426,19 @@ msgstr "����������� �������� �������"
 msgid "Virtual Trash folder"
 msgstr "����� ����������� �������� �������"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "���������� ������������ � �������: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "��� ����� �� ����� ��������� ���������."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "��������..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "�������� �������� ���� �����"
 
-#: mail/component-factory.c:786
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -9918,218 +10446,236 @@ msgstr ""
 "��������� ���� �������� ��������� �������� ������������, ����������, "
 "���������, ��� �ӣ � �������."
 
-#: mail/component-factory.c:955
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr "�� �� ���������� ����� ��������������� �����"
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "����� �������� ���������"
 
-#: mail/component-factory.c:955
-msgid "New _Mail Message"
-msgstr "����� �������� ���������"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "�������� ���������..."
 
-#: mail/component-factory.c:980
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "���������� ���������������� �������� ��������� Evolution."
 
-#: mail/component-factory.c:989
+#: mail/component-factory.c:1003
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "���������� ���������������� ��������� ��������� ����� Evolution."
 
-#: mail/component-factory.c:995
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "���������� ���������������� ��������� ���������� � ����� Evolution."
 
-#: mail/component-factory.c:1211
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "����������� � �������..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "�� ������� ���������������� ��������� � ������� ��������"
 
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "�������� ��� \"%s\""
 
-#: mail/folder-browser-ui.c:275
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "��������"
 
-#: mail/folder-browser.c:298 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:752
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "����� %d"
 
-#: mail/folder-browser.c:755 mail/folder-browser.c:763
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:757
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "������� %d"
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "�������� %d"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "�������������� %d"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "������������ %d"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "����� %d"
 
-#: mail/folder-browser.c:1055
-msgid "Create vFolder from Search"
-msgstr "������� ����������� ����� �� ������"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "������� ����������� ����� �� ���������"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "����������� ����� �� ����"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "����������� ����� �� �����������"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "����������� ����� �� ����������"
 
-#: mail/folder-browser.c:1441
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "����������� ����� �� ������ ��������"
 
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "������ �� ����"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "������ �� �����������"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "������ �� �����������"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "������ �� ������ ��������"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "������� ��� ����� ���������..."
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
-msgid "_Save As..."
-msgstr "��������� ���..."
-
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "����������"
 
-#: mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "�������� �����������"
 
-#: mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "�������� � ������"
 
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "�������� ����"
 
-#: mail/folder-browser.c:1465
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "���������"
 
-#: mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "���������"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "��������"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "�������� ��� �����������"
 
-#: mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "�������� ��� �������������"
 
-#: mail/folder-browser.c:1469
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "�������� ��� ������"
 
-#: mail/folder-browser.c:1470
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "�������� ��� ��������"
 
-#: mail/folder-browser.c:1471
-msgid "Mark as Needing Reply"
-msgstr "�������� ��� ��������� ������"
-
-#: mail/folder-browser.c:1472
-msgid "Mark as Not Needing Reply"
-msgstr "�������� ��� ����������� ������"
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "������������"
 
-#: mail/folder-browser.c:1476
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "����������� � �����..."
 
-#: mail/folder-browser.c:1477
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "����������� � �����..."
 
-#: mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
-msgid "_Undelete"
-msgstr "������������"
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "�����"
 
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "�������� ����������� � �������� �����"
 
-#: mail/folder-browser.c:1486
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "��������� �������"
 
-#: mail/folder-browser.c:1488
-msgid "Create Ru_le From Message"
-msgstr "������� ������� �� ���������"
-
 #: mail/folder-browser.c:1657
-msgid "Filter on Mailing List"
-msgstr "������ �� ������ ��������"
+#, fuzzy
+msgid "Crea_te Rule From Message"
+msgstr "������� ������� �� ���������"
 
-#: mail/folder-browser.c:1658
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "����������� ����� �� ������ ��������"
 
-#: mail/folder-browser.c:1660
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "������ �� ������ �������� (%s)"
 
-#: mail/folder-browser.c:1661
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "����������� ����� �� ������ �������� (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "�� ���������"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "��������� ���������� � �����"
@@ -10151,26 +10697,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "����������� ����� Outlook Express 4 � Evolution"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "���� ��������"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "������� ������ ��������:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "��������������:"
-
-#: 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:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "����� ������ ��������:"
 
-#: 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"
@@ -10180,15 +10719,15 @@ msgstr ""
 "(����� ��� �������� ��������� ������������) ����� �� ���� �������������\n"
 "�����������������. ����������� ��� ����������� � �������������."
 
-#: 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"
 
@@ -10206,66 +10745,79 @@ msgstr "�������� �������� Evolution"
 msgid "Evolution Account Editor"
 msgstr "�������� �ޣ���� ������� Evolution"
 
-#: mail/mail-account-gui.c:959
-msgid "Could not save signature file."
-msgstr "�� ������� ��������� ���� �������."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "������:"
 
-#: mail/mail-account-gui.c:1036
-msgid "Save signature"
-msgstr "��������� �������"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "��� ������������:"
 
-#: mail/mail-account-gui.c:1042
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+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 ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"��� ������� ���� ��������, �� �� ���� ���������.\n"
-"\n"
-"�� ������ ��������� ���������?"
 
-#: mail/mail-account-gui.c:1665
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr "�� �� ������ ������� ��� �ޣ���� ������ � ���������� ������."
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (��������)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "���������"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "��������"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "�� ������� ��� ������ ������� ��� �ޣ���� ������?"
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "�� �������"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "������������� ������� �ޣ���� ������?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "���������"
+
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "��������"
+
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
 msgid "Are you sure you want to delete this news account?"
 msgstr "�� ������� ��� ������ ������� ��� �ޣ���� ������ ��������?"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:49
-msgid "Mail Settings"
-msgstr "��������� �����"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "��������"
+
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "�������� �ޣ���� ������:"
+
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "������-����"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "�������� ������� �������"
 
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10277,7 +10829,7 @@ msgstr ""
 "����������, ��������� ��� ������������� �����.\n"
 "�� ������ ��������� ��� ������?"
 
-#: mail/mail-callbacks.c:143
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10285,7 +10837,7 @@ msgstr ""
 "�� ������ ��������� ������������\n"
 "�� ����, ��� ������� ���������� �����."
 
-#: mail/mail-callbacks.c:157
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10293,12 +10845,8 @@ msgstr ""
 "�� ������ ��������� �������� �����\n"
 "�� ����, ��� ������� ���������� �����."
 
-#: mail/mail-callbacks.c:187
-msgid "You have not set a mail transport method"
-msgstr "�� �� ���������� ����� ��������������� �����"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10306,11 +10854,11 @@ msgstr ""
 "�� ��������� ��������� � HTML �������, �� ��������� ���������� �� ����� "
 "�������� ����� � HTML �������:\n"
 
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "�ӣ �� ���������?"
 
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10318,7 +10866,7 @@ msgstr ""
 "��� ��������� �� ����� ����.\n"
 "��������� ���?"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10326,11 +10874,11 @@ msgstr ""
 "��� ��� ������ ����������� ��������������� �� �������� ������� �� ������, "
 "��� ��������� ����� ��������� ������ ����������� ������� �����."
 
-#: mail/mail-callbacks.c:327
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "��� ��������� �������� ������ ����������� ������� �����."
 
-#: mail/mail-callbacks.c:331
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10340,16 +10888,16 @@ msgstr ""
 "���������� Apparently-To ���������.\n"
 "�ӣ ����� ���������?"
 
-#: mail/mail-callbacks.c:460
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr "�� ������ ������� �����������, ����� ��������� ��� ���������."
 
-#: mail/mail-callbacks.c:549
+#: mail/mail-callbacks.c:497
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "�� ������ ��������� �ޣ���� ������ �� ����, ��� ������� ���������� �����."
 
-#: mail/mail-callbacks.c:668
+#: mail/mail-callbacks.c:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10357,28 +10905,28 @@ msgstr ""
 "�� ������� ������� ����� ���������� ��� ���� ������� ������.\n"
 "������ ������������ ����� ���������� �� ���������?"
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "����������� �����������"
 
-#: mail/mail-callbacks.c:883
+#: mail/mail-callbacks.c:981
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "� %a, %d.%m.%Y, � %H:%M, %%s �������:"
 
-#: mail/mail-callbacks.c:1411 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "����������� ���������(�) �"
 
-#: mail/mail-callbacks.c:1413 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "����������� ���������(�) �"
 
-#: mail/mail-callbacks.c:1914
+#: mail/mail-callbacks.c:2091
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�� �������, ��� ������ ������� ��� %d ���������?"
 
-#: mail/mail-callbacks.c:1939
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10386,7 +10934,7 @@ msgstr ""
 "�� ������ ������� ������ ���������,\n"
 "����������� � ����� \"���������\"."
 
-#: mail/mail-callbacks.c:1978
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10394,24 +10942,39 @@ msgstr ""
 "�� ������ ������������� ���������\n"
 "������ �� ����� \"������������\"."
 
-#: mail/mail-callbacks.c:1992
+#: mail/mail-callbacks.c:2169
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�� �������, ��� ������ ������������� ��� %d ���������?"
 
-#: mail/mail-callbacks.c:2018
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "��� ��������� ���������"
 
-#: mail/mail-callbacks.c:2117
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "������������ ����?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "��������� ��������� ���..."
 
-#: mail/mail-callbacks.c:2119
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "��������� ��������� ���..."
 
-#: mail/mail-callbacks.c:2290
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "�������� ��������� ������������� ���������"
+
+#: mail/mail-callbacks.c:2373
+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
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10423,7 +10986,7 @@ msgstr ""
 "\n"
 "���������� ��� ���������?"
 
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10432,28 +10995,28 @@ msgstr ""
 "������ ��� �������� ���������� �������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "��������� ��������"
 
-#: mail/mail-callbacks.c:2490
+#: mail/mail-callbacks.c:2783
 #, c-format
 msgid "Page %d of %d"
 msgstr "�������� %d �� %d"
 
-#: mail/mail-callbacks.c:2542
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "���������� ���������"
 
-#: mail/mail-callbacks.c:2569
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2604
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "���� ������ ���������"
 
-#: mail/mail-callbacks.c:2770
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "�� ������� ��� ������ ������� ��� %d ��������� � ��������� �����?"
@@ -10509,11 +11072,34 @@ msgstr ""
 "�������� ����� ������������ ������ ��� �����������."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "�������� �� �ޣ���� ������� Evolution"
 
-#: mail/mail-config.c:1995
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "���������"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "����"
+
+#. blue
+#: mail/mail-config.c:78 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"
@@ -10524,96 +11110,158 @@ msgstr ""
 "%s\n"
 "����� �� ����� ������."
 
-#: mail/mail-config.c:2248
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "�������� �������"
 
-#: mail/mail-config.c:2326 mail/mail-config.c:2330
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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 " _Check for supported types "
-msgstr " �������� �������������� ����� "
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " ����"
+#, 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
+#, fuzzy
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr "(� ���� ������ Evolution SSL �� ��������������)"
+
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(� ���� ������ Evolution SSL �� ��������������)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "������ ��������� ���� ������, ����� ���������� ����������� �����"
 
-#: mail/mail-config.glade.h:5
-msgid "Account"
-msgstr "�ޣ���� ������"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "�������� �ޣ���� ������� Evolution"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "���������� �� �ޣ���� ������"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "���������� �ޣ����� ��������"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "�ޣ���� ������"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "�������� ��������"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:12
+#, fuzzy
+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:10
-msgid "Always _sign outgoing messages when using this account"
+#: 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:11
-msgid "Always blind carbon-copy to:"
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "������ ���������� ������� �����:"
 
-#: mail/mail-config.glade.h:12
-msgid "Always carbon-copy to:"
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Always _carbon-copy (Cc) to:"
 msgstr "������ ���������� �����:"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "������"
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "������������ ���� � ���������"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "������������ ����"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "��������������"
 
-#: mail/mail-config.glade.h:15
-msgid "Beep when new mail arrives"
-msgstr "����� �� �������� ����� �����"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "������������� ��������� ����� �����"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "����������� ����� ��������: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "�������"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "�������� ����� �����"
 
-#: mail/mail-config.glade.h:17
-msgid "Composer"
-msgstr "��������"
-
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "�������� ���������"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:20
-msgid "Confirm when Expunging a folder"
-msgstr "������������ ����������� ���������, ���������� ��� ���̣����, � �����"
-
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10629,256 +11277,371 @@ msgstr ""
 "\n"
 "������� \"���������\", ����� ��������� ���� ���������."
 
-#: mail/mail-config.glade.h:27
+#: 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:28
-msgid "Default Forward style is: "
-msgstr "����� ��������� ��-���������: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "�� ���������"
 
-#: mail/mail-config.glade.h:29
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "��������� �������� ��-���������: "
 
-#: mail/mail-config.glade.h:30
-msgid "Defaults"
-msgstr "������� ��������"
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "��������� ��.�����"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "�������� ID..."
 
-#: mail/mail-config.glade.h:33
-msgid "Display"
-msgstr "�����������"
-
-#: mail/mail-config.glade.h:34
-msgid "Do not notify me when new mail arrives"
-msgstr "�� ������������� ��� ������� ����� �����"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "���������� ������� ���������"
 
-#: mail/mail-config.glade.h:35 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:36
-msgid "Drafts"
-msgstr "���������"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "����� ����������:"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "��������"
 
-#: 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:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:39
-msgid "Enabled"
-msgstr "��������"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "���������"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "��.����� ��������"
+
+#: 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 "������� �������� ������� ��� ������"
+
+#: mail/mail-config.glade.h:53
 msgid "Execute Command..."
 msgstr "��������� �������..."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "������������� ��"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "��������"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "����������� ���������"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "�������� �������� �������������..."
 
-#: mail/mail-config.glade.h:42
-msgid "HTML signature file:"
-msgstr "���� ������� � ������� HTML:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "�������� ������ � �������"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "��������"
+
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:44 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:45
-msgid "In HTML mail"
-msgstr "����� � ������� HTML"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "��������� � �������"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "��������� �����������"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "��������� �����"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "������������ ��������� �����"
 
-#: mail/mail-config.glade.h:51
-msgid "Make this my _default account"
-msgstr "������� ���� �������� �ޣ���� �������"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "��������� ���������"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "����������� ���������"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "����������"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "������ NNTP"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "��������� � ����� �����"
 
-#: mail/mail-config.glade.h:54
-msgid "News"
-msgstr "�������"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "��������� ��������"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "�������������� ����������"
 
-#: mail/mail-config.glade.h:58
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "�����������:"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "�������� PGP ID:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "������� ����"
 
-#: mail/mail-config.glade.h:62
-msgid "Play sound file when new mail arrives"
-msgstr "������������� �������� ���� �� �������� ����� �����"
-
-#: mail/mail-config.glade.h:63
-msgid "Pretty Good Privacy"
-msgstr "Pretty Good Privacy"
-
-#: mail/mail-config.glade.h:64
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
-"������������� ��� �������� ��������� � ������� HTML ���, ��� �� ������ �����"
-
-#: mail/mail-config.glade.h:65
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "������������� ��� �������� ��������� � ������ �����"
-
-#: mail/mail-config.glade.h:66
-msgid "Prompt when sending messages with only _Bcc recipients defined"
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "������������� ��� �������� ���������, � ������� ���������� ������ ���������� "
 "������� �����."
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:89
+#, fuzzy
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy"
+
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "���������� ��������� ��������"
+
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "�������� ������� Qmail "
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "���������� ������� ���������"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "�������������"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "��������� ���� ������"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
-msgid "Receiving Email"
-msgstr "��������� ��.�����"
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "��������:"
 
-#: mail/mail-config.glade.h:71
-msgid "Receiving Mail"
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+msgid "Receiving Email"
 msgstr "��������� ��.�����"
 
-#: mail/mail-config.glade.h:72
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "��������� ���������"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "��������� ���� ������"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "����������� ����������"
 
-#: mail/mail-config.glade.h:75
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+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:76
-msgid "Security"
-msgstr "������������"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:77
-msgid "Select Filter Log file..."
-msgstr "������� ���� ������� ��� ��������..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:78
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "������� ��������� PGP"
 
-#: mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "�������� ��.�����"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "���� �������:"
 
-#: mail/mail-config.glade.h:80
-msgid "Sending Mail"
-msgstr "�������� ��.�����"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "������� �ӣ ����� �������"
 
-#: mail/mail-config.glade.h:82
-msgid "Sent"
-msgstr "������������"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "�������� ��.�����"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "����� ������������ ���������:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "������������ ��������� � ���������"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "������ ������� �������������"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "��������� �������"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "��� �������:"
 
-#: mail/mail-config.glade.h:88
-msgid "Signature file:"
-msgstr "���� �������:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "������"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "��������� �������"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "���������� �� ���������"
 
-#: mail/mail-config.glade.h:91
-msgid "Sources"
-msgstr "���������"
-
-#: mail/mail-config.glade.h:92
-msgid "Specify filename:"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
 msgstr "������� ��� �����:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "����������� ���� Unix mbox"
 
-#: mail/mail-config.glade.h:94
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "���"
+#: mail/mail-config.glade.h:128
+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:95
-msgid "Use s_ecure connection (SSL)"
-msgstr "������������ ���������� ���������� (SSL)"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "���� ������� � ������� HTML:"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "����������"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10888,126 +11651,218 @@ msgstr ""
 "\n"
 "������� \"����.\" ��� ������."
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "���������"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "������ ��������� �����������"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr "������ ����������� ���������, ����� ������������ ��� �ޣ���� ������"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "��� ��������������: "
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "��� ��������������: "
+
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "������������� ��������� ����� �����"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:145
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "����� �� �������� ����� �����"
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "������������� �����������:"
 
-#: mail/mail-config.glade.h:106
-msgid "_Drafts folder:"
-msgstr "����� ����������:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:108
-msgid "_Email Address:"
-msgstr "��.�����:"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "������������ ����������� ���������, ���������� ��� ���̣����, � �����"
 
-#: mail/mail-config.glade.h:109
-msgid "_Empty trash folders on exit"
-msgstr "������� �������� ������� ��� ������"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "������� ��������"
 
-#: mail/mail-config.glade.h:110
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:151
+#, fuzzy
+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
+#, fuzzy
+msgid "_Filename:"
+msgstr "��� �����:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "��������� ���"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "������ ���:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "����� � ������� HTML"
+
+#: mail/mail-config.glade.h:160
 msgid "_HTML Signature:"
 msgstr "���� ������� � ������� HTML:"
 
-#: mail/mail-config.glade.h:112
-msgid "_Highlight citations with"
-msgstr "�������� ������ � �������"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "�����������"
 
-#: mail/mail-config.glade.h:113
-msgid "_Host:"
-msgstr "������:"
+#: mail/mail-config.glade.h:163
+msgid "_Language:"
+msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr "��������� �����������, ���� ����������� ���� � �������� �����"
 
-#: mail/mail-config.glade.h:115
-msgid "_Log filter actions to:"
-msgstr "�������������� �������� �������� �:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "������� ���� �������� �ޣ���� �������"
 
-#: mail/mail-config.glade.h:116
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "�������� ��������� ��� \"�����������\" �����:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "���:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "������� �� ��������� �����������"
 
-#: mail/mail-config.glade.h:119
-msgid "_Organization:"
-msgstr "�����������:"
-
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "���� � ��������� PGP:"
 
-#: mail/mail-config.glade.h:121
-msgid "_Path:"
-msgstr "����:"
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Play sound file when new mail arrives"
+msgstr "������������� �������� ���� �� �������� ����� �����"
 
-#: mail/mail-config.glade.h:122
-msgid "_Remember this password"
-msgstr "��������� ���� ������"
+#: mail/mail-config.glade.h:172
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr ""
+"������������� ��� �������� ��������� � ������� HTML ���, ��� �� ������ �����"
 
-#: mail/mail-config.glade.h:123
-msgid "_Send mail in HTML format by default."
-msgstr "�� ��������� ���������� ����� � ������� HTML."
+#: mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "������������� ��� �������� ��������� � ������ �����"
 
-#: mail/mail-config.glade.h:124
-msgid "_Server Type: "
-msgstr "��� �������:"
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "�����"
 
-#: mail/mail-config.glade.h:125
-msgid "_Signature file:"
-msgstr "���� �������:"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "��������� ��.�����"
 
-#: mail/mail-config.glade.h:126
-msgid "_Username:"
-msgstr "��� ������������:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "�������� ����"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "������������"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "������������"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "�������� ��.�����"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "�������� ����� ���"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "����������"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "������"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " ����"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:131
-msgid "placeholder"
-msgstr "placeholder"
-
-#: mail/mail-config.glade.h:132
-msgid "seconds."
-msgstr "������."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "�� ������� ������� �������� ������� PGP"
@@ -11044,127 +11899,139 @@ msgstr "�� ������� ������� �������� �������� S/MIME"
 msgid "Could not create a S/MIME decode context."
 msgstr "�� ������� ������� �������� ������������� S/MIME"
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "��������� ������������ ����"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "�� ������� ������� ��������� �������: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "��������� �� �����..."
 
-#: 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 "������� � %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "���������� �������� (����� %s)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "������"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "������� ��������� ���������"
 
-#: mail/mail-display.c:1162
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "�������� ����������� ���������"
 
-#: mail/mail-display.c:1657
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "������� ������ � ��������"
 
-#: mail/mail-display.c:1659
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "����������� ������"
 
-#: mail/mail-display.c:1662
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "��������� ������ ���"
 
-#: mail/mail-display.c:1665
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "��������� ����������� ���..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s ������������ ����"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "�� ������� ��������� ��������� MIME. ������������ ��� ����."
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "�������� ��.�����"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "��"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "��������"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "�����"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "���.�����:"
 
-#: mail/mail-format.c:2022
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
+msgstr ""
+"\n"
+"�������� ������: "
+
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "��������� �� FTP ���� (%s)"
 
-#: mail/mail-format.c:2036
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "��������� �� ��������� ���� (%s), ��������� �� ����� \"%s\""
 
-#: mail/mail-format.c:2041
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "��������� �� ��������� ���� (%s)"
 
-#: mail/mail-format.c:2070
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "��������� �� ���̣���� ������ (%s)"
 
-#: mail/mail-format.c:2078
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "��������� �� ����������� ������� ������ (���� \"%s\")"
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "����� external-body ������� ������������"
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "������������� �����"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11173,28 +12040,28 @@ msgstr ""
 "���������� ��������� ���������� �����, ��������, �� ����������\n"
 "��� ������ �� ������ ������� ��� �����: %s: %s"
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "���������� ��������� ���������� ����� � %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "���������� ������� ���������� ����� %s: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "��������� ����� \"%s\" � ������ \"%s\""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 "%s ����� �� ��������� �������������, ��� ��� �� �������� ��������� ������"
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11202,11 +12069,11 @@ msgstr ""
 "���� �� �� ������ ������ ������� ���� ����,\n"
 "��������, ��� ���ģ��� ������������ ��� �������."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr "�� �� ������ �������� ������ ����������� �����."
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "������������� /%s"
@@ -11233,112 +12100,112 @@ msgstr ""
 msgid "Working"
 msgstr "���������"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "���������� �����"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "��������� ��.�����"
 
-#: 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:599
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "�������� \"%s\""
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "�������� ��������� %d �� %d"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "���� �� ��������� %d �� %d"
 
-#: 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:833
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "���������� ��������� � �����"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "����������� ��������� � %s"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "����������� ��������� � %s"
 
-#: mail/mail-ops.c:940
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "�����������"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "�����������"
 
-#: mail/mail-ops.c:1053
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "������������ ����� �� \"%s\""
 
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "����������� ���������"
 
-#: mail/mail-ops.c:1279
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "�������� ����� \"%s\""
 
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "�������� ��������� %s"
 
-#: mail/mail-ops.c:1420
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "�������� ����� \"%s\""
 
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "���������� ����� \"%s\""
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "���������� �����"
 
-#: mail/mail-ops.c:1601
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "�������� �����"
 
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "��������� ��������� %s"
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "��������� %d ���������"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "���������� %d ���������"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11347,7 +12214,7 @@ msgstr ""
 "���������� ������� ���� ������: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11356,11 +12223,11 @@ msgstr ""
 "������ ���������� ��������� �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "���������� ������������� �����"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11369,27 +12236,27 @@ msgstr ""
 "�� ������� ������� ���� ������: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�� ������� �������� ������: %s"
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "���������� �� %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "��������������� � %s"
 
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "���������� ������� ��������: %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "�����"
 
@@ -11425,42 +12292,42 @@ msgstr "�����:"
 msgid "Matches:"
 msgstr "����������:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "������..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "������: %s, ���: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "����: %s, ���: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "���: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "��������� � �������� �����"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "�������� ���"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "����������..."
 
-#: 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:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "��������."
 
@@ -11477,24 +12344,40 @@ msgstr "������� ������ ��� %s"
 msgid "Enter Password"
 msgstr "���� ������"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "�� ������� ��������� ���� �������."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "��������� �������"
+
+#: mail/mail-signature-editor.c:178
+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-summary.c:467
-msgid "Mail Summary"
-msgstr "������� ���������� � �����"
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "���� �������:"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "����������� ��������� - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "����������� ���������"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "����������� ���������"
 
@@ -11538,75 +12421,147 @@ msgstr "������� �������������� �������������� ����������� ����� \"%s\"."
 msgid "New VFolder"
 msgstr "����� ����������� �����"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(��� ����)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - ���������"
 
-#: mail/message-list.c:662
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "�����������"
 
-#: mail/message-list.c:663
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "���������"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "��������"
 
-#: mail/message-list.c:665
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "��������� ������������� ���������"
 
-#: mail/message-list.c:666
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "��������� ���������"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "����� ������"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "������"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "�������"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "����� �������"
 
-#: mail/message-list.c:937
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:944
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "������� %I:%M %p"
 
-#: mail/message-list.c:953
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "����� %l:%M %p"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:975
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2387
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "�������� ������ ���������"
 
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "����������� ����"
+
+#: 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 ""
+
+#: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Received"
+msgstr "���� ���������"
+
+#: mail/message-list.etspec.h:10
+#, fuzzy
+msgid "Size"
+msgstr "������:"
+
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "�������� ������"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "������� � �������"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "���������� �� ���������"
+
+#: 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-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr "��������"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "�������� ����"
+
+#: 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
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -11627,7 +12582,8 @@ msgstr "�������� �� ����� \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "����������� �� ����� \"%s\""
 
-#: mail/subscribe-dialog.c:1279
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "�����"
 
@@ -11671,6 +12627,35 @@ msgstr "�����������"
 msgid "_Unsubscribe"
 msgstr "���������� �� ��������"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "�����, ���������� Evolution Summary"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "��������� ��������� ����� Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "������� ��� ������������ �������� Evolution ������"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "������� ��� ���������� Mail Summary ��������� Evolution."
+
+#: 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 ""
+
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
 msgstr ""
@@ -21464,120 +22449,138 @@ msgstr ""
 msgid "Zurich"
 msgstr "�����"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1483
-msgid "Summary"
-msgstr "�������"
-
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "�����, ���������� Evolution Summary"
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "���������� ���������������� ��������� Summary ��������� Evolution."
-
-#: 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:366
 msgid "No appointments"
 msgstr "��� ������"
 
-#: my-evolution/e-summary-calendar.c:375
+#: my-evolution/e-summary-calendar.c:400
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: 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:151
 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
+#, 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:81
-#: my-evolution/e-summary-weather.c:606
+#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "UWWW"
 
-#: my-evolution/e-summary-preferences.c:445
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "����� ��� � Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "������ ���"
 
-#: my-evolution/e-summary-preferences.c:946
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "�������� ����� ��������"
 
-#: my-evolution/e-summary-preferences.c:954
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "���� URL ��������� ��������, ������� �� ������ ��������"
 
-#: my-evolution/e-summary-preferences.c:958
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "��������:"
 
-#: my-evolution/e-summary-preferences.c:1504
-msgid "Summary Settings"
-msgstr "��������� ������"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "������ ��� �������� RDF"
 
-#: my-evolution/e-summary-rdf.c:443
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr "�������� ��������"
 
-#: my-evolution/e-summary-tasks.c:241
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
+msgstr ""
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+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
+#, fuzzy
+msgid "Shown"
+msgstr "�����"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "��� �����"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(��� ��������)"
 
-#: my-evolution/e-summary-weather.c:70
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "��� ������"
 
-#: my-evolution/e-summary-weather.c:504
+#: 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 "������"
 
-#: my-evolution/e-summary-weather.c:667
-msgid "Regions"
-msgstr "�������"
-
-#: my-evolution/e-summary.c:190
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "��������� ����������..."
 
-#: 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:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "���� ������ ������"
 
@@ -21585,38 +22588,6 @@ msgstr "���� ������ ������"
 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
-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 "����� ����"
@@ -22760,158 +23731,123 @@ msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr "�������"
-
-#: 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 "��� �����:"
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "��� ��������� ��������"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr "�������� �������"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 msgid "How many days should the calendar display at once?"
 msgstr "����� ���������� ���� ������ ��������� ���������� ������������?"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
 msgstr "����. ����� ������������ ���������:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
 msgstr "��������� ��������� ��������"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr "���� �����"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr "���� ������"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr "������ ���������� (������):"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 msgid "Refresh _time (seconds):"
 msgstr "������ ���������� (������):"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 msgid "S_how full path for folders"
 msgstr "���������� ������ ���� � ������"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr "���������� ��� ������"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _today's tasks"
 msgstr "���������� ������ �� �������"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr "���������� ����������� �:"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "������ "
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 msgid "Weather settings"
 msgstr "��������� ������"
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "���������� �����:"
-
-#: 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
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr "�������� ����������"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr "���� ����"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Mail"
 msgstr "�����"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 msgid "_News Feeds"
 msgstr "��������� ��������"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr "���� ����"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Schedule"
 msgstr "����������"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr "������"
 
-#: my-evolution/my-evolution.glade.h:33
-msgid "label27"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:34
-msgid "label39"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:35
-msgid "label40"
-msgstr ""
-
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
 msgstr ""
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr ""
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "������� �����"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "�������� Evolution."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "���������� �����������"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "�������� ��������"
 
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "��������� 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"
@@ -22919,16 +23855,16 @@ msgstr ""
 "��� �������� ������ Evolution ���������� ���������� �������������� �����\n"
 "� ��� ������ ������� Evolution"
 
-#: 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:171
 msgid "Could not update files correctly"
 msgstr "�� ������� �������� ����� ���������"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -22939,7 +23875,7 @@ msgstr ""
 "%s\n"
 "������: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -22948,7 +23884,7 @@ msgstr ""
 "��� ����������� ������ � \"%s\"\n"
 "�������� ������."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -22959,7 +23895,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -22967,7 +23903,7 @@ msgid ""
 "readable and executable and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -22975,7 +23911,7 @@ msgid ""
 "Please remove this file and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -22986,7 +23922,7 @@ msgstr ""
 "����������, ����������� ���, ����� ���������\n"
 "���������� ����� ������������ Evolution."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -23000,7 +23936,7 @@ msgstr ""
 "��� Evolution ����� ��������.\n"
 "�� ������ ������� ���� �������?"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -23011,49 +23947,53 @@ msgstr ""
 "����������, ������� ���, ����� ���������\n"
 "���������� ����� ������������ Evolution."
 
-#: 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 (C) 1999-2001 Ximian, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "������� ��� ���"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "���������� ��������� �����: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"���������� ������� �����:\n"
+"%s"
+
+#: 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: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\":"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "����������� �����"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:373
 msgid "Move folder"
 msgstr "����������� �����"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23062,18 +24002,18 @@ msgstr ""
 "���������� ������� �����:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "������� \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23082,16 +24022,16 @@ msgstr ""
 "���������� ������� �����:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "������������� ����� \"%s\" �:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "������������� �����"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23106,7 +24046,7 @@ msgstr ""
 "���������� ������� ��������� �����:\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 - ����� �����"
 
@@ -23122,7 +24062,7 @@ msgstr ""
 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:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr "(��� ���������)"
 
@@ -23295,8 +24235,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "�� ������� ��������� ��������� ��������� ��������� Evolution\n"
 
-#: 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:506
+#: shell/e-shell-user-creatable-items-handler.c:551
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "�����"
@@ -23317,92 +24257,95 @@ msgstr "�������� ����� �� ����� ��������� ����� �����."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" � \"..\" -- ����������������� �������� �����."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy �� ������."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "�� ������� ��������� Bug buddy."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "� ��������� Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "������� � �����..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "�������� �����, ������� �� ������ �������"
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "������� ����� �����"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:566
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "�������� �����, �� ������� ����� ����� ���������:"
 
-#: 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
-#, c-format
-msgid "Error executing %s."
-msgstr "������ ���������� %s."
-
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "������� � ������� �����"
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "������� � ���������� �����"
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "������� � ����� ������ ��� ����"
 
-#: shell/e-shell-view.c:215
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(����� �� ��������)"
 
-#: shell/e-shell-view.c:1598
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1600
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(���)"
 
-#: 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 ������ � ������� ������ ������. ������� �� ��� ������ ��� "
 "�������� � ����� ������ ��� ����."
 
-#: 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:1660
+#: 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:651
+#: shell/e-shell.c:169
+#, 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:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "���������� ���������� ��������� ��������� -- %s"
 
-#: shell/e-shell.c:1660
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23413,23 +24356,23 @@ msgstr ""
 "���������� ����������. ��� ���������� ������������� Evolution ��� ����,\n"
 "����� ����� ����� ������ � ����� ������."
 
-#: shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "��"
 
-#: shell/e-shell.c:1887
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "������������ ���������"
 
-#: shell/e-shell.c:1889
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "�� ������� ���������������� � OAF"
 
-#: shell/e-shell.c:1891
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "���� ������ �������� �� �������"
 
-#: shell/e-shell.c:1893 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "������� ������"
 
@@ -23546,80 +24489,71 @@ msgstr "�������"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "������� ���� ����� �� ������ �������"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "������ ���������� �������."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "������"
 
-#: shell/e-shortcuts.c:1052
+#: shell/e-shortcuts.c:1033
 msgid "Inbox"
 msgstr "��������"
 
-#: shell/e-storage-set-view.c:658
-#, 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:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(��� �����)"
-
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "��� ������"
 
-#: 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:491
 msgid "The specified folder type is not valid"
 msgstr "��������� ��� ����� �� ��������"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "������ �����/������"
 
-#: 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:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "��������� ����� �� �������"
 
-#: 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:505
 msgid "Operation not supported"
 msgstr "�������� �� ��������������"
 
-#: 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: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 "���������� ������� ����� ��������� ����������� ��������"
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "���������� ������� ����� � ����� ���������"
 
@@ -23629,10 +24563,13 @@ 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
+msgid "<click here to select a folder>"
+msgstr "<ݣ������ ����� ����� ������� �����>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -23670,67 +24607,67 @@ msgstr ""
 "������ ������� ���������:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "������ CORBA"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "��������"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "������������ ��������"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "��� ����� ���������"
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "��� ���������"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "�� �������"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "���������������� ���"
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "���������������� �����"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "���������������� ��������"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "���������� ������"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "����������"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "������������ URI"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "����� ��������� �����"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "��� �����"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "������ �������� �������� ������"
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
 msgid "Test type"
 msgstr "��� ��������"
 
@@ -23860,32 +24797,49 @@ msgstr "�� ���������� �����"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution ����� ������������� ������ �� ��������� ������:"
 
-#: shell/main.c:83
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:89
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "����� �� Evolution..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "��� ������� � �������� Ximian Evolution."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "���������� ���������������� �������� Evolution: %s"
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "��������� ��������"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "������ ��������������"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "������ ����������������� �����ԣ��"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr "���������� ���������� ����� ���� ����������� � ����."
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "���������� ���������������� ������������ ������� Bonobo."
 
@@ -23908,241 +24862,206 @@ msgstr "���� ������"
 msgid "No filename provided."
 msgstr "�� ������� ��� �����."
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "����������� ��������� ��������� � ������ �����"
+
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "����������� ���������"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "����������� � �����..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "������� ����� �������"
 
-#: 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:9 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "�������� ���������"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "������� ��������� ��������"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "������� ������"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "����������� ��������� ��������� � ������ �����"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "����������� � �����..."
 
-#: 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:17
 msgid "Previews the contacts to be printed"
 msgstr "���������� �� ��� ��������� �� ������"
 
-#: 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:22
 msgid "Save selected contacts as a VCard."
 msgstr "��������� ��������� �������� ��� VCard."
 
-#: 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:24
 msgid "Select all contacts"
 msgstr "������� ��� ��������"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "��������� ��������� � ��������..."
-
-#: 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:26
 msgid "Send message to contact"
 msgstr "��������� ��������� � ��������"
 
-#: 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:28
 msgid "Stop"
 msgstr "����"
 
-#: 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:30
 msgid "View the current contact"
 msgstr "�������� �������� ��������"
 
-#: 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-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
 msgid "_Actions"
 msgstr "��������"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Addressbook Sources..."
-msgstr "��������� �������� �����..."
-
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "�������"
-
 #: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "������ ���������"
 
-#: 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 "��������� �������..."
 
-#: 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 "����������..."
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "����������� � �����..."
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "��������� ��� VCard"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "����� ��������"
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "������� ���"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "��������� ���������"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "��������� ��������� � ��������..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "������� ����� ���������� �������"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "������� ����� ������"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "������� ����� �������"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "������� ������� �� ����� ����"
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "����"
 
-#: 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:6
 msgid "Go To"
 msgstr "������� �"
 
-#: 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:8
 msgid "Go forward"
 msgstr "������� � �������"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "������� � ����"
 
-#: 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:12
 msgid "Go to today"
 msgstr "������� � ������������ ���"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "�����"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "������� �������"
-
-#: 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: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:16 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "���������� ��� �� ������"
 
-#: 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:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "�������� 1 ����"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "�������� 1 �����"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "�������� 1 ������"
 
-#: 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:23
 msgid "Week"
 msgstr "������"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "�������..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "��������� ���������..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "������������ ���������� � ���������"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "������..."
-
 #: 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
@@ -24172,18 +25091,18 @@ msgstr "���������� �� ��� �������� �� ������"
 msgid "Print this item"
 msgstr "���������� ���� �������"
 
-#: 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:240
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "���������"
 
+#: 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
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "��������� � �������"
 
@@ -24199,8 +25118,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:40
 msgid "_File"
 msgstr "����"
 
@@ -24218,10 +25137,14 @@ msgstr "��������� ���..."
 msgid "Save the contact and close the dialog box"
 msgstr "��������� ������ � ������� ���� �������"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+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 "���������"
 
@@ -24294,82 +25217,54 @@ msgid "Compose _New Message"
 msgstr "������� ����� ���������"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "������� ��� ��������� �ޣ���� ������ ����� � ������ ���������"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "������� ��� ��������� ������� ���������� ����� �����"
 
-#: 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:6
 msgid "Empty _Trash"
 msgstr "�������� �������� �������"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "������ ������"
 
-#: 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
-msgid "New Message"
-msgstr "������� ���������"
-
-#: 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:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "���������� ��� ���������, ���������� ��� ���̣����,  �� ���� ������"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "�������� � ���������"
-
-#: 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:11
 msgid "Show message preview window"
 msgstr "�������� ���� ��������� ���������"
 
-#: 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:13
 msgid "Virtual Folder _Editor..."
 msgstr "��������� ����������� �����..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "��������� �������..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "�������� ���������..."
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "��������� �����..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "������ ���������������� ���������"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "�������� � ���������"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "����������� �� �����..."
 
@@ -24462,11 +25357,11 @@ msgstr "�������� ������ ��������� ���������"
 msgid "Threaded Message list"
 msgstr "���������� �������� �� ���� ��������� � ������ ���������"
 
-#: 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 "���������� ���̣����"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "�����"
 
@@ -24482,147 +25377,157 @@ msgstr "��������..."
 msgid "_Threaded Message List"
 msgstr "���������� �������� � ������ ���������"
 
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "�������� ����������� � �������� �����"
+
 #: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "��������� �������"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "�������� ����������� � �������� �����"
+
+#: 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: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: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: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:9
 msgid "Copy selected messages to another folder"
 msgstr "����������� ��������� ��������� � ������ �����"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "������� ����������� ����� �� ���������"
 
-#: 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: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: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: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:15
 msgid "Create a virtual folder for these recipients"
 msgstr "������� ����������� ����� �� ���� �����������"
 
-#: 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:17
 msgid "Create a virtual folder for this sender"
 msgstr "������� ����������� ����� ��� ����� �����������"
 
-#: 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:19
 msgid "Decrease the text size"
 msgstr "��������� ������ ������"
 
-#: 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:22
 msgid "Display the next message"
 msgstr "�������� ��������� ���������"
 
-#: 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:24
 msgid "Display the next unread thread"
 msgstr "�������� ��������� ������������� ��������"
 
-#: 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:26
 msgid "Display the previous message"
 msgstr "�������� ���������� ���������"
 
-#: 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:26
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "���������"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "������ �� ������ ��������..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "������ �� �����������..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "������ �� ����������..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "������ �� ����..."
 
-#: 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
-msgid "Forward"
-msgstr "���������"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward As"
-msgstr "��������� ���"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Attached"
-msgstr "��������� ������������"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "�������� ��������� ��������� ��� ��������"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Inline"
-msgstr "��������� ����������"
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "������ ���..."
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Forward _Quoted"
-msgstr "��������� ���������������"
+msgid "Force images in HTML mail to be loaded"
+msgstr "�������� �������� �������� � ����� � ������� 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 "��������� ��������� ��������� � ���� ������ ���������"
 
-#: 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:39
 msgid "Forward the selected message to someone"
 msgstr "��������� ��������� ��������� ����-����"
 
-#: 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 "��������� ��������� ��������� ����-���� ��� ������������ ����"
 
@@ -24638,24 +25543,32 @@ msgstr "��������� �����������"
 msgid "Mark as I_mportant"
 msgstr "�������� ��� ������"
 
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "�������� ��� �������������"
+
 #: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "�������� ��� ��������"
 
 #: 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
-msgid "Mark the selected messages as important"
+#, fuzzy
+msgid "Mark the selected message(s) as important"
 msgstr "�������� ��������� ��������� ��� ������"
 
 #: 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
-msgid "Mark the selected messages as unimportant"
+#, fuzzy
+msgid "Mark the selected message(s) as unimportant"
 msgstr "�������� ��������� ��������� ��� ��������"
 
 #: ui/evolution-mail-message.xml.h:51
@@ -24667,7 +25580,8 @@ msgid "Move"
 msgstr "�����������"
 
 #: 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
@@ -24675,157 +25589,157 @@ msgid "Next"
 msgstr "����."
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Important Message"
+#, fuzzy
+msgid "Next _Important Message"
 msgstr "���������� ������� ���������"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Message"
-msgstr "���������� ���������"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "��������� ��������"
 
-#: 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:58
 msgid "Open the selected message in a new window"
 msgstr "��������� ��������� ��������� � ����� ����"
 
-#: 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:60
 msgid "Original Si_ze"
 msgstr "�������� ������"
 
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "����������� �������������� ���������"
+
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "����������� ������� ���������"
+
+#: 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:64
 msgid "Previous"
 msgstr "����."
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Important Message"
-msgstr "����������� ������� ���������"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Message"
-msgstr "����������� ���������"
-
-#: 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:67
 msgid "Print this message"
 msgstr "���������� ��� ���������"
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Redirect"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Re_direct"
 msgstr ""
 
-#: 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:72
-msgid "Reply"
-msgstr "��������"
-
-#: ui/evolution-mail-message.xml.h:73
-msgid "Reply to All"
-msgstr "�������� ����"
-
-#: 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:77
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "����� � ���������..."
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "������"
 
-#: 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: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:81
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "��������� ��������� �������� ��� ������ �������� ��������"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "���������� ��� ����"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "���������� ��� ���������"
 
-#: 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:85
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "���������� ��������� �� ����� �����������"
 
-#: 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:87
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "������ ������"
 
-#: 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:89
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "����������� ����� �� ������ ��������..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "����������� ����� �� �����������..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "����������� ����� �� �����������..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "����������� ����� �� ����..."
 
-#: ui/evolution-mail-message.xml.h:94
-msgid "_Apply Filters"
-msgstr "��������������"
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Attached"
+msgstr "������������"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "����������� � �����"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "������� ������ �� ���������"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "��������� ���������"
 
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "������� �"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "����������"
+
 #: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "������"
@@ -24839,31 +25753,49 @@ msgid "_Move to Folder"
 msgstr "����������� � �����"
 
 #: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "���������� ���������"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "���������� �����������"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "������� ���������"
 
-#: ui/evolution-mail-message.xml.h:108 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "����������� ���������"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "�������������"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "�����������"
 
+#: 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 "������� ��� ����"
 
 #: 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:36
 msgid "_Close"
 msgstr "�������"
 
 #: 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:56
 msgid "_View"
 msgstr "���"
 
@@ -24887,11 +25819,11 @@ msgstr "����������� ��� ��������� � ������� PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "����������� ��� ��������� � ����� 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 "������"
 
-#: 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"
 
@@ -24907,6 +25839,10 @@ msgstr "�������� ���� ��� ����� � ���������"
 msgid "Insert text file..."
 msgstr "������� ��������� ����..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "�������"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "������� ����"
@@ -24940,7 +25876,7 @@ msgid "Save in folder..."
 msgstr "��������� � �����..."
 
 #: 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 "��������� ������� ����"
 
@@ -24965,6 +25901,7 @@ msgid "Send _later"
 msgstr "��������� �����"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "��������� ����� � ������� HTML"
 
@@ -25033,7 +25970,7 @@ msgid "_From Field"
 msgstr "���� \"��\""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "��������"
 
@@ -25045,11 +25982,7 @@ msgstr "�������..."
 msgid "_Reply-To Field"
 msgstr "���� \"�����\""
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "������������"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "�������"
 
@@ -25105,41 +26038,39 @@ msgstr "�������� ��������� ���������� �� ������"
 msgid "Re_fresh Task"
 msgstr "�������� ������"
 
-#: 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:3
 msgid "Copy selected task"
 msgstr "����������� ��������� ������"
 
-#: 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:6
 msgid "Delete completed tasks"
 msgstr "������� ����������� �������"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "������� ��������� ������"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 msgid "Mar_k as Complete"
 msgstr "�������� ��� �����������"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "�������� ������ �� ������ ������"
 
-#: ui/evolution-tasks.xml.h:15
-msgid "Tasks Settings..."
-msgstr "��������� ������..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "���������� �� ��� ��������� �� ������"
 
-#: ui/evolution-tasks.xml.h:22
-msgid "_Task"
-msgstr "������"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "���������� ��� ���������"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25206,113 +26137,118 @@ msgid "Open this folder in an other window"
 msgstr "������� ��� ����� � ����� ����"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "�������� � ���������"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "��������� ����� �� ������� � �������� ����� �����"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "�������� ���������� � ��������� Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "��������� ��������� �� ������"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "��������� ��������� �� ������"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "��������� ��������� �� ������ ��������� Bug Buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "�����������"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "����������� ����������� ������ �����"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "����������� ����������� ������ �������"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "����������� ������ �/��� ����."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "�������� ��������� �����"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "���� �� Evolution"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "� ��������� Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "�����������..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "������ �����"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "������� � �����..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "�������������..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "�����������..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "�������"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "������� �����"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "��������� Pilot..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "�������������..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "�������� � ���������"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "�����"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "������ �������"
 
-#: 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: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/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "��������� ������..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "�������� ��������"
@@ -25326,18 +26262,27 @@ msgid "Phone List"
 msgstr "������ ���������"
 
 #: 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:3
 msgid "By Sender"
 msgstr "�� �����������"
 
-#: 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:5
 msgid "By Subject"
 msgstr "�� ����"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "���������"
 
@@ -25373,11 +26318,21 @@ msgstr ""
 "������� ����.\n"
 " ����������� ������ ������ ��� ���������� �������."
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "����������"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "����������"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "���������� ���� ���������"
 
@@ -25469,20 +26424,20 @@ msgstr "����������"
 msgid "Visual"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "����������� ����� ��������: %s"
 
-#: 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:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "������..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "��������� ��������"
 
@@ -25490,30 +26445,32 @@ msgstr "��������� ��������"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "�������� ������"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "��������� ���������� ������"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "�������� � ��������� ����������� ������"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "��������"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "��������� ���������� ������"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "���������� ���"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "�������� � ��������� ����������� ������"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "����������"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "������"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "������"
@@ -25527,11 +26484,21 @@ msgstr "���������"
 msgid "Don't show this message again."
 msgstr "�� ���������� ��� ��������� �����."
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "�����"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "�����"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "��������"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "��������"
+
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "�����"
 
@@ -25556,3 +26523,720 @@ msgstr "init_corba(): �� ������� ���������������� GNOME"
 #: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
+
+#~ msgid "Card: "
+#~ msgstr "��������: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "���: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  �������:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  ���: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  ����������: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  �������:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  �������:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "���� ��������: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "�����:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "�������� ����:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  ����.:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  �����:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  �����:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  �������:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  �������� ��� (������): "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  ������:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "����� ��� ��������:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "��������:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "�������:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "��.�����:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "��.�����:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "������� ����: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Geo Location: "
+#~ msgstr ""
+#~ "\n"
+#~ "�����.���������: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "���������: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "�����������: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  ���:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "�������:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "�������2: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "�������3: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "�������4: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "���������: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "�����������: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "���������� ������: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "��������� ����: "
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "����������� � ������� LDAP..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "�������� ����������� � ������� LDAP..."
+
+#~ msgid "New _Contact"
+#~ msgstr "����� �������"
+
+#~ msgid "New Contact _List"
+#~ msgstr "����� ������ ���������"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "������ �������� �����"
+
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "������������� �� ������� � ��������������:"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "����� �������� �����"
+
+#~ msgid "Advanced"
+#~ msgstr "�����������"
+
+#~ msgid "Base"
+#~ msgstr "��������"
+
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "������ ������� �������������."
+
+#~ 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."
+
+#~ msgid "label19"
+#~ msgstr "�����"
+
+#~ msgid "label20"
+#~ msgstr "�����"
+
+#~ msgid "label47"
+#~ msgstr "�����"
+
+#~ msgid "label50"
+#~ msgstr "�����"
+
+#~ msgid "label52"
+#~ msgstr "�����"
+
+#~ msgid "label53"
+#~ msgstr "�����"
+
+#~ msgid "label56"
+#~ msgstr "�����"
+
+#~ msgid "label58"
+#~ msgstr "�����"
+
+#~ msgid "label60"
+#~ msgstr "�����"
+
+#~ msgid "Name contains"
+#~ msgstr "��� ��������"
+
+#~ msgid "(none)"
+#~ msgstr "(���)"
+
+#~ msgid "C_ontaining:"
+#~ msgstr "��������:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "�������� ��������, ��������������� ��������� ���������:"
+
+#~ msgid "label26"
+#~ msgstr "�����"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "������� ����� �������"
+
+#~ msgid "Create a new task"
+#~ msgstr "������� ����� ������"
+
+#~ msgid "New _Task"
+#~ msgstr "����� ������"
+
+#~ msgid "label55"
+#~ msgstr "�����"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "��������� ����� ������� � ������������ �� ���������"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "������ ���� ������:"
+
+#~ msgid "_Other"
+#~ msgstr "������"
+
+#~ msgid "label21"
+#~ msgstr "�����"
+
+#~ msgid "_Delete this Task"
+#~ msgstr "������� ��� ������"
+
+#~ 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 "������������ ��� � ����-��������, ��������� ������"
+
+#~ msgid "Error hashing password."
+#~ msgstr "������ ����������� ������."
+
+#~ msgid "Invalid password."
+#~ msgstr "������������ ������."
+
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "�� ������� ���������: ���������� ��� \"%s\" �� ������."
+
+#~ msgid "NT Login"
+#~ msgstr "������������ NT"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "����������, ������� ������ NNTP ��� %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "������ �� ������ ��� ������������"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "���� ��� �������� ����� ������������ �� ������"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "������ �� ������ ��� ������������/������"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "�� ������� �������� � ������� ������ �����."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "�� ������� ��������� ���� ������ ����� ��� %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "�� ������� ��������� ���� ������ ����� ��� %s: %s"
+
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "�� ������� ��������� ������� ����� ��������� �� �������: POP %s"
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr "�� ������� ������� �����: ������ ��������� ��� �������."
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "�� ������� �������� ���������: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ msgstr "�� ������� �������� ��������� � ������� POP %s: %s"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr "�� ������� ������������������� �� ������� KPOP: %s"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "�� ������� ������������ � �������: %s"
+
+#~ msgid "(Unknown)"
+#~ msgstr "(����������)"
+
+#~ msgid "Unexpected response from POP server: %s"
+#~ msgstr "����������� ����� �� ������� POP: %s"
+
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "� ��������� ����������� ���� \"From\""
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "���������� ��������� ���������: �� ��������� ����� �����������."
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "��������� Evolution ��� Executive Summary."
+
+#~ msgid "Select a service"
+#~ msgstr "������� ������"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "��������� ����� %s"
+
+#~ msgid "Run %s"
+#~ msgstr "��������� %s"
+
+#~ msgid "Close %s"
+#~ msgstr "������� %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "����������� %s �����"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "����������� %s ������"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "����������� %s � ���������� ������"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "����������� %s � ��������� ������"
+
+#~ msgid "page"
+#~ msgstr "��������"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "���������� ������� ���� HTML:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "������ ������ ������:\n"
+#~ "%s"
+
+#~ 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 "����� ��� �������� ����� (����������)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "���������� ������������ � �������: %s"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "����� �������� ���������"
+
+#~ 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 "������ ��������� ���� ������, ����� ���������� ����������� �����"
+
+#~ msgid "Composer"
+#~ msgstr "��������"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "����� ��������� ��-���������: "
+
+#~ 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 "���������"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "�������������� �������� �������� �:"
+
+#~ msgid "_Organization:"
+#~ msgstr "�����������:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "��������� ���� ������"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "�� ��������� ���������� ����� � ������� HTML."
+
+#~ msgid "_Server Type: "
+#~ msgstr "��� �������:"
+
+#~ msgid "_Signature file:"
+#~ msgstr "���� �������:"
+
+#~ msgid "placeholder"
+#~ msgstr "placeholder"
+
+#~ msgid "seconds."
+#~ msgstr "������."
+
+#~ msgid "Mail Summary"
+#~ msgstr "������� ���������� � �����"
+
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "���������� ���������������� ��������� Summary ��������� Evolution."
+
+#~ 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 "(��� �����)"
+
+#~ msgid "New List"
+#~ msgstr "������� ������"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "��������� ���������"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "������� ����� ���������� �������"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "������� ����� ������"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "������� ����� �������"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "������� ������� �� ����� ����"
+
+#~ msgid "_Appointment..."
+#~ msgstr "�������..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "��������� ���������..."
+
+#~ msgid "_Task..."
+#~ msgstr "������..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "������� ��� ��������� �ޣ���� ������ ����� � ������ ���������"
+
+#~ msgid "New Message"
+#~ msgstr "������� ���������"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "��������� �����..."
+
+#~ msgid "Forward _Attached"
+#~ msgstr "��������� ������������"
+
+#~ msgid "Forward _Inline"
+#~ msgstr "��������� ����������"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "��������� ���������������"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "��������������"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "��������� �������� �����"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "��������� ������..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "�������� ��������� ������"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "��������� ������..."
+
+#~ msgid "Show All"
+#~ msgstr "���������� ���"
+
+#~ msgid "Sear_ch"
+#~ msgstr "�����"
diff --git a/po/sk.po b/po/sk.po
index 8297a16f6b..d1456a138f 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-02-27 13:05+0100\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -30,16 +30,17 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importuje súbory VCard do Evolution."
 
 #: 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 "Uložiť ako"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Meno"
 
 #: 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-mail"
 
@@ -55,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/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asistent"
 
@@ -95,7 +96,7 @@ msgid "Home"
 msgstr "Domov"
 
 #: 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 "Organizácia"
 
@@ -117,7 +118,7 @@ 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/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Pracovný fax"
 
@@ -127,7 +128,7 @@ msgstr "Prac. 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/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Domáci fax"
 
@@ -147,7 +148,7 @@ msgstr "Domov 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/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -155,55 +156,54 @@ msgstr "ISDN"
 #: 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
 msgid "Other"
 msgstr "Iné"
 
 #: 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/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/widgets/e-addressbook-view.c:353
+#: 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/widgets/e-addressbook-view.c:354
+#: 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/widgets/e-addressbook-view.c:355
+#: 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: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/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/widgets/e-addressbook-view.c:359
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-mail 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 "WWW stránka"
 
@@ -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 "Oddelenie"
 
@@ -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 "Pracovisko"
 
@@ -230,12 +230,12 @@ msgid "Off"
 msgstr "Prac."
 
 #: 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 "Titul"
 
 #: 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 "Povolanie"
 
@@ -244,7 +244,7 @@ msgid "Prof"
 msgstr "Pov."
 
 #: 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 "Vedúci"
 
@@ -257,7 +257,7 @@ msgid "Ass"
 msgstr "Asist."
 
 #: 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 "Prezývka"
 
@@ -266,12 +266,12 @@ msgid "Nick"
 msgstr "Prez."
 
 #: 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 "Manžel(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 "Poznámka"
 
@@ -284,7 +284,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: 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 "Voľno/zaneprázdnený URL"
 
@@ -318,11 +318,11 @@ msgstr "Priezvisko"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Viacero VKariet"
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VKartapre %s"
@@ -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:62
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
 #: 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:2364
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Hľadám...."
 
@@ -356,37 +356,35 @@ msgstr "Načítavam..."
 msgid "Error in search expression."
 msgstr "Chyba v hľadanom výraze."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:516
-msgid "Connecting to LDAP server..."
-msgstr "Pripájam sa na server LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:526
-msgid "Unable to connect to LDAP server."
-msgstr "Nepodarilo sa pripojiť k serveru LDAP."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:542
-msgid "Waiting for connection to LDAP server..."
-msgstr "Čakám na spojenie so serverom LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Pridávam kartu do serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Odstraňujem kartu zo serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1174
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Upravujem kartu na serveri LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2281
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Spúšťam hľadanie znovu."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Prijímam výsledky hľadania LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2287
-msgid "Restarting search."
-msgstr "Spúšťam hľadanie znovu."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Chyba pri odstraňovaní karty"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Nie je možné spracovať URL `%s'"
 
 #: addressbook/conduit/address-conduit.c:293
 msgid "Default Sync Address:"
@@ -426,276 +424,112 @@ msgid "A Bonobo control for displaying an address."
 msgstr "Ovládací prvok Bonobo, ktorý zobrazuje adresy."
 
 #: 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 "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
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Prehliadač minikariet adresára Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Komponent Evolution pre prácu s kontaktami."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Vytváracie rozhranie pre ukážkový ovládací prvok Adresár"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Priečinok obsahujúci informácie o kontaktoch"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "LDAP server obsahujúci informácie o kontaktoch"
 
-#: addressbook/gui/component/addressbook-component.c:558
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Nový kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:558
-#: ui/evolution-addressbook.xml.h:34
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Nový zoznam kontaktov"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Contact _List"
 msgstr "Zoznam _kontaktov"
 
-#: addressbook/gui/component/addressbook-config.c:225
-msgid "Edit Addressbook"
-msgstr "Upraviť adresár"
-
-#: 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 "_Prihlásiť sa k serveru pomocou:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Meno účtu"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Pridať adresár"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Addressbook Sources"
-msgstr "Zdroje adresára"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Pokročilé"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Sústava"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Základné"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr "Použite túto voľbu, ak server vyžaduje prihlásenie."
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "De_lete"
-msgstr "O_dstrániť"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr "Známe meno (DN)"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "E-mailová adresa"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-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"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-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"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr "Jeden"
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "_Oblasť hľadania:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
-msgstr "_Rozsah hľadania:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Meno serveru"
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Údaje uvedené dole sú nutné pre pridanie adresára."
-
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "Táto informácia nie je pre väčšinu serverov LDAP nutná."
-
-#: 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 ""
-"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."
-
-#: 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 ""
-"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."
-
-#: 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 ""
-"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/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."
-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."
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Toto je meno serveru, kde je umiestnený adresár."
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "Toto je port, ktorý používa váš server 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."
-msgstr ""
-"Toto meno sa bude identifikovať váš účet, ale používať sa bude iba pre "
-"zobrazenie."
-
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "Meno úč_tu:"
-
-#: 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
-msgid "_Add"
-msgstr "_Pridať"
-
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr "_Známe meno:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr "Obmedzenie _sťahovania"
-
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:109
-#: 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:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:18
-msgid "_Edit"
-msgstr "_Upraviť"
-
-#: addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:110
-msgid "_Email address:"
-msgstr "_E-mailová adresa:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Port:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "_Meno serveru:"
-
-#: 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:174 calendar/gui/main.c:135
 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:525
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Nie je možné otvoriť adresár"
 
-#: 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"
@@ -704,7 +538,7 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. To buď znamená, že ste\n"
 "zadali neplatné URI, alebo LDAP server nefunguje."
 
-#: 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"
@@ -715,7 +549,7 @@ msgstr ""
 "Ak chcete LDAP v Evolution používať, musíte ho prekompilovať\n"
 "z CVS po získaní OpenLDAP z tohto odkazu.\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."
@@ -723,55 +557,47 @@ 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:655
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Zadajte heslo pre %s (používateľ %s)"
 
-#: addressbook/gui/component/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Ľubovoľné pole obsahuje"
-
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
-msgstr "Meno obsahuje"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "končí na"
 
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
-msgstr "E-mail obsahuje"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "E-mail 2"
 
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategória je"
 
 #. 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:772
+#: 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
 msgid "Advanced..."
 msgstr "Pokročilé..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1082
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Ľubovoľná kategória"
 
-#: addressbook/gui/component/addressbook.c:1167
+#: addressbook/gui/component/addressbook.c:1083
 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
@@ -820,6 +646,632 @@ 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
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "Zdroje adresára"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Alarmy"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonymný"
+
+#: 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 "Žiadna informácia"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "O_dstrániť"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "_Známe meno:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Email Address:"
+msgstr "_E-mailová adresa:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+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"
+
+#: 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"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "_Nájsť"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Všeobecné"
+
+#: 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 "Nastavenie"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Okraje"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_každých"
+
+#: 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 "Jeden"
+
+#: 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 "Štandardné"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Štandardné"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "_Rozsah hľadania:"
+
+#. 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 "Hľadám"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Vybrať všetko"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Odstránené"
+
+#: 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 "Informácia o zdrojovom kóde"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Pripájam sa na 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 "Sub"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Nepodporovaná schéma"
+
+#: 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 ""
+"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 ""
+"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 ""
+"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."
+
+#: 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 ""
+"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"
+"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 "Známe meno (DN)"
+
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+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
+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:139
+msgid "_Add"
+msgstr "_Pridať"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Pridať"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Pridať akciu"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Pridať akciu"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Alarmy"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Odstrániť všetky"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Zobrazenie"
+
+#: addressbook/gui/component/ldap-config.glade.h:111
+#, fuzzy
+msgid "_Distinguished Name (DN):"
+msgstr "Známe meno (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 "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
+#: 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 "_Upraviť"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Upraviť schôdzku"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Upozorňovanie 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 "_Nastavenie"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Port:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Štandardné"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "_Oblasť hľadania:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Meno serveru:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Čas opakovania (minúty)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Účet %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "editor-zoznamu-kontaktov"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Žiadne karty"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Znovu sa pripojujem na %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 "Všeobecné"
+
+#: 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 "Hľadám"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Rozhranie pre výber mena adresára Evolution."
@@ -829,7 +1281,7 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Vytváracie rozhranie pre rozhranie pre výber mena adresára."
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c: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
 msgid "Remove"
@@ -861,6 +1313,11 @@ msgid "Unnamed Contact"
 msgstr "Kontakt bez mena"
 
 #: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Odosielateľ obsahuje"
+
+#: 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"
@@ -869,12 +1326,16 @@ 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."
-
-#: addressbook/gui/component/select-names/e-select-names.c:608
+"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 ""
 "Evolution is unable to get the addressbook local storage.\n"
 "Under normal circumstances, this should never happen.\n"
@@ -885,31 +1346,40 @@ msgstr ""
 "Obvykle by sa to nemalo stať. Možno budete musieť znovu\n"
 "Evolution spustiť, aby sa problém vyriešil."
 
-#: 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 "Vyberte kontakty z adresára"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "O_bsahuje:"
+msgid "Select Names"
+msgstr "Výber mien"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "_Nájsť"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Odstrániť kontakt?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Výber mien"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Kontakty"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Zobraziť kontakty odpovedajúce týmto kritériám:"
+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 "_Presunúť..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategória:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Priečinok:"
 
@@ -970,17 +1440,14 @@ msgstr "Uložiť _ako:"
 msgid "Full _Name..."
 msgstr "_Celé meno..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Všeobecné"
-
 #: 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"
 "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
@@ -1017,10 +1484,11 @@ 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:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1492 mail/mail-config.glade.h:107
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "_Odstrániť"
 
@@ -2071,12 +2539,6 @@ 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?"
 
@@ -2110,7 +2572,7 @@ msgid "Edit Full"
 msgstr "Upraviť celé"
 
 #: 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 "Celé meno"
 
@@ -2316,7 +2778,7 @@ msgstr ""
 "priečinku existuje. Chcete ho aj tak pridať?"
 
 #: 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 "Pokročilé hľadanie"
 
@@ -2325,98 +2787,23 @@ msgstr "Pokročilé hľadanie"
 msgid "Search"
 msgstr "Hľadať"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:136
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Žiadne karty"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:139
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 karta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d kariet"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:369
+#: addressbook/gui/widgets/e-addressbook-model.c:370
 msgid "Error getting book view"
 msgstr "Chyba pri vytváraní pohľadu na adresár"
 
-#: 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:910
-#: addressbook/gui/widgets/e-addressbook-view.c:1024
-#: addressbook/gui/widgets/e-addressbook-view.c:1646
-#: ui/evolution-addressbook.xml.h:22
-msgid "Save as VCard"
-msgstr "Uložiť ako VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:312
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Otvoriť"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-#: ui/evolution-addressbook.xml.h:13
-msgid "Forward Contact"
-msgstr "Predať ďalej kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:1026
-msgid "Send Message to Contact"
-msgstr "Poslať správu kontaktu"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1027
-#: 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:66
-#: ui/my-evolution.xml.h:2
-msgid "Print"
-msgstr "Tlačiť"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:318
-#: addressbook/gui/widgets/e-addressbook-view.c:1029
-msgid "Print Envelope"
-msgstr "Tlačiť obálku"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:322
-#: addressbook/gui/widgets/e-addressbook-view.c:1033
-msgid "Copy to folder..."
-msgstr "Kopírovať do priečinku..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
-#: addressbook/gui/widgets/e-addressbook-view.c:1034
-msgid "Move to folder..."
-msgstr "Presunúť do priečinka..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:1037
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:7
-msgid "Cut"
-msgstr "Vystrihnúť"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
-#: addressbook/gui/widgets/e-addressbook-view.c:1038
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:7
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Kopírovať"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: addressbook/gui/widgets/e-addressbook-view.c:1039
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:12
-msgid "Paste"
-msgstr "Vložiť"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1040 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:295 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:19
-msgid "Delete"
-msgstr "Odstrániť"
-
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
 #: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
@@ -2424,14 +2811,15 @@ msgid "Error modifying card"
 msgstr "Chyba pri zmene karty"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1020
+#: shell/evolution-shell-component.c:1043
 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 shell/e-shell.c:1941
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: 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
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
@@ -2439,8 +2827,8 @@ msgstr "Neznáma chyba"
 msgid "Repository offline"
 msgstr "Sklad off-line"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 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:1071
 msgid "Permission denied"
 msgstr "Prístup zamietnutý"
 
@@ -2458,9 +2846,9 @@ 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
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: 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
 msgid "Cancelled"
 msgstr "Zrušený"
 
@@ -2492,7 +2880,7 @@ 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:1444
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Chyba pri odstraňovaní karty"
 
@@ -2514,86 +2902,186 @@ 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:342
+#: addressbook/gui/widgets/e-addressbook-util.c:344
 msgid "Move card to"
 msgstr "Presunúť kartu do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:346
 msgid "Copy card to"
 msgstr "Kopírovať kartu do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Move cards to"
 msgstr "Presunúť karty do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:351
 msgid "Copy cards to"
 msgstr "Kopírovať karty do"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:331
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Kliknutím pridáte kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Primárny telefón"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Asistentov telefón"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Telefón do zamestania"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Spätné volanie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Firemný felefón"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Telefón domov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Adresa zamestania"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Adresa domov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Mobil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Telefón v aute"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Telefón do zamestnania 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Telefón domov 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:351
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Iný telefón"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Uložiť ako VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Nový kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Nový zoznam kontaktov"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Prejsť do priečinku..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Import..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Hľadať kontakty"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Zdroje _adresára..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Nastavenie _pilota..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Predať ďalej kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Poslať správu kontaktu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Tlačiť obálku"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Copy to folder..."
+msgstr "Kopírovať do priečinku..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Move to folder..."
+msgstr "Presunúť do priečinka..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Vystrihnúť"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Aktuálny pohľad"
+
+#. 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:940
 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"
 
@@ -2601,7 +3089,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:945
 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"
 
@@ -2618,7 +3106,7 @@ msgstr "a jedna iná karta."
 msgid "Save in addressbook"
 msgstr "Uložiť do adresára"
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
@@ -2632,7 +3120,7 @@ msgstr ""
 "\n"
 "Dvojitým kliknutím vytvoríte nový kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
+#: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
 "\n"
 "\n"
@@ -2729,6 +3217,7 @@ msgid "Include:"
 msgstr "Vložiť:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Na šírku"
 
@@ -2753,6 +3242,7 @@ msgid "Options"
 msgstr "Nastavenie"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Orientácia"
 
@@ -2773,7 +3263,9 @@ msgstr "Papier"
 msgid "Paper source:"
 msgstr "Zdroj papiera:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Na výšku"
 
@@ -2833,29 +3325,25 @@ msgstr "_Písmo..."
 msgid "Untitled appointment"
 msgstr "Schôdzka bez mena"
 
-#: 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:653
+#: 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
 msgid "High"
 msgstr "Vysoká"
 
-#: 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:652
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normálny"
 
-#: 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:651
+#: 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
 msgid "Low"
 msgstr "Nízka"
 
 #. 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
 msgid "Undefined"
 msgstr "Nedefinovaná"
 
@@ -2887,41 +3375,56 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Ukážkový ovládací prvok Bonobo pre zobrazenie kalendára."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Nastavenie kalendára a úloh"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Komponent Evolution pre prácu s kalendárom."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 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:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 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:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 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:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 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:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 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
+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 "Služba upozorňovania na poplachy"
@@ -2930,22 +3433,10 @@ 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
-msgid "Evolution Alarm"
-msgstr "Upozorňovanie Evolution"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -2984,7 +3475,7 @@ msgstr ""
 "Evolution preto zobrazí normálny dialóg."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:429 mail/mail-callbacks.c:2573
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varovanie"
@@ -2999,8 +3490,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"
@@ -3010,7 +3501,7 @@ 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:57
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Nie je možné inicializovať GNOME"
 
@@ -3020,70 +3511,70 @@ msgstr "Nie je možné vytvoriť službu upozorňovania"
 
 #: calendar/gui/alarm-notify/notify-main.c:186
 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:56
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Súhrn obsahuje"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Popis obsahuje"
 
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentár obsahuje"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "Nenájdené"
 
-#: 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: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:834
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:800
+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:385
 msgid "Private"
 msgstr "Súkromný"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
 msgid "Confidential"
 msgstr "Tajný"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Verejný"
 
@@ -3104,32 +3595,27 @@ msgid "W"
 msgstr "Z"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
 msgid "Free"
 msgstr "Voľný"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:479 calendar/gui/print.c:2246
 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:480 calendar/gui/print.c:2249
 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-calendar-table.c:481 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2252
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Dokončený"
 
@@ -3145,9 +3631,10 @@ 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/mail-account-gui.c:1512
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:404
-#: mail/mail-config.glade.h:56
+#: 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
 #: 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
@@ -3164,21 +3651,13 @@ 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/e-meeting-model.c:821
 msgid "Yes"
 msgstr "Áno"
 
 #: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
 msgid "No"
 msgstr "Nie"
 
-#. 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 "Hľadám"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Deň"
@@ -3195,59 +3674,75 @@ msgstr "Týždeň"
 msgid "Month View"
 msgstr "Mesiac"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalendár"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Priečinok obsahujúci schôdzky a udalosti"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1733
-#: my-evolution/e-summary-tasks.c:250 my-evolution/e-summary-tasks.c:267
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Priečinok obsahujúci úlohy to-do"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:695
 msgid "New meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:695
 msgid "_Meeting"
 msgstr "_Stretnutie"
 
-#: calendar/gui/component-factory.c:687
+#: calendar/gui/component-factory.c:699
 msgid "New task"
 msgstr "Nová úloha"
 
-#: calendar/gui/component-factory.c:687 ui/evolution-tasks.xml.h:21
+#: calendar/gui/component-factory.c:699
 msgid "_Task"
 msgstr "Ú_loha"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Nová schôdzka"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "S_chôdzka"
+
+#: calendar/gui/component-factory.c:707
 msgid "New appointment"
 msgstr "Nová schôdzka"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:707
 msgid "_Appointment"
 msgstr "S_chôdzka"
 
-#: calendar/gui/control-factory.c:103
+#: calendar/gui/control-factory.c:123
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Nie je možné otvoriť priečinok v '%s'"
 
-#: calendar/gui/control-factory.c:130
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URI, ktoré bude kalendár zobrazovať"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "Zmeniť pohľad na %s"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Zvukové alarmy"
@@ -3293,8 +3788,9 @@ 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:"
@@ -3312,9 +3808,7 @@ msgstr "extra oprakovanie každých"
 msgid "hours"
 msgstr "hodín"
 
-#: 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 "minút"
 
@@ -3442,7 +3936,7 @@ msgstr "Pripomenutia"
 
 #: 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.glade.h:11
 msgid "Summary:"
 msgstr "Súhrn:"
 
@@ -3471,7 +3965,7 @@ msgstr "koniec schôdzky"
 msgid "hour(s)"
 msgstr "hodín"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "minút"
 
@@ -3512,170 +4006,168 @@ 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
-msgid "Create new appointments with a default _reminder"
-msgstr "Vytvoriť novú schôdzku so štandardným _pripomenutím"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Dni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "_Prvý deň týždňa:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Piatok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Hodiny"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minúty"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Pondelok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Úlohy _po termíne:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: 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 "Zobraziť _koncové časy schôdzok v týždennom a mesačnom pohľade"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 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:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_Ne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Úlohy s _dnešným termínom:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "Š_tv"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "_Ut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Úlohy s _dnešným termínom:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "_Zoznam úloh"
 
-#: 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 "Štvrtok"
 
-#: 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 "Časová _zóna:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Ro_zdelenie času:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Formát času:"
 
-#: 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 "Utorok"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Streda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Pracovný týždeň"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12-hodinový (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 hodín"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pýtať sa na potvrdenie pri odstraňovaní"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "Z_hustiť víkendy v mesačnom pohľade"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Zobrazenie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "P_ia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Všeobecné"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "_Skryť dokončené úlohy po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Iné"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Úlohy _po termíne:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_So"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "_Zoznam úloh"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Ro_zdelenie času:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Str"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "pred začiatkom schôdzky"
 
@@ -3739,73 +4231,60 @@ msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Neurobili ste žiadne zmeny. Aktualizovať editor?"
 
-#: 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 "u do "
 
-#: 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 " (Dokončený "
 
-#: 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 "Dokončený "
 
-#: 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 " (Termín do "
 
-#: 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 "Termín do "
 
-#: calendar/gui/dialogs/comp-editor.c:321
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "Nepodarilo sa korektne aktualizovať objekt!"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Upraviť schôdzku"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Schôdzka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Úloha - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Položka denníka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Žiadny súhrn"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2226
-#: mail/mail-display.c:113
-msgid "Overwrite file?"
-msgstr "Prepísať súbor?"
-
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2233
-#: mail/mail-display.c:117
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Súbor s týmto menom už existuje\n"
-"Prepísať ho?"
-
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "Uložiť ako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Nepodarilo sa získať aktuálnu verziu!"
 
@@ -3863,7 +4342,7 @@ msgstr "Delegovať na:"
 msgid "Enter Delegate"
 msgstr "Zadajte na koho delegovať"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Schôdzka"
 
@@ -3930,7 +4409,7 @@ msgid "Pu_blic"
 msgstr "_Verejné"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Zobraziť čas ako"
 
@@ -3975,55 +4454,49 @@ msgstr "Účastník"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "Spoločé meno"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegované od"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegované na"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Jazyk"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Člen"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:853
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Rola"
 
-#: 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
+#: 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"
 msgstr "Stav"
 
-#: 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -4046,27 +4519,99 @@ msgstr "_Pozvať ostatných..."
 msgid "_Other Organizer"
 msgstr "_Iný organizátor"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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: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:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "zapnutá"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "zoznam"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "sekundy"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Iné"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Sever"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "zoznam"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Ďalší fax"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "deň"
 
-#: 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
-msgid "th"
-msgstr " "
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr "výskytov"
 
@@ -4161,7 +4706,7 @@ msgid "Progress"
 msgstr "Priebeh"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:755
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4173,15 +4718,19 @@ msgstr "_Priorita:"
 msgid "_Status:"
 msgstr "_Stav:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+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:325
+#: calendar/gui/dialogs/task-editor.c:324
 msgid "Assignment"
 msgstr "Priradenie"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Popis:"
 
@@ -4193,116 +4742,80 @@ msgstr "_Počiatočný dátum:"
 msgid "_Due Date:"
 msgstr "_Termín:"
 
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:438
-#, 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:751 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: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: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
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: 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:973
+#, 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-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 "_Tlačiť..."
+
+#: calendar/gui/e-calendar-table.c:978 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: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:16
+#: calendar/gui/e-calendar-table.c:979 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: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:20
+#: calendar/gui/e-calendar-table.c:980 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 "_Vložiť"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Priradiť úlohu"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Poslať ďalej ako i_Calendar"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Označiť ako dokončenú"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "O_dstrániť túto úlohu"
-
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_Označiť úlohy ako dokončené"
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "O_dstrániť vybrané úlohy"
 
-#: 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:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Aktualizujem objekty"
 
-#: calendar/gui/e-calendar-table.c:1247
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Kliknutím pridáte úlohu"
 
@@ -4310,48 +4823,47 @@ msgstr "Kliknutím pridáte úlohu"
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Hotovo"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Dátum dokončenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Termín"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Dátum konca"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Geografické umiestnenie"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Priorita"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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:16
-#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1498 shell/e-summary-storage.c:79
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Súhrn"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Triedenie úloh"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4385,406 +4897,178 @@ msgstr "%02i rozdelení minúty"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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
 msgid "am"
 msgstr "dopoludnia"
 
 #. 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
 msgid "pm"
 msgstr "popoludní"
 
-#: calendar/gui/e-day-view.c:3525
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "Nová _schôdzka"
 
-#: 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á celodenná _udalosť"
 
-#: 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é stretnutie"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#, fuzzy
+msgid "New Task"
+msgstr "Nová úloha"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Tlačiť..."
+
+#: 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 "Prejsť na d_nešný dátum"
 
-#: 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 "_Prejsť na dátum..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3435
-msgid "_Delete this Appointment"
-msgstr "O_dstrániť túto schôdzku"
+#: 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 "_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
+#, fuzzy
+msgid "_Configure..."
+msgstr "Nastaviť %s"
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
+msgid "_Save As..."
+msgstr "Uložiť _ako..."
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Naplánovať _stretnutie"
+
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Poslať ďalej ako i_Calendar"
+
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "Nastaviť tento výskyt ako _presunuteľný"
 
-#: 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 "Odstrániť tento vý_skyt"
 
-#: 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 "Odstrániť _všetky výskyty"
 
-#: calendar/gui/e-itip-control.c:545
-msgid "Meeting begins: <b>"
-msgstr "Stretnutie začína: <b>"
-
-#: calendar/gui/e-itip-control.c:550
-msgid "Task begins: <b>"
-msgstr "Úloha začína: <b>"
-
-#: calendar/gui/e-itip-control.c:555
-msgid "Free/Busy info begins: <b>"
-msgstr "Informácia o voľnom čase začína: <b>"
-
-#: calendar/gui/e-itip-control.c:559
-msgid "Begins: <b>"
-msgstr "Začína: <b>"
-
-#: calendar/gui/e-itip-control.c:571
-msgid "Meeting ends: <b>"
-msgstr "Stretnutie končí: <b>"
-
-#: calendar/gui/e-itip-control.c:574
-msgid "Free/Busy info ends: <b>"
-msgstr "Informácia o voľnom čase končí: <b>"
-
-#: calendar/gui/e-itip-control.c:578
-msgid "Ends: <b>"
-msgstr "Končí: <b>"
-
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Completed: <b>"
-msgstr "Úloha dokončená: <b>"
-
-#: calendar/gui/e-itip-control.c:602
-msgid "Task Due: <b>"
-msgstr "Termín úlohy: <b>"
-
-#: calendar/gui/e-itip-control.c:639 calendar/gui/e-itip-control.c:688
-msgid "iCalendar Information"
-msgstr "Informácie o iCalendar"
-
-#. Title
-#: calendar/gui/e-itip-control.c:654
-msgid "iCalendar Error"
-msgstr "Chyba iCalendar"
-
-#: calendar/gui/e-itip-control.c:719 calendar/gui/e-itip-control.c:735
-msgid "An unknown person"
-msgstr "Neznáma osoba"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:742
-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:758
-msgid "<i>None</i>"
-msgstr "<i>Žiadna</i>"
-
-#: calendar/gui/e-itip-control.c:770
-msgid "Status:"
-msgstr "Stav:"
-
-#: 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
-msgid "Accepted"
-msgstr "Akceptované"
-
-#: calendar/gui/e-itip-control.c:779
-msgid "Tentatively Accepted"
-msgstr "Predbežne akceptové"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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."
 
-#: 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
-msgid "Declined"
-msgstr "Odmietnuté"
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
+#, c-format
+msgid "Error executing %s."
+msgstr "Chyba pri vykonávaní %s."
 
-#: 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:171
-#: camel/providers/smtp/camel-smtp-transport.c:226 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: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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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: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
-msgid "Choose an action:"
-msgstr "Vyberte akciu:"
-
-#: calendar/gui/e-itip-control.c:834
-msgid "Update"
-msgstr "Aktualizovať"
-
-#: 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:1931 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:850
-msgid "Accept"
-msgstr "Akceptovať"
-
-#: calendar/gui/e-itip-control.c:851
-msgid "Tentatively accept"
-msgstr "Predbežne akceptovať"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Decline"
-msgstr "Odmietnuť"
-
-#: calendar/gui/e-itip-control.c:866
-msgid "Send Free/Busy Information"
-msgstr "Poslať informácie o voľnom čase"
-
-#: calendar/gui/e-itip-control.c:879
-msgid "Update respondent status"
-msgstr "Aktualizovať stav respondenta"
-
-#: calendar/gui/e-itip-control.c:892
-msgid "Send Latest Information"
-msgstr "Poslať najnovšie informácie"
-
-#: calendar/gui/e-itip-control.c:905 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#: calendar/gui/e-itip-control.c:953
-#, 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:954
-msgid "Meeting Information"
-msgstr "Informácie o stretnutí"
-
-#: calendar/gui/e-itip-control.c:958
-#, 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:959
-msgid "Meeting Proposal"
-msgstr "Návrh na stretnutie"
-
-#: calendar/gui/e-itip-control.c:963
-#, 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:964
-msgid "Meeting Update"
-msgstr "Aktualizácia stretnutia"
-
-#: calendar/gui/e-itip-control.c:968
-#, 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:969
-msgid "Meeting Update Request"
-msgstr "Požiadavka na aktualizáciu stretnutia"
-
-#: calendar/gui/e-itip-control.c:992
-#, 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:993
-msgid "Meeting Reply"
-msgstr "Odpoveď pre stretnutie"
-
-#: calendar/gui/e-itip-control.c:997
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> zrušil stretnutie."
-
-#: calendar/gui/e-itip-control.c:998
-msgid "Meeting Cancellation"
-msgstr "Zrušenie stretnutia"
-
-#: calendar/gui/e-itip-control.c:1002 calendar/gui/e-itip-control.c:1073
-#: calendar/gui/e-itip-control.c:1108
-#, 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:1003
-msgid "Bad Meeting Message"
-msgstr "Neplatná správa o stretnutí"
-
-#: calendar/gui/e-itip-control.c:1023
-#, 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:1024
-msgid "Task Information"
-msgstr "Informácia o úlohe"
-
-#: calendar/gui/e-itip-control.c:1028
-#, 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:1029
-msgid "Task Proposal"
-msgstr "Návrh úlohy"
-
-#: calendar/gui/e-itip-control.c:1033
-#, 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:1034
-msgid "Task Update"
-msgstr "Aktualizácia úlohy"
-
-#: calendar/gui/e-itip-control.c:1038
-#, 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:1039
-msgid "Task Update Request"
-msgstr "Požiadavka na aktualizáciu úlohy"
-
-#: calendar/gui/e-itip-control.c:1063
-#, 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:1064
-msgid "Task Reply"
-msgstr "Odpoveď pre úlohu"
-
-#: calendar/gui/e-itip-control.c:1068
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> zrušil úlohu."
-
-#: calendar/gui/e-itip-control.c:1069
-msgid "Task Cancellation"
-msgstr "Zrušenie úlohy"
-
-#: calendar/gui/e-itip-control.c:1074
-msgid "Bad Task Message"
-msgstr "Neplatná správa úlohy"
-
-#: calendar/gui/e-itip-control.c:1093
-#, 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:1094
-msgid "Free/Busy Information"
-msgstr "Informácie o voľnom čase"
-
-#: calendar/gui/e-itip-control.c:1098
-#, 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:1099
-msgid "Free/Busy Request"
-msgstr "Požiadavka na informácie o voľnom čase"
-
-#: calendar/gui/e-itip-control.c:1103
-#, 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:1104
-msgid "Free/Busy Reply"
-msgstr "Odpoveď s informácio o voľnom čase"
-
-#: calendar/gui/e-itip-control.c:1109
-msgid "Bad Free/Busy Message"
-msgstr "Neplatná správa o voľnom čase"
-
-#: calendar/gui/e-itip-control.c:1182
-msgid "The message does not appear to be properly formed"
-msgstr "Správa nevyzerá ako platná."
-
-#: calendar/gui/e-itip-control.c:1201
-msgid "The message contains only unsupported requests."
-msgstr "Táto správa obsahuje iba nepodporované požiadavky."
-
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1235
-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:1260
-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:1338
-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"
-
-#: calendar/gui/e-itip-control.c:1369
+#: 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:1371
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Aktualizácia dokončená\n"
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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"
+
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 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"
+msgstr ""
+"Stav účastníka nie je možné aktualizovať, pretože jeho stav nie je "
+"platný!\n"
 
-#: calendar/gui/e-itip-control.c:1424
+#: 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:1426
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka bol aktualizovaný\n"
 
-#: calendar/gui/e-itip-control.c:1428
-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"
-
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Odstránenie dokončené"
 
-#: calendar/gui/e-itip-control.c:1486 calendar/gui/e-itip-control.c:1536
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Položka poslaná!\n"
 
-#: calendar/gui/e-itip-control.c:1488 calendar/gui/e-itip-control.c:1540
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Položku nie je možné poslať!\n"
 
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Vybrať priečinok"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Vybrať priečinok"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4826,7 +5110,7 @@ msgstr "dátum začiatku"
 msgid "Chair Persons"
 msgstr "Predsedovia"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1640
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Vyžadovaní účastníci"
 
@@ -4839,57 +5123,58 @@ 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:789
+#: calendar/gui/e-meeting-model.c:533
 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:790
 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
 msgid "Resource"
 msgstr "Zdroj"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
 msgid "Room"
 msgstr "Miestnosť"
 
 #: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
 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:806
+#: calendar/gui/e-meeting-model.c:535
 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:807
 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:808
 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:834
+#: calendar/gui/e-meeting-model.c:543
 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-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:434
 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:838
 msgid "Delegated"
 msgstr "Delegované"
 
@@ -4899,14 +5184,14 @@ 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:471
+#: calendar/gui/e-meeting-time-sel-item.c:475
 #: calendar/gui/e-meeting-time-sel.c:2088
 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:475
+#: calendar/gui/e-meeting-time-sel-item.c:479
 #: calendar/gui/e-meeting-time-sel.c:2118 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"
@@ -4914,7 +5199,7 @@ 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"
@@ -4979,40 +5264,54 @@ msgstr "_Začiatok stretnutia:"
 msgid "Meeting _end time:"
 msgstr "_Koniec stretnutia:"
 
-#: calendar/gui/e-tasks.c:351
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otváram úlohy na %s"
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:186
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nepodarilo sa načítať úlohy 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 "Metódy potrebná pre načítanie `%s' nie je podporovaná"
 
-#: calendar/gui/e-tasks.c:643
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Dátum dokončenia"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Odstráňujem vybrané objekty"
+
+#: calendar/gui/e-tasks.c:659
 msgid "Expunging"
 msgstr "Čistím"
 
-#: 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á _schôdzka..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "O_dstrániť túto schôdzku"
+
+#: calendar/gui/gnome-cal.c:1538
 #, 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:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1872
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otváram kalendára na%s"
@@ -5073,312 +5372,260 @@ msgstr "Október"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr "Nutný je aspoň jeden účastník"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "Organizátor musí byť nastavený."
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:346
-msgid "Event information"
-msgstr "informácie o udalosti"
-
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:348
-msgid "Task information"
-msgstr "Informácie o úlohe"
-
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:350
-msgid "Journal information"
-msgstr "Informácie o denníku"
-
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:367
-msgid "Free/Busy information"
-msgstr "Informácie o voľnom čase"
-
-#: calendar/gui/itip-utils.c:321
-msgid "Calendar information"
-msgstr "Informácie o kalendári"
-
-#: calendar/gui/itip-utils.c:361
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Informácie o voľnom čase (%s do %s)"
-
-#: calendar/gui/itip-utils.c:373
-msgid "iCalendar information"
-msgstr "Informácie iCalendar"
-
-#: calendar/gui/itip-utils.c:582
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Musíte byť účastníkom stretnutia."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr "Nie je možné vytvoriť vytváracie rozhranie pre komponent editora"
 
-#: 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 "Ne"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Ut"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "St"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Št"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Pi"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "So"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Vybraný deň (%a %b %d %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 %b %d"
 
-#: 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 %b %d %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Vybraný týždeň (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Vybraný mesiac (%b - %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Vybraný rok (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Úloha"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Stav: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Priorita: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Dokončených percent: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Kategórie: %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "Kontakty: "
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Tlačiť kalendár"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2882 my-evolution/e-summary.c:605
-#: ui/evolution-addressbook.xml.h:20 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Ukážka pred tlačou"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Tlačiť položku"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Nastavenie tlačiarne"
 
 #: calendar/gui/tasks-control-factory.c:75
-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."
+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."
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ktoré bude zobrazovať priečinok úloh"
 
-#: calendar/gui/tasks-control.c:437
+#: 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"
 "\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:444 mail/mail-callbacks.c:2359
-#: mail/mail-callbacks.c:2587
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "Túto správu už nezobrazovať."
 
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Tlačiť karty"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5394,9 +5641,10 @@ 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
@@ -5413,8 +5661,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"
@@ -5432,91 +5680,111 @@ msgstr "Importuje súbory iCalendar do Evolution"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importuje súbory vCalendar do Evolution"
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Správa kalendára"
+
+#: 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 našiel poštové súbory Pine.\n"
+"Chcete ich naimportovať do Evolution?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Kalendár"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now neočakáva žiadne argumenty"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time očakáva 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 očakáva ako prvý argument reťazec"
 
-#: 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 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:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day očakáva dva argumenty"
 
-#: 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 očakáva ako prvý 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 očakáva ako druhý argument celé číslo"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin očakáva jeden 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 očakáva ako prvý argument time_t"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end očakáva jeden 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 očakáva ako prvý argument time_t"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype neočakáva argumenty"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? očakáva dva argumenty"
 
-#: 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? očakáva ako prvý 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? očakáva ako druhý argument time_t"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? očakáva dva argumenty"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? očakáva ako prvý argument reťazec"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? očakáva ako druhý argument reťazec"
 
-#: calendar/pcs/query.c:691
+#: 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\""
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? očakáva aspoň jeden 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)"
@@ -5524,15 +5792,15 @@ msgstr ""
 "has-categories? očakáva ako všetky argumenty reťazce alebo presne jeden "
 "argument boolean nepravu (#f)"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? neočakáva žiadne argumenty"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? očakáva jeden 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? očakáva ako prvý argument time_t"
 
@@ -7073,11 +7341,11 @@ msgstr "Šifrovanie nie je podporované touto šifrou"
 msgid "Decryption is not supported by this cipher"
 msgstr "Dešifrovanie nie je podporované touto šifrou"
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 msgid "Unable to create cache path"
 msgstr "Nepodarilo sa vytvoriť cestu pre vyrovnávaciu pamäť"
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:441
 #, 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"
@@ -7112,52 +7380,51 @@ msgstr "Obnovujem synchronizáciu so serverom"
 msgid "You must be working online to complete this operation"
 msgstr "Pre dokončenie tejto operácie musíte pracovať on-line"
 
-#: 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 "Synchronizujem priečinky"
 
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Chyba pri spracovávaní filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Chyba pri vykonávaní filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Nie je možné otvoriť priečinok fronty"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Nie je možné spracovať priečinok fronty"
 
-#: camel/camel-filter-driver.c:889
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Získavam správu %d (%d%%)"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Nie je možné otvoriť správu"
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Zlyhala správa %d"
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Synchronizujem priečinok"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Získavam správu %d z %d"
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
@@ -7171,7 +7438,7 @@ msgstr "Nepodarilo sa prijať správu"
 msgid "Error executing filter search: %s: %s"
 msgstr "Chyba pri vykonávaní hľadania filtra: %s: %s"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -7180,7 +7447,7 @@ msgstr ""
 "Nie je možné spracovať hľadací výraz: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -7189,35 +7456,31 @@ msgstr ""
 "Chyba pri vykonávaní hľadacieho výrazu: %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 "(odpovedá všetkému) vyžaduje jeden pravdivostný výsledok"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Vykonanie otázky na neznámej hlavičke: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Neplatný typ v body-contains, očakávam reťazec"
-
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodporovaná operácia: pridať správu: pre %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodporovaná operácia: hľadanie výrazom: %s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodporovaná operácia: hľadanie pomocou uid: %s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Presúvam správy"
 
@@ -7326,164 +7589,130 @@ msgstr "Prosím, zadajte vaše %s heslo pre %s"
 msgid "Please enter your %s passphrase"
 msgstr "Prosím, zadajte vaše %s heslo"
 
-#: camel/camel-pgp-context.c:575
+#: 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:582 camel/camel-pgp-context.c:763
+#: 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:588 camel/camel-pgp-context.c:769
+#: 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"
+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:756
+#: 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:955
+#: 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:961
+#: 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"
+msgstr ""
+"Nie je možné overiť správu: nie je možné vytvoriť rúru do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:972
+#: camel/camel-pgp-context.c:1004
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "Nie je možné overiť správu: nie je možné vytvoriť dočasný súbor: %s"
+msgstr ""
+"Nie je možné overiť správu: nie je možné vytvoriť dočasný súbor: %s"
 
-#: camel/camel-pgp-context.c:1145
+#: 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:1155
+#: 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:1162
+#: 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"
+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:1171
+#: 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:1340
+#: 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"
+msgstr ""
+"Nie je možné dešifrovať správu: žiadny šifrovaný text na "
+"dešifrovanie"
 
-#: camel/camel-pgp-context.c:1348
+#: 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:1355
+#: 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"
+msgstr ""
+"Nie je možné dešifrovať správu: nie je možné vytvoriť rúru do "
+"GPG/PGP: %s"
 
-#: camel/camel-pgp-mime.c:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "Toto je digitálne podpísaná časť správy"
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Prosím, zadajte vaše heslo pre %s"
-
-#: camel/camel-pkcs7-context.c:213
-msgid "Error hashing password."
-msgstr "Chyba pri hešovaní hesla."
-
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr "Neplatné heslo."
-
-#: camel/camel-pkcs7-context.c:329
-#, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Nepodarilo sa podpísať: certifikát nenájdený pre \"%s\"."
-
-#: camel/camel-pkcs7-context.c:378
-#, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Nie je možné podpísať v čistom texte: nnájdený certifikát pre \"%s\"."
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "Nepodarilo sa zašifrovať: zlyhalo vytvorenie obálky pre dáta."
-
-#: camel/camel-pkcs7-context.c:590
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "Nepodarilo sa zašifrovať: zlyhalo vytvorenie kontextu zašifrovania."
-
-#: camel/camel-pkcs7-context.c:620
-#, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Nie je možné zašifrovať dáta: neplatný používateľský kľúč: \"%s\"."
-
-#: camel/camel-pkcs7-context.c:626
-msgid "Could not encrypt: encoding failed."
-msgstr "Nepodarilo sa zašifrovať: kodovanie zlyhalo."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr "Nepodarilo sa dešifrovať: Neznáme"
-
-#: 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 ""
 "Nie je možné načítať %s: Načítavanie modulov nie je na tomto systéme "
 "podporované."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nie je možné načítať %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 "Nie je možné načítať %s: V module nie je inicializačný kód."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:207
+#: 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:264
+#: 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:267
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(neznámy hostiteľ)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7549,8 +7778,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"
@@ -7562,7 +7791,8 @@ msgstr "Správa challenge pre server neplatná\n"
 
 #: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "Správa challenge pre server obsahovala neplatný prvok \"Kvalita ochrany\"\n"
+msgstr ""
+"Správa challenge pre server obsahovala neplatný prvok \"Kvalita ochrany\"\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
@@ -7594,7 +7824,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpoveď na overenie od serveru."
 
@@ -7604,15 +7834,28 @@ 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."
+msgstr ""
+"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."
 msgstr "Neznámy stav overenia."
 
+#: 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á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:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:61
+#: 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"
 
@@ -7656,26 +7899,41 @@ msgstr "URL '%s' vyžaduje komponentu hostiteľa"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vyžaduje komponentu cesty"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Zisťujem adresu: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Zlyhalo hľadanie mena: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: hostiteľ nenájdený"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, 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
+#, fuzzy
+msgid "Resolving address"
+msgstr "Zisťujem adresu: %s"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Zlyhalo hľadanie hostiteľa: %s: hostiteľ nenájdený"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Zlyhalo hľadanie hostiteľa: %s: neznámy dôvod"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Poskytovateľ pošty pre virtuálny priečinok"
@@ -7684,12 +7942,12 @@ msgstr "Poskytovateľ pošty pre virtuálny priečinok"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pre čítanie pošty ako otázky na inú množinu priečinkov"
 
-#: camel/camel-session.c: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 "Pre protokol `%s' nie je k dispozícii poskytovateľ"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7698,6 +7956,11 @@ msgstr ""
 "Nie je možné vytvoriť priečinok %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Prosím, zadajte vaše heslo pre %s"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Prosím, zadajte prezývku certifikátu, ktorým sa má podpísať."
@@ -7730,15 +7993,17 @@ msgstr "Nepodarilo sa dekódovať správu."
 msgid "Failed to verify certificates."
 msgstr "Nepodarilo sa overiť certifikáty"
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 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:282
+#: camel/camel-store.c:284
 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:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -7747,7 +8012,7 @@ msgstr ""
 "Vydal: %s\n"
 "Pre: %s"
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7764,7 +8029,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:438
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7777,16 +8042,16 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Podpis:         %s"
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr "DOBRE"
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr "ZLE"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:500
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7811,27 +8076,27 @@ msgstr "Nie je možné spracovať URL `%s'"
 msgid "No such message %s in %s"
 msgstr "Taká správa neexistuje %s v %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Žiadna taká správa: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie je možné odstrániť priečinok: %s: Priečinok neexistuje"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
@@ -7864,52 +8129,52 @@ msgstr "Odpoveď IMAP serveru neobsahovala informáciu %s"
 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:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, 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:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, 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:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Hľadám zmenené správy"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 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:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 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:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Hľadám nové správy"
 
-#: camel/providers/imap/camel-imap-folder.c:2145
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "Nie je možné nájsť telo správy v odpovedi 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 "Nie je možné otvoriť priečinok pre vyrovnávaciu pamäť: %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 "Nepodarilo sa uložiť správu %s: %s"
@@ -7922,7 +8187,7 @@ msgstr "Kontrolujem novú poštu"
 msgid "Check for new messages in all folders"
 msgstr "Kontrolujem novú poštu vo všetkých priečinkoch"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:925
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
 msgid "Folders"
 msgstr "Priečinky"
 
@@ -7940,7 +8205,8 @@ msgstr "Priestor mien"
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Aplikovať filtre na nové správy v priečinku novej pošty na tomto serveri"
+msgstr ""
+"Aplikovať filtre na nové správy v priečinku novej pošty na tomto serveri"
 
 #: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
@@ -7952,30 +8218,32 @@ msgstr "Pre čítanie a ukladanie pošty na IMAP serveroch."
 
 #: 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."
+msgstr ""
+"Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako "
+"čistý text."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:393
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Overenie typu %s nie je podporované."
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:434
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Nezadali ste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -7986,58 +8254,59 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Priečinok %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 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:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "Poštové priečinky vo formáte MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 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:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Lokálne doručenie"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 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:63
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Poštové priečinky vo formáte maildir"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 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:80
+#: 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:81
+#: camel/providers/local/camel-local-provider.c:101
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
-"Pre čítanie a ukladanie lokálnej pošty v priečinkov v štandardnom formáte "
-"Unix mbox."
+"Pre čítanie a ukladanie lokálnej pošty v priečinkov v štandardnom "
+"formáte Unix mbox."
 
-#: camel/providers/local/camel-local-provider.c:91
+#: 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:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8049,56 +8318,62 @@ msgstr ""
 "POZNÁMKA: Tento poskytovateľ je stále ešte experimentálny, takže\n"
 "nezabudnite najprv svoju poštu zálohovať."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Koreň ukladania %s nie je absolútna cesta"
 
-#: 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 "Koreň ukladania %s nie je normálny priečinok"
 
-#: 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 "Nie je možné získať priečinok: %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 "Lokálne ukladanie nemá priečinok pre novú poštu"
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokálny poštový súbor %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nie je možné premenovať priečinok %s na %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 "Nie je možné premenovať priečinok: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nie je možné odstrániť súbor súhrnu priečinku `%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 "Nie je možné odstrániť indexový súbor priečinku`%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, 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:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nie je možné pridať správu do súhrnu: neznámy dôvod"
 
@@ -8139,7 +8414,7 @@ msgstr "Taká správa neexistuje"
 msgid "Invalid message contents"
 msgstr "Neplatný obsah správy"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8149,14 +8424,14 @@ msgstr ""
 "Nie je možné otvoriť priečinok `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Priečinok `%s' neexistuje."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8166,33 +8441,56 @@ msgstr ""
 "Nie je možné vytvoriť priečinok `%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' nie je priečinok maildir."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie je možné odstrániť priečinok `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "nie je priečinok maildir"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nie je možné prehľadať priečinok `%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 "Nie je možné otvoriť cestu poštovej schránky: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Kontrolujem novú poštu"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "Ukladám priečinok"
+
 #: camel/providers/local/camel-mbox-folder.c:151
 #: camel/providers/local/camel-spool-folder.c:277
 #, c-format
@@ -8238,7 +8536,7 @@ msgstr "Priečinok vyzerá ako nenapraviteľne poškodený."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vytvorenie správy zlyhalo: Poškodená poštová schránka?"
 
-#: 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"
@@ -8247,7 +8545,7 @@ msgstr ""
 "Nie je možné otvoriť súbor `%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"
@@ -8256,14 +8554,14 @@ msgstr ""
 "Nie je možné vytvoriť súbor `%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' nie je normálny súbor."
 
-#: 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"
@@ -8272,96 +8570,85 @@ msgstr ""
 "Nie je možné odstrániť priečinok `%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 "Priečinok `%s' nie je prázdny. Neodstránený."
 
-#. 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 "Ukladám priečinok"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, 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:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, 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:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:648
+#: camel/providers/local/camel-mbox-summary.c:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, 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:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, 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: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: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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "Nie je možné zatvoriť zdrojový priečinok: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, 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:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie je možné premenovať priečinok: %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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznáma chyba: %s"
@@ -8380,7 +8667,7 @@ msgstr "Nie je možné pridať správu do priečinok mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' nie je priečinok."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nie je možné otvoriť cestu MH: %s: %s"
@@ -8396,6 +8683,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Priečinok `%s/%s' neexistuje."
@@ -8405,29 +8693,31 @@ msgstr "Priečinok `%s/%s' neexistuje."
 msgid "Spool mail file %s"
 msgstr "Lokálny poštový súbor %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Lokálne priečinky nie je možné premenovať"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Lokálne priečinky nie je možné odstrániť"
 
-#: 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8436,65 +8726,24 @@ 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:940
+#: 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/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Prosím, zadajte NNTP heslo pre %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Server odmietol používateľské meno"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Nepodarilo sa poslať používateľské meno na server"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Server odmietol používateľské meno/heslo"
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Vnútorná chyba: uid v neplatnom formáte. %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 "Nie je možné získať správu %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 "Používateľ zrušený"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Nie je možné získať zoznam skupín zo serveru."
+#: 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/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 "Nie je možné načítať súbor so zoznamom skupín pre %s: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Nie je možné uložiť súbor so zoznamom skupín pre %s: %s"
+#: 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"
@@ -8502,14 +8751,15 @@ 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."
+msgstr ""
+"Toto je prístup k čítaniu a posielaniu do Diskusných skupín USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "Diskusné skupiny USENET pomocou %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8552,32 +8802,47 @@ msgstr "Použite Zrušiť"
 msgid "Operation failed: %s"
 msgstr "Operácia zlyhala: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Získavam POP súhrn"
 
-#: 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 "Používateľ zrušený"
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Nie je možné súhrn POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:316
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Odstraňujem zmazané správy"
 
-#: 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 "Žiadna správa s 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 "Získavam POP správu %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 "Nie je možné získať správu %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
 msgid "Unknown reason"
 msgstr "Neznámy dôvod"
 
@@ -8594,7 +8859,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:60
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -8607,8 +8872,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 ""
@@ -8616,17 +8881,36 @@ 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
+#, 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:172
-#, c-format
-msgid "Could not connect to POP server on %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
+#, 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:213
-#: camel/providers/pop3/camel-pop3-store.c:316
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8634,26 +8918,27 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Požadovaný spôsob overenia nie je podporovaný."
 
-#: camel/providers/pop3/camel-pop3-store.c:229
+#: camel/providers/pop3/camel-pop3-store.c:405
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "SASL `%s' Prihlásenie zlyhalo: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:240
+#: camel/providers/pop3/camel-pop3-store.c:416
 msgid "SASL Protocol error"
 msgstr "SASL chyba protokolu"
 
-#: camel/providers/pop3/camel-pop3-store.c:255
+#: camel/providers/pop3/camel-pop3-store.c:431
 #, c-format
 msgid "I/O Error: %s"
 msgstr "Chyba V/V: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:276
+#: camel/providers/pop3/camel-pop3-store.c:452
 #, 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:327
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8662,13 +8947,13 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, 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:82
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8678,176 +8963,200 @@ msgid ""
 "system."
 msgstr "Pre doručenie pošty programom \"sendmail\" na tomto počítači."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+msgid "Could not parse recipient list"
+msgstr "Nie je možné spracovať zoznam príjmcov"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Nie je možné vytvoriť rúru do sendmailu: %s: pošta neodoslaná"
 
-#: 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 "Nie je možné spustiť sendmail: %s: pošta neodoslaná"
 
-#: 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 "Nie je možné poslať správu: %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 "sendmail skončil so signálom %s: pošta neodoslaná."
 
-#: 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 "Nie je možné vykonať %s: pošta neodoslaná."
 
-#: 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 skončil so stavom %d: pošta neodoslaná."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-msgid "Could not find 'From' address in message"
-msgstr "Nie je možné nájsť v správe adresu 'Od'"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-msgid "Could not parse recipient list"
-msgstr "Nie je možné spracovať zoznam príjmcov"
-
-#: 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:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr "Prenos pošty pomocou programu sendmail"
 
-#: 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"
 
 #: 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:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaktická chyba, príkaz neznámy"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaktická chyba v parametroch alebo argumentoch"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Príkaz neimplementovaný"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Parameter príkazu neimplementovaný"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Stav systému alebo odpoveď na pomoc"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Správa pomocníka"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Služba pripravená"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Služba zatvára prenosový kanál"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Služba nie je k dispozícii, zatváram prenosový kanál"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Požadovaná poštová akcia v poriadku, dokončená"
 
-#: 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 "Používateľ nie je lokálny, bude predaná podľa <forward-path>"
 
-#: 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 "Požadovaná poštová akcia nevykonaná, poštová schránka nie je k dispozícii"
+msgstr ""
+"Požadovaná poštová akcia nevykonaná, poštová schránka nie je k "
+"dispozícii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: 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:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Požadovaná akcia zrušená: chyba pri spracovaní"
 
-#: 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 "Používateľ nie je lokálny, skúste <forward-path>"
 
-#: 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 "Požadovaná akcia nevykonaná: nedostatok miesta v systéme"
 
-#: 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 "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:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Požadovaná akcia nevykonaná: meno poštovej schránky nepovolené"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Spustiť vstup pošty, končí <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Prenos zlyhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Vyžadované heslo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Mechanizmus overenia je príliš slabý"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Požadované šifrovanie pre požadovaný spôsob overenia"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Dočasné zlyhanie overenia."
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Autentifikácia vyžadovaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, 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:383
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "Správa nevyzerá ako platná."
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, 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
+#, 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"
 msgstr "Požadovaný spôsob overenia %s nie je podporovaný SMTP serverom %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:421
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:442
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8858,92 +9167,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Doručenie pošty SMTP pomocou %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:591
-msgid "Cannot send message: sender address not defined."
-msgstr "Nie je možné poslať správu: adresa odosielateľa nie je definovaná."
-
-#: camel/providers/smtp/camel-smtp-transport.c:598
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:603 mail/mail-ops.c:603
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Posielam správu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:624
+#: camel/providers/smtp/camel-smtp-transport.c:688
 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:798
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:820
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:840
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Chyba odpovede HELO: %s: nie je kritická"
 
-#: camel/providers/smtp/camel-smtp-transport.c:884
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "Prihlásenie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:890
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Chyba pri vytváraní overovacieho objektu SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:905
-#: camel/providers/smtp/camel-smtp-transport.c:917
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Vypršal čas požiadavky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:926
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "Požiadavka AUTH zlyhala."
 
-#: camel/providers/smtp/camel-smtp-transport.c:974
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Neplatná odpoveď na overenie od serveru.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1014
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "MAIL FROM response error"
 msgstr "Chyba odpovede MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> zlyhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Vypršal čas posielania DATA: %s: pošta neodoslaná"
@@ -8951,35 +9256,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:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 msgid "DATA response error"
 msgstr "Chyba odpovede DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
-#: camel/providers/smtp/camel-smtp-transport.c:1163
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1177
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 msgid "DATA termination response error"
 msgstr "Chyba odpovede ukončenia DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1200
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Vypršal čas odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 msgid "RSET response error"
 msgstr "Chyba odpovede RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1237
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 msgid "QUIT response error"
 msgstr "Chyba odpovede QUIT"
 
@@ -9008,7 +9313,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 "príloha"
 
@@ -9048,56 +9353,56 @@ msgid "MIME type:"
 msgstr "Typ 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 "Navrhnúť automatické zobrazovanie príloh"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Kliknutím zobrazíte adresár"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Zadajte adresátov správy"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 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:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9105,12 +9410,12 @@ msgstr ""
 "Zadajte adresy, ktoré dostanú kópiu správy bez toho, aby boli v zozname "
 "adresátov správy."
 
-#: 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ť súbor"
 
-#: composer/e-msg-composer.c:710
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9119,38 +9424,34 @@ msgstr ""
 "Chyba pri čítaní súboru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:927
-msgid "Save as..."
-msgstr "Uložiť ako..."
-
-#: composer/e-msg-composer.c:936
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Varovanie!"
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Súbor existuje, prepísať ho?"
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladaní súboru: %s"
 
-#: composer/e-msg-composer.c:981
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri načítavaní súboru: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba pri prístupe k súboru: %s"
 
-#: composer/e-msg-composer.c:1020
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Nie je možné získať správu z editora"
 
-#: composer/e-msg-composer.c:1027
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9159,7 +9460,7 @@ msgstr ""
 "Nepodarilo sa hľadať v súbore: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1034
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9168,7 +9469,7 @@ msgstr ""
 "Nepodarilo sa skrátiť súbor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9177,7 +9478,7 @@ msgstr ""
 "Chyba pri automatickom ukladaní správ: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1145
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9185,7 +9486,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:1303
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9195,23 +9496,23 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: composer/e-msg-composer.c:1310
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Varovanie: Zmenená správa"
 
-#: composer/e-msg-composer.c:1333
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Otvoriť súbor"
 
-#: composer/e-msg-composer.c:1482
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Vložiť súbor"
 
-#: composer/e-msg-composer.c:1868 composer/e-msg-composer.c:2462
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Napísať správu"
 
-#: composer/e-msg-composer.c:2479
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9219,7 +9520,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:2502 composer/e-msg-composer.c:2557
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9227,7 +9528,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať komponent HTML editor."
 
-#: composer/evolution-composer.c:383
+#: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -9235,7 +9536,7 @@ msgstr ""
 "Nie je možné vytvoriť okno pre písanie správ, pretože ste ešte\n"
 "nenastavili žiadne identity pre poštový komponent."
 
-#: composer/evolution-composer.c:398
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nie je možné inicializovať editor správ Evolution."
 
@@ -9287,12 +9588,21 @@ msgstr "Predmet obsahuje"
 msgid "Subject does not contain"
 msgstr "Predmet neobsahuje"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Súbor s týmto menom už existuje\n"
+"Prepísať ho?"
+
 #. 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 "Uložiť toto heslo"
 
-#: 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 "Zapamätať si heslo pre zvyšok tohto sedenia"
 
@@ -9390,170 +9700,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 "Komponent Evolution pre Súhrn."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Vytváracie rozhranie pre komponent Súhrn Evolution."
-
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Nie je možné inicializovať komponent Súhrnu Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:125
-msgid "Select a service"
-msgstr "Vyberte službu"
-
-#: 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 ""
-"Pre pozadie súhrnu si môžete zvoliť inú stránku HTML.\n"
-"\n"
-"Pre štandardnú nechajte prázdne"
-
-#: 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 "Otvoriť %s pomocou štandardnej aplikácie GNOME"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Otvoriť %s pomocou štandardného web prehliadača GNOME"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Poslať e-mail %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Zmeniť pohľad na %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Spustiť %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Zavrieť %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Presunúť %s doľava"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Presunúť %s doprava"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Presunúť %s do predchádzajúceho riadku"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Presunúť %s do nasledujúceho riadku"
-
-#: 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 "strana"
-
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nie je možné otvoriť súbor HTML:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Chyba pri čítaní dát:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr "Súbor neobsahuje miesto pre služby.\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 ""
-"Komponent Súhrn nemohol inicializovať Bonobo.\n"
-"Ak sa objavilo varovanie o RootPOA, asi to znamená, že ste\n"
-"preložili Bonobo pre GOAD a nie pre OAF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Vytváracie rozhranie pre Súhrn RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Súhrn DRF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Vytváracie rozhranie pre testovací komponent bonobo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Vytváracie rozhranie pre testovací komponent."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Testovacia služba bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Testovacia služba"
-
-#: 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 "Chyba"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "Automaticky aktualizovať"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "Aktualizovať"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "Aktualizovať každých "
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "roku"
@@ -9586,11 +9732,7 @@ msgstr "hodiny"
 msgid "minute"
 msgstr "minúty"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "sekundy"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "sekúnd"
 
@@ -9665,7 +9807,7 @@ msgstr " naspäť"
 msgid "ago"
 msgstr "späť"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:996
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9686,7 +9828,7 @@ msgstr "Potom"
 msgid "Add action"
 msgstr "Pridať akciu"
 
-#: 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."
@@ -9694,19 +9836,11 @@ msgstr ""
 "Zabudli ste vybrať priečinok.\n"
 "Prosím, vráťte sa a zadajte platný priečinok, kam doručiť poštu."
 
-#: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:849
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Vybrať priečinok"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Zadajte URI priečinku"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<kliknutím vyberiete priečinok>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9716,7 +9850,7 @@ msgstr ""
 "Chyba v regulárnom výraze '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test"
 
@@ -9745,7 +9879,8 @@ msgid "if all criteria are met"
 msgstr "ak odpovedajú všetky kritériá"
 
 #: filter/filter-rule.c:769
-msgid "if any criteria are met"
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "ak odpovedá niektoré kritérium"
 
 #: filter/filter-rule.c:780
@@ -9802,208 +9937,224 @@ msgstr "pre všetky lokálne priečinky"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Priradiť skóre"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Priradiť farbu"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Priradiť skóre"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Prílohy"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belem"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "obsahuje"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopírovať do priečinku"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dátum prijatia"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dátum odoslania"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Odstránené"
 
-#: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr "Neexistuje"
-
-#: filter/libfilter-i18n.h:11
-msgid "Draft"
-msgstr "Návrh"
-
-#: filter/libfilter-i18n.h:12
-msgid "Execute Shell Command"
-msgstr "Vykonať príkaz"
-
 #: filter/libfilter-i18n.h:13
-msgid "Exist"
-msgstr "Existuje"
+msgid "does not contain"
+msgstr "neobsahuje"
 
 #: filter/libfilter-i18n.h:14
-msgid "Expression"
-msgstr "Výraz"
+msgid "does not end with"
+msgstr "nekončí na"
 
 #: filter/libfilter-i18n.h:15
-msgid "Follow Up"
-msgstr "Follow Up"
+msgid "does not exist"
+msgstr "neexistuje"
 
 #: filter/libfilter-i18n.h:16
-msgid "Important"
-msgstr "Dôležité"
+msgid "does not sound like"
+msgstr "nevyzerá ako"
 
 #: filter/libfilter-i18n.h:17
-msgid "Mailing list"
-msgstr "Konferencia"
+msgid "does not start with"
+msgstr "nezačína na"
 
 #: filter/libfilter-i18n.h:18
-msgid "Message Body"
-msgstr "Telo správy"
+msgid "Do Not Exist"
+msgstr "Neexistuje"
 
 #: filter/libfilter-i18n.h:19
-msgid "Message Header"
-msgstr "Hlavička správy"
+msgid "Draft"
+msgstr "Návrh"
 
 #: filter/libfilter-i18n.h:20
-msgid "Move to Folder"
-msgstr "Presunúť do priečinku"
+msgid "ends with"
+msgstr "končí na"
 
 #: filter/libfilter-i18n.h:21
-msgid "Read"
-msgstr "Prečítaná"
+msgid "Execute Shell Command"
+msgstr "Vykonať príkaz"
 
 #: filter/libfilter-i18n.h:22
-msgid "Recipients"
-msgstr "Adresáti"
+msgid "Exist"
+msgstr "Existuje"
 
 #: filter/libfilter-i18n.h:23
-msgid "Regex Match"
-msgstr "Regul. výraz"
+msgid "exists"
+msgstr "existuje"
 
 #: filter/libfilter-i18n.h:24
-msgid "Replied to"
-msgstr "Odpovedaná"
+msgid "Expression"
+msgstr "Výraz"
 
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:8
-msgid "Score"
-msgstr "Skóre"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr "Follow Up"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1552
-msgid "Sender"
-msgstr "Odosielateľ"
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Dôležité"
 
 #: filter/libfilter-i18n.h:27
-msgid "Set Status"
-msgstr "Nastaviť stav"
+msgid "is"
+msgstr "je"
 
 #: filter/libfilter-i18n.h:28
-msgid "Size (kB)"
-msgstr "Veľkosť (kB)"
+msgid "is after"
+msgstr "je po"
 
 #: filter/libfilter-i18n.h:29
-msgid "Source Account"
-msgstr "Zdrojový účet"
+msgid "is before"
+msgstr "bolo pred"
 
 #: filter/libfilter-i18n.h:30
-msgid "Specific header"
-msgstr "Špecifická hlavička"
+msgid "is Flagged"
+msgstr "je označený"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "je viac než"
 
 #: filter/libfilter-i18n.h:32
-msgid "Stop Processing"
-msgstr "Zastaviť spracovanie"
+msgid "is less than"
+msgstr "je menej než"
 
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:932
-#: mail/message-list.etspec.h:12
-msgid "Subject"
-msgstr "Predmet"
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "nie je"
 
 #: filter/libfilter-i18n.h:34
-msgid "contains"
-msgstr "obsahuje"
+msgid "is not Flagged"
+msgstr "nie je označený"
 
 #: filter/libfilter-i18n.h:35
-msgid "does not contain"
-msgstr "neobsahuje"
+msgid "Mailing list"
+msgstr "Konferencia"
 
 #: filter/libfilter-i18n.h:36
-msgid "does not end with"
-msgstr "nekončí na"
+msgid "Message Body"
+msgstr "Telo správy"
 
 #: filter/libfilter-i18n.h:37
-msgid "does not exist"
-msgstr "neexistuje"
+msgid "Message Header"
+msgstr "Hlavička správy"
 
 #: filter/libfilter-i18n.h:38
-msgid "does not sound like"
-msgstr "nevyzerá ako"
+msgid "Move to Folder"
+msgstr "Presunúť do priečinku"
 
 #: filter/libfilter-i18n.h:39
-msgid "does not start with"
-msgstr "nezačína na"
+#, fuzzy
+msgid "Play Sound"
+msgstr "Prehrať zvuk:"
 
-#: filter/libfilter-i18n.h:40
-msgid "ends with"
-msgstr "končí na"
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+msgid "Read"
+msgstr "Prečítaná"
 
 #: filter/libfilter-i18n.h:41
-msgid "exists"
-msgstr "existuje"
+msgid "Recipients"
+msgstr "Adresáti"
 
 #: filter/libfilter-i18n.h:42
-msgid "is Flagged"
-msgstr "je označený"
+msgid "Regex Match"
+msgstr "Regul. výraz"
 
 #: filter/libfilter-i18n.h:43
-msgid "is after"
-msgstr "je po"
+msgid "Replied to"
+msgstr "Odpovedaná"
 
-#: filter/libfilter-i18n.h:44
-msgid "is before"
-msgstr "bolo pred"
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
+msgid "Score"
+msgstr "Skóre"
 
-#: filter/libfilter-i18n.h:45
-msgid "is greater than"
-msgstr "je viac než"
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+msgid "Sender"
+msgstr "Odosielateľ"
 
 #: filter/libfilter-i18n.h:46
-msgid "is less than"
-msgstr "je menej než"
+msgid "Set Status"
+msgstr "Nastaviť stav"
 
 #: filter/libfilter-i18n.h:47
-msgid "is not Flagged"
-msgstr "nie je označený"
+msgid "Size (kB)"
+msgstr "Veľkosť (kB)"
 
 #: filter/libfilter-i18n.h:48
-msgid "is not"
-msgstr "nie je"
+msgid "sounds like"
+msgstr "vyzerá ako"
 
 #: filter/libfilter-i18n.h:49
-msgid "is"
-msgstr "je"
+msgid "Source Account"
+msgstr "Zdrojový účet"
 
 #: filter/libfilter-i18n.h:50
-msgid "sounds like"
-msgstr "vyzerá ako"
+msgid "Specific header"
+msgstr "Špecifická hlavička"
 
 #: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "začína na"
 
+#: filter/libfilter-i18n.h:53
+msgid "Stop Processing"
+msgstr "Zastaviť spracovanie"
+
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
+msgid "Subject"
+msgstr "Predmet"
+
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Pravidlá"
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Pridať pravidlo"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Upraviť pravidlo"
 
@@ -10023,30 +10174,30 @@ msgstr "Musíte zadať aspoň jeden priečinok ako zdrojový."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje vašu starú pošty 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 "Importujem..."
 
-#: 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 "Prosím, čakajte"
 
-#: 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 "Importujem %s ako %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 "Prehľadávam %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:101
 msgid "Mail"
 msgstr "Pošta"
 
@@ -10074,23 +10225,74 @@ msgstr ""
 "Evolution našiel súbory GnomeCard.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Priorita: %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 importuje vaše staré dáta Netscape"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Odpadky"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Lokálny poštový súbor %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Prehľadávam priečinok"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Spúšťam import"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Nastavenie"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Upraviť filtre"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10114,45 +10316,95 @@ msgstr ""
 msgid "Pine"
 msgstr "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
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Vytváracie rozhranie pre editor správ Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Vytváracie rozhranie pre ovládací prvok úloh Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Vytváracie rozhranie pre editor správ Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Vytváracie rozhranie pre editor správ Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Komponent Evolution pre prácu s poštou."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Poštový komponent Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Komponent Súhrn pošty Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Komponent zobrazenia poštového priečinku Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Vytváracie rozhranie pre komponent poštového priečinku Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Vytváracie rozhranie pre editor správ Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Vytváracie rozhranie pre komponent Súhrnu pošty Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "_Neopakovať"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Účty"
+
+#: 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 "Rozhranie pre nastavenie pošty"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Priečinok obsahujúci poštu"
+#: 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:101
-msgid "Mail storage folder (internal)"
-msgstr "Priečinok pre ukladanie pošty (interné)"
+msgid "Folder containing mail"
+msgstr "Priečinok obsahujúci poštu"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -10162,248 +10414,260 @@ msgstr "Virtuálne odpadky"
 msgid "Virtual Trash folder"
 msgstr "Virtuálny priečinok s odpadkami"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Nie je možné sa spojiť so skladom: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Tento priečinok nemôže obsahovať správy."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Zmení vlastnosti tohto priečinku"
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:766
 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
+msgid "You have not set a mail transport method"
+msgstr "Nemáte nastavený spôsob prenosu pošty"
 
-#: mail/component-factory.c:971
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Nová správa"
 
-#: mail/component-factory.c:971 ui/evolution-mail-global.xml.h:19
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Poslať správu"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie je možné inicializovať poštový komponent Evolution."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1003
 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:1013
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
-msgstr "Nie je možné inicializovať komponent pre infomácie o priečinkoch Evolution."
+msgstr ""
+"Nie je možné inicializovať komponent pre infomácie o priečinkoch "
+"Evolution."
 
-#: mail/component-factory.c:1229
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Pripájam sa na server..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Nie je možné zaregistrovať sklad u shellu"
 
-#: mail/folder-browser-ui.c:327
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Vlastnosti \"%s\""
 
-#: mail/folder-browser-ui.c:329
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: mail/folder-browser.c:299 mail/mail-display.c:300 mail/mail-display.c:809
+#: mail/folder-browser.c:305 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:754
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d nových"
 
-#: mail/folder-browser.c:757 mail/folder-browser.c:765
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "skrytých %d"
 
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr "%d viditeľných"
 
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d vybraných"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d neposlaných"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d poslaných"
 
-#: mail/folder-browser.c:775
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "celkovo %d"
 
-#: mail/folder-browser.c:1062
-msgid "Create vFolder from Search"
-msgstr "Vytvoriť vPriečinok z výsledku hľadania"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Vytvoriť _virtuálny priečinok zo správy"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "Vpriečinok na _predmet"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "Vpriečinok na _adresátov"
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "VPriečinok na _konferenciu"
 
-#: mail/folder-browser.c:1453
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielateľovi"
 
-#: mail/folder-browser.c:1455
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresátoch"
 
-#: mail/folder-browser.c:1456
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu..."
 
-#: mail/folder-browser.c:1465 ui/evolution-mail-message.xml.h:109
-msgid "_Save As..."
-msgstr "Uložiť _ako..."
-
-#: mail/folder-browser.c:1466
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: mail/folder-browser.c:1470 ui/evolution-mail-message.xml.h:108
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/folder-browser.c:1471 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Odpovedať _zoznamu"
 
-#: mail/folder-browser.c:1472 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Odpovedať _všetkým"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:32
-msgid "Follow _Up..."
+#: mail/folder-browser.c:1622
+#, fuzzy
+msgid "Follo_w Up..."
 msgstr "Follow _Up..."
 
-#: mail/folder-browser.c:1478
-msgid "Flag Com_pleted"
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
 msgstr "Označiť ako _Dokončený"
 
-#: mail/folder-browser.c:1479
-msgid "Clear Fla_g"
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
 msgstr "Vymazať _značky"
 
 #. separator here?
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Označiť ako _prečítanú"
 
-#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/folder-browser.c:1485
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Označiť ako _dôležitú"
 
-#: mail/folder-browser.c:1486
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Označiť ako nedô_ležitú"
 
-#: mail/folder-browser.c:1490 ui/evolution-addressbook.xml.h:40
-msgid "_Move to Folder..."
-msgstr "Pre_sunúť do priečinka..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "Obnoviť _zmazané"
 
-#: mail/folder-browser.c:1491 ui/evolution-addressbook.xml.h:37
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
+msgstr "Presunúť do priečinka..."
+
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Kopírovať do priečinku..."
 
-#: mail/folder-browser.c:1493 ui/evolution-mail-message.xml.h:111
-msgid "_Undelete"
-msgstr "Obnoviť _zmazané"
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
 
-#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
-msgstr "Pridať odosielateľa do adresára"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
+msgstr "Pridať odosielateľa do _adresára"
 
-#: mail/folder-browser.c:1500
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Použiť filtre"
 
-#: mail/folder-browser.c:1502
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: mail/folder-browser.c:1693
-msgid "Filter on Mailing List"
-msgstr "Filter na konferenciu"
-
-#: mail/folder-browser.c:1694
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "VPriečinok na konferenciu"
 
-#: mail/folder-browser.c:1696
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:1697
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "VPriečinok na konferenciu (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Štandard"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Získanie informácie o priečinku"
@@ -10418,33 +10682,27 @@ 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"
 msgstr "Importuje súbory Outlook Express 4 do Evolution"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Obsah tela"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Súčasný formát ukladania:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Index:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Formát poštová schránky"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Obsah tela"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nový formát ukladania:"
 
-#: 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"
@@ -10454,15 +10712,15 @@ msgstr ""
 "nie je možná automatická oprava pri zlyhaní (napr. nedostatku\n"
 "miesta na disku). Prosím, používajte túto funkciu opatrne."
 
-#: 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"
 
@@ -10480,86 +10738,79 @@ msgstr "Editor diskusných skupín Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor účtov Evolution"
 
-#: mail/mail-account-gui.c:974
-msgid "Could not save signature file."
-msgstr "Nepodarilo sa uložiť súbor podpisu."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Hostiteľ:"
 
-#: mail/mail-account-gui.c:1051
-msgid "Save signature"
-msgstr "Uložiť podpis"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "Meno po_užívateľa:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "_Cesta:"
 
-#: mail/mail-account-gui.c:1057
+#: 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 ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Tento podpis bol zmenený, ale neuložený.\n"
-"\n"
-"Chcete uložiť zmeny?"
 
-#: mail/mail-account-gui.c:1681
+#: mail/mail-account-gui.c:1985
 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:149
-msgid " (default)"
-msgstr " (štandard)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Zakázať"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Povoliť"
-
-#: mail/mail-accounts.c:292
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "Naozaj chcete odstrániť tento účet?"
 
-#: mail/mail-accounts.c:296
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Neodstraňovať"
 
-#: mail/mail-accounts.c:299
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Naozaj odstrániť účet?"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.c:535
-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:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Zakázať"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:50
-msgid "Mail Settings"
-msgstr "Nastavenie pošty"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Povoliť"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Pošta pre %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "Naozaj chcete odstrániť tento účet diskusných skupín?"
 
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Predmet je %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Povolené"
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Pošta od %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Meno úč_tu:"
 
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "%s konferencia"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Portoriko"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Pridať pravidlo filtra"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10571,7 +10822,7 @@ msgstr ""
 "posielať, prijímať alebo písať poštu.\n"
 "Chcete ho nastaviť teraz?"
 
-#: mail/mail-callbacks.c:145
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10579,7 +10830,7 @@ msgstr ""
 "Predtým, ako začnete písať správu,\n"
 "musíte nastaviť identitu."
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10587,12 +10838,8 @@ msgstr ""
 "Predtým, ako začnete písať správu,\n"
 "musíte nastaviť spôsob prenosu.."
 
-#: mail/mail-callbacks.c:189
-msgid "You have not set a mail transport method"
-msgstr "Nemáte nastavený spôsob prenosu pošty"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10600,11 +10847,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:239
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Poslať aj tak?"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10612,37 +10859,37 @@ msgstr ""
 "Táto správa nemá predmet.\n"
 "Naozaj ju chcete poslať?"
 
-#: mail/mail-callbacks.c:325
+#: mail/mail-callbacks.c:295
 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:329
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "Táto správa obsahuje iba adresátov Bcc."
 
-#: mail/mail-callbacks.c:333
+#: mail/mail-callbacks.c:303
 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:438
+#: mail/mail-callbacks.c:408
 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:527
+#: mail/mail-callbacks.c:497
 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:646
+#: mail/mail-callbacks.c:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10650,28 +10897,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:979
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "neznámy odosielateľ"
 
-#: mail/mail-callbacks.c:983
+#: mail/mail-callbacks.c:981
 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:1429 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Presunúť správu do"
 
-#: mail/mail-callbacks.c:1431 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopírovať správu do"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2091
 #, 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:2102
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10679,7 +10926,7 @@ msgstr ""
 "Upravovať môžete iba správy uložené\n"
 "v priečinku Koncepty."
 
-#: mail/mail-callbacks.c:2141
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10687,28 +10934,32 @@ msgstr ""
 "Iba správy z priečinku Odoslané je možné\n"
 "znovu poslať."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2169
 #, 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:2181
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Žiadna vybraná správa"
 
-#: mail/mail-callbacks.c:2280
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Prepísať súbor?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Uložiť správu ako..."
 
-#: mail/mail-callbacks.c:2282
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Uložiť správy ako..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2366
 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:2351
+#: mail/mail-callbacks.c:2373
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -10716,19 +10967,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:2580
+#: mail/mail-callbacks.c:2615
 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:2690
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10737,28 +10988,28 @@ msgstr ""
 "Chyba pri načítavaní informácie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2702
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2775
+#: mail/mail-callbacks.c:2783
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stránka %d z %d"
 
-#: mail/mail-callbacks.c:2827
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: mail/mail-callbacks.c:2854
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2889
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Tlač správy zlyhala"
 
-#: mail/mail-callbacks.c:3055
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, 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?"
@@ -10779,7 +11030,8 @@ 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
@@ -10808,22 +11060,43 @@ 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:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Sprievodca účtom Evolution"
 
-#: mail/mail-config.c:356
-#, c-format
-msgid "Account %d"
-msgstr "Účet %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "po"
 
-#: mail/mail-config.c:2036
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -10834,107 +11107,154 @@ msgstr ""
 "%s\n"
 "Skratka nebude vytvorená."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2047
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Doručená pošta"
-
-#: mail/mail-config.c:2297
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Kontrolujem službu"
 
-#: mail/mail-config.c:2375 mail/mail-config.c:2379
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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
-msgid " _Check for supported types "
-msgstr "Kontrolovať _podporované typy"
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " farba"
+#, 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
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:7
 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:6
-msgid "Account"
-msgstr "Účet"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Účet %d"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Informácia o účte"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Správa účtu"
 
-#: mail/mail-config.glade.h:9
-msgid "Accounts"
-msgstr "Účty"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Zrušiť operáciu"
+
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Arkansas"
+
+#: mail/mail-config.glade.h:13
+#, 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:10
+#: 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
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Vždy poslať _slepú kópiu (Bcc):"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Vždy poslať _kópiu (Cc):"
 
-#: mail/mail-config.glade.h:12
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "Vždy ši_frovať kópiu sebe pri posielaní šifrovanej správy"
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "Arica"
 
-#: mail/mail-config.glade.h:13
-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:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Priloží súbor k správe"
 
-#: mail/mail-config.glade.h:14 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Príloha"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Overenie"
 
-#: mail/mail-config.glade.h:16
-msgid "Beep when new mail arrives"
-msgstr "Pípnuť pri príchode novej správy"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "_Automaticky kontrolovať novú poštu"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Neznáma znaková sada: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_Zavrieť"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Kontrolujem novú poštu"
 
-#: mail/mail-config.glade.h:18
-msgid "Composer"
-msgstr "Editor"
-
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Písanie správ"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Nastavenie"
 
-#: mail/mail-config.glade.h:21
-msgid "Confirm when Expunging a folder"
-msgstr "Potvrdenie pri čistení priečinku"
-
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10950,249 +11270,367 @@ msgstr ""
 "\n"
 "Kliknutím na \"Dokončiť\" uložíte vaše nastavenie."
 
-#: mail/mail-config.glade.h:28
+#: 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:29
-msgid "Default Forward style is: "
-msgstr "Štandardný štýl \"Predať ďalej\" je: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Štandardná priorita:"
 
-#: mail/mail-config.glade.h:30
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Štandardná znaková sada:"
 
-#: mail/mail-config.glade.h:31
-msgid "Defaults"
-msgstr "Štandardné"
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Prijímam poštu"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitálne IDs..."
 
-#: mail/mail-config.glade.h:34
-msgid "Display"
-msgstr "Zobrazenie"
-
-#: mail/mail-config.glade.h:35
-msgid "Do not notify me when new mail arrives"
-msgstr "Neuprozorňovať na príchod novej správy"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Nie je možné otvoriť správu"
 
-#: mail/mail-config.glade.h:36 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:37 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Koncepty"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Priečinok _konceptov:"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "_Povoliť"
 
-#: mail/mail-config.glade.h:39 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Upraviť..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Enabled"
-msgstr "Povolené"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Východ"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "E-mail obsahuje"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "_E-mailová adresa:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "Vyprázdniť priečinky na O_dpadky pri ukončení"
+
+#: mail/mail-config.glade.h:53
 msgid "Execute Command..."
 msgstr "Vykonať príkaz..."
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "končí na"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Vlastnosti"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Správy predané ďalej"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Získať digitálne ID..."
 
-#: mail/mail-config.glade.h:43
-msgid "HTML signature file:"
-msgstr "Súbor s HTML podpisom:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Zvýrazniť citácie pomocou"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Honolulu"
+
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: 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 "Identita"
 
-#: mail/mail-config.glade.h:46
-msgid "In HTML mail"
-msgstr "v HTML pošte"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "v texte"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Uložiť a zavrieť"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Nahrávať _obrázky"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Nastavenie pošty"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Umiestnenie poštovej schránky"
 
-#: mail/mail-config.glade.h:52
-msgid "Make this my _default account"
-msgstr "Použiť ho ako š_tandardný účet"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Hlavička správy"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "Zobrazenie _správy"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikronézia"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP server:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Upozornenie na novú poštu"
 
-#: mail/mail-config.glade.h:55
-msgid "News"
-msgstr "Diskusné skupiny"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "_Kanály správ"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Nepovinné informácie"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Or_ganizácia:"
+
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID PGP/GPG _kľúča:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Vyberte farbu"
 
-#: mail/mail-config.glade.h:63
-msgid "Play sound file when new mail arrives"
-msgstr "Zahrať zvuk pri príchode novej správy"
+#: mail/mail-config.glade.h:88
+#, 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:64
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:65
-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"
-
-#: mail/mail-config.glade.h:66
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Pýtať sa pri posielaní správ be_z predmetu"
-
-#: mail/mail-config.glade.h:67
-msgid "Prompt 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:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Tlačiť vybrané kontakty"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Nie je možné otvoriť správu"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citovať"
 
-#: mail/mail-config.glade.h:70
+#: 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"
 
-#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Odpovedať komu:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Príjem pošty"
 
-#: mail/mail-config.glade.h:72
-msgid "Receiving Mail"
-msgstr "Prijímam poštu"
-
-#: mail/mail-config.glade.h:73
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Možnosti príjmu"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Uložiť toto heslo"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Povinné informácie"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:103
+#, fuzzy
+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:77
-msgid "Security"
-msgstr "Bezpečnosť"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:78
-msgid "Select Filter Log file..."
-msgstr "Vyberte súbor pre ukladanie záznamu filtrovania..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "Vyberte program PGP"
 
-#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Posielanie pošty"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Súbor s podpisom:"
 
-#: mail/mail-config.glade.h:81
-msgid "Sending Mail"
-msgstr "Posielanie pošty"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Odstrániť všetko okrem podpisu"
 
-#: mail/mail-config.glade.h:83 mail/message-list.etspec.h:9
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Odoslané"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Priečinok pre _odoslané správy:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Odoslané a koncepty"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Server vyžaduje _prihlásenie"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "_Typ serveru:"
 
-#: mail/mail-config.glade.h:89
-msgid "Signature file:"
-msgstr "Súbor s podpisom:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Skratky"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Uložiť podpis"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Zdroj"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Informácia o zdrojovom kóde"
 
-#: mail/mail-config.glade.h:92
-msgid "Sources"
-msgstr "Zdroje"
-
-#: mail/mail-config.glade.h:93
-msgid "Specify filename:"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
 msgstr "Zadajte meno súboru:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Štandardný Unixový súbor mbox"
 
-#: mail/mail-config.glade.h:96
-msgid "Use s_ecure connection (SSL)"
-msgstr "Použiť _bezpečné pripojenie (_SSL)"
+#: mail/mail-config.glade.h:128
+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:97
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "_HTML podpis:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Premenlivo"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11202,126 +11640,218 @@ msgstr ""
 "\n"
 "Kliknutím \"Nasledujúci\" začneme."
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Východ"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "_Vždy načítavať obrázky zo siete"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:141
 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:103
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Typ overenia:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:143
 msgid "_Authentication type: "
 msgstr "_Typ overenia:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "_Automaticky kontrolovať novú poštu"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:145
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "Pípnuť pri príchode novej správy"
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "ID _certifikátu:"
 
-#: mail/mail-config.glade.h:108
-msgid "_Drafts folder:"
-msgstr "Priečinok _konceptov:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:111
-msgid "_Empty trash folders on exit"
-msgstr "Vyprázdniť priečinky na O_dpadky pri ukončení"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Potvrdenie pri čistení priečinku"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Štandardné"
+
+#: mail/mail-config.glade.h:151
+#, 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
+#, fuzzy
+msgid "_Filename:"
+msgstr "Meno súboru:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Správy _predané ďalej"
+
+#: mail/mail-config.glade.h:157
 msgid "_Full name:"
 msgstr "_Celé meno:"
 
-#: mail/mail-config.glade.h:113
-msgid "_HTML signature:"
+#: mail/mail-config.glade.h:159
+#, 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:114
-msgid "_Highlight citations with"
-msgstr "_Zvýrazniť citácie pomocou"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Identita"
 
-#: mail/mail-config.glade.h:115
-msgid "_Host:"
-msgstr "_Hostiteľ:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Jazyk"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr "_Načítať obrázky ak je odosielateľ v adresári"
 
-#: mail/mail-config.glade.h:117
-msgid "_Log filter actions to:"
-msgstr "Uložiť _záznam o filtrovaní do:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Použiť ho ako š_tandardný účet"
 
-#: mail/mail-config.glade.h:118
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_Označiť správy ako \"Prečítané\" po"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_Nikdy nenačítať obrázky zo siete"
 
-#: mail/mail-config.glade.h:121
-msgid "_Organization:"
-msgstr "_Organizácia:"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "Cesta k spustiteľnému _súboru PGP:"
 
-#: mail/mail-config.glade.h:123
-msgid "_Path:"
-msgstr "_Cesta:"
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Play sound file when new mail arrives"
+msgstr "Zahrať zvuk pri príchode novej správy"
 
-#: mail/mail-config.glade.h:124
-msgid "_Remember this password"
-msgstr "_Uložiť toto heslo"
+#: mail/mail-config.glade.h:172
+#, 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"
 
-#: mail/mail-config.glade.h:125
-msgid "_Send mail in HTML format by default."
-msgstr "Posielať štandardne ako _HTML."
+#: mail/mail-config.glade.h:173
+#, 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:126
-msgid "_Server type: "
-msgstr "_Typ serveru:"
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Rádio"
+
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Prijímam poštu"
+
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Odpovedať všetkým"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "Za_bezpečenie"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "Za_bezpečenie"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:127
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Zobraziť čas ako"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
 msgstr "Súbor s po_dpisom:"
 
-#: mail/mail-config.glade.h:128
-msgid "_Username:"
-msgstr "Meno po_užívateľa:"
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Text Signature:"
+msgstr "_HTML podpis:"
 
-#: mail/mail-config.glade.h:129
+#: 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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Premenlivo"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_každých"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " farba"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "popis"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:133
-msgid "placeholder"
-msgstr "miesto"
-
-#: mail/mail-config.glade.h:134
-msgid "seconds."
-msgstr "sekúnd."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Nepodarilo sa vytvoriť kontext podpisu PGP."
@@ -11358,150 +11888,137 @@ msgstr "Nepodarilo sa vytvoriť kontext obálky S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nepodarilo sa vytvoriť kontext dekódovania S/MIME."
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Uložiť prílohu"
 
-#: mail/mail-display.c:310
+#: mail/mail-display.c:344
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nie je možné vytvoriť dočasný súbor '%s': %s"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Uložiť na disk..."
 
-#: mail/mail-display.c:358
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Zobraziť v texte"
 
-#: mail/mail-display.c:360
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvoriť v %s..."
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Zobraziť v text (pomocou %s)"
 
-#: mail/mail-display.c:425
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Skryť"
 
-#: mail/mail-display.c:446
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Externý zobrazovač"
 
-#: mail/mail-display.c:1224
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Načítavam obsah správy"
 
-#: mail/mail-display.c:1717
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Otvoriť odkaz v prehliadači"
 
-#: mail/mail-display.c:1719
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Kopírovať umiestnenie odkazu"
 
-#: mail/mail-display.c:1722
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Uložiť odkaz ako"
 
-#: mail/mail-display.c:1725
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Uložiť obrázok ako..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s príloha"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
 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:775
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dátum"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Neplatná adresa"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:6
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:13
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Komu"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1784
-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:1807
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution nerozpoznala tento typ podpísanej správy."
-
-#: mail/mail-format.c:1815
-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:1823
-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:915
+#, fuzzy
+msgid "Mailer"
+msgstr "Pošta"
 
-#: mail/mail-format.c:2066
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:2080
+#: mail/mail-format.c:2120
 #, 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:2085
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokálny súbor (%s)"
 
-#: mail/mail-format.c:2114
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzdialené dáta (%s)"
 
-#: mail/mail-format.c:2122
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 
-#: mail/mail-format.c:2127
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Nesprávna časť externého tela."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Znovu nastavujem priečinok"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11510,27 +12027,28 @@ 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:763
+#: mail/mail-local.c:762
 #, 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:815
+#: mail/mail-local.c:814
 #, 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:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Mení priečinok \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, 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:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11538,11 +12056,11 @@ msgstr ""
 "Ak nemôžete otvoriť túto poštovú schránku, potom\n"
 "ju budete musieť opraviť ručne."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 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:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Znovu nastaviť /%s"
@@ -11569,117 +12087,112 @@ msgstr ""
 msgid "Working"
 msgstr "Pracujem"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtrujem priečinok"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Prijímam poštu"
 
-#: 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 "Ale správa bola úspešne odoslaná."
 
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Posielam \"%s\""
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posielam správu %d z %d"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
 
-#: 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 "Dokončené."
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Ukladám správu do priečinku"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Presúvam správy do %s"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírujem správy do %s"
 
-#: mail/mail-ops.c:940
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Premiestňujem"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopírujem"
 
-#: mail/mail-ops.c:1053
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prechádzam priečinky v \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1103 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Odpadky"
-
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Správy predané ďalej"
 
-#: mail/mail-ops.c:1279
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otváram priečinok %s"
 
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Otváram sklad %s"
 
-#: mail/mail-ops.c:1420
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňujem priečinok %s"
 
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Aktualizujem priečinok"
 
-#: mail/mail-ops.c:1601
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Čistím priečinok"
 
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získavam správu %s"
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Získavam %d správ"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ukladám %d správ"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11688,7 +12201,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11697,11 +12210,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11710,27 +12223,27 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu sa pripojujem na %s"
 
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Vykonávam príkaz shellu: %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Nájsť"
 
@@ -11766,42 +12279,42 @@ msgstr "Hľadať:"
 msgid "Matches:"
 msgstr "Odpovedá:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Ruším..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Cesta: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Príjem a odoslanie pošty"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Zrušiť všetko"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Obnovujem..."
 
-#: 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 "Čakám..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Zrušené."
 
@@ -11818,24 +12331,40 @@ msgstr "Zadajte vaše heslo pre %s"
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "Do rúry nebola zapísaná úplná správa!"
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Nepodarilo sa uložiť súbor podpisu."
 
-#: mail/mail-summary.c:467
-msgid "Mail Summary"
-msgstr "Súhrn pošty"
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Uložiť podpis"
+
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Tento podpis bol zmenený, ale neuložený.\n"
+"\n"
+"Chcete uložiť zmeny?"
 
-#: mail/mail-tools.c:256
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "Súbor s podpisom:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Predaná správa - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Predaná správa"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Predaná správa"
 
@@ -11862,10 +12391,6 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "VPriečinky"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "vPriečinky"
@@ -11883,92 +12408,92 @@ msgstr "Pokús o úpravu vpriečinku '%s', ktorý neexistuje."
 msgid "New VFolder"
 msgstr "Nový vPriečinok"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Bez predmetu)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Správa"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Nevidené"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Videné"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Odpovedané"
 
-#: mail/message-list.c:644
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Viacero neprečítaných správ"
 
-#: mail/message-list.c:645
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Viacero správ"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Najnižšia"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Nižšia"
 
-#: mail/message-list.c:654
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Vyššia"
 
-#: mail/message-list.c:655
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Najvyššia"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:967
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Dnes %l:%M %p"
 
-#: mail/message-list.c:976
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %l:%M %p"
 
-#: mail/message-list.c:988
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2365
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Generujem zoznam správ"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Termín do "
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "Stav značiek"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Vyznačené"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr "Značka Follow up"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Prijaté"
 
@@ -11976,6 +12501,52 @@ msgstr "Prijaté"
 msgid "Size"
 msgstr "Veľkosť"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "McCall"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Prejsť dopredu"
+
+#: mail/message-tag-followup.c:59
+#, fuzzy
+msgid "Follow-Up"
+msgstr "Follow Up"
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Informácia o zdrojovom kóde"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Poslať ďalej"
+
+#: 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 "Odpovedať"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Odpovedať všetkým"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Ukážka"
+
+#: mail/message-tag-followup.c:315
+#, fuzzy
+msgid "Flag to Follow Up"
+msgstr "Follow Up"
+
 #: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -11997,7 +12568,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Odhlasujem sa z priečinku \"%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 "Priečinok"
 
@@ -12041,6 +12612,35 @@ msgstr "_Prihlásiť si"
 msgid "_Unsubscribe"
 msgstr "O_dhlásiť"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "Priečinok obsahujúci súhrn Evolution"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Poštový komponent Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Vytváracie rozhranie pre ovládací prvok úloh Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Vytváracie rozhranie pre komponent Súhrn Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Nastavenie súhrnu"
+
+#: 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 "Aarhus"
@@ -21834,14 +22434,10 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Curych"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "Priečinok obsahujúci súhrn Evolution"
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Nie je možné inicializovať komponent súhrnu Evolution."
-
 #: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "Schôdzky"
@@ -21862,44 +22458,50 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Bez popisu"
 
-#: my-evolution/e-summary-mail.c:120
+#: my-evolution/e-summary-mail.c:151
 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
+msgid "Local Folders"
+msgstr "Lokálne priečinky"
+
 #. 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:92
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:453
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Slovo dňa"
 
-#: my-evolution/e-summary-preferences.c:474
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Citát dňa"
 
-#: my-evolution/e-summary-preferences.c:735
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Pridať nový kanál správ"
 
-#: my-evolution/e-summary-preferences.c:743
+#: my-evolution/e-summary-preferences.c:728
 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:747
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Meno:"
 
-#: my-evolution/e-summary-preferences.c:1225
-msgid "Summary Settings"
-msgstr "Nastavenie súhrnu"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "Chyba načítavania RDF"
@@ -21908,6 +22510,28 @@ msgstr "Chyba načítavania RDF"
 msgid "News Feed"
 msgstr "Kanály správ"
 
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+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
+#, fuzzy
+msgid "Shown"
+msgstr "Shannon"
+
 #: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Žiadne úlohy"
@@ -21928,19 +22552,19 @@ msgstr "Nastala chyba pri sťahovaní dát pre"
 msgid "Weather"
 msgstr "Počasie"
 
-#: my-evolution/e-summary.c:190
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "Prosím čakajte..."
 
-#: 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 "Tlač súhrnu"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Tlač súhrnu zlyhala"
 
@@ -21948,38 +22572,6 @@ msgstr "Tlač súhrnu zlyhala"
 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"
@@ -23210,43 +23802,36 @@ msgstr "Na_plánovať"
 msgid "_Weather"
 msgstr "_Počasie"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
-msgstr "Vytváracie rozhranie pre komponent poznámok Evolution."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr "Vytváracie rozhranie pre ovládací prvok Poznámky"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Vybrať priečinok"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Shell Evolution."
 
-#: shell/e-activity-handler.c:160
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Zobraziť detaily"
 
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Zrušiť operáciu"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Doručená pošta"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Odoslaná pošta"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Lokálne priečinky"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Inštalácia 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"
@@ -23254,15 +23839,17 @@ msgstr ""
 "Táto nová verzia Evolution vyžaduje inštaláciu dodatočných súborov\n"
 "do vášho osobného priečinku Evolution"
 
-#: shell/e-setup.c:129
+#: 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."
+msgstr ""
+"Prosím, stlačte \"OK\" pre inštaláciu súborov, alebo \"Zrušiť\" pre "
+"koniec."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Nepodarilo sa korektne aktualizovať súbory"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -23273,7 +23860,7 @@ msgstr ""
 "%s\n"
 "Chyba: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -23282,7 +23869,7 @@ msgstr ""
 "Nastala chyba počas kopírovania súborov do\n"
 "`%s'."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -23293,7 +23880,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -23304,7 +23891,7 @@ msgstr ""
 "nemá správne nastavené práva. Prosím, zmeňte ich tak,\n"
 "aby bolo možné čítanie a vykonanie a reštartujte Evolution."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -23315,7 +23902,7 @@ msgstr ""
 "musí byť odstránený, aby Evolution správne fungoval.\n"
 "Prosím, odstráňte tento súbor a reštartujte Evolution."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -23326,7 +23913,7 @@ msgstr ""
 "Prosím, presuňte ho, aby mohli\n"
 "byť nainštalované súbory Evolution."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -23338,7 +23925,7 @@ msgstr ""
 "Musí byť odstránený pred spustením Evolution.\n"
 "Chcete ho odstrániť?"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -23349,49 +23936,54 @@ msgstr ""
 "to priečinok Evolution. Prosím, presuňte ho,\n"
 "aby mohli byť nainštalované súbory Evolution."
 
-#: shell/e-shell-about-box.c:40
-msgid "Evolution "
-msgstr "Evolution "
-
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Pre vás vytvoril"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Nie je možné skontrolovať priečinok: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Nie je možné premenovať priečinok:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Nie je možné presunúť priečinok do seba."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Nie je možné skopírovať priečinok sám do seba."
 
-#: 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 "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:307
+#: 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:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Kopírovať priečinok"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Presunúť priečinok"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23400,18 +23992,18 @@ msgstr ""
 "Nie je možné odstrániť priečinok:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Odstrániť \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23420,16 +24012,16 @@ msgstr ""
 "Nie je možné premenovať priečinok:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Premenovať priečinok \"%s\" na:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23444,7 +24036,7 @@ msgstr ""
 "Zadaný priečinok sa nedá vytvoriť:\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 - Vytvoriť nový priečinok"
 
@@ -23634,8 +24226,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:503
-#: shell/e-shell-user-creatable-items-handler.c:548
+#: shell/e-shell-user-creatable-items-handler.c:506
+#: shell/e-shell-user-creatable-items-handler.c:551
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nová"
@@ -23656,90 +24248,95 @@ 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:165
+#: shell/e-shell-view-menu.c:168
 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:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Nedá sa spustiť nástroj pre oznamovanie chýb"
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "O Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:427
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Prejsť na priečinku..."
 
-#: shell/e-shell-view-menu.c:428
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Vyberte priečinok, ktorý chcete otvoriť"
 
-#: shell/e-shell-view-menu.c:548
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Vytvorí novú skratku"
 
-#: shell/e-shell-view-menu.c:549
+#: shell/e-shell-view-menu.c:566
 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:580
-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."
-
-#: shell/e-shell-view-menu.c:588
-#, c-format
-msgid "Error executing %s."
-msgstr "Chyba pri vykonávaní %s."
-
-#: shell/e-shell-view-menu.c:691
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "Pracovať _on-line"
 
-#: shell/e-shell-view-menu.c:704 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Pracovať off-line"
 
-#: shell/e-shell-view-menu.c:717 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Pracovať off-line"
 
-#: shell/e-shell-view.c:220
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Nezobrazený žiadny priečinok)"
 
-#: shell/e-shell-view.c:1703
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1705
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(Žiadna)"
 
-#: shell/e-shell-view.c:1752
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+#: shell/e-shell-view.c:1867
+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:1759
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution prechádza do módu off-line."
 
-#: shell/e-shell-view.c:1765
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+#: shell/e-shell-view.c:1880
+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."
+
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
 msgstr ""
-"Ximian Evolution je momentálne off-line. Stlačením tohto tlačidla prejdete "
-"do módu on-line."
+"%s\n"
+"\n"
+"Chyba z aktivačného systému:\n"
+"%s"
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nepodarilo sa vytvoriť lokálny sklad -- %s"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23750,19 +24347,23 @@ 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:1933
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Neplatné argumenty"
 
-#: shell/e-shell.c:1935
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Nie je možné zaregistrovať u OAF"
 
-#: shell/e-shell.c:1937
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Konfiguračná databáza nenájdená"
 
-#: shell/e-shell.c:1939 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Všeobecná chyba"
 
@@ -23879,76 +24480,73 @@ msgstr "O_dstrániť"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrániť túto skratku z panelu skratiek"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Chyba pri ukladaní skratiek."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Skratky"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Nie je možné preniesť priečinok:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Doručená pošta"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Bez mena)"
+#: 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 "Žiadna chyba"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Priečinok s týmto menom už existuje"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Uvedený typ priečinku nie je platný"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "Chyba V/V"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Nedostatok miesta pre vytvorenie priečinku"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Priečinok je prázdny"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Uvedený priečinok nebol nájdený"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funkcia nie je v tomto sklade implementovaná"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Operácia nepodporovaná"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Uvedený typ nie je podporovaný týmto skladom"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "Uvedený priečinok nie je možné zmeniť alebo odstrániť"
 
-#: shell/e-storage.c:524
+#: 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:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "Nepodarilo sa vytvoriť priečinok s týmto menom"
 
@@ -23958,10 +24556,13 @@ 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
+msgid "<click here to select a folder>"
+msgstr "<kliknutím vyberiete priečinok>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -23999,67 +24600,67 @@ msgstr ""
 "Chyba z aktivačného systému:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "Chyba CORBA"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Prerušené"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Neplatné argumenty"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Už je vlastník"
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Žiadny vlastník"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Nenájdený"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Nepodporovaný typ"
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Nepodporovaná schéma"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Nepodporovaná operácia"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Interná chyba"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Existuje"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Neplatné URI"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Má podpriečinky"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Žiadne voľné miesto"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Starý vlastník skončil"
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
 msgid "Test type"
 msgstr "Typ testu"
 
@@ -24187,40 +24788,40 @@ 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:88
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:94
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution končí..."
 
-#: shell/main.c:223
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nie je možné inicializovať shell Ximian Evolution."
 
-#: shell/main.c:232
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nie je možné inicializovať shell Ximian Evolution: %s"
 
-#: shell/main.c:302
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Zakázať úvodné okno"
 
-#: shell/main.c:303
+#: shell/main.c:318
 msgid "Start in offline mode"
 msgstr "Spustiť v režime off-line"
 
-#: shell/main.c:304
+#: shell/main.c:319
 msgid "Start in online mode"
 msgstr "Spustiť v režime on-line"
 
-#: shell/main.c:305
+#: shell/main.c:320
 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:323
+#: shell/main.c:338
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -24229,7 +24830,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:353
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie je možné inicializovať komponentový systém Bonobo."
 
@@ -24256,7 +24857,7 @@ msgstr "Nezadané meno súboru."
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopírovať vybrané kontakty do iného priečinka..."
 
-#: 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 "Skopíruje výber"
 
@@ -24272,7 +24873,7 @@ msgstr "Vytvoriť nový kontakt"
 msgid "Create new contact list"
 msgstr "Vytvoriť nový zoznam kontaktov"
 
-#: 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 "Vystrihne výber"
 
@@ -24280,237 +24881,173 @@ msgstr "Vystrihne výber"
 msgid "Delete selected contacts"
 msgstr "Odstrániť vybrané kontakty"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "Dump"
-msgstr "Vyhodiť"
-
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:13
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Presunúť vybrané kontakty do iného priečinku..."
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:14
 msgid "Move to Folder..."
 msgstr "Presunúť do priečinka..."
 
-#: 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 "Vloží obsah schránky"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Náhľad kontaktov pred tlačou"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Tlačiť vybrané kontakty"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Uloží vybrané kontakty ako vKartu."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Vybrať všetko"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Vybrať všetky kontakty"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Pošle správu vybraným kontaktom."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Poslať správu kontaktu"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Pošle vybrané kontakty inej osobe."
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Zastaviť"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Zastaviť načítavanie"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 msgid "View the current contact"
 msgstr "Zobraziť aktuálny kontakt"
 
-#: 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:92 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:15
+#: 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
 msgid "_Actions"
 msgstr "A_kcie"
 
 #: ui/evolution-addressbook.xml.h:33
-msgid "_Addressbook Sources..."
-msgstr "Zdroje _adresára..."
-
-#: ui/evolution-addressbook.xml.h:35
 msgid "_Contact List"
 msgstr "Zoznam _kontaktov"
 
-#: 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 "_Poslať kontakt ďalej..."
 
-#: 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:106
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "_Tlačiť..."
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "Pre_sunúť do priečinka..."
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "_Uložiť ako vKartu"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_Hľadať kontakty"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "Vybrať _všetko"
 
-#: ui/evolution-addressbook.xml.h:47
+#: ui/evolution-addressbook.xml.h:45
 msgid "_Send Message to Contact..."
 msgstr "_Poslať správu kontaktu..."
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Nastavenie kalendára"
-
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Vytvoriť novú celodennú _udalosť"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "Vytvoriť novú ú_lohu"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Vytvoriť _novú schôdzku"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a _New Meeting"
-msgstr "Vytvoriť _nové stretnutie"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
-msgstr "Vytvoriť novú schôdzku"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new meeting request"
-msgstr "Vytvorí novú požiadavku na stretnutie"
-
-#: ui/evolution-calendar.xml.h:10 ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "Vytvorí novú úlohu"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create an event for the whole day"
-msgstr "Vytvorí udalosť počas celého dňa"
-
-#: ui/evolution-calendar.xml.h:13
 msgid "Day"
 msgstr "Deň"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Odstrániť schôdzku"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Prejsť na"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Prejsť dozadu"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Prejsť dopredu"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Prejsť na _dátum"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Prejsť na zadaný dátum"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Prejsť na dnešný dátum"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Mesiac"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Ukážka kalendára pred tlačou"
 
-#: 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 "U_kážka pred tlačou"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Vytlačí tento kalendár"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publikovať informácie o voľnom čase pre tento kalendár"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Zobraziť jeden deň"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Zobraziť jeden mesiac"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Zobraziť jeden týždeň"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Zobraziť pracovný týždeň"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Týždeň"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "_Schôdzka..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "Nastavenie _kalendára..."
-
-#: ui/evolution-calendar.xml.h:40
-msgid "_Meeting..."
-msgstr "_Stretnutie..."
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Publish Free/Busy Information"
-msgstr "_Publikovať informácie o voľnom čase"
-
-#: ui/evolution-calendar.xml.h:44
-msgid "_Task..."
-msgstr "Ú_loha..."
-
 #: 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
@@ -24540,18 +25077,18 @@ msgstr "Náhľad položky pred tlačou"
 msgid "Print this item"
 msgstr "Tlačiť túto položku"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Tlačiť..."
-
 #: 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 "Uložiť"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Uložiť ako..."
+
 #: 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 "Uložiť a zavrieť"
 
@@ -24567,8 +25104,8 @@ msgstr "Uložiť túto položku na disk"
 #: 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:40
 msgid "_File"
 msgstr "_Súbor"
 
@@ -24593,7 +25130,7 @@ msgstr "Poslať _správu kontaktu..."
 #: 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 "_Uložiť"
 
@@ -24653,6 +25190,10 @@ 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"
@@ -24662,74 +25203,54 @@ msgid "Compose _New Message"
 msgstr "Napísať _novú správu"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Vytvorí alebo upraví poštové účty a iné nastavenia"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Vytvorí alebo upraví pravidlá pre filtrovanie novej pošty"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Vytvorí alebo upraví definície virtuálnych priečinkov"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Vyprázdniť _Odpadky"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Zabudnúť _heslá"
 
-#: 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 "Zabudnúť uložené heslá, takže ich budete musieť znovu zadať"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Otvorí okno pre písanie správy"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trvalo odstrániť všetky zmazané správy zo všetkých priečinkov"
 
-#: ui/evolution-mail-global.xml.h:12
-msgid "Send / Receive"
-msgstr "Príjem / odoslanie"
-
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send queued mail and retrieve new mail"
-msgstr "Poslať neodoslanú poštu a prijať novú poštu"
-
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Zobraziť okno s náhľadom správy"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prihlásiť alebo odhlásiť priečinky na vzdialených serveroch"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor virtuálneho priečinku..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Settings..."
-msgstr "Nastavenie _pošty..."
-
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Náhľad"
 
-#: ui/evolution-mail-global.xml.h:22
-msgid "_Send / Receive"
-msgstr "_Poslať / Prijať"
-
-#: ui/evolution-mail-global.xml.h:23
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "_Prihlásiť priečinky..."
 
@@ -24762,7 +25283,8 @@ msgid "Hide _Read Messages"
 msgstr "Skryť _prečítané správy"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Skryje zmazané správy namiesto zobrazenia škrtnutím"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -24821,11 +25343,11 @@ msgstr "Dočasne skryť vybrané správy"
 msgid "Threaded Message list"
 msgstr "Zoznam vlákien"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:19
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_Vyčistiť"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Priečinok"
 
@@ -24841,204 +25363,224 @@ msgstr "_Vlastnosti..."
 msgid "_Threaded Message List"
 msgstr "Zoznam _vlákien"
 
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Pridať odosielateľa do adresára"
+
 #: ui/evolution-mail-message.xml.h:2
-msgid "Add Sender to Address _Book"
-msgstr "Pridať odosielateľa do _adresára"
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Použiť filtre"
 
 #: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Pridať odosielateľa do adresára"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Použiť pravidlá filtrov na vybrané správy"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Odpovedať všetkým adresátom vybranej správy"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Odpovedať do konferencie tejto správy"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Odpovedať odosielateľovi tejto správy"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopírovať vybrané správy do iného priečinka"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Vytvoriť _virtuálny priečinok zo správy"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Vytvorí pravidlo pre filtrovanie správ od tohto odosielateľa"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Vytvorí pravidlo pre filtrovanie správ týmto adresátom"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Vytvoriť pravidlo pre filtrovanie správ pre túto konferenciu"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Vytvoriť pravidlo pre filtrovanie správ s týmto predmetom"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Vytvoriť virtuálny priečinok pre týchto adresátov"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Vytvoriť virtuálny priečinok pre túto konferenciu"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Vytvoriť virtuálny priečinok pre tohto odosielateľa"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Vytvoriť virtuálny priečinok pre tento predmet"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Zmenšič veľkosť písma"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Prejsť na nasledujúcu dôležitú správu"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Prejsť na nasledujúcu správu"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Prejsť na nasledujúcu neprečítanú správu"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Prejsť na nasledujúcu neprečítané vlákno"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Prejsť na predchádzajúcu dôležitú správu"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Prejsť na predchádzajúcu správu"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Prejsť na predchádzajúcu neprečítanú správu"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Poslať ďalej"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filter na _konferenciu..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filter na _odosielateľovi..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filter na _adresátoch..."
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filter na _predmet..."
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:33
 msgid "Flag selected message(s) for follow-up"
 msgstr "Označí vybrané správy pre follow up"
 
-#: ui/evolution-mail-message.xml.h:33
-msgid "Force images in HTML mail to be loaded"
-msgstr "Vždy nahrávať obrázky v pošte HTML"
-
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward"
-msgstr "Poslať ďalej"
+msgid "Follow _Up..."
+msgstr "Follow _Up..."
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr "Vždy nahrávať obrázky v pošte HTML"
+
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Predá niekomu vybranú správu v tele novej správy"
 
-#: ui/evolution-mail-message.xml.h:36
+#: 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:37
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Predá niekomu vybranú správu"
 
-#: 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 "Predá vybranú správu niekomu ako prílohu"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Zväčšiť veľkosť písma"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Nahrávať _obrázky"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Označiť ako _dôležité"
 
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Označiť ako _neprečítanú"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Označiť ako nedô_ležité"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected message(s) as having been read"
 msgstr "Označí vybrané správy ako už prečítané"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as important"
 msgstr "Označí vybrané správy ako dôležité"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Označí vybrané správy ako neprečítané"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Označí vybrané správy ako nedôležité"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Označí vybrané správy na zmazanie"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Presunúť"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move selected message(s) to another folder"
 msgstr "Presunúť vybrané správy do iného priečinku"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Nasledujúca"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "Nasledujúca dôležitá správa"
-
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
-msgstr "Nasledujúca správa"
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "Nasledujúca dôležitá správa"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Nasledujúce vlákno"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Nasledujúca neprečítaná správa"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -25054,149 +25596,145 @@ msgid "Original Si_ze"
 msgstr "Pôvodná _veľkosť"
 
 #: ui/evolution-mail-message.xml.h:61
-msgid "Preview the message to be printed"
-msgstr "Náhľad správy pred tlačou"
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Prejde na predchádzajúcu neprečítanú správu"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "Predchádzajúca"
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Prejde na predchádzajúcu dôležitú správu"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "Prejde na predchádzajúcu dôležitú správu"
+msgid "Preview the message to be printed"
+msgstr "Náhľad správy pred tlačou"
 
 #: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "Predchádzajúca správa"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "Prejde na predchádzajúcu neprečítanú správu"
+msgid "Previous"
+msgstr "Predchádzajúca"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Vytlačí túto správu"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:68
 msgid "Re_direct"
 msgstr "_Presmerovať"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:69
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Presmeruje (bounce) vybranú správu niekomu inému"
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "Reply"
-msgstr "Odpovedať"
-
-#: ui/evolution-mail-message.xml.h:72
-msgid "Reply to All"
-msgstr "Odpovedať všetkým"
-
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr "Vráti text na jeho pôvodnú veľkosť"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "_Nájsť správu..."
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "_Menšie"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "Uložiť správu do textového súboru"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:78
 msgid "Search for text in the body of the displayed message"
 msgstr "Hľadá v texte zobrazenej správy"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "Nastaví stránku pre aktuálnu tlačiareň"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "Zobraziť zdrojový _kód správy"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "Zobraziť ú_plné hlavičky"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "Zobraziť správu normálne"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "Zobraziť správu so všetkými hlavičkami"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "Zobraziť zdrojový poštový formát v správe"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "_Veľkosť textu"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Obnoviť vybrané správy"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "VPriečinok na _konferenciu..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "Vpriečinok na _odosielateľa..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "Vpriečinok na _adresátov..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "Vpriečinok na _predmet..."
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Apply Filters"
-msgstr "_Použiť filtre"
-
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Attached"
 msgstr "_Priložené"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "_Kopírovať do priečinku"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "Vytvoriť _filter zo správy"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "Správy _predané ďalej"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Prejsť na"
+
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Inline"
 msgstr "_V texte"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Väčšie"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "Zobrazenie _správy"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Presunúť do priečinku"
 
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Nasledujúca správa"
+
 #: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Normálne zobrazenie"
@@ -25205,28 +25743,36 @@ msgstr "_Normálne zobrazenie"
 msgid "_Open Message"
 msgstr "_Otvoriť správu"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Predchádzajúca správa"
+
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Quoted"
 msgstr "_Citované"
 
-#: ui/evolution-mail-message.xml.h:110 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_Nástroje"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "Obnoviť _zmazané"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zavrie toto okno"
 
 #: 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:36
 msgid "_Close"
 msgstr "_Zavrieť"
 
 #: 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:56
 msgid "_View"
 msgstr "_Pohľad"
 
@@ -25250,11 +25796,11 @@ msgstr "Zašifrovať túto správu pomocou PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Zašifrovať túto správu vaším šifrovacím certifikátom 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 "_Formát"
 
-#: 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"
 
@@ -25270,6 +25816,10 @@ msgstr "Vložiť súbor ako text do správy"
 msgid "Insert text file..."
 msgstr "Vložiť textový súbor...."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Otvoriť"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "OtvorĂ­ súbor"
@@ -25303,7 +25853,7 @@ msgid "Save in folder..."
 msgstr "Uložiť v priečinku..."
 
 #: 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 "Uložiť aktuálny súbor"
 
@@ -25328,6 +25878,7 @@ msgid "Send _later"
 msgstr "Poslať _neskôr"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Poslať správu vo formáte HTML"
 
@@ -25396,7 +25947,7 @@ msgid "_From Field"
 msgstr "Pole _Od"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Vložiť"
 
@@ -25408,11 +25959,7 @@ msgstr "_Otvoriť..."
 msgid "_Reply-To Field"
 msgstr "Pole _Reply-To"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "Za_bezpečenie"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Pomocník"
 
@@ -25468,37 +26015,39 @@ msgstr "Získať najnovšie informácie o stretnutí"
 msgid "Re_fresh Task"
 msgstr "O_bnoviť úlohu"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Nastavenie pohľadu pre úlohy"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopíruje vybranú úlohu"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Vystihne vybranú úlohu"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete completed tasks"
 msgstr "Odstrániť dokončené úlohy"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Odstrániť vybrané úlohy"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 msgid "Mar_k as Complete"
 msgstr "_Označiť ako dokončenú"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Vloží úlohu zo schránky"
 
-#: ui/evolution-tasks.xml.h:14
-msgid "Tasks Settings..."
-msgstr "Nastavenie úloh..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Náhľad kontaktov pred tlačou"
+
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Vytlačí túto správu"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25565,113 +26114,120 @@ msgid "Open this folder in an other window"
 msgstr "Otvoriť tento priečinok v inom okne"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Príjem / odoslanie"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Poslať neodoslanú poštu a prijať novú poštu"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "Zobrazí informáciu o Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Pošle správu o chybe"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "_Poslať správu o chybe"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 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."
+msgstr ""
+"Pošle správu o chybe pomocou nástroja pre oznamovanie chýb Priateľ v "
+"núdzi."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Prepnúť"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Prepne, či sa má zobrazovať panel priečinkov"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prepne, či sa má zobrazovať panel skratiek"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Prepne, či pracujete on alebo off-line."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Zobraziť vybraný priečinok"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "O Ximian _Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Kopírovať..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "Pru_h priečinkov"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_Prejsť do priečinku..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Presunúť..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Nový"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "Nový _priečinok"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "Nastavenie _pilota..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Premenovať..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Poslať / Prijať"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Skratka"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "_Panel skratiek"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Zmení nastavenie súhrnu"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Tlačiť súhrn"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Aktualizovať"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Znovu načíta pohľad"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "Nastavenie _súhrnu..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Karty adresára"
@@ -25736,8 +26292,8 @@ 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
@@ -25845,20 +26401,20 @@ msgstr "Ukrajinská"
 msgid "Visual"
 msgstr "Vizuálna"
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Neznáma znaková sada: %s"
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Zadajte znakovú sadu, ktorú chcete použiť"
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Iné..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Znaková sada"
 
@@ -25866,30 +26422,32 @@ msgstr "Znaková sada"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Editor hľadania"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Uložiť hľadanie"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Pridať do uložených hľadaní"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Vymazať"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Uložiť hľadanie"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Zobraziť všetko"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Pridať do uložených hľadaní"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informácia"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Chyba"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Otázka"
@@ -25903,11 +26461,21 @@ msgstr "Správa"
 msgid "Don't show this message again."
 msgstr "Túto správu už nezobrazovať."
 
-#: widgets/misc/e-search-bar.c:342
-msgid "Sear_ch"
-msgstr "_Nájsť"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Nájsť"
 
-#: widgets/misc/e-search-bar.c:468
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Vymazať"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Vymazať"
+
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Nájsť"
 
@@ -25933,3 +26501,777 @@ 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."
+
+#~ 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 "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?"
+
+#~ msgid "Starting:"
+#~ msgstr "Od:"
+
+#~ msgid "Ending:"
+#~ msgstr "Do:"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Vytvoriť novú schôdzku so štandardným _pripomenutím"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "_Prvý deň týždňa:"
+
+#~ msgid "_Other"
+#~ msgstr "_Iné"
+
+#~ msgid "Click here to add an attendee"
+#~ msgstr "Kliknutím pridáte účastníka"
+
+#~ 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 "O_dstrániť túto úlohu"
+
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "Stretnutie začína: <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "Úloha začína: <b>"
+
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Informácia o voľnom čase začína: <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Začína: <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Stretnutie končí: <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Informácia o voľnom čase končí: <b>"
+
+#~ msgid "Ends: <b>"
+#~ msgstr "Končí: <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Úloha dokončená: <b>"
+
+#~ msgid "Task Due: <b>"
+#~ msgstr "Termín úlohy: <b>"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "Informácie o iCalendar"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "Chyba iCalendar"
+
+#~ msgid "An unknown person"
+#~ msgstr "Neznáma osoba"
+
+#~ 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."
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Žiadna</i>"
+
+#~ msgid "Status:"
+#~ msgstr "Stav:"
+
+#~ msgid "Tentatively Accepted"
+#~ msgstr "Predbežne akceptové"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Vyberte akciu:"
+
+#~ msgid "Update"
+#~ msgstr "Aktualizovať"
+
+#~ msgid "Accept"
+#~ msgstr "Akceptovať"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Predbežne akceptovať"
+
+#~ msgid "Decline"
+#~ msgstr "Odmietnuť"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Poslať informácie o voľnom čase"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Aktualizovať stav respondenta"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Poslať najnovšie informácie"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> poslal informácie o stretnutí."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Informácie o stretnutí"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> požaduje vašu účasť na stretnutí."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Návrh na stretnutie"
+
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ msgstr "<b>%s</b> si praje byť pridaný na existujúce stretnutie."
+
+#~ msgid "Meeting Update"
+#~ msgstr "Aktualizácia stretnutia"
+
+#~ 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 "Meeting Update Request"
+#~ msgstr "Požiadavka na aktualizáciu stretnutia"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b> odpovedal na požiadavku o stretnutí."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Odpoveď pre stretnutie"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> zrušil stretnutie."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Zrušenie stretnutia"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> poslal nerozpoznateľnú správu."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Neplatná správa o stretnutí"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> poslal informácie o úlohe."
+
+#~ msgid "Task Information"
+#~ msgstr "Informácia o úlohe"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> požaduje, aby ste vykonali úlohu."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Návrh úlohy"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> si praje byť pridaný do existujúcej úlohy."
+
+#~ msgid "Task Update"
+#~ msgstr "Aktualizácia úlohy"
+
+#~ 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 "Task Update Request"
+#~ msgstr "Požiadavka na aktualizáciu úlohy"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b> odpovedal na priradenie úlohy."
+
+#~ msgid "Task Reply"
+#~ msgstr "Odpoveď pre úlohu"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> zrušil úlohu."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Zrušenie úlohy"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Neplatná správa úlohy"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> publikoval informácie o voľnom čase."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Informácie o voľnom čase"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> požaduje informáciu o vašom voľnom čase."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Požiadavka na informácie o voľnom čase"
+
+#~ 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 "Free/Busy Reply"
+#~ msgstr "Odpoveď s informácio o voľnom čase"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Neplatná správa o voľnom čase"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Táto správa obsahuje iba nepodporované požiadavky."
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "Príloha neobsahuje platnú správu kalendára"
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "Príloha nemá žiadne zobraziteľné položky kalendára"
+
+#~ 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"
+
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "Informácie o voľnom čase (%s do %s)"
+
+#~ 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"
+
+#~ msgid "Error hashing password."
+#~ msgstr "Chyba pri hešovaní hesla."
+
+#~ msgid "Invalid password."
+#~ msgstr "Neplatné heslo."
+
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Nepodarilo sa podpísať: certifikát nenájdený pre \"%s\"."
+
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr ""
+#~ "Nie je možné podpísať v čistom texte: nnájdený certifikát pre \"%s\"."
+
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ 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."
+
+#~ msgid "Could not encrypt data: invalid user key: \"%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"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Server odmietol používateľské meno"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Nepodarilo sa poslať používateľské meno na server"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Server odmietol používateľské meno/heslo"
+
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "Vnútorná chyba: uid v neplatnom formáte. %s"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Nie je možné získať zoznam skupín zo serveru."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Nie je možné načítať súbor so zoznamom skupín pre %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Nie je možné uložiť súbor so zoznamom skupín pre %s: %s"
+
+#~ msgid "Could not find 'From' address in message"
+#~ 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á."
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "Komponent Evolution pre Súhrn."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Nie je možné inicializovať komponent Súhrnu Evolution."
+
+#~ msgid "Select a service"
+#~ msgstr "Vyberte službu"
+
+#~ 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 ""
+#~ "Pre pozadie súhrnu si môžete zvoliť inú stránku HTML.\n"
+#~ "\n"
+#~ "Pre štandardnú nechajte prázdne"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Otvoriť %s pomocou štandardnej aplikácie GNOME"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Otvoriť %s pomocou štandardného web prehliadača GNOME"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Poslať e-mail %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Spustiť %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Zavrieť %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Presunúť %s doľava"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Presunúť %s doprava"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Presunúť %s do predchádzajúceho riadku"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Presunúť %s do nasledujúceho riadku"
+
+#~ msgid "page"
+#~ msgstr "strana"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie je možné otvoriť súbor HTML:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Chyba pri čítaní dát:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Súbor neobsahuje miesto pre služby.\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 ""
+#~ "Komponent Súhrn nemohol inicializovať Bonobo.\n"
+#~ "Ak sa objavilo varovanie o RootPOA, asi to znamená, že ste\n"
+#~ "preložili Bonobo pre GOAD a nie pre OAF."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Vytváracie rozhranie pre Súhrn RDF."
+
+#~ msgid "RDF Summary"
+#~ msgstr "Súhrn DRF"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Vytváracie rozhranie pre testovací komponent bonobo."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Vytváracie rozhranie pre testovací komponent."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Testovacia služba bonobo"
+
+#~ msgid "Test service"
+#~ msgstr "Testovacia služba"
+
+#~ msgid "Update automatically"
+#~ msgstr "Automaticky aktualizovať"
+
+#~ msgid "Update now"
+#~ msgstr "Aktualizovať"
+
+#~ msgid "Update every "
+#~ msgstr "Aktualizovať každých "
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Zadajte URI priečinku"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Priečinok pre ukladanie pošty (interné)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Nie je možné sa spojiť so skladom: %s"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Vytvoriť vPriečinok z výsledku hľadania"
+
+#~ 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"
+
+#~ msgid "Composer"
+#~ msgstr "Editor"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Štandardný štýl \"Predať ďalej\" je: "
+
+#~ 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"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "Uložiť _záznam o filtrovaní do:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organizácia:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Uložiť toto heslo"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Posielať štandardne ako _HTML."
+
+#~ msgid "_Server type: "
+#~ msgstr "_Typ serveru:"
+
+#~ msgid "placeholder"
+#~ msgstr "miesto"
+
+#~ 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!"
+
+#~ msgid "Mail Summary"
+#~ msgstr "Súhrn pošty"
+
+#~ 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)"
+
+#~ msgid "Dump"
+#~ msgstr "Vyhodiť"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Nastavenie kalendára"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Vytvoriť novú celodennú _udalosť"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Vytvoriť novú ú_lohu"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Vytvoriť _novú schôdzku"
+
+#~ msgid "Create a _New Meeting"
+#~ msgstr "Vytvoriť _nové stretnutie"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Vytvoriť novú schôdzku"
+
+#~ msgid "Create a new meeting request"
+#~ msgstr "Vytvorí novú požiadavku na stretnutie"
+
+#~ msgid "Create a new task"
+#~ msgstr "Vytvorí novú úlohu"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Vytvorí udalosť počas celého dňa"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Schôdzka..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "Nastavenie _kalendára..."
+
+#~ msgid "_Meeting..."
+#~ msgstr "_Stretnutie..."
+
+#~ msgid "_Task..."
+#~ msgstr "Ú_loha..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Vytvorí alebo upraví poštové účty a iné nastavenia"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "Nastavenie _pošty..."
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Použiť filtre"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Nastavenie pohľadu pre úlohy"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Nastavenie úloh..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Zmení nastavenie súhrnu"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "Nastavenie _súhrnu..."
+
+#~ msgid "Show All"
+#~ msgstr "Zobraziť všetko"
+
+#~ msgid "Sear_ch"
+#~ msgstr "_Nájsť"
diff --git a/po/sl.po b/po/sl.po
index d452c3afa8..579ec3536f 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-05-07 15:46-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,16 +30,17 @@ 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
+#: 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"
 
@@ -55,7 +56,7 @@ 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/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Pomočnik"
 
@@ -95,7 +96,7 @@ 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"
 
@@ -117,7 +118,7 @@ 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/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Službeni faks"
 
@@ -127,7 +128,7 @@ 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/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Domači faks"
 
@@ -147,7 +148,7 @@ 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/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -155,55 +156,54 @@ msgstr "ISDN"
 #: 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
 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/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/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/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/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/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/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:171 calendar/gui/main.c:63
 #: 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:2732
 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:1123
 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:1226
 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:1462
 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:2586
 msgid "Restarting search."
 msgstr "Znova začenjam iskanje."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2672
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 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:2759
 msgid "Error performing search"
 msgstr "Napaka ob iskanju"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2778
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
 msgid "Could not parse query string"
 msgstr "Nisem mogel razčleniti niza poizvedbe"
 
@@ -422,281 +422,116 @@ 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 "Addressbook Settings"
+msgstr "Viri adresarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, 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:6
+#, fuzzy
+msgid "Configuration control for the Evolution Addressbook."
+msgstr "Nastavitveno orodje za Evolucijin adresarjev veznik.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 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:8
+#, fuzzy
+msgid "Directory Servers"
+msgstr "N_ov strežnik imenikov"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 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:10
 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:11
 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:12
 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:13
 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:14
+#, 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:15
 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:16
+msgid "This page can be used to configure Addressbook Settings"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Stiki"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 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:74
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "Strežnik LDAP, ki vsebuje podatke o stikih"
 
-#: addressbook/gui/component/addressbook-component.c:558
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Nov stik"
 
-#: addressbook/gui/component/addressbook-component.c:558
-#: ui/evolution-addressbook.xml.h:34
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Stik"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Nov seznam stikov"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:565
 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-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-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.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 ""
-"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."
-
-#: 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.glade.h:25
-msgid ""
-"This is the maximum number of cards to download.  Setting this number too "
-"large will slow down this addressbook."
-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."
-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."
-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:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Vrata:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "Ime _strežnika:"
-
-#: 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "Nisem mogel inicializirati gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:168
-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 +540,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 +552,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,55 +560,45 @@ 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:643
+#: addressbook/gui/component/addressbook.c:646
 #, 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:769
 msgid "Name begins with"
 msgstr "Ime se začne z"
 
-#: addressbook/gui/component/addressbook.c:837
+#: addressbook/gui/component/addressbook.c:770
 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:771
+#: 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:772
+#: 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:773 widgets/misc/e-filter-bar.h:99
 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:1001
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "katerakoli kategorija"
 
-#: addressbook/gui/component/addressbook.c:1167
+#: addressbook/gui/component/addressbook.c:1083
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
-#.
-#. * 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 "(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
@@ -822,6 +647,636 @@ msgstr "Izključi poizvedbe"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Vključi poizvedbe (nevarno!)"
 
+#: 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.c:215
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Strežniku IMAP se nisem mogel avtentificirati.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:235
+#, fuzzy
+msgid "Could not perform query on Root DSE"
+msgstr "Nisem mogel razčleniti niza poizvedbe"
+
+#: 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 ""
+"Neveljavni podatki sledenja:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1169
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
+
+#: addressbook/gui/component/addressbook-config.c:1613
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL v to zgradbi Evolucije ni vgrajen)"
+
+#: addressbook/gui/component/addressbook-config.c:1689
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Datum zaključka"
+
+#: 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 "<< Fewer Options"
+msgstr "Možnosti"
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "<- _Remove"
+msgstr " _Odstrani"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+#, fuzzy
+msgid "1234"
+msgstr "123"
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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:54
+#: mail/mail-config.glade.h:16
+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:56
+#: mail/mail-config.glade.h:76
+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:55 mail/mail-config.glade.h:136
+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:139
+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:152 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."
@@ -831,7 +1286,7 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c: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
 msgid "Remove"
@@ -863,6 +1318,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 +1338,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 +1350,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:6
+#, fuzzy
+msgid "_Browse..."
+msgstr "_Prestavi..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: 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:"
 
@@ -975,10 +1444,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 +1487,11 @@ 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: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
 msgid "_Delete"
 msgstr "_Zbriši"
 
@@ -2076,14 +2542,6 @@ 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 ""
-"Ste prepričani, \n"
-"da želite zbrisati ta stik?"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Zbriši stik?"
 
@@ -2117,7 +2575,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"
 
@@ -2323,7 +2781,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,99 +2790,23 @@ 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-minicard.c:475
@@ -2432,14 +2814,15 @@ 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:1043
 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: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
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
@@ -2447,8 +2830,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:1071
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
@@ -2466,9 +2849,9 @@ 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/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
 msgid "Cancelled"
 msgstr "preklicano"
 
@@ -2500,7 +2883,7 @@ 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-view.c:1622
 msgid "Error removing card"
 msgstr "Napaka ob odstranjevanju vizitke"
 
@@ -2522,86 +2905,186 @@ 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:344
 msgid "Move card to"
 msgstr "Prestavi vizitko v"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:346
 msgid "Copy card to"
 msgstr "Kopiraj vizitko v"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Move cards to"
 msgstr "Prestavi vizitke v"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:351
 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:699
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Shrani kot vVizitko"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Nov stik"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Nov seznam stikov"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "Pojdi v _mapo..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Uvozi..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Išči po kontaktih"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Viri _adresarja..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Nastavive pilota..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Posreduj _stik"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Stiku pošlji sporočilo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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:893
+msgid "Print Envelope"
+msgstr "Natisni kuverto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Copy to folder..."
+msgstr "Kopiraj v mapo..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Move to folder..."
+msgstr "Prestavi v mapo..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Izreži"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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:903
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+msgid "Paste"
+msgstr "Prilepi"
+
+#: 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
+#: 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:907
+#: 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:940
 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 +3092,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:945
 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 +3109,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 +3123,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 +3220,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"
 
@@ -2762,7 +3245,7 @@ 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"
 
@@ -2785,7 +3268,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"
 
@@ -2845,29 +3328,25 @@ msgstr "_Pisava..."
 msgid "Untitled appointment"
 msgstr "Neimenovan sestanek"
 
-#: 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:650
+#: 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
 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/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "običajna"
 
-#: 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:648
+#: 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
 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
 msgid "Undefined"
 msgstr "ni definirana"
 
@@ -2899,41 +3378,55 @@ 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
+#, 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 executive summary component."
 msgstr "Evolucijina komponenta za povzetke."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 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:7
 msgid "Evolution component for handling the calendar."
 msgstr "Komponenta Evolucije za urejanje koledarja."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the Calendar Summary component."
 msgstr "Tovarna komponent za povzetke koledarja."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr "Tovarna za Evolucijino komponento nalog."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "Tvoarna za orodje koledarja iTip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "Vzorčna tovarna za kontrolo koledarja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Tovarna za centralzacijo dialogov urejevalnika komponent koledarja."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr "Tovarna za ustvarjanje tovarne komponent urejevalnika."
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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"
@@ -2942,22 +3435,10 @@ msgstr "Storitev opozorilnega alarma"
 msgid "Factory for the alarm notification service"
 msgstr "Tovarna za storitev opozorlinega alarma"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-msgid "Starting:"
-msgstr "Pričetek ob:"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-msgid "Ending:"
-msgstr "Konec ob:"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "neveljaven čas"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-msgid "Evolution Alarm"
-msgstr "Alarm Evolucije"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -2997,7 +3478,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:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Opozorilo"
@@ -3023,7 +3504,7 @@ 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:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Nisem mogel inicializirati GNOMEa"
 
@@ -3035,52 +3516,52 @@ msgstr "Nisem mogel ustvariti storitve alarma"
 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
 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 +3569,14 @@ msgstr ""
 "in OAF-a."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:385
 msgid "Private"
 msgstr "osebno"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
 msgid "Confidential"
 msgstr "zaupno"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "javno"
 
@@ -3118,32 +3597,27 @@ msgid "W"
 msgstr "W"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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
 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
 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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "končano"
 
@@ -3159,10 +3633,10 @@ 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/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/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
 #: 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
@@ -3179,21 +3653,13 @@ 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
 msgid "Yes"
 msgstr "Da"
 
 #: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
 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 +3676,75 @@ msgstr "Tedenski pogled"
 msgid "Month View"
 msgstr "Mesečni pogled"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Koledar"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:68
 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
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Naloge"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Mapa, ki vsebuje predmete za opravit"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:695
 msgid "New meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:695
 msgid "_Meeting"
 msgstr "_Sestanek"
 
-#: calendar/gui/component-factory.c:687
+#: calendar/gui/component-factory.c:699
 msgid "New task"
 msgstr "Nova naloga"
 
-#: calendar/gui/component-factory.c:687 ui/evolution-tasks.xml.h:25
+#: calendar/gui/component-factory.c:699
 msgid "_Task"
 msgstr "_Naloga"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Nov sestanek"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "_Sestanek"
+
+#: calendar/gui/component-factory.c:707
 msgid "New appointment"
 msgstr "Nov sestanek"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:707
 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 +3809,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 +3937,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.glade.h:11
 msgid "Summary:"
 msgstr "Povzetek:"
 
@@ -3486,7 +3966,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:189
 msgid "minute(s)"
 msgstr "minut"
 
@@ -3527,170 +4007,168 @@ 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"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Prvi dan ted_na:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "petek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Ur"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: 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"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: 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"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 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
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Sta_rt of day:"
 msgstr "Zače_tek dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_ned"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "nedeljo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Nalo_ge z današnjim rokom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "č_et"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 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
+#: 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:30
+#: 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:31
 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:32
 msgid "_24 hour"
 msgstr "_24 urna"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 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:34
 msgid "_Compress weekends in month view"
 msgstr "_Skrči vikende v mesečnem pogledu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Prikaz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_End of day:"
 msgstr "_Konec dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_pet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Splošno"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 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:40
 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:41
+#, 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:42
 msgid "_Sat"
 msgstr "so_b"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "Seznam _nalog"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Časovne _delitve:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_sre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "pred pričetkom sestanka"
 
@@ -3754,73 +4232,60 @@ 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
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "Nisem mogel posodobiti predmeta!"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Uredi sestake"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sestanek - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Vpis v dnevniku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 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:1081 mail/mail-callbacks.c:2241
-#: mail/mail-display.c:117
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-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..."
+#: 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
+msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Ne morem dobiti trenutne različice!"
 
@@ -3878,7 +4343,7 @@ 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:185
 msgid "Appointment"
 msgstr "Sestanek"
 
@@ -3945,7 +4410,7 @@ msgid "Pu_blic"
 msgstr "_Javno"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Kaži čas kot"
 
@@ -3990,55 +4455,49 @@ msgstr "Udeležen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Kliknite tu za dodajo udeleženca"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Splošno ime"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegirano od"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegirano komu:"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Jezik"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Član"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:853
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 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
+#: 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"
 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Vrsta"
@@ -4061,27 +4520,97 @@ msgstr "_Povabi ostale..."
 msgid "_Other Organizer"
 msgstr "_Drug organizator"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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 "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"
 
@@ -4160,7 +4689,8 @@ msgstr "Podatki o nalogi so bili ustvarjeni. Naj jih pošljem?"
 
 #: calendar/gui/dialogs/send-comp.c:70
 msgid "The task information has changed. Send an updated version?"
-msgstr "Podatki o nalogi so se spremenili. Naj pošljem posodobljeno različico?"
+msgstr ""
+"Podatki o nalogi so se spremenili. Naj pošljem posodobljeno različico?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
@@ -4177,7 +4707,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:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4189,15 +4719,19 @@ msgstr "_Prioriteta:"
 msgid "_Status:"
 msgstr "_Stanje:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "Osnove"
+
 #: 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:324
 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.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:42
 msgid "Description:"
 msgstr "Opis:"
 
@@ -4209,116 +4743,80 @@ msgstr "Datum _pričetka:"
 msgid "_Due Date:"
 msgstr "_Do datuma:"
 
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:438
-#, 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:751 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: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
 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:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Shrani kot..."
+
+#: calendar/gui/e-calendar-table.c:974 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:978 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:979 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:980 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:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Dodeli nalogo"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Posreduj naprej kot i_Koledar"
+
+#: calendar/gui/e-calendar-table.c:986
 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:987
+#, 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:992
 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:1259 calendar/gui/e-day-view.c:7416
+#: 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.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Kliknite tu za dodajanje opravila"
 
@@ -4326,48 +4824,47 @@ 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Končano"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Datum zaključka"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Do datuma"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Datum konca"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Zemljepisna lega"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioriteta"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 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
-#: shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Povzetek"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Sortiranje opravil"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4401,412 +4898,175 @@ 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/print.c:791
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
 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/print.c:793
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
 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:37
+#, 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:3595 calendar/gui/e-week-view.c:3472
+#: mail/folder-browser.c:1610 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:3567 calendar/gui/e-week-view.c:3460
+#: 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
-msgid "Meeting begins: <b>"
-msgstr "Čas pričetka sestanka: <b>"
-
-#: calendar/gui/e-itip-control.c:550
-msgid "Task begins: <b>"
-msgstr "Čas pričetka opravila: <b>"
-
-#: calendar/gui/e-itip-control.c:555
-msgid "Free/Busy info begins: <b>"
-msgstr "Podatki o zasedenosti se pričnejo: <b>"
-
-#: calendar/gui/e-itip-control.c:559
-msgid "Begins: <b>"
-msgstr "Pričetek: <b>"
-
-#: calendar/gui/e-itip-control.c:571
-msgid "Meeting ends: <b>"
-msgstr "Čas zaključka sestanka: <b>"
-
-#: calendar/gui/e-itip-control.c:574
-msgid "Free/Busy info ends: <b>"
-msgstr "Podatki o zasedenosti se končajo: <b>"
-
-#: calendar/gui/e-itip-control.c:578
-msgid "Ends: <b>"
-msgstr "Konec: <b>"
-
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Completed: <b>"
-msgstr "Opravilo končano: <b>"
-
-#: calendar/gui/e-itip-control.c:602
-msgid "Task Due: <b>"
-msgstr "Rok opravila: <b>"
-
-#: calendar/gui/e-itip-control.c:639 calendar/gui/e-itip-control.c:688
-msgid "iCalendar Information"
-msgstr "Podatki o iKoledarju"
-
-#. Title
-#: calendar/gui/e-itip-control.c:654
-msgid "iCalendar Error"
-msgstr "Napaka iKoledarja"
-
-#: calendar/gui/e-itip-control.c:719 calendar/gui/e-itip-control.c:735
-msgid "An unknown person"
-msgstr "neznana oseba"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:742
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> Prosimo, preglejte sledeče podatke in izberite dejanje iz spodnjega "
-"menuja."
-
-#: calendar/gui/e-itip-control.c:758
-msgid "<i>None</i>"
-msgstr "<i>Nič</i>"
-
-#: calendar/gui/e-itip-control.c:770
-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
-msgid "Accepted"
-msgstr "Sprejeto"
-
-#: calendar/gui/e-itip-control.c:779 calendar/gui/itip-utils.c:326
-msgid "Tentatively Accepted"
-msgstr "Poskusno sprejeto"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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-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
-msgid "Declined"
-msgstr "Zavrnjeno"
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
+#, c-format
+msgid "Error executing %s."
+msgstr "Napaka ob izvajanju %s."
 
-#: 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: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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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
-msgid "Choose an action:"
-msgstr "Izberi dejanje:"
-
-#: calendar/gui/e-itip-control.c:834
-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
-msgid "OK"
-msgstr "V redu"
-
-#: calendar/gui/e-itip-control.c:850
-msgid "Accept"
-msgstr "Sprejmi"
-
-#: calendar/gui/e-itip-control.c:851
-msgid "Tentatively accept"
-msgstr "Poskusno sprejmi"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Decline"
-msgstr "Odbij"
-
-#: calendar/gui/e-itip-control.c:866
-msgid "Send Free/Busy Information"
-msgstr "Pošlji podatek o zasedenosti"
-
-#: calendar/gui/e-itip-control.c:879
-msgid "Update respondent status"
-msgstr "Osveži stanje respondenta"
-
-#: calendar/gui/e-itip-control.c:892
-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
-msgid "Cancel"
-msgstr "Prekliči"
-
-#: calendar/gui/e-itip-control.c:953
-#, 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
-msgid "Meeting Information"
-msgstr "Podatki o sestanku"
-
-#: calendar/gui/e-itip-control.c:958
-#, 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
-msgid "Meeting Proposal"
-msgstr "Predlog sestanka"
-
-#: calendar/gui/e-itip-control.c:963
-#, 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
-msgid "Meeting Update"
-msgstr "Posodobitev sestanka"
-
-#: calendar/gui/e-itip-control.c:968
-#, 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
-msgid "Meeting Update Request"
-msgstr "Zahtevek za posodobitev sestanka"
-
-#: calendar/gui/e-itip-control.c:992
-#, 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
-msgid "Meeting Reply"
-msgstr "Odgovor na sestanek"
-
-#: calendar/gui/e-itip-control.c:997
-#, 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
-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
-#, 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
-msgid "Bad Meeting Message"
-msgstr "Nerazumljivo sporočilo o sestanku"
-
-#: calendar/gui/e-itip-control.c:1023
-#, 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
-msgid "Task Information"
-msgstr "Podatki o nalogi"
-
-#: calendar/gui/e-itip-control.c:1028
-#, 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
-msgid "Task Proposal"
-msgstr "Predlog naloge"
-
-#: calendar/gui/e-itip-control.c:1033
-#, 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
-msgid "Task Update"
-msgstr "Posodobitev naloge"
-
-#: calendar/gui/e-itip-control.c:1038
-#, 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
-msgid "Task Update Request"
-msgstr "Zahtevek za posodobitev naloge"
-
-#: calendar/gui/e-itip-control.c:1063
-#, 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
-msgid "Task Reply"
-msgstr "Odgovor na nalogo"
-
-#: calendar/gui/e-itip-control.c:1068
-#, 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
-msgid "Task Cancellation"
-msgstr "Preklic naloge"
-
-#: calendar/gui/e-itip-control.c:1074
-msgid "Bad Task Message"
-msgstr "Nerazumljivo sporočilo o nalogi"
-
-#: calendar/gui/e-itip-control.c:1093
-#, 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
-msgid "Free/Busy Information"
-msgstr "Podatek o zasedenosti"
-
-#: calendar/gui/e-itip-control.c:1098
-#, 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
-msgid "Free/Busy Request"
-msgstr "Zahtevek po podatkih o zasedenosti"
-
-#: calendar/gui/e-itip-control.c:1103
-#, 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
-msgid "Free/Busy Reply"
-msgstr "Odgovor zasedenosti"
-
-#: calendar/gui/e-itip-control.c:1109
-msgid "Bad Free/Busy Message"
-msgstr "Nerazumljivo sporočilo o zasedenosti"
-
-#: calendar/gui/e-itip-control.c:1182
-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
-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
-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
-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:1369
+#: calendar/gui/e-itip-control.c:1564
 msgid "Calendar file could not be updated!\n"
 msgstr "Datoteke koledarja ni bilo mogoče posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:1371
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Posodobitev končana\n"
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 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
+#: calendar/gui/e-itip-control.c:1638
 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:1640
 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:1456
+#: calendar/gui/e-itip-control.c:1674
 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:1704 calendar/gui/e-itip-control.c:1754
 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:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Izberi mapo"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Izberi mapo"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4861,57 +5121,58 @@ 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:533
 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
 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
 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
 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
 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:535
 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
 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
 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:543
 msgid "Needs Action"
 msgstr "Potrebuje dejanje"
 
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+msgid "Accepted"
+msgstr "Sprejeto"
+
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+msgid "Declined"
+msgstr "Zavrnjeno"
+
 #: 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-time-sel.c:434
 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
 msgid "Delegated"
 msgstr "Delegirano"
 
@@ -5001,40 +5262,54 @@ msgstr "Čas pričetka sestanka:"
 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:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Datum zaključka"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Brišem izbrane predmete"
+
+#: calendar/gui/e-tasks.c:659
 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:1538
 #, 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:1549
 #, 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:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Odpiram koledar v %s"
@@ -5103,43 +5378,11 @@ msgstr "Potreben je vsaj en udeleženec"
 msgid "An organizer must be set."
 msgstr "Organizator mora biti naveden."
 
-#: calendar/gui/itip-utils.c:295
-msgid "Event information"
-msgstr "Podatki o dogodku"
-
-#: calendar/gui/itip-utils.c:297
-msgid "Task information"
-msgstr "Podatki o nalogi"
-
-#: calendar/gui/itip-utils.c:299
-msgid "Journal information"
-msgstr "Podatki o dnevniku"
-
-#: calendar/gui/itip-utils.c:301
-msgid "Free/Busy information"
-msgstr "Podatki o zasedenosti"
-
-#: calendar/gui/itip-utils.c:303
-msgid "Calendar information"
-msgstr "Podatki o kodledarju"
-
-#: calendar/gui/itip-utils.c:339
-msgid "Updated"
-msgstr "Posodobljen"
-
-#: calendar/gui/itip-utils.c:347
-msgid "Refresh"
-msgstr "Osveži"
-
-#: calendar/gui/itip-utils.c:351
-msgid "Counter-proposal"
-msgstr "Proti-predlog"
-
 #: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Biti morate udeleženec dogodka."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr "Nisem mogel ustvariti tovarne komponent urejevalnikov"
 
@@ -5296,87 +5539,54 @@ 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
-msgid "Task"
-msgstr "Naloga"
-
-#: calendar/gui/print.c:2283
-#, c-format
-msgid "Status: %s"
-msgstr "Stanje: %s"
-
-#: calendar/gui/print.c:2301
-#, c-format
-msgid "Priority: %s"
-msgstr "Prioriteta: %s"
-
-#: calendar/gui/print.c:2315
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Procentov opravljeno: %i"
-
-#: calendar/gui/print.c:2327
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2341
-#, c-format
-msgid "Categories: %s"
-msgstr "Kategorije: %s"
-
-#: calendar/gui/print.c:2352
-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:2894
+#: 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 +5597,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 +5613,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:2381
+#: mail/mail-callbacks.c:2622
 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"
 
@@ -5417,8 +5627,8 @@ msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
-"Evolucija je vzela naloge, ki so bile v vaši mapi koledarja in jih samodejno "
-"prenesla v novo mapo nalog."
+"Evolucija je vzela naloge, ki so bile v vaši mapi koledarja in jih "
+"samodejno prenesla v novo mapo nalog."
 
 #: calendar/gui/tasks-migrate.c:108
 msgid ""
@@ -5427,10 +5637,10 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolucija je poskušala vzeti vse naloge, ki so bile v vaši mapi koledarja in "
-"jih prenesti v novo mapo nalog.\n"
-"Nekaterih nalog ni bilo mogoče prenesti, zato bo ta proces v prihodnosti še "
-"ponovljen."
+"Evolucija je poskušala vzeti vse naloge, ki so bile v vaši mapi koledarja "
+"in jih prenesti v novo mapo nalog.\n"
+"Nekaterih nalog ni bilo mogoče prenesti, zato bo ta proces v prihodnosti "
+"še ponovljen."
 
 #: calendar/gui/tasks-migrate.c:120
 #, c-format
@@ -5438,8 +5648,8 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"Ne morem odpreti `%s'; noben predmet iz mape koledarja ne bo prenešen v mapo "
-"nalog."
+"Ne morem odpreti `%s'; noben predmet iz mape koledarja ne bo prenešen v "
+"mapo nalog."
 
 #: calendar/gui/tasks-migrate.c:133
 #, c-format
@@ -5466,91 +5676,109 @@ 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: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"
-"\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
 msgstr ""
-"contains? pričakuje, da je 1. argument eden od \"any\" (karkoli), \"summary"
-"\" (povzetek), \"description\"(opis)"
+"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 +5786,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"
 
@@ -7108,11 +7336,11 @@ msgstr "Šifriranje v tem šifrirniku ni podprto"
 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:441
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nisem mogel odstraniti vnosa v predpomnilnišk: %s: %s"
@@ -7147,52 +7375,51 @@ msgstr "Sinhroniziram s strežnikom"
 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:811 camel/camel-filter-driver.c:1197
 #, 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:820 camel/camel-filter-driver.c:1203
 #, 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:887
 msgid "Unable to open spool folder"
 msgstr "Ne morem odpreti mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Nisem mogel obdelati mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:889
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Dobivam sporočilo %d (%d%%)"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 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:916 camel/camel-filter-driver.c:928
 #, 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:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1016
 #, 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:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
@@ -7206,7 +7433,7 @@ msgstr "Nisem uspel prenesti sporočila"
 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 +7442,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,35 +7451,31 @@ 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:469
 #, 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:1038
 #, 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:1078
 #, 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:1260
 msgid "Moving messages"
 msgstr "Prestavljam sporočila"
 
@@ -7363,172 +7586,129 @@ msgstr "Prosim vpišite svoje %s geslo za %s"
 msgid "Please enter your %s passphrase"
 msgstr "Prosim vpišite svoje %s geslo"
 
-#: camel/camel-pgp-context.c:622
+#: camel/camel-pgp-context.c:621
 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
+#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
 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
+#: 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 ""
 "Ne morem podpisati tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:796
+#: camel/camel-pgp-context.c:795
 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
+#: camel/camel-pgp-context.c:987
 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
+#: camel/camel-pgp-context.c:993
 #, 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"
+"Nisem mogel preveriti tega sporočila: nisem mogel ustvariti cevi do "
+"GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1005
+#: camel/camel-pgp-context.c:1004
 #, 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
+#: camel/camel-pgp-context.c:1177
 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
+#: camel/camel-pgp-context.c:1187
 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
+#: camel/camel-pgp-context.c:1194
 #, 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"
+"Ne morem zašifirati tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: "
+"%s"
 
-#: camel/camel-pgp-context.c:1204
+#: camel/camel-pgp-context.c:1203
 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
+#: camel/camel-pgp-context.c:1372
 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
+#: camel/camel-pgp-context.c:1380
 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
+#: camel/camel-pgp-context.c:1387
 #, 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"
+"Ne morem dešifrirati tega sporočila: nisem mogel ustvariti cevi do "
+"GPG/PGP: %s"
 
-#: camel/camel-pgp-mime.c:332
+#: camel/camel-pgp-mime.c:354
 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-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
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "strežnik %s %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, 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
+#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
 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
+#: 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 "Nisem se mogel povezati z %s (vrata %d): %s"
 
-#: camel/camel-remote-store.c:268 camel/providers/pop3/camel-pop3-store.c:198
+#: camel/camel-remote-store.c:258
 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/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 "Operacija razveljavljena"
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7540,7 +7720,8 @@ msgstr "Anonimno"
 
 #: camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
-msgstr "Ta možnost narekuje povezavo s strežnikom z uporabo anonimne prijave."
+msgstr ""
+"Ta možnost narekuje povezavo s strežnikom z uporabo anonimne prijave."
 
 #: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
@@ -7582,8 +7763,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Ta možnost narekuje povezavo s strežnikom z uporabo varnega CRAM-MD5 gesla, "
-"če to podpira strežnik."
+"Ta možnost narekuje povezavo s strežnikom z uporabo varnega CRAM-MD5 "
+"gesla, če to podpira strežnik."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -7608,8 +7789,8 @@ msgstr "Strežnikov izziv ni veljaven\n"
 #: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
-"Strežnikov izziv je vseboval neveljaven člen \"Quality of Protection"
-"\" (kvaliteta zaščite)\n"
+"Strežnikov izziv je vseboval neveljaven člen \"Quality of Protection\" "
+"(kvaliteta zaščite)\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
@@ -7630,7 +7811,8 @@ msgstr "Kerberos 4"
 #: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
-"Ta možnost narekuje povezavo s strežnikom z uporabo avtentikacije Kerberos 4."
+"Ta možnost narekuje povezavo s strežnikom z uporabo avtentikacije Kerberos "
+"4."
 
 #: camel/camel-sasl-kerberos4.c:161
 #, c-format
@@ -7642,7 +7824,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
@@ -7652,15 +7834,29 @@ msgstr "Prijava"
 
 #: 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 "Ta možnost narekuje povezavo s strežnikom z uporabo enostavnega gesla."
+msgstr ""
+"Ta možnost narekuje povezavo s strežnikom z uporabo enostavnega gesla."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
 msgstr "Neznano stanje avtentifikacije."
 
+#: 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 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
+#: 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 "Geslo"
 
@@ -7704,26 +7900,41 @@ msgstr "URL '%s' potrebuje komponento gostitelja"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' potrebuje komponento poti"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Razvozlujem: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Napaka ob poizvedbi imena: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, 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:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Razvozlujem: %s"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Poizvedba po gostitelju ni uspela: %s: gostitelj ni bil najden"
+
+#: camel/camel-service.c:790
+#, 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 +7943,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 +7957,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 +7994,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:222
 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:284
 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 +8011,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 +8028,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:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7825,16 +8041,16 @@ msgstr ""
 "Prstni odtis:      %s\n"
 "Podpis:            %s"
 
-#: camel/camel-tcp-stream-ssl.c:464
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr "V REDU"
 
-#: camel/camel-tcp-stream-ssl.c:464
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr "SLABO"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:467
+#: camel/camel-tcp-stream-ssl.c:500
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7859,27 +8075,27 @@ msgstr "Ne morem odpreti razčleniti URLja '%s'"
 msgid "No such message %s in %s"
 msgstr "Ni takšnega sporočila %s v %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Ni takšnega sporočila: %s"
 
-#: 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"
@@ -7912,52 +8128,52 @@ msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
 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:199
 #, 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:218
 #, 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:284
 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:469
 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:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 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:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 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:1799
 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:2151
 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"
@@ -8000,30 +8216,31 @@ msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
 
 #: 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."
+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:519
 #, 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:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, 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:553
 #, 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:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 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:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8034,57 +8251,58 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, 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:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Starševski mapi ni dovoljeno vsebovati podmape"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:48
 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:49
 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:64
 msgid "Local delivery"
 msgstr "Krajevna dostava"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 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:76
+#: 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:82
 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:83
 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
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr "Običajni Unix poštni predali mbox"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:101
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 "Za branje in shranjevanje krajevne pošte v običajnih Unix mbox datotekah"
 
-#: camel/providers/local/camel-local-provider.c:91
+#: camel/providers/local/camel-local-provider.c:116
 msgid "Directory tree of mbox files"
 msgstr "Imeniško drevo datotek mbox"
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8096,56 +8314,62 @@ msgstr ""
 "OPOZORILO: Ta nudilnik je še vedno preizkusen, zato pred uporabo naredite "
 "varnostno kopijo mape."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: 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
 #, 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:863
 #, 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:371
 #, 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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne morem dodati sporočila k povzetku: razlog neznan"
 
@@ -8186,7 +8410,7 @@ msgstr "Ni takšnega sporočila"
 msgid "Invalid message contents"
 msgstr "Neveljavna vsebina sporočila"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8196,14 +8420,14 @@ 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-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, 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-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8213,33 +8437,56 @@ 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-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, 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:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, 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-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"
+
+#. 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
+msgid "Storing folder"
+msgstr "Shranjujem mapo"
+
 #: camel/providers/local/camel-mbox-folder.c:151
 #: camel/providers/local/camel-spool-folder.c:277
 #, c-format
@@ -8285,7 +8532,7 @@ msgstr "Zdi se, da je mapa poškodovana in je ni mogoče popraviti."
 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 +8541,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 +8550,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,96 +8566,85 @@ 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:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, 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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, 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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, 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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, 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
+#: 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 "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
+#: 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 "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
+#: 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 "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: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"
 msgstr "Nisem mogel zapreti izvorne mape %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, 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:652
 #, 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
@@ -8427,7 +8663,7 @@ msgstr "Ne morem dodati sporočila v mapo vrste mh: %s: %s"
 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:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ne morem odpreti poštnega imenika MH: %s: %s"
@@ -8443,6 +8679,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mapa `%s/%s' ne obstaja."
@@ -8452,29 +8689,31 @@ msgstr "Mapa `%s/%s' ne obstaja."
 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:208
+#: camel/providers/local/camel-spoold-store.c:193
 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:216
+#: camel/providers/local/camel-spoold-store.c:201
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:831
 #, 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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8483,65 +8722,24 @@ 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
+#: camel/providers/local/camel-spool-summary.c:950
 #, 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/local/camel-spoold-store.c:117
+#, fuzzy, c-format
+msgid "Store `%s' does not exist or is not a directory"
+msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
 
-#: 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/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: 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/local/camel-spoold-store.c:173
+#, fuzzy, c-format
+msgid "Mail tree %s"
+msgstr "Pošta za %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
@@ -8551,12 +8749,12 @@ 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:148
 #, 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:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8598,32 +8796,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 +8853,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:84
 msgid "POP"
 msgstr "POP"
 
@@ -8653,8 +8866,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 ""
-"Ta možnost narekuje povezavo s strežnikom POP z nešifriranim geslom. To je v "
-"večini edina možnost, ki jo strežniki POP podpirajo."
+"Ta možnost narekuje povezavo s strežnikom POP z nešifriranim geslom. To "
+"je v večini edina možnost, ki jo strežniki POP podpirajo."
 
 #: camel/providers/pop3/camel-pop3-provider.c:81
 msgid ""
@@ -8666,27 +8879,28 @@ 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:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, 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"
+msgstr "Nisem se mogel povezati s strežnikom POP %s v varnem načinu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/pop3/camel-pop3-store.c:210
 msgid "SSL/TLS extension not supported."
 msgstr "Razširitev SSL/TLS ni podprta"
 
-#: camel/providers/pop3/camel-pop3-store.c:273
+#: camel/providers/pop3/camel-pop3-store.c:251
 msgid "SSL negotiations failed"
 msgstr "Pogajanje SSL ni uspelo"
 
-#: camel/providers/pop3/camel-pop3-store.c:371
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, 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:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8694,26 +8908,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:405
 #, 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:416
 msgid "SASL Protocol error"
 msgstr "Napaka protokola SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:431
 #, 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:452
 #, 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:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8722,13 +8937,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:601
 #, 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:114
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -8739,54 +8954,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 +9007,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:300
 #, 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:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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:336
 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:350
+#, 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:365
 msgid "STARTTLS response error"
 msgstr "Napaka v odgovoru na STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:502
+#: camel/providers/smtp/camel-smtp-transport.c:458
 #, 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:496
 #, 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:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8940,94 +9152,91 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, 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:644
 #, 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:662
 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:667 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:678
 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:688
 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:838
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:889
 #, 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:937
 msgid "SMTP Authentication"
 msgstr "Avtentifikacija SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1012
+#: camel/providers/smtp/camel-smtp-transport.c:943
 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:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, 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:981
 msgid "AUTH request failed."
 msgstr "Zahtevek AUTH ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1096
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 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:1067
 #, 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"
+"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:1081
 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:1105
 #, 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:1121
 #, 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:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9036,37 +9245,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:1171
 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:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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"
+"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:1243
 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:1266
 #, 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:1280
 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:1303
 #, 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:1317
 msgid "QUIT response error"
 msgstr "Napaka v odgovoru na QUIT"
 
@@ -9095,7 +9304,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 +9344,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:333
 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:363
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Odgovori-na:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 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:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 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:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9192,12 +9401,12 @@ 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:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9206,38 +9415,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:967
 msgid "Warning!"
 msgstr "Opozorilo!"
 
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Datoteka obstaja, prepiši?"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:1009
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:1040
+#: composer/e-msg-composer.c:1043
 #, 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:1051
 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:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9246,7 +9451,7 @@ msgstr ""
 "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1062
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9255,7 +9460,7 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9264,7 +9469,7 @@ msgstr ""
 "Napaka ob samodejnem shranjevanju sporočila: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9272,7 +9477,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:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9282,23 +9487,23 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:1338
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Opozorilo: Spremenjeno sporočilo"
 
-#: composer/e-msg-composer.c:1361
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1510
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Vstavi datoteko"
 
-#: composer/e-msg-composer.c:2044 composer/e-msg-composer.c:2641
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:2658
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9306,7 +9511,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:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9314,7 +9519,7 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Ne morem aktivirati komponente urejevalnika HTML."
 
-#: composer/evolution-composer.c:383
+#: 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 +9527,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 +9579,21 @@ msgstr "Zadeva vsebuje"
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: 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 +9691,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 +9723,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:191
 msgid "seconds"
 msgstr " sekund"
 
@@ -9752,7 +9798,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:1027
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
@@ -9773,7 +9819,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 +9827,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:1633 mail/mail-account-gui.c:1647
 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 +9841,7 @@ msgstr ""
 "Napaka v regularnem izrazu '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:44
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Preizkus"
 
@@ -9832,7 +9870,8 @@ msgid "if all criteria are met"
 msgstr "če je zadoščeno vsem pogojem"
 
 #: filter/filter-rule.c:769
-msgid "if any criteria are met"
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "če je zadoščeno kateremukoli pogoju"
 
 #: filter/filter-rule.c:780
@@ -9889,203 +9928,209 @@ 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
 msgid "contains"
 msgstr "vsebuje"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiraj v mapo"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Sprejeto dne"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Poslano dne"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Zbrisano"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "ne vsebuje"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "se ne konča z"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "ne obstaja"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "ne zveni kot"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "se ne začne z"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "ne obstaja"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Osnutek"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "se konča z"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr "Izvedi ukaz lupine"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Izraz"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Navezava"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Pomembno"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "je po"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "je pred"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr "je označeno"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "je večje"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "je manjše"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "ni"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr "ni označeno"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "Dopisni seznam"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Jedro sporočila"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "Glava sporočila"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:39
 msgid "Play Sound"
 msgstr "Predvajaj zvok"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Beri"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Prejemnik"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "Regularni izraz"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Točke"
 
-#: filter/libfilter-i18n.h:44 mail/mail-callbacks.c:1558
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Nastavi stanje"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Velikost (kB)"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "zveni kot"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "Izvorni račun"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "se začne z"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:53 mail/mail-format.c:933
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
 #: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Zadeva"
@@ -10094,11 +10139,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 +10163,30 @@ 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:101
 msgid "Mail"
 msgstr "Pošta"
 
@@ -10169,23 +10214,74 @@ 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
+#: importers/netscape-importer.c:1865
+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,45 +10305,97 @@ 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/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:101
-msgid "Mail storage folder (internal)"
-msgstr "Mapa v kateri se hrani pošta (notranja)"
+msgid "Folder containing mail"
+msgstr "Mapa, ki vsebuje pošto"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -10257,242 +10405,245 @@ msgstr "Navidezne smeti"
 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:118
 msgid "This folder cannot contain messages."
 msgstr "Ta mapa ne more vsebovati sporočil."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Lastnosti..."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Spremeni lastnosti te mape"
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
-"Nekatere vaše nastavitve pošte se zdijo neveljavne. Prosim, preverite, če je "
-"vse v redu."
+"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:925
+msgid "You have not set a mail transport method"
+msgstr "Niste nastavili postopka prenašanja pošte"
+
+#: mail/component-factory.c:967
 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:967 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Pošlji sporočilo"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:994
 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:1003
 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:1009
 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:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Vzpostavljam povezavo s strežnikom..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser-ui.c:348
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Lastnosti za \"%s\""
 
-#: mail/folder-browser-ui.c:350
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: mail/folder-browser.c:299 mail/mail-display.c:300 mail/mail-display.c:809
+#: mail/folder-browser.c:305 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:760
 #, 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:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d skritih"
 
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr "%d vidnih"
 
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d izbranih"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d neposlanih"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d poslanih"
 
-#: mail/folder-browser.c:775
+#: mail/folder-browser.c:781
 #, 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:1088
+msgid "Create _Virtual Folder From Search..."
+msgstr "Iz iskanja ustvari na_videzno mapo..."
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/folder-browser.c:1453
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/folder-browser.c:1455
+#: mail/folder-browser.c:1590
 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:1591 mail/folder-browser.c:1935
 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:1609 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:1611
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/folder-browser.c:1470 ui/evolution-mail-message.xml.h:123
+#: mail/folder-browser.c:1615 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:1616 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:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:1477
+#: mail/folder-browser.c:1622
 msgid "Follo_w Up..."
 msgstr "Nave_zuj se..."
 
-#: mail/folder-browser.c:1478
+#: mail/folder-browser.c:1623
 msgid "Fla_g Completed"
 msgstr "Postavi zastavico končano"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1624
 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:1628 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:1629
 msgid "Mark as _Unread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/folder-browser.c:1485
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Označi kot po_membno"
 
-#: mail/folder-browser.c:1486
+#: mail/folder-browser.c:1631
 msgid "_Mark as Unimportant"
 msgstr "Označi kot _nepomembno"
 
-#: mail/folder-browser.c:1490
+#: mail/folder-browser.c:1636
+msgid "U_ndelete"
+msgstr "O_dbriši"
+
+#: mail/folder-browser.c:1640
 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:1641 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:1645
+#, fuzzy
+msgid "Label"
+msgstr "oznaka9"
 
-#: mail/folder-browser.c:1497
+#: mail/folder-browser.c:1649
 msgid "Add Sender to Address_book"
 msgstr "Pošiljatelja dodaj v _adresar"
 
-#: mail/folder-browser.c:1500
+#: mail/folder-browser.c:1653
 msgid "Appl_y Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:1502
+#: mail/folder-browser.c:1657
 msgid "Crea_te Rule From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1936
 msgid "VFolder on M_ailing List"
 msgstr "vMapa glede na dopisni seznam"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1938
+#, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1939
+#, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "vMapa glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Privzeto"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Dobivam podatke o mapi"
@@ -10514,26 +10665,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,15 +10687,15 @@ 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"
 
@@ -10569,26 +10713,26 @@ msgstr "Urejevalnik Evolucijinih novic"
 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:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Gostitelj:"
 
-#: 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:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "_Uporabniško ime:"
 
-#: mail/mail-account-gui.c:54 mail/mail-config.glade.h:71
-msgid "Never"
-msgstr "Nikoli"
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "_Pot:"
 
-#: 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
+#: 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 "Naključno"
 
-#: mail/mail-account-gui.c:1109 mail/mail-account-gui.c:1124
-#: mail/mail-accounts.c:904
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
 "Please specify signature filename\n"
 "in Andvanced section of signature settings."
@@ -10596,68 +10740,53 @@ msgstr ""
 "Prosim navedite datoteko s podpisom\n"
 "v naprednem odseku nastavitev podpisa."
 
-#: mail/mail-account-gui.c:1790
+#: mail/mail-account-gui.c:1985
 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:212
 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:216
 msgid "Don't delete"
 msgstr "Ne zbriši"
 
-#: mail/mail-accounts.c:310
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Resnično zbriši račun?"
 
-#: mail/mail-accounts.c:543 mail/mail-accounts.c:547
-msgid "Are you sure you want to delete this news account?"
-msgstr "Ste prepričani, želite zbrisati ta novičarski račun?"
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Izključi"
 
-#. 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:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Vključi"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Pošta za %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "Ste prepričani, želite zbrisati ta novičarski račun?"
 
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Zadeva je %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Vključeno"
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Pošta od %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Ime _računa:"
 
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "%s poštnih seznamov"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Portoriko"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10669,7 +10798,7 @@ msgstr ""
 "ali skladate pošto.\n"
 "Bi ga želeli nastaviti sedaj?"
 
-#: mail/mail-callbacks.c:145
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10677,7 +10806,7 @@ msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10685,12 +10814,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:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10698,11 +10823,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:209
 msgid "Send anyway?"
 msgstr "Vseeno pošlji?"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10710,7 +10835,7 @@ msgstr ""
 "To poročilo nima 'zadeve'.\n"
 "Resnično pošlji?"
 
-#: mail/mail-callbacks.c:325
+#: mail/mail-callbacks.c:295
 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,29 +10843,29 @@ 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:299
 msgid "This message contains only Bcc recipients."
 msgstr "To sporočilo vsebuje le prejemnike bcc"
 
-#: mail/mail-callbacks.c:333
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"Možno je, da poštni strežnik razkrije prejemnike z dodatkom glave Apparenlty-"
-"To(očitno-za).\n"
+"Možno je, da poštni strežnik razkrije prejemnike z dodatkom glave "
+"Apparenlty-To(očitno-za).\n"
 "Vseeno pošlji?"
 
-#: mail/mail-callbacks.c:438
+#: mail/mail-callbacks.c:408
 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:497
 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:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10748,28 +10873,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:977
 msgid "an unknown sender"
 msgstr "neznan pošiljatelj"
 
-#: mail/mail-callbacks.c:983
+#: mail/mail-callbacks.c:981
 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:1433 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:1435 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:2091
 #, 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:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10777,7 +10902,7 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:2149
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10785,28 +10910,32 @@ msgstr ""
 "Znova lahko pošljete le sporočila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:2163
+#: mail/mail-callbacks.c:2169
 #, 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:2195
 msgid "No Message Selected"
 msgstr "Izbrano ni nilo nobeno sporočilo"
 
-#: mail/mail-callbacks.c:2288
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Prepiši datoteko?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/mail-callbacks.c:2290
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Shrani sporočila kot..."
 
-#: mail/mail-callbacks.c:2352
+#: mail/mail-callbacks.c:2366
 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:2373
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -10814,19 +10943,19 @@ msgstr ""
 "V tej mapi ni več novih sporočil.\n"
 "Želite iti v naslednjo mapo?"
 
-#: mail/mail-callbacks.c:2588
+#: mail/mail-callbacks.c:2615
 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 ""
-"To dejanje bo trajno zbrisalo vsa sporočila označena kot zbrisana. Če boste "
-"nadaljevali, ne boste mogli več do teh sporočil. \n"
+"To dejanje bo trajno zbrisalo vsa sporočila označena kot zbrisana. Če "
+"boste nadaljevali, ne boste mogli več do teh sporočil. \n"
 " \n"
 "Resnično zbriši ta sporočila? "
 
-#: mail/mail-callbacks.c:2698
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10835,7 +10964,7 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2710
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtri"
 
@@ -10844,19 +10973,19 @@ msgstr "Filtri"
 msgid "Page %d of %d"
 msgstr "Stran %d od %d"
 
-#: mail/mail-callbacks.c:2835
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:2862
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "ZDA-pismo"
 
-#: mail/mail-callbacks.c:2897
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
-#: mail/mail-callbacks.c:3063
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, 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?"
@@ -10868,8 +10997,8 @@ msgid ""
 "unless you wish to include this information in email you send."
 msgstr ""
 "Prosimo spodaj vpišite svoje ime in e-poštni naslov. Polj \"po želji\" ni "
-"potrebno izpolniti, razen, če ne želite vključiti te podatke v e-pošto, ki "
-"jo boste pošiljali."
+"potrebno izpolniti, razen, če ne želite vključiti te podatke v e-pošto, "
+"ki jo boste pošiljali."
 
 #: mail/mail-config-druid.c:148
 msgid ""
@@ -10877,9 +11006,9 @@ msgid ""
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"Prosim, spodaj vpišite podatke o vašem strežniku dohodne pošte. Če jih ne "
-"veste se obrnite na vašega sistemskega administratorja ali ponudnika dostopa "
-"do interneta."
+"Prosim, spodaj vpišite podatke o vašem strežniku dohodne pošte. Če jih "
+"ne veste se obrnite na vašega sistemskega administratorja ali ponudnika "
+"dostopa do interneta."
 
 #: mail/mail-config-druid.c:150
 msgid "Please select among the following options"
@@ -10891,9 +11020,9 @@ msgid ""
 "sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"Prosim, spodaj vpišite podatke o načinu odpošiljanja pošte. Če jih ne veste "
-"se obrnite na vašega sistemskega administratorja ali ponudnika dostopa do "
-"interneta."
+"Prosim, spodaj vpišite podatke o načinu odpošiljanja pošte. Če jih ne "
+"veste se obrnite na vašega sistemskega administratorja ali ponudnika "
+"dostopa do interneta."
 
 #: mail/mail-config-druid.c:154
 msgid ""
@@ -10907,8 +11036,8 @@ msgid ""
 msgstr ""
 "S procesom nastavljanja pošte ste skoraj pri koncu. Identiteta, strežnik "
 "prihajajoče pošte\n"
-"in način odpošiljanja pošte bodo združene skupaj in tako bo ustvarjen račun "
-"pošte Evolucija. \n"
+"in način odpošiljanja pošte bodo združene skupaj in tako bo ustvarjen "
+"račun pošte Evolucija. \n"
 "Prosim, v prostor spodaj vpišite ime za ta račun. Ime bo uporabljeno le za "
 "prikaz."
 
@@ -10917,12 +11046,31 @@ msgstr ""
 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:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Delam"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Priština"
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
 
-#: mail/mail-config.c:2326
+#. blue
+#: mail/mail-config.c:78 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"
@@ -10933,45 +11081,40 @@ msgstr ""
 "%s\n"
 "Bližnjica ne bo ustvarjena."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2337
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Dohdona pošta"
-
-#: mail/mail-config.c:2587
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Preverjam storitev"
 
-#: mail/mail-config.c:2665 mail/mail-config.c:2669
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: mail/mail-config.c:2860
+#: mail/mail-config.c:2999
 msgid "Unnamed"
 msgstr "Neimenovan"
 
-#: mail/mail-config.c:3035
+#: mail/mail-config.c:3177
 msgid "Cannot execute signature script"
 msgstr "Nisem mogel izvesti skripte podpisa"
 
 #: mail/mail-config.glade.h:1
-msgid "                        "
-msgstr "                        "
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " _Check for supported types "
-msgstr "_Preveri za podprte vrste  "
+#, fuzzy
+msgid " Edit "
+msgstr "Uredi"
 
 #: mail/mail-config.glade.h:3
-msgid " color"
-msgstr " barvo"
+#, fuzzy
+msgid " New "
+msgstr "Nov"
 
 #: mail/mail-config.glade.h:4
-msgid "&lt;&lt; S_imple"
-msgstr "&lt;&lt; _Enostavno"
+msgid " _Check for supported types "
+msgstr "_Preveri za podprte vrste  "
 
 #: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of Evolution)"
@@ -10982,86 +11125,109 @@ 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
 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:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Račun %d"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 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:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Upravljanje z računom"
 
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Napredne možnosti LDAP"
+
 #: mail/mail-config.glade.h:12
-msgid "Accounts"
-msgstr "Računi"
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Afrika/Tunis"
 
 #: mail/mail-config.glade.h:13
-msgid "Ad_vanced &gt;&gt;"
-msgstr "Napredno &gt;&gt;"
+#, 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 "Alerts"
+msgstr "Alberta"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
+#, 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:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Vedno pošlji _slepe kopije (Bcc) na:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 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"
-
 #: 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 "Arabic"
+msgstr "Afrika"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Priloži datoteko k sporočilu"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priloga"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Avtentifikacija"
 
-#: mail/mail-config.glade.h:22
-msgid "Beep when new mail arrives"
-msgstr "Ob prihodu nove pošte zapiskaj"
-
 #: mail/mail-config.glade.h:23
-msgid "Checking for New Mail"
-msgstr "Preverjam za novo pošto"
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "_Samodejno preveri za novo pošto"
 
 #: mail/mail-config.glade.h:24
-msgid "Composer"
-msgstr "Skladatelj"
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
 
 #: mail/mail-config.glade.h:25
-msgid "Composing Messages"
-msgstr "Sestavljanje sporočil"
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
 
 #: mail/mail-config.glade.h:26
-msgid "Configuration"
-msgstr "Nastavitev"
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Neznan nabor znakov: %s"
 
 #: mail/mail-config.glade.h:27
-msgid "Confirm when Expunging a folder"
-msgstr "Potrdi ob uničevanju mape"
+#, fuzzy
+msgid "C_olors"
+msgstr "_Zapri"
 
 #: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
+msgstr "Preverjam za novo pošto"
+
+#: mail/mail-config.glade.h:29
+msgid "Composing Messages"
+msgstr "Sestavljanje sporočil"
+
+#: mail/mail-config.glade.h:30
+msgid "Configuration"
+msgstr "Nastavitev"
+
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11077,305 +11243,353 @@ msgstr ""
 "\n"
 "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Dari"
+msgstr "Pariz"
+
+#: 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:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Privzeta prioriteta:"
 
-#: mail/mail-config.glade.h:36
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, 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:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Sprejemanje pošte"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 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:44
+#, 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:45 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"
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Mapa _osnutkov:"
 
 #: mail/mail-config.glade.h:47
-msgid "Ed_it..."
-msgstr "_Uredi..."
+msgid "E_nable"
+msgstr "_Vključi"
 
 #: mail/mail-config.glade.h:48
-msgid "Edi_t..."
-msgstr "Ur_edi..."
+#, fuzzy
+msgid "E_nable advanced options"
+msgstr "Skrij napredne nastavitve"
 
 #: 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"
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "Ob izhodu _sprazni mapo smeti"
 
 #: mail/mail-config.glade.h:53
-msgid "Get Digital ID..."
-msgstr "Dobi digitalni ID..."
+msgid "Execute Command..."
+msgstr "Izvrši ukaz..."
 
 #: mail/mail-config.glade.h:54
-msgid "Hide advanced settings"
-msgstr "Skrij napredne nastavitve"
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "se konča z"
 
 #: mail/mail-config.glade.h:55
-msgid "IMAPv4 "
-msgstr "IMAPv4 "
+#, fuzzy
+msgid "Font Properties"
+msgstr "Lastnosti računa"
 
-#: 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 "Format messages in _HTML"
+msgstr "Posredovana sporočila"
 
 #: 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"
+msgid "Get Digital ID..."
+msgstr "Dobi digitalni ID..."
 
 #: mail/mail-config.glade.h:58
-msgid "In HTML mail"
-msgstr "V pošti HTML"
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Osvetli citiranja z"
 
 #: mail/mail-config.glade.h:59
-msgid "Include in _random signatures list"
-msgstr "Vključi v seznamu na_ključnih podpisov"
+#, fuzzy
+msgid "Hulu"
+msgstr "Honolulu"
 
 #: 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 "Glava 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:77
 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:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Uredi novičarski strežnik"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Podatki po želji"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organi_zacija:"
+
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _ključa PGP/GPG:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:87
 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:88
+#, 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:89
 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:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Natisni izbrane stike"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Poštni imenik Qmail"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Ne morem dobiti sporočila"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:95
+#, fuzzy
+msgid "Randomized"
+msgstr "Naključno"
+
+#: 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
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+msgstr "Varnost"
+
+#: mail/mail-config.glade.h:104
 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:97
+#: mail/mail-config.glade.h:105
 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:106
+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:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:100
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "Izberi datoteko PGP"
 
-#: mail/mail-config.glade.h:101 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Pošiljam e-pošto"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Datoteka s podpisom:"
 
-#: mail/mail-config.glade.h:102
-msgid "Sending Mail"
-msgstr "Pošiljanje pošte"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Nisem mogel izvesti skripte podpisa"
 
-#: 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:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "Pošiljam e-pošto"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Mapa _poslanih sporočil:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Poslana sporočila in osnutki"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "St_režnik zahteva avtentifikacijo"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Nastavitev strežnika"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:119
 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:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Bližnjice"
 
-#: mail/mail-config.glade.h:111
-msgid "Signatures"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
 msgstr "Podpisi"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:123
 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:124
+#, fuzzy
+msgid "Specify _filename:"
 msgstr "Navedite ime datoteke:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 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:119
+#: mail/mail-config.glade.h:128
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11383,11 +11597,17 @@ msgstr ""
 "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:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "za ta podpis uporabi _HTML"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Spremenljivo"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11397,146 +11617,217 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "vzhod"
+
+#: mail/mail-config.glade.h:140
 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:141
 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:142
 msgid "_Authentication Type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:143
 msgid "_Authentication type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:145
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "Ob prihodu nove pošte zapiskaj"
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "ID _certifikata:"
 
-#: mail/mail-config.glade.h:134
-msgid "_Drafts folder:"
-msgstr "Mapa _osnutkov:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
+#, 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:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Privzeto"
 
-#: mail/mail-config.glade.h:137
-msgid "_Empty trash folders on exit"
-msgstr "Ob izhodu _sprazni mapo smeti"
+#: mail/mail-config.glade.h:151
+#, fuzzy
+msgid "_Do not notify me when new mail arrives"
+msgstr "Ob prihodu nove pošte me ne obvesti"
 
-#: mail/mail-config.glade.h:138
-msgid "_Filename"
+#: mail/mail-config.glade.h:153
+msgid "_Enable spell checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:154
+#, fuzzy
+msgid "_Filename:"
 msgstr "_Ime datoteke:"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Posreduj naprej kot"
+
+#: mail/mail-config.glade.h:157
 msgid "_Full name:"
 msgstr "_Polno ime:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "V pošti HTML"
+
+#: mail/mail-config.glade.h:160
 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 "_Identity"
+msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:142
-msgid "_Host:"
-msgstr "_Gostitelj:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Jezik"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:164
 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:165
+#, 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:166
+#, 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:167
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:168
 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:169
 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:171
+#, 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:172
+#, 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:173
+#, 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:174
+#, fuzzy
+msgid "_Random"
+msgstr "Naključno"
+
+#: 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:155
-msgid "_Server type: "
-msgstr "Vrsta _strežnika: "
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Pošiljanje pošte"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Kaži čas kot"
+
+#: 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 "_Text Signature:"
+msgstr "Besedilo _podpisa:"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:184
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "Uporabi _varno povezavo (SSL)"
+
+#: mail/mail-config.glade.h:185
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Spremenljivo"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_vsakih"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " barvo"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:190
 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."
@@ -11573,152 +11864,137 @@ msgstr "Nisem mogel ustvariti konteksta ovojnice S/MIME."
 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:1832
 msgid "Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:1725
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/mail-display.c:1728
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:1731
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Shrani sliko kot..."
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "priloga %s"
 
-#: mail/mail-format.c:693
+#: mail/mail-format.c:647
 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:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:868
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Slab naslov"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:6
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:920 mail/message-list.etspec.h:13
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Za"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:930
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1785
-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:1816
-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
-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:915
+#, fuzzy
+msgid "Mailer"
+msgstr "Pošta"
 
-#: mail/mail-format.c:2067
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:2081
+#: mail/mail-format.c:2120
 #, 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:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:2115
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Kazalec na oddaljen podatek (%s)"
 
-#: mail/mail-format.c:2123
+#: mail/mail-format.c:2162
 #, 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:2167
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Prenastavljam mapo"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11727,27 +12003,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:762
 #, 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:814
 #, 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:1279
 #, 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:1294
 #, 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:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11755,11 +12031,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:1405
 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:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Znova nastavi /%s"
@@ -11786,117 +12062,112 @@ 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:837
 msgid "Saving message to folder"
 msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporočila v %s"
 
-#: mail/mail-ops.c:941
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:1054
+#: mail/mail-ops.c:1057
 #, 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:1240
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1280
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1352
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1421
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1515
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1566
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Osvežujem mapo"
 
-#: mail/mail-ops.c:1602
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Prenašam %d sporočil"
 
-#: mail/mail-ops.c:1804
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Shranjujem %d sporočil"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11905,7 +12176,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11914,11 +12185,11 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11927,27 +12198,27 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znova se povezujem z %s"
 
-#: mail/mail-ops.c:2234
+#: mail/mail-ops.c:2237
 #, 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 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "I_skanje"
 
@@ -11983,42 +12254,42 @@ 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
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Preklicano."
 
@@ -12035,24 +12306,41 @@ 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:79
+#, 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:172
+#, fuzzy
+msgid "Save signature"
+msgstr "Podpisi"
 
-#: mail/mail-tools.c:256
+#: mail/mail-signature-editor.c:178
+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:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "Datoteka s podpisom:"
+
+#: 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"
 
@@ -12079,10 +12367,6 @@ msgstr ""
 "    '%s'\n"
 "in so bile posodobljene."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "vMape"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "vMape"
@@ -12100,92 +12384,92 @@ msgstr "Poskus ureditve vmape '%s', ki ne obstaja."
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(brez zadeve)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - sporočilo"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "več nevidenih sporočil"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Več sporočil"
 
-#: mail/message-list.c:646
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "najnižja"
 
-#: mail/message-list.c:647
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "najvišja"
 
-#: mail/message-list.c:957
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:964
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:973
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %l:%M %p"
 
-#: mail/message-list.c:985
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:995
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2362
+#: mail/message-list.c:2396
 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
 msgid "Received"
 msgstr "Sprejeto"
 
@@ -12193,6 +12477,52 @@ msgstr "Sprejeto"
 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 "Pojdi 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 +12544,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 +12588,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 ""
@@ -22051,14 +22410,10 @@ msgstr ""
 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,44 +22434,50 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Brez opisa"
 
-#: my-evolution/e-summary-mail.c:120
+#: my-evolution/e-summary-mail.c:151
 msgid "Mail summary"
 msgstr "Povzetek poš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 "vMape"
+
+#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
+#: my-evolution/e-summary-mail.c:761
+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:92
 #: 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:471
 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:492
 msgid "Quotes of the Day"
 msgstr "Citati dneva"
 
-#: my-evolution/e-summary-preferences.c:735
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Dodaj vir novic"
 
-#: my-evolution/e-summary-preferences.c:743
+#: my-evolution/e-summary-preferences.c:728
 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
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Ime:"
 
-#: my-evolution/e-summary-preferences.c:1225
-msgid "Summary Settings"
-msgstr "Nastavitev povzetka"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "Napaka ob prenašanju RDF"
@@ -22125,6 +22486,27 @@ msgstr "Napaka ob prenašanju RDF"
 msgid "News Feed"
 msgstr "Viri novic"
 
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
+msgstr ""
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "Dodaj >>"
+
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr "<< odstrani"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Plohe"
+
 #: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Brez nalog"
@@ -22145,19 +22527,19 @@ 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"
 
@@ -22165,38 +22547,6 @@ msgstr "Tiskanje povzetka ni uspelo"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponenta povzetka ni mogla inicializirati Bonoba.\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 "vozlov"
-
-#: 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 "milje"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilometrov"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Jasno"
@@ -23429,18 +23779,24 @@ msgstr "_Načrtuj"
 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 default folders."
+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 "Default Folders"
+msgstr "Izberi mapo"
 
-#: 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 default folders"
+msgstr ""
+
 #: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Kaži podrobnosti"
@@ -23449,24 +23805,11 @@ msgstr "Kaži podrobnosti"
 msgid "Cancel Operation"
 msgstr "Prekliči operacijo"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Dohodna pošta"
-
-#: shell/e-local-storage.c:176
-msgid "Outbox"
-msgstr "Odhodna pošta"
-
-#: shell/e-local-storage.c:1022
-msgid "Local Folders"
-msgstr "Krajevne mape"
-
-#: 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 +23817,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 +23837,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 +23847,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 +23858,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -23526,7 +23869,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 +23880,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 +23891,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 +23905,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"
@@ -23578,13 +23921,14 @@ msgid "Brought to you by"
 msgstr "K vam prinešeno od"
 
 #: 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."
@@ -23645,16 +23989,16 @@ msgstr ""
 "Nisem mogel preimenovati mape:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-commands.c:549
 #, 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:556
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: shell/e-shell-folder-commands.c:569
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23880,52 +24224,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:168
 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:176
 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:218
 msgid "About Ximian Evolution"
 msgstr "_O Ximianovi Evoluciji..."
 
-#: shell/e-shell-view-menu.c:432
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view-menu.c:433
+#: shell/e-shell-view-menu.c:445
 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:565
 msgid "Create a new shortcut"
 msgstr "Ustvari novo bližnjico"
 
-#: shell/e-shell-view-menu.c:554
+#: shell/e-shell-view-menu.c:566
 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:732
 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:745 ui/evolution.xml.h:57
 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:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
@@ -23933,38 +24268,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:169
+#, 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:764
 #, 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:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23975,19 +24322,23 @@ 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:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "V redu"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Neveljavni argumenti"
 
-#: shell/e-shell.c:1939
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Ne morem se registrirati pri OAF"
 
-#: shell/e-shell.c:1941
+#: shell/e-shell.c:2139
 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:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Generična napaka"
 
@@ -24112,64 +24463,63 @@ 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-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Dohodna pošta"
+
+#: 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"
 
@@ -24179,10 +24529,13 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% končano)"
 
+#: shell/evolution-folder-selector-button.c:84
+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 +24573,67 @@ msgstr ""
 "Napaka iz aktivacijskega sistema je:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "Napaka CORBA"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Prekinjen"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Neveljaven argument"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Že ima lastnika"
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Brez lastnika"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Ni bil(a) najden(a)"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Nepodprta vrsta"
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Nepodprta shema"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Nepodprto dejanje"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Notranja napaka"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Obstaja"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Neveljaven URI"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Ima podmape"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Ni več prostora"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Star lastnik je umru"
 
-#: shell/evolution-test-component.c:44
+#: shell/evolution-test-component.c:47
 msgid "Test type"
 msgstr "Preveri vrsto"
 
@@ -24407,40 +24760,40 @@ 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:89
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: shell/main.c:94
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolucije se sedaj zapira..."
 
-#: shell/main.c:223
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne morem dostopati do lupine Ximian Evolucije."
 
-#: shell/main.c:232
+#: shell/main.c:236
 #, 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:317
 msgid "Disable splash screen"
 msgstr "Izključi začetni zaslon"
 
-#: shell/main.c:303
+#: shell/main.c:318
 msgid "Start in offline mode"
 msgstr "Začni v ne-mrežnem načinu"
 
-#: shell/main.c:304
+#: shell/main.c:319
 msgid "Start in online mode"
 msgstr "Začni v mrežnem načinu"
 
-#: shell/main.c:305
+#: shell/main.c:320
 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:338
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -24449,7 +24802,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:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
@@ -24476,7 +24829,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 +24845,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 +24853,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-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:18
+#: 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
 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
@@ -24766,15 +25049,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 +25077,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:40
 msgid "_File"
 msgstr "_Datoteka"
 
@@ -24879,6 +25162,10 @@ msgstr "Načrtuj sestanek za ta predmet"
 msgid "Customise My Evolution"
 msgstr "Prikroji Mojo Evolucijo"
 
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Prekliči"
+
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Prekliči trenutno operacijo pošte"
@@ -24888,74 +25175,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 "_Nastavive 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 +25315,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:41
 msgid "_Folder"
 msgstr "_Mapa"
 
@@ -25105,423 +25372,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:55
 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 +25726,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:36
 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:56
 msgid "_View"
 msgstr "Po_gled"
 
@@ -25581,6 +25775,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 +25918,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:44
 msgid "_Help"
 msgstr "_Pomoč"
 
@@ -25780,46 +25974,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..."
@@ -25885,113 +26071,118 @@ msgid "Open this folder in an other window"
 msgstr "Odpri to mapo v drugem oknu"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Oddaja / sprejem"
+
+#: ui/evolution.xml.h:22
+#, 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:23
 msgid "Show information about Ximian Evolution"
 msgstr "Kaži podatke o Ximian Evoluciji"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "_Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 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:27
 msgid "Toggle"
 msgstr "Preklopi"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bližnjicami"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Preklopi delo z mrežo"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Poglej izbrane mape"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "_Pogosto zastavljena vprašanja"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "_O Ximian Evoluciji..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Kopiraj..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "_Vrstica map"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Uvozi..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Prestavi..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Nova"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Nova mapa"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_Nastavive pilota..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Oddaja / sprejem"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Bližnjica"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 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"
@@ -26056,8 +26247,8 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"Uporabite lev miškin gumb za povečavo območja zemljevida in izbiro časovnega "
-"pasu.\n"
+"Uporabite lev miškin gumb za povečavo območja zemljevida in izbiro "
+"časovnega pasu.\n"
 " Uporabite desni miškin gumb za pomanjšavo."
 
 #: widgets/menus/gal-view-menus.c:268
@@ -26165,20 +26356,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 +26377,30 @@ 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:96 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Uredi..."
+#: widgets/misc/e-filter-bar.h:97
+msgid "_Save Search..."
+msgstr "_Shrani iskanje..."
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Kaži vse"
+#: widgets/misc/e-filter-bar.h:98
+msgid "_Edit Saved Searches..."
+msgstr "_Uredi shranjena iskanja..."
 
 #: 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 +26414,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:477
+msgid "_Find Now"
+msgstr "_Išči sedaj"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Počisti"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Počisti"
 
-#: widgets/misc/e-search-bar.c:468
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Išči sedaj"
 
@@ -26257,12 +26453,872 @@ 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 "Other Contacts"
+#~ msgstr "Drugo stiki"
+
+#~ msgid "(none)"
+#~ msgstr "(brez)"
+
+#~ msgid "C_ontaining:"
+#~ msgstr "_Vsebujejo:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Kaži stike, ki ustrezajo naslednjim kriterijem:"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Ste prepričani, \n"
+#~ "da želite zbrisati ta stik?"
+
+#~ msgid "Starting:"
+#~ msgstr "Pričetek ob:"
+
+#~ msgid "Ending:"
+#~ msgstr "Konec ob:"
+
+#~ 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 "_Other"
+#~ msgstr "_Drugo"
+
+#~ msgid "Click here to add an attendee"
+#~ msgstr "Kliknite tu za dodajo udeleženca"
+
+#~ 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 "_Zbriši to opravilo"
+
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "Čas pričetka sestanka: <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "Čas pričetka opravila: <b>"
+
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Podatki o zasedenosti se pričnejo: <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Pričetek: <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Čas zaključka sestanka: <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Podatki o zasedenosti se končajo: <b>"
+
+#~ msgid "Ends: <b>"
+#~ msgstr "Konec: <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Opravilo končano: <b>"
+
+#~ msgid "Task Due: <b>"
+#~ msgstr "Rok opravila: <b>"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "Podatki o iKoledarju"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "Napaka iKoledarja"
+
+#~ msgid "An unknown person"
+#~ msgstr "neznana oseba"
+
+#~ msgid ""
+#~ "<br> Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr ""
+#~ "<br> Prosimo, preglejte sledeče podatke in izberite dejanje iz spodnjega "
+#~ "menuja."
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Nič</i>"
+
+#~ msgid "Status:"
+#~ msgstr "Stanje:"
+
+#~ msgid "Tentatively Accepted"
+#~ msgstr "Poskusno sprejeto"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Izberi dejanje:"
+
+#~ msgid "Update"
+#~ msgstr "Posodobi"
+
+#~ msgid "Accept"
+#~ msgstr "Sprejmi"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Poskusno sprejmi"
+
+#~ msgid "Decline"
+#~ msgstr "Odbij"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Pošlji podatek o zasedenosti"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Osveži stanje respondenta"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Pošlji zadnje podatke"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> je izdal(a) podatke o sestanku."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Podatki o sestanku"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> zahteva vašo prisotnost na sestanku."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Predlog sestanka"
+
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ msgstr "<b>%s</b> vas želi dodati k obstoječem sestanku."
+
+#~ msgid "Meeting Update"
+#~ msgstr "Posodobitev sestanka"
+
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ msgstr "<b>%s</b> želi dobiti najnovejše podatke o sestanku."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Zahtevek za posodobitev sestanka"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b> je odgovoril(a) na zahtevek po sestanku."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Odgovor na sestanek"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> je preklical(a) sestanek."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Preklic sestanka"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> je poslal(a) nerazumljivo sporočilo."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Nerazumljivo sporočilo o sestanku"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> je objavil(a) podatke o nalogi."
+
+#~ msgid "Task Information"
+#~ msgstr "Podatki o nalogi"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> zahteva, da opravite nalogo."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Predlog naloge"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> vas želi dodati k obstoječi nalogi."
+
+#~ msgid "Task Update"
+#~ msgstr "Posodobitev naloge"
+
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "<b>%s</b> želi dobiti najnovejše podatke o nalogi."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Zahtevek za posodobitev naloge"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b> je odgovoril(a) na dodelitev naloge."
+
+#~ msgid "Task Reply"
+#~ msgstr "Odgovor na nalogo"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> je preklical(a) nalogo."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Preklic naloge"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Nerazumljivo sporočilo o nalogi"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> je objavil(a) podatke o zasedenosti."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Podatek o zasedenosti"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> zahteva vaše podatke o zasedenosti."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Zahtevek po podatkih o zasedenosti"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "<b>%s</b> je odgovoril(a) na zahtevek po podatkih o zasedenosti."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Odgovor zasedenosti"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Nerazumljivo sporočilo o zasedenosti"
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Zdi se, da sporočilo ni pravilno oblikovano"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "To sporočilo vsebuje le nepodprte zahtevke."
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "Priloga ne vsebuje veljavnega sporočila koledarja"
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "Priloga nima gledljivih predmetov koledarja"
+
+#~ 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 "Event information"
+#~ msgstr "Podatki o dogodku"
+
+#~ msgid "Task information"
+#~ msgstr "Podatki o nalogi"
+
+#~ msgid "Journal information"
+#~ msgstr "Podatki o dnevniku"
+
+#~ msgid "Free/Busy information"
+#~ msgstr "Podatki o zasedenosti"
+
+#~ msgid "Calendar information"
+#~ msgstr "Podatki o kodledarju"
+
+#~ msgid "Updated"
+#~ msgstr "Posodobljen"
+
+#~ msgid "Refresh"
+#~ msgstr "Osveži"
+
+#~ msgid "Counter-proposal"
+#~ msgstr "Proti-predlog"
+
+#~ msgid "Task"
+#~ msgstr "Naloga"
+
+#~ msgid "Status: %s"
+#~ msgstr "Stanje: %s"
+
+#~ msgid "Percent Complete: %i"
+#~ msgstr "Procentov opravljeno: %i"
+
+#~ msgid "URL: %s"
+#~ msgstr "URL: %s"
+
+#~ msgid "Categories: %s"
+#~ msgstr "Kategorije: %s"
+
+#~ msgid "Contacts: "
+#~ msgstr "Stiki: "
+
+#~ msgid "Invalid type in body-contains, expecting string"
+#~ msgstr "Neveljaven tip v body-contains, pričakovan niz"
+
+#~ 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 "Failed to decrypt: Unknown"
+#~ msgstr "Nisem uspel dešifirati: vzrok neznan"
+
+#~ 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 "Default"
+#~ msgstr "Privzeto"
+
+#~ msgid "Indexing:"
+#~ msgstr "Ustvarjanje kazala:"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "Vrsta poštnega predala"
+
+#~ msgid " (default)"
+#~ msgstr " (privzeto)"
+
+#~ msgid "Mail Settings"
+#~ msgstr "Nastavitev pošte"
+
+#~ msgid "Subject is %s"
+#~ msgstr "Zadeva je %s"
+
+#~ msgid "Mail from %s"
+#~ msgstr "Pošta od %s"
+
+#~ msgid "%s mailing list"
+#~ msgstr "%s poštnih seznamov"
+
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: Dohdona pošta"
+
+#~ 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 "Add new signature"
+#~ msgstr "Dodaj nov podpis"
+
+#~ 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 "Drafts"
+#~ msgstr "Osnutki"
+
+#~ 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 "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 "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 "Sent"
+#~ msgstr "Poslano"
+
+#~ msgid "Show advanced settings"
+#~ msgstr "Kaži napredne nastavitve"
+
+#~ msgid "Sources"
+#~ msgstr "Viri"
+
+#~ msgid "_Edit..."
+#~ msgstr "_Uredi..."
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "Evolucija ne pozna te vrste podpisa sporočila"
+
+#~ 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."
+
+#~ 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."
+
+#~ 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 " F"
+#~ msgstr " F"
+
+#~ msgid " C"
+#~ msgstr " C"
+
+#~ msgid "knots"
+#~ msgstr "vozlov"
+
+#~ msgid "kph"
+#~ msgstr "km/h"
+
+#~ msgid "inHg"
+#~ msgstr "inHg"
+
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
+
+#~ msgid "miles"
+#~ msgstr "milje"
+
+#~ msgid "kilometers"
+#~ msgstr "kilometrov"
+
+#~ msgid "Factory for the Evolution notes component."
+#~ msgstr "Tovarna komponent Evolucije zaznamkov."
+
+#~ msgid "Factory for the Notes control"
+#~ msgstr "Tovarna za kontrolo zaznamkov"
+
+#~ msgid "Outbox"
+#~ msgstr "Odhodna pošta"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nisem mogel prenesti mape:\n"
+#~ "%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 "_Nastavive 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,24 +27340,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 "
 
@@ -26554,9 +27595,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."
 
@@ -26570,8 +27608,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Nisem uspel prenesti sporočila s strežnika 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 ""
 #~ "To se bo povezalo s strežnikom POP in uporabilo Kerbos 4 za ustrezno "
 #~ "avtentifikacijo."
@@ -26619,9 +27656,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Regions"
 #~ msgstr "Območja"
 
-#~ msgid " _Remove"
-#~ msgstr " _Odstrani"
-
 #~ msgid "Al_l stations:"
 #~ msgstr "Vse _postaje:"
 
@@ -26646,9 +27680,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 +27689,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"
 
@@ -26762,9 +27790,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 +27799,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "USA"
 #~ msgstr "ZDA"
 
-#~ msgid "123"
-#~ msgstr "123"
-
 #~ msgid "a"
 #~ msgstr "a"
 
@@ -26895,11 +27917,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Podaljšek spanja"
 
 #~ 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 ""
-#~ "Ura je %s. Trenutni Unix čas je %ld. Mislili smo, da bi vas lahko "
-#~ "zanimalo."
+#~ "Ura je %s. Trenutni Unix čas je %ld. Mislili smo, da bi vas lahko zanimalo."
 
 #~ msgid "%d"
 #~ msgstr "%d"
@@ -26988,9 +28009,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Nisem mogel odpreti mape za izdelavo povzetka %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 ""
 #~ "Za povezovanje s strežniki POP. Protokol POP se lahko uporabi tudi za "
 #~ "prenašanje pošte iz nekaterih spletnih nuditeljev pošte in zaprtih "
@@ -27008,9 +28028,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Add"
 #~ msgstr "Dodaj"
 
-#~ msgid "Edit"
-#~ msgstr "Uredi"
-
 #~ msgid "Elm mail"
 #~ msgstr "Poštni program Elm"
 
@@ -27073,8 +28090,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
 #~ msgid "Please click \"OK\" to install the Evolution user files under"
 #~ msgstr ""
-#~ "Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabniških "
-#~ "datotek pod"
+#~ "Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabniških datotek "
+#~ "pod"
 
 #~ msgid "Delete folder '%s'"
 #~ msgstr "Zbriši mapo '%s'"
@@ -27235,9 +28252,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Authentication:"
 #~ msgstr "Avtentifikacija:"
 
-#~ msgid "Advanced LDAP Options"
-#~ msgstr "Napredne možnosti LDAP"
-
 #~ msgid "FIXME Path Help text here"
 #~ msgstr "FIXME Path help text here"
 
@@ -27245,8 +28259,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Če pot ne obstaja jo ustvari."
 
 #~ 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 ""
 #~ "Izberite vrsto adresarja, ki ga imate in vnestite potrebne podatke o njem."
 
@@ -27292,9 +28306,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"
 
@@ -27392,11 +28403,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Posredovano sporočilo (brez navedene zadeve)"
 
 #~ 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 ""
-#~ "-----Posredovano sporočilo-----<br><b>Od:</b> %s<br><b>Za:</b> %"
-#~ "s<br><b>Predmet:</b> %s<br>"
+#~ "-----Posredovano sporočilo-----<br><b>Od:</b> %s<br><b>Za:</b> "
+#~ "%s<br><b>Predmet:</b> %s<br>"
 
 #~ msgid "Getting store for \"%s\""
 #~ msgstr "Dobivam shrambo za \"%s\""
@@ -27703,9 +28714,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 +28876,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"
 
@@ -27969,8 +28974,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "ČISTO"
 
 #~ 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 ""
 #~ "Ta možnost narekuje povezavo s strežnikom z uporabo ČISTEGA SASL "
 #~ "mehanizma,če strežnik to podpira."
@@ -27985,14 +28990,15 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Številka vrat v URL '%s' ni numerična"
 
 #~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
-#~ msgstr "Za branje in hranjenje pošte na IMAP strežnikih preko povezave SSL."
+#~ msgstr ""
+#~ "Za branje in hranjenje pošte na IMAP strežnikih preko povezave SSL."
 
 #~ msgid "Secure POP"
 #~ msgstr "Varni 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 ""
 #~ "Za povezovanje s strežniki POP preko povezave SSL. Protokol POP se lahko "
@@ -28000,11 +29006,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "in zaprtih sistemov e-pošte."
 
 #~ 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 ""
-#~ "Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z "
-#~ "uporabo SMTP preko povezave SSL.\n"
+#~ "Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z uporabo "
+#~ "SMTP preko povezave SSL.\n"
 
 #~ msgid ""
 #~ "One or more of your servers are not configured correctly.\n"
@@ -28025,9 +29031,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 +29093,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 +29128,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 +29143,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"
 
@@ -28205,9 +29199,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 +29504,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Find..."
 #~ msgstr "_Poišči..."
 
-#~ msgid "_Object"
-#~ msgstr "_Predmet"
-
 #~ msgid "_Redo"
 #~ msgstr "Obnovi"
 
@@ -28592,9 +29580,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "External Directories"
 #~ msgstr "Zunanji imeniki"
 
-#~ msgid "Port Number:"
-#~ msgstr "Številka vrat:"
-
 #~ msgid "Headings:"
 #~ msgstr "Zaglavja:"
 
@@ -28626,11 +29611,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "However, the appointment will recur at the appropriate time and will be "
 #~ "displayed properly in the calendar views."
 #~ msgstr ""
-#~ "Ta sestanek ima pravila ponovitev po meri, ki ne morejo biti urejana "
-#~ "znotraj Evolucije.\n"
+#~ "Ta sestanek ima pravila ponovitev po meri, ki ne morejo biti urejana znotraj "
+#~ "Evolucije.\n"
 #~ "\n"
-#~ "Vendar se bo sestanek ponovil pravočasno in bo  pravilno prikazan v "
-#~ "pogledu koledarja."
+#~ "Vendar se bo sestanek ponovil pravočasno in bo  pravilno prikazan v pogledu "
+#~ "koledarja."
 
 #~ msgid "sept"
 #~ msgstr "sept"
@@ -28659,15 +29644,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"
 
@@ -28744,12 +29723,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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"
 
@@ -28763,8 +29736,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
 #~ msgstr ""
-#~ "Za branje pošte dostavljene na krajevni sistem in za shranjevanje pošte "
-#~ "na krajevni disk."
+#~ "Za branje pošte dostavljene na krajevni sistem in za shranjevanje pošte na "
+#~ "krajevni disk."
 
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr "Nisem mogel preimenovati mape %s v %s: cilj že obstaja"
@@ -28789,9 +29762,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Nimate nastavljenih izvorov pošte"
 
 #~ 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 ""
 #~ "Vnesite svoje ime in e-poštni naslov, ki naj se uporablja v izhodni pošti "
 #~ "Po želji lahko vnesete tudi ime vaše organizacije in ime datoteke iz "
@@ -28804,11 +29777,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Vrsta izvora pošte:"
 
 #~ 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 ""
 #~ "Izberite vrsto poštnega strežnika, ki ga uporabljate, in nastavite zanj  "
 #~ "potrebne podatke.\n"
@@ -28817,11 +29790,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "podprte vrste...\" potem, ko boste vnesli ostale podatke."
 
 #~ 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 ""
 #~ "Izberite vrsto poštnega strežnika, ki ga uporabljate, in nastavite zanj  "
 #~ "potrebne podatke.\n"
@@ -28838,9 +29811,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!"
 
@@ -28907,8 +29877,7 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Posreduj sporočilo \"%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 ""
 #~ "Nisem uspel generirati mime dela iz sporočila med generiranjem "
 #~ "posredovanega sporočila."
@@ -28955,9 +29924,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 +29957,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 +29975,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 +30160,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Bcc: >>"
 #~ msgstr "Bcc: >>"
 
-#~ msgid "label9"
-#~ msgstr "oznaka9"
-
 #~ msgid "label7"
 #~ msgstr "oznaka7"
 
@@ -29243,12 +30200,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "label2"
 #~ msgstr "label2"
 
-#~ msgid "Add >>"
-#~ msgstr "Dodaj >>"
-
-#~ msgid "<< Remove"
-#~ msgstr "<< odstrani"
-
 #~ msgid "Discard this message?"
 #~ msgstr "Zavrzi to sporočilo"
 
diff --git a/po/sv.po b/po/sv.po
index 8c50870f96..1a37cac738 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.150 2002/03/31 23:19:10 menthos Exp $
+# $Id: sv.po,v 1.151 2002/05/08 13:37:12 jpr Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-04-01 00:08+0200\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -36,7 +36,7 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importerar VCard-filer till Evolution."
 
 #: 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 "Arkivera som"
 
@@ -46,7 +46,7 @@ msgid "Name"
 msgstr "Namn"
 
 #: 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-post"
 
@@ -62,7 +62,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/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -102,7 +102,7 @@ msgid "Home"
 msgstr "Hem"
 
 #: 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 "Organisation"
 
@@ -124,7 +124,7 @@ 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/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Företagsfax"
 
@@ -134,7 +134,7 @@ msgstr "För.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/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax hem"
 
@@ -154,7 +154,7 @@ msgstr "Hem 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/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -162,55 +162,54 @@ msgstr "ISDN"
 #: 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:112
 msgid "Other"
 msgstr "Annat"
 
 #: 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/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/widgets/e-addressbook-view.c:353
+#: 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/widgets/e-addressbook-view.c:354
+#: 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/widgets/e-addressbook-view.c:355
+#: 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: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/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/widgets/e-addressbook-view.c:359
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-post 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 "Webbsida"
 
@@ -219,7 +218,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 "Avdelning"
 
@@ -228,7 +227,7 @@ msgid "Dep"
 msgstr "Avd"
 
 #: 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 "Kontor"
 
@@ -237,12 +236,12 @@ msgid "Off"
 msgstr "Kont"
 
 #: 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 "Titel"
 
 #: 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 "Yrke"
 
@@ -251,7 +250,7 @@ msgid "Prof"
 msgstr "Yrke"
 
 #: 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 "Manager"
 
@@ -264,7 +263,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: 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 "Smeknamn"
 
@@ -273,12 +272,12 @@ msgid "Nick"
 msgstr "Smek"
 
 #: 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"
 
 #: 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 "Notering"
 
@@ -291,7 +290,7 @@ msgid "CALUri"
 msgstr "KALUri"
 
 #: 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 "Ledig/Upptagen-URL"
 
@@ -325,11 +324,11 @@ msgstr "Efternamn"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Flera VCard"
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard för %s"
@@ -350,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:2738
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Söker..."
 
@@ -363,31 +362,31 @@ msgstr "Läser in..."
 msgid "Error in search expression."
 msgstr "Fel i sökuttryck."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1129
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Lägger till kort till LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1232
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Tar bort kort från LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1468
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Modifierar kort från LDAP-servern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2592
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
 msgid "Restarting search."
 msgstr "Startar om sökningen."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2684
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Mottar LDAP-sökresultat..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2765
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
 msgid "Error performing search"
 msgstr "Fel vid sökning"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2789
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
 msgid "Could not parse query string"
 msgstr "Kunde inte tolka frågesträng"
 
@@ -429,301 +428,120 @@ msgid "A Bonobo control for displaying an address."
 msgstr "En Bonobo-kontroll för att visa en adress."
 
 #: 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 "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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Kontroll som visar ett Evolution-adressboksvisitkort."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Directory Servers"
 msgstr "Katalogservrar"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Visare för Evolution-adressboksvisitkort"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Evolutionkomponent för att hantera kontakter."
 
-#: 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 Minicard control"
 msgstr "Fabrik för kontrollen för adressboksvisitkort"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Fabrik för adressbokens adressvisare"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the Addressbook's address popup"
 msgstr "Fabrik för adressbokens adress-popup"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the configuration control for the Evolution Addressbook."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#, 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:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik för adressbokstestkontrollen"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid ""
-"This page can be used to configure access to directory servers using the "
-"LDAP protocol"
+#: 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/addressbook-component.c:71
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#, 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
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Mapp som innehåller kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "LDAP-server som innehåller kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:560
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:560
-#: ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Ny kontaktlista"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Contact _List"
 msgstr "Kontakt_lista"
 
-#: addressbook/gui/component/addressbook-config.c:238
-msgid "Edit Addressbook"
-msgstr "Redigera adressbok"
-
-#: 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 "A_utentisera med server genom att använda:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Kontonamn"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Lägg till adressbok"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Addressbook Sources"
-msgstr "Adressbokskällor"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Avancerat"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Bas"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Grundläggande"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr "Kontrollera detta om servern kräver autentisering."
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "De_lete"
-msgstr "_Ta bort"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr "Distinguished name (DN)"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "E-postadress"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-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"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-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"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr "En"
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "_Utgångspunkt för sökning:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
-msgstr "Sök_omfattning: "
-
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Servernamn"
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
-msgstr "Pren"
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-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.  "
-
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "Denna information krävs inte för de flesta ldap-servrar. "
-
-#: 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 ""
-"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."
-
-#: 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 ""
-"Detta är basnoden för alla dina sökningar på ldap-servern. Kontakta din "
-"serveradministratör för mer information."
-
-#: 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 ""
-"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/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."
-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."
-
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Detta är namnet på servern där din adressbok finns."
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "Detta är porten som din ldap-server använder."
-
-#: 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 ""
-"Detta namn kommer att användas för att identifiera ditt konto. Det används "
-"endast för visning."
-
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "_Kontonamn:"
-
-#: 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:179
-msgid "_Add"
-msgstr "_Lägg till"
-
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr "_Distinguished name:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr "_Hämtningsgräns"
-
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:189
-#: ui/evolution-addressbook.xml.h:37 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 "_Redigera"
-
-#: addressbook/gui/component/addressbook-config.glade.h:35
-msgid "_Email address:"
-msgstr "_E-postadress:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Port:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "_Servernamn:"
-
-#: addressbook/gui/component/addressbook-factory.c:70
+#: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
 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:519
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Kan inte öppna adressboken"
 
-#: addressbook/gui/component/addressbook.c:528
+#: 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"
@@ -733,7 +551,7 @@ msgstr ""
 "att du har angett en felaktig URI eller att LDAP-servern är\n"
 "onåbar"
 
-#: addressbook/gui/component/addressbook.c:533
+#: 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"
@@ -745,7 +563,7 @@ msgstr ""
 "programmet från CVS-källkod efter det att du har hämtat\n"
 "OpenLDAP från länken nedan.\n"
 
-#: addressbook/gui/component/addressbook.c:541
+#: 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."
@@ -753,54 +571,45 @@ 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:649
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ange lösenord för %s (användare %s)"
 
-#: addressbook/gui/component/addressbook.c:825
+#: addressbook/gui/component/addressbook.c:769
 msgid "Name begins with"
 msgstr "Namn börjar med"
 
-#: addressbook/gui/component/addressbook.c:826
+#: addressbook/gui/component/addressbook.c:770
 msgid "Email is"
 msgstr "E-post är"
 
-#: addressbook/gui/component/addressbook.c:827
+#: addressbook/gui/component/addressbook.c:771
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori är"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:828
+#: addressbook/gui/component/addressbook.c:772
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
-#: addressbook/gui/component/addressbook.c:829 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
 msgid "Advanced..."
 msgstr "Avancerat..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1057
+#: addressbook/gui/component/addressbook.c:1001
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Alla kategorier"
 
-#: addressbook/gui/component/addressbook.c:1139
+#: addressbook/gui/component/addressbook.c:1083
 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
@@ -849,6 +658,638 @@ 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 "
+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
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "Adressbokskällor"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Albany"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonym"
+
+#: 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 "Ansluter till server..."
+
+#: 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 "Ingen information"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "_Ta bort"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "_Distinguished name:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "E-postadress:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+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 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"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "S_ök"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Allmänt"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+#, fuzzy
+msgid "LDAP Attribute"
+msgstr "LDAP-autentisering"
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Konfiguration"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Marginaler"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_var"
+
+#: 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 "_Objekt"
+
+#: 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 "En"
+
+#: 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 " (standard)"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr " (standard)"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "Sök_omfattning: "
+
+#. 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 "Söker"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Markera allt"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Borttagen"
+
+#: 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 "Källinformation"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Ansluter till server..."
+
+#: 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 "Pip vid alarmvisning"
+
+#: addressbook/gui/component/ldap-config.glade.h:69
+msgid "Sub"
+msgstr "Pren"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Lagra sökning som vMapp"
+
+#: 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 ""
+"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 ""
+"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 ""
+"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
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"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."
+
+#: 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 "Distinguished name (DN)"
+
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+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
+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:139
+msgid "_Add"
+msgstr "_Lägg till"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "Lägg till ->"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Lägg till åtgärd"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Lägg till åtgärd"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Albany"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Ta bort alla"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Visning"
+
+#: addressbook/gui/component/ldap-config.glade.h:111
+#, fuzzy
+msgid "_Distinguished Name (DN):"
+msgstr "Distinguished name (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 "_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
+#: 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 "_Redigera"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Redigera möte"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution-alarm"
+
+#: 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 "_Alternativ"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "Portnummer:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr " (standard)"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "_Utgångspunkt för sökning:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Servernamn:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Slumringstid (minuter)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Konto %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "kontaktlisteredigerare"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Inga kort"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Ansluter igen till %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 "Allmänt"
+
+#: 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 "Söker"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolutions adressboks namnvalsgränssnitt."
@@ -858,7 +1299,7 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fabrik för adressbokens namnvalsgränssnitt"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:852
+#: 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
 msgid "Remove"
@@ -889,7 +1330,12 @@ msgstr "(%d visas inte)"
 msgid "Unnamed Contact"
 msgstr "Namnlös kontakt:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:603
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Sök efter en kontakt"
+
+#: 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"
@@ -900,12 +1346,14 @@ 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:611
+#: 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"
@@ -916,31 +1364,40 @@ msgstr ""
 "Normalt bör detta aldrig inträffa. Du kan behöva avsluta\n"
 "och starta om Evolution för att åtgärda detta problem."
 
-#: addressbook/gui/component/select-names/e-select-names.c:693
+#: addressbook/gui/component/select-names/e-select-names.c:806
 msgid "Select Contacts from Addressbook"
 msgstr "Välj kontakter från adressboken"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "_Innehåller:"
+msgid "Select Names"
+msgstr "Markera namn"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "S_ök"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Ta bort kontakten?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Markera namn"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Heta kontakter"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Visa kontakter som matchar följande villkor:"
+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 "_Flytta..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Mapp:"
 
@@ -1001,11 +1458,6 @@ msgstr "Arkivera so_m:"
 msgid "Full _Name..."
 msgstr "Fullständigt _namn..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: mail/mail-config.glade.h:74
-msgid "General"
-msgstr "Allmänt"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1050,12 +1502,11 @@ 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:707
-#: calendar/gui/e-calendar-table.c:1001 calendar/gui/e-day-view.c:3609
-#: filter/filter.glade.h:8 mail/folder-browser.c:1629
-#: mail/mail-config.glade.h:187 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: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
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -2106,14 +2557,6 @@ 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?"
 
@@ -2147,7 +2590,7 @@ msgid "Edit Full"
 msgstr "Redigera fullständigt namn"
 
 #: 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 "Fullständigt namn"
 
@@ -2362,99 +2805,23 @@ msgstr "Avancerad sökning"
 msgid "Search"
 msgstr "Sök"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:136
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Inga kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:139
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:369
+#: addressbook/gui/widgets/e-addressbook-model.c:370
 msgid "Error getting book view"
 msgstr "Fel vid hämtande av bokvy"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: 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 "Spara som VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:313
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Öppna"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:1017
-#: ui/evolution-addressbook.xml.h:13
-msgid "Forward Contact"
-msgstr "Vidarebefordra kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1018
-msgid "Send Message to Contact"
-msgstr "Skicka meddelande till kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:317
-#: 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:65
-#: ui/my-evolution.xml.h:1
-msgid "Print"
-msgstr "Skriv ut"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:319
-#: addressbook/gui/widgets/e-addressbook-view.c:1021
-msgid "Print Envelope"
-msgstr "Skriv ut kuvert"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-msgid "Copy to folder..."
-msgstr "Kopiera till mapp..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:324
-#: addressbook/gui/widgets/e-addressbook-view.c:1026
-msgid "Move to folder..."
-msgstr "Flytta till mapp..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
-#: addressbook/gui/widgets/e-addressbook-view.c:1029
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: 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:2
-msgid "Copy"
-msgstr "Kopiera"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1031
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:9
-msgid "Paste"
-msgstr "Klistra in"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:330
-#: addressbook/gui/widgets/e-addressbook-view.c:1032
-#: filter/libfilter-i18n.h:10 mail/mail-accounts.c:213
-#: 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-table-adapter.c:140
 #: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
@@ -2462,14 +2829,15 @@ msgid "Error modifying card"
 msgstr "Fel vid ändring av kort"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1042
+#: shell/evolution-shell-component.c:1043
 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 shell/e-shell.c:1990
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1079
+#: 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
 msgid "Unknown error"
 msgstr "Okänt fel"
 
@@ -2478,7 +2846,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:1070
+#: shell/evolution-shell-component.c:1071
 msgid "Permission denied"
 msgstr "Åtkomst nekas"
 
@@ -2496,9 +2864,9 @@ 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
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2276
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: 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
 msgid "Cancelled"
 msgstr "Avbruten"
 
@@ -2530,7 +2898,7 @@ 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:1436
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Fel vid borttagning av kort"
 
@@ -2552,86 +2920,186 @@ 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:342
+#: addressbook/gui/widgets/e-addressbook-util.c:344
 msgid "Move card to"
 msgstr "Flytta kort till"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:346
 msgid "Copy card to"
 msgstr "Kopiera kort till"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Move cards to"
 msgstr "Flytta kort till"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:351
 msgid "Copy cards to"
 msgstr "Kopiera kort till"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:331
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Klicka här för att lägga till en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Primär telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Sekreterartelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Arbetstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Tillbakaringningstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Företagets telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Hemtelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Företagsadress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Hemadress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Företagstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Hemtelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:351
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Annan telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Spara som VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Ny kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Ny kontaktlista"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Gå till mapp..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Importera..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Sök efter kontakter"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Adressbokskällor..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Pilotinställningar..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Vidarebefordra kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Skicka meddelande till kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Skriv ut kuvert"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Copy to folder..."
+msgstr "Kopiera till mapp..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Move to folder..."
+msgstr "Flytta till mapp..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: 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
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Aktuell vy"
+
+#. 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:940
 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,å,ä,ö"
 
@@ -2639,7 +3107,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:585
+#: addressbook/gui/widgets/e-addressbook-view.c:945
 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,å,ä,ö"
 
@@ -2656,7 +3124,7 @@ msgstr "och ett annat kort."
 msgid "Save in addressbook"
 msgstr "Spara i adressboken"
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
@@ -2670,7 +3138,7 @@ msgstr ""
 "\n"
 "Dubbelklicka här för att skapa en ny kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
+#: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
 "\n"
 "\n"
@@ -2875,29 +3343,25 @@ msgstr "_Typsnitt..."
 msgid "Untitled appointment"
 msgstr "Namnlöst möte"
 
-#: 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:416 mail/message-list.c:684
+#: 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
 msgid "High"
 msgstr "Hög"
 
-#: 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:417 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
-#: 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:418 mail/message-list.c:682
+#: 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
 msgid "Low"
 msgstr "Låg"
 
 #. 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:419
 msgid "Undefined"
 msgstr "Odefinierad"
 
@@ -2984,22 +3448,10 @@ 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
-msgid "Evolution Alarm"
-msgstr "Evolution-alarm"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3039,7 +3491,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:2583
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varning"
@@ -3089,7 +3541,7 @@ msgstr "Beskrivningen innehåller"
 msgid "Comment contains"
 msgstr "Kommentaren innehåller"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1118
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "Omatchade"
 
@@ -3100,7 +3552,7 @@ 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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1421 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3118,27 +3570,25 @@ msgstr "%d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1468
+#: 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:775
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 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:395
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:396
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:394
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Publikt"
 
@@ -3159,32 +3609,27 @@ msgid "W"
 msgstr "V"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:468
 msgid "Free"
 msgstr "Ledig"
 
-#: 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:1064
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:489 calendar/gui/print.c:2267
 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:490 calendar/gui/print.c:2270
 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-calendar-table.c:491 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2273
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Färdigt"
 
@@ -3200,11 +3645,10 @@ 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:1591
-#: mail/mail-account-gui.c:1035 mail/mail-account-gui.c:1036
-#: mail/mail-account-gui.c:1621 mail/mail-accounts.c:426
-#: mail/mail-accounts.c:435 mail/mail-config.glade.h:110
-#: mail/message-tag-followup.c:62
+#: 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
 #: 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
@@ -3221,21 +3665,13 @@ 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/e-meeting-model.c:821
 msgid "Yes"
 msgstr "Ja"
 
 #: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
 msgid "No"
 msgstr "Nej"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1695
-#: calendar/gui/e-week-view.c:1206
-msgid "Searching"
-msgstr "Söker"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Dagsvy"
@@ -3252,8 +3688,8 @@ msgstr "Veckovy"
 msgid "Month View"
 msgstr "Månadsvy"
 
-#: calendar/gui/component-factory.c:67 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3261,11 +3697,10 @@ msgstr "Kalender"
 msgid "Folder containing appointments and events"
 msgstr "Mapp som innehåller möten och evenemang"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/print.c:1754
-#: calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
-#: 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
+#: 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
 msgid "Tasks"
 msgstr "Uppgifter"
@@ -3274,47 +3709,52 @@ msgstr "Uppgifter"
 msgid "Folder containing to-do items"
 msgstr "Mapp som innehåller att-göra-objekt"
 
-#: calendar/gui/component-factory.c:690
+#: calendar/gui/component-factory.c:695
 msgid "New meeting"
 msgstr "Nytt möte"
 
-#: calendar/gui/component-factory.c:690
+#: calendar/gui/component-factory.c:695
 msgid "_Meeting"
 msgstr "_Möte"
 
-#: calendar/gui/component-factory.c:694
+#: calendar/gui/component-factory.c:699
 msgid "New task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/component-factory.c:694
+#: calendar/gui/component-factory.c:699
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: calendar/gui/component-factory.c:698
+#: calendar/gui/component-factory.c:703
 msgid "New All Day Appointment"
 msgstr "Nytt heldagsmöte"
 
-#: calendar/gui/component-factory.c:698
+#: calendar/gui/component-factory.c:703
 msgid "All _Day Appointment"
 msgstr "Hel_dagsmöte"
 
-#: calendar/gui/component-factory.c:702
+#: calendar/gui/component-factory.c:707
 msgid "New appointment"
 msgstr "Nytt möte"
 
-#: calendar/gui/component-factory.c:702
+#: calendar/gui/component-factory.c:707
 msgid "_Appointment"
 msgstr "_Möte"
 
-#: calendar/gui/control-factory.c:103
+#: calendar/gui/control-factory.c:123
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Kunde inte öppna mappen i \"%s\""
 
-#: calendar/gui/control-factory.c:130
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URI:n som kalendern kommer att visa"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "Ändra vyn till %s"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Alternativ för ljudalarm"
@@ -3380,9 +3820,7 @@ msgstr "extra gånger var"
 msgid "hours"
 msgstr "timme"
 
-#: 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"
 
@@ -3510,7 +3948,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.c:758 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
@@ -3539,7 +3977,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:221
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr "minut(er)"
 
@@ -3580,170 +4018,168 @@ 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
-msgid "Create new appointments with a default _reminder"
-msgstr "_Skapa nya möten med en standardpåminnelse"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "dag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "F_örsta dagen i veckan:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "timme"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "måndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Uppgi_fter som skulle ha utförts:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "lördag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-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:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "Visa v_eckonummer i datumbläddraren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_sö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:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "söndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "U_ppgifter som ska ha utförts idag:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "to_r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "t_is"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "U_ppgifter som ska ha utförts idag:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "_Uppgiftslista"
 
-#: 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 "torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Tid"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Tids_zon:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "_Tidsdivisioner:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: 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 "tisdag"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Arbetsvecka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12-timmars (FM/EM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24-timmars"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 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:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "T_ryck ihop helger i månadsvyn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Visning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: 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:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "Allm_änt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "_Dölj färdiga uppgifter efter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_mån"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Annat"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Uppgi_fter som skulle ha utförts:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_lör"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "_Uppgiftslista"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "_Tidsdivisioner:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "innan starten på mötet"
 
@@ -3802,30 +4238,31 @@ 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
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har inte gjort några ändringar, uppdatera redigeraren?"
 
-#: 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 " till "
 
-#: 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 " (Färdigt "
 
-#: 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 "Färdigt "
 
-#: 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 " (Ska utföras "
 
-#: 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 "Ska utföras "
 
@@ -3857,8 +4294,8 @@ msgid "No summary"
 msgstr "Ingen sammanfattning"
 
 #: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3801
-#: calendar/gui/e-week-view.c:3707 composer/e-msg-composer.c:956
+#: 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
 msgid "Save as..."
 msgstr "Spara som..."
 
@@ -3920,7 +4357,7 @@ msgstr "Delegera till:"
 msgid "Enter Delegate"
 msgstr "Ange delegerad person"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2224
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Möte"
 
@@ -3987,7 +4424,7 @@ msgid "Pu_blic"
 msgstr "Pu_blikt"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Visa tid som"
 
@@ -4032,55 +4469,49 @@ msgstr "Deltagare"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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 "Common Name"
 msgstr "Vanligt namn"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegerad från"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegerad till"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Språk"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Medlem"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:853
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "OSA"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Roll"
 
-#: 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
+#: 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"
 msgstr "Status"
 
-#: 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:168
+#: 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
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -4103,27 +4534,98 @@ msgstr "Bjud _in andra..."
 msgid "_Other Organizer"
 msgstr "_Annan organisatör"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:a"
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "2:a"
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "3:e"
+
+#: 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 ":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:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "vid"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+msgid "first"
+msgstr "första"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "sekund"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "den"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Nord"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "lista"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Annan fax"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr ":e"
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr "förekomster"
 
@@ -4218,7 +4720,7 @@ msgid "Progress"
 msgstr "Förlopp"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:766
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4230,15 +4732,19 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+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
 msgid "Assignment"
 msgstr "Tilldelning"
 
-#: 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.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:55
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Beskrivning:"
 
@@ -4250,132 +4756,76 @@ msgstr "Sta_rtdatum:"
 msgid "_Due Date:"
 msgstr "Förfallo_datum:"
 
-#: calendar/gui/e-calendar-table.c:438
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:439
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:440
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:441
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:442
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:443
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:444
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:445
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:446
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:447
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:448
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2744
-#: calendar/gui/e-week-view.c:1846
+#: calendar/gui/e-calendar-table.c:751 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:3583
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1602
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:40
+#: 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
 msgid "_Open"
 msgstr "_Öppna"
 
-#: calendar/gui/e-calendar-table.c:974
+#: calendar/gui/e-calendar-table.c:973
 msgid "_Save as..."
 msgstr "_Spara som..."
 
-#: calendar/gui/e-calendar-table.c:976 calendar/gui/e-day-view.c:3587
-#: calendar/gui/e-week-view.c:3442 calendar/gui/e-week-view.c:3475
-#: ui/evolution-addressbook.xml.h:42 ui/evolution-calendar.xml.h:30
+#: calendar/gui/e-calendar-table.c:974 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 "Skriv _ut..."
 
-#: calendar/gui/e-calendar-table.c:981 calendar/gui/e-day-view.c:3593
-#: calendar/gui/e-week-view.c:3481 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:978 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:983 calendar/gui/e-day-view.c:3595
-#: calendar/gui/e-week-view.c:3483 ui/evolution-addressbook.xml.h:35
+#: calendar/gui/e-calendar-table.c:979 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:985 calendar/gui/e-day-view.c:3559
-#: calendar/gui/e-day-view.c:3597 calendar/gui/e-week-view.c:3447
-#: calendar/gui/e-week-view.c:3485 ui/evolution-addressbook.xml.h:41
+#: calendar/gui/e-calendar-table.c:980 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 "Klistra _in"
 
-#: calendar/gui/e-calendar-table.c:990
+#: calendar/gui/e-calendar-table.c:984
 msgid "_Assign Task"
 msgstr "_Tilldela uppgift"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:985
 msgid "_Forward as iCalendar"
 msgstr "_Vidarebefordra som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:994
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Markera som färdig"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:987
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markera markerade uppgifter som färdiga"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7366
-#: calendar/gui/e-week-view.c:4155
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Uppdaterar objekt"
 
-#: calendar/gui/e-calendar-table.c:1354
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Klicka för att lägga till en uppgift"
 
@@ -4383,48 +4833,47 @@ msgstr "Klicka för att lägga till en uppgift"
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1055
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Färdigt"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Färdigdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Förfallodatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Slutdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Geografisk position"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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:16
-#: my-evolution/component-factory.c:48 shell/e-shell.c:661
-#: shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Sammanfattning"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Sortera efter uppgift"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4458,442 +4907,169 @@ msgstr "%02i minutdivisioner"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1407
-#: 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:1434
+#: 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:632 calendar/gui/e-week-view.c:368
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
 msgid "am"
 msgstr "fm"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:371
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-day-view.c:3543
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "Nytt m_öte"
 
-#: calendar/gui/e-day-view.c:3545 calendar/gui/e-week-view.c:3433
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsarrangemang"
 
-#: calendar/gui/e-day-view.c:3547 calendar/gui/e-week-view.c:3435
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 msgid "New Meeting"
 msgstr "Nytt möte"
 
-#: calendar/gui/e-day-view.c:3549 calendar/gui/e-week-view.c:3437
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
 msgid "New Task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/e-day-view.c:3554 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: calendar/gui/e-day-view.c:3564 calendar/gui/e-week-view.c:3452
+#: 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 "Gå till _idag"
 
-#: calendar/gui/e-day-view.c:3566 calendar/gui/e-week-view.c:3454
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 msgid "_Go to Date..."
 msgstr "_Gå till datum..."
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
+#: 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 "_Publicera ledig-/upptageninformation"
 
-#: calendar/gui/e-day-view.c:3576 calendar/gui/e-week-view.c:3464
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
 #: ui/evolution.xml.h:37
 msgid "_Configure..."
 msgstr "_Konfigurera..."
 
-#: calendar/gui/e-day-view.c:3585 calendar/gui/e-week-view.c:3473
-#: mail/folder-browser.c:1604 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: calendar/gui/e-day-view.c:3602 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 msgid "_Schedule Meeting..."
 msgstr "_Boka möte..."
 
-#: calendar/gui/e-day-view.c:3604 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 msgid "_Forward as iCalendar..."
 msgstr "_Vidarebefordra som iCalendar..."
 
-#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3499
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "Gör denna förekomst _flyttbar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3501
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3503
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
-#: calendar/gui/e-itip-control.c:545
-msgid "Meeting begins: <b>"
-msgstr "Mötet börjar: <b>"
-
-#: calendar/gui/e-itip-control.c:550
-msgid "Task begins: <b>"
-msgstr "Uppgiften börjar: <b>"
-
-#: calendar/gui/e-itip-control.c:555
-msgid "Free/Busy info begins: <b>"
-msgstr "Ledig-/upptageninformation börjar: <b>"
-
-#: calendar/gui/e-itip-control.c:559
-msgid "Begins: <b>"
-msgstr "Börjar: <b>"
-
-#: calendar/gui/e-itip-control.c:571
-msgid "Meeting ends: <b>"
-msgstr "Mötet slutar: <b>"
-
-#: calendar/gui/e-itip-control.c:574
-msgid "Free/Busy info ends: <b>"
-msgstr "Ledig-/upptageninformation slutar: <b>"
-
-#: calendar/gui/e-itip-control.c:578
-msgid "Ends: <b>"
-msgstr "Slutar: <b>"
-
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Completed: <b>"
-msgstr "Uppgiften färdig: <b>"
-
-#: calendar/gui/e-itip-control.c:602
-msgid "Task Due: <b>"
-msgstr "Uppgiften ska vara utförd: <b>"
-
-#: calendar/gui/e-itip-control.c:639 calendar/gui/e-itip-control.c:688
-msgid "iCalendar Information"
-msgstr "iCalendar-information"
-
-#. Title
-#: calendar/gui/e-itip-control.c:654
-msgid "iCalendar Error"
-msgstr "iCalendar-fel"
-
-#: calendar/gui/e-itip-control.c:719 calendar/gui/e-itip-control.c:735
-msgid "An unknown person"
-msgstr "En okänd person"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:742
-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:758
-msgid "<i>None</i>"
-msgstr "<i>Ingen</i>"
-
-#: calendar/gui/e-itip-control.c:770
-msgid "Status:"
-msgstr "Status:"
-
-#: 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
-msgid "Accepted"
-msgstr "Godtaget"
-
-#: calendar/gui/e-itip-control.c:779 calendar/gui/itip-utils.c:326
-msgid "Tentatively Accepted"
-msgstr "Preliminärt godtaget"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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-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
-msgid "Declined"
-msgstr "Avböjt"
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
+#, c-format
+msgid "Error executing %s."
+msgstr "Fel vid körning av %s."
 
-#: 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
+#: 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
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:318
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
 #: 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: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
-msgid "Choose an action:"
-msgstr "Välj en åtgärd:"
-
-#: calendar/gui/e-itip-control.c:834
-msgid "Update"
-msgstr "Uppdatera"
-
-#: 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:1980 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:850
-msgid "Accept"
-msgstr "Acceptera"
-
-#: calendar/gui/e-itip-control.c:851
-msgid "Tentatively accept"
-msgstr "Acceptera preliminärt"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Decline"
-msgstr "Neka"
-
-#: calendar/gui/e-itip-control.c:866
-msgid "Send Free/Busy Information"
-msgstr "Skicka ledig-/upptageninformation"
-
-#: calendar/gui/e-itip-control.c:879
-msgid "Update respondent status"
-msgstr "Uppdatera svarandestatus"
-
-#: calendar/gui/e-itip-control.c:892
-msgid "Send Latest Information"
-msgstr "Skicka senaste information"
-
-#: calendar/gui/e-itip-control.c:905 calendar/gui/itip-utils.c:343
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: calendar/gui/e-itip-control.c:953
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> har publicerat mötesinformation."
-
-#: calendar/gui/e-itip-control.c:954
-msgid "Meeting Information"
-msgstr "Mötesinformation"
-
-#: calendar/gui/e-itip-control.c:958
-#, 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:959
-msgid "Meeting Proposal"
-msgstr "Mötesförslag"
-
-#: calendar/gui/e-itip-control.c:963
-#, 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:964
-msgid "Meeting Update"
-msgstr "Mötesuppdatering"
-
-#: calendar/gui/e-itip-control.c:968
-#, 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:969
-msgid "Meeting Update Request"
-msgstr "Begäran av mötesuppdatering"
-
-#: calendar/gui/e-itip-control.c:992
-#, 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:993
-msgid "Meeting Reply"
-msgstr "Mötessvar"
-
-#: calendar/gui/e-itip-control.c:997
-#, 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:998
-msgid "Meeting Cancellation"
-msgstr "Mötesavbokning"
-
-#: calendar/gui/e-itip-control.c:1002 calendar/gui/e-itip-control.c:1073
-#: calendar/gui/e-itip-control.c:1108
-#, 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:1003
-msgid "Bad Meeting Message"
-msgstr "Felaktigt mötesmeddelande"
-
-#: calendar/gui/e-itip-control.c:1023
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> har publicerat mötesinformation."
-
-#: calendar/gui/e-itip-control.c:1024
-msgid "Task Information"
-msgstr "Uppgiftsinformation"
-
-#: calendar/gui/e-itip-control.c:1028
-#, 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:1029
-msgid "Task Proposal"
-msgstr "Uppgiftsförslag"
-
-#: calendar/gui/e-itip-control.c:1033
-#, 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:1034
-msgid "Task Update"
-msgstr "Uppgiftsuppdatering"
-
-#: calendar/gui/e-itip-control.c:1038
-#, 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:1039
-msgid "Task Update Request"
-msgstr "Begäran om uppgiftsuppdatering"
-
-#: calendar/gui/e-itip-control.c:1063
-#, 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:1064
-msgid "Task Reply"
-msgstr "Uppgiftssvar"
-
-#: calendar/gui/e-itip-control.c:1068
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> har avbokat en uppgift."
-
-#: calendar/gui/e-itip-control.c:1069
-msgid "Task Cancellation"
-msgstr "Uppgiftsavbokning"
-
-#: calendar/gui/e-itip-control.c:1074
-msgid "Bad Task Message"
-msgstr "Felaktigt uppgiftsmeddelande"
-
-#: calendar/gui/e-itip-control.c:1093
-#, 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:1094
-msgid "Free/Busy Information"
-msgstr "Ledig-/upptageninformation"
-
-#: calendar/gui/e-itip-control.c:1098
-#, 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:1099
-msgid "Free/Busy Request"
-msgstr "Ledig-/Upptagenbegäran"
-
-#: calendar/gui/e-itip-control.c:1103
-#, 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:1104
-msgid "Free/Busy Reply"
-msgstr "Ledig-/Upptagensvar"
-
-#: calendar/gui/e-itip-control.c:1109
-msgid "Bad Free/Busy Message"
-msgstr "Felaktigt ledig-/upptagenmeddelande"
-
-#: calendar/gui/e-itip-control.c:1182
-msgid "The message does not appear to be properly formed"
-msgstr "Meddelandet verkar inte vara korrekt utformat"
-
-#: calendar/gui/e-itip-control.c:1201
-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:1229 calendar/gui/e-itip-control.c:1235
-msgid "The attachment does not contain a valid calendar message"
-msgstr "Bilagan innehåller inte ett giltigt kalendermeddelande"
-
-#: calendar/gui/e-itip-control.c:1260
-msgid "The attachment has no viewable calendar items"
-msgstr "Bilagan har inga visningsbara kalenderobjekt"
-
-#: calendar/gui/e-itip-control.c:1338
-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"
-
-#: calendar/gui/e-itip-control.c:1369
+#: 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:1371
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Uppdateringen färdig\n"
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 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:1424
+#: 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:1426
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Närvarandestatus är uppdaterad\n"
 
-#: calendar/gui/e-itip-control.c:1428
-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:1456
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Borttagning färdig"
 
-#: calendar/gui/e-itip-control.c:1486 calendar/gui/e-itip-control.c:1536
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Objektet skickat!\n"
 
-#: calendar/gui/e-itip-control.c:1488 calendar/gui/e-itip-control.c:1540
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Objektet kunde inte skickas!\n"
 
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Välj mapp"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Välj mapp"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4948,57 +5124,58 @@ 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:789
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Person"
 
 #: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
 msgid "Group"
 msgstr "Grupp"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
 msgid "Resource"
 msgstr "Resurs"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
 msgid "Room"
 msgstr "Rum"
 
 #: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
 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:806
+#: calendar/gui/e-meeting-model.c:535
 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:807
 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:808
 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:834
+#: calendar/gui/e-meeting-model.c:543
 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-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:434
 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:838
 msgid "Delegated"
 msgstr "Delegerat"
 
@@ -5103,29 +5280,39 @@ 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:654
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Färdigdatum"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Tar bort markerade objekt"
+
+#: calendar/gui/e-tasks.c:659
 msgid "Expunging"
 msgstr "Utplånar"
 
-#: calendar/gui/e-week-view.c:3431
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: calendar/gui/e-week-view.c:3497
+#: calendar/gui/e-week-view.c:3489
 msgid "_Delete this Appointment"
 msgstr "_Ta bort detta möte"
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunde inte öppna mappen i \"%s\""
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1879
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Öppnar kalender i %s"
@@ -5194,38 +5381,6 @@ msgstr "Åtminstone en närvarande person krävs"
 msgid "An organizer must be set."
 msgstr "En organisatör måste vara angiven."
 
-#: calendar/gui/itip-utils.c:295
-msgid "Event information"
-msgstr "Evenemangsinformation"
-
-#: calendar/gui/itip-utils.c:297
-msgid "Task information"
-msgstr "Uppgiftsinformation"
-
-#: calendar/gui/itip-utils.c:299
-msgid "Journal information"
-msgstr "Journalinformation"
-
-#: calendar/gui/itip-utils.c:301
-msgid "Free/Busy information"
-msgstr "Ledig-/upptageninformation"
-
-#: calendar/gui/itip-utils.c:303
-msgid "Calendar information"
-msgstr "Kalenderinformation"
-
-#: calendar/gui/itip-utils.c:339
-msgid "Updated"
-msgstr "Uppdaterat"
-
-#: calendar/gui/itip-utils.c:347
-msgid "Refresh"
-msgstr "Uppdatera"
-
-#: calendar/gui/itip-utils.c:351
-msgid "Counter-proposal"
-msgstr "Motförslag"
-
 #: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Du måste vara närvarande på detta evenemang."
@@ -5387,87 +5542,54 @@ msgid "Sa"
 msgstr "Lö"
 
 #. Day
-#: calendar/gui/print.c:1840
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Markerad dag (%a %d %b %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 "Markerad vecka (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1885
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Markerad månad (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Markerat år (%Y)"
 
-#: calendar/gui/print.c:2226
-msgid "Task"
-msgstr "Uppgift"
-
-#: calendar/gui/print.c:2283
-#, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
-
-#: calendar/gui/print.c:2301
-#, c-format
-msgid "Priority: %s"
-msgstr "Prioritet: %s"
-
-#: calendar/gui/print.c:2315
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Procent klar: %i"
-
-#: calendar/gui/print.c:2327
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2341
-#, c-format
-msgid "Categories: %s"
-msgstr "Kategorier: %s"
-
-#: calendar/gui/print.c:2352
-msgid "Contacts: "
-msgstr "Kontakter: "
-
-#: calendar/gui/print.c:2407
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:2498 calendar/gui/print.c:2590
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2862
-#: my-evolution/e-summary.c:604 ui/evolution-addressbook.xml.h:20
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
-#: calendar/gui/print.c:2527
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Skriv ut objekt"
 
-#: calendar/gui/print.c:2608
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Skrivarinställningar"
 
@@ -5494,8 +5616,8 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa uppgifter?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2358
-#: mail/mail-callbacks.c:2597
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "Fråga mig inte igen."
 
@@ -5529,8 +5651,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
@@ -5557,10 +5679,6 @@ 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"
@@ -5577,108 +5695,108 @@ msgstr ""
 msgid "Gnome Calendar"
 msgstr "Gnome-kalendern"
 
-#: calendar/pcs/query.c:246
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now förväntar sig 0 argument"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time förväntar sig 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 förväntar sig att argument 1 är en sträng"
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "argument 1 till make-time måste vara en datum-/tidssträng enligt ISO 8601"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day förväntar sig 2 argument"
 
-#: 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 förväntar sig att argument 1 är en 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 förväntar sig att argument 2 är ett heltal"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin förväntar sig 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 förväntar sig att argument 1 är en time_t"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end förväntar sig 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 förväntar sig att argument 1 är en time_t"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype förväntar sig 0 argument"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? förväntar sig 2 argument"
 
-#: 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? förväntar sig att argument 1 är en 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? förväntar sig att argument 2 är en time_t"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? förväntar sig 2 argument"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? förväntar sig att argument 1 är en sträng"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? förväntar sig att argument 2 är en sträng"
 
-#: calendar/pcs/query.c:691
+#: calendar/pcs/query.c:693
 msgid ""
-"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 "
+"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\""
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? förväntar sig minst 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)"
 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:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? förväntar sig 0 argument"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? förväntar sig 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? förväntar sig att argument 1 är en time_t"
 
@@ -7219,11 +7337,11 @@ msgstr "Kryptering stöds inte av detta chiffer"
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering stöds inte av detta chiffer"
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 msgid "Unable to create cache path"
 msgstr "Kan inte skapa cachesökväg"
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:441
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kunde inte ta bort cacheposten: %s: %s"
@@ -7262,12 +7380,12 @@ 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:1198
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, 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:1204
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fel vid körning av filter: %s: %s"
@@ -7281,7 +7399,6 @@ msgid "Unable to process spool folder"
 msgstr "Kan inte bearbeta spool-mappen"
 
 #: camel/camel-filter-driver.c:911
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Hämtar meddelande %d (%d%%)"
 
@@ -7294,16 +7411,16 @@ msgstr "Kan inte öppna meddelande"
 msgid "Failed on message %d"
 msgstr "Misslyckades med meddelande %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1050
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Synkroniserar mapp"
 
-#: camel/camel-filter-driver.c:1017
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Hämtar meddelande %d av %d"
 
-#: camel/camel-filter-driver.c:1032
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Misslyckades vid meddelande %d av %d"
@@ -7339,27 +7456,27 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(matcha-alla) kräver ett ensamt booleskt resultat"
 
-#: camel/camel-folder-search.c:649
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Utför fråga på okänt huvud: %s"
 
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, 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:1040
+#: camel/camel-folder.c:1038
 #, 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:1080
+#: camel/camel-folder.c:1078
 #, 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:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Flyttar meddelanden"
 
@@ -7392,7 +7509,8 @@ 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
@@ -7468,130 +7586,87 @@ msgstr "Ange din %s-lösenordsfras för %s"
 msgid "Please enter your %s passphrase"
 msgstr "Ange din %s-lösenordsfras"
 
-#: camel/camel-pgp-context.c:622
+#: 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:629 camel/camel-pgp-context.c:803
+#: 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:635 camel/camel-pgp-context.c:809
+#: 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 inte signera detta meddelande: kunde inte skapa rör till GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:796
+#: 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:988
+#: 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:994
+#: 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:1005
+#: 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"
+msgstr ""
+"Kan inte verifiera detta meddelande: kunde inte skapa temporär fil: %s"
 
-#: camel/camel-pgp-context.c:1178
+#: 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:1188
+#: 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:1195
+#: 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:1204
+#: 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:1373
+#: 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:1381
+#: 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:1388
+#: 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-pgp-mime.c:332
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "Detta är en digitalt signerad meddelandedel"
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Ange ditt lösenord för %s"
-
-#: camel/camel-pkcs7-context.c:213
-msgid "Error hashing password."
-msgstr "Fel vid hashning av lösenord."
-
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr "Ogiltigt lösenord."
-
-#: camel/camel-pkcs7-context.c:329
-#, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Kunde inte signera: certifikat hittades inte för \"%s\"."
-
-#: camel/camel-pkcs7-context.c:378
-#, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Kunde inte klartextsignera: certifikat hittades inte för \"%s\"."
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "Kunde inte kryptera: misslyckades med att skapa kuvertdata."
-
-#: camel/camel-pkcs7-context.c:590
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "Kunde inte kryptera: misslyckades med att skapa krypteringssammanhang."
-
-#: camel/camel-pkcs7-context.c:620
-#, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Kunde inte kryptera data: ogiltig användarnyckel: \"%s\"."
-
-#: camel/camel-pkcs7-context.c:626
-msgid "Could not encrypt: encoding failed."
-msgstr "Kunde inte kryptera: kodning misslyckades."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr "Misslyckades med att dekryptera: Okänd"
-
-#: 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 "Kunde inte läsa in %s: Modulinläsning stöds inte på detta system."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunde inte läsa in %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 "Kunde inte läsa in %s: Ingen initieringskod i modulen."
@@ -7620,14 +7695,14 @@ msgstr "Kunde inte ansluta till %s (port %d): %s"
 msgid "(unknown host)"
 msgstr "(okänd värd)"
 
-#: camel/camel-remote-store.c:348 camel/camel-remote-store.c:410
-#: camel/camel-remote-store.c:471
+#: 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:474
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7682,8 +7757,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"
@@ -7694,8 +7769,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"
@@ -7728,8 +7803,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
@@ -7741,7 +7816,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar från servern."
 
@@ -7752,7 +7827,8 @@ 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."
@@ -7771,8 +7847,8 @@ msgstr ""
 "lösenordsautentisering (SPA)."
 
 #: 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:115
+#: 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"
 
@@ -7818,26 +7894,41 @@ msgstr "URL:en \"%s\" behöver ett värdnamn"
 msgid "URL '%s' needs a path component"
 msgstr "URL:en \"%s\" behöver en sökväg"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Slår upp: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Namnuppslagning misslyckades: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, 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:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Uppslagning av värdnamn misslyckades: %s: okänd orsak"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Slår upp: %s"
+
+#: camel/camel-service.c:787
+#, 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
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Uppslagning av värdnamn misslyckades: %s: okänd orsak"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "E-postleverantör för virtuell mapp"
@@ -7846,12 +7937,12 @@ msgstr "E-postleverantör för virtuell mapp"
 msgid "For reading mail as a query of another set of folders"
 msgstr "För läsande av e-post som en fråga av en annan samling mappar"
 
-#: camel/camel-session.c: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 "Det finns ingen leverantör för protokollet \"%s\""
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7860,6 +7951,11 @@ msgstr ""
 "Kunde inte skapa katalogen %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Ange ditt lösenord för %s"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Ange smeknamnet på ett certifikat att signera med."
@@ -7893,11 +7989,11 @@ msgstr "Misslyckades med att avkoda meddelandet."
 msgid "Failed to verify certificates."
 msgstr "Misslyckades med att verifiera certifikat."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 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:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan inte skapa mapp: Ogiltig åtgärd på detta lager"
 
@@ -7927,7 +8023,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:467
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7940,16 +8036,16 @@ msgstr ""
 "Fingeravtryck:     %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-ssl.c:473
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr "BRA"
 
-#: camel/camel-tcp-stream-ssl.c:473
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr "DÅLIG"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:476
+#: camel/camel-tcp-stream-ssl.c:500
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7974,27 +8070,27 @@ msgstr "Kunde inte tolka URL:en \"%s\""
 msgid "No such message %s in %s"
 msgstr "Det finns inget sådant meddelande %s i %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Det finns inget sådant meddelande: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
@@ -8027,52 +8123,52 @@ msgstr "IMAP-serversvaret innehöll inte %s-information"
 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:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kunde inte skapa katalogen %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, 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:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Letar efter ändrade meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 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:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "Hämtar meddelandeinformation för nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Letar efter nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:2145
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
-#: 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 "Kunde inte öppna cachekatalogen: %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 "Misslyckades med att cacha meddelande %s: %s"
@@ -8118,28 +8214,28 @@ 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:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
+#: camel/providers/imap/camel-imap-store.c:529
 #: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Inget stöd för autentiseringstypen %s"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
+#: camel/providers/imap/camel-imap-store.c:568
 #: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Du angav inte något lösenord."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8150,56 +8246,57 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 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:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "Brevlådekataloger i MH-format"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 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:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Lokal leverans"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 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:63
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Brevlådekataloger i maildir-format"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 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:80
+#: 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:81
+#: 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:91
+#: camel/providers/local/camel-local-provider.c:116
 msgid "Directory tree of mbox files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8210,7 +8307,7 @@ 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:110
+#: camel/providers/local/camel-spoold-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagringsroten %s är inte en absolut sökväg"
@@ -8236,17 +8333,22 @@ 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:864
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunde inte byta namn på mappen %s till %s: %s"
 
-#: camel/providers/local/camel-local-store.c:375
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Kunde inte byta namn på mappen \"%s\": %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kunde inte ta bort mappsammanfattningsfilen \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-local-store.c:389
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunde inte ta bort mappindexfilen \"%s\": %s"
@@ -8257,7 +8359,7 @@ 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:1160
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunde inte lägga till meddelandet i sammanfattningen: okänd orsak"
 
@@ -8298,7 +8400,7 @@ msgstr "Det finns inget sådant meddelande"
 msgid "Invalid message contents"
 msgstr "Ogiltigt meddelandeinnehåll"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8308,14 +8410,14 @@ msgstr ""
 "Kunde inte öppna mappen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen \"%s\" finns inte."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8325,24 +8427,24 @@ msgstr ""
 "Kunde inte skapa mappen \"%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\" är inte en brevlådekatalog."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunde inte ta bort mappen \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "är inte en brevlådekatalog"
 
-#: camel/providers/local/camel-maildir-store.c:331
-#: camel/providers/local/camel-spoold-store.c:252
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunde inte genomsöka mappen \"%s\": %s"
@@ -8369,7 +8471,7 @@ msgstr "Kontrollerar nya meddelanden"
 #: 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:938
+#: camel/providers/local/camel-spool-summary.c:945
 msgid "Storing folder"
 msgstr "Lagrar mapp"
 
@@ -8494,8 +8596,8 @@ msgstr "Kan inte öppna temporär brevlåda: %s"
 #: 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:981
-#: camel/providers/local/camel-spool-summary.c:989
+#: 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"
 
@@ -8513,7 +8615,7 @@ 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:1039
+#: camel/providers/local/camel-spool-summary.c:1046
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunde inte stänga källmappen %s: %s"
@@ -8530,7 +8632,7 @@ 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:1113
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Okänt fel: %s"
@@ -8565,7 +8667,7 @@ 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:141
-#: camel/providers/local/camel-spoold-store.c:147
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen \"%s/%s\" finns inte."
@@ -8575,31 +8677,31 @@ msgstr "Mappen \"%s/%s\" finns inte."
 msgid "Spool mail file %s"
 msgstr "Spool-brevlådefil %s"
 
-#: camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spoold-store.c:192
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mappar kan inte bytas namn på"
 
-#: camel/providers/local/camel-spool-store.c:217
-#: camel/providers/local/camel-spoold-store.c:200
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-mappar kan inte tas bort"
 
-#: camel/providers/local/camel-spool-summary.c:791
-#: camel/providers/local/camel-spool-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:809
+#: camel/providers/local/camel-spool-summary.c:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:824
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:854
-#: camel/providers/local/camel-spool-summary.c:872
-#: camel/providers/local/camel-spool-summary.c:884
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8608,80 +8710,25 @@ msgstr ""
 "Kunde inte synkronisera spool-mappen %s: %s\n"
 "Mappen kan vara skadad, kopia sparad i \"%s\""
 
-#: camel/providers/local/camel-spool-summary.c:943
+#: 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:116
+#: 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:161
+#: 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:172
+#: camel/providers/local/camel-spoold-store.c:173
 #, c-format
 msgid "Mail tree %s"
 msgstr "E-postträd %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Ange NNTP-lösenordet för %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Servern avvisade användarnamnet"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Misslyckades med att skicka användarnamnet till servern"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Servern avvisade användarnamnet/lösenordet"
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Internt fel: uid är i ogiltigt format: %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 "Kan inte hämta meddelande %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 "Användaren avbröt"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Kunde inte hämta grupplista från servern."
-
-#: 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 "Kan inte läsa in grupplistefilen för %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Kan inte spara grupplistefilen för %s: %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET-diskussionsgrupper"
@@ -8689,15 +8736,15 @@ 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:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-diskussionsgrupper via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8740,32 +8787,47 @@ msgstr "Använd avbryt"
 msgid "Operation failed: %s"
 msgstr "Åtgärden misslyckades: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Hämtar POP-sammanfattning"
 
-#: 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 "Användaren avbröt"
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Kan inte hämta POP-sammanfattning: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:316
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Tömmer borttagna meddelanden"
 
-#: 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 "Inget meddelande med 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 "Hämtar POP-meddelande %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 "Kan inte hämta meddelande %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
 msgid "Unknown reason"
 msgstr "Okänd anledning"
 
@@ -8782,7 +8844,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:114
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -8796,8 +8858,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 ""
@@ -8857,7 +8919,8 @@ msgstr "I/O-fel: %s"
 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:503
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8866,13 +8929,13 @@ msgstr ""
 "Kan inte ansluta till POP-server.\n"
 "Fel vid skickande av lösenord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:593
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, 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:147
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8881,8 +8944,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"
@@ -8926,15 +8989,15 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "E-postleverans via programmet sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:135
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 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,7 +9162,7 @@ msgstr "SMTP-epostleverans via %s"
 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:604
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
@@ -9111,63 +9174,63 @@ msgstr "Kan inte skicka meddelande: inga mottagare är angivna."
 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:837
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "SMTP-hälsning"
 
-#: camel/providers/smtp/camel-smtp-transport.c:863
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:883
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Fel i HELO-svar: %s: inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:931
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Fel vid skapande av SASL-autentiseringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:954
-#: camel/providers/smtp/camel-smtp-transport.c:966
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "AUTH-begäran misslyckades."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1036
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Felaktigt autentiseringssvar från servern.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1062
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1076
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Fel i MAIL FROM-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1101
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:1117
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA-begäran gjorde time-out: %s: brevet skickades inte"
@@ -9175,39 +9238,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:1167
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 #, fuzzy
 msgid "DATA response error"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1207
-#: camel/providers/smtp/camel-smtp-transport.c:1225
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1239
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Felaktigt autentiseringssvar från servern."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1262
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1276
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 #, fuzzy
 msgid "RSET response error"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1299
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Fel i RSET-svar: %s"
@@ -9237,7 +9300,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:149
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
 msgid "attachment"
 msgstr "bilaga"
 
@@ -9281,52 +9344,52 @@ msgstr "MIME-typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Föreslå automatisk visning av bilaga"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Klicka här för att ta fram adressboken"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Från:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Svara till:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Till:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 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:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Blindkopia:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9339,7 +9402,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9348,34 +9411,34 @@ msgstr ""
 "Fel vid läsning av filen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:965
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Varning!"
 
-#: composer/e-msg-composer.c:969
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Filen finns, skriv över?"
 
-#: composer/e-msg-composer.c:991
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:1010
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inläsning av filen: %s"
 
-#: composer/e-msg-composer.c:1041
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fel vid åtkomst av filen: %s"
 
-#: composer/e-msg-composer.c:1049
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "Kunde inte hämta meddelande från redigeraren"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9384,7 +9447,7 @@ msgstr ""
 "Kan inte spola filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9393,7 +9456,7 @@ msgstr ""
 "Kan inte trunkera filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9402,7 +9465,7 @@ msgstr ""
 "Fel vid automatiskt sparande av meddelande: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1174
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9410,7 +9473,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:1332
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9420,23 +9483,23 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Varning: Ändrat meddelande"
 
-#: composer/e-msg-composer.c:1362
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:1511
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Infoga fil"
 
-#: composer/e-msg-composer.c:2047 composer/e-msg-composer.c:2644
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:2661
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9444,7 +9507,7 @@ msgstr ""
 "Kan inte skapa redigerarfönstret:\n"
 "Kan inte aktivera adressväljarkontrollen."
 
-#: composer/e-msg-composer.c:2684 composer/e-msg-composer.c:2739
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9452,12 +9515,6 @@ msgstr ""
 "Kunde inte skapa redigerarfönstret:\n"
 "Kan inte aktivera HTML-redigerarkomponenten."
 
-#: composer/e-msg-composer.c:3464
-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"
@@ -9518,8 +9575,8 @@ 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:2226
-#: mail/mail-display.c:119
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -9528,11 +9585,11 @@ msgstr ""
 "Ska den skrivas över?"
 
 #. 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 "Kom ihåg detta lösenord"
 
-#: 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 "Kom ihåg detta lösenord för resten av denna session"
 
@@ -9630,169 +9687,6 @@ msgstr "%H.%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolutionkomponent för sammanfattningen."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Fabrik för Evolutions sammanfattningskomponent."
-
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Kan inte initiera Evolutions sammanfattningskomponent."
-
-#: executive-summary/component/e-summary-callbacks.c:125
-msgid "Select a service"
-msgstr "Välj en tjänst"
-
-#: 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 ""
-"Du kan välja en annan HTML-sida som bakgrund för sammanfattningen.\n"
-"\n"
-"Lämna fältet tomt för att få standardsidan."
-
-#: 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 "Öppna %s med det program som är standard i Gnome"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Öppna %s med standardwebbläsaren i Gnome"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Skicka e-post till %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Ändra vyn till %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Kör %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Stäng %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Flytta %s till vänster"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Flytta %s till höger"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Flytta %s till föregående rad"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Flytta %s till nästa rad"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Konfigurera %s"
-
-#: executive-summary/component/e-summary-url.c:553
-msgid "page"
-msgstr "sida"
-
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Kunde inte öppna HTML-filen:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Fel vid läsning av data:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr "Filen har ingen plats för tjänsterna.\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 ""
-"Sammanfattningskomponenten kunde inte initiera Bonobo.\n"
-"Om du fick en varning om RootPOA, betyder det förmodligen att\n"
-"du kompilerade Bonobo med GOAD i stället för OAF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Fabrik för RDF-sammanfattningen."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF-sammanfattning"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Fabrik för Bonobo-testkomponenten."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Fabrik för testkomponenten."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Testa Bonobo-tjänsten"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Testa tjänsten"
-
-#: 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 "Fel"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "Uppdatera automatiskt"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "Uppdatera nu"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "Uppdatera var "
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "år"
@@ -9825,11 +9719,7 @@ msgstr "timme"
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "sekund"
-
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:224
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "sekunder"
 
@@ -9925,7 +9815,7 @@ msgstr "Då"
 msgid "Add action"
 msgstr "Lägg till åtgärd"
 
-#: 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."
@@ -9933,19 +9823,11 @@ msgstr ""
 "Du glömde välja en mapp.\n"
 "Gå tillbaka och ange en giltig mapp som e-post kan levereras till."
 
-#: 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:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Välj mapp"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Ange mappens URI"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<klicka här för att välja en mapp>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9955,7 +9837,7 @@ msgstr ""
 "Fel i reguljära uttrycket \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:45
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test"
 
@@ -9984,7 +9866,8 @@ msgid "if all criteria are met"
 msgstr "om alla villkor uppfylls"
 
 #: filter/filter-rule.c:769
-msgid "if any criteria are met"
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "om något villkor uppfylls"
 
 #: filter/filter-rule.c:780
@@ -10041,209 +9924,214 @@ msgstr "med alla lokala mappar"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Tilldela poäng"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Tilldela färg"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Tilldela poäng"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Bilagor"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
 #, fuzzy
 msgid "Beep"
 msgstr "Belem"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "innehåller"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiera till mapp"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ankomstdatum"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Avsändningsdatum"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "innehåller inte"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "slutar inte med"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "finns inte"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "låter inte som"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "börjar inte med"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "finns inte"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Utkast"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "slutar med"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr "Kör skalkommando"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "finns"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "finns"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Uttryck"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25 mail/mail-config.c:74
-#: mail/mail-config.glade.h:82
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "viktigt"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "är"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "är efter"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "är innan"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "Flaggad"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "är större än"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "är mindre än"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "är inte"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Flaggad"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "Sändlista"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "meddelandetext"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "meddelandehuvud"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Flytta till mapp"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:39
 #, fuzzy
 msgid "Play Sound"
 msgstr "Spela ljud:"
 
 # [Status] [är] [Läst]
-#: filter/libfilter-i18n.h:39 mail/message-tag-followup.c:58
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Läst"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "Reguljärt uttryck matchar"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "besvarad"
 
-#: 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Poäng"
 
-#: filter/libfilter-i18n.h:44 mail/mail-callbacks.c:1533
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Avsändare"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Ställ in status"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Storlek (kB)"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "låter som"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "Källkonto"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Specifikt huvud"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "börjar med"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: filter/libfilter-i18n.h:53 mail/mail-format.c:938
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
 #: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Ämne"
@@ -10252,11 +10140,11 @@ msgstr "Ämne"
 msgid "Rules"
 msgstr "Regler"
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Lägg till regel"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Redigera regel"
 
@@ -10276,30 +10164,30 @@ msgstr "Du måste ange minst en mapp som källa."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerar din gamla Elm-epost"
 
-#: 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 "Importerar..."
 
-#: 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 "Var vänlig vänta"
 
-#: 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 "Importerar %s som %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 "Genomsöker %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:101
 msgid "Mail"
 msgstr "E-post"
 
@@ -10327,23 +10215,74 @@ msgstr ""
 "Evolution har hittat GnomeCard-filer.\n"
 "Vill du importera dem till Evolution?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Prioritet: %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 importerar din gamla Netscape-data"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Papperskorg"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Genomsöker IMAP-mappen"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Genomsöker katalog"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Startar import"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Inställningar"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Redigera filter"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10374,339 +10313,352 @@ msgstr "Kalenderinställningar"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:2
 #, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
+msgid "Configuration control for the Evolution Display Fonts."
 msgstr "Konfigurationsverktyg för evolutions att-göra-kanal.\n"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:3
 #, fuzzy
-msgid "Configuration control for the Evolution Mailer."
+msgid "Configuration control for the Evolution Mail Accounts."
 msgstr "Konfigurationsverktyg för evolutions att-göra-kanal.\n"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:4
 #, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Konfigurationsverktyg för evolutions att-göra-kanal.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
 msgid "Configuration control for the Evolution Message Composer."
 msgstr "Fabrik för Evolutions e-postredigerare."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5 notes/GNOME_Evolution_Notes.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Evolutionkomponenten för hantering av e-post."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolutions e-postredigerare."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Evolutions e-postsammanfattningskomponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Evolutions e-postvisningskomponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Fabrik för Evolutions e-postmappkomponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Fabrik för Evolutions e-postredigerare."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Fabrik för e-postsammanfattningskomponenten."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Inställningar"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Epostkonton"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13 mail/mail-config.glade.h:94
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Inställningar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "Gränssnitt för e-postkonfiguration"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#, fuzzy
+msgid "This Page can be used to configure the Fonts"
+msgstr ""
+"Denna sida kan användas för att konfigurera åtkomst till katalogservrar "
+"genom användning av LDAP-protokollet"
+
+#: 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:16
+#: 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:17
+#: 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:101
 msgid "Folder containing mail"
 msgstr "Mapp som innehåller e-post"
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtuell papperskorg"
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Virtuell papperskorgsmapp"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Denna mapp kan inte innehålla meddelanden."
 
-#: mail/component-factory.c:401
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Egenskaper..."
 
-#: mail/component-factory.c:401
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Ändra egenskaperna för denna mapp"
 
-#: mail/component-factory.c:764
+#: mail/component-factory.c:766
 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:923
+#: mail/component-factory.c:925
 msgid "You have not set a mail transport method"
 msgstr "Du har inte angivit någon e-posttransportmetod"
 
-#: mail/component-factory.c:965
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: mail/component-factory.c:965 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_E-postmeddelande"
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:1001
+#: mail/component-factory.c:1003
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan inte initiera Evolutions e-postkonfigurationskomponent."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1009
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan inte initiera Evolutions mappinformationskomponent."
 
-#: mail/component-factory.c:1207 mail/component-factory.c:1238
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ansluter till server..."
 
-#: mail/component-factory.c:1248
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lager hos skal"
 
-#: mail/folder-browser-ui.c:343
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper för \"%s\""
 
-#: mail/folder-browser-ui.c:345
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:300 mail/mail-display.c:331 mail/mail-display.c:840
+#: mail/folder-browser.c:305 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:755
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d nya"
 
-#: mail/folder-browser.c:758 mail/folder-browser.c:766
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d dolda"
 
-#: mail/folder-browser.c:762
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr "%d synliga"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d markerade"
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d oskickade"
 
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d skickade"
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1083
+#: mail/folder-browser.c:1088
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Skapa _virtuell mapp från meddelande"
 
-#: mail/folder-browser.c:1575
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp på _ämne"
 
-#: mail/folder-browser.c:1576
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på _avsändare"
 
-#: mail/folder-browser.c:1577
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på _mottagare"
 
-#: mail/folder-browser.c:1578
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "Virtuell mapp på sänd_lista"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtrera på _ämne"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtrera på _avsändare"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filtrera på _mottagare"
 
-#: mail/folder-browser.c:1585 mail/folder-browser.c:1917
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
-#: mail/folder-browser.c:1603 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: mail/folder-browser.c:1605
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/folder-browser.c:1611 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/folder-browser.c:1612
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/folder-browser.c:1616
+#: mail/folder-browser.c:1622
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1617
+#: mail/folder-browser.c:1623
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Färdigt"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1624
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Ställ flagga"
 
 #. separator here?
-#: mail/folder-browser.c:1622 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_Markera som läst"
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1629
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1631
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markera som ovikti_gt"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1636
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Ångra borttagning"
 
-#: mail/folder-browser.c:1634
+#: mail/folder-browser.c:1640
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Flytta till mapp..."
 
-#: mail/folder-browser.c:1635 ui/evolution-addressbook.xml.h:36
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/folder-browser.c:1639
+#: mail/folder-browser.c:1645
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: mail/folder-browser.c:1643
+#: mail/folder-browser.c:1649
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lägg till avsändaren i adressboken"
 
-#: mail/folder-browser.c:1647
+#: mail/folder-browser.c:1653
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Tillämpa filter"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1657
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Skapa rege_l från meddelande"
 
-#: mail/folder-browser.c:1918
+#: mail/folder-browser.c:1936
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Virtuell mapp på sändlista"
 
-#: mail/folder-browser.c:1920
+#: mail/folder-browser.c:1938
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrera på sändlista (%s)"
 
-#: mail/folder-browser.c:1921
+#: mail/folder-browser.c:1939
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Virtuell mapp på sändlista (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Standard"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Hämtar mappinformation"
@@ -10776,92 +10728,74 @@ msgstr "Evolutions diskussionsgruppsredigerare"
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontoredigerare"
 
-#: mail/mail-account-gui.c:52 mail/mail-config.glade.h:17
-#, fuzzy
-msgid "Always"
-msgstr "Albany"
-
-#: mail/mail-account-gui.c:53 mail/mail-config.glade.h:176
-msgid "Whenever Possible"
-msgstr ""
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Värd:"
 
-#: mail/mail-account-gui.c:54 mail/mail-config.glade.h:107
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
 #, fuzzy
-msgid "Never"
-msgstr "_var"
+msgid "User_name:"
+msgstr "Användar_namn:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "_Sökväg:"
 
-#: mail/mail-account-gui.c:1039 mail/mail-account-gui.c:1040
-#: mail/mail-account-gui.c:1283 mail/mail-account-gui.c:1288
-#: mail/mail-config.glade.h:127
+#: 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:1109 mail/mail-account-gui.c:1124
+#: 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:1794
+#: mail/mail-account-gui.c:1985
 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:210
+#: mail/mail-accounts.c:212
 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:214
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Ta inte bort"
 
-#: mail/mail-accounts.c:217
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Verkligen ta bort kontot?"
 
-#: mail/mail-accounts.c:340 mail/mail-accounts.c:374
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
 msgid "Disable"
 msgstr "Stäng av"
 
-#: mail/mail-accounts.c:342 mail/mail-accounts.c:376
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
 msgid "Enable"
 msgstr "Slå på"
 
-#: mail/mail-accounts.c:498 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:70
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+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
 msgid "Enabled"
 msgstr "Påslagen"
 
-#: mail/mail-accounts.c:499 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Kontonamn:"
 
-#: mail/mail-accounts.c:500 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "E-post till %s"
-
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Ämnet är %s"
-
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "E-post från %s"
-
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "Sändlistan %s"
-
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
@@ -10933,8 +10867,8 @@ msgid ""
 "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
@@ -10945,7 +10879,7 @@ msgstr "Du måste ange mottagare för att kunna skicka detta meddelande."
 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:616
+#: mail/mail-callbacks.c:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10953,28 +10887,28 @@ msgstr ""
 "Kan inte öppna utkastmappen för detta konto.\n"
 "Vill du använda standardmappen för utkast?"
 
-#: mail/mail-callbacks.c:962
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "en okänd avsändare"
 
-#: mail/mail-callbacks.c:966
+#: mail/mail-callbacks.c:981
 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:1411 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:1413 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:2070
+#: mail/mail-callbacks.c:2091
 #, 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:2095
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10982,7 +10916,7 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Utkast."
 
-#: mail/mail-callbacks.c:2134
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10990,39 +10924,39 @@ msgstr ""
 "Du kan bara skicka om meddelanden\n"
 "som du sparat i mappen Skickat."
 
-#: mail/mail-callbacks.c:2148
+#: mail/mail-callbacks.c:2169
 #, 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:2174
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Inget meddelande markerat"
 
-#: mail/mail-callbacks.c:2219 mail/mail-display.c:115
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: mail/mail-callbacks.c:2273
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:2275
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:2343
+#: mail/mail-callbacks.c:2366
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Visa nästa olästa meddelande"
 
-#: mail/mail-callbacks.c:2350
+#: mail/mail-callbacks.c:2373
 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:2590
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11035,7 +10969,7 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa meddelanden?"
 
-#: mail/mail-callbacks.c:2700
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11044,28 +10978,28 @@ msgstr ""
 "Fel vid läsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2712
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2755
+#: mail/mail-callbacks.c:2783
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Hämtar meddelande %d av %d"
 
-#: mail/mail-callbacks.c:2807
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:2834
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2869
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
-#: mail/mail-callbacks.c:3052 mail/mail-callbacks.c:3092
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11115,48 +11049,43 @@ 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:627
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoassistent"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:177
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:116
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:167
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "To Do"
 msgstr "Att-göra-lista"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:90
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "efter"
 
-#: mail/mail-config.c:631
-#, c-format
-msgid "Account %d"
-msgstr "Konto %d"
-
-#: mail/mail-config.c:2451
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -11167,46 +11096,41 @@ msgstr ""
 "%s\n"
 "Ingen genväg kommer att skapas."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2462
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Inkorg"
-
-#: mail/mail-config.c:2712
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Kontrollerar tjänst"
 
-#: mail/mail-config.c:2790 mail/mail-config.c:2794
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 msgstr "Ansluter till server..."
 
-#: mail/mail-config.c:2991
+#: mail/mail-config.c:2999
 #, fuzzy
 msgid "Unnamed"
 msgstr "Namnlös kontakt:"
 
-#: mail/mail-config.c:3169
+#: mail/mail-config.c:3177
 msgid "Cannot execute signature script"
 msgstr ""
 
 #: mail/mail-config.glade.h:1
-msgid "                        "
-msgstr ""
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " _Check for supported types "
-msgstr " _Kontrollera vilka typer som stöds "
+#, fuzzy
+msgid " Edit "
+msgstr "Redigera"
 
 #: mail/mail-config.glade.h:3
-msgid " color"
-msgstr " färg"
+#, fuzzy
+msgid " New "
+msgstr "Ny"
 
 #: mail/mail-config.glade.h:4
-msgid "&lt;&lt; S_imple"
-msgstr ""
+msgid " _Check for supported types "
+msgstr " _Kontrollera vilka typer som stöds "
 
 #: mail/mail-config.glade.h:5
 #, fuzzy
@@ -11218,139 +11142,112 @@ 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
-msgid "/home/rodo/cvs/evolution/mail/"
-msgstr ""
-
-#: mail/mail-config.glade.h:8
 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:9
-msgid "Account"
-msgstr "Konto"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-config.glade.h:11 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Kontohantering"
 
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Avancerade LDAP-alternativ"
+
 #: mail/mail-config.glade.h:12
-msgid "Accounts"
-msgstr "Konton"
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Arkansas"
 
 #: mail/mail-config.glade.h:13
 #, fuzzy
-msgid "Ad_vanced &gt;&gt;"
-msgstr "Avancerat"
+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 "Add new signature"
-msgstr "Spara signatur"
+msgid "Alerts"
+msgstr "Alberta"
 
 #: mail/mail-config.glade.h:15
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Avancerade LDAP-alternativ"
-
-#: mail/mail-config.glade.h:16
-#, fuzzy
-msgid "Afrikaans"
-msgstr "Arkansas"
+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:18
+#: mail/mail-config.glade.h:17
 #, fuzzy
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Skicka alltid blindkopia till:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Skicka alltid kopia till:"
 
-#: mail/mail-config.glade.h:20
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "Kr_yptera alltid till mig själv när krypterad post skickas"
-
-#: mail/mail-config.glade.h:21
-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:22
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Arabic"
 msgstr "Arica"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "Bifoga en fil till meddelandet"
 
-#: mail/mail-config.glade.h:24 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilaga"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentisering"
 
 # Låter konstigt
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 #, fuzzy
-msgid "Automatically detect links"
+msgid "Automatically _detect links"
 msgstr "Kontrollera _automatiskt ny e-post"
 
-#: mail/mail-config.glade.h:27
-msgid "Baltic (IS0-8859-13)"
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
-msgid "Beep when new mail arrives"
-msgstr "Pip då ny post anländer"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:26
 #, fuzzy
-msgid "Character Set:"
+msgid "C_haracter set:"
 msgstr "Teckenkodning"
 
-#: mail/mail-config.glade.h:31
-msgid "Checking for New Mail"
-msgstr "Kontrollerar ny e-post"
-
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:27
 #, fuzzy
-msgid "Colors"
+msgid "C_olors"
 msgstr "Komorerna"
 
-#: mail/mail-config.glade.h:33
-#, fuzzy
-msgid "Command"
-msgstr "Företag"
-
-#: mail/mail-config.glade.h:34
-msgid "Composer"
-msgstr "Redigerare"
+#: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
+msgstr "Kontrollerar ny e-post"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Redigerar meddelanden"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:37
-msgid "Confirm when Expunging a folder"
-msgstr "Bekräfta vid tömning av mapp"
-
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11365,488 +11262,355 @@ msgstr ""
 "\n"
 "Klicka på \"Slutför\" för att spara dina inställningar."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:37
 #, fuzzy
 msgid "Dari"
 msgstr "Bari"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:47
-msgid "Default Forward style is: "
-msgstr "Standardstil för vidarebefordran är: "
-
-#: mail/mail-config.glade.h:48
-#, fuzzy
-msgid "Default Forward style:"
-msgstr "Standardstil för vidarebefordran är: "
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 #, fuzzy
-msgid "Default Reply style:"
-msgstr "Standardstil för vidarebefordran är: "
-
-#: mail/mail-config.glade.h:50
-#, fuzzy
-msgid "Default character encoding:"
+msgid "Default character _encoding:"
 msgstr "Standardteckenkodning: "
 
-#: mail/mail-config.glade.h:51
-msgid "Default character encoding: "
-msgstr "Standardteckenkodning: "
-
-#: mail/mail-config.glade.h:52
-msgid "Defaults"
-msgstr "Standardvärden"
-
-#: mail/mail-config.glade.h:53
-#, fuzzy
-msgid "Delete selected signature"
-msgstr "Ta bort allt utom signatur"
-
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Hämtar post"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitala ID..."
 
-#: mail/mail-config.glade.h:57
-msgid "Display"
-msgstr "Visa"
-
-#: mail/mail-config.glade.h:58
-msgid "Do not notify me when new mail arrives"
-msgstr "Notifiera inte mig när ny post anländer"
-
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Kan inte öppna meddelande"
 
-#: mail/mail-config.glade.h:60 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Klar"
 
-#: mail/mail-config.glade.h:61 shell/e-local-storage.c:174
-msgid "Drafts"
-msgstr "Utkast"
-
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:46
 #, fuzzy
-msgid "E_mail address:"
-msgstr "_E-postadress:"
+msgid "Drafts _folder:"
+msgstr "_Utkastmapp:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "Sl_å på"
 
-#: mail/mail-config.glade.h:64
-#, fuzzy
-msgid "Ed_it..."
-msgstr "Redigera..."
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:48
 #, fuzzy
-msgid "Edi_t..."
-msgstr "Redigera..."
-
-#: mail/mail-config.glade.h:66
-msgid "Edit signature content in editor"
-msgstr ""
+msgid "E_nable advanced options"
+msgstr "Slå på radarkartor"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Öst"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Epostkonton"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:51
 #, fuzzy
-msgid "Enable advanced options"
-msgstr "Slå på radarkartor"
+msgid "Email _address:"
+msgstr "_E-postadress:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "_Töm papperskorgsmappar vid avslut"
+
+#: mail/mail-config.glade.h:53
 msgid "Execute Command..."
 msgstr "Kör kommando..."
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "File containing signature"
-msgstr "Mapp som innehåller e-post"
+msgid "Fi_xed -width:"
+msgstr "slutar med"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Forwards and Replies"
-msgstr "Vidarebefordra _inuti"
+msgid "Font Properties"
+msgstr "Kontoegenskaper"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Vidarebefordrade meddelanden"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Hämta digitalt ID..."
 
-#: mail/mail-config.glade.h:76
-#, fuzzy
-msgid "HTML Mail"
-msgstr "I HTML-brev"
-
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Hide advanced settings"
-msgstr "Väderinställningar"
+msgid "Highlight _quotations with"
+msgstr "Markera _citat med"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Hulu"
 msgstr "Hurlburt"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:80 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:81
-msgid "If selected signature will be included in random signature list"
-msgstr ""
-
-#: mail/mail-config.glade.h:83
-msgid "In HTML mail"
-msgstr "I HTML-brev"
-
-#: mail/mail-config.glade.h:84
-msgid "Include in _random signatures list"
-msgstr ""
-
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Inuti"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:87
-#, fuzzy
-msgid "Keyboard Shortcuts"
-msgstr "Genvägar"
-
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Spara och stäng"
 
-#: mail/mail-config.glade.h:89
-#, fuzzy
-msgid "Language:"
-msgstr "Språk"
-
-#: mail/mail-config.glade.h:91
-#, fuzzy
-msgid "List of signatures"
-msgstr "Spara signatur"
-
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Läs in _bilder"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: mail/mail-config.glade.h:95
-msgid "Mail Settings"
-msgstr "E-postinställningar"
-
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Brevlådeplats"
 
-#: mail/mail-config.glade.h:97
-msgid "Make this my _default account"
-msgstr "Gör detta till mitt standard_konto"
-
-#: mail/mail-config.glade.h:98
-#, fuzzy
-msgid "Mark messages as read after"
-msgstr "_Markera meddelanden som lästa efter"
-
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Composer"
 msgstr "Meddelanden"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Display"
 msgstr "M_eddelandevisning"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronesien"
 
-#: mail/mail-config.glade.h:102
-msgid "Misspelled color: "
-msgstr ""
-
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP-server:"
 
-#: mail/mail-config.glade.h:104
-#, fuzzy
-msgid "N_ew..."
-msgstr "Ny..."
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
-msgid "Name of selected signature"
-msgstr "Ta bort allt utom signatur"
-
-#: mail/mail-config.glade.h:106
-#, fuzzy
-msgid "Ne_w..."
-msgstr "Ny..."
-
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Notifiering om ny post"
 
-#: mail/mail-config.glade.h:109
-msgid "News"
-msgstr "Diskussionsgrupper"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Redigera diskussionsgruppsserver"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Valfri information"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organi_sation:"
+
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP-_nyckelid:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Välj en färg"
 
-#: mail/mail-config.glade.h:118
-msgid "Play sound file when new mail arrives"
-msgstr "Spela ljudfil då ny post anländer"
+#: mail/mail-config.glade.h:88
+#, 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:119
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:120
-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"
-
-#: mail/mail-config.glade.h:121
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Fråga då meddelanden skickas med ett _tomt ämne"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:90
 #, 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:123
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "Fråga då meddelanden skickas med endast _blindkopiemottagare angivna"
+msgid "Printed Fonts"
+msgstr "Skriv ut markerade kontakter"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail-epostkatalog "
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Kan inte öppna meddelande"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citerad"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:95
 msgid "Randomized"
 msgstr ""
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Ko_m ihåg detta lösenord"
 
-#: mail/mail-config.glade.h:130 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Svara till:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Mottagande av e-post"
 
-#: mail/mail-config.glade.h:131
-msgid "Receiving Mail"
-msgstr "Mottagande av post"
-
-#: mail/mail-config.glade.h:132
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Alternativ för mottagning"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Kom ihåg detta lösenord"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Obligatorisk information"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:103
 #, fuzzy
-msgid "Restore defaults"
-msgstr " (standard)"
+msgid "S_ecurity"
+msgstr "Säkerhet"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Same as text"
 msgstr "Somerset"
 
-#: mail/mail-config.glade.h:137
-msgid "Script which is run before signature loading from specified filename"
-msgstr ""
-
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Säker MIME"
 
-#: mail/mail-config.glade.h:139
-msgid "Security"
-msgstr "Säkerhet"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:140
-msgid "Select Filter Log file..."
-msgstr "Välj en filterloggfil..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:141
-msgid "Select PGP binary"
-msgstr "Välj PGP-program"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Välj PGP-program"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Select a signature file"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Select a signature script"
 msgstr "Ta bort allt utom signatur"
 
-#: mail/mail-config.glade.h:145 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Skickande av e-post"
 
-#: mail/mail-config.glade.h:146
-msgid "Sending Mail"
-msgstr "Skickande av post"
-
-#: mail/mail-config.glade.h:148 mail/message-list.etspec.h:9
-#: shell/e-local-storage.c:177
-msgid "Sent"
-msgstr "Skickat"
-
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Mapp för skickade _meddelanden:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Skickade meddelanden och utkast"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vern kräver autentisering"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:154
-#, fuzzy
-msgid "Shortcut"
-msgstr "_Genväg"
-
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:120
 #, fuzzy
-msgid "Shortcuts type:"
+msgid "Shortcuts _type:"
 msgstr "Genvägar"
 
-#: mail/mail-config.glade.h:156
-#, fuzzy
-msgid "Show advanced settings"
-msgstr "Inställningar för nyhetskällor"
-
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "Show animated images"
-msgstr "Visa tid som"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Signature"
 msgstr "Spara signatur"
 
-#: mail/mail-config.glade.h:159
-#, fuzzy
-msgid "Signatures"
-msgstr "Spara signatur"
-
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Källkod"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Källinformation"
 
-#: mail/mail-config.glade.h:162
-msgid "Sources"
-msgstr "Källor"
-
-#: mail/mail-config.glade.h:163
-msgid "Specify filename:"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
 msgstr "Ange filnamn:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:125
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Standard Unix-brevlåda"
 
-#: mail/mail-config.glade.h:166
-#, fuzzy
-msgid "Text _Signature:"
-msgstr "_HTML-signatur:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -11855,17 +11619,17 @@ 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:171
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "Use _HTML for this signature"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:132
 #, fuzzy
-msgid "Use s_ecure connection (SSL):"
-msgstr "Använd s_äker anslutning (SSL)"
+msgid "V_ariable-width:"
+msgstr "Variabel"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11875,199 +11639,221 @@ msgstr ""
 "\n"
 "Klicka på \"Nästa\" för att börja. "
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "XEmacs"
 msgstr "Öst"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "Läs alltid in _bilder från nätet"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:141
 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:182
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Autentiseringstyp: "
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentiseringstyp: "
 
 # Låter konstigt
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "Kontrollera _automatiskt ny e-post"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:145
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "Pip då ny post anländer"
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Bekräfta vid tömning av mapp"
 
-#: mail/mail-config.glade.h:188
-msgid "_Drafts folder:"
-msgstr "_Utkastmapp:"
-
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:149
 #, fuzzy
-msgid "_Edit..."
-msgstr "Redigera..."
+msgid "_Defaults"
+msgstr "Standardvärden"
 
-#: mail/mail-config.glade.h:191
-msgid "_Empty trash folders on exit"
-msgstr "_Töm papperskorgsmappar vid avslut"
+#: mail/mail-config.glade.h:151
+#, 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:192
+#: mail/mail-config.glade.h:153
 msgid "_Enable spell checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:193
+#: mail/mail-config.glade.h:154
 #, fuzzy
-msgid "_Filename"
+msgid "_Filename:"
 msgstr "Filnamn:"
 
-#: mail/mail-config.glade.h:194
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
 #, fuzzy
-msgid "_Filename:"
-msgstr "Filnamn:"
+msgid "_Forward style:"
+msgstr "Standardstil för vidarebefordran är: "
 
-#: mail/mail-config.glade.h:195
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Full name:"
 msgstr "Fullständigt namn:"
 
-#: mail/mail-config.glade.h:196
+#: mail/mail-config.glade.h:159
+#, 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:197
-msgid "_Highlight citations with"
-msgstr "Markera _citat med"
-
-#: mail/mail-config.glade.h:198
+#: mail/mail-config.glade.h:162
 #, fuzzy
-msgid "_Highlight quotations with"
-msgstr "Markera _citat med"
+msgid "_Identity"
+msgstr "Identitet"
 
-#: mail/mail-config.glade.h:199
-msgid "_Host:"
-msgstr "_Värd:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Språk"
 
-#: mail/mail-config.glade.h:200
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr "Läs _in bilder om avsändaren finns i adressboken"
 
-#: mail/mail-config.glade.h:201
-msgid "_Log filter actions to:"
-msgstr "_Logga filteråtgärder i:"
-
-#: mail/mail-config.glade.h:202
-msgid "_Mark messages as Read after"
-msgstr "_Markera meddelanden som lästa efter"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Gör detta till mitt standard_konto"
 
-#: mail/mail-config.glade.h:203
+#: mail/mail-config.glade.h:166
 #, fuzzy
-msgid "_Name"
-msgstr "_Namn:"
+msgid "_Mark messages as read after"
+msgstr "_Markera meddelanden som lästa efter"
 
-#: mail/mail-config.glade.h:204
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:205
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_Läs aldrig in bilder från nätet"
 
-#: mail/mail-config.glade.h:206
-msgid "_Organization:"
-msgstr "_Organisation:"
-
-#: mail/mail-config.glade.h:207
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "Sökväg till _PGP-programmet:"
 
-#: mail/mail-config.glade.h:208
-msgid "_Path:"
-msgstr "_Sökväg:"
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Play sound file when new mail arrives"
+msgstr "Spela ljudfil då ny post anländer"
 
-#: mail/mail-config.glade.h:209
-msgid "_Randomize"
+#: mail/mail-config.glade.h:172
+#, 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"
 
-#: mail/mail-config.glade.h:210
-msgid "_Remember this password"
-msgstr "_Kom ihåg detta lösenord"
+#: mail/mail-config.glade.h:173
+#, 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:211
+#: mail/mail-config.glade.h:174
 #, fuzzy
-msgid "_Script"
-msgstr "_Säkerhet"
+msgid "_Random"
+msgstr "Radio"
+
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Mottagande av post"
+
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Standardstil för vidarebefordran är: "
 
-#: mail/mail-config.glade.h:212
+#: mail/mail-config.glade.h:177
+#, fuzzy
+msgid "_Restore defaults"
+msgstr " (standard)"
+
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Script:"
 msgstr "_Säkerhet"
 
-#: mail/mail-config.glade.h:213
-msgid "_Send mail in HTML format by default."
-msgstr "_Skicka brev i HTML-format som standard."
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Säkerhet"
 
-#: mail/mail-config.glade.h:214
+#: mail/mail-config.glade.h:180
 #, fuzzy
-msgid "_Send messages in HTML format by default"
-msgstr "_Skicka brev i HTML-format som standard."
+msgid "_Sending Mail"
+msgstr "Skickande av post"
 
-#: mail/mail-config.glade.h:215
+#: mail/mail-config.glade.h:181
 #, fuzzy
-msgid "_Server type: "
-msgstr "_Servertyp: "
+msgid "_Show animated images"
+msgstr "Visa tid som"
 
-#: mail/mail-config.glade.h:216
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Signaturfil:"
 
-#: mail/mail-config.glade.h:217
-msgid "_Username:"
-msgstr "Användar_namn:"
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Text Signature:"
+msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:218
+#: 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
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Variabel"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_var"
 
-#: mail/mail-config.glade.h:219
+#: mail/mail-config.glade.h:187
 #, fuzzy
 msgid "color"
 msgstr " färg"
 
-#: mail/mail-config.glade.h:220
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "beskrivning"
 
-#: mail/mail-config.glade.h:222
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:223
-msgid "placeholder"
-msgstr "platshållare"
-
-#: mail/mail-config.glade.h:225
-msgid "seconds."
-msgstr "sekunder."
-
-#: mail/mail-config.glade.h:226
-#, fuzzy
-msgid "use _HTML for this signature"
-msgstr "_HTML-signatur:"
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Kunde inte skapa ett PGP-signatursammanhang."
@@ -12104,24 +11890,24 @@ msgstr "Kunde inte skapa ett S/MIME-kuvertsammanhang."
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunde inte skapa ett S/MIME-avkodningssammanhang."
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Spara bilaga"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:344
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Kunde inte skapa temporärt meddelandefält \"%s\": %s"
 
-#: mail/mail-display.c:387
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Spara till disk..."
 
-#: mail/mail-display.c:389
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Visa inuti"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
@@ -12143,117 +11929,98 @@ msgstr "Externt visningsprogram"
 msgid "Loading message content"
 msgstr "Läser in meddelandeinnehåll"
 
-#: mail/mail-display.c:1757
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Öppna länk i webbläsare"
 
-#: mail/mail-display.c:1759
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Kopiera länkplats"
 
-#: mail/mail-display.c:1762
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Spara länk som (FIXME)"
 
-#: mail/mail-display.c:1765
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
-#: mail/mail-format.c:652
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:698
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
 
-#: mail/mail-format.c:781
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Felaktig adress"
 
-#: mail/mail-format.c:916 mail/message-list.etspec.h:6
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Från"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: mail/mail-format.c:925 mail/message-list.etspec.h:13
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Till"
 
-#: mail/mail-format.c:930
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Kopia"
 
-#: mail/mail-format.c:935
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Blindkopia"
 
-#: mail/mail-format.c:1712
+#: mail/mail-format.c:915
 #, fuzzy
-msgid "View messages..."
-msgstr "Spara meddelande som..."
-
-#: mail/mail-format.c:1806
-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:1829
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution känner inte igen denna typ av signerat meddelande."
-
-#: mail/mail-format.c:1837
-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:1845
-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 "Mailer"
+msgstr "E-post"
 
-#: mail/mail-format.c:2088
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2120
 #, 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:2107
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:2136
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pekare till fjärrdata (%s)"
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:2149
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerar mapp"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12262,27 +12029,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:763
+#: mail/mail-local.c:762
 #, 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:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan inte ta bort metainformation för mapp %s: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Byter format på mappen \"%s\" till \"%s\""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, 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:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12290,11 +12057,11 @@ msgstr ""
 "Om du inte längre kan öppna denna brevlåda måste\n"
 "du kanske reparera den manuellt."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 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:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigurera om /%s"
@@ -12321,117 +12088,112 @@ msgstr ""
 msgid "Working"
 msgstr "Arbetar"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtrerar mapp"
 
-#: mail/mail-ops.c:259
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Hämtar post"
 
-#: 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 "Meddelandet skickades dock utan problem."
 
-#: mail/mail-ops.c:600
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Skickar \"%s\""
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Skickar meddelande %d av %d"
 
-#: mail/mail-ops.c:739
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Meddelande %d av %d misslyckades"
 
-#: mail/mail-ops.c:741 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "Färdig."
 
-#: mail/mail-ops.c:834
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/mail-ops.c:941
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopierar"
 
-#: mail/mail-ops.c:1054
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1104 shell/e-local-storage.c:179
-msgid "Trash"
-msgstr "Papperskorg"
-
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1280
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1352
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagret %s"
 
-#: mail/mail-ops.c:1421
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: mail/mail-ops.c:1515
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1566
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: mail/mail-ops.c:1602
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Hämtar %d meddelande(n)"
 
-#: mail/mail-ops.c:1804
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Sparar %d meddelande(n)"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12440,7 +12202,7 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12449,11 +12211,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12462,22 +12224,22 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
 
-#: mail/mail-ops.c:2234
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Kör skalkommando: %s"
@@ -12570,15 +12332,16 @@ msgstr "Ange lösenord för %s"
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: mail/mail-signature-editor.c:44
-msgid "Could not save signature file."
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
 msgstr "Kunde inte spara signaturfilen."
 
-#: mail/mail-signature-editor.c:128
+#: mail/mail-signature-editor.c:172
 msgid "Save signature"
 msgstr "Spara signatur"
 
-#: mail/mail-signature-editor.c:134
+#: mail/mail-signature-editor.c:178
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12588,29 +12351,21 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: mail/mail-signature-editor.c:313
+#: mail/mail-signature-editor.c:357
 #, fuzzy
 msgid "Signature name:"
 msgstr "Signaturfil:"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "Inkomplett meddelande skrevs på rör!"
-
-#: mail/mail-summary.c:467
-msgid "Mail Summary"
-msgstr "E-postsammanfattning"
-
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidarebefordrat meddelande - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Vidarebefordrat meddelande"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Vidarebefordrat meddelande"
 
@@ -12637,10 +12392,6 @@ msgstr ""
 "    \"%s\"\n"
 "och har uppdaterats."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "Virtuella mappar"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "Virtuella mappar"
@@ -12658,11 +12409,11 @@ msgstr "Försöker redigera en virtuell mapp \"%s\" som inte finns."
 msgid "New VFolder"
 msgstr "Ny virtuell mapp"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Inget ämne)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Meddelande"
@@ -12727,25 +12478,25 @@ msgstr "%d %b %Y"
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
 #, fuzzy
 msgid "Due By"
 msgstr "Ska utföras "
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Flag Status"
 msgstr "Status"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Flaggad"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr ""
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Mottaget"
 
@@ -12753,50 +12504,50 @@ msgstr "Mottaget"
 msgid "Size"
 msgstr "Storlek"
 
-#: mail/message-tag-editor.c:91
-msgid "Flag to Follow Up"
-msgstr ""
-
-#: mail/message-tag-followup.c:52
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:53
+#: mail/message-tag-followup.c:58
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Vidarebefordra"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:59
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:60
 #, fuzzy
 msgid "For Your Information"
 msgstr "Källinformation"
 
-#: mail/message-tag-followup.c:56 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:62
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:59 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/message-tag-followup.c:60 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: mail/message-tag-followup.c:61
+#: mail/message-tag-followup.c:66
 #, fuzzy
 msgid "Review"
 msgstr "Förhandsgranska"
 
+#: 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\""
@@ -12818,7 +12569,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Säger upp prenumeration på mappen \"%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 "Mapp"
 
@@ -12863,37 +12614,31 @@ msgid "_Unsubscribe"
 msgstr "_Säg upp prenumeration"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:1
 #, fuzzy
 msgid "Configuration control for the Evolution Summary."
 msgstr "Konfigurationsverktyg för evolutions att-göra-kanal.\n"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:2
 #, fuzzy
 msgid "Evolution Summary component."
 msgstr "Evolutions e-postredigerare."
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:3
 #, fuzzy
 msgid "Factory for Evolution Summary's configuration control."
 msgstr "Fabrik för Evolutions uppgiftskomponent."
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:4
 #, fuzzy
 msgid "Factory for the Evolution Summary component."
 msgstr "Fabrik för Evolutions sammanfattningskomponent."
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:5
 #, fuzzy
 msgid "Summary Preferences"
 msgstr "Inställningar"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.in.h:6
 msgid "This page can be used to customize the appearance of the Summary page."
 msgstr ""
 
@@ -22691,7 +22436,7 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zürich"
 
-#: my-evolution/component-factory.c:48
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "Mapp som innehåller Evolution-sammanfattningen"
 
@@ -22715,11 +22460,17 @@ msgstr "%l.%M %d %B"
 msgid "No description"
 msgstr "Ingen beskrivning"
 
-#: my-evolution/e-summary-mail.c:134
+#: my-evolution/e-summary-mail.c:151
 msgid "Mail summary"
 msgstr "E-postsammanfattning"
 
-#: my-evolution/e-summary-mail.c:398 shell/e-local-storage.c:1022
+#. 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
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
@@ -22733,25 +22484,25 @@ msgstr "Lokala mappar"
 msgid "KBOS"
 msgstr "ESGG:ESMS:ESSA:ESNU"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dagens ord från dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:487
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Dagens citat"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:746
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Lägg till en nyhetskälla"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:754
+#: my-evolution/e-summary-preferences.c:728
 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:758
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Namn:"
 
@@ -22763,17 +22514,24 @@ msgstr "Fel vid hämtning av RDF"
 msgid "News Feed"
 msgstr "Nyhetskälla"
 
-#: my-evolution/e-summary-shown.c:467
+#: my-evolution/e-summary-shown.c:463
 #, fuzzy
-msgid "Add->"
+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:473
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
 #, fuzzy
-msgid "<-Remove"
+msgid "<- Remove"
 msgstr "Ta bort"
 
-#: my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Visa"
@@ -22800,19 +22558,19 @@ msgstr "Ett fel uppstod när nyhetskällan hämtades"
 msgid "Weather"
 msgstr "Väder"
 
-#: my-evolution/e-summary.c:189
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A %e %B %Y"
 
-#: my-evolution/e-summary.c:474
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "Var vänlig vänta..."
 
-#: my-evolution/e-summary.c:565 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Skriv ut sammanfattning"
 
-#: my-evolution/e-summary.c:611
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Utskrift av sammanfattning misslyckades"
 
@@ -22820,38 +22578,6 @@ msgstr "Utskrift av sammanfattning misslyckades"
 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"
@@ -24082,18 +23808,27 @@ msgstr "_Schema"
 msgid "_Weather"
 msgstr "_Väder"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
-msgstr "Fabrik för Evolutions anteckningskomponent."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for Evolution default folders."
+msgstr "Konfigurationsverktyg för evolutions att-göra-kanal.\n"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr "Fabrik för anteckningskontrollen"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Specialmappar"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolutionskalet."
 
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+#, fuzzy
+msgid "This page can be used to configure default folders"
+msgstr ""
+"Denna sida kan användas för att konfigurera åtkomst till katalogservrar "
+"genom användning av LDAP-protokollet"
+
 #: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Visa detaljer"
@@ -24102,20 +23837,11 @@ msgstr "Visa detaljer"
 msgid "Cancel Operation"
 msgstr "Avbryt åtgärd"
 
-#: 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-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution-installation"
 
-#: 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"
@@ -24123,17 +23849,17 @@ msgstr ""
 "Denna nya version av Evolution måste installera ytterligare filer\n"
 "i din personliga Evolutionkatalog"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Klicka på \"OK\" för att installera filerna, eller \"Avbryt\" för att "
 "avsluta."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Kunde inte uppdatera filerna korrekt"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24144,7 +23870,7 @@ msgstr ""
 "%s\n"
 "Fel: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -24153,7 +23879,7 @@ msgstr ""
 "Ett fel inträffade vid kopiering av filer till\n"
 "\"%s\"."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -24164,7 +23890,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -24175,7 +23901,7 @@ msgstr ""
 "har inte rätt rättigheter. Gör den läsbar och\n"
 "körbar och starta om Evolution."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -24186,7 +23912,7 @@ msgstr ""
 "bör tas bort för att Evolution ska kunna fungera korrekt.\n"
 "Ta bort denna fil och starta om Evolution."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -24197,7 +23923,7 @@ msgstr ""
 "Var vänlig och flytta den så att installationen\n"
 "av Evolutions användarfiler kan genomföras."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -24211,7 +23937,7 @@ msgstr ""
 "starta.\n"
 "Vill du att jag ska ta bort katalogen?"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -24356,8 +24082,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:"
@@ -24532,52 +24258,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:170
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy hittades inte i din $PATH."
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kunde inte köras."
 
-#: shell/e-shell-view-menu.c:220
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Om Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:446
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Gå till mapp..."
 
-#: shell/e-shell-view-menu.c:447
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Markera den mapp som du vill öppna"
 
-#: shell/e-shell-view-menu.c:567
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Skapa en ny genväg"
 
-#: shell/e-shell-view-menu.c:568
+#: shell/e-shell-view-menu.c:566
 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:616
-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."
-
-#: shell/e-shell-view-menu.c:624
-#, c-format
-msgid "Error executing %s."
-msgstr "Fel vid körning av %s."
-
-#: shell/e-shell-view-menu.c:739
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: shell/e-shell-view-menu.c:752 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
-#: shell/e-shell-view-menu.c:765 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
@@ -24585,39 +24302,51 @@ msgstr "Arbeta frånkopplad"
 msgid "(No folder displayed)"
 msgstr "(Ingen mapp visas)"
 
-#: 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 "(Ingen)"
 
-#: 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 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:1858
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution håller på att koppla från."
 
-#: 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 Evolution är just nu frånkopplad. Klicka på denna knapp för att "
 "ansluta."
 
-#: shell/e-shell.c:652
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Felet från aktiveringssystemet är:\n"
+"%s"
+
+#: shell/e-shell.c:764
 #, 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:1719
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24628,19 +24357,23 @@ 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:1982
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: shell/e-shell.c:1984
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: shell/e-shell.c:1986
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
-#: shell/e-shell.c:1988 shell/e-storage.c:487
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Allmänt fel"
 
@@ -24765,14 +24498,14 @@ msgstr "Fel vid sparande av genvägar."
 msgid "Shortcuts"
 msgstr "Genvägar"
 
-#: shell/e-storage-set-view.c:649
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Kan inte för över mapp:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Inkorg"
+
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Chico"
 
 #: shell/e-storage.c:485
 msgid "No error"
@@ -24832,10 +24565,13 @@ 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
+msgid "<click here to select a folder>"
+msgstr "<klicka här för att välja en mapp>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -24873,67 +24609,67 @@ msgstr ""
 "Felet från aktiveringssystemet är:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "CORBA-fel"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Avbruten"
 
-#: shell/evolution-shell-component.c:1048
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Ogiltigt argument"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Har redan en ägare"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Ingen ägare"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Hittades inte"
 
-#: shell/evolution-shell-component.c:1056
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Typen stöds inte"
 
-#: shell/evolution-shell-component.c:1058
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Schemat stöds inte"
 
-#: shell/evolution-shell-component.c:1060
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Åtgärden stöds inte"
 
-#: shell/evolution-shell-component.c:1062
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: shell/evolution-shell-component.c:1066
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Existerar"
 
-#: shell/evolution-shell-component.c:1068
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Ogiltig URI"
 
-#: shell/evolution-shell-component.c:1072
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Har undermappar"
 
-#: shell/evolution-shell-component.c:1074
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Inget utrymme kvar"
 
-#: shell/evolution-shell-component.c:1076
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Gamla ägaren har dött"
 
-#: shell/evolution-test-component.c:45
+#: shell/evolution-test-component.c:47
 msgid "Test type"
 msgstr "Testtyp"
 
@@ -25010,7 +24746,8 @@ 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"
@@ -25062,49 +24799,49 @@ 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:88
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:94
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avslutar nu..."
 
-#: shell/main.c:223
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan inte komma åt Ximian Evolution-skalet."
 
-#: shell/main.c:232
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan inte initiera Ximian Evolution-skalet: %s"
 
-#: shell/main.c:302
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Använd inte startbild"
 
-#: shell/main.c:303
+#: shell/main.c:318
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Startar import"
 
-#: shell/main.c:304
+#: shell/main.c:319
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Startar intelligenta importörer"
 
-#: shell/main.c:305
+#: shell/main.c:320
 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:323
+#: shell/main.c:338
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:353
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
@@ -25156,69 +24893,64 @@ msgstr "Klipp ut markeringen"
 msgid "Delete selected contacts"
 msgstr "Ta bort markerade kontakter"
 
-#: ui/evolution-addressbook.xml.h:12
-#, fuzzy
-msgid "Dump"
-msgstr "Kasta XML"
-
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:13
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Ski_cka kontakten till annan..."
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:14
 msgid "Move to Folder..."
 msgstr "Flytta till mapp..."
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Klistra in från urklipp"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Förhandsgranskar kontakterna som ska skrivas ut"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Skriv ut markerade kontakter"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Spara markerade kontakter som ett VCard."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Markera allt"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Markera alla kontakter"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Skicka ett meddelande till de markerade kontakterna."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Skicka meddelande till kontakt"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Skicka markerade kontakter till en annan person."
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Stoppa inläsning"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 msgid "View the current contact"
 msgstr "Visa den aktuella kontakten"
 
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:25
+#: 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
@@ -25228,31 +24960,31 @@ msgstr "Visa den aktuella kontakten"
 msgid "_Actions"
 msgstr "_Åtgärder"
 
-#: ui/evolution-addressbook.xml.h:34
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "_Kontaktlista"
 
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Vidarebefordra kontakt..."
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:38
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "_Spara som VCard"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_Sök efter kontakter"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Markera allt"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:45
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Skicka _meddelande till kontakt..."
@@ -25472,6 +25204,10 @@ 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"
@@ -25592,7 +25328,8 @@ 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"
@@ -25875,7 +25612,8 @@ 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"
@@ -26107,6 +25845,10 @@ msgstr "Infoga en fil som text i meddelandet"
 msgid "Insert text file..."
 msgstr "Infoga textfil..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Öppna"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Öppna en fil"
@@ -26246,10 +25988,6 @@ msgstr "_Öppna..."
 msgid "_Reply-To Field"
 msgstr "_Svara till-fältet"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Säkerhet"
-
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Hjälp"
@@ -26582,8 +26320,8 @@ 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
@@ -26722,25 +26460,24 @@ msgstr "Sökredigerare"
 msgid "Save Search"
 msgstr "Spara sökning"
 
-#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:97
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Spara sökning"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Lägg till i sparade sökningar"
 
-#: widgets/misc/e-filter-bar.h:93
-#, fuzzy
-msgid "_Advanced Search..."
-msgstr "Avancerad sökning"
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Information"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Fel"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Fråga"
@@ -26764,14 +26501,14 @@ msgstr "Sök nu"
 msgid "_Clear"
 msgstr "Töm"
 
-#: widgets/misc/e-search-bar.c:844
-msgid "Find Now"
-msgstr "Sök nu"
-
-#: widgets/misc/e-search-bar.c:846
+#: widgets/misc/e-search-bar.c:835
 msgid "Clear"
 msgstr "Töm"
 
+#: widgets/misc/e-search-bar.c:837
+msgid "Find Now"
+msgstr "Sök nu"
+
 #: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
 #: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
 msgid "The Personal Addressbook Server"
@@ -26794,6 +26531,813 @@ 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"
+
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Kontrollera detta om servern kräver autentisering."
+
+#~ 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 "Server Name"
+#~ msgstr "Servernamn"
+
+#~ 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 "This information is not required for most ldap servers. "
+#~ msgstr "Denna information krävs inte för de flesta ldap-servrar. "
+
+#~ 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 ""
+#~ "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 "This is the name of the server where your addressbook is located."
+#~ msgstr "Detta är namnet på servern där din adressbok finns."
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Detta är porten som din ldap-server använder."
+
+#~ msgid "_Account name:"
+#~ msgstr "_Kontonamn:"
+
+#~ msgid "_Port:"
+#~ msgstr "_Port:"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Andra kontakter"
+
+#~ msgid "(none)"
+#~ msgstr "(ingen)"
+
+#~ msgid "C_ontaining:"
+#~ msgstr "_Innehåller:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Visa kontakter som matchar följande villkor:"
+
+#~ 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?"
+
+#~ 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 "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "Mötet börjar: <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "Uppgiften börjar: <b>"
+
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Ledig-/upptageninformation börjar: <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Börjar: <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Mötet slutar: <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Ledig-/upptageninformation slutar: <b>"
+
+#~ msgid "Ends: <b>"
+#~ msgstr "Slutar: <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Uppgiften färdig: <b>"
+
+#~ msgid "Task Due: <b>"
+#~ msgstr "Uppgiften ska vara utförd: <b>"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "iCalendar-information"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "iCalendar-fel"
+
+#~ msgid "An unknown person"
+#~ msgstr "En okänd person"
+
+#~ 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."
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ingen</i>"
+
+#~ msgid "Status:"
+#~ msgstr "Status:"
+
+#~ msgid "Tentatively Accepted"
+#~ msgstr "Preliminärt godtaget"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Välj en åtgärd:"
+
+#~ msgid "Update"
+#~ msgstr "Uppdatera"
+
+#~ msgid "Accept"
+#~ msgstr "Acceptera"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Acceptera preliminärt"
+
+#~ msgid "Decline"
+#~ msgstr "Neka"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Skicka ledig-/upptageninformation"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Uppdatera svarandestatus"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Skicka senaste information"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> har publicerat mötesinformation."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Mötesinformation"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> begär din närvaro vid ett möte."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Mötesförslag"
+
+#~ 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 "Meeting Update"
+#~ msgstr "Mötesuppdatering"
+
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ msgstr "<b>%s</b> vill få den senaste mötesinformationen."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Begäran av mötesuppdatering"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b> har svarat på en mötesbegäran."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Mötessvar"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> har avbokat ett möte."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Mötesavbokning"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> har skickat ett obegripligt meddelande."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Felaktigt mötesmeddelande"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> har publicerat mötesinformation."
+
+#~ msgid "Task Information"
+#~ msgstr "Uppgiftsinformation"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> begär att du utför en uppgift."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Uppgiftsförslag"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> vill lägga till i en befintlig uppgift."
+
+#~ msgid "Task Update"
+#~ msgstr "Uppgiftsuppdatering"
+
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "<b>%s</b> vill få den senaste uppgiftsinformationen."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Begäran om uppgiftsuppdatering"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b> har svarat på en uppgiftstilldelning."
+
+#~ msgid "Task Reply"
+#~ msgstr "Uppgiftssvar"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> har avbokat en uppgift."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Uppgiftsavbokning"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Felaktigt uppgiftsmeddelande"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> har publicerat ledig-/upptageninformation."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Ledig-/upptageninformation"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> begär din ledig-/upptageninformation."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Ledig-/Upptagenbegäran"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "<b>%s</b> har svarat på en ledig-/upptagenbegäran."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Ledig-/Upptagensvar"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Felaktigt ledig-/upptagenmeddelande"
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Meddelandet verkar inte vara korrekt utformat"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Meddelandet innehåller typer av begäran som inte stöds."
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "Bilagan innehåller inte ett giltigt kalendermeddelande"
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "Bilagan har inga visningsbara kalenderobjekt"
+
+#~ 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."
+
+#~ msgid "Invalid password."
+#~ msgstr "Ogiltigt lösenord."
+
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Kunde inte signera: certifikat hittades inte för \"%s\"."
+
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Kunde inte klartextsignera: certifikat hittades inte för \"%s\"."
+
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ msgstr "Kunde inte kryptera: misslyckades med att skapa kuvertdata."
+
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr ""
+#~ "Kunde inte kryptera: misslyckades med att skapa krypteringssammanhang."
+
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Kunde inte kryptera data: ogiltig användarnyckel: \"%s\"."
+
+#~ 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"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Servern avvisade användarnamnet"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Misslyckades med att skicka användarnamnet till servern"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Servern avvisade användarnamnet/lösenordet"
+
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "Internt fel: uid är i ogiltigt format: %s"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Kunde inte hämta grupplista från servern."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Kan inte läsa in grupplistefilen för %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Kan inte spara grupplistefilen för %s: %s"
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "Evolutionkomponent för sammanfattningen."
+
+#~ msgid "Factory for the Evolution executive summary component."
+#~ msgstr "Fabrik för Evolutions sammanfattningskomponent."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Kan inte initiera Evolutions sammanfattningskomponent."
+
+#~ msgid "Select a service"
+#~ msgstr "Välj en tjänst"
+
+#~ 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 ""
+#~ "Du kan välja en annan HTML-sida som bakgrund för sammanfattningen.\n"
+#~ "\n"
+#~ "Lämna fältet tomt för att få standardsidan."
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Öppna %s med det program som är standard i Gnome"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Öppna %s med standardwebbläsaren i Gnome"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Skicka e-post till %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Kör %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Stäng %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Flytta %s till vänster"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Flytta %s till höger"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Flytta %s till föregående rad"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Flytta %s till nästa rad"
+
+#~ msgid "Configure %s"
+#~ msgstr "Konfigurera %s"
+
+#~ msgid "page"
+#~ msgstr "sida"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunde inte öppna HTML-filen:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Fel vid läsning av data:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Filen har ingen plats för tjänsterna.\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 ""
+#~ "Sammanfattningskomponenten kunde inte initiera Bonobo.\n"
+#~ "Om du fick en varning om RootPOA, betyder det förmodligen att\n"
+#~ "du kompilerade Bonobo med GOAD i stället för OAF."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Fabrik för RDF-sammanfattningen."
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF-sammanfattning"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Fabrik för Bonobo-testkomponenten."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Fabrik för testkomponenten."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Testa Bonobo-tjänsten"
+
+#~ msgid "Test service"
+#~ msgstr "Testa tjänsten"
+
+#~ msgid "Update automatically"
+#~ msgstr "Uppdatera automatiskt"
+
+#~ msgid "Update now"
+#~ msgstr "Uppdatera nu"
+
+#~ msgid "Update every "
+#~ msgstr "Uppdatera var "
+
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Confirm when Expunging a folder"
+#~ msgstr "Bekräfta vid tömning av mapp"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Standardstil för vidarebefordran är: "
+
+#~ msgid "Default character encoding: "
+#~ msgstr "Standardteckenkodning: "
+
+#, fuzzy
+#~ msgid "Delete selected signature"
+#~ msgstr "Ta bort allt utom signatur"
+
+#~ msgid "Display"
+#~ msgstr "Visa"
+
+#~ msgid "Drafts"
+#~ msgstr "Utkast"
+
+#, fuzzy
+#~ msgid "E_mail address:"
+#~ msgstr "_E-postadress:"
+
+#, fuzzy
+#~ msgid "Ed_it..."
+#~ msgstr "Redigera..."
+
+#, fuzzy
+#~ msgid "Edi_t..."
+#~ msgstr "Redigera..."
+
+#, fuzzy
+#~ msgid "File containing signature"
+#~ msgstr "Mapp som innehåller e-post"
+
+#, fuzzy
+#~ msgid "Forwards and Replies"
+#~ msgstr "Vidarebefordra _inuti"
+
+#, fuzzy
+#~ msgid "Hide advanced settings"
+#~ msgstr "Väderinställningar"
+
+#~ msgid "In HTML mail"
+#~ msgstr "I HTML-brev"
+
+#, fuzzy
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Genvägar"
+
+#, fuzzy
+#~ msgid "List of signatures"
+#~ msgstr "Spara signatur"
+
+#~ msgid "Mail Settings"
+#~ msgstr "E-postinställningar"
+
+#, fuzzy
+#~ msgid "N_ew..."
+#~ msgstr "Ny..."
+
+#, fuzzy
+#~ msgid "Name of selected signature"
+#~ msgstr "Ta bort allt utom signatur"
+
+#, fuzzy
+#~ msgid "Ne_w..."
+#~ msgstr "Ny..."
+
+#~ msgid "News"
+#~ msgstr "Diskussionsgrupper"
+
+#~ msgid "Prompt when sending messages with an _empty subject"
+#~ msgstr "Fråga då meddelanden skickas med ett _tomt ämne"
+
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Välj en filterloggfil..."
+
+#~ msgid "Select PGP binary"
+#~ msgstr "Välj PGP-program"
+
+#~ msgid "Sent"
+#~ msgstr "Skickat"
+
+#, fuzzy
+#~ msgid "Shortcut"
+#~ msgstr "_Genväg"
+
+#, fuzzy
+#~ msgid "Show advanced settings"
+#~ msgstr "Inställningar för nyhetskällor"
+
+#, fuzzy
+#~ msgid "Signatures"
+#~ msgstr "Spara signatur"
+
+#~ msgid "Sources"
+#~ msgstr "Källor"
+
+#, fuzzy
+#~ msgid "_Edit..."
+#~ msgstr "Redigera..."
+
+#, fuzzy
+#~ msgid "_Filename"
+#~ msgstr "Filnamn:"
+
+#~ msgid "_Highlight citations with"
+#~ msgstr "Markera _citat med"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "_Logga filteråtgärder i:"
+
+#~ msgid "_Mark messages as Read after"
+#~ msgstr "_Markera meddelanden som lästa efter"
+
+#, fuzzy
+#~ msgid "_Name"
+#~ msgstr "_Namn:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organisation:"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "_Send messages in HTML format by default"
+#~ msgstr "_Skicka brev i HTML-format som standard."
+
+#, fuzzy
+#~ msgid "_Server type: "
+#~ msgstr "_Servertyp: "
+
+#~ msgid "placeholder"
+#~ msgstr "platshållare"
+
+#~ msgid "seconds."
+#~ msgstr "sekunder."
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "_Advanced Search..."
+#~ msgstr "Avancerad sökning"
+
 #~ msgid "Card: "
 #~ msgstr "Kort: "
 
@@ -27038,9 +27582,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Connecting to LDAP server..."
 #~ msgstr "Ansluter till LDAP-servern..."
 
-#~ msgid "Unable to connect to LDAP server."
-#~ msgstr "Kan inte ansluta till LDAP-servern."
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Väntar på anslutning till LDAP-servern..."
 
@@ -27093,8 +27634,7 @@ 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."
@@ -27162,9 +27702,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Mailbox Format"
 #~ msgstr "Brevlådeformat"
 
-#~ msgid "Are you sure you want to delete this news account?"
-#~ msgstr "Är du säker på att du vill ta bort detta diskussionsgruppskonto?"
-
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "Detta meddelande innehåller ogiltiga mottagare:"
 
@@ -27220,9 +27757,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "New List"
 #~ msgstr "Ny lista"
 
-#~ msgid "_Addressbook Sources..."
-#~ msgstr "_Adressbokskällor..."
-
 #~ msgid "Configure the calendar's settings"
 #~ msgstr "Konfigurera kalenderns inställningar"
 
@@ -27287,15 +27821,12 @@ 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"
 
-#~ msgid "Email Address:"
-#~ msgstr "E-postadress:"
-
 #~ msgid "Co_ntacts:"
 #~ msgstr "Ko_ntakter:"
 
@@ -27359,9 +27890,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "The journal entry has changed. Send an updated version?"
 #~ msgstr "Dagboksposten har ändrats. Skicka en uppdaterad version?"
 
-#~ msgid "Special Folders"
-#~ msgstr "Specialmappar"
-
 #~ msgid "°F"
 #~ msgstr "°F"
 
@@ -27606,9 +28134,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "Ange din e-postadress och ditt lösenord för åtkomst till %s"
 
-#~ msgid "LDAP Authentication"
-#~ msgstr "LDAP-autentisering"
-
 #~ msgid "Password:"
 #~ msgstr "Lösenord:"
 
@@ -27657,7 +28182,8 @@ 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"
@@ -27703,8 +28229,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."
 
@@ -27759,9 +28285,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Vidarebefordrat meddelande:\n"
 
-#~ msgid "123"
-#~ msgstr "123"
-
 #~ msgid "a"
 #~ msgstr "a"
 
@@ -27859,13 +28382,12 @@ 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"
@@ -27924,9 +28446,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Add"
 #~ msgstr "Lägg till"
 
-#~ msgid "Edit"
-#~ msgstr "Redigera"
-
 #~ msgid "Evolution Account Manager"
 #~ msgstr "Evolutions kontohanterare"
 
@@ -28047,9 +28566,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Goals/Objectives"
 #~ msgstr "Mål"
 
-#~ msgid "Hot Contacts"
-#~ msgstr "Heta kontakter"
-
 #~ msgid "Strategies"
 #~ msgstr "Strategier"
 
@@ -28062,9 +28578,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "VIP"
 #~ msgstr "VIP"
 
-#~ msgid "Store search as vFolder"
-#~ msgstr "Lagra sökning som vMapp"
-
 #~ msgid "_Appointment (FIXME)"
 #~ msgstr "_Möte (FIXME)"
 
@@ -28123,11 +28636,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"
@@ -28222,11 +28735,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"
@@ -28237,9 +28750,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Has category"
 #~ msgstr "Har kategorin"
 
-#~ msgid "Scanning IMAP folder"
-#~ msgstr "Genomsöker IMAP-mappen"
-
 #~ msgid "Work offline"
 #~ msgstr "Arbeta frånkopplad"
 
@@ -28747,9 +29257,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Edit the task"
 #~ msgstr "Redigera uppgiften"
 
-#~ msgid "Find a contact"
-#~ msgstr "Sök efter en kontakt"
-
 #~ msgid "SASL"
 #~ msgstr "SASL"
 
@@ -28770,8 +29277,7 @@ 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"
@@ -28870,11 +29376,11 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ 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."
@@ -28893,23 +29399,24 @@ 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"
@@ -28982,8 +29489,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 ]"
@@ -29135,15 +29642,11 @@ 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"
 
-#~ msgid "Account Properties"
-#~ msgstr "Kontoegenskaper"
-
 #~ msgid "Incoming Mail Server"
 #~ msgstr "Server för inkommande post"
 
@@ -29257,9 +29760,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Forms"
 #~ msgstr "_Formulär"
 
-#~ msgid "_Object"
-#~ msgstr "_Objekt"
-
 #~ msgid "_Redo"
 #~ msgstr "_Gör om"
 
@@ -29378,9 +29878,9 @@ 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 "
@@ -29393,24 +29893,24 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ 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"
@@ -29427,9 +29927,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Edit Identity"
 #~ msgstr "Redigera identitet"
 
-#~ msgid "Edit News Server"
-#~ msgstr "Redigera diskussionsgruppsserver"
-
 #~ msgid "The connection was successful!"
 #~ msgstr "Anslutningen lyckades!"
 
@@ -29478,9 +29975,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "External Directories"
 #~ msgstr "Externa kataloger"
 
-#~ msgid "Port Number:"
-#~ msgstr "Portnummer:"
-
 #~ msgid "Outline:"
 #~ msgstr "Ram:"
 
@@ -29521,8 +30015,7 @@ 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."
@@ -29605,15 +30098,9 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "yesterday"
 #~ msgstr "igår"
 
-#~ msgid "this"
-#~ msgstr "den"
-
 #~ msgid "next"
 #~ msgstr "nästa"
 
-#~ msgid "first"
-#~ msgstr "första"
-
 #~ msgid "sixth"
 #~ msgstr "sjätte"
 
@@ -29644,9 +30131,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Cannot copy data to output file: %s"
 #~ msgstr "Kan inte kopiera data till utdatafil: %s"
 
-#~ msgid "Could not rename folder `%s': %s"
-#~ msgstr "Kunde inte byta namn på mappen \"%s\": %s"
-
 #~ msgid "Could not rename folder `%s': %s exists"
 #~ msgstr "Kunde inte byta namn på mappen \"%s\": %s existerar"
 
@@ -29746,9 +30230,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "To Do List Properties"
 #~ msgstr "Egenskaper för att-göra-listan"
 
-#~ msgid "Beep on display alarms"
-#~ msgstr "Pip vid alarmvisning"
-
 #~ msgid "Audio alarms timeout after"
 #~ msgstr "Ljudalarm stängs av efter"
 
diff --git a/po/tr.po b/po/tr.po
index ddc92a9cb7..8c76573252 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-02-08 07:58-0500\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -36,6 +36,7 @@ msgid "File As"
 msgstr "Farklı Dosyala"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "İsim"
 
@@ -156,7 +157,6 @@ msgstr "ISDN"
 #: 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
 msgid "Other"
 msgstr "Diğer"
 
@@ -315,14 +315,15 @@ msgid "Family Name"
 msgstr "Tam İsim"
 
 #: addressbook/backend/ebook/e-card-simple.c:792
+#, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Çoklu VCard"
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "%s için VCard"
@@ -335,58 +336,56 @@ 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:62
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo'yu başlatamadım"
 
-#: 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:2732
 msgid "Searching..."
 msgstr "Aranıyor..."
 
-#: addressbook/backend/pas/pas-backend-file.c:262
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
 #. 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 "Arama ifadesinde hata."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:486
-msgid "Connecting to LDAP server..."
-msgstr "LDAP sunucuya bağlantı kuruluyor..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:496
-msgid "Unable to connect to LDAP server."
-msgstr "LDAP sunucuyla bağlantı başarısız oldu"
-
-#: addressbook/backend/pas/pas-backend-ldap.c:512
-msgid "Waiting for connection to LDAP server..."
-msgstr "LDAP sunucuya bağlantı kuruluyor..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:915
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "LDAP sunucuya kart ekleniyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1016
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "LDAP sunucudaki kart siliniyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP sunucudaki kart düzenleniyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2217
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Arama yeniden başlatılıyor."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "LDAP arama sonuçları alınıyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2222
-msgid "Restarting search."
-msgstr "Arama yeniden başlatılıyor."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Kartı silerken bir hata oluştu"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "URL açılamadı: %s"
 
 #: addressbook/conduit/address-conduit.c:293
 msgid "Default Sync Address:"
@@ -426,266 +425,112 @@ msgid "A Bonobo control for displaying an address."
 msgstr "Adres gösteren örnek bir Bonobo denetleyici"
 
 #: 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 "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
 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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution Adres Defteri mini kart görüntüleyici"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Bağlantıları düzenleyen Evolution bileşeni."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Adres defteri mini kart mimarisi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the Addressbook's address popup"
 msgstr "Adres defteri menüsü mimarisi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Örnek adres defteri kontrol mimarisi"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Bağlantılar"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Bağlantı bilgisini içeren dizin"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP Sunucusu"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "Bağlantı bilgisini içeren LDAP sunucusu"
 
-#: addressbook/gui/component/addressbook-component.c:527
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Yeni Bağlantı"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:562
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Bağlantı"
 
-#: addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Yeni Bağlantı Listesi"
 
-#: addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Contact _List"
 msgstr "B_ağlantı Listesi"
 
-#: addressbook/gui/component/addressbook-config.c:223
-msgid "Edit Addressbook"
-msgstr "Adres Defterini Düzenle"
-
-#: 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 "Sunucu ile kimlik denetimi yaparken kullan:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Hesap Adı"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Adres Defterine Ekle"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Addressbook Sources"
-msgstr "Adres Defteri Kaynakları"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Gelişmiş"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Temel"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Temel"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr "Sunucu kimlik denetimi istiyor"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "De_lete"
-msgstr "_Sil"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "E-posta adresi"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid "Evolution will use this email address to authenticate you with the server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr "Biri"
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "Arama _sahası:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Sunucu Adı"
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Aşağıdaki bilgi, adres defterine eklemek için gereklidir.  "
-
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "Bu bilgi pek çok ldap sunucu için gerekli değildir. "
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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
-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/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Burada adres defterinizin bulunduğu sunucunun adı yeralıyor."
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "Bu sizin LDAP sunucunuzun kullandığı port numarasını veriyor."
-
-#: 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 "Bu isim hesabınızı gösterir. Sadece görüntüleme sırasında işe yarar."
-
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "_Hesap adı:"
-
-#: 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
-msgid "_Add"
-msgstr "_Ekle"
-
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr "İ_ndirme Sınırı"
-
-#: 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:41
-#: 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 "_Düzenle"
-
-#: addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:110
-msgid "_Email address:"
-msgstr "_E-posta Adresi:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Port:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "_Sunucu adı:"
-
-#: 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:174 calendar/gui/main.c:135
 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:499
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Adres defterini açamadım"
 
-#: 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"
@@ -694,7 +539,7 @@ msgstr ""
 "Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
 "ya da LDAP sunucusu erişilemiyor olabilir."
 
-#: 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"
@@ -706,7 +551,7 @@ msgstr ""
 "programı CVS kaynaklarından alacağınız openLDAP desteği\n"
 "ile kurmalısınız:\n"
 
-#: 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."
@@ -714,54 +559,47 @@ 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:655
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
+#, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s için parolayı girin (kullanıcı: %s)"
 
-#: addressbook/gui/component/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Herhangi bir alanın içeriği"
-
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
-msgstr "İsim içeriği"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "biter"
 
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
-msgstr "E-posta içeriği"
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "2. E-posta Adresi"
 
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori"
 
 #. 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:772
+#: 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
 msgid "Advanced..."
 msgstr "Gelişmiş..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1067
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Herhangi bir Kategori"
 
-#: addressbook/gui/component/addressbook.c:1150
+#: addressbook/gui/component/addressbook.c:1083
 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
@@ -810,6 +648,621 @@ 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
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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 "Adres Defteri Kaynakları"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Uyarılar"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonim"
+
+#: 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 "_Bağlantı"
+
+#: 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 "Bilgi Yok"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "_Sil"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "_Liste adı:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Email Address:"
+msgstr "_E-posta Adresi:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Evolution Alarmı"
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "_Bul"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Genel"
+
+#: 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 "Yapılandırma"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Marjin"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_her"
+
+#: 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 "Biri"
+
+#: 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 "Öntanımlılar"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Öntanımlılar"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "Arama _sahası:"
+
+#. 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 "Arıyor"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Hepsini Seç"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Silinen"
+
+#: 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 "Bilgi Yok"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Sunucuya bağlantı kuruluyor..."
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Desteklenmeyen şema"
+
+#: 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 ""
+"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"
+"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 "E-posta adresi"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+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:139
+msgid "_Add"
+msgstr "_Ekle"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Ekle"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Eylem ekle"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Eylem ekle"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Uyarılar"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "He_psini sil"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "Gösterim"
+
+#: 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
+#, fuzzy
+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
+#: 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 "_Düzenle"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Toplantıyı düzenle"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution Alarmı"
+
+#: 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 "_Seçenekler"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Port:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Öntanımlılar"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "Arama _sahası:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Sunucu adı:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Dinlenme zamanı (dakika)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Hesap %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "bağlantı-listesi-editörü"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Kart yok"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "%s bağlantısı kesiliyor"
+
+#: 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 "Genel"
+
+#: 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 "Arıyor"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolution adres defteri isim seçme arayüzü."
@@ -819,9 +1272,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Adres defteri isim seçim arayüzü mimarisi"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c: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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Sil"
 
@@ -850,7 +1303,12 @@ msgstr "(%d adet gösterilmiyor)"
 msgid "Unnamed Contact"
 msgstr "İsimsiz Bağlantı"
 
-#: addressbook/gui/component/select-names/e-select-names.c:581
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Gönderen içerir"
+
+#: 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"
@@ -860,7 +1318,7 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: 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"
@@ -868,31 +1326,40 @@ msgid ""
 "correct this problem."
 msgstr ""
 
-#: 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 "Adres Defterinden Bağlantıları Seç"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "İç_erir:"
+msgid "Select Names"
+msgstr "İsimleri Seçin"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "_Bul"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Bağlantıyı Sil?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "İsimleri Seçin"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Bağlantılar"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
+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 "_Taşı..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Dizin:"
 
@@ -953,10 +1420,6 @@ msgstr "Farklı _Dosya:"
 msgid "Full _Name..."
 msgstr "_Tam İsim..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Genel"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -999,10 +1462,11 @@ 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:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1479 mail/mail-config.glade.h:107
-#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "_Sil"
 
@@ -2053,14 +2517,6 @@ 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?"
 
@@ -2300,7 +2756,7 @@ msgstr ""
 "Yine de eklemek istiyor musunuz?"
 
 #: 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 "Gelişmiş Arama"
 
@@ -2309,170 +2765,113 @@ msgstr "Gelişmiş Arama"
 msgid "Search"
 msgstr "Ara"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Kart yok"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d kart"
 
-#: 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:915
-#: addressbook/gui/widgets/e-addressbook-view.c:1015
-#: addressbook/gui/widgets/e-addressbook-view.c:1635
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr "VCard olarak kaydet"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Aç"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
-#: addressbook/gui/widgets/e-addressbook-view.c:1016
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Bağlantıyı Gönder"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
-#: addressbook/gui/widgets/e-addressbook-view.c:1017
-msgid "Send Message to Contact"
-msgstr "Bağlantıya İleti Gönder"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
-#: addressbook/gui/widgets/e-addressbook-view.c:1018
-#: 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:64
-#: ui/my-evolution.xml.h:2
-msgid "Print"
-msgstr "Yazdır"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
-#: addressbook/gui/widgets/e-addressbook-view.c:1020
-msgid "Print Envelope"
-msgstr "Zarfı Yazdır"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
-#: addressbook/gui/widgets/e-addressbook-view.c:1022
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
-msgid "Cut"
-msgstr "Kes"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
-#: addressbook/gui/widgets/e-addressbook-view.c:1023
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:7
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Kopyala"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
-#: addressbook/gui/widgets/e-addressbook-view.c:1024
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
-msgid "Paste"
-msgstr "Yapıştır"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:1025 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:19
-msgid "Delete"
-msgstr "Sil"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: 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:33
-#: shell/evolution-shell-component.c:1020
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: shell/evolution-shell-component.c:1043
 msgid "Success"
 msgstr "Başarıldı"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: 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:1895
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: 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
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Depo çevrimdışı"
 
-#: 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:1071
 msgid "Permission denied"
 msgstr "İzin yok"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Kart bulunamadı"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "Bu kart numarası var"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protokol desteklenmiyor"
 
-#: 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/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
 msgid "Cancelled"
 msgstr "İptal Edildi"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Diğer hata"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Liste eklenirken hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Kart eklenirken hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Liste düzenlenirken hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Listeyi silerken bir hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1433
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Kartı silerken bir hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:202
+#: addressbook/gui/widgets/e-addressbook-util.c:204
 msgid "Display Cards?"
 msgstr "Kartlar Gösterilsin mi?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:203
+#: addressbook/gui/widgets/e-addressbook-util.c:205
 msgid "Display Cards"
 msgstr "Kart Gösterimi"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2480,6 +2879,26 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Monte Scuro"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Kart yok"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Kart yok"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Kart yok"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Bağlantı eklemek buraya tıklayın *"
@@ -2540,18 +2959,121 @@ 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "VCard olarak kaydet"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Yeni Bağlantı"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Yeni Bağlantı Listesi"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "Dizine _Git..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Al..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "Bağ_lantıları Ara"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Adres Defteri Kaynakları..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Pilot Ayarları..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Bağlantıyı Gönder"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Bağlantıya İleti Gönder"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Zarfı Yazdır"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "D_izine Kopyala..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "_Dizine Taşı..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Kes"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "Ş_imdiki Görünüm"
+
+#. 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:585
+#: addressbook/gui/widgets/e-addressbook-view.c:940
 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:590
+#: addressbook/gui/widgets/e-addressbook-view.c:945
 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"
 
@@ -2568,11 +3090,12 @@ msgstr "ve diğer 1 kart."
 msgid "Save in addressbook"
 msgstr "Adres Defterine kaydet"
 
-#: 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 ""
@@ -2582,6 +3105,19 @@ msgstr ""
 "\n"
 "Buraya çift tıklayarak bir bağlantı öğesini yarat."
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Bu bakışta gösterilecek öğe yok\n"
+"\n"
+"Buraya çift tıklayarak bir bağlantı öğesini yarat."
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Kart Görünümü"
@@ -2669,6 +3205,7 @@ msgid "Include:"
 msgstr "İçer:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Yatay"
 
@@ -2693,6 +3230,7 @@ msgid "Options"
 msgstr "Seçenekler"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Konum"
 
@@ -2713,7 +3251,9 @@ msgstr "Kağıt"
 msgid "Paper source:"
 msgstr "Kağıt kaynağı:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Portre"
 
@@ -2773,29 +3313,25 @@ msgstr "_Yazıtipi..."
 msgid "Untitled appointment"
 msgstr "Başlıksız toplantı"
 
-#: 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:635
+#: 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
 msgid "High"
 msgstr "Yüksek"
 
-#: 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:634
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
-#: 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:633
+#: 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
 msgid "Low"
 msgstr "Düşük"
 
 #. 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
 msgid "Undefined"
 msgstr "Tanımsız"
 
@@ -2827,44 +3363,58 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Takvim gösteren örnek bir Bonobo denetleyici."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "E-posta Ayarları..."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+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:4
+#: 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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Takvimi düzenleyen Evolution bileşeni."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "Evolution e-posta bileşen mimarisi."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "Takvim iTip görüntü kontrolü mimarisi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "Örnek Takvim kontrolü mimarisi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Evolution takvimi bileşen mimarisi."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Evolution takvimi bileşen mimarisi."
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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 "Alarm bilgilendirme servisi"
@@ -2873,22 +3423,10 @@ 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
-msgid "Evolution Alarm"
-msgstr "Evolution Alarmı"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -2925,7 +3463,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2262
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Uyarı"
@@ -2945,7 +3483,7 @@ 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:57
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "GNOME başlatılamıyor"
 
@@ -2957,66 +3495,66 @@ msgstr "Alarm bilgilendirme servisi oluşturamadım"
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm bilgilendirme servis mimarisi oluşturamadım"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Özet içeriği"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Açıklama içeriği"
 
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Yorum içeriği"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "Eşleme yok"
 
-#: calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%d %B %A %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 "%d %b %a"
 
-#: 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 "%d %b %a %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: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:834
-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."
+#: 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."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:385
 msgid "Private"
 msgstr "Özel"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Genel"
 
@@ -3037,32 +3575,27 @@ msgid "W"
 msgstr "B"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
 msgid "Free"
 msgstr "Boş"
 
-#: 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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:479 calendar/gui/print.c:2246
 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:480 calendar/gui/print.c:2249
 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-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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Tamamlandı"
 
@@ -3078,9 +3611,10 @@ 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/mail-account-gui.c:1497
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:404
-#: mail/mail-config.glade.h:56
+#: 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
 #: 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
@@ -3095,23 +3629,15 @@ msgstr "Tekrarlama"
 msgid "Assigned"
 msgstr "Görevlendirildi"
 
-#: 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:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
 msgid "Yes"
 msgstr "Evet"
 
-#: 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:310
 msgid "No"
 msgstr "Hayır"
 
-#. 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 "Arıyor"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Gün Görünümü"
@@ -3128,54 +3654,75 @@ msgstr "Hafta Görünümü"
 msgid "Month View"
 msgstr "Ay Görünümü"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Takvim"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Randevuları tutan dizin"
 
-#: calendar/gui/component-factory.c:69 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Görevler"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Yapılacaklar listesini tutan dizin"
 
-#: calendar/gui/component-factory.c:653
-msgid "New appointment"
-msgstr "Y_eni randevu"
-
-#: calendar/gui/component-factory.c:654
-msgid "_Appointment"
-msgstr "_Randevu"
-
-#: calendar/gui/component-factory.c:659
+#: calendar/gui/component-factory.c:695
 msgid "New meeting"
 msgstr "_Yeni toplantı"
 
-#: calendar/gui/component-factory.c:660
+#: calendar/gui/component-factory.c:695
 msgid "_Meeting"
 msgstr "_Toplantı"
 
-#: calendar/gui/component-factory.c:665
+#: calendar/gui/component-factory.c:699
 msgid "New task"
 msgstr "Yeni görev"
 
-#: calendar/gui/component-factory.c:666 ui/evolution-tasks.xml.h:22
+#: calendar/gui/component-factory.c:699
 msgid "_Task"
 msgstr "_Görev"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Y_eni randevu"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "_Randevu"
+
+#: calendar/gui/component-factory.c:707
+msgid "New appointment"
+msgstr "Y_eni randevu"
+
+#: calendar/gui/component-factory.c:707
+msgid "_Appointment"
+msgstr "_Randevu"
+
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "`%s' dizini açılamadı."
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "Takvimin gösterecek olduğu URI"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "Bu dizinin adını değiştir"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Ses Alarm Seçenekleri"
@@ -3238,9 +3785,7 @@ msgstr ""
 msgid "hours"
 msgstr "saat"
 
-#: 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 "dakika"
 
@@ -3368,7 +3913,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.c:748 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Özet:"
 
@@ -3398,7 +3943,7 @@ msgstr "randevu sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: 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:189
 msgid "minute(s)"
 msgstr "dakika"
 
@@ -3441,197 +3986,187 @@ msgstr "Bugün tamamlanması gereken görevlerin rengi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
-msgid "Create new appointments with a default _reminder"
-msgstr "Yeni bir randevu yarat"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
 msgid "Days"
 msgstr "Gün"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#, fuzzy
-msgid "First day of wee_k:"
-msgstr "Haftanın ilk günü:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Cuma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "Hours"
 msgstr "saat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
 msgid "Minutes"
 msgstr "dakika"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#, fuzzy
-msgid "O_verdue tasks:"
-msgstr "Zamanı geçen görevler"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, 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:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #, fuzzy
 msgid "Show week _numbers in date navigator"
 msgstr "Hafta numaralarını göster"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #, fuzzy
 msgid "Su_n"
 msgstr "Paz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Pazar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Bugünün işleri"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_hu"
 msgstr "Per"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "T_ue"
 msgstr "Sal"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
-msgid "Tas_ks due today:"
-msgstr "Bugünün işleri"
+msgid "Task List"
+msgstr "Görev Listesi"
 
-#: 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 "Perşembe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Zaman"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #, fuzzy
 msgid "Time _zone:"
 msgstr "Zaman Dilimi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
-msgid "Time di_visions:"
-msgstr "Zaman bölmeleri:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Zaman biçimi:"
 
-#: 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 "Salı"
 
-#: 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
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Çarşamba"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Çalışma Haftası"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #, fuzzy
 msgid "_12 hour (AM/PM)"
 msgstr "12 saat (öö/ös)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #, fuzzy
 msgid "_24 hour"
 msgstr "24 saat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #, 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 #, fuzzy
 msgid "_Display"
 msgstr "Gösterim"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "_End of day:"
 msgstr "Gün sonu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
 msgid "_Fri"
 msgstr "Cum"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_General"
 msgstr "Genel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "_Silenen İletileri Gizle"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Mon"
 msgstr "Pzt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #, fuzzy
-msgid "_Other"
-msgstr "Diğer"
+msgid "_Overdue tasks:"
+msgstr "Zamanı geçen görevler"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Sat"
 msgstr "Cmt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "_Task List"
-msgstr "Görev Listesi"
+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
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Zaman bölmeleri:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Wed"
 msgstr "Çar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "before the start of the appointment"
 msgstr " randevunun başlangıcından önce"
@@ -3701,75 +4236,62 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: 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:2212
 msgid " (Completed "
 msgstr " (Tamamlanan "
 
-#: 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 "Tamamlanan "
 
-#: 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:2221
 msgid "Due "
 msgstr "Tarihe göre "
 
-#: calendar/gui/dialogs/comp-editor.c:321
+#: calendar/gui/dialogs/comp-editor.c:322
 #, fuzzy
 msgid "Could not update object!"
 msgstr "Dosyalar düzgün bir şekilde güncellenemedi"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "Toplantıyı düzenle"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "Randevular"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Görev - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Özet yok"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2054
-#: mail/mail-display.c:101
-msgid "Overwrite file?"
-msgstr "Dosya üzerine yazılsın mı?"
-
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2061
-#: mail/mail-display.c:105
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Aynı isimde bir dosya zaten var\n"
-"Üzerine yazılsın mı?"
-
-#: 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 "Farklı Kaydet..."
+#: 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
+msgid "Save as..."
+msgstr "Farklı kaydet..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -3828,7 +4350,7 @@ msgstr "Dağıt:"
 msgid "Enter Delegate"
 msgstr "Silinen"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Randevu"
 
@@ -3842,13 +4364,13 @@ msgstr "Tekrarlama"
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 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:365
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "Toplantı"
 
@@ -3895,7 +4417,7 @@ msgid "Pu_blic"
 msgstr "_Genel"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Zamanı Farklı Göster"
 
@@ -3940,58 +4462,52 @@ msgstr "Katılımcı"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-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
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 #, fuzzy
 msgid "Delegated From"
 msgstr "Silinen"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
 msgid "Delegated To"
 msgstr "Görevi Dağıt"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Dil"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Üye"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:843
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 #, fuzzy
 msgid "Role"
 msgstr "Görevler"
 
-#: 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:8
+#: 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"
 msgstr "Durum"
 
-#: 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tür"
@@ -4007,7 +4523,7 @@ msgid "_Change Organizer"
 msgstr "Kurum:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "_Başkalarını Davet Et..."
 
@@ -4016,27 +4532,98 @@ msgstr "_Başkalarını Davet Et..."
 msgid "_Other Organizer"
 msgstr "Kurum:"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Bu randevuyu Evolution düzenleyemiyor."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "tarih"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "liste"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "saniye"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Diğer"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Kuzey"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "liste"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Başka Fakslar"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "gün"
 
-#: 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
-msgid "th"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr "tekrarlar"
 
@@ -4106,7 +4693,8 @@ 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?"
@@ -4131,7 +4719,7 @@ msgid "Progress"
 msgstr "İşlem"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:755
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4143,16 +4731,20 @@ msgstr "Ö_ncelik:"
 msgid "_Status:"
 msgstr "_Durum:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "Temel"
+
 #: 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:324
 #, fuzzy
 msgid "Assignment"
 msgstr "Görevlendirildi"
 
-#: 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.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:42
 msgid "Description:"
 msgstr "Açıklama:"
 
@@ -4164,106 +4756,81 @@ msgstr "_Başlangıç Tarihi:"
 msgid "_Due Date:"
 msgstr "_Tarihe Göre:"
 
-#: calendar/gui/e-calendar-table.c:428
-msgid "0%"
-msgstr "%0"
-
-#: calendar/gui/e-calendar-table.c:429
-msgid "10%"
-msgstr "%10"
-
-#: calendar/gui/e-calendar-table.c:430
-msgid "20%"
-msgstr "%20"
-
-#: calendar/gui/e-calendar-table.c:431
-msgid "30%"
-msgstr "%30"
-
-#: calendar/gui/e-calendar-table.c:432
-msgid "40%"
-msgstr "%40"
-
-#: calendar/gui/e-calendar-table.c:433
-msgid "50%"
-msgstr "%50"
-
-#: calendar/gui/e-calendar-table.c:434
-msgid "60%"
-msgstr "%60"
-
-#: calendar/gui/e-calendar-table.c:435
-msgid "70%"
-msgstr "%70"
-
-#: calendar/gui/e-calendar-table.c:436
-msgid "80%"
-msgstr "%80"
-
-#: calendar/gui/e-calendar-table.c:437
-msgid "90%"
-msgstr "%90"
-
-#: calendar/gui/e-calendar-table.c:438
-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:751 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:960 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1458
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Aç"
 
-#: 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:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Farklı kaydet..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "_Yazdır..."
+
+#: calendar/gui/e-calendar-table.c:978 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: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:39 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:979 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: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:43 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:21
+#: calendar/gui/e-calendar-table.c:980 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 "_Yapıştır"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Görev Ata"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "i_Calendar Olarak Yönlendir"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Bitmiş Olarak İşaretle"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "_Bu Görevi Sil"
-
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_Görevleri Bitmiş Olarak İşaretle"
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_Seçilen Görevleri Sil"
 
-#: calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
-#: calendar/gui/e-week-view.c:3929
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1247
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "_Görev eklemek buraya tıklayın"
 
@@ -4271,48 +4838,47 @@ msgstr "_Görev eklemek buraya tıklayın"
 msgid "Alarms"
 msgstr "Uyarılar"
 
-#: 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Tamamlandı"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Tamamlanma Tarihi"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Tarihe göre:"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Bitiş Tarihi"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Coğrafi Konum"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Öncelik"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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: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:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Özet"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Görev sıralama"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4346,408 +4912,173 @@ msgstr "%02i dakika bölmeleri"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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 "%d %B %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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
 msgid "am"
 msgstr "öö"
 
 #. 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
 msgid "pm"
 msgstr "ös"
 
-#: calendar/gui/e-day-view.c:3525
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "Yeni _Randevu"
 
-#: 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 "Y_eni Tüm Gün Olayı"
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
-#: 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 "_Yeni toplantı"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Yeni Görev"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Yazdır..."
+
+#: 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 "_Bugüne Git"
 
-#: 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üne Git..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-msgid "_Delete this Appointment"
-msgstr "_Bu Randevuyu Sil"
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
-msgid "Make this Occurrence _Movable"
-msgstr "Bu _Oluşumu Taşınabilir Yap"
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
-msgid "Delete this _Occurrence"
-msgstr "_Bu Oluşumu Sil"
-
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
-msgid "Delete _All Occurrences"
-msgstr "_Tüm Oluşumları Sil"
-
-#: calendar/gui/e-itip-control.c:535
-msgid "Meeting begins: <b>"
-msgstr "Toplantı başlangıcı: <b>"
-
-#: calendar/gui/e-itip-control.c:540
-msgid "Task begins: <b>"
-msgstr "Görev başlangıcı: <b>"
+#: 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 "_Boş/Meşgul Bilgisini Yayınla"
 
-#: calendar/gui/e-itip-control.c:545
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
 #, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "İstenen Bilgiler"
-
-#: calendar/gui/e-itip-control.c:549
-msgid "Begins: <b>"
-msgstr "Başlangıç: <b>"
-
-#: calendar/gui/e-itip-control.c:561
-msgid "Meeting ends: <b>"
-msgstr "Toplantı bitişi: <b>"
+msgid "_Configure..."
+msgstr "Yapılandır: %s"
 
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
 #, fuzzy
-msgid "Free/Busy info ends: <b>"
-msgstr "İstenen Bilgiler"
-
-#: calendar/gui/e-itip-control.c:568
-msgid "Ends: <b>"
-msgstr "Bitiş: <b>"
-
-#: calendar/gui/e-itip-control.c:582
-msgid "Task Completed: <b>"
-msgstr "Tamamlanan Görev: <b>"
-
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Due: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-msgid "iCalendar Information"
-msgstr "iCalendar Bilgisi"
+msgid "_Configure Pilot..."
+msgstr "Yapılandır: %s"
 
-#. Title
-#: calendar/gui/e-itip-control.c:644
-msgid "iCalendar Error"
-msgstr "iCalendar Hatası"
+#: 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
+msgid "_Save As..."
+msgstr "_Farklı Kaydet..."
 
-#: calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-msgid "An unknown person"
-msgstr "Bilinmeyen kişi"
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Toplantı Zamanı Düzenle"
 
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:732
-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-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "i_Calendar Olarak Yönlendir"
 
-#: calendar/gui/e-itip-control.c:748
-msgid "<i>None</i>"
-msgstr "<i>Hiçbiri</i>"
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+msgid "Make this Occurrence _Movable"
+msgstr "Bu _Oluşumu Taşınabilir Yap"
 
-#: calendar/gui/e-itip-control.c:760
-msgid "Status:"
-msgstr "Durum:"
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+msgid "Delete this _Occurrence"
+msgstr "_Bu Oluşumu Sil"
 
-#: 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
-msgid "Accepted"
-msgstr "Onaylandı"
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+msgid "Delete _All Occurrences"
+msgstr "_Tüm Oluşumları Sil"
 
-#: calendar/gui/e-itip-control.c:769
-msgid "Tentatively Accepted"
-msgstr ""
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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-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
-msgid "Declined"
-msgstr "Reddedildi"
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
+#, c-format
+msgid "Error executing %s."
+msgstr "%s çalıştırırken bir hata oldu."
 
-#: 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: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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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: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
-msgid "Choose an action:"
-msgstr "Bir eylem seçin:"
-
-#: calendar/gui/e-itip-control.c:824
-msgid "Update"
-msgstr "Güncelle"
-
-#: 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
-msgid "OK"
-msgstr "Tamam"
-
-#: calendar/gui/e-itip-control.c:840
-msgid "Accept"
-msgstr "Onayla"
-
-#: calendar/gui/e-itip-control.c:841
-msgid "Tentatively accept"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:842
-msgid "Decline"
-msgstr "Reddet"
-
-#: calendar/gui/e-itip-control.c:856
-msgid "Send Free/Busy Information"
-msgstr "Boş/Meşgul Bilgisi Gönder"
-
-#: calendar/gui/e-itip-control.c:869
-msgid "Update respondent status"
-msgstr "Cevaplayan Bilgisini Güncelle"
-
-#: calendar/gui/e-itip-control.c:882
-msgid "Send Latest Information"
-msgstr "Güncel Bilgiyi Gönder"
-
-#: calendar/gui/e-itip-control.c:895 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "İptal"
-
-#: calendar/gui/e-itip-control.c:943
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b>, toplantı bilgisi gönderdi."
-
-#: calendar/gui/e-itip-control.c:944
-msgid "Meeting Information"
-msgstr "Toplantı Bilgisi"
-
-#: calendar/gui/e-itip-control.c:948
-#, 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:949
-msgid "Meeting Proposal"
-msgstr "Toplantı Taslağı"
-
-#: calendar/gui/e-itip-control.c:953
-#, 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:954
-msgid "Meeting Update"
-msgstr "Toplantı Güncellemesi"
-
-#: calendar/gui/e-itip-control.c:958
-#, 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:959
-msgid "Meeting Update Request"
-msgstr "Toplantı Güncelleme Bilgisi İsteği"
-
-#: calendar/gui/e-itip-control.c:982
-#, 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:983
-msgid "Meeting Reply"
-msgstr "Toplantı Yanıtı"
-
-#: calendar/gui/e-itip-control.c:987
-#, 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:988
-msgid "Meeting Cancellation"
-msgstr "Toplantı İptali"
-
-#: calendar/gui/e-itip-control.c:992 calendar/gui/e-itip-control.c:1063
-#: calendar/gui/e-itip-control.c:1098
-#, 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:993
-msgid "Bad Meeting Message"
-msgstr "Hatalı Toplantı Mesajı"
-
-#: calendar/gui/e-itip-control.c:1013
-#, 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:1014
-msgid "Task Information"
-msgstr "Görev Bilgisi"
-
-#: calendar/gui/e-itip-control.c:1018
-#, 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:1019
-msgid "Task Proposal"
-msgstr "Görev Taslağı"
-
-#: calendar/gui/e-itip-control.c:1023
-#, 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:1024
-msgid "Task Update"
-msgstr "Görev Güncellemesi"
-
-#: calendar/gui/e-itip-control.c:1028
-#, 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:1029
-msgid "Task Update Request"
-msgstr "Güncel Görev Bilgisi İsteği"
-
-#: calendar/gui/e-itip-control.c:1053
-#, 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:1054
-msgid "Task Reply"
-msgstr "Görev Yanıtı"
-
-#: calendar/gui/e-itip-control.c:1058
-#, 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:1059
-msgid "Task Cancellation"
-msgstr "Görev İptali"
-
-#: calendar/gui/e-itip-control.c:1064
-msgid "Bad Task Message"
-msgstr "Hatalı Görev Mesajı"
-
-#: calendar/gui/e-itip-control.c:1083
-#, 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:1084
-msgid "Free/Busy Information"
-msgstr "Boş/Meşgul Bilgisi"
-
-#: calendar/gui/e-itip-control.c:1088
-#, 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:1089
-msgid "Free/Busy Request"
-msgstr "Boş/Meşgul İsteği"
-
-#: calendar/gui/e-itip-control.c:1093
-#, 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:1094
-msgid "Free/Busy Reply"
-msgstr "Boş/Meşgul Cevabı"
-
-#: calendar/gui/e-itip-control.c:1099
-msgid "Bad Free/Busy Message"
-msgstr "Hatalı Boş/Meşgul Mesajı"
-
-#: calendar/gui/e-itip-control.c:1172
-msgid "The message does not appear to be properly formed"
-msgstr "Bu iletinin biçimi düzgün değil."
-
-#: calendar/gui/e-itip-control.c:1191
-msgid "The message contains only unsupported requests."
-msgstr "Bu iletide desteklenmeyen bilgiler var."
-
-#: calendar/gui/e-itip-control.c:1219 calendar/gui/e-itip-control.c:1225
-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:1250
-msgid "The attachment has no viewable calendar items"
-msgstr "Bu eklentide görüntülenebilir takvim öğeleri bulunmuyor"
-
-#: calendar/gui/e-itip-control.c:1349
+#: 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:1351
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Güncelleme tamamlandı\n"
 
-#: calendar/gui/e-itip-control.c:1396
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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"
+
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 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:1404
+#: 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:1406
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Katılımcı bilgileri güncellendi\n"
 
-#: calendar/gui/e-itip-control.c:1408
-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"
-
-#: calendar/gui/e-itip-control.c:1436
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Bitiş Tamamlandı"
 
-#: calendar/gui/e-itip-control.c:1455 calendar/gui/e-itip-control.c:1505
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "Öğe gönderildi!\n"
 
-#: calendar/gui/e-itip-control.c:1457 calendar/gui/e-itip-control.c:1509
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "Öğe gönderilemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1682
-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"
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Dizini Seçin"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Dizini Seçin"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4786,199 +5117,214 @@ msgstr "bitiş-tarihi"
 msgid "date-start"
 msgstr "başlangıç-tarihi"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Toplantıyı Yönetenler"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Gerekli Katılımcılar"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "Seçimlik Katılımcılar"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "Katılmayanlar"
 
-#: 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:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Bireysel"
 
-#: 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:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Grup"
 
-#: 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:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Kaynak"
 
-#: 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:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Oda"
 
-#: 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:264 calendar/gui/e-meeting-model.c:281
 #, fuzzy
 msgid "Chair"
 msgstr "Araba"
 
-#: 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:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "Gerekli Katılımcı"
 
-#: 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:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "Seçimlik Katılımcı"
 
-#: 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:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Katılmayan"
 
-#: 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:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 msgid "Needs Action"
 msgstr "İşlem Gerektiriyor"
 
-#: 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: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
 msgid "Tentative"
 msgstr "Girişimli"
 
-#: 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:324 calendar/gui/e-meeting-model.c:347
 #, fuzzy
 msgid "Delegated"
 msgstr "Silinen"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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: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:2118 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"
 
 #. 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:436
 msgid "Out of Office"
 msgstr "Ofiste Değil"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Bilgi Yok"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Seçenekler"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "_Sadece Çalışma Saatlerini Göster"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr "_Uzaklaştırılmış Göster"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr "_Boş/Meşgul Olanları Güncelle"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Otomatikman seç"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr "_Tüm Kişiler ve Kaynaklar"
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr "Tüm _Kişiler ve Bir Kaynak"
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr "_Gerekli Kişiler"
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr "Gerekli Kişiler ve _Bir Kaynak"
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr "Toplantı b_aşlama saati :"
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Toplantı _bitiş saati:"
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s tarihinde görevler açılıyor"
 
-#: 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 içindeki görevler yüklenemedi."
 
-#: 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' yüklemek için gereken yöntem desteklenmiyor"
 
-#: calendar/gui/e-tasks.c:629
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Tamamlanma Tarihi"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Seçili bağlantıları sil"
+
+#: calendar/gui/e-tasks.c:659
 msgid "Expunging"
 msgstr "Siliniyor"
 
-#: 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 "Yeni _Randevu..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "_Bu Randevuyu Sil"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' dizini açılamadı."
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1865
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s tarihinde takvim açılıyor"
@@ -5039,298 +5385,238 @@ msgstr "Ekim"
 msgid "September"
 msgstr "Eylül"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr "En az bir katılımcı olmak zorunda"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "Bir düzenleyen kişi olmak zorunda."
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-msgid "Event information"
-msgstr "Olay bilgisi"
-
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-msgid "Task information"
-msgstr "Görev bilgisi"
-
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-#, fuzzy
-msgid "Journal information"
-msgstr "Seçimlik Bilgiler"
-
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-msgid "Free/Busy information"
-msgstr "Boş/Meşgul bilgisi"
-
-#: calendar/gui/itip-utils.c:321
-msgid "Calendar information"
-msgstr "Takvim bilgisi"
-
-#: calendar/gui/itip-utils.c:370
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Boş/Meşgul bilgisi (%s -> %s)"
-
-#: calendar/gui/itip-utils.c:382
-msgid "iCalendar information"
-msgstr "iCalendar bilgisi"
-
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:617
 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:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr "Bileşen düzenleyici mimarisi oluşturulamadı."
 
-#: 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 "8."
 
-#: 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 "39."
 
-#: 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 "Pz"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Pt"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Sa"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Ça"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Pe"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Cu"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Ct"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Seçili gün (%d %b %a %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 "%d %b %a"
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr "%d %a %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 "%d %b %a %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Seçili hafta (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Seçili ay (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Seçili yıl (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Görev"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Durum: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Öncelik: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Biten Yüzde: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Kategoriler: %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "Bağlantılar: "
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Takvimi Yazdır"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2576 my-evolution/e-summary.c:605
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:65
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Önizlemeyi Yazdır"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Öğeyi Yazdır"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Yazdırma Ayarları"
 
 #: calendar/gui/tasks-control-factory.c:75
 #, 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."
+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."
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "Gösterilecek görevler dizininin URI'si"
 
-#: 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"
@@ -5338,15 +5624,23 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2276
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "Tekrar sorma."
 
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Kartları yazdır"
+
 #: calendar/gui/tasks-migrate.c:105
 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ı."
+msgstr ""
+"Evolution takvim dizininde bulunan tüm görevleri görevler dizinine "
+"aktardı."
 
 #: calendar/gui/tasks-migrate.c:108
 msgid ""
@@ -5356,8 +5650,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
@@ -5387,111 +5681,135 @@ msgstr "VCard dosyalarını Evolution'a aktarım mimarisi"
 msgid "Imports iCalendar files into Evolution"
 msgstr "iCalendar dosyalarını Evolution'a aktarır"
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "iCalendar dosyalarını Evolution'a aktarır"
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Takvim Mesajı"
+
+#: 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 e-posta dosyaları buldu.\n"
+"Bunların Evolution'a aktarılmasını istiyor musunuz?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Takvim"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now hiç argüman istemiyor"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time 1 argüman istiyor"
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time için birinci argüman bir dizi olmalıdır."
 
-#: 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 1. argümanı ISO 8601 tarih/saat bilgisi olmalıdır"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day 2 argüman istiyor"
 
-#: calendar/pcs/query.c:317
+#: calendar/pcs/query.c:319
 #, fuzzy
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-day-end birinci argümanı time_t biçiminde istiyor"
 
-#: 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 2. argümanı bir sayı istiyor"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin bir argüman istiyor"
 
-#: 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 birinci argümanı time_t biçiminde istiyor"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end bir argüman istiyor"
 
-#: 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 birinci argümanı time_t biçiminde istiyor"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype hiç argüman istemiyor"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "ocrur-in-time-range? iki argüman istiyor"
 
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:527
 #, fuzzy
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "time-day-end birinci argümanı time_t biçiminde istiyor"
 
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:534
 #, fuzzy
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "time-day-end birinci argümanı time_t biçiminde istiyor"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? iki argüman istiyor"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? birinci argümanı dizgi şeklinde istiyor"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? ikinci argümanı dizgi şeklinde istiyor"
 
-#: calendar/pcs/query.c:691
+#: 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:733
+#: calendar/pcs/query.c:735
 #, fuzzy
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? tüm argümanları dizgi şeklinde istiyor"
 
-#: calendar/pcs/query.c:745
+#: calendar/pcs/query.c:747
 #, fuzzy
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr "has-categories? tüm argümanları dizgi şeklinde istiyor"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 #, fuzzy
 msgid "is-completed? expects 0 arguments"
 msgstr "time-now hiç argüman istemiyor"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "time-now hiç argüman istemiyor"
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "time-day-begin birinci argümanı time_t biçiminde istiyor"
@@ -7034,11 +7352,11 @@ msgstr "Bu şifre ile şifreleme desteklenmiyor"
 msgid "Decryption is not supported by this cipher"
 msgstr "Bu şifreleme ile geriye dönük şifreleme desteklenmiyor"
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 msgid "Unable to create cache path"
 msgstr "Önbellek yolu oluşturulamıyor"
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:441
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Önbellek girdisi silinemedi: %s: %s"
@@ -7070,52 +7388,51 @@ msgstr "Sunucu ile eşzamanlama yapılıyor"
 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"
 
-#: 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 "Dizinler eşzamanlı hale getiriliyor"
 
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "%s filtresini ayrıştırırken hata oldu: %s"
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "%s filtresini çalıştırırken hata oldu: %s"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "Spool dizini açılamadı"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "Spool dizini işlenemedi"
 
-#: camel/camel-filter-driver.c:889
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) iletisi alınıyor"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "İleti açılamadı"
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d iletisinde hata"
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Dizin eşzamanlı hale getiriliyor"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d ileti alınıyor"
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d/%d iletisinde hata"
@@ -7129,7 +7446,7 @@ msgstr "Mesajın alınmasında hata"
 msgid "Error executing filter search: %s: %s"
 msgstr "%s filtre taramasını çalıştırırken hata oldu: %s"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -7138,7 +7455,7 @@ msgstr ""
 "Arama deyimi ayrıştırılamadı: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -7147,35 +7464,31 @@ msgstr ""
 "Arama deyimi çalıştırılamadı: %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 "(hepsini-eşle) boolean sonuç içermelidir"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Bilinmeyen başlık üzerinde arama yapılıyor: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Gövde içeriğinde geçersiz tür. Dizgi bekleniyordu"
-
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Desteklenmeyen işlem: mesaja ekle: %s için"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Desteklenmeyen işlem: ifade ile ara: %s için"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Desteklenmeyen işlem: uid ile ara: %s için"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Mesajlar taşınıyor"
 
@@ -7209,8 +7522,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
@@ -7286,169 +7599,121 @@ msgstr "%s parolasını %s için parolayı girin"
 msgid "Please enter your %s passphrase"
 msgstr "%s parolasını girin"
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Bu mesaj şifrelenemedi"
 
-#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
+#: 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:588 camel/camel-pgp-context.c:768
+#: 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:755
+#: 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:953
+#: 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:959
+#: 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:970
+#: 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:1143
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1153
+#: 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:1160
+#: 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:1169
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1372
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
 
-#: camel/camel-pgp-context.c:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1352
+#: 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:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "%s için parolanızı girin"
-
-#: camel/camel-pkcs7-context.c:213
-#, fuzzy
-msgid "Error hashing password."
-msgstr "Kartlar düzenlenirken bir hata oluştu"
-
-#: camel/camel-pkcs7-context.c:222
-#, fuzzy
-msgid "Invalid password."
-msgstr "Geçersiz ileti içeriği"
-
-#: camel/camel-pkcs7-context.c:329
-#, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "İmzalanamadı: \"%s\" için sertifika bulunamadı."
-
-#: camel/camel-pkcs7-context.c:378
-#, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "İmzalanamadı: \"%s\" için sertifika bulunamadı."
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "Şifrelenemedi: Zarflı veri oluşturulamadı."
-
-#: camel/camel-pkcs7-context.c:590
-#, fuzzy
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "PGP şifreleme dosyası oluşturulamadı."
-
-#: camel/camel-pkcs7-context.c:620
-#, fuzzy, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Sunucuya bağlantı kurulamadı: %s"
-
-#: camel/camel-pkcs7-context.c:626
-#, fuzzy
-msgid "Could not encrypt: encoding failed."
-msgstr "PGP imza dosyası oluşturulamadı."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr "Şifre açılamadı: Bilinmeyen hata"
-
-#: 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 yüklenemedi: Bu sistemde modül yükleneme desteklenmiyor."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s yüklenemedi: %s"
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s yüklenemedi: Modülde başlangıç kodu bulunamadı"
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s sunucu %s"
 
-#: camel/camel-remote-store.c:207
+#: 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:264
+#: 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:267
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(bilinmeyen makine)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7501,7 +7766,8 @@ 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"
@@ -7511,7 +7777,8 @@ msgstr "DIGEST-MD5"
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
-msgstr "Bu seçenek sunucuya güvenli DIGEST-MD5 sistemi ile bağlantı kuracaktır. "
+msgstr ""
+"Bu seçenek sunucuya güvenli DIGEST-MD5 sistemi ile bağlantı kuracaktır. "
 
 #: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
@@ -7555,7 +7822,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Sunucudan hatalı kimlik sınama yanıtı."
 
@@ -7565,15 +7832,27 @@ 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."
 msgstr "Bilinmeyen kimlik denetim konumu."
 
+#: 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 "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:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:61
+#: 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"
 
@@ -7583,7 +7862,9 @@ 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"
+msgstr ""
+"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"
@@ -7617,26 +7898,41 @@ msgstr "'%s' URL'inde makine adı bilgisi bulunmuyor"
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URL'inde dizin bilgisi bulunmuyor"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Çözümleniyor: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "İsim çözümlemesinde hata: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Makine adı çözümlemesinde hata: %s: Makine bulunamadı"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Makine adı çözümlemesinde hata: %s: bilinmeyen hata"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Çözümleniyor: %s"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Makine adı çözümlemesinde hata: %s: Makine bulunamadı"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Makine adı çözümlemesinde hata: %s: bilinmeyen hata"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Sanal dizin e-posta sağlayıcısı"
@@ -7645,12 +7941,12 @@ msgstr "Sanal dizin e-posta sağlayıcısı"
 msgid "For reading mail as a query of another set of folders"
 msgstr "diğer bir dizin listesinden alınan iletileri okumak için"
 
-#: camel/camel-session.c: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' protokolü için alıcı yok"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7659,6 +7955,11 @@ msgstr ""
 "%s dizini yaratılamadı:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "%s için parolanızı girin"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
@@ -7691,15 +7992,15 @@ msgstr "Mesajın açılmasında hata."
 msgid "Failed to verify certificates."
 msgstr "Sertifika denetlenemedi."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Dizin alınamadı: Gerçersiz"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Dizin oluşturulamadı: Geçersiz işlem"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -7708,7 +8009,7 @@ msgstr ""
 "Gönderen: %s\n"
 "Konu: %s"
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7725,7 +8026,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:438
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7738,16 +8039,16 @@ msgstr ""
 "Parmak izi:       %s\n"
 "İmza:              %s"
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr "İYİ"
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr "KÖTÜ"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:500
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7756,8 +8057,7 @@ msgid ""
 "\n"
 "Do you wish to accept?"
 msgstr ""
-"%s adresi için SSL sertifika denetimi"
-"\n"
+"%s adresi için SSL sertifika denetimi\n"
 "%s\n"
 "\n"
 "Kabul etmek istiyor musunuz?"
@@ -7772,27 +8072,27 @@ msgstr "URL açılamadı: %s"
 msgid "No such message %s in %s"
 msgstr "Bu isimle bir ileti yok: %s (%s)"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Bu isimle bir ileti yok: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "%s dizini silinemedi. Geçersiz işlem"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "%s dizini silinemedi: Böyle bir dizin yok"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "%s dizininin adı değiştirilemedi: Bu isimde bir dizin yok"
@@ -7825,52 +8125,52 @@ msgstr "IMAP sunucu cevabı %s bilgisini içermiyor"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP sunucudan beklenmeyen cevap: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s dizini yaratılamadı: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s için özet bilgisi yüklenemedi"
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Değiştirilen iletiler taranıyor"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Bu ileti kullanılabilir değil"
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "Yeni iletilerdeki özet bilgiler alınıyor"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Yeni iletiler taranıyor"
 
-#: camel/providers/imap/camel-imap-folder.c:2145
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cevabında ileti gövdesi bulunamadı"
 
-#: 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 "Önbellek dizini yaratılamadı: %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 "%s iletisi önbelleğe yazılamadı: %s"
@@ -7883,7 +8183,7 @@ msgstr "Yeni iletiler denetleniyor"
 msgid "Check for new messages in all folders"
 msgstr "Yeni iletileri tüm dizinlerde denetle"
 
-#: 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 "Dizinler"
 
@@ -7914,31 +8214,31 @@ msgstr "IMAP sunucuları ileti alma ve göndermede kullanmak için"
 #: 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:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:393
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s kimlik sınama yöntemi desteklenmiyor"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:434
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Bir parola girmediniz."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -7949,57 +8249,58 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Bu isimde bir dizin yok: `%s'"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 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:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "MH biçimli e-posta dizinleri"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 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:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Yerel aktarım"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Maildir biçimli ileti dizinleri"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:80
+#: 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:81
+#: 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:91
+#: camel/providers/local/camel-local-provider.c:116
 msgid "Directory tree of mbox files"
 msgstr "Posta kutusu dosyalarının dizin yapısı"
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8007,56 +8308,62 @@ msgid ""
 "folders first."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s saklama dizininde hata"
 
-#: 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 saklama dizini geçersiz"
 
-#: 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 dizini alınamadı: %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 "Yerel disklerde gelen dizini bulunmasın"
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Yerel mektup dosyası %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:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "%s dizininin adı %s olarak değiştirilemedi: %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 "Dizinin adı değiştirilemedi: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "`%s' dizin özet dosyası silinemedi: %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 "`%s' dizin indeks dosyası silinemedi: %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Özet kaydedilemedi: %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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "İleti özete eklenemedi: bilinmeyen neden"
 
@@ -8097,7 +8404,7 @@ msgstr "İleti bulunmuyor"
 msgid "Invalid message contents"
 msgstr "Geçersiz ileti içeriği"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8107,14 +8414,14 @@ msgstr ""
 "Dizin açılamadı: `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "%s dizini bulunamadı."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8124,33 +8431,57 @@ msgstr ""
 "'%s dizini yaratılamadı:\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' bir maildir dizini."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' dizini silinemedi: %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "maildir dizini değil"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "'%s dizini taranamadı: %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 "Maildir dizini açılamadı: %s: %s"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Yeni iletiler denetleniyor"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+#, 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
 #, c-format
@@ -8196,7 +8527,7 @@ msgstr "Dizin onarılamayacak şekilde bozulmuş."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İletiler düzenlenemiyor: İleti kutusu bozulmuş olabilir."
 
-#: 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"
@@ -8205,7 +8536,7 @@ msgstr ""
 "`%s' dosyası açılamadı:\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"
@@ -8214,14 +8545,14 @@ msgstr ""
 "`%s' dosyası yaratılamadı:\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' normal bir dosya değildir."
 
-#: 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"
@@ -8230,97 +8561,85 @@ msgstr ""
 "`%s' dizini silinemedi:\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 "`%s' dizini boş değil. Silinmedi."
 
-#. 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 "Dizin eşzamanlı hale getiriliyor"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Dizin açılamadı: `%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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "%s dizini alınamadı: %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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "%s dosyası açılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Geçici posta kutusu açılamadı: %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
+#: 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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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"
 msgstr "Kaynak dizin %s açılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "geçici dizin kapatılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Dizinin adı değiştirilemedi: %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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Bilinmeyen hata: %s"
@@ -8340,7 +8659,7 @@ msgstr "Mesaj mh dizinine eklenemedi: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' bir dizin değil."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH dizin yolu açılamadı: %s: %s"
@@ -8356,6 +8675,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' normal bir dosya değildir."
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "%s dizini bulunamadı."
@@ -8365,94 +8685,55 @@ msgstr "%s dizini bulunamadı."
 msgid "Spool mail file %s"
 msgstr "Yerel mektup dosyası %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "'%s dizini taranamadı: %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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "%s yüklenemedi: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "%s@%s için NNTP parolasını giriniz"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Kullanıcı adı sunucu tarafından reddedildi"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Sunucuya kullanıcı adı gönderilemedi"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Sunucu kullanıcı adı ve parolasını reddetti"
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "İç hata: Gerçersiz biçim: %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 "İleti alınamadı: %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 "İşlem iptal edildi"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Sunucudan grup listesi alınamadı."
+#: 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/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 için grup liste dosyası alınamadı: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "%s için grup liste dosyası kaydedilemedi: %s"
+#: 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"
@@ -8460,14 +8741,15 @@ 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ı."
+msgstr ""
+"USENET haber gruplarından ileti okuma ve gönderme için sağlayıcı."
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s üzerinden USENET"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8511,33 +8793,48 @@ msgstr "İptal"
 msgid "Operation failed: %s"
 msgstr "İşlem başarısız oldu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "POP özeti alınıyor"
 
-#: 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 "İşlem iptal edildi"
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "POP özeti alınamadı: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:316
+#: camel/providers/pop3/camel-pop3-folder.c:325
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Seçili iletileri kes"
 
-#: 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 "%s kullanıcı numarasıyla ileti yok"
 
 #. 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 "%d. POP iletisi alınıyor"
 
-#: 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 "İleti alınamadı: %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
 msgid "Unknown reason"
 msgstr "Bilinmeyen neden"
 
@@ -8554,7 +8851,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:60
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -8568,23 +8865,44 @@ 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 ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
-msgstr "Bu seçenek POP sunucuya şifreli APOP protokolünü kullanarak bağlantı kurar."
+msgstr ""
+"Bu seçenek POP sunucuya şifreli APOP protokolünü kullanarak bağlantı "
+"kurar."
 
-#: 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:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, 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
+#, 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:213
-#: camel/providers/pop3/camel-pop3-store.c:316
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8592,26 +8910,27 @@ msgstr ""
 "POP sunucusuyla bağlantı kurulamadı.\n"
 "Belirtilen kimlik sınama protokolü desteklenmiyor."
 
-#: camel/providers/pop3/camel-pop3-store.c:229
+#: camel/providers/pop3/camel-pop3-store.c:405
 #, 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:240
+#: camel/providers/pop3/camel-pop3-store.c:416
 msgid "SASL Protocol error"
 msgstr "SASL Protokol hatası"
 
-#: camel/providers/pop3/camel-pop3-store.c:255
+#: camel/providers/pop3/camel-pop3-store.c:431
 #, c-format
 msgid "I/O Error: %s"
 msgstr "G/Ç hatası: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:276
+#: camel/providers/pop3/camel-pop3-store.c:452
 #, 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:327
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8620,13 +8939,13 @@ msgstr ""
 "POP sunucusuyla bağlantı kurulamadı.\n"
 "Parola iletiminde hata: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, 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:82
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8634,178 +8953,200 @@ 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"
+msgstr "Alıcı listesi açılamadı"
 
-#: 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 ile bağlantı kurulamadı: %s: ileti gönderilemedi"
 
-#: 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 çalıştırılamadı: %s: ileti gönderilemedi"
 
-#: 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 "İleti gönderilemedi: %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 "sendmail %s sinyali ile kapandı: ileti gönderilemedi."
 
-#: 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 çalıştırılamadı: ileti gönderilemedi."
 
-#: 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 durumu ile çıktı: ileti gönderilemedi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-msgid "Could not find 'From' address in message"
-msgstr "İletide 'From' adresi bulunamadı"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-msgid "Could not parse recipient list"
-msgstr "Alıcı listesi açılamadı"
-
-#: 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:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail üzerinden ileti gönderimi"
 
-#: 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"
 
 #: 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:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "İmla hatası, bilinmeyen komut"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametre ya da argümanlarda imla hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Komut henüz tanınmıyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Komut parametresi henüz tanınmıyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Sistem durumu, ya da sistem yardım yanıtı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Yardım mesajı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Servis hazır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Servis iletişim kanalını kapatıyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Servis uygun değil, iletişim kanalı kapatılıyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "İstenen ileti işlemi tamamlandı"
 
-#: 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 "Kullanıcı yerel değil, <forward-path> üzerine yönlendirilecek"
 
-#: 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 "İstenen ileti eylemi yapılmadı: posta kutusu bulunamadı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "İstenen eylem yapılmadı: posta kutusu bulunamadı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "İstenen eylem iptal edildi: işlem sırasında hata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "Kullanıcı yerel değil; lütfen <forward-path> deneyin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr "İstenen eylem yapılmadı: disk alanı yetersiz"
 
-#: 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 "İstenen eylem iptal edildi: disk alanı yetersiz"
 
-#: 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 "İstenen eylem yapılmadı: e-posta kutusu izni yok"
 
-#: 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 "İleti başlangıcını girin, <CRLF>.<CRLF> ile bitirin."
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "İletişim kurulamadı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Parola iletimi gerekiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Kimlik sınama yöntemi çok zayıf"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "İstenen kimlik sınama yöntemi için şifreleme gerekiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Geçici kimlik denetim hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Kimlik denetimi isteniyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Giriş hatası: %s: önemsiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:383
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+#, 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
+#, 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
+#, 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"
 msgstr "%s SMTP sunucusu %s kimlik sınama yöntemini desteklemiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:421
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:442
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8816,92 +9157,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP sunucu %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s üzerinden STMP ileti gönderimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:591
-msgid "Cannot send message: sender address not defined."
-msgstr "İleti gönderilemiyor: gönderen adresi tanımlı değil."
-
-#: camel/providers/smtp/camel-smtp-transport.c:598
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr "İleti gönderilemiyor: gönderen adresi geçersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "İleti gönderiliyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:624
+#: camel/providers/smtp/camel-smtp-transport.c:688
 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:798
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "SMTP Karşılaması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:820
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:840
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO cevap hatası: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:883
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "SMTP Kimlik Denetimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "SASL kimlik denetim nesnesi yaratılamadı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:904
-#: camel/providers/smtp/camel-smtp-transport.c:916
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, 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:925
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "AUTH isteği başarısız."
 
-#: camel/providers/smtp/camel-smtp-transport.c:973
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr "Sunucudan hatalı kimlik sınama yanıtı.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:999
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:1054
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, 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"
@@ -8909,35 +9246,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:1104
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 msgid "DATA response error"
 msgstr "DATA cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1144
-#: camel/providers/smtp/camel-smtp-transport.c:1162
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1176
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 msgid "DATA termination response error"
 msgstr "DATA kesimi cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1199
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, 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:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 msgid "RSET response error"
 msgstr "RSET cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1236
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 msgid "QUIT response error"
 msgstr "QUIT cevap hatası"
 
@@ -8966,7 +9303,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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 "ek"
 
@@ -9006,56 +9343,56 @@ msgid "MIME type:"
 msgstr "MIME türü:"
 
 #: 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 "Eklentinin otomatik gösterimini öner"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Adres defteri için buraya tıklayın"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Gönderen:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Cevapla:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Konu:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Alıcı:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "İletinin gönderildiği kişiler"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Bilgi:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 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:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Gizli:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9063,12 +9400,12 @@ msgstr ""
 "İletinin karbon kopyalarının gönderileceği adresi girin. Ancak buraya "
 "girilecek kişiler gönderilenler listesinde görünmeyecektir."
 
-#: 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 "Bir dosya ekle"
 
-#: composer/e-msg-composer.c:697
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9077,39 +9414,35 @@ msgstr ""
 "%s dosyasını yüklerken hata oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:914
-msgid "Save as..."
-msgstr "Farklı kaydet..."
-
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Uyarı!"
 
-#: composer/e-msg-composer.c:927
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Dosya var. Üzerine yazılsın mı?"
 
-#: composer/e-msg-composer.c:949
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "%s dosyasını kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "`%s' dosyasını yüklerken hata oldu"
 
-#: composer/e-msg-composer.c:999
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Dosyaya erişirken hata oldu: %s"
 
-#: composer/e-msg-composer.c:1007
+#: composer/e-msg-composer.c:1051
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "%s POP sunucusundan iletileri alamadım: %s"
 
-#: composer/e-msg-composer.c:1014
+#: composer/e-msg-composer.c:1058
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9118,7 +9451,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1065
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9127,7 +9460,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1074
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9136,7 +9469,7 @@ msgstr ""
 "İletilerin kaydında hata: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1132
+#: composer/e-msg-composer.c:1176
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -9145,7 +9478,7 @@ msgstr ""
 "Evolution, Pine e-posta dosyaları buldu.\n"
 "Bunların Evolution'a aktarılmasını istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9154,29 +9487,29 @@ msgstr ""
 "Bu ileti gönderilmedi.\n"
 "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1297
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Uyarı: İleti Değiştirildi"
 
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Dosyayı aç"
 
-#: composer/e-msg-composer.c:1469
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Dosya _Ekle"
 
-#: composer/e-msg-composer.c:1855 composer/e-msg-composer.c:2447
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Bir ileti yaz"
 
-#: composer/e-msg-composer.c:2464
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2487 composer/e-msg-composer.c:2542
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -9185,7 +9518,7 @@ msgstr ""
 "E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
 "e-posta bilgilerinizi girmediniz."
 
-#: 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."
@@ -9193,7 +9526,7 @@ msgstr ""
 "E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
 "e-posta bilgilerinizi girmediniz."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution posta programı açılamadı."
 
@@ -9245,12 +9578,21 @@ 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
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Aynı isimde bir dosya zaten var\n"
+"Üzerine yazılsın mı?"
+
 #. 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 "Bu parolayı hatırla"
 
-#: 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 ""
 
@@ -9357,164 +9699,6 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I:%M %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 "Özet için Evolution bileşeni"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Evolution özet bileşen mimarisi."
-
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolution Özet bileşeni ilklendirilemedi."
-
-#: executive-summary/component/e-summary-callbacks.c:125
-msgid "Select a service"
-msgstr "Bir servis seçin"
-
-#: 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 ""
-
-#: 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 "Öntanımlı GNOME uygulaması ile %s dosyasını aç"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Öntanımlı GNOME web tarayıcı ile %s dosyasını aç"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "%s kullanıcısına bir ileti gönder"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Bu dizinin adını değiştir"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "%s çalıştır"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "%s 'i kapat"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "%s 'i sola taşı"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "%s 'i sağa taşı"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "%s 'i önceki satıra taşı"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "%s 'i sonraki satıra taşı"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Yapılandır: %s"
-
-#: executive-summary/component/e-summary-url.c:553
-msgid "page"
-msgstr "sayfa"
-
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"HTML dosyası açılamadı:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Veri okunurken hata oluştu:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr "Bu dosya servisler için yer içermiyor.\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 ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "RDF özeti için mimari"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF Özeti"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Deneme bileşen mimarisi"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Deneme bonobo servisi"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Deneme servisi"
-
-#: 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 "Hata"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "Otomatik güncelle"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "Şimdi güncelle"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "Her "
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "yılda bir güncelle"
@@ -9547,11 +9731,7 @@ msgstr "saat"
 msgid "minute"
 msgstr "dakika"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "saniye"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "saniye"
 
@@ -9627,7 +9807,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:923
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
@@ -9640,15 +9820,15 @@ msgid "Filter Rules"
 msgstr "Filtre Kuralları"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "Sonra"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Eylem ekle"
 
-#: 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."
@@ -9656,19 +9836,11 @@ msgstr ""
 "Bir dizin seçmeyi unuttunuz.\n"
 "Lütfen geriye gidip geçerli bir dizin seçin."
 
-#: 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:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Dizini Seçin"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Dizin URI girin"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<bir dizin seçmek için tıklayın>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9678,7 +9850,7 @@ msgstr ""
 "`%s' düzgün deyiminde hata var:\n"
 "%s"
 
-#: filter/filter-part.c:488 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test"
 
@@ -9686,39 +9858,40 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "Bu filtrenin adını değiştirmelisiniz."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Kural adı:"
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "İsimsiz"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Eğer"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "Eylemleri işlet"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "tüm kriterler sağlanırsa"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "herhangi bir kriter sağlanırsa"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Sınıf ekle"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "gelen"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "giden"
 
@@ -9764,190 +9937,216 @@ msgstr "tüm yerel dizinlerle birlikte"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Puan Belirt"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Renk Belirle"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Puan Belirt"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Ekler"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Boyut"
+
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "içerir"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Dizine Kopyala"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Alınma tarihi"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Gönderilme tarihi"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Silinen"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "içermez"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "sonlanmaz"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "bulunmaz"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "benzemez"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "başlamaz"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Bulunmaz"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Taslak"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "biter"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr "Kabuk Programı Çalıştır"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "bulunur"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "bulunur"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Deyim"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Önemli"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr " "
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "daha önce"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "daha sonra"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "İşaretli"
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "büyük"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "küçük"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "değil"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "İşaretli"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "E-posta listesi"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "İleti Gövdesi"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "İleti Başlığı"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Dizine Taşı"
 
-#: filter/libfilter-i18n.h:34
-msgid "Needs Reply"
-msgstr "Cevap İstiyor"
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "Ses çal:"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Oku"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Alıcılar"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "Düzgün Deyim Eşleşimi"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "Cevaplanan"
 
-#: filter/libfilter-i18n.h:39 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Puan"
 
-#: filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1544
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Gönderen"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Durum belirt"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Boyut (Kb)"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "benzer"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "Kaynak Hesap"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "Özel başlık"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "başlayan"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "İşlemeyi Durdur"
 
-#: filter/libfilter-i18n.h:49 mail/mail-format.c:932
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Konu"
 
@@ -9955,11 +10154,11 @@ msgstr "Konu"
 msgid "Rules"
 msgstr "Görevler"
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Görev Ekle"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Görev Düzenle"
 
@@ -9980,17 +10179,17 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr "E-posta alma va gönderme için Evolution bileşeni"
 
-#: 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 "Alınıyor..."
 
-#: 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 "Lütfen bekleyiniz"
 
-#: 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
 #, fuzzy, c-format
 msgid "Importing %s as %s"
@@ -9998,14 +10197,14 @@ msgstr ""
 "%s alınıyor.\n"
 "%s başlatılıyor"
 
-#: 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 "%s taranıyor"
 
-#: 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:101
 msgid "Mail"
 msgstr "İleti"
 
@@ -10033,23 +10232,74 @@ msgstr ""
 "Evolution, GnomeCard dosyaları buldu.\n"
 "Bunların Evolution'a aktarılmasını istiyor musunuz?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Öncelik: %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, Netscape verilerini alıyor."
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Çöp"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Yerel mektup dosyası %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Dizin taranıyor"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Aktarma işlemi başlıyor"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Filtreleri Düzenle"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10073,46 +10323,96 @@ msgstr ""
 msgid "Pine"
 msgstr "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
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Evolution e-posta programı mimarisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Evolution e-posta bileşen mimarisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Evolution e-posta programı mimarisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Evolution e-posta programı mimarisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "E-posta alma va gönderme için Evolution bileşeni"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolution e-posta programı."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Evolution e-posta özet bileşeni."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Evolution e-posta dizin görüntüleme bileşeni."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Evolution e-posta dizin bileşeni"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Evolution e-posta programı mimarisi."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "E-posta özet bileşen mimarisi"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "_Tekrarlama yok"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Hesaplar"
+
+#: 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 "İleti yapılandırma arayüzü"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "İletileri içeren dizin"
+#: 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)"
+#: 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:101
+msgid "Folder containing mail"
+msgstr "İletileri içeren dizin"
+
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Sanal Çöp"
@@ -10121,34 +10421,33 @@ msgstr "Sanal Çöp"
 msgid "Virtual Trash folder"
 msgstr "Sanal Çöp dizini"
 
-#: mail/component-factory.c:129
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Sunucuya bağlantı kurulamadı: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Bu dizinde ileti bulunamaz."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Özellikler..."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Bu dizinin özelliklerini değiştir"
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:969
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr "Posta iletim yöntemi düzenlenmemiş"
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Yeni İleti"
 
-#: mail/component-factory.c:969 ui/evolution-mail-global.xml.h:20
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_İletiyi Gönder"
 
@@ -10164,191 +10463,212 @@ msgstr "Evolution'ın ileti yapılandırma bileşeni başlatılamadı."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution'ın ileti dizin bilgi bileşeni başlatılamadı."
 
-#: mail/component-factory.c:1225
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Sunucuya bağlantı kuruluyor..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Depo kabuğa kayıt ettirilemedi"
 
-#: mail/folder-browser-ui.c:322
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" özellikleri"
 
-#: mail/folder-browser-ui.c:324
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Özellikler"
 
-#: mail/folder-browser.c:298 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:752
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d yeni"
 
-#: mail/folder-browser.c:755 mail/folder-browser.c:763
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:757
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d gizli"
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr "%d görünür"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d seçili"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d gönderilmemiş"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d gönderilmiş"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "toplam %d"
 
-#: mail/folder-browser.c:1060
+#: mail/folder-browser.c:1088
 #, fuzzy
-msgid "Create vFolder from Search"
-msgstr "İ_letiden Bir Filtre Yarat"
+msgid "Create _Virtual Folder From Search..."
+msgstr "İletiden _Sanal Dizin Yarat"
 
-#: mail/folder-browser.c:1441
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "_Konuya Göre VFolder"
 
-#: mail/folder-browser.c:1442
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "_Gönderene Göre VFolder"
 
-#: mail/folder-browser.c:1443
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "_Alıcılara Göre VFolder"
 
-#: mail/folder-browser.c:1444
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "_E-posta Listesi Üzerinde VFolder"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "_Konuya Göre Filtrele"
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "_Gönderene Göre Filtrele"
 
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "_Alıcılara Göre Filtrele"
 
-#: mail/folder-browser.c:1451
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "_E-posta Listelerine Göre Filtrele"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "Yeni İleti Olarak _Düzenle..."
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:107
-msgid "_Save As..."
-msgstr "_Farklı Kaydet..."
-
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Yazdır"
 
-#: mail/folder-browser.c:1465 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Gönderene Cevapla"
 
-#: mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "_Listeye Cevapla"
 
-#: mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "_Tümüne Cevapla"
 
-#: mail/folder-browser.c:1468
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Yönlendir"
 
-#: mail/folder-browser.c:1470 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Tamamlandı"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Temizle"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_Okunmuş Olarak İşaretle"
 
-#: mail/folder-browser.c:1471 ui/evolution-mail-message.xml.h:42
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Oku_nmamış Olarak İşaretle"
 
-#: mail/folder-browser.c:1472
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Ö_nemli Olarak İşaretle"
 
-#: mail/folder-browser.c:1473
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Ö_nemsiz Olarak İşaretle"
 
-#: mail/folder-browser.c:1477
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Silme"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "_Dizine Taşı..."
 
-#: mail/folder-browser.c:1478
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
-#: mail/folder-browser.c:1480 ui/evolution-mail-message.xml.h:109
-msgid "_Undelete"
-msgstr "_Silme"
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "Çağrı Cihazı"
 
-#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
-msgstr "Göndereni Adres Defterine Ekle"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
+msgstr "_Göndereni Adres Defterine Ekle"
 
-#: mail/folder-browser.c:1487
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Filtreleri Uygula"
 
-#: mail/folder-browser.c:1489
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "İletiden Bir Kural Yarat"
 
-#: mail/folder-browser.c:1639
-msgid "Filter on Mailing List"
-msgstr "E-posta Listelerine Göre Filtreleme"
-
-#: mail/folder-browser.c:1640
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "E-posta Listesi Üzerinde VFolder"
 
-#: mail/folder-browser.c:1642
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "E-posta Listesine Filtre (%s)"
 
-#: mail/folder-browser.c:1643
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "E-posta Listesi Üzerinde VFolder (%s)"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Öntanımlı"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Dizin Bilgisi Alınıyor"
@@ -10370,26 +10690,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Outlook Express dosyalarını Evolution'a aktarır"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Gövde içerir"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Güncel depolama biçimi:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "İndeksleniyor:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Posta Kutusu Biçimi"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Gövde içerir"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Yeni depolama biçimi:"
 
-#: 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"
@@ -10399,15 +10712,15 @@ msgstr ""
 "diskin dolması gibi hatalarda veri kayıpları olabilir.\n"
 "Lütfen bu özelliği dikkatli kullanın."
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "pdizini"
 
-#: mail/local-config.glade.h:10
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "pkutusu"
 
-#: mail/local-config.glade.h:11
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
@@ -10425,86 +10738,80 @@ msgstr "Evolution Haber Grubu Düzenleyici"
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesap Düzenleyici"
 
-#: mail/mail-account-gui.c:959
-msgid "Could not save signature file."
-msgstr "İmza dosyası kaydedilemedi."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Makina:"
 
-#: mail/mail-account-gui.c:1036
-msgid "Save signature"
-msgstr "İmzayı kaydet"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "_Kullanıcı adı:"
 
-#: mail/mail-account-gui.c:1042
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#, 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 ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Bu ileti değiştirildi, ancak kaydedilmedi.\n"
-"\n"
-"Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: mail/mail-account-gui.c:1666
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr "İki hesabı aynı isimlerle oluşturamazsınız."
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (öntanımlı)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Kapat"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Etkinleştir"
-
-#: mail/mail-accounts.c:292
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "Gerçekten bu hesabı silmek istiyor musunuz?"
 
-#: mail/mail-accounts.c:296
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Silme"
 
-#: mail/mail-accounts.c:299
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Gerçekten hesap silinsin mi?"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.c:535
-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:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Kapat"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:50
-msgid "Mail Settings"
-msgstr "İleti Ayarları"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Etkinleştir"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "%s'e Postala"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "Gerçekten bu haber grubu hesabını silmek istiyor musunuz?"
 
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Konu: %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Etkin"
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "%s'ten E-posta"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "_Hesap adı:"
 
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "%s posta listesi"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Porto Riko"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Filtre Kuralı Ekle"
 
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10516,7 +10823,7 @@ msgstr ""
 "önce yapmanız gerekiyor.\n"
 "Şimdi yapılandırmak istiyor musunuz?"
 
-#: mail/mail-callbacks.c:143
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10524,7 +10831,7 @@ msgstr ""
 "İleti göndermeden önce kendinize\n"
 "ait bir kimlik oluşturmalısınız."
 
-#: mail/mail-callbacks.c:157
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10532,24 +10839,20 @@ msgstr ""
 "İleti göndermeden önce bir posta\n"
 "iletim ayarı yapmalısınız."
 
-#: mail/mail-callbacks.c:187
-msgid "You have not set a mail transport method"
-msgstr "Posta iletim yöntemi düzenlenmemiş"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:194
 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:237
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Yine de gönderilsin mi?"
 
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10557,35 +10860,35 @@ msgstr ""
 "Bu iletinin konusu yok.\n"
 "Yine de gönderilsin mi?"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:295
 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:327
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "Bu ileti sadece gizli (Bcc) alıcıları içeriyor."
 
-#: mail/mail-callbacks.c:331
+#: mail/mail-callbacks.c:303
 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:436
+#: mail/mail-callbacks.c:408
 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:525
+#: mail/mail-callbacks.c:497
 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:644
+#: mail/mail-callbacks.c:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10593,28 +10896,28 @@ msgstr ""
 "Bu hesap için taslak dizini açılamadı.\n"
 "Öntanımlı taslak dizinini kullanmak istiyor musunuz?"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "bilinmeyen gönderici"
 
-#: mail/mail-callbacks.c:973
+#: mail/mail-callbacks.c:981
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1421 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "İletileri buraya taşı"
 
-#: mail/mail-callbacks.c:1423 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "İleti(leri) buraya kopyala"
 
-#: mail/mail-callbacks.c:1905
+#: mail/mail-callbacks.c:2091
 #, 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:1930
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10622,7 +10925,7 @@ msgstr ""
 "Sadece taslaklar dizinine kaydedilen\n"
 "iletileri düzenleyebilirsiniz."
 
-#: mail/mail-callbacks.c:1969
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10630,24 +10933,39 @@ msgstr ""
 "Sadece Gönderilen dizinine kaydedilen\n"
 "iletileri yeniden gönderebilirsiniz."
 
-#: mail/mail-callbacks.c:1983
+#: mail/mail-callbacks.c:2169
 #, 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:2009
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Hiç İleti Seçilmedi"
 
-#: mail/mail-callbacks.c:2108
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Dosya üzerine yazılsın mı?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "İletiyi Farklı Kaydet..."
 
-#: mail/mail-callbacks.c:2110
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "İletileri Farklı Kaydet..."
 
-#: mail/mail-callbacks.c:2269
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Sonraki okunmamış iletiyi göster"
+
+#: mail/mail-callbacks.c:2373
+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
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10655,7 +10973,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2384
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10664,28 +10982,28 @@ msgstr ""
 "Filtre bilgisini yüklerken hata oluştu:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2396
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtreler"
 
-#: mail/mail-callbacks.c:2469
+#: mail/mail-callbacks.c:2783
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sayfa %d/%d"
 
-#: mail/mail-callbacks.c:2521
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "İletiyi Yazdır"
 
-#: mail/mail-callbacks.c:2548
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "Zarf"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "İletiyi yazdırılmasında hata"
 
-#: mail/mail-callbacks.c:2749
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, 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?"
@@ -10696,9 +11014,9 @@ msgid ""
 "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
@@ -10707,9 +11025,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"
@@ -10722,9 +11040,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 ""
@@ -10736,22 +11054,44 @@ msgid ""
 "space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"E-posta yapılandırma işlemi neredeyse tamamlandı. Kimlik ayarlarınız, 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 amaçlı olarak kullanılacaktır."
+"E-posta yapılandırma işlemi neredeyse tamamlandı. Kimlik ayarlarınız, "
+"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"
+" amaçlı olarak kullanılacaktır."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesap Sihirbazı"
 
-#: mail/mail-config.c:354
-#, c-format
-msgid "Account %d"
-msgstr "Hesap %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Çalışıyor"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "sonra"
 
-#: mail/mail-config.c:1995
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -10759,108 +11099,152 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. 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: Gelen"
-
-#: mail/mail-config.c:2256
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Servis Denetleniyor"
 
-#: mail/mail-config.c:2334 mail/mail-config.c:2338
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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
-msgid " _Check for supported types "
-msgstr "_Desteklenen türleri denetle "
+#, fuzzy
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " renk"
+#, 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
 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:4
+#: mail/mail-config.glade.h:6
 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:5
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
-msgid "Account"
-msgstr "Hesap"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Hesap %d"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Hesap Bilgisi"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Hesap Yöneticisi"
 
-#: mail/mail-config.glade.h:9
-msgid "Accounts"
-msgstr "Hesaplar"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "İşlemi İ_ptal Et"
 
-#: mail/mail-config.glade.h:10
-msgid "Always _blind carbon-copy (Bcc) to:"
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Afrika/Lagos"
+
+#: mail/mail-config.glade.h:13
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always _carbon-copy (Cc) to:"
+#: 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:12
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:14 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "Ağustos"
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "İletiyi bir dosya ekle"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Ek"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Kimlik Denetimi"
 
-#: mail/mail-config.glade.h:16
-msgid "Beep when new mail arrives"
-msgstr "Yeni ileti geldiği zaman ses çıkar"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "_Yeni iletileri otomatik denetle:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Bilinmeyen karakter seti: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_Kapat"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Yeni İletiler Denetleniyor"
 
-#: mail/mail-config.glade.h:18
-msgid "Composer"
-msgstr "Düzenleyici"
-
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "İleti Düzenleniyor"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Yapılandırma"
 
-#: mail/mail-config.glade.h:21
-#, fuzzy
-msgid "Confirm when Expunging a folder"
-msgstr "Dizin siliniyor"
-
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10876,262 +11260,374 @@ msgstr ""
 "\n"
 "Ayarlarınızı kaydetmek için \"Bitir\" düğmesine tıklayın."
 
-#: mail/mail-config.glade.h:28
+#: 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:29
+#: mail/mail-config.glade.h:39
 #, fuzzy
-msgid "Default Forward style is: "
-msgstr "Öntanımlı \"Yönlendirme\" türü: "
+msgid "Default Behavior"
+msgstr "Öntanımlı Ö_ncelik:"
 
-#: mail/mail-config.glade.h:30
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Öntanımlı karakter kodlaması: "
 
-#: mail/mail-config.glade.h:31
-msgid "Defaults"
-msgstr "Öntanımlılar"
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "E-posta Alınıyor"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Sayısal Numaralar..."
 
-#: mail/mail-config.glade.h:34
-msgid "Display"
-msgstr "Gösterim"
-
-#: mail/mail-config.glade.h:35
-msgid "Do not notify me when new mail arrives"
-msgstr "Yeni ileti geldiğinde haber verme"
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "İleti açılamadı"
 
-#: mail/mail-config.glade.h:36 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Tamamlandı"
 
-#: mail/mail-config.glade.h:37 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Taslaklar"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "_Taslaklar dizini:"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "_Etkinleştir"
 
-#: mail/mail-config.glade.h:39 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Düzenle..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Enabled"
-msgstr "Etkin"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Doğu"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "E-posta içeriği"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "_E-posta Adresi:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "Çıkarken taslaklar dizinini sil"
+
+#: mail/mail-config.glade.h:53
 msgid "Execute Command..."
 msgstr "Komut Çalıştır..."
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "biter"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Özellikler"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Yönlendirilen iletiler"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Sayısal Numarayı Al..."
 
-#: mail/mail-config.glade.h:43
-msgid "HTML signature file:"
-msgstr "HTML imza dosyası:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "Renklendir: "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Tuvalu"
+
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: 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 "Kimlik"
 
-#: mail/mail-config.glade.h:46
-msgid "In HTML mail"
-msgstr "HTML iletide"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Inline"
 msgstr "_Bağlantıda"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Kaydet ve Kapat"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Resimleri _Yükle"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "E-posta Yapılandırması"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Posta Kutusu konumu"
 
-#: mail/mail-config.glade.h:52
-msgid "Make this my _default account"
-msgstr "_Bunu öntanımlı hesabım yap"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "İleti Başlığı"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "İleti _Görünümü"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikronezya"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP Sunucusu: "
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Yeni İleti Uyarısı"
 
-#: mail/mail-config.glade.h:55
-msgid "News"
-msgstr "Haberler"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Haber _Grupları"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Seçimlik Bilgiler"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "_Kurum:"
+
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Anahtar Numarası:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Bir renk seçin"
 
-#: mail/mail-config.glade.h:63
-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:88
+#, 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:64
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:65
-#, 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:66
-#, fuzzy
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Bu konuyla iletileri filtrelemek için kural oluştur"
-
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:90
 #, fuzzy
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
+msgid "Printed Fonts"
+msgstr "Seçili bağlantıları yazdır"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail dizini "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "İleti açılamadı"
+
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quoted"
 msgstr "_Kotelenmiş"
 
-#: mail/mail-config.glade.h:70
+#: 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"
 
-#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:6
-msgid "Receiving Email"
-msgstr "E-posta Alınıyor"
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Cevapla:"
 
-#: mail/mail-config.glade.h:72
-msgid "Receiving Mail"
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+msgid "Receiving Email"
 msgstr "E-posta Alınıyor"
 
-#: mail/mail-config.glade.h:73
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Alma Seçenekleri"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Bu parolayı hatırla"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "İstenen Bilgiler"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:103
+#, fuzzy
+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:77
-msgid "Security"
-msgstr "Güvenlik"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:78
-msgid "Select Filter Log file..."
-msgstr "Bir Filtre Günlük Dosyası Seçin..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "PGP programını seçin"
 
-#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "E-posta Gönderiliyor"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "İmza dosyası:"
 
-#: mail/mail-config.glade.h:81
-msgid "Sending Mail"
-msgstr "E-posta Gönderiliyor"
+#: 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:83 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Gönderildi"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "E-posta Gönderiliyor"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Gönderilen iletiler dizini:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Gönderilen ve Taslak İletileri"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Sunucu kimlik denetimi istiyor"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Sunucu Yapılandırması"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Sunucu Türü: "
 
-#: mail/mail-config.glade.h:89
-msgid "Signature file:"
-msgstr "İmza dosyası:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Kısayollar"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "İmzayı kaydet"
+
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Source"
 msgstr "Kaynaklar"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "Source Information"
 msgstr "Bilgi Yok"
 
-#: mail/mail-config.glade.h:92
-msgid "Sources"
-msgstr "Kaynaklar"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:124
 #, fuzzy
-msgid "Specify filename:"
+msgid "Specify _filename:"
 msgstr "Stil adı:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX posta kutusu dosyası"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:128
+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 s_ecure connection (SSL)"
-msgstr "Güvenli bağlantı (SSL) kullan"
+msgid "Use _HTML for this signature"
+msgstr "_HTML imzası:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Değişken"
+
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -11142,137 +11638,220 @@ msgstr ""
 "\n"
 "Devam etmek için \"İleri\" düğmesine tıklayın."
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Doğu"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Kimlik Denetim Türü: "
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:143
 msgid "_Authentication type: "
 msgstr "_Kimlik denetim türü: "
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "_Yeni iletileri otomatik denetle:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:145
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "Yeni ileti geldiği zaman ses çıkar"
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Sertifika No:"
 
-#: mail/mail-config.glade.h:108
-msgid "_Drafts folder:"
-msgstr "_Taslaklar dizini:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:111
-msgid "_Empty trash folders on exit"
-msgstr "Çıkarken taslaklar dizinini sil"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Dizin siliniyor"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Öntanımlılar"
+
+#: mail/mail-config.glade.h:151
+#, 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
+#, fuzzy
+msgid "_Filename:"
+msgstr "Dosya adı:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "İletiyi _Yönlendir"
+
+#: mail/mail-config.glade.h:157
 msgid "_Full name:"
 msgstr "_Tam isim:"
 
-#: mail/mail-config.glade.h:113
-msgid "_HTML signature:"
+#: mail/mail-config.glade.h:159
+#, 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:114
+#: mail/mail-config.glade.h:162
 #, fuzzy
-msgid "_Highlight citations with"
-msgstr "Renklendir: "
+msgid "_Identity"
+msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:115
-msgid "_Host:"
-msgstr "_Makina:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Dil"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "Gönderici adres defterinde ise resimleri yükle"
 
-#: mail/mail-config.glade.h:117
-msgid "_Log filter actions to:"
-msgstr ""
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "_Bunu öntanımlı hesabım yap"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:166
 #, fuzzy
-msgid "_Mark messages as Read after"
+msgid "_Mark messages as read after"
 msgstr "İletileri okunmuş olarak işaretle:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Name:"
 msgstr "İsim:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
-#, fuzzy
-msgid "_Organization:"
-msgstr "Kurum:"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP program yolu:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:171
 #, fuzzy
-msgid "_Path:"
-msgstr "Yol:"
+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:124
+#: mail/mail-config.glade.h:172
 #, fuzzy
-msgid "_Remember this password"
-msgstr "Bu parolayı hatırla"
+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:125
+#: mail/mail-config.glade.h:173
 #, fuzzy
-msgid "_Send mail in HTML format by default."
-msgstr "E-postaları öntanımlı olarak HTML gönder."
+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:126
+#: mail/mail-config.glade.h:174
 #, fuzzy
-msgid "_Server type: "
-msgstr "Sunucu Türü: "
+msgid "_Random"
+msgstr "Radyo"
+
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "E-posta Alınıyor"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Signature file:"
+msgid "_Reply style:"
+msgstr "Tümüne cevapla"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Güvenlik"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Güvenlik"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "E-posta Gönderiliyor"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Zamanı Farklı Göster"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
 msgstr "İmza dosyası:"
 
-#: mail/mail-config.glade.h:128
-msgid "_Username:"
-msgstr "_Kullanıcı adı:"
+#: 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:129
+#: mail/mail-config.glade.h:185
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Değişken"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_her"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " renk"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "açıklama"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:133
-msgid "placeholder"
-msgstr ""
-
-#: mail/mail-config.glade.h:134
-msgid "seconds."
-msgstr "saniye."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "PGP imza dosyası oluşturulamadı."
@@ -11309,143 +11888,137 @@ msgstr "S/MIME şifreli zarf içeriği oluşturulamıyor."
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME kodlama içeriği oluşturulamıyor."
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Eki Kaydet"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Geçici dizin yaratılamadı: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Diske Kaydet..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "İzle"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "%s içinde aç..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "İzle (%s kullanarak)"
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Gizle"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Harici İzleyici"
 
-#: mail/mail-display.c:1162
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "İleti içeriği yükleniyor"
 
-#: mail/mail-display.c:1657
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Bağlantıyı Tarayıcıda Aç"
 
-#: mail/mail-display.c:1659
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Adresi Kopyala"
 
-#: mail/mail-display.c:1662
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Bağlantıyı Farklı Kaydet"
 
-#: mail/mail-display.c:1665
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Resmi Farklı Kaydet..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s ek"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarih"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Hatalı Adres"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Gönderen"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Yanıtla:"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Alıcı"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Bilgi:"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Gizli"
 
-#: mail/mail-format.c:1767
-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:1790
-msgid "Evolution does not recognize this type of signed message."
-msgstr ""
-
-#: mail/mail-format.c:1798
-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:1806
-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:915
+#, fuzzy
+msgid "Mailer"
+msgstr "İleti"
 
-#: mail/mail-format.c:2021
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP adresine bağ (%s)"
 
-#: mail/mail-format.c:2035
+#: mail/mail-format.c:2120
 #, 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:2040
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerel dosyaya bağ (%s)"
 
-#: mail/mail-format.c:2069
+#: mail/mail-format.c:2154
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "FTP adresine bağ (%s)"
 
-#: mail/mail-format.c:2077
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Bilinmeyen harici veriye bağ (\"%s\" türünde)"
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Bozuk harici gövde"
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Dizin yeniden yapılandırılıyor"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11454,29 +12027,29 @@ msgstr ""
 "Dizin meta bilgisi kaydedilemedi. Büyük ihtimalle bu dizini \n"
 "yeniden açamayacaksınız: %s"
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "%s üzerinde dizin kilitlemesi yaratılamadı: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "`%s' dizini silinemedi:\n"
 "%s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" biçiminden \"%s\" biçimine geçiliyor"
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11484,12 +12057,12 @@ msgstr ""
 "Eğer bu dizini tekrar açamazsınız, elle \n"
 "düzeltme yapmak zorunda kalacaksınız."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Bu çöp dizininden iletileri kopyalayamazsınız."
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Yeniden Yapılandır: %s"
@@ -11516,119 +12089,114 @@ msgstr ""
 msgid "Working"
 msgstr "Çalışıyor"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "E-posta Alınıyor"
 
-#: 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:599
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" gönderiliyor"
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ileti gönderiliyor"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d iletide hata"
 
-#: 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 "Tamamlandı."
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "İletiler dizine kaydediliyor"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İletiler %s'e taşınıyor"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İletiler %s'e kopyalanıyor"
 
-#: mail/mail-ops.c:940
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Taşınıyor"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopyalanıyor"
 
-#: mail/mail-ops.c:1053
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1103 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Çöp"
-
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Yönlendirilen iletiler"
 
-#: mail/mail-ops.c:1279
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s dizini açılıyor"
 
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "%s deposu açılıyor"
 
-#: mail/mail-ops.c:1420
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1518
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Yeni dizin yaratılıyor"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:1601
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s iletisi alınıyor"
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1721
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "İletiler alınıyor"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1807
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "İletiler kaydediliyor"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11637,7 +12205,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11646,11 +12214,11 @@ msgstr ""
 "İletilerin kaydında hata: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Ek kaydediliyor"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11659,27 +12227,27 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s bağlantısı kesiliyor"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2138
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "%s bağlantısı kesiliyor"
 
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Ara"
 
@@ -11717,43 +12285,43 @@ msgstr "Bul:"
 msgid "Matches:"
 msgstr "Eşleşenler:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "İptal ediliyor..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Sunucu Türü: "
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tip:"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "E-posta Al & Gönder"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Hepsini İptal Et"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Güncelleniyor..."
 
-#: 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 "Bekleniyor..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "İptal edildi."
 
@@ -11770,25 +12338,40 @@ msgstr "%s İçin Parolayı Girin"
 msgid "Enter Password"
 msgstr "Parolayı Girin"
 
-#: mail/mail-summary.c:109
-#, fuzzy
-msgid "Incomplete message written on pipe!"
-msgstr "Şifrelenmiş ileti gösterilemiyor"
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "İmza dosyası kaydedilemedi."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "İmzayı kaydet"
+
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Bu ileti değiştirildi, ancak kaydedilmedi.\n"
+"\n"
+"Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: mail/mail-summary.c:467
-msgid "Mail Summary"
-msgstr "İleti Özeti"
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "İmza dosyası:"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Yönlendirilmiş ileti - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Yönlendirilen ileti"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Yönlendirilen İleti"
 
@@ -11811,10 +12394,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "VDizin"
-
 #: mail/mail-vfolder.c:785
 #, fuzzy
 msgid "vFolders"
@@ -11834,87 +12413,145 @@ msgstr ""
 msgid "New VFolder"
 msgstr "Yeni VDizin"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Konusuz)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - İleti"
 
-#: mail/message-list.c:623
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Görünmeyen"
 
-#: mail/message-list.c:624
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Görünen"
 
-#: mail/message-list.c:625
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Cevaplanan"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Çoklu Görülmeyen İleti"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Çoklu İletiler"
 
-#: mail/message-list.c:631
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "En Düşük"
 
-#: mail/message-list.c:632
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Düşük"
 
-#: mail/message-list.c:636
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Yüksek"
 
-#: mail/message-list.c:637
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "En Yüksek"
 
-#: mail/message-list.c:887
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:894
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Dün %l:%M %p"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2292
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "İleti listesi oluşturuluyor"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "Tarihe göre "
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Durum"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "İşaretli"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Alındı"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Boyut"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "McCall"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "İleri git"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Bilgi Yok"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Yönlendir"
+
+#: 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 "Cevapla"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Tümüne cevapla"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Önizleme"
+
+#: mail/message-tag-followup.c:315
+msgid "Flag to Follow Up"
+msgstr ""
+
 #: mail/subscribe-dialog.c:219
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -11936,7 +12573,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" dizininden üyelik siliniyor"
 
 #: 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 "Dizin"
 
@@ -11980,6 +12617,35 @@ msgstr "_Üye ol"
 msgid "_Unsubscribe"
 msgstr "Ü_yelikten çık"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "Özet için Evolution bileşeni"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolution e-posta programı."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Evolution e-posta bileşen mimarisi."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Evolution özet bileşen mimarisi."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Özet Ayarları"
+
+#: 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
 #, fuzzy
 msgid "Aarhus"
@@ -22230,75 +22896,76 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zürih"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:153
-#, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Evolution'ın posta programı başlatılamadı."
-
-#: 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 "Randevular"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "Randevu yok"
 
-#: my-evolution/e-summary-calendar.c:375
+#: my-evolution/e-summary-calendar.c:400
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%d %B %A"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:402
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%d %B %A"
 
-#: my-evolution/e-summary-calendar.c:395
+#: my-evolution/e-summary-calendar.c:420
 msgid "No description"
 msgstr "Açıklama yok"
 
-#: my-evolution/e-summary-mail.c:120
+#: my-evolution/e-summary-mail.c:151
 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
+msgid "Local Folders"
+msgstr "Yerel Dizinler"
+
 #. 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:92
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:453
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:474
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:735
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:743
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:747
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "İsim:"
 
-#: my-evolution/e-summary-preferences.c:1225
-msgid "Summary Settings"
-msgstr "Özet Ayarları"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "RDF indirirken bir hata oluştu"
@@ -22307,11 +22974,33 @@ msgstr "RDF indirirken bir hata oluştu"
 msgid "News Feed"
 msgstr "Haber Grubu"
 
-#: my-evolution/e-summary-tasks.c:241
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+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
+#, fuzzy
+msgid "Shown"
+msgstr "Shannon"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Görev yok"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(Açıklama Yok)"
 
@@ -22327,19 +23016,19 @@ msgstr ""
 msgid "Weather"
 msgstr "Hava Durumu"
 
-#: my-evolution/e-summary.c:190
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%e %B %A, %Y"
 
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "Lütfen bekleyiniz..."
 
-#: 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 "Yazdırma Özeti"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:626
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "İletiyi yazdırılmasında hata"
@@ -22348,39 +23037,6 @@ msgstr "İletiyi yazdırılmasında hata"
 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ü"
@@ -23641,43 +24297,36 @@ msgstr ""
 msgid "_Weather"
 msgstr "_Hava Durumu"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
-msgstr "Evolution notes bileşen mimarisi"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr "Evolution Notes denetim mimarisi"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Dizini Seçin"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution kabuğu."
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Ayrıntıları Göster"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "İşlemi İ_ptal Et"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Gelen"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Giden"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Yerel Dizinler"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution kurulumu"
 
-#: 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"
@@ -23685,17 +24334,17 @@ msgstr ""
 "Evolution'un bu yeni sürümü kişisel Evolution dizinine ek dosya\n"
 "yerleştirilmesini gerektirir."
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Dosyaları kurmak için \"Tamam\" düğmesine, ya da işlemi durdurmak için "
 "\"İptal\" düğmesine tıklayın."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Dosyalar düzgün bir şekilde güncellenemedi"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -23706,7 +24355,8 @@ msgstr ""
 "\n"
 "Hata: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
+#, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
@@ -23714,7 +24364,7 @@ msgstr ""
 "Dosyalar aşağıdaki dizine kopyalanırken hata oluştu\n"
 "`%s'."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, fuzzy, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -23724,7 +24374,7 @@ msgstr ""
 "%s dizini yaratılamadı:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -23732,7 +24382,7 @@ msgid ""
 "readable and executable and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -23740,7 +24390,7 @@ msgid ""
 "Please remove this file and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -23751,7 +24401,7 @@ msgstr ""
 "Evolution kullanıcı dosyalarının yüklenmesi\n"
 "bunu silmelisiniz."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -23760,7 +24410,7 @@ 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"
@@ -23771,51 +24421,54 @@ msgstr ""
 "kullanılmıyor. Lütfen Evolution kullanıcı dosyalarının\n"
 "kopyalanabilmesi için bu dizini taşıyınız."
 
-#: shell/e-shell-about-box.c:40
-#, fuzzy
-msgid "Evolution "
-msgstr "Evolution"
-
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Telif hakkı 1999, 2000, 2001 Ximian, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "%s dizini alınamadı: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Dizin yeniden adlandırılamadı:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "%s dizini alınamadı: %s"
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Bir dizin üzerine kopyalanamaz."
 
-#: 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\" dizinini kopyalamak için bir dizin adı verin:"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Dizini kopyala"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Dizini taşı"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23824,18 +24477,18 @@ msgstr ""
 "Dizin silinemedi:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23844,16 +24497,16 @@ msgstr ""
 "Dizin yeniden adlandırılamadı:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" dizinini yeniden adlandır:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Dizini yeniden adlandır"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23868,7 +24521,7 @@ msgstr ""
 "Belirlenen dizin yaratılamadı:\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 - Yeni dizin yarat"
 
@@ -23884,7 +24537,7 @@ msgstr ""
 msgid "New..."
 msgstr "Yeni..."
 
-#: 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 "(isimsiz)"
 
@@ -23903,8 +24556,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:"
@@ -24057,8 +24710,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:495
-#: shell/e-shell-user-creatable-items-handler.c:540
+#: shell/e-shell-user-creatable-items-handler.c:506
+#: shell/e-shell-user-creatable-items-handler.c:551
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Yeni"
@@ -24079,90 +24732,95 @@ msgstr "Dizin içinde bölü karakteri bulunamaz."
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH dizininde bulunamadı."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy çalıştırılamadı."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution Hakkında"
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Dizine git..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Açmak istediğiniz dizini seçin"
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Yeni bir kısayol yarat"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:566
 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:577
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Bu sistemde GNOME Pilot araçları kurulu değil."
-
-#: shell/e-shell-view-menu.c:585
-#, c-format
-msgid "Error executing %s."
-msgstr "%s çalıştırırken bir hata oldu."
-
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "Ç_evrimiçi Çalış"
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Çe_vrimdışı Çalış"
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Çevrimdışı Çalış"
 
-#: shell/e-shell-view.c:215
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(dizin gösterilmiyor)"
 
-#: shell/e-shell-view.c:1598
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1600
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(Hiçbiri)"
 
-#: shell/e-shell-view.c:1647
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+#: shell/e-shell-view.c:1867
+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:1654
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution çevrimdışı çalışmak üzere hazırlanıyor."
 
-#: shell/e-shell-view.c:1660
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+#: shell/e-shell-view.c:1880
+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."
+
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
 msgstr ""
-"Ximian Evolution çevrimdışı çalışıyor. Bu düğmeye tıklayarak çevrimiçi çalışmasını "
-"sağlayın."
+"%s\n"
+"\n"
+"Etkinleştirme sisteminden gelen mesaj:\n"
+"%s"
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerel kayıt kurulamadı -- %s"
 
-#: shell/e-shell.c:1660
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24170,19 +24828,23 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1887
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Tamam"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Geçersiz argümanlar"
 
-#: shell/e-shell.c:1889
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "OAF'a kayıt yapılamadı"
 
-#: shell/e-shell.c:1891
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Yapılandırma Veritabanı bulunamadı"
 
-#: shell/e-shell.c:1893 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Genel hata"
 
@@ -24299,76 +24961,72 @@ msgstr "_Sil"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu kısayolu kısayol çubuğundan sil"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Kısayolları kaydederken hata oldu."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Kısayollar"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Cannot transfer folder:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Gelen"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(isimsiz)"
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Araba"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Hata yok"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Aynı isimli bir dizin zaten var"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Belirtilen dizin türü geçerli değildir"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "G/Ç hatası"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Dizin yaratmak için gerekli disk alanı yok"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Dizin boş değil"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Belirtilen dizin bulunamadı"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Fonksiyon desteklenmiyor"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "İşlem desteklenmiyor"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Bu kayıtta belirtilen tip desteklenmiyor"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "Belirtilen dizin düzenlenemedi ya da silinemedi"
 
-#: 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:513
 msgid "Cannot create a folder with that name"
 msgstr "Bu isimde bir dizin yaratılamadı"
 
@@ -24378,10 +25036,13 @@ 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
+msgid "<click here to select a folder>"
+msgstr "<bir dizin seçmek için tıklayın>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -24419,67 +25080,67 @@ msgstr ""
 "Etkinleştirme sisteminden gelen mesaj:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "CORBA hatası"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Kesintiye uğradı"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Geçersiz argüman"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Sahibi yok"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Bulunamadı"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Desteklenmeyen tür"
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Desteklenmeyen şema"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Desteklenmeyen işlem"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "İç hata"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Bulunur"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Geçersiz URI"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Alt dizinler"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Hiç boş alan kalmadı"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
 msgid "Test type"
 msgstr "Deneme türü"
 
@@ -24489,7 +25150,9 @@ 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"
+msgstr ""
+"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"
@@ -24605,32 +25268,49 @@ msgstr "Tekrar sorma"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution, aşağıdaki dosyalardan veri alabilir:"
 
-#: shell/main.c:83
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:89
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution'dan çıkılıyor..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution Kabuğuna erişilemedi."
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution Kabuğu başlatılamadı: %s"
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Açılış ekranıni gösterme"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Aktarma işlemi başlıyor"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Aktarma işlemi başlıyor"
+
+#: shell/main.c:320
 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:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parçalar sistemi başlatılamadı."
 
@@ -24653,258 +25333,207 @@ msgstr "Çıktı Dosyası"
 msgid "No filename provided."
 msgstr "Dosya adı belirtilmedi."
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Seçili iletileri başka dizine kopyala"
+
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Seçimi kopyala"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "D_izine Kopyala..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Yeni bir bağlantı yarat"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Yeni bir bağlantı listesi yarat"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:12
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Seçimi kes"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "Seçili bağlantıları sil"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Yeni Liste"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Seçili iletileri başka bir dizine taşı"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "_Dizine Taşı..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Panoyu yapıştır"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Yazdırılacak olan bağlantıları önizler"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Seçili bağlantıları yazdır"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Seçili bağlantıları vCard olarak kaydet"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Hepsini Seç"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Tüm Bağlantıkları Seç"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "Bağlantıya Mesaj Gönder..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "Seçili bağlantıları sil"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Bağlantıya ileti gönder"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Seçilen bağlantıları başkasına gönder."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Dur"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Yüklemeyi Durdur"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:30
 msgid "View the current contact"
 msgstr "Şimdiki bağlantıyı görüntüle"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: 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-tasks.xml.h:16
+#: 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
 msgid "_Actions"
 msgstr "_Eylemler"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Addressbook Sources..."
-msgstr "_Adres Defteri Kaynakları..."
-
 #: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "B_ağlantı Listesi"
 
-#: 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 "_Bağlantıyı Gönder..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:44
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "_Yazdır..."
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "_Dizine Taşı..."
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "VCard Olarak Kaydet"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "Bağ_lantıları Ara"
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Hepsini Seç"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Takvim ayarlarını yapılandır"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "Bağlantıya Mesaj Gönder..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Yeni _Bir Randevu Oluştur"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "Ye_ni Bir Randevu Oluştur"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Ye_ni Bir Randevu Oluştur"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a _New Meeting"
-msgstr "Y_eni Bir Randevu Oluştur"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
-msgstr "Yeni bir randevu oluştur"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new meeting request"
-msgstr "Yeni bir toplantı isteği oluştur"
-
-#: ui/evolution-calendar.xml.h:10 ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "Yeni bir görev oluştur"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create an event for the whole day"
-msgstr "Tüm gün için bir olay oluştur"
-
-#: ui/evolution-calendar.xml.h:13
 msgid "Day"
 msgstr "Gün"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Randevuyu sil"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:37
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Git"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Geri git"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "İleri git"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "_Tarihe Git"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Belirli bir tarihe git"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Bugüne git"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Ay"
 
-#: ui/evolution-calendar.xml.h:23
-msgid "New Appointment"
-msgstr "Yeni Randevu"
-
-#: ui/evolution-calendar.xml.h:24 ui/evolution-tasks.xml.h:12
-msgid "New Task"
-msgstr "Yeni Görev"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Yazdırılacak olan takvimi önizler"
 
-#: ui/evolution-calendar.xml.h:27 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 "Yazdırma Ö_nizlemesi"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Bu takvimi yazdır"
 
-#: ui/evolution-calendar.xml.h:29
+#: 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:19
 msgid "Show one day"
 msgstr "Bir gün göster"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Bir ay göster"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Bir hafta göster"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Çalışma günlerini göster"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Hafta"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment..."
-msgstr "_Randevu..."
-
-#: ui/evolution-calendar.xml.h:38
-msgid "_Calendar Settings..."
-msgstr "_Takvim Ayarları..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Meeting..."
-msgstr "_Toplantı..."
-
-#: ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr "_Boş/Meşgul Bilgisini Yayınla"
-
-#: ui/evolution-calendar.xml.h:46
-msgid "_Task..."
-msgstr "_Görev..."
-
 #: 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
@@ -24934,18 +25563,18 @@ msgstr "Yazdırılacak olan öğeyi önizle"
 msgid "Print this item"
 msgstr "Bu öğeyi yazdır"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Yazdır..."
-
 #: 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 "Kaydet"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Farklı Kaydet..."
+
 #: 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 "Kaydet ve Kapat"
 
@@ -24961,8 +25590,8 @@ msgstr "Bu öğeyi diske kaydet"
 #: 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:40
 msgid "_File"
 msgstr "_Dosya"
 
@@ -24980,10 +25609,14 @@ msgstr "_Farklı Kaydet..."
 msgid "Save the contact and close the dialog box"
 msgstr "Bağlantıyı kaydet ve diyalog penceresini kapat"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "Bağlantıya Mesaj Gönder..."
+
 #: 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 "_Kaydet"
 
@@ -25043,6 +25676,10 @@ 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"
@@ -25052,78 +25689,55 @@ msgid "Compose _New Message"
 msgstr "_Yeni İleti Oluştur"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "E-posta hesaplarını düzenle ve diğer seçenekler"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Yeni iletileri süzmek için kural oluştur"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Sanal dizin tanımları oluştur/düzenle"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Çöpü _Boşalt"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Parolaları _Unut"
 
-#: 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 "Bilinen parolaları unut (tüm parolaları yeniden girmeniz gerekecektir)"
-
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Yeni İ_leti"
+msgstr ""
+"Bilinen parolaları unut (tüm parolaları yeniden girmeniz gerekecektir)"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "İletiyi düzenlemek için bir pencere aç"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Tüm dizindeki tüm silinmiş iletileri tamamen sil"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "Al / Gönder"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Kuyruktaki iletileri gönder ve yeni iletileri al"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "İleti önizleme penceresini göster"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Uzak sunuculardaki dizinlere üyelik işlemini gerçekleştir"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "Sanal Dizin _Düzenleyici..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filtreler..."
 
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "E-posta Ayarları..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "Önizleme _Panosu"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "_Gönder / Al"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "_Dizinlere Üye Ol..."
 
@@ -25156,7 +25770,8 @@ msgid "Hide _Read Messages"
 msgstr "_Okunan İletileri Gizle"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Silinen iletileri üzerine çizgi çekmek yerine gizle"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -25215,11 +25830,11 @@ msgstr "Seçili iletileri geçici olarak gizle"
 msgid "Threaded Message list"
 msgstr "Konumlandırılan İleti listesi"
 
-#: 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 "_Sil"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Dizin"
 
@@ -25235,328 +25850,344 @@ msgstr "Ö_zellikler..."
 msgid "_Threaded Message List"
 msgstr "_Konumlandırılan İleti Listesi"
 
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Göndereni Adres Defterine Ekle"
+
 #: ui/evolution-mail-message.xml.h:2
-msgid "Add Sender to Address _Book"
-msgstr "_Göndereni Adres Defterine Ekle"
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Filtreleri Uygula"
 
 #: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Göndereni Adres Defterine Ekle"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Seçilen iletilere filtre kurallarını uygula"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Seçili iletideki tüm alıcılara bir cevap gönder"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Seçilen iletinin e-posta listesine bir cevap gönder"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Seçilen iletinin göndericisine bir cevap gönder"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Seçili iletileri başka dizine kopyala"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "İletiden _Sanal Dizin Yarat"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Bu gönderene göre iletileri filtrelemek için kural yarat"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Bu alıcılara göre iletileri filtrelemek için kural yarat"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Bu e-posta listesine göre iletileri filtrelemek için kural yarat"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Bu konuyla iletileri filtrelemek için kural oluştur"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Bu alıcılar için bir sanal dizin yarat"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Bu e-posta listesi için bir sanal dizin yarat"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Bu gönderen için bir sanal dizin yarat"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Bu konu için bir sanal dizin yarat"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Metin boyunu azalt"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Sonraki önemli iletiyi göster"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Sonraki iletiyi göster"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Sonraki okunmamış iletiyi göster"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Sonraki okunmamış konumu göster"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Önceki önemli iletiyi göster"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Önceki iletiyi göster"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Önceki okunmamış iletiyi göster"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Yönlendir"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "_E-posta Listelerine Göre Filtrele..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "_Gönderene Göre Filtrele..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "_Alıcılara Göre Filtrele..."
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "_Konuya Göre Filtrele..."
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Seçili iletileri silmek için işaretle"
+
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "_Tam İsim..."
+
+#: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML iletideki resimleri yükle"
 
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward"
-msgstr "Yönlendir"
-
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message in the body of a new message"
 msgstr "Seçilen iletiyi birisine ilet"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Seçilen e-postayı birisine ilet"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Seçilen iletiyi birisine yönlendir"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Seçilen iletiyi birisine eklenti olarak yönlendir"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Metin boyunu büyüt"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Resimleri _Yükle"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Ön_emli Olarak İşaretle"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Oku_nmamış Olarak İşaretle"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Ö_nemsiz Olarak İşaretle"
 
-#: ui/evolution-mail-message.xml.h:44
-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 "Seçili iletileri okunmuş olarak işaretle"
 
-#: ui/evolution-mail-message.xml.h:45
-msgid "Mark the selected messages as important"
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected message(s) as important"
 msgstr "Seçili iletileri önemli olarak işaretle"
 
-#: ui/evolution-mail-message.xml.h:46
-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 "Seçili iletileri okunmamış olarak işaretle"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mark the selected messages as unimportant"
+#: ui/evolution-mail-message.xml.h:50
+#, fuzzy
+msgid "Mark the selected message(s) as unimportant"
 msgstr "Seçili iletileri önemsiz olarak işaretle"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Seçili iletileri silmek için işaretle"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Taşı"
 
-#: ui/evolution-mail-message.xml.h:50
-msgid "Move selected messages to another folder"
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Move selected message(s) to another folder"
 msgstr "Seçili iletileri başka bir dizine taşı"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "İ_leri"
 
-#: ui/evolution-mail-message.xml.h:52
-msgid "Next Important Message"
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next _Important Message"
 msgstr "Sonraki Önemli İleti"
 
-#: ui/evolution-mail-message.xml.h:53
-msgid "Next Message"
-msgstr "Sonraki İleti"
-
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Thread"
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Sonraki Konum"
 
-#: ui/evolution-mail-message.xml.h:55
-msgid "Next Unread Message"
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Sonraki Okunmamış İleti"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Seçilen iletiyi yeni bir pencerede aç"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Seçilen iletiyi düzenleyicide yeniden göndermek üzere aç"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Asıl Boyut"
 
-#: ui/evolution-mail-message.xml.h:59
-msgid "Preview the message to be printed"
-msgstr "Yazdırılacak İletiyi Önizle"
-
-#: ui/evolution-mail-message.xml.h:60
-msgid "Previous"
-msgstr "Geri"
-
 #: ui/evolution-mail-message.xml.h:61
-msgid "Previous Important Message"
-msgstr "Önceki Önemli İleti"
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Önceki Okunmamış İletiyi"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous Message"
-msgstr "Önceki İleti"
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Önceki Önemli İleti"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Unread Message"
-msgstr "Önceki Okunmamış İletiyi"
+msgid "Preview the message to be printed"
+msgstr "Yazdırılacak İletiyi Önizle"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:64
+msgid "Previous"
+msgstr "Geri"
+
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Bu iletiyi yazdır"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:68
 msgid "Re_direct"
 msgstr "_Yeniden Yönlendir"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:69
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Seçili iletiyi başkasına yönlendir"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "Cevapla"
-
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "Tümüne cevapla"
-
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr "Metni orjinal boyuna getir"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "İle_tide Ara..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "_Daha küçük"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "İletiyi bir dosyaya kaydet"
 
-#: 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 "Görüntülenen ileti içinde bir metin ara"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "Güncel yazıcı için sayfa ayarlarını yap"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "İleti _Kaynağını Göster"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "_Kapsamlı Başlıkları Göster"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "İletiyi normal biçemde göster"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "İletiyi tüm başlıklarıyla göster"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "İletinin kaynağını göster"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "Metin _Boyu"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Seçilen iletiyi silme"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "_E-posta Listesine Göre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "_Gönderene Göre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "_Alıcılara Göre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "_Konuya Göre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
-msgstr "_Filtreleri Uygula"
-
 #: ui/evolution-mail-message.xml.h:92
 msgid "_Attached"
 msgstr "_Ekli"
@@ -25575,52 +26206,70 @@ msgstr "İletiyi _Yönlendir"
 
 #: ui/evolution-mail-message.xml.h:98
 #, fuzzy
+msgid "_Go To"
+msgstr "Git"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
 msgid "_Inline"
 msgstr "_Bağlantıda"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Daha büyük"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "İleti _Görünümü"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "Dizine _Taşı"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Sonraki İleti"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "Normal _Gösterim"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "İ_letiyi Aç "
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Önceki İleti"
+
+#: ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Quoted"
 msgstr "_Kotelenmiş"
 
-#: 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:55
 msgid "_Tools"
 msgstr "_Araçlar"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Silme"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Bu pencereyi kapat"
 
 #: 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:36
 msgid "_Close"
 msgstr "_Kapat"
 
 #: 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:56
 msgid "_View"
 msgstr "_Göster"
 
@@ -25644,11 +26293,11 @@ msgstr "Bu iletiyi PGP ile şifrele"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Bu iletiyi S/MIME şifreleme sertifikasıyla şifrele"
 
-#: 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 "Biçi_m"
 
-#: 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"
 
@@ -25664,6 +26313,10 @@ msgstr "Bir dosyayı ileti içine ekle"
 msgid "Insert text file..."
 msgstr "Metin dosyası ekle..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Aç"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Bir dosya aç"
@@ -25697,7 +26350,7 @@ msgid "Save in folder..."
 msgstr "Dizine kaydet..."
 
 #: 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 "Şimdiki zamanı kaydet"
 
@@ -25722,6 +26375,7 @@ msgid "Send _later"
 msgstr "Sonra _gönder"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "İletiyi HTML olarak gönder"
 
@@ -25790,7 +26444,7 @@ msgid "_From Field"
 msgstr "_Gönderen Alanı"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Ekle"
 
@@ -25802,11 +26456,7 @@ msgstr "_Aç..."
 msgid "_Reply-To Field"
 msgstr "_Yanıtla Alanı"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Güvenlik"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Yardım"
 
@@ -25862,37 +26512,39 @@ msgstr "Son görev bilgisini al"
 msgid "Re_fresh Task"
 msgstr "Görevi _Tazele"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Görev görünüm ayarlarını yapılandır"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Seçili görevi kopyala"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Seçili Görevi Sil"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete completed tasks"
 msgstr "Biten görevleri sil"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Seçilen görevleri sil"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 msgid "Mar_k as Complete"
 msgstr "_Bitmiş Olarak İşaretle"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Panodan görevi yapıştır"
 
-#: ui/evolution-tasks.xml.h:15
-msgid "Tasks Settings..."
-msgstr "Görev Ayarları..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Yazdırılacak olan bağlantıları önizler"
+
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Bu iletiyi yazdır"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25959,113 +26611,118 @@ msgid "Open this folder in an other window"
 msgstr "Bu dizini yeni bir pencerede aç"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Al / Gönder"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Kuyruktaki iletileri gönder ve yeni iletileri al"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution hakkında bilgi ver"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Hata Raporu Gönder"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "_Hata Raporu Gönder"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy kullanarak bir hata raporu gönderin"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Aç/kapat"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Dizin çubuğunu göster/gizle"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Kısayol çubuğunu göster/gizle"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Çevrimiçi/çevrimdışı çalış."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Seçili dizini göster"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _SSS"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolution Hakkında..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Kopyala..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "_Dizin Çubuğu"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "Dizine _Git..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Al..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Taşı..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Yeni"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Yeni Dizin"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_Pilot Ayarları..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "Y_eniden İsimlendir..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Gönder / Al"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Kısayol"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "_Kısayol Çubuğu"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Özet için ayarları düzenle"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Yazdırma özeti"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Tekrar yükle"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Görünümü tekrar yükle"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "Ö_zet Ayarları..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Adres Kartları"
@@ -26083,18 +26740,22 @@ msgid "As Sent Folder"
 msgstr "Gönderilmiş Dizin Olarak"
 
 #: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Gönderen"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Durum"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Konu"
 
-#: views/mail/galview.xml.h:5
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "İletiler"
 
@@ -26232,19 +26893,20 @@ msgstr "Ukraynaca"
 msgid "Visual"
 msgstr "Görsel"
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
+#, c-format
 msgid "Unknown character set: %s"
 msgstr "Bilinmeyen karakter seti: %s"
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Kullanılacak karakter setini girin"
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Diğer..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Karakter Kodlama"
 
@@ -26252,30 +26914,32 @@ msgstr "Karakter Kodlama"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Arama Düzenleyici"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Aramayı Kaydet"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Kayıtlı Aramalara Ekle"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Temizle"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Aramayı Kaydet"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Tümünü Göster"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Kayıtlı Aramalara Ekle"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Bilgi"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Hata"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Soru"
@@ -26289,11 +26953,21 @@ msgstr "İleti"
 msgid "Don't show this message again."
 msgstr "Bu mesajı bir daha gösterme."
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "A_ra"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Şimdi Bul"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Temizle"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Temizle"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Şimdi Bul"
 
@@ -26319,3 +26993,734 @@ 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:"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Gerçekten bu bağlantıyı\n"
+#~ "silmek istiyor musunuz?"
+
+#~ msgid "Starting:"
+#~ msgstr "Başlangıç:"
+
+#~ msgid "Ending:"
+#~ msgstr "Bitiş:"
+
+#, fuzzy
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Yeni bir randevu yarat"
+
+#, fuzzy
+#~ msgid "First day of wee_k:"
+#~ msgstr "Haftanın ilk günü:"
+
+#, 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 "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 "_Bu Görevi Sil"
+
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "Toplantı başlangıcı: <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "Görev başlangıcı: <b>"
+
+#, 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>"
+
+#, 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 "iCalendar Information"
+#~ msgstr "iCalendar Bilgisi"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "iCalendar Hatası"
+
+#~ msgid "An unknown person"
+#~ msgstr "Bilinmeyen kişi"
+
+#~ 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 "<i>None</i>"
+#~ msgstr "<i>Hiçbiri</i>"
+
+#~ msgid "Status:"
+#~ msgstr "Durum:"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Bir eylem seçin:"
+
+#~ msgid "Update"
+#~ msgstr "Güncelle"
+
+#~ msgid "Accept"
+#~ msgstr "Onayla"
+
+#~ msgid "Decline"
+#~ msgstr "Reddet"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Boş/Meşgul Bilgisi Gönder"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Cevaplayan Bilgisini Güncelle"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Güncel Bilgiyi Gönder"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b>, toplantı bilgisi gönderdi."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Toplantı Bilgisi"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> sizin toplantıda olmanızı istiyor."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Toplantı Taslağı"
+
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ msgstr "<b>%s</b> mevcut bir toplantıya ekleme yapmak istiyor"
+
+#~ msgid "Meeting Update"
+#~ msgstr "Toplantı Güncellemesi"
+
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ msgstr "<b>%s</b> son toplantı bilgisini almak istiyor."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Toplantı Güncelleme Bilgisi İsteği"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b> bir toplantı isteğine cevap verdi."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Toplantı Yanıtı"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> bir toplantıyı iptal etti."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Toplantı İptali"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> hatalı bir mesaj gönderdi."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Hatalı Toplantı Mesajı"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> görev bilgisi yayınladı."
+
+#~ msgid "Task Information"
+#~ msgstr "Görev Bilgisi"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> bir görevi tamamlamanızı istiyor."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Görev Taslağı"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> mevcut bir göreve eklenti yapmak istiyor."
+
+#~ msgid "Task Update"
+#~ msgstr "Görev Güncellemesi"
+
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "<b>%s</b> en güncel görev bilgisini almak istiyor."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Güncel Görev Bilgisi İsteği"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b> bir görev tanımına cevap verdi."
+
+#~ msgid "Task Reply"
+#~ msgstr "Görev Yanıtı"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> bir görevi iptal etti."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Görev İptali"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Hatalı Görev Mesajı"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> boş/meşgul bilgisi gönderdi."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Boş/Meşgul Bilgisi"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> sizden boş/meşgul bilgisini almak istiyor."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Boş/Meşgul İsteği"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "<b>%s</b> bir boş/meşgul isteğine cevap verdi."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Boş/Meşgul Cevabı"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Hatalı Boş/Meşgul Mesajı"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Bu iletide desteklenmeyen bilgiler var."
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "Bu eklenti geçerli bir takvim mesajını içermiyor."
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "Bu eklentide görüntülenebilir takvim öğeleri bulunmuyor"
+
+#~ 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 "Event information"
+#~ msgstr "Olay bilgisi"
+
+#~ msgid "Task information"
+#~ msgstr "Görev bilgisi"
+
+#, fuzzy
+#~ msgid "Journal information"
+#~ msgstr "Seçimlik Bilgiler"
+
+#~ msgid "Free/Busy information"
+#~ msgstr "Boş/Meşgul bilgisi"
+
+#~ msgid "Calendar information"
+#~ msgstr "Takvim bilgisi"
+
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "Boş/Meşgul bilgisi (%s -> %s)"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Error hashing password."
+#~ msgstr "Kartlar düzenlenirken bir hata oluştu"
+
+#, fuzzy
+#~ msgid "Invalid password."
+#~ msgstr "Geçersiz ileti içeriği"
+
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "İmzalanamadı: \"%s\" için sertifika bulunamadı."
+
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "İmzalanamadı: \"%s\" için sertifika bulunamadı."
+
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ msgstr "Şifrelenemedi: Zarflı veri oluşturulamadı."
+
+#, fuzzy
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "PGP şifreleme dosyası oluşturulamadı."
+
+#, fuzzy
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Sunucuya bağlantı kurulamadı: %s"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Kullanıcı adı sunucu tarafından reddedildi"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Sunucuya kullanıcı adı gönderilemedi"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Sunucu kullanıcı adı ve parolasını reddetti"
+
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "İç hata: Gerçersiz biçim: %s"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Sunucudan grup listesi alınamadı."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "%s için grup liste dosyası alınamadı: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "%s için grup liste dosyası kaydedilemedi: %s"
+
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "İletide 'From' adresi bulunamadı"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "İleti gönderilemiyor: gönderen adresi tanımlı değil."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Evolution Özet bileşeni ilklendirilemedi."
+
+#~ msgid "Select a service"
+#~ msgstr "Bir servis seçin"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Öntanımlı GNOME uygulaması ile %s dosyasını aç"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Öntanımlı GNOME web tarayıcı ile %s dosyasını aç"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "%s kullanıcısına bir ileti gönder"
+
+#~ msgid "Run %s"
+#~ msgstr "%s çalıştır"
+
+#~ msgid "Close %s"
+#~ msgstr "%s 'i kapat"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "%s 'i sola taşı"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "%s 'i sağa taşı"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "%s 'i önceki satıra taşı"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "%s 'i sonraki satıra taşı"
+
+#~ msgid "page"
+#~ msgstr "sayfa"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "HTML dosyası açılamadı:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Veri okunurken hata oluştu:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Bu dosya servisler için yer içermiyor.\n"
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "RDF özeti için mimari"
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF Özeti"
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Deneme bileşen mimarisi"
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Deneme bonobo servisi"
+
+#~ msgid "Test service"
+#~ msgstr "Deneme servisi"
+
+#~ msgid "Update automatically"
+#~ msgstr "Otomatik güncelle"
+
+#~ msgid "Update now"
+#~ msgstr "Şimdi güncelle"
+
+#~ msgid "Update every "
+#~ msgstr "Her "
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Dizin URI girin"
+
+#~ msgid "Needs Reply"
+#~ msgstr "Cevap İstiyor"
+
+#, fuzzy
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Sunucuya bağlantı kurulamadı: %s"
+
+#, fuzzy
+#~ msgid "Create vFolder from Search"
+#~ msgstr "İ_letiden Bir Filtre Yarat"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Default Forward style is: "
+#~ msgstr "Öntanımlı \"Yönlendirme\" türü: "
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "_Organization:"
+#~ msgstr "Kurum:"
+
+#, fuzzy
+#~ msgid "_Remember this password"
+#~ msgstr "Bu parolayı hatırla"
+
+#, fuzzy
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "E-postaları öntanımlı olarak HTML gönder."
+
+#, fuzzy
+#~ msgid "_Server type: "
+#~ msgstr "Sunucu Türü: "
+
+#~ 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"
+
+#~ msgid "Mail Summary"
+#~ msgstr "İleti Özeti"
+
+#, fuzzy
+#~ 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)"
+
+#~ msgid "New List"
+#~ msgstr "Yeni Liste"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Takvim ayarlarını yapılandır"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Yeni _Bir Randevu Oluştur"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Ye_ni Bir Randevu Oluştur"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Ye_ni Bir Randevu Oluştur"
+
+#~ msgid "Create a _New Meeting"
+#~ msgstr "Y_eni Bir Randevu Oluştur"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Yeni bir randevu oluştur"
+
+#~ msgid "Create a new meeting request"
+#~ msgstr "Yeni bir toplantı isteği oluştur"
+
+#~ msgid "Create a new task"
+#~ msgstr "Yeni bir görev oluştur"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Tüm gün için bir olay oluştur"
+
+#~ msgid "New Appointment"
+#~ msgstr "Yeni Randevu"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Randevu..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Takvim Ayarları..."
+
+#~ msgid "_Meeting..."
+#~ msgstr "_Toplantı..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Görev..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "E-posta hesaplarını düzenle ve diğer seçenekler"
+
+#~ msgid "New Message"
+#~ msgstr "Yeni İ_leti"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "E-posta Ayarları..."
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Filtreleri Uygula"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Görev görünüm ayarlarını yapılandır"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Görev Ayarları..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Özet için ayarları düzenle"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "Ö_zet Ayarları..."
+
+#~ msgid "Show All"
+#~ msgstr "Tümünü Göster"
+
+#~ msgid "Sear_ch"
+#~ msgstr "A_ra"
diff --git a/po/uk.po b/po/uk.po
index 472143a3cf..ee60729a9d 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-02-22 09:59+0200\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -30,16 +30,17 @@ msgid "Imports VCard files into Evolution."
 msgstr "Імпорт файлів VCard у Evolution."
 
 #: 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 "Файл як"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ім'я:"
 
 #: 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 "Е-пошта"
 
@@ -55,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/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Помічник"
 
@@ -95,7 +96,7 @@ msgid "Home"
 msgstr "Домашня"
 
 #: 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 "Організація"
 
@@ -117,7 +118,7 @@ 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/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Робочий факс"
 
@@ -127,7 +128,7 @@ msgstr "Роб. факс"
 
 #: 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/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Домашній факс"
 
@@ -147,7 +148,7 @@ msgstr "Домашня 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/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -155,55 +156,54 @@ msgstr "ISDN"
 #: 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
 msgid "Other"
 msgstr "Інша"
 
 #: 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/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/widgets/e-addressbook-view.c:353
+#: 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/widgets/e-addressbook-view.c:354
+#: 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/widgets/e-addressbook-view.c:355
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Телекс"
 
 #: 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/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/widgets/e-addressbook-view.c:359
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Е-пошта 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 "Сайт"
 
@@ -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 "Відділ"
 
@@ -221,7 +221,7 @@ msgid "Dep"
 msgstr "Від."
 
 #: 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 "Офіс"
 
@@ -230,12 +230,12 @@ msgid "Off"
 msgstr "Оф."
 
 #: 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 "Титул"
 
 #: 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 "Професія"
 
@@ -244,7 +244,7 @@ msgid "Prof"
 msgstr "Проф."
 
 #: 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 "Керівник"
 
@@ -257,7 +257,7 @@ msgid "Ass"
 msgstr "Пом."
 
 #: 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 "Прізвисько"
 
@@ -266,12 +266,12 @@ msgid "Nick"
 msgstr "Псевдо"
 
 #: 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 "Дружина"
 
 #: 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 "Примітки"
 
@@ -284,7 +284,7 @@ msgid "CALUri"
 msgstr "Кал.URI"
 
 #: 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 зайнятості"
 
@@ -318,12 +318,12 @@ msgstr "Прізвище"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "Надрукувати повідомлення"
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "vCard для %s"
@@ -336,8 +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:62
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -345,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:2287
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Пошук..."
 
@@ -358,37 +357,35 @@ msgstr "Завантаження..."
 msgid "Error in search expression."
 msgstr "Помилка у реґулярному виразі."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:486
-msgid "Connecting to LDAP server..."
-msgstr "З'єднання з сервером LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:496
-msgid "Unable to connect to LDAP server."
-msgstr "Неможливо з'єднатись з сервером LDAP."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:512
-msgid "Waiting for connection to LDAP server..."
-msgstr "Очікування на з'єднання з сервером LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:933
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Додавання картки з сервером LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1034
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Видалення картки з сервера LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1144
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Змина картки на сервері LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2232
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Почати пошук знову."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Отримання результатів пошузу на LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2237
-msgid "Restarting search."
-msgstr "Почати пошук знову."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Помилка видалення картки"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Неможливо проаналізувати URL \"%s\""
 
 #: addressbook/conduit/address-conduit.c:293
 #, fuzzy
@@ -396,17 +393,11 @@ msgid "Default Sync Address:"
 msgstr "Електронна адреса:"
 
 #: addressbook/conduit/address-conduit.c:536
-msgid ""
-"Cursor could not be loaded\n"
-""
-msgstr ""
-"Не вдалося завантажити курсор\n"
-""
+msgid "Cursor could not be loaded\n"
+msgstr "Не вдалося завантажити курсор\n"
 
 #: addressbook/conduit/address-conduit.c:549
-msgid ""
-"EBook not loaded\n"
-""
+msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1354
@@ -435,372 +426,843 @@ msgid "A Bonobo control for displaying an address."
 msgstr ""
 
 #: 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 ""
 
 #: 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
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 #, fuzzy
 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:10
 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:11
 #, fuzzy
 msgid "Factory for the Addressbook Minicard control"
-msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
+msgstr ""
+"Не вдалося ініціалізувати поштовий "
+"компонент Evolutuion."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 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:13
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 #, 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/addressbook-component.c:71
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: shell/e-shortcuts.c:1061
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Контакти"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
-msgstr "Тека, що містисть контактну інформацію"
+msgstr ""
+"Тека, що містисть контактну інформацію"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
-msgstr "Сервер LDAP, що містить контактну інформацію"
+msgstr ""
+"Сервер LDAP, що містить контактну "
+"інформацію"
 
-#: addressbook/gui/component/addressbook-component.c:558
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Новий контакт"
 
-#: addressbook/gui/component/addressbook-component.c:558
-#: ui/evolution-addressbook.xml.h:34
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "Контакт"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Новий контактний список"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Contact _List"
 msgstr "Контактний _список"
 
-#: addressbook/gui/component/addressbook-config.c:223
-msgid "Edit Addressbook"
-msgstr "Виправити адресну книгу"
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+msgid "Could not initialize gnome-vfs"
+msgstr "Не вдалось ініціалізувати gnome-vfs"
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr "Не вдалося відкрити адресну книгу"
+
+#: 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 ""
+
+#: 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"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Введіть пароль для %s (користувач %s)"
+
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "закінчується на"
+
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "Е-пошта 2"
+
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "Категорія - "
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: 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
+msgid "Advanced..."
+msgstr "Додатково..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
+msgstr "Будь-яка категорія"
+
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
+msgstr ""
+"URI теки, що буде відображено переглядачем"
+
+#: 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
+msgid "Primary Email"
+msgstr "Первинна е-пошта"
+
+#: addressbook/gui/component/e-address-popup.c:587
+msgid "Select an Action"
+msgstr "Вибір дії"
+
+#: addressbook/gui/component/e-address-popup.c:593
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Створити новий контакт \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+"Додати адресу до існуючого контакту \"%s\""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "100"
+#: addressbook/gui/component/e-address-popup.c:891
+msgid "Querying Addressbook..."
+msgstr "Запит адресної книги..."
+
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
+msgstr "Виправлення контактної інформації"
+
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+msgid "Add to Contacts"
+msgstr "Додати до контактів"
+
+#: addressbook/gui/component/e-address-popup.c:1046
+msgid "Merge E-Mail Address"
+msgstr "Об'єднати електронін адреси"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
+msgstr "Заборонити запити"
+
+#: addressbook/gui/component/e-address-widget.c:364
+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 "Помилка завантаження файлу: %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
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Видалити"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "1234"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#, fuzzy
-msgid "A_uthenticate with server using:"
-msgstr "Вимагається автенфікація"
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Облікова назва"
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Додати адресну книгу"
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "Джерело адресної книги"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Додатково"
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Сповіщення"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
-msgid "Base"
-msgstr "Вставити"
+msgid "Anonymously"
+msgstr "Анонім"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
+#: 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 "Basic"
-msgstr "Вставити"
+msgid "Connecting"
+msgstr "Коннектикут"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
-msgid "Check this if the server requires you to authenticate."
-msgstr "Мій сервер вимагає автенфікації"
+msgid "DN Customization"
+msgstr "Немає інформації"
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "De_lete"
 msgstr "Стерти"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Назва списку:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Email Address:"
+msgstr "_Електронна адреса:"
+
+#: 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/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "Електронна адреса"
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Evolution will use this Distinquished Name (DN) to authenticate you with the server"
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "Знайти"
+
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Конфіґурація"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Поля"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, 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/addressbook-config.glade.h:15
-msgid "Evolution will use this email address to authenticate you with the server"
+#: addressbook/gui/component/ldap-config.glade.h:43
+msgid "Objectclasses Used on Server:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
+#: 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 "Search _base:"
-msgstr "Серверне повідомлення:"
+msgid "R_estore Defaults"
+msgstr "Типово"
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
-msgid "Search s_cope: "
+msgid "Re_store Defaults"
+msgstr "Типово"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
 msgstr "Серверне повідомлення:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Назва сервера"
+#. 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 "Пошук"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Вибрати все"
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
+#: 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 ""
+
+#: addressbook/gui/component/ldap-config.glade.h:65
+#, fuzzy
+msgid "Step 1: Server Information"
+msgstr "Вихідна інформація"
+
+#: 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/ldap-config.glade.h:69
 #, fuzzy
 msgid "Sub"
 msgstr "Ндл"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
+#: 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/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
+#: 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/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/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/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/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
-msgid "This is the maximum number of cards to download.  Setting this number too large will slow down this addressbook."
+#: 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/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/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/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
+#: addressbook/gui/component/ldap-config.glade.h:91
+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/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "Це порт, який використовує ваш сервер LDAP."
+#: 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/addressbook-config.glade.h:29
-msgid "This name will be used to identify your account. It is for display purposes only."
+#: addressbook/gui/component/ldap-config.glade.h:96
+msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-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/addressbook-config.glade.h:31
+#: 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 "Електронна адреса"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+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:100
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:139
 msgid "_Add"
 msgstr "Додати"
 
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "Додати"
+
+#: 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 "Додати дію"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Сповіщення"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "Стерти все"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "День"
+
+#: addressbook/gui/component/ldap-config.glade.h:111
+msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9
-#: mail/mail-config.glade.h:109
-#: ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:39
-#: ui/evolution-mail-list.xml.h:25
+#: 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:152 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:7
-#: ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "Редагування"
 
-#: addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:110
-msgid "_Email address:"
-msgstr "_Електронна адреса:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "Порт:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "Назва сервера:"
-
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174
-#: calendar/gui/main.c:134
-msgid "Could not initialize gnome-vfs"
-msgstr "Не вдалось ініціалізувати gnome-vfs"
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "Виправити зустріч"
 
-#: addressbook/gui/component/addressbook.c:525
-msgid "Unable to open addressbook"
-msgstr "Не вдалося відкрити адресну книгу"
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution "
 
-#: addressbook/gui/component/addressbook.c:534
-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"
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:539
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-""
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:547
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:655
-#: addressbook/gui/component/addressbook.c:658
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Введіть пароль для %s (користувач %s)"
-
-#: addressbook/gui/component/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Будь-яке поле містить"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
-msgstr "Ім'я містить"
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "Параметри"
 
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
-msgstr "Електронна адреса містить"
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "Порт:"
 
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:59
-msgid "Category is"
-msgstr "Категорія - "
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Типово"
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:840
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Додатково..."
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "Серверне повідомлення:"
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1067
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
-msgstr "Будь-яка категорія"
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "Назва сервера:"
 
-#: addressbook/gui/component/addressbook.c:1150
-msgid "The URI that the Folder Browser will display"
-msgstr "URI теки, що буде відображено переглядачем"
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+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
-msgid "Primary Email"
-msgstr "Первинна е-пошта"
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Рахунок"
 
-#: addressbook/gui/component/e-address-popup.c:587
-msgid "Select an Action"
-msgstr "Вибір дії"
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "Редактор контактів"
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Створити новий контакт \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Немає карток"
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Додати адресу до існуючого контакту \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Перевстановлення з'єднання з %s"
 
-#: addressbook/gui/component/e-address-popup.c:891
-msgid "Querying Addressbook..."
-msgstr "Запит адресної книги..."
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
-msgstr "Виправлення контактної інформації"
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-msgid "Add to Contacts"
-msgstr "Додати до контактів"
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "Загальне"
 
-#: addressbook/gui/component/e-address-popup.c:1046
-msgid "Merge E-Mail Address"
-msgstr "Об'єднати електронін адреси"
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
-msgstr "Заборонити запити"
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
-msgstr "Дозволити запити (небезпечно!)"
+#: 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
 #, fuzzy
@@ -812,11 +1274,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:849
-#: 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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Видалити"
 
@@ -846,6 +1306,11 @@ msgid "Unnamed Contact"
 msgstr "Неназваний контакт"
 
 #: 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"
@@ -855,7 +1320,7 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: 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"
@@ -863,31 +1328,40 @@ msgid ""
 "correct this problem."
 msgstr ""
 
-#: 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 "Вибрати контакт з адресної книги"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "Містить:"
+msgid "Select Names"
+msgstr "Вибрати назви"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "Знайти"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Стерти контакт?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Вибрати назви"
+#, 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 ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "_Browse..."
+msgstr "Перенести..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "Категорія:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "Тека:"
 
@@ -948,13 +1422,10 @@ msgstr "Файл як:"
 msgid "Full _Name..."
 msgstr "Повне ім'я..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Загальне"
-
 #: 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"
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
 "of that information here."
 msgstr ""
 
@@ -992,14 +1463,11 @@ 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:707
-#: filter/filter.glade.h:8
-#: mail/folder-browser.c:1492
-#: mail/mail-config.glade.h:107
-#: ui/evolution-calendar.xml.h:38
-#: ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:17
-#: ui/evolution.xml.h:35
+#: 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
 msgid "_Delete"
 msgstr "Стерти"
 
@@ -1165,7 +1633,9 @@ 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"
@@ -2063,7 +2533,8 @@ msgstr "Редактор категорій недоступний."
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:830
 msgid "This contact belongs to these categories:"
-msgstr "Цей контакт належить до таких категорій:"
+msgstr ""
+"Цей контакт належить до таких категорій:"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:1044
 msgid "Save Contact as VCard"
@@ -2076,7 +2547,8 @@ msgstr "TTY/TDD"
 #: addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, 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"
@@ -2087,7 +2559,7 @@ msgid "Edit Full"
 msgstr "Виправлення повного імені"
 
 #: 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 "Повне ім'я"
 
@@ -2231,8 +2703,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 msgid "_Remove"
 msgstr "Видалити"
 
@@ -2272,8 +2743,10 @@ 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"
@@ -2292,11 +2765,13 @@ 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:238
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "Удосконалений пошук"
 
@@ -2305,102 +2780,23 @@ msgstr "Удосконалений пошук"
 msgid "Search"
 msgstr "Пошук"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:135
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Немає карток"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:138
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 картка"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:141
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "Карток: %d"
 
-#: 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:910
-#: addressbook/gui/widgets/e-addressbook-view.c:1024
-#: addressbook/gui/widgets/e-addressbook-view.c:1646
-#: ui/evolution-addressbook.xml.h:22
-msgid "Save as VCard"
-msgstr "Зберегти як VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:312
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Відкрити"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-#: ui/evolution-addressbook.xml.h:13
-msgid "Forward Contact"
-msgstr "Переслати контакт"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:1026
-msgid "Send Message to Contact"
-msgstr "Відіслати повідомлення за контактом"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1027
-#: 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:66
-#: ui/my-evolution.xml.h:2
-msgid "Print"
-msgstr "Друкувати"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:318
-#: addressbook/gui/widgets/e-addressbook-view.c:1029
-msgid "Print Envelope"
-msgstr "Надрукувати конверт"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:322
-#: addressbook/gui/widgets/e-addressbook-view.c:1033
-msgid "Copy to folder..."
-msgstr "Скопіювати в теку..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
-#: addressbook/gui/widgets/e-addressbook-view.c:1034
-msgid "Move to folder..."
-msgstr "Перенести в теку..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:1037
-#: ui/evolution-addressbook.xml.h:8
-#: ui/evolution-tasks.xml.h:7
-msgid "Cut"
-msgstr "Вирізати"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
-#: addressbook/gui/widgets/e-addressbook-view.c:1038
-#: ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:7
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Скопіювати"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: addressbook/gui/widgets/e-addressbook-view.c:1039
-#: ui/evolution-addressbook.xml.h:16
-#: ui/evolution-tasks.xml.h:12
-msgid "Paste"
-msgstr "Вставити"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1040
-#: filter/libfilter-i18n.h:9
-#: mail/mail-accounts.c:295
-#: 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:19
-msgid "Delete"
-msgstr "Стерти"
+#: 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:87
@@ -2409,16 +2805,15 @@ msgid "Error modifying card"
 msgstr "Помилка модифікації картки"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1020
+#: shell/evolution-shell-component.c:1043
 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
-#: shell/e-shell.c:1900
-#: shell/e-storage.c:528
-#: shell/evolution-shell-component.c:1057
+#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
@@ -2427,9 +2822,8 @@ msgstr "Невідома помилка"
 msgid "Repository offline"
 msgstr "Перенесення"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
-#: 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:1071
 msgid "Permission denied"
 msgstr ""
 
@@ -2446,11 +2840,10 @@ msgid "Protocol not supported"
 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:610
-#: camel/camel-service.c:646
+#: 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
 msgid "Cancelled"
 msgstr "Скасовано"
 
@@ -2482,7 +2875,7 @@ msgstr "Помилка видалення списку"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:97
 #: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1444
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Помилка видалення картки"
 
@@ -2499,94 +2892,195 @@ msgstr "Відобразити"
 #: addressbook/gui/widgets/e-addressbook-util.c:209
 #, c-format
 msgid ""
-"You have requested that %d cards be cards. This will cause %d new windows to be\n"
+"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:342
+#: addressbook/gui/widgets/e-addressbook-util.c:344
 #, fuzzy
 msgid "Move card to"
 msgstr "Немає карток"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:346
 #, fuzzy
 msgid "Copy card to"
 msgstr "Немає карток"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Move cards to"
 msgstr "Немає карток"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:351
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Немає карток"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:331
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Клацніть тут щоб додати контакт *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Первинний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Телефон помічника"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Робочий телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Телефон компанії"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Домашній телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Робоча адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Домашня адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Мобільний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Автомобільний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Робочий телеофн 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Домашній телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:351
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Інший телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 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
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Зберегти як VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Новий контакт"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Новий контактний список"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "Перейти на теку..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "Імпорт..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "Пошук контактів"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Джерела адресних книг..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Установки пілота..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Переслати контакт"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Відіслати повідомлення за контактом"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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
+msgid "Print Envelope"
+msgstr "Надрукувати конверт"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Copy to folder..."
+msgstr "Скопіювати в теку..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Move to folder..."
+msgstr "Перенести в теку..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Вирізати"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "Поточний рік"
+
+#. 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:940
 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 ""
 
@@ -2594,7 +3088,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:585
+#: addressbook/gui/widgets/e-addressbook-view.c:945
 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 ""
 
@@ -2611,7 +3105,7 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr "Зберегти у адресній книзі"
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
@@ -2620,7 +3114,7 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
+#: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
 "\n"
 "\n"
@@ -2714,6 +3208,7 @@ msgid "Include:"
 msgstr "Включити:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Альбомна"
 
@@ -2738,6 +3233,7 @@ msgid "Options"
 msgstr "Параметри"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Орієнтація"
 
@@ -2758,7 +3254,9 @@ msgstr "Папір"
 msgid "Paper source:"
 msgstr "Джерело паперу:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Книжна"
 
@@ -2818,30 +3316,24 @@ msgstr "Шрифт..."
 msgid "Untitled appointment"
 msgstr "Неназвана зустріч"
 
-#: calendar/cal-util/cal-util.c:498
-#: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: mail/message-list.c:654
+#: 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
 msgid "High"
 msgstr "Високий"
 
-#: 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
-#: mail/message-list.c:653
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Звичайний"
 
-#: calendar/cal-util/cal-util.c:502
-#: calendar/cal-util/cal-util.c:524
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: mail/message-list.c:652
+#: 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
 msgid "Low"
 msgstr "Низький"
 
 #. 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
 msgid "Undefined"
 msgstr "Невизначено"
@@ -2849,12 +3341,16 @@ 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:"
@@ -2875,45 +3371,72 @@ msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
+msgid "Calendar and Tasks"
+msgstr "Установки пошти..."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 #, fuzzy
+msgid "Configuration control for the Evolution Calendar."
+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:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
-msgstr "Компонент Evolution для керування календарем."
+msgstr ""
+"Компонент Evolution для керування календарем."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 #, fuzzy
 msgid "Factory for the Calendar Summary component."
-msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
+msgstr ""
+"Не вдалося ініціалізувати поштовий "
+"компонент Evolutuion."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
-msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
+msgstr ""
+"Не вдалося ініціалізувати поштовий "
+"компонент Evolutuion."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory for the calendar iTip view control"
-msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
+msgstr ""
+"Не вдалося ініціалізувати поштовий "
+"компонент Evolutuion."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the sample Calendar control"
-msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
+msgstr ""
+"Не вдалося ініціалізувати поштовий "
+"компонент Evolutuion."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
-msgstr "Фабрика для створення фабрики компонентного редактора"
+msgstr ""
+"Фабрика для створення фабрики "
+"компонентного редактора"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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"
@@ -2962,8 +3485,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:419
-#: mail/mail-callbacks.c:2573
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Попередження"
@@ -2971,7 +3493,8 @@ msgstr "Попередження"
 #: calendar/gui/alarm-notify/alarm-queue.c:758
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. 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"
@@ -2983,81 +3506,76 @@ msgstr ""
 msgid "Do not ask me about this program again."
 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:58
 msgid "Could not initialize GNOME"
 msgstr "Не вдалось ініціалізувати GNOME"
 
 #: calendar/gui/alarm-notify/notify-main.c:181
 msgid "Could not create the alarm notify service"
-msgstr "Не вдалося створити послугу сповіщення"
+msgstr ""
+"Не вдалося створити послугу сповіщення"
 
 #: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
-msgstr "Не вдалося створити фабрику послуги сповіщення"
+msgstr ""
+"Не вдалося створити фабрику послуги "
+"сповіщення"
 
-#: 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:51
 msgid "Description contains"
 msgstr "Опис містить"
 
-#: 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
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr ""
 
-#: 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: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:834
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:800
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418
-#: calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:421
-#: calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
 msgid "Confidential"
 msgstr ""
 
@@ -3081,34 +3599,28 @@ msgstr "Сх"
 msgid "W"
 msgstr "Зх"
 
-#: calendar/gui/calendar-model.c:603
-#: calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
 msgid "Free"
 msgstr "Вільний"
 
-#: calendar/gui/calendar-model.c:605
-#: calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1042
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: calendar/gui/calendar-model.c:754
-#: calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Not Started"
 msgstr "Не розпочато"
 
-#: calendar/gui/calendar-model.c:757
-#: calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 msgid "In Progress"
 msgstr "Виконується"
 
-#: calendar/gui/calendar-model.c:760
-#: calendar/gui/calendar-model.c:1195
+#: 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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Завершено"
 
@@ -3118,23 +3630,20 @@ 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/mail-account-gui.c:1512
-#: 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: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
 #: 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
+#: 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
 msgid "None"
 msgstr "Немає"
 
@@ -3146,97 +3655,103 @@ 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:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
 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:310
 msgid "No"
 msgstr "Ні"
 
-#. 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
 msgid "Day View"
 msgstr "Відображення дня"
 
-#: calendar/gui/calendar-view-factory.c:151
-#: views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Показ робочого тижня"
 
-#: calendar/gui/calendar-view-factory.c:154
-#: views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 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
 msgid "Month View"
 msgstr "Відображення місяця"
 
-#: calendar/gui/component-factory.c:64
-#: my-evolution/my-evolution.glade.h:3
-#: shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Календар"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
-msgstr "Тека, що містить інформацію про зустрічі та події"
+msgstr ""
+"Тека, що містить інформацію про зустрічі "
+"та події"
 
-#: calendar/gui/component-factory.c:69
-#: my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267
-#: shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Завдання"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:73
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "Фільтр списку розсилки"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:695
 msgid "New meeting"
 msgstr "Нове засідання"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:695
 msgid "_Meeting"
 msgstr "За_сідання"
 
-#: calendar/gui/component-factory.c:687
+#: calendar/gui/component-factory.c:699
 msgid "New task"
 msgstr "Нове завдання"
 
-#: calendar/gui/component-factory.c:687
-#: ui/evolution-tasks.xml.h:21
+#: calendar/gui/component-factory.c:699
 msgid "_Task"
 msgstr "Завдання"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Нова зустріч"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "_Зустріч"
+
+#: calendar/gui/component-factory.c:707
 msgid "New appointment"
 msgstr "Нова зустріч"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:707
 msgid "_Appointment"
 msgstr "_Зустріч"
 
-#: calendar/gui/control-factory.c:120
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Не вдалося відкрити теку в \"%s\""
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URI, який відобразить календар"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "Змінити назву цієї теки"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Параметри звукових сповіщень"
@@ -3278,15 +3793,16 @@ msgid "Run program:"
 msgstr "Запустити програму:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:6
-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."
+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 ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "З цими арґументами:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-#: filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 #, fuzzy
 msgid "days"
 msgstr "Тіло"
@@ -3295,14 +3811,11 @@ msgstr "Тіло"
 msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 msgid "hours"
 msgstr ""
 
-#: 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 ""
 
@@ -3463,8 +3976,7 @@ msgstr "кінець зустрічі"
 msgid "hour(s)"
 msgstr "година"
 
-#: 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:189
 #, fuzzy
 msgid "minute(s)"
 msgstr "хвилина"
@@ -3507,174 +4019,168 @@ msgid "Color for tasks due today"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
-msgid "Create new appointments with a default _reminder"
-msgstr "Створити нову зустріч"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Дні"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Перший день тижня:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "П'ятниця"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Години"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 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:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Понеділок"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Субота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, fuzzy
-msgid "Show appointment _end times in week and month views"
-msgstr "Показати час завершення зустрічей"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
-msgstr "Показати номера тижнів у навіґаторі дат"
+msgstr ""
+"Показати номера тижнів у навіґаторі дат"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Sta_rt of day:"
 msgstr "Початок дня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "Ндл"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Неділя"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "T_asks due today:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "Чтв"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "Втр"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "Список завдань"
 
-#: 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:25
 msgid "Time"
 msgstr "Час"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Часовий пояс:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Розділювачі часу:"
-
-#: 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: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:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Середа"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Робочий тиждень"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 годин (дп/пп)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 години"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 #, fuzzy
 msgid "_Display"
 msgstr "День"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_End of day:"
 msgstr "Кінець дня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "Птн"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "Загальне"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "_Сховати виконані завдання після"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "Пнд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#, fuzzy
-msgid "_Other"
-msgstr "Інша"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "_Overdue tasks:"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "Сбт"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "Список завдань"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "Показати час завершення зустрічей"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Розділювачі часу:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "Срд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "Перед початком зустрічі"
 
@@ -3690,12 +4196,16 @@ msgstr "Ви впевнені, що хочете стерти завдання"
 #: calendar/gui/dialogs/cancel-comp.c:62
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Ви впевнені, що хочете стерти завдання \"%s\"?"
+msgstr ""
+"Ви впевнені, що хочете стерти завдання "
+"\"%s\"?"
 
 #: calendar/gui/dialogs/cancel-comp.c:67
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Ви впевнені, що хочете стерти запис в журналі \"%s\"?"
+msgstr ""
+"Ви впевнені, що хочете стерти запис в "
+"журналі \"%s\"?"
 
 #: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
@@ -3741,127 +4251,122 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: 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:2212
 #, fuzzy
 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:2214
 #, fuzzy
 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/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:321
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "Не вдалося поновити об'єкт!"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Виправити зустріч"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Зустріч - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Завдання - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Журнальний запис - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Немає зведення"
 
-#: calendar/gui/dialogs/comp-editor.c:1077
-#: mail/mail-callbacks.c:2226
-#: mail/mail-display.c:113
-msgid "Overwrite file?"
-msgstr "Переписати файл?"
-
-#: calendar/gui/dialogs/comp-editor.c:1081
-#: mail/mail-callbacks.c:2233
-#: mail/mail-display.c:117
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Файл з цією назвою вже існує.\n"
-"Переписати його?"
-
-#: calendar/gui/dialogs/comp-editor.c:1127
-#: ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "Зберегти як..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 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
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d appointments?"
-msgstr "Ви впевнені, що хочете стерти зустріч \"%s\"?"
+msgstr ""
+"Ви впевнені, що хочете стерти зустріч \"%s\"?"
 
 #: calendar/gui/dialogs/delete-comp.c:137
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d tasks?"
-msgstr "Ви впевнені, що хочете стерти завдання \"%s\"?"
+msgstr ""
+"Ви впевнені, що хочете стерти завдання "
+"\"%s\"?"
 
 #: calendar/gui/dialogs/delete-comp.c:142
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Ви впевнені, що хочете стерти запис в журналі \"%s\"?"
+msgstr ""
+"Ви впевнені, що хочете стерти запис в "
+"журналі \"%s\"?"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Addressbook..."
@@ -4031,8 +4536,7 @@ 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:49
+#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
 #: mail/message-list.etspec.h:11
 msgid "Status"
 msgstr "Стан"
@@ -4040,7 +4544,6 @@ 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
-#: mail/mail-config.glade.h:95
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Тип"
@@ -4063,30 +4566,100 @@ msgstr "Запросити інших..."
 msgid "_Other Organizer"
 msgstr "Інший організатор"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 #, fuzzy
 msgid "on"
 msgstr "Пнд"
 
-#: calendar/gui/dialogs/recurrence-page.c:958
-#: filter/filter-datespec.c:83
+#: 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 "секунда"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Інша"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Північ"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "список"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Інший факс"
+
+#: 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:1260
 #, fuzzy
 msgid "on the"
 msgstr "місяць"
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr " "
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 #, fuzzy
 msgid "occurrences"
 msgstr "Джерела"
@@ -4184,7 +4757,7 @@ msgid "Progress"
 msgstr "Поступ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:755
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4196,17 +4769,21 @@ msgstr "Пріоритет:"
 msgid "_Status:"
 msgstr "Стан:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+#, fuzzy
+msgid "Basic"
+msgstr "Вставити"
+
 #: 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:324
 #, fuzzy
 msgid "Assignment"
 msgstr "Призначення"
 
 #: calendar/gui/dialogs/task-page.glade.h:5
 #: 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:42
 msgid "Description:"
 msgstr "Опис:"
 
@@ -4219,76 +4796,81 @@ msgstr "Час початку:"
 msgid "_Due Date:"
 msgstr "Відділ:"
 
-#: 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:751 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: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: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
 msgid "_Open"
 msgstr "Відкрити"
 
-#: 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
-#: ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Зберегти як..."
+
+#: calendar/gui/e-calendar-table.c:974 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 "Друкувати..."
+
+#: calendar/gui/e-calendar-table.c:978 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: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:16
+#: calendar/gui/e-calendar-table.c:979 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: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:20
+#: calendar/gui/e-calendar-table.c:980 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 "Вставити"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Призначити завдання"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Переслати як i_Calendar"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "Позначити як виконане"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "Стерти це завдання"
-
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "Позначити завдання як виконані"
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "Стерти вибрані завдання"
 
-#: 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:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Поновлення об'єктів"
 
-#: calendar/gui/e-calendar-table.c:1247
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Клацніть щоб додати завдання"
 
@@ -4296,9 +4878,8 @@ msgstr "Клацніть щоб додати завдання"
 msgid "Alarms"
 msgstr "Сповіщення"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
-#: camel/camel-filter-driver.c:924
-#: camel/camel-filter-driver.c:1026
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 #, fuzzy
 msgid "Complete"
 msgstr "% завершення:"
@@ -4330,9 +4911,7 @@ 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:44
-#: shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1483
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Зведення"
 
@@ -4345,15 +4924,13 @@ 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
+#: 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
+#: 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"
@@ -4376,156 +4953,179 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c: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/e-day-view.c:638 calendar/gui/e-week-view.c:375
 msgid "am"
 msgstr "дп"
 
 #. 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
 msgid "pm"
 msgstr "пп"
 
-#: calendar/gui/e-day-view.c:3525
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "Нова зустріч"
 
-#: 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
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Нова щоденна подія"
 
-#: 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 "Нове засідання"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#, fuzzy
+msgid "New Task"
+msgstr "Нове завдання"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Друкувати..."
+
+#: 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 "Сьогодні"
 
-#: 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 "Перейти на дату..."
 
-#: calendar/gui/e-day-view.c:3548
-#: calendar/gui/e-week-view.c:3435
-msgid "_Delete this Appointment"
-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 ""
+"Опублікувати інформацію про зайнятість"
+
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
+#, fuzzy
+msgid "_Configure..."
+msgstr "Конфіґурувати теку"
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+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
+msgid "_Save As..."
+msgstr "Зберегти як..."
+
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Планувати зустріч"
 
-#: calendar/gui/e-day-view.c:3567
-#: calendar/gui/e-week-view.c:3460
+#: 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:3613 calendar/gui/e-week-view.c:3490
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Зберегти поточний файл"
 
-#: 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
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Стерти цей елемент"
 
-#: 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
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Джерела"
 
-#: 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-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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
+#, 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
-#: camel/providers/smtp/camel-smtp-transport.c:171
-#: camel/providers/smtp/camel-smtp-transport.c:226
-#: mail/folder-browser.c:317
-#: mail/mail-display.c:827
-#: widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:442
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1338
-msgid ""
-"Unable to find any of your identities in the attendees list!\n"
-""
+#: calendar/gui/e-itip-control.c:1564
+msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1369
-msgid ""
-"Calendar file could not be updated!\n"
-""
+#: calendar/gui/e-itip-control.c:1566
+msgid "Update complete\n"
+msgstr "Оновлення виконано\n"
+
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1371
-msgid ""
-"Update complete\n"
-""
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
-"Оновлення виконано\n"
-""
 
-#: calendar/gui/e-itip-control.c:1416
-msgid ""
-"Attendee status could not be updated because of an invalid status!\n"
-""
+#: calendar/gui/e-itip-control.c:1625
+msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1638
 #, fuzzy
-msgid ""
-"Attendee status could not be updated!\n"
-""
+msgid "Attendee status could not be updated!\n"
 msgstr "Весь супровід"
 
-#: calendar/gui/e-itip-control.c:1426
+#: calendar/gui/e-itip-control.c:1640
 #, fuzzy
-msgid ""
-"Attendee status updated\n"
-""
+msgid "Attendee status updated\n"
 msgstr "Весь супровід"
 
-#: calendar/gui/e-itip-control.c:1428
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Видалення завершено"
 
-#: calendar/gui/e-itip-control.c:1486
-#: calendar/gui/e-itip-control.c:1536
-msgid ""
-"Item sent!\n"
-""
-msgstr ""
-"Елемент відіслано!\n"
-""
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+msgid "Item sent!\n"
+msgstr "Елемент відіслано!\n"
 
-#: calendar/gui/e-itip-control.c:1488
-#: calendar/gui/e-itip-control.c:1540
-msgid ""
-"The item could not be sent!\n"
-""
-msgstr ""
-"Елемент не може бути відіслано!\n"
-""
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+msgid "The item could not be sent!\n"
+msgstr "Елемент не може бути відіслано!\n"
+
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Вибір теки"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Вибір теки"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4569,8 +5169,7 @@ msgstr "дата-початку"
 msgid "Chair Persons"
 msgstr "Автомобільний телефон"
 
-#: calendar/gui/e-meeting-model.c:82
-#: calendar/gui/e-meeting-model.c:1640
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Потрібні учасники"
 
@@ -4582,104 +5181,86 @@ msgstr "Необов'язкові учасники"
 msgid "Non-Participants"
 msgstr "Не учасники"
 
-#: calendar/gui/e-meeting-model.c:229
-#: calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
 #: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Індивідуальне"
 
-#: calendar/gui/e-meeting-model.c:231
-#: calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Групове"
 
-#: calendar/gui/e-meeting-model.c:233
-#: calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Ресурс"
 
-#: calendar/gui/e-meeting-model.c:235
-#: calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Кімната"
 
-#: calendar/gui/e-meeting-model.c:264
-#: calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "Місце"
 
-#: calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
 #: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "Потрібний учасник"
 
-#: calendar/gui/e-meeting-model.c:268
-#: calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "Необов'язковий учасник"
 
-#: calendar/gui/e-meeting-model.c:270
-#: calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Не учасник"
 
-#: calendar/gui/e-meeting-model.c:316
-#: calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
 #: calendar/gui/e-meeting-model.c:543
 #, fuzzy
 msgid "Needs Action"
 msgstr "Додати дію"
 
-#: calendar/gui/e-meeting-model.c:318
-#: calendar/gui/e-meeting-model.c:341
+#: 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
+#: 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-model.c:322 calendar/gui/e-meeting-model.c:345
 #: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "Доручено"
 
-#: calendar/gui/e-meeting-model.c:328
-#: calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 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:471
+#: calendar/gui/e-meeting-time-sel-item.c:475
 #: calendar/gui/e-meeting-time-sel.c:2088
 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:2118
-#: e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:276
-#: e-util/e-time-utils.c:348
+#: calendar/gui/e-meeting-time-sel-item.c:479
+#: calendar/gui/e-meeting-time-sel.c:2118 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
-#: e-util/e-time-utils.c:279
-#: widgets/misc/e-dateedit.c:1612
+#: 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"
 
@@ -4743,42 +5324,59 @@ msgstr "Час початку зібрання:"
 msgid "Meeting _end time:"
 msgstr "Час завершення зібрання:"
 
-#: calendar/gui/e-tasks.c:351
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Відкривання завдань на %s"
 
-#: calendar/gui/e-tasks.c:381
+#: 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:393
+#: 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:643
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Дата завершення"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Стерти вибрані контакти"
+
+#: calendar/gui/e-tasks.c:659
 #, fuzzy
 msgid "Expunging"
 msgstr "Викреслення теки"
 
-#: 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 "Нова зустріч..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "Стерти цю зустріч"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Не вдалося відкрити теку в \"%s\""
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
-msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
+msgstr ""
+"Метод, необхідний для завантаження \"%s\", "
+"не підтримується"
 
-#: calendar/gui/gnome-cal.c:1872
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Відкривання календаря на %s"
@@ -4839,280 +5437,286 @@ msgstr "Жовтень"
 msgid "September"
 msgstr "Вересень"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "Потрібен хоча б один відвідувач"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "Потрібно вказати організатора."
 
-#: calendar/gui/itip-utils.c:370
-#, fuzzy, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Опублікувати інформацію про зайнятість"
-
-#: calendar/gui/itip-utils.c:591
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Ви маєте бути відвідувачем події."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
-msgstr "Неможливо створити фабрику компонентного редактора"
+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 "Ндл"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Пнд"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Втр"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Срд"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Чтв"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Птн"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Сбт"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Поточний день (%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 %b %d"
 
-#: 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 %b %d %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Вибраний тиждень (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Вибраний місяць (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Вібраний рік (%Y)"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Надрукувати календар"
 
-#: calendar/gui/print.c:2477
-#: calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2882
-#: my-evolution/e-summary.c:605
-#: ui/evolution-addressbook.xml.h:20
-#: 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:2894
+#: 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:2550
 msgid "Print Item"
 msgstr "Надрукувати елемент"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Параметри друку"
 
 #: calendar/gui/tasks-control-factory.c:75
-msgid "Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "URI, який відобразить календар"
 
-#: calendar/gui/tasks-control.c:427
+#: 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"
+"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 ""
 
-#: calendar/gui/tasks-control.c:434
-#: mail/mail-callbacks.c:2359
-#: mail/mail-callbacks.c:2587
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "Більше не питати."
 
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Надрукувати картки"
+
 #: calendar/gui/tasks-migrate.c:105
-msgid "Evolution has taken the tasks that were in your calendar folder and automatically migrated them to the new tasks folder."
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
 msgstr ""
 
 #: calendar/gui/tasks-migrate.c:108
 msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted again in the future."
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
 msgstr ""
 
 #: calendar/gui/tasks-migrate.c:120
 #, c-format
-msgid "Could not open `%s'; no items from the calendar folder will be migrated to the tasks folder."
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
 msgstr ""
 
 #: calendar/gui/tasks-migrate.c:133
 #, c-format
-msgid "The method required to load `%s' is not supported; no items from the calendar folder will be migrated to the tasks folder."
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:314
-#: calendar/gui/weekday-picker.c:409
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "НПВСЧПС"
 
@@ -5131,99 +5735,122 @@ msgstr "Імпорт файлів VCard у Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Імпорт файлів VCard у Evolution."
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Календарне повідомлення"
+
+#: 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/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Календар"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:317
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:324
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:356
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:388
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:691
-msgid "contains? expects argument 1 to be one of \"any\", \"summary\", \"description\""
+#: calendar/pcs/query.c:693
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
 msgstr ""
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:745
-msgid "has-categories? expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
+#: 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 ""
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
@@ -6824,14 +7451,14 @@ msgstr ""
 msgid "Decryption is not supported by this cipher"
 msgstr "Операція не підтримується"
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr ""
 "Неможливо створити файл виводу: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:441
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Не вдалося відкрити кеш-каталогу: %s"
@@ -6860,58 +7487,54 @@ msgstr ""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: 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:789
-#: camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Помилка аналізу фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:798
-#: camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Помилка виконання фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:887
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Не вдалося відкрити адресну книгу"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 #, fuzzy
 msgid "Unable to process spool folder"
-msgstr "Не вдалося зберегти список груп для %s: %s"
+msgstr ""
+"Не вдалося зберегти список груп для %s: %s"
 
-#: camel/camel-filter-driver.c:889
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Отримання повідомлення %d (%d%%)"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Неможливо відкрити повідомлення"
 
-#: camel/camel-filter-driver.c:894
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Збій на повідомленні %d"
 
-#: camel/camel-filter-driver.c:920
-#: camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Синхронізація теки"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Отримання повідомлення %d з %d"
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Збій на повідомленні %d з %d"
@@ -6920,22 +7543,24 @@ msgstr "Збій на повідомленні %d з %d"
 msgid "Failed to retrieve message"
 msgstr "Збій отримання повідомлення"
 
-#: camel/camel-filter-search.c:543
-#: camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
-msgstr "Помилка виконання фільтрованого пошуку: %s: %s"
+msgstr ""
+"Помилка виконання фільтрованого пошуку: "
+"%s: %s"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
-"Неможливо проаналізувати пошуковий вираз: %s:\n"
+"Неможливо проаналізувати пошуковий "
+"вираз: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -6944,37 +7569,37 @@ msgstr ""
 "Помилка виконання пошукового виразу: %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 ""
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: 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:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
-msgstr "Непідтримувана операція: додавання повідомлення: для %s"
+msgstr ""
+"Непідтримувана операція: додавання "
+"повідомлення: для %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
-msgstr "Непідтримувана операція: пошук за виразом: для %s"
+msgstr ""
+"Непідтримувана операція: пошук за "
+"виразом: для %s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
-msgstr "Непідтримувана операція: пошук за ідентифікаторами користувачів: для %s"
+msgstr ""
+"Непідтримувана операція: пошук за "
+"ідентифікаторами користувачів: для %s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Перенесення повідомлень"
 
@@ -6988,8 +7613,7 @@ msgstr "Не вдалося створити канал: %s"
 msgid "Cannot fork locking helper: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/camel-lock-client.c:202
-#: camel/camel-lock-client.c:225
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
@@ -7000,11 +7624,12 @@ msgid "Could not lock '%s'"
 msgstr "Не вдалося заблокувати \"%s\""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91
-#: camel/camel-lock.c:110
+#: 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
@@ -7014,17 +7639,22 @@ 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
@@ -7034,12 +7664,16 @@ 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
@@ -7049,7 +7683,9 @@ 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
@@ -7068,13 +7704,15 @@ 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
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
-msgstr "Помилка копиювання тимчасового поштового файлу: %s"
+msgstr ""
+"Помилка копиювання тимчасового "
+"поштового файлу: %s"
 
 #: camel/camel-pgp-context.c:193
 #, fuzzy, c-format
@@ -7086,177 +7724,144 @@ msgstr "Введіть пароль NNTP для %s@%s"
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+msgstr ""
+"Неможливо відіслати повідомлення: не "
+"визначено отримувачів"
 
-#: camel/camel-pgp-context.c:582
-#: camel/camel-pgp-context.c:763
+#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
-msgstr "Неможливо відіслати повідомлення: адреса відправника не вірна."
+msgstr ""
+"Неможливо відіслати повідомлення: адреса "
+"відправника не вірна."
 
-#: camel/camel-pgp-context.c:588
-#: camel/camel-pgp-context.c:769
+#: 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: %s"
 
-#: camel/camel-pgp-context.c:756
+#: camel/camel-pgp-context.c:795
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+msgstr ""
+"Неможливо відіслати повідомлення: не "
+"визначено отримувачів"
 
-#: camel/camel-pgp-context.c:955
+#: camel/camel-pgp-context.c:987
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+msgstr ""
+"Неможливо відіслати повідомлення: не "
+"визначено отримувачів"
 
-#: camel/camel-pgp-context.c:961
+#: 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:972
+#: 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:1145
+#: camel/camel-pgp-context.c:1177
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+msgstr ""
+"Неможливо відіслати повідомлення: не "
+"визначено отримувачів"
 
-#: camel/camel-pgp-context.c:1155
+#: camel/camel-pgp-context.c:1187
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
-msgstr "Неможливо відіслати повідомлення: адреса відправника не вірна."
+msgstr ""
+"Неможливо відіслати повідомлення: адреса "
+"відправника не вірна."
 
-#: camel/camel-pgp-context.c:1162
+#: 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:1171
+#: camel/camel-pgp-context.c:1203
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+msgstr ""
+"Неможливо відіслати повідомлення: не "
+"визначено отримувачів"
 
-#: camel/camel-pgp-context.c:1340
+#: camel/camel-pgp-context.c:1372
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+msgstr ""
+"Неможливо відіслати повідомлення: не "
+"визначено отримувачів"
 
-#: camel/camel-pgp-context.c:1348
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1355
+#: 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:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:197
-#: camel/camel-smime-context.c:173
-#, fuzzy, c-format
-msgid "Please enter your password for %s"
-msgstr "Введіть пароль NNTP для %s@%s"
-
-#: camel/camel-pkcs7-context.c:213
-#, fuzzy
-msgid "Error hashing password."
-msgstr "Помилка додавання картки"
-
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr "Неправильний пароль."
-
-#: camel/camel-pkcs7-context.c:329
-#, fuzzy, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Не вдалося відіслати ім'я користувача на сервер"
-
-#: camel/camel-pkcs7-context.c:378
-#, fuzzy, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Не вдалося відіслати ім'я користувача на сервер"
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:590
-#, fuzzy
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "Не вдалось створити вікно конструктора."
-
-#: camel/camel-pkcs7-context.c:620
-#, fuzzy, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Не вдалося з'єднатись з сервером: %s"
-
-#: camel/camel-pkcs7-context.c:626
-#, fuzzy
-msgid "Could not encrypt: encoding failed."
-msgstr "Не вдалося зберегти файл підпису."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr ""
-
-#: 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 ""
 
-#: 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:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr "Не вдалося завантажити %s: немає ініціалізації в модулі."
+msgstr ""
+"Не вдалося завантажити %s: немає "
+"ініціалізації в модулі."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, fuzzy, c-format
 msgid "%s server %s"
 msgstr "Сервер:"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "З'єднання скасовано"
 
-#: camel/camel-remote-store.c:267
+#: 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:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(невідомий хост)"
 
-#: camel/camel-remote-store.c:358
-#: camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: 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:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7270,8 +7875,7 @@ msgstr "Анонім"
 msgid "This option will connect to the server using an anonymous login."
 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
 msgid "Authentication failed."
 msgstr "Збій автенфікації."
 
@@ -7301,7 +7905,9 @@ msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 #: camel/camel-sasl-cram-md5.c:37
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
 msgstr ""
 
 #: camel/camel-sasl-digest-md5.c:43
@@ -7309,43 +7915,33 @@ msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 #: camel/camel-sasl-digest-md5.c:45
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
 msgstr ""
 
 #: camel/camel-sasl-digest-md5.c:810
-msgid ""
-"Server challenge too long (>2048 octets)\n"
-""
+msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
 #: camel/camel-sasl-digest-md5.c:819
-msgid ""
-"Server challenge invalid\n"
-""
+msgid "Server challenge invalid\n"
 msgstr ""
 
 #: camel/camel-sasl-digest-md5.c:825
-msgid ""
-"Server challenge contained invalid \"Quality of Protection\" token\n"
-""
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
 #: camel/camel-sasl-digest-md5.c:847
-msgid ""
-"Server response did not contain authorization data\n"
-""
+msgid "Server response did not contain authorization data\n"
 msgstr ""
 
 #: camel/camel-sasl-digest-md5.c:865
-msgid ""
-"Server response contained incomplete authorization data\n"
-""
+msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 
 #: camel/camel-sasl-digest-md5.c:875
-msgid ""
-"Server response does not match\n"
-""
+msgid "Server response does not match\n"
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:40
@@ -7364,18 +7960,18 @@ msgid ""
 msgstr "Не вдалося створити канал: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 #, fuzzy
 msgid "Bad authentication response from server."
-msgstr "Неочікувана відповідь від сервера IMAP: %s"
+msgstr ""
+"Неочікувана відповідь від сервера IMAP: %s"
 
 #: camel/camel-sasl-login.c:32
 #, fuzzy
 msgid "Login"
 msgstr "вихідні"
 
-#: camel/camel-sasl-login.c:34
-#: camel/camel-sasl-plain.c:34
+#: 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 ""
 
@@ -7383,11 +7979,19 @@ 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:69
-#: mail/mail-config.glade.h:61
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+#: camel/camel-sasl-ntlm.c:33
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"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 "Пароль"
 
@@ -7397,7 +8001,9 @@ 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
@@ -7415,7 +8021,9 @@ 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
 #, c-format
@@ -7432,26 +8040,39 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Розв'язання: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Розв'язання: %s"
+
+#: camel/camel-service.c:787
+msgid "Host lookup failed: host not found"
+msgstr ""
+
+#: camel/camel-service.c:790
+msgid "Host lookup failed: unknown reason"
+msgstr ""
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
@@ -7460,13 +8081,12 @@ msgstr ""
 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 ""
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7475,6 +8095,11 @@ msgstr ""
 "Не вдалося створити каталог %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Введіть пароль NNTP для %s@%s"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
@@ -7489,13 +8114,13 @@ msgstr "Сертифікату підпису \"%s\" не існує."
 msgid "The encryption certificate for \"%s\" does not exist."
 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
 #, 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."
@@ -7509,24 +8134,24 @@ msgstr "Збій розкодовування повідомлення."
 msgid "Failed to verify certificates."
 msgstr "Збір перевірки сертифікатів."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7543,7 +8168,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:438
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7552,16 +8177,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:500
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7586,39 +8211,48 @@ msgstr "Неможливо проаналізувати URL \"%s\""
 msgid "No such message %s in %s"
 msgstr "Невірне повідомлення %s в %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Немає такого повідомлення: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "Неможливо стерти теку: %s: Невірна операція"
+msgstr ""
+"Неможливо стерти теку: %s: Невірна операція"
 
-#: camel/camel-vee-store.c:293
+#: 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:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Неможливо перейменувати теку: %s: Невірна операція"
+msgstr ""
+"Неможливо перейменувати теку: %s: Невірна "
+"операція"
 
-#: camel/camel-vee-store.c:314
+#: 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 "Ви неможете скопіювати повідомлення з цієї теки смітника."
+msgstr ""
+"Ви неможете скопіювати повідомлення з "
+"цієї теки смітника."
 
 #: camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
-msgstr "Неочікувана відповідь від сервера IMAP: %s"
+msgstr ""
+"Неочікувана відповідь від сервера IMAP: %s"
 
 #: camel/providers/imap/camel-imap-command.c:362
 #, c-format
@@ -7627,64 +8261,75 @@ msgstr "Збій команди IMAP: %s"
 
 #: camel/providers/imap/camel-imap-command.c:417
 msgid "Server response ended too soon."
-msgstr "Відповідь сервера завершилась надто скоро."
+msgstr ""
+"Відповідь сервера завершилась надто "
+"скоро."
 
 #: camel/providers/imap/camel-imap-command.c:610
 #, 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
 #, 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:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Не вдалося створити каталог %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Не вдалося завантажити зведення для %s"
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Пошук змінених повідомлень."
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Цього повідомлення зараз не існує"
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
-msgstr "Отримання інформації про нові повідомлення"
+msgstr ""
+"Отримання інформації про нові "
+"повідомлення"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Пошук нових повідомлень"
 
-#: camel/providers/imap/camel-imap-folder.c:2145
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
-msgstr "Не вдалося знайти тіла повідомлення у відповіді на FETCH."
+msgstr ""
+"Не вдалося знайти тіла повідомлення у "
+"відповіді на 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 "Не вдалося відкрити кеш-каталогу: %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 "Збій кешування повідомлення %s: %s"
@@ -7697,8 +8342,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48
-#: shell/e-shell-view.c:834
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
 msgid "Folders"
 msgstr "Теки"
 
@@ -7716,7 +8360,9 @@ msgstr "Простір назв"
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Застосувати фільтри до нових повідомлень у теці \"Вхідні\" на цьому сервері"
+msgstr ""
+"Застосувати фільтри до нових повідомлень "
+"у теці \"Вхідні\" на цьому сервері"
 
 #: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
@@ -7724,164 +8370,198 @@ 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:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "Сервер IMAP %s не підтримує запитаного типу автенфікації %s"
+msgstr ""
+"Сервер IMAP %s не підтримує запитаного типу "
+"автенфікації %s"
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:393
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Немає підтримки автенфікації типу %s"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sБудь ласка, введіть пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:434
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Ви не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, 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:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "Невірна тека \"%s\""
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
-msgstr "Батьківська тека не дозволяє розміщути підтеки"
+msgstr ""
+"Батьківська тека не дозволяє розміщути "
+"підтеки"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "Поштові каталоги формату MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
-msgstr "Для збереження локальної пошти у форматі поштових каталогів MH"
+msgstr ""
+"Для збереження локальної пошти у форматі "
+"поштових каталогів MH"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Локальне відвантаження"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 msgid "For retrieving local mail from standard mbox formated spools."
-msgstr "Для отримання локальної пошти з стандартного накопичувача у форматі mbox."
+msgstr ""
+"Для отримання локальної пошти з "
+"стандартного накопичувача у форматі mbox."
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:76
+#: 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:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Поштові каталоги формату maildir"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
-msgstr "Для збереження локальної пошти у форматі поштових каталогів maildir."
+msgstr ""
+"Для збереження локальної пошти у форматі "
+"поштових каталогів maildir."
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr "Стандартні накопичувачі Unix mbox"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:101
 msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "Для зчитування та збереження локальної пошти у стандартних накопичувальних файлах mbox."
+msgstr ""
+"Для зчитування та збереження локальної "
+"пошти у стандартних накопичувальних "
+"файлах mbox."
 
-#: camel/providers/local/camel-local-provider.c:91
+#: camel/providers/local/camel-local-provider.c:116
 msgid "Directory tree of mbox files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:117
 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."
+"NOTE: This provider is still experimental so ensure you backup any mail "
+"folders first."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: 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
 #, 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
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 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: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: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:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Файл локальної пошти %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:863
 #, 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
+msgid "Could not rename '%s': %s"
+msgstr "Не вдалося перейменувати теку: %s"
 
-#: 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"
+msgstr ""
+"Не вдалося стерти файл зведення теки \"%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 "Не вдалося стерти індексний файл теки \"%s\": %s"
+msgstr ""
+"Не вдалося стерти індексний файл теки "
+"\"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Не вдалося зберегти зведення %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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
-msgstr "Неможливо додати повідомлення до зведення: причина невідома"
+msgstr ""
+"Неможливо додати повідомлення до "
+"зведення: причина невідома"
 
 #: camel/providers/local/camel-maildir-folder.c:181
 msgid "Maildir append message cancelled"
-msgstr "Відмінено додавання повідомлення у maildir"
+msgstr ""
+"Відмінено додавання повідомлення у maildir"
 
 #: camel/providers/local/camel-maildir-folder.c:184
 #, 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
@@ -7911,7 +8591,7 @@ msgstr "Невірне повідомлення"
 msgid "Invalid message contents"
 msgstr "Невірний вміст повідомлення"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -7921,14 +8601,14 @@ msgstr ""
 "Не вдалося відкрити теку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Теки \"%s\" не існує."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -7938,34 +8618,56 @@ msgstr ""
 "Не вдалося створити теку \"%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\" не є каталогом Maildir."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Не вдалося стерти теку \"%s\": %s"
 
-#: 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:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, 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:408
+#: camel/providers/local/camel-maildir-summary.c:531
 #, fuzzy, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 "Неможливо відкрити поштову скриньку: %s: %s\n"
-""
+
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Тека не порожня"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+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
+msgid "Storing folder"
+msgstr "Збереження теки"
 
 #: camel/providers/local/camel-mbox-folder.c:151
 #: camel/providers/local/camel-spool-folder.c:277
@@ -7976,12 +8678,9 @@ msgstr "Не вдалося отримати теку: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:208
 #: camel/providers/local/camel-spool-folder.c:459
 #, c-format
-msgid ""
-"Cannot open mailbox: %s: %s\n"
-""
+msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 "Неможливо відкрити поштову скриньку: %s: %s\n"
-""
 
 #: camel/providers/local/camel-mbox-folder.c:265
 msgid "Mail append cancelled"
@@ -7990,7 +8689,9 @@ msgstr "Додавання пошти відмінено"
 #: camel/providers/local/camel-mbox-folder.c:268
 #, 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
@@ -8003,7 +8704,8 @@ 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
@@ -8014,9 +8716,11 @@ msgstr "Схоже тека непоправно зіпсована."
 #: camel/providers/local/camel-mbox-folder.c:392
 #: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Збій побудови повідомлення: зіпсовано поштову скриньку?"
+msgstr ""
+"Збій побудови повідомлення: зіпсовано "
+"поштову скриньку?"
 
-#: 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"
@@ -8025,7 +8729,7 @@ msgstr ""
 "Не вдалося відкрити файл \"%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"
@@ -8034,14 +8738,14 @@ msgstr ""
 "Не вдалось створити файл \"%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\" не є звичайним файлом."
 
-#: 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"
@@ -8050,96 +8754,95 @@ msgstr ""
 "Не вдалось стерти теку \"%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 "Тека \"%s\" не порожня. Не стерто."
 
-#. 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:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Не вдалося відкрити теку %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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Не вдалося відкрити файл %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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %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
-#: 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
+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 "Зведення і тека не співпадають, навіть після синхронізації"
+msgstr ""
+"Зведення і тека не співпадають, навіть "
+"після синхронізації"
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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"
+msgstr ""
+"Помилка запису в тимчасову пошту "
+"скриньку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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: %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: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"
 msgstr "Не вдалося закрити вихідну теку %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, 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:652
 #, 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Невідома помилка: %s"
@@ -8151,14 +8854,16 @@ msgstr "Відмінено додавання повідомлення у MH"
 #: camel/providers/local/camel-mh-folder.c:175
 #, 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
 #, 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:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Неможливо відкрити каталог MH: %s: %s"
@@ -8166,7 +8871,9 @@ msgstr "Неможливо відкрити каталог MH: %s: %s"
 #: camel/providers/local/camel-spool-folder.c:515
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
-msgstr "Неможливо додати повідомлення до файлу Mbox: %s: %s"
+msgstr ""
+"Неможливо додати повідомлення до файлу "
+"Mbox: %s: %s"
 
 #: camel/providers/local/camel-spool-store.c:115
 #, fuzzy, c-format
@@ -8174,6 +8881,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "\"%s\" не є звичайним файлом."
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Теки \"%s/%s\" не існує."
@@ -8183,95 +8891,61 @@ msgstr "Теки \"%s/%s\" не існує."
 msgid "Spool mail file %s"
 msgstr "Накопичувальній файл пошти %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
-msgstr "Накопичувальні теки не можна перейменовувати"
+msgstr ""
+"Накопичувальні теки не можна "
+"перейменовувати"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
-msgstr "Не вдалось синхронізувати тимчасову теку %s: %s"
+msgstr ""
+"Не вдалось синхронізувати тимчасову теку "
+"%s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, c-format
 msgid "Could not sync spool folder %s: %s"
-msgstr "Не вдалося синхронізувати накопичувальну теку %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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "Не вдалося завантажити %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Введіть пароль NNTP для %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Сервер відкинув ім'я користувача"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Не вдалося відіслати ім'я користувача на сервер"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-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\" не є звичайним файлом."
 
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: 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  %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
-#, fuzzy
-msgid "User cancelled"
-msgstr "Операцію скасовано"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Не вдалося отримати спісок груп з сервера."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c: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
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Не вдалося зберегти список груп для %s: %s"
+#: 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"
@@ -8281,13 +8955,15 @@ msgstr "Новини USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "Новини USENET через %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
-msgid "This option will authenticate with the NNTP server using a plaintext password."
+#: camel/providers/nntp/camel-nntp-store.c:155
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-summary.c:234
@@ -8326,33 +9002,50 @@ msgstr "Операцію скасовано"
 msgid "Operation failed: %s"
 msgstr "Збій операції: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Отримання 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
+#, fuzzy
+msgid "User cancelled"
+msgstr "Операцію скасовано"
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:316
+#: camel/providers/pop3/camel-pop3-folder.c:325
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Стерти вибрані повідомлення"
 
-#: 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"
 
 #. 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/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 ""
+"Неможливо отримати повідомлення %s: %s  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
 msgid "Unknown reason"
 msgstr "Невідома причина"
 
@@ -8370,55 +9063,82 @@ msgstr "Залишати повідомлення на сервері"
 msgid "Delete after %s day(s)"
 msgstr "Стирати по завершенню %s днів"
 
-#: 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:84
 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 "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-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."
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:172
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Не вдалося з'єднатись з сервером POP на %s."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, 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
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr ""
+"Не вдалося з'єднатись з сервером POP на %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:213
-#: camel/providers/pop3/camel-pop3-store.c:316
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:229
+#: camel/providers/pop3/camel-pop3-store.c:405
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:240
+#: camel/providers/pop3/camel-pop3-store.c:416
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:255
+#: camel/providers/pop3/camel-pop3-store.c:431
 #, c-format
 msgid "I/O Error: %s"
 msgstr "Помилка вводу-виводу: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:276
+#: camel/providers/pop3/camel-pop3-store.c:452
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sБудь ласка, введіть пароль POP3 для %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:327
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8427,330 +9147,377 @@ msgstr ""
 "Неможливо з'єднатись з сервером POP.\n"
 "Помилка відсилання пароля: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Невірна тека \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: 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: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:124
+#: 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:150
+#: 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: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:170
+#: 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: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:194
-msgid "Could not find 'From' address in message"
-msgstr "Не вдалося знайти адресу відправника у повідомленні"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-#, fuzzy
-msgid "Could not parse recipient list"
-msgstr "Неможливо проаналізувати URL \"%s\""
+msgstr ""
+"sendmail завершився з станом %d: пошту не "
+"відіслано."
 
-#: 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: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:75
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
-msgid ""
-"For delivering mail by connecting to a remote mailhub using SMTP.\n"
-""
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
-msgstr "Синтаксична помилка, команду не розпизнано"
+msgstr ""
+"Синтаксична помилка, команду не "
+"розпизнано"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
-msgstr "Синтаксична помилка у параметрах чи арґументах"
+msgstr ""
+"Синтаксична помилка у параметрах чи "
+"арґументах"
 
-#: 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:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Парамера команди не реалізовано"
 
-#: 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:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Довідкове повідомлення"
 
-#: 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Послуга закриває канал передачі"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
-msgstr "Послуга не доступна, закриття каналу передачі"
+msgstr ""
+"Послуга не доступна, закриття каналу "
+"передачі"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
-msgstr "Запитана поштова дія успішно виконалася"
+msgstr ""
+"Запитана поштова дія успішно виконалася"
 
-#: 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: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:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: 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: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: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: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: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:209
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: 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:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
-msgstr "Автенфікаційний механізм надто слабкий"
+msgstr ""
+"Автенфікаційний механізм надто слабкий"
 
-#: 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:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Тимчасовий збій автенфікації"
 
-#: 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:320
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:383
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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
+msgid "server does not appear to support SSL"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr ""
+"Перевищено час очікування відповіді на "
+"AUTH: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, 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:421
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Введіть пароль NNTP для %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:442
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
 "%s\n"
 "\n"
-""
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "Сервер SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Достачання пошти SMTP через %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:591
-msgid "Cannot send message: sender address not defined."
-msgstr "Неможливо відіслати повідомлення: адреса відправника не визначена."
-
-#: camel/providers/smtp/camel-smtp-transport.c:598
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
-msgstr "Неможливо відіслати повідомлення: адреса відправника не вірна."
+msgstr ""
+"Неможливо відіслати повідомлення: адреса "
+"відправника не вірна."
 
-#: camel/providers/smtp/camel-smtp-transport.c:603
-#: mail/mail-ops.c:603
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Відсилання повідомлення"
 
-#: camel/providers/smtp/camel-smtp-transport.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
-msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+msgstr ""
+"Неможливо відіслати повідомлення: не "
+"визначено отримувачів"
 
-#: camel/providers/smtp/camel-smtp-transport.c:624
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+msgstr ""
+"Неможливо відіслати повідомлення: не "
+"визначено отримувачів"
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "Привітання SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:820
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
-msgstr "Перевищено час очікування відповіді на HELO: %s: не фатально"
+msgstr ""
+"Перевищено час очікування відповіді на "
+"HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:840
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Помилка відповіді на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:884
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "Автенфікація SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:890
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
-msgstr "Помилка створення автенфікаційного об'єкта SASL"
+msgstr ""
+"Помилка створення автенфікаційного "
+"об'єкта SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:905
-#: camel/providers/smtp/camel-smtp-transport.c:917
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
-msgstr "Перевищено час очікування відповіді на AUTH: %s"
+msgstr ""
+"Перевищено час очікування відповіді на "
+"AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:926
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "Збій запиту AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:974
-msgid ""
-"Bad authentication response from server.\n"
-""
+#: camel/providers/smtp/camel-smtp-transport.c:1042
+msgid "Bad authentication response from server.\n"
 msgstr ""
-"Невірна автенфікаціна відповідь від сервера.\n"
-""
+"Невірна автенфікаціна відповідь від "
+"сервера.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1014
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "MAIL FROM response error"
 msgstr "Помилка відповіді на MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, 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:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 msgid "DATA response error"
 msgstr "Помилка відповіді на DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
-#: camel/providers/smtp/camel-smtp-transport.c:1163
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1177
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1200
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "затримка відповіді на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 msgid "RSET response error"
 msgstr "Помилка відповіді на RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1237
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
-msgstr "затримка відповіді на QUIT: %s: нефатально"
+msgstr ""
+"затримка відповіді на QUIT: %s: нефатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 msgid "QUIT response error"
 msgstr "Помилка відповіді на QUIT"
 
@@ -8779,14 +9546,15 @@ msgid "%.1fG"
 msgstr "%.1fГ"
 
 #. 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 "долучення"
 
 #: 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..."
@@ -8805,7 +9573,9 @@ 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"
@@ -8820,65 +9590,73 @@ msgid "MIME type:"
 msgstr "Тип 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 ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
-msgstr "Клацніть тут щоб викликати адресну книгу"
+msgstr ""
+"Клацніть тут щоб викликати адресну книгу"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Від:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Відповідати на:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Введіть адресатів повідомлення"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Введіть адресатів, що отримають копію повідомлення"
+msgstr ""
+"Введіть адресатів, що отримають копію "
+"повідомлення"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
-msgstr "Введіть адресатів, що отримають копію повідомлення не попавши в список отримувачів."
+#: composer/e-msg-composer-hdrs.c:403
+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:291
+#: 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:697
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -8887,38 +9665,36 @@ msgstr ""
 "Помилка зчитування файлу: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:914
-msgid "Save as..."
-msgstr "Зберегти як..."
-
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Попередження!"
 
-#: composer/e-msg-composer.c:927
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Файл існує, переписати?"
 
-#: composer/e-msg-composer.c:949
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: composer/e-msg-composer.c:999
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Помилка доступу до файлу: %s"
 
-#: composer/e-msg-composer.c:1007
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
-msgstr "Неможливо отримати повідомлення від редактора"
+msgstr ""
+"Неможливо отримати повідомлення від "
+"редактора"
 
-#: composer/e-msg-composer.c:1014
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -8927,7 +9703,7 @@ msgstr ""
 "Неможливо спозиціонуватися у файлі: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -8936,7 +9712,7 @@ msgstr ""
 "Неможливо обрізати файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -8945,15 +9721,16 @@ msgstr ""
 "Помилка автозбереження файлу: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1132
+#: composer/e-msg-composer.c:1176
 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:1290
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -8963,47 +9740,48 @@ msgstr ""
 "\n"
 "Чи хочете ви зберегти ваші зміни?"
 
-#: composer/e-msg-composer.c:1297
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Увага: змінене повідомлення"
 
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Відкрити файл"
 
-#: composer/e-msg-composer.c:1469
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Вставити файл"
 
-#: composer/e-msg-composer.c:1855
-#: composer/e-msg-composer.c:2447
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Підготувати повідомлення"
 
-#: composer/e-msg-composer.c:2464
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2487
-#: composer/e-msg-composer.c:2542
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 "Не вдалось створити вікно редактора:\n"
-"Неможливо активувати компонент HTML-редактора."
+"Неможливо активувати компонент "
+"HTML-редактора."
 
-#: 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."
 msgstr ""
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
-msgstr "Не вдалося ініціалізувати редактора Evolutuion."
+msgstr ""
+"Не вдалося ініціалізувати редактора "
+"Evolutuion."
 
 #: data/evolution.desktop.in.h:1
 #, fuzzy
@@ -9054,14 +9832,21 @@ msgstr "Тема містить"
 msgid "Subject does not contain"
 msgstr "Тема не містить"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Файл з цією назвою вже існує.\n"
+"Переписати його?"
+
 #. 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:270
+#: e-util/e-passwords.c:365 mail/mail-session.c:270
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -9076,15 +9861,13 @@ msgstr "Категорії"
 
 #. 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
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d.%m.%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173
-#: e-util/e-time-utils.c:353
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d.%m.%Y %H:%M"
 
@@ -9135,31 +9918,25 @@ msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:303
-#: e-util/e-time-utils.c:402
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:307
-#: e-util/e-time-utils.c:394
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 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:1420
-#: widgets/misc/e-dateedit.c:1647
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1647
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. 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:1417
-#: widgets/misc/e-dateedit.c:1644
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1644
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -9168,173 +9945,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 "Компонент Evolution для виконавчого зведення."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Компонент поштового виконавчого зведення Evolutuion."
-
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Не вдалося ініціалізувати компонент зведення Evolutuion."
-
-#: 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 ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Відіслати пошту на %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Змінити назву цієї теки"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Закрити %s"
-
-#: 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
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Конфіґурувати теку"
-
-#: executive-summary/component/e-summary-url.c:553
-msgid "page"
-msgstr "сторінка"
-
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Неможливо відкрити файл HTML:\n"
-"%s"
-
-#: 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
-msgid ""
-"File does not have a place for the services.\n"
-""
-msgstr ""
-
-#: 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 ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Фабрика для RDF-зведень"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RFD-зведення"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "Фабрика для редактора Evolutuion."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c: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
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr ""
-"Оновлення виконано\n"
-""
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "Поновити зайнятість"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "рік"
@@ -9370,11 +9980,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:191
 msgid "seconds"
 msgstr "секунд"
 
@@ -9430,8 +10036,7 @@ msgstr "Вибрати файл"
 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 "зараз"
 
@@ -9443,8 +10048,7 @@ msgstr " тому"
 msgid "ago"
 msgstr "тому"
 
-#: filter/filter-datespec.c:711
-#: mail/message-list.c:997
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9452,40 +10056,30 @@ msgstr "%b %d %l:%M %p"
 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 "Правила фільтрування"
 
 #. 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
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:239
-#: filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:849
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Вибір теки"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Введіть URI теки"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<клацніть тут для вибору теки>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9495,8 +10089,7 @@ msgstr ""
 "Помилка у реґулярному виразі \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:488
-#: shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Тест"
 
@@ -9504,39 +10097,40 @@ msgstr "Тест"
 msgid "You must name this filter."
 msgstr "Необхідно назвати цей фільтр."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Назва правила: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Неназвано"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Якщо"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "якщо всі відповідоє всім критеріям"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "якщо відповідає будь-якому критерію"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Додати критерій"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "вхідні"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "вихідні"
 
@@ -9556,8 +10150,7 @@ msgstr "Вхідні"
 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 "Віртуальні теки"
 
@@ -9585,206 +10178,217 @@ msgstr "Створити нову теку"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Призначити колір"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Долучення"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Беліз"
+
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "містить"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Скопіювати у теку"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Дата отримання"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Дата відсилання"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Стерто"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "не містить"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "не закінчуєтьтся на"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "не існує"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "не схоже на"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "не починається з"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "не існують"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Чернетка"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "закінчується на"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Існують"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "існує"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Вираз"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Важливо"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr " "
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "було перед"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "було після"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "більше"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "менше"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "не"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "не"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "Список листування"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Тіло повідомлення"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "Заголовок повідомлення"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Перенести в теку"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "Відтворити звук:"
+
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Прочитано"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Адресати"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "Replied to"
 msgstr "Відповісти всім"
 
-#: filter/libfilter-i18n.h:41
-#: filter/score-rule.c:204
-#: filter/score-rule.c:206
-#: mail/message-list.etspec.h:8
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 #, fuzzy
 msgid "Score"
 msgstr "Мобільний"
 
-#: filter/libfilter-i18n.h:42
-#: mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Відправник"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 #, fuzzy
 msgid "Set Status"
 msgstr "Стан:"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Розмір (Кб)"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "схоже на"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 #, fuzzy
 msgid "Source Account"
 msgstr "Електронна адреса містить"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "починається на"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Зупинити обробку"
 
-#: filter/libfilter-i18n.h:51
-#: mail/mail-format.c:932
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
 #: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Тема"
@@ -9793,11 +10397,11 @@ msgstr "Тема"
 msgid "Rules"
 msgstr "Правила"
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Додати правило"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Змінити правило"
 
@@ -9818,36 +10422,30 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution імпортує вашу пошту з 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 "Імпортування..."
 
-#: 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 "Будь ласка, зачекайте"
 
-#: 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 "Імпортування %s як %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 "Сканування %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:101
 msgid "Mail"
 msgstr "Пошта"
 
@@ -9863,8 +10461,7 @@ 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
 msgid "Addressbook"
 msgstr "Адресна книга"
 
@@ -9876,24 +10473,75 @@ msgstr ""
 "Evolution знайшов файли GnomeCard.\n"
 "Чи бажаєте ви імпортувати їх у Evolution?"
 
-#: importers/netscape-importer.c:106
+#: 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:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution імпортує ваші старі дані Netscape"
 
-#: importers/netscape-importer.c:888
-#: importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+#, fuzzy
+msgid "Trash"
+msgstr "Лаос"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Файл локальної пошти %s"
+
+#: 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:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Параметри"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Редагування вільтрів"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -9918,46 +10566,104 @@ msgid "Pine"
 msgstr "Pine"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
-#: notes/GNOME_Evolution_Notes.oaf.in.h:2
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Фабрика для редактора Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr ""
+"Не вдалося ініціалізувати поштовий "
+"компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Фабрика для редактора Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Фабрика для редактора Evolutuion."
+
+#: 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:7
 msgid "Evolution mail composer."
 msgstr "Редактор пошти Evolutuion."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: 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:4
+#: 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:5
+#: 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:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Фабрика для редактора Evolutuion."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: 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:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Без періодичності"
+
+#: 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:16
 msgid "Mail configuration interface"
 msgstr "Інтерфейс конфіґурації пошти"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-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:101
-msgid "Mail storage folder (internal)"
-msgstr "Тека зберігання пошти (внутрішня)"
+msgid "Folder containing mail"
+msgstr "Тека, що містить пошту"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -9967,261 +10673,264 @@ msgstr "Віртуальний смітник"
 msgid "Virtual Trash folder"
 msgstr "Віртуальна тека смітника"
 
-#: mail/component-factory.c:129
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Створити новий календар"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Ця тека не може містити повідомлення."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Властивості..."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Змінити властивості цієї теки"
 
-#: mail/component-factory.c:800
-msgid "Some of your mail settings seem corrupt, please check that everything is in order."
+#: mail/component-factory.c:766
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:971
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Нове поштове повідомлення"
 
-#: mail/component-factory.c:971
-#: ui/evolution-mail-global.xml.h:19
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "Відіслати повідомлення"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
-msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
+msgstr ""
+"Не вдалося ініціалізувати поштовий "
+"компонент Evolutuion."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1003
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
-msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
+msgstr ""
+"Не вдалося ініціалізувати поштовий "
+"компонент Evolutuion."
 
-#: mail/component-factory.c:1013
+#: mail/component-factory.c:1009
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
-msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
+msgstr ""
+"Не вдалося ініціалізувати поштовий "
+"компонент Evolutuion."
+
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "З'єднання з сервером..."
 
-#: mail/component-factory.c:1229
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:327
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Властивості для \"%s\""
 
-#: mail/folder-browser-ui.c:329
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Властивості"
 
-#: mail/folder-browser.c:299
-#: mail/mail-display.c:310
-#: mail/mail-display.c:819
+#: mail/folder-browser.c:305 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:754
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d нових"
 
-#: mail/folder-browser.c:757
-#: mail/folder-browser.c:765
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d приховано"
 
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "d вибрано"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d не відіслано"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d відіслано"
 
-#: mail/folder-browser.c:775
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d всього"
 
-#: mail/folder-browser.c:1062
+#: mail/folder-browser.c:1088
 #, fuzzy
-msgid "Create vFolder from Search"
-msgstr "Створити правило з повідомлення"
+msgid "Create _Virtual Folder From Search..."
+msgstr ""
+"Створити віртуальну теку з повідомлення"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1581
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Віртуальна тека теми"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "Віртуальна тека відправника"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "Віртуальна тека отримувачів"
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "Фільтр списку листування"
 
-#: mail/folder-browser.c:1453
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Фільтр теми"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Фільтр відправника"
 
-#: mail/folder-browser.c:1455
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Фільтр отримувачів"
 
-#: mail/folder-browser.c:1456
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Фільтр списку розсилки"
 
-#: mail/folder-browser.c:1464
-#: ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "Виправити як нове повідомлення..."
 
-#: mail/folder-browser.c:1465
-#: ui/evolution-mail-message.xml.h:109
-msgid "_Save As..."
-msgstr "Зберегти як..."
-
-#: mail/folder-browser.c:1466
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "Друкувати"
 
-#: mail/folder-browser.c:1470
-#: ui/evolution-mail-message.xml.h:108
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Відповісти відправнику"
 
-#: mail/folder-browser.c:1471
-#: ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Відповісти у список"
 
-#: mail/folder-browser.c:1472
-#: ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Відповісти всім"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "Переслати"
 
-#: mail/folder-browser.c:1477
-#: ui/evolution-mail-message.xml.h:32
+#: mail/folder-browser.c:1622
 #, fuzzy
-msgid "Follow _Up..."
+msgid "Follo_w Up..."
 msgstr "Повне ім'я..."
 
-#: mail/folder-browser.c:1478
+#: mail/folder-browser.c:1623
 #, fuzzy
-msgid "Flag Com_pleted"
+msgid "Fla_g Completed"
 msgstr "Завершено"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1624
 #, fuzzy
-msgid "Clear Fla_g"
+msgid "Cl_ear Flag"
 msgstr "Безхмарно"
 
 #. separator here?
-#: mail/folder-browser.c:1483
-#: ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Позначити прочитаним"
 
-#: mail/folder-browser.c:1484
-#: ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Позначити непрочитаним"
 
-#: mail/folder-browser.c:1485
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Позначити як важливе"
 
-#: mail/folder-browser.c:1486
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Позначити як неважливе"
 
-#: mail/folder-browser.c:1490
-#: ui/evolution-addressbook.xml.h:40
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "Відновити"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "Перенести в теку..."
 
-#: mail/folder-browser.c:1491
-#: ui/evolution-addressbook.xml.h:37
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "Скопіювати в теку..."
 
-#: mail/folder-browser.c:1493
-#: ui/evolution-mail-message.xml.h:111
-msgid "_Undelete"
-msgstr "Відновити"
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "Більше"
 
-#: mail/folder-browser.c:1497
-#: ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Додати відправника в адресну книгу"
 
-#: mail/folder-browser.c:1500
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Застосувати фільтри"
 
-#: mail/folder-browser.c:1502
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "Створити правило з повідомлення"
 
-#: mail/folder-browser.c:1693
-msgid "Filter on Mailing List"
-msgstr "Фільтр списку листування"
-
-#: mail/folder-browser.c:1694
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "Віртуальна теку списку листування"
 
-#: mail/folder-browser.c:1696
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Фільтр списку листування (%s)"
 
-#: mail/folder-browser.c:1697
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "Віртуальна тека списку листування (%s)"
 
 #: mail/folder-info.c:64
@@ -10238,55 +10947,49 @@ 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"
 msgstr "Імпортує файли Outlook Express 4 у Evolution"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Тіло містить"
-
-#: mail/local-config.glade.h:2
 #, fuzzy
 msgid "Current store format:"
 msgstr "Не вдалось запустити Wombat"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr ""
-
-#: 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:5
+#: mail/local-config.glade.h:3
 #, fuzzy
 msgid "New store format:"
 msgstr "Новий тип телефона"
 
-#: 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"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: 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:107
 msgid "You have not filled in all of the required information."
 msgstr ""
 
@@ -10300,67 +11003,84 @@ msgstr "Редактор новин Evolution"
 msgid "Evolution Account Editor"
 msgstr "Редактор рахунків Evolution"
 
-#: mail/mail-account-gui.c:974
-msgid "Could not save signature file."
-msgstr "Не вдалося зберегти файл підпису."
-
-#: mail/mail-account-gui.c:1051
-msgid "Save signature"
-msgstr "Зберегти підпис"
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "Комп'ютер:"
 
-#: mail/mail-account-gui.c:1057
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "Назва користувача:"
 
-#: mail/mail-account-gui.c:1681
-msgid "You may not create two accounts with the same name."
-msgstr "Ви не можете створити два рахунки з однаковими назвами."
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "Шлях:"
 
-#: mail/mail-accounts.c:149
+#: 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 " (default)"
-msgstr "Стерти"
+msgid "Random"
+msgstr "Радіо"
 
-#: mail/mail-accounts.c:194
-msgid "Disable"
-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-accounts.c:196
-msgid "Enable"
-msgstr "Увімкнути"
+#: mail/mail-account-gui.c:1985
+msgid "You may not create two accounts with the same name."
+msgstr ""
+"Ви не можете створити два рахунки з "
+"однаковими назвами."
 
-#: mail/mail-accounts.c:292
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
-msgstr "Ви впевнені, що хочете стерти цей рахунок?"
+msgstr ""
+"Ви впевнені, що хочете стерти цей рахунок?"
 
-#: mail/mail-accounts.c:296
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Не стирати"
 
-#: mail/mail-accounts.c:299
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Справді стерти рахунок?"
 
-#: mail/mail-accounts.c:531
-#: mail/mail-accounts.c:535
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Вимкнути"
+
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Увімкнути"
+
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
 msgid "Are you sure you want to delete this news account?"
-msgstr "Ви впевнені, що хочете стерти ці нові рахунки?"
+msgstr ""
+"Ви впевнені, що хочете стерти ці нові "
+"рахунки?"
 
-#. 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-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Увімкнено"
+
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Назва рахунку:"
 
-#: mail/mail-autofilter.c:338
-#: mail/mail-autofilter.c:358
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Пуерто Ріко"
+
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Додати правило фільтрування"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10368,34 +11088,30 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:145
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:189
-msgid "You have not set a mail transport method"
-msgstr ""
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:194
 msgid ""
-"You are sending an HTML-formatted message, but the following recipients do not want HTML-formatted mail:\n"
-""
+"You are sending an HTML-formatted message, but the following recipients do "
+"not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:239
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Відіслати всеодно?"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10403,59 +11119,64 @@ msgstr ""
 "Це повідомлення не має теми.\n"
 "Справді відіслати?"
 
-#: mail/mail-callbacks.c:325
-msgid "Since the contact list you are sending to is configured to hide the list's addresses, this message will contain only Bcc recipients."
+#: mail/mail-callbacks.c:295
+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:329
+#: mail/mail-callbacks.c:299
 #, fuzzy
 msgid "This message contains only Bcc recipients."
-msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+msgstr ""
+"Неможливо відіслати повідомлення: не "
+"визначено отримувачів"
 
-#: mail/mail-callbacks.c:333
+#: mail/mail-callbacks.c:303
 msgid ""
-"It is possible that the mail server may reveal the recipients by adding an Apparently-To header.\n"
+"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:438
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:527
+#: mail/mail-callbacks.c:497
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:646
+#: mail/mail-callbacks.c:623
 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:979
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "невідомий відпраник"
 
-#: mail/mail-callbacks.c:983
+#: mail/mail-callbacks.c:981
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1429
-#: mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Перенести повідомлення у"
 
-#: mail/mail-callbacks.c:1431
-#: mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Скопіювати повідомлення у"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2091
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
-msgstr "Ви впевнені, що хочете виправити всі %d повідомлень?"
+msgstr ""
+"Ви впевнені, що хочете виправити всі %d "
+"повідомлень?"
 
-#: mail/mail-callbacks.c:2102
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10463,7 +11184,7 @@ msgstr ""
 "Ви можете лише редагувати збережені\n"
 "повідомлення в теці \"Чернетки\"."
 
-#: mail/mail-callbacks.c:2141
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10471,85 +11192,95 @@ msgstr ""
 "Ви можете лише відіслати повторно\n"
 "повідомлення з теки \"Відіслані\"."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2169
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
-msgstr "Ви впевнені, що хочете відіслати повторно всі %d повідомлень?"
+msgstr ""
+"Ви впевнені, що хочете відіслати повторно "
+"всі %d повідомлень?"
 
-#: mail/mail-callbacks.c:2181
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Немає вибраних повідомлень"
 
-#: mail/mail-callbacks.c:2280
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Переписати файл?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Зберегти повідомлення як..."
 
-#: mail/mail-callbacks.c:2282
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Зберегти повідомлення як..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2366
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Показати попереднє повідомлення"
 
-#: mail/mail-callbacks.c:2351
+#: mail/mail-callbacks.c:2373
 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:2580
+#: mail/mail-callbacks.c:2615
 msgid ""
-"This operation will permanently erase all messages marked as deleted. If you continue, you will not be able to recover these messages.\n"
+"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 ""
 
-#: mail/mail-callbacks.c:2690
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
-"Помилка завантаження інформації про фільтр:\n"
+"Помилка завантаження інформації про "
+"фільтр:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2702
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Фільтри"
 
-#: mail/mail-callbacks.c:2775
+#: mail/mail-callbacks.c:2783
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Отримання повідомлення %d з %d"
 
-#: mail/mail-callbacks.c:2827
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Надрукувати повідомлення"
 
-#: mail/mail-callbacks.c:2854
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2889
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Не вдалося надрукувати повідомлення"
 
-#: mail/mail-callbacks.c:3055
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 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"
+"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 ""
 
 #: 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"
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
 
@@ -10559,25 +11290,53 @@ msgstr ""
 
 #: mail/mail-config-druid.c:152
 msgid ""
-"Please enter information about the way you will send mail. If you are not sure, ask your system\n"
+"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 ""
 
 #: mail/mail-config-druid.c:154
 msgid ""
-"You are almost done with the mail configuration process. The identity, incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together to\n"
-"make an Evolution mail account. Please enter a name for this account in the space below.\n"
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Інсталяція Evolution"
 
-#: mail/mail-config.c:2036
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Корк"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Загальне"
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Тоґо"
+
+#. blue
+#: mail/mail-config.c:78 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"
@@ -10585,106 +11344,153 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#: mail/mail-config.c:2297
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2375
-#: mail/mail-config.c:2379
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 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 " _Check for supported types "
-msgstr "Визначити типи, що підтримуються..."
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " колір"
+#, fuzzy
+msgid " Edit "
+msgstr "Редагування"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid " New "
+msgstr "Новий"
+
+#: mail/mail-config.glade.h:4
+#, fuzzy
+msgid " _Check for supported types "
+msgstr "Визначити типи, що підтримуються..."
+
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
-msgid "Account"
-msgstr "Рахунок"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Редактор рахунків Evolution"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Інформація про рахунок"
 
-#: mail/mail-config.glade.h:8
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Керування рахунками"
 
-#: mail/mail-config.glade.h:9
-msgid "Accounts"
-msgstr "Рахунки"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Скасувати операцію"
 
-#: mail/mail-config.glade.h:10
-msgid "Always _blind carbon-copy (Bcc) to:"
+#: mail/mail-config.glade.h:12
+#, fuzzy
+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:11
-msgid "Always _carbon-copy (Cc) to:"
+#: 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:12
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
-#: mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "Алґерія"
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Долучити файл до повідомлення"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Долучення"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Автенфікація"
 
-#: mail/mail-config.glade.h:16
-msgid "Beep when new mail arrives"
+#: mail/mail-config.glade.h:23
+msgid "Automatically _detect links"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
-msgid "Checking for New Mail"
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
 #, fuzzy
-msgid "Composer"
-msgstr "Редактор"
+msgid "C_haracter set:"
+msgstr "Невідомий набір символів: %s"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "Закрити"
+
+#: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Підготувати повідомлення"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Конфіґурація"
 
-#: mail/mail-config.glade.h:21
-#, fuzzy
-msgid "Confirm when Expunging a folder"
-msgstr "Викреслення теки"
-
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10694,409 +11500,612 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: 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:29
-msgid "Default Forward style is: "
-msgstr "Типовий стиль пересилання: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Gjxfnrjdbq пріоритет:"
 
-#: mail/mail-config.glade.h:30
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Типове кодування символів: "
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:41
 #, fuzzy
-msgid "Defaults"
-msgstr "Типово"
+msgid "Deleting Mail"
+msgstr "Отримання пошти"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:34
-msgid "Display"
-msgstr "Відобразити"
-
-#: mail/mail-config.glade.h:35
-msgid "Do not notify me when new mail arrives"
-msgstr ""
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Неможливо відкрити повідомлення"
 
-#: mail/mail-config.glade.h:36
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Готово"
 
-#: mail/mail-config.glade.h:37
-msgid "Drafts"
-msgstr "Чернетки"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Тека чернеток:"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "Увімкнути"
 
-#: mail/mail-config.glade.h:39
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Виправити..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Enabled"
-msgstr "Увімкнено"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Схід"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Електронна адреса містить"
+
+#: 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 "Спорожнити теку смітника на виході"
+
+#: mail/mail-config.glade.h:53
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "закінчується на"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Властивості"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Переслані повідомлення"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:43
-msgid "HTML signature file:"
-msgstr "Файл підпису HTML:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "Підсвітка процитованого"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Тувалу"
+
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: 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:46
-msgid "In HTML mail"
-msgstr "В HTML"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "В тілі"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Зберегти та закрити"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Завантажити зображення"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Конфіґурація пошти"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Розміщення поштової скриньки"
 
-#: mail/mail-config.glade.h:52
-msgid "Make this my _default account"
-msgstr "Зробити це моїм _початковим рахунком"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Заголовок повідомлення"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "Показати повідомлення"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Мікронезія"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "Сервер NNTP:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Конфіґурація пошти"
 
-#: mail/mail-config.glade.h:55
-msgid "News"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
 msgstr "Новини"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Необов'язкова інформація"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Організація:"
+
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "Ідентифікатор ключа PGP:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Вибір кольору"
 
-#: mail/mail-config.glade.h:63
-msgid "Play sound file when new mail arrives"
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
+"Неможливо відіслати повідомлення: не "
+"визначено отримувачів"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:65
-#, fuzzy
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
-
-#: mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
-
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:90
 #, fuzzy
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+msgid "Printed Fonts"
+msgstr "Надрукувати вибрані контакти"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Неможливо відкрити повідомлення"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Процитовано"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Запам'ятати цей пароль"
 
-#: mail/mail-config.glade.h:71
-#: shell/glade/evolution-startup-wizard.glade.h:6
-msgid "Receiving Email"
-msgstr "Отримання пошти"
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Відповідати на:"
 
-#: mail/mail-config.glade.h:72
-msgid "Receiving Mail"
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+msgid "Receiving Email"
 msgstr "Отримання пошти"
 
-#: mail/mail-config.glade.h:73
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Параметри отримання"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Запам'ятати цей пароль"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Необхідна інформація"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+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:77
-msgid "Security"
-msgstr "Безпека"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:78
-#, fuzzy
-msgid "Select Filter Log file..."
-msgstr "Вибрати файл"
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
-#: shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Відсилання пошти"
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:81
-msgid "Sending Mail"
-msgstr "Відсилання пошти"
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
+msgstr "Вибрати назви"
 
-#: mail/mail-config.glade.h:83
-#: mail/message-list.etspec.h:9
-msgid "Sent"
-msgstr "Відіслано"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Файл підпису:"
 
-#: mail/mail-config.glade.h:84
+#: 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
+msgid "Sending Email"
+msgstr "Відсилання пошти"
+
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Відіслати повідомлення пізніше"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Відіслати повідомлення негайно"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Сервер вимагає автенфікації"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Конфіґурація сервера"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "Тип сервера: "
 
-#: mail/mail-config.glade.h:89
-msgid "Signature file:"
-msgstr "Файл підпису:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Ярлики"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Зберегти підпис"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Джерело"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Вихідна інформація"
 
-#: mail/mail-config.glade.h:92
-msgid "Sources"
-msgstr "Джерела"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:124
 #, fuzzy
-msgid "Specify filename:"
+msgid "Specify _filename:"
 msgstr "Назва стилю:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Стандартний Unix mbox"
 
-#: mail/mail-config.glade.h:96
-msgid "Use s_ecure connection (SSL)"
-msgstr "Використовувати безпечне з'єднання (SSL)"
+#: mail/mail-config.glade.h:128
+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:97
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "Підпис _HTML:"
+
+#: mail/mail-config.glade.h:132
+msgid "V_ariable-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Схід"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "Тип автенфікації: "
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:143
 msgid "_Authentication type: "
 msgstr "Тип _автенфікації: "
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "Ідентифікатор сертифіката:"
 
-#: mail/mail-config.glade.h:108
-msgid "_Drafts folder:"
-msgstr "Тека чернеток:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:111
-msgid "_Empty trash folders on exit"
-msgstr "Спорожнити теку смітника на виході"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Викреслення теки"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Типово"
+
+#: mail/mail-config.glade.h:151
+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
+#, fuzzy
+msgid "_Filename:"
+msgstr "Назва файлу:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Переслати повідомлення"
+
+#: mail/mail-config.glade.h:157
 msgid "_Full name:"
 msgstr "_Повне ім'я:"
 
-#: mail/mail-config.glade.h:113
-msgid "_HTML signature:"
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "В HTML"
+
+#: mail/mail-config.glade.h:160
+#, fuzzy
+msgid "_HTML Signature:"
 msgstr "Підпис _HTML:"
 
-#: mail/mail-config.glade.h:114
-msgid "_Highlight citations with"
-msgstr "Підсвітка процитованого"
+#: mail/mail-config.glade.h:162
+msgid "_Identity"
+msgstr ""
 
-#: mail/mail-config.glade.h:115
-msgid "_Host:"
-msgstr "Комп'ютер:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Мова"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
-msgstr "Завантажувати зображення, якщо відправник у адресній книзі"
-
-#: mail/mail-config.glade.h:117
-msgid "_Log filter actions to:"
 msgstr ""
+"Завантажувати зображення, якщо "
+"відправник у адресній книзі"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:165
 #, fuzzy
-msgid "_Mark messages as Read after"
+msgid "_Make this my default account"
+msgstr "Зробити це моїм _початковим рахунком"
+
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "Зберегти повідомлення у вказаній теці"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "Ім'я:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
-msgid "_Organization:"
-msgstr "Організація:"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "Шифрування PGP"
 
-#: mail/mail-config.glade.h:123
-msgid "_Path:"
-msgstr "Шлях:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:124
-msgid "_Remember this password"
-msgstr "Запам'ятати цей пароль"
+#: mail/mail-config.glade.h:172
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr ""
+"Неможливо відіслати повідомлення: не "
+"визначено отримувачів"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:173
 #, fuzzy
-msgid "_Send mail in HTML format by default."
-msgstr "Відіслати пошту в форматі HTML"
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr ""
+"Неможливо відіслати повідомлення: не "
+"визначено отримувачів"
 
-#: mail/mail-config.glade.h:126
-msgid "_Server type: "
-msgstr "Тип _сервера:"
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Радіо"
+
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Отримання пошти"
+
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Відповісти всім"
 
-#: mail/mail-config.glade.h:127
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "Безпека"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "Безпека"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Відсилання пошти"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Показати"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
 msgstr "Файл підпису:"
 
-#: mail/mail-config.glade.h:128
-msgid "_Username:"
-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
+msgid "_Variable-width:"
+msgstr ""
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "кожні"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " колір"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "опис"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
-msgid "placeholder"
-msgstr ""
-
-#: mail/mail-config.glade.h:134
-msgid "seconds."
-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-перевірки."
+msgstr ""
+"Не вдалося створити вміст PGP-перевірки."
 
 #: mail/mail-crypto.c:113
 msgid "Could not create a PGP encryption context."
-msgstr "Не вдалося створити вміст PGP-шифрування."
+msgstr ""
+"Не вдалося створити вміст PGP-шифрування."
 
 #: mail/mail-crypto.c:138
 msgid "Could not create a PGP decryption context."
-msgstr "Не вдалося створити вміст PGP-дешифрування."
+msgstr ""
+"Не вдалося створити вміст PGP-дешифрування."
 
 #: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
@@ -11113,187 +12122,196 @@ msgstr ""
 #: mail/mail-crypto.c:267
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
-msgstr "Не вдалось створити вікно конструктора."
+msgstr ""
+"Не вдалось створити вікно конструктора."
 
 #: mail/mail-crypto.c:297
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
-msgstr "Не вдалось створити вікно конструктора."
+msgstr ""
+"Не вдалось створити вікно конструктора."
 
-#: mail/mail-display.c:255
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Зберегти долучення"
 
-#: mail/mail-display.c:320
+#: mail/mail-display.c:344
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
-msgstr "Неможливо створити тимчасовий каталог: %s"
+msgstr ""
+"Неможливо створити тимчасовий каталог: %s"
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Зберегти на диск..."
 
-#: mail/mail-display.c:368
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:370
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Відкрити в %s..."
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:435
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Сховати"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Зовнішня програма перегляду"
 
-#: mail/mail-display.c:1256
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Завантаження вмісту повідомлення"
 
-#: mail/mail-display.c:1751
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Відкрити посилання у браузері"
 
-#: mail/mail-display.c:1753
+#: mail/mail-display.c:1833
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "Контакт"
 
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1835
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Завдання"
 
-#: mail/mail-display.c:1759
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Зберегти зображення як..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "долучення %s"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Невірна адреса"
 
-#: mail/mail-format.c:910
-#: mail/message-list.etspec.h:6
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Від"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Відповідати на"
 
-#: mail/mail-format.c:919
-#: mail/message-list.etspec.h:13
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "До"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:2021
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
+msgstr "Пошта"
+
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Вказівник на сайт FTP (%s)"
 
-#: mail/mail-format.c:2035
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2040
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Вказівник на локальний файл (%s)"
 
-#: mail/mail-format.c:2069
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Вказівник на віддалені дані (%s)"
 
-#: mail/mail-format.c:2077
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Вказівник на невідомі завнішні дані (типу \"%s\")"
+msgstr ""
+"Вказівник на невідомі завнішні дані (типу "
+"\"%s\")"
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Переконфіґурування теки"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, 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:762
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Не вдалось стерти теку \"%s\":\n"
 "%s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
-"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
+"Неможливо отримати повідомлення \"%s\" з "
+"теки \"%s\"\n"
 "  %s"
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Конфіґурувати теку"
@@ -11320,115 +12338,115 @@ msgstr ""
 msgid "Working"
 msgstr "Робота"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Фільтрування теки"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Отримання пошти"
 
-#: 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 "Всеодно, повідомлення було успішно відіслано."
+msgstr ""
+"Всеодно, повідомлення було успішно "
+"відіслано."
 
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Відсилання \"%s\""
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Відсилання повідомлення %d з %d"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Збій на повідомленні %d з %d"
 
-#: mail/mail-ops.c:740
-#: mail/mail-send-recv.c:545
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 #, fuzzy
 msgid "Complete."
 msgstr "% завершення:"
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Збереження повідомлення у теці"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перенесення повідомлень у %s"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копіювання повідомлень у %s"
 
-#: mail/mail-ops.c:940
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Перенесення"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Копіювання"
 
-#: mail/mail-ops.c:1053
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканування тек в \"%s\""
 
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Переслані повідомлення"
 
-#: mail/mail-ops.c:1279
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Відкривання теки %s"
 
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1420
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Видалення теки %s"
 
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Збереження теки \"%s\""
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Оновлення теки"
 
-#: mail/mail-ops.c:1601
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Викреслення теки"
 
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Отримання повідомлення %s"
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Отримання %d повідомлень"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Збереження %d повідомлень"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11437,7 +12455,7 @@ msgstr ""
 "Неможливо створити файл виводу: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11446,11 +12464,11 @@ msgstr ""
 "Помилка збереження повідомлень у %s:\n"
 "%s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Збереження долучення"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11459,27 +12477,27 @@ msgstr ""
 "Неможливо створити файл виводу %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Закриття з'єднання з %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Перевстановлення з'єднання з %s"
 
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "Пошук"
 
@@ -11516,43 +12534,42 @@ msgstr "Знайти:"
 msgid "Matches:"
 msgstr "Шлях:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Скасування..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Сервер: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Шлях: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Відіслати й отримати пошту"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Скасувати все"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Оновлення..."
 
-#: 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:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Відмінено."
 
@@ -11569,25 +12586,37 @@ msgstr "Введіть пароль для %s"
 msgid "Enter Password"
 msgstr "Ввід пароля"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Не вдалося зберегти файл підпису."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Зберегти підпис"
+
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-summary.c:467
+#: mail/mail-signature-editor.c:357
 #, fuzzy
-msgid "Mail Summary"
-msgstr "Поштове зведення"
+msgid "Signature name:"
+msgstr "Файл підпису:"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Переслане повідомлення %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Переслане повідомлення"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Переслане повідомлення"
 
@@ -11627,95 +12656,95 @@ msgstr ""
 msgid "New VFolder"
 msgstr "Нова віртуальна тека"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Без теми)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "повідомлення - %s"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Не прочитано"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Прочитано"
 
-#: mail/message-list.c:644
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Дано відповідь"
 
-#: mail/message-list.c:645
+#: mail/message-list.c:675
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Не вдалося відіслати повідомлення: %s"
 
-#: mail/message-list.c:646
+#: mail/message-list.c:676
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Надрукувати повідомлення"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Найнижче"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Нижче"
 
-#: mail/message-list.c:655
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Вище"
 
-#: mail/message-list.c:656
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Найвище"
 
-#: mail/message-list.c:961
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:968
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Сьогодні %I:%M %p"
 
-#: mail/message-list.c:977
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Вчора %l:%M %p"
 
-#: mail/message-list.c:989
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:999
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2394
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Створення списку повідомлень"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr ""
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Flag Status"
 msgstr "Стан"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr ""
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Отримано"
 
@@ -11723,6 +12752,52 @@ msgstr "Отримано"
 msgid "Size"
 msgstr "Розмір"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "Малі"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Перейти вперед"
+
+#: mail/message-tag-followup.c:59
+#, fuzzy
+msgid "Follow-Up"
+msgstr "Повне ім'я..."
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Вихідна інформація"
+
+#: 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-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr "Відповісти"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Відповісти всім"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Перегляд"
+
+#: mail/message-tag-followup.c:315
+#, fuzzy
+msgid "Flag to Follow Up"
+msgstr "Повне ім'я..."
+
 #: mail/subscribe-dialog.c:219
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -11743,9 +12818,8 @@ msgstr "Передплатити теку \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 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:2
 msgid "Folder"
 msgstr "Тека"
 
@@ -11789,6 +12863,39 @@ msgstr "Передплатити"
 msgid "_Unsubscribe"
 msgstr "Припинити передплату"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "Тека, що містить зведення Evolution"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Редактор пошти Evolutuion."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr ""
+"Не вдалося ініціалізувати поштовий "
+"компонент Evolutuion."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr ""
+"Компонент поштового виконавчого "
+"зведення Evolutuion."
+
+#: 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 ""
+
 #: my-evolution/Locations.h:1
 #, fuzzy
 msgid "Aarhus"
@@ -15529,8 +16636,7 @@ msgid "Hagerstown"
 msgstr ""
 
 #. HAIL
-#: my-evolution/Locations.h:885
-#: my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
 msgid "Hail"
 msgstr "Град"
 
@@ -22532,16 +23638,11 @@ msgstr ""
 msgid "Zurich"
 msgstr "Цюріх"
 
-#: 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
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Не вдалося ініціалізувати компонент зведення Evolutuion."
-
-#: my-evolution/e-summary-calendar.c:365
-#: my-evolution/e-summary-calendar.c:383
+#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "Зустрічі"
 
@@ -22561,44 +23662,52 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Немає опису"
 
-#: my-evolution/e-summary-mail.c:120
+#: my-evolution/e-summary-mail.c:151
 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
+#, 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:82
+#: my-evolution/e-summary-preferences.c:92
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:453
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Слово дня на Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:474
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Цитати для"
 
-#: my-evolution/e-summary-preferences.c:735
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:743
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:747
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Ім'я:"
 
-#: my-evolution/e-summary-preferences.c:1225
-msgid "Summary Settings"
-msgstr "Параметри зведення"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "Помилка завантаження RDF"
@@ -22608,6 +23717,27 @@ msgstr "Помилка завантаження RDF"
 msgid "News Feed"
 msgstr "Нова тека"
 
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
+msgstr ""
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+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
+#, fuzzy
+msgid "Shown"
+msgstr "Шведція"
+
 #: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Немає завдань"
@@ -22628,28 +23758,25 @@ msgstr ""
 msgid "Weather"
 msgstr "Погода"
 
-#: 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 "Будь ласка, зачекайте..."
 
-#: 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:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Збій друку зведення"
 
 #: my-evolution/main.c:65
 #, fuzzy
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-""
+msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 
 #: my-evolution/metar.c:44
@@ -22672,9 +23799,7 @@ msgstr ""
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56
-#: my-evolution/metar.c:74
-#: my-evolution/metar.c:485
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr ""
 
@@ -22779,8 +23904,7 @@ msgstr ""
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:135
-#: my-evolution/metar.c:150
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr ""
 
@@ -22885,8 +24009,7 @@ msgstr ""
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:165
-#: my-evolution/metar.c:180
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr ""
 
@@ -23062,8 +24185,7 @@ msgstr ""
 msgid "Hail in the vicinity"
 msgstr "Град в околицях"
 
-#: my-evolution/metar.c:219
-#: my-evolution/metar.c:234
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr "Слабкий град"
 
@@ -23752,8 +24874,7 @@ msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:442
-#: my-evolution/metar.c:451
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr "Смерч"
 
@@ -23841,7 +24962,9 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:5
 msgid "Ma_x number of items shown:"
-msgstr "Максимальна кількість показуваних елементів:"
+msgstr ""
+"Максимальна кількість показуваних "
+"елементів:"
 
 #: my-evolution/my-evolution.glade.h:6
 msgid "News Feed Settings"
@@ -23915,47 +25038,52 @@ msgstr "Планування"
 msgid "_Weather"
 msgstr "Погода"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-#, fuzzy
-msgid "Factory for the Evolution notes component."
-msgstr "Фабрика для редактора Evolutuion."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Factory for the Notes control"
-msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
+msgid "Default Folders"
+msgstr "Вибір теки"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Оболонка Evolutuion."
 
-#: shell/e-activity-handler.c:160
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Показати подробиці"
 
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Скасувати операцію"
 
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Інсталяція 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 "Натисніть \"Гаразд\" щоб встановити файли, чи \"Відмінити\" щоб вийти."
+msgstr ""
+"Натисніть \"Гаразд\" щоб встановити файли, "
+"чи \"Відмінити\" щоб вийти."
 
-#: 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:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -23966,14 +25094,15 @@ msgstr ""
 "%s\n"
 "Помилка: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
-msgstr "Сталася помилка під час зчитування файлу."
+msgstr ""
+"Сталася помилка під час зчитування файлу."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, fuzzy, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -23983,7 +25112,7 @@ msgstr ""
 "Не вдалося створити каталог %s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -23991,7 +25120,7 @@ msgid ""
 "readable and executable and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -23999,7 +25128,7 @@ msgid ""
 "Please remove this file and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -24007,7 +25136,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -24016,7 +25145,7 @@ 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"
@@ -24024,49 +25153,57 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: 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."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Неможливо перевірити теку: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Неможливо перейменувати теку:\n"
+"%s"
+
+#: 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: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\":"
+msgstr ""
+"Вкажіть теку, в яку буде скопійовано теку "
+"\"%s\":"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Скопіювати теку"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Вкажіть теку, в яку буде перенесено теку \"%s\":"
+msgstr ""
+"Вкажіть теку, в яку буде перенесено теку "
+"\"%s\":"
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Перенести теку"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24075,18 +25212,18 @@ msgstr ""
 "Не вдалось стерти теку:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Стерти \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24095,16 +25232,16 @@ msgstr ""
 "Неможливо перейменувати теку:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Перейменувати теку \"%s\" на:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Перейменувати теку"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24119,7 +25256,7 @@ msgstr ""
 "Неможливо створити вказану теку:\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 - Створення нової теки"
 
@@ -24133,8 +25270,7 @@ msgstr ""
 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:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr "(Ненайменований)"
 
@@ -24144,13 +25280,14 @@ msgstr ""
 
 #: shell/e-shell-importer.c:145
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151
-#: shell/e-shell-startup-wizard.c:803
+#: 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 ""
 
@@ -24167,8 +25304,7 @@ msgstr ""
 "Імпортер не готовий.\n"
 "Очікування 5 секунд на відповідь."
 
-#: shell/e-shell-importer.c:263
-#: shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24182,10 +25318,8 @@ msgstr ""
 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:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
 msgid "Evolution Error"
 msgstr "Помилка Evolution"
 
@@ -24248,26 +25382,25 @@ msgstr "Тип файлу:"
 
 #: shell/e-shell-importer.c:663
 msgid "Import data and settings from older programs"
-msgstr "Імпортувати дані й параметри з старіших програм"
+msgstr ""
+"Імпортувати дані й параметри з старіших "
+"програм"
 
 #: shell/e-shell-importer.c:667
 msgid "Import a single file"
 msgstr "Імпорт одного файла"
 
-#: 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
 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:735 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:859 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Від %s:"
@@ -24278,10 +25411,11 @@ msgstr "Вибрати теку"
 
 #: shell/e-shell-importer.c:1028
 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:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Імпорт"
 
@@ -24294,17 +25428,19 @@ msgstr "Закриття з'єднань..."
 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."
+msgid "Could not start the Evolution Mailer Assistant interface\n"
+msgstr ""
+"Не вдалося ініціалізувати поштовий "
+"компонент Evolutuion."
 
-#: shell/e-shell-user-creatable-items-handler.c:503
-#: shell/e-shell-user-creatable-items-handler.c:548
+#: shell/e-shell-user-creatable-items-handler.c:506
+#: shell/e-shell-user-creatable-items-handler.c:551
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Новий"
@@ -24315,7 +25451,8 @@ msgstr "Не вказано назви теки."
 
 #: shell/e-shell-utils.c:121
 msgid "Folder name cannot contain the Return character."
-msgstr "Назва теки не може містити символ вводу."
+msgstr ""
+"Назва теки не може містити символ вводу."
 
 #: shell/e-shell-utils.c:127
 #, fuzzy
@@ -24324,90 +25461,95 @@ msgstr "Ця тека не може містити повідомлення."
 
 #: shell/e-shell-utils.c:133
 msgid "'.' and '..' are reserved folder names."
-msgstr "\".\" і \"..\" є зарезервованими назвами тек."
+msgstr ""
+"\".\" і \"..\" є зарезервованими назвами тек."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy не знайдено за шляхом вказаним в $PATH."
+msgstr ""
+"Bug buddy не знайдено за шляхом вказаним в $PATH."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "Не вдалося запустити Bug buddy"
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Про Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:427
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Перейти на теку..."
 
-#: shell/e-shell-view-menu.c:428
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Виберіть теку, яку ви бажаєте відкрити"
 
-#: shell/e-shell-view-menu.c:548
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Створити новий ярлик"
 
-#: shell/e-shell-view-menu.c:549
+#: shell/e-shell-view-menu.c:566
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:580
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:588
-#, c-format
-msgid "Error executing %s."
-msgstr "Помилка виконання %s."
-
-#: shell/e-shell-view-menu.c:691
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "Робота на лінії"
 
-#: shell/e-shell-view-menu.c:704
-#: ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Робота не на лінії"
 
-#: shell/e-shell-view-menu.c:717
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Робота не на лінії"
 
-#: shell/e-shell-view.c:215
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Жодної теки не відображено)"
 
-#: shell/e-shell-view.c:1600
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1602
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(Немає)"
 
-#: shell/e-shell-view.c:1649
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+#: 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:1656
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1662
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+#: shell/e-shell-view.c:1880
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:169
+#, 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:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1665
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24415,25 +25557,24 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1890
-#: widgets/misc/e-cell-date-edit.c:258
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Гаразд"
 
-#: shell/e-shell.c:1892
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Невірні арґументи"
 
-#: shell/e-shell.c:1894
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "Неможливо зараєструватись на OAF"
 
-#: shell/e-shell.c:1896
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
-msgstr "Не знайдено конфіґураційної бази даних"
+msgstr ""
+"Не знайдено конфіґураційної бази даних"
 
-#: shell/e-shell.c:1898
-#: shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Загальна помилка"
 
@@ -24464,7 +25605,8 @@ msgstr "Перейменувати групу ярликів"
 
 #: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
-msgstr "Перейменувати вибрану групу ярликів на:"
+msgstr ""
+"Перейменувати вибрану групу ярликів на:"
 
 #: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
@@ -24480,7 +25622,8 @@ msgstr "Великі піктограми"
 
 #: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
-msgstr "Показувати ярликі як великі піктограми"
+msgstr ""
+"Показувати ярликі як великі піктограми"
 
 #: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
@@ -24524,16 +25667,18 @@ msgstr "Перейменувати вибраний ярлик на:"
 
 #: shell/e-shortcuts-view.c:384
 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:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Відкрити у новому вікні"
 
 #: shell/e-shortcuts-view.c:386
 msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Відкрити теку, що зв'язана з цим ярликом, у новому вікні"
+msgstr ""
+"Відкрити теку, що зв'язана з цим ярликом, у "
+"новому вікні"
 
 #: shell/e-shortcuts-view.c:389
 msgid "_Rename"
@@ -24551,81 +25696,73 @@ msgstr "Видалити"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Видалити цей ярлик з панелі ярликів"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Помилка збереження ярликів."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Ярлики"
 
-#: shell/e-shortcuts.c:1052
+#: shell/e-shortcuts.c:1033
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: 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
-msgid "(No name)"
-msgstr "(Без назви)"
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Чилі"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Без помилок"
 
-#: 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:491
 msgid "The specified folder type is not valid"
 msgstr "Вказаний тип теки не вірний"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "Помилка вводу/виводу"
 
-#: 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:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Вказаної теки не знайдено"
 
-#: 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:505
 msgid "Operation not supported"
 msgstr "Операція не підтримується"
 
-#: 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:509
 msgid "The specified folder cannot be modified or removed"
-msgstr "Вказану теку не можна змінити чи видалити"
+msgstr ""
+"Вказану теку не можна змінити чи видалити"
 
-#: 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:513
 msgid "Cannot create a folder with that name"
 msgstr "Неможливо створити теку з цією назвою"
 
@@ -24639,6 +25776,10 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "% завершення:"
 
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<клацніть тут для вибору теки>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -24676,67 +25817,67 @@ msgstr ""
 "Помилка від системи активації:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "Помилка CORBA"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Невірний арґумент"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Вже має власника"
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Не має власника"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "Не знайдено"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Непідтримуваний тип"
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Непідтримувана схема"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Непідтримувана операція"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Існує"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Невірний URI"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Має підтеки"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Не залишилося вільного простору"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Старого власника знищено"
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
 #, fuzzy
 msgid "Test type"
 msgstr "Тип файлу:"
@@ -24805,7 +25946,9 @@ 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"
@@ -24852,60 +25995,69 @@ msgstr "Більше не запитувати"
 
 #: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
-msgstr "Evolution може імпортувати дані з таких файлів:"
+msgstr ""
+"Evolution може імпортувати дані з таких "
+"файлів:"
 
-#: shell/main.c:88
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:94
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution завершує роботу..."
 
-#: shell/main.c:215
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
-msgstr "Неможливо зв'язатись з оболонкою Ximian Evolutuion."
+msgstr ""
+"Неможливо зв'язатись з оболонкою Ximian "
+"Evolutuion."
 
-#: shell/main.c:224
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Неможливо ініціалізувати оболонку Ximian Evolutuion: %s"
+msgstr ""
+"Неможливо ініціалізувати оболонку Ximian "
+"Evolutuion: %s"
 
-#: shell/main.c:294
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Вимкнути заставку"
 
-#: shell/main.c:295
+#: shell/main.c:318
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Початок імпортування"
 
-#: shell/main.c:296
+#: shell/main.c:319
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Початок імпортування"
 
-#: shell/main.c:297
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:315
+#: shell/main.c:338
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
-""
 msgstr ""
 
-#: shell/main.c:345
+#: shell/main.c:368
 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
@@ -24922,10 +26074,10 @@ 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:3
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Скопіювати вибране"
 
@@ -24941,8 +26093,7 @@ msgstr "Створити новий контакт"
 msgid "Create new contact list"
 msgstr "Створити новий контактний список"
 
-#: 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 "Вирізати вибране"
 
@@ -24950,262 +26101,187 @@ msgstr "Вирізати вибране"
 msgid "Delete selected contacts"
 msgstr "Стерти вибрані контакти"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "Dump"
+#: ui/evolution-addressbook.xml.h:13
+msgid "Move Contact(s) to Another Folder..."
 msgstr ""
+"Перенести вибрані контакти в іншу теку..."
 
 #: ui/evolution-addressbook.xml.h:14
-msgid "Move Contact(s) to Another Folder..."
-msgstr "Перенести вибрані контакти в іншу теку..."
-
-#: ui/evolution-addressbook.xml.h:15
 msgid "Move to Folder..."
 msgstr "Перенести в теку..."
 
-#: 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 "Вставити буфер обміну"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:17
 #, fuzzy
 msgid "Previews the contacts to be printed"
-msgstr "Переглянути календар, що буде надрукувано"
+msgstr ""
+"Переглянути календар, що буде надрукувано"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Надрукувати вибрані контакти"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Зберегти вибраний контак як vCard."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Вибрати все"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Вибрати всі контакти"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "Стерти контакт"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Відіслати повідомлення за контактом"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
-msgstr "Відіслати вибрані контакти іншій особі."
+msgstr ""
+"Відіслати вибрані контакти іншій особі."
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Зупинити"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Зупинити завантаження"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 msgid "View the current contact"
 msgstr "Показати поточний контакт"
 
-#: ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:34
-#: 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:92
-#: ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:15
+#: 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
 msgid "_Actions"
 msgstr "Дії"
 
 #: ui/evolution-addressbook.xml.h:33
-msgid "_Addressbook Sources..."
-msgstr "Джерела адресних книг..."
-
-#: ui/evolution-addressbook.xml.h:35
 msgid "_Contact List"
 msgstr "Контактний список"
 
-#: 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 "Переслати контакт..."
 
-#: 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:106
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "Друкувати..."
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "Перенести в теку..."
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "Зберегти як VCard"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "Пошук контактів"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "Вибрати все"
 
-#: ui/evolution-addressbook.xml.h:47
+#: ui/evolution-addressbook.xml.h:45
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Відіслати повідомлення за контактом..."
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Налаштування календаря"
-
 #: ui/evolution-calendar.xml.h:4
-#, fuzzy
-msgid "Create a New All Day _Event"
-msgstr "Створити новий календар"
-
-#: ui/evolution-calendar.xml.h:5
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "Створити нове завдання"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Створити нову зустріч"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a _New Meeting"
-msgstr "Створити _нову зустріч"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
-msgstr "Створити нову зустріч"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new meeting request"
-msgstr "Створити новий запит на засідання"
-
-#: ui/evolution-calendar.xml.h:10
-#: ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "Створити нову завдання"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create an event for the whole day"
-msgstr "Створити подію на весь день"
-
-#: ui/evolution-calendar.xml.h:13
 msgid "Day"
 msgstr "День"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Стерти зустріч"
 
-#: ui/evolution-calendar.xml.h:15
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Перейти"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Перейти назад"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Перейти вперед"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Go to _Date"
 msgstr "Кінцева дата"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Перейти до вказаної дати"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Сьогодні"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Місяць"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
-msgstr "Переглянути календар, що буде надрукувано"
+msgstr ""
+"Переглянути календар, що буде надрукувано"
 
-#: 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 "Перегляд друку"
 
-#: 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 "Опублікувати інформацію про зайнятість для цього календаря"
+msgstr ""
+"Опублікувати інформацію про зайнятість "
+"для цього календаря"
 
-#: 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:20
 msgid "Show one month"
 msgstr "Показати один місяць"
 
-#: 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:22
 msgid "Show the working week"
 msgstr "Показати робочий тиждень"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Тиждень"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "Зустріч..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "параметри календаря..."
-
-#: ui/evolution-calendar.xml.h:40
-msgid "_Meeting..."
-msgstr "_Засідання..."
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Publish Free/Busy Information"
-msgstr "Опублікувати інформацію про зайнятість"
-
-#: ui/evolution-calendar.xml.h:44
-msgid "_Task..."
-msgstr "Завдання..."
-
-#: ui/evolution-comp-editor.xml.h:2
-#: ui/evolution-contact-editor.xml.h:1
+#: 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-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Закрити"
@@ -25214,13 +26290,11 @@ msgstr "Закрити"
 msgid "Close this item"
 msgstr "Закрити цей елемент"
 
-#: ui/evolution-comp-editor.xml.h:5
-#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Стерти цей елемент"
 
-#: ui/evolution-comp-editor.xml.h:6
-#: ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
 #: ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Головна панель інструментів"
@@ -25228,47 +26302,45 @@ 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
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Надрукувати цей елемент"
 
-#: 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:240
+#: 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 "Зберегти"
 
-#: ui/evolution-comp-editor.xml.h:14
-#: ui/evolution-contact-editor.xml.h:8
+#: 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
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 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"
 msgstr "Зберегти цей елемент на диску"
 
-#: ui/evolution-comp-editor.xml.h:18
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: 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:40
 msgid "_File"
 msgstr "Файл"
 
@@ -25293,7 +26365,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 "Зберегти"
 
@@ -25307,7 +26379,8 @@ 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..."
@@ -25323,21 +26396,23 @@ 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
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Переслати як i_Calendar"
 
-#: ui/evolution-event-editor.xml.h:4
-#: ui/evolution-task-editor.xml.h:6
+#: 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
 msgid "Obtain the latest meeting information"
-msgstr "Отримати останню інформацію про засідання"
+msgstr ""
+"Отримати останню інформацію про "
+"засідання"
 
 #: ui/evolution-event-editor.xml.h:6
 msgid "Re_fresh Meeting"
@@ -25349,7 +26424,8 @@ msgstr "Планувати зустріч"
 
 #: ui/evolution-event-editor.xml.h:8
 msgid "Schedule a meeting for this item"
-msgstr "Запланувати засідання для цього елемента"
+msgstr ""
+"Запланувати засідання для цього елемента"
 
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customise My Evolution"
@@ -25368,74 +26444,59 @@ msgid "Compose _New Message"
 msgstr "Скласти нове повідомлення"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: 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:6
 msgid "Empty _Trash"
 msgstr "Спорожнити смітник"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Забути паролі"
 
-#: 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:9
 msgid "Open a window for composing a mail message"
-msgstr "Відкрити вікно для написання нового повідомлення"
+msgstr ""
+"Відкрити вікно для написання нового "
+"повідомлення"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Остаточно видалити всі стерті повідомлення з усіх тек"
-
-#: ui/evolution-mail-global.xml.h:12
-msgid "Send / Receive"
-msgstr "Відіслати / отримати"
-
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send queued mail and retrieve new mail"
-msgstr "Відіслати повідомлення з черги та отримати нові"
+msgstr ""
+"Остаточно видалити всі стерті "
+"повідомлення з усіх тек"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Передплата на тки на віддалених серверах"
+msgstr ""
+"Передплата на тки на віддалених серверах"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "Редактор віртуальних тек..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "Фільтри..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Settings..."
-msgstr "Установки пошти..."
-
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "панель перегляду"
 
-#: ui/evolution-mail-global.xml.h:22
-msgid "_Send / Receive"
-msgstr "Відіслати / отримати"
-
-#: ui/evolution-mail-global.xml.h:23
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "Передплатити теки..."
 
@@ -25468,7 +26529,8 @@ msgid "Hide _Read Messages"
 msgstr "Сховати _прочитані повідомлення"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
@@ -25477,7 +26539,9 @@ 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"
@@ -25485,10 +26549,11 @@ 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
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Вибрати все"
 
@@ -25502,7 +26567,9 @@ 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"
@@ -25514,32 +26581,34 @@ 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"
 msgstr "Розбитий на гілки список повідомлень"
 
-#: ui/evolution-mail-list.xml.h:26
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "Викреслити"
 
-#: ui/evolution-mail-list.xml.h:27
-#: ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "Тека"
 
-#: ui/evolution-mail-list.xml.h:28
-#: ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Інвертувати вибір"
 
@@ -25551,374 +26620,450 @@ msgstr "Властивості..."
 msgid "_Threaded Message List"
 msgstr "Розбитий на гілки список повідомлень"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "Add Sender to Address _Book"
+msgid "A_dd Sender to Addressbook"
 msgstr "Додати відправника в адресну книгу"
 
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Застосувати фільтри"
+
 #: ui/evolution-mail-message.xml.h:3
-msgid "Apply filter rules to the selected messages"
-msgstr "Застосувати правила фільтрування вибраних повідомлень"
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Додати відправника в адресну книгу"
 
 #: ui/evolution-mail-message.xml.h:4
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Підготувати відповідь всім отримувачам вибраного повідомлення"
+msgid "Apply filter rules to the selected messages"
+msgstr ""
+"Застосувати правила фільтрування "
+"вибраних повідомлень"
 
 #: ui/evolution-mail-message.xml.h:5
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Підготувати відповідь у список листування вибраного повідомлення"
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr ""
+"Підготувати відповідь всім отримувачам "
+"вибраного повідомлення"
 
 #: 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:7
 msgid "Compose a reply to the sender of the selected message"
-msgstr "Підготувати відповідь відправнику вибраного повідомлення"
+msgstr ""
+"Підготувати відповідь відправнику "
+"вибраного повідомлення"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
-msgstr "Скопіювати вибрані повідомлення у іншу теку"
+msgstr ""
+"Скопіювати вибрані повідомлення у іншу "
+"теку"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
-msgstr "Створити віртуальну теку з повідомлення"
+msgstr ""
+"Створити віртуальну теку з повідомлення"
 
-#: ui/evolution-mail-message.xml.h:10
+#: 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:11
+#: 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:12
+#: 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:13
+#: 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:14
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
-msgstr "Створити віртуальну теку для цих отримувачів"
+msgstr ""
+"Створити віртуальну теку для цих "
+"отримувачів"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
-msgstr "Створити віртуальну теку для цього списку листування"
+msgstr ""
+"Створити віртуальну теку для цього "
+"списку листування"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
-msgstr "Створити віртуальну теку для цього відправника"
+msgstr ""
+"Створити віртуальну теку для цього "
+"відправника"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
-msgstr "Створити віртуальну теку для цієї теми"
+msgstr ""
+"Створити віртуальну теку для цієї теми"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Зменшити розмір тексту"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
-msgstr "Показати наступне важливе повідомлення"
+msgstr ""
+"Показати наступне важливе повідомлення"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Показати наступне повідомлення"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Показати попереднє повідомлення"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Показати наступну непрочитану гілку"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
-msgstr "Показати попереднє важливе повідомлення"
+msgstr ""
+"Показати попереднє важливе повідомлення"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Показати попереднє повідомлення"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
-msgstr "Показати попереднє непрочитане повідомлення"
+msgstr ""
+"Показати попереднє непрочитане "
+"повідомлення"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Переслати"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Фільтр списку листування..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Фільтр відправника..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Фільтр отримувачів..."
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Фільтр теми..."
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
-msgstr "Позначити вибрані повідомлення до видалення"
-
-#: ui/evolution-mail-message.xml.h:33
-msgid "Force images in HTML mail to be loaded"
 msgstr ""
+"Позначити вибрані повідомлення до "
+"видалення"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward"
-msgstr "Переслати"
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "Повне ім'я..."
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+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:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
-msgstr "Переслати вибране повідомлення процитоване як відповідь"
+msgstr ""
+"Переслати вибране повідомлення "
+"процитоване як відповідь"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
-msgstr "Переслати вибране повідомлення до когось"
+msgstr ""
+"Переслати вибране повідомлення до когось"
 
-#: 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 "Переслати вибране повідомлення до когось як долучення"
+msgstr ""
+"Переслати вибране повідомлення до когось "
+"як долучення"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Збільшити розмір тексту"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Завантажити зображення"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Позначити як важливі"
 
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Позначити непрочитаним"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Позначити як неважливі"
 
-#: ui/evolution-mail-message.xml.h:46
+#: 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:47
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected message(s) as important"
-msgstr "Позначити вибрані повідомлення як важливі"
+msgstr ""
+"Позначити вибрані повідомлення як "
+"важливі"
 
-#: ui/evolution-mail-message.xml.h:48
+#: 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:49
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
-msgstr "Позначити вибрані повідомлення як неважливі"
+msgstr ""
+"Позначити вибрані повідомлення як "
+"неважливі"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
-msgstr "Позначити вибрані повідомлення до видалення"
+msgstr ""
+"Позначити вибрані повідомлення до "
+"видалення"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Перенести"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Move selected message(s) to another folder"
-msgstr "Перенести вибрані повідомлення у іншу теку"
+msgstr ""
+"Перенести вибрані повідомлення у іншу "
+"теку"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Далі"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "Наступне важливе повідомлення"
-
 #: 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 "Наступна гілка"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+#, fuzzy
+msgid "Next _Unread Message"
 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 "Відкрити вибране повідомлення у редакторі для його повторного посилання"
+msgstr ""
+"Відкрити вибране повідомлення у "
+"редакторі для його повторного посилання"
 
 #: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Ориґінальний розмір"
 
 #: ui/evolution-mail-message.xml.h:61
-msgid "Preview the message to be printed"
-msgstr "Переглянути повідомлення, що буде надрукувано"
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Попереднє непрочитане повідомлення"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "Попереднє"
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Попереднє важливе повідомлення"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "Попереднє важливе повідомлення"
+msgid "Preview the message to be printed"
+msgstr ""
+"Переглянути повідомлення, що буде "
+"надрукувано"
 
 #: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "Попереднє повідомлення"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "Попереднє непрочитане повідомлення"
+msgid "Previous"
+msgstr "Попереднє"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Надрукувати це повідомлення"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:68
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
-msgstr "Переслати вибране повідомлення до когось"
-
-#: ui/evolution-mail-message.xml.h:71
-msgid "Reply"
-msgstr "Відповісти"
-
-#: ui/evolution-mail-message.xml.h:72
-msgid "Reply to All"
-msgstr "Відповісти всім"
+msgstr ""
+"Переслати вибране повідомлення до когось"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr "Повернути ориґінальнир розмір тексту"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "Пошук повідомлення..."
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "Менше"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
-msgstr "Зберегти повідомлення як текстовий файл"
+msgstr ""
+"Зберегти повідомлення як текстовий файл"
 
-#: ui/evolution-mail-message.xml.h:79
+#: 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:80
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "Показати повні заголовки"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
-msgstr "Показати повідомлення у звичайному стилі"
+msgstr ""
+"Показати повідомлення у звичайному стилі"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Зберегти повідомлення у вказаній теці"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Долучити файл до повідомлення"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "Розмір тексту"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Відновити вібрані повідомлення"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
-msgstr "Вірткальна тека за списком листування..."
+msgstr ""
+"Вірткальна тека за списком листування..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "Віртуальна тека за відправником..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "Віртуальна тека за отримувачами..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "Віртуальна тека за темою..."
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Apply Filters"
-msgstr "Застосувати фільтри"
-
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Attached"
 msgstr "Долучити"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "Скопіювати у теку"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "Створити фільтр з повідомлення"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "Переслати повідомлення"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Перейти"
+
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Inline"
 msgstr "В тілі"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "Більше"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "Показати повідомлення"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "Перенести в теку"
 
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Наступне повідомлення"
+
 #: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "Звичайне відображення"
@@ -25927,33 +27072,37 @@ msgstr "Звичайне відображення"
 msgid "_Open Message"
 msgstr "Відкрити повідомлення"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Попереднє повідомлення"
+
+#: ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Quoted"
 msgstr "Процитовано"
 
-#: ui/evolution-mail-message.xml.h:110
-#: ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "Інструменти"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2
-#: ui/evolution.xml.h:5
+#: 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 "Закрити це вікно"
 
 #: 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:36
 msgid "_Close"
 msgstr "Закрити"
 
 #: 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:56
 msgid "_View"
 msgstr "Вид"
 
@@ -25961,8 +27110,7 @@ msgstr "Вид"
 msgid "Attach"
 msgstr "Долучити"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Закрити поточний файл"
 
@@ -25976,13 +27124,15 @@ 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-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "Формат"
 
-#: 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"
 
@@ -25998,6 +27148,10 @@ msgstr "Вставити файл як текст у повідомлення"
 msgid "Insert text file..."
 msgstr "Вставити текстовий файл..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Відкрити"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Відкрити файл"
@@ -26031,7 +27185,7 @@ msgid "Save in folder..."
 msgstr "Зберегти в теці..."
 
 #: 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 "Зберегти поточний файл"
 
@@ -26056,6 +27210,7 @@ msgid "Send _later"
 msgstr "Відправити пізніше"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Відіслати пошту в форматі HTML"
 
@@ -26081,11 +27236,14 @@ 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
@@ -26127,7 +27285,7 @@ msgid "_From Field"
 msgstr "Поле \"Від\""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -26140,18 +27298,15 @@ msgstr "Відкрити..."
 msgid "_Reply-To Field"
 msgstr "Відповідати на:"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "Безпека"
-
-#: ui/evolution-signature-editor.xml.h:9
-#: ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 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"
@@ -26167,7 +27322,9 @@ 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"
@@ -26201,38 +27358,41 @@ msgstr ""
 msgid "Re_fresh Task"
 msgstr "Оновити завдання"
 
-#: 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:3
 msgid "Copy selected task"
 msgstr "Скопіювати вибране завдання"
 
-#: 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:6
 msgid "Delete completed tasks"
 msgstr "Стерти виконані завдання"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Стерти вибрані завдання"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "Mar_k as Complete"
 msgstr "Позначити як виконане"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Вставити завдання з буферу обміну"
 
-#: ui/evolution-tasks.xml.h:14
-msgid "Tasks Settings..."
-msgstr "Установки завдань..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr ""
+"Переглянути календар, що буде надрукувано"
+
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Надрукувати це повідомлення"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -26256,7 +27416,9 @@ 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"
@@ -26299,113 +27461,123 @@ msgid "Open this folder in an other window"
 msgstr "Відкрити цю теку в новому вікні"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Відіслати / отримати"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr ""
+"Відіслати повідомлення з черги та "
+"отримати нові"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "Показати інформацію про Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Підготувати звіт про помилку"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Відіслати звіт про помилку"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
-msgstr "Відіслати звіт про помилку за допомогою Bug Buddy"
+msgstr ""
+"Відіслати звіт про помилку за допомогою "
+"Bug Buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Перемикнути"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Перемикнути стан показу панелі тек"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
-msgstr "Перемикнути стан показу панелі ярликів"
+msgstr ""
+"Перемикнути стан показу панелі ярликів"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Перемикнути стан роботи на лінії"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Показати вибрану теки"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Часті запитання щодо Ximian Evolution"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "Про Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "Скопіювати..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "Панель тек"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "Перейти на теку..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "Імпорт..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "Перенести..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "Новий"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "Нова тека"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "Установки пілота..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "Перейменувати..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "Відіслати / отримати"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "Ярлик"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "Панель ярликів"
 
-#: 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: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/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "Параметри зведення..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Адресні картки"
@@ -26470,7 +27642,8 @@ msgstr "Часові пояси"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
 
@@ -26503,13 +27676,11 @@ msgstr "ПВСЧПСН"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:234
-#: widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "зараз"
 
-#: widgets/misc/e-cell-date-edit.c:242
-#: widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "сьогодні"
 
@@ -26520,7 +27691,9 @@ 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"
@@ -26570,8 +27743,7 @@ msgstr "Західноєвропейський"
 msgid "Traditional"
 msgstr "Традиційний"
 
-#: widgets/misc/e-charset-picker.c:87
-#: widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
 msgid "Simplified"
 msgstr "Спрощений"
 
@@ -26584,20 +27756,20 @@ msgstr "Український"
 msgid "Visual"
 msgstr "Вимкнути"
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Невідомий набір символів: %s"
 
-#: 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:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Інший..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Кодування символів"
 
@@ -26605,22 +27777,32 @@ msgstr "Кодування символів"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Редактор пошуків"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Зберегти пошук"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Показати все"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Зберегти пошук"
+
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Виправити як нове повідомлення..."
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Інформація"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Помилка"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Питання"
@@ -26634,11 +27816,22 @@ msgstr "Повідомлення"
 msgid "Don't show this message again."
 msgstr "Більше не показувати це повідомлення."
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "Пошук"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Знайти зараз"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Календар"
+
+#: widgets/misc/e-search-bar.c:835
+#, fuzzy
+msgid "Clear"
+msgstr "Календар"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Знайти зараз"
 
@@ -26650,11 +27843,14 @@ 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"
@@ -26664,3 +27860,374 @@ msgstr "init_corba(): не вдалось ініціалізувати GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "З'єднання з сервером LDAP..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr ""
+#~ "Очікування на з'єднання з сервером LDAP..."
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Виправити адресну книгу"
+
+#, fuzzy
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "Вимагається автенфікація"
+
+#~ msgid "Account Name"
+#~ msgstr "Облікова назва"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Додати адресну книгу"
+
+#~ msgid "Advanced"
+#~ msgstr "Додатково"
+
+#, fuzzy
+#~ msgid "Base"
+#~ msgstr "Вставити"
+
+#, fuzzy
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Мій сервер вимагає автенфікації"
+
+#~ msgid "Server Name"
+#~ msgstr "Назва сервера"
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr ""
+#~ "Це порт, який використовує ваш сервер LDAP."
+
+#~ msgid "Name contains"
+#~ msgstr "Ім'я містить"
+
+#~ msgid "C_ontaining:"
+#~ msgstr "Містить:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr ""
+#~ "Показати контакти, що відповідають таким "
+#~ "критеріям:"
+
+#, fuzzy
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Створити нову зустріч"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "Перший день тижня:"
+
+#, fuzzy
+#~ msgid "_Other"
+#~ msgstr "Інша"
+
+#~ msgid "_Delete this Task"
+#~ msgstr "Стерти це завдання"
+
+#, fuzzy
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr ""
+#~ "Опублікувати інформацію про зайнятість"
+
+#, fuzzy
+#~ msgid "Error hashing password."
+#~ msgstr "Помилка додавання картки"
+
+#~ msgid "Invalid password."
+#~ msgstr "Неправильний пароль."
+
+#, fuzzy
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr ""
+#~ "Не вдалося відіслати ім'я користувача на "
+#~ "сервер"
+
+#, fuzzy
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr ""
+#~ "Не вдалося відіслати ім'я користувача на "
+#~ "сервер"
+
+#, fuzzy
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr ""
+#~ "Не вдалось створити вікно конструктора."
+
+#, fuzzy
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Не вдалося з'єднатись з сервером: %s"
+
+#, fuzzy
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "Не вдалося зберегти файл підпису."
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Введіть пароль NNTP для %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Сервер відкинув ім'я користувача"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr ""
+#~ "Не вдалося відіслати ім'я користувача на "
+#~ "сервер"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr ""
+#~ "Сервер відкинув ім'я користувача і пароль"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr ""
+#~ "Не вдалося отримати спісок груп з сервера."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr ""
+#~ "Не вдалося завантажити список груп для %s: "
+#~ "%s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr ""
+#~ "Не вдалося зберегти список груп для %s: %s"
+
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr ""
+#~ "Не вдалося знайти адресу відправника у "
+#~ "повідомленні"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr ""
+#~ "Неможливо відіслати повідомлення: адреса "
+#~ "відправника не визначена."
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr ""
+#~ "Компонент Evolution для виконавчого зведення."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr ""
+#~ "Не вдалося ініціалізувати компонент "
+#~ "зведення Evolutuion."
+
+#~ msgid "Select a service"
+#~ msgstr "Вибрати послугу"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Відіслати пошту на %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Закрити %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Перенести %s ліворуч"
+
+#~ msgid "page"
+#~ msgstr "сторінка"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Неможливо відкрити файл HTML:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Помилка зчитування даних:\n"
+#~ "%s"
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Фабрика для RDF-зведень"
+
+#~ msgid "RDF Summary"
+#~ msgstr "RFD-зведення"
+
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Фабрика для редактора Evolutuion."
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr ""
+#~ "Не вдалося ініціалізувати поштовий "
+#~ "компонент Evolutuion."
+
+#, fuzzy
+#~ msgid "Update now"
+#~ msgstr "Оновлення виконано\n"
+
+#, fuzzy
+#~ msgid "Update every "
+#~ msgstr "Поновити зайнятість"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Введіть URI теки"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Тека зберігання пошти (внутрішня)"
+
+#, fuzzy
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Створити новий календар"
+
+#, fuzzy
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Створити правило з повідомлення"
+
+#~ msgid "Filter on Mailing List"
+#~ msgstr "Фільтр списку листування"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "Формат поштової скриньки"
+
+#, fuzzy
+#~ msgid " (default)"
+#~ msgstr "Стерти"
+
+#~ msgid "Mail Settings"
+#~ msgstr "Параметри пошти"
+
+#, fuzzy
+#~ msgid "Composer"
+#~ msgstr "Редактор"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Типовий стиль пересилання: "
+
+#~ msgid "Display"
+#~ msgstr "Відобразити"
+
+#~ msgid "Drafts"
+#~ msgstr "Чернетки"
+
+#~ msgid "Edit..."
+#~ msgstr "Виправити..."
+
+#~ msgid "HTML signature file:"
+#~ msgstr "Файл підпису HTML:"
+
+#~ msgid "News"
+#~ msgstr "Новини"
+
+#, fuzzy
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Вибрати файл"
+
+#~ msgid "Sent"
+#~ msgstr "Відіслано"
+
+#~ msgid "Sources"
+#~ msgstr "Джерела"
+
+#~ msgid "_Organization:"
+#~ msgstr "Організація:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "Запам'ятати цей пароль"
+
+#, fuzzy
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Відіслати пошту в форматі HTML"
+
+#~ msgid "_Server type: "
+#~ msgstr "Тип _сервера:"
+
+#~ msgid "seconds."
+#~ msgstr "секунд."
+
+#, fuzzy
+#~ msgid "Mail Summary"
+#~ msgstr "Поштове зведення"
+
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr ""
+#~ "Не вдалося ініціалізувати компонент "
+#~ "зведення Evolutuion."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution notes component."
+#~ msgstr "Фабрика для редактора Evolutuion."
+
+#, fuzzy
+#~ msgid "Factory for the Notes control"
+#~ 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 "(Без назви)"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Налаштування календаря"
+
+#, fuzzy
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Створити новий календар"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Створити нове завдання"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Створити нову зустріч"
+
+#~ msgid "Create a _New Meeting"
+#~ msgstr "Створити _нову зустріч"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Створити нову зустріч"
+
+#~ msgid "Create a new meeting request"
+#~ msgstr "Створити новий запит на засідання"
+
+#~ msgid "Create a new task"
+#~ msgstr "Створити нову завдання"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Створити подію на весь день"
+
+#~ msgid "_Appointment..."
+#~ msgstr "Зустріч..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "параметри календаря..."
+
+#~ msgid "_Meeting..."
+#~ msgstr "_Засідання..."
+
+#~ msgid "_Task..."
+#~ msgstr "Завдання..."
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "Установки пошти..."
+
+#~ msgid "_Apply Filters"
+#~ msgstr "Застосувати фільтри"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Налаштувати відображення завдання"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Установки завдань..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Змінити параметри зведення"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "Параметри зведення..."
+
+#~ msgid "Show All"
+#~ msgstr "Показати все"
+
+#~ msgid "Sear_ch"
+#~ msgstr "Пошук"
diff --git a/po/vi.po b/po/vi.po
index 25c525d9f8..b3c68e3901 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-05-07 15:46-0400\n"
 "PO-Revision-Date: 2002-04-26 14:03-0400\n"
 "Last-Translator: pclouds <pclouds@gmx.net>\n"
 "Language-Team: GnomeVN\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
+#: 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:1731
 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:1716
+#: 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:1717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
 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:1720
 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:1722
 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:1723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
 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:1727
 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:1721
 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:1719
+#: 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:1725
+#: 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:1718
 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:1724
 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:1726
+#: 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:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 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:1729
+#: 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:1730
+#: 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:1732
+#: 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:1733
+#: 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:1759
+#: 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:1760
+#: 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 ""
-
-#: 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:171 calendar/gui/main.c:63
+#: 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:2732
 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:1123
 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:1226
 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:1462
 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:2586
+msgid "Restarting search."
+msgstr "Khởi động lại tìm kiếm."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 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:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Lỗi khi loại bỏ card"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Không thể phân tích URL `%s'"
+
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "Địa chỉ email:"
 
-#: addressbook/conduit/address-conduit.c:296
+#: 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,294 +429,185 @@ 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
+#, fuzzy
+msgid "Addressbook Settings"
+msgstr "Nguồn sổ địa chỉ"
+
+#: 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
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 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:12
 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:13
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: 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
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 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:74
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 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
+#: addressbook/gui/component/addressbook-component.c:562
 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:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 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"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "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-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-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-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.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.glade.h:23
-msgid "_Account name:"
-msgstr "Tên Tài _khoản:"
-
-#: 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.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.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.glade.h:27
-msgid "_Port:"
-msgstr "_Cổng:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
-msgstr "Tên Ser_ver:"
-
-#: 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "Không thể khởi động gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:167
-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"
 "you must compile the program from the CVS sources after\n"
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
-"Phiên bản Evolution này không được biên dịch để hỗ trợ LDAP.\n"
+"Phiên bản Evolution này không được biên dịch để hỗ trợ "
+"LDAP.\n"
 "Nếu bạn muốn dùng LDAP trong Evolution, bạn phải biên dịch\n"
-"lại chương trình từ mã nguồn sau khi nhận OpenLDAP từ địa chỉ\n"
+"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."
 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."
+"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:643
+#: addressbook/gui/component/addressbook.c:646
 #, 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:769
+#, 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:770
+#, 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:771
+#: 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:772
+#: 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:773 widgets/misc/e-filter-bar.h:99
 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:1001
+#: 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:1083
 msgid "The URI that the Folder Browser will display"
 msgstr "URI sẽ được Bộ duyệt Thư mục hiển thị"
 
-#.
-#. * 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 "(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:1758
 msgid "Primary Email"
 msgstr "Email chính"
 
@@ -976,6 +653,612 @@ 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/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.c:215
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr "Không thể kết nối tớ LDAP server."
+
+#: 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 ""
+"Thông tin truy tìm địa chỉ bí hiểm không hợp lệ:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1169
+#, 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.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 "Ngày hoàn tất"
+
+#: 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 "Tùy chọn"
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "<- _Remove"
+msgstr "_Loại bỏ"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "1234"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: 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:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Báo động"
+
+#: 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 "_Chứa:"
+
+#: 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:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "mãi 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 "Vùng chọn:"
+
+#: 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
+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 ""
+"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:55 mail/mail-config.glade.h:136
+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:139
+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:152 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
+msgid "connecting-tab"
+msgstr ""
+
+#: 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."
@@ -985,9 +1268,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: 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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Loại bỏ"
 
@@ -1016,7 +1299,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"
@@ -1027,11 +1315,12 @@ msgid ""
 msgstr ""
 "Evolution không thể lấy sổ địa chỉ cục bộ.\n"
 "Có lẽ do thành phần evolution-addressbook bị hỏng.\n"
-"Để giúp chúng tôi hiểu và giải quyết tốt hơn vấn đề này,\n"
+"Để giúp chúng tôi hiểu và giải quyết tốt hơn vấn đề "
+"này,\n"
 "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 +1332,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 mới"
 
 #: 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 phân loại 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 +1401,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:1365
 msgid "Contact Editor"
 msgstr "Bộ hiệu chỉnh liên lạc"
 
@@ -1136,10 +1426,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 +1467,11 @@ 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: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
 msgid "_Delete"
 msgstr "_Xóa"
 
@@ -1212,1121 +1499,1118 @@ 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:2343
+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 ""
 
-#: 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 ""
-
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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/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 ""
 
-#: 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 "Cộng hoà Séc"
+
+#: 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
+#: my-evolution/Locations.h:1190
 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:1198
 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:1218
 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:1234
 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:1268
 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:1297
 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/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:1387
 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
+msgid "Moldova, Republic Of"
+msgstr ""
+
+#: 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:1470
 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:1531
 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:1560
 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:1562
 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:1574
 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 ""
 
-#: 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:1587
 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:1632
 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:1673
 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:1683
 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:1688
 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:1723
 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:1764
 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:1791
 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:1824
 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:1836
 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:1912
 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:2035
 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:2090
 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:2103
 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:2104
 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 ""
 
-#: 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
-#: my-evolution/Locations.h:2109
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2119
 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 ""
 
-#: 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:2127
 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:2176
 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/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:2181
 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:2183
 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:2205
 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
+msgid "Tanzania, United Republic Of"
+msgstr ""
+
+#: 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:2321
 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 ""
 
-#: 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/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:2334
 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:2342
 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:2348
 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:2380
 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:2392
 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
+msgid "Virgin Islands, British"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+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 ""
 
-#: 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:2512
 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:2524
 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 "Delete Contact?"
+msgstr "Xoá liên lạc?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+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:830
+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:1044
+msgid "Save Contact as VCard"
+msgstr "Lưu liên lạc bằng VCard"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, 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: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/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:"
 
@@ -2478,7 +2762,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 +2771,318 @@ 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
+msgid "Error getting book view"
+msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: 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:1043
 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: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
 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:1071
 msgid "Permission denied"
 msgstr ""
 
-#: 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/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
 msgid "Cancelled"
 msgstr "Bị hủy bỏ"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Lỗi khác"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: 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:78
 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:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 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:87
 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:97
 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:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 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:204
+#, 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:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "Hiển thị"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Không có card"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Không có card"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Không có card"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, 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 ""
 
-#: 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:699
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Lưu là VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Liên lạc mới"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Danh sách liên lạc mới"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "Đ_i tới thư mục..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Nhập..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Liên lạc..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Nguồn sổ địa chỉ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Thiết lập thư"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: 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:890
+msgid "Send Message to Contact"
+msgstr "Gửi thông điệp cho liên lạc"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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:893
+msgid "Print Envelope"
+msgstr "In phong bì"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "C_hép vào hộp thư..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "_Chuyển tới hộp thư..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: 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
+#: 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
+#: 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:907
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "Cửa sổ card"
+
+#. 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:940
+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:945
+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 +3096,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 +3199,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"
 
@@ -2817,11 +3224,12 @@ 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:1672
 msgid "Page"
 msgstr "Trang"
 
@@ -2837,7 +3245,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 +3303,49 @@ 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
 msgid "Untitled appointment"
 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:405 mail/message-list.c:668
+#: 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
 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/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Bình thường"
 
-#: 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:407 mail/message-list.c:666
+#: 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
 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
 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,41 +3358,54 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, 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 "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:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: 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:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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"
@@ -4517,22 +3414,10 @@ msgstr "Dịch vụ báo động"
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-msgid "Starting:"
-msgstr "Bắt đầu:"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-msgid "Ending:"
-msgstr "Kết thúc:"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "thời gian không hợp lệ"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-msgid "Evolution Alarm"
-msgstr "Báo động Evolution"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -4555,11 +3440,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,18 +3452,29 @@ 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:2608
+#: 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:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Không thể khởi động GNOME"
 
@@ -4590,51 +3486,65 @@ msgstr "Không thể tạo dịch vụ báo động"
 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
+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 ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:384
 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
 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
 msgid "Public"
 msgstr "Công cộng"
 
@@ -4655,32 +3565,27 @@ msgid "W"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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
 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
 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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Hoàn tất"
 
@@ -4696,9 +3601,10 @@ 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/mail-account-gui.c:1485
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
-#: mail/mail-config.glade.h:47
+#: 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
 #: 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 +3619,15 @@ 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:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
 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:310
 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 ""
@@ -4746,63 +3644,79 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: 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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Lịch"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "Công việc"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 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:695
+#, 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:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "Cuộc họp"
+
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "Nhiệm _vụ mới"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "Nhiệm _vụ"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New 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:703
+#, fuzzy
+msgid "All _Day 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:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Cuộc _hẹn mới"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "Cuộc hẹn"
+
+#: 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 +3761,10 @@ 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 +3910,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.glade.h:11
 msgid "Summary:"
 msgstr "Tóm tắt:"
 
@@ -5001,11 +3918,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 +3939,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:189
 msgid "minute(s)"
 msgstr "phút"
 
@@ -5063,176 +3980,177 @@ 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"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Ngày đầu của tuần:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Thứ Sáu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Giờ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Phút"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: 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:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: 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"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 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
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Sta_rt of day:"
 msgstr "Đầ_u ngày:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_CN"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Chủ nhật"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Nhiệm _vụ trong ngày:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "_Năm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "_Ba"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Nhiệm _vụ 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
+#: 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:30
+#: 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:31
 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:32
 msgid "_24 hour"
 msgstr "_24 giờ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 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:34
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Hiển thị"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_End of day:"
 msgstr "_Cuối ngày:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Sáu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Chung"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 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:40
 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:41
+#, 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:42
 msgid "_Sat"
 msgstr "Bả_y"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "Danh sách _công việc"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Độ _lệch thời gian:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Tư"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "trước khi bắt đầu cuộc hẹn"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
-msgstr "Trạng thái cuộc họp đã thay đổi. Gửi phiên bản cập nhật?"
+msgstr ""
+"Trạng thái cuộc họp đã thay đổi. Gửi phiên bản cập nhật?"
 
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
@@ -5261,7 +4179,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 +4203,69 @@ 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 ""
 
-#: 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:322
 msgid "Could not update 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:693
 msgid "Edit Appointment"
 msgstr "Sửa cuộc hẹn"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cuộc hẹn - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Công việc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:704
 #, 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:718
 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:1065 mail/mail-callbacks.c:1915
-#: mail/mail-display.c:106
-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?"
-
-#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: 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
+msgid "Save as..."
 msgstr "Lưu là..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Không thể lấy phiên bản hiện thời!"
 
@@ -5414,7 +4323,7 @@ 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:185
 msgid "Appointment"
 msgstr "Cuộc hẹn"
 
@@ -5428,13 +4337,13 @@ 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:365
 msgid "Scheduling"
 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:368
 msgid "Meeting"
 msgstr "Cuộc họp"
 
@@ -5481,7 +4390,7 @@ msgid "Pu_blic"
 msgstr "_Công cộng"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Hiện thời gian là"
 
@@ -5526,55 +4435,49 @@ msgstr "Người tham dự"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Nhấn vào đây để thêm người tham dự"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Tên chung"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Được ủy nhiệm 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:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Đã ủy nhiệm cho"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Ngôn ngữ"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 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-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 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/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"
 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Kiểu"
@@ -5589,7 +4492,7 @@ 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:453
 msgid "_Invite Others..."
 msgstr "_Mời người khác..."
 
@@ -5597,27 +4500,99 @@ msgstr "_Mời người khác..."
 msgid "_Other Organizer"
 msgstr "Tổ chức _khác"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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: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."
+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 "danh sách"
+
+#: 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 "Khác"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "cho"
+
+#: 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 +4656,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 +4689,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:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -5720,15 +4701,19 @@ msgstr "Độ ư_u tiên:"
 msgid "_Status:"
 msgstr "_Trạng thái:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "Cơ bản"
+
 #: 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:324
 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.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:42
 msgid "Description:"
 msgstr "Mô tả"
 
@@ -5740,180 +4725,154 @@ msgstr "Ngày _bắt đầu:"
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:427
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:428
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:429
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:430
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:431
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:432
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:433
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:434
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:435
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:436
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:437
-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:751 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: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
 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:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Lưu là..."
+
+#: calendar/gui/e-calendar-table.c:974 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 ""
+
+#: calendar/gui/e-calendar-table.c:978 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:979 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:980 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:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Gán công việc"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Đang nạp lịch"
+
+#: calendar/gui/e-calendar-table.c:986
 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:987
+#, 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:992
 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:1259 calendar/gui/e-day-view.c:7416
+#: 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.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Hoàn tất"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Ngày hoàn tất"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Ngày kết thúc"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Vị trí địa lý"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Độ ưu tiên"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 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
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Tóm tắt"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Loại công việc"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 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 +4880,175 @@ 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
 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
 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
-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
-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:3567 calendar/gui/e-week-view.c:3455
-msgid "Make this Occurrence _Movable"
-msgstr ""
+#: 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:3569 calendar/gui/e-week-view.c:3457
-msgid "Delete this _Occurrence"
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
-msgid "Delete _All Occurrences"
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:536
-msgid "Meeting begins: <b>"
-msgstr "Bắt đầu cuộc họp: <b>"
-
-#: calendar/gui/e-itip-control.c:541
-msgid "Task begins: <b>"
-msgstr "Bắt đầu công việc: <b>"
-
-#: calendar/gui/e-itip-control.c:546
-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
-msgid "Begins: <b>"
-msgstr "Bắt đầu: <b>"
-
-#: calendar/gui/e-itip-control.c:562
-msgid "Meeting ends: <b>"
-msgstr "Kết thúc cuộc họp: <b>"
-
-#: calendar/gui/e-itip-control.c:565
-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
-msgid "Ends: <b>"
-msgstr "Kết thúc: <b>"
+#: 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-itip-control.c:583
-msgid "Task Completed: <b>"
-msgstr "Công việc hoàn tất: <b>"
+#: 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-itip-control.c:593
-msgid "Task Due: <b>"
+#: 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-itip-control.c:630 calendar/gui/e-itip-control.c:679
-msgid "iCalendar Information"
-msgstr "Thông tin iCalendar"
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
+#, fuzzy
+msgid "_Configure..."
+msgstr "Cấu hình"
 
-#. Title
-#: calendar/gui/e-itip-control.c:645
-msgid "iCalendar Error"
-msgstr "Lỗi iCalendar"
+#: 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-itip-control.c:710 calendar/gui/e-itip-control.c:726
-msgid "An unknown person"
-msgstr "Người lạ"
+#: 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
+msgid "_Save As..."
+msgstr "Lư_u là..."
 
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:733
-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."
-
-#: calendar/gui/e-itip-control.c:749
-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
-msgid "Choose an action:"
-msgstr "Chọn hành động:"
-
-#: calendar/gui/e-itip-control.c:791
-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
-msgid "OK"
-msgstr "Đồng ý"
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Thiết lập _tóm tắt..."
 
-#: calendar/gui/e-itip-control.c:807
-msgid "Accept"
-msgstr "Chấp nhận"
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Đang nạp lịch..."
 
-#: calendar/gui/e-itip-control.c:808
-msgid "Tentatively accept"
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:809
-msgid "Decline"
-msgstr "Từ chối"
-
-#: calendar/gui/e-itip-control.c:823
-msgid "Send Free/Busy Information"
-msgstr "Gửi thông tin Rảnh/Bận"
-
-#: calendar/gui/e-itip-control.c:836
-msgid "Update respondent status"
-msgstr "Cập nhật trạng thái trả lời"
-
-#: calendar/gui/e-itip-control.c:849
-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
-msgid "Cancel"
-msgstr "Bỏ"
-
-#: calendar/gui/e-itip-control.c:910
-#, 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
-msgid "Meeting Information"
-msgstr "Thông tin cuộc họp"
-
-#: calendar/gui/e-itip-control.c:915
-#, 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
-msgid "Meeting Proposal"
-msgstr "Đề nghị cuộc họp"
-
-#: calendar/gui/e-itip-control.c:920
-#, 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
-msgid "Meeting Update"
-msgstr "Cập nhật cuộc họp"
-
-#: calendar/gui/e-itip-control.c:925
-#, 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
-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
-#, 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
-msgid "Meeting Reply"
-msgstr "Trả lời họp"
-
-#: calendar/gui/e-itip-control.c:954
-#, 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
-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
-#, 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
-msgid "Bad Meeting Message"
-msgstr "Thông điệp lạ về cuộc họp"
-
-#: calendar/gui/e-itip-control.c:980
-#, 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
-msgid "Task Information"
-msgstr "Thông tin công việc"
-
-#: calendar/gui/e-itip-control.c:985
-#, 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
-msgid "Task Proposal"
-msgstr "Đề nghị công việc"
-
-#: calendar/gui/e-itip-control.c:990
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:991
-msgid "Task Update"
-msgstr "Cập nhật công việc"
-
-#: calendar/gui/e-itip-control.c:995
-#, 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
-msgid "Task Update Request"
-msgstr "Yêu cầu cập nhật công việc"
-
-#: calendar/gui/e-itip-control.c:1020
-#, 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
-msgid "Task Reply"
-msgstr "Trả lời công việc"
-
-#: calendar/gui/e-itip-control.c:1025
-#, 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
-msgid "Task Cancellation"
-msgstr "Hủy bỏ công việc"
-
-#: calendar/gui/e-itip-control.c:1031
-msgid "Bad Task Message"
-msgstr "Thông điệp lạ về công việc"
-
-#: calendar/gui/e-itip-control.c:1050
-#, 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
-msgid "Free/Busy Information"
-msgstr "Thông tin bận/rảnh"
-
-#: calendar/gui/e-itip-control.c:1055
-#, 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-day-view.c:3615 calendar/gui/e-week-view.c:3492
+msgid "Delete _All Occurrences"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:1056
-msgid "Free/Busy Request"
-msgstr "Yêu cầu thông tin bận/rảnh"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, 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
-msgid "Free/Busy Reply"
-msgstr "Trả lời thông tin bận/rảnh"
-
-#: calendar/gui/e-itip-control.c:1066
-msgid "Bad Free/Busy Message"
+msgid "Error executing %s."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1139
-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
-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
-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
-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: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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1316
+#: calendar/gui/e-itip-control.c:1564
 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:1318
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Hoàn tất cập nhật\n"
 
-#: calendar/gui/e-itip-control.c:1363
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 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"
+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:1371
+#: calendar/gui/e-itip-control.c:1638
 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:1373
+#: calendar/gui/e-itip-control.c:1640
 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:1403
+#: calendar/gui/e-itip-control.c:1674
 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:1704 calendar/gui/e-itip-control.c:1754
 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:1706 calendar/gui/e-itip-control.c:1758
 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:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Chọn thư mục"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Chọn thư mục"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -6335,203 +5087,213 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1570
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 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:83
 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:84
 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:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 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:231 calendar/gui/e-meeting-model.c:248
 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:233 calendar/gui/e-meeting-model.c:250
 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:235 calendar/gui/e-meeting-model.c:252
 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:264 calendar/gui/e-meeting-model.c:281
 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:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 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:268 calendar/gui/e-meeting-model.c:285
 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:270 calendar/gui/e-meeting-model.c:287
 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: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:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:824
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 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
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 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:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr ""
 
-#: 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:324 calendar/gui/e-meeting-model.c:347
 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:328 calendar/gui/e-meeting-model.c:351
 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: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:2088
 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:2118 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:436
 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:437
 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:473
 msgid "_Options"
 msgstr "_Tùy chọn"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 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:503
 msgid "Show _Zoomed Out"
 msgstr "Hiện Thu _nhỏ"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 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:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Tự chọn"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 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:600
 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:613
 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:626
 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:649
 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:668
 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:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Ngày hoàn tất"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Đang xóa đối tượng được chọn"
+
+#: calendar/gui/e-tasks.c:659
+#, fuzzy
+msgid "Expunging"
+msgstr "Kết thú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:1538
 #, 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:1549
 #, 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:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Đang mở lịch tại %s"
@@ -6592,295 +5354,260 @@ msgstr "Tháng Mười"
 msgid "September"
 msgstr "Tháng Chín"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 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:251
 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
-msgid "Event information"
-msgstr "Thông tin sự kiện"
-
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-msgid "Task information"
-msgstr "Thông tin công việc"
-
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-msgid "Journal information"
-msgstr "Thông tin nhật ký"
-
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-msgid "Free/Busy information"
-msgstr "Thông tin rảnh/bận"
-
-#: calendar/gui/itip-utils.c:321
-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:382
-msgid "iCalendar information"
-msgstr "Thông tin iCalendar"
-
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:617
 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:92
 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
-msgid "Task"
-msgstr "Công việc"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Trạng thái: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Độ ưu tiên: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Phần trăm hoàn thành: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Phân loại: %s"
-
-#: calendar/gui/print.c:2331
-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:2894
+#: 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:2381
+#: mail/mail-callbacks.c:2622
+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,109 +5641,1664 @@ 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: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)"
+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ả\""
+"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ả\""
 
-#: 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"
 
 #: calendar/pcs/query.c:1160
 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"
+msgstr ""
+"Định lượng biểu thức tìm kiếm không trả về giá trị "
+"boolean"
+
+#.
+#. * 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"
 
 #: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
@@ -7038,6 +7320,15 @@ msgstr ""
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
+#: camel/camel-data-cache.c:169
+msgid "Unable to create cache path"
+msgstr ""
+
+#: camel/camel-data-cache.c:441
+#, 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:180
 #, c-format
 msgid ""
@@ -7055,7 +7346,8 @@ msgid ""
 msgstr ""
 "Không thể mở `%s':\n"
 "%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ộ."
+"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
 msgid "Resynchronizing with server"
@@ -7063,83 +7355,70 @@ msgstr "Đang tái đồng bộ với server"
 
 #: camel/camel-disco-store.c:343
 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."
+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:811 camel/camel-filter-driver.c:1197
+#, 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:820 camel/camel-filter-driver.c:1203
+#, 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:887
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 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:915
 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:916 camel/camel-filter-driver.c:928
 #, 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:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Đang đồng bộ thư mục"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, 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:1031
 #, 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-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:126
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "Lỗi giải mã thông điệp."
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
 #, 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
-#, 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
-#, 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
-#, 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
-msgid "Moving messages"
-msgstr "Đang di chuyển thông điệp"
-
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -7148,7 +7427,7 @@ 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-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -7157,18 +7436,33 @@ 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
+#: 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:638
+#: 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-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-folder.c:469
+#, 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:1038
+#, 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:1078
+#, 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:1260
+msgid "Moving messages"
+msgstr "Đang di chuyển thông điệp"
 
 #: camel/camel-lock-client.c:111
 #, c-format
@@ -7183,7 +7477,9 @@ msgstr "Không thể tạo tiến trình hỗ trợ khóa: %s"
 #: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Không thể khóa '%s': lỗi giao thức với bộ hỗ trợ khóa (lock-helper)"
+msgstr ""
+"Không thể khóa '%s': lỗi giao thức với bộ hỗ trợ khóa "
+"(lock-helper)"
 
 #: camel/camel-lock-client.c:215
 #, c-format
@@ -7275,122 +7571,140 @@ 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"
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
 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ý"
+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
+#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
 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"
+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
+#: 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 "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"
+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
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:953
+#: camel/camel-pgp-context.c:987
 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"
+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
+#: camel/camel-pgp-context.c:993
 #, 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"
+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
+#: camel/camel-pgp-context.c:1004
 #, 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"
+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
+#: camel/camel-pgp-context.c:1177
 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"
+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
+#: camel/camel-pgp-context.c:1187
 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
+#: camel/camel-pgp-context.c:1194
 #, 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"
+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
+#: camel/camel-pgp-context.c:1203
 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"
+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
+#: camel/camel-pgp-context.c:1372
 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ã"
+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
+#: camel/camel-pgp-context.c:1380
 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
+#: camel/camel-pgp-context.c:1387
 #, 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"
+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-pgp-mime.c:310
+#: camel/camel-pgp-mime.c:354
 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-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."
+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
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, 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
+#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
 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
+#: 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 "Không thể kết nối tới %s (cổng %d): %s"
 
-#: camel/camel-remote-store.c:268
+#: camel/camel-remote-store.c:258
 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/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:401
+#: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "Thao tác bị hủy bỏ"
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
+#: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server đã ngắt kết nối bất ngờ: %s"
@@ -7401,7 +7715,9 @@ msgstr "Vô danh"
 
 #: camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
-msgstr "Tùy chọn này sẽ kết nối tới server bằng cách đang nhập vô danh."
+msgstr ""
+"Tùy chọn này sẽ kết nối tới server bằng cách đang nhập vô "
+"danh."
 
 #: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
@@ -7442,7 +7758,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 +7770,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"
@@ -7484,7 +7804,9 @@ msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Tùy chọn này sẽ kết nối server bằng cơ chế xác minh Kerberos 4."
+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-kerberos4.c:161
 #, c-format
@@ -7496,25 +7818,41 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
+#, fuzzy
+msgid "Login"
 msgstr "Đăng nhập NT"
 
 #: 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ùy chọn này sẽ kết nối tới server bằng mật khẩu đơn giản."
+msgstr ""
+"Tùy chọn này sẽ kết nối tới server bằng mật khẩu đơn "
+"giản."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
 msgstr ""
 
+#: 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 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
+#: 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 "Mật khẩu"
 
@@ -7558,26 +7896,41 @@ msgstr "URL '%s' cần phần máy chủ"
 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:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Đang phân giải: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, 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:673
 #, 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:675
 #, 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:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Đang phân giải: %s"
+
+#: camel/camel-service.c:787
+#, 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:790
+#, 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 ""
@@ -7586,12 +7939,12 @@ msgstr ""
 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 +7990,26 @@ 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:222
 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ữ"
+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:284
 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ữ"
+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,6 +8024,41 @@ 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:491
+#, c-format
+msgid ""
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:500
+#, 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'"
@@ -7690,105 +8069,108 @@ msgstr "Không thể phân tích URL `%s'"
 msgid "No such message %s in %s"
 msgstr "Không có thông điệp %s trong %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Không có thông điệp: %s"
 
-#: 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 nà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."
+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:344
+#: camel/providers/imap/camel-imap-command.c:352
 #, 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:362
 #, 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:417
 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:610
 #, 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:646
 #, 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:199
 #, 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:218
 #, 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:284
 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:469
 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:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 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:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 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:1799
 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:2151
 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"
+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 +8183,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 +8201,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 hộp thư 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 hộp "
+"thư INBOX trên server này"
 
 #: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
@@ -7831,30 +8215,32 @@ msgstr ""
 
 #: 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:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:389
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 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:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -7862,103 +8248,123 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:901
 #, 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:1276
 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
+#: camel/providers/local/camel-local-provider.c:48
 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:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:76
+#: 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:82
 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:83
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: 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-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
+#: 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
 #, 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ó hộp thư 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:863
 #, 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:371
 #, 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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 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ạ"
+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
 msgid "Maildir append message cancelled"
@@ -7967,7 +8373,8 @@ msgstr "Thông điệp nối thêm dạng Maildir đã bị hủy"
 #: camel/providers/local/camel-maildir-folder.c:184
 #, 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"
+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
@@ -7976,7 +8383,7 @@ msgstr "Không thể nối thêm thông điệp vào thư mục Maildir: %s: %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -7988,7 +8395,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "Không có thông điệp như vậy"
 
@@ -7997,7 +8404,7 @@ msgstr "Không có thông điệp như vậy"
 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-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8007,14 +8414,14 @@ 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-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, 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-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8024,41 +8431,64 @@ 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-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, 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:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, 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-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"
+
+#. 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
+msgid "Storing folder"
+msgstr "Đang lưu thư mục"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, 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-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Không thể mở hộp thư: %s: %s\n"
@@ -8075,9 +8505,9 @@ 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-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8087,16 +8517,18 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 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."
+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-spool-folder.c:643
 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"
@@ -8105,7 +8537,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"
@@ -8114,14 +8546,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"
@@ -8130,96 +8562,88 @@ 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:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, 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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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"
+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:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, 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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, 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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, 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
+#: 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 "Bản tóm tắt và thư mục không khớp, kể cả sau khi đồng bộ"
+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
+#: 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 "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
+#: 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 "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: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"
 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:641
 #, 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:652
 #, 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Lỗi lạ: %s"
@@ -8231,19 +8655,20 @@ 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
 #, 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 hộp thư dạng MH: %s: %s"
+msgstr ""
+"Không thể nối thêm thông điệp vào hộp thư dạng MH: %s: %s"
 
 #: camel/providers/local/camel-mh-store.c:109
 #, 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:220
 #, 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
+#: camel/providers/local/camel-spool-folder.c:515
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr ""
@@ -8254,6 +8679,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Thư mục `%s/%s' không tồn tại"
@@ -8263,76 +8689,55 @@ msgstr "Thư mục `%s/%s' không tồn tại"
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:831
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: 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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, 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/local/camel-spoold-store.c:117
+#, fuzzy, c-format
+msgid "Store `%s' does not exist or is not a directory"
+msgstr "`%s' không phải là thư mục."
 
-#: 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/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: 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/local/camel-spoold-store.c:173
+#, fuzzy, c-format
+msgid "Mail tree %s"
+msgstr "Gửi thư tới %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
@@ -8340,147 +8745,195 @@ msgstr "USENET news"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
 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
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Không thể mở thư mục cho news server: %s"
+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:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, 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:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c: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/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:175
+#: 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 ""
 
-#: 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:84
 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 ""
 
-#: 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ợ."
+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."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, 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:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
+#: camel/providers/pop3/camel-pop3-store.c:210
+msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: 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:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Giao dịch thất bại"
 
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, 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: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"
-
-#: camel/providers/pop3/camel-pop3-store.c:377
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
-"Error sending username: %s"
+"No support for requested authentication mechanism."
 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:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "Lỗi lệnh IMAP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+#: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "Lỗi lạ: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8489,18 +8942,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:601
 #, 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:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8510,49 +8958,50 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: 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: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 ""
 
-#: 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"
 
@@ -8560,122 +9009,149 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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>"
+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 ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: 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:200
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: 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>"
+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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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>"
+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 ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: 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:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: 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:224
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:317
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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:336
+#, 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:350
+#, 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:365
+#, fuzzy
+msgid "STARTTLS response error"
+msgstr "Lỗi trả lời RSET: %s"
+
+#: 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:417
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8683,128 +9159,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, 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:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: 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:662
 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ệ."
+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:667 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:678
 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:688
+#, 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:838
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:726
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1081
+#, 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:1105
 #, 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:1121
 #, 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:1157
 #, 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:1171
+#, 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:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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"
+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:1243
+msgid "DATA termination response error"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, 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:1280
+#, 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:1303
 #, 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:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "Lỗi trả lời RSET: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -8831,19 +9313,20 @@ 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"
+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"
 
@@ -8856,7 +9339,9 @@ msgstr "Không thể đính kèm tập tin %s: %s"
 #: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
-msgstr "Không thể đính kèm tập tin %s: không phải tập tin bình thường"
+msgstr ""
+"Không thể đính kèm tập tin %s: không phải tập tin bình "
+"thường"
 
 #: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
@@ -8871,67 +9356,69 @@ 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:333
 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:363
 msgid "From:"
 msgstr "Từ:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Trả lời cho:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Chủ đề:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Tới:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 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:398
 msgid "Cc:"
 msgstr "CC:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 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:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -8940,53 +9427,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:967
 msgid "Warning!"
 msgstr "Cảnh báo!"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:971
 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:993
 #, 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:1012
 #, 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:1043
 #, 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:1051
 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:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1093
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -8995,7 +9470,7 @@ msgstr ""
 "Không thể cắt tập tin: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9004,13 +9479,13 @@ 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:1176
 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:1358
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9020,23 +9495,23 @@ msgstr ""
 "\n"
 "Bạn có muốn lưu các thay đổi?"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1341
 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:1364
 msgid "Open file"
 msgstr "Mở tập tin"
 
-#: composer/e-msg-composer.c:1537
+#: composer/e-msg-composer.c:1513
 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:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Biên soạn thông điệp"
 
-#: composer/e-msg-composer.c:2383
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9044,7 +9519,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:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9052,15 +9527,16 @@ 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/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 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"
+"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."
 
@@ -9112,14 +9588,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:2247
+#: 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"
+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.
@@ -9239,11 +9734,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:191
 msgid "seconds"
 msgstr "giây"
 
@@ -9315,7 +9806,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:1027
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
@@ -9328,35 +9819,28 @@ msgid "Filter Rules"
 msgstr "Quy tắc bộ lọc"
 
 #. 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."
 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 mail tới."
+"Vui lòng quay lại và chọn một thư mục hợp lệ để gửi mail "
+"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:1633 mail/mail-account-gui.c:1647
 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 ""
@@ -9364,7 +9848,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Kiểm tra"
 
@@ -9372,39 +9856,40 @@ 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 điều kiện đều thỏa"
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "nếu một trong các điều kiện thỏa"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Thêm điều kiệ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"
 
@@ -9442,7 +9927,8 @@ msgstr "với mọi thư mục hoạt động từ xa"
 
 #: filter/filter.glade.h:14
 msgid "with all local and active remote folders"
-msgstr "với mọi thư mục hoạt động từ xa và thư mục cục bộ"
+msgstr ""
+"với mọi thư mục hoạt động từ xa và thư mục cục bộ"
 
 #: filter/filter.glade.h:15
 msgid "with all local folders"
@@ -9450,208 +9936,226 @@ 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
+#: filter/libfilter-i18n.h:6
+msgid "Beep"
+msgstr ""
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "chứa"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Chép vào thư mục"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ngày nhận"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Ngày gửi"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Đã xóa"
 
-#: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr "Không tồn tại"
-
-#: filter/libfilter-i18n.h:11
-msgid "Draft"
-msgstr "Nháp"
-
-#: filter/libfilter-i18n.h:12
-msgid "Exist"
-msgstr "Tồn tại"
-
 #: filter/libfilter-i18n.h:13
-msgid "Expression"
-msgstr "Biểu thức"
+msgid "does not contain"
+msgstr "không chứa"
 
 #: filter/libfilter-i18n.h:14
-msgid "Important"
-msgstr "Quan trọng"
+msgid "does not end with"
+msgstr "không kết thúc bằng"
 
 #: filter/libfilter-i18n.h:15
-msgid "Mailing list"
-msgstr ""
+msgid "does not exist"
+msgstr "không tồn tại"
 
 #: filter/libfilter-i18n.h:16
-msgid "Message Body"
-msgstr "Thân thông điệp"
+msgid "does not sound like"
+msgstr "không giống với"
 
 #: filter/libfilter-i18n.h:17
-msgid "Message Header"
-msgstr "Đầu thông điệp"
+msgid "does not start with"
+msgstr "không bắt đầu bằng"
 
 #: filter/libfilter-i18n.h:18
-msgid "Message was received"
-msgstr "Đã nhận thông điệp"
+msgid "Do Not Exist"
+msgstr "Không tồn tại"
 
 #: filter/libfilter-i18n.h:19
-msgid "Message was sent"
-msgstr "Đã gửi thông điệp"
+msgid "Draft"
+msgstr "Nháp"
 
 #: filter/libfilter-i18n.h:20
-msgid "Move to Folder"
-msgstr "Chuyển vào thư mục"
+msgid "ends with"
+msgstr "kết thúc bằng"
 
 #: filter/libfilter-i18n.h:21
-msgid "Read"
-msgstr "Đọc"
+msgid "Execute Shell Command"
+msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Recipients"
-msgstr "Người nhận"
+msgid "Exist"
+msgstr "Tồn tại"
 
 #: filter/libfilter-i18n.h:23
-msgid "Regex Match"
-msgstr ""
+msgid "exists"
+msgstr "tồn tại"
 
 #: filter/libfilter-i18n.h:24
-msgid "Replied to"
-msgstr "Trả lời cho"
+msgid "Expression"
+msgstr "Biểu thức"
 
-#: 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 "Follow Up"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1404
-msgid "Sender"
-msgstr "Người gửi"
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Quan trọng"
 
 #: filter/libfilter-i18n.h:27
-msgid "Set Status"
-msgstr "Đặt trạng thái"
+msgid "is"
+msgstr "bằng"
 
 #: filter/libfilter-i18n.h:28
-msgid "Size (kB)"
-msgstr "Kích thước (kB)"
+#, fuzzy
+msgid "is after"
+msgstr "sau"
 
 #: filter/libfilter-i18n.h:29
-msgid "Source Account"
-msgstr "Tài khoản nguồn"
+#, fuzzy
+msgid "is before"
+msgstr "trước"
 
 #: filter/libfilter-i18n.h:30
-msgid "Specific header"
+msgid "is Flagged"
 msgstr ""
 
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "lớn hơn"
+
 #: filter/libfilter-i18n.h:32
-msgid "Stop Processing"
-msgstr "Dừng tiến trình"
+msgid "is less than"
+msgstr "nhỏ 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 not"
+msgstr "không phải"
+
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "không phải"
+
+#: filter/libfilter-i18n.h:35
+msgid "Mailing list"
+msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "contains"
-msgstr "chứa"
+msgid "Message Body"
+msgstr "Thân thông điệp"
 
 #: filter/libfilter-i18n.h:37
-msgid "does not contain"
-msgstr "không chứa"
+msgid "Message Header"
+msgstr "Đầu thông điệp"
 
 #: filter/libfilter-i18n.h:38
-msgid "does not end with"
-msgstr "không kết thúc bằng"
+msgid "Move to Folder"
+msgstr "Chuyển vào thư mục"
 
 #: filter/libfilter-i18n.h:39
-msgid "does not exist"
-msgstr "không tồn tại"
+#, fuzzy
+msgid "Play Sound"
+msgstr "Phát âm thanh:"
 
-#: filter/libfilter-i18n.h:40
-msgid "does not sound like"
-msgstr "không giống với"
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+msgid "Read"
+msgstr "Đọc"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not start with"
-msgstr "không bắt đầu bằng"
+msgid "Recipients"
+msgstr "Người nhận"
 
 #: filter/libfilter-i18n.h:42
-msgid "ends with"
-msgstr "kết thúc bằng"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "exists"
-msgstr "tồn tại"
+msgid "Replied to"
+msgstr "Trả lời cho"
 
-#: filter/libfilter-i18n.h:44
-msgid "is greater than"
-msgstr "lớn hơn"
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
+msgid "Score"
+msgstr "Điểm"
 
-#: filter/libfilter-i18n.h:45
-msgid "is less than"
-msgstr "nhỏ hơn"
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+msgid "Sender"
+msgstr "Người gửi"
 
 #: filter/libfilter-i18n.h:46
-msgid "is not"
-msgstr "không phải"
+msgid "Set Status"
+msgstr "Đặt trạng thái"
 
 #: filter/libfilter-i18n.h:47
-msgid "is"
-msgstr "bằng"
+msgid "Size (kB)"
+msgstr "Kích thước (kB)"
 
 #: filter/libfilter-i18n.h:48
-msgid "on or after"
-msgstr "bây giờ hoặc sau"
+msgid "sounds like"
+msgstr "giống như"
 
 #: filter/libfilter-i18n.h:49
-msgid "on or before"
-msgstr "bây giờ hoặc trước"
+msgid "Source Account"
+msgstr "Tài khoản nguồn"
 
 #: filter/libfilter-i18n.h:50
-msgid "sounds like"
-msgstr "giống như"
+msgid "Specific header"
+msgstr ""
 
 #: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "bắt đầu bằng"
 
-#: filter/libfilter-i18n.h:52
-msgid "was after"
-msgstr "sau"
-
 #: filter/libfilter-i18n.h:53
-msgid "was before"
-msgstr "trước"
+msgid "Stop Processing"
+msgstr "Dừng tiến trình"
+
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
+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"
 
@@ -9671,30 +10175,30 @@ 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:101
 msgid "Mail"
 msgstr "Thư"
 
@@ -9722,23 +10226,74 @@ 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
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr ""
+
+#: 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?"
@@ -9763,44 +10318,90 @@ 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ị hộp thư 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/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:101
-msgid "Mail storage folder (internal)"
-msgstr "Hộp lưu trữ thư (nội tại)"
+msgid "Folder containing mail"
+msgstr "Thư mục đang chứa thư"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -9810,227 +10411,257 @@ msgstr "Thùng rác ảo"
 msgid "Virtual Trash folder"
 msgstr "Hộp thư 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:118
 msgid "This folder cannot contain messages."
 msgstr "Hộp thư này chứa các thông điệp."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Thuộc tính..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Thay đổi thuộc tính hộp thư này"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 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:951
+#: mail/component-factory.c:925
+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:967
 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:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr ""
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:994
 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:1003
 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"
+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:1009
 msgid "Cannot initialize Evolution's folder info component."
-msgstr "Không thể khởi động thành phần thông tin hộp thư của Evolution."
+msgstr ""
+"Không thể khởi động thành phần thông tin hộp thư của "
+"Evolution."
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Đang kết nối tới server..."
+
+#: mail/component-factory.c:1250
 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:342
 #, 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:344
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:760
 #, 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:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "ẩn %d"
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "được chọn %d"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "chưa gửi %d"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "đã gửi %d"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:781
 #, 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:1088
+#, 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:1581
 msgid "VFolder on _Subject"
 msgstr "VFolder trên _chủ đề"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "VFolder trên _người gửi"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "VFolder trên n_gười nhận"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Lọc theo _chủ đề"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Lọc theo _người gửi"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Lọc theo n_gười nhận"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 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:1611
 msgid "_Print"
 msgstr "_In"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1615 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:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 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:1618
 msgid "_Forward"
 msgstr "_Chuyển tiếp"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Hoàn tất"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Xóa"
+
+#. separator here?
+#: mail/folder-browser.c:1628 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:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Đánh dấu _quan trọng"
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Đánh dấu khôn_g quan trọng"
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Xóa"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "_Chuyển tới hộp thư..."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "C_hép vào hộp thư..."
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
-msgid "_Undelete"
+#: mail/folder-browser.c:1645
+msgid "Label"
 msgstr ""
 
-#: mail/folder-browser.c:1473 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, 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:1653
+#, 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:1657
+#, 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"
-msgstr ""
-
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr ""
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
+msgstr "Thư mục đang chứa thư"
 
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
-msgstr ""
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "Lọc theo n_gười nhận"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Mặc định"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "VFolder trên n_gười nhận"
 
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
@@ -10053,45 +10684,39 @@ 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"
 "recoverable.  Please use this feature with care."
 msgstr ""
 "Chú ý: Trong khi đang chuyển đổi dạng thức hộp thư, nếu\n"
-"xảy ra lỗi (ví dụ như thiếu đĩa) thì không thể được phục\n"
+"xảy ra lỗi (ví dụ như thiếu đĩa) thì không thể được "
+"phục\n"
 "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"
 
@@ -10109,86 +10734,78 @@ msgstr ""
 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:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr ""
 
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "Lưu chữ ký"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "Tên _danh sách:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+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 "Rađiô"
 
-#: mail/mail-account-gui.c:1045
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 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:1654
+#: mail/mail-account-gui.c:1985
 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:212
 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:216
 msgid "Don't delete"
 msgstr "Không xóa"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 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
-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?"
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Tắt"
 
-#. 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:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Bật"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Gửi thư tới %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+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?"
 
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Chủ để là %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Bật"
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Thừ từ %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Tên Tài _khoản:"
 
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+msgid "Protocol"
 msgstr ""
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Thêm quy tắc lọc"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10200,7 +10817,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:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10208,7 +10825,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:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10216,22 +10833,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:194
 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:209
 msgid "Send anyway?"
 msgstr "Gửi bất cứ giá nào?"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10239,108 +10854,131 @@ 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:295
 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:299
 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:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"Có thể mail server sẽ để lộ tên người nhận bằng cách thêm một trường \n"
+"Có thể mail server sẽ để lộ tên người nhận bằng cách "
+"thêm một trường \n"
 "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:408
 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."
+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:497
 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."
+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:623
+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:977
 msgid "an unknown sender"
 msgstr "người gửi lạ"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 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:1433 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:1435 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:2091
 #, 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:2116
 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 hộp thư Nháp."
+msgstr ""
+"Bạn chỉ có thể sửa những thông điệp trong hộp thư Nháp."
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:2155
 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 hộp thư Đã gửi"
+msgstr ""
+"Bạn chỉ có thể gửi lại những thông điệp trong hộp thư "
+"Đã gửi"
 
-#: mail/mail-callbacks.c:1837
+#: mail/mail-callbacks.c:2169
 #, 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:2195
 msgid "No Message Selected"
 msgstr "Chưa chọn thông điệp"
 
-#: mail/mail-callbacks.c:1962
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Ghi đè tập tin?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/mail-callbacks.c:1964
+#: mail/mail-callbacks.c:2296
 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:2366
+#, 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:2373
+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
 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:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10349,26 +10987,33 @@ msgstr ""
 "Lỗi khi nạp thông tin bộ lọc:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2262
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Bộ lọc"
 
-#: mail/mail-callbacks.c:2325
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Đang lấy thông điệp %d trên %d"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "In thông điệp"
 
-#: mail/mail-callbacks.c:2352
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2371
+#: mail/mail-callbacks.c:2901
 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:3087 mail/mail-callbacks.c:3127
 #, 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-config-druid.c:146
 msgid ""
@@ -10407,16 +11052,33 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 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:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Tuần làm việc"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+msgid "To Do"
+msgstr ""
+
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "sau khi"
 
-#: mail/mail-config.c:1859
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -10424,87 +11086,151 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Hộp thư nhận"
-
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2719
 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:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 msgstr "Đang kết nối tới server..."
 
-#: mail/mail-config.glade.h:1
-msgid " _Check for supported types "
+#: mail/mail-config.c:2999
+#, fuzzy
+msgid "Unnamed"
+msgstr "Liên lạc vô danh"
+
+#: 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
-msgid " color"
-msgstr " màu"
+#, fuzzy
+msgid " Edit "
+msgstr "_Sửa"
 
 #: mail/mail-config.glade.h:3
-msgid "(SSL is not supported in this build of evolution)"
-msgstr ""
+#, fuzzy
+msgid " New "
+msgstr "Mới"
 
 #: mail/mail-config.glade.h:4
-msgid "A_lways encrypt to myself when sending encrypted mail"
+msgid " _Check for supported types "
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "Account"
-msgstr "Tài khoản"
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr ""
 
 #: mail/mail-config.glade.h:6
+msgid "(SSL is not supported in this build of evolution)"
+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 "Tài khoản %d"
+
+#: mail/mail-config.glade.h:9
 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:10 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:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Nâng cao"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Châu Phi/Lagos"
+
+#: mail/mail-config.glade.h:13
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Alerts"
+msgstr "Báo động"
+
+#: mail/mail-config.glade.h:15
+msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Đính kèm tập tin vào thông điệp"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Đồ đính kèm"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:23
+msgid "Automatically _detect links"
+msgstr ""
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Bộ mã lạ: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "Đón_g"
+
+#: 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 "Composing Messages"
+msgstr "Biên soạn thông điệp"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 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:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10514,355 +11240,564 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:37
+msgid "Dari"
+msgstr ""
+
+#: 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 ""
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Mặc định"
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
-msgstr ""
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
+msgstr "Bộ mã"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "_Xoá tất cả"
+
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr "Hiển thị"
+#: mail/mail-config.glade.h:44
+#, 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:45 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:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "_Thư mục:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
 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:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
-msgstr "Bật"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Email"
+
+#: 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
+msgid "Empty _trash folders on exit"
+msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "Thực hiện hành động"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "kết thúc bằng"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Thuộc tính"
+
+#: mail/mail-config.glade.h:56
+msgid "Format messages in _HTML"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
 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:58
+msgid "Highlight _quotations with"
+msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:59
+msgid "Hulu"
+msgstr ""
+
+#: 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 ""
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr ""
-
-#: 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
+msgid "Labels and Colors"
+msgstr ""
+
+#: 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"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Đầu thông điệp"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_Hiển thị thông điệp"
+
+#: mail/mail-config.glade.h:74
+msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP Server:"
 
-#: mail/mail-config.glade.h:46
-msgid "News"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "Cấu hình thư"
+
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "%s server %s"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
-msgstr ""
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Tổ _chức:"
 
-#: mail/mail-config.glade.h:53
-msgid "Pick a color"
+#: mail/mail-config.glade.h:83
+msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
-msgid "Pretty Good Privacy"
+#: mail/mail-config.glade.h:87
+msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "Không thể gửi thông điệp: chưa có người nhận."
 
-#: mail/mail-config.glade.h:56
-msgid "Prompt when sending messages with an _empty subject"
+#: mail/mail-config.glade.h:89
+msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr ""
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "In một mục"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Không thể mở thông điệp"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr ""
 
-#: 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 ""
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
-msgstr ""
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
+msgstr "_Tùy chọn"
 
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
-msgstr ""
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Nhớ mật khẩu này"
 
-#: 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"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+msgstr "_Bảo mật"
+
+#: mail/mail-config.glade.h:104
+msgid "Same as text"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
-msgid "Security"
+#: mail/mail-config.glade.h:105
+msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: 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:110
+#, fuzzy
+msgid "Select PGP program"
+msgstr "Chọn tên"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Tập tin chữ ký:"
+
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Xoá mọi thứ trừ chữ ký"
+
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr ""
+
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Hộp thư thông điệp đã gửi:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 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:117
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Cấu hình server"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "_Kiểu server:"
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
-msgstr "Tập tin chữ ký:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "_Lối tắt"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Lưu chữ ký"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Nguồn"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 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:124
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "Tên kiểu:"
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
-msgstr "Hộp thư đặc biệt"
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 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)"
+#: mail/mail-config.glade.h:128
+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:87
+#: mail/mail-config.glade.h:130
+msgid "Use _HTML for this signature"
+msgstr ""
+
+#: mail/mail-config.glade.h:132
+msgid "V_ariable-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: 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:92
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:143
+msgid "_Authentication type: "
+msgstr ""
+
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
-msgid "_Drafts folder:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
 msgstr ""
 
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
+#: mail/mail-config.glade.h:148
+msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Mặc định"
+
+#: mail/mail-config.glade.h:151
+msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:153
+msgid "_Enable spell checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
-msgid "_HTML Signature:"
+#: mail/mail-config.glade.h:154
+#, fuzzy
+msgid "_Filename:"
+msgstr "Tên tập tin:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
-msgid "_Highlight citations with"
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Chuyển tiếp như là"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
+msgstr "Tên đầy đủ"
+
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "Gửi thư HTML"
+
+#: mail/mail-config.glade.h:160
+msgid "_HTML Signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
+#: mail/mail-config.glade.h:162
+msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Ngôn ngữ"
+
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
+#: mail/mail-config.glade.h:165
+msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
-msgstr ""
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
+msgstr "Đầu thông điệp"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
-msgid "_Organization:"
+#: mail/mail-config.glade.h:169
+msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
-msgid "_PGP binary path:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
+#: mail/mail-config.glade.h:172
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
+#: mail/mail-config.glade.h:173
+msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
-msgid "_Send mail in HTML format by default."
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Rađiô"
+
+#: mail/mail-config.glade.h:175
+msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
-msgid "_Server Type: "
+#: 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:116
-msgid "_Signature file:"
+#: 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 "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 "Lưu chữ ký"
+
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Text Signature:"
+msgstr "Lưu chữ ký"
+
+#: mail/mail-config.glade.h:184
+msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
+#: mail/mail-config.glade.h:185
+msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " màu"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr ""
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr ""
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr ""
@@ -10899,181 +11834,174 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1136
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1605
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1607
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1610
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1613
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr ""
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:1814
-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 ""
-
-#: mail/mail-format.c:1845
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1853
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
+msgstr "Thư"
 
-#: mail/mail-format.c:2069
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2088
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2117
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2130
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, 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:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
@@ -11096,157 +12024,157 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr ""
 
-#: 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 ""
 
-#: mail/mail-ops.c:554
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:674
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: 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 ""
 
-#: mail/mail-ops.c:788
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:868
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:868
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:895
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1058 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr ""
-
-#: mail/mail-ops.c:1191
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1306
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1375
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1520
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1556
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1672
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2088
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2089
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2237
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr ""
 
@@ -11282,68 +12210,92 @@ msgstr ""
 msgid "Matches:"
 msgstr ""
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr ""
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr ""
 
-#: 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:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-tools.c:256
+#: mail/mail-signature-editor.c:79
+#, 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:172
+msgid "Save signature"
+msgstr "Lưu chữ ký"
+
+#: mail/mail-signature-editor.c:178
+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:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "Tập tin chữ ký:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr ""
 
@@ -11366,10 +12318,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr ""
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr ""
@@ -11387,87 +12335,144 @@ msgstr ""
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr ""
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr ""
 
-#: mail/message-list.c:656
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:657
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:658
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:659
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:660
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:664
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:665
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:669
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:670
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:920
+#: mail/message-list.c:991
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:927
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:936
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:958
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2358
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr ""
 
-#: mail/message-list.etspec.h:2
-msgid "Flagged"
+#: mail/message-list.etspec.h:3
+msgid "Due By"
 msgstr ""
 
 #: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Trạng thái"
+
+#: mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr ""
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "Bị hủy bỏ"
+
+#: 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\""
@@ -11489,7 +12494,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #: 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 ""
 
@@ -11534,1421 +12539,29 @@ msgid "_Unsubscribe"
 msgstr ""
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive 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 ""
-
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
-msgid "Appointments"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:341
-msgid "No appointments"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:375
-msgid "%k:%M %d %B"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:377
-msgid "%l:%M %d %B"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:395
-msgid "No description"
-msgstr ""
-
-#: my-evolution/e-summary-mail.c:129
-msgid "Mail summary"
-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:81
-#: my-evolution/e-summary-weather.c:661
-msgid "KBOS"
-msgstr ""
-
-#: 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 ""
-
-#: my-evolution/e-summary-preferences.c:946
-msgid "Add a news feed"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:954
-msgid "Enter the URL of the news feed you wish to add"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:958
-msgid "Name:"
-msgstr ""
-
-#: 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
-msgid "Error downloading RDF"
-msgstr ""
-
-#: my-evolution/e-summary-rdf.c:528
-msgid "News Feed"
-msgstr ""
-
-#: my-evolution/e-summary-tasks.c:248
-msgid "No tasks"
-msgstr ""
-
-#: my-evolution/e-summary-tasks.c:287
-msgid "(No Description)"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:71
-msgid "My Weather"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:559
-msgid "Weather"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr ""
-
-#: my-evolution/e-summary.c:193
-msgid "%A, %B %e %Y"
-msgstr ""
-
-#: my-evolution/e-summary.c:493
-msgid "Please wait..."
-msgstr ""
-
-#: my-evolution/e-summary.c:584 ui/my-evolution.xml.h:3
-msgid "Print Summary"
-msgstr ""
-
-#: my-evolution/e-summary.c:630
-msgid "Printing of Summary failed"
-msgstr ""
-
-#: my-evolution/main.c:66
-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
-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 ""
-
-#: my-evolution/metar.c:45
-msgid "Broken clouds"
-msgstr ""
-
-#: my-evolution/metar.c:46
-msgid "Scattered clouds"
-msgstr ""
-
-#: my-evolution/metar.c:47
-msgid "Few clouds"
-msgstr ""
-
-#: my-evolution/metar.c:48
-msgid "Overcast"
-msgstr ""
-
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
-msgid "Invalid"
-msgstr ""
-
-#: my-evolution/metar.c:63
-msgid "Variable"
-msgstr ""
-
-#: my-evolution/metar.c:64
-msgid "North"
-msgstr ""
-
-#: my-evolution/metar.c:64
-msgid "North - NorthEast"
-msgstr ""
-
-#: my-evolution/metar.c:64
-msgid "Northeast"
-msgstr ""
-
-#: my-evolution/metar.c:64
-msgid "East - NorthEast"
-msgstr ""
-
-#: my-evolution/metar.c:65
-msgid "East"
-msgstr ""
-
-#: my-evolution/metar.c:65
-msgid "East - Southeast"
-msgstr ""
-
-#: my-evolution/metar.c:65
-msgid "Southeast"
-msgstr ""
-
-#: my-evolution/metar.c:65
-msgid "South - Southeast"
-msgstr ""
-
-#: my-evolution/metar.c:66
-msgid "South"
-msgstr ""
-
-#: my-evolution/metar.c:66
-msgid "South - Southwest"
-msgstr ""
-
-#: my-evolution/metar.c:66
-msgid "Southwest"
-msgstr ""
-
-#: my-evolution/metar.c:66
-msgid "West - Southwest"
-msgstr ""
-
-#: my-evolution/metar.c:67
-msgid "West"
-msgstr ""
-
-#: my-evolution/metar.c:67
-msgid "West - Northwest"
-msgstr ""
-
-#: my-evolution/metar.c:67
-msgid "Northwest"
-msgstr ""
-
-#: my-evolution/metar.c:67
-msgid "North - Northwest"
-msgstr ""
-
-#. DRIZZLE
-#: my-evolution/metar.c:127
-msgid "Drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:128
-msgid "Drizzle in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:129
-msgid "Light drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:130
-msgid "Moderate drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:131
-msgid "Heavy drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:132
-msgid "Shallow drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:133
-msgid "Patches of drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:134
-msgid "Partial drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
-msgid "Thunderstorm"
-msgstr ""
-
-#: my-evolution/metar.c:136
-msgid "Windy drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:137
-msgid "Showers"
-msgstr ""
-
-#: my-evolution/metar.c:138
-msgid "Drifting drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:139
-msgid "Freezing drizzle"
-msgstr ""
-
-#. RAIN
-#: my-evolution/metar.c:142
-msgid "Rain"
-msgstr ""
-
-#: my-evolution/metar.c:143
-msgid "Rain in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:144
-msgid "Light rain"
-msgstr ""
-
-#: my-evolution/metar.c:145
-msgid "Moderate rain"
-msgstr ""
-
-#: my-evolution/metar.c:146
-msgid "Heavy rain"
-msgstr ""
-
-#: my-evolution/metar.c:147
-msgid "Shallow rain"
-msgstr ""
-
-#: my-evolution/metar.c:148
-msgid "Patches of rain"
-msgstr ""
-
-#: my-evolution/metar.c:149
-msgid "Partial rainfall"
-msgstr ""
-
-#: my-evolution/metar.c:151
-msgid "Blowing rainfall"
-msgstr ""
-
-#: my-evolution/metar.c:152
-msgid "Rain showers"
-msgstr ""
-
-#: my-evolution/metar.c:153
-msgid "Drifting rain"
-msgstr ""
-
-#: my-evolution/metar.c:154
-msgid "Freezing rain"
-msgstr ""
-
-#. SNOW
-#: my-evolution/metar.c:157
-msgid "Snow"
-msgstr ""
-
-#: my-evolution/metar.c:158
-msgid "Snow in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:159
-msgid "Light snow"
-msgstr ""
-
-#: my-evolution/metar.c:160
-msgid "Moderate snow"
-msgstr ""
-
-#: my-evolution/metar.c:161
-msgid "Heavy snow"
-msgstr ""
-
-#: my-evolution/metar.c:162
-msgid "Shallow snow"
-msgstr ""
-
-#: my-evolution/metar.c:163
-msgid "Patches of snow"
-msgstr ""
-
-#: my-evolution/metar.c:164
-msgid "Partial snowfall"
-msgstr ""
-
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
-msgid "Snowstorm"
-msgstr ""
-
-#: my-evolution/metar.c:166
-msgid "Blowing snowfall"
-msgstr ""
-
-#: my-evolution/metar.c:167
-msgid "Snow showers"
-msgstr ""
-
-#: my-evolution/metar.c:168
-msgid "Drifting snow"
-msgstr ""
-
-#: my-evolution/metar.c:169
-msgid "Freezing snow"
-msgstr ""
-
-#. SNOW_GRAINS
-#: my-evolution/metar.c:172
-msgid "Snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:173
-msgid "Snow grains in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:174
-msgid "Light snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:175
-msgid "Moderate snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:176
-msgid "Heavy snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:177
-msgid "Shallow snow grains"
-msgstr ""
-
-#: 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 ""
-
-#: my-evolution/metar.c:218
-msgid "Hail in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
-msgid "Light hail"
-msgstr ""
-
-#: my-evolution/metar.c:220
-msgid "Moderate hail"
-msgstr ""
-
-#: my-evolution/metar.c:221
-msgid "Heavy hail"
-msgstr ""
-
-#: my-evolution/metar.c:222
-msgid "Shallow hail"
-msgstr ""
-
-#: my-evolution/metar.c:223
-msgid "Patches of hail"
-msgstr ""
-
-#: my-evolution/metar.c:224
-msgid "Partial hail"
-msgstr ""
-
-#: my-evolution/metar.c:225
-msgid "Hailstorm"
-msgstr ""
-
-#: my-evolution/metar.c:226
-msgid "Blowing hail"
-msgstr ""
-
-#: my-evolution/metar.c:227
-msgid "Hail showers"
-msgstr ""
-
-#: my-evolution/metar.c:228
-msgid "Drifting hail"
-msgstr ""
-
-#: my-evolution/metar.c:229
-msgid "Freezing hail"
-msgstr ""
-
-#. SMALL_HAIL
-#: my-evolution/metar.c:232
-msgid "Small hail"
-msgstr ""
-
-#: my-evolution/metar.c:233
-msgid "Small hail in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:235
-msgid "Moderate small hail"
-msgstr ""
-
-#: my-evolution/metar.c:236
-msgid "Heavy small hail"
-msgstr ""
-
-#: my-evolution/metar.c:237
-msgid "Shallow small hail"
-msgstr ""
-
-#: my-evolution/metar.c:238
-msgid "Patches of small hail"
-msgstr ""
-
-#: my-evolution/metar.c:239
-msgid "Partial small hail"
-msgstr ""
-
-#: my-evolution/metar.c:240
-msgid "Small hailstorm"
-msgstr ""
-
-#: my-evolution/metar.c:241
-msgid "Blowing small hail"
-msgstr ""
-
-#: my-evolution/metar.c:242
-msgid "Showers of small hail"
-msgstr ""
-
-#: my-evolution/metar.c:243
-msgid "Drifting small hail"
-msgstr ""
-
-#: my-evolution/metar.c:244
-msgid "Freezing small hail"
-msgstr ""
-
-#. 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 ""
-
-#: my-evolution/metar.c:263
-msgid "Mist in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:264
-msgid "Light mist"
-msgstr ""
-
-#: my-evolution/metar.c:265
-msgid "Moderate mist"
-msgstr ""
-
-#: my-evolution/metar.c:266
-msgid "Thick mist"
-msgstr ""
-
-#: 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 ""
-
-#. FOG
-#: my-evolution/metar.c:277
-msgid "Fog"
-msgstr ""
-
-#: my-evolution/metar.c:278
-msgid "Fog in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:279
-msgid "Light fog"
-msgstr ""
-
-#: my-evolution/metar.c:280
-msgid "Moderate fog"
-msgstr ""
-
-#: my-evolution/metar.c:281
-msgid "Thick fog"
-msgstr ""
-
-#: my-evolution/metar.c:282
-msgid "Shallow fog"
-msgstr ""
-
-#: my-evolution/metar.c:283
-msgid "Patches of fog"
-msgstr ""
-
-#: my-evolution/metar.c:284
-msgid "Partial fog"
-msgstr ""
-
-#: my-evolution/metar.c:286
-msgid "Fog with wind"
-msgstr ""
-
-#: my-evolution/metar.c:288
-msgid "Drifting fog"
-msgstr ""
-
-#: my-evolution/metar.c:289
-msgid "Freezing fog"
-msgstr ""
-
-#. SMOKE
-#: my-evolution/metar.c:292
-msgid "Smoke"
-msgstr ""
-
-#: my-evolution/metar.c:293
-msgid "Smoke in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:294
-msgid "Thin smoke"
-msgstr ""
-
-#: my-evolution/metar.c:295
-msgid "Moderate smoke"
-msgstr ""
-
-#: my-evolution/metar.c:296
-msgid "Thick smoke"
-msgstr ""
-
-#: my-evolution/metar.c:297
-msgid "Shallow smoke"
-msgstr ""
-
-#: my-evolution/metar.c:298
-msgid "Patches of smoke"
-msgstr ""
-
-#: my-evolution/metar.c:299
-msgid "Partial smoke"
-msgstr ""
-
-#: my-evolution/metar.c:300
-msgid "Thunderous smoke"
-msgstr ""
-
-#: my-evolution/metar.c:301
-msgid "Smoke with wind"
-msgstr ""
-
-#: my-evolution/metar.c:303
-msgid "Drifting smoke"
-msgstr ""
-
-#. VOLCANIC_ASH
-#: my-evolution/metar.c:307
-msgid "Volcanic ash"
-msgstr ""
-
-#: my-evolution/metar.c:308
-msgid "Volcanic ash in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:310
-msgid "Moderate volcanic ash"
-msgstr ""
-
-#: my-evolution/metar.c:311
-msgid "Thick volcanic ash"
-msgstr ""
-
-#: 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 ""
-
-#: my-evolution/metar.c:323
-msgid "Sand in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:324
-msgid "Light sand"
-msgstr ""
-
-#: my-evolution/metar.c:325
-msgid "Moderate sand"
-msgstr ""
-
-#: my-evolution/metar.c:326
-msgid "Heavy sand"
-msgstr ""
-
-#: 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"
+msgid "Configuration control for the Evolution Summary."
 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 ""
-
-#: my-evolution/metar.c:368
-msgid "Dust in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:369
-msgid "Light dust"
-msgstr ""
-
-#: my-evolution/metar.c:370
-msgid "Moderate dust"
-msgstr ""
-
-#: my-evolution/metar.c:371
-msgid "Heavy dust"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: my-evolution/metar.c:398
-msgid "Sandstorm in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:399
-msgid "Light standstorm"
-msgstr ""
-
-#: my-evolution/metar.c:400
-msgid "Moderate sandstorm"
-msgstr ""
-
-#: my-evolution/metar.c:401
-msgid "Heavy sandstorm"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: my-evolution/metar.c:443
-msgid "Tornado in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:445
-msgid "Moderate tornado"
-msgstr ""
-
-#: my-evolution/metar.c:446
-msgid "Raging tornado"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: my-evolution/my-evolution.glade.h:9
-msgid "Ma_x number of items shown:"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:10
-msgid "News Feed Settings"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:11
-msgid "One mont_h"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:12
-msgid "One w_eek"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:13
-msgid "R_efresh time (seconds):"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:14
-msgid "Refresh _time (seconds):"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:15
-msgid "S_how full path for folders"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:16
-msgid "Show _all tasks"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:17
-msgid "Show _today's tasks"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Show temperatures in:"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:19
-msgid "Tasks "
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:20
-msgid "Weather settings"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr ""
-
-#: 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 ""
-
-#: my-evolution/my-evolution.glade.h:27
-msgid "_Mail"
-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/my-evolution.glade.h:28
-msgid "_News Feeds"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+msgid "Factory for Evolution Summary's configuration control."
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:29
-msgid "_One day"
-msgstr ""
+#: 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 thư của Evolution"
 
-#: my-evolution/my-evolution.glade.h:30
-msgid "_Schedule"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+msgid "Summary Preferences"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:31
-msgid "_Weather"
+#: 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
@@ -15268,7472 +14881,8896 @@ msgid "Diyarbakir"
 msgstr ""
 
 #: my-evolution/Locations.h:603
-msgid "Dobbiaco"
+msgid "Dnipropetrovsk"
 msgstr ""
 
 #: my-evolution/Locations.h:604
-msgid "Dodge City"
+msgid "Dobbiaco"
 msgstr ""
 
 #: my-evolution/Locations.h:605
-msgid "Doha"
+msgid "Dodge City"
 msgstr ""
 
 #: my-evolution/Locations.h:606
+msgid "Doha"
+msgstr ""
+
+#: my-evolution/Locations.h:607
 msgid "Dole"
 msgstr ""
 
-#: my-evolution/Locations.h:608
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "Xong"
+
+#: my-evolution/Locations.h:610
 msgid "Dongsha"
 msgstr ""
 
-#: my-evolution/Locations.h:609
+#: my-evolution/Locations.h:611
 msgid "Dongshi"
 msgstr ""
 
-#: my-evolution/Locations.h:610
+#: my-evolution/Locations.h:612
 msgid "Don Torcuato"
 msgstr ""
 
-#: my-evolution/Locations.h:611
+#: my-evolution/Locations.h:613
 msgid "Dortmund-Wickede"
 msgstr ""
 
-#: my-evolution/Locations.h:612
+#: my-evolution/Locations.h:614
 msgid "Dothan"
 msgstr ""
 
-#: my-evolution/Locations.h:613
+#: my-evolution/Locations.h:615
 msgid "Douglas"
 msgstr ""
 
-#: my-evolution/Locations.h:614
+#: my-evolution/Locations.h:616
 msgid "Dover"
 msgstr ""
 
-#: my-evolution/Locations.h:615
+#: my-evolution/Locations.h:617
 msgid "Dresden-Klotzsche"
 msgstr ""
 
-#: my-evolution/Locations.h:616
+#: my-evolution/Locations.h:618
 msgid "Drummond"
 msgstr ""
 
-#: my-evolution/Locations.h:617
+#: my-evolution/Locations.h:619
 msgid "Dubai"
 msgstr ""
 
-#: my-evolution/Locations.h:618
+#: my-evolution/Locations.h:620
 msgid "Dubbo"
 msgstr ""
 
-#: my-evolution/Locations.h:619
+#: my-evolution/Locations.h:621
 msgid "Dublin"
 msgstr ""
 
-#: my-evolution/Locations.h:620
+#: my-evolution/Locations.h:622
 msgid "Du Bois"
 msgstr ""
 
-#: my-evolution/Locations.h:621
+#: my-evolution/Locations.h:623
 msgid "Dubrovnik"
 msgstr ""
 
-#: my-evolution/Locations.h:622
+#: my-evolution/Locations.h:624
 msgid "Dubuque"
 msgstr ""
 
-#: my-evolution/Locations.h:623
+#: my-evolution/Locations.h:625
 msgid "Dugway"
 msgstr ""
 
-#: my-evolution/Locations.h:624
+#: my-evolution/Locations.h:626
 msgid "Duluth"
 msgstr ""
 
-#: my-evolution/Locations.h:625
+#: my-evolution/Locations.h:627
 msgid "Dundee"
 msgstr ""
 
-#: my-evolution/Locations.h:626
+#: my-evolution/Locations.h:628
 msgid "Durango"
 msgstr ""
 
-#: my-evolution/Locations.h:627
+#: my-evolution/Locations.h:629
 msgid "Durango Awrs"
 msgstr ""
 
-#: my-evolution/Locations.h:628
+#: my-evolution/Locations.h:630
 msgid "Durazno"
 msgstr ""
 
-#: my-evolution/Locations.h:629
+#: my-evolution/Locations.h:631
 msgid "Durban Louis Botha "
 msgstr ""
 
-#: my-evolution/Locations.h:630
+#: my-evolution/Locations.h:632
 msgid "Dusseldorf"
 msgstr ""
 
-#: my-evolution/Locations.h:631
+#: my-evolution/Locations.h:633
 msgid "Dutch Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:632
+#: my-evolution/Locations.h:634
 msgid "Dyersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:633
+#: my-evolution/Locations.h:635
 msgid "Eagle"
 msgstr ""
 
-#: my-evolution/Locations.h:634
+#: my-evolution/Locations.h:636
 msgid "Eagle Range"
 msgstr ""
 
-#: my-evolution/Locations.h:635
+#: my-evolution/Locations.h:637
 msgid "East London"
 msgstr ""
 
-#: my-evolution/Locations.h:636
+#: my-evolution/Locations.h:638
 msgid "East Midlands"
 msgstr ""
 
-#: my-evolution/Locations.h:637
+#: my-evolution/Locations.h:639
 msgid "East St Louis"
 msgstr ""
 
-#: my-evolution/Locations.h:638
+#: my-evolution/Locations.h:640
 msgid "Eau Claire"
 msgstr ""
 
-#: my-evolution/Locations.h:640
+#: my-evolution/Locations.h:642
 msgid "Edinburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:641
+#: my-evolution/Locations.h:643
 msgid "Edmonton"
 msgstr ""
 
-#: my-evolution/Locations.h:642
+#: my-evolution/Locations.h:644
 msgid "Edmonton/Villeneuve"
 msgstr ""
 
-#: my-evolution/Locations.h:643
+#: my-evolution/Locations.h:645
 msgid "Eduardo Gomes International"
 msgstr ""
 
-#: my-evolution/Locations.h:644
+#: my-evolution/Locations.h:646
 msgid "Edwards AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:645
+#: my-evolution/Locations.h:647
 msgid "Egilsstadir"
 msgstr ""
 
-#: my-evolution/Locations.h:646
+#: my-evolution/Locations.h:648
 msgid "Eglin"
 msgstr ""
 
-#: my-evolution/Locations.h:647
+#: my-evolution/Locations.h:649
 msgid "Eglington/Londonderry"
 msgstr ""
 
-#: my-evolution/Locations.h:649
+#: my-evolution/Locations.h:651
 msgid "Eindhoven"
 msgstr ""
 
-#: my-evolution/Locations.h:650
+#: my-evolution/Locations.h:652
 msgid "Ekofisk"
 msgstr ""
 
-#: my-evolution/Locations.h:651
+#: my-evolution/Locations.h:653
 msgid "Elazig"
 msgstr ""
 
-#: my-evolution/Locations.h:652
+#: my-evolution/Locations.h:654
 msgid "El Centro"
 msgstr ""
 
-#: my-evolution/Locations.h:653
+#: my-evolution/Locations.h:655
 msgid "El Dorado"
 msgstr ""
 
-#: my-evolution/Locations.h:654
+#: my-evolution/Locations.h:656
 msgid "Elefsis"
 msgstr ""
 
-#: my-evolution/Locations.h:655
+#: my-evolution/Locations.h:657
 msgid "Elfin Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:656
+#: my-evolution/Locations.h:658
 msgid "Elizabeth City"
 msgstr ""
 
-#: my-evolution/Locations.h:657
+#: my-evolution/Locations.h:659
 msgid "Elk City"
 msgstr ""
 
-#: my-evolution/Locations.h:658
+#: my-evolution/Locations.h:660
 msgid "Elkhart"
 msgstr ""
 
-#: my-evolution/Locations.h:659
+#: my-evolution/Locations.h:661
 msgid "Elkins"
 msgstr ""
 
-#: my-evolution/Locations.h:660
+#: my-evolution/Locations.h:662
 msgid "Elko"
 msgstr ""
 
-#: my-evolution/Locations.h:661
+#: my-evolution/Locations.h:663
 msgid "Elmira"
 msgstr ""
 
-#: my-evolution/Locations.h:662
+#: my-evolution/Locations.h:664
 msgid "El Monte"
 msgstr ""
 
-#: my-evolution/Locations.h:663
+#: my-evolution/Locations.h:665
 msgid "El Paso"
 msgstr ""
 
-#: my-evolution/Locations.h:665
+#: my-evolution/Locations.h:667
 msgid "El Salvador Int."
 msgstr ""
 
-#: my-evolution/Locations.h:666
+#: my-evolution/Locations.h:668
 msgid "Elsenborn"
 msgstr ""
 
-#: my-evolution/Locations.h:667
+#: my-evolution/Locations.h:669
 msgid "Ely"
 msgstr ""
 
-#: my-evolution/Locations.h:668
+#: my-evolution/Locations.h:670
 msgid "Emmonak"
 msgstr ""
 
-#: my-evolution/Locations.h:669
+#: my-evolution/Locations.h:671
 msgid "Emporia"
 msgstr ""
 
-#: my-evolution/Locations.h:670
+#: my-evolution/Locations.h:672
 msgid "Enid"
 msgstr ""
 
-#: my-evolution/Locations.h:671
+#: my-evolution/Locations.h:673
 msgid "Enid/Woodring"
 msgstr ""
 
-#: my-evolution/Locations.h:672
+#: my-evolution/Locations.h:674
 msgid "Enosburg Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:673
+#: my-evolution/Locations.h:675
 msgid "Ephrata"
 msgstr ""
 
-#: my-evolution/Locations.h:674
+#: my-evolution/Locations.h:676
 msgid "Ercan"
 msgstr ""
 
-#: my-evolution/Locations.h:675
+#: my-evolution/Locations.h:677
 msgid "Erie"
 msgstr ""
 
-#: my-evolution/Locations.h:676
+#: my-evolution/Locations.h:678
 msgid "Erzurum"
 msgstr ""
 
-#: my-evolution/Locations.h:677
+#: my-evolution/Locations.h:679
 msgid "Esbjerg"
 msgstr ""
 
-#: my-evolution/Locations.h:678
+#: my-evolution/Locations.h:680
 msgid "Escanaba"
 msgstr ""
 
-#: my-evolution/Locations.h:679
+#: my-evolution/Locations.h:681
 msgid "Esfahan"
 msgstr ""
 
-#: my-evolution/Locations.h:680
+#: my-evolution/Locations.h:682
 msgid "Eskisehir"
 msgstr ""
 
-#: my-evolution/Locations.h:681
+#: my-evolution/Locations.h:683
 msgid "Estherville"
 msgstr ""
 
-#: my-evolution/Locations.h:683
+#: my-evolution/Locations.h:685
 msgid "Eugene"
 msgstr ""
 
-#: my-evolution/Locations.h:684
+#: my-evolution/Locations.h:686
 msgid "Eureka"
 msgstr ""
 
-#: my-evolution/Locations.h:685
+#: my-evolution/Locations.h:687
 msgid "Europe"
 msgstr ""
 
-#: my-evolution/Locations.h:686
+#: my-evolution/Locations.h:688
 msgid "Evanston"
 msgstr ""
 
-#: my-evolution/Locations.h:687
+#: my-evolution/Locations.h:689
 msgid "Evansville"
 msgstr ""
 
-#: my-evolution/Locations.h:688
+#: my-evolution/Locations.h:690
 msgid "Everett"
 msgstr ""
 
-#: my-evolution/Locations.h:689
+#: my-evolution/Locations.h:691
 msgid "Evergreen"
 msgstr ""
 
-#: my-evolution/Locations.h:690
+#: my-evolution/Locations.h:692
 msgid "Evreux-Fauville"
 msgstr ""
 
-#: my-evolution/Locations.h:691
+#: my-evolution/Locations.h:693
 msgid "Exeter"
 msgstr ""
 
-#: my-evolution/Locations.h:692
+#: my-evolution/Locations.h:694
 msgid "Ezeiza"
 msgstr ""
 
-#: my-evolution/Locations.h:693
+#: my-evolution/Locations.h:695
 msgid "Fagernes"
 msgstr ""
 
-#: my-evolution/Locations.h:694
+#: my-evolution/Locations.h:696
 msgid "Fairbanks"
 msgstr ""
 
-#: my-evolution/Locations.h:695
+#: my-evolution/Locations.h:697
 msgid "Fairchild"
 msgstr ""
 
-#: my-evolution/Locations.h:696
+#: my-evolution/Locations.h:698
 msgid "Fairfield"
 msgstr ""
 
-#: my-evolution/Locations.h:697
+#: my-evolution/Locations.h:699
 msgid "Fairmont"
 msgstr ""
 
-#: my-evolution/Locations.h:698
+#: my-evolution/Locations.h:700
 msgid "Fallon"
 msgstr ""
 
-#: my-evolution/Locations.h:699
+#: my-evolution/Locations.h:701
 msgid "Falls City"
 msgstr ""
 
-#: my-evolution/Locations.h:700
+#: my-evolution/Locations.h:702
 msgid "Falmouth-Otis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:701
+#: my-evolution/Locations.h:703
 msgid "Farbanks/Eielson AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:702
+#: my-evolution/Locations.h:704
 msgid "Fargo"
 msgstr ""
 
-#: my-evolution/Locations.h:703
+#: my-evolution/Locations.h:705
 msgid "Farmingdale"
 msgstr ""
 
-#: my-evolution/Locations.h:704
+#: my-evolution/Locations.h:706
 msgid "Farmington"
 msgstr ""
 
-#: my-evolution/Locations.h:705
+#: my-evolution/Locations.h:707
 msgid "Farmville"
 msgstr ""
 
-#: my-evolution/Locations.h:706
+#: my-evolution/Locations.h:708
 msgid "Faro"
 msgstr ""
 
-#: my-evolution/Locations.h:707
+#: my-evolution/Locations.h:709
 msgid "Fayetteville"
 msgstr ""
 
-#: my-evolution/Locations.h:708
+#: my-evolution/Locations.h:710
 msgid "Feng Nin"
 msgstr ""
 
-#: my-evolution/Locations.h:709
+#: my-evolution/Locations.h:711
 msgid "Fergus Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:710
+#: my-evolution/Locations.h:712
 msgid "Fernando De Noronha"
 msgstr ""
 
-#: my-evolution/Locations.h:711
+#: my-evolution/Locations.h:713
 msgid "Ferrara"
 msgstr ""
 
-#: my-evolution/Locations.h:712
+#: my-evolution/Locations.h:714
 msgid "Figari"
 msgstr ""
 
-#: my-evolution/Locations.h:713
+#: my-evolution/Locations.h:715
 msgid "Findlay"
 msgstr ""
 
-#: my-evolution/Locations.h:715
+#: my-evolution/Locations.h:717
 msgid "Firenze"
 msgstr ""
 
-#: my-evolution/Locations.h:716
+#: my-evolution/Locations.h:718
 msgid "Fitchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:717
+#: my-evolution/Locations.h:719
 msgid "Flagstaff"
 msgstr ""
 
-#: my-evolution/Locations.h:718
+#: my-evolution/Locations.h:720
 msgid "Flint"
 msgstr ""
 
-#: my-evolution/Locations.h:719
+#: my-evolution/Locations.h:721
 msgid "Flippin"
 msgstr ""
 
-#: my-evolution/Locations.h:720
+#: my-evolution/Locations.h:722
 msgid "Florence"
 msgstr ""
 
-#: my-evolution/Locations.h:721
+#: my-evolution/Locations.h:723
 msgid "Florennes"
 msgstr ""
 
-#: my-evolution/Locations.h:722
+#: my-evolution/Locations.h:724
 msgid "Flores"
 msgstr ""
 
-#: my-evolution/Locations.h:723
+#: my-evolution/Locations.h:725
 msgid "Florianopolis"
 msgstr ""
 
-#: my-evolution/Locations.h:724
+#: my-evolution/Locations.h:726
 msgid "Florida"
 msgstr ""
 
-#: my-evolution/Locations.h:725
+#: my-evolution/Locations.h:727
 msgid "Floro"
 msgstr ""
 
-#: my-evolution/Locations.h:726
+#: my-evolution/Locations.h:728
 msgid "Fond Du Lac"
 msgstr ""
 
-#: my-evolution/Locations.h:727
+#: my-evolution/Locations.h:729
 msgid "Forde/Bringeland"
 msgstr ""
 
-#: my-evolution/Locations.h:728
+#: my-evolution/Locations.h:730
 msgid "Forli"
 msgstr ""
 
-#: my-evolution/Locations.h:729
+#: my-evolution/Locations.h:731
 msgid "Formosa"
 msgstr ""
 
-#: my-evolution/Locations.h:730
+#: my-evolution/Locations.h:732
 msgid "Fortaleza"
 msgstr ""
 
-#: my-evolution/Locations.h:731
+#: my-evolution/Locations.h:733
 msgid "Fort Belvoir"
 msgstr ""
 
-#: my-evolution/Locations.h:732
+#: my-evolution/Locations.h:734
 msgid "Fort Benning"
 msgstr ""
 
-#: my-evolution/Locations.h:733
+#: my-evolution/Locations.h:735
 msgid "Fort Bragg"
 msgstr ""
 
-#: my-evolution/Locations.h:734
+#: my-evolution/Locations.h:736
 msgid "Fort Campbell"
 msgstr ""
 
-#: my-evolution/Locations.h:735
+#: my-evolution/Locations.h:737
 msgid "Fort Carson"
 msgstr ""
 
-#: my-evolution/Locations.h:736
+#: my-evolution/Locations.h:738
 msgid "Fort Collins"
 msgstr ""
 
-#: my-evolution/Locations.h:737
+#: my-evolution/Locations.h:739
 msgid "Fort Collins/Lovel"
 msgstr ""
 
-#: my-evolution/Locations.h:738
+#: my-evolution/Locations.h:740
 msgid "Fort Dodge"
 msgstr ""
 
-#: my-evolution/Locations.h:739
+#: my-evolution/Locations.h:741
 msgid "Fort Drum"
 msgstr ""
 
-#: my-evolution/Locations.h:740
+#: my-evolution/Locations.h:742
 msgid "Fort Eustis"
 msgstr ""
 
-#: my-evolution/Locations.h:741
+#: my-evolution/Locations.h:743
 msgid "Fort Greely/Allen AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:742
+#: my-evolution/Locations.h:744
 msgid "Fort Huachuca"
 msgstr ""
 
-#: my-evolution/Locations.h:743
+#: my-evolution/Locations.h:745
 msgid "Fort Knox"
 msgstr ""
 
-#: my-evolution/Locations.h:744
+#: my-evolution/Locations.h:746
 msgid "Fort Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:745
+#: my-evolution/Locations.h:747
 msgid "Fort Lauderdale (International)"
 msgstr ""
 
-#: my-evolution/Locations.h:746
+#: my-evolution/Locations.h:748
 msgid "Fort Leonard"
 msgstr ""
 
-#: my-evolution/Locations.h:747
+#: my-evolution/Locations.h:749
 msgid "Fort Lewis"
 msgstr ""
 
-#: my-evolution/Locations.h:748
+#: my-evolution/Locations.h:750
 msgid "Fort Madison"
 msgstr ""
 
-#: my-evolution/Locations.h:749
+#: my-evolution/Locations.h:751
 msgid "Fort Meade"
 msgstr ""
 
-#: my-evolution/Locations.h:750
+#: my-evolution/Locations.h:752
 msgid "Fort Myers (Page Field)"
 msgstr ""
 
-#: my-evolution/Locations.h:751
+#: my-evolution/Locations.h:753
 msgid "Fort Myers (Southwest Florida International)"
 msgstr ""
 
-#: my-evolution/Locations.h:752
+#: my-evolution/Locations.h:754
 msgid "Fort Polk-Leesville"
 msgstr ""
 
-#: my-evolution/Locations.h:753
+#: my-evolution/Locations.h:755
 msgid "Fort Riley"
 msgstr ""
 
-#: my-evolution/Locations.h:754
+#: my-evolution/Locations.h:756
 msgid "Fort Sill"
 msgstr ""
 
-#: my-evolution/Locations.h:755
+#: my-evolution/Locations.h:757
 msgid "Fort Smith"
 msgstr ""
 
-#: my-evolution/Locations.h:756
+#: my-evolution/Locations.h:758
 msgid "Fort Stewart"
 msgstr ""
 
-#: my-evolution/Locations.h:757
+#: my-evolution/Locations.h:759
 msgid "Fort Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:758
+#: my-evolution/Locations.h:760
 msgid "Fort Wayne"
 msgstr ""
 
-#: my-evolution/Locations.h:759
+#: my-evolution/Locations.h:761
 msgid "Fort Worth-Alliance"
 msgstr ""
 
-#: my-evolution/Locations.h:760
+#: my-evolution/Locations.h:762
 msgid "Fort Worth-Meacham"
 msgstr ""
 
-#: my-evolution/Locations.h:761
+#: my-evolution/Locations.h:763
 msgid "Fort Worth NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:762
+#: my-evolution/Locations.h:764
 msgid "Fourchon"
 msgstr ""
 
-#: my-evolution/Locations.h:763
+#: my-evolution/Locations.h:765
 msgid "Foz Do Iguacu"
 msgstr ""
 
-#: my-evolution/Locations.h:765
+#: my-evolution/Locations.h:767
 msgid "Frankfort"
 msgstr ""
 
-#: my-evolution/Locations.h:766
+#: my-evolution/Locations.h:768
 msgid "Frankfurt/Main"
 msgstr ""
 
-#: my-evolution/Locations.h:767
+#: my-evolution/Locations.h:769
 msgid "Franklin"
 msgstr ""
 
-#: my-evolution/Locations.h:768
+#: my-evolution/Locations.h:770
 msgid "Fredericton"
 msgstr ""
 
-#: my-evolution/Locations.h:769
+#: my-evolution/Locations.h:771
 msgid "Freeport"
 msgstr ""
 
-#: my-evolution/Locations.h:770
+#: my-evolution/Locations.h:772
 msgid "Frenchville"
 msgstr ""
 
-#: my-evolution/Locations.h:771
+#: my-evolution/Locations.h:773
 msgid "Fresno"
 msgstr ""
 
-#: my-evolution/Locations.h:772
+#: my-evolution/Locations.h:774
 msgid "Fresno-Chandler"
 msgstr ""
 
-#: my-evolution/Locations.h:773
+#: my-evolution/Locations.h:775
 msgid "Friday Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:774
+#: my-evolution/Locations.h:776
 msgid "Friedrichshafen"
 msgstr ""
 
-#: my-evolution/Locations.h:775
+#: my-evolution/Locations.h:777
 msgid "Frigg"
 msgstr ""
 
-#: my-evolution/Locations.h:776
+#: my-evolution/Locations.h:778
 msgid "Frontone"
 msgstr ""
 
-#: my-evolution/Locations.h:777
+#: my-evolution/Locations.h:779
 msgid "Frosinone"
 msgstr ""
 
-#: my-evolution/Locations.h:778
+#: my-evolution/Locations.h:780
 msgid "Fryeburg"
 msgstr ""
 
-#: my-evolution/Locations.h:779
+#: my-evolution/Locations.h:781
 msgid "Fujairah"
 msgstr ""
 
-#: my-evolution/Locations.h:780
+#: my-evolution/Locations.h:782
 msgid "Fuji Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:781
+#: my-evolution/Locations.h:783
 msgid "Fukue Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:782
+#: my-evolution/Locations.h:784
 msgid "Fukui Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:783
+#: my-evolution/Locations.h:785
 msgid "Fukuoka Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:784
+#: my-evolution/Locations.h:786
 msgid "Fullerton"
 msgstr ""
 
-#: my-evolution/Locations.h:785
+#: my-evolution/Locations.h:787
 msgid "Funchal"
 msgstr ""
 
-#: my-evolution/Locations.h:786
+#: my-evolution/Locations.h:788
 msgid "FYR Macedonia"
 msgstr ""
 
-#: my-evolution/Locations.h:787
+#: my-evolution/Locations.h:789
 msgid "Gadsden"
 msgstr ""
 
-#: my-evolution/Locations.h:788
+#: my-evolution/Locations.h:790
 msgid "Gage"
 msgstr ""
 
-#: my-evolution/Locations.h:789
+#: my-evolution/Locations.h:791
 msgid "Gainesville"
 msgstr ""
 
-#: my-evolution/Locations.h:790
+#: my-evolution/Locations.h:792
 msgid "Galax-Hillsville"
 msgstr ""
 
-#: my-evolution/Locations.h:791
+#: my-evolution/Locations.h:793
 msgid "Galbraith Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:792
+#: my-evolution/Locations.h:794
 msgid "Galeao"
 msgstr ""
 
-#: my-evolution/Locations.h:793
+#: my-evolution/Locations.h:795
 msgid "Galena"
 msgstr ""
 
-#: my-evolution/Locations.h:794
+#: my-evolution/Locations.h:796
 msgid "Galesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:795
+#: my-evolution/Locations.h:797
 msgid "Gallup"
 msgstr ""
 
-#: my-evolution/Locations.h:796
+#: my-evolution/Locations.h:798
 msgid "Galveston"
 msgstr ""
 
-#: my-evolution/Locations.h:797
+#: my-evolution/Locations.h:799
 msgid "Gambell"
 msgstr ""
 
-#: my-evolution/Locations.h:798
+#: my-evolution/Locations.h:800
 msgid "Gander"
 msgstr ""
 
-#: my-evolution/Locations.h:799
+#: my-evolution/Locations.h:801
 msgid "Garden City"
 msgstr ""
 
-#: my-evolution/Locations.h:800
+#: my-evolution/Locations.h:802
 msgid "Gary"
 msgstr ""
 
-#: my-evolution/Locations.h:801
+#: my-evolution/Locations.h:803
 msgid "Gassim"
 msgstr ""
 
-#: my-evolution/Locations.h:802
+#: my-evolution/Locations.h:804
 msgid "Gatineau"
 msgstr ""
 
-#: my-evolution/Locations.h:803
+#: my-evolution/Locations.h:805
 msgid "Gaziantep"
 msgstr ""
 
-#: my-evolution/Locations.h:804
+#: my-evolution/Locations.h:806
 msgid "Gdansk"
 msgstr ""
 
-#: my-evolution/Locations.h:805
+#: my-evolution/Locations.h:807
 msgid "Geneve"
 msgstr ""
 
-#: my-evolution/Locations.h:806
+#: my-evolution/Locations.h:808
 msgid "Genova"
 msgstr ""
 
-#: my-evolution/Locations.h:807
+#: my-evolution/Locations.h:809
 msgid "George Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:808
+#: my-evolution/Locations.h:810
 msgid "Georgetown"
 msgstr ""
 
-#: my-evolution/Locations.h:811
+#: my-evolution/Locations.h:813
 msgid "Ghardaia"
 msgstr ""
 
-#: my-evolution/Locations.h:812
+#: my-evolution/Locations.h:814
 msgid "Ghedi"
 msgstr ""
 
-#: my-evolution/Locations.h:814
+#: my-evolution/Locations.h:816
 msgid "Gifu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:815
+#: my-evolution/Locations.h:817
 msgid "Gila Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:816
+#: my-evolution/Locations.h:818
 msgid "Gillette"
 msgstr ""
 
-#: my-evolution/Locations.h:817
+#: my-evolution/Locations.h:819
 msgid "Gilze-Rijen"
 msgstr ""
 
-#: my-evolution/Locations.h:818
+#: my-evolution/Locations.h:820
 msgid "Gioia del Colle"
 msgstr ""
 
-#: my-evolution/Locations.h:819
+#: my-evolution/Locations.h:821
 msgid "Girona"
 msgstr ""
 
-#: my-evolution/Locations.h:820
+#: my-evolution/Locations.h:822
 msgid "Gizan"
 msgstr ""
 
-#: my-evolution/Locations.h:821
+#: my-evolution/Locations.h:823
 msgid "Glasgow"
 msgstr ""
 
-#: my-evolution/Locations.h:822
+#: my-evolution/Locations.h:824
 msgid "Glendive"
 msgstr ""
 
-#: my-evolution/Locations.h:823
+#: my-evolution/Locations.h:825
 msgid "Glens Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:824
+#: my-evolution/Locations.h:826
 msgid "Goiania"
 msgstr ""
 
-#: my-evolution/Locations.h:825
+#: my-evolution/Locations.h:827
 msgid "Goldsboro"
 msgstr ""
 
-#: my-evolution/Locations.h:826
+#: my-evolution/Locations.h:828
 msgid "Goodland"
 msgstr ""
 
-#: my-evolution/Locations.h:827
+#: my-evolution/Locations.h:829
 msgid "Goose Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:828
+#: my-evolution/Locations.h:830
 msgid "Goteborg (Landvetter)"
 msgstr ""
 
-#: my-evolution/Locations.h:829
+#: my-evolution/Locations.h:831
 msgid "Goteborg (Save)"
 msgstr ""
 
-#: my-evolution/Locations.h:830
+#: my-evolution/Locations.h:832
 msgid "Granada"
 msgstr ""
 
-#: my-evolution/Locations.h:831
+#: my-evolution/Locations.h:833
 msgid "Grand Canyon"
 msgstr ""
 
-#: my-evolution/Locations.h:832
+#: my-evolution/Locations.h:834
 msgid "Grand Cayman"
 msgstr ""
 
-#: my-evolution/Locations.h:833
+#: my-evolution/Locations.h:835
 msgid "Grand Forks"
 msgstr ""
 
-#: my-evolution/Locations.h:834
+#: my-evolution/Locations.h:836
 msgid "Grand Island"
 msgstr ""
 
-#: my-evolution/Locations.h:835
+#: my-evolution/Locations.h:837
 msgid "Grand Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:836
+#: my-evolution/Locations.h:838
 msgid "Grand Junction"
 msgstr ""
 
-#: my-evolution/Locations.h:837
+#: my-evolution/Locations.h:839
 msgid "Grand Marais"
 msgstr ""
 
-#: my-evolution/Locations.h:838
+#: my-evolution/Locations.h:840
 msgid "Grand Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:839
+#: my-evolution/Locations.h:841
 msgid "Grandview"
 msgstr ""
 
-#: my-evolution/Locations.h:840
+#: my-evolution/Locations.h:842
 msgid "Grangeville"
 msgstr ""
 
-#: my-evolution/Locations.h:841
+#: my-evolution/Locations.h:843
 msgid "Grants"
 msgstr ""
 
-#: my-evolution/Locations.h:842
+#: my-evolution/Locations.h:844
 msgid "Graz"
 msgstr ""
 
-#: my-evolution/Locations.h:843
+#: my-evolution/Locations.h:845
 msgid "Great Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:845
+#: my-evolution/Locations.h:847
 msgid "Greeley"
 msgstr ""
 
-#: my-evolution/Locations.h:846
+#: my-evolution/Locations.h:848
 msgid "Green Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:847
+#: my-evolution/Locations.h:849
 msgid "Green River"
 msgstr ""
 
-#: my-evolution/Locations.h:848
+#: my-evolution/Locations.h:850
 msgid "Greensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:849
+#: my-evolution/Locations.h:851
 msgid "Greenville"
 msgstr ""
 
-#: my-evolution/Locations.h:850
+#: my-evolution/Locations.h:852
 msgid "Greenville-Spartanburg"
 msgstr ""
 
-#: my-evolution/Locations.h:851
+#: my-evolution/Locations.h:853
 msgid "Greenwood"
 msgstr ""
 
-#: my-evolution/Locations.h:852
+#: my-evolution/Locations.h:854
 msgid "Grenoble-Saint-Geoirs"
 msgstr ""
 
-#: my-evolution/Locations.h:853
+#: my-evolution/Locations.h:855
 msgid "Griffiss AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:854
+#: my-evolution/Locations.h:856
 msgid "Groningen"
 msgstr ""
 
-#: my-evolution/Locations.h:855
+#: my-evolution/Locations.h:857
 msgid "Grosseto"
 msgstr ""
 
-#: my-evolution/Locations.h:856
+#: my-evolution/Locations.h:858
 msgid "Groton"
 msgstr ""
 
-#: my-evolution/Locations.h:857
+#: my-evolution/Locations.h:859
 msgid "Guadalajara"
 msgstr ""
 
-#: my-evolution/Locations.h:858
+#: my-evolution/Locations.h:860
 msgid "Guadalupe Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:859
+#: my-evolution/Locations.h:861
 msgid "Guanare"
 msgstr ""
 
-#: my-evolution/Locations.h:860
+#: my-evolution/Locations.h:862
 msgid "Guangzhou"
 msgstr ""
 
-#: my-evolution/Locations.h:861
+#: my-evolution/Locations.h:863
 msgid "Guantanamo"
 msgstr ""
 
-#: my-evolution/Locations.h:862
+#: my-evolution/Locations.h:864
 msgid "Guarany"
 msgstr ""
 
-#: my-evolution/Locations.h:863
+#: my-evolution/Locations.h:865
 msgid "Guaratingueta"
 msgstr ""
 
-#: my-evolution/Locations.h:864
+#: my-evolution/Locations.h:866
 msgid "Guarulhos"
 msgstr ""
 
-#: my-evolution/Locations.h:866
+#: my-evolution/Locations.h:868
 msgid "Guayaquil/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:867
+#: my-evolution/Locations.h:869
 msgid "Guaymas"
 msgstr ""
 
-#: my-evolution/Locations.h:868
+#: my-evolution/Locations.h:870
 msgid "Guernsey"
 msgstr ""
 
-#: my-evolution/Locations.h:869
+#: my-evolution/Locations.h:871
 msgid "Guidonia"
 msgstr ""
 
-#: my-evolution/Locations.h:870
+#: my-evolution/Locations.h:872
 msgid "Gulfport"
 msgstr ""
 
-#: my-evolution/Locations.h:871
+#: my-evolution/Locations.h:873
 msgid "Gulkana"
 msgstr ""
 
-#: my-evolution/Locations.h:872
+#: my-evolution/Locations.h:874
 msgid "Gullfax C"
 msgstr ""
 
-#: my-evolution/Locations.h:873
+#: my-evolution/Locations.h:875
 msgid "Gunnison"
 msgstr ""
 
-#: my-evolution/Locations.h:874
+#: my-evolution/Locations.h:876
 msgid "Gunnison (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:875
+#: my-evolution/Locations.h:877
 msgid "Guriat"
 msgstr ""
 
-#: my-evolution/Locations.h:876
+#: my-evolution/Locations.h:878
 msgid "Gustavus"
 msgstr ""
 
-#: my-evolution/Locations.h:877
+#: my-evolution/Locations.h:879
 msgid "Guymon"
 msgstr ""
 
-#: my-evolution/Locations.h:878
+#: my-evolution/Locations.h:880
 msgid "Habana"
 msgstr ""
 
-#: my-evolution/Locations.h:879
+#: my-evolution/Locations.h:881
 msgid "Hachijojima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:880
+#: my-evolution/Locations.h:882
 msgid "Hachinohe Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:881
+#: my-evolution/Locations.h:883
 msgid "Hafr Al-Batin"
 msgstr ""
 
-#: my-evolution/Locations.h:882
+#: my-evolution/Locations.h:884
 msgid "Hagerstown"
 msgstr ""
 
-#: my-evolution/Locations.h:884
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+msgid "Hail"
+msgstr ""
+
+#: my-evolution/Locations.h:886
 msgid "Hailey-Sun Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:885
+#: my-evolution/Locations.h:887
 msgid "Haines"
 msgstr ""
 
-#: my-evolution/Locations.h:887
+#: my-evolution/Locations.h:889
 msgid "Hakodate Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:888
+#: my-evolution/Locations.h:890
 msgid "Halifax"
 msgstr ""
 
-#: my-evolution/Locations.h:889
+#: my-evolution/Locations.h:891
 msgid "Hamamatsu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:890
+#: my-evolution/Locations.h:892
 msgid "Hamburg"
 msgstr ""
 
-#: my-evolution/Locations.h:891
+#: my-evolution/Locations.h:893
 msgid "Hamburg-Finkenwerder"
 msgstr ""
 
-#: my-evolution/Locations.h:892
+#: my-evolution/Locations.h:894
 msgid "Hamilton"
 msgstr ""
 
-#: my-evolution/Locations.h:893
+#: my-evolution/Locations.h:895
 msgid "Hammerfest"
 msgstr ""
 
-#: my-evolution/Locations.h:894
+#: my-evolution/Locations.h:896
 msgid "Hampton"
 msgstr ""
 
-#: my-evolution/Locations.h:895
+#: my-evolution/Locations.h:897
 msgid "Hanamaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:896
+#: my-evolution/Locations.h:898
 msgid "Hancock"
 msgstr ""
 
-#: my-evolution/Locations.h:897
+#: my-evolution/Locations.h:899
 msgid "Hangzhou"
 msgstr ""
 
-#: my-evolution/Locations.h:898
+#: my-evolution/Locations.h:900
 msgid "Hanksville"
 msgstr ""
 
-#: my-evolution/Locations.h:899
+#: my-evolution/Locations.h:901
 msgid "Hannover"
 msgstr ""
 
-#: my-evolution/Locations.h:900
+#: my-evolution/Locations.h:902
 msgid "Ha Noi"
 msgstr ""
 
-#: my-evolution/Locations.h:901
+#: my-evolution/Locations.h:903
 msgid "Harbor Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:902
+#: my-evolution/Locations.h:904
 msgid "Harlingen"
 msgstr ""
 
-#: my-evolution/Locations.h:903
+#: my-evolution/Locations.h:905
 msgid "Harlowton"
 msgstr ""
 
-#: my-evolution/Locations.h:904
+#: my-evolution/Locations.h:906
 msgid "Harrisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:905
+#: my-evolution/Locations.h:907
 msgid "Harrison"
 msgstr ""
 
-#: my-evolution/Locations.h:906
+#: my-evolution/Locations.h:908
 msgid "Harstad/Narvik/Evenes"
 msgstr ""
 
-#: my-evolution/Locations.h:907
+#: my-evolution/Locations.h:909
 msgid "Hartford"
 msgstr ""
 
-#: my-evolution/Locations.h:908
+#: my-evolution/Locations.h:910
 msgid "Hassi-Messaoud"
 msgstr ""
 
-#: my-evolution/Locations.h:909
+#: my-evolution/Locations.h:911
 msgid "Hastings"
 msgstr ""
 
-#: my-evolution/Locations.h:910
+#: my-evolution/Locations.h:912
 msgid "Haugesund"
 msgstr ""
 
-#: my-evolution/Locations.h:911
+#: my-evolution/Locations.h:913
 msgid "Havre"
 msgstr ""
 
-#: my-evolution/Locations.h:912
+#: my-evolution/Locations.h:914
 msgid "Hawaii"
 msgstr ""
 
-#: my-evolution/Locations.h:913
+#: my-evolution/Locations.h:915
 msgid "Hawthorne"
 msgstr ""
 
-#: my-evolution/Locations.h:914
+#: my-evolution/Locations.h:916
 msgid "Hayden"
 msgstr ""
 
-#: my-evolution/Locations.h:915
+#: my-evolution/Locations.h:917
 msgid "Hayes River"
 msgstr ""
 
-#: my-evolution/Locations.h:916
+#: my-evolution/Locations.h:918
 msgid "Hays"
 msgstr ""
 
-#: my-evolution/Locations.h:917
+#: my-evolution/Locations.h:919
 msgid "Hayward"
 msgstr ""
 
-#: my-evolution/Locations.h:918
+#: my-evolution/Locations.h:920
 msgid "Healy River"
 msgstr ""
 
-#: my-evolution/Locations.h:919
+#: my-evolution/Locations.h:921
 msgid "Helena"
 msgstr ""
 
-#: my-evolution/Locations.h:920
+#: my-evolution/Locations.h:922
 msgid "Helsinki"
 msgstr ""
 
-#: my-evolution/Locations.h:921
+#: my-evolution/Locations.h:923
 msgid "Henderson"
 msgstr ""
 
-#: my-evolution/Locations.h:922
+#: my-evolution/Locations.h:924
 msgid "Hengchun"
 msgstr ""
 
-#: my-evolution/Locations.h:923
+#: my-evolution/Locations.h:925
 msgid "Hermosillo"
 msgstr ""
 
-#: my-evolution/Locations.h:924
+#: my-evolution/Locations.h:926
 msgid "Hibbing"
 msgstr ""
 
-#: my-evolution/Locations.h:925
+#: my-evolution/Locations.h:927
 msgid "Hickory"
 msgstr ""
 
-#: my-evolution/Locations.h:926
+#: my-evolution/Locations.h:928
 msgid "Hill City"
 msgstr ""
 
-#: my-evolution/Locations.h:927
+#: my-evolution/Locations.h:929
 msgid "Hillsboro"
 msgstr ""
 
-#: my-evolution/Locations.h:928
+#: my-evolution/Locations.h:930
 msgid "Hilo"
 msgstr ""
 
-#: my-evolution/Locations.h:929
+#: my-evolution/Locations.h:931
 msgid "Hinesville"
 msgstr ""
 
-#: my-evolution/Locations.h:930
+#: my-evolution/Locations.h:932
 msgid "Hiroshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:931
+#: my-evolution/Locations.h:933
 msgid "Hobart"
 msgstr ""
 
-#: my-evolution/Locations.h:932
+#: my-evolution/Locations.h:934
 msgid "Hobbs"
 msgstr ""
 
-#: my-evolution/Locations.h:933
+#: my-evolution/Locations.h:935
 msgid "Ho Chi Minh"
 msgstr ""
 
-#: my-evolution/Locations.h:934
+#: my-evolution/Locations.h:936
 msgid "Hodeidah"
 msgstr ""
 
-#: my-evolution/Locations.h:935
+#: my-evolution/Locations.h:937
 msgid "Hof"
 msgstr ""
 
-#: my-evolution/Locations.h:936
+#: my-evolution/Locations.h:938
 msgid "Hoffman"
 msgstr ""
 
-#: my-evolution/Locations.h:937
+#: my-evolution/Locations.h:939
 msgid "Hofu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:938
+#: my-evolution/Locations.h:940
 msgid "Hohenems"
 msgstr ""
 
-#: my-evolution/Locations.h:939
+#: my-evolution/Locations.h:941
 msgid "Holguin"
 msgstr ""
 
-#: my-evolution/Locations.h:940
+#: my-evolution/Locations.h:942
 msgid "Homer"
 msgstr ""
 
-#: my-evolution/Locations.h:941
+#: my-evolution/Locations.h:943
 msgid "Homestead AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:942
+#: my-evolution/Locations.h:944
 msgid "Hondo"
 msgstr ""
 
-#: my-evolution/Locations.h:945
+#: my-evolution/Locations.h:947
 msgid "Honningsvag"
 msgstr ""
 
-#: my-evolution/Locations.h:946
+#: my-evolution/Locations.h:948
 msgid "Honolulu"
 msgstr ""
 
-#: my-evolution/Locations.h:947
+#: my-evolution/Locations.h:949
 msgid "Hoonah"
 msgstr ""
 
-#: my-evolution/Locations.h:948
+#: my-evolution/Locations.h:950
 msgid "Hoquiam"
 msgstr ""
 
-#: my-evolution/Locations.h:949
+#: my-evolution/Locations.h:951
 msgid "Hot Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:950
+#: my-evolution/Locations.h:952
 msgid "Houghton Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:951
+#: my-evolution/Locations.h:953
 msgid "Houlton"
 msgstr ""
 
-#: my-evolution/Locations.h:952
+#: my-evolution/Locations.h:954
 msgid "Houma"
 msgstr ""
 
-#: my-evolution/Locations.h:953
+#: my-evolution/Locations.h:955
 msgid "Houston-Bush"
 msgstr ""
 
-#: my-evolution/Locations.h:954
+#: my-evolution/Locations.h:956
 msgid "Houston-Clover"
 msgstr ""
 
-#: my-evolution/Locations.h:955
+#: my-evolution/Locations.h:957
 msgid "Houston-Ellington Field"
 msgstr ""
 
-#: my-evolution/Locations.h:956
+#: my-evolution/Locations.h:958
 msgid "Houston-Hobby"
 msgstr ""
 
-#: my-evolution/Locations.h:957
+#: my-evolution/Locations.h:959
 msgid "Houston-Hooks"
 msgstr ""
 
-#: my-evolution/Locations.h:958
+#: my-evolution/Locations.h:960
 msgid "Howard AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:959
+#: my-evolution/Locations.h:961
 msgid "Hsinchu"
 msgstr ""
 
-#: my-evolution/Locations.h:960
+#: my-evolution/Locations.h:962
 msgid "Huanuco"
 msgstr ""
 
-#: my-evolution/Locations.h:961
+#: my-evolution/Locations.h:963
 msgid "Huehuetenango"
 msgstr ""
 
-#: my-evolution/Locations.h:962
+#: my-evolution/Locations.h:964
 msgid "Hulien"
 msgstr ""
 
-#: my-evolution/Locations.h:963
+#: my-evolution/Locations.h:965
 msgid "Humberside"
 msgstr ""
 
-#: my-evolution/Locations.h:965
+#: my-evolution/Locations.h:967
 msgid "Huntington"
 msgstr ""
 
-#: my-evolution/Locations.h:966
+#: my-evolution/Locations.h:968
 msgid "Huntsville"
 msgstr ""
 
-#: my-evolution/Locations.h:967
+#: my-evolution/Locations.h:969
 msgid "Hurlburt"
 msgstr ""
 
-#: my-evolution/Locations.h:968
+#: my-evolution/Locations.h:970
 msgid "Huron"
 msgstr ""
 
-#: my-evolution/Locations.h:969
+#: my-evolution/Locations.h:971
 msgid "Hutchinson"
 msgstr ""
 
-#: my-evolution/Locations.h:970
+#: my-evolution/Locations.h:972
 msgid "Hyakuri Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:971
+#: my-evolution/Locations.h:973
 msgid "Hyannis"
 msgstr ""
 
-#: my-evolution/Locations.h:972
+#: my-evolution/Locations.h:974
 msgid "Hyderabad"
 msgstr ""
 
-#: my-evolution/Locations.h:973
+#: my-evolution/Locations.h:975
 msgid "Hyeres-Le Palyvestre"
 msgstr ""
 
-#: my-evolution/Locations.h:974
+#: my-evolution/Locations.h:976
 msgid "Iasi"
 msgstr ""
 
-#: my-evolution/Locations.h:975
+#: my-evolution/Locations.h:977
 msgid "Ibiza"
 msgstr ""
 
-#: my-evolution/Locations.h:977
+#: my-evolution/Locations.h:979
 msgid "Ichikawa"
 msgstr ""
 
-#: my-evolution/Locations.h:978
+#: my-evolution/Locations.h:980
 msgid "Idaho"
 msgstr ""
 
-#: my-evolution/Locations.h:979
+#: my-evolution/Locations.h:981
 msgid "Idaho Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:980
+#: my-evolution/Locations.h:982
 msgid "Iguazu"
 msgstr ""
 
-#: my-evolution/Locations.h:981
+#: my-evolution/Locations.h:983
 msgid "Iki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:982
+#: my-evolution/Locations.h:984
 msgid "Ilan"
 msgstr ""
 
-#: my-evolution/Locations.h:983
+#: my-evolution/Locations.h:985
 msgid "Iliamna"
 msgstr ""
 
-#: my-evolution/Locations.h:984
+#: my-evolution/Locations.h:986
 msgid "Illinois"
 msgstr ""
 
-#: my-evolution/Locations.h:985
+#: my-evolution/Locations.h:987
 msgid "Imperial"
 msgstr ""
 
-#: my-evolution/Locations.h:986
+#: my-evolution/Locations.h:988
 msgid "Imperial (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:987
+#: my-evolution/Locations.h:989
 msgid "Imperial Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:988
+#: my-evolution/Locations.h:990
 msgid "In Amenas"
 msgstr ""
 
-#: my-evolution/Locations.h:990
+#: my-evolution/Locations.h:992
 msgid "Indiana"
 msgstr ""
 
-#: my-evolution/Locations.h:991
+#: my-evolution/Locations.h:993
 msgid "Indianapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:992
+#: my-evolution/Locations.h:994
 msgid "Indian Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:993
+#: my-evolution/Locations.h:995
 msgid "Innsbruck"
 msgstr ""
 
-#: my-evolution/Locations.h:994
+#: my-evolution/Locations.h:996
 msgid "International Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:995
+#: my-evolution/Locations.h:997
 msgid "Intracoastal"
 msgstr ""
 
-#: my-evolution/Locations.h:996
+#: my-evolution/Locations.h:998
 msgid "Inverness"
 msgstr ""
 
-#: my-evolution/Locations.h:997
+#: my-evolution/Locations.h:999
 msgid "Inyokern"
 msgstr ""
 
-#: my-evolution/Locations.h:998
+#: my-evolution/Locations.h:1000
 msgid "Iowa"
 msgstr ""
 
-#: my-evolution/Locations.h:999
+#: my-evolution/Locations.h:1001
 msgid "Iowa City"
 msgstr ""
 
-#: my-evolution/Locations.h:1000
+#: my-evolution/Locations.h:1002
 msgid "Iqaluit"
 msgstr ""
 
-#: my-evolution/Locations.h:1001
+#: my-evolution/Locations.h:1003
 msgid "Iquique/Diego Arac"
 msgstr ""
 
-#: my-evolution/Locations.h:1002
+#: my-evolution/Locations.h:1004
 msgid "Iquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1003
+#: my-evolution/Locations.h:1005
 msgid "Iraklion"
 msgstr ""
 
-#: my-evolution/Locations.h:1004
+#: my-evolution/Locations.h:1006
 msgid "Iran, Islamic Republic of"
 msgstr ""
 
-#: my-evolution/Locations.h:1006
+#: my-evolution/Locations.h:1008
 msgid "Iron Mountain"
 msgstr ""
 
-#: my-evolution/Locations.h:1007
+#: my-evolution/Locations.h:1009
 msgid "Ironwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1008
+#: my-evolution/Locations.h:1010
 msgid "Iruma Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1009
+#: my-evolution/Locations.h:1011
 msgid "Islamabad"
 msgstr ""
 
-#: my-evolution/Locations.h:1010
+#: my-evolution/Locations.h:1012
 msgid "Isle of Man"
 msgstr ""
 
-#: my-evolution/Locations.h:1011
+#: my-evolution/Locations.h:1013
 msgid "Islip"
 msgstr ""
 
-#: my-evolution/Locations.h:1012
+#: my-evolution/Locations.h:1014
 msgid "Istanbul"
 msgstr ""
 
-#: my-evolution/Locations.h:1013
+#: my-evolution/Locations.h:1015
 msgid "Itaituba"
 msgstr ""
 
-#: my-evolution/Locations.h:1015
+#: my-evolution/Locations.h:1017
 msgid "Ithaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1016
+#: my-evolution/Locations.h:1018
+msgid "Ivano-Frankivsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1019
 msgid "Iwakuni MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1017
+#: my-evolution/Locations.h:1020
 msgid "Iwojima"
 msgstr ""
 
-#: my-evolution/Locations.h:1018
+#: my-evolution/Locations.h:1021
 msgid "Ixtapa"
 msgstr ""
 
-#: my-evolution/Locations.h:1019
+#: my-evolution/Locations.h:1022
 msgid "Izmir/Adnan Menderes"
 msgstr ""
 
-#: my-evolution/Locations.h:1020
+#: my-evolution/Locations.h:1023
 msgid "Izmir/Cigli"
 msgstr ""
 
-#: my-evolution/Locations.h:1021
+#: my-evolution/Locations.h:1024
 msgid "Izmit"
 msgstr ""
 
-#: my-evolution/Locations.h:1022
+#: my-evolution/Locations.h:1025
 msgid "Izumo Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1023
+#: my-evolution/Locations.h:1026
 msgid "Jackson"
 msgstr ""
 
-#: my-evolution/Locations.h:1024
+#: my-evolution/Locations.h:1027
 msgid "Jacksonville"
 msgstr ""
 
-#: my-evolution/Locations.h:1025
+#: my-evolution/Locations.h:1028
 msgid "Jacksonville-Craig Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1026
+#: my-evolution/Locations.h:1029
 msgid "Jacksonville NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1027
+#: my-evolution/Locations.h:1030
 msgid "Jaffrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1029
+#: my-evolution/Locations.h:1032
 msgid "Jamestown"
 msgstr ""
 
-#: my-evolution/Locations.h:1030
+#: my-evolution/Locations.h:1033
 msgid "Janesville"
 msgstr ""
 
-#: my-evolution/Locations.h:1031
+#: my-evolution/Locations.h:1034
 msgid "Jan Smuts"
 msgstr ""
 
-#: my-evolution/Locations.h:1033
+#: my-evolution/Locations.h:1036
 msgid "Jeddah King Abdul Aziz International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1034
+#: my-evolution/Locations.h:1037
 msgid "Jefferson City"
 msgstr ""
 
-#: my-evolution/Locations.h:1035
+#: my-evolution/Locations.h:1038
 msgid "Jerez"
 msgstr ""
 
-#: my-evolution/Locations.h:1036
+#: my-evolution/Locations.h:1039
 msgid "Jersey"
 msgstr ""
 
-#: my-evolution/Locations.h:1037
+#: my-evolution/Locations.h:1040
 msgid "Jinotega"
 msgstr ""
 
-#: my-evolution/Locations.h:1038
+#: my-evolution/Locations.h:1041
 msgid "Johan A. Pengel"
 msgstr ""
 
-#: my-evolution/Locations.h:1039
+#: my-evolution/Locations.h:1042
 msgid "Johnstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1040
+#: my-evolution/Locations.h:1043
 msgid "Jonesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1041
+#: my-evolution/Locations.h:1044
 msgid "Jonkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1042
+#: my-evolution/Locations.h:1045
 msgid "Joplin"
 msgstr ""
 
-#: my-evolution/Locations.h:1044
+#: my-evolution/Locations.h:1047
 msgid "Juanjui"
 msgstr ""
 
-#: my-evolution/Locations.h:1045
+#: my-evolution/Locations.h:1048
 msgid "Juan Santamaria"
 msgstr ""
 
-#: my-evolution/Locations.h:1046
+#: my-evolution/Locations.h:1049
 msgid "Juigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1047
+#: my-evolution/Locations.h:1050
 msgid "Jujuy"
 msgstr ""
 
-#: my-evolution/Locations.h:1048
+#: my-evolution/Locations.h:1051
 msgid "Juliaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1049
+#: my-evolution/Locations.h:1052
 msgid "Junction"
 msgstr ""
 
-#: my-evolution/Locations.h:1050
+#: my-evolution/Locations.h:1053
 msgid "Juneau"
 msgstr ""
 
-#: my-evolution/Locations.h:1051
+#: my-evolution/Locations.h:1054
 msgid "Kadena Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1052
+#: my-evolution/Locations.h:1055
 msgid "Kagoshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1053
+#: my-evolution/Locations.h:1056
 msgid "Kahului"
 msgstr ""
 
-#: my-evolution/Locations.h:1054
+#: my-evolution/Locations.h:1057
 msgid "Kailua-Kona"
 msgstr ""
 
-#: my-evolution/Locations.h:1055
+#: my-evolution/Locations.h:1058
 msgid "Kake"
 msgstr ""
 
-#: my-evolution/Locations.h:1056
+#: my-evolution/Locations.h:1059
 msgid "Kalamata"
 msgstr ""
 
-#: my-evolution/Locations.h:1057
+#: my-evolution/Locations.h:1060
 msgid "Kalamazoo"
 msgstr ""
 
-#: my-evolution/Locations.h:1058
+#: my-evolution/Locations.h:1061
 msgid "Kalispell"
 msgstr ""
 
-#: my-evolution/Locations.h:1059
+#: my-evolution/Locations.h:1062
 msgid "Kamigoto"
 msgstr ""
 
-#: my-evolution/Locations.h:1060
+#: my-evolution/Locations.h:1063
 msgid "Kaneohe"
 msgstr ""
 
-#: my-evolution/Locations.h:1061
+#: my-evolution/Locations.h:1064
 msgid "Kangshan"
 msgstr ""
 
-#: my-evolution/Locations.h:1062
+#: my-evolution/Locations.h:1065
 msgid "Kanoya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1063
+#: my-evolution/Locations.h:1066
 msgid "Kansai International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1064
+#: my-evolution/Locations.h:1067
 msgid "Kansas"
 msgstr ""
 
-#: my-evolution/Locations.h:1065
+#: my-evolution/Locations.h:1068
 msgid "Kansas City"
 msgstr ""
 
-#: my-evolution/Locations.h:1066
+#: my-evolution/Locations.h:1069
 msgid "Kansas City-Gladstone"
 msgstr ""
 
-#: my-evolution/Locations.h:1067
+#: my-evolution/Locations.h:1070
 msgid "Kaohsiung"
 msgstr ""
 
-#: my-evolution/Locations.h:1068
+#: my-evolution/Locations.h:1071
 msgid "Karachi"
 msgstr ""
 
-#: my-evolution/Locations.h:1069
+#: my-evolution/Locations.h:1072
 msgid "Karup"
 msgstr ""
 
-#: my-evolution/Locations.h:1070
+#: my-evolution/Locations.h:1073
 msgid "Kassel-Calden"
 msgstr ""
 
-#: my-evolution/Locations.h:1071
+#: my-evolution/Locations.h:1074
 msgid "Kasumigaura Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1072
+#: my-evolution/Locations.h:1075
 msgid "Kasuminome Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1073
+#: my-evolution/Locations.h:1076
 msgid "Katowice"
 msgstr ""
 
-#: my-evolution/Locations.h:1074
+#: my-evolution/Locations.h:1077
 msgid "Kavala"
 msgstr ""
 
-#: my-evolution/Locations.h:1075
+#: my-evolution/Locations.h:1078
 msgid "Kayseri"
 msgstr ""
 
-#: my-evolution/Locations.h:1076
+#: my-evolution/Locations.h:1079
 msgid "Kazan"
 msgstr ""
 
-#: my-evolution/Locations.h:1077
+#: my-evolution/Locations.h:1080
 msgid "Kearney"
 msgstr ""
 
-#: my-evolution/Locations.h:1078
+#: my-evolution/Locations.h:1081
 msgid "Keene"
 msgstr ""
 
-#: my-evolution/Locations.h:1079
+#: my-evolution/Locations.h:1082
 msgid "Kefallinia"
 msgstr ""
 
-#: my-evolution/Locations.h:1080
+#: my-evolution/Locations.h:1083
 msgid "Keflavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1081
+#: my-evolution/Locations.h:1084
 msgid "Kenai"
 msgstr ""
 
-#: my-evolution/Locations.h:1082
+#: my-evolution/Locations.h:1085
 msgid "Kenosha"
 msgstr ""
 
-#: my-evolution/Locations.h:1083
+#: my-evolution/Locations.h:1086
 msgid "Kentucky"
 msgstr ""
 
-#: my-evolution/Locations.h:1084
+#: my-evolution/Locations.h:1087
 msgid "Keokuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1085
+#: my-evolution/Locations.h:1088
 msgid "Kerkira"
 msgstr ""
 
-#: my-evolution/Locations.h:1086
+#: my-evolution/Locations.h:1089
 msgid "Kerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1087
+#: my-evolution/Locations.h:1090
 msgid "Ketchikan"
 msgstr ""
 
-#: my-evolution/Locations.h:1088
+#: my-evolution/Locations.h:1091
 msgid "Key West"
 msgstr ""
 
-#: my-evolution/Locations.h:1089
+#: my-evolution/Locations.h:1092
 msgid "Key West NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1090
+#: my-evolution/Locations.h:1093
 msgid "Khabarovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1091
+#: my-evolution/Locations.h:1094
 msgid "Khamis Mushait"
 msgstr ""
 
-#: my-evolution/Locations.h:1092
+#: my-evolution/Locations.h:1095
+msgid "Kharkiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1096
 msgid "Kikai Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1093
+#: my-evolution/Locations.h:1097
 msgid "Killeen"
 msgstr ""
 
-#: my-evolution/Locations.h:1094
+#: my-evolution/Locations.h:1098
 msgid "Killeen-Ft Hood"
 msgstr ""
 
-#: my-evolution/Locations.h:1095
+#: my-evolution/Locations.h:1099
 msgid "Killeen-Gray AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:1096
+#: my-evolution/Locations.h:1100
 msgid "King Khaled International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1097
+#: my-evolution/Locations.h:1101
 msgid "Kingman"
 msgstr ""
 
-#: my-evolution/Locations.h:1098
+#: my-evolution/Locations.h:1102
 msgid "King Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1099
+#: my-evolution/Locations.h:1103
 msgid "Kingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1100
+#: my-evolution/Locations.h:1104
 msgid "Kingsville"
 msgstr ""
 
-#: my-evolution/Locations.h:1101
+#: my-evolution/Locations.h:1105
 msgid "Kinloss"
 msgstr ""
 
-#: my-evolution/Locations.h:1102
+#: my-evolution/Locations.h:1106
 msgid "Kinston"
 msgstr ""
 
-#: my-evolution/Locations.h:1103
+#: my-evolution/Locations.h:1107
 msgid "Kirkenes"
 msgstr ""
 
-#: my-evolution/Locations.h:1104
+#: my-evolution/Locations.h:1108
 msgid "Kirksville"
 msgstr ""
 
-#: my-evolution/Locations.h:1105
+#: my-evolution/Locations.h:1109
 msgid "Kiruna"
 msgstr ""
 
-#: my-evolution/Locations.h:1106
+#: my-evolution/Locations.h:1110
 msgid "Kisarazu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1107
+#: my-evolution/Locations.h:1111
 msgid "Kishineu"
 msgstr ""
 
-#: my-evolution/Locations.h:1108
+#: my-evolution/Locations.h:1112
 msgid "Kitakyushu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1109
+#: my-evolution/Locations.h:1113
 msgid "Klagenfurt"
 msgstr ""
 
-#: my-evolution/Locations.h:1110
+#: my-evolution/Locations.h:1114
 msgid "Klamath Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1111
+#: my-evolution/Locations.h:1115
 msgid "Klawock"
 msgstr ""
 
-#: my-evolution/Locations.h:1112
+#: my-evolution/Locations.h:1116
 msgid "Kleine Brogel"
 msgstr ""
 
-#: my-evolution/Locations.h:1113
+#: my-evolution/Locations.h:1117
 msgid "Kliningrad"
 msgstr ""
 
-#: my-evolution/Locations.h:1114
+#: my-evolution/Locations.h:1118
 msgid "Knoxville"
 msgstr ""
 
-#: my-evolution/Locations.h:1115
+#: my-evolution/Locations.h:1119
 msgid "Knoxville-Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:1116
+#: my-evolution/Locations.h:1120
 msgid "Kobenhavn/Kastrup"
 msgstr ""
 
-#: my-evolution/Locations.h:1117
+#: my-evolution/Locations.h:1121
 msgid "Kobenhavn/Roskilde"
 msgstr ""
 
-#: my-evolution/Locations.h:1118
+#: my-evolution/Locations.h:1122
 msgid "Kochi Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1119
+#: my-evolution/Locations.h:1123
 msgid "Kodiak"
 msgstr ""
 
-#: my-evolution/Locations.h:1120
+#: my-evolution/Locations.h:1124
 msgid "Kogalniceanu"
 msgstr ""
 
-#: my-evolution/Locations.h:1121
+#: my-evolution/Locations.h:1125
 msgid "Kogalym"
 msgstr ""
 
-#: my-evolution/Locations.h:1122
+#: my-evolution/Locations.h:1126
 msgid "Koksijde"
 msgstr ""
 
-#: my-evolution/Locations.h:1123
+#: my-evolution/Locations.h:1127
 msgid "Kolding/Vandrup"
 msgstr ""
 
-#: my-evolution/Locations.h:1124
+#: my-evolution/Locations.h:1128
 msgid "Koln/Bonn"
 msgstr ""
 
-#: my-evolution/Locations.h:1125
+#: my-evolution/Locations.h:1129
 msgid "Komatsu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1126
+#: my-evolution/Locations.h:1130
 msgid "Komatsujima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1127
+#: my-evolution/Locations.h:1131
 msgid "Konya"
 msgstr ""
 
-#: my-evolution/Locations.h:1128
+#: my-evolution/Locations.h:1132
 msgid "Korea, Democratic People's Republic of"
 msgstr ""
 
-#: my-evolution/Locations.h:1129
+#: my-evolution/Locations.h:1133
 msgid "Korea, Republic of"
 msgstr ""
 
-#: my-evolution/Locations.h:1130
+#: my-evolution/Locations.h:1134
 msgid "Kos"
 msgstr ""
 
-#: my-evolution/Locations.h:1131
+#: my-evolution/Locations.h:1135
 msgid "Kotzebue"
 msgstr ""
 
-#: my-evolution/Locations.h:1132
+#: my-evolution/Locations.h:1136
 msgid "Kozani"
 msgstr ""
 
-#: my-evolution/Locations.h:1133
+#: my-evolution/Locations.h:1137
 msgid "Krakow"
 msgstr ""
 
-#: my-evolution/Locations.h:1134
+#: my-evolution/Locations.h:1138
 msgid "Krasnodar"
 msgstr ""
 
-#: my-evolution/Locations.h:1135
+#: my-evolution/Locations.h:1139
 msgid "Krasnoyarsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1136
+#: my-evolution/Locations.h:1140
 msgid "Kristiansand/Kjevik"
 msgstr ""
 
-#: my-evolution/Locations.h:1137
+#: my-evolution/Locations.h:1141
 msgid "Kristiansund/Kvernberget"
 msgstr ""
 
-#: my-evolution/Locations.h:1138
+#: my-evolution/Locations.h:1142
+msgid "Kryviy Rig/Lozovatka"
+msgstr ""
+
+#: my-evolution/Locations.h:1143
 msgid "Kumamoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1139
+#: my-evolution/Locations.h:1144
 msgid "Kunming"
 msgstr ""
 
-#: my-evolution/Locations.h:1140
+#: my-evolution/Locations.h:1145
 msgid "Kushiro Airport"
 msgstr ""
 
-#: 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 ""
 
-#: my-evolution/Locations.h:1143
+#: my-evolution/Locations.h:1150
 msgid "Laconia"
 msgstr ""
 
-#: my-evolution/Locations.h:1144
+#: my-evolution/Locations.h:1151
 msgid "La Coruna"
 msgstr ""
 
-#: my-evolution/Locations.h:1145
+#: my-evolution/Locations.h:1152
 msgid "La Crosse"
 msgstr ""
 
-#: my-evolution/Locations.h:1146
+#: my-evolution/Locations.h:1153
 msgid "La Esperanza"
 msgstr ""
 
-#: my-evolution/Locations.h:1147
+#: my-evolution/Locations.h:1154
 msgid "Lafayette"
 msgstr ""
 
-#: my-evolution/Locations.h:1148
+#: my-evolution/Locations.h:1155
 msgid "La Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1149
+#: my-evolution/Locations.h:1156
 msgid "Lahaina"
 msgstr ""
 
-#: my-evolution/Locations.h:1150
+#: my-evolution/Locations.h:1157
 msgid "Lahore"
 msgstr ""
 
-#: my-evolution/Locations.h:1151
+#: my-evolution/Locations.h:1158
 msgid "Lajes"
 msgstr ""
 
-#: my-evolution/Locations.h:1152
+#: my-evolution/Locations.h:1159
 msgid "La Junta"
 msgstr ""
 
-#: my-evolution/Locations.h:1153
+#: my-evolution/Locations.h:1160
 msgid "Lake Charles"
 msgstr ""
 
-#: my-evolution/Locations.h:1154
+#: my-evolution/Locations.h:1161
 msgid "Lake Hood"
 msgstr ""
 
-#: my-evolution/Locations.h:1155
+#: my-evolution/Locations.h:1162
 msgid "Lakehurst"
 msgstr ""
 
-#: my-evolution/Locations.h:1156
+#: my-evolution/Locations.h:1163
 msgid "Lakeland"
 msgstr ""
 
-#: my-evolution/Locations.h:1157
+#: my-evolution/Locations.h:1164
 msgid "Lake Tahoe"
 msgstr ""
 
-#: my-evolution/Locations.h:1158
+#: my-evolution/Locations.h:1165
 msgid "Lakeview"
 msgstr ""
 
-#: my-evolution/Locations.h:1159
+#: my-evolution/Locations.h:1166
 msgid "Lamar"
 msgstr ""
 
-#: my-evolution/Locations.h:1160
+#: my-evolution/Locations.h:1167
 msgid "La Mesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1161
+#: my-evolution/Locations.h:1168
 msgid "Lamezia"
 msgstr ""
 
-#: my-evolution/Locations.h:1162
+#: my-evolution/Locations.h:1169
 msgid "Lamoni"
 msgstr ""
 
-#: my-evolution/Locations.h:1163
+#: my-evolution/Locations.h:1170
 msgid "Lampedusa"
 msgstr ""
 
-#: my-evolution/Locations.h:1164
+#: my-evolution/Locations.h:1171
 msgid "Lanai"
 msgstr ""
 
-#: my-evolution/Locations.h:1165
+#: my-evolution/Locations.h:1172
 msgid "Lancaster"
 msgstr ""
 
-#: my-evolution/Locations.h:1166
+#: my-evolution/Locations.h:1173
 msgid "Lander"
 msgstr ""
 
-#: my-evolution/Locations.h:1167
+#: my-evolution/Locations.h:1174
 msgid "Langebaanweg"
 msgstr ""
 
-#: my-evolution/Locations.h:1168
+#: my-evolution/Locations.h:1175
 msgid "Langley AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1169
+#: my-evolution/Locations.h:1176
 msgid "Lannion"
 msgstr ""
 
-#: my-evolution/Locations.h:1170
+#: my-evolution/Locations.h:1177
 msgid "Lansing"
 msgstr ""
 
-#: my-evolution/Locations.h:1171
+#: my-evolution/Locations.h:1178
 msgid "Lanzhou"
 msgstr ""
 
-#: my-evolution/Locations.h:1172
+#: my-evolution/Locations.h:1179
 msgid "La Paz"
 msgstr ""
 
-#: my-evolution/Locations.h:1173
+#: my-evolution/Locations.h:1180
 msgid "La Paz/Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1174
+#: my-evolution/Locations.h:1181
 msgid "Laramie"
 msgstr ""
 
-#: my-evolution/Locations.h:1175
+#: my-evolution/Locations.h:1182
 msgid "Laredo"
 msgstr ""
 
-#: my-evolution/Locations.h:1176
+#: my-evolution/Locations.h:1183
 msgid "Larnaka"
 msgstr ""
 
-#: my-evolution/Locations.h:1177
+#: my-evolution/Locations.h:1184
 msgid "La Romana"
 msgstr ""
 
-#: my-evolution/Locations.h:1178
+#: my-evolution/Locations.h:1185
 msgid "Las Americas"
 msgstr ""
 
-#: my-evolution/Locations.h:1179
+#: my-evolution/Locations.h:1186
 msgid "Las Tunas"
 msgstr ""
 
-#: my-evolution/Locations.h:1180
+#: my-evolution/Locations.h:1187
 msgid "Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1181
+#: my-evolution/Locations.h:1188
 msgid "Latina"
 msgstr ""
 
-#: my-evolution/Locations.h:1182
+#: my-evolution/Locations.h:1189
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1184
+#: my-evolution/Locations.h:1191
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1185
+#: my-evolution/Locations.h:1192
 msgid "Laurel"
 msgstr ""
 
-#: my-evolution/Locations.h:1186
+#: my-evolution/Locations.h:1193
 msgid "La Verne"
 msgstr ""
 
-#: my-evolution/Locations.h:1187
+#: my-evolution/Locations.h:1194
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1188
+#: my-evolution/Locations.h:1195
 msgid "Lawton"
 msgstr ""
 
-#: my-evolution/Locations.h:1189
+#: my-evolution/Locations.h:1196
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1190
+#: my-evolution/Locations.h:1197
 msgid "Learmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1199
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1200
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1201
 msgid "Leesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1202
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1203
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1204
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1205
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1206
 msgid "Le Mans"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1207
 msgid "Le Marine"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1208
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1209
 msgid "Lemoore"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1210
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1211
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1212
 msgid "Leuchars"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1213
 msgid "Lewisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1214
 msgid "Lewiston"
 msgstr ""
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1215
 msgid "Lewistown"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1216
 msgid "Lexington"
 msgstr ""
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1217
 msgid "Liberal"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1219
 msgid "Libya"
 msgstr ""
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1220
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1221
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1222
 msgid "Liege"
 msgstr ""
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1223
 msgid "Lihue"
 msgstr ""
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1224
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1225
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1226
 msgid "Limnos"
 msgstr ""
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1227
 msgid "Limoges"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1228
 msgid "Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1229
 msgid "Lincoln"
 msgstr ""
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1230
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1231
 msgid "Lisboa"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1232
 msgid "Lista"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1233
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1235
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1236
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1237
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1238
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1239
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1240
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1241
 msgid "Logan"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1242
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1243
 msgid "Lompoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1244
 msgid "London"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1245
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1246
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1247
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1248
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1249
 msgid "Londrina"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1250
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1251
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1252
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1253
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1254
 msgid "Los Alamos"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1255
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1256
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1257
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1258
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1259
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1260
 msgid "Lousiana"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1261
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1262
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1263
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1264
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1265
 msgid "Lugano"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1266
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1267
 msgid "Luton"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1269
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1270
 msgid "Luxor"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1271
+msgid "Lviv"
+msgstr ""
+
+#: my-evolution/Locations.h:1272
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1273
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1275
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1276
 msgid "Maastricht"
 msgstr ""
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1277
 msgid "Macae"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1278
 msgid "Macapa"
 msgstr ""
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1279
 msgid "Maceio"
 msgstr ""
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1280
 msgid "Macon"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1281
 msgid "Madinah"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1282
 msgid "Madison"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1283
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1285
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1286
 msgid "Magadan"
 msgstr ""
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1287
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1288
 msgid "Maine"
 msgstr ""
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1289
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1290
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1291
 msgid "Makung"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1292
 msgid "Malad City"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1293
 msgid "Malaga"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1294
 msgid "Malatya"
 msgstr ""
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1295
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1296
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1298
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1299
 msgid "Managua"
 msgstr ""
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1300
 msgid "Manassas"
 msgstr ""
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1301
 msgid "Manaus"
 msgstr ""
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1302
 msgid "Manchester"
 msgstr ""
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1303
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1304
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1305
 msgid "Manisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1306
 msgid "Manistee"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1307
 msgid "Manitoba"
 msgstr ""
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1308
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1309
 msgid "Mankato"
 msgstr ""
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1310
 msgid "Mansfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1311
 msgid "Manta"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1312
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1313
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1314
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1315
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1316
 msgid "Marathon"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1317
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1318
 msgid "Margarita"
 msgstr ""
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1319
 msgid "Marianna"
 msgstr ""
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1320
 msgid "Marib"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1321
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1322
 msgid "Marietta"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1323
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1324
 msgid "Marion"
 msgstr ""
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1325
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1326
 msgid "Marquette"
 msgstr ""
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1327
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1328
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1329
 msgid "Marshall"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1330
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1331
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1332
 msgid "Marte"
 msgstr ""
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1333
 msgid "Marthas Vineyard"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1334
 msgid "Martinsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1335
 msgid "Martinsville"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1336
 msgid "Maryland"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1337
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1338
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1339
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1340
 msgid "Masirah"
 msgstr ""
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1341
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1342
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1343
 msgid "Massena"
 msgstr ""
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1344
 msgid "Matamoros"
 msgstr ""
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1345
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1346
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1347
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1348
 msgid "Mattoon"
 msgstr ""
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1349
 msgid "Mayaguez"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1350
 msgid "Mayport"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1351
 msgid "Mazatlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1352
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1353
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1354
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1355
 msgid "McCall"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1356
 msgid "McCarthy"
 msgstr ""
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1357
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1358
 msgid "McComb"
 msgstr ""
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1359
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1360
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1361
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1362
 msgid "Meacham"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1363
 msgid "Medford"
 msgstr ""
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1364
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1365
 msgid "Mehamn"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1366
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1367
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1368
 msgid "Melfa"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1369
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1370
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1371
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1372
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1373
 msgid "Mendoza"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1374
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1375
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1376
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1377
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1378
 msgid "Merida"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1379
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1380
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1381
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1382
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1383
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1384
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1385
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1386
 msgid "Mexicali"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1388
 msgid "Miami"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1389
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1390
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1391
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1392
 msgid "Middle East"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1393
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1394
 msgid "Middletown"
 msgstr ""
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1395
 msgid "Midland"
 msgstr ""
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1396
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1397
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1398
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1399
 msgid "Miles City"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1400
 msgid "Milford"
 msgstr ""
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1401
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1402
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1403
 msgid "Milton"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1405
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1406
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1407
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1408
 msgid "Minchumina"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1409
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1410
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1413
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1414
 msgid "Minnesota"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1415
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1416
 msgid "Minot"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1417
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1418
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1419
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1420
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1421
 msgid "Missouri"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1422
 msgid "Mitchell"
 msgstr ""
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1423
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1424
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1425
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1426
 msgid "Moa"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1427
 msgid "Mobile Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1428
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1429
 msgid "Mobridge"
 msgstr ""
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1430
 msgid "Modesto"
 msgstr ""
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1431
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1432
 msgid "Mojave"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1433
 msgid "Molde"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1434
 msgid "Moldova"
 msgstr ""
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1435
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1436
 msgid "Molokai"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1437
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1438
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1439
 msgid "Monclova"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1440
 msgid "Moncton"
 msgstr ""
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1441
 msgid "Monida"
 msgstr ""
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1442
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1443
 msgid "Monroe"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1444
 msgid "Montague"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1445
 msgid "Montana"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1446
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1447
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1448
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1449
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1450
 msgid "Monte Cimone"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1451
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1452
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1453
 msgid "Monterey"
 msgstr ""
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1454
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1455
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1456
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1457
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1458
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1459
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1460
 msgid "Monticello"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1461
 msgid "Montpelier"
 msgstr ""
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1462
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1463
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1464
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1465
 msgid "Montrose"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1466
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1467
 msgid "Morelia"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1468
 msgid "Morgantown"
 msgstr ""
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1469
 msgid "Moriarty"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1471
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1472
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1473
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1474
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1475
 msgid "Mosinee"
 msgstr ""
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1476
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1477
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1478
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1479
 msgid "Mountain View"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1480
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1481
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1482
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1483
 msgid "Mount Vernon"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1484
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1485
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1486
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1487
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1488
 msgid "Mullan"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1489
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1490
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1491
 msgid "Muncie"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1492
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1493
 msgid "Murcia"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1494
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1495
 msgid "Mus"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1496
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1497
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1498
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1499
 msgid "Mykonos"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1500
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1501
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1502
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1503
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1504
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1505
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1506
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1507
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1508
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1509
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1510
 msgid "Namsos"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1512
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1513
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1514
 msgid "Nanning"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1515
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1516
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1517
 msgid "Napa"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1518
 msgid "Naples"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1519
 msgid "Napoli"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1520
 msgid "Narvik"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1521
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1522
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1523
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1524
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1525
 msgid "Natal"
 msgstr ""
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1526
 msgid "Natchez"
 msgstr ""
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1527
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1528
 msgid "Nebraska"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1529
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1530
 msgid "Nenana"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1532
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1533
 msgid "Nevada"
 msgstr ""
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1534
 msgid "Newark"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1535
 msgid "New Bedford"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1536
 msgid "New Bern"
 msgstr ""
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1537
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1538
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1539
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1540
 msgid "Newcastle"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1541
 msgid "New Delhi/Palam"
 msgstr ""
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1542
 msgid "Newfoundland"
 msgstr ""
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1543
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1544
 msgid "New Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1545
 msgid "New Iberia"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1546
 msgid "New Jersey"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1547
 msgid "New Mexico"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1548
 msgid "New Orleans"
 msgstr ""
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1549
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1550
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1551
 msgid "Newport"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1552
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1553
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1554
 msgid "New River"
 msgstr ""
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1555
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1556
 msgid "Newton"
 msgstr ""
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1557
 msgid "New York"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1558
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1559
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1561
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1563
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1564
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1565
 msgid "Nimes-Garons"
 msgstr ""
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1566
 msgid "Nipawin"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1567
 msgid "Nis"
 msgstr ""
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1568
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1569
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1570
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1571
 msgid "Nogales"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1572
 msgid "Nome"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1573
 msgid "Norfolk"
 msgstr ""
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1575
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1576
 msgid "Norrkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1577
 msgid "North Adams"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1578
 msgid "North Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1579
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1580
 msgid "North Conway"
 msgstr ""
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1581
 msgid "North Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1582
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1583
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1584
 msgid "North Platte"
 msgstr ""
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1585
 msgid "Northway"
 msgstr ""
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1586
 msgid "Northwest Territories"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1588
 msgid "Norwich"
 msgstr ""
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1589
 msgid "Norwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1590
 msgid "Notodden"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1591
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1592
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1593
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1594
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1595
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1596
 msgid "Nuevo Laredo"
 msgstr ""
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1597
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1598
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1599
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1600
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1601
 msgid "Oakland"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1602
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1603
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1604
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1605
 msgid "Ocala"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1606
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1607
 msgid "Odense"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+msgstr ""
+
+#: my-evolution/Locations.h:1609
 msgid "Oelwen"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1610
 msgid "Ogden"
 msgstr ""
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1611
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1612
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1613
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1614
 msgid "Ohrid"
 msgstr ""
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1615
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1616
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1617
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1618
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1619
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1623
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1624
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1625
 msgid "Olathe"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1626
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1627
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1628
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1629
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1630
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1631
 msgid "Omak"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1633
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1634
 msgid "Omsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1635
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1636
 msgid "Ontario"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1637
 msgid "Oostende"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1638
 msgid "Oran"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1639
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1640
 msgid "Orange"
 msgstr ""
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1641
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1642
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1643
 msgid "Oregon"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1644
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1645
 msgid "Orland"
 msgstr ""
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1646
 msgid "Orlando"
 msgstr ""
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1647
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1648
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1649
 msgid "Oruro"
 msgstr ""
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1650
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1651
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1652
 msgid "Oscoda"
 msgstr ""
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1653
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1654
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1655
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1656
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1657
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1658
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1659
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1660
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1661
 msgid "Owyhee"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1662
 msgid "Oxford"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1663
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1664
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1665
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1666
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1667
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1668
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1669
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1670
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1671
 msgid "Paganella"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1674
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1675
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1676
 msgid "Palermo"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1677
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1678
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1679
 msgid "Palmer"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1680
 msgid "Palm Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1681
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1682
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1684
 msgid "Panama City"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1685
 msgid "Pantelleria"
 msgstr ""
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1686
 msgid "Papa"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1687
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1689
 msgid "Paris"
 msgstr ""
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1690
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1691
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1692
 msgid "Paris/Orly"
 msgstr ""
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1693
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1694
 msgid "Pasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1695
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1696
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1697
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1698
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1699
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1700
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1701
 msgid "Patna"
 msgstr ""
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1702
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1703
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1704
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1705
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1706
 msgid "Paysandu"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1707
 msgid "Payson"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1708
 msgid "Pellston"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1709
 msgid "Pelotas"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1710
 msgid "Pendleton"
 msgstr ""
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1711
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1712
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1713
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1714
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1715
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1716
 msgid "Peoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1717
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1718
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1719
 msgid "Perm"
 msgstr ""
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1720
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1721
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1722
 msgid "Perth"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1724
 msgid "Perugia"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1725
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1726
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1727
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1728
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1729
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1730
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1731
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1732
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1733
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1736
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1737
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1738
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1739
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1740
 msgid "Pierre"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1741
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1742
 msgid "Pikeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1743
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1744
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1745
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1746
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1747
 msgid "Pisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1748
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1750
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1751
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1752
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1753
 msgid "Plymouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1754
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1755
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1756
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1757
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1758
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1759
 msgid "Point Hope"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1760
 msgid "Point Lay"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1761
 msgid "Point Mugu"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1762
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1763
 msgid "Poitiers"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1765
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1766
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1767
 msgid "Ponce"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1768
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1769
 msgid "Pontiac"
 msgstr ""
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1770
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1771
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1772
 msgid "Poprad"
 msgstr ""
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1773
 msgid "Port Alexander"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1774
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1775
 msgid "Port Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1776
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1777
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1778
 msgid "Porterville"
 msgstr ""
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1779
 msgid "Port Hardy"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1780
 msgid "Port Hedland"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1781
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1782
 msgid "Portland"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1783
 msgid "Porto"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1785
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1786
 msgid "Portoroz"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1787
 msgid "Porto Santo"
 msgstr ""
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1788
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1789
 msgid "Port Said"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1790
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1792
 msgid "Posadas"
 msgstr ""
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1793
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1794
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1795
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1796
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1797
 msgid "Poznan"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1798
 msgid "Praha"
 msgstr ""
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1799
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1800
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1801
 msgid "Presidente Prudente"
 msgstr ""
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1802
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1803
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1804
 msgid "Pretoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1805
 msgid "Preveza"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1806
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1807
 msgid "Pristina"
 msgstr ""
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1808
 msgid "Providence"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1809
 msgid "Provincetown"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1810
 msgid "Provo"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1811
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1812
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1813
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1814
 msgid "Puebla"
 msgstr ""
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1815
 msgid "Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1816
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1817
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1818
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1819
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1820
 msgid "Puerto Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1821
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1822
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1823
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1825
 msgid "Puerto Suarez"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1826
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1827
 msgid "Pula"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1828
 msgid "Pullman"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1829
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1830
 msgid "Punta Cana"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1831
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1832
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1833
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1834
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1835
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1837
 msgid "Quantico"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1838
 msgid "Quebec"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1839
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1840
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1841
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1842
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1843
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1844
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1845
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1846
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1847
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1848
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1849
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1850
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1851
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1852
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1853
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1854
 msgid "Reading"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1855
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1856
 msgid "Recife"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1857
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1858
 msgid "Redding"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1859
 msgid "Redig"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1860
 msgid "Redmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1861
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1862
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1863
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1864
 msgid "Regina"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1865
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1866
 msgid "Rennes"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1867
 msgid "Reno"
 msgstr ""
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1868
 msgid "Renton"
 msgstr ""
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1869
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1870
 msgid "Reus"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1871
 msgid "Reyes"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1872
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1873
 msgid "Reynosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1874
 msgid "Rhinelander"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1875
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1876
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1877
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1878
 msgid "Rickenbacker"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1879
 msgid "Rieti"
 msgstr ""
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1880
 msgid "Rifle"
 msgstr ""
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1881
 msgid "Riga"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1882
 msgid "Rijeka"
 msgstr ""
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1883
 msgid "Rimini"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1884
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1885
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1886
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1887
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1888
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1889
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1890
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1891
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1892
 msgid "Rivera"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1893
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1894
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1895
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Rivne"
+msgstr "Pine"
+
+#: my-evolution/Locations.h:1897
 msgid "Rivolto"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1898
 msgid "Riyadh"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1899
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1900
 msgid "Roatan"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1901
 msgid "Robore"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1902
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1903
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1904
 msgid "Rockland"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1905
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1906
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1907
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1908
 msgid "Rodos"
 msgstr ""
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1909
 msgid "Rogers"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1910
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1911
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1913
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1914
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1915
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1916
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1917
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1918
 msgid "Roros"
 msgstr ""
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1919
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1920
 msgid "Rosario"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1921
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1922
 msgid "Roseglen"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1923
 msgid "Rost"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1924
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1925
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1926
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1927
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1928
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1929
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1930
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1931
 msgid "Russia"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1932
 msgid "Rutland"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1933
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1934
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1935
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1936
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1937
 msgid "Sacramento"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1938
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1939
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1940
 msgid "Saginaw"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1941
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1942
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1943
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1944
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1945
 msgid "Saint Mary's"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1946
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1947
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1948
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1949
 msgid "Saiq"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1950
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1951
 msgid "Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1952
 msgid "Salida"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1953
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1954
 msgid "Salina"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1955
 msgid "Salinas"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1956
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1957
 msgid "Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1958
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1959
 msgid "Salta"
 msgstr ""
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1960
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1961
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1962
 msgid "Salto"
 msgstr ""
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1963
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1964
 msgid "Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1965
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1966
 msgid "Samara"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1967
 msgid "Samos"
 msgstr ""
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1968
 msgid "Samsun"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1969
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1970
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1971
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1972
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1973
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1974
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1975
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1976
 msgid "San Carlos"
 msgstr ""
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1977
 msgid "Sandane"
 msgstr ""
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1978
 msgid "Sandberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1979
 msgid "Sanderson"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1980
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1984
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1985
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1986
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1987
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1988
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1989
 msgid "Sanford"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1990
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1991
 msgid "Sangju"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1992
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1993
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1994
 msgid "San Jose"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1995
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1996
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1997
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1998
 msgid "San Juan"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1999
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:2000
 msgid "Sanliurfa"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:2001
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:2002
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:2003
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:2004
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:2005
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:2006
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:2007
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:2008
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:2009
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:2010
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2011
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2012
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2013
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2014
 msgid "Santander"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2015
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2016
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2017
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2018
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2019
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2020
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2021
 msgid "Santorini"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2022
 msgid "Santos"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2023
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2024
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2025
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2026
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2027
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2028
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2029
 msgid "Sarasota"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2030
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2031
 msgid "Sarzana"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2032
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2033
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2034
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2036
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2037
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2038
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2039
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2040
 msgid "Sayun"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2041
 msgid "Scatsta"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2042
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2043
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2044
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2045
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2046
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2047
 msgid "Scranton"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2048
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2049
 msgid "Seattle-Boeing"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2050
 msgid "Sedalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2051
 msgid "Seeb"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2052
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2053
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2054
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2055
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2056
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2057
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2058
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2059
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2060
 msgid "Seward"
 msgstr ""
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2061
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2062
 msgid "Shanghai"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2063
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2064
 msgid "Sharjah"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2065
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2066
 msgid "Sharurah"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2067
 msgid "Shawbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2068
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2069
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2070
 msgid "Sheldon"
 msgstr ""
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2071
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2072
 msgid "Shelton"
 msgstr ""
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2073
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2074
 msgid "Sheridan"
 msgstr ""
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2075
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2076
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2077
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2078
 msgid "Shiraz"
 msgstr ""
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2079
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2080
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2081
 msgid "Shoreham"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2082
 msgid "Show Low"
 msgstr ""
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2083
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2084
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2085
 msgid "Sidney"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2086
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2087
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2088
 msgid "Silver City"
 msgstr ""
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2089
 msgid "Sindal"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2091
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2092
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2093
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2094
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2095
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2096
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2097
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2098
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2099
 msgid "Skive"
 msgstr ""
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2100
 msgid "Skopje"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2101
 msgid "Skwentna"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2102
 msgid "Slana"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2105
 msgid "Smithers"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2106
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2107
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2108
 msgid "Sochi"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2109
 msgid "Socorro"
 msgstr ""
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2110
 msgid "Socotra"
 msgstr ""
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2111
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2112
 msgid "Sofia"
 msgstr ""
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2113
 msgid "Sogndal"
 msgstr ""
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2114
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2115
 msgid "Somerset"
 msgstr ""
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2116
 msgid "Sonderborg"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2117
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2118
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2120
 msgid "Southampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2121
 msgid "South Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2122
 msgid "South Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2123
 msgid "South Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2124
 msgid "Southend"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2125
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2126
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2128
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2129
 msgid "Spencer"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2130
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2131
 msgid "Split"
 msgstr ""
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2132
 msgid "Spokane"
 msgstr ""
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2133
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2134
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2135
 msgid "Springfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2136
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2137
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2138
 msgid "Stauning"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2139
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2140
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2141
 msgid "Staverton"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2142
 msgid "Stavropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2143
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2144
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2145
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2146
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2147
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2148
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2149
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2150
 msgid "St Joseph"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2151
 msgid "St Louis"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2152
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2153
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2154
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2155
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2156
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2157
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2158
 msgid "Storm Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2159
 msgid "Stornoway"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2160
 msgid "St Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2161
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2162
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2163
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2164
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2165
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2166
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2167
 msgid "Sturgeon Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2168
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2169
 msgid "Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2170
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2171
 msgid "Sumter"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2172
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2173
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2174
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2175
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2177
 msgid "Sutton"
 msgstr ""
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2178
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2179
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2180
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2182
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2184
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2185
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2188
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2189
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2190
 msgid "Tabatinga"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2191
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2192
 msgid "Tabuk"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2193
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2194
 msgid "Tacna"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2195
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2196
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2197
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2198
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2199
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2200
 msgid "Taejon"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2201
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2202
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2203
 msgid "Taif"
 msgstr ""
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2204
 msgid "Tainan"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2206
 msgid "Taiyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2207
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2208
 msgid "Tajima"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2209
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2210
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2211
 msgid "Talinn"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2212
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2213
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2214
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2215
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2216
 msgid "Tampa"
 msgstr ""
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2217
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2218
 msgid "Tampere"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2219
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2220
 msgid "Tanana"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2221
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2222
 msgid "Taos"
 msgstr ""
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2223
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2224
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2225
 msgid "Taranto"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2226
 msgid "Tarbes"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2227
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2228
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2229
 msgid "Tatalina"
 msgstr ""
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2230
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2231
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2232
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2233
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2234
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2235
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2236
 msgid "Tela"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2237
 msgid "Temple"
 msgstr ""
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2238
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2239
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2240
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2241
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2242
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2243
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2244
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2245
 msgid "Texas"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2246
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2247
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2248
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2249
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2250
 msgid "Thisted"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2251
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2252
 msgid "Thumrait"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2253
 msgid "Tianjin"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2254
 msgid "Tijuana"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2255
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2256
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2257
 msgid "Tirana"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2258
 msgid "Tiree"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2259
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2260
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2261
 msgid "Titusville"
 msgstr ""
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2262
 msgid "Tivat"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2263
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2264
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2265
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2266
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2267
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2268
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2269
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2270
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2271
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2272
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2273
 msgid "Toledo"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2274
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2275
 msgid "Tonopah"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2276
 msgid "Topeka"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2277
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2278
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2279
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2280
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2281
 msgid "Torp"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2282
 msgid "Torrance"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2283
 msgid "Torreon"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2284
 msgid "Tottori Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2285
 msgid "Toulouse"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2286
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2287
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2288
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2289
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2290
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2291
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2292
 msgid "Trapani"
 msgstr ""
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2293
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2294
 msgid "Trelew"
 msgstr ""
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2295
 msgid "Trenton"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2296
 msgid "Trevico"
 msgstr ""
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2297
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2298
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2299
 msgid "Trieste"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2300
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2301
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2302
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2303
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2304
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2305
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2306
 msgid "Truckee"
 msgstr ""
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2307
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2308
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2309
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2310
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2311
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2312
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2313
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2314
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2315
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2316
 msgid "Tulcea"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2317
 msgid "Tulsa"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2318
 msgid "Tupelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2319
 msgid "Turaif"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2320
 msgid "Turin"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2322
 msgid "Turku"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2323
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2324
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2325
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2326
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2327
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2328
 msgid "Tyler"
 msgstr ""
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2329
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2330
 msgid "Tyumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2331
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2332
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2333
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2335
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2336
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2337
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2338
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2339
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2340
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2341
 msgid "United Arab Emirates "
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2344
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2345
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2346
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2347
 msgid "Uruguaiana"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2349
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2350
 msgid "Utah"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2351
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2352
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2353
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2354
+#, fuzzy
+msgid "Uzhgorod"
+msgstr "Châu Âu/Uzhgorod"
+
+#: my-evolution/Locations.h:2355
 msgid "Vadso"
 msgstr ""
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2356
 msgid "Vaerlose"
 msgstr ""
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2357
 msgid "Vagar"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2358
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2359
 msgid "Valdosta"
 msgstr ""
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2360
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2361
 msgid "Valencia"
 msgstr ""
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2362
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2363
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2364
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2365
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2366
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2367
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2368
 msgid "Van"
 msgstr ""
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2369
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2370
 msgid "Vandel"
 msgstr ""
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2371
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2372
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2373
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2374
 msgid "Varadero"
 msgstr ""
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2375
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2376
 msgid "Varna"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2377
 msgid "Vasteras"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2378
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2379
 msgid "Venezia"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2381
 msgid "Venice"
 msgstr ""
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2382
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2383
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2384
 msgid "Vermont"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2385
 msgid "Vernal"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2386
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2387
 msgid "Vicenza"
 msgstr ""
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2388
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2389
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2390
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2391
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2393
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2394
 msgid "Vilhena"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2395
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2396
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2397
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2398
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2399
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2400
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2401
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2402
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2403
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2404
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2405
 msgid "Visalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2406
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2407
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2408
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2409
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2410
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2411
 msgid "Vlieland"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2412
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2413
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2414
 msgid "Volkel"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2415
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2416
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2417
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2418
 msgid "Waco"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2419
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2420
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2421
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2422
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2423
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2424
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2425
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2426
 msgid "Warner Robins"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2427
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2428
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2429
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2430
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2431
 msgid "Waterbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2432
 msgid "Waterloo"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2433
 msgid "Watertown"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2434
 msgid "Waterville"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2435
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2436
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2437
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2438
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2439
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2440
 msgid "Wejh"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2441
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2442
 msgid "Wenatchee"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2443
 msgid "Wendover"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2444
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2445
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2446
 msgid "Westerland"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2447
 msgid "Westfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2448
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2449
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2450
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2451
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2452
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2453
 msgid "Wheeling"
 msgstr ""
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2454
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2455
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2456
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2457
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2458
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2459
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2460
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2461
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2462
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2463
 msgid "Wick"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2464
 msgid "Wien"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2465
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2466
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2467
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2468
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2469
 msgid "Williston"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2470
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2471
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2472
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2473
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2474
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2475
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2476
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2477
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2478
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2479
 msgid "Winslow"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2480
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2481
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2482
 msgid "Winter Park"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2483
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2484
 msgid "Wisconsin"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2485
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2486
 msgid "Wise"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2487
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2488
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2489
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2490
 msgid "Wooster"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2491
 msgid "Worcester"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2492
 msgid "Worland"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2493
 msgid "Worthington"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2494
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2495
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2496
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2497
 msgid "Wyoming"
 msgstr ""
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2498
 msgid "Xiamen"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2499
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2500
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2501
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2502
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2503
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2504
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2505
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2506
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2507
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2508
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2509
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2510
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2511
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2513
 msgid "Yenbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2514
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2515
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2516
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2517
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2518
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2519
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2520
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2521
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2522
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2523
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2525
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2526
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2527
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2528
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2529
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2530
 msgid "Zadar"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2531
 msgid "Zagreb"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2532
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2533
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2534
 msgid "Zanesville"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2535
 msgid "Zaragoza"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2536
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2537
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2538
 msgid "Zurich"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
+#: my-evolution/component-factory.c:51
+msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: shell/e-activity-handler.c:200
-msgid "Show Details"
+#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
+msgid "Appointments"
 msgstr ""
 
-#: shell/e-activity-handler.c:202
-msgid "Cancel Operation"
+#: my-evolution/e-summary-calendar.c:366
+msgid "No appointments"
 msgstr ""
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Hộp thư nhận"
+#: my-evolution/e-summary-calendar.c:400
+msgid "%k:%M %d %B"
+msgstr ""
 
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Hộp thư gửi"
+#: my-evolution/e-summary-calendar.c:402
+msgid "%l:%M %d %B"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:420
+msgid "No description"
+msgstr ""
+
+#: my-evolution/e-summary-mail.c:151
+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 ""
 
-#: shell/e-local-storage.c:636
+#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
+#: my-evolution/e-summary-mail.c:761
 msgid "Local Folders"
 msgstr "Hộp thư cục bộ"
 
-#: shell/e-setup.c:124
+#. 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:92
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:471
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:492
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:720
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:728
+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
+msgid "Error downloading RDF"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:444
+msgid "News Feed"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
+msgstr ""
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "_Thêm"
+
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr "Loại bỏ"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Hiện tất cả"
+
+#: my-evolution/e-summary-tasks.c:251
+msgid "No tasks"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:291
+msgid "(No Description)"
+msgstr ""
+
+#: 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:501
+msgid "Weather"
+msgstr ""
+
+#: my-evolution/e-summary.c:193
+msgid "%A, %B %e %Y"
+msgstr ""
+
+#: my-evolution/e-summary.c:488
+msgid "Please wait..."
+msgstr ""
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr ""
+
+#: my-evolution/e-summary.c:626
+msgid "Printing of Summary failed"
+msgstr ""
+
+#: my-evolution/main.c:65
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr ""
+
+#: my-evolution/metar.c:44
+msgid "Clear sky"
+msgstr ""
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "North"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "Northeast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "East"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "South"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. DRIZZLE
+#: my-evolution/metar.c:127
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:128
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:129
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:130
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:131
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:132
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:133
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:134
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:136
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:137
+msgid "Showers"
+msgstr ""
+
+#: my-evolution/metar.c:138
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:139
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:142
+msgid "Rain"
+msgstr ""
+
+#: my-evolution/metar.c:143
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:144
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:145
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:146
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:147
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:148
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:149
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:151
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:152
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:153
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:154
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:157
+msgid "Snow"
+msgstr ""
+
+#: my-evolution/metar.c:158
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:159
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:160
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:161
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:162
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:163
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:164
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:166
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:167
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:168
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:169
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:172
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:173
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:174
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:175
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:176
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:177
+msgid "Shallow snow grains"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:220
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:221
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:222
+msgid "Shallow hail"
+msgstr ""
+
+#: my-evolution/metar.c:223
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:224
+msgid "Partial hail"
+msgstr ""
+
+#: my-evolution/metar.c:225
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:226
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:227
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:228
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:229
+msgid "Freezing hail"
+msgstr ""
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:232
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:233
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:235
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:236
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:237
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:238
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:239
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:240
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:241
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:242
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:243
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:244
+msgid "Freezing small hail"
+msgstr ""
+
+#. 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 ""
+
+#: my-evolution/metar.c:263
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:264
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:265
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:266
+msgid "Thick mist"
+msgstr ""
+
+#: 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 ""
+
+#. FOG
+#: my-evolution/metar.c:277
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:278
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:279
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:280
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:281
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:282
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:283
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:284
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:286
+msgid "Fog with wind"
+msgstr ""
+
+#: my-evolution/metar.c:288
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:289
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:292
+msgid "Smoke"
+msgstr ""
+
+#: my-evolution/metar.c:293
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:294
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:295
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:296
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:297
+msgid "Shallow smoke"
+msgstr ""
+
+#: my-evolution/metar.c:298
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:299
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
+msgstr ""
+
+#: my-evolution/metar.c:301
+msgid "Smoke with wind"
+msgstr ""
+
+#: my-evolution/metar.c:303
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:307
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:308
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:310
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:311
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/metar.c:323
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:324
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:325
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:326
+msgid "Heavy sand"
+msgstr ""
+
+#: 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 ""
+
+#: my-evolution/metar.c:368
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:369
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:370
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:371
+msgid "Heavy dust"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/metar.c:398
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:399
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:400
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:401
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: my-evolution/metar.c:443
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:445
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:446
+msgid "Raging tornado"
+msgstr ""
+
+#: 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 ""
+
+#: 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
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:5
+msgid "Ma_x number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:6
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "One mont_h"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "One w_eek"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:9
+msgid "R_efresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "Refresh _time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "S_how full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Show _all tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "Show _today's tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "Show temperatures in:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+msgid "Tasks "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "Weather settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:17
+msgid "_Fahrenheit"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "_Five days"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "_Mail"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
+msgid "_News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "_One day"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "_Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:23
+msgid "_Weather"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "Hộp thư đặc biệt"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+msgid "The Evolution shell."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
+msgid "Show Details"
+msgstr ""
+
+#: shell/e-activity-handler.c:164
+msgid "Cancel Operation"
+msgstr ""
+
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr ""
 
-#: 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 ""
 
-#: 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:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -22741,14 +23778,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -22756,7 +23793,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -22764,7 +23801,7 @@ msgid ""
 "readable and executable and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -22772,7 +23809,7 @@ msgid ""
 "Please remove this file and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -22780,7 +23817,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -22789,7 +23826,7 @@ 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"
@@ -22797,83 +23834,85 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-about-box.c:40
-msgid "Evolution "
-msgstr ""
-
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr ""
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: 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ể lấy thư mục: %s: %s"
+
+#: 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: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 ""
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: 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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -22886,7 +23925,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:304
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -22900,7 +23939,7 @@ msgstr ""
 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:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr ""
 
@@ -23053,6 +24092,12 @@ 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
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Mới"
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr ""
@@ -23069,88 +24114,87 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:566
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: 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 ""
-
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1585
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1587
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr ""
 
-#: 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 ""
 
-#: shell/e-shell-view.c:1641
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: 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 ""
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23158,19 +24202,23 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Đồng ý"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr ""
 
@@ -23285,74 +24333,71 @@ msgstr ""
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Hộp thư nhận"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr ""
 
-#: 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:491
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr ""
 
-#: 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:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr ""
 
-#: 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:505
 msgid "Operation not supported"
 msgstr ""
 
-#: 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: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 ""
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr ""
 
@@ -23362,95 +24407,103 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:84
+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 ""
+
+#: 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/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:124
-#, 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/evolution-test-component.c:47
+#, fuzzy
+msgid "Test type"
+msgstr "Kiểu"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -23564,296 +24617,272 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:83
+#: shell/main.c:89
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:89
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Đang nhập"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Đang nhập"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr ""
 
+#: tools/evolution-addressbook-abuse.c:80
 #: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr ""
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr ""
 
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr ""
+
 #: tools/evolution-addressbook-import.c:80
 msgid "No filename provided."
 msgstr ""
 
-#: 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:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "C_hép vào hộp thư..."
 
-#: 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 ""
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "C_hép vào hộp thư..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr ""
-
-#: 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:11
 msgid "Delete selected contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr ""
+#: 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 ""
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "_Chuyển tới hộp thư..."
 
-#: 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:17
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: 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:22
 msgid "Save selected contacts as a VCard."
 msgstr ""
 
-#: 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:24
 msgid "Select all contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr ""
-
-#: 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:26
 msgid "Send message to contact"
 msgstr ""
 
-#: 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:28
 msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr ""
 
-#: 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-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-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
+#: ui/evolution.xml.h:35
 msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
-
 #: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "_Chuyển tới hộp thư..."
+
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "Gửi thông điệp cho liên lạc"
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a New _Task"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr ""
 
-#: 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:6
 msgid "Go To"
 msgstr ""
 
-#: 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:8
 msgid "Go forward"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr ""
 
-#: 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:12
 msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr ""
-
-#: 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:16 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr ""
 
-#: 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:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr ""
 
-#: 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:21
 msgid "Show one week"
 msgstr ""
 
-#: 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:23
 msgid "Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr ""
-
 #: 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
@@ -23883,18 +24912,18 @@ msgstr ""
 msgid "Print this item"
 msgstr ""
 
-#: 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:240
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr ""
 
+#: 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 ""
 
@@ -23910,8 +24939,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:40
 msgid "_File"
 msgstr ""
 
@@ -23929,10 +24958,14 @@ msgstr ""
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+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 ""
 
@@ -23992,6 +25025,10 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr ""
 
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Bỏ"
+
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr ""
@@ -24001,82 +25038,54 @@ msgid "Compose _New Message"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: 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:6
 msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr ""
 
-#: 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
-msgid "New Message"
-msgstr ""
-
-#: 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:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr ""
-
-#: 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:11
 msgid "Show message preview window"
 msgstr ""
 
-#: 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:13
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr ""
 
@@ -24169,11 +25178,11 @@ msgstr ""
 msgid "Threaded Message list"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr ""
 
@@ -24189,149 +25198,164 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
+#: 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 ""
 
-#: 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: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: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:9
 msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: 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 ""
 
-#: 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"
+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ư"
+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"
+msgstr ""
+"Chuyển tiếp thông điệp được chọn tới người khác như là "
+"đồ đính kèm"
 
 #: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
@@ -24345,24 +25369,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
@@ -24374,7 +25406,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
@@ -24382,64 +25415,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"
+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
+msgid "Re_direct"
+msgstr ""
 
-#: 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"
@@ -24510,8 +25542,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"
@@ -24526,43 +25559,70 @@ msgid "_Forward Message"
 msgstr "Chuyển _tiếp thông điệp"
 
 #: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Tới ngày"
+
+#: ui/evolution-mail-message.xml.h:99
+msgid "_Inline"
+msgstr ""
+
+#: 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 "Chuyển tiếp _trích dẫn"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 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:36
 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:56
 msgid "_View"
 msgstr "_Xem"
 
@@ -24586,11 +25646,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"
 
@@ -24606,6 +25666,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"
@@ -24639,7 +25703,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"
 
@@ -24664,6 +25728,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"
 
@@ -24693,7 +25758,8 @@ msgstr "Ký tên vào thông điệp này, dùng khoá PGP"
 
 #: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Ký tên vào thông điệp này, dùng Chứng nhận Chữ ký S/MIME"
+msgstr ""
+"Ký tên vào thông điệp này, dùng Chứng nhận Chữ ký S/MIME"
 
 #: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
@@ -24732,7 +25798,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"
 
@@ -24744,11 +25810,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:44
 msgid "_Help"
 msgstr "Trợ _giúp"
 
@@ -24770,7 +25832,8 @@ msgstr "Cập nhật danh sách thư mục"
 
 #: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
-msgstr "Loại bỏ thư mục khỏi danh sách các thư mục đã đăng ký"
+msgstr ""
+"Loại bỏ thư mục khỏi danh sách các thư mục đã đăng ký"
 
 #: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
@@ -24805,33 +25868,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 thông điệp 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..."
@@ -24898,113 +25969,117 @@ 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
+msgid "Send / Receive"
+msgstr ""
+
+#: ui/evolution.xml.h:22
+msgid "Send queued items and retrieve new items"
+msgstr ""
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "Hiện thông tin về Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Bật tắt"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 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:29
 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:30
 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:31
 msgid "View the selected folder"
 msgstr "Xem thư mục được chọn"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Sao chép..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "Thanh Thư _mục"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "Đ_i tới thư mục..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Nhập..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Di chuyển..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "Mớ_i"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "Thư mục mớ_i"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr ""
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "Đổi _tên..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr ""
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Lối tắt"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 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 ""
 
-#: 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ỉ"
@@ -25018,18 +26093,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"
 
@@ -25062,11 +26146,21 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "Cửa sổ card"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr ""
 
@@ -25098,76 +26192,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 "Tắt"
 
-#: 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ã"
 
@@ -25175,25 +26274,23 @@ 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:95
-msgid "Clear"
-msgstr "Xóa"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Lưu tìm kiếm"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Hiện tất cả"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Thêm vào Những tìm kiếm được lưu"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -25216,11 +26313,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:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Tìm ngay"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Xóa"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Xóa"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Tìm ngay"
 
@@ -25245,3 +26352,750 @@ 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"
+#~ "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 "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 "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 "Other Contacts"
+#~ msgstr "Liên lạc khác"
+
+#~ msgid "Name contains"
+#~ msgstr "Tên chứa"
+
+#~ msgid "(none)"
+#~ msgstr "(không)"
+
+#~ 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 phân loại sau:"
+
+#~ msgid "_Message Recipients:"
+#~ msgstr "Người _nhận:"
+
+#~ 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?"
+
+#~ msgid "Starting:"
+#~ msgstr "Bắt đầu:"
+
+#~ 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 "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 "_Other"
+#~ msgstr "_Khác"
+
+#~ msgid "Click here to add an attendee"
+#~ msgstr "Nhấn vào đây để thêm người tham dự"
+
+#~ 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 "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 "_Xóa công việc này"
+
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "Bắt đầu cuộc họp: <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "Bắt đầu công việc: <b>"
+
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Bắt đầu thông tin Rảnh/Bận: <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Bắt đầu: <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Kết thúc cuộc họp: <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Kết thúc thông tin Rảnh/Bận: <b>"
+
+#~ msgid "Ends: <b>"
+#~ msgstr "Kết thúc: <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Công việc hoàn tất: <b>"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "Thông tin iCalendar"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "Lỗi iCalendar"
+
+#~ msgid "An unknown person"
+#~ msgstr "Người lạ"
+
+#~ 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."
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Không</i>"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Chọn hành động:"
+
+#~ msgid "Update"
+#~ msgstr "Cập nhật"
+
+#~ msgid "Accept"
+#~ msgstr "Chấp nhận"
+
+#~ msgid "Decline"
+#~ msgstr "Từ chối"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Gửi thông tin Rảnh/Bận"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Cập nhật trạng thái trả lời"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Gửi thông tin mới nhất"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> đã công bố thông tin cuộc họp."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Thông tin cuộc họp"
+
+#~ 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."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Đề nghị cuộc họp"
+
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ msgstr "<b>%s</b? muốn được dự cuộc họp đã có."
+
+#~ msgid "Meeting Update"
+#~ msgstr "Cập nhật cuộc họp"
+
+#~ 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"
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Yêu cầu cập nhật cuộc họp"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b> đã trả lời yêu cầu họp."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Trả lời họp"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> đã hủy bỏ cuộc họp."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Hủy bỏ cuộc họp"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> đã gửi một thông điệp khó hiểu."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Thông điệp lạ về cuộc họp"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> đã công bố thông tin công việc."
+
+#~ msgid "Task Information"
+#~ msgstr "Thông tin công việc"
+
+#~ 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."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Đề nghị công việc"
+
+#~ msgid "Task Update"
+#~ msgstr "Cập nhật công việc"
+
+#~ 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."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Yêu cầu cập nhật công việc"
+
+#~ 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."
+
+#~ msgid "Task Reply"
+#~ msgstr "Trả lời công việc"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> đã hủy bỏ công việc."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Hủy bỏ công việc"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Thông điệp lạ về công việc"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> đã công bố thông tin bận/rảnh."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Thông tin bận/rảnh"
+
+#~ 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."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Yêu cầu thông tin bận/rảnh"
+
+#~ 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."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Trả lời thông tin bận/rảnh"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Thông điệp chỉ chứa yêu cầu chưa được hỗ trợ."
+
+#~ 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ệ"
+
+#~ 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"
+
+#~ 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 "Event information"
+#~ msgstr "Thông tin sự kiện"
+
+#~ msgid "Task information"
+#~ msgstr "Thông tin công việc"
+
+#~ msgid "Journal information"
+#~ msgstr "Thông tin nhật ký"
+
+#~ msgid "Free/Busy information"
+#~ msgstr "Thông tin rảnh/bận"
+
+#~ msgid "Calendar information"
+#~ msgstr "Thông tin lịch"
+
+#~ 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 "Task"
+#~ msgstr "Công việc"
+
+#~ msgid "Status: %s"
+#~ msgstr "Trạng thái: %s"
+
+#~ msgid "Percent Complete: %i"
+#~ msgstr "Phần trăm hoàn thành: %i"
+
+#~ msgid "URL: %s"
+#~ msgstr "URL: %s"
+
+#~ msgid "Categories: %s"
+#~ msgstr "Phân loại: %s"
+
+#~ msgid "Contacts: "
+#~ msgstr "Liên lạc: "
+
+#~ 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 "This is an encrypted message part"
+#~ msgstr "Đây là phần thông điệp đã mã hóa"
+
+#~ 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 "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 "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 "Unexpected response from POP server: %s"
+#~ msgstr "Tín hiệu trả lời không mong đợi từ POP server: %s"
+
+#~ 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 "Hộp 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 "Mailbox Format"
+#~ msgstr "Dạng thức hộp thư"
+
+#~ msgid " (default)"
+#~ msgstr " (mặc định)"
+
+#~ msgid "Subject is %s"
+#~ msgstr "Chủ để là %s"
+
+#~ msgid "Mail from %s"
+#~ msgstr "Thừ từ %s"
+
+#~ 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: Hộp thư nhận"
+
+#~ msgid "Account"
+#~ msgstr "Tài khoản"
+
+#~ msgid "Composer"
+#~ msgstr "Bộ soạn thư"
+
+#~ msgid "Drafts"
+#~ msgstr "Nháp"
+
+#~ msgid "Edit..."
+#~ msgstr "Sửa..."
+
+#~ msgid "HTML signature file:"
+#~ msgstr "tập tin chữ ký HTML:"
+
+#~ msgid "Sent"
+#~ msgstr "Đã gửi"
+
+#~ msgid "Sources"
+#~ msgstr "Nguồn"
+
+#~ msgid "Outbox"
+#~ msgstr "Hộp thư gửi"
+
+#~ msgid "Forward _Attached"
+#~ msgstr "Chuyển tiếp đính _kèm"
+
+#~ 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 "Sear_ch"
+#~ msgstr "Tì_m"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 24d9131492..e44aaea3b9 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-05-07 15:46-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,7 +47,7 @@ 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 ""
 
@@ -55,6 +55,7 @@ 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
+#: 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 "电子邮件"
 
@@ -102,7 +103,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/widgets/e-addressbook-view.c:994
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 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 "组织"
 
@@ -251,7 +252,7 @@ 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/widgets/e-addressbook-view.c:974
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "商务传真"
 
@@ -273,7 +274,7 @@ msgstr "商务传真"
 # 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/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "家庭传真"
 
@@ -317,7 +318,7 @@ msgstr "家庭 2"
 # 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/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -340,7 +341,6 @@ msgstr "ISDN"
 #: 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
 msgid "Other"
 msgstr "其它"
 
@@ -355,7 +355,7 @@ msgstr "其它"
 # 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/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "其它传真"
 
@@ -370,7 +370,7 @@ msgstr "其它传真"
 # 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/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "传呼机"
 
@@ -385,7 +385,7 @@ msgstr "传呼机"
 # 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/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "收音机"
 
@@ -400,7 +400,7 @@ msgstr "收音机"
 # 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/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"
 
@@ -430,7 +430,7 @@ 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:986
+#: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "电子邮件 2"
 
@@ -449,7 +449,7 @@ 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/widgets/e-addressbook-view.c:987
+#: 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:171 calendar/gui/main.c:63
 #: 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:2732
 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:1123
 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:1226
 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:1462
 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:2586
+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:2678
 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:2759
+#, 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:2783
+#, 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,90 @@ 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/addressbook-config.glade.h:4
+# addressbook/gui/component/addressbook-config.glade.h:4
+# addressbook/gui/component/addressbook-config.glade.h:6
+#: 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: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:7
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "显示 Evolution 地址簿小卡片的控制。"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+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:9
 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:10
 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:11
 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:12
 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:13
 msgid "Factory for the Addressbook's address popup"
 msgstr "地址簿地址对话框车间"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+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:15
 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
+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,31 +1002,31 @@ 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:72
 #: 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-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:72
 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:74
 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:74
 msgid "LDAP server containing contact information"
 msgstr "含有联系人信息的 LDAP 服务器"
 
@@ -999,349 +1036,32 @@ msgstr "含有联系人信息的 LDAP 服务器"
 # 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:562
 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)"
+# ui/evolution-addressbook.xml.h:31
+# ui/evolution-addressbook.xml.h:31
+# ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_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
+#: addressbook/gui/component/addressbook-component.c:565
 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) 在服务器上对您进行认证"
-
-# 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/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"
-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/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"
-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."
-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."
-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."
-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)："
-
-# 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)："
-
-# 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)："
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "联系人列表(_C)"
 
 # addressbook/gui/component/addressbook-factory.c:70
 # calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
@@ -1349,29 +1069,22 @@ 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "无法创始化 gnome-vfs"
 
-# addressbook/gui/component/addressbook-storage.c:167
-# addressbook/gui/component/addressbook-storage.c:167
-# addressbook/gui/component/addressbook-storage.c:168
-#: addressbook/gui/component/addressbook-storage.c:168
-msgid "Other Contacts"
-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 +1097,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 +1112,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 +1124,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:643
+#: addressbook/gui/component/addressbook.c:646
 #, 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:769
+#, 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:770
+#, fuzzy
+msgid "Email is"
+msgstr "电子邮件 2"
 
 # addressbook/gui/component/addressbook.c:806
 # calendar/gui/cal-search-bar.c:59
@@ -1448,19 +1158,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:771
+#: 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:772
+#: 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:773 widgets/misc/e-filter-bar.h:99
 msgid "Advanced..."
 msgstr "高级..."
 
@@ -1471,30 +1191,18 @@ 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:1001
+#: 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:1083
 msgid "The URI that the Folder Browser will display"
 msgstr "文件夹浏览器将显示的 URI"
 
-# shell/e-shell-view.c:1587
-# addressbook/gui/component/e-address-popup.c:178
-# addressbook/gui/component/e-address-popup.c:178
-#.
-#. * 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:1686
@@ -1591,6 +1299,858 @@ msgstr "关闭查询"
 msgid "Enable Queries (Dangerous!)"
 msgstr "开启查询(危险！)"
 
+# 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 服务器。"
+
+# 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: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 ""
+
+# camel/camel-sasl-anonymous.c:131
+# camel/camel-sasl-anonymous.c:131
+# camel/camel-sasl-anonymous.c:131
+#: addressbook/gui/component/addressbook-config.c:1163
+#, fuzzy
+msgid "Could not query for schema information"
+msgstr ""
+"无效的诲涩跟踪信息：\n"
+"%s"
+
+# 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:1169
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP 服务器应答不含有 %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:1613
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(在该版本的 evolution 中不支持SSL)"
+
+# calendar/gui/e-calendar-table.etspec.h:8
+# calendar/gui/e-calendar-table.etspec.h:8
+# calendar/gui/e-calendar-table.etspec.h:8
+#: addressbook/gui/component/addressbook-config.c:1689
+#, fuzzy
+msgid "Extra Completion folders"
+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/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:2
+#, fuzzy
+msgid "<< Fewer Options"
+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:3
+#, fuzzy
+msgid "<- _Remove"
+msgstr "删除(_R)"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+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:5
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+# 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:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+# 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:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+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 "地址簿资源"
+
+# 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:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, 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:56
+#: mail/mail-config.glade.h:76
+#, 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:55 mail/mail-config.glade.h:136
+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:139
+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:152 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 +2174,10 @@ 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
 #: 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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "删除"
 
@@ -1665,10 +2224,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 +2254,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 +2269,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)："
 
@@ -1856,13 +2441,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
@@ -1871,7 +2449,9 @@ msgid ""
 "If this person publishes free/busy or other calendar information on the "
 "Internet, enter the address\n"
 "of that information here."
-msgstr "如果此人把忙闲信息或其它日历信息发布到互联网上，就在这里输入发布地址。"
+msgstr ""
+"如果此人把忙闲信息或其它日历信息发布到互联网上，就�"
+"�这里输入发布地址。"
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:21
 # addressbook/gui/contact-editor/contact-editor.glade.h:21
@@ -1949,10 +2529,11 @@ 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: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
 msgid "_Delete"
 msgstr "删除(_D)"
 
@@ -3809,19 +4390,10 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-#: 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
 # 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/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "删除联系人？"
 
@@ -3856,7 +4428,7 @@ 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:2415
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "无法为域找到构件：“%s”"
@@ -3882,7 +4454,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 "全名"
 
@@ -4238,7 +4810,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 +4828,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 +4865,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:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "修改卡片错误"
@@ -4456,8 +4876,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:1043
 msgid "Success"
 msgstr "成功"
 
@@ -4473,17 +4893,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
+#: 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:1895
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: 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
 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 +4914,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:1071
 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 +4955,18 @@ 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/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
 msgid "Cancelled"
 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:43
 msgid "Other error"
 msgstr "其它错误"
 
@@ -4555,7 +4976,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:59
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "您希望保存修改吗？"
@@ -4563,28 +4984,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:78
 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:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 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:87
 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:97
 msgid "Error removing list"
 msgstr "删除列表错误"
 
@@ -4594,27 +5016,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:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 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:204
 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:205
 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:209
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -4624,132 +5047,388 @@ 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"
+# 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:344
+#, 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"
+# 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:346
+#, 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:349
+#, 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:351
+#, 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 "其它地址"
 
+# 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:699
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: 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:875
+#, 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:876
+#, 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:879
+#, 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:880
+#, 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:882
+#, 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:883
+#, 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:885
+#, 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:889
+#: 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:890
+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:891
+#: 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:893
+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:897
+#, 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:898
+#, 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:901
+#: 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:902
+#: 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:903
+#: 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: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
+#: 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:907
+#: 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:940
+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:945
+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 +5454,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 +5469,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 +5644,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 "横向"
 
@@ -4990,6 +5687,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 "方向"
 
@@ -5026,7 +5724,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 "纵向"
 
@@ -5137,9 +5837,8 @@ 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/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:500 calendar/cal-util/cal-util.c:522
+#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
 msgid "High"
 msgstr "高"
 
@@ -5155,10 +5854,9 @@ 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/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "中"
 
@@ -5171,9 +5869,8 @@ 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/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:504 calendar/cal-util/cal-util.c:526
+#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
 msgid "Low"
 msgstr "低"
 
@@ -5187,9 +5884,8 @@ 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
 msgid "Undefined"
 msgstr "未定义"
 
@@ -5200,7 +5896,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 +5911,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,69 +5944,89 @@ msgstr "显示任务列表的 Bonobo 控制。"
 msgid "A sample Bonobo control which displays an calendar."
 msgstr "显示日历的示例 Bonobo 控制。"
 
+# 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
+#, 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:3
 # 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/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution calendar executive summary component."
 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:6
 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:7
 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
+#: 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:7
 # 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
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr "Evolution 任务控制车间"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "日历 iTip 视图控制车间"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "日历控制示例车间"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "日历组件编辑器对话框集中车间"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr "创建组件编辑车间的车间"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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
@@ -5317,20 +6041,6 @@ msgstr "提醒服务"
 msgid "Factory for the alarm notification service"
 msgstr "提醒服务车间"
 
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-msgid "Starting:"
-msgstr "开始："
-
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-msgid "Ending:"
-msgstr "结束："
-
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:231
@@ -5338,13 +6048,6 @@ msgstr "结束："
 msgid "invalid time"
 msgstr "无效时间"
 
-# 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
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-msgid "Evolution Alarm"
-msgstr "Evolution 提醒"
-
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:371
@@ -5413,7 +6116,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:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "警告"
@@ -5431,7 +6134,8 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Evolution 日历提示器将要触发。该提示器被配置为运行以下程序：\n"
+"Evolution "
+"日历提示器将要触发。该提示器被配置为运行以下程序：\n"
 "\n"
 "        %s\n"
 "\n"
@@ -5447,7 +6151,7 @@ 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:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "无法初始化 GNOME"
 
@@ -5468,35 +6172,35 @@ 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
 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 +6212,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 +6223,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 +6234,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 +6248,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 +6268,6 @@ 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
 msgid "Private"
 msgstr "保密"
 
@@ -5575,14 +6278,13 @@ 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
 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
 msgid "Public"
 msgstr "公开"
 
@@ -5621,7 +6323,6 @@ 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
 msgid "Free"
 msgstr "放假"
 
@@ -5634,9 +6335,8 @@ 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 msgid "Busy"
 msgstr "繁忙"
 
@@ -5651,7 +6351,6 @@ 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
 msgid "Not Started"
 msgstr "尚未开始"
 
@@ -5666,7 +6365,6 @@ 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
 msgid "In Progress"
 msgstr "正在进行中"
 
@@ -5684,8 +6382,7 @@ 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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "已完成"
 
@@ -5725,9 +6422,10 @@ msgstr ""
 # 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/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
 #: 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 +6455,8 @@ 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:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
 msgid "Yes"
 msgstr "是"
 
@@ -5769,23 +6466,10 @@ 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:310
 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 +6504,15 @@ 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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 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:68
 msgid "Folder containing appointments and events"
 msgstr "文件夹含有约会和事件"
 
@@ -5844,9 +6528,10 @@ 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "任务"
@@ -5854,49 +6539,102 @@ 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:73
 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:695
+#, 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:695
+#, 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:699
+#, 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:699
+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:703
+#, 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:703
+#, 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:707
+#, 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:707
+#, 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
@@ -5975,8 +6713,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 ""
-"这是电子邮件提示器，但 Evolution 尚不支持这类提示器。您无法为该提示器编辑选"
-"项。"
+"这是电子邮件提示器，但 Evolution "
+"尚不支持这类提示器。您无法为该提示器编辑选项。"
 
 # calendar/gui/dialogs/alarm-options.glade.h:7
 # calendar/gui/dialogs/alarm-options.glade.h:7
@@ -6010,10 +6748,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 +6978,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.glade.h:11
 msgid "Summary:"
 msgstr "概要："
 
@@ -6296,7 +7031,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:189
 msgid "minute(s)"
 msgstr "分钟"
 
@@ -6363,49 +7098,35 @@ msgstr "被延误任务的颜色"
 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
 # 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:9
 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
 # 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/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "星期五"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "小时"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "分钟"
 
@@ -6415,54 +7136,44 @@ msgstr "分钟"
 # 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/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: 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:16
-msgid "O_verdue tasks:"
-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/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/cal-prefs-dialog.glade.h:14
+#: 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)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 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
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 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
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "星期日(_N)"
 
@@ -6472,31 +7183,40 @@ msgstr "星期日(_N)"
 # 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:19
+#: 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:20
+#, 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:21
 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
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 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 +7224,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,8 +7256,8 @@ 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 "星期二"
 
@@ -6554,8 +7267,8 @@ msgstr "星期二"
 # 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:29
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "星期三"
 
@@ -6565,113 +7278,124 @@ 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:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 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:31
 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:32
 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:33
 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:34
 msgid "_Compress weekends in month view"
 msgstr "不在月视图中显示周末(_C)"
 
 # 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
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 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
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 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:37
 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:38
+#: mail/mail-config.glade.h:158
 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:39
 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:40
 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:41
+#, 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:42
 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:46
-msgid "_Task List"
-msgstr "任务列表(_T)"
+# 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:43
+#, 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:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "时间分割(_V)："
 
 # 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:45
 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
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "在约会开始以前"
 
@@ -6780,56 +7504,56 @@ 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
+#: calendar/gui/dialogs/comp-editor.c:322
 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:693
 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:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
@@ -6837,7 +7561,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:701
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
@@ -6845,7 +7569,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:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日志条目 - %s"
@@ -6853,51 +7577,23 @@ 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:718
 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 "覆盖文件？"
-
-# 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
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-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..."
+# composer/e-msg-composer.c:943
+# composer/e-msg-composer.c:947
+# composer/e-msg-composer.c:912
+#: 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
+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:1226
 msgid "Unable to obtain current version!"
 msgstr "无法获取当前版本！"
 
@@ -6994,7 +7690,7 @@ 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:185
 msgid "Appointment"
 msgstr "约会"
 
@@ -7023,7 +7719,7 @@ msgstr "再次发生"
 # 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:365
 msgid "Scheduling"
 msgstr "正在调度"
 
@@ -7038,7 +7734,7 @@ msgstr "正在调度"
 # 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:368
 msgid "Meeting"
 msgstr "会见"
 
@@ -7136,7 +7832,7 @@ msgstr "公开的(_B)"
 # 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/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "按其显示时间"
 
@@ -7215,25 +7911,14 @@ msgstr "授权于(_D)..."
 msgid "Attendee"
 msgstr "出席者"
 
-# calendar/gui/dialogs/meeting-page.etspec.h:2
-# calendar/gui/e-meeting-time-sel.etspec.h:2
-# calendar/gui/dialogs/meeting-page.etspec.h:2
-# calendar/gui/e-meeting-time-sel.etspec.h:2
-# calendar/gui/dialogs/meeting-page.etspec.h:2
-# calendar/gui/e-meeting-time-sel.etspec.h:2
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-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
 # calendar/gui/dialogs/meeting-page.etspec.h:3
 # calendar/gui/e-meeting-time-sel.etspec.h:3
 # calendar/gui/dialogs/meeting-page.etspec.h:3
 # calendar/gui/e-meeting-time-sel.etspec.h:3
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Common Name"
 msgstr "通用名"
 
@@ -7243,8 +7928,8 @@ msgstr "通用名"
 # calendar/gui/e-meeting-time-sel.etspec.h:4
 # calendar/gui/dialogs/meeting-page.etspec.h:4
 # calendar/gui/e-meeting-time-sel.etspec.h:4
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "来自...的代表"
 
@@ -7254,8 +7939,8 @@ msgstr "来自...的代表"
 # calendar/gui/e-meeting-time-sel.etspec.h:5
 # calendar/gui/dialogs/meeting-page.etspec.h:5
 # calendar/gui/e-meeting-time-sel.etspec.h:5
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "授权于"
 
@@ -7265,8 +7950,8 @@ msgstr "授权于"
 # calendar/gui/e-meeting-time-sel.etspec.h:6
 # calendar/gui/dialogs/meeting-page.etspec.h:6
 # calendar/gui/e-meeting-time-sel.etspec.h:6
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "语言"
 
@@ -7276,8 +7961,8 @@ msgstr "语言"
 # calendar/gui/e-meeting-time-sel.etspec.h:7
 # calendar/gui/dialogs/meeting-page.etspec.h:7
 # calendar/gui/e-meeting-time-sel.etspec.h:7
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "成员"
 
@@ -7290,9 +7975,8 @@ msgstr "成员"
 # calendar/gui/dialogs/meeting-page.etspec.h:8
 # 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-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
@@ -7302,8 +7986,8 @@ msgstr "RSVP"
 # calendar/gui/e-meeting-time-sel.etspec.h:9
 # calendar/gui/dialogs/meeting-page.etspec.h:9
 # calendar/gui/e-meeting-time-sel.etspec.h:9
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "角色"
 
@@ -7319,10 +8003,10 @@ msgstr "角色"
 # 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/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/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"
 msgstr "状态"
 
@@ -7338,9 +8022,9 @@ msgstr "状态"
 # calendar/gui/e-calendar-table.etspec.h:18
 # calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:94
 # 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "类型"
@@ -7370,7 +8054,7 @@ 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:453
 msgid "_Invite Others..."
 msgstr "邀请其他人(_I)..."
 
@@ -7381,45 +8065,158 @@ msgstr "邀请其他人(_I)..."
 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 "在"
 
+# 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: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
+# 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:57
+#: 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 +8386,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:740
 msgid "URL:"
 msgstr "URL："
 
@@ -7607,6 +8404,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:178
+msgid "Basic"
+msgstr "基本"
+
 # calendar/gui/dialogs/task-editor.c:190
 # calendar/gui/dialogs/task-editor.c:227
 # calendar/gui/dialogs/task-editor.c:322
@@ -7618,7 +8425,7 @@ msgstr "状态(_S)："
 # 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:324
 msgid "Assignment"
 msgstr "分派"
 
@@ -7631,9 +8438,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.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:42
 msgid "Description:"
 msgstr "描述："
 
@@ -7651,102 +8458,14 @@ msgstr "开始日期(_R)："
 msgid "_Due Date:"
 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
-#, c-format
-msgid "0%"
-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
-#, c-format
-msgid "10%"
-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
-#, c-format
-msgid "20%"
-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
-#, c-format
-msgid "30%"
-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
-#, c-format
-msgid "40%"
-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
-#, c-format
-msgid "50%"
-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
-#, c-format
-msgid "60%"
-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
-#, c-format
-msgid "70%"
-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
-#, c-format
-msgid "80%"
-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
-#, c-format
-msgid "90%"
-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
-#, c-format
-msgid "100%"
-msgstr "100%"
-
 # 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-calendar-table.c:741 calendar/gui/e-day-view.c:2726
-#: calendar/gui/e-week-view.c:1828
+#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
@@ -7759,12 +8478,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: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
 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:973
+#, 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:974 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 +8518,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:978 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 +8536,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:979 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 +8558,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:980 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:984
+#, 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:985
+#, 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:986
 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:987
+#, 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:992
 msgid "_Delete Selected Tasks"
 msgstr "删除选定的任务(_D)"
 
@@ -7856,8 +8610,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:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "更新对象"
 
@@ -7867,8 +8621,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.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "点击以添加任务"
 
@@ -7885,50 +8638,50 @@ 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 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
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "完成日期"
 
 # calendar/gui/e-calendar-table.etspec.h:9
 # calendar/gui/e-calendar-table.etspec.h:9
 # calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "约定日期"
 
 # calendar/gui/e-calendar-table.etspec.h:10
 # calendar/gui/e-calendar-table.etspec.h:10
 # calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "结束日期"
 
 # calendar/gui/e-calendar-table.etspec.h:11
 # calendar/gui/e-calendar-table.etspec.h:11
 # calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "地理位置"
 
 # calendar/gui/e-calendar-table.etspec.h:12
 # calendar/gui/e-calendar-table.etspec.h:12
 # calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "优先级"
 
 # calendar/gui/e-calendar-table.etspec.h:14
 # calendar/gui/e-calendar-table.etspec.h:14
 # calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "开始日期"
 
@@ -7943,23 +8696,22 @@ msgstr "开始日期"
 # shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
 #. 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
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "概要"
 
 # calendar/gui/e-calendar-table.etspec.h:17
 # calendar/gui/e-calendar-table.etspec.h:17
 # calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "任务排序"
 
 # calendar/gui/e-calendar-table.etspec.h:19
 # calendar/gui/e-calendar-table.etspec.h:19
 # calendar/gui/e-calendar-table.etspec.h:19
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -8017,8 +8769,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 +8782,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 +8794,7 @@ 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
 msgid "am"
 msgstr "上午"
 
@@ -8054,201 +8805,156 @@ 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
 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:37
+#, 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:1610 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)"
 
-# 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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-msgid "iCalendar Information"
-msgstr "iCalendar 信息"
-
-# calendar/gui/e-itip-control.c:641
-# calendar/gui/e-itip-control.c:641
-# calendar/gui/e-itip-control.c:644
-#. Title
-#: calendar/gui/e-itip-control.c:644
-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
-msgid "An unknown person"
-msgstr "未知的人"
-
-# calendar/gui/e-itip-control.c:729
-# 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
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-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
-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
-msgid "Status:"
-msgstr "状态："
-
-# calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-# 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-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
-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
-msgid "Tentatively Accepted"
-msgstr "暂时接受"
+# 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:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "GNOME Pilot 工具好像并未安装到系统中。"
 
-# calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-# 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-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
-msgid "Declined"
-msgstr "否决"
+# 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:617
+#, c-format
+msgid "Error executing %s."
+msgstr "执行 %s 错误。"
 
 # 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
@@ -8269,461 +8975,98 @@ 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: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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:786 calendar/gui/e-itip-control.c:802
-# calendar/gui/e-itip-control.c:818 calendar/gui/e-itip-control.c:831
-# calendar/gui/e-itip-control.c:845 calendar/gui/e-itip-control.c:859
-# calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:802
-# calendar/gui/e-itip-control.c:818 calendar/gui/e-itip-control.c:831
-# calendar/gui/e-itip-control.c:845 calendar/gui/e-itip-control.c:859
-# 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
-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
-msgid "Update"
-msgstr "更新"
-
-# calendar/gui/e-itip-control.c:788 calendar/gui/e-itip-control.c:807
-# calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:833
-# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:861
-# shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
-# calendar/gui/e-itip-control.c:788 calendar/gui/e-itip-control.c:807
-# calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:833
-# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:861
-# shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
-# calendar/gui/e-itip-control.c:791 calendar/gui/e-itip-control.c:810
-# 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
-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
-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
-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
-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
-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
-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
-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
-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
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-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
-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
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-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
-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
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-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
-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
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-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
-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
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-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
-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
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-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
-msgid "Meeting Cancellation"
-msgstr "会议取消"
-
-# calendar/gui/e-itip-control.c:905 calendar/gui/e-itip-control.c:955
-# calendar/gui/e-itip-control.c:990
-# calendar/gui/e-itip-control.c:905 calendar/gui/e-itip-control.c:955
-# 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
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-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
-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
-#, c-format
-msgid "<b>%s</b> has published task information."
-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
-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
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-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
-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
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-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
-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
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-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
-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
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-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
-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
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-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
-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
-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
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
-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
-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
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-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
-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
-#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-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
-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
-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
-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
-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
-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
-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
+#: calendar/gui/e-itip-control.c:1564
 msgid "Calendar file could not be updated!\n"
 msgstr "无法更新日历文件！\n"
 
 # 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:1566
 msgid "Update complete\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:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "由于条目不再存在而无法更新参与者状态"
+
+#: calendar/gui/e-itip-control.c:1613
+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:1625
 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
+#: calendar/gui/e-itip-control.c:1638
 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:1640
 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: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:1674
 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:1704 calendar/gui/e-itip-control.c:1754
 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:1706 calendar/gui/e-itip-control.c:1758
 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:1861
+#, 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:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "选择文件夹"
 
 # calendar/gui/e-itip-control.glade.h:2
 # calendar/gui/e-itip-control.glade.h:2
@@ -8792,28 +9135,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:81
 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:82 calendar/gui/e-meeting-model.c:1650
 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:83
 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:84
 msgid "Non-Participants"
 msgstr "不参加"
 
@@ -8823,8 +9166,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:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "个人"
 
@@ -8834,8 +9177,7 @@ 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:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "组"
 
@@ -8845,8 +9187,7 @@ 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:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "资源"
 
@@ -8856,8 +9197,7 @@ 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:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "房间"
 
@@ -8867,8 +9207,7 @@ 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:264 calendar/gui/e-meeting-model.c:281
 msgid "Chair"
 msgstr "主席"
 
@@ -8878,8 +9217,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:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "必需的参与者"
 
@@ -8889,8 +9228,7 @@ 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:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr "可选的参与者"
 
@@ -8900,8 +9238,7 @@ 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:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "不参加"
 
@@ -8911,19 +9248,39 @@ 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: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:321 calendar/gui/e-meeting-model.c:344
+# 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-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
+# calendar/gui/e-meeting-model.c:824
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+msgid "Accepted"
+msgstr "接受"
+
+# calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
+# 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-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
+# calendar/gui/e-meeting-model.c:825
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+msgid "Declined"
+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:428
 # 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: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:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "暂时的"
 
@@ -8933,15 +9290,14 @@ 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:324 calendar/gui/e-meeting-model.c:347
 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:328 calendar/gui/e-meeting-model.c:351
 msgid "In Process"
 msgstr "正在处理"
 
@@ -8953,8 +9309,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:2088
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%B月%d日 %A"
 
@@ -8969,8 +9325,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:2118 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 +9339,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 +9347,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:436
 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:437
 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:473
 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:490
 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:503
 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:521
 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:539
 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:556
 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:570
 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:587
 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:600
 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:613
 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:626
 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:649
 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:668
 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 +9460,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 +9468,55 @@ 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/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:543
+#, 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:566
+#, 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:659
 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:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "无法打开“%s”中的文件夹"
@@ -9142,7 +9524,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:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "不支持打开“%s”必需的方法"
@@ -9150,7 +9532,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:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "从 %s 打开日历"
@@ -9256,344 +9638,294 @@ 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:220
 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:251
 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
-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
-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
-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
-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
-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/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 信息"
-
 # 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:617
 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:92
 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 +9933,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 +9957,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 +9974,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,68 +9982,14 @@ 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
-msgid "Task"
-msgstr "任务"
-
-# calendar/gui/print.c:2262
-# calendar/gui/print.c:2262
-# calendar/gui/print.c:2262
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "状态：%s"
-
-# calendar/gui/print.c:2280
-# calendar/gui/print.c:2280
-# calendar/gui/print.c:2280
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "优先级：%s"
-
-# calendar/gui/print.c:2294
-# calendar/gui/print.c:2294
-# calendar/gui/print.c:2294
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "完成率：%i"
-
-# calendar/gui/print.c:2306
-# calendar/gui/print.c:2306
-# calendar/gui/print.c:2306
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL：%s"
-
-# calendar/gui/print.c:2320
-# calendar/gui/print.c:2320
-# calendar/gui/print.c:2320
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "类别：%s"
-
-# calendar/gui/print.c:2331
-# calendar/gui/print.c:2331
-# calendar/gui/print.c:2331
-#: calendar/gui/print.c:2331
-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 +10002,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:2894
+#: 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,31 +10034,41 @@ 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"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"该操作将永久删除所有标记为完成的任务。如果您继续，您将无法恢复这些任务。\n"
+"该操作将永久删除所有标记为完成的任务。如果您继续，�"
+"�将无法恢复这些任务。\n"
 "\n"
 "确实删除这些任务？"
 
 # 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:2381
+#: mail/mail-callbacks.c:2622
 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
@@ -9788,7 +10077,9 @@ 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
 # calendar/gui/tasks-migrate.c:108
@@ -9800,7 +10091,9 @@ 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
@@ -9811,7 +10104,9 @@ msgstr ""
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
-msgstr "无法打开“%s”；不会从日志文件夹迁移项目到任务文件夹。"
+msgstr ""
+"无法打开“%s”；不会从日志文件夹迁移项目到任务文件夹"
+"。"
 
 # calendar/gui/tasks-migrate.c:133
 # calendar/gui/tasks-migrate.c:133
@@ -9821,7 +10116,9 @@ msgstr "无法打开“%s”；不会从日志文件夹迁移项目到任务文�
 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”的方法；不会从日志文件夹迁移项目到任务文件夹。"
+msgstr ""
+"不支持用于装入“%s”的方法；不会从日志文件夹迁移项目"
+"到任务文件夹。"
 
 # calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 # calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
@@ -9844,175 +10141,218 @@ 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/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"
-"\""
-msgstr "contains? 的第一个参数必须是“任意”、“概要”、“描述”之一"
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
+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)"
-msgstr "has-categories? 的所有参数都应该为字符串或者它唯一的参数为布尔假 (#f)"
+msgstr ""
+"has-categories? "
+"的所有参数都应该为字符串或者它唯一的参数为布尔假 (#f)"
 
 # 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"
 
@@ -12436,14 +12776,14 @@ 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:441
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "无法删除缓冲条目：%s：%s"
@@ -12493,14 +12833,14 @@ 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:811 camel/camel-filter-driver.c:1197
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "解析过滤规则错误： %s： %s"
@@ -12508,7 +12848,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:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "执行过滤规则错误： %s： %s"
@@ -12516,36 +12856,35 @@ 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:887
 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:896
 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
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 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:915
 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:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "在消息 %d 失败"
@@ -12553,14 +12892,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:942 camel/camel-filter-driver.c:1049
 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:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在获取第 %d 个消息，共 %d 个"
@@ -12568,7 +12907,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:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d 个消息失败，共 %d 个"
@@ -12591,7 +12930,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 +12942,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 +12954,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:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "不支持的操作：附加邮件：附加 %s"
@@ -12645,7 +12977,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:1038
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "不支持的操作：按表达式搜索：搜索 %s"
@@ -12653,7 +12985,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:1078
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "不支持的操作：按 uid 搜索：搜索 %s"
@@ -12661,7 +12993,7 @@ 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:1260
 msgid "Moving messages"
 msgstr "正在移动邮件"
 
@@ -12836,21 +13168,21 @@ 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
+#: camel/camel-pgp-context.c:621
 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
+#: 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: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
+#: 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"
@@ -12858,21 +13190,21 @@ 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
+#: camel/camel-pgp-context.c:795
 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
+#: camel/camel-pgp-context.c:987
 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
+#: 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"
@@ -12880,7 +13212,7 @@ 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
+#: camel/camel-pgp-context.c:1004
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "无法验证该邮件：无法创建临时文件： %s"
@@ -12888,21 +13220,21 @@ 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
+#: camel/camel-pgp-context.c:1177
 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
+#: camel/camel-pgp-context.c:1187
 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
+#: 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"
@@ -12910,116 +13242,42 @@ 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
+#: camel/camel-pgp-context.c:1203
 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
+#: camel/camel-pgp-context.c:1372
 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
+#: camel/camel-pgp-context.c:1380
 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
-#: camel/camel-pgp-context.c:1352
+#: 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:310
 # camel/camel-pgp-mime.c:310
-#: camel/camel-pgp-mime.c:310
+#: camel/camel-pgp-mime.c:354
 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 "无法解密：未知"
-
 # 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 +13285,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,7 +13293,7 @@ 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： 模块中没有初始化代码。"
@@ -13043,7 +13301,7 @@ 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
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s 服务器 %s"
@@ -13051,7 +13309,7 @@ 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
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s 为 %s 服务，在 %s"
@@ -13059,7 +13317,7 @@ 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
+#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "连接已取消"
 
@@ -13069,7 +13327,7 @@ msgstr "连接已取消"
 # 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/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"
@@ -13078,7 +13336,7 @@ 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
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(未知的主机)"
 
@@ -13094,8 +13352,8 @@ msgstr "(未知的主机)"
 # 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/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"
@@ -13107,7 +13365,7 @@ msgstr "操作已取消"
 # 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/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -13184,7 +13442,9 @@ msgstr "CRAM-MD5"
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr "如果服务器支持的话，该选项将用安全 CRAM-MD5 密码连接到服务器。"
+msgstr ""
+"如果服务器支持的话，该选项将用安全 CRAM-MD5 "
+"密码连接到服务器。"
 
 # camel/camel-sasl-digest-md5.c:43
 # camel/camel-sasl-digest-md5.c:43
@@ -13200,7 +13460,9 @@ msgstr "DIGEST-MD5"
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
-msgstr "如果服务器支持的话，该选项将用安全 DIGEST-MD5 密码连接到服务器。"
+msgstr ""
+"如果服务器支持的话，该选项将用安全 DIGEST-MD5 "
+"密码连接到服务器。"
 
 # camel/camel-sasl-digest-md5.c:810
 # camel/camel-sasl-digest-md5.c:810
@@ -13277,7 +13539,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:496
 msgid "Bad authentication response from server."
 msgstr "来自服务器的无效认证应答。"
 
@@ -13302,6 +13564,20 @@ msgstr "该选项将以普通密码连接到服务器。"
 msgid "Unknown authentication state."
 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 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
@@ -13312,8 +13588,8 @@ msgstr "未知的认证状态。"
 # 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
+#: 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 "密码"
 
@@ -13387,7 +13663,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:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "正在解析： %s"
@@ -13395,7 +13671,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:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "域名寻找失败： %s"
@@ -13403,7 +13679,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:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "主机寻找失败： %s： 没有找到主机"
@@ -13411,11 +13687,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:675
 #, 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:725
+#, 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:787
+#, 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:790
+#, 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 +13733,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 +13741,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 +13750,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 +13817,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:222
 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:284
 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 +13841,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 +13859,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:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -13565,12 +13873,12 @@ msgstr ""
 "签名：           %s"
 
 # camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr "好"
 
 # camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr "坏"
 
@@ -13578,7 +13886,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:500
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -13612,7 +13920,7 @@ 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
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "没有邮件： %s"
@@ -13620,7 +13928,7 @@ msgstr "没有邮件： %s"
 # 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 +13936,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 +13944,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,7 +13952,7 @@ 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： 没有该文件夹"
@@ -13698,7 +14006,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:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "无法创建目录 %s： %s"
@@ -13706,7 +14014,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:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "无法为 %s 装入概要"
@@ -13714,7 +14022,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:284
 msgid "Folder was destroyed and recreated on server."
 msgstr "文件夹已被删除并在服务器上重建了。"
 
@@ -13722,7 +14030,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:469
 msgid "Scanning for changed messages"
 msgstr "正在扫描改变了的邮件"
 
@@ -13732,8 +14040,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:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "该邮件目前不可用"
 
@@ -13743,29 +14051,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:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 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:1799
 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:2151
 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 +14090,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 +14115,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 "文件夹"
 
@@ -13863,7 +14171,7 @@ msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
 # 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:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
@@ -13874,8 +14182,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:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "不支持验证类型 %s"
@@ -13883,7 +14191,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:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 IMAP 密码"
@@ -13894,15 +14202,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:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 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:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -13916,7 +14224,7 @@ 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:901
 #, c-format
 msgid "No such folder %s"
 msgstr "没有文件夹 %s"
@@ -13924,73 +14232,87 @@ 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:1276
 msgid "The parent folder is not allowed to contain subfolders"
 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:48
 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:49
 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:64
 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:65
 msgid "For retrieving local mail from standard mbox formated spools."
-msgstr "在按照标准邮件箱格式化的脱机文件中检索本地邮件。"
+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:76
+#: 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:82
 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:83
 msgid "For storing local mail in maildir directories."
 msgstr "在 maildir 邮件目录中存储本地邮件。"
 
 # 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
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 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
+#: 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"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
 # camel/providers/local/camel-local-store.c:138
 # camel/providers/local/camel-local-store.c:227
 # camel/providers/local/camel-spool-store.c:109
@@ -14000,9 +14322,10 @@ 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-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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "存储根目录 %s 不是绝对路径"
@@ -14010,7 +14333,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 +14347,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 +14357,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 +14372,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:863
 #, 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 +14396,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 +14404,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:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "无法保存概要： %s： %s"
@@ -14084,8 +14415,8 @@ 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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "无法将邮件添加到概要中： 未知的原因"
 
@@ -14135,7 +14466,7 @@ msgstr "无法将邮件附加到邮件目录文件夹： %s： %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -14159,7 +14490,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "没有该邮件"
 
@@ -14180,7 +14511,7 @@ 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-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -14199,8 +14530,8 @@ 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-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -14212,7 +14543,7 @@ 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-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -14225,7 +14556,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,8 +14570,8 @@ 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-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
@@ -14249,14 +14580,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:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "无法扫描文件夹“%s”： %s"
@@ -14267,12 +14599,58 @@ 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
+#. 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
+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
@@ -14280,7 +14658,7 @@ msgstr "无法打开邮件目录路径： %s： %s"
 # 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-spool-folder.c:277
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "无法在 %s 创建文件夹锁： %s"
@@ -14292,7 +14670,7 @@ msgstr "无法在 %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:208
-#: camel/providers/local/camel-spool-folder.c:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "无法打开邮件箱： %s： %s\n"
@@ -14333,9 +14711,9 @@ msgstr "无法将邮件附加到邮件箱文件： %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-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -14351,7 +14729,7 @@ msgstr ""
 # 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-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "文件夹好像已经被不可恢复地破坏了。"
 
@@ -14362,14 +14740,14 @@ msgstr "文件夹好像已经被不可恢复地破坏了。"
 # 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-spool-folder.c:643
 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 +14759,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 +14774,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 +14786,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 +14799,19 @@ 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:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "无法打开文件夹： %s： %s"
@@ -14473,8 +14822,8 @@ 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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
@@ -14485,8 +14834,8 @@ 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:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "无法检查文件夹： %s： %s"
@@ -14500,9 +14849,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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "无法打开文件： %s： %s"
@@ -14513,8 +14862,8 @@ 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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "无法打开临时邮件箱： %s"
@@ -14543,14 +14892,14 @@ 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: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 "即使同步后，概要和文件夹仍然不匹配"
 
@@ -14560,8 +14909,8 @@ msgstr "即使同步后，概要和文件夹仍然不匹配"
 # 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:597
+#: camel/providers/local/camel-spool-summary.c:752
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "写入临时文件夹错误： %s"
@@ -14572,8 +14921,8 @@ 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:614
+#: camel/providers/local/camel-spool-summary.c:774
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "写入临时文件夹失败： %s： %s"
@@ -14587,9 +14936,9 @@ 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: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"
 msgstr "无法关闭来源文件夹 %s： %s"
@@ -14597,7 +14946,7 @@ 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
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "无法关闭临时文件夹： %s"
@@ -14605,7 +14954,7 @@ 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
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "无法重命名文件夹： %s"
@@ -14619,9 +14968,9 @@ 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "未知的错误： %s"
@@ -14652,7 +15001,7 @@ 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:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "无法打开 MH 目录： %s： %s"
@@ -14660,7 +15009,7 @@ 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
+#: camel/providers/local/camel-spool-folder.c:515
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "无法将邮件附加到脱机文件： %s： %s"
@@ -14677,6 +15026,7 @@ 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-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "文件夹“%s/%s”不存在。"
@@ -14692,14 +15042,16 @@ 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:208
+#: camel/providers/local/camel-spoold-store.c:193
 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:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "脱机文件夹无法删除"
 
@@ -14712,9 +15064,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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "无法同步临时文件夹 %s： %s"
@@ -14722,7 +15074,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:831
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "无法同步脱机文件夹 %s： %s"
@@ -14736,9 +15088,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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -14750,117 +15102,30 @@ msgstr ""
 # 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
+#: camel/providers/local/camel-spool-summary.c:950
 #, 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/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-spoold-store.c:117
+#, fuzzy, c-format
+msgid "Store `%s' does not exist or is not a directory"
+msgstr "脱机文件“%s”不存在或不是普通文件"
 
-# 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/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-# 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"
+# mail/mail-autofilter.c:72
+# mail/mail-autofilter.c:72
+# mail/mail-autofilter.c:72
+#: 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
 # camel/providers/nntp/camel-nntp-provider.c:41
@@ -14874,12 +15139,14 @@ msgstr "USENET 新闻"
 # camel/providers/nntp/camel-nntp-provider.c:43
 #: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "这是一个从 USENET 新闻组和向 USENET 新闻组发布消息的提供者。"
+msgstr ""
+"这是一个从 USENET 新闻组和向 USENET "
+"新闻组发布消息的提供者。"
 
 # 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:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET 新闻 %s"
@@ -14887,7 +15154,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:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -14963,10 +15230,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 +15268,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 +15276,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 +15293,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 +15356,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:84
 msgid "POP"
 msgstr "POP"
 
@@ -15066,8 +15375,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 ""
-"该选项使 Evolution 在连接到 POP 服务器时使用明文密码。这是许多 POP 服务器唯一"
-"支持的选项。"
+"该选项使 Evolution 在连接到 POP "
+"服务器时使用明文密码。这是许多 POP "
+"服务器唯一支持的选项。"
 
 # camel/providers/pop3/camel-pop3-provider.c:79
 # camel/providers/pop3/camel-pop3-provider.c:79
@@ -15078,22 +15388,51 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"该选项使 Evolution 在连接到 POP 服务器时使用 APOP 协议。即使是声称支持这一功"
-"能的服务器，也不一定能使所有用户工作。"
+"该选项使 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:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, fuzzy, c-format
+msgid "Failed to connect to POP 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/pop3/camel-pop3-store.c:210
+#, 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/pop3/camel-pop3-store.c:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "认证失败。"
 
 # 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:348
+#, 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:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -15104,19 +15443,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:405
 #, 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:416
 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:431
 #, c-format
 msgid "I/O Error: %s"
 msgstr "输入输出错误：%s"
@@ -15124,7 +15463,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:452
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 POP 密码"
@@ -15132,7 +15471,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:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -15144,7 +15484,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:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "没有文件夹“%s”。"
@@ -15156,7 +15496,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:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -15169,10 +15509,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 +15527,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 +15535,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 +15543,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 +15551,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 +15559,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,190 +15595,228 @@ 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:300
 #, 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:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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:336
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "邮件的格式可能不正确"
+
+# camel/providers/smtp/camel-smtp-transport.c:779
+# camel/providers/smtp/camel-smtp-transport.c:791
+# camel/providers/smtp/camel-smtp-transport.c:779
+# 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:350
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "AUTH 请求超时： %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:365
+#, 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
+#: camel/providers/smtp/camel-smtp-transport.c:458
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP 服务器 %s 并不支持请求的认证类型 %s"
@@ -15453,7 +15824,7 @@ 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:496
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 SMTP 密码"
@@ -15461,7 +15832,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:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -15475,7 +15846,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:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 服务器 %s"
@@ -15483,57 +15854,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:644
 #, 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:662
 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:667 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:678
 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:688
 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:838
 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:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELLO 请求超时： %s： 非致命"
@@ -15541,7 +15905,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:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELLO 应答错误： %s： 非致命"
@@ -15549,14 +15913,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:937
 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:943
 msgid "Error creating SASL authentication object."
 msgstr "创建 SASL 认证对象错误。"
 
@@ -15566,8 +15930,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:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH 请求超时： %s"
@@ -15575,21 +15939,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:981
 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:1042
 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:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM 请求超时： %s： 邮件未发送"
@@ -15597,20 +15961,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:1081
 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:1105
 #, 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:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> 失败"
@@ -15618,7 +15982,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:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA 请求超时： %s： 邮件未发送"
@@ -15629,7 +15993,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:1171
 msgid "DATA response error"
 msgstr "DATA 应答错误"
 
@@ -15639,8 +16003,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:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA 发送超时： 消息终止： %s： 邮件未发送"
@@ -15650,14 +16014,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:1243
 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:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET 请求超时： %s"
@@ -15665,14 +16029,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:1280
 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:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT 请求超时： %s： 非致命"
@@ -15680,7 +16044,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:1317
 msgid "QUIT response error"
 msgstr "QUIT 应答错误"
 
@@ -15727,7 +16091,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 +16164,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:333
 msgid "Click here for the address book"
 msgstr "点击此处以使用地址簿"
 
@@ -15817,7 +16181,7 @@ msgstr "点击此处以使用地址簿"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "发件人："
 
@@ -15827,7 +16191,7 @@ msgstr "发件人："
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "回复到："
 
@@ -15837,53 +16201,55 @@ msgstr "回复到："
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 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:394
 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:395
 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:398
 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:399
 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:402
 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:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
-msgstr "输入将接收该邮件副本，但不出现在收件人列表中的收件人地址。"
+msgstr ""
+"输入将接收该邮件副本，但不出现在收件人列表中的收件�"
+"�地址。"
 
 # composer/e-msg-composer-select-file.c:228
 # ui/evolution-message-composer.xml.h:2
@@ -15891,7 +16257,7 @@ 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 "附件一个文件"
@@ -15899,7 +16265,7 @@ msgstr "附件一个文件"
 # 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:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -15908,31 +16274,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:967
 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:971
 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:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "保存文件错误： %s"
@@ -15940,7 +16299,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:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "读入文件错误： %s"
@@ -15948,7 +16307,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:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "访问文件错误： %s"
@@ -15956,14 +16315,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:1051
 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:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -15975,7 +16334,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:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -15987,7 +16346,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:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -15999,7 +16358,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:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -16010,7 +16369,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:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -16023,35 +16382,35 @@ 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:1341
 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:1364
 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:1513
 msgid "Insert File"
 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:2049 composer/e-msg-composer.c:2648
 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:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -16062,7 +16421,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:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -16073,7 +16432,7 @@ 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 +16443,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 +16531,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:2247
+#: 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 +16712,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:191
 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 +16766,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 +16774,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 +16784,63 @@ 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:1027
 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
 #. 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 +16850,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:1633 mail/mail-account-gui.c:1647
 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 +16865,342 @@ 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-part.c:518 shell/evolution-test-component.c:47
 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
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion 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 "伯利兹"
+
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "含有"
 
-# filter/libfilter-i18n.h:6
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "复制到文件夹"
 
-# filter/libfilter-i18n.h:7
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "接收日期"
 
-# filter/libfilter-i18n.h:8
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "发送日期"
 
-# filter/libfilter-i18n.h:10
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "已删除"
 
-# filter/libfilter-i18n.h:11
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "不含有"
 
-# filter/libfilter-i18n.h:12
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "不以之结尾"
 
-# filter/libfilter-i18n.h:13
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "不存在"
 
-# filter/libfilter-i18n.h:14
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "听起来不像"
 
-# filter/libfilter-i18n.h:15
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "不以之开始"
 
-# filter/libfilter-i18n.h:16
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "不存在"
 
-# filter/libfilter-i18n.h:17
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "草稿"
 
-# filter/libfilter-i18n.h:18
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "以之结束"
 
-# filter/libfilter-i18n.h:19
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr "执行 Shell 命令"
 
-# filter/libfilter-i18n.h:20
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "存在"
 
-# filter/libfilter-i18n.h:21
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "存在"
 
-# filter/libfilter-i18n.h:22
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "表达式"
 
-# filter/libfilter-i18n.h:23
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "重要"
 
-# filter/libfilter-i18n.h:24
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "是"
 
-# filter/libfilter-i18n.h:25
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "以后"
 
-# filter/libfilter-i18n.h:26
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:29
 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:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "已标志"
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "大于"
 
-# filter/libfilter-i18n.h:28
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "小于"
 
-# filter/libfilter-i18n.h:29
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:33
 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:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "已标志"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "邮件列表"
 
-# filter/libfilter-i18n.h:31
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "邮件体"
 
-# filter/libfilter-i18n.h:32
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr "邮件头"
 
-# filter/libfilter-i18n.h:33
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:38
 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:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "播放声音："
 
-# filter/libfilter-i18n.h:35
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "已读"
 
-# filter/libfilter-i18n.h:36
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "收件人"
 
-# filter/libfilter-i18n.h:37
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "常规表达式匹配"
 
-# filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:43
 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 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:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "发件人"
 
-# filter/libfilter-i18n.h:41
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "设置状态"
 
-# filter/libfilter-i18n.h:42
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "大小 (kB)"
 
-# filter/libfilter-i18n.h:43
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "听起来象"
 
-# filter/libfilter-i18n.h:44
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "来源帐号"
 
-# filter/libfilter-i18n.h:45
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "指定邮件头"
 
-# filter/libfilter-i18n.h:46
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "以之开始"
 
-# filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:53
 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:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 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 +17218,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 +17229,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 +17240,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 +17252,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 +17264,8 @@ 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:101
 msgid "Mail"
 msgstr "邮件"
 
@@ -17269,38 +17305,98 @@ 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
+#: importers/netscape-importer.c:1865
+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,76 +17429,141 @@ 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:101
 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
@@ -17417,57 +17578,57 @@ msgstr "虚拟已删除邮件箱"
 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:118
 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:403
 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:403
 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:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
-msgstr "您的某些邮件设置好像已崩溃，请按顺序检查所有内容。"
+msgstr ""
+"您的某些邮件设置好像已崩溃，请按顺序检查所有内容。"
+
+# mail/mail-callbacks.c:230
+# mail/mail-callbacks.c:230
+# mail/mail-callbacks.c:187
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+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:967
 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:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "邮件(_M)"
 
 # mail/component-factory.c:975
 # mail/component-factory.c:975
@@ -17490,17 +17651,25 @@ msgstr "无法初始化 Evolution 的邮件配置组件。"
 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:1209 mail/component-factory.c:1240
+#, 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:1250
 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:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "“%s”的属性"
@@ -17508,14 +17677,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:344
 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:305 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "无法创建临时目录： %s"
@@ -17523,7 +17692,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:760
 #, c-format
 msgid "%d new"
 msgstr "%d 新"
@@ -17534,21 +17703,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:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 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:765
 #, c-format
 msgid "%d hidden"
 msgstr "隐藏 %d 个"
 
 # mail/folder-browser.c:759
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr "%d 个可见"
@@ -17556,7 +17725,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:772
 #, c-format
 msgid "%d selected"
 msgstr "选择 %d 个"
@@ -17564,7 +17733,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:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d 个未发送"
@@ -17572,7 +17741,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:779
 #, c-format
 msgid "%d sent"
 msgstr "%d 个已发送"
@@ -17580,244 +17749,257 @@ 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:781
 #, 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:1088
+#, 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:1581
 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:1582
 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:1583
 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:1584
 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:1588
 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:1589
 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:1590
 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:1591 mail/folder-browser.c:1935
 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:1609 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:1611
 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:1615 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:1616 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:1617 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:1618
 msgid "_Forward"
 msgstr "转发(_F)"
 
+#: mail/folder-browser.c:1622
+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:1623
+#, 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:1624
+#, 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:1628 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:1629
+#, 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:1630
 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"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 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 "标记为需要回复"
-
-# 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:1636
+#, 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:1640
+#, 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:1641 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)"
+# ui/evolution-mail-message.xml.h:98
+# ui/evolution-mail-message.xml.h:98
+# my-evolution/Locations.h:1192
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+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
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, 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:1653
+#, 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"
-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 "过滤邮件列表"
+#, fuzzy
+msgid "Crea_te Rule From Message"
+msgstr "从消息创建规则(_L)"
 
 # 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:1936
+#, 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:1938
+#, 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:1939
+#, 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
-msgid "Default"
-msgstr "默认"
-
 # mail/folder-info.c:64
 # mail/folder-info.c:64
 # mail/folder-info.c:64
@@ -17853,45 +18035,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,21 +18073,21 @@ 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"
 
@@ -17945,128 +18114,122 @@ msgstr "Evolution 新闻编辑器"
 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:738 mail/mail-config.glade.h:161
+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:742 mail/mail-config.glade.h:131
+#, 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
+# mail/mail-config.glade.h:112
+# mail/mail-config.glade.h:112
+# mail/mail-config.glade.h:121
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "路径(_P)："
+
+# 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/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/backend/ebook/e-card-simple.c:82
+# addressbook/gui/contact-editor/e-contact-editor.c:1660
+# addressbook/gui/widgets/e-addressbook-view.c:982
+#: 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 ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"该签名已经被改变，但还没有存储。\n"
-"\n"
-"您希望保存改动吗？"
 
 # 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:1985
 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:212
 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:216
 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:219
 msgid "Really delete account?"
 msgstr "确实删除帐号？"
 
+# mail/mail-accounts.c:194
+# mail/mail-accounts.c:194
+# mail/mail-accounts.c:194
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "禁用"
+
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+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:632 mail/mail-accounts.c:636
 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-autofilter.c:72
-# mail/mail-autofilter.c:72
-# mail/mail-autofilter.c:72
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "邮寄给 %s"
-
-# mail/mail-autofilter.c:215
-# mail/mail-autofilter.c:217
-# mail/mail-autofilter.c:217
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "主题是 %s"
+# mail/mail-config.glade.h:33
+# mail/mail-config.glade.h:33
+# mail/mail-config.glade.h:39
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "已启用"
 
-# mail/mail-autofilter.c:231
-# mail/mail-autofilter.c:233
-# mail/mail-autofilter.c:233
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "邮件来自 %s"
+# 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:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "帐号名(_A)："
 
-# mail/mail-autofilter.c:287
-# mail/mail-autofilter.c:289
-# mail/mail-autofilter.c:289
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "%s 邮件列表"
+# 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:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "波多黎各"
 
 # mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
 # mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
@@ -18078,7 +18241,7 @@ 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:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -18093,7 +18256,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:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -18104,7 +18267,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:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -18112,34 +18275,29 @@ 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:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
-msgstr "您正在发送 HTML 格式的消息，当以下收件人不希望接收 HTML 格式的邮件：\n"
+msgstr ""
+"您正在发送 HTML 格式的消息，当以下收件人不希望接收 "
+"HTML 格式的邮件：\n"
 
 # mail/mail-callbacks.c:280
 # mail/mail-callbacks.c:280
 # mail/mail-callbacks.c:237
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:209
 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:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -18150,25 +18308,25 @@ 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:295
 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:370
 # mail/mail-callbacks.c:327
-#: mail/mail-callbacks.c:327
+#: mail/mail-callbacks.c:299
 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:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -18180,21 +18338,21 @@ 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:408
 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:497
 msgid "You must configure an account before you can send this email."
 msgstr "在您能够发送该邮件之前您必须配置一个帐号。"
 
 # composer/e-msg-composer.c:1068
 # mail/mail-callbacks.c:716
 # mail/mail-callbacks.c:668
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -18205,35 +18363,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:977
 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:981
 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:1433 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:1435 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:2091
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "您确信您需要编辑所有的 %d 个消息？"
@@ -18241,7 +18399,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:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -18252,7 +18410,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:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -18263,7 +18421,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:2169
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "您确信您希望重新发送所有的 %d 个消息？"
@@ -18271,43 +18429,67 @@ 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:2195
 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:2240 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:2294
 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:2296
 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:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "显示下一个未读文件"
+
+#: mail/mail-callbacks.c:2373
+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:2615
 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:2250
 # mail/mail-callbacks.c:2369
 # mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:2419
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -18319,14 +18501,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:2740
 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:2783
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d 页，共 %d 页"
@@ -18334,27 +18516,27 @@ 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:2836
 msgid "Print Message"
 msgstr "打印消息"
 
 # mail/mail-callbacks.c:2492
 # mail/mail-callbacks.c:2569
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2863
 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:2901
 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:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "您确信您希望在单独的窗口中打开所有的 %d 个消息？"
@@ -18368,7 +18550,8 @@ msgid ""
 "below do not need to be filled in,\n"
 "unless you wish to include this information in email you send."
 msgstr ""
-"请在下面输入您的名字和电子邮件地址。“可选”域可以不填写，\n"
+"请在下面输入您的名字和电子邮件地址。“可选”域可以�"
+"�填写，\n"
 "除非您希望在您发送的邮件中含有这些信息。"
 
 # mail/mail-config-druid.c:148
@@ -18380,7 +18563,8 @@ msgid ""
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"请在下面输入您的接收邮件服务器的信息。如果您不能确定，\n"
+"请在下面输入您的接收邮件服务器的信息。如果您不能确�"
+"�，\n"
 "请询问您的系统管理员或互联网服务提供商。"
 
 # mail/mail-config-druid.c:150
@@ -18415,7 +18599,8 @@ msgid ""
 "space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"您基本上完成了邮件配置过程。身份标识、邮件接收服务器和您提供\n"
+"您基本上完成了邮件配置过程。身份标识、邮件接收服务�"
+"�和您提供\n"
 "的邮件发送传输方法将组合起来构成 Evolution 邮件帐号。\n"
 "请在下面输入该帐号的名称。\n"
 "该名称仅用于显示。"
@@ -18424,22 +18609,46 @@ 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:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帐号助手"
 
-# mail/mail-config.c:326
-# mail/mail-config.c:329
-# mail/mail-config.c:354
-#: mail/mail-config.c:354
-#, c-format
-msgid "Account %d"
-msgstr "帐号 %d"
+# my-evolution/Locations.h:508
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "科克"
+
+# my-evolution/Locations.h:1795
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, 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:77 mail/mail-config.glade.h:127
+#, 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:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "之后"
 
 # mail/mail-config.c:1860
 # mail/mail-config.c:1902
 # mail/mail-config.c:1995
-#: mail/mail-config.c:1995
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -18450,174 +18659,263 @@ msgstr ""
 "%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:2719
 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:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 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-config.c:2999
+#, fuzzy
+msgid "Unnamed"
+msgstr "未命名的联系人"
+
+#: mail/mail-config.c:3177
+msgid "Cannot execute signature script"
+msgstr ""
+
+# mail/folder-browser.c:734 mail/folder-browser.c:739
+# mail/folder-browser.c:761
+# mail/folder-browser.c:754 mail/folder-browser.c:762
+# mail/folder-browser.c:765
+# mail/folder-browser.c:755 mail/folder-browser.c:763
+# mail/folder-browser.c:766
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " "
+msgstr "， "
+
+# 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
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid " Edit "
+msgstr "编辑(_E)"
+
+# widgets/misc/e-charset-picker.c:101
+# widgets/misc/e-charset-picker.c:101
+# 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
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid " New "
+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:4
 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
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(在该版本的 evolution 中不支持SSL)"
 
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(在该版本的 evolution 中不支持SSL)"
 
 # mail/mail-config.glade.h:4
 # mail/mail-config.glade.h:4
 # mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:7
 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 "帐号"
+# mail/mail-config.c:326
+# mail/mail-config.c:329
+# mail/mail-config.c:354
+#: mail/mail-config.glade.h:8
+#, 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:9
 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:10 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 ""
-
+# shell/e-activity-handler.c:202
+# shell/e-activity-handler.c:202
+# shell/e-activity-handler.c:202
 #: mail/mail-config.glade.h:11
-msgid "Always _carbon-copy (Cc) to:"
-msgstr ""
+#, fuzzy
+msgid "Advanced Options"
+msgstr "取消操作"
 
-# mail/mail-config.glade.h:9
-# mail/mail-config.glade.h:9
-# mail/mail-config.glade.h:9
+# calendar/zones.h:35
+# my-evolution/Locations.h:123
 #: mail/mail-config.glade.h:12
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "当发送加密邮件时总是加密到自身(_E)"
+#, fuzzy
+msgid "Afrikaans"
+msgstr "阿肯色州"
+
+# mail/mail-config.glade.h:4
+# mail/mail-config.glade.h:4
+# mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "当发送加密邮件时总是对自身加密(_L)"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:4
+# addressbook/gui/contact-editor/fulladdr.glade.h:4
+# my-evolution/Locations.h:45
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Alerts"
+msgstr "阿尔伯达"
 
 # 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:15
+#, fuzzy
+msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "当使用该帐号的时候总是签名发送的邮件(_S)"
 
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:15
+# addressbook/gui/contact-editor/fulladdr.glade.h:15
+# my-evolution/Locations.h:121
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+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:20
+#, 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:21 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:22
 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:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "自动检查新邮件(_A)"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+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:26
+#, 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:27
+#, fuzzy
+msgid "C_olors"
+msgstr "关闭(_L)"
 
 # 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 "撰写器"
-
 # 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:29
 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:30
 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:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -18633,431 +18931,580 @@ msgstr ""
 "\n"
 "点击“完成”以便保存您的设置。"
 
+# addressbook/gui/contact-editor/fulladdr.glade.h:18
+# addressbook/gui/contact-editor/fulladdr.glade.h:18
+# my-evolution/Locations.h:181
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Dari"
+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:39
+#, 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:40
+#, 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:41
+#, 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:43
 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:44
+#, 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:45 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:46
+#, 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:47
 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 "编辑..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+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 "已启用"
+# 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 "东"
+
+# 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:53
 msgid "Execute Command..."
 msgstr "执行命令..."
 
+#: mail/mail-config.glade.h:54
+#, 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:55
+#, 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:56
+#, 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:57
 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:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "突出显示引文，使用(_H)"
+
+# calendar/zones.h:358
+# my-evolution/Locations.h:948
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "火奴鲁鲁"
 
 # 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)"
+#: 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:77
 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:78
+#, fuzzy
+msgid "News Servers"
+msgstr "新闻来源(_N)"
+
+#: mail/mail-config.glade.h:80
+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:81
 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:82
+#, 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:83
 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:87
 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:88
+#, 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:89
 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:90
+#, 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:91
 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:92
+#, 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:93
 msgid "Quoted"
 msgstr "已引用"
 
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+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 "安全"
+
+# my-evolution/metar.c:137
+# my-evolution/metar.c:137
+# my-evolution/Locations.h:2115
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "Same as text"
+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:105
 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:106
+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:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+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:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "选择 PGP 二进制数"
 
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "签名文件："
+
+# 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:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "删除签名以外的所有内容"
+
 # 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:113 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:115
 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:116
 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:117
 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:118
 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:119
 msgid "Server _Type: "
 msgstr "服务器类型(_T)："
 
-# 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:"
-msgstr "签名文件："
+# shell/e-shortcuts.c:1043
+# shell/e-shortcuts.c:1043
+# shell/e-shortcuts.c:1043
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "快捷方式"
+
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1036
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+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:122
 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:123
 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:124
+#, fuzzy
+msgid "Specify _filename:"
 msgstr "指定文件名："
 
+#: mail/mail-config.glade.h:125
+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:126
 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:128
+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:102
+# mail/mail-config.glade.h:102
+# mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "HTML 签名(_H)："
+
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+#: mail/mail-config.glade.h:132
+#, 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:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -19067,216 +19514,351 @@ msgstr ""
 "\n"
 "点击 “下一步” 以便开始。"
 
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "东"
+
 # 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:140
 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:141
 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:142
 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:143
 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:144
 msgid "_Automatically check for new mail"
 msgstr "自动检查新邮件(_A)"
 
+# mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:145
+#, 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:146
 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:147
+msgid "_Color for misspelled words: "
+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)"
+# mail/mail-config.glade.h:16
+# mail/mail-config.glade.h:16
+# mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "当删除文件夹时进行提示"
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "默认"
+
+# mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:151
+#, fuzzy
+msgid "_Do not notify me when new mail arrives"
+msgstr "新邮件到达时不要提醒我"
+
+#: mail/mail-config.glade.h:153
+msgid "_Enable spell checking"
+msgstr ""
+
+# shell/e-shell-importer.c:612
+# shell/e-shell-importer.c:612
+# shell/e-shell-importer.c:623
+#: mail/mail-config.glade.h:154
+#, fuzzy
+msgid "_Filename:"
+msgstr "文件名："
+
+#: mail/mail-config.glade.h:155
+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:156
+#, 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:157
 msgid "_Full name:"
 msgstr "全名(_F)："
 
+# mail/mail-config.glade.h:38
+# mail/mail-config.glade.h:38
+# mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "在 HTML 邮件中"
+
 # 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:"
+#: mail/mail-config.glade.h:160
+#, fuzzy
+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: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:162
+#, fuzzy
+msgid "_Identity"
+msgstr "标识"
 
-# 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)："
+# calendar/gui/dialogs/meeting-page.etspec.h:6
+# calendar/gui/e-meeting-time-sel.etspec.h:6
+# calendar/gui/dialogs/meeting-page.etspec.h:6
+# calendar/gui/e-meeting-time-sel.etspec.h:6
+# calendar/gui/dialogs/meeting-page.etspec.h:6
+# calendar/gui/e-meeting-time-sel.etspec.h:6
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+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:164
 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:165
+#, 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:166
+#, 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:167
 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:168
 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:169
 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:171
+#, 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:172
+#, 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:173
+#, 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)："
+# 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/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/backend/ebook/e-card-simple.c:82
+# addressbook/gui/contact-editor/e-contact-editor.c:1660
+# addressbook/gui/widgets/e-addressbook-view.c:982
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "收音机"
+
+# 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:102
+# mail/mail-config.glade.h:102
+# mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Text Signature:"
+msgstr "HTML 签名(_H)："
+
+# mail/mail-config.glade.h:86
+# mail/mail-config.glade.h:86
+# mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:184
+#, 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:185
+#, 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:186
 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:187
+#, 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:188
 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:190
 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
@@ -19343,28 +19925,36 @@ 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 +19962,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 +19970,56 @@ 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 "装入邮件内容"
 
 # mail/mail-display.c:1602
 # mail/mail-display.c:1628
 # mail/mail-display.c:1657
-#: mail/mail-display.c:1657
+#: mail/mail-display.c:1832
 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:1833
 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:1835
 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:1837
 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:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
@@ -19437,92 +20027,74 @@ 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:647
 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:730 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:822
 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:865 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:869
 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:874 mail/message-list.etspec.h:13
 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:879
 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:884
 msgid "Bcc"
 msgstr "密件抄送"
 
-# mail/mail-format.c:1813
-# mail/mail-format.c:1749
-# mail/mail-format.c:1768
-#: mail/mail-format.c:1767
-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-format.c:1844
-# mail/mail-format.c:1780
-# mail/mail-format.c:1799
-#: mail/mail-format.c:1798
-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
-msgid "This message is digitally signed but can not be proven to be authentic."
-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:915
+#, fuzzy
+msgid "Mailer"
+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:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
@@ -19530,7 +20102,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:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
@@ -19538,7 +20110,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:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
@@ -19546,7 +20118,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:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
@@ -19554,7 +20126,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:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
@@ -19562,21 +20134,21 @@ 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:2167
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
 
 # mail/mail-local.c:626
 # mail/mail-local.c:626
 # mail/mail-local.c:626
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 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:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -19588,7 +20160,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:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "无法把文件夹元信息保存到 %s： %s"
@@ -19596,7 +20168,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:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "无法删除文件夹元信息 %s： %s"
@@ -19604,7 +20176,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:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "将文件夹格式从“%s”改为“%s”"
@@ -19612,7 +20184,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:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "由于 %s 不是本地文件夹，因此不能重新配置"
@@ -19620,7 +20192,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:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -19631,14 +20203,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:1405
 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:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "重新配置 /%s"
@@ -19677,28 +20249,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 +20278,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 +20286,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 +20294,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:837
 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:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "把邮件移动到 %s"
@@ -19744,7 +20316,7 @@ 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:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "把邮件复制到 %s"
@@ -19752,44 +20324,36 @@ msgstr "把邮件复制到 %s"
 # mail/mail-ops.c:895
 # mail/mail-ops.c:897
 # mail/mail-ops.c:940
-#: mail/mail-ops.c:940
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "正在移动"
 
 # mail/mail-ops.c:898
 # mail/mail-ops.c:900
 # mail/mail-ops.c:943
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:947
 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:1057
 #, 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:1240
 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:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "正在打开文件夹 %s"
@@ -19797,7 +20361,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:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "正在打开存储 %s"
@@ -19805,7 +20369,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:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "正在删除文件夹“%s”"
@@ -19813,7 +20377,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:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "正在存储文件夹“%s”"
@@ -19821,21 +20385,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:1569
 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:1605
 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:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "正在检索邮件 %s"
@@ -19843,7 +20407,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:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "正在检索 %d 个邮件"
@@ -19851,7 +20415,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:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "正在保存 %d 个邮件"
@@ -19859,7 +20423,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:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -19871,7 +20435,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:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -19883,14 +20447,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:2021
 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:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -19902,7 +20466,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:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "无法写数据： %s"
@@ -19910,7 +20474,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:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "断开与 %s 的连接"
@@ -19918,13 +20482,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:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新与 %s 连接"
 
 # mail/mail-ops.c:2233
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "正在执行 shell 命令：%s"
@@ -19932,7 +20496,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 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "搜索(_S)"
 
@@ -19995,14 +20559,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 +20574,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 +20582,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,35 +20590,35 @@ 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
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "已取消"
 
@@ -20080,22 +20644,46 @@ 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:79
+#, 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:172
+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:178
+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:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "签名文件："
 
 # 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,14 +20691,14 @@ 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 "已转发邮件"
 
@@ -20142,13 +20730,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-# mail/mail-vfolder.c:728
-# mail/mail-vfolder.c:728
-# mail/mail-vfolder.c:728
-#: mail/mail-vfolder.c:728
-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
@@ -20181,14 +20762,14 @@ 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:210
 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:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - 邮件"
@@ -20196,129 +20777,225 @@ 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:672
 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:673
 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:674
 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:675
 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:676
 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:680
 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:681
 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:685
 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:686
 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:991
 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:998
 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:1007
 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:1019
 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:1029
 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:2396
 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 ""
+
 # 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:8
 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:10
 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-calendar.xml.h:15
+# ui/evolution-calendar.xml.h:15
+# ui/evolution-calendar.xml.h:15
+#: 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 +21035,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 +21109,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
@@ -35779,59 +36500,68 @@ 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:151
 msgid "Mail summary"
 msgstr "邮件概要"
 
+# mail/mail-vfolder.c:728
+# mail/mail-vfolder.c:728
+# mail/mail-vfolder.c:728
+#. 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 "虚拟文件夹"
+
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
+#: my-evolution/e-summary-mail.c:761
+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,53 +36573,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:81
-#: my-evolution/e-summary-weather.c:606
+#: my-evolution/e-summary-preferences.c:92
+#: 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:471
 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:492
 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:720
 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:728
 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
+#: my-evolution/e-summary-preferences.c:732
 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
@@ -35902,49 +36625,88 @@ 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:444
 msgid "News Feed"
 msgstr "新闻来源"
 
+# my-evolution/Locations.h:1354
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+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
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "添加(_A)"
+
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr "删除(_R)"
+
+# my-evolution/Locations.h:2063
+#: my-evolution/e-summary-shown.c:487 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,21 +36715,21 @@ 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 "打印概要失败"
 
@@ -35978,58 +36740,6 @@ msgstr "打印概要失败"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "实施概要组件无法初始化 Bonobo。\n"
 
-# my-evolution/metar.c:29
-# my-evolution/metar.c:29
-#: my-evolution/metar.c:29
-msgid " F"
-msgstr " 华氏度"
-
-# my-evolution/metar.c:29
-# my-evolution/metar.c:29
-#: my-evolution/metar.c:29
-msgid " C"
-msgstr " 摄氏度"
-
-# addressbook/printing/e-contact-print.glade.h:8
-# my-evolution/metar.c:33
-# my-evolution/metar.c:33
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr "节"
-
-# my-evolution/metar.c:33
-# my-evolution/metar.c:33
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "kph"
-
-# mail/mail-ops.c:895
-# my-evolution/metar.c:38
-# my-evolution/metar.c:38
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "英寸汞柱"
-
-# my-evolution/metar.c:38
-# my-evolution/metar.c:38
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "毫米汞柱"
-
-# mail/mail-callbacks.c:2262
-# my-evolution/metar.c:41
-# my-evolution/metar.c:41
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "英里"
-
-# mail/mail-callbacks.c:2262
-# my-evolution/metar.c:41
-# my-evolution/metar.c:41
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "公里"
-
 # my-evolution/metar.c:44
 # my-evolution/metar.c:44
 # my-evolution/metar.c:44
@@ -38012,276 +38722,207 @@ 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: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:4
 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:5
 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:6
 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:7
 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:8
 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:9
 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:10
 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:11
 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:12
 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:13
 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:14
 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:15
 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:16
 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:17
 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:18
 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:19
 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:20
 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:21
 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:22
 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:23
 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 default folders."
+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-config.glade.h:83
+# mail/mail-config.glade.h:83
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+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 default folders"
+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-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
-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
-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 "本地文件夹"
-
 # 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 +38933,23 @@ 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 "请点击“确认”以安装文件，或者点击“取消”以便退出。"
+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 +38963,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 +38975,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 +38988,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 +39001,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 +39015,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 +39028,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 +39045,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 +39055,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 +39062,52 @@ msgstr "版权所有 1999，2000，2001 Ximian 公司。"
 msgid "Brought to you by"
 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 +39115,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:326
 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:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "给出一个文件夹以便将文件夹“%s”移动进去："
@@ -38480,14 +39130,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:373
 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:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -38499,7 +39149,7 @@ 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:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "删除“%s”"
@@ -38508,7 +39158,7 @@ msgstr "删除“%s”"
 # 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
+#: shell/e-shell-folder-commands.c:425
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "您确认您要删除文件夹“%s”？"
@@ -38516,7 +39166,7 @@ msgstr "您确认您要删除文件夹“%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:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -38528,7 +39178,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:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "把文件夹“%s”重命名为："
@@ -38536,7 +39186,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:556
 msgid "Rename folder"
 msgstr "重命名文件夹"
 
@@ -38546,7 +39196,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:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -38567,7 +39217,7 @@ 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 - 创建新文件夹"
 
@@ -38592,7 +39242,7 @@ 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 "(无标题)"
 
@@ -38614,9 +39264,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:799
 # shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
@@ -38856,8 +39508,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:506
+#: shell/e-shell-user-creatable-items-handler.c:551
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "新建"
@@ -38893,99 +39545,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:168
 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:176
 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:218
 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:444
 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:445
 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:565
 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:566
 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:732
 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:745 ui/evolution.xml.h:57
 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:758 ui/evolution.xml.h:32
 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 +39630,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 +39645,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:169
+#, 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:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "无法设置本地存储 -- %s"
@@ -39031,7 +39683,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:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -39042,31 +39694,47 @@ msgstr ""
 " 组件已经意外退出了。为了重新访问数据\n"
 "您需要退出 Evolution 并重新启动。"
 
+# calendar/gui/e-itip-control.c:788 calendar/gui/e-itip-control.c:807
+# calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:833
+# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:861
+# shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
+# calendar/gui/e-itip-control.c:788 calendar/gui/e-itip-control.c:807
+# calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:833
+# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:861
+# shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
+# calendar/gui/e-itip-control.c:791 calendar/gui/e-itip-control.c:810
+# 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
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+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:2135
 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:2137
 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:2139
 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:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "通用错误"
 
@@ -39267,124 +39935,122 @@ 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-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-shortcuts.c:1033
+msgid "Inbox"
+msgstr "收件箱"
 
-# 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 "无法以那个名字创建文件夹"
 
@@ -39400,10 +40066,13 @@ msgstr "%s (...)"
 # shell/e-task-widget.c:196
 # shell/e-task-widget.c:196
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+#: shell/evolution-folder-selector-button.c:84
+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 +40122,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:1045
 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:1047
 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:1049
 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:1051
 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:1053
 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:1055
 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:1057
 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:1059
 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:1061
 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:1063
 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:1067
 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:1069
 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:1073
 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:1075
 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:1077
 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:47
 msgid "Test type"
 msgstr "测试类型"
 
@@ -39764,28 +40433,28 @@ 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:89
 msgid "Evolution"
 msgstr "Evolution"
 
 # shell/main.c:89
 # shell/main.c:89
 # shell/main.c:89
-#: shell/main.c:89
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution 正在退出 ..."
 
 # shell/main.c:210
 # shell/main.c:210
 # shell/main.c:210
-#: shell/main.c:210
+#: shell/main.c:227
 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:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "无法初始化 Ximian Evolution shell： %s"
@@ -39793,21 +40462,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:317
 msgid "Disable splash screen"
 msgstr "禁用启动屏幕"
 
+# importers/netscape-importer.c:897
+# importers/netscape-importer.c:897
+# importers/netscape-importer.c:897
+#: shell/main.c:318
+#, 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:319
+#, 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:320
 msgid "Send the debugging output of all components to a file."
 msgstr "把所有成员的调试输出发送到一个文件中。"
 
+#: shell/main.c:338
+#, 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:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "无法初始化 Bonobo 成员系统。"
 
@@ -39847,134 +40539,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 +40706,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-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
 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 +40726,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
@@ -40334,13 +40955,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 +40962,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 +40987,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 +41027,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:40
 msgid "_File"
 msgstr "文件(_F)"
 
@@ -40437,6 +41061,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 +41083,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)"
 
@@ -40554,6 +41185,13 @@ msgstr "为此项调度会议"
 msgid "Customise My Evolution"
 msgstr "定制我的 Evolution"
 
+# 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
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "取消"
+
 # ui/evolution-mail-global.xml.h:2
 # ui/evolution-mail-global.xml.h:2
 # ui/evolution-mail-global.xml.h:2
@@ -40568,143 +41206,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 +41455,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:41
 msgid "_Folder"
 msgstr "文件夹(_F)"
 
@@ -40898,255 +41487,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 +41773,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 +41791,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 +41837,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 +41852,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 +42128,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:55
 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 +42204,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:36
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -41577,7 +42216,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:56
 msgid "_View"
 msgstr "查看(_V)"
 
@@ -41619,14 +42258,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 +42290,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 +42363,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 +42406,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 +42529,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 +42547,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:44
 msgid "_Help"
 msgstr "帮助(_H)"
 
@@ -42002,68 +42645,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
@@ -42177,195 +42815,203 @@ msgstr "在新窗口中打开"
 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:21
+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:22
+#, 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:23
 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:24
 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:25
 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:26
 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:27
 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:28
 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:29
 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:30
 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:31
 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:33
 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:34
 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:38
 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:42
 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:43
 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:45
 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:46
 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:47
 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:48
 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:49
 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:50
 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:52
+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:53
 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:54
 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 +43033,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 +43124,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:268
 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:324
+#, fuzzy
+msgid "Custom View"
+msgstr "当前视图(_C)"
+
+#: widgets/menus/gal-view-menus.c:333
+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:346
 msgid "Define Views"
 msgstr "定义视图"
 
@@ -42629,7 +43300,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 +43308,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,39 +43336,33 @@ 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:97
+#, 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:98
+#, 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 "全部显示"
-
 # widgets/misc/e-messagebox.c:152
 # widgets/misc/e-messagebox.c:152
 # widgets/misc/e-messagebox.c:152
@@ -42705,6 +43370,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 +43402,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:477
+#, 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:478
+#, 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:835
+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:837
 msgid "Find Now"
 msgstr "立即查找"
 
@@ -42784,6 +43477,1588 @@ 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-storage.c:167
+# addressbook/gui/component/addressbook-storage.c:167
+# addressbook/gui/component/addressbook-storage.c:168
+#~ msgid "Other Contacts"
+#~ msgstr "其他联系人"
+
+# addressbook/gui/component/addressbook.c:804
+# addressbook/gui/component/addressbook.c:804
+# addressbook/gui/component/addressbook.c:837
+#~ msgid "Name contains"
+#~ msgstr "名称含有"
+
+# shell/e-shell-view.c:1587
+# addressbook/gui/component/e-address-popup.c:178
+# addressbook/gui/component/e-address-popup.c:178
+#~ msgid "(none)"
+#~ 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 "显示符合以下条件的联系人："
+
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr "您确定要删除该联系人吗？"
+
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#~ msgid "Starting:"
+#~ msgstr "开始："
+
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#~ msgid "Ending:"
+#~ 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: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.etspec.h:2
+# calendar/gui/e-meeting-time-sel.etspec.h:2
+# calendar/gui/dialogs/meeting-page.etspec.h:2
+# calendar/gui/e-meeting-time-sel.etspec.h:2
+# calendar/gui/dialogs/meeting-page.etspec.h:2
+# calendar/gui/e-meeting-time-sel.etspec.h:2
+#~ msgid "Click here to add an attendee"
+#~ msgstr "点击此处添加出席者"
+
+# calendar/gui/e-calendar-table.c:427
+# calendar/gui/e-calendar-table.c:427
+# calendar/gui/e-calendar-table.c:428
+#~ msgid "0%"
+#~ msgstr "0%"
+
+# calendar/gui/e-calendar-table.c:428
+# calendar/gui/e-calendar-table.c:428
+# calendar/gui/e-calendar-table.c:429
+#~ msgid "10%"
+#~ msgstr "10%"
+
+# calendar/gui/e-calendar-table.c:429
+# calendar/gui/e-calendar-table.c:429
+# calendar/gui/e-calendar-table.c:430
+#~ msgid "20%"
+#~ msgstr "20%"
+
+# calendar/gui/e-calendar-table.c:430
+# calendar/gui/e-calendar-table.c:430
+# calendar/gui/e-calendar-table.c:431
+#~ msgid "30%"
+#~ msgstr "30%"
+
+# calendar/gui/e-calendar-table.c:431
+# calendar/gui/e-calendar-table.c:431
+# calendar/gui/e-calendar-table.c:432
+#~ msgid "40%"
+#~ msgstr "40%"
+
+# calendar/gui/e-calendar-table.c:432
+# calendar/gui/e-calendar-table.c:432
+# calendar/gui/e-calendar-table.c:433
+#~ msgid "50%"
+#~ msgstr "50%"
+
+# calendar/gui/e-calendar-table.c:433
+# calendar/gui/e-calendar-table.c:433
+# calendar/gui/e-calendar-table.c:434
+#~ msgid "60%"
+#~ msgstr "60%"
+
+# calendar/gui/e-calendar-table.c:434
+# calendar/gui/e-calendar-table.c:434
+# calendar/gui/e-calendar-table.c:435
+#~ msgid "70%"
+#~ msgstr "70%"
+
+# calendar/gui/e-calendar-table.c:435
+# calendar/gui/e-calendar-table.c:435
+# calendar/gui/e-calendar-table.c:436
+#~ msgid "80%"
+#~ msgstr "80%"
+
+# calendar/gui/e-calendar-table.c:436
+# calendar/gui/e-calendar-table.c:436
+# calendar/gui/e-calendar-table.c:437
+#~ msgid "90%"
+#~ msgstr "90%"
+
+# calendar/gui/e-calendar-table.c:437
+# calendar/gui/e-calendar-table.c:437
+# calendar/gui/e-calendar-table.c:438
+#~ msgid "100%"
+#~ msgstr "100%"
+
+# 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:532
+# calendar/gui/e-itip-control.c:532
+# calendar/gui/e-itip-control.c:535
+#~ 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
+#~ 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
+#~ 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
+#~ 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
+#~ 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
+#~ 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
+#~ 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
+#~ 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
+#~ 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
+#~ msgid "iCalendar Information"
+#~ msgstr "iCalendar 信息"
+
+# calendar/gui/e-itip-control.c:641
+# calendar/gui/e-itip-control.c:641
+# calendar/gui/e-itip-control.c:644
+#~ 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
+#~ msgid "An unknown person"
+#~ msgstr "未知的人"
+
+# calendar/gui/e-itip-control.c:729
+# calendar/gui/e-itip-control.c:729
+# calendar/gui/e-itip-control.c:732
+#~ msgid ""
+#~ "<br> Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr ""
+#~ "<br> 请查看下列信息，并从下面的菜单中选择一个动作。"
+
+# calendar/gui/e-itip-control.c:745
+# calendar/gui/e-itip-control.c:745
+# calendar/gui/e-itip-control.c:748
+#~ 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
+#~ msgid "Status:"
+#~ msgstr "状态："
+
+# calendar/gui/e-itip-control.c:804
+# calendar/gui/e-itip-control.c:804
+# calendar/gui/e-itip-control.c:807
+#~ msgid "Tentatively Accepted"
+#~ msgstr "暂时接受"
+
+# calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:802
+# calendar/gui/e-itip-control.c:818 calendar/gui/e-itip-control.c:831
+# calendar/gui/e-itip-control.c:845 calendar/gui/e-itip-control.c:859
+# calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:802
+# calendar/gui/e-itip-control.c:818 calendar/gui/e-itip-control.c:831
+# calendar/gui/e-itip-control.c:845 calendar/gui/e-itip-control.c:859
+# 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
+#~ 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
+#~ msgid "Update"
+#~ msgstr "更新"
+
+# calendar/gui/e-itip-control.c:803
+# calendar/gui/e-itip-control.c:803
+# calendar/gui/e-itip-control.c:806
+#~ msgid "Accept"
+#~ msgstr "接受"
+
+# calendar/gui/e-itip-control.c:804
+# calendar/gui/e-itip-control.c:804
+# calendar/gui/e-itip-control.c:807
+#~ 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
+#~ msgid "Decline"
+#~ msgstr "否决"
+
+# calendar/gui/e-itip-control.c:819
+# calendar/gui/e-itip-control.c:819
+# calendar/gui/e-itip-control.c:822
+#~ 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
+#~ 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
+#~ msgid "Send Latest Information"
+#~ msgstr "发送最新的信息"
+
+# calendar/gui/e-itip-control.c:875
+# calendar/gui/e-itip-control.c:875
+# calendar/gui/e-itip-control.c:909
+#~ msgid "<b>%s</b> has published meeting information."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ 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
+#~ msgid "Meeting Cancellation"
+#~ msgstr "会议取消"
+
+# calendar/gui/e-itip-control.c:905 calendar/gui/e-itip-control.c:955
+# calendar/gui/e-itip-control.c:990
+# calendar/gui/e-itip-control.c:905 calendar/gui/e-itip-control.c:955
+# 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
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> has published task information."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ 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
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ 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
+#~ 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
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "错误的忙闲信息"
+
+# calendar/gui/e-itip-control.c:1083
+# calendar/gui/e-itip-control.c:1083
+# calendar/gui/e-itip-control.c:1157
+#~ 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
+#~ 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
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "附件中没有可查看的日程项目"
+
+# 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: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
+#~ 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
+#~ 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
+#~ 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
+#~ msgid "Free/Busy information"
+#~ msgstr "忙闲信息"
+
+# calendar/gui/itip-utils.c:321
+# calendar/gui/itip-utils.c:321
+# calendar/gui/itip-utils.c:321
+#~ msgid "Calendar information"
+#~ msgstr "日历信息"
+
+# 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 信息"
+
+# calendar/gui/print.c:2205
+# calendar/gui/print.c:2205
+# calendar/gui/print.c:2205
+#~ msgid "Task"
+#~ msgstr "任务"
+
+# calendar/gui/print.c:2262
+# calendar/gui/print.c:2262
+# calendar/gui/print.c:2262
+#~ msgid "Status: %s"
+#~ msgstr "状态：%s"
+
+# calendar/gui/print.c:2294
+# calendar/gui/print.c:2294
+# calendar/gui/print.c:2294
+#~ msgid "Percent Complete: %i"
+#~ msgstr "完成率：%i"
+
+# calendar/gui/print.c:2306
+# calendar/gui/print.c:2306
+# calendar/gui/print.c:2306
+#~ msgid "URL: %s"
+#~ msgstr "URL：%s"
+
+# calendar/gui/print.c:2320
+# calendar/gui/print.c:2320
+# calendar/gui/print.c:2320
+#~ msgid "Categories: %s"
+#~ msgstr "类别：%s"
+
+# calendar/gui/print.c:2331
+# calendar/gui/print.c:2331
+# calendar/gui/print.c:2331
+#~ msgid "Contacts: "
+#~ 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 "邮件体内容中的无效类型，应该是字符串"
+
+# 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-pkcs7-context.c:677
+#~ msgid "Failed to decrypt: Unknown"
+#~ msgstr "无法解密：未知"
+
+# 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 "根据搜索创建虚拟文件夹"
+
+# 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-accounts.c:149
+# mail/mail-accounts.c:149
+# mail/mail-accounts.c:149
+#~ msgid " (default)"
+#~ 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
+#~ msgid "Mail Settings"
+#~ msgstr "邮件设置"
+
+# mail/mail-autofilter.c:215
+# mail/mail-autofilter.c:217
+# mail/mail-autofilter.c:217
+#~ msgid "Subject is %s"
+#~ msgstr "主题是 %s"
+
+# mail/mail-autofilter.c:231
+# mail/mail-autofilter.c:233
+# mail/mail-autofilter.c:233
+#~ msgid "Mail from %s"
+#~ msgstr "邮件来自 %s"
+
+# mail/mail-autofilter.c:287
+# mail/mail-autofilter.c:289
+# mail/mail-autofilter.c:289
+#~ msgid "%s mailing list"
+#~ msgstr "%s 邮件列表"
+
+# 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: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
+#~ msgid "Drafts"
+#~ 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:35
+# mail/mail-config.glade.h:35
+# mail/mail-config.glade.h:42
+#~ msgid "HTML signature file:"
+#~ msgstr "HTML 签名文件："
+
+# 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: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
+#~ msgid "Sent"
+#~ 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: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-format.c:1813
+# mail/mail-format.c:1749
+# mail/mail-format.c:1768
+#~ 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
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "Evolution 无法识别该类型的带签名邮件。"
+
+# mail/mail-format.c:1844
+# mail/mail-format.c:1780
+# mail/mail-format.c:1799
+#~ 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
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ 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 "邮件概要"
+
+# 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/metar.c:29
+# my-evolution/metar.c:29
+#~ msgid " F"
+#~ msgstr " 华氏度"
+
+# my-evolution/metar.c:29
+# my-evolution/metar.c:29
+#~ msgid " C"
+#~ msgstr " 摄氏度"
+
+# addressbook/printing/e-contact-print.glade.h:8
+# my-evolution/metar.c:33
+# my-evolution/metar.c:33
+#~ msgid "knots"
+#~ msgstr "节"
+
+# my-evolution/metar.c:33
+# my-evolution/metar.c:33
+#~ msgid "kph"
+#~ msgstr "kph"
+
+# mail/mail-ops.c:895
+# my-evolution/metar.c:38
+# my-evolution/metar.c:38
+#~ msgid "inHg"
+#~ msgstr "英寸汞柱"
+
+# my-evolution/metar.c:38
+# my-evolution/metar.c:38
+#~ msgid "mmHg"
+#~ msgstr "毫米汞柱"
+
+# mail/mail-callbacks.c:2262
+# my-evolution/metar.c:41
+# my-evolution/metar.c:41
+#~ msgid "miles"
+#~ msgstr "英里"
+
+# mail/mail-callbacks.c:2262
+# my-evolution/metar.c:41
+# my-evolution/metar.c:41
+#~ msgid "kilometers"
+#~ 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: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: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-local-storage.c:175
+# shell/e-local-storage.c:175
+# shell/e-local-storage.c:175
+#~ msgid "Outbox"
+#~ msgstr "发件箱"
+
+# 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
+#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+#~ msgstr "版权所有 1999，2000，2001 Ximian 公司。"
+
+# shell/e-storage-set-view.c:658
+# shell/e-storage-set-view.c:658
+# shell/e-storage-set-view.c:658
+#~ 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
+#~ 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
@@ -43154,8 +45429,7 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 # 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."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 #~ msgstr "这将连接到 POP 服务器并使用 Kerberos 4 进行认证。"
 
 # camel/providers/pop3/camel-pop3-store.c:198
@@ -43170,16 +45444,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
@@ -43195,12 +45459,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ 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 +45566,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..9947dc0a0f 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-05-07 15:46-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
+#: 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:1731
 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:1716
+#: 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:1717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
 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:1720
 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:1722
 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:1723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
 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:1727
 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:1721
 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:1719
+#: 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:1725
+#: 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:1718
 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:1724
 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:1726
+#: 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:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 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:1729
+#: 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:1730
+#: 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:1732
+#: 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:1733
+#: 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:1759
+#: 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:1760
+#: 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:171 calendar/gui/main.c:63
+#: 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:2732
 #, 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:1123
 #, 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:1226
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "移除名片..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 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:2586
+msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2162
-msgid "Restarting search."
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
+msgid "Receiving LDAP search results..."
 msgstr ""
 
+# executive-summary/component/e-summary.c:940
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "移除名片時發生錯誤"
+
+# camel/camel-url.c:289
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, 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,117 @@ 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/addressbook-config.glade.h:2
 #: 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:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "顯示 Evolution 目錄服務迷你名片之控制項."
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+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:9
 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:10
 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:11
 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:12
 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:13
 msgid "Factory for the Addressbook's address popup"
 msgstr "目錄服務地址彈出選單工廠"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+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:15
 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
+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:72
 #: 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-shortcuts.c:1042
 msgid "Contacts"
 msgstr "連絡人"
 
 # mail/mail-callbacks.c:1349
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 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:74
 #, fuzzy
 msgid "LDAP Server"
 msgstr "NNTP 伺服器："
 
 # mail/mail-callbacks.c:1349
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 #, 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
+#: addressbook/gui/component/addressbook-component.c:562
 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:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "連絡人(_C)"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:565
 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-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)"
-
-# mail/mail-config.glade.h:29
-#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "電子郵件地址："
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-
-# 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."
-msgstr ""
-"此資訊被您的 LDAP 伺服器用來指出那一個節點正被用於搜尋.連絡您的伺服器管理者以"
-"得到更多資訊。"
-
-#: 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 ""
-"這是您在 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)"
-
-# 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)"
-
-# mail/mail-config.glade.h:73
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
-msgstr "伺服器要求驗證(_M)"
-
-# addressbook/gui/component/addressbook-config.c:409
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
-msgstr "通訊埠(_P)："
-
-# 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-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "連絡人清單(_C)"
 
 # addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 # addressbook/backend/ebook/load-pine-addressbook.c:22
@@ -1133,24 +670,18 @@ 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:174 calendar/gui/main.c:135
 msgid "Could not initialize gnome-vfs"
 msgstr "不能始初化 gnome-vfs"
 
-# ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-storage.c:167
-#, 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 +692,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 +704,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,69 +713,61 @@ msgstr ""
 "您是否擁有存取權限。"
 
 # camel/camel-smime-context.c:194
-#: addressbook/gui/component/addressbook.c:623
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
 #, 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:769
+#, 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:770
+#, 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:771
+#: 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:772
+#: 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:773 widgets/misc/e-filter-bar.h:99
 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:1001
+#: 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:1083
 msgid "The URI that the Folder Browser will display"
 msgstr "資料夾瀏覽器顯示之URI"
 
-# shell/e-storage.c:178
-#.
-#. * 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/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:1758
 msgid "Primary Email"
 msgstr "主要電子郵件"
 
@@ -1301,6 +824,709 @@ msgstr "關閉查詢"
 msgid "Enable Queries (Dangerous!)"
 msgstr "啟動查詢(非常危險！)"
 
+# 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"
+
+# camel/providers/imap/camel-imap-store.c:531
+#: 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 ""
+
+# camel/camel-sasl-anonymous.c:131
+#: addressbook/gui/component/addressbook-config.c:1163
+#, fuzzy
+msgid "Could not query for schema information"
+msgstr ""
+"無效的不透明追蹤資訊：\n"
+"%s"
+
+# camel/providers/imap/camel-imap-command.c:487
+#: 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)"
+
+# calendar/gui/e-calendar-table.c:152
+#: addressbook/gui/component/addressbook-config.c:1689
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "完成日期"
+
+# mail/mail-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:1
+#, fuzzy
+msgid "  S_how Supported Bases "
+msgstr " 檢查可支援的類別(_C)"
+
+# addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:2
+#, fuzzy
+msgid "<< Fewer Options"
+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:3
+#, fuzzy
+msgid "<- _Remove"
+msgstr "移除(_R)"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "1234"
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:377
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+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:54
+#: mail/mail-config.glade.h:16
+#, 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:56
+#: mail/mail-config.glade.h:76
+#, 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:55 mail/mail-config.glade.h:136
+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:139
+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:152 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."
@@ -1316,9 +1542,9 @@ msgstr "目錄服務名稱選擇介面工廠"
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
 #: 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 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "移除"
 
@@ -1354,7 +1580,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 +1596,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 +1604,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:1365
 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: calendar/gui/dialogs/task-editor.c:183
 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 +1736,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 +1785,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: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
 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:2343
+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
+#: my-evolution/Locations.h:1190
 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:1198
 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:1218
 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:1234
 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:1268
 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:1297
 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:1387
 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:1470
 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:1531
 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:1560
 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:1562
 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:1574
 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:1587
 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:1632
 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:1673
 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:1683
 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:1688
 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:1723
 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:1764
 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:1791
 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:1824
 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:1836
 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:1912
 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:2035
 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:2090
 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:2103
 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:2104
 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 +2735,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:2119
 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:2127
 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:2176
 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:2181
 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:2183
 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:2205
 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:2321
 msgid "Turkey"
 msgstr "土耳其"
 
@@ -2645,120 +2857,217 @@ 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:2334
 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:2342
 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:2348
 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:2380
 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:2392
 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:2512
 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:2524
 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 "辛巴威"
 
+# addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "刪除連絡人？"
+
+# calendar/gui/dialogs/alarm-notify-dialog.c:207
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#, fuzzy
+msgid "Category editor not available."
+msgstr "沒有描述。"
+
+# addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
+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:1044
+#, fuzzy
+msgid "Save Contact as VCard"
+msgstr "儲存成 VCard 檔案格式"
+
+# addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+# camel/providers/local/camel-local-store.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#, 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: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)："
+
+# 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 +3190,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:234
 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:428
+#, fuzzy
+msgid "Save List as VCard"
+msgstr "儲存成 VCard 檔案格式"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "不管怎樣都新增"
@@ -2936,7 +3254,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 +3269,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:87
 #: 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:1043
 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: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
 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:1071
 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 +3344,347 @@ 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
-#: 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
+#: 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
 msgid "Cancelled"
 msgstr "已取消"
 
 # shell/e-storage.c:467
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 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:59
 #: 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:78
 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:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 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:87
 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:97
 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:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 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:204
+#, 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:205
+#, fuzzy
+msgid "Display Cards"
+msgstr "顯示"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:209
+#, 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 ""
+
+# 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:344
+#, fuzzy
+msgid "Move 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:346
+#, 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:349
+#, 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:351
+#, 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 "其它地址"
 
+# 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:699
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: 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:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "新增連絡人"
+
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "新增連絡人清單"
+
+# ui/evolution.xml.h:52
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "移至資料夾(_G)..."
+
+# shell/e-shell-importer.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "匯入..."
+
+# ui/evolution-addressbook.xml.h:19
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "尋找連絡人(_S)"
+
+# ui/evolution-addressbook.xml.h:16
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "目錄服務來源(_A)..."
+
+# ui/evolution-mail.xml.h:110
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "郵件設定(_M)..."
+
+# ui/evolution-mail.xml.h:35
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: 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:890
+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:891
+#: 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:893
+msgid "Print Envelope"
+msgstr "列印信封"
+
+# mail/folder-browser.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "復製至資料夾(_C)..."
+
+# mail/folder-browser.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, 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:901
+#: 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:902
+#: 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:903
+#: 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: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
+#: 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:907
+#: 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:940
+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:945
+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 +3700,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 +3715,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 +3839,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 "橫向"
 
@@ -3383,11 +3871,13 @@ 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:1672
 msgid "Page"
 msgstr "頁"
 
@@ -3407,7 +3897,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 +3968,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:1207
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "編輯約會(_E)"
@@ -3505,9 +3979,8 @@ 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/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
+#: 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
 msgid "High"
 msgstr "高"
 
@@ -3517,10 +3990,9 @@ 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/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
+#: 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
 msgid "Normal"
 msgstr "普通"
 
@@ -3529,9 +4001,8 @@ 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/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
+#: 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
 msgid "Low"
 msgstr "低"
 
@@ -3539,30 +4010,35 @@ 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
 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,52 +4053,68 @@ 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
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "行事曆與工作設定"
+
+# 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:2
+#: 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:3
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: 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:4
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 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
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 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
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "用作產生行事曆 iTip 檢視控制項的元件工廠。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "用作產生行事曆控制項例子的元件工廠。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "集中式行事曆元件編輯器對話視窗工廠。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr "建立元件編輯器工廠。"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+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"
@@ -3633,31 +4125,12 @@ msgstr "聲音提醒服務"
 msgid "Factory for the alarm notification service"
 msgstr "聲音提醒服務的元件工廠"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-#, fuzzy
-msgid "Starting:"
-msgstr "設定"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-msgid "Ending:"
-msgstr ""
-
 # calendar/gui/event-editor-dialog.glade.h:30
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 #, fuzzy
 msgid "invalid time"
 msgstr "結束時間 (_E)："
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-#, fuzzy
-msgid "Evolution Alarm"
-msgstr "Evolution"
-
 # calendar/gui/e-calendar-table.c:162
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, fuzzy, c-format
@@ -3693,11 +4166,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,20 +4178,35 @@ 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:2608
+#: 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:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "不能初始化 GNOME"
 
@@ -3733,10 +4221,29 @@ msgstr "不能建立聲音提醒服務元件工廠"
 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
+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 +4252,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 +4275,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 +4289,21 @@ 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
 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
 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
 msgid "Public"
 msgstr "公開"
 
@@ -3823,15 +4328,13 @@ 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
 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-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 msgid "Busy"
 msgstr "忙碌"
 
@@ -3839,9 +4342,8 @@ 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
 msgid "Not Started"
 msgstr "未開始"
 
@@ -3849,9 +4351,8 @@ 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
 msgid "In Progress"
 msgstr "進行中"
 
@@ -3859,15 +4360,14 @@ 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-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 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 +4392,38 @@ 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: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
+#: 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:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
 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:310
 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 +4444,100 @@ 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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "行事曆"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 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
+#: calendar/gui/component-factory.c:72 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
 msgid "Tasks"
 msgstr "工作"
 
 # mail/folder-browser.c:871
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 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:695
+#, fuzzy
+msgid "New meeting"
+msgstr "新聞發送伺服器設定"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "會議"
+
+# ui/evolution-tasks.xml.h:3
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "新增工作"
+
+# ui/evolution-tasks.xml.h:9
+#: calendar/gui/component-factory.c:699
+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:703
+#, 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:703
+#, 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:707
+#, 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:707
+#, 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 +4735,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 +4766,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.glade.h:11
 msgid "Summary:"
 msgstr "摘要："
 
@@ -4264,13 +4776,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 +4803,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:189
 msgid "minute(s)"
 msgstr "分"
 
@@ -4339,221 +4850,215 @@ msgstr "過期的工作色彩"
 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)"
-
 # ui/evolution-calendar.xml.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 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/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "星期五"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "小時"
 
 # executive-summary/test-service/rdf-summary.c:806
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 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/cal-prefs-dialog.glade.h:13
+#: 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:16
-msgid "O_verdue tasks:"
-msgstr "過期的工作(_V)："
-
 # 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/cal-prefs-dialog.glade.h:14
+#: 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)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 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
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 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
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 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:19
+#: 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:20
+#, 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:21
 msgid "T_hu"
 msgstr "週四(_H)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 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: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:29
+#: 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:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 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:31
 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:32
 msgid "_24 hour"
 msgstr "_24 小時"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 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:34
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
 
 # calendar/gui/calendar-summary.c:622
 # mail/mail-config.glade.h:24
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "顯示(_D)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 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:37
 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:38
+#: mail/mail-config.glade.h:158
 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:39
 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:40
 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:41
+#, 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:42
 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:46
-msgid "_Task List"
-msgstr "工作清單(_T)"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, 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:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "時間間隔(_V)："
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "週三(_W)"
 
 # calendar/gui/event-editor.c:1612
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "約會開始前"
 
@@ -4593,7 +5098,9 @@ msgstr "這個日誌項目已刪除。"
 #: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  您已經做了些變更。放棄這些變更並且關閉這個編輯器？"
+msgstr ""
+"%s  "
+"您已經做了些變更。放棄這些變更並且關閉這個編輯器？"
 
 #: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
@@ -4615,14 +5122,16 @@ msgstr "這個日誌項目已變更。"
 #: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s 您已經做了些變更。放棄這些變更並且更新這個編輯器？"
+msgstr ""
+"%s "
+"您已經做了些變更。放棄這些變更並且更新這個編輯器？"
 
 #: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 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 +5139,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 +5147,33 @@ 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:322
 #, fuzzy
 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:693
 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:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
@@ -4672,47 +5181,29 @@ 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:701
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:687
+#: calendar/gui/dialogs/comp-editor.c:704
 #, 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:718
 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 "覆蓋檔案？"
-
-# 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
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-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..."
+# composer/e-msg-composer.c:774
+#: 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
+msgid "Save as..."
 msgstr "另存新檔..."
 
-#: calendar/gui/dialogs/comp-editor.c:1270
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "無法取得目前的版本！"
 
@@ -4783,7 +5274,7 @@ 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:185
 msgid "Appointment"
 msgstr "約會"
 
@@ -4799,7 +5290,8 @@ 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:260
+#: calendar/gui/dialogs/event-editor.c:365
 #, fuzzy
 msgid "Scheduling"
 msgstr "會議排程(_M)"
@@ -4807,7 +5299,8 @@ 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:263
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "會議"
 
@@ -4850,59 +5343,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/e-calendar-table.etspec.h:13
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 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:425
 #, fuzzy
 msgid "An organizer is required."
 msgstr "必須指定一個召集人。"
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:623
+#: calendar/gui/dialogs/meeting-page.c:626
 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:701
 msgid "_Delegate To..."
 msgstr "委派給(_D)..."
 
@@ -4912,68 +5420,61 @@ msgstr "委派給(_D)..."
 msgid "Attendee"
 msgstr "到會者"
 
-# calendar/gui/e-calendar-table.c:163
+# calendar/gui/e-calendar-table.c:152
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "按這裡新增到會者"
-
-# calendar/gui/e-calendar-table.c:152
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "普通名稱"
 
 # calendar/gui/e-calendar-table.c:708
 # ui/evolution-task-editor-dialog.xml.h:19
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "委任自"
 
 # calendar/gui/e-calendar-table.c:708
 # ui/evolution-task-editor-dialog.xml.h:19
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "委派給"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "語言"
 
 # calendar/gui/goto-dialog.glade.h:12
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "會員"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:798
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "角色"
 
 # calendar/gui/e-meeting-dialog.glade.h:23
 # 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/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"
 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/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "類別"
@@ -4991,7 +5492,7 @@ 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:453
 msgid "_Invite Others..."
 msgstr "邀請其他人(_I)..."
 
@@ -5000,33 +5501,114 @@ msgstr "邀請其他人(_I)..."
 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:1254
+# addressbook/contact-editor/e-contact-editor.c:1312
+#: 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 +5691,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 +5728,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:740
 msgid "URL:"
 msgstr "網址："
 
@@ -5154,19 +5742,23 @@ msgstr "優先順序(_P)："
 msgid "_Status:"
 msgstr "狀態(_S)："
 
+#: calendar/gui/dialogs/task-editor.c:178
+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:324
 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.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:42
 msgid "Description:"
 msgstr "描述："
 
@@ -5180,173 +5772,103 @@ msgstr "開始日期(_R)："
 msgid "_Due Date:"
 msgstr "到期日(_D)："
 
-# calendar/gui/e-calendar-table.c:367
-#: calendar/gui/e-calendar-table.c:427
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-# calendar/gui/e-calendar-table.c:368
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-# calendar/gui/e-calendar-table.c:369
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-# calendar/gui/e-calendar-table.c:370
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-# calendar/gui/e-calendar-table.c:371
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-# calendar/gui/e-calendar-table.c:372
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-# calendar/gui/e-calendar-table.c:373
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-# calendar/gui/e-calendar-table.c:374
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-# calendar/gui/e-calendar-table.c:375
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-# calendar/gui/e-calendar-table.c:376
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-# calendar/gui/e-calendar-table.c:377
-#: calendar/gui/e-calendar-table.c:437
-#, 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:751 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: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
 msgid "_Open"
 msgstr "開啟(_O)"
 
+# composer/e-msg-composer.c:774
+#: calendar/gui/e-calendar-table.c:973
+#, 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:974 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:978 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:979 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:980 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:984
+#, 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:985
+#, 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:986
 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:987
+#, 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:992
 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:1259 calendar/gui/e-day-view.c:7416
+#: 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.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 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,64 +5876,91 @@ 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:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "完成"
 
 # calendar/gui/e-calendar-table.c:152
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "完成日期"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 # calendar/gui/e-calendar-table.c:155
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "到期日"
 
 # calendar/gui/e-calendar-table.c:153
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "結束日期"
 
 # calendar/gui/e-calendar-table.c:156
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "經緯"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 # calendar/gui/e-calendar-table.c:158
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "優先順序"
 
 # calendar/gui/e-calendar-table.c:154
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "開始日期"
 
 # calendar/gui/e-calendar-table.c:159
 #. 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
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "摘要"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "工作排序"
 
 # calendar/gui/e-calendar-table.c:161
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 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 +5972,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 +5982,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 +5991,7 @@ 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
 msgid "am"
 msgstr "上午"
 
@@ -5451,426 +5999,192 @@ 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
 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:37
+#, 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:1610 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
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Task begins: <b>"
-msgstr ""
-
-# mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:534
-#, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "空閒/忙碌 資訊"
-
-#: calendar/gui/e-itip-control.c:538
-msgid "Begins: <b>"
-msgstr ""
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: calendar/gui/e-itip-control.c:550
-#, fuzzy
-msgid "Meeting ends: <b>"
-msgstr "會議結束時間(_E)："
-
-# mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:553
-#, fuzzy
-msgid "Free/Busy info ends: <b>"
-msgstr "空閒/忙碌 資訊"
-
-#: calendar/gui/e-itip-control.c:557
-msgid "Ends: <b>"
-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
-#: calendar/gui/e-itip-control.c:571
-#, fuzzy
-msgid "Task Completed: <b>"
-msgstr " (已完成)"
-
-#: calendar/gui/e-itip-control.c:581
-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
-#, fuzzy
-msgid "iCalendar Information"
-msgstr "行事曆資訊"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#. Title
-#: calendar/gui/e-itip-control.c:633
-#, 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
-#, fuzzy
-msgid "An unknown person"
-msgstr "不明的寄件者"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:737
-msgid "<i>None</i>"
-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
-#, fuzzy
-msgid "Choose an action:"
-msgstr "選擇一個動作"
-
-#: calendar/gui/e-itip-control.c:779
-#, 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
-msgid "OK"
-msgstr "確認"
-
-#: calendar/gui/e-itip-control.c:795
-#, fuzzy
-msgid "Accept"
-msgstr "接受"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:796
-#, fuzzy
-msgid "Tentatively accept"
-msgstr "暫訂"
-
-#: calendar/gui/e-itip-control.c:797
-#, fuzzy
-msgid "Decline"
-msgstr "婉拒"
-
-# mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:811
-#, fuzzy
-msgid "Send Free/Busy Information"
-msgstr "空閒/忙碌 資訊"
-
-#: calendar/gui/e-itip-control.c:824
-msgid "Update respondent status"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-# widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:838
-#, 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
-msgid "Cancel"
-msgstr "取消"
-
-#: calendar/gui/e-itip-control.c:867
-#, 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
-msgid "Meeting Information"
-msgstr "會議資訊"
-
-#: calendar/gui/e-itip-control.c:872
-#, 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
-msgid "Meeting Proposal"
-msgstr "會議提案"
-
-#: calendar/gui/e-itip-control.c:877
-#, 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
-msgid "Meeting Update"
-msgstr "會議更新"
-
-#: calendar/gui/e-itip-control.c:882
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> 希望收到最新的會議資訊。"
-
-#: calendar/gui/e-itip-control.c:883
-msgid "Meeting Update Request"
-msgstr "會議更新請求"
-
-#: calendar/gui/e-itip-control.c:887
-#, 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
-msgid "Meeting Reply"
-msgstr "會議答覆"
-
-#: calendar/gui/e-itip-control.c:892
-#, 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
-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
-#, 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
-msgid "Bad Meeting Message"
-msgstr "不正確的會議訊息"
-
-#: calendar/gui/e-itip-control.c:917
-#, 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
-msgid "Task Information"
-msgstr "工作資訊"
-
-#: calendar/gui/e-itip-control.c:922
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> 要求您進行工作。"
-
-#: calendar/gui/e-itip-control.c:923
-msgid "Task Proposal"
-msgstr "工作計畫"
-
-#: calendar/gui/e-itip-control.c:927
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b>%s</b> 希望加入一項既存的工作。"
-
-#: calendar/gui/e-itip-control.c:928
-msgid "Task Update"
-msgstr "工作更新"
-
-#: calendar/gui/e-itip-control.c:932
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> 希望收到最新的工作資訊。"
-
-#: calendar/gui/e-itip-control.c:933
-msgid "Task Update Request"
-msgstr "工作更新請求"
-
-#: calendar/gui/e-itip-control.c:937
-#, 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
-msgid "Task Reply"
-msgstr "工作回覆"
-
-#: calendar/gui/e-itip-control.c:942
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> 已經取消工作。"
-
-#: calendar/gui/e-itip-control.c:943
-msgid "Task Cancellation"
-msgstr "工作取消"
-
-# calendar/gui/e-itip-control.glade.h:4
-#: calendar/gui/e-itip-control.c:948
-msgid "Bad Task Message"
-msgstr "不正確的工作訊息"
-
-#: calendar/gui/e-itip-control.c:967
-#, 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
-msgid "Free/Busy Information"
-msgstr "空閒/忙碌 資訊"
-
-#: calendar/gui/e-itip-control.c:972
-#, 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
-msgid "Free/Busy Request"
-msgstr "空閒/忙碌 請求"
-
-#: calendar/gui/e-itip-control.c:977
-#, 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
-msgid "Free/Busy Reply"
-msgstr "空閒/忙碌 回覆"
-
-# mail/mail-callbacks.c:1407
-#: calendar/gui/e-itip-control.c:983
-msgid "Bad Free/Busy Message"
-msgstr "不正確的 空閒/忙碌 訊息"
-
-# camel/providers/local/camel-mbox-folder.c:368
-#: calendar/gui/e-itip-control.c:1052
-#, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "資料夾好像已經損毀並且不能復原。"
-
-#: calendar/gui/e-itip-control.c:1071
-#, fuzzy
-msgid "The message contains only unsupported requests."
-msgstr "這個郵件只包含密件副本收件者。"
-
-#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
-msgid "The attachment does not contain a valid calendar message"
-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:617
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "執行過濾器發生錯誤： %s: %s"
 
-#: calendar/gui/e-itip-control.c:1130
-msgid "The attachment has no viewable calendar items"
-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: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
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: 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:1229
+#: calendar/gui/e-itip-control.c:1564
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "不能傳送這個項目！\n"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1566
 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:1592 calendar/gui/e-itip-control.c:1642
+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:1613
+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:1625
+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"
-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: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:1640
+msgid "Attendee status updated\n"
+msgstr ""
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "移除完成"
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 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:1706 calendar/gui/e-itip-control.c:1758
 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:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "選擇資料夾"
+
+# mail/mail-account-gui.c:682
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "選擇資料夾"
 
 # calendar/gui/e-itip-control.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:2
@@ -5920,104 +6234,83 @@ 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:81
 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:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "出席者"
 
-#: calendar/gui/e-meeting-model.c:96
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "列席者"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:84
 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:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 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:231 calendar/gui/e-meeting-model.c:248
 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:233 calendar/gui/e-meeting-model.c:250
 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:235 calendar/gui/e-meeting-model.c:252
 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:264 calendar/gui/e-meeting-model.c:281
 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:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 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:268 calendar/gui/e-meeting-model.c:285
 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:270 calendar/gui/e-meeting-model.c:287
 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: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:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr "接受"
 
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-model.c:791
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 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:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 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:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "已委派"
 
@@ -6025,7 +6318,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:328 calendar/gui/e-meeting-model.c:351
 msgid "In Process"
 msgstr "進行中"
 
@@ -6033,8 +6326,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:2088
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -6043,8 +6336,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:2118 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 +6349,149 @@ 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:436
 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:437
 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:473
 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:490
 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:503
 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:521
 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:539
 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:556
 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:570
 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:587
 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:600
 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:613
 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:626
 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:649
 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:668
 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/e-calendar-table.c:152
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "完成日期"
+
+# calendar/gui/e-calendar-table.c:714
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "刪除選定的連絡人"
+
+# mail/mail-ops.c:1449
+#: calendar/gui/e-tasks.c:659
+#, 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:1538
 #, 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:1549
 #, 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:1916
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "開啟資料夾 %s"
@@ -6249,227 +6566,227 @@ msgstr "10月"
 msgid "September"
 msgstr "9月"
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:220
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "必須指定一個召集人。"
 
-#: calendar/gui/itip-utils.c:570
+#: calendar/gui/itip-utils.c:617
 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:92
 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,77 +6794,31 @@ 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
-#, fuzzy
-msgid "Task"
-msgstr "工作"
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/print.c:2262
-#, fuzzy, c-format
-msgid "Status: %s"
-msgstr "狀態(_S)："
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: calendar/gui/print.c:2280
-#, fuzzy, c-format
-msgid "Priority: %s"
-msgstr "優先順序(_P)："
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/print.c:2294
-#, fuzzy, c-format
-msgid "Percent Complete: %i"
-msgstr "完成日期："
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: calendar/gui/print.c:2306
-#, fuzzy, c-format
-msgid "URL: %s"
-msgstr "網址："
-
-# addressbook/backend/ebook/e-card.c:3467
-#: calendar/gui/print.c:2320
-#, fuzzy, c-format
-msgid "Categories: %s"
-msgstr ""
-"\n"
-"類別： "
-
-# ui/evolution-addressbook.xml.h:17
-#: calendar/gui/print.c:2331
-#, 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 +6826,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:2894
+#: 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,12 +6853,45 @@ 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:2381
+#: mail/mail-callbacks.c:2622
+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 ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
-msgstr "Evolution 會將行事曆資料夾內的工作轉移至新的工作資料夾"
+msgstr ""
+"Evolution 會將行事曆資料夾內的工作轉移至新的工作資料夾"
 
 # calendar/gui/tasks-migrate.c:109
 #: calendar/gui/tasks-migrate.c:108
@@ -6601,7 +6901,8 @@ 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:121
@@ -6610,7 +6911,9 @@ msgstr ""
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
-msgstr "不能開啟 `%s'；沒有項目可由行事曆資料夾轉移至工作資料夾。"
+msgstr ""
+"不能開啟 "
+"`%s'；沒有項目可由行事曆資料夾轉移至工作資料夾。"
 
 # calendar/gui/tasks-migrate.c:134
 #: calendar/gui/tasks-migrate.c:133
@@ -6619,7 +6922,9 @@ 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:315
 # calendar/gui/weekday-picker.c:410
@@ -6627,141 +6932,1842 @@ 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/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\" 其中之一"
+"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)"
 msgstr ""
-"has-categories? 要求所有的參數為字串或僅有的一個為布林值 false(#f) 的參數"
+"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/zones.h:230
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:231
+msgid "Asia/Manila"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1242
+# addressbook/gui/widgets/e-addressbook-view.c:733
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Muscat"
+msgstr "助理"
+
+#: calendar/zones.h:233
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:234
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+# calendar/gui/calendar-model.c:1578
+#: calendar/zones.h:235
+#, fuzzy
+msgid "Asia/Omsk"
+msgstr "指派工作"
+
+#: calendar/zones.h:236
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:237
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:238
+msgid "Asia/Pyongyang"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: calendar/zones.h:239
+#, fuzzy
+msgid "Asia/Qatar"
+msgstr "卡達"
+
+#: calendar/zones.h:240
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:242
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:243
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:247
+#, fuzzy
+msgid "Asia/Singapore"
+msgstr "新加坡"
+
+#: calendar/zones.h:248
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:251
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:252
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:263
+#, fuzzy
+msgid "Atlantic/Bermuda"
+msgstr "百慕達"
+
+#: calendar/zones.h:264
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:265
+#, fuzzy
+msgid "Atlantic/Cape_Verde"
+msgstr "維德角島"
+
+#: calendar/zones.h:266
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:267
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:268
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:269
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:270
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:273
+#, fuzzy
+msgid "Australia/Adelaide"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:274
+#, fuzzy
+msgid "Australia/Brisbane"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:275
+#, fuzzy
+msgid "Australia/Broken_Hill"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:276
+#, fuzzy
+msgid "Australia/Darwin"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:277
+#, fuzzy
+msgid "Australia/Hobart"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:278
+#, fuzzy
+msgid "Australia/Lindeman"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:279
+#, fuzzy
+msgid "Australia/Lord_Howe"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:280
+#, fuzzy
+msgid "Australia/Melbourne"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:281
+#, fuzzy
+msgid "Australia/Perth"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:282
+#, fuzzy
+msgid "Australia/Sydney"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:283
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:284
+#, 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:285
+#, fuzzy
+msgid "Europe/Athens"
+msgstr "內容"
+
+#: calendar/zones.h:286
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:287
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:288
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:289
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:290
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:296
+#, fuzzy
+msgid "Europe/Gibraltar"
+msgstr "直布羅陀"
+
+#: calendar/zones.h:297
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:300
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:301
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:304
+#, fuzzy
+msgid "Europe/Luxembourg"
+msgstr "盧森堡"
+
+#: calendar/zones.h:305
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/Minsk"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: calendar/zones.h:308
+#, fuzzy
+msgid "Europe/Monaco"
+msgstr "摩納哥"
+
+#: calendar/zones.h:309
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:311
+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:312
+#, fuzzy
+msgid "Europe/Paris"
+msgstr "內容"
+
+#: calendar/zones.h:313
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:316
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:317
+#, fuzzy
+msgid "Europe/San_Marino"
+msgstr "聖馬利諾"
+
+#: calendar/zones.h:318
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:321
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:322
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Indian/Cocos"
+msgstr ""
+
+# ui/evolution-mail.xml.h:5
+#: calendar/zones.h:338
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "葛摩"
+
+#: calendar/zones.h:339
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:340
+#, fuzzy
+msgid "Indian/Mahe"
+msgstr "印度"
+
+#: calendar/zones.h:341
+#, fuzzy
+msgid "Indian/Maldives"
+msgstr "馬爾地夫"
+
+# addressbook/printing/e-contact-print.glade.h:21
+#: calendar/zones.h:342
+#, fuzzy
+msgid "Indian/Mauritius"
+msgstr "模里西斯"
+
+# calendar/gui/goto-dialog.glade.h:11
+#: calendar/zones.h:343
+#, fuzzy
+msgid "Indian/Mayotte"
+msgstr "美亞特"
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: calendar/zones.h:344
+#, fuzzy
+msgid "Indian/Reunion"
+msgstr "留尼旺"
+
+#: calendar/zones.h:345
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:346
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:347
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:348
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:349
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Palau"
+msgstr ""
+
+# ui/evolution-calendar.xml.h:25
+#: calendar/zones.h:372
+#, fuzzy
+msgid "Pacific/Pitcairn"
+msgstr "皮特康"
+
+#: calendar/zones.h:373
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:376
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:377
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Yap"
+msgstr ""
+
 # camel/camel-cipher-context.c:171
-#: camel/camel-cipher-context.c:171
+#: camel/camel-cipher-context.c:169
 msgid "Signing is not supported by this cipher"
 msgstr "此加密器不支援加簽"
 
 # camel/camel-cipher-context.c:211
-#: camel/camel-cipher-context.c:211
+#: 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:251
+#: camel/camel-cipher-context.c:249
 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:292
 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:334
 msgid "Decryption is not supported by this cipher"
 msgstr "此加密器不支援解密"
 
+# 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:441
+#, fuzzy, c-format
+msgid "Could not remove cache entry: %s: %s"
+msgstr "不能開啟快取目錄：%s"
+
 #: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
@@ -6795,102 +8801,84 @@ 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:811 camel/camel-filter-driver.c:1197
+#, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "分析過濾器發生錯誤： %s: %s"
+
+# camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#, 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:887
 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:896
 msgid "Unable to process spool folder"
 msgstr "無法處理 spool 資料夾"
 
 # camel/camel-filter-driver.c:666
-#: camel/camel-filter-driver.c:688
-#, c-format
+#: camel/camel-filter-driver.c:911
 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:915
 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:916 camel/camel-filter-driver.c:928
 #, 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:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "同步處理資料夾"
 
 # camel/camel-filter-driver.c:748
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1016
 #, 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:1031
 #, 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: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:126
+#, fuzzy
+msgid "Failed to retrieve message"
+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:543 camel/camel-filter-search.c:551
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "執行過濾器搜尋發生錯誤： %s: %s"
 
-#: camel/camel-folder.c:471
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-# camel/camel-folder-search.c:338
-#: camel/camel-folder.c:1040
-#, fuzzy, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-"執行搜尋詞句時發生錯誤：%s：\n"
-"%s"
-
-#: camel/camel-folder.c:1080
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-
-# mail/mail-ops.c:898
-#: camel/camel-folder.c:1262
-#, fuzzy
-msgid "Moving messages"
-msgstr "將郵件移到 %s"
-
 # camel/camel-folder-search.c:328
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -6900,7 +8888,7 @@ msgstr ""
 "%s"
 
 # camel/camel-folder-search.c:338
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -6911,21 +8899,39 @@ msgstr ""
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: 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 "(符合-全部) 需要單一布林值結果"
 
 # camel/camel-folder-search.c:559
-#: 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: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/camel-folder.c:469
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+# camel/camel-folder-search.c:338
+#: camel/camel-folder.c:1038
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"執行搜尋詞句時發生錯誤：%s：\n"
+"%s"
+
+#: camel/camel-folder.c:1078
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+
+# mail/mail-ops.c:898
+#: camel/camel-folder.c:1260
+#, fuzzy
+msgid "Moving messages"
+msgstr "將郵件移到 %s"
 
 # camel/camel-movemail.c:306
 #: camel/camel-lock-client.c:111
@@ -7044,25 +9050,25 @@ msgid "Error copying mail temp file: %s"
 msgstr "複製郵件暫存檔案時發生錯誤：%s"
 
 # camel/camel-pgp-context.c:190
-#: camel/camel-pgp-context.c:194
+#: 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:193
-#: camel/camel-pgp-context.c:197
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "請輸入您的 %s 密碼"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:561
+#: camel/camel-pgp-context.c:621
 #, 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
+#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr "無法傳送郵件：寄件者的地址無效。"
@@ -7072,19 +9078,19 @@ msgstr "無法傳送郵件：寄件者的地址無效。"
 # 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
+#: 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：%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:795
 #, 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
+#: camel/camel-pgp-context.c:987
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "無法傳送郵件：沒有提供收件者。"
@@ -7094,25 +9100,25 @@ msgstr "無法傳送郵件：沒有提供收件者。"
 # camel/camel-pgp-context.c:879
 # camel/camel-pgp-context.c:1064
 # camel/camel-pgp-context.c:1276
-#: camel/camel-pgp-context.c:945
+#: 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:890
-#: camel/camel-pgp-context.c:956
+#: camel/camel-pgp-context.c:1004
 #, 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
+#: camel/camel-pgp-context.c:1177
 #, 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
+#: camel/camel-pgp-context.c:1187
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr "無法傳送郵件：寄件者的地址無效。"
@@ -7122,24 +9128,24 @@ msgstr "無法傳送郵件：寄件者的地址無效。"
 # camel/camel-pgp-context.c:879
 # camel/camel-pgp-context.c:1064
 # camel/camel-pgp-context.c:1276
-#: camel/camel-pgp-context.c:1146
+#: 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/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:1155
+#: camel/camel-pgp-context.c:1203
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "無法傳送郵件：沒有提供收件者。"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:1323
+#: camel/camel-pgp-context.c:1372
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "無法傳送郵件：沒有提供收件者。"
 
-#: camel/camel-pgp-context.c:1331
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
@@ -7148,56 +9154,60 @@ msgstr ""
 # camel/camel-pgp-context.c:879
 # camel/camel-pgp-context.c:1064
 # camel/camel-pgp-context.c:1276
-#: camel/camel-pgp-context.c:1338
+#: 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 ""
+
 # 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
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s 伺服器 %s"
 
 # camel/camel-remote-store.c:195
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, 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
+#: camel/camel-remote-store.c:254 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/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: 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:256
-#: camel/camel-remote-store.c:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(不明的主機)"
 
@@ -7205,14 +9215,16 @@ msgstr "(不明的主機)"
 # 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
+#: 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/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
+#: camel/providers/imap/camel-imap-command.c:274
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "伺服器突然中斷連線"
@@ -7274,8 +9286,9 @@ 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
 #: camel/camel-sasl-digest-md5.c:43
@@ -7288,8 +9301,9 @@ 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
 #: camel/camel-sasl-digest-md5.c:810
@@ -7350,7 +9364,8 @@ 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,6 +9379,18 @@ msgstr "這個選項將會使用普通的密碼連線至伺服器。"
 msgid "Unknown authentication state."
 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 驗證連線至伺服器。"
+
 # addressbook/gui/component/addressbook-config.c:165
 # camel/camel-sasl-plain.c:32
 # camel/providers/imap/camel-imap-provider.c:80
@@ -7371,8 +9398,8 @@ msgstr "不詳的驗証狀況。"
 # 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
+#: 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 "密碼"
 
@@ -7422,29 +9449,47 @@ 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:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "解析：%s"
 
 # camel/camel-service.c:575
-#: camel/camel-service.c:638
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "搜尋名稱失敗： %s"
 
 # camel/camel-service.c:600
-#: camel/camel-service.c:663
+#: camel/camel-service.c:673
 #, 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:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "搜尋主機失敗： %s ：不明原因"
 
+# camel/camel-service.c:548
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "解析：%s"
+
+# camel/camel-service.c:600
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "搜尋主機失敗： %s ：找不到主機"
+
+# camel/camel-service.c:602
+#: camel/camel-service.c:790
+#, 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 +9502,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 +9561,19 @@ msgid "Failed to verify certificates."
 msgstr "驗證證書失敗。"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 #, 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:284
 #, 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 +9584,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 +9599,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:491
 #, 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:497
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:497
+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:500
+#, 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
@@ -7588,14 +9649,14 @@ msgid "No such message %s in %s"
 msgstr "%2$s 沒有 %1$s 這個郵件"
 
 # camel/camel-vee-folder.c:546
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "沒有這個郵件： %s"
 
 # 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 +9665,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,13 +9673,13 @@ 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"
@@ -7629,91 +9690,91 @@ msgid "You cannot copy messages from this trash folder."
 msgstr "您不能從垃圾桶資料夾內複製郵件。"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: camel/providers/imap/camel-imap-command.c:329
+#: camel/providers/imap/camel-imap-command.c:352
 #, 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:362
 #, 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:417
 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:610
 #, 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:646
 #, 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:199
 #, 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:218
 #, 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:284
 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:469
 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:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 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:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 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:1799
 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:2151
 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 +9792,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 "資料夾"
 
@@ -7779,7 +9840,7 @@ 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/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "不支援驗證類別 %s"
@@ -7793,12 +9854,12 @@ 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/smtp/camel-smtp-transport.c:509
 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:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -7811,121 +9872,141 @@ 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:901
 #, c-format
 msgid "No such folder %s"
 msgstr "沒有這個資料夾 %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "母資料夾並不允許包含子資料夾"
 
 # camel/providers/local/camel-local-provider.c:39
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "MH-format 郵件目錄"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 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:64
 msgid "Local delivery"
 msgstr "本地端寄送"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 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:76
+#: 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:82
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "MH-format 郵件目錄"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 #, fuzzy
 msgid "For storing local mail in maildir directories."
 msgstr "用於儲存本地端郵件至 qmail maildir 目錄。"
 
 # mail/mail-config.glade.h:77
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr "標準 Unix mbox 排程器"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: camel/providers/local/camel-local-provider.c:81
+#: 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 ""
+
+#: camel/providers/local/camel-local-provider.c:117
+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 ""
+
 # 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-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
 #, 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:863
 #, 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:371
 #, 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:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "無法新增郵件到摘要資訊：不明的原因"
 
@@ -7958,7 +10039,7 @@ msgstr "無法將郵件儲存到 maildir 資料夾： %s： %s"
 #: 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-spool-folder.c:582
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -7973,7 +10054,7 @@ 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:579
+#: camel/providers/local/camel-spool-folder.c:582
 msgid "No such message"
 msgstr "沒有這封郵件"
 
@@ -7986,7 +10067,7 @@ 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-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -7999,8 +10080,8 @@ 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-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -8008,7 +10089,7 @@ 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-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8019,7 +10100,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 +10108,72 @@ 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-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, 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:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, 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
+#. 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
+#, 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-spool-folder.c:277
 #, 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-spool-folder.c:459
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "無法開啟 mailbox：%s： %s\n"
@@ -8089,9 +10199,9 @@ 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:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8102,18 +10212,18 @@ msgstr ""
 
 # 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-spool-folder.c:631
 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-spool-folder.c:643
 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 +10233,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 +10244,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 +10263,15 @@ 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:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
@@ -8183,24 +10279,24 @@ 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:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, 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:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, 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:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
@@ -8208,8 +10304,8 @@ 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:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "無法開啟暫存 mailbox：%s"
@@ -8218,56 +10314,56 @@ msgstr "無法開啟暫存 mailbox：%s"
 # 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
+#: 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:600
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: 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:617
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: 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: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: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"
 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:641
 #, 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:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "無法將資料夾：%s 重新命名"
 
 # 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:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "不明的錯誤：%s"
@@ -8290,13 +10386,13 @@ 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:220
 #, 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
+#: camel/providers/local/camel-spool-folder.c:515
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "無法將郵件增加到 spool 檔案： %s： %s"
@@ -8312,6 +10408,7 @@ msgstr "排程器 `%s' 不存在或不是一個合法的檔案"
 # 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-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "資料夾 `%s/%s' 不存在。"
@@ -8322,32 +10419,34 @@ msgstr "資料夾 `%s/%s' 不存在。"
 msgid "Spool mail file %s"
 msgstr "排程郵件檔案 %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "排程資料夾不能重新命名"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 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:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, 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:831
 #, 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:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8357,56 +10456,27 @@ msgstr ""
 "資料夾可能損毀，複製儲存於 `%s'"
 
 # camel/camel-provider.c:140
-#: camel/providers/local/camel-spool-summary.c:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, 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/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#: 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/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/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-# 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 的群組清單檔案"
+# mail/mail-autofilter.c:70
+#: camel/providers/local/camel-spoold-store.c:173
+#, fuzzy, c-format
+msgid "Mail tree %s"
+msgstr "郵件送到 %s"
 
 # camel/providers/nntp/camel-nntp-provider.c:42
 #: camel/providers/nntp/camel-nntp-provider.c:41
@@ -8418,173 +10488,211 @@ 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
-#, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "無法開啟新聞伺服器：%s 的目錄"
-
 # camel/providers/nntp/camel-nntp-store.c:286
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, 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:155
 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:84
 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."
 msgstr ""
-"這個選項將會使用純文字的密碼連線到 POP 伺服器。一般的 POP 伺服器只會支援這種"
-"方式。"
+"這個選項將會使用純文字的密碼連線到 POP "
+"伺服器。一般的 POP 伺服器只會支援這種方式。"
 
 # 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 "
 "claim to support it."
 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 密碼"
+"這個選項將會使用加密的密碼經由 APOP 通訊協定連線到 POP "
+"伺服器。不過就算伺服器聲稱能夠支援，但對於所有使用�"
+"�來講都未必一定可行。"
 
 # 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:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, 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 "(不明)"
+# shell/e-storage.c:477
+#: camel/providers/pop3/camel-pop3-store.c:210
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "行動不支援"
+
+# camel/camel-sasl-anonymous.c:110
+# camel/camel-sasl-plain.c:87
+#: camel/providers/pop3/camel-pop3-store.c:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "驗証失敗。"
+
+# camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, 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:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8592,8 +10700,31 @@ msgstr ""
 "不能夠連線到 POP 伺服器。\n"
 "對於所要求的驗證機制沒有支援。"
 
-# camel/providers/pop3/camel-pop3-store.c:417
+# camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "IMAP 指令失敗： %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
+msgstr ""
+
+# shell/e-storage.c:467
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "輸出/入錯誤"
+
+# camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, 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:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8603,21 +10734,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:601
 #, 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:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8626,215 +10751,246 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "將遞送的郵件交給本地端系統上的 \"sendmail\" 程式處理。"
+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"
 
 # camel/providers/smtp/camel-smtp-provider.c:40
 #: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "使用 SMTP 通訊協定連線到遠端的 mailhub 來傳送郵件。\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:300
 #, 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:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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:336
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "資料夾好像已經損毀並且不能復原。"
+
+# camel/providers/smtp/camel-smtp-transport.c:743
+# camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "AUTH 的要求逾時：%s"
+
+# camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, fuzzy
+msgid "STARTTLS response error"
+msgstr "傳回 RSET 的回應錯誤： %s"
+
 # camel/providers/smtp/camel-smtp-transport.c:356
-#: camel/providers/smtp/camel-smtp-transport.c:376
+#: camel/providers/smtp/camel-smtp-transport.c:458
 #, 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:496
 #, 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:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8846,156 +11002,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:642
 #, 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:644
 #, 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:662
 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:667 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:678
 msgid "Cannot send message: no recipients defined."
 msgstr "無法傳送郵件：沒有提供收件者。"
 
+# camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:688
+#, 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:838
 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:869
 #, 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:889
 #, 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:937
 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:943
 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:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, 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:981
 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:1042
 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:1067
 #, 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:1081
+#, 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:1105
 #, 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:1121
 #, 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:1157
 #, 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:1171
+#, 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:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1243
+#, 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:1266
 #, 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:1280
+#, 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:1303
 #, 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:1317
+#, 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 +11189,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 +11239,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:333
 msgid "Click here for the address book"
 msgstr "按這裡新增目錄服務"
 
@@ -9092,7 +11252,7 @@ msgstr "按這裡新增目錄服務"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "寄件者："
 
@@ -9100,7 +11260,7 @@ msgstr "寄件者："
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "回覆地址："
 
@@ -9108,37 +11268,37 @@ msgstr "回覆地址："
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "主旨："
 
 # composer/e-msg-composer-hdrs.c:386
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "收件者："
 
 # composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 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:398
 msgid "Cc:"
 msgstr "副本："
 
 # composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 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:402
 msgid "Bcc:"
 msgstr "密件副本："
 
 # composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9146,13 +11306,13 @@ 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 "附加檔案"
 
 # composer/e-msg-composer.c:805
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9161,54 +11321,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:967
 msgid "Warning!"
 msgstr "警告！"
 
-#: composer/e-msg-composer.c:892
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "檔案已存在，覆蓋它？"
 
 # composer/e-msg-composer.c:785
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:993
 #, 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:1012
 #, 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:1043
 #, 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:1051
 msgid "Unable to retrieve message from editor"
 msgstr "無法從編輯器取得郵件"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9218,7 +11364,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9228,7 +11374,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: composer/e-msg-composer.c:1085
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9238,7 +11384,7 @@ msgstr ""
 " %s"
 
 # importers/pine-importer.c:705
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9247,7 +11393,7 @@ msgstr ""
 "是否嘗試將它復原？"
 
 # composer/e-msg-composer.c:941
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9258,34 +11404,34 @@ msgstr ""
 "是否先將變更儲存？"
 
 # mail/mail-ops.c:1154
-#: composer/e-msg-composer.c:1348
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "警告：變更過的郵件"
 
 # composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "開啟檔案"
 
 # ui/evolution-message-composer.xml.h:49
-#: composer/e-msg-composer.c:1520
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 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:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "編輯郵件"
 
-#: composer/e-msg-composer.c:2353
+#: composer/e-msg-composer.c:2665
 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:2688 composer/e-msg-composer.c:2743
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -9295,7 +11441,7 @@ 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 +11450,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 +11512,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:2247
+#: 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 +11645,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 +11655,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 +11700,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:191
 msgid "seconds"
 msgstr "秒"
 
@@ -9615,7 +11778,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:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9628,15 +11791,15 @@ msgid "Filter Rules"
 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 +11809,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:1633 mail/mail-account-gui.c:1647
 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 +11823,50 @@ msgstr ""
 "正規表示式內有錯誤 '%s'：\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 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
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion 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 +11910,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,6 +11928,12 @@ msgstr "指定目標"
 msgid "Attachments"
 msgstr "附加檔案"
 
+# addressbook/printing/e-contact-print.glade.h:36
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "貝里斯"
+
 #: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "包含"
@@ -9813,148 +11987,160 @@ msgid "ends with"
 msgstr "以此終結"
 
 #: filter/libfilter-i18n.h:21
+msgid "Execute Shell Command"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "存在"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "存在"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "詞句"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "重要"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "是"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "是之後的"
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "是之前的"
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "有標幟的"
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "大於"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "小於"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "不是"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "有標幟的"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "郵件列表"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "郵件內容"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:37
 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:38
 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:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "播放音效："
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "閱讀"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "收件者"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr "正規表示式相配"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 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:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "目標"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1398
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "寄件者"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "設定狀態"
 
 # addressbook/printing/e-contact-print.glade.h:36
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "大小 (kB)"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "類似"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr "來源帳號"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr "指定檔頭"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "以此開始"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 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:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 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 +12148,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 +12165,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 +12192,13 @@ 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:101
 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 +12206,17 @@ 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
+#: importers/evolution-gnomecard-importer.c:228 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 +12224,86 @@ 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
+#: importers/netscape-importer.c:1865
+#, 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,55 +12336,111 @@ 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:101
 msgid "Folder containing mail"
 msgstr "資料夾包含郵件"
 
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr "郵件儲存資料夾(內部的)"
-
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "虛擬垃圾桶"
@@ -10142,13 +12449,7 @@ msgstr "虛擬垃圾桶"
 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:118
 msgid "This folder cannot contain messages."
 msgstr "此資料夾不能包含郵件。"
 
@@ -10156,55 +12457,67 @@ 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:403
 msgid "Properties..."
 msgstr "內容..."
 
 # ui/evolution-mail.xml.h:4
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "變更這個資料夾的內容"
 
-#: mail/component-factory.c:805
+#: mail/component-factory.c:766
 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:925
+msgid "You have not set a mail transport method"
+msgstr "您沒有設定郵件傳送方法"
+
 # ui/evolution-mail.xml.h:109
-#: mail/component-factory.c:973
+#: mail/component-factory.c:967
 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:967 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:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "不能初始化 Evolution 的 mail 元件。"
 
 # mail/component-factory.c:337
-#: mail/component-factory.c:1006
+#: mail/component-factory.c:1003
 #, 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:1009
 #, 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:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "正在連線至伺服器..."
+
 # mail/component-factory.c:410
-#: mail/component-factory.c:1228
+#: mail/component-factory.c:1250
 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:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" 的內容"
@@ -10212,222 +12525,242 @@ 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:344
 msgid "Properties"
 msgstr "內容"
 
 # mail/mail-display.c:236
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:305 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:760
 #, 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:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d 隱藏"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:767
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d 已刪除"
 
 # calendar/gui/event-editor.c:1558
-#: mail/folder-browser.c:800
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d 未傳送"
 
 # calendar/gui/event-editor.c:1558
-#: mail/folder-browser.c:802
+#: mail/folder-browser.c:779
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d 未傳送"
 
-#: mail/folder-browser.c:804
+#: mail/folder-browser.c:781
 #, 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:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "從郵件建立虛擬資料夾(_V)"
 
 # mail/folder-browser.c:653
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "從主旨建立虛擬資料夾(_S)"
 
 # mail/folder-browser.c:656
-#: mail/folder-browser.c:1468
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "從寄件者建立虛擬資料夾(_N)"
 
 # mail/folder-browser.c:659
-#: mail/folder-browser.c:1469
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "從收件者建立虛擬資料夾(_R)"
 
 # mail/folder-browser.c:662
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "從郵件清單建立虛擬資料夾(_L)"
 
 # mail/folder-browser.c:668
-#: mail/folder-browser.c:1474
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "從主旨建立規則(_J)"
 
 # mail/folder-browser.c:671
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "從寄件者建立規則(_D)"
 
 # mail/folder-browser.c:674
-#: mail/folder-browser.c:1476
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "收件者規則(_C)"
 
 # mail/folder-browser.c:677
-#: mail/folder-browser.c:1477
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 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:1609 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:1611
 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:1615 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:1616 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:1617 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:1618
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
+#: mail/folder-browser.c:1622
+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:1623
+#, 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:1624
+#, 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:1628 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:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_n)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1498
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1499
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "標示成不重要(_I)"
 
+# mail/folder-browser.c:717
+# ui/evolution-mail.xml.h:121
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "復原(_U)"
+
 # mail/folder-browser.c:711
-#: mail/folder-browser.c:1503
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "移至資料夾(_M)..."
 
 # mail/folder-browser.c:713
-#: mail/folder-browser.c:1504
+#: mail/folder-browser.c:1641 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)"
+#: mail/folder-browser.c:1645
+msgid "Label"
+msgstr ""
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/folder-browser.c:1510
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, 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:1653
+#, 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:1657
+#, 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:1936
+#, 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:1938
+#, 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:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "郵件清單的虛擬資料夾 (%s)"
 
-# mail/mail-config.glade.h:21
-#: mail/folder-browser.h:26
-#, fuzzy
-msgid "Default"
-msgstr "預設值(_F)"
-
 # data/evolution.keys.in.h:2
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
@@ -10453,32 +12786,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,17 +12813,17 @@ 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"
 
@@ -10520,109 +12844,101 @@ msgstr "Evolution 新聞編輯器"
 msgid "Evolution Account Editor"
 msgstr "Evolution 帳號編輯器"
 
-# mail/mail-crypto.c:59
-#: mail/mail-account-gui.c:962
+# addressbook/gui/component/addressbook-config.c:401
+# mail/mail-config.glade.h:33
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "主機(_H)："
+
+# mail/mail-config.glade.h:80
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
 #, fuzzy
-msgid "Could not save signature file."
-msgstr "無法建立一個 PGP 簽名文本。"
+msgid "User_name:"
+msgstr "使用者名稱(_U)："
 
-# mail/mail-config.glade.h:74
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "儲存簽名檔"
+# addressbook/gui/component/addressbook-config.c:520
+# mail/mail-config.glade.h:53
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "路徑(_P)："
 
-# composer/e-msg-composer.c:941
-#: mail/mail-account-gui.c:1045
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: 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 ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"這個簽名檔已變更但仍未儲存。\n"
-"\n"
-"您是否要儲存變更？"
 
-#: mail/mail-account-gui.c:1654
+#: mail/mail-account-gui.c:1985
 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:212
 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:216
 msgid "Don't delete"
 msgstr "不要刪除"
 
 # mail/mail-config.glade.h:41
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "確定刪除帳號？"
 
+# mail/mail-accounts.c:197
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "停用"
+
+# mail/mail-accounts.c:199
+# mail/mail-config.glade.h:30
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+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:632 mail/mail-accounts.c:636
 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-autofilter.c:70
-#: mail/mail-autofilter.c:71
-#, c-format
-msgid "Mail to %s"
-msgstr "郵件送到 %s"
-
-# mail/mail-autofilter.c:213
-#: mail/mail-autofilter.c:214
-#, c-format
-msgid "Subject is %s"
-msgstr "主旨是 %s"
+# mail/mail-accounts.c:199
+# mail/mail-config.glade.h:30
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "已啟用"
 
-# mail/mail-autofilter.c:229
-#: mail/mail-autofilter.c:230
-#, c-format
-msgid "Mail from %s"
-msgstr "郵件來自 %s "
+# mail/mail-config.glade.h:5
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "帳號(_A)："
 
-# mail/mail-autofilter.c:285
-#: mail/mail-autofilter.c:286
-#, c-format
-msgid "%s mailing list"
-msgstr "%s 郵件列表"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "波多黎各"
 
 # mail/mail-autofilter.c:335
 # mail/mail-autofilter.c:356
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
+#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "新增過濾器規則"
 
 # mail/mail-callbacks.c:93
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10635,7 +12951,7 @@ msgstr ""
 "是否現在設定？"
 
 # mail/mail-callbacks.c:146
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10644,7 +12960,7 @@ msgstr ""
 "才可以開始撰寫郵件。"
 
 # mail/mail-callbacks.c:158
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10652,13 +12968,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:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10666,13 +12977,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:209
 #, fuzzy
 msgid "Send anyway?"
 msgstr "傳送電子郵件"
 
 # mail/mail-callbacks.c:235
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10680,18 +12991,19 @@ msgstr ""
 "郵件上沒有主旨。\n"
 "是否仍然將郵件送出？"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:295
 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:299
 msgid "This message contains only Bcc recipients."
 msgstr "這個郵件只包含密件副本收件者。"
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10700,49 +13012,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:408
 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:497
 msgid "You must configure an account before you can send this email."
 msgstr "您必須要先設定一個帳號才可以傳送這封郵件。"
 
+# composer/e-msg-composer.c:877
+#: mail/mail-callbacks.c:623
+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:977
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:981
 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:1433 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:1435 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:2091
 #, 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:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10751,7 +13067,7 @@ msgstr ""
 "草稿資料夾內的郵件。"
 
 # mail/mail-callbacks.c:1073
-#: mail/mail-callbacks.c:1811
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10760,52 +13076,58 @@ msgstr ""
 "內的郵件重傳。"
 
 # mail/mail-callbacks.c:1085
-#: mail/mail-callbacks.c:1825
+#: mail/mail-callbacks.c:2169
 #, 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:2195
 msgid "No Message Selected"
 msgstr "沒有選定郵件"
 
+# mail/mail-callbacks.c:1140
+# mail/mail-display.c:92
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "覆蓋檔案？"
+
 # mail/mail-callbacks.c:1188
-#: mail/mail-callbacks.c:1945
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "另存郵件..."
 
 # mail/mail-callbacks.c:1190
-#: mail/mail-callbacks.c:1947
+#: mail/mail-callbacks.c:2296
 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:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "顯示下一封未閱讀的郵件"
 
-#: mail/mail-callbacks.c:2123
+#: mail/mail-callbacks.c:2373
+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
 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"
 "確定清除這些郵件？"
 
-# 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:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10816,22 +13138,32 @@ msgstr ""
 
 # importers/netscape-importer.c:795
 # mail/mail-callbacks.c:1359
-#: mail/mail-callbacks.c:2250
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "過濾器"
 
+# camel/camel-filter-driver.c:748
+#: mail/mail-callbacks.c:2783
+#, 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:2836
 msgid "Print Message"
 msgstr "列印郵件"
 
+#: mail/mail-callbacks.c:2863
+msgid "US-Letter"
+msgstr ""
+
 # mail/mail-callbacks.c:1454
-#: mail/mail-callbacks.c:2359
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "列印郵件失敗"
 
 # mail/mail-callbacks.c:1549
-#: mail/mail-callbacks.c:2461
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "您確定要用新視窗開啟全部 %d 封郵件？"
@@ -10843,7 +13175,8 @@ msgid ""
 "below do not need to be filled in,\n"
 "unless you wish to include this information in email you send."
 msgstr ""
-"請在下面輸入您的名稱及電郵地址。\"可選擇\" 的欄位不一定要填，\n"
+"請在下面輸入您的名稱及電郵地址。\"可選擇\" "
+"的欄位不一定要填，\n"
 "除非您希望在送出的郵件內包含這些資訊。"
 
 # mail/mail-config-druid.c:101
@@ -10853,7 +13186,8 @@ msgid ""
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"請輸入以下關於您的收件伺服器的資料。如果您不清楚，請聯絡您的系統\n"
+"請輸入以下關於您的收件伺服器的資料。如果您不清楚，�"
+"�聯絡您的系統\n"
 "管理員或網路服務供應商。"
 
 #: mail/mail-config-druid.c:150
@@ -10867,7 +13201,8 @@ msgid ""
 "sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"請輸入以下關於您的寄件伺服器的資料。如果您不清楚，請聯絡您的系統\n"
+"請輸入以下關於您的寄件伺服器的資料。如果您不清楚，�"
+"�聯絡您的系統\n"
 "管理員或網路服務供應商。"
 
 # mail/mail-config-druid.c:107
@@ -10881,24 +13216,48 @@ msgid ""
 "space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"您差不多已完成郵件設定。您提供的身份證明，收件伺服器及\n"
+"您差不多已完成郵件設定。您提供的身份證明，收件伺服�"
+"�及\n"
 "寄送郵件傳送方式將會整理為一個 Evolution 郵件帳號。\n"
 "現請在下面的空白處為這個帳號輸入一個名稱。\n"
 "這個名稱僅用作顯示用途。"
 
 # mail/mail-config-druid.c:445
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
-# mail/mail-config.glade.h:3
-#: mail/mail-config.c:316
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "帳號"
+# mail/mail-mt.c:516
+# mail/mail-mt.c:545
+# mail/mail-mt.c:880
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "正在工作"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr ""
+
+# mail/mail-format.c:762
+# mail/message-list.c:1083
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "多哥"
 
-#: mail/mail-config.c:1643
+# calendar/gui/event-editor-dialog.glade.h:33
+#. blue
+#: mail/mail-config.c:78 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"
@@ -10906,113 +13265,197 @@ msgid ""
 "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:2719
 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:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 msgstr "正在連線至伺服器..."
 
-# mail/mail-config.glade.h:1
+# addressbook/gui/component/addressbook-storage.c:99
+#: 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 " _Check for supported types "
-msgstr " 檢查可支援的類別(_C)"
+msgid " "
+msgstr ", "
 
-# mail/mail-config.glade.h:2
+# 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
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " 色彩"
+#, fuzzy
+msgid " Edit "
+msgstr "編輯 (_E)"
 
+# 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
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid " New "
+msgstr "新增"
+
+# mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:4
+#, fuzzy
+msgid " _Check for supported types "
+msgstr " 檢查可支援的類別(_C)"
+
+#: mail/mail-config.glade.h:5
+#, fuzzy
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr "(此一版本的 evolution 並不支援 SSL)"
+
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(此一版本的 evolution 並不支援 SSL)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "當傳送加密郵件時永遠自我加密"
 
 # mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:5
-msgid "Account"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
 msgstr "帳號"
 
 # mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 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:10 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 "帳號"
+# calendar/gui/e-itip-control.c:883
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "取消行動"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:12
+msgid "Afrikaans"
+msgstr ""
+
+#: mail/mail-config.glade.h:13
 #, fuzzy
-msgid "Always _encrypt to myself when sending encrypted mail"
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "當傳送加密郵件時永遠自我加密"
 
-#: mail/mail-config.glade.h:10
+# calendar/gui/e-calendar-table.c:162
+#: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Always _sign outgoing messages when using this account"
+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
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Arabic"
+msgstr ""
+
+# composer/e-msg-composer-attachment-bar.c:501
+#: mail/mail-config.glade.h:20
+#, 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:21 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:22
 msgid "Authentication"
 msgstr "驗證"
 
+# mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "自動檢查新郵件每隔(_A)"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+# mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:26
+#, 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:27
+#, fuzzy
+msgid "C_olors"
+msgstr "關閉 (_L)"
+
 # 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 "編輯器"
+# composer/e-msg-composer.c:1526
+# composer/e-msg-composer.c:1871
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Composing Messages"
+msgstr "編輯郵件"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
 #, 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:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11028,294 +13471,440 @@ msgstr ""
 "\n"
 "請按 \"完成\" 來儲存您的設定。"
 
+#: mail/mail-config.glade.h:37
+msgid "Dari"
+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:39
+#, 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:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "預設編碼："
 
-#: mail/mail-config.glade.h:27
+# mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "接收郵件"
+
+#: mail/mail-config.glade.h:43
 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:44
+#, 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:45 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:46
+#, 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:47
 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:48
+msgid "E_nable advanced options"
+msgstr ""
 
-# mail/mail-accounts.c:199
-# mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
-msgstr "已啟用"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+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:53
+#, fuzzy
+msgid "Execute Command..."
+msgstr "執行動作"
+
+#: mail/mail-config.glade.h:54
+#, 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:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "內容"
+
+# mail/mail-ops.c:1154
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "已轉寄的郵件"
+
+#: mail/mail-config.glade.h:57
 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:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "強調引文(_H)"
+
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "吐瓦魯"
 
 # 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)"
+#: 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:77
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "郵件設定"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "新聞發送伺服器(_N)"
+
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
 
 # mail/mail-config.glade.h:47
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "選用的資訊"
 
-#: mail/mail-config.glade.h:50
+# addressbook/gui/widgets/e-addressbook-view.c:708
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "團體(_Z)："
+
+#: mail/mail-config.glade.h:83
 #, fuzzy
-msgid "PGP _Key ID:"
+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:87
 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:88
 #, 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:89
+#, 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:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "列印選定的連絡人"
 
 # mail/mail-config.glade.h:55
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
+# camel/camel-filter-driver.c:671
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "不能開啟郵件"
+
 # mail/mail-config.glade.h:56
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "引用"
 
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+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
+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
+msgid "Select HTML fixed width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+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:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "選擇 PGP 二元檔"
 
+# mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "簽名檔："
+
+# calendar/gui/e-day-view.c:3179
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "刪除簽名檔以外的全部事件"
+
 # 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:113 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:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "傳送郵件資料夾："
 
 # mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "傳送與草稿郵件"
 
 # mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:117
 #, 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:118
 msgid "Server Configuration"
 msgstr "伺服器設定"
 
 # mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Server _Type: "
 msgstr "伺服器類別："
 
+# ui/evolution.xml.h:62
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "功能"
+
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
-msgstr "簽名檔："
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "儲存簽名檔"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "來源"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:123
 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:124
+#, 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:125
+msgid "Spell Checking"
+msgstr ""
 
 # mail/mail-config.glade.h:77
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "標準 Unix mbox"
 
-# mail/mail-config.glade.h:79
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:128
+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:74
+#: mail/mail-config.glade.h:130
 #, fuzzy
-msgid "Use s_ecure connection (SSL)"
-msgstr "使用安全連結 (_SSL)"
+msgid "Use _HTML for this signature"
+msgstr "_HTML 簽名檔："
+
+# mail/mail-accounts.c:197
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "變數"
 
 # mail/mail-config.glade.h:81
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11325,160 +13914,257 @@ msgstr ""
 "\n"
 "按 \"下一步\" 開始。"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "東"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "永遠自網路下載圖片(_A)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:141
 #, 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:142
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "驗證類別："
 
+# mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "驗證類別："
+
 # mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "自動檢查新郵件每隔(_A)"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "證書 ID："
 
-# mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+# mail/mail-ops.c:1449
+#: mail/mail-config.glade.h:148
 #, 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)："
+# mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "預設值(_F)"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
-msgstr "離開時清空垃圾桶資料夾(_E)"
+#: mail/mail-config.glade.h:151
+msgid "_Do not notify me when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:153
+msgid "_Enable spell checking"
+msgstr ""
+
+# shell/e-shell-importer.c:540
+#: mail/mail-config.glade.h:154
+#, fuzzy
+msgid "_Filename:"
+msgstr "檔案名稱："
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+# ui/evolution-mail.xml.h:34
+#: mail/mail-config.glade.h:156
+#, 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:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "全名(_F)："
 
+# mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "HTML 格式郵件"
+
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:160
 msgid "_HTML Signature:"
 msgstr "_HTML 簽名檔："
 
-#: mail/mail-config.glade.h:103
-msgid "_Highlight citations with"
-msgstr "強調引文(_H)"
+# mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "身份"
 
-# addressbook/gui/component/addressbook-config.c:401
-# mail/mail-config.glade.h:33
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
-msgstr "主機(_H)："
+# addressbook/gui/widgets/e-addressbook-view.c:732
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "語言"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:164
 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:165
+#, 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:166
+#, 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:167
 msgid "_Name:"
 msgstr "名稱(_N)："
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:168
 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:169
 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:171
+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:172
+#, 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:173
+#, 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
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: mail/mail-config.glade.h:174
 #, fuzzy
-msgid "_Server Type: "
-msgstr "伺服器類別："
+msgid "_Random"
+msgstr "無線電電話"
+
+# mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:175
+#, fuzzy
+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:"
-msgstr "簽名檔(_S)："
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+msgstr "_HTML 簽名檔："
 
-# mail/mail-config.glade.h:80
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
-msgstr "使用者名稱(_U)："
+# mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Text Signature:"
+msgstr "_HTML 簽名檔："
+
+# mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:184
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "使用安全連結 (_SSL)"
+
+# mail/mail-accounts.c:197
+#: mail/mail-config.glade.h:185
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "變數"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "_every"
 msgstr "每"
 
+# mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:187
+#, 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:188
 msgid "description"
 msgstr "描述"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:190
 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."
@@ -11525,181 +14211,174 @@ 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 "正在載入郵件內文"
 
 # mail/mail-display.c:1256
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1832
 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:1833
 msgid "Copy Link Location"
 msgstr "複製連結位址"
 
 # ui/evolution-message-composer.xml.h:21
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "另存目標(FIXME)"
 
 # mail/mail-callbacks.c:1188
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "另存圖片..."
 
 # mail/mail-format.c:527
-#: mail/mail-format.c:635
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附加檔案"
 
 # mail/mail-format.c:573
-#: mail/mail-format.c:680
+#: mail/mail-format.c:647
 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:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日期"
 
 # mail/mail-config.glade.h:29
-#: mail/mail-format.c:846
+#: mail/mail-format.c:822
 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:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "寄件者"
 
 # mail/mail-format.c:759
-#: mail/mail-format.c:889
+#: mail/mail-format.c:869
 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:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "收件者"
 
 # mail/mail-format.c:765
-#: mail/mail-format.c:897
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "副本"
 
 # composer/e-msg-composer-hdrs.c:394
-#: mail/mail-format.c:901
+#: mail/mail-format.c:884
 #, fuzzy
 msgid "Bcc"
 msgstr "密件副本："
 
-# mail/mail-format.c:1153
-#: mail/mail-format.c:1812
+# addressbook/backend/ebook/e-card.c:3428
+#: mail/mail-format.c:915
 #, 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."
+msgid "Mailer"
 msgstr ""
-
-# mail/mail-format.c:1153
-#: mail/mail-format.c:1843
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "這封是加入了數位簽名的郵件，已証實無訛"
-
-# mail/mail-format.c:1161
-#: mail/mail-format.c:1851
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
+"\n"
+"寄件者: "
 
 # mail/mail-format.c:1787
-#: mail/mail-format.c:2067
+#: mail/mail-format.c:2106
 #, 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:2120
 #, 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:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: mail/mail-format.c:2115
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "遠端資料指示 (%s)"
 
 # mail/mail-format.c:1837
-#: mail/mail-format.c:2123
+#: mail/mail-format.c:2162
 #, 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:2167
 msgid "Malformed external-body part."
 msgstr "變形的外加本文部分。"
 
 # mail/mail-local.c:812
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "重新載入資料夾"
 
 # mail/mail-local.c:922
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11709,14 +14388,14 @@ msgstr ""
 "再也無法開啟這個資料夾： %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
 #, 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:814
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
@@ -11724,18 +14403,18 @@ msgstr ""
 "%s"
 
 # mail/mail-local.c:785
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "將資料夾 \"%s\" 格式變更為 \"%s\""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, 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:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11744,12 +14423,12 @@ msgstr ""
 "您可能需要手動修復它。"
 
 # camel/camel-vtrash-folder.c:109
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 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:1414
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "重新設定 %s"
@@ -11782,149 +14461,138 @@ 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:837
 msgid "Saving message to folder"
 msgstr "儲存郵件到資料夾"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "將郵件移到 %s"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "將郵件複製到 %s"
 
 # mail/mail-ops.c:914
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "移動"
 
 # mail/mail-ops.c:917
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "複製"
 
 # mail/mail-ops.c:992
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1057
 #, 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:1240
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:1262
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1355
 #, 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:1424
 #, 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:1518
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "建立資料夾 %s"
 
 # mail/mail-local.c:812
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
 # mail/mail-ops.c:1449
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
 # mail/mail-ops.c:1498
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "取回郵件 %s"
 
 # mail/mail-ops.c:1565
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "取回郵件 %d 封郵件"
 
 # mail/mail-ops.c:1649
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "儲存郵件 %d 封郵件"
 
 # mail/mail-ops.c:1728
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11934,7 +14602,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11944,12 +14612,12 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1829
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "儲存附件"
 
 # mail/mail-ops.c:1844
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11959,25 +14627,30 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1872
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2138
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "中斷與 %s 的連線"
 
+#: mail/mail-ops.c:2237
+#, 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 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "尋找(_S)"
 
@@ -12027,56 +14700,56 @@ 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
+#: mail/mail-send-recv.c:534
 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,24 +14760,52 @@ 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:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "無法建立一個 PGP 簽名文本。"
+
+# mail/mail-config.glade.h:74
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "儲存簽名檔"
+
+# composer/e-msg-composer.c:941
+#: mail/mail-signature-editor.c:178
+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:74
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "簽名檔："
+
 # 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 "轉寄的郵件"
 
@@ -12121,7 +14822,7 @@ msgstr "建立資料夾 %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "掃描 \"%s\" 內的資料夾"
 
-#: mail/mail-vfolder.c:414
+#: mail/mail-vfolder.c:419
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12132,126 +14833,198 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: mail/mail-vfolder.c:723
+#: mail/mail-vfolder.c:785
 #, fuzzy
-msgid "VFolders"
+msgid "vFolders"
 msgstr "資料夾"
 
-#: mail/mail-vfolder.c:816
+#: mail/mail-vfolder.c:825
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "編輯虛擬資料夾"
 
-#: mail/mail-vfolder.c:832
+#: mail/mail-vfolder.c:841
 #, 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:895
 msgid "New VFolder"
 msgstr "新增虛擬資料夾"
 
 # views/mail/galview.xml.h:3
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(沒有主旨)"
 
 # widgets/misc/e-messagebox.c:180
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - 郵件"
 
 # mail/message-list.c:677
-#: mail/message-list.c:639
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "未閱讀"
 
 # mail/message-list.c:678
-#: mail/message-list.c:640
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "已閱讀"
 
 # mail/message-list.c:679
-#: mail/message-list.c:641
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "已回覆"
 
 # mail/message-list.c:680
-#: mail/message-list.c:642
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
 # mail/message-list.c:681
-#: mail/message-list.c:643
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
 # mail/message-list.c:685
-#: mail/message-list.c:647
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "最低"
 
 # mail/message-list.c:686
-#: mail/message-list.c:648
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "低"
 
 # mail/message-list.c:690
-#: mail/message-list.c:652
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "高"
 
 # mail/message-list.c:691
-#: mail/message-list.c:653
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:941
-#: mail/message-list.c:903
+#: mail/message-list.c:991
 msgid "?"
 msgstr "？"
 
 # mail/message-list.c:948
-#: mail/message-list.c:910
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:957
-#: mail/message-list.c:919
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:969
-#: mail/message-list.c:931
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 # mail/message-list.c:979
-#: mail/message-list.c:941
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 # mail/mail-local.c:905
-#: mail/message-list.c:2334
+#: mail/message-list.c:2396
 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 ""
+
 # mail/mail-send-recv.c:236
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "已接收"
 
 # addressbook/printing/e-contact-print.glade.h:36
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "大小"
 
+# addressbook/contact-editor/e-contact-editor.c:1246
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "回撥電話"
+
+# ui/evolution-calendar.xml.h:10
+#: 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 +15052,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 +15102,11958 @@ 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 "進階"
+
+#: 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 "亞美尼亞"
+
+#: 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 "開啟"
+
+# addressbook/contact-editor/e-contact-editor.c:1242
+# addressbook/gui/widgets/e-addressbook-view.c:733
+#: 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 ""
+
+# addressbook/printing/e-contact-print.glade.h:35
+#: 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 ""
+
+# calendar/gui/calendar-model.c:896
+# calendar/gui/calendar-model.c:1120
+# calendar/gui/calendar-model.c:1174
+# calendar/gui/e-calendar-table.c:322
+# calendar/gui/e-calendar-table.c:397
+# mail/mail-account-gui.c:976
+# mail/mail-accounts.c:120
+# mail/mail-accounts.c:164
+# mail/mail-config.glade.h:46
+# shell/e-shell-view.c:1198
+# widgets/misc/e-cell-date-edit.c:237
+# widgets/misc/e-dateedit.c:432
+# widgets/misc/e-dateedit.c:1341
+# widgets/misc/e-dateedit.c:1456
+#: 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/gui/component/addressbook-config.c:150
+#: 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 "加拿大"
+
+#: 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 "哥倫比亞"
+
+# ui/evolution-mail.xml.h:5
+#: 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 ""
+
+# 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:496
+#, fuzzy
+msgid "Comox"
+msgstr "公司電話"
+
+#: 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 "連絡人"
+
+# 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 "克羅埃西亞"
+
+# 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: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 ""
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: 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 "黎巴嫩"
+
+#: 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 ""
+
+# calendar/gui/event-editor-dialog.glade.h:38
+#: 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)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+# calendar/gui/e-calendar-table.c:155
+#: 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 "甘比亞"
+
+# addressbook/printing/e-contact-print.glade.h:11
+#: 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 ""
+
+#: 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/goto-dialog.glade.h:6
+#: 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 ""
+
+# addressbook/printing/e-contact-print.glade.h:11
+#: 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 ""
+
+# addressbook/printing/e-contact-print.glade.h:11
+#: 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月"
+
+#: 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 "橫向"
+
+# addressbook/printing/e-contact-print.glade.h:11
+#: 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:1191
+msgid "Laughlin"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1256
+# addressbook/gui/widgets/e-addressbook-view.c:720
+#: my-evolution/Locations.h:1192
+#, fuzzy
+msgid "Laurel"
+msgstr "呼叫器"
+
+#: my-evolution/Locations.h:1193
+#, fuzzy
+msgid "La Verne"
+msgstr "維德角島"
+
+#: my-evolution/Locations.h:1194
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1195
+#, fuzzy
+msgid "Lawton"
+msgstr "黎巴嫩"
+
+#: my-evolution/Locations.h:1196
+msgid "Leadville"
+msgstr ""
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1197
+#, fuzzy
+msgid "Learmouth"
+msgstr "賴索托"
+
+#: my-evolution/Locations.h:1199
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1201
+#, fuzzy
+msgid "Leesburg"
+msgstr "盧森堡"
+
+#: my-evolution/Locations.h:1202
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1205
+msgid "Leknes"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1206
+#, fuzzy
+msgid "Le Mans"
+msgstr "主管"
+
+#: my-evolution/Locations.h:1207
+#, fuzzy
+msgid "Le Marine"
+msgstr "法屬馬丁尼克"
+
+#: my-evolution/Locations.h:1208
+#, 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:1209
+#, fuzzy
+msgid "Lemoore"
+msgstr "移除"
+
+#: my-evolution/Locations.h:1210
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1212
+#, fuzzy
+msgid "Leuchars"
+msgstr "年"
+
+#: my-evolution/Locations.h:1213
+#, fuzzy
+msgid "Lewisburg"
+msgstr "盧森堡"
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1214
+#, fuzzy
+msgid "Lewiston"
+msgstr "賴索托"
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1215
+#, fuzzy
+msgid "Lewistown"
+msgstr "賴索托"
+
+#: my-evolution/Locations.h:1216
+#, fuzzy
+msgid "Lexington"
+msgstr "黎巴嫩"
+
+#: my-evolution/Locations.h:1217
+#, fuzzy
+msgid "Liberal"
+msgstr "賴比瑞亞"
+
+#: my-evolution/Locations.h:1219
+#, fuzzy
+msgid "Libya"
+msgstr "賴比瑞亞"
+
+#: my-evolution/Locations.h:1220
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1221
+msgid "Lidgerwood"
+msgstr ""
+
+# mail/message-list.c:690
+#: my-evolution/Locations.h:1222
+#, fuzzy
+msgid "Liege"
+msgstr "尼日"
+
+#: my-evolution/Locations.h:1223
+#, fuzzy
+msgid "Lihue"
+msgstr "紐威島"
+
+#: my-evolution/Locations.h:1224
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1225
+msgid "Lima-Callao"
+msgstr ""
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1226
+#, fuzzy
+msgid "Limnos"
+msgstr "寮國"
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1227
+#, fuzzy
+msgid "Limoges"
+msgstr "最低"
+
+#: my-evolution/Locations.h:1228
+#, fuzzy
+msgid "Limon"
+msgstr "月"
+
+#: my-evolution/Locations.h:1229
+#, fuzzy
+msgid "Lincoln"
+msgstr "內送"
+
+#: my-evolution/Locations.h:1230
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1231
+#, fuzzy
+msgid "Lisboa"
+msgstr "賴比瑞亞"
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: my-evolution/Locations.h:1232
+#, fuzzy
+msgid "Lista"
+msgstr "靄"
+
+#: my-evolution/Locations.h:1233
+#, fuzzy
+msgid "Litchfield"
+msgstr "小冰雹"
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1240
+msgid "Ljubljana"
+msgstr ""
+
+# camel/camel-sasl-login.c:32
+#: my-evolution/Locations.h:1241
+#, fuzzy
+msgid "Logan"
+msgstr "NT 登錄"
+
+#: my-evolution/Locations.h:1242
+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:1243
+#, fuzzy
+msgid "Lompoc"
+msgstr "公司電話"
+
+#: my-evolution/Locations.h:1244
+#, fuzzy
+msgid "London"
+msgstr "黎巴嫩"
+
+#: my-evolution/Locations.h:1245
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1249
+#, fuzzy
+msgid "Londrina"
+msgstr "宏都拉斯"
+
+#: my-evolution/Locations.h:1250
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1253
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:162
+#: my-evolution/Locations.h:1254
+#, fuzzy
+msgid "Los Alamos"
+msgstr "提醒"
+
+#: my-evolution/Locations.h:1255
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1260
+#, fuzzy
+msgid "Lousiana"
+msgstr "波札那"
+
+#: my-evolution/Locations.h:1261
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1265
+#, fuzzy
+msgid "Lugano"
+msgstr "黎巴嫩"
+
+#: my-evolution/Locations.h:1266
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1267
+#, fuzzy
+msgid "Luton"
+msgstr "外寄"
+
+#: my-evolution/Locations.h:1269
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1270
+#, fuzzy
+msgid "Luxor"
+msgstr "盧森堡"
+
+#: my-evolution/Locations.h:1271
+#, fuzzy
+msgid "Lviv"
+msgstr "拉脫維亞"
+
+#: my-evolution/Locations.h:1272
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1275
+msgid "Lyon-Satolas"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1276
+#, fuzzy
+msgid "Maastricht"
+msgstr "3月"
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1277
+#, fuzzy
+msgid "Macae"
+msgstr "澳門"
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1278
+#, fuzzy
+msgid "Macapa"
+msgstr "澳門"
+
+#: my-evolution/Locations.h:1279
+#, fuzzy
+msgid "Maceio"
+msgstr "馬其頓"
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1280
+#, fuzzy
+msgid "Macon"
+msgstr "主管"
+
+#: my-evolution/Locations.h:1281
+#, fuzzy
+msgid "Madinah"
+msgstr "馬其頓"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:1282
+#, fuzzy
+msgid "Madison"
+msgstr "無線電電話"
+
+#: my-evolution/Locations.h:1283
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1285
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: my-evolution/Locations.h:1286
+#, fuzzy
+msgid "Magadan"
+msgstr "加拿大"
+
+#: my-evolution/Locations.h:1287
+msgid "Magdalena"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1288
+#, fuzzy
+msgid "Maine"
+msgstr "主管"
+
+#: my-evolution/Locations.h:1289
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1290
+msgid "Makkah"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1291
+#, fuzzy
+msgid "Makung"
+msgstr "主管"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1292
+#, fuzzy
+msgid "Malad City"
+msgstr "馬拉威"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1293
+#, fuzzy
+msgid "Malaga"
+msgstr "馬爾他"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1294
+#, fuzzy
+msgid "Malatya"
+msgstr "馬爾他"
+
+#: my-evolution/Locations.h:1295
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1296
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1298
+msgid "Mammoth Lakes"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:732
+#: my-evolution/Locations.h:1299
+#, fuzzy
+msgid "Managua"
+msgstr "主管"
+
+#: my-evolution/Locations.h:1300
+#, fuzzy
+msgid "Manassas"
+msgstr "馬來西亞"
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1301
+#, fuzzy
+msgid "Manaus"
+msgstr "澳門"
+
+# mail/mail-search.c:319
+#: my-evolution/Locations.h:1302
+#, fuzzy
+msgid "Manchester"
+msgstr "符合的資料："
+
+#: my-evolution/Locations.h:1303
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+msgid "Manhattan"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1305
+#, fuzzy
+msgid "Manisa"
+msgstr "主管"
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: my-evolution/Locations.h:1306
+#, fuzzy
+msgid "Manistee"
+msgstr "靄"
+
+# ui/evolution.xml.h:22
+#: my-evolution/Locations.h:1307
+#, fuzzy
+msgid "Manitoba"
+msgstr "主工具列"
+
+#: my-evolution/Locations.h:1308
+msgid "Manitowoc"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1309
+#, fuzzy
+msgid "Mankato"
+msgstr "摩納哥"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1310
+#, fuzzy
+msgid "Mansfield"
+msgstr "郵件"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1311
+#, fuzzy
+msgid "Manta"
+msgstr "馬爾他"
+
+#: my-evolution/Locations.h:1312
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1313
+#, fuzzy
+msgid "Maraba"
+msgstr "茅利塔尼亞"
+
+#: my-evolution/Locations.h:1314
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1315
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1316
+#, fuzzy
+msgid "Marathon"
+msgstr "3月"
+
+#: my-evolution/Locations.h:1317
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1318
+#, fuzzy
+msgid "Margarita"
+msgstr "茅利塔尼亞"
+
+#: my-evolution/Locations.h:1319
+#, fuzzy
+msgid "Marianna"
+msgstr "茅利塔尼亞"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1320
+#, fuzzy
+msgid "Marib"
+msgstr "馬利"
+
+#: my-evolution/Locations.h:1321
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1322
+#, fuzzy
+msgid "Marietta"
+msgstr "茅利塔尼亞"
+
+#: my-evolution/Locations.h:1323
+msgid "Marino di Ravenna"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:21
+#: my-evolution/Locations.h:1324
+#, fuzzy
+msgid "Marion"
+msgstr "邊界"
+
+#: my-evolution/Locations.h:1325
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1326
+#, fuzzy
+msgid "Marquette"
+msgstr "法屬馬丁尼克"
+
+#: my-evolution/Locations.h:1327
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+msgid "Marseilles"
+msgstr ""
+
+#: my-evolution/Locations.h:1329
+#, fuzzy
+msgid "Marshall"
+msgstr "馬紹爾群島"
+
+#: my-evolution/Locations.h:1330
+#, fuzzy
+msgid "Marshalltown"
+msgstr "馬紹爾群島"
+
+#: my-evolution/Locations.h:1331
+msgid "Marshfield"
+msgstr ""
+
+#: my-evolution/Locations.h:1332
+#, fuzzy
+msgid "Marte"
+msgstr "法屬馬丁尼克"
+
+# mail/folder-browser.c:706
+#: my-evolution/Locations.h:1333
+#, fuzzy
+msgid "Marthas Vineyard"
+msgstr "標示成未閱讀(_n)"
+
+#: my-evolution/Locations.h:1334
+#, fuzzy
+msgid "Martinsburg"
+msgstr "法屬馬丁尼克"
+
+#: my-evolution/Locations.h:1335
+#, fuzzy
+msgid "Martinsville"
+msgstr "法屬馬丁尼克"
+
+#: my-evolution/Locations.h:1336
+#, fuzzy
+msgid "Maryland"
+msgstr "愛爾蘭"
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1339
+msgid "Mashhad"
+msgstr ""
+
+#: my-evolution/Locations.h:1340
+#, fuzzy
+msgid "Masirah"
+msgstr "馬來西亞"
+
+#: my-evolution/Locations.h:1341
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1343
+#, fuzzy
+msgid "Massena"
+msgstr "馬其頓"
+
+# ui/evolution-mail.xml.h:5
+#: my-evolution/Locations.h:1344
+#, fuzzy
+msgid "Matamoros"
+msgstr "葛摩"
+
+#: my-evolution/Locations.h:1345
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1347
+msgid "Matsuyama Airport"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1348
+#, fuzzy
+msgid "Mattoon"
+msgstr "主管"
+
+# addressbook/gui/widgets/e-addressbook-view.c:732
+#: my-evolution/Locations.h:1349
+#, fuzzy
+msgid "Mayaguez"
+msgstr "主管"
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1350
+#, fuzzy
+msgid "Mayport"
+msgstr "美亞特"
+
+#: my-evolution/Locations.h:1351
+#, fuzzy
+msgid "Mazatlan"
+msgstr "哈薩克"
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1352
+#, fuzzy
+msgid "Mazu"
+msgstr "澳門"
+
+#: my-evolution/Locations.h:1353
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1354
+msgid "McAllen"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1355
+#, fuzzy
+msgid "McCall"
+msgstr "馬利"
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1356
+#, fuzzy
+msgid "McCarthy"
+msgstr "3月"
+
+#: my-evolution/Locations.h:1357
+#, 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:1358
+#, fuzzy
+msgid "McComb"
+msgstr "公司電話"
+
+#: my-evolution/Locations.h:1359
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1361
+msgid "Mc Gregor"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1362
+#, fuzzy
+msgid "Meacham"
+msgstr "澳門"
+
+# calendar/gui/event-editor-dialog.glade.h:34
+#: my-evolution/Locations.h:1363
+#, fuzzy
+msgid "Medford"
+msgstr "之前"
+
+#: my-evolution/Locations.h:1364
+msgid "Medicine Lodge"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1365
+#, fuzzy
+msgid "Mehamn"
+msgstr "主管"
+
+#: my-evolution/Locations.h:1366
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1367
+msgid "Melbourne"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1368
+#, fuzzy
+msgid "Melfa"
+msgstr "馬爾他"
+
+#: my-evolution/Locations.h:1369
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1373
+#, fuzzy
+msgid "Mendoza"
+msgstr "馬其頓"
+
+#: my-evolution/Locations.h:1374
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1377
+msgid "Merced"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+# calendar/gui/event-editor.c:479
+#: my-evolution/Locations.h:1378
+#, fuzzy
+msgid "Merida"
+msgstr "星期五"
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1380
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:47
+#: my-evolution/Locations.h:1381
+#, fuzzy
+msgid "Merril Field"
+msgstr "寄件者(_F)"
+
+#: my-evolution/Locations.h:1382
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1386
+#, fuzzy
+msgid "Mexicali"
+msgstr "墨西哥"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1388
+#, fuzzy
+msgid "Miami"
+msgstr "馬利"
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1391
+msgid "Michigan"
+msgstr ""
+
+# addressbook/contact-editor/fullname.glade.h:15
+#: my-evolution/Locations.h:1392
+#, fuzzy
+msgid "Middle East"
+msgstr "中名(_M)："
+
+#: my-evolution/Locations.h:1393
+#, fuzzy
+msgid "Middleton Island"
+msgstr "索羅門群島"
+
+# addressbook/contact-editor/fullname.glade.h:15
+#: my-evolution/Locations.h:1394
+#, fuzzy
+msgid "Middletown"
+msgstr "中名(_M)："
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1395
+#, fuzzy
+msgid "Midland"
+msgstr "芬蘭"
+
+#: my-evolution/Locations.h:1396
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1398
+msgid "Milano/Malpensa"
+msgstr ""
+
+# shell/e-shell-importer.c:555
+#: my-evolution/Locations.h:1399
+#, fuzzy
+msgid "Miles City"
+msgstr "檔案類別："
+
+# calendar/gui/event-editor-dialog.glade.h:37
+#: my-evolution/Locations.h:1400
+#, fuzzy
+msgid "Milford"
+msgstr "發生"
+
+#: my-evolution/Locations.h:1401
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1402
+msgid "Millville"
+msgstr ""
+
+# mail/mail-autofilter.c:70
+#: my-evolution/Locations.h:1403
+#, fuzzy
+msgid "Milton"
+msgstr "郵件送到 %s"
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1407
+#, fuzzy
+msgid "Minatitlan"
+msgstr "茅利塔尼亞"
+
+#: my-evolution/Locations.h:1408
+#, fuzzy
+msgid "Minchumina"
+msgstr "內送"
+
+#: my-evolution/Locations.h:1409
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1414
+#, fuzzy
+msgid "Minnesota"
+msgstr "密克羅尼西亞"
+
+#: my-evolution/Locations.h:1415
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1416
+#, fuzzy
+msgid "Minot"
+msgstr "不是"
+
+#: my-evolution/Locations.h:1417
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1419
+msgid "Mississippi"
+msgstr ""
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: my-evolution/Locations.h:1420
+#, fuzzy
+msgid "Missoula"
+msgstr "Miss"
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: my-evolution/Locations.h:1421
+#, fuzzy
+msgid "Missouri"
+msgstr "Miss"
+
+# mail/mail-search.c:319
+#: my-evolution/Locations.h:1422
+#, fuzzy
+msgid "Mitchell"
+msgstr "符合的資料："
+
+#: my-evolution/Locations.h:1423
+#, fuzzy
+msgid "Mitilini"
+msgstr "郵件列表"
+
+#: my-evolution/Locations.h:1424
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1425
+msgid "Miyazaki Airport"
+msgstr ""
+
+# calendar/gui/print.c:362
+#: my-evolution/Locations.h:1426
+#, fuzzy
+msgid "Moa"
+msgstr "一"
+
+# addressbook/gui/widgets/e-addressbook-view.c:711
+#: my-evolution/Locations.h:1427
+#, fuzzy
+msgid "Mobile Downtown"
+msgstr "行動電話"
+
+#: my-evolution/Locations.h:1428
+msgid "Mobile Regional Airport"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1253
+#: my-evolution/Locations.h:1429
+#, fuzzy
+msgid "Mobridge"
+msgstr "行動電話"
+
+#: my-evolution/Locations.h:1430
+#, fuzzy
+msgid "Modesto"
+msgstr "中霧"
+
+#: my-evolution/Locations.h:1431
+msgid "Mo I Rana"
+msgstr ""
+
+# ui/evolution-mail.xml.h:55
+#: my-evolution/Locations.h:1432
+#, fuzzy
+msgid "Mojave"
+msgstr "移動"
+
+# addressbook/contact-editor/e-contact-editor.c:1253
+#: my-evolution/Locations.h:1433
+#, fuzzy
+msgid "Molde"
+msgstr "行動電話"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1434
+#, fuzzy
+msgid "Moldova"
+msgstr "星期一"
+
+#: my-evolution/Locations.h:1435
+msgid "Moline-Quad Cities"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1436
+#, fuzzy
+msgid "Molokai"
+msgstr "馬拉威"
+
+#: my-evolution/Locations.h:1437
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1438
+msgid "Monchengladbach"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1439
+#, fuzzy
+msgid "Monclova"
+msgstr "摩納哥"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1440
+#, fuzzy
+msgid "Moncton"
+msgstr "摩納哥"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1441
+#, fuzzy
+msgid "Monida"
+msgstr "星期一"
+
+#: my-evolution/Locations.h:1442
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1443
+#, fuzzy
+msgid "Monroe"
+msgstr "摩納哥"
+
+# addressbook/gui/widgets/e-addressbook-view.c:732
+#: my-evolution/Locations.h:1444
+#, fuzzy
+msgid "Montague"
+msgstr "主管"
+
+#: my-evolution/Locations.h:1445
+#, fuzzy
+msgid "Montana"
+msgstr "波札那"
+
+#: my-evolution/Locations.h:1446
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1448
+#, fuzzy
+msgid "Monte Bisbino"
+msgstr "中雪"
+
+#: my-evolution/Locations.h:1449
+msgid "Monte Calamita"
+msgstr ""
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:1450
+#, fuzzy
+msgid "Monte Cimone"
+msgstr "月檢視"
+
+#: my-evolution/Locations.h:1451
+#, fuzzy
+msgid "Montego Bay"
+msgstr "蒙古"
+
+#: my-evolution/Locations.h:1452
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1453
+#, fuzzy
+msgid "Monterey"
+msgstr "蒙瑟拉特島"
+
+#: my-evolution/Locations.h:1454
+#, fuzzy
+msgid "Monterrey"
+msgstr "蒙瑟拉特島"
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1458
+#, fuzzy
+msgid "Montgomery"
+msgstr "蒙瑟拉特島"
+
+#: my-evolution/Locations.h:1459
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1460
+#, fuzzy
+msgid "Monticello"
+msgstr "摩納哥"
+
+#: my-evolution/Locations.h:1461
+#, fuzzy
+msgid "Montpelier"
+msgstr "蒙瑟拉特島"
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1465
+#, fuzzy
+msgid "Montrose"
+msgstr "蒙瑟拉特島"
+
+#: my-evolution/Locations.h:1466
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1467
+#, fuzzy
+msgid "Morelia"
+msgstr "蒙古"
+
+# addressbook/gui/widgets/e-addressbook-view.c:708
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Morgantown"
+msgstr "團體"
+
+# addressbook/contact-editor/e-contact-editor.c:1257
+#: my-evolution/Locations.h:1469
+#, fuzzy
+msgid "Moriarty"
+msgstr "首要的"
+
+#: my-evolution/Locations.h:1471
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1474
+msgid "Moses Lake"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1253
+#: my-evolution/Locations.h:1475
+#, fuzzy
+msgid "Mosinee"
+msgstr "行動電話"
+
+#: my-evolution/Locations.h:1476
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1478
+msgid "Mountain Home"
+msgstr ""
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:1479
+#, fuzzy
+msgid "Mountain View"
+msgstr "月檢視"
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1482
+#, fuzzy
+msgid "Mount Shasta"
+msgstr "東南"
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:1483
+#, fuzzy
+msgid "Mount Vernon"
+msgstr "月檢視"
+
+#: my-evolution/Locations.h:1484
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1487
+msgid "Muir"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1488
+#, fuzzy
+msgid "Mullan"
+msgstr "主管"
+
+#: my-evolution/Locations.h:1489
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1490
+msgid "Munchen"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:9
+#: my-evolution/Locations.h:1491
+#, fuzzy
+msgid "Muncie"
+msgstr "6月"
+
+#: my-evolution/Locations.h:1492
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1493
+#, fuzzy
+msgid "Murcia"
+msgstr "茅利塔尼亞"
+
+#: my-evolution/Locations.h:1494
+msgid "Murmansk"
+msgstr ""
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: my-evolution/Locations.h:1495
+#, fuzzy
+msgid "Mus"
+msgstr "商務電話"
+
+#: my-evolution/Locations.h:1496
+#, fuzzy
+msgid "Muscatine"
+msgstr "法屬馬丁尼克"
+
+#: my-evolution/Locations.h:1497
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1498
+msgid "Muskegon"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:8
+#: my-evolution/Locations.h:1499
+#, fuzzy
+msgid "Mykonos"
+msgstr "節"
+
+#: my-evolution/Locations.h:1500
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1507
+#, fuzzy
+msgid "Najran"
+msgstr "巴林"
+
+#: my-evolution/Locations.h:1508
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1509
+msgid "Nalchik"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:5
+#: my-evolution/Locations.h:1510
+#, fuzzy
+msgid "Namsos"
+msgstr "名稱"
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1513
+msgid "Nankishirahama Airport"
+msgstr ""
+
+# widgets/misc/e-messagebox.c:159
+#: my-evolution/Locations.h:1514
+#, fuzzy
+msgid "Nanning"
+msgstr "警告"
+
+#: my-evolution/Locations.h:1515
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1516
+msgid "Nantucket"
+msgstr ""
+
+#: my-evolution/Locations.h:1517
+#, fuzzy
+msgid "Napa"
+msgstr "日本"
+
+# addressbook/gui/component/addressbook-config.glade.h:5
+#: my-evolution/Locations.h:1518
+#, fuzzy
+msgid "Naples"
+msgstr "名稱"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1519
+#, fuzzy
+msgid "Napoli"
+msgstr "馬利"
+
+# addressbook/gui/widgets/e-addressbook-view.c:734
+#: my-evolution/Locations.h:1520
+#, fuzzy
+msgid "Narvik"
+msgstr "暱稱"
+
+#: my-evolution/Locations.h:1521
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1524
+msgid "Nassau"
+msgstr ""
+
+#: my-evolution/Locations.h:1525
+#, fuzzy
+msgid "Natal"
+msgstr "義大利"
+
+# mail/mail-search.c:319
+#: my-evolution/Locations.h:1526
+#, fuzzy
+msgid "Natchez"
+msgstr "符合的資料："
+
+#: my-evolution/Locations.h:1527
+msgid "Nawabshah"
+msgstr ""
+
+# ui/evolution-tasks.xml.h:3
+#: my-evolution/Locations.h:1528
+#, fuzzy
+msgid "Nebraska"
+msgstr "新增工作"
+
+#: my-evolution/Locations.h:1529
+msgid "Needles"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: my-evolution/Locations.h:1530
+#, fuzzy
+msgid "Nenana"
+msgstr "格瑞那達"
+
+#: my-evolution/Locations.h:1532
+msgid "Neuquen"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: my-evolution/Locations.h:1533
+#, fuzzy
+msgid "Nevada"
+msgstr "格瑞那達"
+
+# ui/evolution-tasks.xml.h:3
+#: my-evolution/Locations.h:1534
+#, fuzzy
+msgid "Newark"
+msgstr "新增工作"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: my-evolution/Locations.h:1535
+#, fuzzy
+msgid "New Bedford"
+msgstr "新聞發送伺服器"
+
+#: my-evolution/Locations.h:1536
+#, fuzzy
+msgid "New Bern"
+msgstr "紐西蘭"
+
+#: my-evolution/Locations.h:1537
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1539
+msgid "Newburgh"
+msgstr ""
+
+# mail/mail-config.glade.h:45
+#: my-evolution/Locations.h:1540
+#, fuzzy
+msgid "Newcastle"
+msgstr "新聞"
+
+#: my-evolution/Locations.h:1541
+#, fuzzy
+msgid "New Delhi/Palam"
+msgstr "紐西蘭"
+
+#: my-evolution/Locations.h:1542
+#, fuzzy
+msgid "Newfoundland"
+msgstr "紐西蘭"
+
+#: my-evolution/Locations.h:1543
+msgid "New Hampshire"
+msgstr ""
+
+# ui/evolution-addressbook.xml.h:7
+#: my-evolution/Locations.h:1544
+#, fuzzy
+msgid "New Haven"
+msgstr "新喀里多尼亞島"
+
+# ui/evolution-addressbook.xml.h:7
+#: my-evolution/Locations.h:1545
+#, fuzzy
+msgid "New Iberia"
+msgstr "新喀里多尼亞島"
+
+# widgets/misc/e-messagebox.c:180
+#: my-evolution/Locations.h:1546
+#, fuzzy
+msgid "New Jersey"
+msgstr "新郵件"
+
+#: my-evolution/Locations.h:1547
+#, fuzzy
+msgid "New Mexico"
+msgstr "墨西哥"
+
+# addressbook/contact-editor/contact-editor.glade.h:12
+#: my-evolution/Locations.h:1548
+#, fuzzy
+msgid "New Orleans"
+msgstr "荷蘭"
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1550
+msgid "New Orleans NAS"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:736
+#: my-evolution/Locations.h:1551
+#, fuzzy
+msgid "Newport"
+msgstr "北"
+
+#: my-evolution/Locations.h:1552
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1553
+msgid "New Port Richey"
+msgstr ""
+
+# mail/mail-vfolder.c:438
+#: my-evolution/Locations.h:1554
+#, fuzzy
+msgid "New River"
+msgstr "新增虛擬資料夾"
+
+#: my-evolution/Locations.h:1555
+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:1556
+#, fuzzy
+msgid "Newton"
+msgstr "新增"
+
+# mail/mail-vfolder.c:438
+#: my-evolution/Locations.h:1557
+#, fuzzy
+msgid "New York"
+msgstr "新增虛擬資料夾"
+
+#: my-evolution/Locations.h:1558
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1559
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1561
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1564
+msgid "Niigata Airport"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:6
+#: my-evolution/Locations.h:1565
+#, fuzzy
+msgid "Nimes-Garons"
+msgstr "尺寸："
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:1566
+#, fuzzy
+msgid "Nipawin"
+msgstr "西班牙"
+
+#: my-evolution/Locations.h:1567
+#, fuzzy
+msgid "Nis"
+msgstr "是"
+
+#: my-evolution/Locations.h:1568
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1570
+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:1571
+#, fuzzy
+msgid "Nogales"
+msgstr "普通"
+
+# addressbook/gui/component/addressbook-config.glade.h:5
+#: my-evolution/Locations.h:1572
+#, fuzzy
+msgid "Nome"
+msgstr "名稱"
+
+#: my-evolution/Locations.h:1573
+#, fuzzy
+msgid "Norfolk"
+msgstr "諾福克群島"
+
+#: my-evolution/Locations.h:1575
+#, fuzzy
+msgid "Norfolk NAS"
+msgstr "諾福克群島"
+
+# mail/mail-mt.c:516
+# mail/mail-mt.c:545
+# mail/mail-mt.c:880
+#: my-evolution/Locations.h:1576
+#, fuzzy
+msgid "Norrkoping"
+msgstr "正在工作"
+
+# addressbook/contact-editor/contact-editor.glade.h:12
+#: my-evolution/Locations.h:1577
+#, fuzzy
+msgid "North Adams"
+msgstr "東北"
+
+# addressbook/gui/widgets/e-addressbook-view.c:736
+#: my-evolution/Locations.h:1578
+#, fuzzy
+msgid "North Bend"
+msgstr "北"
+
+#: my-evolution/Locations.h:1579
+msgid "North Carolina"
+msgstr ""
+
+# widgets/misc/e-cell-date-edit.c:221
+# widgets/misc/e-dateedit.c:418
+#: my-evolution/Locations.h:1580
+#, fuzzy
+msgid "North Conway"
+msgstr "挪威"
+
+# addressbook/contact-editor/contact-editor.glade.h:12
+#: my-evolution/Locations.h:1581
+#, fuzzy
+msgid "North Dakota"
+msgstr "東北"
+
+#: my-evolution/Locations.h:1582
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1583
+msgid "North Kingstown"
+msgstr ""
+
+# addressbook/contact-editor/contact-editor.glade.h:12
+#: my-evolution/Locations.h:1584
+#, fuzzy
+msgid "North Platte"
+msgstr "東北"
+
+# widgets/misc/e-cell-date-edit.c:221
+# widgets/misc/e-dateedit.c:418
+#: my-evolution/Locations.h:1585
+#, fuzzy
+msgid "Northway"
+msgstr "挪威"
+
+#: my-evolution/Locations.h:1586
+#, fuzzy
+msgid "Northwest Territories"
+msgstr "法屬南部屬地"
+
+# addressbook/gui/widgets/e-addressbook-view.c:736
+#: my-evolution/Locations.h:1588
+#, fuzzy
+msgid "Norwich"
+msgstr "北"
+
+# widgets/misc/e-cell-date-edit.c:221
+# widgets/misc/e-dateedit.c:418
+#: my-evolution/Locations.h:1589
+#, fuzzy
+msgid "Norwood"
+msgstr "挪威"
+
+# addressbook/gui/widgets/e-addressbook-view.c:736
+#: my-evolution/Locations.h:1590
+#, fuzzy
+msgid "Notodden"
+msgstr "備註"
+
+#: my-evolution/Locations.h:1591
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1595
+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:1596
+#, fuzzy
+msgid "Nuevo Laredo"
+msgstr "未開始"
+
+#: my-evolution/Locations.h:1597
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+msgid "Oahu"
+msgstr ""
+
+#: my-evolution/Locations.h:1600
+msgid "Oak Harbor"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1601
+#, fuzzy
+msgid "Oakland"
+msgstr "泰國"
+
+#: my-evolution/Locations.h:1602
+#, fuzzy
+msgid "Oaxaca"
+msgstr "牙買加"
+
+#: my-evolution/Locations.h:1603
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+msgid "Obihiro Airport"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1605
+#, fuzzy
+msgid "Ocala"
+msgstr "馬爾他"
+
+#: my-evolution/Locations.h:1606
+#, fuzzy
+msgid "Oceanside"
+msgstr "冰島"
+
+# addressbook/gui/component/addressbook-config.c:179
+#: my-evolution/Locations.h:1607
+#, fuzzy
+msgid "Odense"
+msgstr "一"
+
+#: my-evolution/Locations.h:1608
+msgid "Odesa"
+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 "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:1610
+#, fuzzy
+msgid "Ogden"
+msgstr "開啟"
+
+#: my-evolution/Locations.h:1611
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1613
+msgid "Ohio"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1254
+# addressbook/contact-editor/e-contact-editor.c:1312
+#: my-evolution/Locations.h:1614
+#, fuzzy
+msgid "Ohrid"
+msgstr "其它電話"
+
+#: my-evolution/Locations.h:1615
+msgid "Oita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1616
+#, fuzzy
+msgid "Ojika Island"
+msgstr "科克群島"
+
+#: my-evolution/Locations.h:1617
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1624
+#, 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:1625
+#, fuzzy
+msgid "Olathe"
+msgstr "其它電話"
+
+#: my-evolution/Locations.h:1626
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1627
+#, fuzzy
+msgid "Olbia"
+msgstr "阿爾巴尼亞"
+
+#: my-evolution/Locations.h:1628
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1629
+#, fuzzy
+msgid "Omaha"
+msgstr "阿曼"
+
+#: my-evolution/Locations.h:1630
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1631
+#, fuzzy
+msgid "Omak"
+msgstr "阿曼"
+
+#: my-evolution/Locations.h:1633
+msgid "Ominato Ab"
+msgstr ""
+
+# calendar/gui/alarm-notify/alarm-queue.c:890
+# calendar/gui/alarm-notify/alarm-queue.c:945
+#: my-evolution/Locations.h:1634
+#, fuzzy
+msgid "Omsk"
+msgstr "確定"
+
+#: my-evolution/Locations.h:1635
+msgid "O'Neill"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:24
+#: my-evolution/Locations.h:1636
+#, fuzzy
+msgid "Ontario"
+msgstr "紙張方向"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:744
+#: my-evolution/Locations.h:1637
+#, fuzzy
+msgid "Oostende"
+msgstr "到會者"
+
+#: my-evolution/Locations.h:1638
+#, fuzzy
+msgid "Oran"
+msgstr "阿曼"
+
+#: my-evolution/Locations.h:1639
+msgid "Oran/Es Senia"
+msgstr ""
+
+# addressbook/backend/ebook/e-card.c:3458
+#: my-evolution/Locations.h:1640
+#, fuzzy
+msgid "Orange"
+msgstr "團體"
+
+#: my-evolution/Locations.h:1641
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1642
+msgid "Ord-Sharp"
+msgstr ""
+
+# addressbook/backend/ebook/e-card.c:3458
+#: my-evolution/Locations.h:1643
+#, fuzzy
+msgid "Oregon"
+msgstr "團體"
+
+#: my-evolution/Locations.h:1644
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1645
+#, fuzzy
+msgid "Orland"
+msgstr "愛爾蘭"
+
+#: my-evolution/Locations.h:1646
+#, fuzzy
+msgid "Orlando"
+msgstr "愛爾蘭"
+
+#: my-evolution/Locations.h:1647
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1648
+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:1649
+#, fuzzy
+msgid "Oruro"
+msgstr "錯誤"
+
+#: my-evolution/Locations.h:1650
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1652
+#, fuzzy
+msgid "Oscoda"
+msgstr "秒"
+
+#: my-evolution/Locations.h:1653
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1657
+#, fuzzy
+msgid "Ostrava"
+msgstr "澳大利亞"
+
+#: my-evolution/Locations.h:1658
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1661
+#, fuzzy
+msgid "Owyhee"
+msgstr "週"
+
+# calendar/gui/event-editor-dialog.glade.h:37
+#: my-evolution/Locations.h:1662
+#, fuzzy
+msgid "Oxford"
+msgstr "發生"
+
+#: my-evolution/Locations.h:1663
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1670
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1671
+#, fuzzy
+msgid "Paganella"
+msgstr "頁"
+
+#: my-evolution/Locations.h:1674
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1675
+#, fuzzy
+msgid "Palacios"
+msgstr "帛琉群島"
+
+# addressbook/contact-editor/e-contact-editor.c:1256
+# addressbook/gui/widgets/e-addressbook-view.c:720
+#: my-evolution/Locations.h:1676
+#, fuzzy
+msgid "Palermo"
+msgstr "呼叫器"
+
+#: my-evolution/Locations.h:1677
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1678
+#, fuzzy
+msgid "Palmdale"
+msgstr "帛琉群島"
+
+# addressbook/contact-editor/e-contact-editor.c:1256
+# addressbook/gui/widgets/e-addressbook-view.c:720
+#: my-evolution/Locations.h:1679
+#, fuzzy
+msgid "Palmer"
+msgstr "呼叫器"
+
+# ui/evolution-mail.xml.h:110
+#: my-evolution/Locations.h:1680
+#, fuzzy
+msgid "Palm Springs"
+msgstr "郵件設定"
+
+#: my-evolution/Locations.h:1681
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1682
+#, fuzzy
+msgid "Pamplona"
+msgstr "帛琉群島"
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: my-evolution/Locations.h:1684
+#, 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:1685
+#, fuzzy
+msgid "Pantelleria"
+msgstr "已取消"
+
+#: my-evolution/Locations.h:1686
+#, fuzzy
+msgid "Papa"
+msgstr "日本"
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1687
+#, fuzzy
+msgid "Paphos"
+msgstr "寮國"
+
+# addressbook/contact-editor/e-contact-editor.c:1257
+#: my-evolution/Locations.h:1689
+#, fuzzy
+msgid "Paris"
+msgstr "首要的"
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1692
+#, fuzzy
+msgid "Paris/Orly"
+msgstr "局部有飛沫"
+
+#: my-evolution/Locations.h:1693
+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:1694
+#, fuzzy
+msgid "Pasco"
+msgstr "密碼"
+
+#: my-evolution/Locations.h:1695
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1700
+msgid "Passo Rolle"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: my-evolution/Locations.h:1701
+#, fuzzy
+msgid "Patna"
+msgstr "巴拿馬"
+
+#: my-evolution/Locations.h:1702
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1706
+#, fuzzy
+msgid "Paysandu"
+msgstr "大沙塵"
+
+# calendar/gui/event-editor-dialog.glade.h:14
+# calendar/gui/event-editor.c:1588
+#: my-evolution/Locations.h:1707
+#, fuzzy
+msgid "Payson"
+msgstr "播放音效："
+
+# widgets/misc/e-messagebox.c:173
+#: my-evolution/Locations.h:1708
+#, fuzzy
+msgid "Pellston"
+msgstr "問題"
+
+#: my-evolution/Locations.h:1709
+#, fuzzy
+msgid "Pelotas"
+msgstr "重新載入"
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/Locations.h:1710
+#, fuzzy
+msgid "Pendleton"
+msgstr "選擇："
+
+#: my-evolution/Locations.h:1711
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1716
+#, fuzzy
+msgid "Peoria"
+msgstr "喬治亞"
+
+#: my-evolution/Locations.h:1717
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1718
+msgid "Pereira/Matecana"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1257
+#: my-evolution/Locations.h:1719
+#, fuzzy
+msgid "Perm"
+msgstr "首要的"
+
+#: my-evolution/Locations.h:1720
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1721
+msgid "Perry-Foley"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:27
+#: my-evolution/Locations.h:1722
+#, fuzzy
+msgid "Perth"
+msgstr "秘魯"
+
+# addressbook/printing/e-contact-print.glade.h:27
+#: my-evolution/Locations.h:1724
+#, fuzzy
+msgid "Perugia"
+msgstr "秘魯"
+
+#: my-evolution/Locations.h:1725
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1730
+#, fuzzy
+msgid "Philip"
+msgstr "菲律賓"
+
+#: my-evolution/Locations.h:1731
+#, fuzzy
+msgid "Philipsburg"
+msgstr "菲律賓"
+
+#: my-evolution/Locations.h:1732
+#, fuzzy
+msgid "Phillips"
+msgstr "菲律賓"
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1739
+msgid "Piedras Negras"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:27
+#: my-evolution/Locations.h:1740
+#, fuzzy
+msgid "Pierre"
+msgstr "秘魯"
+
+#: my-evolution/Locations.h:1741
+msgid "Pietersburg"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:15
+#: my-evolution/Locations.h:1742
+#, fuzzy
+msgid "Pikeville"
+msgstr "預覽"
+
+# importers/pine-importer.c:723
+#: my-evolution/Locations.h:1743
+#, fuzzy
+msgid "Pine Bluff"
+msgstr "Pine 郵件"
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+msgid "Pirassununga"
+msgstr ""
+
+# ui/evolution-event-editor.xml.h:30
+# ui/evolution-task-editor-dialog.xml.h:33
+#: my-evolution/Locations.h:1747
+#, fuzzy
+msgid "Pisa"
+msgstr "巴基斯坦"
+
+#: my-evolution/Locations.h:1748
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1753
+#, fuzzy
+msgid "Plymouth"
+msgstr "月"
+
+#: my-evolution/Locations.h:1754
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+msgid "Pocos De Caldas"
+msgstr ""
+
+#: my-evolution/Locations.h:1756
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1757
+#, fuzzy
+msgid "Podgorica Titograd"
+msgstr "局部有龍捲風"
+
+#: my-evolution/Locations.h:1758
+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:1759
+#, fuzzy
+msgid "Point Hope"
+msgstr "列印信封"
+
+# calendar/gui/e-calendar-table.c:159
+#: my-evolution/Locations.h:1760
+#, fuzzy
+msgid "Point Lay"
+msgstr "列印摘要"
+
+# mail/mail-callbacks.c:1407
+#: my-evolution/Locations.h:1761
+#, fuzzy
+msgid "Point Mugu"
+msgstr "列印郵件"
+
+#: my-evolution/Locations.h:1762
+msgid "Point Piedras Blanca"
+msgstr ""
+
+# mail/folder-browser-factory.c:198
+# ui/evolution-event-editor.xml.h:39
+# ui/evolution-task-editor-dialog.xml.h:42
+#: my-evolution/Locations.h:1763
+#, fuzzy
+msgid "Poitiers"
+msgstr "內容"
+
+#: my-evolution/Locations.h:1765
+msgid "Pompano Beach"
+msgstr ""
+
+# views/addressbook/galview.xml.h:3
+#: my-evolution/Locations.h:1766
+#, fuzzy
+msgid "Ponca City"
+msgstr "電話清單"
+
+# calendar/gui/calendar-model.c:896
+# calendar/gui/calendar-model.c:1120
+# calendar/gui/calendar-model.c:1174
+# calendar/gui/e-calendar-table.c:322
+# calendar/gui/e-calendar-table.c:397
+# mail/mail-account-gui.c:976
+# mail/mail-accounts.c:120
+# mail/mail-accounts.c:164
+# mail/mail-config.glade.h:46
+# shell/e-shell-view.c:1198
+# widgets/misc/e-cell-date-edit.c:237
+# widgets/misc/e-dateedit.c:432
+# widgets/misc/e-dateedit.c:1341
+# widgets/misc/e-dateedit.c:1456
+#: my-evolution/Locations.h:1767
+#, fuzzy
+msgid "Ponce"
+msgstr "無"
+
+#: my-evolution/Locations.h:1768
+msgid "Ponta Pora"
+msgstr ""
+
+# ui/evolution-addressbook.xml.h:17
+#: my-evolution/Locations.h:1769
+#, fuzzy
+msgid "Pontiac"
+msgstr "連絡人"
+
+#: my-evolution/Locations.h:1770
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1771
+msgid "Poplar Bluff"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1772
+#, fuzzy
+msgid "Poprad"
+msgstr "波蘭"
+
+# calendar/gui/print.c:1156
+#: my-evolution/Locations.h:1773
+#, fuzzy
+msgid "Port Alexander"
+msgstr "列印行事曆"
+
+#: my-evolution/Locations.h:1774
+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:1775
+#, fuzzy
+msgid "Port Angeles"
+msgstr "列印信封"
+
+#: my-evolution/Locations.h:1776
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1777
+msgid "Port Elizabeth"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:15
+#: my-evolution/Locations.h:1778
+#, fuzzy
+msgid "Porterville"
+msgstr "預覽"
+
+# ui/evolution-calendar.xml.h:25
+#: my-evolution/Locations.h:1779
+#, fuzzy
+msgid "Port Hardy"
+msgstr "列印名片"
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1780
+#, fuzzy
+msgid "Port Hedland"
+msgstr "波蘭"
+
+#: my-evolution/Locations.h:1781
+msgid "Port Heiden"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1782
+#, fuzzy
+msgid "Portland"
+msgstr "波蘭"
+
+# addressbook/gui/component/addressbook-config.c:409
+#: my-evolution/Locations.h:1783
+#, fuzzy
+msgid "Porto"
+msgstr "通訊埠(_P)："
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: my-evolution/Locations.h:1784
+#, fuzzy
+msgid "Porto Alegre"
+msgstr "進度"
+
+#: my-evolution/Locations.h:1785
+msgid "Porto Alegre Apt"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:29
+#: my-evolution/Locations.h:1786
+#, fuzzy
+msgid "Portoroz"
+msgstr "縱向"
+
+# addressbook/printing/e-contact-print.glade.h:29
+#: my-evolution/Locations.h:1787
+#, fuzzy
+msgid "Porto Santo"
+msgstr "縱向"
+
+#: my-evolution/Locations.h:1788
+msgid "Porto Velho"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:29
+#: my-evolution/Locations.h:1789
+#, fuzzy
+msgid "Port Said"
+msgstr "縱向"
+
+#: my-evolution/Locations.h:1790
+msgid "Portsmouth"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1792
+#, fuzzy
+msgid "Posadas"
+msgstr "波蘭"
+
+#: my-evolution/Locations.h:1793
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1796
+#, fuzzy
+msgid "Poza Rica"
+msgstr "哥斯大黎加"
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1797
+#, fuzzy
+msgid "Poznan"
+msgstr "波蘭"
+
+#: my-evolution/Locations.h:1798
+#, fuzzy
+msgid "Praha"
+msgstr "巴拉圭"
+
+#: my-evolution/Locations.h:1799
+#, fuzzy
+msgid "Pratica di Mare"
+msgstr "局部毛毛雨"
+
+#: my-evolution/Locations.h:1800
+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:1801
+#, fuzzy
+msgid "Presidente Prudente"
+msgstr "預覽列印"
+
+#: my-evolution/Locations.h:1802
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1804
+#, fuzzy
+msgid "Pretoria"
+msgstr "喬治亞"
+
+# calendar/gui/event-editor-dialog.glade.h:15
+#: my-evolution/Locations.h:1805
+#, fuzzy
+msgid "Preveza"
+msgstr "預覽"
+
+# ui/evolution-calendar.xml.h:25
+#: my-evolution/Locations.h:1806
+#, fuzzy
+msgid "Price-Carbon"
+msgstr "皮特康"
+
+# camel/providers/smtp/camel-smtp-transport.c:206
+#: my-evolution/Locations.h:1807
+#, fuzzy
+msgid "Pristina"
+msgstr "繁體"
+
+# addressbook/contact-editor/fulladdr.glade.h:10
+#: my-evolution/Locations.h:1808
+#, fuzzy
+msgid "Providence"
+msgstr "州/省 (_S)："
+
+# calendar/gui/event-editor-dialog.glade.h:15
+#: my-evolution/Locations.h:1809
+#, fuzzy
+msgid "Provincetown"
+msgstr "預覽"
+
+#: my-evolution/Locations.h:1810
+#, fuzzy
+msgid "Provo"
+msgstr "專業"
+
+#: my-evolution/Locations.h:1811
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1812
+#, fuzzy
+msgid "Pucallpa"
+msgstr "帛琉群島"
+
+#: my-evolution/Locations.h:1813
+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:1814
+#, 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:1815
+#, fuzzy
+msgid "Pueblo"
+msgstr "公開"
+
+#: my-evolution/Locations.h:1816
+#, fuzzy
+msgid "Puerto Barrios"
+msgstr "波多黎各"
+
+#: my-evolution/Locations.h:1817
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1818
+#, fuzzy
+msgid "Puerto Escondido"
+msgstr "波多黎各"
+
+#: my-evolution/Locations.h:1819
+#, fuzzy
+msgid "Puerto Lempira"
+msgstr "波多黎各"
+
+#: my-evolution/Locations.h:1820
+#, fuzzy
+msgid "Puerto Limon"
+msgstr "波多黎各"
+
+#: my-evolution/Locations.h:1821
+#, fuzzy
+msgid "Puerto Maldonado"
+msgstr "局部有龍捲風"
+
+#: my-evolution/Locations.h:1822
+#, fuzzy
+msgid "Puerto Montt"
+msgstr "波多黎各"
+
+#: my-evolution/Locations.h:1823
+#, fuzzy
+msgid "Puerto Plata"
+msgstr "波多黎各"
+
+# calendar/gui/e-calendar-table.c:159
+#: my-evolution/Locations.h:1825
+#, fuzzy
+msgid "Puerto Suarez"
+msgstr "列印摘要"
+
+#: my-evolution/Locations.h:1826
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1827
+#, fuzzy
+msgid "Pula"
+msgstr "帛琉群島"
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1828
+#, fuzzy
+msgid "Pullman"
+msgstr "波蘭"
+
+#: my-evolution/Locations.h:1829
+msgid "Punta Arenas"
+msgstr ""
+
+# calendar/gui/print.c:1156
+#: my-evolution/Locations.h:1830
+#, fuzzy
+msgid "Punta Cana"
+msgstr "列印行事曆"
+
+#: my-evolution/Locations.h:1831
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1835
+msgid "Pyongyang"
+msgstr ""
+
+# widgets/misc/e-messagebox.c:173
+#: my-evolution/Locations.h:1837
+#, fuzzy
+msgid "Quantico"
+msgstr "問題"
+
+# mail/mail-format.c:767
+# mail/message-list.c:1082
+#: my-evolution/Locations.h:1838
+#, fuzzy
+msgid "Quebec"
+msgstr "主旨"
+
+#: my-evolution/Locations.h:1839
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1842
+#, fuzzy
+msgid "Quimper"
+msgstr "英制(_I)"
+
+#: my-evolution/Locations.h:1843
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1850
+#, fuzzy
+msgid "Rapid City"
+msgstr "回覆"
+
+#: my-evolution/Locations.h:1851
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1852
+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:1853
+#, fuzzy
+msgid "Rawlins"
+msgstr "下雨"
+
+# addressbook/printing/e-contact-print.glade.h:13
+#: my-evolution/Locations.h:1854
+#, fuzzy
+msgid "Reading"
+msgstr "標題"
+
+#: my-evolution/Locations.h:1855
+#, fuzzy
+msgid "Rebun Island"
+msgstr "波維特島"
+
+# mail/mail-send-recv.c:236
+#: my-evolution/Locations.h:1856
+#, fuzzy
+msgid "Recife"
+msgstr "已接收"
+
+#: my-evolution/Locations.h:1857
+msgid "Red Bluff"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:13
+#: my-evolution/Locations.h:1858
+#, fuzzy
+msgid "Redding"
+msgstr "標題"
+
+#: my-evolution/Locations.h:1859
+#, fuzzy
+msgid "Redig"
+msgstr "閱讀"
+
+# calendar/gui/event-editor-dialog.glade.h:20
+#: my-evolution/Locations.h:1860
+#, fuzzy
+msgid "Redmond"
+msgstr "提醒"
+
+#: my-evolution/Locations.h:1861
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1863
+msgid "Reggio Calabria"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/Locations.h:1864
+#, fuzzy
+msgid "Regina"
+msgstr "地區"
+
+#: my-evolution/Locations.h:1865
+msgid "Reims-Champagne"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+# calendar/gui/event-editor-dialog.glade.h:21
+#: my-evolution/Locations.h:1866
+#, fuzzy
+msgid "Rennes"
+msgstr "提醒"
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/Locations.h:1867
+#, fuzzy
+msgid "Reno"
+msgstr "留尼旺"
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/Locations.h:1868
+#, fuzzy
+msgid "Renton"
+msgstr "留尼旺"
+
+#: my-evolution/Locations.h:1869
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1870
+#, fuzzy
+msgid "Reus"
+msgstr "規則"
+
+#: my-evolution/Locations.h:1871
+#, fuzzy
+msgid "Reyes"
+msgstr "年"
+
+#: my-evolution/Locations.h:1872
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1873
+#, fuzzy
+msgid "Reynosa"
+msgstr "重新載入"
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1874
+#, fuzzy
+msgid "Rhinelander"
+msgstr "芬蘭"
+
+#: my-evolution/Locations.h:1875
+#, fuzzy
+msgid "Rhode Island"
+msgstr "波維特島"
+
+#: my-evolution/Locations.h:1876
+#, fuzzy
+msgid "Riberalta"
+msgstr "直布羅陀"
+
+#: my-evolution/Locations.h:1877
+msgid "Richmond"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:734
+#: my-evolution/Locations.h:1878
+#, fuzzy
+msgid "Rickenbacker"
+msgstr "暱稱"
+
+# mail/mail-send-recv.c:287
+# mail/mail-send-recv.c:333
+#: my-evolution/Locations.h:1879
+#, fuzzy
+msgid "Rieti"
+msgstr "海地"
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rifle"
+msgstr "角色"
+
+# addressbook/printing/e-contact-print.glade.h:33
+#: my-evolution/Locations.h:1881
+#, fuzzy
+msgid "Riga"
+msgstr "右："
+
+#: my-evolution/Locations.h:1882
+#, fuzzy
+msgid "Rijeka"
+msgstr "閱讀"
+
+#: my-evolution/Locations.h:1883
+#, fuzzy
+msgid "Rimini"
+msgstr "羅馬尼亞"
+
+#: my-evolution/Locations.h:1884
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1885
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1886
+msgid "Rio Grande"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:1887
+#, fuzzy
+msgid "Rioja"
+msgstr "無線電電話"
+
+#: my-evolution/Locations.h:1888
+#, fuzzy
+msgid "Rio / Jacarepagua"
+msgstr "尼加拉瓜"
+
+#: my-evolution/Locations.h:1889
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+#, fuzzy
+msgid "Rishiri Island"
+msgstr "英屬維爾京群島"
+
+#: my-evolution/Locations.h:1891
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+#, fuzzy
+msgid "Rivera"
+msgstr "賴比瑞亞"
+
+#: my-evolution/Locations.h:1893
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1894
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1895
+msgid "Riverton"
+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:1896
+#, 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:1897
+#, fuzzy
+msgid "Rivolto"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:1898
+#, fuzzy
+msgid "Riyadh"
+msgstr "閱讀"
+
+#: my-evolution/Locations.h:1899
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1900
+#, fuzzy
+msgid "Roatan"
+msgstr "克羅埃西亞"
+
+# calendar/gui/event-editor-dialog.glade.h:34
+#: my-evolution/Locations.h:1901
+#, fuzzy
+msgid "Robore"
+msgstr "之前"
+
+#: my-evolution/Locations.h:1902
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1903
+msgid "Rockford"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1904
+#, fuzzy
+msgid "Rockland"
+msgstr "波蘭"
+
+#: my-evolution/Locations.h:1905
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1907
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1908
+#, fuzzy
+msgid "Rodos"
+msgstr "會議室"
+
+# camel/providers/imap/camel-imap-provider.c:48
+# shell/e-shell-view.c:552
+#: my-evolution/Locations.h:1909
+#, fuzzy
+msgid "Rogers"
+msgstr "資料夾"
+
+#: my-evolution/Locations.h:1910
+#, fuzzy
+msgid "Roma/Ciampino"
+msgstr "羅馬尼亞"
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1917
+msgid "Roosevelt"
+msgstr ""
+
+# ui/evolution-mail.xml.h:5
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Roros"
+msgstr "葛摩"
+
+#: my-evolution/Locations.h:1919
+msgid "Rorvik/Ryum"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:1920
+#, fuzzy
+msgid "Rosario"
+msgstr "無線電電話"
+
+#: my-evolution/Locations.h:1921
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1922
+#, fuzzy
+msgid "Roseglen"
+msgstr "角色"
+
+# addressbook/gui/component/addressbook-config.c:401
+# mail/mail-config.glade.h:33
+#: my-evolution/Locations.h:1923
+#, fuzzy
+msgid "Rost"
+msgstr "主機"
+
+#: my-evolution/Locations.h:1924
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1927
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1928
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:18
+#: my-evolution/Locations.h:1929
+#, fuzzy
+msgid "Rurrenabaque"
+msgstr "週期性"
+
+#: my-evolution/Locations.h:1930
+msgid "Russell"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:2
+#: my-evolution/Locations.h:1931
+#, fuzzy
+msgid "Russia"
+msgstr "奧地利"
+
+#: my-evolution/Locations.h:1932
+#, fuzzy
+msgid "Rutland"
+msgstr "不丹"
+
+#: my-evolution/Locations.h:1933
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1935
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1936
+msgid "Sabine Pass"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:728
+#: my-evolution/Locations.h:1937
+#, fuzzy
+msgid "Sacramento"
+msgstr "部門"
+
+#: my-evolution/Locations.h:1938
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1939
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:1940
+#, fuzzy
+msgid "Saginaw"
+msgstr "西班牙"
+
+#: my-evolution/Locations.h:1941
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1944
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1945
+#, fuzzy
+msgid "Saint Mary's"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:1946
+#, fuzzy
+msgid "Saint Mawgan"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:1947
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1948
+#, fuzzy
+msgid "Saint Paul"
+msgstr "聖露西亞"
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:1949
+#, fuzzy
+msgid "Saiq"
+msgstr "西班牙"
+
+#: my-evolution/Locations.h:1950
+#, 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:1951
+#, 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:1952
+#, fuzzy
+msgid "Salida"
+msgstr "索馬利亞"
+
+#: my-evolution/Locations.h:1953
+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:1954
+#, 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:1955
+#, fuzzy
+msgid "Salinas"
+msgstr "索馬利亞"
+
+#: my-evolution/Locations.h:1956
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1957
+#, fuzzy
+msgid "Salmon"
+msgstr "薩摩亞群島"
+
+#: my-evolution/Locations.h:1958
+msgid "Salmon (2)"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1959
+#, fuzzy
+msgid "Salta"
+msgstr "馬爾他"
+
+#: my-evolution/Locations.h:1960
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1961
+msgid "Salt Lake City"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: my-evolution/Locations.h:1962
+#, fuzzy
+msgid "Salto"
+msgstr "週六(_S)"
+
+#: my-evolution/Locations.h:1963
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+#, fuzzy
+msgid "Salvador"
+msgstr "薩爾瓦多"
+
+#: my-evolution/Locations.h:1965
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1966
+#, fuzzy
+msgid "Samara"
+msgstr "薩摩亞群島"
+
+#: my-evolution/Locations.h:1967
+#, fuzzy
+msgid "Samos"
+msgstr "薩摩亞群島"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: my-evolution/Locations.h:1968
+#, fuzzy
+msgid "Samsun"
+msgstr "週日(_N)"
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:1969
+#, fuzzy
+msgid "Sana'A"
+msgstr "沙塵"
+
+#: my-evolution/Locations.h:1970
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+#, fuzzy
+msgid "San Angelo"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1975
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1976
+#, fuzzy
+msgid "San Carlos"
+msgstr "聖馬利諾"
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:1977
+#, fuzzy
+msgid "Sandane"
+msgstr "沙塵"
+
+#: my-evolution/Locations.h:1978
+#, fuzzy
+msgid "Sandberg"
+msgstr "寄件者"
+
+#: my-evolution/Locations.h:1979
+#, fuzzy
+msgid "Sanderson"
+msgstr "寄件者"
+
+#: my-evolution/Locations.h:1980
+#, fuzzy
+msgid "San Diego"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1986
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1987
+#, fuzzy
+msgid "Sand Point"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:1988
+msgid "San Fernando De Apure"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:1989
+#, fuzzy
+msgid "Sanford"
+msgstr "沙塵"
+
+#: my-evolution/Locations.h:1990
+#, fuzzy
+msgid "San Francisco"
+msgstr "聖馬利諾"
+
+# addressbook/printing/e-contact-print.glade.h:35
+#: my-evolution/Locations.h:1991
+#, fuzzy
+msgid "Sangju"
+msgstr "網底"
+
+#: my-evolution/Locations.h:1992
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1993
+#, 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:1994
+#, fuzzy
+msgid "San Jose"
+msgstr "儲存後關閉"
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1997
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1998
+#, fuzzy
+msgid "San Juan"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:1999
+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:2000
+#, fuzzy
+msgid "Sanliurfa"
+msgstr "索馬利亞"
+
+#: my-evolution/Locations.h:2001
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2002
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2003
+#, fuzzy
+msgid "San Miguel"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:2004
+#, fuzzy
+msgid "San Nicholas Island"
+msgstr "諾福克群島"
+
+#: my-evolution/Locations.h:2005
+#, fuzzy
+msgid "San Salvador"
+msgstr "薩爾瓦多"
+
+#: my-evolution/Locations.h:2006
+#, fuzzy
+msgid "San Sebastian"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:2007
+#, fuzzy
+msgid "Santa Ana"
+msgstr "聖露西亞"
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+#, fuzzy
+msgid "Santa Maria"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:2012
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2013
+#, fuzzy
+msgid "Santa Monica"
+msgstr "聖露西亞"
+
+#: my-evolution/Locations.h:2014
+#, fuzzy
+msgid "Santander"
+msgstr "寄件者"
+
+#: my-evolution/Locations.h:2015
+#, fuzzy
+msgid "Santarem"
+msgstr "沙暴"
+
+#: my-evolution/Locations.h:2016
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2017
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+#, fuzzy
+msgid "Santiago"
+msgstr "聖露西亞"
+
+#: my-evolution/Locations.h:2019
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2020
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2021
+#, fuzzy
+msgid "Santorini"
+msgstr "沙暴"
+
+# calendar/gui/e-meeting-dialog.glade.h:23
+# mail/message-list.c:1081
+#: my-evolution/Locations.h:2022
+#, fuzzy
+msgid "Santos"
+msgstr "狀況"
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+#, fuzzy
+msgid "Sao Luiz"
+msgstr "聖露西亞"
+
+#: my-evolution/Locations.h:2025
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2028
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+#, fuzzy
+msgid "Sarasota"
+msgstr "薩摩亞群島"
+
+#: my-evolution/Locations.h:2030
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+#, fuzzy
+msgid "Sarzana"
+msgstr "斯里蘭卡"
+
+#: my-evolution/Locations.h:2032
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2033
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2038
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2039
+msgid "Sawyer AFB"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: my-evolution/Locations.h:2040
+#, fuzzy
+msgid "Sayun"
+msgstr "週日(_N)"
+
+# calendar/gui/e-meeting-dialog.glade.h:23
+# mail/message-list.c:1081
+#: my-evolution/Locations.h:2041
+#, fuzzy
+msgid "Scatsta"
+msgstr "狀況"
+
+#: my-evolution/Locations.h:2042
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2045
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2046
+msgid "Scottsdale"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:708
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Scranton"
+msgstr "團體"
+
+#: my-evolution/Locations.h:2048
+msgid "Seattle"
+msgstr ""
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: my-evolution/Locations.h:2049
+#, 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:2050
+#, fuzzy
+msgid "Sedalia"
+msgstr "索馬利亞"
+
+# mail/message-list.c:678
+#: my-evolution/Locations.h:2051
+#, fuzzy
+msgid "Seeb"
+msgstr "已閱讀"
+
+#: my-evolution/Locations.h:2052
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+#, fuzzy
+msgid "Sendai Airport"
+msgstr "開始匯入"
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2058
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2059
+msgid "Sevilla"
+msgstr ""
+
+# addressbook/gui/search/e-addressbook-search-dialog.c:158
+# mail/mail-search.c:242
+#: my-evolution/Locations.h:2060
+#, fuzzy
+msgid "Seward"
+msgstr "尋找"
+
+#: my-evolution/Locations.h:2061
+msgid "Sexton Summit"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:35
+#: my-evolution/Locations.h:2062
+#, fuzzy
+msgid "Shanghai"
+msgstr "網底"
+
+#: my-evolution/Locations.h:2063
+msgid "Shannon"
+msgstr ""
+
+# addressbook/gui/search/e-addressbook-search-dialog.c:158
+# mail/mail-search.c:242
+#: my-evolution/Locations.h:2064
+#, fuzzy
+msgid "Sharjah"
+msgstr "尋找"
+
+#: my-evolution/Locations.h:2065
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+# calendar/gui/event-editor.c:480
+#: my-evolution/Locations.h:2066
+#, fuzzy
+msgid "Sharurah"
+msgstr "星期六"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+# calendar/gui/event-editor.c:480
+#: my-evolution/Locations.h:2067
+#, fuzzy
+msgid "Shawbury"
+msgstr "星期六"
+
+# calendar/gui/e-calendar-table.c:154
+#: my-evolution/Locations.h:2068
+#, fuzzy
+msgid "Shearwater"
+msgstr "開始日期"
+
+#: my-evolution/Locations.h:2069
+msgid "Sheboygan"
+msgstr ""
+
+# mail/message-list.c:678
+#: my-evolution/Locations.h:2070
+#, fuzzy
+msgid "Sheldon"
+msgstr "瑞典"
+
+#: my-evolution/Locations.h:2071
+msgid "Shelter Cove"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/Locations.h:2072
+#, fuzzy
+msgid "Shelton"
+msgstr "選擇："
+
+#: my-evolution/Locations.h:2073
+msgid "Shenandoah"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: my-evolution/Locations.h:2074
+#, fuzzy
+msgid "Sheridan"
+msgstr "蘇丹"
+
+#: my-evolution/Locations.h:2075
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2076
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2077
+msgid "Shingle Point"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:36
+#: my-evolution/Locations.h:2078
+#, fuzzy
+msgid "Shiraz"
+msgstr "大小"
+
+#: my-evolution/Locations.h:2079
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2080
+msgid "Shizuhama Ab"
+msgstr ""
+
+# mail/message-list.c:1081
+#: my-evolution/Locations.h:2081
+#, fuzzy
+msgid "Shoreham"
+msgstr "目標"
+
+#: my-evolution/Locations.h:2082
+#, fuzzy
+msgid "Show Low"
+msgstr "淺雪"
+
+#: my-evolution/Locations.h:2083
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2084
+msgid "Shreveport Regional"
+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:2085
+#, fuzzy
+msgid "Sidney"
+msgstr "列印"
+
+#: my-evolution/Locations.h:2086
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2087
+msgid "Siloam Springs"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:54
+#: my-evolution/Locations.h:2088
+#, fuzzy
+msgid "Silver City"
+msgstr "安全性"
+
+# camel/providers/sendmail/camel-sendmail-provider.c:37
+# mail/mail-config.glade.h:67
+#: my-evolution/Locations.h:2089
+#, fuzzy
+msgid "Sindal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2091
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2097
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2098
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:36
+#: my-evolution/Locations.h:2099
+#, fuzzy
+msgid "Skive"
+msgstr "大小"
+
+# ui/evolution-addressbook.xml.h:12
+#: my-evolution/Locations.h:2100
+#, fuzzy
+msgid "Skopje"
+msgstr "停止"
+
+# mail/mail-config.glade.h:68
+#: my-evolution/Locations.h:2101
+#, fuzzy
+msgid "Skwentna"
+msgstr "傳送"
+
+#: my-evolution/Locations.h:2102
+#, fuzzy
+msgid "Slana"
+msgstr "阿爾巴尼亞"
+
+# executive-summary/test-service/rdf-summary.c:806
+#: my-evolution/Locations.h:2105
+#, fuzzy
+msgid "Smithers"
+msgstr "分"
+
+#: my-evolution/Locations.h:2106
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2107
+#, fuzzy
+msgid "Snowshoe Lake"
+msgstr "陣雪"
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:2108
+#, fuzzy
+msgid "Sochi"
+msgstr "南"
+
+# mail/message-list.c:1081
+#: my-evolution/Locations.h:2109
+#, fuzzy
+msgid "Socorro"
+msgstr "目標"
+
+# mail/message-list.c:1081
+#: my-evolution/Locations.h:2110
+#, fuzzy
+msgid "Socotra"
+msgstr "目標"
+
+#: my-evolution/Locations.h:2111
+#, 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:2112
+#, fuzzy
+msgid "Sofia"
+msgstr "索馬利亞"
+
+# camel/providers/sendmail/camel-sendmail-provider.c:37
+# mail/mail-config.glade.h:67
+#: my-evolution/Locations.h:2113
+#, fuzzy
+msgid "Sogndal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2114
+#, fuzzy
+msgid "Soldotna"
+msgstr "斯洛凡尼亞"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: my-evolution/Locations.h:2115
+#, fuzzy
+msgid "Somerset"
+msgstr "陣雨"
+
+#: my-evolution/Locations.h:2116
+#, fuzzy
+msgid "Sonderborg"
+msgstr "寄件者"
+
+#: my-evolution/Locations.h:2117
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2120
+#, fuzzy
+msgid "Southampton"
+msgstr "東南"
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:2121
+#, fuzzy
+msgid "South Bend"
+msgstr "南"
+
+#: my-evolution/Locations.h:2122
+#, fuzzy
+msgid "South Carolina"
+msgstr "南非"
+
+#: my-evolution/Locations.h:2123
+#, fuzzy
+msgid "South Dakota"
+msgstr "東南"
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:2124
+#, fuzzy
+msgid "Southend"
+msgstr "南"
+
+#: my-evolution/Locations.h:2125
+#, fuzzy
+msgid "South Marsh Island"
+msgstr "馬紹爾群島"
+
+#: my-evolution/Locations.h:2126
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2128
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2129
+#, fuzzy
+msgid "Spencer"
+msgstr "寄件者"
+
+#: my-evolution/Locations.h:2130
+msgid "Spickard"
+msgstr ""
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: my-evolution/Locations.h:2131
+#, fuzzy
+msgid "Split"
+msgstr "靄"
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:2132
+#, fuzzy
+msgid "Spokane"
+msgstr "西班牙"
+
+#: my-evolution/Locations.h:2133
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2134
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "Springfield"
+msgstr "簡體"
+
+#: my-evolution/Locations.h:2136
+msgid "Stampede Pass"
+msgstr ""
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#: my-evolution/Locations.h:2137
+#, fuzzy
+msgid "State College"
+msgstr "完成日期："
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: my-evolution/Locations.h:2138
+#, fuzzy
+msgid "Stauning"
+msgstr "設定"
+
+#: my-evolution/Locations.h:2139
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2140
+msgid "Stavanger/Sola"
+msgstr ""
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: my-evolution/Locations.h:2141
+#, fuzzy
+msgid "Staverton"
+msgstr "設定"
+
+# ui/evolution-addressbook.xml.h:12
+#: my-evolution/Locations.h:2142
+#, fuzzy
+msgid "Stavropol"
+msgstr "停止"
+
+#: my-evolution/Locations.h:2143
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2144
+msgid "Steamboat Springs"
+msgstr ""
+
+# calendar/gui/e-meeting-dialog.glade.h:21
+#: my-evolution/Locations.h:2145
+#, fuzzy
+msgid "Stephenville"
+msgstr "塞席爾"
+
+#: my-evolution/Locations.h:2146
+#, fuzzy
+msgid "St. George"
+msgstr "聖赫勒拿島"
+
+#: my-evolution/Locations.h:2147
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2148
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2149
+msgid "St Johnsbury"
+msgstr ""
+
+# ui/evolution-addressbook.xml.h:12
+#: my-evolution/Locations.h:2150
+#, fuzzy
+msgid "St Joseph"
+msgstr "停止"
+
+#: my-evolution/Locations.h:2151
+#, fuzzy
+msgid "St Louis"
+msgstr "聖露西亞"
+
+#: my-evolution/Locations.h:2152
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2157
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2158
+#, fuzzy
+msgid "Storm Lake"
+msgstr "斯里蘭卡"
+
+# widgets/misc/e-cell-date-edit.c:221
+# widgets/misc/e-dateedit.c:418
+#: my-evolution/Locations.h:2159
+#, fuzzy
+msgid "Stornoway"
+msgstr "挪威"
+
+# calendar/gui/e-meeting-dialog.glade.h:23
+# mail/message-list.c:1081
+#: my-evolution/Locations.h:2160
+#, fuzzy
+msgid "St Paul"
+msgstr "狀況"
+
+#: my-evolution/Locations.h:2161
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2164
+msgid "Strevell"
+msgstr ""
+
+#: my-evolution/Locations.h:2165
+#, fuzzy
+msgid "St Simon's Island"
+msgstr "索羅門群島"
+
+#: my-evolution/Locations.h:2166
+msgid "Stumpy Point"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+# calendar/gui/event-editor.c:480
+#: my-evolution/Locations.h:2167
+#, fuzzy
+msgid "Sturgeon Bay"
+msgstr "星期六"
+
+#: my-evolution/Locations.h:2168
+msgid "Stuttgart"
+msgstr ""
+
+# mail/message-list.c:1081
+#: my-evolution/Locations.h:2169
+#, fuzzy
+msgid "Sucre"
+msgstr "目標"
+
+#: my-evolution/Locations.h:2170
+#, fuzzy
+msgid "Sumburgh"
+msgstr "盧森堡"
+
+# calendar/gui/e-calendar-table.c:159
+#: my-evolution/Locations.h:2171
+#, fuzzy
+msgid "Sumter"
+msgstr "摘要"
+
+#: my-evolution/Locations.h:2172
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2174
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2175
+msgid "Superior"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: my-evolution/Locations.h:2177
+#, fuzzy
+msgid "Sutton"
+msgstr "週日(_N)"
+
+#: my-evolution/Locations.h:2178
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2179
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2188
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2189
+msgid "Szombathely"
+msgstr ""
+
+# camel/providers/smtp/camel-smtp-transport.c:206
+#: my-evolution/Locations.h:2190
+#, fuzzy
+msgid "Tabatinga"
+msgstr "繁體"
+
+#: my-evolution/Locations.h:2191
+msgid "Tabriz"
+msgstr ""
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: my-evolution/Locations.h:2192
+#, fuzzy
+msgid "Tabuk"
+msgstr "工作"
+
+#: my-evolution/Locations.h:2193
+msgid "Tachikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+#, fuzzy
+msgid "Tacna"
+msgstr "迦納"
+
+#: my-evolution/Locations.h:2195
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2199
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+#, fuzzy
+msgid "Taejon"
+msgstr "然後"
+
+#: my-evolution/Locations.h:2201
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2202
+msgid "Taichung"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2203
+#, fuzzy
+msgid "Taif"
+msgstr "臺灣"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2204
+#, fuzzy
+msgid "Tainan"
+msgstr "臺灣"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2206
+#, fuzzy
+msgid "Taiyuan"
+msgstr "臺灣"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2207
+#, fuzzy
+msgid "Taiz"
+msgstr "臺灣"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2208
+#, fuzzy
+msgid "Tajima"
+msgstr "臺灣"
+
+#: my-evolution/Locations.h:2209
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Talara"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Talinn"
+msgstr "臺灣"
+
+#: my-evolution/Locations.h:2212
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tallahassee"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2215
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2216
+#, fuzzy
+msgid "Tampa"
+msgstr "日本"
+
+#: my-evolution/Locations.h:2217
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:27
+#: my-evolution/Locations.h:2218
+#, fuzzy
+msgid "Tampere"
+msgstr "使用紙張"
+
+#: my-evolution/Locations.h:2219
+msgid "Tampico"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: my-evolution/Locations.h:2220
+#, fuzzy
+msgid "Tanana"
+msgstr "加拿大"
+
+#: my-evolution/Locations.h:2221
+msgid "Tanegashima Airport"
+msgstr ""
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:2222
+#, fuzzy
+msgid "Taos"
+msgstr "寮國"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2223
+#, fuzzy
+msgid "Taoyuan"
+msgstr "臺灣"
+
+#: my-evolution/Locations.h:2224
+msgid "Tapachula"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2225
+#, fuzzy
+msgid "Taranto"
+msgstr "臺灣"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: my-evolution/Locations.h:2226
+#, fuzzy
+msgid "Tarbes"
+msgstr "工作"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2227
+#, fuzzy
+msgid "Tarija"
+msgstr "臺灣"
+
+#: my-evolution/Locations.h:2228
+msgid "Tarvisio"
+msgstr ""
+
+# camel/providers/smtp/camel-smtp-transport.c:206
+#: my-evolution/Locations.h:2229
+#, fuzzy
+msgid "Tatalina"
+msgstr "繁體"
+
+#: my-evolution/Locations.h:2230
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2235
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2236
+#, fuzzy
+msgid "Tela"
+msgstr "托克勞群島"
+
+# addressbook/contact-editor/e-contact-editor.c:1259
+# addressbook/gui/widgets/e-addressbook-view.c:722
+#: my-evolution/Locations.h:2237
+#, fuzzy
+msgid "Temple"
+msgstr "電報"
+
+#: my-evolution/Locations.h:2238
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2244
+msgid "Texarkana"
+msgstr ""
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: my-evolution/Locations.h:2245
+#, fuzzy
+msgid "Texas"
+msgstr "工作"
+
+# calendar/gui/e-meeting-dialog.glade.h:21
+#: my-evolution/Locations.h:2246
+#, fuzzy
+msgid "The Dalles"
+msgstr "塞席爾"
+
+#: my-evolution/Locations.h:2247
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2248
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2249
+msgid "Thiruvananthapuram"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:730
+#: my-evolution/Locations.h:2250
+#, fuzzy
+msgid "Thisted"
+msgstr "頭銜"
+
+#: my-evolution/Locations.h:2251
+msgid "Thompson Falls"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+# calendar/gui/event-editor.c:478
+#: my-evolution/Locations.h:2252
+#, fuzzy
+msgid "Thumrait"
+msgstr "星期四"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2253
+#, fuzzy
+msgid "Tianjin"
+msgstr "臺灣"
+
+#: my-evolution/Locations.h:2254
+#, fuzzy
+msgid "Tijuana"
+msgstr "立陶宛"
+
+#: my-evolution/Locations.h:2255
+msgid "Timisoara"
+msgstr ""
+
+#: my-evolution/Locations.h:2256
+msgid "Tin City"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2257
+#, fuzzy
+msgid "Tirana"
+msgstr "臺灣"
+
+# ui/evolution-calendar.xml.h:36
+#: my-evolution/Locations.h:2258
+#, fuzzy
+msgid "Tiree"
+msgstr "空閒"
+
+#: my-evolution/Locations.h:2259
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2260
+msgid "Tiruchchirapalli"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:730
+#: my-evolution/Locations.h:2261
+#, 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:2262
+#, fuzzy
+msgid "Tivat"
+msgstr "私人"
+
+#: my-evolution/Locations.h:2263
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2267
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+#, fuzzy
+msgid "Tokunoshima Island"
+msgstr "聖誕島"
+
+#: my-evolution/Locations.h:2269
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2271
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2272
+msgid "Tokyo New International Airport"
+msgstr ""
+
+# ui/evolution.xml.h:31
+#: my-evolution/Locations.h:2273
+#, fuzzy
+msgid "Toledo"
+msgstr "切換"
+
+#: my-evolution/Locations.h:2274
+#, 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:2275
+#, fuzzy
+msgid "Tonopah"
+msgstr "東加"
+
+#: my-evolution/Locations.h:2276
+#, fuzzy
+msgid "Topeka"
+msgstr "托克勞群島"
+
+#: my-evolution/Locations.h:2277
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2279
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2280
+#, fuzzy
+msgid "Toronto"
+msgstr "龍捲風"
+
+# addressbook/printing/e-contact-print.glade.h:39
+#: my-evolution/Locations.h:2281
+#, fuzzy
+msgid "Torp"
+msgstr "上："
+
+# ui/evolution-mail.xml.h:2
+#: my-evolution/Locations.h:2282
+#, fuzzy
+msgid "Torrance"
+msgstr "法國"
+
+#: my-evolution/Locations.h:2283
+#, fuzzy
+msgid "Torreon"
+msgstr "韓文"
+
+#: my-evolution/Locations.h:2284
+#, 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:2285
+#, fuzzy
+msgid "Toulouse"
+msgstr "關閉"
+
+#: my-evolution/Locations.h:2286
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2290
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2291
+#, fuzzy
+msgid "Trabzon"
+msgstr "加彭"
+
+#: my-evolution/Locations.h:2292
+#, fuzzy
+msgid "Trapani"
+msgstr "日本"
+
+#: my-evolution/Locations.h:2293
+msgid "Traverse City"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1259
+# addressbook/gui/widgets/e-addressbook-view.c:722
+#: my-evolution/Locations.h:2294
+#, fuzzy
+msgid "Trelew"
+msgstr "電報"
+
+# addressbook/printing/e-contact-print.glade.h:24
+#: my-evolution/Locations.h:2295
+#, 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:2296
+#, fuzzy
+msgid "Trevico"
+msgstr "上一步"
+
+#: my-evolution/Locations.h:2297
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2298
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2299
+#, fuzzy
+msgid "Trieste"
+msgstr "測試"
+
+#: my-evolution/Locations.h:2300
+#, fuzzy
+msgid "Trinidad"
+msgstr "龍捲風"
+
+#: my-evolution/Locations.h:2301
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2304
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2305
+msgid "Troyes/Barberey"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: my-evolution/Locations.h:2306
+#, fuzzy
+msgid "Truckee"
+msgstr "土耳其"
+
+#: my-evolution/Locations.h:2307
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2314
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2315
+msgid "Tulancingo"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+# calendar/gui/event-editor.c:476
+#: my-evolution/Locations.h:2316
+#, fuzzy
+msgid "Tulcea"
+msgstr "星期二"
+
+#: my-evolution/Locations.h:2317
+#, fuzzy
+msgid "Tulsa"
+msgstr "突尼西亞"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: my-evolution/Locations.h:2318
+#, fuzzy
+msgid "Tupelo"
+msgstr "週二(_U)"
+
+# 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:2319
+#, 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:2320
+#, fuzzy
+msgid "Turin"
+msgstr "土耳其文"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: my-evolution/Locations.h:2322
+#, fuzzy
+msgid "Turku"
+msgstr "土耳其"
+
+#: my-evolution/Locations.h:2323
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2324
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: my-evolution/Locations.h:2325
+#, fuzzy
+msgid "Twenthe"
+msgstr "暫訂"
+
+#: my-evolution/Locations.h:2326
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2327
+msgid "Twin Falls"
+msgstr ""
+
+# mail/mail-config.glade.h:78
+#: my-evolution/Locations.h:2328
+#, fuzzy
+msgid "Tyler"
+msgstr "類別"
+
+#: my-evolution/Locations.h:2329
+msgid "Tyndall AFB"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: my-evolution/Locations.h:2330
+#, fuzzy
+msgid "Tyumen"
+msgstr "週二(_U)"
+
+#: my-evolution/Locations.h:2331
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2332
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2340
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2341
+#, fuzzy
+msgid "United Arab Emirates "
+msgstr "阿拉伯聯合大公國"
+
+# mail/message-list.c:677
+#: my-evolution/Locations.h:2344
+#, fuzzy
+msgid "Unst"
+msgstr "未閱讀"
+
+#: my-evolution/Locations.h:2345
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2346
+#, fuzzy
+msgid "Uruapan"
+msgstr "日本"
+
+#: my-evolution/Locations.h:2347
+#, fuzzy
+msgid "Uruguaiana"
+msgstr "烏拉圭"
+
+#: my-evolution/Locations.h:2349
+msgid "Urumqi"
+msgstr ""
+
+# calendar/gui/event-editor.c:608
+#: my-evolution/Locations.h:2350
+#, fuzzy
+msgid "Utah"
+msgstr " "
+
+#: my-evolution/Locations.h:2351
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2353
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2354
+msgid "Uzhgorod"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2355
+#, fuzzy
+msgid "Vadso"
+msgstr "無線電電話"
+
+# mail/mail-accounts.c:197
+#: my-evolution/Locations.h:2356
+#, fuzzy
+msgid "Vaerlose"
+msgstr "變數"
+
+# addressbook/contact-editor/e-contact-editor.c:1256
+# addressbook/gui/widgets/e-addressbook-view.c:720
+#: my-evolution/Locations.h:2357
+#, fuzzy
+msgid "Vagar"
+msgstr "呼叫器"
+
+#: my-evolution/Locations.h:2358
+msgid "Valdez 2"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:2359
+#, fuzzy
+msgid "Valdosta"
+msgstr "馬爾他"
+
+#: my-evolution/Locations.h:2360
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2361
+#, fuzzy
+msgid "Valencia"
+msgstr "斯洛凡尼亞"
+
+# mail/mail-display.c:301
+#: my-evolution/Locations.h:2362
+#, fuzzy
+msgid "Valentine"
+msgstr "檢視 Inline"
+
+#: my-evolution/Locations.h:2363
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2366
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2367
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:2368
+#, fuzzy
+msgid "Van"
+msgstr "主管"
+
+#: my-evolution/Locations.h:2369
+msgid "Vancouver"
+msgstr ""
+
+# ui/evolution-mail.xml.h:2
+#: my-evolution/Locations.h:2370
+#, fuzzy
+msgid "Vandel"
+msgstr "取消"
+
+#: my-evolution/Locations.h:2371
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2373
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+#, fuzzy
+msgid "Varadero"
+msgstr "巴貝多"
+
+#: my-evolution/Locations.h:2375
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2376
+#, fuzzy
+msgid "Varna"
+msgstr "萬那杜"
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: my-evolution/Locations.h:2377
+#, fuzzy
+msgid "Vasteras"
+msgstr "之後"
+
+#: my-evolution/Locations.h:2378
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2379
+#, fuzzy
+msgid "Venezia"
+msgstr "委內瑞拉"
+
+#: my-evolution/Locations.h:2381
+#, fuzzy
+msgid "Venice"
+msgstr "Unicode"
+
+#: my-evolution/Locations.h:2382
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2383
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2384
+#, 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:2385
+#, fuzzy
+msgid "Vernal"
+msgstr "一般"
+
+#: my-evolution/Locations.h:2386
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+#, fuzzy
+msgid "Vicenza"
+msgstr "委內瑞拉"
+
+#: my-evolution/Locations.h:2388
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2390
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2393
+msgid "Vigo"
+msgstr ""
+
+# shell/e-shell-importer.c:540
+#: my-evolution/Locations.h:2394
+#, fuzzy
+msgid "Vilhena"
+msgstr "檔案名稱："
+
+#: my-evolution/Locations.h:2395
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+msgid "Villahermosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2398
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2404
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+#, fuzzy
+msgid "Visalia"
+msgstr "澳大利亞"
+
+#: my-evolution/Locations.h:2406
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2410
+msgid "Vladivostok"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:2411
+#, fuzzy
+msgid "Vlieland"
+msgstr "芬蘭"
+
+#: my-evolution/Locations.h:2412
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2413
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2414
+#, fuzzy
+msgid "Volkel"
+msgstr "托克勞群島"
+
+# ui/evolution-message-composer.xml.h:47
+#: my-evolution/Locations.h:2415
+#, fuzzy
+msgid "Volk Field"
+msgstr "寄件者(_F)"
+
+#: my-evolution/Locations.h:2416
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2417
+#, fuzzy
+msgid "Voslau"
+msgstr "托克勞群島"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:2418
+#, fuzzy
+msgid "Waco"
+msgstr "摩納哥"
+
+#: my-evolution/Locations.h:2419
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2423
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2424
+#, fuzzy
+msgid "Wallops Island"
+msgstr "福克蘭群島"
+
+#: my-evolution/Locations.h:2425
+msgid "Walnut Ridge"
+msgstr ""
+
+# widgets/misc/e-messagebox.c:159
+#: my-evolution/Locations.h:2426
+#, fuzzy
+msgid "Warner Robins"
+msgstr "警告"
+
+#: my-evolution/Locations.h:2427
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2429
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2430
+msgid "Washington/Dulles"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: my-evolution/Locations.h:2431
+#, fuzzy
+msgid "Waterbury"
+msgstr "天氣"
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: my-evolution/Locations.h:2432
+#, fuzzy
+msgid "Waterloo"
+msgstr "天氣"
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: my-evolution/Locations.h:2433
+#, fuzzy
+msgid "Watertown"
+msgstr "天氣"
+
+# calendar/gui/e-calendar-table.c:150
+#: my-evolution/Locations.h:2434
+#, fuzzy
+msgid "Waterville"
+msgstr "類別"
+
+#: my-evolution/Locations.h:2435
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+#, fuzzy
+msgid "Wausau"
+msgstr "萬那杜"
+
+#: my-evolution/Locations.h:2437
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2438
+msgid "Waynesboro"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:727
+#: my-evolution/Locations.h:2439
+#, fuzzy
+msgid "Webster City"
+msgstr "網址"
+
+# calendar/gui/print.c:362
+#: my-evolution/Locations.h:2440
+#, fuzzy
+msgid "Wejh"
+msgstr "三"
+
+#: my-evolution/Locations.h:2441
+msgid "Wellington"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: my-evolution/Locations.h:2442
+#, fuzzy
+msgid "Wenatchee"
+msgstr "天氣"
+
+#: my-evolution/Locations.h:2443
+#, fuzzy
+msgid "Wendover"
+msgstr "寄件者"
+
+#: my-evolution/Locations.h:2444
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2445
+#, fuzzy
+msgid "West Burke"
+msgstr "西歐字母"
+
+# addressbook/contact-editor/contact-editor.glade.h:12
+#: my-evolution/Locations.h:2446
+#, fuzzy
+msgid "Westerland"
+msgstr "荷蘭"
+
+#: my-evolution/Locations.h:2447
+#, fuzzy
+msgid "Westfield"
+msgstr "西"
+
+#: my-evolution/Locations.h:2448
+msgid "Westhampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2449
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2451
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2452
+msgid "West Yellowstone (2)"
+msgstr ""
+
+# ui/evolution-event-editor.xml.h:46
+#: my-evolution/Locations.h:2453
+#, fuzzy
+msgid "Wheeling"
+msgstr "會議排程(_M)"
+
+#: my-evolution/Locations.h:2454
+#, fuzzy
+msgid "Whidbey Island"
+msgstr "聖誕島"
+
+#: my-evolution/Locations.h:2455
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2461
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2462
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:734
+#: my-evolution/Locations.h:2463
+#, fuzzy
+msgid "Wick"
+msgstr "暱稱"
+
+# calendar/gui/print.c:362
+#: my-evolution/Locations.h:2464
+#, fuzzy
+msgid "Wien"
+msgstr "三"
+
+#: my-evolution/Locations.h:2465
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2467
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2468
+msgid "Williamsport"
+msgstr ""
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: my-evolution/Locations.h:2469
+#, fuzzy
+msgid "Williston"
+msgstr "靄"
+
+#: my-evolution/Locations.h:2470
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2472
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2473
+#, fuzzy
+msgid "Winchester"
+msgstr "列支敦斯登"
+
+#: my-evolution/Locations.h:2474
+#, fuzzy
+msgid "Windsor"
+msgstr "沙暴"
+
+#: my-evolution/Locations.h:2475
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2478
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+#, fuzzy
+msgid "Winslow"
+msgstr "現在"
+
+#: my-evolution/Locations.h:2480
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2481
+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:2482
+#, fuzzy
+msgid "Winter Park"
+msgstr "密碼"
+
+#: my-evolution/Locations.h:2483
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+#, fuzzy
+msgid "Wisconsin"
+msgstr "密克羅尼西亞"
+
+#: my-evolution/Locations.h:2485
+msgid "Wisconsin Rapids"
+msgstr ""
+
+# calendar/gui/print.c:362
+#: my-evolution/Locations.h:2486
+#, fuzzy
+msgid "Wise"
+msgstr "三"
+
+#: my-evolution/Locations.h:2487
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2488
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2489
+#, fuzzy
+msgid "Woong Cheon"
+msgstr "香港"
+
+# addressbook/printing/e-contact-print.glade.h:9
+#: my-evolution/Locations.h:2490
+#, fuzzy
+msgid "Wooster"
+msgstr "頁尾："
+
+# calendar/gui/event-editor-dialog.glade.h:38
+#: my-evolution/Locations.h:2491
+#, fuzzy
+msgid "Worcester"
+msgstr "永遠"
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:2492
+#, fuzzy
+msgid "Worland"
+msgstr "波蘭"
+
+# mail/mail-mt.c:516
+# mail/mail-mt.c:545
+# mail/mail-mt.c:880
+#: my-evolution/Locations.h:2493
+#, fuzzy
+msgid "Worthington"
+msgstr "正在工作"
+
+#: my-evolution/Locations.h:2494
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2495
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2496
+msgid "Wuchia Observatory"
+msgstr ""
+
+# mail/mail-mt.c:516
+# mail/mail-mt.c:545
+# mail/mail-mt.c:880
+#: my-evolution/Locations.h:2497
+#, fuzzy
+msgid "Wyoming"
+msgstr "正在工作"
+
+# addressbook/gui/component/addressbook-config.glade.h:5
+#: my-evolution/Locations.h:2498
+#, fuzzy
+msgid "Xiamen"
+msgstr "名稱"
+
+#: my-evolution/Locations.h:2499
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2505
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2506
+msgid "Yankton"
+msgstr ""
+
+# shell/e-shortcuts-view.c:265
+#: my-evolution/Locations.h:2507
+#, fuzzy
+msgid "Yao Airport"
+msgstr "不要匯入"
+
+#: my-evolution/Locations.h:2508
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2510
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2511
+msgid "Yellowstone"
+msgstr ""
+
+# mail/message-list.c:678
+#: my-evolution/Locations.h:2513
+#, fuzzy
+msgid "Yenbo"
+msgstr "葉門"
+
+#: my-evolution/Locations.h:2514
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2522
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2528
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2529
+msgid "Zacatecas"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: my-evolution/Locations.h:2530
+#, fuzzy
+msgid "Zadar"
+msgstr "行事曆"
+
+# addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:2531
+#, fuzzy
+msgid "Zagreb"
+msgstr "頁"
+
+#: my-evolution/Locations.h:2532
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2533
+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:2534
+#, fuzzy
+msgid "Zanesville"
+msgstr "已取消"
+
+#: my-evolution/Locations.h:2535
+#, fuzzy
+msgid "Zaragoza"
+msgstr "巴拉圭"
+
+#: my-evolution/Locations.h:2536
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2537
+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:2538
+#, 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 +27061,119 @@ 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:151
 msgid "Mail summary"
 msgstr "郵件摘要"
 
+# camel/providers/imap/camel-imap-provider.c:48
+# shell/e-shell-view.c:552
+#. 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 "資料夾"
+
+# mail/mail-config.glade.h:76
+#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
+#: my-evolution/e-summary-mail.c:761
+#, 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:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com 每日一字"
 
-#: my-evolution/e-summary-preferences.c:467
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "每日一文"
 
-#: my-evolution/e-summary-preferences.c:946
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "新增新聞發送伺服器"
 
-#: my-evolution/e-summary-preferences.c:954
+#: my-evolution/e-summary-preferences.c:728
 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
+#: my-evolution/e-summary-preferences.c:732
 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:300
 #, 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:444
 msgid "News Feed"
 msgstr "新聞發送伺服器"
 
+#: my-evolution/e-summary-shown.c:463
+msgid "All"
+msgstr ""
+
+# addressbook/contact-editor/contact-editor.glade.h:17
+# mail/mail-config.glade.h:84
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "新增 (_A)"
+
+# 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
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr "移除(_R)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: my-evolution/e-summary-shown.c:487 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,79 +27182,42 @@ 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:65
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "執行摘要元件不能初始化 Bonobo。\n"
 
-#: my-evolution/metar.c:29
-msgid "蚌"
-msgstr "蚌"
-
-#: my-evolution/metar.c:29
-msgid "蚓"
-msgstr "蚓"
-
-# addressbook/printing/e-contact-print.glade.h:8
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr "節"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "kph"
-
-# mail/mail-ops.c:914
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "inHg"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "mmHg"
-
-# importers/netscape-importer.c:795
-# mail/mail-callbacks.c:1359
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "哩"
-
-# importers/netscape-importer.c:795
-# mail/mail-callbacks.c:1359
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "公里"
-
 # ui/evolution-event-editor.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:9
 #: my-evolution/metar.c:44
@@ -12928,14 +27631,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 +28405,155 @@ 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)："
-
-# mail/message-list.c:679
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "所有新聞發送伺服器(_F)："
-
-#: my-evolution/my-evolution.glade.h:6
-msgid "C_elcius"
+#: my-evolution/my-evolution.glade.h:2
+msgid "C_elsius"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 msgid "How many days should the calendar display at once?"
 msgstr "行事曆每次顯示多少天？"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:5
 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:6
 msgid "News Feed Settings"
 msgstr "新聞發送伺服器設定"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 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:8
 msgid "One w_eek"
 msgstr "一週(_E)"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 msgid "R_efresh time (seconds):"
 msgstr "重新整理時間(秒)(_E)："
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 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:11
 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:12
 msgid "Show _all tasks"
 msgstr "顯示全部工作(_A)"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _today's tasks"
 msgstr "顯示今天的工作(_T)"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 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:15
 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:16
 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:17
 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:18
 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:19
 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:20
 msgid "_News Feeds"
 msgstr "新聞發送伺服器(_N)"
 
 # calendar/gui/event-editor.c:1545
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 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:22
 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:23
 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 default folders."
+msgstr ""
+
+# mail/mail-config.glade.h:76
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+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 default folders"
+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 "取消行動"
 
-# mail/local-config.glade.h:8
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Inbox"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr ""
-
-# mail/mail-config.glade.h:76
-#: shell/e-local-storage.c:636
-#, fuzzy
-msgid "Local Folders"
-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 +28562,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 +28584,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 +28593,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 +28632,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 +28647,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 +28658,63 @@ 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
-#, fuzzy
-msgid "Evolution "
-msgstr "Evolution"
-
-# 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-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
 # 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: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: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:326
 msgid "Copy folder"
 msgstr "複製資料夾"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, 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:373
 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:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -14049,21 +28734,21 @@ 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:415
 #, 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
+#: shell/e-shell-folder-commands.c:425
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "您確定要刪除這個資料夾 '%s'？"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:502
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -14074,27 +28759,27 @@ msgstr ""
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:549
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "重新命名資料夾 '%s'"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:556
 #, fuzzy
 msgid "Rename folder"
 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-commands.c:566
+#: 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,7 +28789,7 @@ 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 - 新增資料夾"
 
@@ -14118,13 +28803,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:376
 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 "(未命名)"
 
@@ -14141,11 +28826,13 @@ 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: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 ""
 
@@ -14177,17 +28864,26 @@ 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:409
 #, 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:410 shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: shell/e-shell-importer.c:420
 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:435
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14197,12 +28893,12 @@ msgstr ""
 "%s"
 
 # shell/e-shell-importer.c:363
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:445
 msgid "Importing"
 msgstr "匯入"
 
 # shell/e-shell-importer.c:371
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:453
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14212,19 +28908,19 @@ msgstr ""
 "正在啟動 %s"
 
 # shell/e-shell-importer.c:384
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:466
 #, 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:485
 #, 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:502
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14234,37 +28930,37 @@ msgstr ""
 "正在匯入項目 1。"
 
 # shell/e-shell-importer.c:490
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:572
 msgid "Automatic"
 msgstr "自動"
 
 # shell/e-shell-importer.c:540
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:623
 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:628
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
 # shell/e-shell-importer.c:555
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:638
 msgid "File type:"
 msgstr "檔案類別："
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:663
 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:667
 #, 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:732 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14272,23 +28968,23 @@ msgstr ""
 "請稍候...\n"
 "正在掃描現存的設定"
 
-#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
+#: shell/e-shell-importer.c:735 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:859 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:1027
 msgid "Select folder"
 msgstr "選擇資料夾"
 
 # shell/e-shell-importer.c:602
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1028
 msgid "Select a destination folder for importing this data"
 msgstr "選擇目的資料夾用作匯入這些資料"
 
@@ -14297,7 +28993,7 @@ 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:1140 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "匯入"
 
@@ -14322,6 +29018,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:506
+#: shell/e-shell-user-creatable-items-handler.c:551
+#: 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 +29047,103 @@ 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:168
 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:176
 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:218
 #, 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:444
 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:445
 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:565
 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:566
 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:732
 #, 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:745 ui/evolution.xml.h:57
 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:758 ui/evolution.xml.h:32
 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 目前為線上工作。按這裡改為離線工作。"
+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 目前是離線工作。按這裡改為線上工作。"
+msgstr ""
+"Ximian Evolution 目前是離線工作。按這裡改為線上工作。"
+
+#: shell/e-shell.c:169
+#, 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:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "無法設定本地端的儲存空間 -- %s"
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -14445,22 +29151,27 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
+# widgets/misc/e-cell-date-edit.c:245
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+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:2135
 msgid "Invalid arguments"
 msgstr "無效的參數"
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "不能於 OAF 註冊"
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2139
 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:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "一般錯誤"
 
@@ -14608,91 +29319,84 @@ 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"
-msgstr ""
-"無法刪除資料夾：\n"
-"%s"
+# mail/local-config.glade.h:8
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Inbox"
 
-# shell/e-storage.c:178
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(沒有名稱)"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+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"
@@ -14707,28 +29411,59 @@ msgstr "%s (...)"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+#: shell/evolution-folder-selector-button.c:84
+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:1045
 #, fuzzy
 msgid "CORBA error"
 msgstr "輸出/入錯誤"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1047
 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:1049
 #, fuzzy
 msgid "Invalid argument"
 msgstr "無效的參數"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
@@ -14746,94 +29481,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:1053
 #, fuzzy
 msgid "No owner"
 msgstr "無"
 
 # calendar/gui/calendar-commands.c:266
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1055
 #, fuzzy
 msgid "Not found"
 msgstr "找不到名片"
 
 # mail/mail-config.glade.h:1
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1057
 #, fuzzy
 msgid "Unsupported type"
 msgstr " 檢查可支援的類別(_C)"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr ""
 
 # mail/mail-session.c:161
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1061
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "使用者取消動作。"
 
 # shell/e-storage.c:467
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1063
 #, fuzzy
 msgid "Internal error"
 msgstr "其它錯誤"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1067
 #, fuzzy
 msgid "Exists"
 msgstr "存在"
 
 # mail/mail-config.glade.h:37
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1069
 #, 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:1073
 #, fuzzy
 msgid "Has subfolders"
 msgstr "沒有這個資料夾 %s"
 
 # mail/mail-callbacks.c:1106
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1075
 #, fuzzy
 msgid "No space left"
 msgstr "沒有選定郵件"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1077
 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:47
+#, fuzzy
+msgid "Test type"
+msgstr "檔案類別："
 
 # shell/e-shell-offline-handler.c:554
 #: shell/glade/e-active-connection-dialog.glade.h:1
@@ -14978,381 +29691,346 @@ msgstr "不要再顯示這個訊息"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution 可以自下列檔案匯入資料："
 
-# ui/evolution.xml.h:17
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
 #: shell/main.c:89
+msgid "Evolution"
+msgstr "Evolution"
+
+# ui/evolution.xml.h:17
+#: shell/main.c:95
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolution 視窗(_W)"
 
 # shell/main.c:138
-#: shell/main.c:210
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "無法存取 Ximian Evolution shell。"
 
 # shell/main.c:138
-#: shell/main.c:219
+#: shell/main.c:236
 #, 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:317
 msgid "Disable splash screen"
 msgstr "停用顯著效果螢幕"
 
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "開始匯入"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "啟動智慧型匯入服務"
+
 # shell/main.c:185
-#: shell/main.c:290
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 
+#: shell/main.c:338
+#, 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:368
 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-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
 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
@@ -15397,28 +30075,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 +30118,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:40
 msgid "_File"
 msgstr "檔案(_F)"
 
@@ -15456,7 +30133,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 +30143,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 +30155,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)"
 
@@ -15549,6 +30231,11 @@ msgstr "為這個項目安排一個會議"
 msgid "Customise My Evolution"
 msgstr "自訂我的 Evolution"
 
+# ui/evolution-mail.xml.h:2
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "取消"
+
 # ui/evolution-mail.xml.h:3
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -15560,103 +30247,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 +30427,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:41
 msgid "_Folder"
 msgstr "資料 (_F)"
 
@@ -15804,240 +30456,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 +30716,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 +30751,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 +30773,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:55
 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 +30983,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:36
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -16293,7 +30993,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:56
 msgid "_View"
 msgstr "檢視(_V)"
 
@@ -16324,13 +31024,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 +31050,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 +31103,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 +31134,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 +31228,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 +31242,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:44
 msgid "_Help"
 msgstr "說明(_H)"
 
@@ -16609,41 +31313,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
@@ -16724,84 +31437,95 @@ msgstr "在新視窗開啟"
 msgid "Open this folder in an other window"
 msgstr "使用新視窗開啟這個資料夾"
 
-# ui/evolution.xml.h:27
+# ui/evolution-mail.xml.h:81
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "傳送 / 接收"
+
+# ui/evolution-mail.xml.h:82
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "傳送待送的郵件及接收新郵件"
+
+# ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "顯示關於 Ximian Evolution 的資訊"
 
 # ui/evolution.xml.h:28
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "傳送錯誤報告"
 
 # ui/evolution.xml.h:29
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "傳送錯誤報告(_B)"
 
 # ui/evolution.xml.h:30
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 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:27
 msgid "Toggle"
 msgstr "切換"
 
 # ui/evolution.xml.h:32
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "切換資料夾清單的顯示狀態"
 
 # ui/evolution.xml.h:33
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "切換資料功能列的顯示狀態"
 
 # ui/evolution.xml.h:34
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
 
 # ui/evolution.xml.h:38
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "檢視選定的資料夾"
 
 # ui/evolution.xml.h:16
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
 # ui/evolution.xml.h:40
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "關於 Ximian Evolution(_A)..."
 
 # ui/evolution.xml.h:45
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "複製(_C)..."
 
 # ui/evolution.xml.h:51
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "資料夾清單(_F)"
 
 # ui/evolution.xml.h:52
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "移至資料夾(_G)..."
 
 # shell/e-shell-importer.c:363
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Import..."
 msgstr "匯入..."
 
 # ui/evolution.xml.h:57
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "移動(_M)..."
 
@@ -16809,59 +31533,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:47
 msgid "_New"
 msgstr "新增(_N)"
 
 # ui/evolution.xml.h:59
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "新增資料夾(_N)"
 
 # ui/evolution-mail.xml.h:110
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "郵件設定(_M)..."
 
 # ui/evolution.xml.h:61
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "重新命名(_R)..."
 
+# ui/evolution-mail.xml.h:119
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "傳送 / 接收 (_S)"
+
 # ui/evolution.xml.h:62
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "功能(_S)"
 
 # ui/evolution.xml.h:62
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 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 +31596,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 +31631,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 +31663,23 @@ msgstr ""
 "  使用滑鼠右鍵縮小地圖。"
 
 # widgets/menus/gal-view-menus.c:176
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 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:324
+#, fuzzy
+msgid "Custom View"
+msgstr "目前檢視(_C)"
+
+#: widgets/menus/gal-view-menus.c:333
+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:346
 msgid "Define Views"
 msgstr "定義檢視"
 
@@ -16975,32 +31721,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 +31759,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 +31817,26 @@ 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 "加入儲存的搜尋結果"
-
-# 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.h:97
+#, fuzzy
+msgid "_Save Search..."
+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.c:168
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "加入儲存的搜尋結果"
 
 # widgets/misc/e-messagebox.c:152
 #: widgets/misc/e-messagebox.c:152
@@ -17124,13 +31867,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:477
+#, 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:478
+#, 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:835
+msgid "Clear"
+msgstr "清除"
 
 # addressbook/gui/component/addressbook-config.c:349
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "立即搜尋"
 
@@ -17161,14 +31918,1115 @@ 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
+#, fuzzy
+#~ msgid "Other Contacts"
+#~ msgstr "連絡人"
+
+# shell/e-storage.c:178
+#~ msgid "(none)"
+#~ msgstr "(沒有)"
+
+# 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)"
+
+# mail/mail-accounts.c:280
+# mail/mail-accounts.c:284
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "您確定要刪除\n"
+#~ "這個連絡人？"
+
+#~ msgid "Republic Of Moldova"
+#~ 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)："
+
+# addressbook/contact-editor/e-contact-editor.c:1254
+# addressbook/contact-editor/e-contact-editor.c:1312
+#~ msgid "_Other"
+#~ msgstr "其它(_O)"
+
+# calendar/gui/e-calendar-table.c:163
+#~ msgid "Click here to add an attendee"
+#~ msgstr "按這裡新增到會者"
+
+#~ msgid "The journal entry has changed. Send an updated version?"
+#~ msgstr "日誌項目已變更。是否傳送更新後的資訊？"
+
+# calendar/gui/e-calendar-table.c:367
+#~ msgid "0%"
+#~ msgstr "0%"
+
+# calendar/gui/e-calendar-table.c:368
+#~ msgid "10%"
+#~ msgstr "10%"
+
+# calendar/gui/e-calendar-table.c:369
+#~ msgid "20%"
+#~ msgstr "20%"
+
+# calendar/gui/e-calendar-table.c:370
+#~ msgid "30%"
+#~ msgstr "30%"
+
+# calendar/gui/e-calendar-table.c:371
+#~ msgid "40%"
+#~ msgstr "40%"
+
+# calendar/gui/e-calendar-table.c:372
+#~ msgid "50%"
+#~ msgstr "50%"
+
+# calendar/gui/e-calendar-table.c:373
+#~ msgid "60%"
+#~ msgstr "60%"
+
+# calendar/gui/e-calendar-table.c:374
+#~ msgid "70%"
+#~ msgstr "70%"
+
+# calendar/gui/e-calendar-table.c:375
+#~ msgid "80%"
+#~ msgstr "80%"
+
+# calendar/gui/e-calendar-table.c:376
+#~ msgid "90%"
+#~ msgstr "90%"
+
+# calendar/gui/e-calendar-table.c:708
+# ui/evolution-task-editor-dialog.xml.h:19
+#~ msgid "_Delete this Task"
+#~ msgstr "刪除這個工作(_D)"
+
+# mail/mail-config.glade.h:61
+#, fuzzy
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "空閒/忙碌 資訊"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:631
+#, fuzzy
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "會議結束時間(_E)："
+
+# mail/mail-config.glade.h:61
+#, fuzzy
+#~ msgid "Free/Busy info ends: <b>"
+#~ 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
+#, fuzzy
+#~ msgid "Task Completed: <b>"
+#~ msgstr " (已完成)"
+
+# data/evolution.keys.in.h:2
+#, fuzzy
+#~ msgid "iCalendar Information"
+#~ msgstr "行事曆資訊"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#, fuzzy
+#~ msgid "iCalendar Error"
+#~ msgstr "行事曆"
+
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#, fuzzy
+#~ msgid "An unknown person"
+#~ msgstr "不明的寄件者"
+
+# shell/e-shell-importer.c:545
+# shell/importer/import.glade.h:5
+#, fuzzy
+#~ msgid "Choose an action:"
+#~ msgstr "選擇一個動作"
+
+#, fuzzy
+#~ msgid "Update"
+#~ msgstr "工作更新"
+
+#, fuzzy
+#~ msgid "Accept"
+#~ msgstr "接受"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#, fuzzy
+#~ msgid "Tentatively accept"
+#~ msgstr "暫訂"
+
+#, fuzzy
+#~ msgid "Decline"
+#~ msgstr "婉拒"
+
+# mail/mail-config.glade.h:61
+#, fuzzy
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "空閒/忙碌 資訊"
+
+# widgets/misc/e-messagebox.c:152
+#, fuzzy
+#~ msgid "Send Latest Information"
+#~ msgstr "工作資訊"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> 已經發佈會議資訊。"
+
+# data/evolution.keys.in.h:2
+#~ msgid "Meeting Information"
+#~ msgstr "會議資訊"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> 請求您出席此次會議。"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#~ msgid "Meeting Proposal"
+#~ msgstr "會議提案"
+
+#~ 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
+#~ 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> 已經答覆了會議請求。"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#~ msgid "Meeting Reply"
+#~ msgstr "會議答覆"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> 已經消取會議。"
+
+# shell/e-shell-importer.c:545
+# shell/importer/import.glade.h:5
+#~ msgid "Meeting Cancellation"
+#~ msgstr "會議取消"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> 傳送了一個難以理解的訊息。"
+
+# mail/mail-search.c:268
+#~ msgid "Bad Meeting Message"
+#~ msgstr "不正確的會議訊息"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> 已經發佈了工作資訊。"
+
+# widgets/misc/e-messagebox.c:152
+#~ 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> 已經回覆指派的工作。"
+
+# mail/message-browser.c:188
+# ui/evolution-mail.xml.h:70
+#~ msgid "Task Reply"
+#~ msgstr "工作回覆"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> 已經取消工作。"
+
+#~ msgid "Task Cancellation"
+#~ msgstr "工作取消"
+
+# calendar/gui/e-itip-control.glade.h:4
+#~ msgid "Bad Task Message"
+#~ msgstr "不正確的工作訊息"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> 已經發佈 空閒/忙碌 資訊。"
+
+# mail/mail-config.glade.h:61
+#~ msgid "Free/Busy Information"
+#~ msgstr "空閒/忙碌 資訊"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> 請求您的 空閒/忙碌 資訊。"
+
+# addressbook/gui/widgets/e-addressbook-view.c:737
+#~ msgid "Free/Busy Request"
+#~ msgstr "空閒/忙碌 請求"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "<b>%s</b> 已經答覆 空閒/忙碌 請求。"
+
+# addressbook/gui/widgets/e-addressbook-view.c:737
+#~ msgid "Free/Busy Reply"
+#~ msgstr "空閒/忙碌 回覆"
+
+# mail/mail-callbacks.c:1407
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "不正確的 空閒/忙碌 訊息"
+
+#, fuzzy
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "這個郵件只包含密件副本收件者。"
+
+# calendar/gui/e-itip-control.c:470
+#~ msgid "I couldn't remove the item from your calendar file!\n"
+#~ msgstr "無法將項目從您的行事曆檔案移除！\n"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#, fuzzy
+#~ msgid "Status: %s"
+#~ msgstr "狀態(_S)："
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#, fuzzy
+#~ msgid "Percent Complete: %i"
+#~ msgstr "完成日期："
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#, fuzzy
+#~ msgid "URL: %s"
+#~ msgstr "網址："
+
+# addressbook/backend/ebook/e-card.c:3467
+#, fuzzy
+#~ msgid "Categories: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "類別： "
+
+# ui/evolution-addressbook.xml.h:17
+#, fuzzy
+#~ msgid "Contacts: "
+#~ msgstr "連絡人(_N)："
+
+# 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-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/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/imap/camel-imap-command.c:232
+#, fuzzy
+#~ msgid "Unexpected response from POP server: %s"
+#~ msgstr "從 IMAP 伺服器傳回不當的回應： %s"
+
+# 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:870
+#~ msgid "Filter on Mailing List"
+#~ msgstr "郵件清單的規則"
+
+# mail/local-config.glade.h:2
+#~ msgid "Mailbox Format"
+#~ msgstr "信箱格式"
+
+# mail/mail-accounts.c:121
+# mail/mail-accounts.c:165
+#~ msgid " (default)"
+#~ msgstr "(預設)"
+
+# mail/mail-autofilter.c:213
+#~ msgid "Subject is %s"
+#~ msgstr "主旨是 %s"
+
+# mail/mail-autofilter.c:229
+#~ msgid "Mail from %s"
+#~ msgstr "郵件來自 %s "
+
+# mail/mail-autofilter.c:285
+#~ msgid "%s mailing list"
+#~ msgstr "%s 郵件列表"
+
+#, 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 "編輯..."
+
+# mail/mail-config.glade.h:74
+#~ msgid "HTML signature file:"
+#~ msgstr "HTML 簽名檔："
+
+# 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 "伺服器類別："
+
+# mail/mail-config.glade.h:74
+#~ msgid "_Signature file:"
+#~ msgstr "簽名檔(_S)："
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+# mail/mail-config.glade.h:88
+#~ msgid "seconds."
+#~ msgstr "秒"
+
+# mail/mail-format.c:1153
+#, fuzzy
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more information."
+#~ msgstr "這封是加入了數位簽名的郵件，已証實無訛"
+
+# mail/mail-format.c:1153
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr "這封是加入了數位簽名的郵件，已証實無訛"
+
+# mail/mail-format.c:1161
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ 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 "蚓"
+
+#~ msgid "kph"
+#~ msgstr "kph"
+
+# mail/mail-ops.c:914
+#~ msgid "inHg"
+#~ msgstr "inHg"
+
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
+
+# importers/netscape-importer.c:795
+# mail/mail-callbacks.c:1359
+#~ msgid "kilometers"
+#~ msgstr "公里"
+
+# shell/e-shell-importer.c:601
+#~ msgid "All _folders:"
+#~ msgstr "全部資料夾(_A)："
+
+# mail/message-list.c:679
+#~ msgid "All news _feeds:"
+#~ msgstr "所有新聞發送伺服器(_F)："
+
+# ui/evolution.xml.h:14
+#~ msgid "_Display folders:"
+#~ msgstr "顯示資料夾(_D)："
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#~ msgid "_Display stations:"
+#~ 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."
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#, fuzzy
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法刪除資料夾：\n"
+#~ "%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,16 +33090,12 @@ 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 "
-#~ "to know."
-#~ msgstr "您應該會想知道的...。  這是 %s。  現在的 Unix 時間是 %ld。"
+#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+#~ "know."
+#~ msgstr ""
+#~ "您應該會想知道的...。  這是 %s。  現在的 Unix 時間是 %ld。"
 
 # addressbook/gui/widgets/alphabet.glade.h:5
 #~ msgid "%d"
@@ -17373,10 +33227,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"
@@ -17428,21 +33278,14 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ 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 的執行摘要元件。"
 
 #~ msgid "KBOS:ZSAM:EGAA"
 #~ msgstr ""
-#~ "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 "下載新聞發送伺服器時發生錯誤"
+#~ "RCFS:RCTP:RCKU:RCQS:RCBS:RCLM:RCNO:RCFN:RCKW:RCPO:RCYU:RCMS:RCAY:RCKH:RCQC:RC"
+#~ "FG:RCUK:RCSQ:RCDC:RCSS:RCLG:RCNN:RCGM:RCMQ:VHHH:WSSS"
 
 #~ msgid "Smoke w/ thunders"
 #~ msgstr "帶雷的煙"
@@ -17454,9 +33297,6 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ msgid "Units: "
 #~ msgstr "單位：  "
 
-#~ msgid "_imperial"
-#~ msgstr "英制(_I)"
-
 #~ msgid "m_etric"
 #~ msgstr "公制(_E)"
 
@@ -17476,12 +33316,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"
@@ -17572,12 +33406,6 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ 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)..."